diff --git a/L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs index f2efc8aa43..cca85c9968 100644 --- a/L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs @@ -123,7 +123,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=99 +org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 @@ -137,8 +137,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=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_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=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_resources_in_try=85 @@ -148,6 +150,8 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=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_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_package=1 @@ -206,6 +210,7 @@ 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 @@ -400,12 +405,24 @@ 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_at_beginning_of_method_body=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_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.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java index 35f56fc417..a99b439119 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java @@ -77,16 +77,24 @@ public class Q00701_ProofOfExistence extends Quest { case "32559-03.htm": case "32559-08.html": + { break; + } case "32559-04.htm": + { st.startQuest(); break; + } case "32559-09.html": + { st.exitQuest(true, true); break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -143,10 +151,13 @@ public class Q00701_ProofOfExistence extends Quest switch (st.getState()) { case State.CREATED: + { final QuestState qs = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName()); htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32559-01.htm" : "32559-02.htm"; break; + } case State.STARTED: + { if (hasQuestItems(player, BANSHEE_QUEENS_EYE)) { giveAdena(player, (getQuestItemsCount(player, DEADMANS_REMAINS) * 2500) + (getQuestItemsCount(player, BANSHEE_QUEENS_EYE) * 50000) + 23835, true); @@ -165,6 +176,7 @@ public class Q00701_ProofOfExistence extends Quest htmltext = "32559-05.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java index 40e650abd9..283939cc0a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java @@ -274,6 +274,7 @@ public class Q00702_ATrapForRevenge extends Quest switch (npc.getId()) { case 22612: + { if (chance < 413) { giveItems(player, DRAKES_FLESH, 2); @@ -283,7 +284,9 @@ public class Q00702_ATrapForRevenge extends Quest giveItems(player, DRAKES_FLESH, 1); } break; + } case 22613: + { if (chance < 440) { giveItems(player, DRAKES_FLESH, 2); @@ -293,13 +296,17 @@ public class Q00702_ATrapForRevenge extends Quest giveItems(player, DRAKES_FLESH, 1); } break; + } case 25632: + { if (chance < 996) { giveItems(player, DRAKES_FLESH, 1); } break; + } case 22610: + { if (chance < 485) { giveItems(player, DRAKES_FLESH, 2); @@ -309,7 +316,9 @@ public class Q00702_ATrapForRevenge extends Quest giveItems(player, DRAKES_FLESH, 1); } break; + } case 22611: + { if (chance < 451) { giveItems(player, DRAKES_FLESH, 2); @@ -319,7 +328,9 @@ public class Q00702_ATrapForRevenge extends Quest giveItems(player, DRAKES_FLESH, 1); } break; + } case 25631: + { if (chance < 485) { giveItems(player, DRAKES_FLESH, 2); @@ -329,7 +340,9 @@ public class Q00702_ATrapForRevenge extends Quest giveItems(player, DRAKES_FLESH, 1); } break; + } case 25626: + { int count = 0; if (chance < 708) { @@ -353,6 +366,7 @@ public class Q00702_ATrapForRevenge extends Quest } giveItems(player, VARIANT_DRAKE_WING_HORNS, count); break; + } } playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); return null; @@ -369,12 +383,16 @@ public class Q00702_ATrapForRevenge extends Quest switch (st.getState()) { case State.CREATED: + { final QuestState prev = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName()); htmltext = ((prev != null) && prev.isCompleted() && (player.getLevel() >= 78)) ? "32563-01.htm" : "32563-02.htm"; break; + } case State.STARTED: + { htmltext = (st.isCond(1)) ? "32563-05.html" : "32563-06.html"; break; + } } } if (st.getState() == State.STARTED) @@ -384,11 +402,15 @@ public class Q00702_ATrapForRevenge extends Quest switch (st.getCond()) { case 1: + { htmltext = "32557-01.html"; break; + } case 2: + { htmltext = "32557-02.html"; break; + } } } else if (npc.getId() == TENIUS) @@ -396,11 +418,15 @@ public class Q00702_ATrapForRevenge extends Quest switch (st.getCond()) { case 1: + { htmltext = "32555-01.html"; break; + } case 2: + { htmltext = "32555-04.html"; break; + } } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java index 6f442ad5f7..2076635ac3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java @@ -152,6 +152,7 @@ public class Q10376_BloodyGoodTime extends Quest switch (npc.getId()) { case ZENYA: + { switch (qs.getState()) { case State.CREATED: @@ -179,7 +180,7 @@ public class Q10376_BloodyGoodTime extends Quest } } break; - + } case CASCA: { if (qs.isStarted()) @@ -203,7 +204,6 @@ public class Q10376_BloodyGoodTime extends Quest } break; } - case AGNES: { if (qs.isStarted()) @@ -219,7 +219,6 @@ public class Q10376_BloodyGoodTime extends Quest } break; } - case ANDREI: { if (qs.isStarted() && qs.isCond(6)) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java index 4eaeaaf1ef..2b4bc5a1b0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java @@ -129,7 +129,6 @@ public class Q10383_FergasonsOffer extends Quest { htmltext = "maestro_ferguson_q10383_05.html"; } - break; } case AKU: @@ -142,7 +141,6 @@ public class Q10383_FergasonsOffer extends Quest { htmltext = "sofa_aku_q10383_02.html"; } - break; } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java index bd7262bcfa..59f4754289 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java @@ -111,7 +111,6 @@ public class Q10384_AnAudienceWithTauti extends Quest { htmltext = "maestro_ferguson_q10384_09.html"; } - } else if (qs.isCompleted()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java index 62ce465540..97543bbcc2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java @@ -132,8 +132,10 @@ public final class Q10734_DoOrDie extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = (meetStartRestrictions(player)) ? "33943-01.htm" : "33943-08.htm"; break; + } case State.STARTED: { switch (qs.getCond()) @@ -182,8 +184,10 @@ public final class Q10734_DoOrDie extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = (meetStartRestrictions(player)) ? "33942-01.htm" : "33942-08.htm"; break; + } case State.STARTED: { switch (qs.getCond()) @@ -219,8 +223,10 @@ public final class Q10734_DoOrDie extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } } break; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java index 752a8f6acf..87e6d1ddea 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java @@ -119,8 +119,10 @@ public final class Q10735_ASpecialPower extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } @@ -136,14 +138,20 @@ public final class Q10735_ASpecialPower extends Quest switch (qs.getCond()) { case 2: + { npcId = FLOATO; break; + } case 4: + { npcId = FLOATO2; break; + } case 6: + { npcId = RATEL; break; + } } if (npcId != -1) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java index 6bd35a18c0..83d0b937eb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java @@ -83,8 +83,10 @@ public final class Q10736_ASpecialPower extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33943-01.htm"; break; + } case State.STARTED: { switch (qs.getCond()) @@ -116,8 +118,10 @@ public final class Q10736_ASpecialPower extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } @@ -133,14 +137,20 @@ public final class Q10736_ASpecialPower extends Quest switch (qs.getCond()) { case 2: + { npcId = FLOATO; break; + } case 4: + { npcId = FLOATO2; break; + } case 6: + { npcId = RATEL; break; + } } if (npcId != -1) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index 4b2383a539..dd588a6c25 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -152,8 +152,10 @@ public final class Q10740_NeverForget extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index cffcc9a035..20fca4d548 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -70,7 +70,9 @@ public final class Q10741_ADraughtForTheCold extends Quest switch (event) { case "33951-02.htm": + { break; + } case "33951-03.htm": { qs.startQuest(); @@ -88,7 +90,9 @@ public final class Q10741_ADraughtForTheCold extends Quest break; } default: + { htmltext = null; + } } return htmltext; } @@ -106,8 +110,10 @@ public final class Q10741_ADraughtForTheCold extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33951-01.htm"; break; + } case State.STARTED: { if (qs.isCond(1)) @@ -117,8 +123,10 @@ public final class Q10741_ADraughtForTheCold extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java index fd514520dd..4bde38513f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java @@ -74,8 +74,10 @@ public final class Q10742_AFurryFriend extends Quest { case "33952-02.htm": case "33952-05.html": + { htmltext = event; break; + } case "33952-03.htm": { qs.startQuest(); @@ -183,8 +185,10 @@ public final class Q10742_AFurryFriend extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33952-01.htm"; break; + } case State.STARTED: { if (qs.isCond(1)) @@ -201,8 +205,10 @@ public final class Q10742_AFurryFriend extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } } return htmltext; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index a9691219fb..4abe0e783c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -78,7 +78,9 @@ public final class Q10743_StrangeFungus extends Quest { case "33952-02.htm": case "33953-02.html": + { break; + } case "33952-03.htm": { qs.startQuest(); @@ -97,7 +99,9 @@ public final class Q10743_StrangeFungus extends Quest break; } default: + { htmltext = null; + } } return htmltext; } @@ -115,14 +119,20 @@ public final class Q10743_StrangeFungus extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33952-01.htm"; break; + } case State.STARTED: + { htmltext = (qs.isCond(1)) ? "33952-04.html" : "33952-05.html"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index c3e806ec65..03679c1aeb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -67,7 +67,9 @@ public final class Q10744_StrongerThanSteel extends Quest { case "33953-02.htm": case "33954-02.html": + { break; + } case "33953-03.htm": { qs.startQuest(); @@ -82,7 +84,9 @@ public final class Q10744_StrongerThanSteel extends Quest break; } default: + { htmltext = null; + } } return htmltext; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java index 1731d98a1e..ca85a13944 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java @@ -114,7 +114,9 @@ public final class Q10745_TheSecretIngredients extends Quest break; } default: + { htmltext = null; + } } return htmltext; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java index 1b6c4f586e..3456c12de4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java @@ -82,7 +82,9 @@ public final class Q10746_SeeTheWorld extends Quest break; } default: + { htmltext = null; + } } return htmltext; } @@ -100,8 +102,10 @@ public final class Q10746_SeeTheWorld extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33933-01.htm"; break; + } case State.STARTED: { if (qs.isCond(1)) @@ -111,8 +115,10 @@ public final class Q10746_SeeTheWorld extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index ffe2b731f6..cbfaa85e87 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -60,7 +60,9 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest { case "31616-02.htm": case "31616-03.htm": + { break; + } case "31616-04.htm": { qs.startQuest(); @@ -111,8 +113,8 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest { htmltext = getAlreadyCompletedMsg(player); } - } break; + } } return htmltext; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java index 85e05a8a57..fee8051211 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java @@ -65,7 +65,9 @@ public class Q10797_CrossingFate extends Quest { case "31683-02.htm": case "31683-03.htm": + { break; + } case "31683-04.htm": { qs.startQuest(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/Expression.java index c914843929..1bd7aa8cae 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/Expression.java @@ -137,9 +137,12 @@ public class Expression { case Token.TOKEN_NUMBER: case Token.TOKEN_VARIABLE: + { count++; break; + } case Token.TOKEN_FUNCTION: + { final Function func = ((FunctionToken) tok).getFunction(); final int argsNum = func.getNumArguments(); if (argsNum > count) @@ -156,13 +159,16 @@ public class Expression count++; } break; + } case Token.TOKEN_OPERATOR: + { Operator op = ((OperatorToken) tok).getOperator(); if (op.getNumOperands() == 2) { count--; } break; + } } if (count < 1) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/Operators.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/Operators.java index 79abddd39e..ca28599f0c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/Operators.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/Operators.java @@ -109,27 +109,41 @@ public abstract class Operators switch (symbol) { case '+': + { if (numArguments != 1) { return builtinOperators[INDEX_ADDITION]; } return builtinOperators[INDEX_UNARYPLUS]; + } case '-': + { if (numArguments != 1) { return builtinOperators[INDEX_SUBTRACTION]; } return builtinOperators[INDEX_UNARYMINUS]; + } case '*': + { return builtinOperators[INDEX_MUTLIPLICATION]; + } case '/': + { return builtinOperators[INDEX_DIVISION]; + } case '^': + { return builtinOperators[INDEX_POWER]; + } case '%': + { return builtinOperators[INDEX_MODULO]; + } default: + { return null; + } } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java index 18a5ef7a3d..c43acda129 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java @@ -48,12 +48,17 @@ public class ShuntingYard { case Token.TOKEN_NUMBER: case Token.TOKEN_VARIABLE: + { output.add(token); break; + } case Token.TOKEN_FUNCTION: + { stack.add(token); break; + } case Token.TOKEN_SEPARATOR: + { while (!stack.empty() && (stack.peek().getType() != Token.TOKEN_PARENTHESES_OPEN)) { output.add(stack.pop()); @@ -63,7 +68,9 @@ public class ShuntingYard throw new IllegalArgumentException("Misplaced function separator ',' or mismatched parentheses"); } break; + } case Token.TOKEN_OPERATOR: + { while (!stack.empty() && (stack.peek().getType() == Token.TOKEN_OPERATOR)) { OperatorToken o1 = (OperatorToken) token; @@ -83,10 +90,14 @@ public class ShuntingYard } stack.push(token); break; + } case Token.TOKEN_PARENTHESES_OPEN: + { stack.push(token); break; + } case Token.TOKEN_PARENTHESES_CLOSE: + { while (stack.peek().getType() != Token.TOKEN_PARENTHESES_OPEN) { output.add(stack.pop()); @@ -97,8 +108,11 @@ public class ShuntingYard output.add(stack.pop()); } break; + } default: + { throw new IllegalArgumentException("Unknown Token type encountered. This should not happen"); + } } } while (!stack.empty()) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java index 078b6d0121..715ee05d47 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java @@ -159,19 +159,24 @@ public final class GeoDataConverter switch (type) { case GeoStructure.TYPE_FLAT_L2J_L2OFF: + { _blocks[ix][iy] = new BlockFlat(buffer, _format); break; - + } case GeoStructure.TYPE_COMPLEX_L2J: + { _blocks[ix][iy] = new BlockComplex(buffer, _format); break; - + } case GeoStructure.TYPE_MULTILAYER_L2J: + { _blocks[ix][iy] = new BlockMultilayer(buffer, _format); break; - + } default: + { throw new IllegalArgumentException("Unknown block type: " + type); + } } } else @@ -183,16 +188,20 @@ public final class GeoDataConverter switch (type) { case GeoStructure.TYPE_FLAT_L2J_L2OFF: + { _blocks[ix][iy] = new BlockFlat(buffer, _format); break; - + } case GeoStructure.TYPE_COMPLEX_L2OFF: + { _blocks[ix][iy] = new BlockComplex(buffer, _format); break; - + } default: + { _blocks[ix][iy] = new BlockMultilayer(buffer, _format); break; + } } } } diff --git a/L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs index f2efc8aa43..cca85c9968 100644 --- a/L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs @@ -123,7 +123,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=99 +org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 @@ -137,8 +137,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=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_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=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_resources_in_try=85 @@ -148,6 +150,8 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=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_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_package=1 @@ -206,6 +210,7 @@ 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 @@ -400,12 +405,24 @@ 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_at_beginning_of_method_body=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_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.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java index 6f442ad5f7..2076635ac3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java @@ -152,6 +152,7 @@ public class Q10376_BloodyGoodTime extends Quest switch (npc.getId()) { case ZENYA: + { switch (qs.getState()) { case State.CREATED: @@ -179,7 +180,7 @@ public class Q10376_BloodyGoodTime extends Quest } } break; - + } case CASCA: { if (qs.isStarted()) @@ -203,7 +204,6 @@ public class Q10376_BloodyGoodTime extends Quest } break; } - case AGNES: { if (qs.isStarted()) @@ -219,7 +219,6 @@ public class Q10376_BloodyGoodTime extends Quest } break; } - case ANDREI: { if (qs.isStarted() && qs.isCond(6)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java index 4eaeaaf1ef..2b4bc5a1b0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java @@ -129,7 +129,6 @@ public class Q10383_FergasonsOffer extends Quest { htmltext = "maestro_ferguson_q10383_05.html"; } - break; } case AKU: @@ -142,7 +141,6 @@ public class Q10383_FergasonsOffer extends Quest { htmltext = "sofa_aku_q10383_02.html"; } - break; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java index bd7262bcfa..59f4754289 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java @@ -111,7 +111,6 @@ public class Q10384_AnAudienceWithTauti extends Quest { htmltext = "maestro_ferguson_q10384_09.html"; } - } else if (qs.isCompleted()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java index 62ce465540..97543bbcc2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java @@ -132,8 +132,10 @@ public final class Q10734_DoOrDie extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = (meetStartRestrictions(player)) ? "33943-01.htm" : "33943-08.htm"; break; + } case State.STARTED: { switch (qs.getCond()) @@ -182,8 +184,10 @@ public final class Q10734_DoOrDie extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = (meetStartRestrictions(player)) ? "33942-01.htm" : "33942-08.htm"; break; + } case State.STARTED: { switch (qs.getCond()) @@ -219,8 +223,10 @@ public final class Q10734_DoOrDie extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } } break; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java index 752a8f6acf..87e6d1ddea 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java @@ -119,8 +119,10 @@ public final class Q10735_ASpecialPower extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } @@ -136,14 +138,20 @@ public final class Q10735_ASpecialPower extends Quest switch (qs.getCond()) { case 2: + { npcId = FLOATO; break; + } case 4: + { npcId = FLOATO2; break; + } case 6: + { npcId = RATEL; break; + } } if (npcId != -1) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java index 6bd35a18c0..83d0b937eb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java @@ -83,8 +83,10 @@ public final class Q10736_ASpecialPower extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33943-01.htm"; break; + } case State.STARTED: { switch (qs.getCond()) @@ -116,8 +118,10 @@ public final class Q10736_ASpecialPower extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } @@ -133,14 +137,20 @@ public final class Q10736_ASpecialPower extends Quest switch (qs.getCond()) { case 2: + { npcId = FLOATO; break; + } case 4: + { npcId = FLOATO2; break; + } case 6: + { npcId = RATEL; break; + } } if (npcId != -1) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index 4b2383a539..dd588a6c25 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -152,8 +152,10 @@ public final class Q10740_NeverForget extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index cffcc9a035..20fca4d548 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -70,7 +70,9 @@ public final class Q10741_ADraughtForTheCold extends Quest switch (event) { case "33951-02.htm": + { break; + } case "33951-03.htm": { qs.startQuest(); @@ -88,7 +90,9 @@ public final class Q10741_ADraughtForTheCold extends Quest break; } default: + { htmltext = null; + } } return htmltext; } @@ -106,8 +110,10 @@ public final class Q10741_ADraughtForTheCold extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33951-01.htm"; break; + } case State.STARTED: { if (qs.isCond(1)) @@ -117,8 +123,10 @@ public final class Q10741_ADraughtForTheCold extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java index fd514520dd..4bde38513f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java @@ -74,8 +74,10 @@ public final class Q10742_AFurryFriend extends Quest { case "33952-02.htm": case "33952-05.html": + { htmltext = event; break; + } case "33952-03.htm": { qs.startQuest(); @@ -183,8 +185,10 @@ public final class Q10742_AFurryFriend extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33952-01.htm"; break; + } case State.STARTED: { if (qs.isCond(1)) @@ -201,8 +205,10 @@ public final class Q10742_AFurryFriend extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } } return htmltext; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index a9691219fb..4abe0e783c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -78,7 +78,9 @@ public final class Q10743_StrangeFungus extends Quest { case "33952-02.htm": case "33953-02.html": + { break; + } case "33952-03.htm": { qs.startQuest(); @@ -97,7 +99,9 @@ public final class Q10743_StrangeFungus extends Quest break; } default: + { htmltext = null; + } } return htmltext; } @@ -115,14 +119,20 @@ public final class Q10743_StrangeFungus extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33952-01.htm"; break; + } case State.STARTED: + { htmltext = (qs.isCond(1)) ? "33952-04.html" : "33952-05.html"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index c3e806ec65..03679c1aeb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -67,7 +67,9 @@ public final class Q10744_StrongerThanSteel extends Quest { case "33953-02.htm": case "33954-02.html": + { break; + } case "33953-03.htm": { qs.startQuest(); @@ -82,7 +84,9 @@ public final class Q10744_StrongerThanSteel extends Quest break; } default: + { htmltext = null; + } } return htmltext; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java index 1731d98a1e..ca85a13944 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java @@ -114,7 +114,9 @@ public final class Q10745_TheSecretIngredients extends Quest break; } default: + { htmltext = null; + } } return htmltext; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java index 1b6c4f586e..3456c12de4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java @@ -82,7 +82,9 @@ public final class Q10746_SeeTheWorld extends Quest break; } default: + { htmltext = null; + } } return htmltext; } @@ -100,8 +102,10 @@ public final class Q10746_SeeTheWorld extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33933-01.htm"; break; + } case State.STARTED: { if (qs.isCond(1)) @@ -111,8 +115,10 @@ public final class Q10746_SeeTheWorld extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index ffe2b731f6..cbfaa85e87 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -60,7 +60,9 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest { case "31616-02.htm": case "31616-03.htm": + { break; + } case "31616-04.htm": { qs.startQuest(); @@ -111,8 +113,8 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest { htmltext = getAlreadyCompletedMsg(player); } - } break; + } } return htmltext; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java index 85e05a8a57..fee8051211 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java @@ -65,7 +65,9 @@ public class Q10797_CrossingFate extends Quest { case "31683-02.htm": case "31683-03.htm": + { break; + } case "31683-04.htm": { qs.startQuest(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/Expression.java index c914843929..1bd7aa8cae 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/Expression.java @@ -137,9 +137,12 @@ public class Expression { case Token.TOKEN_NUMBER: case Token.TOKEN_VARIABLE: + { count++; break; + } case Token.TOKEN_FUNCTION: + { final Function func = ((FunctionToken) tok).getFunction(); final int argsNum = func.getNumArguments(); if (argsNum > count) @@ -156,13 +159,16 @@ public class Expression count++; } break; + } case Token.TOKEN_OPERATOR: + { Operator op = ((OperatorToken) tok).getOperator(); if (op.getNumOperands() == 2) { count--; } break; + } } if (count < 1) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/Operators.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/Operators.java index 79abddd39e..ca28599f0c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/Operators.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/Operators.java @@ -109,27 +109,41 @@ public abstract class Operators switch (symbol) { case '+': + { if (numArguments != 1) { return builtinOperators[INDEX_ADDITION]; } return builtinOperators[INDEX_UNARYPLUS]; + } case '-': + { if (numArguments != 1) { return builtinOperators[INDEX_SUBTRACTION]; } return builtinOperators[INDEX_UNARYMINUS]; + } case '*': + { return builtinOperators[INDEX_MUTLIPLICATION]; + } case '/': + { return builtinOperators[INDEX_DIVISION]; + } case '^': + { return builtinOperators[INDEX_POWER]; + } case '%': + { return builtinOperators[INDEX_MODULO]; + } default: + { return null; + } } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java index 18a5ef7a3d..c43acda129 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java @@ -48,12 +48,17 @@ public class ShuntingYard { case Token.TOKEN_NUMBER: case Token.TOKEN_VARIABLE: + { output.add(token); break; + } case Token.TOKEN_FUNCTION: + { stack.add(token); break; + } case Token.TOKEN_SEPARATOR: + { while (!stack.empty() && (stack.peek().getType() != Token.TOKEN_PARENTHESES_OPEN)) { output.add(stack.pop()); @@ -63,7 +68,9 @@ public class ShuntingYard throw new IllegalArgumentException("Misplaced function separator ',' or mismatched parentheses"); } break; + } case Token.TOKEN_OPERATOR: + { while (!stack.empty() && (stack.peek().getType() == Token.TOKEN_OPERATOR)) { OperatorToken o1 = (OperatorToken) token; @@ -83,10 +90,14 @@ public class ShuntingYard } stack.push(token); break; + } case Token.TOKEN_PARENTHESES_OPEN: + { stack.push(token); break; + } case Token.TOKEN_PARENTHESES_CLOSE: + { while (stack.peek().getType() != Token.TOKEN_PARENTHESES_OPEN) { output.add(stack.pop()); @@ -97,8 +108,11 @@ public class ShuntingYard output.add(stack.pop()); } break; + } default: + { throw new IllegalArgumentException("Unknown Token type encountered. This should not happen"); + } } } while (!stack.empty()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java index 078b6d0121..715ee05d47 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java @@ -159,19 +159,24 @@ public final class GeoDataConverter switch (type) { case GeoStructure.TYPE_FLAT_L2J_L2OFF: + { _blocks[ix][iy] = new BlockFlat(buffer, _format); break; - + } case GeoStructure.TYPE_COMPLEX_L2J: + { _blocks[ix][iy] = new BlockComplex(buffer, _format); break; - + } case GeoStructure.TYPE_MULTILAYER_L2J: + { _blocks[ix][iy] = new BlockMultilayer(buffer, _format); break; - + } default: + { throw new IllegalArgumentException("Unknown block type: " + type); + } } } else @@ -183,16 +188,20 @@ public final class GeoDataConverter switch (type) { case GeoStructure.TYPE_FLAT_L2J_L2OFF: + { _blocks[ix][iy] = new BlockFlat(buffer, _format); break; - + } case GeoStructure.TYPE_COMPLEX_L2OFF: + { _blocks[ix][iy] = new BlockComplex(buffer, _format); break; - + } default: + { _blocks[ix][iy] = new BlockMultilayer(buffer, _format); break; + } } } } diff --git a/L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs index f2efc8aa43..cca85c9968 100644 --- a/L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs @@ -123,7 +123,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=99 +org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 @@ -137,8 +137,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=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_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=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_resources_in_try=85 @@ -148,6 +150,8 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=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_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_package=1 @@ -206,6 +210,7 @@ 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 @@ -400,12 +405,24 @@ 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_at_beginning_of_method_body=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_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.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java index 6f442ad5f7..2076635ac3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java @@ -152,6 +152,7 @@ public class Q10376_BloodyGoodTime extends Quest switch (npc.getId()) { case ZENYA: + { switch (qs.getState()) { case State.CREATED: @@ -179,7 +180,7 @@ public class Q10376_BloodyGoodTime extends Quest } } break; - + } case CASCA: { if (qs.isStarted()) @@ -203,7 +204,6 @@ public class Q10376_BloodyGoodTime extends Quest } break; } - case AGNES: { if (qs.isStarted()) @@ -219,7 +219,6 @@ public class Q10376_BloodyGoodTime extends Quest } break; } - case ANDREI: { if (qs.isStarted() && qs.isCond(6)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java index 9b5e6c3774..f0a1477544 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java @@ -139,7 +139,6 @@ public class Q10383_FergasonsOffer extends Quest { htmltext = "maestro_ferguson_q10383_05.html"; } - break; } case AKU: @@ -152,7 +151,6 @@ public class Q10383_FergasonsOffer extends Quest { htmltext = "sofa_aku_q10383_02.html"; } - break; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java index e8600acc78..68d0acdef5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java @@ -124,7 +124,6 @@ public class Q10384_AnAudienceWithTauti extends Quest { htmltext = "maestro_ferguson_q10384_09.html"; } - } else if (qs.isCompleted()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java index 0a0f129995..1d850db7cd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java @@ -211,7 +211,9 @@ public final class Q10542_SearchingForNewPower extends Quest break; } default: + { break; + } } if (npcStringId != null) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java index 62ce465540..97543bbcc2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java @@ -132,8 +132,10 @@ public final class Q10734_DoOrDie extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = (meetStartRestrictions(player)) ? "33943-01.htm" : "33943-08.htm"; break; + } case State.STARTED: { switch (qs.getCond()) @@ -182,8 +184,10 @@ public final class Q10734_DoOrDie extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = (meetStartRestrictions(player)) ? "33942-01.htm" : "33942-08.htm"; break; + } case State.STARTED: { switch (qs.getCond()) @@ -219,8 +223,10 @@ public final class Q10734_DoOrDie extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } } break; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java index 752a8f6acf..87e6d1ddea 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java @@ -119,8 +119,10 @@ public final class Q10735_ASpecialPower extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } @@ -136,14 +138,20 @@ public final class Q10735_ASpecialPower extends Quest switch (qs.getCond()) { case 2: + { npcId = FLOATO; break; + } case 4: + { npcId = FLOATO2; break; + } case 6: + { npcId = RATEL; break; + } } if (npcId != -1) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java index 6bd35a18c0..83d0b937eb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java @@ -83,8 +83,10 @@ public final class Q10736_ASpecialPower extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33943-01.htm"; break; + } case State.STARTED: { switch (qs.getCond()) @@ -116,8 +118,10 @@ public final class Q10736_ASpecialPower extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } @@ -133,14 +137,20 @@ public final class Q10736_ASpecialPower extends Quest switch (qs.getCond()) { case 2: + { npcId = FLOATO; break; + } case 4: + { npcId = FLOATO2; break; + } case 6: + { npcId = RATEL; break; + } } if (npcId != -1) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index 4b2383a539..dd588a6c25 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -152,8 +152,10 @@ public final class Q10740_NeverForget extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index cffcc9a035..20fca4d548 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -70,7 +70,9 @@ public final class Q10741_ADraughtForTheCold extends Quest switch (event) { case "33951-02.htm": + { break; + } case "33951-03.htm": { qs.startQuest(); @@ -88,7 +90,9 @@ public final class Q10741_ADraughtForTheCold extends Quest break; } default: + { htmltext = null; + } } return htmltext; } @@ -106,8 +110,10 @@ public final class Q10741_ADraughtForTheCold extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33951-01.htm"; break; + } case State.STARTED: { if (qs.isCond(1)) @@ -117,8 +123,10 @@ public final class Q10741_ADraughtForTheCold extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java index fd514520dd..4bde38513f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java @@ -74,8 +74,10 @@ public final class Q10742_AFurryFriend extends Quest { case "33952-02.htm": case "33952-05.html": + { htmltext = event; break; + } case "33952-03.htm": { qs.startQuest(); @@ -183,8 +185,10 @@ public final class Q10742_AFurryFriend extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33952-01.htm"; break; + } case State.STARTED: { if (qs.isCond(1)) @@ -201,8 +205,10 @@ public final class Q10742_AFurryFriend extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } } return htmltext; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index a9691219fb..4abe0e783c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -78,7 +78,9 @@ public final class Q10743_StrangeFungus extends Quest { case "33952-02.htm": case "33953-02.html": + { break; + } case "33952-03.htm": { qs.startQuest(); @@ -97,7 +99,9 @@ public final class Q10743_StrangeFungus extends Quest break; } default: + { htmltext = null; + } } return htmltext; } @@ -115,14 +119,20 @@ public final class Q10743_StrangeFungus extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33952-01.htm"; break; + } case State.STARTED: + { htmltext = (qs.isCond(1)) ? "33952-04.html" : "33952-05.html"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index c3e806ec65..03679c1aeb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -67,7 +67,9 @@ public final class Q10744_StrongerThanSteel extends Quest { case "33953-02.htm": case "33954-02.html": + { break; + } case "33953-03.htm": { qs.startQuest(); @@ -82,7 +84,9 @@ public final class Q10744_StrongerThanSteel extends Quest break; } default: + { htmltext = null; + } } return htmltext; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java index 1731d98a1e..ca85a13944 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java @@ -114,7 +114,9 @@ public final class Q10745_TheSecretIngredients extends Quest break; } default: + { htmltext = null; + } } return htmltext; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java index 61bf30b3c2..35a7499569 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java @@ -83,7 +83,9 @@ public final class Q10746_SeeTheWorld extends Quest break; } default: + { htmltext = null; + } } return htmltext; } @@ -101,8 +103,10 @@ public final class Q10746_SeeTheWorld extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33933-01.htm"; break; + } case State.STARTED: { if (qs.isCond(1)) @@ -112,8 +116,10 @@ public final class Q10746_SeeTheWorld extends Quest break; } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java index 588a12b043..99af2ad387 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java @@ -88,7 +88,9 @@ public class Q10790_AMercenaryHelper extends Quest { case "33847-02.htm": case "33847-03.htm": + { break; + } case "33847-04.htm": { qs.startQuest(); @@ -118,14 +120,20 @@ public class Q10790_AMercenaryHelper extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = "33847-01.htm"; break; + } case State.STARTED: + { htmltext = (qs.isCond(1)) ? "33847-05.html" : "33847-06.html"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index ffe2b731f6..cbfaa85e87 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -60,7 +60,9 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest { case "31616-02.htm": case "31616-03.htm": + { break; + } case "31616-04.htm": { qs.startQuest(); @@ -111,8 +113,8 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest { htmltext = getAlreadyCompletedMsg(player); } - } break; + } } return htmltext; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java index 85e05a8a57..fee8051211 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java @@ -65,7 +65,9 @@ public class Q10797_CrossingFate extends Quest { case "31683-02.htm": case "31683-03.htm": + { break; + } case "31683-04.htm": { qs.startQuest(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/Expression.java index c914843929..1bd7aa8cae 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/Expression.java @@ -137,9 +137,12 @@ public class Expression { case Token.TOKEN_NUMBER: case Token.TOKEN_VARIABLE: + { count++; break; + } case Token.TOKEN_FUNCTION: + { final Function func = ((FunctionToken) tok).getFunction(); final int argsNum = func.getNumArguments(); if (argsNum > count) @@ -156,13 +159,16 @@ public class Expression count++; } break; + } case Token.TOKEN_OPERATOR: + { Operator op = ((OperatorToken) tok).getOperator(); if (op.getNumOperands() == 2) { count--; } break; + } } if (count < 1) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/Operators.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/Operators.java index 79abddd39e..ca28599f0c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/Operators.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/Operators.java @@ -109,27 +109,41 @@ public abstract class Operators switch (symbol) { case '+': + { if (numArguments != 1) { return builtinOperators[INDEX_ADDITION]; } return builtinOperators[INDEX_UNARYPLUS]; + } case '-': + { if (numArguments != 1) { return builtinOperators[INDEX_SUBTRACTION]; } return builtinOperators[INDEX_UNARYMINUS]; + } case '*': + { return builtinOperators[INDEX_MUTLIPLICATION]; + } case '/': + { return builtinOperators[INDEX_DIVISION]; + } case '^': + { return builtinOperators[INDEX_POWER]; + } case '%': + { return builtinOperators[INDEX_MODULO]; + } default: + { return null; + } } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java index 18a5ef7a3d..c43acda129 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java @@ -48,12 +48,17 @@ public class ShuntingYard { case Token.TOKEN_NUMBER: case Token.TOKEN_VARIABLE: + { output.add(token); break; + } case Token.TOKEN_FUNCTION: + { stack.add(token); break; + } case Token.TOKEN_SEPARATOR: + { while (!stack.empty() && (stack.peek().getType() != Token.TOKEN_PARENTHESES_OPEN)) { output.add(stack.pop()); @@ -63,7 +68,9 @@ public class ShuntingYard throw new IllegalArgumentException("Misplaced function separator ',' or mismatched parentheses"); } break; + } case Token.TOKEN_OPERATOR: + { while (!stack.empty() && (stack.peek().getType() == Token.TOKEN_OPERATOR)) { OperatorToken o1 = (OperatorToken) token; @@ -83,10 +90,14 @@ public class ShuntingYard } stack.push(token); break; + } case Token.TOKEN_PARENTHESES_OPEN: + { stack.push(token); break; + } case Token.TOKEN_PARENTHESES_CLOSE: + { while (stack.peek().getType() != Token.TOKEN_PARENTHESES_OPEN) { output.add(stack.pop()); @@ -97,8 +108,11 @@ public class ShuntingYard output.add(stack.pop()); } break; + } default: + { throw new IllegalArgumentException("Unknown Token type encountered. This should not happen"); + } } } while (!stack.empty()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java index 078b6d0121..715ee05d47 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java @@ -159,19 +159,24 @@ public final class GeoDataConverter switch (type) { case GeoStructure.TYPE_FLAT_L2J_L2OFF: + { _blocks[ix][iy] = new BlockFlat(buffer, _format); break; - + } case GeoStructure.TYPE_COMPLEX_L2J: + { _blocks[ix][iy] = new BlockComplex(buffer, _format); break; - + } case GeoStructure.TYPE_MULTILAYER_L2J: + { _blocks[ix][iy] = new BlockMultilayer(buffer, _format); break; - + } default: + { throw new IllegalArgumentException("Unknown block type: " + type); + } } } else @@ -183,16 +188,20 @@ public final class GeoDataConverter switch (type) { case GeoStructure.TYPE_FLAT_L2J_L2OFF: + { _blocks[ix][iy] = new BlockFlat(buffer, _format); break; - + } case GeoStructure.TYPE_COMPLEX_L2OFF: + { _blocks[ix][iy] = new BlockComplex(buffer, _format); break; - + } default: + { _blocks[ix][iy] = new BlockMultilayer(buffer, _format); break; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs index 040117e9a7..25ac1d2757 100644 --- a/L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 @@ -127,8 +128,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=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_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=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_resources_in_try=85 @@ -138,6 +141,8 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=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_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_package=1 @@ -196,6 +201,7 @@ 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 @@ -390,12 +396,24 @@ 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_at_beginning_of_method_body=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_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.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/BeastFarm.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/BeastFarm.java index 5e58f880a6..2b3f1537ff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/BeastFarm.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/BeastFarm.java @@ -257,17 +257,25 @@ public final class BeastFarm extends AbstractNpcAI switch (nextNpcId) { case 18869: + { name = name.replace("%name%", "Alpine Kookaburra"); break; + } case 18870: + { name = name.replace("%name%", "Alpine Cougar"); break; + } case 18871: + { name = name.replace("%name%", "Alpine Buffalo"); break; + } case 18872: + { name = name.replace("%name%", "Alpine Grendel"); break; + } } nextNpc.setName(name); nextNpc.broadcastPacket(new AbstractNpcInfo.NpcInfo(nextNpc, player)); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/DragonValley.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/DragonValley.java index 63b3d091ba..7bffff2d10 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/DragonValley.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/DragonValley.java @@ -256,14 +256,20 @@ public final class DragonValley extends AbstractNpcAI switch (moraleBoostLv) { case 1: + { MORALE_BOOST1.getSkill().applyEffects(member, member); break; + } case 2: + { MORALE_BOOST2.getSkill().applyEffects(member, member); break; + } case 3: + { MORALE_BOOST3.getSkill().applyEffects(member, member); break; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java index eb4edb8bb9..7f9045e186 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java @@ -120,21 +120,30 @@ public final class PlainsOfLizardman extends AbstractNpcAI switch (npc.getId()) { case TANTA_SUMMONER: + { if (!npc.isAffectedBySkill(DEMOTIVATION_HEX.getSkillId())) { npc.doCast(DEMOTIVATION_HEX.getSkill()); } break; + } case RAINBOW_FROG: + { castSkill(npc, attacker, RAINBOW_FROG_SKILL); break; + } case ENERGY_PLANT: + { castSkill(npc, attacker, ENERGY_PLANT_SKILL); break; + } case STICKY_MUSHROOM: + { castSkill(npc, attacker, STICKY_MUSHROOM_SKILL); break; + } case FANTASY_MUSHROOM: + { if (npc.isScriptValue(0)) { npc.setScriptValue(1); @@ -154,6 +163,7 @@ public final class PlainsOfLizardman extends AbstractNpcAI startQuestTimer("fantasy_mushroom", 4000, npc, attacker); } break; + } } return super.onAttack(npc, attacker, damage, isSummon); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SilentValley.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SilentValley.java index 89c03f7bca..a2ed7a538a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SilentValley.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SilentValley.java @@ -78,15 +78,21 @@ public final class SilentValley extends AbstractNpcAI switch (event) { case "CLEAR": + { npc.doDie(null); break; + } case "CLEAR_EVENT": + { npc.broadcastEvent("CLEAR_ALL_INSTANT", 2000, null); npc.doDie(null); break; + } case "SPAWN_CHEST": + { addSpawn(CHEST, npc.getX() - 100, npc.getY(), npc.getZ() - 100, 0, false, 0); break; + } } } return null; @@ -191,11 +197,15 @@ public final class SilentValley extends AbstractNpcAI switch (eventName) { case "CLEAR_ALL": + { startQuestTimer("CLEAR", 60000, receiver, null); break; + } case "CLEAR_ALL_INSTANT": + { receiver.doDie(null); break; + } } } return super.onEventReceived(eventName, sender, receiver, reference); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/StakatoNest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/StakatoNest.java index e23e129fa3..87490af7fb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/StakatoNest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/StakatoNest.java @@ -121,6 +121,7 @@ public final class StakatoNest extends AbstractNpcAI switch (npc.getId()) { case STAKATO_NURSE: + { monster = checkMinion(npc); if (monster != null) { @@ -132,14 +133,18 @@ public final class StakatoNest extends AbstractNpcAI } } break; + } case STAKATO_BABY: + { monster = ((L2MonsterInstance) npc).getLeader(); if ((monster != null) && !monster.isDead()) { startQuestTimer("nurse_change", 5000, monster, killer); } break; + } case STAKATO_MALE: + { monster = checkMinion(npc); if (monster != null) { @@ -151,14 +156,18 @@ public final class StakatoNest extends AbstractNpcAI } } break; + } case STAKATO_FEMALE: + { monster = ((L2MonsterInstance) npc).getLeader(); if ((monster != null) && !monster.isDead()) { startQuestTimer("male_change", 5000, monster, killer); } break; + } case STAKATO_CHIEF: + { if (killer.isInParty()) { final List party = killer.getParty().getMembers(); @@ -172,6 +181,7 @@ public final class StakatoNest extends AbstractNpcAI giveCocoon(killer, npc); } break; + } } return super.onKill(npc, killer, isSummon); } @@ -200,11 +210,15 @@ public final class StakatoNest extends AbstractNpcAI switch (event) { case "nurse_change": + { npcId = STAKATO_NURSE_2; break; + } case "male_change": + { npcId = STAKATO_MALE_2; break; + } } if (npcId > 0) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java index 1f10a1f860..6ab402d656 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java @@ -277,14 +277,20 @@ public class DrChaos extends AbstractNpcAI switch (chance) { case 0: + { message = "Bwah-ha-ha! Your doom is at hand! Behold the Ultra Secret Super Weapon!"; break; + } case 1: + { message = "Foolish, insignificant creatures! How dare you challenge me!"; break; + } default: + { message = "I see that none will challenge me now!"; break; + } } // Make him speak. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java index daa14d24e5..82762cfdb6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java @@ -201,20 +201,30 @@ public final class CastleChamberlain extends AbstractNpcAI switch (func) { case Castle.FUNC_RESTORE_EXP: + { fee = (level == 45) ? Config.CS_EXPREG1_FEE : Config.CS_EXPREG2_FEE; break; + } case Castle.FUNC_RESTORE_HP: + { fee = (level == 300) ? Config.CS_HPREG1_FEE : Config.CS_HPREG2_FEE; break; + } case Castle.FUNC_RESTORE_MP: + { fee = (level == 40) ? Config.CS_MPREG1_FEE : Config.CS_MPREG2_FEE; break; + } case Castle.FUNC_SUPPORT: + { fee = (level == 5) ? Config.CS_SUPPORT1_FEE : Config.CS_SUPPORT2_FEE; break; + } case Castle.FUNC_TELEPORT: + { fee = (level == 1) ? Config.CS_TELE1_FEE : Config.CS_TELE2_FEE; break; + } } return fee; } @@ -225,20 +235,30 @@ public final class CastleChamberlain extends AbstractNpcAI switch (func) { case Castle.FUNC_RESTORE_EXP: + { ratio = Config.CS_EXPREG_FEE_RATIO; break; + } case Castle.FUNC_RESTORE_HP: + { ratio = Config.CS_HPREG_FEE_RATIO; break; + } case Castle.FUNC_RESTORE_MP: + { ratio = Config.CS_MPREG_FEE_RATIO; break; + } case Castle.FUNC_SUPPORT: + { ratio = Config.CS_SUPPORT_FEE_RATIO; break; + } case Castle.FUNC_TELEPORT: + { ratio = Config.CS_TELE_FEE_RATIO; break; + } } return ratio; } @@ -253,14 +273,20 @@ public final class CastleChamberlain extends AbstractNpcAI switch (level) { case 2: + { price = Config.OUTER_DOOR_UPGRADE_PRICE2; break; + } case 3: + { price = Config.OUTER_DOOR_UPGRADE_PRICE3; break; + } case 5: + { price = Config.OUTER_DOOR_UPGRADE_PRICE5; break; + } } break; } @@ -269,14 +295,20 @@ public final class CastleChamberlain extends AbstractNpcAI switch (level) { case 2: + { price = Config.INNER_DOOR_UPGRADE_PRICE2; break; + } case 3: + { price = Config.INNER_DOOR_UPGRADE_PRICE3; break; + } case 5: + { price = Config.INNER_DOOR_UPGRADE_PRICE5; break; + } } break; } @@ -285,14 +317,20 @@ public final class CastleChamberlain extends AbstractNpcAI switch (level) { case 2: + { price = Config.WALL_UPGRADE_PRICE2; break; + } case 3: + { price = Config.WALL_UPGRADE_PRICE3; break; + } case 5: + { price = Config.WALL_UPGRADE_PRICE5; break; + } } break; } @@ -300,11 +338,15 @@ public final class CastleChamberlain extends AbstractNpcAI switch (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE)) { case SevenSigns.CABAL_DUSK: + { price *= 3; break; + } case SevenSigns.CABAL_DAWN: + { price *= 0.8; break; + } } return price; } @@ -315,14 +357,20 @@ public final class CastleChamberlain extends AbstractNpcAI switch (SevenSigns.getInstance().getSealOwner(seal)) { case SevenSigns.CABAL_DAWN: + { npcString = "1000511"; break; + } case SevenSigns.CABAL_DUSK: + { npcString = "1000510"; break; + } default: + { npcString = "1000512"; break; + } } return npcString; } @@ -333,14 +381,20 @@ public final class CastleChamberlain extends AbstractNpcAI switch (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE)) { case SevenSigns.CABAL_DAWN: + { taxLimit = 25; break; + } case SevenSigns.CABAL_DUSK: + { taxLimit = 5; break; + } default: + { taxLimit = 15; break; + } } return taxLimit; } @@ -351,27 +405,39 @@ public final class CastleChamberlain extends AbstractNpcAI switch (level) { case 1: + { price = Config.TRAP_UPGRADE_PRICE1; break; + } case 2: + { price = Config.TRAP_UPGRADE_PRICE2; break; + } case 3: + { price = Config.TRAP_UPGRADE_PRICE3; break; + } case 4: + { price = Config.TRAP_UPGRADE_PRICE4; break; + } } switch (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE)) { case SevenSigns.CABAL_DUSK: + { price *= 3; break; + } case SevenSigns.CABAL_DAWN: + { price *= 0.8; break; + } } return price; } @@ -428,14 +494,20 @@ public final class CastleChamberlain extends AbstractNpcAI switch (fortress.getFortState()) { case 1: + { fortStatus = "1300122"; break; + } case 2: + { fortStatus = "1300124"; break; + } default: + { fortStatus = "1300123"; break; + } } sb.append("1300" + fortId + ""); sb.append(" (" + fortType + ")"); @@ -540,7 +612,6 @@ public final class CastleChamberlain extends AbstractNpcAI { doors[i] = Integer.parseInt(st.nextToken()); } - final L2DoorInstance door = castle.getDoor(doors[0]); if (door != null) { @@ -634,7 +705,6 @@ public final class CastleChamberlain extends AbstractNpcAI final int level = Integer.parseInt(st.nextToken()); final int price = getTrapUpgradePrice(level); final int currentLevel = castle.getTrapUpgradeLevel(trapIndex); - if (currentLevel >= level) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "chamberlain-19.html"); @@ -674,19 +744,24 @@ public final class CastleChamberlain extends AbstractNpcAI html.replace("%clanleadername%", clan.getLeaderName()); html.replace("%clanname%", clan.getName()); html.replace("%castlename%", String.valueOf(1001000 + castle.getResidenceId())); - switch (SevenSigns.getInstance().getCurrentPeriod()) { case SevenSigns.PERIOD_COMP_RECRUITING: + { html.replace("%ss_event%", "1000509"); break; + } case SevenSigns.PERIOD_COMPETITION: + { html.replace("%ss_event%", "1000507"); break; + } case SevenSigns.PERIOD_SEAL_VALIDATION: case SevenSigns.PERIOD_COMP_RESULTS: + { html.replace("%ss_event%", "1000508"); break; + } } html.replace("%ss_avarice%", getSealOwner(1)); html.replace("%ss_gnosis%", getSealOwner(2)); @@ -779,7 +854,6 @@ public final class CastleChamberlain extends AbstractNpcAI } } } - final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); html.replace("%tax_income_reserved%", "0"); // TODO: Implement me! @@ -1119,7 +1193,6 @@ public final class CastleChamberlain extends AbstractNpcAI { html = getHtmlPacket(player, npc, "castlenotenoughmp.html"); } - html.replace("%MPLeft%", Integer.toString((int) npc.getCurrentMp())); player.sendPacket(html); } @@ -1334,15 +1407,22 @@ public final class CastleChamberlain extends AbstractNpcAI switch (evt.getRequest()) { case 3: // Seed info + { player.sendPacket(new ExShowSeedInfo(castleId, evt.isNextPeriod(), true)); break; + } case 4: // Crop info + { player.sendPacket(new ExShowCropInfo(castleId, evt.isNextPeriod(), true)); break; + } case 5: // Basic info + { player.sendPacket(new ExShowManorDefaultInfo(true)); break; + } case 7: // Seed settings + { if (manor.isManorApproved()) { player.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_4_30_AM_AND_8_PM); @@ -1350,7 +1430,9 @@ public final class CastleChamberlain extends AbstractNpcAI } player.sendPacket(new ExShowSeedSetting(castleId)); break; + } case 8: // Crop settings + { if (manor.isManorApproved()) { player.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_4_30_AM_AND_8_PM); @@ -1358,8 +1440,11 @@ public final class CastleChamberlain extends AbstractNpcAI } player.sendPacket(new ExShowCropSetting(castleId)); break; + } default: + { _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java index 06101e7424..ef1dc9b85a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java @@ -126,13 +126,19 @@ public final class CastleMercenaryManager extends AbstractNpcAI switch (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE)) { case SevenSigns.CABAL_DUSK: + { htmltext = "mercmanager-dusk.html"; break; + } case SevenSigns.CABAL_DAWN: + { htmltext = "mercmanager-dawn.html"; break; + } default: + { htmltext = "mercmanager.html"; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java index 43ac77ef1c..08dd6e2608 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java @@ -41,18 +41,23 @@ public final class Rafforty extends AbstractNpcAI switch (event) { case "32020-01.html": + { if (!hasQuestItems(player, NECKLACE)) { htmltext = "32020-02.html"; } break; + } case "32020-04.html": + { if (!hasQuestItems(player, BOTTLE)) { htmltext = "32020-05.html"; } break; + } case "32020-07.html": + { if (!hasQuestItems(player, BOTTLE, NECKLACE)) { return "32020-08.html"; @@ -61,6 +66,7 @@ public final class Rafforty extends AbstractNpcAI takeItems(player, BOTTLE, 1); giveItems(player, BLESSED_NECKLACE, 1); break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index 96d4582ddb..5a50ca67d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -357,9 +357,11 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine switch (npc.getId()) { case MESSENGER: + { switch (event) { case "register": + { if (!player.isClanLeader()) { html = "messenger_yetti010.htm"; @@ -397,7 +399,9 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine } } break; + } case "cancel": + { if (!player.isClanLeader()) { html = "messenger_yetti010.htm"; @@ -416,7 +420,9 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine html = "messenger_yetti018.htm"; } break; + } case "unregister": + { if (_rainbow.isRegistering()) { if (_warDecreesCount.containsKey(clan.getId())) @@ -436,9 +442,12 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine html = "messenger_yetti020.htm"; } break; + } } break; + } case CARETAKER: + { if (event.equals("portToArena")) { final L2Party party = player.getParty(); @@ -470,7 +479,6 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine break; } } - if (nonClanMemberInParty) { html = "game_manager007.htm"; @@ -510,6 +518,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine } } break; + } } if (event.startsWith("enterText")) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java index efc36ea871..0e568f5ce1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java @@ -98,20 +98,30 @@ public final class BanditStronghold extends FlagWar switch (flag) { case 35423: + { result = "messenger_flag1.htm"; break; + } case 35424: + { result = "messenger_flag2.htm"; break; + } case 35425: + { result = "messenger_flag3.htm"; break; + } case 35426: + { result = "messenger_flag4.htm"; break; + } case 35427: + { result = "messenger_flag5.htm"; break; + } } return result; @@ -125,20 +135,30 @@ public final class BanditStronghold extends FlagWar switch (ally) { case 35428: + { result = "messenger_ally1result.htm"; break; + } case 35429: + { result = "messenger_ally2result.htm"; break; + } case 35430: + { result = "messenger_ally3result.htm"; break; + } case 35431: + { result = "messenger_ally4result.htm"; break; + } case 35432: + { result = "messenger_ally5result.htm"; break; + } } return result; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java index 830df416f6..c811620c22 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java @@ -98,20 +98,30 @@ public final class WildBeastReserve extends FlagWar switch (flag) { case 35607: + { result = "messenger_flag1.htm"; break; + } case 35608: + { result = "messenger_flag2.htm"; break; + } case 35609: + { result = "messenger_flag3.htm"; break; + } case 35610: + { result = "messenger_flag4.htm"; break; + } case 35611: + { result = "messenger_flag5.htm"; break; + } } return result; @@ -125,20 +135,30 @@ public final class WildBeastReserve extends FlagWar switch (ally) { case 35618: + { result = "messenger_ally1result.htm"; break; + } case 35619: + { result = "messenger_ally2result.htm"; break; + } case 35620: + { result = "messenger_ally3result.htm"; break; + } case 35621: + { result = "messenger_ally4result.htm"; break; + } case 35622: + { result = "messenger_ally5result.htm"; break; + } } return result; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java index 65dcd18fcf..3666d8edd7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java @@ -633,34 +633,52 @@ public class NpcBuffer extends Quest switch (buffType) { case "buff": + { price = BUFF_PRICE; break; + } case "resist": + { price = RESIST_PRICE; break; + } case "song": + { price = SONG_PRICE; break; + } case "dance": + { price = DANCE_PRICE; break; + } case "chant": + { price = CHANT_PRICE; break; + } case "others": + { price = OTHERS_PRICE; break; + } case "special": + { price = SPECIAL_PRICE; break; + } case "cubic": + { price = CUBIC_PRICE; break; + } default: + { if (DEBUG) { throw new RuntimeException(); } + } } HTML_MESSAGE += "All special buffs cost " + formatAdena(price) + " adena!"; } @@ -1196,6 +1214,7 @@ public class NpcBuffer extends Quest switch (eventParam0) { case "reloadscript": + { if (eventParam1.equals("1")) { return reloadConfig(st); @@ -1208,38 +1227,62 @@ public class NpcBuffer extends Quest { throw new RuntimeException(); } - + } case "redirect": + { switch (eventParam1) { case "main": + { return rebuildMainHtml(st); + } case "manage_buffs": + { return viewAllBuffTypes(); + } case "view_buffs": + { return buildHtml("buff"); + } case "view_resists": + { return buildHtml("resist"); + } case "view_songs": + { return buildHtml("song"); + } case "view_dances": + { return buildHtml("dance"); + } case "view_chants": + { return buildHtml("chant"); + } case "view_others": + { return buildHtml("others"); + } case "view_special": + { return buildHtml("special"); + } case "view_cubic": + { return buildHtml("cubic"); + } default: + { if (DEBUG) { throw new RuntimeException(); } + } } - + } case "buffpet": + { if ((int) (System.currentTimeMillis() / 1000) > st.getInt("blockUntilTime")) { st.set("Pet-On-Off", eventParam1); @@ -1249,7 +1292,7 @@ public class NpcBuffer extends Quest } } return rebuildMainHtml(st); - + } case "create": { final String param = eventParam1.replaceAll("[ !\"#$%&'()*+,/:;<=>?@\\[\\\\\\]\\^`{|}~]", ""); @@ -1274,6 +1317,7 @@ public class NpcBuffer extends Quest } case "delete": + { try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("DELETE FROM npcbuffer_scheme_list WHERE id=? LIMIT 1"); @@ -1290,23 +1334,35 @@ public class NpcBuffer extends Quest print(e); } return rebuildMainHtml(st); - + } case "delete_c": + { return "" + TITLE_NAME + "

Do you really want to delete '" + eventParam2 + "' scheme?

"; - + } case "create_1": + { return createScheme(); + } case "edit_1": + { return editScheme(player); + } case "delete_1": + { return deleteScheme(player); + } case "manage_scheme_1": + { return viewAllSchemeBuffs(eventParam1, eventParam2, "add"); + } case "manage_scheme_2": + { return viewAllSchemeBuffs(eventParam1, eventParam2, "remove"); + } case "manage_scheme_select": + { return getOptionList(eventParam1); - + } case "remove_buff": { final String[] split = eventParam1.split("_"); @@ -1374,9 +1430,11 @@ public class NpcBuffer extends Quest } case "edit_buff_list": + { return viewAllBuffs(eventParam1, eventParam2, eventParam3); - + } case "changeBuffSet": + { if (eventParam2.equals(SET_FIGHTER)) { eventParam2 = "0"; @@ -1398,7 +1456,7 @@ public class NpcBuffer extends Quest throw new RuntimeException(); } return manageSelectedSet(eventParam1, eventParam2, eventParam3); - + } case "editSelectedBuff": { eventParam2 = eventParam2.replace("-", " "); @@ -1410,49 +1468,69 @@ public class NpcBuffer extends Quest switch (eventParam3) { case "buff": + { typeName = "Buffs"; break; + } case "resist": + { typeName = "Resists"; break; + } case "song": + { typeName = "Songs"; break; + } case "dance": + { typeName = "Dances"; break; + } case "chant": + { typeName = "Chants"; break; + } case "others": + { typeName = "Others_Buffs"; break; + } case "special": + { typeName = "Special_Buffs"; break; + } case "cubic": + { typeName = "Cubics"; break; + } default: + { throw new RuntimeException(); + } } return viewAllBuffs(eventParam3, typeName, page); } case "viewSelectedConfig": + { throw new RuntimeException(); - + } case "changeConfig": + { throw new RuntimeException(); - + } case "heal": + { if ((int) (System.currentTimeMillis() / 1000) > st.getInt("blockUntilTime")) { if (player.isInCombat() && !ENABLE_HEAL_IN_COMBAT) { return showText(st, "Info", "You can't use the heal function while in combat.", false, "Return", "main"); } - if (getQuestItemsCount(player, CONSUMABLE_ID) < HEAL_PRICE) { return showText(st, "Sorry", "You don't have the enough items:
You need: " + HEAL_PRICE + " " + getItemNameHtml(st, CONSUMABLE_ID) + "!", false, "0", "0"); @@ -1480,8 +1558,9 @@ public class NpcBuffer extends Quest } } return SMART_WINDOW ? null : rebuildMainHtml(st); - + } case "removeBuffs": + { if ((int) (System.currentTimeMillis() / 1000) > st.getInt("blockUntilTime")) { if (getQuestItemsCount(player, CONSUMABLE_ID) < BUFF_REMOVE_PRICE) @@ -1519,8 +1598,9 @@ public class NpcBuffer extends Quest } } return SMART_WINDOW ? null : rebuildMainHtml(st); - + } case "cast": + { if ((int) (System.currentTimeMillis() / 1000) > st.getInt("blockUntilTime")) { final List buffs = new ArrayList<>(); @@ -1537,6 +1617,7 @@ public class NpcBuffer extends Quest switch (getBuffType(id)) { case "buff": + { if (ENABLE_BUFFS) { if (isEnabled(id, level)) @@ -1546,7 +1627,9 @@ public class NpcBuffer extends Quest } } break; + } case "resist": + { if (ENABLE_RESIST) { if (isEnabled(id, level)) @@ -1556,7 +1639,9 @@ public class NpcBuffer extends Quest } } break; + } case "song": + { if (ENABLE_SONGS) { if (isEnabled(id, level)) @@ -1566,7 +1651,9 @@ public class NpcBuffer extends Quest } } break; + } case "dance": + { if (ENABLE_DANCES) { if (isEnabled(id, level)) @@ -1576,7 +1663,9 @@ public class NpcBuffer extends Quest } } break; + } case "chant": + { if (ENABLE_CHANTS) { if (isEnabled(id, level)) @@ -1586,7 +1675,9 @@ public class NpcBuffer extends Quest } } break; + } case "others": + { if (ENABLE_OTHERS) { if (isEnabled(id, level)) @@ -1596,7 +1687,9 @@ public class NpcBuffer extends Quest } } break; + } case "special": + { if (ENABLE_SPECIAL) { if (isEnabled(id, level)) @@ -1606,11 +1699,14 @@ public class NpcBuffer extends Quest } } break; + } default: + { if (DEBUG) { throw new RuntimeException(); } + } } } statement.close(); @@ -1677,38 +1773,56 @@ public class NpcBuffer extends Quest } } return SMART_WINDOW ? null : rebuildMainHtml(st); - + } case "giveBuffs": { final int cost; switch (eventParam3) { case "buff": + { cost = BUFF_PRICE; break; + } case "resist": + { cost = RESIST_PRICE; break; + } case "song": + { cost = SONG_PRICE; break; + } case "dance": + { cost = DANCE_PRICE; break; + } case "chant": + { cost = CHANT_PRICE; break; + } case "others": + { cost = OTHERS_PRICE; break; + } case "special": + { cost = SPECIAL_PRICE; break; + } case "cubic": + { cost = CUBIC_PRICE; break; + } default: + { throw new RuntimeException(); + } } if ((int) (System.currentTimeMillis() / 1000) > st.getInt("blockUntilTime")) @@ -1786,8 +1900,8 @@ public class NpcBuffer extends Quest } return SMART_WINDOW ? null : buildHtml(eventParam3); } - case "castBuffSet": + { if ((int) (System.currentTimeMillis() / 1000) > st.getInt("blockUntilTime")) { if (!FREE_BUFFS) @@ -1833,7 +1947,6 @@ public class NpcBuffer extends Quest { print(e); } - player.setTarget(player); player.broadcastPacket(new MagicSkillUse(player, SKILL_BUFF_1, 1, 1000, 0)); player.broadcastPacket(new MagicSkillUse(player, SKILL_BUFF_2, 1, 1000, 0)); @@ -1869,7 +1982,6 @@ public class NpcBuffer extends Quest { print(e); } - player.getSummon().setTarget(player.getSummon()); player.getSummon().broadcastPacket(new MagicSkillUse(player.getSummon(), SKILL_BUFF_1, 1, 1000, 0)); player.getSummon().broadcastPacket(new MagicSkillUse(player.getSummon(), SKILL_BUFF_2, 1, 1000, 0)); @@ -1890,7 +2002,7 @@ public class NpcBuffer extends Quest } } return SMART_WINDOW ? null : rebuildMainHtml(st); - + } } return rebuildMainHtml(st); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/EnergySeeds.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/EnergySeeds.java index fd3b3fc789..1eb7cc7c6b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/EnergySeeds.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/EnergySeeds.java @@ -292,13 +292,19 @@ public class EnergySeeds extends AbstractNpcAI switch (seed) { case INFINITY: + { return false; + } case DESTRUCTION: + { return SoDManager.getInstance().getSoDState() == 2; + } case ANNIHILATION_BISTAKON: case ANNIHILATION_REPTILIKON: case ANNIHILATION_COKRAKON: + { return true; + } } return true; } @@ -325,25 +331,39 @@ public class EnergySeeds extends AbstractNpcAI switch (npc.getId()) { case 18678: // Water + { itemId = 14016; break; + } case 18679: // Fire + { itemId = 14015; break; + } case 18680: // Wind + { itemId = 14017; break; + } case 18681: // Earth + { itemId = 14018; break; + } case 18682: // Divinity + { itemId = 14020; break; + } case 18683: // Darkness + { itemId = 14019; break; + } default: + { return super.onSkillSee(npc, caster, skill, targets, isSummon); + } } if (getRandom(100) < 33) { @@ -445,17 +465,21 @@ public class EnergySeeds extends AbstractNpcAI switch (zone.getId()) { case SOD_ZONE: + { if (!isSeedActive(GraciaSeeds.DESTRUCTION) && !character.isGM()) { character.teleToLocation(SOD_EXIT_POINT); } break; + } case SOI_ZONE: + { if ((SoIManager.getCurrentStage() != 3) && !SoIManager.isSeedOpen()) { character.teleToLocation(SOI_EXIT_POINT); } break; + } } } return super.onEnterZone(character, zone); @@ -506,18 +530,23 @@ public class EnergySeeds extends AbstractNpcAI switch (seedType) { case INFINITY: + { if ((st != null) && st.isCond(3)) { handleQuestDrop(player, 13798); } break; + } case DESTRUCTION: + { if ((st != null) && st.isCond(3)) { handleQuestDrop(player, 13867); } break; + } case ANNIHILATION_BISTAKON: + { if ((st != null) && st.isCond(3)) { handleQuestDrop(player, 15535); @@ -530,7 +559,9 @@ public class EnergySeeds extends AbstractNpcAI mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } break; + } case ANNIHILATION_REPTILIKON: + { if ((st != null) && st.isCond(3)) { handleQuestDrop(player, 15535); @@ -543,7 +574,9 @@ public class EnergySeeds extends AbstractNpcAI mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } break; + } case ANNIHILATION_COKRAKON: + { if ((st != null) && st.isCond(3)) { handleQuestDrop(player, 15535); @@ -556,6 +589,7 @@ public class EnergySeeds extends AbstractNpcAI mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Lindvior.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Lindvior.java index 326b0c8e92..b8ab2c92d7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Lindvior.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Lindvior.java @@ -63,15 +63,22 @@ public class Lindvior extends AbstractNpcAI switch (event) { case "tomaris_shout1": + { npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.HUH_THE_SKY_LOOKS_FUNNY_WHAT_S_THAT); break; + } case "artius_shout": + { npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.A_POWERFUL_SUBORDINATE_IS_BEING_HELD_BY_THE_BARRIER_ORB_THIS_REACTION_MEANS); break; + } case "tomaris_shout2": + { npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.BE_CAREFUL_SOMETHING_S_COMING); break; + } case "lindvior_scene": + { if (npc != null) { for (L2PcInstance pl : npc.getKnownList().getKnownPlayersInRadius(4000)) @@ -83,17 +90,19 @@ public class Lindvior extends AbstractNpcAI } } break; + } case "start": + { _lindviorCamera = SpawnTable.getInstance().findAny(LINDVIOR_CAMERA).getLastSpawn(); _tomaris = SpawnTable.getInstance().findAny(TOMARIS).getLastSpawn(); _artius = SpawnTable.getInstance().findAny(ARTIUS).getLastSpawn(); - startQuestTimer("tomaris_shout1", 1000, _tomaris, null); startQuestTimer("artius_shout", 60000, _artius, null); startQuestTimer("tomaris_shout2", 90000, _tomaris, null); startQuestTimer("lindvior_scene", 120000, _lindviorCamera, null); scheduleNextLindviorVisit(); break; + } } return super.onAdvEvent(event, npc, player); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Maguen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Maguen.java index 6e68fab2ca..ce5f464e7d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Maguen.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Maguen.java @@ -219,14 +219,20 @@ public final class Maguen extends AbstractNpcAI switch (getRandom(3)) { case 0: + { skillToCast = (getRandom(100) < 70) ? B_BUFF_1 : B_BUFF_2; break; + } case 1: + { skillToCast = (getRandom(100) < 70) ? C_BUFF_1 : C_BUFF_2; break; + } case 2: + { skillToCast = (getRandom(100) < 70) ? R_BUFF_1 : R_BUFF_2; break; + } } if (skillToCast != null) @@ -285,14 +291,20 @@ public final class Maguen extends AbstractNpcAI switch (i1) { case 0: + { skillToCast = B_PLASMA1; break; + } case 1: + { skillToCast = B_PLASMA2; break; + } case 2: + { skillToCast = B_PLASMA3; break; + } } break; } @@ -301,14 +313,20 @@ public final class Maguen extends AbstractNpcAI switch (i2) { case 0: + { skillToCast = C_PLASMA1; break; + } case 1: + { skillToCast = C_PLASMA2; break; + } case 2: + { skillToCast = C_PLASMA3; break; + } } break; } @@ -317,14 +335,20 @@ public final class Maguen extends AbstractNpcAI switch (i3) { case 0: + { skillToCast = R_PLASMA1; break; + } case 1: + { skillToCast = R_PLASMA2; break; + } case 2: + { skillToCast = R_PLASMA3; break; + } } break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/StarStones.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/StarStones.java index 962a3c6453..d8157a645e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/StarStones.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/StarStones.java @@ -57,24 +57,32 @@ public class StarStones extends AbstractNpcAI case 18684: case 18685: case 18686: + { // give Red item itemId = 14009; break; + } case 18687: case 18688: case 18689: + { // give Blue item itemId = 14010; break; + } case 18690: case 18691: case 18692: + { // give Green item itemId = 14011; break; + } default: + { // unknown npc! return super.onSkillSee(npc, caster, skill, targets, isSummon); + } } if (getRandom(100) < 33) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java index d25b48d33d..73e9425603 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java @@ -319,15 +319,25 @@ public class HallOfSufferingAttack extends AbstractNpcAI switch (room) { case 0: + { return ROOM_1_MOBS; + } case 1: + { return ROOM_2_MOBS; + } case 2: + { return ROOM_3_MOBS; + } case 3: + { return ROOM_4_MOBS; + } case 4: + { return ROOM_5_MOBS; + } } return new int[][] {}; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java index dceec4436c..6842b6fcce 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java @@ -319,15 +319,25 @@ public class HallOfSufferingDefence extends AbstractNpcAI switch (room) { case 0: + { return ROOM_1_MOBS; + } case 1: + { return ROOM_2_MOBS; + } case 2: + { return ROOM_3_MOBS; + } case 3: + { return ROOM_4_MOBS; + } case 4: + { return ROOM_5_MOBS; + } } return new int[][] {}; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java index c04f29beb2..d4a688d536 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java @@ -777,40 +777,54 @@ public class HeartInfinityAttack extends Quest switch (world.tumorCount) { case 6: + { a[0] = 2; a[1] = 1; a[2] = 4; break; + } case 5: + { a[0] = 1.9; a[1] = 0.9; a[2] = 3.5; break; + } case 4: + { a[0] = 1.5; a[1] = 0.6; a[2] = 3.0; break; + } case 3: + { a[0] = 1.0; a[1] = 0.4; a[2] = 2.5; break; + } case 2: + { a[0] = 0.7; a[1] = 0.3; a[2] = 2.0; break; + } case 1: + { a[0] = 0.3; a[1] = 0.15; a[2] = 1.0; break; + } case 0: + { a[0] = 0.12; a[1] = 0.06; a[2] = 0.25; break; + } } return a; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java index 8ea45f9d15..8efe2e43c4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java @@ -1046,13 +1046,16 @@ public class SeedOfDestruction extends AbstractNpcAI switch (world.getStatus()) { case 0: + { spawn(world, ENTRANCE_GROUND_SPAWNS_1, true, false); spawn(world, ENTRANCE_GROUND_SPAWNS_2, false, false); spawn(world, ENTRANCE_UPPER_SPAWNS, false, true); closeDoor(SCOUTPASS_DOOR, world.getInstanceId()); closeDoor(THRONE_DOOR, world.getInstanceId()); break; + } case 1: + { final ExShowScreenMessage message1 = new ExShowScreenMessage(NpcStringId.THE_ENEMIES_HAVE_ATTACKED_EVERYONE_COME_OUT_AND_FIGHT_URGH, 5, 5000); sendScreenMessage(world, message1); for (int i : ENTRANCE_ROOM_DOORS) @@ -1062,11 +1065,15 @@ public class SeedOfDestruction extends AbstractNpcAI spawn(world, SQUARE_SPAWNS_STATIC, false, true); spawn(world, SQUARE_SPAWNS_MAIN, true, false); break; + } case 2: case 3: + { // handled elsewhere return; + } case 4: + { final ExShowScreenMessage message2 = new ExShowScreenMessage(NpcStringId.OBELISK_HAS_COLLAPSED_DON_T_LET_THE_ENEMIES_JUMP_AROUND_WILDLY_ANYMORE, 5, 5000); sendScreenMessage(world, message2); for (int i : SQUARE_DOORS) @@ -1077,7 +1084,9 @@ public class SeedOfDestruction extends AbstractNpcAI spawn(world, CORRIDOR_SPAWNS_GROUND, false, false); world.killedDevice = 0; break; + } case 5: + { openDoor(SCOUTPASS_DOOR, world.getInstanceId()); spawn(world, SQUARE_SPAWNS_HALF, false, false); spawn(world, SCOUTPASS_SPAWNS_UPPER, false, true); @@ -1089,19 +1098,28 @@ public class SeedOfDestruction extends AbstractNpcAI spawn(world, FORT_SPAWNS_GROUND, false, false); world.killedDevice = 0; break; + } case 6: + { runThrone(world); openDoor(THRONE_DOOR, world.getInstanceId()); spawn(world, FORT_PORTALS, false, true); break; + } case 7: + { // handled elsewhere return; + } case 8: + { break; + } case 9: + { // instance end break; + } } world.incStatus(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java index 59bd0bec81..8d170bda31 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java @@ -245,43 +245,59 @@ public final class AirShipGludioGracia extends Quest implements Runnable switch (_cycle) { case 0: + { broadcastInGludio(NpcStringId.THE_REGULARLY_SCHEDULED_AIRSHIP_THAT_FLIES_TO_THE_GRACIA_CONTINENT_HAS_DEPARTED); _ship.setInDock(0); _ship.executePath(GLUDIO_TO_WARPGATE); break; + } case 1: + { // _ship.teleToLocation(-167874, 256731, -509, 41035, false); _ship.setOustLoc(OUST_GRACIA); ThreadPoolManager.schedule(this, 5000); break; + } case 2: + { _ship.executePath(WARPGATE_TO_GRACIA); break; + } case 3: + { broadcastInGracia(NpcStringId.THE_REGULARLY_SCHEDULED_AIRSHIP_HAS_ARRIVED_IT_WILL_DEPART_FOR_THE_ADEN_CONTINENT_IN_1_MINUTE); _ship.setInDock(GRACIA_DOCK_ID); _ship.oustPlayers(); ThreadPoolManager.schedule(this, 60000); break; + } case 4: + { broadcastInGracia(NpcStringId.THE_REGULARLY_SCHEDULED_AIRSHIP_THAT_FLIES_TO_THE_ADEN_CONTINENT_HAS_DEPARTED); _ship.setInDock(0); _ship.executePath(GRACIA_TO_WARPGATE); break; + } case 5: + { // _ship.teleToLocation(-157261, 255664, 221, 64781, false); _ship.setOustLoc(OUST_GLUDIO); ThreadPoolManager.schedule(this, 5000); break; + } case 6: + { _ship.executePath(WARPGATE_TO_GLUDIO); break; + } case 7: + { broadcastInGludio(NpcStringId.THE_REGULARLY_SCHEDULED_AIRSHIP_HAS_ARRIVED_IT_WILL_DEPART_FOR_THE_GRACIA_CONTINENT_IN_1_MINUTE); _ship.setInDock(GLUDIO_DOCK_ID); _ship.oustPlayers(); ThreadPoolManager.schedule(this, 60000); break; + } } _cycle++; if (_cycle > 7) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java index 4376640637..da81f8b100 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java @@ -305,14 +305,20 @@ public final class AdminCHSiege implements IAdminCommandHandler switch (hall.getSiegeStatus()) { case REGISTERING: + { siegable.prepareOwner(); break; + } case WAITING_BATTLE: + { siegable.startSiege(); break; + } case RUNNING: + { siegable.endSiege(); break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java index 99e2cc52c7..64e9f13a03 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java @@ -192,26 +192,40 @@ public class AdminLogin implements IAdminCommandHandler switch (currentType) { case 0x01: + { nameType += "Normal"; break; + } case 0x02: + { nameType += "Relax"; break; + } case 0x04: + { nameType += "Test"; break; + } case 0x08: + { nameType += "NoLabel"; break; + } case 0x10: + { nameType += "Restricted"; break; + } case 0x20: + { nameType += "Event"; break; + } case 0x40: + { nameType += "Free"; break; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java index 8d9e9cea1b..83237dfc5f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java @@ -132,34 +132,50 @@ public final class AdminPForge implements IAdminCommandHandler case 'B': case 'x': case 'X': + { // array break; + } case 'c': case 'C': + { // byte break; + } case 'h': case 'H': + { // word break; + } case 'd': case 'D': + { // dword break; + } case 'q': case 'Q': + { // qword break; + } case 'f': case 'F': + { // double break; + } case 's': case 'S': + { // string break; + } default: + { return false; + } } } @@ -173,7 +189,9 @@ public final class AdminPForge implements IAdminCommandHandler case "sc": case "sb": case "cs": + { return true; + } } return false; @@ -405,9 +423,12 @@ public final class AdminPForge implements IAdminCommandHandler switch (value) { case "$oid": + { value = String.valueOf(activeChar.getObjectId()); break; + } case "$boid": + { boat = activeChar.getBoat(); if (boat != null) { @@ -418,28 +439,44 @@ public final class AdminPForge implements IAdminCommandHandler value = "0"; } break; + } case "$title": + { value = activeChar.getTitle(); break; + } case "$name": + { value = activeChar.getName(); break; + } case "$x": + { value = String.valueOf(activeChar.getX()); break; + } case "$y": + { value = String.valueOf(activeChar.getY()); break; + } case "$z": + { value = String.valueOf(activeChar.getZ()); break; + } case "$heading": + { value = String.valueOf(activeChar.getHeading()); break; + } case "$toid": + { value = String.valueOf(activeChar.getTargetId()); break; + } case "$tboid": + { target = activeChar.getTarget(); if ((target != null) && (target instanceof L2Playable)) { @@ -454,7 +491,9 @@ public final class AdminPForge implements IAdminCommandHandler } } break; + } case "$ttitle": + { target = activeChar.getTarget(); if ((target != null) && (target instanceof L2Character)) { @@ -465,7 +504,9 @@ public final class AdminPForge implements IAdminCommandHandler value = ""; } break; + } case "$tname": + { target = activeChar.getTarget(); if (target != null) { @@ -476,7 +517,9 @@ public final class AdminPForge implements IAdminCommandHandler value = ""; } break; + } case "$tx": + { target = activeChar.getTarget(); if (target != null) { @@ -487,7 +530,9 @@ public final class AdminPForge implements IAdminCommandHandler value = "0"; } break; + } case "$ty": + { target = activeChar.getTarget(); if (target != null) { @@ -498,7 +543,9 @@ public final class AdminPForge implements IAdminCommandHandler value = "0"; } break; + } case "$tz": + { target = activeChar.getTarget(); if (target != null) { @@ -509,7 +556,9 @@ public final class AdminPForge implements IAdminCommandHandler value = "0"; } break; + } case "$theading": + { target = activeChar.getTarget(); if (target != null) { @@ -520,6 +569,7 @@ public final class AdminPForge implements IAdminCommandHandler value = "0"; } break; + } } if (method.equals("sc") || method.equals("sb")) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java index aa9cf50e09..6e9e094a3e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java @@ -94,25 +94,23 @@ public class AdminSiege implements IAdminCommandHandler switch (command) { case "admin_clanhallset": + { if ((player == null) || (player.getClan() == null)) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return false; } - if (clanhall.getOwnerId() > 0) { activeChar.sendMessage("This Clan Hall is not free!"); return false; } - clan = player.getClan(); if (clan.getHideoutId() > 0) { activeChar.sendMessage("You have already a Clan Hall!"); return false; } - if (!clanhall.isSiegableHall()) { ClanHallManager.getInstance().setOwner(clanhall.getId(), clan); @@ -127,8 +125,9 @@ public class AdminSiege implements IAdminCommandHandler clan.setHideoutId(clanhall.getId()); } break; + } case "admin_clanhalldel": - + { if (!clanhall.isSiegableHall()) { if (!ClanHallManager.getInstance().isFree(clanhall.getId())) @@ -156,20 +155,28 @@ public class AdminSiege implements IAdminCommandHandler } } break; + } case "admin_clanhallopendoors": + { clanhall.openCloseDoors(true); break; + } case "admin_clanhallclosedoors": + { clanhall.openCloseDoors(false); break; + } case "admin_clanhallteleportself": + { final L2ClanHallZone zone = clanhall.getZone(); if (zone != null) { activeChar.teleToLocation(zone.getSpawnLoc(), true); } break; + } default: + { if (!clanhall.isSiegableHall()) { showClanHallPage(activeChar, clanhall); @@ -179,6 +186,7 @@ public class AdminSiege implements IAdminCommandHandler showSiegableHallPage(activeChar, (SiegableHall) clanhall); } break; + } } } } @@ -188,6 +196,7 @@ public class AdminSiege implements IAdminCommandHandler switch (command) { case "admin_add_attacker": + { if (player == null) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); @@ -197,7 +206,9 @@ public class AdminSiege implements IAdminCommandHandler castle.getSiege().registerAttacker(player, true); } break; + } case "admin_add_defender": + { if (player == null) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); @@ -207,7 +218,9 @@ public class AdminSiege implements IAdminCommandHandler castle.getSiege().registerDefender(player, true); } break; + } case "admin_add_guard": + { if (st.hasMoreTokens()) { val = st.nextToken(); @@ -220,19 +233,29 @@ public class AdminSiege implements IAdminCommandHandler // If doesn't have more tokens or token is not a number. activeChar.sendMessage("Usage: //add_guard castle npcId"); break; + } case "admin_clear_siege_list": + { castle.getSiege().clearSiegeClan(); break; + } case "admin_endsiege": + { castle.getSiege().endSiege(); break; + } case "admin_list_siege_clans": + { castle.getSiege().listRegisterClan(activeChar); break; + } case "admin_move_defenders": + { activeChar.sendMessage("Not implemented yet."); break; + } case "admin_setcastle": + { if ((player == null) || (player.getClan() == null)) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); @@ -242,7 +265,9 @@ public class AdminSiege implements IAdminCommandHandler castle.setOwner(player.getClan()); } break; + } case "admin_removecastle": + { final L2Clan clan = ClanTable.getInstance().getClan(castle.getOwnerId()); if (clan != null) { @@ -253,14 +278,14 @@ public class AdminSiege implements IAdminCommandHandler activeChar.sendMessage("Unable to remove castle."); } break; + } case "admin_setsiegetime": + { if (st.hasMoreTokens()) { final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(castle.getSiegeDate().getTimeInMillis()); - val = st.nextToken(); - if ("month".equals(val)) { final int month = cal.get(Calendar.MONTH) + Integer.parseInt(st.nextToken()); @@ -301,7 +326,6 @@ public class AdminSiege implements IAdminCommandHandler } cal.set(Calendar.MINUTE, min); } - if (cal.getTimeInMillis() < Calendar.getInstance().getTimeInMillis()) { activeChar.sendMessage("Unable to change Siege Date"); @@ -315,15 +339,22 @@ public class AdminSiege implements IAdminCommandHandler } showSiegeTimePage(activeChar, castle); break; + } case "admin_spawn_doors": + { castle.spawnDoor(); break; + } case "admin_startsiege": + { castle.getSiege().startSiege(); break; + } default: + { showSiegePage(activeChar, castle.getName()); break; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java index 9de69ab0c3..34ed48ee31 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java @@ -377,14 +377,20 @@ public class AdminSpawn implements IAdminCommandHandler { default: case 0: + { _log.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); break; + } case 1: + { _log.info(""); break; + } case 2: + { _log.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java index 2a5ff3ac98..4741ce8ae6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java @@ -304,23 +304,35 @@ public class AdminTeleport implements IAdminCommandHandler switch (player.getRace()) { case ELF: + { regionName = "elf_town"; break; + } case DARK_ELF: + { regionName = "darkelf_town"; break; + } case ORC: + { regionName = "orc_town"; break; + } case DWARF: + { regionName = "dwarf_town"; break; + } case KAMAEL: + { regionName = "kamael_town"; break; + } case HUMAN: default: + { regionName = "talking_island_town"; + } } player.teleToLocation(MapRegionManager.getInstance().getMapRegionByName(regionName).getSpawnLoc(), true); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Augment.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Augment.java index f48e247a85..fa57d5006c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Augment.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Augment.java @@ -44,11 +44,15 @@ public class Augment implements IBypassHandler switch (Integer.parseInt(command.substring(8, 9).trim())) { case 1: + { activeChar.sendPacket(ExShowVariationMakeWindow.STATIC_PACKET); return true; + } case 2: + { activeChar.sendPacket(ExShowVariationCancelWindow.STATIC_PACKET); return true; + } } } catch (Exception e) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java index 65469b2aea..76c6b22b47 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java @@ -67,50 +67,44 @@ public class Festival implements IBypassHandler switch (val) { case 1: // Become a Participant + { // Check if the festival period is active, if not then don't allow registration. if (SevenSigns.getInstance().isSealValidationPeriod()) { npc.showChatWindow(activeChar, 2, "a", false); return true; } - // Check if a festival is in progress, then don't allow registration yet. if (SevenSignsFestival.getInstance().isFestivalInitialized()) { activeChar.sendMessage("You cannot sign up while a festival is in progress."); return true; } - // Check if the player is in a formed party already. if (!activeChar.isInParty()) { npc.showChatWindow(activeChar, 2, "b", false); return true; } - party = activeChar.getParty(); - // Check if the player is the party leader. if (!party.isLeader(activeChar)) { npc.showChatWindow(activeChar, 2, "c", false); return true; } - // Check to see if the party has at least 5 members. if (party.getMemberCount() < Config.ALT_FESTIVAL_MIN_PLAYER) { npc.showChatWindow(activeChar, 2, "b", false); return true; } - // Check if all the party members are in the required level range. if (party.getLevel() > SevenSignsFestival.getMaxLevelForFestival(npc.getFestivalType())) { npc.showChatWindow(activeChar, 2, "d", false); return true; } - // Check to see if the player has already signed up if (activeChar.isFestivalParticipant()) { @@ -118,85 +112,75 @@ public class Festival implements IBypassHandler npc.showChatWindow(activeChar, 2, "f", false); return true; } - npc.showChatWindow(activeChar, 1, null, false); break; + } case 2: // Seal Stones + { final int stoneType = Integer.parseInt(command.substring(11)); final int stoneCount = npc.getStoneCount(stoneType); if (stoneCount <= 0) { return false; } - if (!activeChar.destroyItemByItemId("SevenSigns", stoneType, stoneCount, npc, true)) { return false; } - SevenSignsFestival.getInstance().setParticipants(npc.getFestivalOracle(), npc.getFestivalType(), activeChar.getParty()); SevenSignsFestival.getInstance().addAccumulatedBonus(npc.getFestivalType(), stoneType, stoneCount); - npc.showChatWindow(activeChar, 2, "e", false); break; + } case 3: // Score Registration + { // Check if the festival period is active, if not then don't register the score. if (SevenSigns.getInstance().isSealValidationPeriod()) { npc.showChatWindow(activeChar, 3, "a", false); return true; } - // Check if a festival is in progress, if it is don't register the score. if (SevenSignsFestival.getInstance().isFestivalInProgress()) { activeChar.sendMessage("You cannot register a score while a festival is in progress."); return true; } - // Check if the player is in a party. if (!activeChar.isInParty()) { npc.showChatWindow(activeChar, 3, "b", false); return true; } - final List prevParticipants = SevenSignsFestival.getInstance().getPreviousParticipants(npc.getFestivalOracle(), npc.getFestivalType()); - // Check if there are any past participants. if ((prevParticipants == null) || prevParticipants.isEmpty() || !prevParticipants.contains(activeChar.getObjectId())) { npc.showChatWindow(activeChar, 3, "b", false); return true; } - // Check if this player was the party leader in the festival. if (activeChar.getObjectId() != prevParticipants.get(0)) { npc.showChatWindow(activeChar, 3, "b", false); return true; } - final L2ItemInstance bloodOfferings = activeChar.getInventory().getItemByItemId(SevenSignsFestival.FESTIVAL_OFFERING_ID); - // Check if the player collected any blood offerings during the festival. if (bloodOfferings == null) { activeChar.sendMessage("You do not have any blood offerings to contribute."); return true; } - final long offeringScore = bloodOfferings.getCount() * SevenSignsFestival.FESTIVAL_OFFERING_VALUE; if (!activeChar.destroyItem("SevenSigns", bloodOfferings, npc, false)) { return true; } - final boolean isHighestScore = SevenSignsFestival.getInstance().setFinalScore(activeChar, npc.getFestivalOracle(), npc.getFestivalType(), offeringScore); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_CONTRIBUTION_SCORE_HAS_INCREASED_BY_S1); sm.addLong(offeringScore); activeChar.sendPacket(sm); - if (isHighestScore) { npc.showChatWindow(activeChar, 3, "c", false); @@ -206,25 +190,23 @@ public class Festival implements IBypassHandler npc.showChatWindow(activeChar, 3, "d", false); } break; + } case 4: // Current High Scores + { final StringBuilder strBuffer = new StringBuilder(500); strBuffer.append("Festival Guide:
These are the top scores of the week, for the "); final StatsSet dawnData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, npc.getFestivalType()); final StatsSet duskData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, npc.getFestivalType()); final StatsSet overallData = SevenSignsFestival.getInstance().getOverallHighestScoreData(npc.getFestivalType()); - final int dawnScore = dawnData.getInt("score"); final int duskScore = duskData.getInt("score"); int overallScore = 0; - // If no data is returned, assume there is no record, or all scores are 0. if (overallData != null) { overallScore = overallData.getInt("score"); } - strBuffer.append(SevenSignsFestival.getFestivalName(npc.getFestivalType()) + " festival.
"); - if (dawnScore > 0) { strBuffer.append("Dawn: " + calculateDate(dawnData.getString("date")) + ". Score " + dawnScore + "
" + dawnData.getString("members") + "
"); @@ -233,7 +215,6 @@ public class Festival implements IBypassHandler { strBuffer.append("Dawn: No record exists. Score 0
"); } - if (duskScore > 0) { strBuffer.append("Dusk: " + calculateDate(duskData.getString("date")) + ". Score " + duskScore + "
" + duskData.getString("members") + "
"); @@ -242,7 +223,6 @@ public class Festival implements IBypassHandler { strBuffer.append("Dusk: No record exists. Score 0
"); } - if ((overallScore > 0) && (overallData != null)) { final String cabalStr; @@ -254,38 +234,34 @@ public class Festival implements IBypassHandler { cabalStr = "Children of Dusk"; } - strBuffer.append("Consecutive top scores: " + calculateDate(overallData.getString("date")) + ". Score " + overallScore + "
Affilated side: " + cabalStr + "
" + overallData.getString("members") + "
"); } else { strBuffer.append("Consecutive top scores: No record exists. Score 0
"); } - strBuffer.append("Go back."); - final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(strBuffer.toString()); activeChar.sendPacket(html); break; + } case 8: // Increase the Festival Challenge + { if (!activeChar.isInParty()) { return true; } - if (!SevenSignsFestival.getInstance().isFestivalInProgress()) { return true; } - party = activeChar.getParty(); if (!party.isLeader(activeChar)) { npc.showChatWindow(activeChar, 8, "a", false); return true; } - if (SevenSignsFestival.getInstance().increaseChallenge(npc.getFestivalOracle(), npc.getFestivalType())) { npc.showChatWindow(activeChar, 8, "b", false); @@ -295,12 +271,13 @@ public class Festival implements IBypassHandler npc.showChatWindow(activeChar, 8, "c", false); } break; + } case 9: // Leave the Festival + { if (!activeChar.isInParty()) { return true; } - party = activeChar.getParty(); if (party.isLeader(activeChar)) { @@ -318,13 +295,14 @@ public class Festival implements IBypassHandler } } break; + } case 0: // Distribute Accumulated Bonus + { if (!SevenSigns.getInstance().isSealValidationPeriod()) { activeChar.sendMessage("Bonuses cannot be paid during the competition period."); return true; } - if (SevenSignsFestival.getInstance().distribAccumulatedBonus(activeChar) > 0) { npc.showChatWindow(activeChar, 0, "a", false); @@ -334,8 +312,11 @@ public class Festival implements IBypassHandler npc.showChatWindow(activeChar, 0, "b", false); } break; + } default: + { npc.showChatWindow(activeChar, val, null, false); + } } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java index 3cb17591d7..e246e0b2bd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java @@ -275,17 +275,25 @@ public class Loto implements IBypassHandler switch ((int) check[0]) { case 1: + { message += "- 1st Prize"; break; + } case 2: + { message += "- 2nd Prize"; break; + } case 3: + { message += "- 3th Prize"; break; + } case 4: + { message += "- 4th Prize"; break; + } } message += " " + check[1] + "a."; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java index 513a93e657..6bd349004c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java @@ -120,6 +120,7 @@ public class OlympiadManagerLink implements IBypassHandler switch (val) { case 0: // H5 match selection + { if (!OlympiadManager.getInstance().isRegistered(activeChar)) { html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_desc2a.htm"); @@ -136,10 +137,14 @@ public class OlympiadManagerLink implements IBypassHandler activeChar.sendPacket(html); } break; + } case 1: // unregister + { OlympiadManager.getInstance().unRegisterNoble(activeChar); break; + } case 2: // show waiting list | TODO: cleanup (not used anymore) + { final int nonClassed = OlympiadManager.getInstance().getRegisteredNonClassBased().size(); final int teams = OlympiadManager.getInstance().getRegisteredTeamsBased().size(); final Collection> allClassed = OlympiadManager.getInstance().getRegisteredClassBased().values(); @@ -170,20 +175,28 @@ public class OlympiadManagerLink implements IBypassHandler html.replace("%objectId%", String.valueOf(target.getObjectId())); activeChar.sendPacket(html); break; + } case 3: // There are %points% Grand Olympiad points granted for this event. | TODO: cleanup (not used anymore) + { final int points = Olympiad.getInstance().getNoblePoints(activeChar.getObjectId()); html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_points1.htm"); html.replace("%points%", String.valueOf(points)); html.replace("%objectId%", String.valueOf(target.getObjectId())); activeChar.sendPacket(html); break; + } case 4: // register non classed + { OlympiadManager.getInstance().registerNoble(activeChar, CompetitionType.NON_CLASSED); break; + } case 5: // register classed + { OlympiadManager.getInstance().registerNoble(activeChar, CompetitionType.CLASSED); break; + } case 6: // request tokens reward + { passes = Olympiad.getInstance().getNoblessePasses(activeChar, false); if (passes > 0) { @@ -198,41 +211,52 @@ public class OlympiadManagerLink implements IBypassHandler activeChar.sendPacket(html); } break; + } case 7: // Equipment Rewards + { MultisellData.getInstance().separateAndSend(102, activeChar, (L2Npc) target, false); break; + } case 8: // Misc. Rewards + { MultisellData.getInstance().separateAndSend(103, activeChar, (L2Npc) target, false); break; + } case 9: // Your Grand Olympiad Score from the previous period is %points% point(s) | TODO: cleanup (not used anymore) + { final int point = Olympiad.getInstance().getLastNobleOlympiadPoints(activeChar.getObjectId()); html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_points2.htm"); html.replace("%points%", String.valueOf(point)); html.replace("%objectId%", String.valueOf(target.getObjectId())); activeChar.sendPacket(html); break; + } case 10: // give tokens to player + { passes = Olympiad.getInstance().getNoblessePasses(activeChar, true); if (passes > 0) { final L2ItemInstance item = activeChar.getInventory().addItem("Olympiad", GATE_PASS, passes, activeChar, target); - final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(item); activeChar.sendPacket(iu); - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); sm.addLong(passes); sm.addItemName(item); activeChar.sendPacket(sm); } break; + } case 11: // register team + { OlympiadManager.getInstance().registerNoble(activeChar, CompetitionType.TEAMS); break; + } default: + { _log.warning("Olympiad System: Couldnt send packet for request " + val); break; + } } } else if (command.toLowerCase().startsWith("olybuff")) @@ -309,13 +333,13 @@ public class OlympiadManagerLink implements IBypassHandler switch (val) { case 2: // show rank for a specific class + { // for example >> Olympiad 1_88 final int classId = Integer.parseInt(command.substring(11)); if (((classId >= 88) && (classId <= 118)) || ((classId >= 131) && (classId <= 134)) || (classId == 136)) { final List names = Olympiad.getInstance().getClassLeaderBoard(classId); reply.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "olympiad_ranking.htm"); - int index = 1; for (String name : names) { @@ -332,15 +356,18 @@ public class OlympiadManagerLink implements IBypassHandler reply.replace("%place" + index + "%", ""); reply.replace("%rank" + index + "%", ""); } - reply.replace("%objectId%", String.valueOf(target.getObjectId())); activeChar.sendPacket(reply); } break; + } case 4: // hero list + { activeChar.sendPacket(new ExHeroList()); break; + } case 5: // Hero Certification + { if (Hero.getInstance().isUnclaimedHero(activeChar.getObjectId())) { Hero.getInstance().claimHero(activeChar); @@ -352,9 +379,12 @@ public class OlympiadManagerLink implements IBypassHandler } activeChar.sendPacket(reply); break; + } default: + { _log.warning("Olympiad System: Couldnt send packet for request " + val); break; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index d87c3efb56..a4bf75598e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -46,13 +46,19 @@ public class EventItem implements IItemHandler switch (itemId) { case 13787: // Handy's Block Checker Bond + { used = useBlockCheckerItem(activeChar, item); break; + } case 13788: // Handy's Block Checker Land Mine + { used = useBlockCheckerItem(activeChar, item); break; + } default: + { _log.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); + } } return used; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/PartyOther.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/PartyOther.java index dbe9acac9c..1af5e33caf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/PartyOther.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/PartyOther.java @@ -41,6 +41,7 @@ public class PartyOther implements ITargetTypeHandler { // FORCE BUFFS may cancel here but there should be a proper condition case 426: + { if (!target.getActingPlayer().isMageClass()) { return new L2Character[] @@ -49,7 +50,9 @@ public class PartyOther implements ITargetTypeHandler }; } return EMPTY_TARGET_LIST; + } case 427: + { if (target.getActingPlayer().isMageClass()) { return new L2Character[] @@ -58,6 +61,7 @@ public class PartyOther implements ITargetTypeHandler }; } return EMPTY_TARGET_LIST; + } } } return new L2Character[] diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java index 1f330260ed..1025a51319 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java @@ -123,52 +123,84 @@ public class PlayerHandler implements ITelnetHandler switch (itemType) { case 1: + { itemType = Inventory.PAPERDOLL_HEAD; break; + } case 2: + { itemType = Inventory.PAPERDOLL_CHEST; break; + } case 3: + { itemType = Inventory.PAPERDOLL_GLOVES; break; + } case 4: + { itemType = Inventory.PAPERDOLL_FEET; break; + } case 5: + { itemType = Inventory.PAPERDOLL_LEGS; break; + } case 6: + { itemType = Inventory.PAPERDOLL_RHAND; break; + } case 7: + { itemType = Inventory.PAPERDOLL_LHAND; break; + } case 8: + { itemType = Inventory.PAPERDOLL_LEAR; break; + } case 9: + { itemType = Inventory.PAPERDOLL_REAR; break; + } case 10: + { itemType = Inventory.PAPERDOLL_LFINGER; break; + } case 11: + { itemType = Inventory.PAPERDOLL_RFINGER; break; + } case 12: + { itemType = Inventory.PAPERDOLL_NECK; break; + } case 13: + { itemType = Inventory.PAPERDOLL_UNDER; break; + } case 14: + { itemType = Inventory.PAPERDOLL_CLOAK; break; + } case 15: + { itemType = Inventory.PAPERDOLL_BELT; break; + } default: + { itemType = 0; + } } if (enchant > 65535) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java index 1071f24053..5c2368f017 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java @@ -48,20 +48,30 @@ public class PartyInfo implements IUserCommandHandler switch (party.getDistributionType()) { case FINDERS_KEEPERS: + { activeChar.sendPacket(SystemMessageId.LOOTING_METHOD_FINDERS_KEEPERS); break; + } case RANDOM: + { activeChar.sendPacket(SystemMessageId.LOOTING_METHOD_RANDOM); break; + } case RANDOM_INCLUDING_SPOIL: + { activeChar.sendPacket(SystemMessageId.LOOTING_METHOD_RANDOM_INCLUDING_SPOIL); break; + } case BY_TURN: + { activeChar.sendPacket(SystemMessageId.LOOTING_METHOD_BY_TURN); break; + } case BY_TURN_INCLUDING_SPOIL: + { activeChar.sendPacket(SystemMessageId.LOOTING_METHOD_BY_TURN_INCLUDING_SPOIL); break; + } } if (!party.isLeader(activeChar)) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java index ac03c9fbba..46612781b8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java @@ -41,6 +41,7 @@ public class CastleVCmd implements IVoicedCommandHandler switch (command) { case "opendoors": + { if (!params.equals("castle")) { activeChar.sendMessage("Only Castle doors can be open."); @@ -79,7 +80,9 @@ public class CastleVCmd implements IVoicedCommandHandler door.openMe(); } break; + } case "closedoors": + { if (!params.equals("castle")) { activeChar.sendMessage("Only Castle doors can be closed."); @@ -115,12 +118,15 @@ public class CastleVCmd implements IVoicedCommandHandler door2.closeMe(); } break; + } case "ridewyvern": + { if (activeChar.isClanLeader() && (activeChar.getClan().getCastleId() > 0)) { activeChar.mount(12621, 0, true); } break; + } } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java index c75d864e1a..cd7378289a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java @@ -92,15 +92,25 @@ public final class Bernarde extends AbstractNpcAI { case 0: case 1: + { return isTransformed(player) ? "32300-01a.htm" : "32300-01.htm"; + } case 2: + { return isTransformed(player) ? "32300-02.htm" : "32300-03.htm"; + } case 3: + { return isTransformed(player) ? "32300-01c.htm" : "32300-03.htm"; + } case 4: + { return isTransformed(player) ? "32300-01d.htm" : "32300-03.htm"; + } default: + { return isTransformed(player) ? "32300-01f.htm" : "32300-03.htm"; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Buron/Buron.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Buron/Buron.java index 4f0d7384d9..e4c9edbdeb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Buron/Buron.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Buron/Buron.java @@ -91,13 +91,19 @@ public final class Buron extends AbstractNpcAI switch (HellboundEngine.getInstance().getLevel()) { case 1: + { return "32345-01.htm"; + } case 2: case 3: case 4: + { return "32345-02.htm"; + } default: + { return "32345-01a.htm"; + } } } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Jude/Jude.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Jude/Jude.java index ec7db9e45d..ea29e82103 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Jude/Jude.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Jude/Jude.java @@ -68,14 +68,22 @@ public final class Jude extends AbstractNpcAI case 0: case 1: case 2: + { return "32356-01.htm"; + } case 3: case 4: + { return "32356-01c.htm"; + } case 5: + { return "32356-01a.htm"; + } default: + { return "32356-01b.htm"; + } } } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Kief/Kief.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Kief/Kief.java index fbae51a01c..2bbd24556d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Kief/Kief.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Kief/Kief.java @@ -158,20 +158,34 @@ public final class Kief extends AbstractNpcAI switch (HellboundEngine.getInstance().getLevel()) { case 1: + { return "32354-01.htm"; + } case 2: case 3: + { return "32354-01a.htm"; + } case 4: + { return "32354-01e.htm"; + } case 5: + { return "32354-01d.htm"; + } case 6: + { return "32354-01b.htm"; + } case 7: + { return "32354-01c.htm"; + } default: + { return "32354-01f.htm"; + } } } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java index 1664731238..7a645f379e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java @@ -762,14 +762,20 @@ public final class TowerOfNaia extends AbstractNpcAI { case SPORE_FIRE: case SPORE_WATER: + { ret = 0; break; + } case SPORE_WIND: case SPORE_EARTH: + { ret = 1; break; + } default: + { ret = -1; + } } return ret; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java index 09b5534402..3eda245afd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java @@ -1631,11 +1631,15 @@ public final class TullyWorkshop extends AbstractNpcAI switch (_state) { case STATE_OPEN: + { door.openMe(); break; + } case STATE_CLOSE: + { door.closeMe(); break; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/Instances/UrbanArea/UrbanArea.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/Instances/UrbanArea/UrbanArea.java index 6756b28a79..55de951377 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/Instances/UrbanArea/UrbanArea.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/Instances/UrbanArea/UrbanArea.java @@ -289,16 +289,22 @@ public final class UrbanArea extends AbstractInstance switch (npc.getId()) { case TOWN_GUARD: + { msgId = 0; range = 1000; break; + } case KEYMASTER: + { msgId = 1; range = 5000; break; + } default: + { msgId = -1; range = 0; + } } if (msgId >= 0) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java index ad18d37617..ffbf666bf5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java @@ -565,13 +565,17 @@ public abstract class Chamber extends AbstractInstance switch (eventName) { case "SCE_LUCKY": + { receiver.setBusy(true); receiver.doCast(SUCCESS_SKILL.getSkill()); break; + } case "SCE_DREAM_FIRE_IN_THE_HOLE": + { receiver.setBusy(true); receiver.doCast(FAIL_SKILL.getSkill()); break; + } } return null; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index 88ad8243da..f576652f81 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -948,10 +948,14 @@ public final class CrystalCaverns extends AbstractInstance case 2360: case 2369: case 5146: + { doReturn = false; break; + } default: + { doReturn = true; + } } if (doReturn) { @@ -1668,16 +1672,23 @@ public final class CrystalCaverns extends AbstractInstance switch (world.getStatus()) { case 22: + { closeDoor(DOOR6, npc.getInstanceId()); oracleOrder = ordreOracle1; break; + } case 23: + { oracleOrder = ordreOracle2; break; + } case 24: + { oracleOrder = ordreOracle3; break; + } case 25: + { world.setStatus(26); final L2Party party = player.getParty(); if (party != null) @@ -1694,9 +1705,12 @@ public final class CrystalCaverns extends AbstractInstance final L2Npc kechi = addSpawn(KECHI, 154069, 149525, -12158, 51165, false, 0, false, world.getInstanceId()); startQuestTimer("checkKechiAttack", 1000, kechi, null); return ""; + } default: + { _log.warning("CrystalCavern-SteamCorridor: status " + world.getStatus() + " error. OracleOrder not found in " + world.getInstanceId()); return ""; + } } runSteamOracles(world, oracleOrder); } @@ -1778,6 +1792,7 @@ public final class CrystalCaverns extends AbstractInstance switch (npc.getId()) { case 32275: + { if (world.getStatus() == 22) { runSteamRooms(world, STEAM2_SPAWNS, 23); @@ -1805,7 +1820,9 @@ public final class CrystalCaverns extends AbstractInstance } startQuestTimer("Timer31", 600000, npc, null); break; + } case 32276: + { if (world.getStatus() == 23) { runSteamRooms(world, STEAM3_SPAWNS, 24); @@ -1833,7 +1850,9 @@ public final class CrystalCaverns extends AbstractInstance } startQuestTimer("Timer41", 1200000, npc, null); break; + } case 32277: + { if (world.getStatus() == 24) { runSteamRooms(world, STEAM4_SPAWNS, 25); @@ -1861,9 +1880,12 @@ public final class CrystalCaverns extends AbstractInstance } startQuestTimer("Timer51", 900000, npc, null); break; + } default: + { // something is wrong doTeleport = false; + } } if (doTeleport && (loc != null)) { @@ -1951,12 +1973,14 @@ public final class CrystalCaverns extends AbstractInstance switch (action) { case TRAP_DISARMED: + { if (trap.getId() == DOOR_OPENING_TRAP[0]) { openDoor(24220001, world.getInstanceId()); runEmeraldRooms(world, ROOM1_SPAWNS, 1); } break; + } } } return null; @@ -1978,19 +2002,27 @@ public final class CrystalCaverns extends AbstractInstance switch (zone.getId()) { case 20105: + { spawns = ROOM2_SPAWNS; room = 2; break; + } case 20106: + { spawns = ROOM3_SPAWNS; room = 3; break; + } case 20107: + { spawns = ROOM4_SPAWNS; room = 4; break; + } default: + { return super.onEnterZone(character, zone); + } } for (L2DoorInstance door : InstanceManager.getInstance().getInstance(world.getInstanceId()).getDoors()) { @@ -2036,16 +2068,24 @@ public final class CrystalCaverns extends AbstractInstance switch (zone.getId()) { case 20105: + { doorId = 24220002; break; + } case 20106: + { doorId = 24220003; break; + } case 20107: + { doorId = 24220004; break; + } default: + { return super.onExitZone(character, zone); + } } for (L2DoorInstance door : InstanceManager.getInstance().getInstance(world.getInstanceId()).getDoors()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java index 167acc6740..221f30bd96 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java @@ -151,20 +151,30 @@ public final class DisciplesNecropolisPast extends AbstractInstance switch (world.countKill) { case 4: + { openDoor(DOOR_1, world.getInstanceId()); break; + } case 10: + { openDoor(DOOR_2, world.getInstanceId()); break; + } case 18: + { openDoor(DOOR_3, world.getInstanceId()); break; + } case 28: + { openDoor(DOOR_4, world.getInstanceId()); break; + } case 40: + { openDoor(DOOR_5, world.getInstanceId()); break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java index cb852e75d3..7afb9bbee9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java @@ -605,23 +605,30 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea switch (world.getStatus()) { case 0: + { spawnFlaggedNPCs(world, 0); break; + } case 1: + { for (int doorId : FIRST_ROUTE_DOORS) { openDoor(doorId, world.getInstanceId()); } spawnFlaggedNPCs(world, world.getStatus()); break; + } case 2: + { for (int doorId : SECOND_ROUTE_DOORS) { openDoor(doorId, world.getInstanceId()); } ThreadPoolManager.schedule(new IntroTask(world, 0), 600000); break; + } case 3: // first morph + { if (world.songEffectTask != null) { world.songEffectTask.cancel(false); @@ -636,7 +643,9 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea world.activeScarlet.doCast(FIRST_MORPH_SKILL.getSkill()); ThreadPoolManager.schedule(new SongTask(world, 2), 1500); break; + } case 4: // second morph + { world.isVideo = true; broadCastPacket(world, new MagicSkillCanceld(world.frintezza.getObjectId())); if (world.songEffectTask != null) @@ -647,7 +656,9 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea ThreadPoolManager.schedule(new IntroTask(world, 23), 2000); ThreadPoolManager.schedule(new IntroTask(world, 24), 2100); break; + } case 5: // raid success + { world.isVideo = true; broadCastPacket(world, new MagicSkillCanceld(world.frintezza.getObjectId())); if (world.songTask != null) @@ -662,7 +673,9 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea world.songEffectTask = null; ThreadPoolManager.schedule(new IntroTask(world, 33), 500); break; + } case 6: // open doors + { InstanceManager.getInstance().getInstance(world.getInstanceId()).setDuration(300000); for (int doorId : FIRST_ROOM_DOORS) { @@ -681,6 +694,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea closeDoor(doorId, world.getInstanceId()); } break; + } } world.incStatus(); return true; @@ -786,6 +800,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea switch (_status) { case 0: // new song play + { if (_world.isVideo) { _world.songTask = ThreadPoolManager.schedule(new SongTask(_world, 0), 1000); @@ -814,14 +829,15 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea } } break; + } case 1: // Frintezza song effect + { _world.songEffectTask = null; final Skill skill = _world.OnSong.effectSkill.getSkill(); if (skill == null) { return; } - if ((_world.frintezza != null) && !_world.frintezza.isDead() && (_world.activeScarlet != null) && !_world.activeScarlet.isDead()) { final List targetList = new ArrayList<>(); @@ -853,10 +869,13 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea } } break; + } case 2: // finish morph + { _world.activeScarlet.setRHandId(SECOND_SCARLET_WEAPON); _world.activeScarlet.setIsInvul(false); break; + } } } } @@ -878,11 +897,14 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea switch (_status) { case 0: + { ThreadPoolManager.schedule(new IntroTask(_world, 1), 27000); ThreadPoolManager.schedule(new IntroTask(_world, 2), 30000); broadCastPacket(_world, new Earthquake(-87784, -155083, -9087, 45, 27)); break; + } case 1: + { for (int doorId : FIRST_ROOM_DOORS) { closeDoor(doorId, _world.getInstanceId()); @@ -901,42 +923,39 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea } addSpawn(29061, -87904, -141296, -9168, 0, false, 0, false, _world.getInstanceId()); break; + } case 2: + { _world.frintezzaDummy = addSpawn(29052, -87784, -155083, -9087, 16048, false, 0, false, _world.getInstanceId()); _world.frintezzaDummy.setIsInvul(true); _world.frintezzaDummy.setIsImmobilized(true); - _world.overheadDummy = addSpawn(29052, -87784, -153298, -9175, 16384, false, 0, false, _world.getInstanceId()); _world.overheadDummy.setIsInvul(true); _world.overheadDummy.setIsImmobilized(true); _world.overheadDummy.setCollisionHeight(600); - _world.portraitDummy1 = addSpawn(29052, -89566, -153168, -9165, 16048, false, 0, false, _world.getInstanceId()); _world.portraitDummy1.setIsImmobilized(true); _world.portraitDummy1.setIsInvul(true); - _world.portraitDummy3 = addSpawn(29052, -86004, -153168, -9165, 16048, false, 0, false, _world.getInstanceId()); _world.portraitDummy3.setIsImmobilized(true); _world.portraitDummy3.setIsInvul(true); - _world.scarletDummy = addSpawn(29053, -87784, -153298, -9175, 16384, false, 0, false, _world.getInstanceId()); _world.scarletDummy.setIsInvul(true); _world.scarletDummy.setIsImmobilized(true); - stopPc(); ThreadPoolManager.schedule(new IntroTask(_world, 3), 1000); break; + } case 3: + { broadCastPacket(_world, new SpecialCamera(_world.overheadDummy, 0, 75, -89, 0, 100, 0, 0, 1, 0, 0)); broadCastPacket(_world, new SpecialCamera(_world.overheadDummy, 0, 75, -89, 0, 100, 0, 0, 1, 0, 0)); broadCastPacket(_world, new SpecialCamera(_world.overheadDummy, 300, 90, -10, 6500, 7000, 0, 0, 1, 0, 0)); - _world.frintezza = (L2GrandBossInstance) addSpawn(FRINTEZZA, -87780, -155086, -9080, 16384, false, 0, false, _world.getInstanceId()); _world.frintezza.setIsImmobilized(true); _world.frintezza.setIsInvul(true); _world.frintezza.disableAllSkills(); updateKnownList(_world, _world.frintezza); - for (int[] element : PORTRAIT_SPAWNS) { final L2MonsterInstance demon = (L2MonsterInstance) addSpawn(element[0] + 2, element[5], element[6], element[7], element[8], false, 0, false, _world.getInstanceId()); @@ -947,41 +966,57 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea } ThreadPoolManager.schedule(new IntroTask(_world, 4), 6500); break; + } case 4: + { broadCastPacket(_world, new SpecialCamera(_world.frintezzaDummy, 1800, 90, 8, 6500, 7000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 5), 900); break; + } case 5: + { broadCastPacket(_world, new SpecialCamera(_world.frintezzaDummy, 140, 90, 10, 2500, 4500, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 6), 4000); break; + } case 6: + { broadCastPacket(_world, new SpecialCamera(_world.frintezza, 40, 75, -10, 0, 1000, 0, 0, 1, 0, 0)); broadCastPacket(_world, new SpecialCamera(_world.frintezza, 40, 75, -10, 0, 12000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 7), 1350); break; + } case 7: + { broadCastPacket(_world, new SocialAction(_world.frintezza.getObjectId(), 2)); ThreadPoolManager.schedule(new IntroTask(_world, 8), 7000); break; + } case 8: + { _world.frintezzaDummy.deleteMe(); _world.frintezzaDummy = null; ThreadPoolManager.schedule(new IntroTask(_world, 9), 1000); break; + } case 9: + { broadCastPacket(_world, new SocialAction(_world.demons.get(1).getObjectId(), 1)); broadCastPacket(_world, new SocialAction(_world.demons.get(2).getObjectId(), 1)); ThreadPoolManager.schedule(new IntroTask(_world, 10), 400); break; + } case 10: + { broadCastPacket(_world, new SocialAction(_world.demons.get(0).getObjectId(), 1)); broadCastPacket(_world, new SocialAction(_world.demons.get(3).getObjectId(), 1)); sendPacketX(new SpecialCamera(_world.portraitDummy1, 1000, 118, 0, 0, 1000, 0, 0, 1, 0, 0), new SpecialCamera(_world.portraitDummy3, 1000, 62, 0, 0, 1000, 0, 0, 1, 0, 0), -87784); sendPacketX(new SpecialCamera(_world.portraitDummy1, 1000, 118, 0, 0, 10000, 0, 0, 1, 0, 0), new SpecialCamera(_world.portraitDummy3, 1000, 62, 0, 0, 10000, 0, 0, 1, 0, 0), -87784); ThreadPoolManager.schedule(new IntroTask(_world, 11), 2000); break; + } case 11: + { broadCastPacket(_world, new SpecialCamera(_world.frintezza, 240, 90, 0, 0, 1000, 0, 0, 1, 0, 0)); broadCastPacket(_world, new SpecialCamera(_world.frintezza, 240, 90, 25, 5500, 10000, 0, 0, 1, 0, 0)); broadCastPacket(_world, new SocialAction(_world.frintezza.getObjectId(), 3)); @@ -991,36 +1026,49 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea _world.portraitDummy3 = null; ThreadPoolManager.schedule(new IntroTask(_world, 12), 4500); break; + } case 12: + { broadCastPacket(_world, new SpecialCamera(_world.frintezza, 100, 195, 35, 0, 10000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 13), 700); break; + } case 13: + { broadCastPacket(_world, new SpecialCamera(_world.frintezza, 100, 195, 35, 0, 10000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 14), 1300); break; + } case 14: + { broadCastPacket(_world, new ExShowScreenMessage(NpcStringId.MOURNFUL_CHORALE_PRELUDE, 2, 5000)); broadCastPacket(_world, new SpecialCamera(_world.frintezza, 120, 180, 45, 1500, 10000, 0, 0, 1, 0, 0)); broadCastPacket(_world, new MagicSkillUse(_world.frintezza, _world.frintezza, 5006, 1, 34000, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 15), 1500); break; + } case 15: + { broadCastPacket(_world, new SpecialCamera(_world.frintezza, 520, 135, 45, 8000, 10000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 16), 7500); break; + } case 16: + { broadCastPacket(_world, new SpecialCamera(_world.frintezza, 1500, 110, 25, 10000, 13000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 17), 9500); break; + } case 17: + { broadCastPacket(_world, new SpecialCamera(_world.overheadDummy, 930, 160, -20, 0, 1000, 0, 0, 1, 0, 0)); broadCastPacket(_world, new SpecialCamera(_world.overheadDummy, 600, 180, -25, 0, 10000, 0, 0, 1, 0, 0)); broadCastPacket(_world, new MagicSkillUse(_world.scarletDummy, _world.overheadDummy, 5004, 1, 5800, 0)); - ThreadPoolManager.schedule(new IntroTask(_world, 18), 5000); break; + } case 18: + { _world.activeScarlet = (L2GrandBossInstance) addSpawn(29046, -87789, -153295, -9176, 16384, false, 0, false, _world.getInstanceId()); _world.activeScarlet.setRHandId(FIRST_SCARLET_WEAPON); _world.activeScarlet.setIsInvul(true); @@ -1031,31 +1079,37 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea broadCastPacket(_world, new SpecialCamera(_world.scarletDummy, 800, 180, 10, 1000, 10000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 19), 2100); break; + } case 19: + { broadCastPacket(_world, new SpecialCamera(_world.activeScarlet, 300, 60, 8, 0, 10000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 20), 2000); break; + } case 20: + { broadCastPacket(_world, new SpecialCamera(_world.activeScarlet, 500, 90, 10, 3000, 5000, 0, 0, 1, 0, 0)); _world.songTask = ThreadPoolManager.schedule(new SongTask(_world, 0), 100); ThreadPoolManager.schedule(new IntroTask(_world, 21), 3000); break; + } case 21: + { for (int i = 0; i < PORTRAIT_SPAWNS.length; i++) { final L2MonsterInstance portrait = (L2MonsterInstance) addSpawn(PORTRAIT_SPAWNS[i][0], PORTRAIT_SPAWNS[i][1], PORTRAIT_SPAWNS[i][2], PORTRAIT_SPAWNS[i][3], PORTRAIT_SPAWNS[i][4], false, 0, false, _world.getInstanceId()); updateKnownList(_world, portrait); _world.portraits.put(portrait, i); } - _world.overheadDummy.deleteMe(); _world.scarletDummy.deleteMe(); _world.overheadDummy = null; _world.scarletDummy = null; - ThreadPoolManager.schedule(new IntroTask(_world, 22), 2000); break; + } case 22: + { for (L2MonsterInstance demon : _world.demons) { demon.setIsImmobilized(false); @@ -1070,13 +1124,16 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea _world.frintezza.disableCoreAI(true); _world.frintezza.setIsMortal(false); startPc(); - ThreadPoolManager.schedule(new DemonSpawnTask(_world), TIME_BETWEEN_DEMON_SPAWNS); break; + } case 23: + { broadCastPacket(_world, new SocialAction(_world.frintezza.getObjectId(), 4)); break; + } case 24: + { stopPc(); broadCastPacket(_world, new SpecialCamera(_world.frintezza, 250, 120, 15, 0, 1000, 0, 0, 1, 0, 0)); broadCastPacket(_world, new SpecialCamera(_world.frintezza, 250, 120, 15, 0, 10000, 0, 0, 1, 0, 0)); @@ -1087,16 +1144,22 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea _world.activeScarlet.disableAllSkills(); ThreadPoolManager.schedule(new IntroTask(_world, 25), 7000); break; + } case 25: + { broadCastPacket(_world, new MagicSkillUse(_world.frintezza, _world.frintezza, 5006, 1, 34000, 0)); broadCastPacket(_world, new SpecialCamera(_world.frintezza, 500, 70, 15, 3000, 10000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 26), 3000); break; + } case 26: + { broadCastPacket(_world, new SpecialCamera(_world.frintezza, 2500, 90, 12, 6000, 10000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 27), 3000); break; + } case 27: + { _world.scarlet_x = _world.activeScarlet.getX(); _world.scarlet_y = _world.activeScarlet.getY(); _world.scarlet_z = _world.activeScarlet.getZ(); @@ -1113,61 +1176,80 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea broadCastPacket(_world, new SpecialCamera(_world.activeScarlet, 250, _world.scarlet_a, 12, 0, 10000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 28), 500); break; + } case 28: + { _world.activeScarlet.doDie(_world.activeScarlet); broadCastPacket(_world, new SpecialCamera(_world.activeScarlet, 450, _world.scarlet_a, 14, 8000, 8000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 29), 6250); ThreadPoolManager.schedule(new IntroTask(_world, 30), 7200); break; + } case 29: + { _world.activeScarlet.deleteMe(); _world.activeScarlet = null; break; + } case 30: + { _world.activeScarlet = (L2GrandBossInstance) addSpawn(SCARLET2, _world.scarlet_x, _world.scarlet_y, _world.scarlet_z, _world.scarlet_h, false, 0, false, _world.getInstanceId()); _world.activeScarlet.setIsInvul(true); _world.activeScarlet.setIsImmobilized(true); _world.activeScarlet.disableAllSkills(); updateKnownList(_world, _world.activeScarlet); - broadCastPacket(_world, new SpecialCamera(_world.activeScarlet, 450, _world.scarlet_a, 12, 500, 14000, 0, 0, 1, 0, 0)); - ThreadPoolManager.schedule(new IntroTask(_world, 31), 8100); break; + } case 31: + { broadCastPacket(_world, new SocialAction(_world.activeScarlet.getObjectId(), 2)); ThreadPoolManager.schedule(new IntroTask(_world, 32), 9000); break; + } case 32: + { startPc(); _world.activeScarlet.setIsInvul(false); _world.activeScarlet.setIsImmobilized(false); _world.activeScarlet.enableAllSkills(); _world.isVideo = false; break; + } case 33: + { broadCastPacket(_world, new SpecialCamera(_world.activeScarlet, 300, _world.scarlet_a - 180, 5, 0, 7000, 0, 0, 1, 0, 0)); broadCastPacket(_world, new SpecialCamera(_world.activeScarlet, 200, _world.scarlet_a, 85, 4000, 10000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 34), 7400); ThreadPoolManager.schedule(new IntroTask(_world, 35), 7500); break; + } case 34: + { _world.frintezza.doDie(_world.frintezza); break; + } case 35: + { broadCastPacket(_world, new SpecialCamera(_world.frintezza, 100, 120, 5, 0, 7000, 0, 0, 1, 0, 0)); broadCastPacket(_world, new SpecialCamera(_world.frintezza, 100, 90, 5, 5000, 15000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 36), 7000); break; + } case 36: + { broadCastPacket(_world, new SpecialCamera(_world.frintezza, 900, 90, 25, 7000, 10000, 0, 0, 1, 0, 0)); ThreadPoolManager.schedule(new IntroTask(_world, 37), 9000); break; + } case 37: + { controlStatus(_world); _world.isVideo = false; startPc(); break; + } } } @@ -1243,28 +1325,38 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea switch (_status) { case 0: + { ThreadPoolManager.schedule(new StatusTask(_world, 1), 2000); for (int doorId : FIRST_ROOM_DOORS) { openDoor(doorId, _world.getInstanceId()); } break; + } case 1: + { addAggroToMobs(); break; + } case 2: + { ThreadPoolManager.schedule(new StatusTask(_world, 3), 100); for (int doorId : SECOND_ROOM_DOORS) { openDoor(doorId, _world.getInstanceId()); } break; + } case 3: + { addAggroToMobs(); break; + } case 4: + { controlStatus(_world); break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java index fb23269af7..5314986e32 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java @@ -168,14 +168,19 @@ public abstract class AbstractSagaQuest extends Quest case "0-013.htm": case "0-014.htm": case "0-015.htm": + { htmltext = event; break; + } case "accept": + { st.startQuest(); giveItems(player, Items[10], 1); htmltext = "0-03.htm"; break; + } case "0-1": + { if (player.getLevel() < 76) { htmltext = "0-02.htm"; @@ -189,7 +194,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "0-05.htm"; } break; + } case "0-2": + { if (player.getLevel() < 76) { takeItems(player, Items[10], -1); @@ -215,11 +222,15 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "0-07.htm"; } break; + } case "1-3": + { st.setCond(3); htmltext = "1-05.htm"; break; + } case "1-4": + { st.setCond(4); takeItems(player, Items[0], 1); if (Items[11] != 0) @@ -229,42 +240,60 @@ public abstract class AbstractSagaQuest extends Quest giveItems(player, Items[1], 1); htmltext = "1-06.htm"; break; + } case "2-1": + { st.setCond(2); htmltext = "2-05.htm"; break; + } case "2-2": + { st.setCond(5); takeItems(player, Items[1], 1); giveItems(player, Items[4], 1); htmltext = "2-06.htm"; break; + } case "3-5": + { htmltext = "3-07.htm"; break; + } case "3-6": + { st.setCond(11); htmltext = "3-02.htm"; break; + } case "3-7": + { st.setCond(12); htmltext = "3-03.htm"; break; + } case "3-8": + { st.setCond(13); takeItems(player, Items[2], 1); giveItems(player, Items[7], 1); htmltext = "3-08.htm"; break; + } case "4-1": + { htmltext = "4-010.htm"; break; + } case "4-2": + { giveItems(player, Items[9], 1); st.setCond(18, true); htmltext = "4-011.htm"; break; + } case "4-3": + { giveItems(player, Items[9], 1); st.setCond(18, true); autoChat(npc, Text[13].replace("PLAYERNAME", player.getName())); @@ -272,19 +301,25 @@ public abstract class AbstractSagaQuest extends Quest cancelQuestTimer("Mob_2 has despawned", npc, player); DeleteSpawn(st, npc); return null; + } case "5-1": + { st.setCond(6, true); takeItems(player, Items[4], 1); cast(npc, player, 4546, 1); htmltext = "5-02.htm"; break; + } case "6-1": + { st.setCond(8, true); takeItems(player, Items[5], 1); cast(npc, player, 4546, 1); htmltext = "6-03.htm"; break; + } case "7-1": + { if (st.getInt("spawned") == 1) { htmltext = "7-03.htm"; @@ -303,25 +338,33 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "7-04.htm"; } break; + } case "7-2": + { st.setCond(10, true); takeItems(player, Items[6], 1); cast(npc, player, 4546, 1); htmltext = "7-06.htm"; break; + } case "8-1": + { st.setCond(14, true); takeItems(player, Items[7], 1); cast(npc, player, 4546, 1); htmltext = "8-02.htm"; break; + } case "9-1": + { st.setCond(17, true); takeItems(player, Items[8], 1); cast(npc, player, 4546, 1); htmltext = "9-03.htm"; break; + } case "10-1": + { if (st.getInt("Quest0") == 0) { final L2Npc Mob_3 = addSpawn(Mob[2], npcSpawnLocations[1], false, 0); @@ -346,30 +389,42 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "10-04.htm"; } break; + } case "10-2": + { st.setCond(19, true); takeItems(player, Items[9], 1); cast(npc, player, 4546, 1); htmltext = "10-06.htm"; break; + } case "11-9": + { st.setCond(15); htmltext = "11-03.htm"; break; + } case "Mob_1 Timer 1": + { autoChat(npc, Text[0].replace("PLAYERNAME", player.getName())); return null; + } case "Mob_1 has despawned": + { autoChat(npc, Text[1].replace("PLAYERNAME", player.getName())); st.set("spawned", "0"); DeleteSpawn(st, npc); return null; + } case "Archon Hellisha has despawned": + { autoChat(npc, Text[6].replace("PLAYERNAME", player.getName())); st.set("spawned", "0"); DeleteSpawn(st, npc); return null; + } case "Mob_3 Timer 1": + { final L2Npc Mob_2 = FindSpawn(player, (L2Npc) L2World.getInstance().findObject(st.getInt("Mob_2"))); if (npc.getKnownList().knowsObject(Mob_2)) { @@ -380,12 +435,16 @@ public abstract class AbstractSagaQuest extends Quest cancelQuestTimer("Mob_3 Timer 1", npc, player); } return null; + } case "Mob_3 has despawned": + { autoChat(npc, Text[15].replace("PLAYERNAME", player.getName())); st.set("Quest0", "2"); DeleteSpawn(st, npc); return null; + } case "Mob_2 Timer 1": + { autoChat(npc, Text[7].replace("PLAYERNAME", player.getName())); startQuestTimer("Mob_2 Timer 2", 1500, npc, player); if (st.getInt("Quest1") == 45) @@ -393,11 +452,15 @@ public abstract class AbstractSagaQuest extends Quest st.set("Quest1", "0"); } return null; + } case "Mob_2 Timer 2": + { autoChat(npc, Text[8].replace("PLAYERNAME", player.getName())); startQuestTimer("Mob_2 Timer 3", 10000, npc, player); return null; + } case "Mob_2 Timer 3": + { if (st.getInt("Quest0") == 0) { startQuestTimer("Mob_2 Timer 3", 13000, npc, player); @@ -411,7 +474,9 @@ public abstract class AbstractSagaQuest extends Quest } } return null; + } case "Mob_2 has despawned": + { st.set("Quest1", String.valueOf(st.getInt("Quest1") + 1)); if ((st.getInt("Quest0") == 1) || (st.getInt("Quest0") == 2) || (st.getInt("Quest1") > 3)) { @@ -432,6 +497,7 @@ public abstract class AbstractSagaQuest extends Quest startQuestTimer("Mob_2 has despawned", 1000, npc, player); } return null; + } } } return htmltext; @@ -756,12 +822,15 @@ public abstract class AbstractSagaQuest extends Quest switch (st.getCond()) { case 0: + { if (npcId == _npc[0]) { htmltext = "0-01.htm"; } break; + } case 1: + { if (npcId == _npc[0]) { htmltext = "0-04.htm"; @@ -771,7 +840,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "2-01.htm"; } break; + } case 2: + { if (npcId == _npc[2]) { htmltext = "2-02.htm"; @@ -781,7 +852,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "1-01.htm"; } break; + } case 3: + { if ((npcId == _npc[1]) && hasQuestItems(player, Items[0])) { if ((Items[11] == 0) || hasQuestItems(player, Items[11])) @@ -794,7 +867,9 @@ public abstract class AbstractSagaQuest extends Quest } } break; + } case 4: + { if (npcId == _npc[1]) { htmltext = "1-04.htm"; @@ -804,7 +879,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "2-03.htm"; } break; + } case 5: + { if (npcId == _npc[2]) { htmltext = "2-04.htm"; @@ -814,7 +891,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "5-01.htm"; } break; + } case 6: + { if (npcId == _npc[5]) { htmltext = "5-03.htm"; @@ -824,13 +903,17 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "6-01.htm"; } break; + } case 7: + { if (npcId == _npc[6]) { htmltext = "6-02.htm"; } break; + } case 8: + { if (npcId == _npc[6]) { htmltext = "6-04.htm"; @@ -840,13 +923,17 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "7-01.htm"; } break; + } case 9: + { if (npcId == _npc[7]) { htmltext = "7-05.htm"; } break; + } case 10: + { if (npcId == _npc[7]) { htmltext = "7-07.htm"; @@ -856,8 +943,10 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "3-01.htm"; } break; + } case 11: case 12: + { if (npcId == _npc[3]) { if (hasQuestItems(player, Items[2])) @@ -870,7 +959,9 @@ public abstract class AbstractSagaQuest extends Quest } } break; + } case 13: + { if (npcId == _npc[3]) { htmltext = "3-06.htm"; @@ -880,7 +971,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "8-01.htm"; } break; + } case 14: + { if (npcId == _npc[8]) { htmltext = "8-03.htm"; @@ -890,7 +983,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "11-01.htm"; } break; + } case 15: + { if (npcId == _npc[11]) { htmltext = "11-02.htm"; @@ -900,13 +995,17 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "9-01.htm"; } break; + } case 16: + { if (npcId == _npc[9]) { htmltext = "9-02.htm"; } break; + } case 17: + { if (npcId == _npc[9]) { htmltext = "9-04.htm"; @@ -916,13 +1015,17 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "10-01.htm"; } break; + } case 18: + { if (npcId == _npc[10]) { htmltext = "10-05.htm"; } break; + } case 19: + { if (npcId == _npc[10]) { htmltext = "10-07.htm"; @@ -932,7 +1035,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "0-06.htm"; } break; + } case 20: + { if (npcId == _npc[0]) { if (player.getLevel() >= 76) @@ -961,6 +1066,7 @@ public abstract class AbstractSagaQuest extends Quest } } break; + } } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java index d7bcca3b8a..5aa91a1cee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java @@ -66,15 +66,20 @@ public class Q00002_WhatWomenWant extends Quest switch (event) { case "30223-04.htm": + { st.startQuest(); giveItems(player, ARUJIENS_LETTER1, 1); break; + } case "30223-08.html": + { takeItems(player, ARUJIENS_LETTER3, -1); giveItems(player, POETRY_BOOK, 1); st.setCond(4, true); break; + } case "30223-09.html": + { giveAdena(player, 450, true); st.exitQuest(false, true); // Newbie Guide @@ -82,11 +87,16 @@ public class Q00002_WhatWomenWant extends Quest addExpAndSp(player, 4254, 335); giveAdena(player, 1850, true); break; + } case "30223-03.html": + { break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -99,27 +109,40 @@ public class Q00002_WhatWomenWant extends Quest switch (npc.getId()) { case ARUJIEN: + { switch (st.getState()) { case State.CREATED: + { htmltext = ((player.getRace() != Race.ELF) && (player.getRace() != Race.HUMAN)) ? "30223-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30223-02.htm" : "30223-01.html"; break; + } case State.STARTED: + { switch (st.getCond()) { case 1: + { htmltext = "30223-05.html"; break; + } case 2: + { htmltext = "30223-06.html"; break; + } case 3: + { htmltext = "30223-07.html"; break; + } case 4: + { htmltext = "30223-10.html"; break; + } case 5: + { giveItems(player, EARRING, 1); st.exitQuest(false, true); htmltext = "30223-11.html"; @@ -128,14 +151,20 @@ public class Q00002_WhatWomenWant extends Quest addExpAndSp(player, 4254, 335); giveAdena(player, 1850, true); break; + } } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case MIRABEL: + { if (st.isStarted()) { if (st.isCond(1)) @@ -151,7 +180,9 @@ public class Q00002_WhatWomenWant extends Quest } } break; + } case HERBIEL: + { if (st.isStarted() && (st.getCond() > 1)) { if (st.isCond(2)) @@ -167,7 +198,9 @@ public class Q00002_WhatWomenWant extends Quest } } break; + } case GREENIS: + { if (st.isStarted()) { if (st.isCond(4)) @@ -187,6 +220,7 @@ public class Q00002_WhatWomenWant extends Quest } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java index b1c55b3175..deec139c0a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java @@ -69,13 +69,19 @@ public class Q00003_WillTheSealBeBroken extends Quest switch (event) { case "30141-03.htm": + { st.startQuest(); break; + } case "30141-05.html": + { break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -92,17 +98,23 @@ public class Q00003_WillTheSealBeBroken extends Quest switch (npc.getId()) { case OMEN_BEAST: + { giveItem(member, st, OMEN_BEAST_EYE, getRegisteredItemIds()); break; + } case STINK_ZOMBIE: case TAINTED_ZOMBIE: + { giveItem(member, st, TAINT_STONE, getRegisteredItemIds()); break; + } case LESSER_SUCCUBUS: case LESSER_SUCCUBUS_TILFO: case LESSER_SUCCUBUS_TUREN: + { giveItem(member, st, SUCCUBUS_BLOOD, getRegisteredItemIds()); break; + } } return super.onKill(npc, player, isSummon); } @@ -115,9 +127,12 @@ public class Q00003_WillTheSealBeBroken extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getRace() != Race.DARK_ELF) ? "30141-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30141-02.htm" : "30141-01.html"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30141-04.html"; @@ -129,9 +144,12 @@ public class Q00003_WillTheSealBeBroken extends Quest htmltext = "30141-06.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java index e22205b761..a2a8181d14 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java @@ -71,13 +71,19 @@ public class Q00004_LongLiveThePaagrioLord extends Quest switch (event) { case "30578-03.htm": + { st.startQuest(); break; + } case "30578-05.html": + { break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -90,12 +96,16 @@ public class Q00004_LongLiveThePaagrioLord extends Quest switch (npc.getId()) { case NAKUSIN: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getRace() != Race.ORC) ? "30578-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30578-02.htm" : "30578-01.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30578-04.html"; @@ -111,29 +121,45 @@ public class Q00004_LongLiveThePaagrioLord extends Quest htmltext = "30578-06.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case VARKEES: + { htmltext = giveItem(player, st, npc.getId(), HONEY_KHANDAR, getRegisteredItemIds()); break; + } case URUTU: + { htmltext = giveItem(player, st, npc.getId(), DEEP_SEA_ORB, getRegisteredItemIds()); break; + } case HESTUI: + { htmltext = giveItem(player, st, npc.getId(), BEAR_FUR_CLOAK, getRegisteredItemIds()); break; + } case KUNAI: + { htmltext = giveItem(player, st, npc.getId(), SPIDER_DUST, getRegisteredItemIds()); break; + } case USKA: + { htmltext = giveItem(player, st, npc.getId(), ANCESTOR_SKULL, getRegisteredItemIds()); break; + } case GROOKIN: + { htmltext = giveItem(player, st, npc.getId(), BLOODY_AXE, getRegisteredItemIds()); break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java index 2eb2eaed45..8b5d4ed733 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java @@ -68,11 +68,14 @@ public class Q00005_MinersFavor extends Quest switch (event) { case "30554-03.htm": + { st.startQuest(); giveItems(player, BOLTERS_LIST, 1); giveItems(player, BOLTERS_SMELLY_SOCKS, 1); break; + } case "30526-02.html": + { if (!hasQuestItems(player, BOLTERS_SMELLY_SOCKS)) { return "30526-04.html"; @@ -81,11 +84,16 @@ public class Q00005_MinersFavor extends Quest giveItems(player, MINERS_PICK, 1); checkProgress(player, st); break; + } case "30554-05.html": + { break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -98,12 +106,16 @@ public class Q00005_MinersFavor extends Quest switch (npc.getId()) { case BOLTER: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "30554-02.htm" : "30554-01.html"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30554-04.html"; @@ -119,26 +131,38 @@ public class Q00005_MinersFavor extends Quest htmltext = "30554-06.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case BRUNON: + { if (st.isStarted()) { htmltext = (hasQuestItems(player, MINERS_PICK)) ? "30526-03.html" : "30526-01.html"; } break; + } case REED: + { htmltext = giveItem(player, st, npc.getId(), REDSTONE_BEER); break; + } case SHARI: + { htmltext = giveItem(player, st, npc.getId(), BOOMBOOM_POWDER); break; + } case GARITA: + { htmltext = giveItem(player, st, npc.getId(), MINING_BOOTS); break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java index 2ff4b1b38f..2d59c6c74e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java @@ -595,7 +595,9 @@ public final class Q00022_TragedyInVonHellmannForest extends Quest break; } default: + { break; + } } } break; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java index 0ff7cbf517..b4334f2039 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java @@ -73,6 +73,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest { // Dorian case "31389-02.htm": + { final QuestState qs = player.getQuestState(Q00023_LidiasHeart.class.getSimpleName()); if ((player.getLevel() >= 65) && (qs != null) && qs.isCompleted()) { @@ -81,18 +82,26 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest return "31389-03.htm"; } break; + } case "31389-08.html": + { st.set("var", "1"); break; + } case "31389-13.html": + { giveItems(player, SILVER_CROSS_OF_EINHASAD, 1); st.setCond(3, true); st.unset("var"); break; + } case "31389-18.html": + { playSound(player, QuestSound.INTERFACESOUND_CHARSTAT_OPEN); break; + } case "31389-19.html": + { if (!hasQuestItems(player, BROKEN_SILVER_CROSS_OF_EINHASAD)) { return getNoQuestMsg(player); @@ -100,6 +109,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest takeItems(player, BROKEN_SILVER_CROSS_OF_EINHASAD, -1); st.setCond(5, true); break; + } case "31389-06.html": case "31389-07.html": case "31389-10.html": @@ -107,13 +117,18 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest case "31389-12.html": case "31389-16.html": case "31389-17.html": + { break; + } // Lidia Maid case "31532-04.html": + { giveItems(player, LIDIA_LETTER, 1); st.setCond(6, true); break; + } case "31532-07.html": + { if (st.isCond(8)) { if (!hasQuestItems(player, LIDIA_HAIRPIN, LIDIA_LETTER)) @@ -133,16 +148,23 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest } } break; + } case "31532-10.html": + { st.set("var", "2"); break; + } case "31532-14.html": + { st.set("var", "3"); break; + } case "31532-19.html": + { st.unset("var"); st.setCond(9, true); break; + } case "31532-02.html": case "31532-03.html": case "31532-09.html": @@ -152,9 +174,12 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest case "31532-16.html": case "31532-17.html": case "31532-18.html": + { break; + } // Mysterious Wizard case "31522-03.html": + { if (!hasQuestItems(player, SUSPICIOUS_TOTEM_DOLL)) { return getNoQuestMsg(player); @@ -162,18 +187,25 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest takeItems(player, SUSPICIOUS_TOTEM_DOLL, 1); st.set("var", "1"); break; + } case "31522-08.html": + { st.unset("var"); st.setCond(11, true); break; + } case "31522-17.html": + { st.set("var", "1"); break; + } case "31522-21.html": + { giveItems(player, TOTEM, 1); addExpAndSp(player, 242105, 22529); // GoD: Harmony: 6191140 exp and 6118650 sp st.exitQuest(false, true); break; + } case "31522-02.html": case "31522-05.html": case "31522-06.html": @@ -187,9 +219,12 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest case "31522-16.html": case "31522-19.html": case "31522-20.html": + { break; + } // Tombstone case "31531-02.html": + { if (!hasQuestItems(player, FLOWER_BOUQUET)) { return getNoQuestMsg(player); @@ -197,9 +232,12 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest takeItems(player, FLOWER_BOUQUET, -1); st.setCond(2, true); break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -226,46 +264,69 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest switch (npc.getId()) { case DORIAN: + { switch (st.getState()) { case State.CREATED: + { htmltext = "31389-01.htm"; break; + } case State.STARTED: + { switch (st.getCond()) { case 1: + { htmltext = "31389-04.html"; break; + } case 2: + { htmltext = (st.getInt("var") == 0) ? "31389-05.html" : "31389-09.html"; break; + } case 3: + { htmltext = "31389-14.html"; break; + } case 4: + { htmltext = "31389-15.html"; break; + } case 5: + { htmltext = "31389-20.html"; break; + } case 6: case 8: + { htmltext = "31389-22.html"; break; + } case 7: + { giveItems(player, LIDIA_HAIRPIN, 1); st.setCond(8, true); htmltext = "31389-21.html"; break; + } } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case MYSTERIOUS_WIZARD: + { if (st.isStarted()) { if (st.isCond(10)) @@ -286,7 +347,9 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest } } break; + } case TOMBSTONE: + { if (st.isStarted()) { if (st.isCond(1)) @@ -300,44 +363,65 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest } } break; + } case LIDIA_MAID: + { if (st.isStarted()) { switch (st.getCond()) { case 5: + { htmltext = "31532-01.html"; break; + } case 6: + { htmltext = "31532-05.html"; break; + } case 7: + { htmltext = "31532-07a.html"; break; + } case 8: + { switch (st.getInt("var")) { case 0: + { htmltext = "31532-07a.html"; break; + } case 1: + { htmltext = "31532-08.html"; break; + } case 2: + { htmltext = "31532-11.html"; break; + } case 3: + { htmltext = "31532-15.html"; break; + } } break; + } case 9: case 10: + { htmltext = "31532-20.html"; break; + } } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java index d3a28813c8..f0f4e2a18a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java @@ -60,9 +60,12 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest switch (event) { case "31570-03.htm": + { st.startQuest(); break; + } case "31570-05.htm": + { if (st.isCond(1) && hasQuestItems(player, BLUE_TREASURE_BOX)) { htmltext = "31570-06.htm"; @@ -71,7 +74,9 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest takeItems(player, BLUE_TREASURE_BOX, -1); } break; + } case "31434-02.htm": + { if (st.isCond(2) && hasQuestItems(player, STRANGE_BLUESPRINT)) { giveItems(player, BLACK_PEARL_RING, 1); @@ -79,7 +84,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest htmltext = "31434-01.htm"; } break; - + } } return htmltext; } @@ -93,9 +98,12 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest switch (st.getState()) { case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } case State.CREATED: + { final QuestState qs = player.getQuestState(Q00050_LanoscosSpecialBait.class.getSimpleName()); if (npc.getId() == LANOSCO) { @@ -106,10 +114,13 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest } } break; + } case State.STARTED: + { switch (npc.getId()) { case LANOSCO: + { if (st.isCond(1)) { if (hasQuestItems(player, BLUE_TREASURE_BOX)) @@ -126,13 +137,17 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest htmltext = "31570-07.htm"; } break; + } case SHALING: + { if (st.isCond(2)) { htmltext = "31434-00.htm"; } break; + } } + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java index a2384d0e60..f72f792114 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java @@ -60,9 +60,12 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest switch (event) { case "31572-04.htm": + { st.startQuest(); break; + } case "31572-08.htm": + { if (st.isCond(1) && hasQuestItems(player, YELLOW_TREASURE_BOX)) { giveItems(player, KIKIS_LETTER, 1); @@ -71,7 +74,9 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest htmltext = "31572-07.htm"; } break; + } case "31442-03.htm": + { if (st.isCond(2) && hasQuestItems(player, KIKIS_LETTER)) { giveItems(player, ELVEN_RING, 1); @@ -79,7 +84,7 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest htmltext = "31442-02.htm"; } break; - + } } return htmltext; } @@ -94,9 +99,12 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest switch (st.getState()) { case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } case State.CREATED: + { final QuestState qs = player.getQuestState(Q00051_OFullesSpecialBait.class.getSimpleName()); if (npcId == OFULLE) { @@ -107,32 +115,43 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest } } break; + } case State.STARTED: + { switch (npcId) { case OFULLE: + { switch (st.getCond()) { case 1: + { htmltext = "31572-06.htm"; if (hasQuestItems(player, YELLOW_TREASURE_BOX)) { htmltext = "31572-05.htm"; } break; + } case 2: + { htmltext = "31572-09.htm"; break; + } } break; + } case KIKI: + { if (st.isCond(2)) { htmltext = "31442-01.htm"; } break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java index f57063187e..a1dac145a2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java @@ -60,9 +60,12 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest switch (event) { case "31574-04.htm": + { st.startQuest(); break; + } case "31574-08.htm": + { if (st.isCond(1) && hasQuestItems(player, PURPLE_TREASURE_BOX)) { giveItems(player, SMALL_GLASS_BOX, 1); @@ -71,7 +74,9 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest htmltext = "31574-07.htm"; } break; + } case "30909-03.htm": + { if (st.isCond(2) && hasQuestItems(player, SMALL_GLASS_BOX)) { giveItems(player, PLATED_LEATHER_GLOVES, 1); @@ -79,7 +84,7 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest htmltext = "30909-02.htm"; } break; - + } } return htmltext; } @@ -94,9 +99,12 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest switch (st.getState()) { case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } case State.CREATED: + { final QuestState qs = player.getQuestState(Q00052_WilliesSpecialBait.class.getSimpleName()); if (npcId == WILLIE) { @@ -107,32 +115,43 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest } } break; + } case State.STARTED: + { switch (npcId) { case WILLIE: + { switch (st.getCond()) { case 1: + { htmltext = "31574-06.htm"; if (hasQuestItems(player, PURPLE_TREASURE_BOX)) { htmltext = "31574-05.htm"; } break; + } case 2: + { htmltext = "31574-09.htm"; break; + } } break; + } case ANABEL: + { if (st.isCond(2)) { htmltext = "30909-01.htm"; } break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java index f908913c76..1aea3d5339 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java @@ -60,9 +60,12 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest switch (event) { case "31577-02.htm": + { st.startQuest(); break; + } case "31577-04a.htm": + { if (st.isCond(1) && hasQuestItems(player, RED_TREASURE_BOX)) { giveItems(player, RUKAL_MUSICAL, 1); @@ -71,7 +74,9 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest htmltext = "31577-04.htm"; } break; + } case "30629-02.htm": + { if (st.isCond(2) && hasQuestItems(player, RUKAL_MUSICAL)) { giveItems(player, PROTECTION_NECKLACE, 1); @@ -79,6 +84,7 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest htmltext = "30629-03.htm"; } break; + } } return htmltext; } @@ -94,9 +100,12 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest switch (st.getState()) { case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } case State.CREATED: + { final QuestState qs = player.getQuestState(Q00053_LinnaeusSpecialBait.class.getSimpleName()); if (npcId == LINNAEUS) { @@ -107,32 +116,43 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest } } break; + } case State.STARTED: + { switch (npcId) { case LINNAEUS: + { switch (st.getCond()) { case 1: + { htmltext = "31577-03a.htm"; if (hasQuestItems(player, RED_TREASURE_BOX)) { htmltext = "31577-03.htm"; } break; + } case 2: + { htmltext = "31577-05.htm"; break; + } } break; + } case RUKAL: + { if (st.isCond(2)) { htmltext = "30629-01.htm"; } break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java index ddf870786d..205ef7ce2d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java @@ -147,6 +147,7 @@ public class Q00043_HelpTheSister extends Quest switch (npc.getId()) { case COOPER: + { switch (qs.getState()) { case State.CREATED: @@ -193,6 +194,7 @@ public class Q00043_HelpTheSister extends Quest } } break; + } case GALLADUCCI: { if (qs.isStarted()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java index 92e8c7a387..5617f13201 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java @@ -61,9 +61,12 @@ public class Q00050_LanoscosSpecialBait extends Quest switch (event) { case "31570-03.htm": + { st.startQuest(); break; + } case "31570-07.html": + { if ((st.isCond(2)) && (getQuestItemsCount(player, ESSENCE_OF_WIND) >= 100)) { htmltext = "31570-06.htm"; @@ -71,6 +74,7 @@ public class Q00050_LanoscosSpecialBait extends Quest st.exitQuest(false, true); } break; + } } return htmltext; } @@ -114,14 +118,20 @@ public class Q00050_LanoscosSpecialBait extends Quest switch (st.getState()) { case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } case State.CREATED: + { htmltext = (player.getLevel() >= 27) ? "31570-01.htm" : "31570-02.html"; break; + } case State.STARTED: + { htmltext = (st.isCond(1)) ? "31570-05.html" : "31570-04.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java index 75c3209dca..4cecc6561d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java @@ -60,9 +60,12 @@ public class Q00051_OFullesSpecialBait extends Quest switch (event) { case "31572-03.htm": + { st.startQuest(); break; + } case "31572-07.html": + { if ((st.isCond(2)) && (getQuestItemsCount(player, LOST_BAIT) >= 100)) { htmltext = "31572-06.htm"; @@ -70,6 +73,7 @@ public class Q00051_OFullesSpecialBait extends Quest st.exitQuest(false, true); } break; + } } return htmltext; } @@ -110,14 +114,20 @@ public class Q00051_OFullesSpecialBait extends Quest switch (st.getState()) { case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } case State.CREATED: + { htmltext = (player.getLevel() >= 36) ? "31572-01.htm" : "31572-02.html"; break; + } case State.STARTED: + { htmltext = (st.isCond(1)) ? "31572-05.html" : "31572-04.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java index 968d173be7..952c14c7b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java @@ -60,9 +60,12 @@ public class Q00052_WilliesSpecialBait extends Quest switch (event) { case "31574-03.htm": + { st.startQuest(); break; + } case "31574-07.html": + { if (st.isCond(2) && (getQuestItemsCount(player, TARLK_EYE) >= 100)) { htmltext = "31574-06.htm"; @@ -70,6 +73,7 @@ public class Q00052_WilliesSpecialBait extends Quest st.exitQuest(false, true); } break; + } } return htmltext; } @@ -110,14 +114,20 @@ public class Q00052_WilliesSpecialBait extends Quest switch (st.getState()) { case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } case State.CREATED: + { htmltext = (player.getLevel() >= 48) ? "31574-01.htm" : "31574-02.html"; break; + } case State.STARTED: + { htmltext = (st.isCond(1)) ? "31574-05.html" : "31574-04.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java index 24e3abfb6c..609be20f12 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java @@ -66,9 +66,12 @@ public class Q00053_LinnaeusSpecialBait extends Quest switch (event) { case "31577-1.htm": + { st.startQuest(); break; + } case "31577-3.htm": + { if (st.isCond(2) && (getQuestItemsCount(player, CRIMSON_DRAKE_HEART) >= 100)) { giveItems(player, FLAMING_FISHING_LURE, 4); @@ -79,6 +82,7 @@ public class Q00053_LinnaeusSpecialBait extends Quest htmltext = "31577-5.html"; } break; + } } return htmltext; } @@ -122,14 +126,20 @@ public class Q00053_LinnaeusSpecialBait extends Quest switch (st.getState()) { case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } case State.CREATED: + { htmltext = ((player.getLevel() > 59) && (fishingLevel(player) > 19)) ? "31577-0.htm" : "31577-0a.html"; break; + } case State.STARTED: + { htmltext = (st.isCond(1)) ? "31577-4.html" : "31577-2.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java index 26e9211155..28eda39251 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java @@ -82,9 +82,12 @@ public class Q00112_WalkOfFate extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() < MIN_LEVEL) ? "30572-03.html" : "30572-01.htm"; break; + } case State.STARTED: + { switch (npc.getId()) { case LIVINA: @@ -99,6 +102,7 @@ public class Q00112_WalkOfFate extends Quest } } break; + } case State.COMPLETED: { htmltext = getAlreadyCompletedMsg(player); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java index 34b7439d5c..ff3ce5cb3a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java @@ -99,14 +99,20 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest switch (qs.getCond()) { case 3: + { htmltext = "32041-12.html"; break; + } case 4: + { htmltext = "32041-13.html"; break; + } case 5: + { htmltext = "32041-14.html"; break; + } } break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java index ac6e709708..b70cc4c3b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java @@ -87,40 +87,55 @@ public class Q00125_TheNameOfEvil1 extends Quest switch (event) { case "32114-05.html": + { qs.startQuest(); break; + } case "32114-08.html": + { if (qs.isCond(1)) { giveItems(player, GAZKH_FRAGMENT, 1); qs.setCond(2, true); } break; + } case "32117-09.html": + { if (qs.isCond(2)) { qs.setCond(3, true); } break; + } case "32117-15.html": + { if (qs.isCond(4)) { qs.setCond(5, true); } break; + } case "T_One": + { qs.set("T", "1"); htmltext = "32119-04.html"; break; + } case "E_One": + { qs.set("E", "1"); htmltext = "32119-05.html"; break; + } case "P_One": + { qs.set("P", "1"); htmltext = "32119-06.html"; break; + } case "U_One": + { qs.set("U", "1"); if (qs.isCond(5) && (qs.getInt("T") > 0) && (qs.getInt("E") > 0) && (qs.getInt("P") > 0) && (qs.getInt("U") > 0)) { @@ -136,32 +151,44 @@ public class Q00125_TheNameOfEvil1 extends Quest qs.unset("P"); qs.unset("U"); break; + } case "32119-07.html": + { qs.unset("T"); qs.unset("E"); qs.unset("P"); qs.unset("U"); break; + } case "32119-18.html": + { if (qs.isCond(5)) { qs.setCond(6, true); qs.unset("Memo"); } break; + } case "T_Two": + { qs.set("T", "1"); htmltext = "32120-04.html"; break; + } case "O_Two": + { qs.set("O", "1"); htmltext = "32120-05.html"; break; + } case "O2_Two": + { qs.set("O2", "1"); htmltext = "32120-06.html"; break; + } case "N_Two": + { qs.set("N", "1"); if (qs.isCond(6) && (qs.getInt("T") > 0) && (qs.getInt("O") > 0) && (qs.getInt("O2") > 0) && (qs.getInt("N") > 0)) { @@ -177,31 +204,43 @@ public class Q00125_TheNameOfEvil1 extends Quest qs.unset("O2"); qs.unset("N"); break; + } case "32120-07.html": + { qs.unset("T"); qs.unset("O"); qs.unset("O2"); qs.unset("N"); + } case "32120-17.html": + { if (qs.isCond(6)) { qs.setCond(7, true); qs.unset("Memo"); } break; + } case "W_Three": + { qs.set("W", "1"); htmltext = "32121-04.html"; break; + } case "A_Three": + { qs.set("A", "1"); htmltext = "32121-05.html"; break; + } case "G_Three": + { qs.set("G", "1"); htmltext = "32121-06.html"; break; + } case "U_Three": + { qs.set("U", "1"); if (qs.isCond(7) && (qs.getInt("W") > 0) && (qs.getInt("A") > 0) && (qs.getInt("G") > 0) && (qs.getInt("U") > 0)) { @@ -217,19 +256,27 @@ public class Q00125_TheNameOfEvil1 extends Quest qs.unset("G"); qs.unset("U"); break; + } case "32121-07.html": + { qs.unset("W"); qs.unset("A"); qs.unset("G"); qs.unset("U"); break; + } case "32121-11.html": + { qs.set("Memo", "2"); break; + } case "32121-16.html": + { qs.set("Memo", "3"); break; + } case "32121-18.html": + { if (qs.isCond(7) && hasQuestItems(player, GAZKH_FRAGMENT)) { giveItems(player, EPITAPH_OF_WISDOM, 1); @@ -238,6 +285,7 @@ public class Q00125_TheNameOfEvil1 extends Quest qs.unset("Memo"); } break; + } } return htmltext; } @@ -283,9 +331,11 @@ public class Q00125_TheNameOfEvil1 extends Quest switch (npc.getId()) { case MUSHIKA: + { switch (qs.getState()) { case State.CREATED: + { if (player.getLevel() < 76) { htmltext = "32114-01a.htm"; @@ -296,23 +346,32 @@ public class Q00125_TheNameOfEvil1 extends Quest htmltext = ((qs != null) && qs.isCompleted()) ? "32114-01.htm" : "32114-01b.htm"; } break; + } case State.STARTED: + { switch (qs.getCond()) { case 1: + { htmltext = "32114-09.html"; break; + } case 2: + { htmltext = "32114-10.html"; break; + } case 3: case 4: case 5: case 6: case 7: + { htmltext = "32114-11.html"; break; + } case 8: + { if (hasQuestItems(player, EPITAPH_OF_WISDOM)) { htmltext = "32114-12.html"; @@ -320,28 +379,41 @@ public class Q00125_TheNameOfEvil1 extends Quest qs.exitQuest(false, true); } break; + } } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case KARAKAWEI: + { if (qs.isStarted()) { switch (qs.getCond()) { case 1: + { htmltext = "32117-01.html"; break; + } case 2: + { htmltext = "32117-02.html"; break; + } case 3: + { htmltext = "32117-10.html"; break; + } case 4: + { if ((getQuestItemsCount(player, ORNITHOMIMUS_CLAW) >= 2) && (getQuestItemsCount(player, DEINONYCHUS_BONE) >= 2)) { takeItems(player, ORNITHOMIMUS_CLAW, -1); @@ -349,20 +421,29 @@ public class Q00125_TheNameOfEvil1 extends Quest htmltext = "32117-11.html"; } break; + } case 5: + { htmltext = "32117-16.html"; break; + } case 6: case 7: + { htmltext = "32117-17.html"; break; + } case 8: + { htmltext = "32117-18.html"; break; + } } } break; + } case ULU_KAIMU: + { if (qs.isStarted()) { switch (qs.getCond()) @@ -371,9 +452,12 @@ public class Q00125_TheNameOfEvil1 extends Quest case 2: case 3: case 4: + { htmltext = "32119-01.html"; break; + } case 5: + { if (qs.get("Memo") == null) { htmltext = "32119-02.html"; @@ -388,16 +472,23 @@ public class Q00125_TheNameOfEvil1 extends Quest htmltext = "32119-09.html"; } break; + } case 6: + { htmltext = "32119-18.html"; break; + } default: + { htmltext = "32119-19.html"; break; + } } } break; + } case BALU_KAIMU: + { if (qs.isStarted()) { switch (qs.getCond()) @@ -407,9 +498,12 @@ public class Q00125_TheNameOfEvil1 extends Quest case 3: case 4: case 5: + { htmltext = "32120-01.html"; break; + } case 6: + { if (qs.get("Memo") == null) { htmltext = "32120-02.html"; @@ -424,16 +518,23 @@ public class Q00125_TheNameOfEvil1 extends Quest htmltext = "32120-09.html"; } break; + } case 7: + { htmltext = "32120-17.html"; break; + } default: + { htmltext = "32119-18.html"; break; + } } } break; + } case CHUTA_KAIMU: + { if (qs.isStarted()) { switch (qs.getCond()) @@ -444,12 +545,16 @@ public class Q00125_TheNameOfEvil1 extends Quest case 4: case 5: case 6: + { htmltext = "32121-01.html"; break; + } case 7: + { switch (qs.getInt("Memo")) { case 0: + { htmltext = "32121-02.html"; npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); qs.unset("W"); @@ -457,23 +562,34 @@ public class Q00125_TheNameOfEvil1 extends Quest qs.unset("G"); qs.unset("U"); break; + } case 1: + { htmltext = "32121-09.html"; break; + } case 2: + { htmltext = "32121-19.html"; break; + } case 3: + { htmltext = "32121-20.html"; break; + } } break; + } case 8: + { htmltext = "32121-21.html"; break; + } } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java index 3d08b33ccf..eaaf0fec2f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java @@ -66,116 +66,161 @@ public class Q00126_TheNameOfEvil2 extends Quest switch (event) { case "32115-1.html": + { qs.startQuest(); break; + } case "32115-1b.html": + { if (qs.isCond(1)) { qs.setCond(2, true); } break; + } case "32119-3.html": + { if (qs.isCond(2)) { qs.setCond(3, true); } break; + } case "32119-4.html": + { if (qs.isCond(3)) { qs.setCond(4, true); } break; + } case "32119-4a.html": case "32119-5b.html": + { playSound(player, QuestSound.ETCSOUND_ELROKI_SONG_1ST); break; + } case "32119-5.html": + { if (qs.isCond(4)) { qs.setCond(5, true); } break; + } case "32120-3.html": + { if (qs.isCond(5)) { qs.setCond(6, true); } break; + } case "32120-4.html": + { if (qs.isCond(6)) { qs.setCond(7, true); } break; + } case "32120-4a.html": case "32120-5b.html": + { playSound(player, QuestSound.ETCSOUND_ELROKI_SONG_2ND); break; + } case "32120-5.html": + { if (qs.isCond(7)) { qs.setCond(8, true); } break; + } case "32121-3.html": + { if (qs.isCond(8)) { qs.setCond(9, true); } break; + } case "32121-4.html": + { if (qs.isCond(9)) { qs.setCond(10, true); } break; + } case "32121-4a.html": case "32121-5b.html": + { playSound(player, QuestSound.ETCSOUND_ELROKI_SONG_3RD); break; + } case "32121-5.html": + { if (qs.isCond(10)) { giveItems(player, GAZKH_FRAGMENT, 1); qs.setCond(11, true); } break; + } case "32122-2a.html": + { npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); break; + } case "32122-2d.html": + { takeItems(player, GAZKH_FRAGMENT, -1); break; + } case "32122-3.html": + { if (qs.isCond(12)) { qs.setCond(13, true); } break; + } case "32122-4.html": + { if (qs.isCond(13)) { qs.setCond(14, true); } break; + } case "DO_One": + { qs.set("DO", "1"); event = "32122-4d.html"; break; + } case "MI_One": + { qs.set("MI", "1"); event = "32122-4f.html"; break; + } case "FA_One": + { qs.set("FA", "1"); event = "32122-4h.html"; break; + } case "SOL_One": + { qs.set("SOL", "1"); event = "32122-4j.html"; break; + } case "FA2_One": + { qs.set("FA2", "1"); if (qs.isCond(14) && (qs.getInt("DO") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("FA2") > 0)) { @@ -192,30 +237,42 @@ public class Q00126_TheNameOfEvil2 extends Quest qs.unset("SOL"); qs.unset("FA2"); break; + } case "32122-4m.html": + { qs.unset("DO"); qs.unset("MI"); qs.unset("FA"); qs.unset("SOL"); qs.unset("FA2"); break; + } case "FA_Two": + { qs.set("FA", "1"); event = "32122-5a.html"; break; + } case "SOL_Two": + { qs.set("SOL", "1"); event = "32122-5c.html"; break; + } case "TI_Two": + { qs.set("TI", "1"); event = "32122-5e.html"; break; + } case "SOL2_Two": + { qs.set("SOL2", "1"); event = "32122-5g.html"; break; + } case "FA2_Two": + { qs.set("FA2", "1"); if (qs.isCond(15) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("TI") > 0) && (qs.getInt("SOL2") > 0) && (qs.getInt("FA2") > 0)) { @@ -232,30 +289,42 @@ public class Q00126_TheNameOfEvil2 extends Quest qs.unset("SOL2"); qs.unset("FA2"); break; + } case "32122-5i.html": + { qs.unset("FA"); qs.unset("SOL"); qs.unset("TI"); qs.unset("SOL2"); qs.unset("FA2"); break; + } case "SOL_Three": + { qs.set("SOL", "1"); event = "32122-6a.html"; break; + } case "FA_Three": + { qs.set("FA", "1"); event = "32122-6c.html"; break; + } case "MI_Three": + { qs.set("MI", "1"); event = "32122-6e.html"; break; + } case "FA2_Three": + { qs.set("FA2", "1"); event = "32122-6g.html"; break; + } case "MI2_Three": + { qs.set("MI2", "1"); if (qs.isCond(16) && (qs.getInt("SOL") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA2") > 0) && (qs.getInt("MI2") > 0)) { @@ -272,61 +341,80 @@ public class Q00126_TheNameOfEvil2 extends Quest qs.unset("FA2"); qs.unset("MI2"); break; + } case "32122-6i.html": + { qs.unset("SOL"); qs.unset("FA"); qs.unset("MI"); qs.unset("FA2"); qs.unset("MI2"); break; + } case "32122-7.html": + { giveItems(player, BONE_POWDER, 1); playSound(player, QuestSound.ETCSOUND_ELROKI_SONG_FULL); npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); break; + } case "32122-8.html": + { if (qs.isCond(17)) { qs.setCond(18, true); } break; + } case "32109-2.html": + { if (qs.isCond(18)) { qs.setCond(19, true); } break; + } case "32109-3.html": + { if (qs.isCond(19)) { takeItems(player, BONE_POWDER, -1); qs.setCond(20, true); } break; + } case "32115-4.html": + { if (qs.isCond(20)) { qs.setCond(21, true); } break; + } case "32115-5.html": + { if (qs.isCond(21)) { qs.setCond(22, true); } break; + } case "32114-2.html": + { if (qs.isCond(22)) { qs.setCond(23, true); } break; + } case "32114-3.html": + { rewardItems(player, ENCHANT_WEAPON_A, 1); giveAdena(player, 460483, true); addExpAndSp(player, 1015973, 102802); qs.exitQuest(false, true); break; + } } return event; } @@ -340,9 +428,11 @@ public class Q00126_TheNameOfEvil2 extends Quest switch (npc.getId()) { case ASAMAH: + { switch (qs.getState()) { case State.CREATED: + { if (player.getLevel() < 77) { htmltext = "32115-0.htm"; @@ -353,15 +443,21 @@ public class Q00126_TheNameOfEvil2 extends Quest htmltext = ((qs != null) && qs.isCompleted()) ? "32115-0a.htm" : "32115-0b.htm"; } break; + } case State.STARTED: + { switch (qs.getCond()) { case 1: + { htmltext = "32115-1d.html"; break; + } case 2: + { htmltext = "32115-1c.html"; break; + } case 3: case 4: case 5: @@ -379,49 +475,74 @@ public class Q00126_TheNameOfEvil2 extends Quest case 17: case 18: case 19: + { htmltext = "32115-2.html"; break; + } case 20: + { htmltext = "32115-3.html"; break; + } case 21: + { htmltext = "32115-4j.html"; break; + } case 22: + { htmltext = "32115-5a.html"; break; + } } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case ULU_KAIMU: + { if (qs.isStarted()) { switch (qs.getCond()) { case 1: + { htmltext = "32119-1.html"; break; + } case 2: + { htmltext = "32119-2.html"; npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); break; + } case 3: + { htmltext = "32119-3c.html"; break; + } case 4: + { htmltext = "32119-4c.html"; break; + } case 5: + { htmltext = "32119-5a.html"; break; + } } } break; + } case BALU_KAIMU: + { if (qs.isStarted()) { switch (qs.getCond()) @@ -430,25 +551,37 @@ public class Q00126_TheNameOfEvil2 extends Quest case 2: case 3: case 4: + { htmltext = "32120-1.html"; break; + } case 5: + { htmltext = "32120-2.html"; npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); break; + } case 6: + { htmltext = "32120-3c.html"; break; + } case 7: + { htmltext = "32120-4c.html"; break; + } default: + { htmltext = "32120-5a.html"; break; + } } } break; + } case CHUTA_KAIMU: + { if (qs.isStarted()) { switch (qs.getCond()) @@ -460,25 +593,37 @@ public class Q00126_TheNameOfEvil2 extends Quest case 5: case 6: case 7: + { htmltext = "32121-1.html"; break; + } case 8: + { htmltext = "32121-2.html"; npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); break; + } case 9: + { htmltext = "32121-3e.html"; break; + } case 10: + { htmltext = "32121-4e.html"; break; + } default: + { htmltext = "32121-5a.html"; break; + } } } break; + } case WARRIORS_GRAVE: + { if (qs.isStarted()) { switch (qs.getCond()) @@ -493,19 +638,28 @@ public class Q00126_TheNameOfEvil2 extends Quest case 8: case 9: case 10: + { htmltext = "32122-1.html"; break; + } case 11: + { htmltext = "32122-2.html"; qs.setCond(12, true); break; + } case 12: + { htmltext = "32122-2l.html"; break; + } case 13: + { htmltext = "32122-3b.html"; break; + } case 14: + { htmltext = "32122-4.html"; qs.unset("DO"); qs.unset("MI"); @@ -513,7 +667,9 @@ public class Q00126_TheNameOfEvil2 extends Quest qs.unset("SOL"); qs.unset("FA2"); break; + } case 15: + { htmltext = "32122-5.html"; qs.unset("FA"); qs.unset("SOL"); @@ -521,7 +677,9 @@ public class Q00126_TheNameOfEvil2 extends Quest qs.unset("SOL2"); qs.unset("FA2"); break; + } case 16: + { htmltext = "32122-6.html"; qs.unset("SOL"); qs.unset("FA"); @@ -529,19 +687,28 @@ public class Q00126_TheNameOfEvil2 extends Quest qs.unset("FA2"); qs.unset("MI2"); break; + } case 17: + { htmltext = hasQuestItems(player, BONE_POWDER) ? "32122-7.html" : "32122-7b.html"; break; + } case 18: + { htmltext = "32122-8.html"; break; + } default: + { htmltext = "32122-9.html"; break; + } } } break; + } case SHILENS_STONE_STATUE: + { if (qs.isStarted()) { switch (qs.getCond()) @@ -563,27 +730,39 @@ public class Q00126_TheNameOfEvil2 extends Quest case 15: case 16: case 17: + { htmltext = "32109-1a.html"; break; + } case 18: + { if (hasQuestItems(player, BONE_POWDER)) { htmltext = "32109-1.html"; } break; + } case 19: + { htmltext = "32109-2l.html"; break; + } case 20: + { htmltext = "32109-5.html"; break; + } default: + { htmltext = "32109-4.html"; break; + } } } break; + } case MUSHIKA: + { if (qs.isStarted()) { if (qs.getCond() < 22) @@ -600,6 +779,7 @@ public class Q00126_TheNameOfEvil2 extends Quest } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java index c748d3e721..80b7ef4786 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java @@ -97,13 +97,13 @@ public final class Q00132_MatrasCuriosity extends Quest switch (npc.getId()) { case DEMON_PRINCE: + { pl = getRandomPartyMember(player, "rewarded_prince", "1"); if (pl != null) { final QuestState st = getQuestState(pl, false); giveItems(player, BLUEPRINT_PRINCE, 1); st.set("rewarded_prince", "2"); - if (hasQuestItems(player, BLUEPRINT_RANKU)) { st.setCond(2, true); @@ -114,14 +114,15 @@ public final class Q00132_MatrasCuriosity extends Quest } } break; + } case RANKU: + { pl = getRandomPartyMember(player, "rewarded_ranku", "1"); if (pl != null) { final QuestState st = getQuestState(pl, false); giveItems(player, BLUEPRINT_RANKU, 1); st.set("rewarded_ranku", "2"); - if (hasQuestItems(player, BLUEPRINT_PRINCE)) { st.setCond(2, true); @@ -132,6 +133,7 @@ public final class Q00132_MatrasCuriosity extends Quest } } break; + } } return null; } @@ -156,6 +158,7 @@ public final class Q00132_MatrasCuriosity extends Quest { case 1: case 2: + { if (hasQuestItems(player, BLUEPRINT_RANKU) && hasQuestItems(player, BLUEPRINT_PRINCE)) { takeItems(player, BLUEPRINT_RANKU, -1); @@ -167,10 +170,12 @@ public final class Q00132_MatrasCuriosity extends Quest { htmltext = "32245-04.htm"; } - break; + } case 3: + { htmltext = "32245-06.htm"; + } } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index ffc48dd967..d5437691c4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -480,128 +480,133 @@ public class Q00144_PailakaInjuredDragon extends Quest { case VARKA_SILENOS_FOOTMAN: case VARKA_SILENOS_RECRUIT: + { dropHerb(npc, player, HP_HERBS_DROPLIST); if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (Rnd.get(100) < 25)) { giveItems(player, STAGE1, 1); } - // Spawns Mage Type silenos behind the one that was killed. spawnMageBehind(npc, player, VARKA_SILENOS_MEDIUM); - // Check if all the first row have been killed. Despawn mages. checkIfLastInWall(npc); break; + } case VARKA_SILENOS_WARRIOR: + { dropHerb(npc, player, HP_HERBS_DROPLIST); if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (Rnd.get(100) < 25)) { giveItems(player, STAGE1, 1); } - // Spawns Mage Type silenos behind the one that was killed. spawnMageBehind(npc, player, VARKA_SILENOS_PRIEST); - // Check if all the first row have been killed. Despawn mages. checkIfLastInWall(npc); break; + } case VARKA_ELITE_GUARD: + { dropHerb(npc, player, HP_HERBS_DROPLIST); if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (Rnd.get(100) < 25)) { giveItems(player, STAGE1, 1); } - // Spawns Mage Type silenos behind the one that was killed. spawnMageBehind(npc, player, VARKA_SILENOS_SHAMAN); - // Check if all the first row have been killed. Despawn mages. checkIfLastInWall(npc); break; + } case VARKAS_COMMANDER: case VARKA_SILENOS_OFFICER: + { dropHerb(npc, player, HP_HERBS_DROPLIST); if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (Rnd.get(100) < 25)) { giveItems(player, STAGE1, 1); } - // Spawns Mage Type silenos behind the one that was killed. spawnMageBehind(npc, player, VARKA_SILENOS_SEER); - // Check if all the first row have been killed. Despawn mages. checkIfLastInWall(npc); break; + } case VARKA_SILENOS_GREAT_MAGUS: case VARKA_SILENOS_GENERAL: + { dropHerb(npc, player, HP_HERBS_DROPLIST); if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (Rnd.get(100) < 25)) { giveItems(player, STAGE2, 1); } - // Spawns Mage Type silenos behind the one that was killed. spawnMageBehind(npc, player, VARKA_SILENOS_MAGNUS); - // Check if all the first row have been killed. Despawn mages. checkIfLastInWall(npc); break; + } case VARKAS_PROPHET: + { dropHerb(npc, player, HP_HERBS_DROPLIST); if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (Rnd.get(100) < 25)) { giveItems(player, STAGE2, 1); } - // Spawns Mage Type silenos behind the one that was killed. spawnMageBehind(npc, player, DISCIPLE_OF_PROPHET); - // Check if all the first row have been killed. Despawn mages. checkIfLastInWall(npc); break; + } case VARKA_SILENOS_HEAD_GUARD: + { dropHerb(npc, player, HP_HERBS_DROPLIST); if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (Rnd.get(100) < 25)) { giveItems(player, STAGE2, 1); } - // Spawns Mage Type silenos behind the one that was killed. spawnMageBehind(npc, player, VARKA_HEAD_MAGUS); - // Check if all the first row have been killed. Despawn mages. checkIfLastInWall(npc); break; + } case PROPHET_GUARD: + { dropHerb(npc, player, HP_HERBS_DROPLIST); if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (Rnd.get(100) < 25)) { giveItems(player, STAGE2, 1); } - // Spawns Mage Type silenos behind the one that was killed. spawnMageBehind(npc, player, VARKA_SILENOS_GREAT_SEER); - // Check if all the first row have been killed. Despawn mages. checkIfLastInWall(npc); break; + } case LATANA: + { qs.setCond(4, true); - // Spawns Ketra Orc Supporter. addSpawn(KETRA_ORC_SUPPORTER2, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 0, false, npc.getInstanceId()); break; + } case ANTYLOPE_1: case ANTYLOPE_2: case ANTYLOPE_3: case FLAVA: + { dropItem(npc, player); break; + } default: + { // hardcoded herb drops. dropHerb(npc, player, HP_HERBS_DROPLIST); dropHerb(npc, player, MP_HERBS_DROPLIST); break; + } } return super.onKill(npc, player, isSummon); } @@ -679,45 +684,61 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_FOOTMAN: case VARKA_SILENOS_RECRUIT: case VARKA_SILENOS_WARRIOR: + { switch (knownNpc.getId()) { case VARKA_SILENOS_FOOTMAN: case VARKA_SILENOS_RECRUIT: case VARKA_SILENOS_WARRIOR: + { return; + } } break; + } case VARKA_ELITE_GUARD: case VARKAS_COMMANDER: case VARKA_SILENOS_OFFICER: + { switch (knownNpc.getId()) { case VARKA_ELITE_GUARD: case VARKAS_COMMANDER: case VARKA_SILENOS_OFFICER: + { return; + } } break; + } case VARKA_SILENOS_GREAT_MAGUS: case VARKA_SILENOS_GENERAL: case VARKAS_PROPHET: + { switch (knownNpc.getId()) { case VARKA_SILENOS_GREAT_MAGUS: case VARKA_SILENOS_GENERAL: case VARKAS_PROPHET: + { return; + } } break; + } case VARKA_SILENOS_HEAD_GUARD: case PROPHET_GUARD: + { switch (knownNpc.getId()) { case VARKA_SILENOS_HEAD_GUARD: case PROPHET_GUARD: + { return; + } } break; + } } } @@ -735,50 +756,66 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_FOOTMAN: case VARKA_SILENOS_RECRUIT: case VARKA_SILENOS_WARRIOR: + { switch (knownNpc.getId()) { case VARKA_SILENOS_MEDIUM: case VARKA_SILENOS_PRIEST: + { knownNpc.abortCast(); knownNpc.deleteMe(); break; + } } break; + } case VARKA_ELITE_GUARD: case VARKAS_COMMANDER: case VARKA_SILENOS_OFFICER: + { switch (knownNpc.getId()) { case VARKA_SILENOS_SHAMAN: case VARKA_SILENOS_SEER: + { knownNpc.abortCast(); knownNpc.deleteMe(); break; + } } break; + } case VARKA_SILENOS_GREAT_MAGUS: case VARKA_SILENOS_GENERAL: case VARKAS_PROPHET: + { switch (knownNpc.getId()) { case VARKA_SILENOS_MAGNUS: case DISCIPLE_OF_PROPHET: + { knownNpc.abortCast(); knownNpc.deleteMe(); break; + } } break; + } case VARKA_SILENOS_HEAD_GUARD: case PROPHET_GUARD: + { switch (knownNpc.getId()) { case VARKA_HEAD_MAGUS: case VARKA_SILENOS_GREAT_SEER: + { knownNpc.abortCast(); knownNpc.deleteMe(); break; + } } break; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java index d6dd222240..6a1f5919b7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java @@ -88,6 +88,7 @@ public class Q00147_PathtoBecominganEliteMercenary extends Quest switch (st.getState()) { case State.CREATED: + { if ((player.getClan() != null) && (player.getClan().getCastleId() > 0)) { htmltext = "castle.htm"; @@ -97,7 +98,9 @@ public class Q00147_PathtoBecominganEliteMercenary extends Quest htmltext = "elite-01.htm"; } break; + } case State.STARTED: + { if (st.getCond() < 4) { htmltext = "elite-05.htm"; @@ -110,9 +113,12 @@ public class Q00147_PathtoBecominganEliteMercenary extends Quest htmltext = "elite-06.htm"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java index 9a75816d98..378098cca7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java @@ -85,6 +85,7 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest switch (st.getState()) { case State.CREATED: + { final QuestState _prev = player.getQuestState(Q00147_PathtoBecominganEliteMercenary.class.getSimpleName()); if ((player.getClan() != null) && (player.getClan().getCastleId() > 0)) { @@ -106,7 +107,9 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest } } break; + } case State.STARTED: + { if (st.getCond() < 4) { htmltext = "exalted-04.htm"; @@ -119,9 +122,12 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest htmltext = "exalted-05.htm"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java index 29b89d130b..cb90d44068 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java @@ -89,12 +89,16 @@ public class Q00151_CureForFever extends Quest switch (npc.getId()) { case ELLIAS: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "30050-02.htm" : "30050-01.htm"; break; + } case State.STARTED: + { if (st.isCond(3) && hasQuestItems(player, FEVER_MEDICINE)) { giveItems(player, ROUND_SHIELD, 1); @@ -112,12 +116,17 @@ public class Q00151_CureForFever extends Quest htmltext = "30050-04.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case YOHANES: + { if (st.isStarted()) { if (st.isCond(2) && hasQuestItems(player, POISON_SAC)) @@ -133,6 +142,7 @@ public class Q00151_CureForFever extends Quest } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java index 5dd894f926..94a8648148 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java @@ -84,9 +84,12 @@ public class Q00153_DeliverGoods extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= 2) ? "30041-01.htm" : "30041-00.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30041-03.html"; @@ -105,9 +108,12 @@ public class Q00153_DeliverGoods extends Quest htmltext = "30041-04.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java index 5a9b8114a0..767c517dd7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java @@ -67,20 +67,29 @@ public class Q00155_FindSirWindawood extends Quest switch (npc.getId()) { case ABELLOS: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "30042-02.htm" : "30042-01.htm"; break; + } case State.STARTED: + { htmltext = "30042-04.html"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case SIR_COLLIN_WINDAWOOD: + { if (st.isStarted() && hasQuestItems(player, OFFICIAL_LETTER)) { giveItems(player, HASTE_POTION, 1); @@ -88,6 +97,7 @@ public class Q00155_FindSirWindawood extends Quest htmltext = "30311-01.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java index 56fe3667a8..c4f740f465 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java @@ -96,9 +96,12 @@ public class Q00158_SeedOfEvil extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "30031-02.htm" : "30031-01.html"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30031-04.html"; @@ -112,9 +115,12 @@ public class Q00158_SeedOfEvil extends Quest htmltext = "30031-05.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java index 77dd1d0544..ed39e607cb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java @@ -59,15 +59,20 @@ public class Q00161_FruitOfTheMotherTree extends Quest switch (event) { case "30362-04.htm": + { st.startQuest(); giveItems(player, ANDELLRIAS_LETTER, 1); break; + } case "30371-03.html": + { break; + } default: + { htmltext = null; break; - + } } return htmltext; } @@ -81,12 +86,16 @@ public class Q00161_FruitOfTheMotherTree extends Quest switch (npc.getId()) { case ANDELLIA: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30362-03.htm" : "30362-02.htm" : "30362-01.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30362-05.html"; @@ -99,12 +108,17 @@ public class Q00161_FruitOfTheMotherTree extends Quest htmltext = "30362-06.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case THALIA: + { if (st.isStarted()) { if (st.isCond(1) && hasQuestItems(player, ANDELLRIAS_LETTER)) @@ -120,6 +134,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java index ff9e2dfd3e..e837c642cb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java @@ -93,9 +93,12 @@ public class Q00170_DangerousSeduction extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30305-01.htm" : "30305-02.htm" : "30305-03.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30305-05.html"; @@ -108,9 +111,12 @@ public class Q00170_DangerousSeduction extends Quest htmltext = "30305-06.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java index 04047867f2..73e865bfaa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java @@ -60,16 +60,22 @@ public class Q00172_NewHorizons extends Quest switch (event) { case "32140-04.htm": + { st.startQuest(); break; + } case "32163-02.html": + { giveItems(player, SCROLL_OF_ESCAPE_GIRAN, 1); giveItems(player, MARK_OF_TRAVELER, 1); st.exitQuest(false, true); break; + } default: + { htmltext = null; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java index 51c4c0dd5a..8457f4c117 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java @@ -63,22 +63,30 @@ public class Q00173_ToTheIsleOfSouls extends Quest switch (event) { case "30097-03.htm": + { st.startQuest(); giveItems(player, GALLADUCCIS_ORDER, 1); break; + } case "30097-06.html": + { giveItems(player, SCROLL_OF_ESCAPE_KAMAEL_VILLAGE, 1); takeItems(player, MARK_OF_TRAVELER, 1); st.exitQuest(false, true); break; + } case "30094-02.html": + { st.setCond(2, true); takeItems(player, GALLADUCCIS_ORDER, -1); giveItems(player, MAGIC_SWORD_HILT, 1); break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -92,26 +100,36 @@ public class Q00173_ToTheIsleOfSouls extends Quest switch (npc.getId()) { case GALLADUCCI: + { switch (st.getState()) { case State.CREATED: + { final QuestState qs = player.getQuestState(Q00172_NewHorizons.class.getSimpleName()); htmltext = ((qs != null) && qs.isCompleted() && (player.getRace() == Race.KAMAEL) && hasQuestItems(player, MARK_OF_TRAVELER)) ? "30097-01.htm" : "30097-02.htm"; break; + } case State.STARTED: + { htmltext = (st.isCond(1)) ? "30097-04.html" : "30097-05.html"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case GENTLER: + { if (st.isStarted()) { htmltext = (st.isCond(1)) ? "30094-01.html" : "30094-03.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java index f91defe896..531947782a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java @@ -84,26 +84,37 @@ public class Q00174_SupplyCheck extends Quest switch (npc.getId()) { case MARCELA: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "32173-01.htm" : "32173-02.htm"; break; + } case State.STARTED: + { switch (st.getCond()) { case 1: + { htmltext = "32173-04.html"; break; + } case 2: + { st.setCond(3, true); takeItems(player, WAREHOUSE_MANIFEST, -1); htmltext = "32173-05.html"; break; + } case 3: + { htmltext = "32173-06.html"; break; + } case 4: + { for (int itemId : REWARD) { giveItems(player, itemId, 1); @@ -115,52 +126,73 @@ public class Q00174_SupplyCheck extends Quest showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE, 2, 5000); htmltext = "32173-07.html"; break; + } } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case BENIS: + { if (st.isStarted()) { switch (st.getCond()) { case 1: + { st.setCond(2, true); giveItems(player, WAREHOUSE_MANIFEST, 1); htmltext = "32170-01.html"; break; + } case 2: + { htmltext = "32170-02.html"; break; + } default: + { htmltext = "32170-03.html"; break; + } } } break; + } case NIKA: + { if (st.isStarted()) { switch (st.getCond()) { case 1: case 2: + { htmltext = "32167-01.html"; break; + } case 3: + { st.setCond(4, true); giveItems(player, GROCERY_STORE_MANIFEST, 1); htmltext = "32167-02.html"; break; + } case 4: + { htmltext = "32167-03.html"; break; + } } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java index c92ed67898..e6d878b336 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java @@ -64,9 +64,12 @@ public class Q00176_StepsForHonor extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "36479-03.html" : "36479-02.html"; break; + } case State.STARTED: + { if (TerritoryWarManager.getInstance().isTWInProgress()) { return "36479-05.html"; @@ -74,39 +77,58 @@ public class Q00176_StepsForHonor extends Quest switch (st.getCond()) { case 1: + { htmltext = "36479-06.html"; break; + } case 2: + { st.setCond(3, true); htmltext = "36479-07.html"; break; + } case 3: + { htmltext = "36479-08.html"; break; + } case 4: + { st.setCond(5, true); htmltext = "36479-09.html"; break; + } case 5: + { htmltext = "36479-10.html"; break; + } case 6: + { st.setCond(7, true); htmltext = "36479-11.html"; break; + } case 7: + { htmltext = "36479-12.html"; break; + } case 8: + { giveItems(player, CLOAK, 1); st.exitQuest(false, true); htmltext = "36479-13.html"; break; + } } break; + } case State.COMPLETED: + { htmltext = "36479-01.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java index dcf52ed303..437d7ae328 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java @@ -88,6 +88,7 @@ public class Q00179_IntoTheLargeCavern extends Quest switch (st.getState()) { case State.CREATED: + { if (player.getRace() != Race.KAMAEL) { htmltext = "32138-00b.html"; @@ -110,15 +111,20 @@ public class Q00179_IntoTheLargeCavern extends Quest } } break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "32138-03.htm"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } } else if ((npc.getId() == MENACING_MACHINE) && (st.getState() == State.STARTED)) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java index 9acb2ddc44..3e0742115a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java @@ -86,6 +86,7 @@ public class Q00182_NewRecruits extends Quest switch (st.getState()) { case State.CREATED: + { final int level = player.getLevel(); if (player.getRace() == Race.KAMAEL) { @@ -100,15 +101,20 @@ public class Q00182_NewRecruits extends Quest htmltext = "32138-00b.html"; } break; + } case State.STARTED: + { if (st.getInt("cond") == 1) { htmltext = "32138-04.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } } else if ((npcId == MENACING_MACHINE) && st.isStarted()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java index 17b51aca62..1a69c0a42a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java @@ -197,11 +197,17 @@ public final class Q00234_FatesWhisper extends Quest switch (qs.getMemoState()) { case 6: + { return "30178-01.html"; + } case 7: + { return "30178-03.html"; + } case 8: + { return "30178-04.html"; + } } break; } @@ -346,83 +352,109 @@ public final class Q00234_FatesWhisper extends Quest switch (qs.getMemoState()) { case 11: + { if (hasAtLeastOneQuestItem(player, SWORD_OF_DAMASCUS, SWORD_OF_DAMASCUS_FOCUS, SWORD_OF_DAMASCUS_CRT_DAMAGE, SWORD_OF_DAMASCUS_HASTE)) { return "31002-35.html"; } return "31002-35a.html"; + } case 12: + { if (hasAtLeastOneQuestItem(player, HAZARD_BOW_GUIDENCE, HAZARD_BOW_QUICKRECOVERY, HAZARD_BOW_CHEAPSHOT, HAZARD_BOW)) { return "31002-36.html"; } return "31002-36a.html"; + } case 13: + { if (hasAtLeastOneQuestItem(player, LANCIA_ANGER, LANCIA_CRT_STUN, LANCIA_LONGBLOW, LANCIA)) { return "31002-37.html"; } return "31002-37a.html"; + } case 14: + { if (hasAtLeastOneQuestItem(player, ART_OF_BATTLE_AXE_HEALTH, ART_OF_BATTLE_AXE_RSK_FOCUS, ART_OF_BATTLE_AXE_HASTE, ART_OF_BATTLE_AXE)) { return "31002-38.html"; } return "31002-38a.html"; + } case 15: + { if (hasAtLeastOneQuestItem(player, STAFF_OF_EVIL_SPRIT_MAGICFOCUS, STAFF_OF_EVIL_SPRIT_MAGICBLESSTHEBODY, STAFF_OF_EVIL_SPRIT_MAGICPOISON, STAFF_OF_EVIL_SPRIT)) { return "31002-39.html"; } return "31002-39a.html"; + } case 16: + { if (hasAtLeastOneQuestItem(player, DEMONS_SWORD_CRT_BLEED, DEMONS_SWORD_CRT_POISON, DEMONS_SWORD_MIGHTMOTAL, DEMONS_SWORD)) { return "31002-40.html"; } return "31002-40a.html"; + } case 17: + { if (hasAtLeastOneQuestItem(player, BELLION_CESTUS_CRT_DRAIN, BELLION_CESTUS_CRT_POISON, BELLION_CESTUS_RSK_HASTE, BELLION_CESTUS)) { return "31002-41.html"; } return "31002-41a.html"; + } case 18: + { if (hasAtLeastOneQuestItem(player, DEADMANS_GLORY_ANGER, DEADMANS_GLORY_HEALTH, DEADMANS_GLORY_HASTE, DEADMANS_GLORY)) { return "31002-42.html"; } return "31002-42a.html"; + } case 19: + { if (hasAtLeastOneQuestItem(player, SAMURAI_LONGSWORD_SAMURAI_LONGSWORD)) { return "31002-43.html"; } return "31002-43a.html"; + } case 41: + { if (hasAtLeastOneQuestItem(player, GUARDIANS_SWORD, GUARDIANS_SWORD_CRT_DRAIN, GUARDIANS_SWORD_HEALTH, GUARDIANS_SWORD_CRT_BLEED)) { return "31002-43b.html"; } return "31002-43c.html"; + } case 42: + { if (hasAtLeastOneQuestItem(player, TEARS_OF_WIZARD, TEARS_OF_WIZARD_ACUMEN, TEARS_OF_WIZARD_MAGICPOWER, TEARS_OF_WIZARD_UPDOWN)) { return "31002-43d.html"; } return "31002-43e.html"; + } case 43: + { if (hasAtLeastOneQuestItem(player, STAR_BUSTER, STAR_BUSTER_HEALTH, STAR_BUSTER_HASTE, STAR_BUSTER_RSK_FOCUS)) { return "31002-43f.html"; } return "31002-43g.html"; + } case 44: + { if (hasAtLeastOneQuestItem(player, BONE_OF_KAIM_VANUL, BONE_OF_KAIM_VANUL_MANAUP, BONE_OF_KAIM_VANUL_MAGICSILENCE, BONE_OF_KAIM_VANUL_UPDOWN)) { return "31002-43h.html"; } return "31002-43i.html"; + } } break; } @@ -605,11 +637,17 @@ public final class Q00234_FatesWhisper extends Quest switch (eventID) { case 1: + { return "31002-02.htm"; + } case 2: + { return "31002-03.html"; + } case 3: + { return "31002-04.html"; + } case 4: { if (!qs.isCompleted() && (player.getLevel() >= 75)) @@ -996,31 +1034,57 @@ public final class Q00234_FatesWhisper extends Quest switch (qs.getMemoState()) { case 11: + { return getReward(qs, player, SWORD_OF_DAMASCUS, SWORD_OF_DAMASCUS_FOCUS, SWORD_OF_DAMASCUS_CRT_DAMAGE, SWORD_OF_DAMASCUS_HASTE, REWARD); + } case 12: + { return getReward(qs, player, HAZARD_BOW, HAZARD_BOW_GUIDENCE, HAZARD_BOW_QUICKRECOVERY, HAZARD_BOW_CHEAPSHOT, REWARD); + } case 13: + { return getReward(qs, player, LANCIA, LANCIA_ANGER, LANCIA_CRT_STUN, LANCIA_LONGBLOW, REWARD); + } case 14: + { return getReward(qs, player, ART_OF_BATTLE_AXE, ART_OF_BATTLE_AXE_HEALTH, ART_OF_BATTLE_AXE_RSK_FOCUS, ART_OF_BATTLE_AXE_HASTE, REWARD); + } case 15: + { return getReward(qs, player, STAFF_OF_EVIL_SPRIT, STAFF_OF_EVIL_SPRIT_MAGICFOCUS, STAFF_OF_EVIL_SPRIT_MAGICBLESSTHEBODY, STAFF_OF_EVIL_SPRIT_MAGICPOISON, REWARD); + } case 16: + { return getReward(qs, player, DEMONS_SWORD, DEMONS_SWORD_CRT_BLEED, DEMONS_SWORD_CRT_POISON, DEMONS_SWORD_MIGHTMOTAL, REWARD); + } case 17: + { return getReward(qs, player, BELLION_CESTUS, BELLION_CESTUS_CRT_DRAIN, BELLION_CESTUS_CRT_POISON, BELLION_CESTUS_RSK_HASTE, REWARD); + } case 18: + { return getReward(qs, player, DEADMANS_GLORY, DEADMANS_GLORY_ANGER, DEADMANS_GLORY_HEALTH, DEADMANS_GLORY_HASTE, REWARD); + } case 19: + { return getReward(qs, player, SAMURAI_LONGSWORD_SAMURAI_LONGSWORD, 0, 0, 0, REWARD); + } case 41: + { return getReward(qs, player, GUARDIANS_SWORD, GUARDIANS_SWORD_CRT_DRAIN, GUARDIANS_SWORD_HEALTH, GUARDIANS_SWORD_CRT_BLEED, REWARD); + } case 42: + { return getReward(qs, player, TEARS_OF_WIZARD, TEARS_OF_WIZARD_ACUMEN, TEARS_OF_WIZARD_MAGICPOWER, TEARS_OF_WIZARD_UPDOWN, REWARD); + } case 43: + { return getReward(qs, player, STAR_BUSTER, STAR_BUSTER_HEALTH, STAR_BUSTER_HASTE, STAR_BUSTER_RSK_FOCUS, REWARD); + } case 44: + { return getReward(qs, player, BONE_OF_KAIM_VANUL, BONE_OF_KAIM_VANUL_MANAUP, BONE_OF_KAIM_VANUL_MAGICSILENCE, BONE_OF_KAIM_VANUL_UPDOWN, REWARD); + } } return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java index 17f51e5e26..3eaab6243c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java @@ -77,17 +77,23 @@ public class Q00249_PoisonedPlainsOfTheLizardmen extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= 82) ? "30196-01.htm" : "30196-00.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30196-04.htm"; } break; + } case State.COMPLETED: + { htmltext = "30196-05.htm"; break; + } } } else if (npc.getId() == JOHNNY) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java index 53f69b11b3..e1b06433b2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java @@ -144,9 +144,12 @@ public class Q00250_WatchWhatYouEat extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= 82) ? "32743-01.htm" : "32743-00.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "32743-04.htm"; @@ -167,9 +170,12 @@ public class Q00250_WatchWhatYouEat extends Quest } } break; + } case State.COMPLETED: + { htmltext = "32743-done.htm"; break; + } } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java index a484dacb22..d5c35cfedf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java @@ -121,9 +121,12 @@ public class Q00251_NoSecrets extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() > 81) ? "30201-01.htm" : "30201-00.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30201-05.htm"; @@ -136,9 +139,12 @@ public class Q00251_NoSecrets extends Quest st.exitQuest(false, true); } break; + } case State.COMPLETED: + { htmltext = "30201-06.htm"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java index 6a36dba6e4..f34e88a263 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java @@ -70,16 +70,21 @@ public class Q00252_ItSmellsDelicious extends Quest switch (event) { case "30200-04.htm": + { htmltext = event; break; + } case "30200-05.htm": + { if (qs.isCreated()) { qs.startQuest(); htmltext = event; } break; + } case "30200-08.html": + { if (qs.isCond(2)) { giveAdena(player, 147656, true); @@ -88,6 +93,7 @@ public class Q00252_ItSmellsDelicious extends Quest htmltext = event; } break; + } } return htmltext; } @@ -148,14 +154,18 @@ public class Q00252_ItSmellsDelicious extends Quest switch (qs.getCond()) { case 1: + { htmltext = "30200-06.html"; break; + } case 2: + { if (hasMaxDiaries(qs) && hasMaxCookbookPages(qs)) { htmltext = "30200-07.html"; } break; + } } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java index 9a5cc34c19..fc38d1a318 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java @@ -281,11 +281,13 @@ public class Q00255_Tutorial extends Quest break; } case 2: + { qs.playTutorialVoice("tutorial_voice_003"); html = "tutorial_02.htm"; qs.onTutorialClientEvent(1); qs.set("Ex", "-5"); break; + } case 3: { html = "tutorial_03.htm"; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java index af2b094a1e..f74a2232f4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java @@ -93,9 +93,12 @@ public class Q00277_GatekeepersOffering extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = "30576-02.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30576-04.html"; @@ -107,6 +110,7 @@ public class Q00277_GatekeepersOffering extends Quest htmltext = "30576-05.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java index 078cfa0ed0..62a5431e0a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java @@ -108,9 +108,12 @@ public class Q00287_FiguringItOut extends Quest switch (event) { case "32742-03.htm": + { st.startQuest(); break; + } case "Icarus": + { if (getQuestItemsCount(player, VIAL_OF_TANTA_BLOOD) >= 500) { final ItemHolder holder = ICARUS[getRandom(ICARUS.length)]; @@ -124,7 +127,9 @@ public class Q00287_FiguringItOut extends Quest htmltext = "32742-07.html"; } break; + } case "Moirai": + { if (getQuestItemsCount(player, VIAL_OF_TANTA_BLOOD) >= 100) { final ItemHolder holder = MOIRAI[getRandom(MOIRAI.length)]; @@ -138,22 +143,31 @@ public class Q00287_FiguringItOut extends Quest htmltext = "32742-09.html"; } break; + } case "32742-11.html": + { if (!hasQuestItems(player, VIAL_OF_TANTA_BLOOD)) { st.exitQuest(true, true); htmltext = "32742-12.html"; } break; + } case "32742-13.html": + { st.exitQuest(true, true); break; + } case "32742-02.htm": case "32742-10.html": + { break; + } default: + { htmltext = null; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java index eb5611ebc8..356f3066f3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java @@ -191,9 +191,12 @@ public class Q00288_HandleWithCare extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() < MIN_LEVEL) ? "32741-01.html" : "32741-02.htm"; break; + } case State.STARTED: + { if (st.isCond(1) && !hasQuestItems(player, HIGH_GRADE_LIZARD_SCALE) && !hasQuestItems(player, MIDDLE_GRADE_LIZARD_SCALE)) { htmltext = "32741-05.html"; @@ -202,12 +205,12 @@ public class Q00288_HandleWithCare extends Quest { htmltext = "32741-06.html"; } - if (st.isCond(2) && hasQuestItems(player, HIGH_GRADE_LIZARD_SCALE)) { htmltext = "32741-07.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java index 18383f4c49..56f6b1c2d0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java @@ -242,15 +242,19 @@ public class Q00289_NoMoreSoupForYou extends Quest switch (st.getState()) { case State.CREATED: + { final QuestState _prev = player.getQuestState(Q00252_ItSmellsDelicious.class.getSimpleName()); htmltext = ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 82)) ? "30200-01.htm" : "30200-00.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = (getQuestItemsCount(player, SOUP) >= 100) ? "30200-04.htm" : "30200-03.htm"; } break; + } } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java index 0f50b87bed..5bfdea4a10 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java @@ -93,9 +93,12 @@ public class Q00297_GatekeepersFavor extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = "30540-02.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30540-04.html"; @@ -107,6 +110,7 @@ public class Q00297_GatekeepersFavor extends Quest htmltext = "30540-05.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java index 0af63fbce3..be65612612 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java @@ -143,45 +143,65 @@ public class Q00308_ReedFieldMaintenance extends Quest case "32646-07.html": case "32646-08.html": case "32646-10.html": + { htmltext = event; break; + } case "32646-04.html": + { st.startQuest(); player.sendPacket(new RadarControl(0, 2, 77325, 205773, -3432)); htmltext = event; break; + } case "claimreward": + { final QuestState q238 = player.getQuestState(Q00238_SuccessFailureOfBusiness.class.getName()); htmltext = ((q238 != null) && q238.isCompleted()) ? "32646-09.html" : "32646-12.html"; break; + } case "100": case "120": + { htmltext = onItemExchangeRequest(player, MOIRAI_PIECES[getRandom(MOIRAI_PIECES.length - 1)], Integer.parseInt(event)); break; + } case "192": case "230": + { htmltext = onItemExchangeRequest(player, REC_DYNASTY_EARRINGS_70, Integer.parseInt(event)); break; + } case "256": case "308": + { htmltext = onItemExchangeRequest(player, REC_DYNASTY_NECKLACE_70, Integer.parseInt(event)); break; + } case "128": case "154": + { htmltext = onItemExchangeRequest(player, REC_DYNASTY_RING_70, Integer.parseInt(event)); break; + } case "206": case "246": + { htmltext = onItemExchangeRequest(player, REC_DYNASTY_SIGIL_60, Integer.parseInt(event)); break; + } case "180": case "216": + { htmltext = onItemExchangeRequest(player, MOIRAI_RECIPES[getRandom(MOIRAI_RECIPES.length - 1)], Integer.parseInt(event)); break; + } case "32646-11.html": + { st.exitQuest(true, true); htmltext = event; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java index f313c20ddd..f1baf250fb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java @@ -144,46 +144,66 @@ public class Q00309_ForAGoodCause extends Quest case "32647-10.html": case "32647-12.html": case "32647-13.html": + { htmltext = event; break; + } case "32647-05.html": + { st.startQuest(); player.sendPacket(new RadarControl(0, 2, 77325, 205773, -3432)); htmltext = event; break; + } case "claimreward": + { final QuestState q239 = player.getQuestState(Q00239_WontYouJoinUs.class.getSimpleName()); htmltext = ((q239 != null) && q239.isCompleted()) ? "32647-11.html" : "32647-09.html"; break; + } case "100": case "120": + { htmltext = onItemExchangeRequest(player, MOIRAI_PIECES[getRandom(MOIRAI_PIECES.length - 1)], Integer.parseInt(event)); break; + } case "192": case "230": + { htmltext = onItemExchangeRequest(player, REC_DYNASTY_EARRINGS_70, Integer.parseInt(event)); break; + } case "256": case "308": + { htmltext = onItemExchangeRequest(player, REC_DYNASTY_NECKLACE_70, Integer.parseInt(event)); break; + } case "128": case "154": + { htmltext = onItemExchangeRequest(player, REC_DYNASTY_RING_70, Integer.parseInt(event)); break; + } case "206": case "246": + { htmltext = onItemExchangeRequest(player, REC_DYNASTY_SIGIL_60, Integer.parseInt(event)); break; + } case "180": case "216": + { htmltext = onItemExchangeRequest(player, MOIRAI_RECIPES[getRandom(MOIRAI_RECIPES.length - 1)], Integer.parseInt(event)); break; + } case "32647-14.html": case "32647-07.html": + { st.exitQuest(true, true); htmltext = event; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java index 70d1560528..1c80de5575 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java @@ -84,16 +84,24 @@ public class Q00312_TakeAdvantageOfTheCrisis extends Quest case "30535-05.htm": case "30535-09.html": case "30535-10.html": + { break; + } case "30535-06.htm": + { st.startQuest(); break; + } case "30535-11.html": + { st.exitQuest(true, true); break; + } default: + { htmltext = null; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java index f45406e100..22ae4e6e61 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java @@ -590,13 +590,17 @@ public final class Q00334_TheWishingPotion extends Quest switch (qs.getInt(I_QUEST0)) { case 1: + { i0 = getRandom(2); break; + } case 2: case 3: case 4: + { i0 = getRandom(3); break; + } } switch (i0) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java index 6cf1093432..fcc45c2611 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java @@ -65,9 +65,12 @@ public class Q00338_AlligatorHunter extends Quest switch (event) { case "30892-03.htm": + { st.startQuest(); break; + } case "30892-06.html": + { if (!hasQuestItems(player, ALLIGATOR_LEATHER)) { return "30892-05.html"; @@ -77,16 +80,23 @@ public class Q00338_AlligatorHunter extends Quest giveAdena(player, amount, true); takeItems(player, ALLIGATOR_LEATHER, -1); break; + } case "30892-10.html": + { st.exitQuest(true, true); break; + } case "30892-07.html": case "30892-08.html": case "30892-09.html": + { break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -116,11 +126,15 @@ public class Q00338_AlligatorHunter extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "30892-02.htm" : "30892-01.htm"; break; + } case State.STARTED: + { htmltext = "30892-04.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 8327212db6..9d761c5e40 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -443,6 +443,7 @@ public class Q00350_EnhanceYourWeapon extends Quest switch (mainlvlInfo.getAbsorbCrystalType()) { case PARTY_ONE_RANDOM: + { // This is a naive method for selecting a random member. It gets any random party member and // then checks if the member has a valid crystal. It does not select the random party member // among those who have crystals, only. However, this might actually be correct (same as retail). @@ -456,7 +457,9 @@ public class Q00350_EnhanceYourWeapon extends Quest levelCrystal(killer, players.get(killer), mob); } break; + } case PARTY_RANDOM: + { if (killer.getParty() != null) { final List luckyParty = new ArrayList<>(); @@ -475,7 +478,9 @@ public class Q00350_EnhanceYourWeapon extends Quest levelCrystal(killer, players.get(killer), mob); } break; + } case FULL_PARTY: + { if (killer.getParty() != null) { for (L2PcInstance pl : killer.getParty().getMembers()) @@ -488,9 +493,12 @@ public class Q00350_EnhanceYourWeapon extends Quest levelCrystal(killer, players.get(killer), mob); } break; + } case LAST_HIT: + { levelCrystal(killer, players.get(killer), mob); break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java index 8cff85bcb0..6ae5bc6d23 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java @@ -138,9 +138,12 @@ public final class Q00381_LetsBecomeARoyalMember extends Quest switch (qs.getMemoState()) { case 1: + { htmltext = "30090-01.html"; break; + } case 2: + { if (hasQuestItems(talker, COIN_ALBUM)) { htmltext = "30090-05.html"; @@ -157,6 +160,7 @@ public final class Q00381_LetsBecomeARoyalMember extends Quest htmltext = "30090-03.html"; } break; + } } break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index 9caec5bcfd..7fb130c380 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -337,17 +337,23 @@ public final class Q00421_LittleWingsBigAdventure extends Quest switch (flute.getId()) { case DRAGONFLUTE_OF_WIND: + { takeItems(talker, DRAGONFLUTE_OF_WIND, -1); giveItems(talker, DRAGON_BUGLE_OF_WIND, 1); break; + } case DRAGONFLUTE_OF_STAR: + { takeItems(talker, DRAGONFLUTE_OF_STAR, -1); giveItems(talker, DRAGON_BUGLE_OF_STAR, 1); break; + } case DRAGONFLUTE_OF_TWILIGHT: + { takeItems(talker, DRAGONFLUTE_OF_TWILIGHT, -1); giveItems(talker, DRAGON_BUGLE_OF_TWILIGHT, 1); break; + } } qs.exitQuest(true, true); @@ -418,14 +424,20 @@ public final class Q00421_LittleWingsBigAdventure extends Quest switch (getRandom(3)) { case 0: + { npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.WHY_DO_YOU_BOTHER_ME_AGAIN)); break; + } case 1: + { npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, data.message)); break; + } case 2: + { npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.LEAVE_NOW_BEFORE_YOU_INCUR_THE_WRATH_OF_THE_GUARDIAN_GHOST)); break; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java index 5745699793..b6e0b54000 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java @@ -69,16 +69,24 @@ public class Q00423_TakeYourBestShot extends Quest case "32740-01.html": case "32744-02.html": case "32744-03.htm": + { break; + } case "32744-04.htm": + { st.startQuest(); break; + } case "32744-quit.html": + { st.exitQuest(true); break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -113,9 +121,11 @@ public class Q00423_TakeYourBestShot extends Quest switch (npc.getId()) { case JOHNNY: + { switch (st.getState()) { case State.CREATED: + { final QuestState _prev = player.getQuestState(Q00249_PoisonedPlainsOfTheLizardmen.class.getSimpleName()); if ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= MIN_LEVEL)) { @@ -126,7 +136,9 @@ public class Q00423_TakeYourBestShot extends Quest htmltext = "32744-00.htm"; } break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "32744-05.html"; @@ -136,15 +148,21 @@ public class Q00423_TakeYourBestShot extends Quest htmltext = "32744-06.html"; } break; + } } break; + } case BATRACOS: + { switch (st.getState()) { case State.CREATED: + { htmltext = (hasQuestItems(player, SEER_UGOROS_PASS)) ? "32740-05.html" : "32740-00.html"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "32740-02.html"; @@ -156,7 +174,10 @@ public class Q00423_TakeYourBestShot extends Quest htmltext = "32740-04.html"; } break; + } } + break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java index 2fbb9b0c11..1e677d6a8b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java @@ -98,9 +98,12 @@ public class Q00452_FindingtheLostSoldiers extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = (player.getLevel() < 84) ? "32773-0.html" : "32773-1.htm"; break; + } case State.STARTED: + { if (qs.isCond(1)) { htmltext = "32773-4.html"; @@ -114,7 +117,9 @@ public class Q00452_FindingtheLostSoldiers extends Quest qs.exitQuest(QuestType.DAILY, true); } break; + } case State.COMPLETED: + { if (qs.isNowAvailable()) { qs.setState(State.CREATED); @@ -125,6 +130,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest htmltext = "32773-6.html"; } break; + } } } else if (qs.isCond(1)) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index a0bcf0a89b..ecc7b528ab 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -190,6 +190,7 @@ public final class Q00456_DontKnowDontCare extends Quest switch (qs.getState()) { case State.COMPLETED: + { if (!qs.isNowAvailable()) { htmltext = "32864-02.html"; @@ -197,10 +198,14 @@ public final class Q00456_DontKnowDontCare extends Quest } qs.setState(State.CREATED); // intentional fall-through + } case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "32864-01.htm" : "32864-03.html"; break; + } case State.STARTED: + { switch (qs.getCond()) { case 1: @@ -220,6 +225,7 @@ public final class Q00456_DontKnowDontCare extends Quest } } break; + } } } return htmltext; @@ -236,22 +242,28 @@ public final class Q00456_DontKnowDontCare extends Quest case "32864-04.htm": case "32864-05.htm": case "32864-06.htm": + { if ((qs != null) && qs.isCreated()) { htmltext = event; } break; + } case "32864-07.htm": + { if ((qs != null) && qs.isCreated()) { qs.startQuest(); htmltext = event; } break; + } case "unspawnRaidCorpse": + { allowedPlayerMap.remove(npc.getObjectId()); npc.deleteMe(); break; + } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java index 1cbee1ce87..0cf1eedd70 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java @@ -139,9 +139,12 @@ public class Q00461_RumbleInTheBase extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = ((player.getLevel() >= 82) && (prev != null) && prev.isCompleted()) ? "30200-01.htm" : "30200-02.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30200-06.html"; @@ -153,7 +156,9 @@ public class Q00461_RumbleInTheBase extends Quest htmltext = "30200-07.html"; } break; + } case State.COMPLETED: + { if (!st.isNowAvailable()) { htmltext = "30200-03.htm"; @@ -164,6 +169,7 @@ public class Q00461_RumbleInTheBase extends Quest htmltext = ((player.getLevel() >= 82) && (prev != null) && (prev.getState() == State.COMPLETED)) ? "30200-01.htm" : "30200-02.htm"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java index c912019556..d01f8dc401 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java @@ -93,14 +93,16 @@ public class Q00601_WatchingEyes extends Quest switch (event) { case "31683-02.htm": + { st.startQuest(); break; + } case "31683-05.html": + { if (getQuestItemsCount(player, PROOF_OF_AVENGER) < 100) { return "31683-06.html"; } - final int i = getRandom(4); if (i < 3) { @@ -110,9 +112,12 @@ public class Q00601_WatchingEyes extends Quest giveAdena(player, REWARD[i][1], true); st.exitQuest(true, true); break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -146,11 +151,15 @@ public class Q00601_WatchingEyes extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= 71) ? "31683-01.htm" : "31683-00.htm"; break; + } case State.STARTED: + { htmltext = (st.isCond(1)) ? "31683-03.html" : "31683-04.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java index 2a169615e3..a23dbd7252 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java @@ -93,14 +93,16 @@ public class Q00602_ShadowOfLight extends Quest switch (event) { case "31683-02.htm": + { st.startQuest(); break; + } case "31683-05.html": + { if (getQuestItemsCount(player, EYE_OF_DARKNESS) < 100) { return "31683-06.html"; } - final int i = getRandom(4); if (i < 3) { @@ -110,9 +112,12 @@ public class Q00602_ShadowOfLight extends Quest addExpAndSp(player, REWARD[i][2], REWARD[i][3]); st.exitQuest(true, true); break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -153,11 +158,15 @@ public class Q00602_ShadowOfLight extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= 68) ? "31683-01.htm" : "31683-00.htm"; break; + } case State.STARTED: + { htmltext = (st.isCond(1)) ? "31683-03.html" : "31683-04.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java index 44a9eb4e34..2b78fc2f6a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java @@ -45,14 +45,20 @@ public class Q00605_AllianceWithKetraOrcs extends Quest switch (_minCond) { case 1: + { _itemId = VARKA_BADGE_SOLDIER; break; + } case 2: + { _itemId = VARKA_BADGE_OFFICER; break; + } default: + { _itemId = VARKA_BADGE_CAPTAIN; break; + } } } @@ -164,14 +170,20 @@ public class Q00605_AllianceWithKetraOrcs extends Quest switch (itemId) { case VARKA_BADGE_SOLDIER: + { count = SOLDIER_BADGE_COUNT[st.getCond() - 1]; break; + } case VARKA_BADGE_OFFICER: + { count = OFFICER_BADGE_COUNT[st.getCond() - 1]; break; + } case VARKA_BADGE_CAPTAIN: + { count = CAPTAIN_BADGE_COUNT[st.getCond() - 1]; break; + } } if (getQuestItemsCount(st.getPlayer(), itemId) < count) { @@ -195,8 +207,11 @@ public class Q00605_AllianceWithKetraOrcs extends Quest case "31371-12a.html": case "31371-12b.html": case "31371-25.html": + { break; + } case "31371-04.htm": + { if (hasAtLeastOneQuestItem(player, VARKA_MARKS)) { return "31371-03.htm"; @@ -213,7 +228,9 @@ public class Q00605_AllianceWithKetraOrcs extends Quest } st.setCond(1); break; + } case "31371-12.html": + { if (getQuestItemsCount(player, VARKA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[0]) { return getNoQuestMsg(player); @@ -222,7 +239,9 @@ public class Q00605_AllianceWithKetraOrcs extends Quest giveItems(player, KETRA_MARKS[0], 1); st.setCond(2, true); break; + } case "31371-15.html": + { if ((getQuestItemsCount(player, VARKA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[1]) || (getQuestItemsCount(player, VARKA_BADGE_OFFICER) < OFFICER_BADGE_COUNT[1])) { return getNoQuestMsg(player); @@ -231,7 +250,9 @@ public class Q00605_AllianceWithKetraOrcs extends Quest giveItems(player, KETRA_MARKS[1], 1); st.setCond(3, true); break; + } case "31371-18.html": + { if ((getQuestItemsCount(player, VARKA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[2]) || (getQuestItemsCount(player, VARKA_BADGE_OFFICER) < OFFICER_BADGE_COUNT[2]) || (getQuestItemsCount(player, VARKA_BADGE_CAPTAIN) < CAPTAIN_BADGE_COUNT[2])) { return getNoQuestMsg(player); @@ -240,7 +261,9 @@ public class Q00605_AllianceWithKetraOrcs extends Quest giveItems(player, KETRA_MARKS[2], 1); st.setCond(4, true); break; + } case "31371-21.html": + { if (!hasQuestItems(player, VALOR_TOTEM) || (getQuestItemsCount(player, VARKA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[3]) || (getQuestItemsCount(player, VARKA_BADGE_OFFICER) < OFFICER_BADGE_COUNT[3]) || (getQuestItemsCount(player, VARKA_BADGE_CAPTAIN) < CAPTAIN_BADGE_COUNT[3])) { return getNoQuestMsg(player); @@ -249,14 +272,19 @@ public class Q00605_AllianceWithKetraOrcs extends Quest giveItems(player, KETRA_MARKS[3], 1); st.setCond(5, true); break; + } case "31371-26.html": + { takeItems(player, -1, KETRA_MARKS); takeItems(player, -1, VALOR_TOTEM, WISDOM_TOTEM); st.exitQuest(true, true); break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -286,24 +314,36 @@ public class Q00605_AllianceWithKetraOrcs extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "31371-01.htm" : "31371-02.htm"; break; + } case State.STARTED: + { switch (st.getCond()) { case 1: + { htmltext = (getQuestItemsCount(player, VARKA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[0]) ? "31371-11.html" : "31371-10.html"; break; + } case 2: + { htmltext = (hasQuestItems(player, KETRA_MARKS[0]) && (getQuestItemsCount(player, VARKA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[1]) && (getQuestItemsCount(player, VARKA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[1])) ? "31371-14.html" : "31371-13.html"; break; + } case 3: + { htmltext = (hasQuestItems(player, KETRA_MARKS[1]) && (getQuestItemsCount(player, VARKA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[2]) && (getQuestItemsCount(player, VARKA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[2]) && (getQuestItemsCount(player, VARKA_BADGE_CAPTAIN) >= CAPTAIN_BADGE_COUNT[2])) ? "31371-17.html" : "31371-16.html"; break; + } case 4: + { htmltext = (hasQuestItems(player, KETRA_MARKS[2], VALOR_TOTEM) && (getQuestItemsCount(player, VARKA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[3]) && (getQuestItemsCount(player, VARKA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[3]) && (getQuestItemsCount(player, VARKA_BADGE_CAPTAIN) >= CAPTAIN_BADGE_COUNT[3])) ? "31371-20.html" : "31371-19.html"; break; + } case 5: + { if (!hasQuestItems(player, KETRA_MARKS[3]) || !hasQuestItems(player, WISDOM_TOTEM) || (getQuestItemsCount(player, VARKA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[4]) || (getQuestItemsCount(player, VARKA_BADGE_OFFICER) < OFFICER_BADGE_COUNT[4]) || (getQuestItemsCount(player, VARKA_BADGE_CAPTAIN) < CAPTAIN_BADGE_COUNT[4])) { return "31371-22.html"; @@ -313,14 +353,18 @@ public class Q00605_AllianceWithKetraOrcs extends Quest giveItems(player, KETRA_MARKS[4], 1); htmltext = "31371-23.html"; break; + } case 6: + { if (hasQuestItems(player, KETRA_MARKS[4])) { htmltext = "31371-24.html"; } break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java index 46876f3e4a..471eac3791 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java @@ -83,11 +83,16 @@ public class Q00606_BattleAgainstVarkaSilenos extends Quest switch (event) { case "31370-03.htm": + { st.startQuest(); break; + } case "31370-06.html": + { break; + } case "31370-07.html": + { if (getQuestItemsCount(player, MANE) < MANE_COUNT) { return "31370-08.html"; @@ -95,12 +100,17 @@ public class Q00606_BattleAgainstVarkaSilenos extends Quest takeItems(player, MANE, MANE_COUNT); giveItems(player, HORN, 20); break; + } case "31370-09.html": + { st.exitQuest(true, true); break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -126,11 +136,15 @@ public class Q00606_BattleAgainstVarkaSilenos extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "31370-01.htm" : "31370-02.htm"; break; + } case State.STARTED: + { htmltext = (hasQuestItems(player, MANE)) ? "31370-04.html" : "31370-05.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java index d5efdf04ac..2e01fe3a21 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java @@ -73,9 +73,12 @@ public class Q00607_ProveYourCourageKetra extends Quest switch (event) { case "31370-04.htm": + { st.startQuest(); break; + } case "31370-07.html": + { if (hasQuestItems(player, SHADITH_HEAD) && st.isCond(2)) { giveItems(player, VALOR_TOTEM, 1); @@ -87,9 +90,12 @@ public class Q00607_ProveYourCourageKetra extends Quest htmltext = getNoQuestMsg(player); } break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -110,11 +116,15 @@ public class Q00607_ProveYourCourageKetra extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? (hasQuestItems(player, KETRA_ALLIANCE_THREE)) ? "31370-01.htm" : "31370-02.htm" : "31370-03.htm"; break; + } case State.STARTED: + { htmltext = (st.isCond(2) && hasQuestItems(player, SHADITH_HEAD)) ? "31370-05.html" : "31370-06.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java index 49e2955616..272eb395ae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java @@ -73,9 +73,12 @@ public class Q00608_SlayTheEnemyCommanderKetra extends Quest switch (event) { case "31370-04.htm": + { st.startQuest(); break; + } case "31370-07.html": + { if (hasQuestItems(player, MOS_HEAD) && st.isCond(2)) { giveItems(player, WISDOM_TOTEM, 1); @@ -87,9 +90,12 @@ public class Q00608_SlayTheEnemyCommanderKetra extends Quest htmltext = getNoQuestMsg(player); } break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -110,11 +116,15 @@ public class Q00608_SlayTheEnemyCommanderKetra extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? (hasQuestItems(player, KETRA_ALLIANCE_FOUR)) ? "31370-01.htm" : "31370-02.htm" : "31370-03.htm"; break; + } case State.STARTED: + { htmltext = (st.isCond(2) && hasQuestItems(player, MOS_HEAD)) ? "31370-05.html" : "31370-06.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java index a37022f679..468b201b0a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java @@ -102,10 +102,13 @@ public class Q00609_MagicalPowerOfWaterPart1 extends Quest switch (event) { case "31371-02.html": + { st.startQuest(); htmltext = event; break; + } case "open_box": + { if (!hasQuestItems(player, KEY)) { htmltext = "31561-02.html"; @@ -126,10 +129,13 @@ public class Q00609_MagicalPowerOfWaterPart1 extends Quest } } break; + } case "eye_despawn": + { npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.UDAN_HAS_ALREADY_SEEN_YOUR_FACE)); npc.deleteMe(); break; + } } return htmltext; } @@ -159,29 +165,39 @@ public class Q00609_MagicalPowerOfWaterPart1 extends Quest switch (npc.getId()) { case WAHKAN: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? (hasAtLeastOneQuestItem(player, KETRA_MARKS)) ? "31371-01.htm" : "31371-00a.html" : "31371-00b.html"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "31371-03.html"; } break; + } } break; + } case ASEFA: + { if (st.isStarted()) { switch (st.getCond()) { case 1: + { htmltext = "31372-01.html"; st.setCond(2, true); break; + } case 2: + { if (st.isSet("spawned")) { st.unset("spawned"); @@ -194,21 +210,27 @@ public class Q00609_MagicalPowerOfWaterPart1 extends Quest htmltext = "31372-02.html"; } break; + } case 3: + { giveItems(player, GREEN_TOTEM, 1); giveItems(player, WISDOM_STONE, 1); st.exitQuest(true, true); htmltext = "31372-04.html"; break; + } } } break; + } case UDANS_BOX: + { if (st.isCond(2)) { htmltext = "31561-01.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java index b516389c70..0fac3d0585 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java @@ -76,14 +76,18 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest switch (st.getCond()) { case 1: // take the item and give the heart + { takeItems(player, GREEN_TOTEM, 1); + } case 2: + { if (!hasQuestItems(player, ASHUTAR_HEART)) { giveItems(player, ASHUTAR_HEART, 1); } st.setCond(3, true); break; + } } } } @@ -104,10 +108,13 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest switch (event) { case "31372-02.html": + { st.startQuest(); htmltext = event; break; + } case "give_heart": + { if (hasQuestItems(player, ASHUTAR_HEART)) { addExpAndSp(player, 10000, 0); @@ -119,9 +126,12 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest htmltext = "31372-07.html"; } break; + } case "spawn_totem": + { htmltext = (hasQuestItems(player, GREEN_TOTEM)) ? spawnAshutar(npc, st) : "31560-04.html"; break; + } } } else @@ -162,33 +172,47 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest switch (npc.getId()) { case ASEFA: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? (hasQuestItems(player, GREEN_TOTEM)) ? "31372-01.htm" : "31372-00a.html" : "31372-00b.html"; break; + } case State.STARTED: + { htmltext = (st.isCond(1)) ? "31372-03.html" : (hasQuestItems(player, ASHUTAR_HEART)) ? "31372-04.html" : "31372-05.html"; break; + } } break; + } case VARKA_TOTEM: + { if (st.isStarted()) { switch (st.getCond()) { case 1: + { htmltext = "31560-01.html"; break; + } case 2: + { htmltext = spawnAshutar(npc, st); break; + } case 3: + { htmltext = "31560-05.html"; break; + } } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java index 4d14ecd9ea..5da4648c5b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java @@ -45,14 +45,20 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest switch (_minCond) { case 1: + { _itemId = KETRA_BADGE_SOLDIER; break; + } case 2: + { _itemId = KETRA_BADGE_OFFICER; break; + } default: + { _itemId = KETRA_BADGE_CAPTAIN; break; + } } } @@ -164,14 +170,20 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest switch (itemId) { case KETRA_BADGE_SOLDIER: + { count = SOLDIER_BADGE_COUNT[st.getCond() - 1]; break; + } case KETRA_BADGE_OFFICER: + { count = OFFICER_BADGE_COUNT[st.getCond() - 1]; break; + } case KETRA_BADGE_CAPTAIN: + { count = CAPTAIN_BADGE_COUNT[st.getCond() - 1]; break; + } } if (getQuestItemsCount(st.getPlayer(), itemId) < count) { @@ -195,8 +207,11 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest case "31378-12a.html": case "31378-12b.html": case "31378-25.html": + { break; + } case "31378-04.htm": + { if (hasAtLeastOneQuestItem(player, KETRA_MARKS)) { return "31378-03.htm"; @@ -213,7 +228,9 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest } st.setCond(1); break; + } case "31378-12.html": + { if (getQuestItemsCount(player, KETRA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[0]) { return getNoQuestMsg(player); @@ -222,7 +239,9 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest giveItems(player, VARKA_MARKS[0], 1); st.setCond(2, true); break; + } case "31378-15.html": + { if ((getQuestItemsCount(player, KETRA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[1]) || (getQuestItemsCount(player, KETRA_BADGE_OFFICER) < OFFICER_BADGE_COUNT[1])) { return getNoQuestMsg(player); @@ -231,7 +250,9 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest giveItems(player, VARKA_MARKS[1], 1); st.setCond(3, true); break; + } case "31378-18.html": + { if ((getQuestItemsCount(player, KETRA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[2]) || (getQuestItemsCount(player, KETRA_BADGE_OFFICER) < OFFICER_BADGE_COUNT[2]) || (getQuestItemsCount(player, KETRA_BADGE_CAPTAIN) < CAPTAIN_BADGE_COUNT[2])) { return getNoQuestMsg(player); @@ -240,7 +261,9 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest giveItems(player, VARKA_MARKS[2], 1); st.setCond(4, true); break; + } case "31378-21.html": + { if (!hasQuestItems(player, VALOR_FEATHER) || (getQuestItemsCount(player, KETRA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[3]) || (getQuestItemsCount(player, KETRA_BADGE_OFFICER) < OFFICER_BADGE_COUNT[3]) || (getQuestItemsCount(player, KETRA_BADGE_CAPTAIN) < CAPTAIN_BADGE_COUNT[3])) { return getNoQuestMsg(player); @@ -249,14 +272,19 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest giveItems(player, VARKA_MARKS[3], 1); st.setCond(5, true); break; + } case "31378-26.html": + { takeItems(player, -1, VARKA_MARKS); takeItems(player, -1, VALOR_FEATHER, WISDOM_FEATHER); st.exitQuest(true, true); break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -286,24 +314,36 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "31378-01.htm" : "31378-02.htm"; break; + } case State.STARTED: + { switch (st.getCond()) { case 1: + { htmltext = (getQuestItemsCount(player, KETRA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[0]) ? "31378-11.html" : "31378-10.html"; break; + } case 2: + { htmltext = (hasQuestItems(player, VARKA_MARKS[0]) && (getQuestItemsCount(player, KETRA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[1]) && (getQuestItemsCount(player, KETRA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[1])) ? "31378-14.html" : "31378-13.html"; break; + } case 3: + { htmltext = (hasQuestItems(player, VARKA_MARKS[1]) && (getQuestItemsCount(player, KETRA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[2]) && (getQuestItemsCount(player, KETRA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[2]) && (getQuestItemsCount(player, KETRA_BADGE_CAPTAIN) >= CAPTAIN_BADGE_COUNT[2])) ? "31378-17.html" : "31378-16.html"; break; + } case 4: + { htmltext = (hasQuestItems(player, VARKA_MARKS[2], VALOR_FEATHER) && (getQuestItemsCount(player, KETRA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[3]) && (getQuestItemsCount(player, KETRA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[3]) && (getQuestItemsCount(player, KETRA_BADGE_CAPTAIN) >= CAPTAIN_BADGE_COUNT[3])) ? "31378-20.html" : "31378-19.html"; break; + } case 5: + { if (!hasQuestItems(player, VARKA_MARKS[3]) || !hasQuestItems(player, WISDOM_FEATHER) || (getQuestItemsCount(player, KETRA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[4]) || (getQuestItemsCount(player, KETRA_BADGE_OFFICER) < OFFICER_BADGE_COUNT[4]) || (getQuestItemsCount(player, KETRA_BADGE_CAPTAIN) < CAPTAIN_BADGE_COUNT[4])) { return "31378-22.html"; @@ -313,14 +353,18 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest giveItems(player, VARKA_MARKS[4], 1); htmltext = "31378-23.html"; break; + } case 6: + { if (hasQuestItems(player, VARKA_MARKS[4])) { htmltext = "31378-24.html"; } break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java index fdc1b56302..a2acb29651 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java @@ -83,11 +83,16 @@ public class Q00612_BattleAgainstKetraOrcs extends Quest switch (event) { case "31377-03.htm": + { st.startQuest(); break; + } case "31377-06.html": + { break; + } case "31377-07.html": + { if (getQuestItemsCount(player, MOLAR) < MOLAR_COUNT) { return "31377-08.html"; @@ -95,12 +100,17 @@ public class Q00612_BattleAgainstKetraOrcs extends Quest takeItems(player, MOLAR, MOLAR_COUNT); giveItems(player, SEED, 20); break; + } case "31377-09.html": + { st.exitQuest(true, true); break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -126,11 +136,15 @@ public class Q00612_BattleAgainstKetraOrcs extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "31377-01.htm" : "31377-02.htm"; break; + } case State.STARTED: + { htmltext = (hasQuestItems(player, MOLAR)) ? "31377-04.html" : "31377-05.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java index feb103c97d..cde7c51e7a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java @@ -73,9 +73,12 @@ public class Q00613_ProveYourCourageVarka extends Quest switch (event) { case "31377-04.htm": + { st.startQuest(); break; + } case "31377-07.html": + { if (hasQuestItems(player, HEKATON_HEAD) && st.isCond(2)) { giveItems(player, VALOR_FEATHER, 1); @@ -87,9 +90,12 @@ public class Q00613_ProveYourCourageVarka extends Quest htmltext = getNoQuestMsg(player); } break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -110,11 +116,15 @@ public class Q00613_ProveYourCourageVarka extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? (hasQuestItems(player, VARKA_ALLIANCE_THREE)) ? "31377-01.htm" : "31377-02.htm" : "31377-03.htm"; break; + } case State.STARTED: + { htmltext = (st.isCond(2) && hasQuestItems(player, HEKATON_HEAD)) ? "31377-05.html" : "31377-06.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java index 6eb7413716..807933a250 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java @@ -73,9 +73,12 @@ public class Q00614_SlayTheEnemyCommanderVarka extends Quest switch (event) { case "31377-04.htm": + { st.startQuest(); break; + } case "31377-07.html": + { if (hasQuestItems(player, TAYR_HEAD) && st.isCond(2)) { giveItems(player, WISDOM_FEATHER, 1); @@ -87,9 +90,12 @@ public class Q00614_SlayTheEnemyCommanderVarka extends Quest htmltext = getNoQuestMsg(player); } break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -110,11 +116,15 @@ public class Q00614_SlayTheEnemyCommanderVarka extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? (hasQuestItems(player, VARKA_ALLIANCE_FOUR)) ? "31377-01.htm" : "31377-02.htm" : "31377-03.htm"; break; + } case State.STARTED: + { htmltext = (st.isCond(2) && hasQuestItems(player, TAYR_HEAD)) ? "31377-05.html" : "31377-06.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java index 7a4e9a076c..5349c521b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java @@ -102,10 +102,13 @@ public class Q00615_MagicalPowerOfFirePart1 extends Quest switch (event) { case "31378-02.html": + { st.startQuest(); htmltext = event; break; + } case "open_box": + { if (!hasQuestItems(player, KEY)) { htmltext = "31559-02.html"; @@ -126,10 +129,13 @@ public class Q00615_MagicalPowerOfFirePart1 extends Quest } } break; + } case "eye_despawn": + { npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.ASEFA_HAS_ALREADY_SEEN_YOUR_FACE)); npc.deleteMe(); break; + } } return htmltext; } @@ -159,29 +165,39 @@ public class Q00615_MagicalPowerOfFirePart1 extends Quest switch (npc.getId()) { case NARAN: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? (hasAtLeastOneQuestItem(player, VARKA_MARKS)) ? "31378-01.htm" : "31378-00a.html" : "31378-00b.html"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "31378-03.html"; } break; + } } break; + } case UDAN: + { if (st.isStarted()) { switch (st.getCond()) { case 1: + { htmltext = "31379-01.html"; st.setCond(2, true); break; + } case 2: + { if (st.isSet("spawned")) { st.unset("spawned"); @@ -194,21 +210,27 @@ public class Q00615_MagicalPowerOfFirePart1 extends Quest htmltext = "31379-02.html"; } break; + } case 3: + { giveItems(player, RED_TOTEM, 1); giveItems(player, WISDOM_STONE, 1); st.exitQuest(true, true); htmltext = "31379-04.html"; break; + } } } break; + } case ASEFA_BOX: + { if (st.isCond(2)) { htmltext = "31559-01.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java index 67854f2423..dc500ad700 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java @@ -76,14 +76,18 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest switch (st.getCond()) { case 1: // take the item and give the heart + { takeItems(player, RED_TOTEM, 1); + } case 2: + { if (!hasQuestItems(player, NASTRON_HEART)) { giveItems(player, NASTRON_HEART, 1); } st.setCond(3, true); break; + } } } } @@ -104,10 +108,13 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest switch (event) { case "31379-02.html": + { st.startQuest(); htmltext = event; break; + } case "give_heart": + { if (hasQuestItems(player, NASTRON_HEART)) { addExpAndSp(player, 10000, 0); @@ -119,9 +126,12 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest htmltext = "31379-07.html"; } break; + } case "spawn_totem": + { htmltext = (hasQuestItems(player, RED_TOTEM)) ? spawnNastron(npc, st) : "31558-04.html"; break; + } } } else @@ -162,33 +172,47 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest switch (npc.getId()) { case UDAN: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? (hasQuestItems(player, RED_TOTEM)) ? "31379-01.htm" : "31379-00a.html" : "31379-00b.html"; break; + } case State.STARTED: + { htmltext = (st.isCond(1)) ? "31379-03.html" : (hasQuestItems(player, NASTRON_HEART)) ? "31379-04.html" : "31379-05.html"; break; + } } break; + } case KETRA_TOTEM: + { if (st.isStarted()) { switch (st.getCond()) { case 1: + { htmltext = "31558-01.html"; break; + } case 2: + { htmltext = spawnNastron(npc, st); break; + } case 3: + { htmltext = "31558-05.html"; break; + } } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java index 14ac3eb592..e6e01db633 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java @@ -80,17 +80,24 @@ public class Q00651_RunawayYouth extends Quest switch (npc.getId()) { case IVAN: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "32014-01.htm" : "32014-01a.htm"; break; + } case State.STARTED: + { htmltext = "32014-02.html"; break; + } } break; + } case BATIDAE: + { if (st.isStarted()) { giveAdena(player, 2883, true); @@ -98,6 +105,7 @@ public class Q00651_RunawayYouth extends Quest htmltext = "31989-01.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java index 3f433b2077..7650b02619 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java @@ -84,11 +84,15 @@ public class Q00652_AnAgedExAdventurer extends Quest switch (qs.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= 46) ? "32012-01.htm" : "32012-01a.htm"; break; + } case State.STARTED: + { htmltext = "32012-02.html"; break; + } } break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java index 876ceadbaf..4d7bd9300a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java @@ -80,17 +80,24 @@ public class Q00653_WildMaiden extends Quest switch (npc.getId()) { case SUKI: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "32013-01.htm" : "32013-01a.htm"; break; + } case State.STARTED: + { htmltext = "32013-02.htm"; break; + } } break; + } case GALIBREDO: + { if (st.isStarted()) { giveAdena(player, 2553, true); @@ -98,6 +105,7 @@ public class Q00653_WildMaiden extends Quest htmltext = "30181-01.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java index e40c535b4e..36735f9651 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java @@ -162,6 +162,7 @@ public class Q00690_JudesRequest extends Quest switch (st.getState()) { case State.CREATED: + { if (player.getLevel() >= 78) { htmltext = "32356-01.htm"; @@ -171,7 +172,9 @@ public class Q00690_JudesRequest extends Quest htmltext = "32356-02.htm"; } break; + } case State.STARTED: + { if (getQuestItemsCount(player, EVIL_WEAPON) >= 200) { htmltext = "32356-04.htm"; @@ -185,6 +188,7 @@ public class Q00690_JudesRequest extends Quest htmltext = "32356-05.htm"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java index ed13f62529..d759ff627e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java @@ -78,13 +78,18 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest { case "32245-02.htm": case "32245-11.html": + { htmltext = event; break; + } case "32245-04.htm": + { st.startQuest(); htmltext = event; break; + } case "take_reward": + { if (st.isStarted()) { final int gemsCount = st.getInt("submitted_gems"); @@ -100,7 +105,9 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest } } break; + } case "32245-08.html": + { if (st.isStarted()) { final int submittedCount = st.getInt("submitted_gems"); @@ -111,7 +118,9 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest htmltext = getHtm(player.getHtmlPrefix(), "32245-08.html").replace("%itemcount%", Integer.toString(finalCount)); } break; + } case "32245-12.html": + { if (st.isStarted()) { giveAdena(player, (st.getInt("submitted_gems") * 10000), true); @@ -119,6 +128,7 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest htmltext = event; } break; + } } return htmltext; } @@ -152,9 +162,12 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "32245-01.htm" : "32245-03.html"; break; + } case State.STARTED: + { if (hasQuestItems(player, RED_GEM)) { htmltext = "32245-05.html"; @@ -168,6 +181,7 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest htmltext = "32245-06.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java index f329da5647..fc80b4a046 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java @@ -73,6 +73,7 @@ public final class Q00694_BreakThroughTheHallOfSuffering extends Quest switch (qs.getState()) { case State.CREATED: + { if ((player.getLevel() >= 75) && (player.getLevel() <= 82)) { htmltext = "32603-01.htm"; @@ -83,15 +84,19 @@ public final class Q00694_BreakThroughTheHallOfSuffering extends Quest qs.exitQuest(true); } break; + } case State.STARTED: + { switch (npc.getId()) { case TEPIOS: + { htmltext = "32603-01a.html"; break; + } case TEPIOS2: + { final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); - if ((world != null) && (world.getTemplateId() == 115)) { if (world.tag == -1) @@ -262,8 +267,10 @@ public final class Q00694_BreakThroughTheHallOfSuffering extends Quest htmltext = "32530-11.html"; } break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java index 0d9393161c..a53aee4373 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java @@ -77,16 +77,24 @@ public class Q00701_ProofOfExistence extends Quest { case "32559-03.htm": case "32559-08.html": + { break; + } case "32559-04.htm": + { st.startQuest(); break; + } case "32559-09.html": + { st.exitQuest(true, true); break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -143,10 +151,13 @@ public class Q00701_ProofOfExistence extends Quest switch (st.getState()) { case State.CREATED: + { final QuestState qs = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName()); htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32559-01.htm" : "32559-02.htm"; break; + } case State.STARTED: + { if (hasQuestItems(player, BANSHEE_QUEENS_EYE)) { giveAdena(player, (getQuestItemsCount(player, DEADMANS_REMAINS) * 2500) + (getQuestItemsCount(player, BANSHEE_QUEENS_EYE) * 50000) + 23835, true); @@ -165,6 +176,7 @@ public class Q00701_ProofOfExistence extends Quest htmltext = "32559-05.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java index 8cce8398c1..0626a146b6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java @@ -274,6 +274,7 @@ public class Q00702_ATrapForRevenge extends Quest switch (npc.getId()) { case 22612: + { if (chance < 413) { giveItems(player, DRAKES_FLESH, 2); @@ -283,7 +284,9 @@ public class Q00702_ATrapForRevenge extends Quest giveItems(player, DRAKES_FLESH, 1); } break; + } case 22613: + { if (chance < 440) { giveItems(player, DRAKES_FLESH, 2); @@ -293,13 +296,17 @@ public class Q00702_ATrapForRevenge extends Quest giveItems(player, DRAKES_FLESH, 1); } break; + } case 25632: + { if (chance < 996) { giveItems(player, DRAKES_FLESH, 1); } break; + } case 22610: + { if (chance < 485) { giveItems(player, DRAKES_FLESH, 2); @@ -309,7 +316,9 @@ public class Q00702_ATrapForRevenge extends Quest giveItems(player, DRAKES_FLESH, 1); } break; + } case 22611: + { if (chance < 451) { giveItems(player, DRAKES_FLESH, 2); @@ -319,7 +328,9 @@ public class Q00702_ATrapForRevenge extends Quest giveItems(player, DRAKES_FLESH, 1); } break; + } case 25631: + { if (chance < 485) { giveItems(player, DRAKES_FLESH, 2); @@ -329,7 +340,9 @@ public class Q00702_ATrapForRevenge extends Quest giveItems(player, DRAKES_FLESH, 1); } break; + } case 25626: + { int count = 0; if (chance < 708) { @@ -353,6 +366,7 @@ public class Q00702_ATrapForRevenge extends Quest } giveItems(player, VARIANT_DRAKE_WING_HORNS, count); break; + } } playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); return null; @@ -369,12 +383,16 @@ public class Q00702_ATrapForRevenge extends Quest switch (st.getState()) { case State.CREATED: + { final QuestState prev = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName()); htmltext = ((prev != null) && prev.isCompleted() && (player.getLevel() >= 78)) ? "32563-01.htm" : "32563-02.htm"; break; + } case State.STARTED: + { htmltext = (st.isCond(1)) ? "32563-05.html" : "32563-06.html"; break; + } } } if (st.getState() == State.STARTED) @@ -384,11 +402,15 @@ public class Q00702_ATrapForRevenge extends Quest switch (st.getCond()) { case 1: + { htmltext = "32557-01.html"; break; + } case 2: + { htmltext = "32557-02.html"; break; + } } } else if (npc.getId() == TENIUS) @@ -396,11 +418,15 @@ public class Q00702_ATrapForRevenge extends Quest switch (st.getCond()) { case 1: + { htmltext = "32555-01.html"; break; + } case 2: + { htmltext = "32555-04.html"; break; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java index 54ccef995d..0307151a41 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java @@ -61,13 +61,19 @@ public class Q00998_FallenAngelSelect extends Quest case "30894-01.html": case "30894-02.html": case "30894-03.html": + { return event; + } case "dawn": + { startQuest(Q00142_FallenAngelRequestOfDawn.class.getSimpleName(), player); break; + } case "dusk": + { startQuest(Q00143_FallenAngelRequestOfDusk.class.getSimpleName(), player); break; + } } return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java index 43830dd7f8..ef2151b3bb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java @@ -56,17 +56,23 @@ public class Q10267_JourneyToGracia extends Quest switch (event) { case "30857-06.html": + { st.startQuest(); giveItems(player, LETTER, 1); break; + } case "32564-02.html": + { st.setCond(2, true); break; + } case "32548-02.html": + { giveAdena(player, 92500, true); addExpAndSp(player, 75480, 7570); st.exitQuest(false, true); break; + } } return event; } @@ -80,26 +86,37 @@ public class Q10267_JourneyToGracia extends Quest switch (npc.getId()) { case ORVEN: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() < 75) ? "30857-00.html" : "30857-01.htm"; break; + } case State.STARTED: + { htmltext = "30857-07.html"; break; + } case State.COMPLETED: + { htmltext = "30857-0a.html"; break; + } } break; + } case PAPIKU: + { if (st.isStarted()) { htmltext = st.isCond(1) ? "32564-01.html" : "32564-03.html"; } break; + } case KEUCEREUS: + { if (st.isStarted() && st.isCond(2)) { htmltext = "32548-01.html"; @@ -109,6 +126,7 @@ public class Q10267_JourneyToGracia extends Quest htmltext = "32548-03.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java index 4f37072db3..2929176f2c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java @@ -69,35 +69,51 @@ public class Q10268_ToTheSeedOfInfinity extends Quest switch (npc.getId()) { case KEUCEREUS: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() < 75) ? "32548-00.html" : "32548-01.htm"; break; + } case State.STARTED: + { htmltext = "32548-06.html"; break; + } case State.COMPLETED: + { htmltext = "32548-0a.html"; break; + } } break; + } case TEPIOS: + { switch (st.getState()) { case State.STARTED: + { htmltext = "32530-01.html"; giveAdena(player, 16671, true); addExpAndSp(player, 100640, 10098); st.exitQuest(false, true); break; + } case State.COMPLETED: + { htmltext = "32530-02.html"; break; + } default: + { break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java index e117d4d31d..1b24bd5d49 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java @@ -69,35 +69,51 @@ public class Q10269_ToTheSeedOfDestruction extends Quest switch (npc.getId()) { case KEUCEREUS: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() < 75) ? "32548-00.html" : "32548-01.htm"; break; + } case State.STARTED: + { htmltext = "32548-06.html"; break; + } case State.COMPLETED: + { htmltext = "32548-0a.html"; break; + } } break; + } case ALLENOS: + { switch (st.getState()) { case State.STARTED: + { htmltext = "32526-01.html"; giveAdena(player, 29174, true); addExpAndSp(player, 176121, 7671); st.exitQuest(false, true); break; + } case State.COMPLETED: + { htmltext = "32526-02.html"; break; + } default: + { break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java index 12b8a817c5..6b56afb566 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java @@ -55,20 +55,28 @@ public class Q10271_TheEnvelopingDarkness extends Quest switch (event) { case "32560-05.html": + { st.startQuest(); break; + } case "32556-06.html": + { st.setCond(2, true); break; + } case "32556-09.html": + { if (hasQuestItems(player, MEDIBAL_DOCUMENT)) { takeItems(player, MEDIBAL_DOCUMENT, -1); st.setCond(4, true); } break; + } default: + { break; + } } return event; } @@ -82,39 +90,55 @@ public class Q10271_TheEnvelopingDarkness extends Quest switch (npc.getId()) { case ORBYU: + { switch (st.getState()) { case State.CREATED: + { st = player.getQuestState(Q10269_ToTheSeedOfDestruction.class.getSimpleName()); htmltext = ((player.getLevel() >= 75) && (st != null) && st.isCompleted()) ? "32560-01.htm" : "32560-02.html"; break; + } case State.STARTED: + { switch (st.getCond()) { case 1: + { htmltext = "32560-05.html"; // TODO this html should most probably be different break; + } case 2: + { htmltext = "32560-06.html"; break; + } case 3: + { htmltext = "32560-07.html"; break; + } case 4: + { htmltext = "32560-08.html"; giveAdena(player, 62516, true); addExpAndSp(player, 377403, 37867); st.exitQuest(false, true); break; + } } break; + } case State.COMPLETED: + { htmltext = "32560-03.html"; break; + } } - break; + } case EL: + { if (st.isCompleted()) { htmltext = "32556-02.html"; @@ -124,21 +148,31 @@ public class Q10271_TheEnvelopingDarkness extends Quest switch (st.getCond()) { case 1: + { htmltext = "32556-01.html"; break; + } case 2: + { htmltext = "32556-07.html"; break; + } case 3: + { htmltext = "32556-08.html"; break; + } case 4: + { htmltext = "32556-09.html"; break; + } } } break; + } case MEDIBAL_CORPSE: + { if (st.isCompleted()) { htmltext = "32528-02.html"; @@ -148,17 +182,22 @@ public class Q10271_TheEnvelopingDarkness extends Quest switch (st.getCond()) { case 2: + { htmltext = "32528-01.html"; st.setCond(3, true); giveItems(player, MEDIBAL_DOCUMENT, 1); break; + } case 3: case 4: + { htmltext = "32528-03.html"; break; + } } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java index 0ee7661c54..1e6adae933 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java @@ -133,7 +133,9 @@ public class Q10272_LightFragment extends Quest break; } default: + { break; + } } return event; } @@ -184,6 +186,7 @@ public class Q10272_LightFragment extends Quest switch (st.getState()) { case State.CREATED: + { if (player.getLevel() < 75) { htmltext = "32560-03.html"; @@ -194,12 +197,17 @@ public class Q10272_LightFragment extends Quest htmltext = ((st != null) && st.isCompleted()) ? "32560-01.htm" : "32560-02.html"; } break; + } case State.STARTED: + { htmltext = "32560-06.html"; break; + } case State.COMPLETED: + { htmltext = "32560-04.html"; break; + } } break; } @@ -214,18 +222,27 @@ public class Q10272_LightFragment extends Quest switch (st.getCond()) { case 1: + { htmltext = "32559-01.html"; break; + } case 2: + { htmltext = "32559-04.html"; break; + } case 3: + { htmltext = "32559-08.html"; break; + } case 4: + { htmltext = "32559-10.html"; break; + } case 5: + { if (getQuestItemsCount(player, FRAGMENT_POWDER) >= 100) { htmltext = "32559-15.html"; @@ -236,7 +253,9 @@ public class Q10272_LightFragment extends Quest htmltext = hasQuestItems(player, FRAGMENT_POWDER) ? "32559-14.html" : "32559-13.html"; } break; + } case 6: + { if (getQuestItemsCount(player, LIGHT_FRAGMENT_POWDER) < 100) { htmltext = "32559-16.html"; @@ -247,15 +266,20 @@ public class Q10272_LightFragment extends Quest st.setCond(7, true); } break; + } case 7: + { // TODO Nothing here? break; + } case 8: + { htmltext = "32559-18.html"; giveAdena(player, 556980, true); addExpAndSp(player, 1009016, 91363); st.exitQuest(false, true); break; + } } } break; @@ -266,20 +290,30 @@ public class Q10272_LightFragment extends Quest { case 1: case 2: + { htmltext = "32566-02.html"; break; + } case 3: + { htmltext = "32566-01.html"; break; + } case 4: + { htmltext = "32566-09.html"; break; + } case 5: + { htmltext = "32566-10.html"; break; + } case 6: + { htmltext = "32566-10.html"; break; + } } break; } @@ -288,11 +322,15 @@ public class Q10272_LightFragment extends Quest switch (st.getCond()) { case 3: + { htmltext = "32567-01.html"; break; + } case 4: + { htmltext = "32567-05.html"; break; + } } break; } @@ -301,6 +339,7 @@ public class Q10272_LightFragment extends Quest switch (st.getCond()) { case 7: + { if (st.getInt("wait") == 1) { htmltext = "32557-05.html"; @@ -313,9 +352,12 @@ public class Q10272_LightFragment extends Quest htmltext = "32557-01.html"; } break; + } case 8: + { htmltext = "32557-06.html"; break; + } } break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java index 2b535d79b3..982ea877ff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java @@ -63,12 +63,16 @@ public class Q10276_MutatedKaneusGludio extends Quest switch (event) { case "30332-03.htm": + { st.startQuest(); break; + } case "30344-03.htm": + { giveAdena(player, 8500, true); st.exitQuest(false, true); break; + } } return event; } @@ -116,32 +120,48 @@ public class Q10276_MutatedKaneusGludio extends Quest switch (npc.getId()) { case BATHIS: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() > 17) ? "30332-01.htm" : "30332-00.htm"; break; + } case State.STARTED: + { htmltext = (hasQuestItems(player, TISSUE_TK) && hasQuestItems(player, TISSUE_OA)) ? "30332-05.htm" : "30332-04.htm"; break; + } case State.COMPLETED: + { htmltext = "30332-06.htm"; break; + } } break; + } case ROHMER: + { switch (st.getState()) { case State.STARTED: + { htmltext = (hasQuestItems(player, TISSUE_TK) && hasQuestItems(player, TISSUE_OA)) ? "30344-02.htm" : "30344-01.htm"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } default: + { break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java index 7dab180a23..c9e5d0a4c9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java @@ -63,12 +63,16 @@ public class Q10277_MutatedKaneusDion extends Quest switch (event) { case "30071-03.html": + { st.startQuest(); break; + } case "30461-03.html": + { giveAdena(player, 20000, true); st.exitQuest(false, true); break; + } } return event; } @@ -116,32 +120,48 @@ public class Q10277_MutatedKaneusDion extends Quest switch (npc.getId()) { case LUKAS: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() > 27) ? "30071-01.htm" : "30071-00.html"; break; + } case State.STARTED: + { htmltext = (hasQuestItems(player, TISSUE_CH) && hasQuestItems(player, TISSUE_SF)) ? "30071-05.html" : "30071-04.html"; break; + } case State.COMPLETED: + { htmltext = "30071-06.html"; break; + } } break; + } case MIRIEN: + { switch (st.getState()) { case State.STARTED: + { htmltext = (hasQuestItems(player, TISSUE_CH) && hasQuestItems(player, TISSUE_SF)) ? "30461-02.html" : "30461-01.html"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } default: + { break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java index f66937efb2..4746d0dd31 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java @@ -63,12 +63,16 @@ public class Q10278_MutatedKaneusHeine extends Quest switch (event) { case "30916-03.htm": + { st.startQuest(); break; + } case "30907-03.htm": + { giveAdena(player, 50000, true); st.exitQuest(false, true); break; + } } return event; } @@ -116,32 +120,48 @@ public class Q10278_MutatedKaneusHeine extends Quest switch (npc.getId()) { case GOSTA: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() > 37) ? "30916-01.htm" : "30916-00.htm"; break; + } case State.STARTED: + { htmltext = (hasQuestItems(player, TISSUE_BO) && hasQuestItems(player, TISSUE_WB)) ? "30916-05.htm" : "30916-04.htm"; break; + } case State.COMPLETED: + { htmltext = "30916-06.htm"; break; + } } break; + } case MINEVIA: + { switch (st.getState()) { case State.STARTED: + { htmltext = (hasQuestItems(player, TISSUE_BO) && hasQuestItems(player, TISSUE_WB)) ? "30907-02.htm" : "30907-01.htm"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } default: + { break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java index f9947b90ff..ccd3f8052c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java @@ -63,12 +63,16 @@ public class Q10279_MutatedKaneusOren extends Quest switch (event) { case "30196-03.htm": + { st.startQuest(); break; + } case "30189-03.htm": + { giveAdena(player, 100000, true); st.exitQuest(false, true); break; + } } return event; } @@ -116,32 +120,48 @@ public class Q10279_MutatedKaneusOren extends Quest switch (npc.getId()) { case MOUEN: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() > 47) ? "30196-01.htm" : "30196-00.htm"; break; + } case State.STARTED: + { htmltext = (hasQuestItems(player, TISSUE_KA) && hasQuestItems(player, TISSUE_KM)) ? "30196-05.htm" : "30196-04.htm"; break; + } case State.COMPLETED: + { htmltext = "30916-06.htm"; break; + } } break; + } case ROVIA: + { switch (st.getState()) { case State.STARTED: + { htmltext = (hasQuestItems(player, TISSUE_KA) && hasQuestItems(player, TISSUE_KM)) ? "30189-02.htm" : "30189-01.htm"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } default: + { break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java index 26816e6427..7f4d3f97c3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java @@ -63,12 +63,16 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest switch (event) { case "31981-03.htm": + { st.startQuest(); break; + } case "31972-03.htm": + { giveAdena(player, 210000, true); st.exitQuest(false, true); break; + } } return event; } @@ -116,32 +120,48 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest switch (npc.getId()) { case VISHOTSKY: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() > 57) ? "31981-01.htm" : "31981-00.htm"; break; + } case State.STARTED: + { htmltext = (hasQuestItems(player, TISSUE_VS) && hasQuestItems(player, TISSUE_KB)) ? "31981-05.htm" : "31981-04.htm"; break; + } case State.COMPLETED: + { htmltext = "31981-06.htm"; break; + } } break; + } case ATRAXIA: + { switch (st.getState()) { case State.STARTED: + { htmltext = (hasQuestItems(player, TISSUE_VS) && hasQuestItems(player, TISSUE_KB)) ? "31972-02.htm" : "31972-01.htm"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } default: + { break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java index e6f8ffb520..d9a8ff18e3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java @@ -61,12 +61,16 @@ public class Q10281_MutatedKaneusRune extends Quest switch (event) { case "31340-03.htm": + { st.startQuest(); break; + } case "31335-03.htm": + { giveAdena(player, 360000, true); st.exitQuest(false, true); break; + } } return event; } @@ -114,32 +118,48 @@ public class Q10281_MutatedKaneusRune extends Quest switch (npc.getId()) { case MATHIAS: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() > 67) ? "31340-01.htm" : "31340-00.htm"; break; + } case State.STARTED: + { htmltext = hasQuestItems(player, TISSUE_WA) ? "31340-05.htm" : "31340-04.htm"; break; + } case State.COMPLETED: + { htmltext = "31340-06.htm"; break; + } } break; + } case KAYAN: + { switch (st.getState()) { case State.STARTED: + { htmltext = hasQuestItems(player, TISSUE_WA) ? "31335-02.htm" : "31335-01.htm"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } default: + { break; + } } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index b92eec1376..101e80fb37 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -60,13 +60,18 @@ public class Q10289_FadeToBlack extends Quest switch (event) { case "32757-02.htm": + { htmltext = event; break; + } case "32757-03.htm": + { qs.startQuest(); htmltext = event; break; + } case "32757-06.html": + { if (qs.isCond(2) && hasQuestItems(player, MARK_OF_DARKNESS)) { htmltext = "32757-07.html"; @@ -80,6 +85,7 @@ public class Q10289_FadeToBlack extends Quest htmltext = event; } break; + } case "11": case "12": case "13": @@ -100,90 +106,131 @@ public class Q10289_FadeToBlack extends Quest case "28": case "29": case "30": + { if (qs.isCond(3) && hasQuestItems(player, MARK_OF_SPLENDOR)) { // see 32757-08.html for recipe list (all moirai armor 60%) switch (event) { case "11": + { rewardItems(player, 15775, 1); giveAdena(player, 420920, true); break; + } case "12": + { rewardItems(player, 15776, 1); giveAdena(player, 420920, true); break; + } case "13": + { rewardItems(player, 15777, 1); giveAdena(player, 420920, true); break; + } case "14": + { rewardItems(player, 15778, 1); break; + } case "15": + { rewardItems(player, 15779, 1); giveAdena(player, 168360, true); break; + } case "16": + { rewardItems(player, 15780, 1); giveAdena(player, 168360, true); break; + } case "17": + { rewardItems(player, 15781, 1); giveAdena(player, 252540, true); break; + } case "18": + { rewardItems(player, 15782, 1); giveAdena(player, 357780, true); break; + } case "19": + { rewardItems(player, 15783, 1); giveAdena(player, 357780, true); break; + } case "20": + { rewardItems(player, 15784, 1); giveAdena(player, 505100, true); break; + } case "21": + { rewardItems(player, 15785, 1); giveAdena(player, 505100, true); break; + } case "22": + { rewardItems(player, 15786, 1); giveAdena(player, 505100, true); break; + } case "23": + { rewardItems(player, 15787, 1); giveAdena(player, 505100, true); break; + } case "24": + { rewardItems(player, 15787, 1); giveAdena(player, 505100, true); break; + } case "25": + { rewardItems(player, 15789, 1); giveAdena(player, 505100, true); break; + } case "26": + { rewardItems(player, 15790, 1); giveAdena(player, 496680, true); break; + } case "27": + { rewardItems(player, 15791, 1); giveAdena(player, 496680, true); break; + } case "28": + { rewardItems(player, 15792, 1); giveAdena(player, 563860, true); break; + } case "29": + { rewardItems(player, 15793, 1); giveAdena(player, 509040, true); break; + } case "30": + { rewardItems(player, 15794, 1); giveAdena(player, 454240, true); break; + } } final long marksOfDarkness = getQuestItemsCount(player, MARK_OF_DARKNESS); @@ -195,6 +242,7 @@ public class Q10289_FadeToBlack extends Quest htmltext = "32757-09.html"; } break; + } } return htmltext; } @@ -257,12 +305,16 @@ public class Q10289_FadeToBlack extends Quest switch (qs.getCond()) { case 1: + { htmltext = "32757-04.html"; break; + } case 2: case 3: + { htmltext = "32757-05.html"; break; + } } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGiranTalking.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGiranTalking.java index f61a6a350d..d3f180bd32 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGiranTalking.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGiranTalking.java @@ -160,73 +160,96 @@ public class BoatGiranTalking implements Runnable switch (_cycle) { case 0: + { BoatManager.getInstance().broadcastPacket(GIRAN_DOCK, TALKING_DOCK[0], LEAVE_GIRAN5); ThreadPoolManager.schedule(this, 240000); break; + } case 1: + { BoatManager.getInstance().broadcastPacket(GIRAN_DOCK, TALKING_DOCK[0], LEAVE_GIRAN1); ThreadPoolManager.schedule(this, 40000); break; + } case 2: + { BoatManager.getInstance().broadcastPacket(GIRAN_DOCK, TALKING_DOCK[0], LEAVE_GIRAN0); ThreadPoolManager.schedule(this, 20000); break; + } case 3: + { BoatManager.getInstance().broadcastPackets(GIRAN_DOCK, TALKING_DOCK[0], LEAVING_GIRAN, ARRIVAL_TALKING15); _boat.broadcastPacket(GIRAN_SOUND); _boat.payForRide(3946, 1, 46763, 187041, -3451); _boat.executePath(GIRAN_TO_TALKING); ThreadPoolManager.schedule(this, 250000); break; + } case 4: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GIRAN_DOCK, ARRIVAL_TALKING10); ThreadPoolManager.schedule(this, 300000); break; + } case 5: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GIRAN_DOCK, ARRIVAL_TALKING5); ThreadPoolManager.schedule(this, 240000); break; + } case 6: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GIRAN_DOCK, ARRIVAL_TALKING1); break; + } case 7: + { if (BoatManager.getInstance().dockBusy(BoatManager.TALKING_ISLAND)) { if (_shoutCount == 0) { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GIRAN_DOCK, BUSY_TALKING); } - _shoutCount++; if (_shoutCount > 35) { _shoutCount = 0; } - ThreadPoolManager.schedule(this, 5000); return; } _boat.executePath(TALKING_DOCK); break; + } case 8: + { BoatManager.getInstance().dockShip(BoatManager.TALKING_ISLAND, true); BoatManager.getInstance().broadcastPackets(TALKING_DOCK[0], GIRAN_DOCK, ARRIVED_AT_TALKING, ARRIVED_AT_TALKING_2); _boat.broadcastPacket(TALKING_SOUND); ThreadPoolManager.schedule(this, 300000); break; + } case 9: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GIRAN_DOCK, LEAVE_TALKING5); ThreadPoolManager.schedule(this, 240000); break; + } case 10: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GIRAN_DOCK, LEAVE_TALKING1); ThreadPoolManager.schedule(this, 40000); break; + } case 11: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GIRAN_DOCK, LEAVE_TALKING0); ThreadPoolManager.schedule(this, 20000); break; + } case 12: + { BoatManager.getInstance().dockShip(BoatManager.TALKING_ISLAND, false); BoatManager.getInstance().broadcastPackets(TALKING_DOCK[0], GIRAN_DOCK, LEAVING_TALKING); _boat.broadcastPacket(TALKING_SOUND); @@ -234,30 +257,43 @@ public class BoatGiranTalking implements Runnable _boat.executePath(TALKING_TO_GIRAN); ThreadPoolManager.schedule(this, 200000); break; + } case 13: + { BoatManager.getInstance().broadcastPacket(GIRAN_DOCK, TALKING_DOCK[0], ARRIVAL_GIRAN20); ThreadPoolManager.schedule(this, 300000); break; + } case 14: + { BoatManager.getInstance().broadcastPacket(GIRAN_DOCK, TALKING_DOCK[0], ARRIVAL_GIRAN15); ThreadPoolManager.schedule(this, 300000); break; + } case 15: + { BoatManager.getInstance().broadcastPacket(GIRAN_DOCK, TALKING_DOCK[0], ARRIVAL_GIRAN10); ThreadPoolManager.schedule(this, 300000); break; + } case 16: + { BoatManager.getInstance().broadcastPacket(GIRAN_DOCK, TALKING_DOCK[0], ARRIVAL_GIRAN5); ThreadPoolManager.schedule(this, 240000); break; + } case 17: + { BoatManager.getInstance().broadcastPacket(GIRAN_DOCK, TALKING_DOCK[0], ARRIVAL_GIRAN1); break; + } case 18: + { BoatManager.getInstance().broadcastPackets(GIRAN_DOCK, TALKING_DOCK[0], ARRIVED_AT_GIRAN, ARRIVED_AT_GIRAN_2); _boat.broadcastPacket(GIRAN_SOUND); ThreadPoolManager.schedule(this, 300000); break; + } } _shoutCount = 0; _cycle++; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGludinRune.java index 83749b931f..88f8f5e48a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -175,18 +175,25 @@ public class BoatGludinRune implements Runnable switch (_cycle) { case 0: + { BoatManager.getInstance().broadcastPacket(GLUDIN_DOCK[0], RUNE_DOCK[0], LEAVE_GLUDIN5); ThreadPoolManager.schedule(this, 240000); break; + } case 1: + { BoatManager.getInstance().broadcastPacket(GLUDIN_DOCK[0], RUNE_DOCK[0], LEAVE_GLUDIN1); ThreadPoolManager.schedule(this, 40000); break; + } case 2: + { BoatManager.getInstance().broadcastPacket(GLUDIN_DOCK[0], RUNE_DOCK[0], LEAVE_GLUDIN0); ThreadPoolManager.schedule(this, 20000); break; + } case 3: + { BoatManager.getInstance().dockShip(BoatManager.GLUDIN_HARBOR, false); BoatManager.getInstance().broadcastPackets(GLUDIN_DOCK[0], RUNE_DOCK[0], LEAVING_GLUDIN); _boat.broadcastPacket(GLUDIN_SOUND); @@ -194,59 +201,77 @@ public class BoatGludinRune implements Runnable _boat.executePath(GLUDIN_TO_RUNE); ThreadPoolManager.schedule(this, 250000); break; + } case 4: + { BoatManager.getInstance().broadcastPacket(RUNE_DOCK[0], GLUDIN_DOCK[0], ARRIVAL_RUNE15); ThreadPoolManager.schedule(this, 300000); break; + } case 5: + { BoatManager.getInstance().broadcastPacket(RUNE_DOCK[0], GLUDIN_DOCK[0], ARRIVAL_RUNE10); ThreadPoolManager.schedule(this, 300000); break; + } case 6: + { BoatManager.getInstance().broadcastPacket(RUNE_DOCK[0], GLUDIN_DOCK[0], ARRIVAL_RUNE5); ThreadPoolManager.schedule(this, 240000); break; + } case 7: + { BoatManager.getInstance().broadcastPacket(RUNE_DOCK[0], GLUDIN_DOCK[0], ARRIVAL_RUNE1); break; + } case 8: + { if (BoatManager.getInstance().dockBusy(BoatManager.RUNE_HARBOR)) { if (_shoutCount == 0) { BoatManager.getInstance().broadcastPacket(RUNE_DOCK[0], GLUDIN_DOCK[0], BUSY_RUNE); } - _shoutCount++; if (_shoutCount > 35) { _shoutCount = 0; } - ThreadPoolManager.schedule(this, 5000); return; } _boat.executePath(RUNE_DOCK); break; + } case 9: + { BoatManager.getInstance().dockShip(BoatManager.RUNE_HARBOR, true); BoatManager.getInstance().broadcastPackets(RUNE_DOCK[0], GLUDIN_DOCK[0], ARRIVED_AT_RUNE, ARRIVED_AT_RUNE_2); _boat.broadcastPacket(RUNE_SOUND); ThreadPoolManager.schedule(this, 300000); break; + } case 10: + { BoatManager.getInstance().broadcastPacket(RUNE_DOCK[0], GLUDIN_DOCK[0], LEAVE_RUNE5); ThreadPoolManager.schedule(this, 240000); break; + } case 11: + { BoatManager.getInstance().broadcastPacket(RUNE_DOCK[0], GLUDIN_DOCK[0], LEAVE_RUNE1); ThreadPoolManager.schedule(this, 40000); break; + } case 12: + { BoatManager.getInstance().broadcastPacket(RUNE_DOCK[0], GLUDIN_DOCK[0], LEAVE_RUNE0); ThreadPoolManager.schedule(this, 20000); break; + } case 13: + { BoatManager.getInstance().dockShip(BoatManager.RUNE_HARBOR, false); BoatManager.getInstance().broadcastPackets(RUNE_DOCK[0], GLUDIN_DOCK[0], LEAVING_RUNE); _boat.broadcastPacket(RUNE_SOUND); @@ -254,46 +279,57 @@ public class BoatGludinRune implements Runnable _boat.executePath(RUNE_TO_GLUDIN); ThreadPoolManager.schedule(this, 60000); break; + } case 14: + { BoatManager.getInstance().broadcastPacket(GLUDIN_DOCK[0], RUNE_DOCK[0], ARRIVAL_GLUDIN15); ThreadPoolManager.schedule(this, 300000); break; + } case 15: + { BoatManager.getInstance().broadcastPacket(GLUDIN_DOCK[0], RUNE_DOCK[0], ARRIVAL_GLUDIN10); ThreadPoolManager.schedule(this, 300000); break; + } case 16: + { BoatManager.getInstance().broadcastPacket(GLUDIN_DOCK[0], RUNE_DOCK[0], ARRIVAL_GLUDIN5); ThreadPoolManager.schedule(this, 240000); break; + } case 17: + { BoatManager.getInstance().broadcastPacket(GLUDIN_DOCK[0], RUNE_DOCK[0], ARRIVAL_GLUDIN1); break; + } case 18: + { if (BoatManager.getInstance().dockBusy(BoatManager.GLUDIN_HARBOR)) { if (_shoutCount == 0) { BoatManager.getInstance().broadcastPacket(GLUDIN_DOCK[0], RUNE_DOCK[0], BUSY_GLUDIN); } - _shoutCount++; if (_shoutCount > 35) { _shoutCount = 0; } - ThreadPoolManager.schedule(this, 5000); return; } _boat.executePath(GLUDIN_DOCK); break; + } case 19: + { BoatManager.getInstance().dockShip(BoatManager.GLUDIN_HARBOR, true); BoatManager.getInstance().broadcastPackets(GLUDIN_DOCK[0], RUNE_DOCK[0], ARRIVED_AT_GLUDIN, ARRIVED_AT_GLUDIN_2); _boat.broadcastPacket(GLUDIN_SOUND); ThreadPoolManager.schedule(this, 300000); break; + } } _shoutCount = 0; _cycle++; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index 30d8d48208..921d14083d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -118,46 +118,66 @@ public class BoatInnadrilTour implements Runnable switch (_cycle) { case 0: + { BoatManager.getInstance().broadcastPacket(DOCK, DOCK, LEAVE_INNADRIL5); ThreadPoolManager.schedule(this, 240000); break; + } case 1: + { BoatManager.getInstance().broadcastPacket(DOCK, DOCK, LEAVE_INNADRIL1); ThreadPoolManager.schedule(this, 40000); break; + } case 2: + { BoatManager.getInstance().broadcastPacket(DOCK, DOCK, LEAVE_INNADRIL0); ThreadPoolManager.schedule(this, 20000); break; + } case 3: + { BoatManager.getInstance().broadcastPackets(DOCK, DOCK, LEAVING_INNADRIL, INNADRIL_SOUND); _boat.payForRide(0, 1, 107092, 219098, -3952); _boat.executePath(TOUR); ThreadPoolManager.schedule(this, 650000); break; + } case 4: + { BoatManager.getInstance().broadcastPacket(DOCK, DOCK, ARRIVAL20); ThreadPoolManager.schedule(this, 300000); break; + } case 5: + { BoatManager.getInstance().broadcastPacket(DOCK, DOCK, ARRIVAL15); ThreadPoolManager.schedule(this, 300000); break; + } case 6: + { BoatManager.getInstance().broadcastPacket(DOCK, DOCK, ARRIVAL10); ThreadPoolManager.schedule(this, 300000); break; + } case 7: + { BoatManager.getInstance().broadcastPacket(DOCK, DOCK, ARRIVAL5); ThreadPoolManager.schedule(this, 240000); break; + } case 8: + { BoatManager.getInstance().broadcastPacket(DOCK, DOCK, ARRIVAL1); break; + } case 9: + { BoatManager.getInstance().broadcastPackets(DOCK, DOCK, ARRIVED_AT_INNADRIL, INNADRIL_SOUND); ThreadPoolManager.schedule(this, 300000); break; + } } _cycle++; if (_cycle > 9) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index acb30efdd8..f2ee7d1348 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -111,44 +111,52 @@ public class BoatRunePrimeval implements Runnable switch (_cycle) { case 0: + { BoatManager.getInstance().dockShip(BoatManager.RUNE_HARBOR, false); BoatManager.getInstance().broadcastPackets(RUNE_DOCK[0], PRIMEVAL_DOCK, LEAVING_RUNE, RUNE_SOUND); _boat.payForRide(8925, 1, 34513, -38009, -3640); _boat.executePath(RUNE_TO_PRIMEVAL); break; + } case 1: + { BoatManager.getInstance().broadcastPackets(PRIMEVAL_DOCK, RUNE_DOCK[0], ARRIVED_AT_PRIMEVAL, ARRIVED_AT_PRIMEVAL_2, PRIMEVAL_SOUND); ThreadPoolManager.schedule(this, 180000); break; + } case 2: + { BoatManager.getInstance().broadcastPackets(PRIMEVAL_DOCK, RUNE_DOCK[0], LEAVING_PRIMEVAL, PRIMEVAL_SOUND); _boat.payForRide(8924, 1, 10447, -24982, -3664); _boat.executePath(PRIMEVAL_TO_RUNE); break; + } case 3: + { if (BoatManager.getInstance().dockBusy(BoatManager.RUNE_HARBOR)) { if (_shoutCount == 0) { BoatManager.getInstance().broadcastPacket(RUNE_DOCK[0], PRIMEVAL_DOCK, BUSY_RUNE); } - _shoutCount++; if (_shoutCount > 35) { _shoutCount = 0; } - ThreadPoolManager.schedule(this, 5000); return; } _boat.executePath(RUNE_DOCK); break; + } case 4: + { BoatManager.getInstance().dockShip(BoatManager.RUNE_HARBOR, true); BoatManager.getInstance().broadcastPackets(RUNE_DOCK[0], PRIMEVAL_DOCK, ARRIVED_AT_RUNE, ARRIVED_AT_RUNE_2, RUNE_SOUND); ThreadPoolManager.schedule(this, 180000); break; + } } _shoutCount = 0; _cycle++; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatTalkingGludin.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatTalkingGludin.java index c6e1a1a7f0..db0af79cbb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatTalkingGludin.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatTalkingGludin.java @@ -144,18 +144,25 @@ public class BoatTalkingGludin implements Runnable switch (_cycle) { case 0: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GLUDIN_DOCK[0], LEAVE_TALKING5); ThreadPoolManager.schedule(this, 240000); break; + } case 1: + { BoatManager.getInstance().broadcastPackets(TALKING_DOCK[0], GLUDIN_DOCK[0], LEAVE_TALKING1, LEAVE_TALKING1_2); ThreadPoolManager.schedule(this, 40000); break; + } case 2: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GLUDIN_DOCK[0], LEAVE_TALKING0); ThreadPoolManager.schedule(this, 20000); break; + } case 3: + { BoatManager.getInstance().dockShip(BoatManager.TALKING_ISLAND, false); BoatManager.getInstance().broadcastPackets(TALKING_DOCK[0], GLUDIN_DOCK[0], LEAVING_TALKING); _boat.broadcastPacket(TALKING_SOUND); @@ -163,55 +170,71 @@ public class BoatTalkingGludin implements Runnable _boat.executePath(TALKING_TO_GLUDIN); ThreadPoolManager.schedule(this, 300000); break; + } case 4: + { BoatManager.getInstance().broadcastPacket(GLUDIN_DOCK[0], TALKING_DOCK[0], ARRIVAL_GLUDIN10); ThreadPoolManager.schedule(this, 300000); break; + } case 5: + { BoatManager.getInstance().broadcastPacket(GLUDIN_DOCK[0], TALKING_DOCK[0], ARRIVAL_GLUDIN5); ThreadPoolManager.schedule(this, 240000); break; + } case 6: + { BoatManager.getInstance().broadcastPacket(GLUDIN_DOCK[0], TALKING_DOCK[0], ARRIVAL_GLUDIN1); break; + } case 7: + { if (BoatManager.getInstance().dockBusy(BoatManager.GLUDIN_HARBOR)) { if (_shoutCount == 0) { BoatManager.getInstance().broadcastPacket(GLUDIN_DOCK[0], TALKING_DOCK[0], BUSY_GLUDIN); } - _shoutCount++; if (_shoutCount > 35) { _shoutCount = 0; } - ThreadPoolManager.schedule(this, 5000); return; } _boat.executePath(GLUDIN_DOCK); break; + } case 8: + { BoatManager.getInstance().dockShip(BoatManager.GLUDIN_HARBOR, true); BoatManager.getInstance().broadcastPackets(GLUDIN_DOCK[0], TALKING_DOCK[0], ARRIVED_AT_GLUDIN, ARRIVED_AT_GLUDIN_2); _boat.broadcastPacket(GLUDIN_SOUND); ThreadPoolManager.schedule(this, 300000); break; + } case 9: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GLUDIN_DOCK[0], LEAVE_GLUDIN5); ThreadPoolManager.schedule(this, 240000); break; + } case 10: + { BoatManager.getInstance().broadcastPackets(TALKING_DOCK[0], GLUDIN_DOCK[0], LEAVE_GLUDIN1, LEAVE_TALKING1_2); ThreadPoolManager.schedule(this, 40000); break; + } case 11: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GLUDIN_DOCK[0], LEAVE_GLUDIN0); ThreadPoolManager.schedule(this, 20000); break; + } case 12: + { BoatManager.getInstance().dockShip(BoatManager.GLUDIN_HARBOR, false); BoatManager.getInstance().broadcastPackets(TALKING_DOCK[0], GLUDIN_DOCK[0], LEAVING_GLUDIN); _boat.broadcastPacket(GLUDIN_SOUND); @@ -219,42 +242,51 @@ public class BoatTalkingGludin implements Runnable _boat.executePath(GLUDIN_TO_TALKING); ThreadPoolManager.schedule(this, 150000); break; + } case 13: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GLUDIN_DOCK[0], ARRIVAL_TALKING10); ThreadPoolManager.schedule(this, 300000); break; + } case 14: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GLUDIN_DOCK[0], ARRIVAL_TALKING5); ThreadPoolManager.schedule(this, 240000); break; + } case 15: + { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GLUDIN_DOCK[0], ARRIVAL_TALKING1); break; + } case 16: + { if (BoatManager.getInstance().dockBusy(BoatManager.TALKING_ISLAND)) { if (_shoutCount == 0) { BoatManager.getInstance().broadcastPacket(TALKING_DOCK[0], GLUDIN_DOCK[0], BUSY_TALKING); } - _shoutCount++; if (_shoutCount > 35) { _shoutCount = 0; } - ThreadPoolManager.schedule(this, 5000); return; } _boat.executePath(TALKING_DOCK); break; + } case 17: + { BoatManager.getInstance().dockShip(BoatManager.TALKING_ISLAND, true); BoatManager.getInstance().broadcastPackets(TALKING_DOCK[0], GLUDIN_DOCK[0], ARRIVED_AT_TALKING, ARRIVED_AT_TALKING_2); _boat.broadcastPacket(TALKING_SOUND); ThreadPoolManager.schedule(this, 300000); break; + } } _shoutCount = 0; _cycle++; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java index eb1127c8f1..8e06dd2ffa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java @@ -207,6 +207,7 @@ public class SevenSigns { case PERIOD_SEAL_VALIDATION: case 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); @@ -217,11 +218,14 @@ public class SevenSigns lastPeriodChange.add(Calendar.HOUR, -24 * 7); } break; + } case PERIOD_COMP_RECRUITING: case PERIOD_COMP_RESULTS: + { // because of the short duration of this period, just check it from last save lastPeriodChange.setTimeInMillis(_lastSave.getTimeInMillis() + PERIOD_MINOR_LENGTH); break; + } } // because of previous "date" column usage, check only if it already contains usable data for us @@ -312,13 +316,12 @@ public class SevenSigns 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()) @@ -326,21 +329,19 @@ public class SevenSigns AutoSpawnHandler.getInstance().setSpawnActive(dawnCrest, true); } } - for (AutoSpawnInstance duskCrest : crestOfDuskSpawns) { AutoSpawnHandler.getInstance().setSpawnActive(duskCrest, false); } break; - + } 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()) @@ -348,12 +349,12 @@ public class SevenSigns AutoSpawnHandler.getInstance().setSpawnActive(duskCrest, true); } } - for (AutoSpawnInstance dawnCrest : crestOfDawnSpawns) { AutoSpawnHandler.getInstance().setSpawnActive(dawnCrest, false); } break; + } } } else @@ -430,9 +431,13 @@ public class SevenSigns switch (cabal) { case CABAL_DAWN: + { return "dawn"; + } case CABAL_DUSK: + { return "dusk"; + } } return "No Cabal"; @@ -443,9 +448,13 @@ public class SevenSigns switch (cabal) { case CABAL_DAWN: + { return "Lords of Dawn"; + } case CABAL_DUSK: + { return "Revolutionaries of Dusk"; + } } return "No Cabal"; @@ -458,14 +467,20 @@ public class SevenSigns switch (seal) { case SEAL_AVARICE: + { sealName += "Avarice"; break; + } case SEAL_GNOSIS: + { sealName += "Gnosis"; break; + } case SEAL_STRIFE: + { sealName += "Strife"; break; + } } return sealName; @@ -504,8 +519,8 @@ public class SevenSigns { case PERIOD_SEAL_VALIDATION: case PERIOD_COMPETITION: + { int daysToChange = getDaysToPeriodChange(); - if (daysToChange == 7) { if (_nextPeriodChange.get(Calendar.HOUR_OF_DAY) < PERIOD_START_HOUR) @@ -517,20 +532,21 @@ public class SevenSigns daysToChange = 0; } } - // Otherwise... if (daysToChange > 0) { _nextPeriodChange.add(Calendar.DATE, daysToChange); } - _nextPeriodChange.set(Calendar.HOUR_OF_DAY, PERIOD_START_HOUR); _nextPeriodChange.set(Calendar.MINUTE, PERIOD_START_MINS); break; + } case PERIOD_COMP_RECRUITING: case PERIOD_COMP_RESULTS: + { _nextPeriodChange.add(Calendar.MILLISECOND, PERIOD_MINOR_LENGTH); break; + } } _log.info("SevenSigns: Next period change set to " + _nextPeriodChange.getTime()); } @@ -542,17 +558,25 @@ public class SevenSigns switch (_activePeriod) { case PERIOD_COMP_RECRUITING: + { periodName = "Quest Event Initialization"; break; + } case PERIOD_COMPETITION: + { periodName = "Competition (Quest Event)"; break; + } case PERIOD_COMP_RESULTS: + { periodName = "Quest Event Results"; break; + } case PERIOD_SEAL_VALIDATION: + { periodName = "Seal Validation"; break; + } } return periodName; } @@ -598,21 +622,29 @@ public class SevenSigns switch (getCurrentPeriod()) { case PERIOD_COMP_RECRUITING: + { nextValidStart = nextPeriodChange + PERIOD_MAJOR_LENGTH; nextQuestStart = nextValidStart + PERIOD_MAJOR_LENGTH + PERIOD_MINOR_LENGTH; break; + } case PERIOD_COMPETITION: + { nextValidStart = nextPeriodChange; nextQuestStart = nextPeriodChange + PERIOD_MAJOR_LENGTH + PERIOD_MINOR_LENGTH; break; + } case PERIOD_COMP_RESULTS: + { nextQuestStart = nextPeriodChange + PERIOD_MAJOR_LENGTH; nextValidStart = nextQuestStart + PERIOD_MAJOR_LENGTH + PERIOD_MINOR_LENGTH; break; + } case PERIOD_SEAL_VALIDATION: + { nextQuestStart = nextPeriodChange; nextValidStart = nextPeriodChange + PERIOD_MAJOR_LENGTH + PERIOD_MINOR_LENGTH; break; + } } if (((nextQuestStart < tillDate) && (tillDate < nextValidStart)) || ((nextValidStart < nextQuestStart) && ((tillDate < nextValidStart) || (nextQuestStart < tillDate)))) @@ -629,11 +661,17 @@ public class SevenSigns switch (cabal) { case CABAL_NULL: + { return 0; + } case CABAL_DAWN: + { return Math.round((float) (_dawnStoneScore / ((float) totalStoneScore == 0 ? 1 : totalStoneScore)) * 500) + _dawnFestivalScore; + } case CABAL_DUSK: + { return Math.round((float) (_duskStoneScore / ((float) totalStoneScore == 0 ? 1 : totalStoneScore)) * 500) + _duskFestivalScore; + } } return 0; @@ -644,11 +682,17 @@ public class SevenSigns switch (cabal) { case CABAL_NULL: + { return 0; + } case CABAL_DAWN: + { return _dawnStoneScore; + } case CABAL_DUSK: + { return _duskStoneScore; + } } return 0; @@ -659,11 +703,17 @@ public class SevenSigns switch (cabal) { case CABAL_NULL: + { return 0; + } case CABAL_DAWN: + { return _dawnFestivalScore; + } case CABAL_DUSK: + { return _duskFestivalScore; + } } return 0; @@ -1100,11 +1150,15 @@ public class SevenSigns switch (getPlayerCabal(objectId)) { case CABAL_DAWN: + { _dawnStoneScore += contribScore; break; + } case CABAL_DUSK: + { _duskStoneScore += contribScore; break; + } } if (!Config.ALT_SEVENSIGNS_LAZY_UPDATE) @@ -1156,17 +1210,25 @@ public class SevenSigns switch (getCurrentPeriod()) { case PERIOD_COMP_RECRUITING: + { sm = SystemMessage.getSystemMessage(SystemMessageId.SEVEN_SIGNS_PREPARATIONS_HAVE_BEGUN_FOR_THE_NEXT_QUEST_EVENT); break; + } case PERIOD_COMPETITION: + { sm = SystemMessage.getSystemMessage(SystemMessageId.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); break; + } case PERIOD_COMP_RESULTS: + { sm = SystemMessage.getSystemMessage(SystemMessageId.SEVEN_SIGNS_QUEST_EVENT_HAS_ENDED_RESULTS_ARE_BEING_TALLIED); break; + } case PERIOD_SEAL_VALIDATION: + { sm = SystemMessage.getSystemMessage(SystemMessageId.SEVEN_SIGNS_THIS_IS_THE_SEAL_VALIDATION_PERIOD_A_NEW_QUEST_EVENT_PERIOD_BEGINS_NEXT_MONDAY); break; + } } player.sendPacket(sm); @@ -1248,12 +1310,16 @@ public class SevenSigns switch (prevSealOwner) { case CABAL_NULL: + { switch (getCabalHighestScore()) { case CABAL_NULL: + { newSealOwner = CABAL_NULL; break; + } case CABAL_DAWN: + { if (dawnPercent >= 35) { newSealOwner = CABAL_DAWN; @@ -1263,7 +1329,9 @@ public class SevenSigns newSealOwner = CABAL_NULL; } break; + } case CABAL_DUSK: + { if (duskPercent >= 35) { newSealOwner = CABAL_DUSK; @@ -1273,12 +1341,16 @@ public class SevenSigns newSealOwner = CABAL_NULL; } break; + } } break; + } case CABAL_DAWN: + { switch (getCabalHighestScore()) { case CABAL_NULL: + { if (dawnPercent >= 10) { newSealOwner = CABAL_DAWN; @@ -1288,7 +1360,9 @@ public class SevenSigns newSealOwner = CABAL_NULL; } break; + } case CABAL_DAWN: + { if (dawnPercent >= 10) { newSealOwner = CABAL_DAWN; @@ -1298,7 +1372,9 @@ public class SevenSigns newSealOwner = CABAL_NULL; } break; + } case CABAL_DUSK: + { if (duskPercent >= 35) { newSealOwner = CABAL_DUSK; @@ -1312,12 +1388,16 @@ public class SevenSigns newSealOwner = CABAL_NULL; } break; + } } break; + } case CABAL_DUSK: + { switch (getCabalHighestScore()) { case CABAL_NULL: + { if (duskPercent >= 10) { newSealOwner = CABAL_DUSK; @@ -1327,7 +1407,9 @@ public class SevenSigns newSealOwner = CABAL_NULL; } break; + } case CABAL_DAWN: + { if (dawnPercent >= 35) { newSealOwner = CABAL_DAWN; @@ -1341,7 +1423,9 @@ public class SevenSigns newSealOwner = CABAL_NULL; } break; + } case CABAL_DUSK: + { if (duskPercent >= 10) { newSealOwner = CABAL_DUSK; @@ -1351,8 +1435,10 @@ public class SevenSigns newSealOwner = CABAL_NULL; } break; + } } break; + } } _signsSealOwners.put(currSeal, newSealOwner); @@ -1361,6 +1447,7 @@ public class SevenSigns switch (currSeal) { case SEAL_AVARICE: + { if (newSealOwner == CABAL_DAWN) { sendMessageToAll(SystemMessageId.SEVEN_SIGNS_THE_LORDS_OF_DAWN_HAVE_OBTAINED_THE_SEAL_OF_AVARICE); @@ -1370,7 +1457,9 @@ public class SevenSigns sendMessageToAll(SystemMessageId.SEVEN_SIGNS_THE_REVOLUTIONARIES_OF_DUSK_HAVE_OBTAINED_THE_SEAL_OF_AVARICE); } break; + } case SEAL_GNOSIS: + { if (newSealOwner == CABAL_DAWN) { sendMessageToAll(SystemMessageId.SEVEN_SIGNS_THE_LORDS_OF_DAWN_HAVE_OBTAINED_THE_SEAL_OF_GNOSIS); @@ -1380,7 +1469,9 @@ public class SevenSigns sendMessageToAll(SystemMessageId.SEVEN_SIGNS_THE_REVOLUTIONARIES_OF_DUSK_HAVE_OBTAINED_THE_SEAL_OF_GNOSIS); } break; + } case SEAL_STRIFE: + { if (newSealOwner == CABAL_DAWN) { sendMessageToAll(SystemMessageId.SEVEN_SIGNS_THE_LORDS_OF_DAWN_HAVE_OBTAINED_THE_SEAL_OF_STRIFE); @@ -1389,9 +1480,9 @@ public class SevenSigns { sendMessageToAll(SystemMessageId.SEVEN_SIGNS_THE_REVOLUTIONARIES_OF_DUSK_HAVE_OBTAINED_THE_SEAL_OF_STRIFE); } - CastleManager.getInstance().validateTaxes(newSealOwner); break; + } } } } @@ -1445,34 +1536,34 @@ public class SevenSigns switch (periodEnded) { case PERIOD_COMP_RECRUITING: // Initialization - + { // Start the Festival of Darkness cycle. SevenSignsFestival.getInstance().startFestivalManager(); - // Send message that Competition has begun. sendMessageToAll(SystemMessageId.SEVEN_SIGNS_THE_COMPETITION_PERIOD_HAS_BEGUN_VISIT_A_PRIEST_OF_DAWN_OR_PRIESTESS_OF_DUSK_TO_PARTICIPATE_IN_THE_EVENT); break; + } case PERIOD_COMPETITION: // Results Calculation - + { // Send message that Competition has ended. sendMessageToAll(SystemMessageId.SEVEN_SIGNS_THE_COMPETITION_PERIOD_HAS_ENDED_THE_NEXT_QUEST_EVENT_WILL_START_IN_ONE_WEEK); - final 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(SystemMessageId.SEVEN_SIGNS_THE_LORDS_OF_DAWN_HAVE_WON); break; + } case CABAL_DUSK: + { sendMessageToAll(SystemMessageId.SEVEN_SIGNS_THE_REVOLUTIONARIES_OF_DUSK_HAVE_WON); break; + } } _previousWinner = compWinner; @@ -1483,24 +1574,22 @@ public class SevenSigns 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(SystemMessageId.SEVEN_SIGNS_THE_SEAL_VALIDATION_PERIOD_HAS_BEGUN); - _log.info("SevenSigns: The " + getCabalName(_previousWinner) + " have won the competition with " + getCurrentScore(_previousWinner) + " points!"); 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(SystemMessageId.SEVEN_SIGNS_THE_SEAL_VALIDATION_PERIOD_HAS_ENDED); // Clear Seal of Strife influence. @@ -1508,18 +1597,16 @@ public class SevenSigns // 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. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java index 2d80f47fbb..9ace9471fe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java @@ -816,20 +816,30 @@ public class SevenSignsFestival implements SpawnListener switch (festivalID) { case FESTIVAL_LEVEL_MAX_31: + { festivalName = "Level 31 or lower"; break; + } case FESTIVAL_LEVEL_MAX_42: + { festivalName = "Level 42 or lower"; break; + } case FESTIVAL_LEVEL_MAX_53: + { festivalName = "Level 53 or lower"; break; + } case FESTIVAL_LEVEL_MAX_64: + { festivalName = "Level 64 or lower"; break; + } default: + { festivalName = "No Level Limit"; break; + } } return festivalName; @@ -847,17 +857,25 @@ public class SevenSignsFestival implements SpawnListener switch (festivalId) { case SevenSignsFestival.FESTIVAL_LEVEL_MAX_31: + { maxLevel = 31; break; + } case SevenSignsFestival.FESTIVAL_LEVEL_MAX_42: + { maxLevel = 42; break; + } case SevenSignsFestival.FESTIVAL_LEVEL_MAX_53: + { maxLevel = 53; break; + } case SevenSignsFestival.FESTIVAL_LEVEL_MAX_64: + { maxLevel = 64; break; + } } return maxLevel; @@ -1609,14 +1627,20 @@ public class SevenSignsFestival implements SpawnListener switch (stoneType) { case SevenSigns.SEAL_STONE_BLUE_ID: + { eachStoneBonus = SevenSigns.SEAL_STONE_BLUE_VALUE; break; + } case SevenSigns.SEAL_STONE_GREEN_ID: + { eachStoneBonus = SevenSigns.SEAL_STONE_GREEN_VALUE; break; + } case SevenSigns.SEAL_STONE_RED_ID: + { eachStoneBonus = SevenSigns.SEAL_STONE_RED_VALUE; break; + } } final int newTotalBonus = _accumulatedBonuses.get(festivalId) + (stoneAmount * eachStoneBonus); @@ -2209,16 +2233,24 @@ public class SevenSignsFestival implements SpawnListener { case 0: case 1: + { _npcSpawns = (_cabal == SevenSigns.CABAL_DAWN) ? FESTIVAL_DAWN_PRIMARY_SPAWNS[_levelRange] : FESTIVAL_DUSK_PRIMARY_SPAWNS[_levelRange]; break; + } case 2: + { _npcSpawns = (_cabal == SevenSigns.CABAL_DAWN) ? FESTIVAL_DAWN_SECONDARY_SPAWNS[_levelRange] : FESTIVAL_DUSK_SECONDARY_SPAWNS[_levelRange]; break; + } case 3: + { _npcSpawns = (_cabal == SevenSigns.CABAL_DAWN) ? FESTIVAL_DAWN_CHEST_SPAWNS[_levelRange] : FESTIVAL_DUSK_CHEST_SPAWNS[_levelRange]; break; + } default: + { return; + } } for (int[] _npcSpawn : _npcSpawns) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java index 97eb133be0..682d3cca53 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java @@ -99,10 +99,14 @@ public class EnchantItemHPBonusData implements IXmlReader 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; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 1250fc6ffa..9ce8df37f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -283,6 +283,7 @@ public final class MultisellData implements IXmlReader switch (id) { case CLAN_REPUTATION: + { if (player.getClan() == null) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_AND_CANNOT_PERFORM_THIS_ACTION); @@ -299,13 +300,16 @@ public final class MultisellData implements IXmlReader break; } return true; + } case FAME: + { if (player.getFame() < amount) { player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_REPUTATION_TO_DO_THAT); break; } return true; + } } return false; } @@ -315,16 +319,20 @@ public final class MultisellData implements IXmlReader switch (id) { case CLAN_REPUTATION: + { player.getClan().takeReputationScore((int) amount, true); final SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE); 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; } @@ -334,13 +342,17 @@ public final class MultisellData implements IXmlReader switch (id) { case CLAN_REPUTATION: + { player.getClan().addReputationScore((int) amount, true); break; + } case FAME: + { player.setFame((int) (player.getFame() + amount)); player.sendPacket(new UserInfo(player)); player.sendPacket(new ExBrExtraUserInfo(player)); break; + } } } @@ -378,9 +390,13 @@ public final class MultisellData implements IXmlReader { case CLAN_REPUTATION: case FAME: + { return true; + } default: + { return ing.getTemplate() != null; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index efb4d09405..4f4499abdf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -197,23 +197,35 @@ public final class SkillTreesData implements IXmlReader switch (b.getNodeName()) { case "item": + { skillLearn.addRequiredItem(new ItemHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"))); break; + } case "preRequisiteSkill": + { skillLearn.addPreReqSkill(new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "lvl"))); break; + } case "race": + { skillLearn.addRace(Race.valueOf(b.getTextContent())); break; + } case "residenceId": + { skillLearn.addResidenceId(Integer.valueOf(b.getTextContent())); break; + } case "socialClass": + { skillLearn.setSocialClass(Enum.valueOf(SocialClass.class, b.getTextContent())); break; + } case "subClassConditions": + { skillLearn.addSubclassConditions(parseInteger(attrs, "slot"), parseInteger(attrs, "lvl")); break; + } } } @@ -885,29 +897,45 @@ public final class SkillTreesData implements IXmlReader switch (skillType) { case CLASS: + { sl = getClassSkill(id, lvl, player.getLearningClass()); break; + } case TRANSFORM: + { sl = getTransformSkill(id, lvl); break; + } case FISHING: + { sl = getFishingSkill(id, lvl); break; + } case PLEDGE: + { sl = getPledgeSkill(id, lvl); break; + } case SUBPLEDGE: + { sl = getSubPledgeSkill(id, lvl); break; + } case TRANSFER: + { sl = getTransferSkill(id, lvl, player.getClassId()); break; + } case SUBCLASS: + { sl = getSubClassSkill(id, lvl); break; + } case COLLECT: + { sl = getCollectSkill(id, lvl); break; + } } return sl; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java index 24024376dd..8411eac942 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java @@ -524,9 +524,13 @@ public class AugmentationData case L2Item.SLOT_LR_FINGER: case L2Item.SLOT_LR_EAR: case L2Item.SLOT_NECK: + { return generateRandomAccessoryAugmentation(lifeStoneLevel, bodyPart, lifeStoneId); + } default: + { return generateRandomWeaponAugmentation(lifeStoneLevel, lifeStoneGrade, lifeStoneId, targetItem); + } } } @@ -568,19 +572,29 @@ public class AugmentationData switch (lifeStoneGrade) { case AbstractRefinePacket.GRADE_NONE: + { gradeChance = Config.RETAIL_LIKE_AUGMENTATION_NG_CHANCE; break; + } case AbstractRefinePacket.GRADE_MID: + { gradeChance = Config.RETAIL_LIKE_AUGMENTATION_MID_CHANCE; break; + } case AbstractRefinePacket.GRADE_HIGH: + { gradeChance = Config.RETAIL_LIKE_AUGMENTATION_HIGH_CHANCE; break; + } case AbstractRefinePacket.GRADE_TOP: + { gradeChance = Config.RETAIL_LIKE_AUGMENTATION_TOP_CHANCE; break; + } default: + { gradeChance = Config.RETAIL_LIKE_AUGMENTATION_NG_CHANCE; + } } int c = Rnd.get(100); @@ -653,19 +667,29 @@ public class AugmentationData switch (lifeStoneGrade) { case AbstractRefinePacket.GRADE_NONE: + { gradeChance = Config.RETAIL_LIKE_AUGMENTATION_NG_CHANCE; break; + } case AbstractRefinePacket.GRADE_MID: + { gradeChance = Config.RETAIL_LIKE_AUGMENTATION_MID_CHANCE; break; + } case AbstractRefinePacket.GRADE_HIGH: + { gradeChance = Config.RETAIL_LIKE_AUGMENTATION_HIGH_CHANCE; break; + } case AbstractRefinePacket.GRADE_TOP: + { gradeChance = Config.RETAIL_LIKE_AUGMENTATION_TOP_CHANCE; break; + } default: + { gradeChance = Config.RETAIL_LIKE_AUGMENTATION_NG_CHANCE; + } } int c = Rnd.get(100); @@ -715,6 +739,7 @@ public class AugmentationData switch (lifeStoneGrade) { case AbstractRefinePacket.GRADE_NONE: + { if (Rnd.get(1, 100) <= Config.AUGMENTATION_NG_SKILL_CHANCE) { generateSkill = true; @@ -724,7 +749,9 @@ public class AugmentationData generateGlow = true; } break; + } case AbstractRefinePacket.GRADE_MID: + { if (Rnd.get(1, 100) <= Config.AUGMENTATION_MID_SKILL_CHANCE) { generateSkill = true; @@ -734,7 +761,9 @@ public class AugmentationData generateGlow = true; } break; + } case AbstractRefinePacket.GRADE_HIGH: + { if (Rnd.get(1, 100) <= Config.AUGMENTATION_HIGH_SKILL_CHANCE) { generateSkill = true; @@ -744,7 +773,9 @@ public class AugmentationData generateGlow = true; } break; + } case AbstractRefinePacket.GRADE_TOP: + { if (Rnd.get(1, 100) <= Config.AUGMENTATION_TOP_SKILL_CHANCE) { generateSkill = true; @@ -754,11 +785,14 @@ public class AugmentationData generateGlow = true; } break; + } case AbstractRefinePacket.GRADE_ACC: + { if (Rnd.get(1, 100) <= Config.AUGMENTATION_ACC_SKILL_CHANCE) { generateSkill = true; } + } } if (!generateSkill && (Rnd.get(1, 100) <= Config.AUGMENTATION_BASESTAT_CHANCE)) @@ -805,14 +839,20 @@ public class AugmentationData switch (resultColor) { case 1: // blue skill + { stat34 = _blueSkills.get(lifeStoneLevel).get(Rnd.get(0, _blueSkills.get(lifeStoneLevel).size() - 1)); break; + } case 2: // purple skill + { stat34 = _purpleSkills.get(lifeStoneLevel).get(Rnd.get(0, _purpleSkills.get(lifeStoneLevel).size() - 1)); break; + } case 3: // red skill + { stat34 = _redSkills.get(lifeStoneLevel).get(Rnd.get(0, _redSkills.get(lifeStoneLevel).size() - 1)); break; + } } } @@ -951,19 +991,27 @@ public class AugmentationData 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; + } } final int resultColor = Rnd.get(0, 3); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/NpcPersonalAIData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/NpcPersonalAIData.java index de54883e09..2eaa5e7b78 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/NpcPersonalAIData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/NpcPersonalAIData.java @@ -99,12 +99,16 @@ public class NpcPersonalAIData switch (key) { case "disableRandomAnimation": + { npc.setRandomAnimationEnabled((map.get(key) == 0)); break; + } case "disableRandomWalk": + { npc.setIsNoRndWalk((map.get(key) == 1)); spawn.setIsNoRndWalk((map.get(key) == 1)); break; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java index 777430184f..da8e3ab45a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java @@ -161,10 +161,14 @@ public final class SpawnTable implements IXmlReader { case "disableRandomAnimation": case "disableRandomWalk": + { val = Boolean.parseBoolean(c.getTextContent()) ? 1 : 0; break; + } default: + { val = Integer.parseInt(c.getTextContent()); + } } map.put(c.getNodeName(), val); } @@ -324,16 +328,22 @@ public final class SpawnTable implements IXmlReader switch (spawnInfo.getInt("periodOfDay", 0)) { case 0: // default + { ret += spawnDat.init(); break; + } case 1: // Day + { DayNightSpawnManager.getInstance().addDayCreature(spawnDat); ret = 1; break; + } case 2: // Night + { DayNightSpawnManager.getInstance().addNightCreature(spawnDat); ret = 1; break; + } } addSpawn(spawnDat); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java index b293ce7901..6d7b4add29 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -200,14 +200,20 @@ public final class CastleManager implements InstanceListManager switch (sealStrifeOwner) { case SevenSigns.CABAL_DUSK: + { maxTax = 5; break; + } case SevenSigns.CABAL_DAWN: + { maxTax = 25; break; + } default: // no owner + { maxTax = 15; break; + } } for (Castle castle : _castles) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java index 2041dcedd5..efda600665 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java @@ -401,19 +401,33 @@ public final class DimensionalRiftManager switch (type) { case 1: + { return Config.RIFT_ENTER_COST_RECRUIT; + } case 2: + { return Config.RIFT_ENTER_COST_SOLDIER; + } case 3: + { return Config.RIFT_ENTER_COST_OFFICER; + } case 4: + { return Config.RIFT_ENTER_COST_CAPTAIN; + } case 5: + { return Config.RIFT_ENTER_COST_COMMANDER; + } case 6: + { return Config.RIFT_ENTER_COST_HERO; + } default: + { throw new IndexOutOfBoundsException(); + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index 99de95752f..66c3c32f79 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -280,29 +280,37 @@ public final class FourSepulchersManager switch (npcId) { case 31921: // conquerors + { spawnDat.setX(181061); spawnDat.setY(-85595); spawnDat.setZ(-7200); spawnDat.setHeading(-32584); break; + } case 31922: // emperors + { spawnDat.setX(179292); spawnDat.setY(-88981); spawnDat.setZ(-7200); spawnDat.setHeading(-33272); break; + } case 31923: // sages + { spawnDat.setX(173202); spawnDat.setY(-87004); spawnDat.setZ(-7200); spawnDat.setHeading(-16248); break; + } case 31924: // judges + { spawnDat.setX(175606); spawnDat.setY(-82853); spawnDat.setZ(-7200); spawnDat.setHeading(-16248); break; + } } _managers.add(spawnDat); SpawnTable.getInstance().addNewSpawn(spawnDat, false); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java index ca13385589..b6ba5a5e26 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java @@ -52,20 +52,28 @@ public final class SoDManager 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.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); break; + } } } @@ -90,9 +98,12 @@ public final class SoDManager switch (_SoDState) { case 1: + { // do nothing, players should kill Tiat a few times break; + } case 2: + { // Conquest Complete state, if too much time is passed than change to defense state final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) @@ -105,12 +116,17 @@ public final class SoDManager ThreadPoolManager.schedule(new UpdateSoDStateTask(), Config.SOD_STAGE_2_LENGTH - timePast); } break; + } case 3: + { // not implemented setSoDState(1, true); break; + } default: + { _log.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); + } } } @@ -178,15 +194,23 @@ public final class SoDManager switch (_SoDState) { case 1: + { return -1; + } case 2: + { return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); + } case 3: + { // not implemented yet return -1; + } default: + { // this should not happen! return -1; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java index d86c57ee60..c18a377d33 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java @@ -148,17 +148,23 @@ public class SoIManager { case 1: case 4: + { // EnergySeeds.SoiMouthSpawn(); // EnergySeeds.SoiAbyssGaze2Spawn(); break; + } case 5: + { // EnergySeeds.SoiCloseMouthSpawn(); // EnergySeeds.SoiAbyssGaze2Spawn(); break; + } default: + { // EnergySeeds.SoiCloseMouthSpawn(); // EnergySeeds.SoiAbyssGaze1Spawn(); break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java index ac0a3f49d4..024b019f22 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java @@ -821,13 +821,19 @@ public final class TerritoryWarManager implements Siegable 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.warning(getClass().getSimpleName() + ": Unknown npc type for " + rs.getInt("id")); + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2ArmorSet.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2ArmorSet.java index 3bc925ac46..96777714f5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2ArmorSet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2ArmorSet.java @@ -205,17 +205,29 @@ public final class L2ArmorSet switch (slot) { case Inventory.PAPERDOLL_CHEST: + { return _chestId == itemId; + } case Inventory.PAPERDOLL_LEGS: + { return _legs.contains(itemId); + } case Inventory.PAPERDOLL_HEAD: + { return _head.contains(itemId); + } case Inventory.PAPERDOLL_GLOVES: + { return _gloves.contains(itemId); + } case Inventory.PAPERDOLL_FEET: + { return _feet.contains(itemId); + } default: + { return false; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java index 73fcc817ce..6f5936bfaf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -554,58 +554,86 @@ public class L2Clan implements IIdentifiable, INamable switch (pledgeType) { case 0: + { switch (getLevel()) { case 3: + { limit = 30; break; + } case 2: + { limit = 20; break; + } case 1: + { limit = 15; break; + } case 0: + { limit = 10; break; + } default: + { limit = 40; break; + } } break; + } case -1: + { limit = 20; break; + } case 100: case 200: + { switch (getLevel()) { case 11: + { limit = 30; break; + } default: + { limit = 20; break; + } } break; + } case 1001: case 1002: case 2001: case 2002: + { switch (getLevel()) { case 9: case 10: case 11: + { limit = 25; break; + } default: + { limit = 10; break; + } } break; + } default: + { break; + } } return limit; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/StatsSet.java index c48cd7a3fb..87af380179 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/StatsSet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/StatsSet.java @@ -502,7 +502,6 @@ public class StatsSet implements IParserAdvUtils return val == null ? defaultValue : String.valueOf(val); } - @Override @SuppressWarnings("unchecked") public > T getEnum(String key, Class enumClass) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 6ad8cf4fc3..d381bf8a4c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -430,16 +430,20 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe 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; } @@ -1616,15 +1620,19 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe switch (skill.getTargetType()) { case AREA_SUMMON: // We need it to correct facing + { target = getSummon(); break; + } case AURA: case AURA_CORPSE_MOB: case FRONT_AURA: case BEHIND_AURA: case GROUND: + { target = this; break; + } case SELF: case PET: case SERVITOR: @@ -1634,8 +1642,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe case CLAN: case PARTY_CLAN: case COMMAND_CHANNEL: + { doit = true; + } default: + { if (targets.length == 0) { if (simultaneously) @@ -1668,6 +1679,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { target = (L2Character) getTarget(); } + } } beginCast(skill, simultaneously, target, targets); } @@ -5142,9 +5154,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe switch (getAttackType()) { case BOW: + { return (int) ((1500 * 333 * getStat().getWeaponReuseModifier(null)) / getStat().getPAtkSpd()); + } case CROSSBOW: + { return (int) ((1200 * 333 * getStat().getWeaponReuseModifier(null)) / getStat().getPAtkSpd()); + } } } @@ -5330,10 +5346,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe case FRONT_AURA: case BEHIND_AURA: case AURA_CORPSE_MOB: + { break; + } default: + { abortCast(); return; + } } } @@ -5788,10 +5808,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { case 51: // Lure case 511: // Temptation + { break; + } default: + { // add attacker into list ((L2Character) target).addAttackerToAttackByList(this); + } } } // notify target AI about the attack diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 0b2a75f139..01d98cc804 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -987,24 +987,32 @@ public class L2Npc extends L2Character 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 31092: // Black Marketeer of Mammon + { filename += "blkmrkt_1.htm"; break; + } case 31113: // Merchant of Mammon + { if (Config.ALT_STRICT_SEVENSIGNS) { switch (compWinner) { case SevenSigns.CABAL_DAWN: + { if ((playerCabal != compWinner) || (playerCabal != sealAvariceOwner)) { player.sendPacket(SystemMessageId.ONLY_A_LORD_OF_DAWN_MAY_USE_THIS); @@ -1012,7 +1020,9 @@ public class L2Npc extends L2Character return; } break; + } case SevenSigns.CABAL_DUSK: + { if ((playerCabal != compWinner) || (playerCabal != sealAvariceOwner)) { player.sendPacket(SystemMessageId.ONLY_A_REVOLUTIONARY_OF_DUSK_MAY_USE_THIS); @@ -1020,19 +1030,25 @@ public class L2Npc extends L2Character return; } break; + } default: + { player.sendPacket(SystemMessageId.THE_SSQ_COMPETITION_PERIOD_IS_UNDERWAY); return; + } } } filename += "mammmerch_1.htm"; break; + } case 31126: // Blacksmith of Mammon + { if (Config.ALT_STRICT_SEVENSIGNS) { switch (compWinner) { case SevenSigns.CABAL_DAWN: + { if ((playerCabal != compWinner) || (playerCabal != sealGnosisOwner)) { player.sendPacket(SystemMessageId.ONLY_A_LORD_OF_DAWN_MAY_USE_THIS); @@ -1040,7 +1056,9 @@ public class L2Npc extends L2Character return; } break; + } case SevenSigns.CABAL_DUSK: + { if ((playerCabal != compWinner) || (playerCabal != sealGnosisOwner)) { player.sendPacket(SystemMessageId.ONLY_A_REVOLUTIONARY_OF_DUSK_MAY_USE_THIS); @@ -1048,13 +1066,17 @@ public class L2Npc extends L2Character return; } break; + } default: + { player.sendPacket(SystemMessageId.THE_SSQ_COMPETITION_PERIOD_IS_UNDERWAY); return; + } } } filename += "mammblack_1.htm"; break; + } case 31132: case 31133: case 31134: @@ -1065,9 +1087,12 @@ public class L2Npc extends L2Character 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"; @@ -1077,11 +1102,13 @@ public class L2Npc extends L2Character 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"; @@ -1091,7 +1118,9 @@ public class L2Npc extends L2Character filename = (getHtmlPath(npcId, val)); } break; + } case 36402: + { if (player.getOlympiadBuffCount() > 0) { filename = (player.getOlympiadBuffCount() == Config.ALT_OLY_MAX_BUFFS ? Olympiad.OLYMPIAD_HTML_PATH + "olympiad_buffs.htm" : Olympiad.OLYMPIAD_HTML_PATH + "olympiad_5buffs.htm"); @@ -1101,7 +1130,9 @@ public class L2Npc extends L2Character filename = Olympiad.OLYMPIAD_HTML_PATH + "olympiad_nobuffs.htm"; } break; + } case 30298: // Blacksmith Pinter + { if (player.isAcademyMember()) { filename = (getHtmlPath(npcId, 1)); @@ -1111,7 +1142,9 @@ public class L2Npc extends L2Character filename = (getHtmlPath(npcId, val)); } break; + } default: + { if ((npcId >= 31865) && (npcId <= 31918)) { if (val == 0) @@ -1131,6 +1164,7 @@ public class L2Npc extends L2Character // 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 diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 287d8e1f4e..0545ecc7b5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -612,8 +612,10 @@ public abstract class L2Summon extends L2Playable { // OWNER_PET should be cast even if no target has been found case OWNER_PET: + { target = getOwner(); break; + } // PARTY, AURA, SELF should be cast even if no target has been found case PARTY: case AURA: @@ -622,12 +624,16 @@ public abstract class L2Summon extends L2Playable case SELF: case AURA_CORPSE_MOB: case COMMAND_CHANNEL: + { target = this; break; + } default: + { // Get the first target of the list target = skill.getFirstOfTargetList(this); break; + } } // Check the validity of the target diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java index 006650002a..ebc34c87b4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java @@ -695,29 +695,45 @@ public final class L2AuctioneerInstance extends L2Npc switch (nearestTownId) { case 911: + { nearestTown = "GLUDIN"; break; + } case 912: + { nearestTown = "GLUDIO"; break; + } case 916: + { nearestTown = "DION"; break; + } case 918: + { nearestTown = "GIRAN"; break; + } case 1537: + { nearestTown = "RUNE"; break; + } case 1538: + { nearestTown = "GODARD"; break; + } case 1714: + { nearestTown = "SCHUTTGART"; break; + } default: + { nearestTown = "ADEN"; break; + } } return nearestTown; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java index b623faf599..24544d08c5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java @@ -81,20 +81,30 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance switch (Integer.parseInt(st.nextToken())) { case 1: + { ok = Evolve.doEvolve(player, this, 9882, 10307, 55); break; + } case 2: + { ok = Evolve.doEvolve(player, this, 4422, 10308, 55); break; + } case 3: + { ok = Evolve.doEvolve(player, this, 4423, 10309, 55); break; + } case 4: + { ok = Evolve.doEvolve(player, this, 4424, 10310, 55); break; + } case 5: + { ok = Evolve.doEvolve(player, this, 10426, 10611, 70); break; + } } final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); if (ok) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java index 2c284afadb..7fcb5c81fa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java @@ -294,44 +294,70 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (percent) { case 20: + { cost = Config.CH_HPREG1_FEE; break; + } case 40: + { cost = Config.CH_HPREG2_FEE; break; + } case 80: + { cost = Config.CH_HPREG3_FEE; break; + } case 100: + { cost = Config.CH_HPREG4_FEE; break; + } case 120: + { cost = Config.CH_HPREG5_FEE; break; + } case 140: + { cost = Config.CH_HPREG6_FEE; break; + } case 160: + { cost = Config.CH_HPREG7_FEE; break; + } case 180: + { cost = Config.CH_HPREG8_FEE; break; + } case 200: + { cost = Config.CH_HPREG9_FEE; break; + } case 220: + { cost = Config.CH_HPREG10_FEE; break; + } case 240: + { cost = Config.CH_HPREG11_FEE; break; + } case 260: + { cost = Config.CH_HPREG12_FEE; break; + } default: + { cost = Config.CH_HPREG13_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); @@ -351,20 +377,30 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (percent) { case 5: + { cost = Config.CH_MPREG1_FEE; break; + } case 10: + { cost = Config.CH_MPREG2_FEE; break; + } case 15: + { cost = Config.CH_MPREG3_FEE; break; + } case 30: + { cost = Config.CH_MPREG4_FEE; break; + } default: + { cost = Config.CH_MPREG5_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Provides additional MP recovery for clan members in the clan hall." + percent + "%"); @@ -383,26 +419,40 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (percent) { case 5: + { cost = Config.CH_EXPREG1_FEE; break; + } case 10: + { cost = Config.CH_EXPREG2_FEE; break; + } case 15: + { cost = Config.CH_EXPREG3_FEE; break; + } case 25: + { cost = Config.CH_EXPREG4_FEE; break; + } case 35: + { cost = Config.CH_EXPREG5_FEE; break; + } case 40: + { cost = Config.CH_EXPREG6_FEE; break; + } default: + { cost = Config.CH_EXPREG7_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the clan hall." + percent + "%"); @@ -436,48 +486,76 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (percent) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm"); break; + } case 20: + { fee = Config.CH_HPREG1_FEE; break; + } case 40: + { fee = Config.CH_HPREG2_FEE; break; + } case 80: + { fee = Config.CH_HPREG3_FEE; break; + } case 100: + { fee = Config.CH_HPREG4_FEE; break; + } case 120: + { fee = Config.CH_HPREG5_FEE; break; + } case 140: + { fee = Config.CH_HPREG6_FEE; break; + } case 160: + { fee = Config.CH_HPREG7_FEE; break; + } case 180: + { fee = Config.CH_HPREG8_FEE; break; + } case 200: + { fee = Config.CH_HPREG9_FEE; break; + } case 220: + { fee = Config.CH_HPREG10_FEE; break; + } case 240: + { fee = Config.CH_HPREG11_FEE; break; + } case 260: + { fee = Config.CH_HPREG12_FEE; break; + } default: + { fee = Config.CH_HPREG13_FEE; break; + } } if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_HP, percent, fee, Config.CH_HPREG_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) == null))) { @@ -518,24 +596,36 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (percent) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm"); break; + } case 5: + { fee = Config.CH_MPREG1_FEE; break; + } case 10: + { fee = Config.CH_MPREG2_FEE; break; + } case 15: + { fee = Config.CH_MPREG3_FEE; break; + } case 30: + { fee = Config.CH_MPREG4_FEE; break; + } default: + { fee = Config.CH_MPREG5_FEE; break; + } } if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_MP, percent, fee, Config.CH_MPREG_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) == null))) { @@ -576,30 +666,46 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (percent) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm"); break; + } case 5: + { fee = Config.CH_EXPREG1_FEE; break; + } case 10: + { fee = Config.CH_EXPREG2_FEE; break; + } case 15: + { fee = Config.CH_EXPREG3_FEE; break; + } case 25: + { fee = Config.CH_EXPREG4_FEE; break; + } case 35: + { fee = Config.CH_EXPREG5_FEE; break; + } case 40: + { fee = Config.CH_EXPREG6_FEE; break; + } default: + { fee = Config.CH_EXPREG7_FEE; break; + } } if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_EXP, percent, fee, Config.CH_EXPREG_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) == null))) { @@ -637,17 +743,25 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (grade) { case 0: + { html.replace("%change_hp%", "[Deactivate]" + hp_grade0); break; + } case 1: + { html.replace("%change_hp%", "[Deactivate]" + hp_grade1); break; + } case 2: + { html.replace("%change_hp%", "[Deactivate]" + hp_grade2); break; + } case 3: + { html.replace("%change_hp%", "[Deactivate]" + hp_grade3); break; + } } } else @@ -658,17 +772,25 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (grade) { case 0: + { html.replace("%change_hp%", hp_grade0); break; + } case 1: + { html.replace("%change_hp%", hp_grade1); break; + } case 2: + { html.replace("%change_hp%", hp_grade2); break; + } case 3: + { html.replace("%change_hp%", hp_grade3); break; + } } } if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null) @@ -679,17 +801,25 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (grade) { case 0: + { html.replace("%change_exp%", "[Deactivate]" + exp_grade0); break; + } case 1: + { html.replace("%change_exp%", "[Deactivate]" + exp_grade1); break; + } case 2: + { html.replace("%change_exp%", "[Deactivate]" + exp_grade2); break; + } case 3: + { html.replace("%change_exp%", "[Deactivate]" + exp_grade3); break; + } } } else @@ -700,17 +830,25 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (grade) { case 0: + { html.replace("%change_exp%", exp_grade0); break; + } case 1: + { html.replace("%change_exp%", exp_grade1); break; + } case 2: + { html.replace("%change_exp%", exp_grade2); break; + } case 3: + { html.replace("%change_exp%", exp_grade3); break; + } } } if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null) @@ -721,17 +859,25 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (grade) { case 0: + { html.replace("%change_mp%", "[Deactivate]" + mp_grade0); break; + } case 1: + { html.replace("%change_mp%", "[Deactivate]" + mp_grade1); break; + } case 2: + { html.replace("%change_mp%", "[Deactivate]" + mp_grade2); break; + } case 3: + { html.replace("%change_mp%", "[Deactivate]" + mp_grade3); break; + } } } else @@ -742,17 +888,25 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (grade) { case 0: + { html.replace("%change_mp%", mp_grade0); break; + } case 1: + { html.replace("%change_mp%", mp_grade1); break; + } case 2: + { html.replace("%change_mp%", mp_grade2); break; + } case 3: + { html.replace("%change_mp%", mp_grade3); break; + } } } sendHtmlMessage(player, html); @@ -802,14 +956,20 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (stage) { case 1: + { cost = Config.CH_ITEM1_FEE; break; + } case 2: + { cost = Config.CH_ITEM2_FEE; break; + } default: + { cost = Config.CH_ITEM3_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Allow the purchase of special items at fixed intervals."); @@ -828,29 +988,45 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (stage) { case 1: + { cost = Config.CH_SUPPORT1_FEE; break; + } case 2: + { cost = Config.CH_SUPPORT2_FEE; break; + } case 3: + { cost = Config.CH_SUPPORT3_FEE; break; + } case 4: + { cost = Config.CH_SUPPORT4_FEE; break; + } case 5: + { cost = Config.CH_SUPPORT5_FEE; break; + } case 6: + { cost = Config.CH_SUPPORT6_FEE; break; + } case 7: + { cost = Config.CH_SUPPORT7_FEE; break; + } default: + { cost = Config.CH_SUPPORT8_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Enables the use of supplementary magic."); @@ -869,11 +1045,15 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (stage) { case 1: + { cost = Config.CH_TELE1_FEE; break; + } default: + { cost = Config.CH_TELE2_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Teleports clan members in a clan hall to the target Stage " + stage + " staging area"); @@ -912,18 +1092,26 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (lvl) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm"); break; + } case 1: + { fee = Config.CH_ITEM1_FEE; break; + } case 2: + { fee = Config.CH_ITEM2_FEE; break; + } default: + { fee = Config.CH_ITEM3_FEE; break; + } } if (!getClanHall().updateFunctions(player, ClanHall.FUNC_ITEM_CREATE, lvl, fee, Config.CH_ITEM_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) == null))) { @@ -964,15 +1152,21 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (lvl) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm"); break; + } case 1: + { fee = Config.CH_TELE1_FEE; break; + } default: + { fee = Config.CH_TELE2_FEE; break; + } } if (!getClanHall().updateFunctions(player, ClanHall.FUNC_TELEPORT, lvl, fee, Config.CH_TELE_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) == null))) { @@ -1013,33 +1207,51 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (lvl) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm"); break; + } case 1: + { fee = Config.CH_SUPPORT1_FEE; break; + } case 2: + { fee = Config.CH_SUPPORT2_FEE; break; + } case 3: + { fee = Config.CH_SUPPORT3_FEE; break; + } case 4: + { fee = Config.CH_SUPPORT4_FEE; break; + } case 5: + { fee = Config.CH_SUPPORT5_FEE; break; + } case 6: + { fee = Config.CH_SUPPORT6_FEE; break; + } case 7: + { fee = Config.CH_SUPPORT7_FEE; break; + } default: + { fee = Config.CH_SUPPORT8_FEE; break; + } } if (!getClanHall().updateFunctions(player, ClanHall.FUNC_SUPPORT, lvl, fee, Config.CH_SUPPORT_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) == null))) { @@ -1083,17 +1295,25 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (grade) { case 0: + { html.replace("%change_support%", "[Deactivate]" + support_grade0); break; + } case 1: + { html.replace("%change_support%", "[Deactivate]" + support_grade1); break; + } case 2: + { html.replace("%change_support%", "[Deactivate]" + support_grade2); break; + } case 3: + { html.replace("%change_support%", "[Deactivate]" + support_grade3); break; + } } } else @@ -1104,17 +1324,25 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (grade) { case 0: + { html.replace("%change_support%", support_grade0); break; + } case 1: + { html.replace("%change_support%", support_grade1); break; + } case 2: + { html.replace("%change_support%", support_grade2); break; + } case 3: + { html.replace("%change_support%", support_grade3); break; + } } } if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null) @@ -1168,11 +1396,15 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (stage) { case 1: + { cost = Config.CH_CURTAIN1_FEE; break; + } default: + { cost = Config.CH_CURTAIN2_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "These curtains can be used to decorate the clan hall."); @@ -1191,11 +1423,15 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (stage) { case 1: + { cost = Config.CH_FRONT1_FEE; break; + } default: + { cost = Config.CH_FRONT2_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Used to decorate the clan hall."); @@ -1229,15 +1465,21 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (lvl) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm"); break; + } case 1: + { fee = Config.CH_CURTAIN1_FEE; break; + } default: + { fee = Config.CH_CURTAIN2_FEE; break; + } } if (!getClanHall().updateFunctions(player, ClanHall.FUNC_DECO_CURTAINS, lvl, fee, Config.CH_CURTAIN_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) == null))) { @@ -1278,15 +1520,21 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance switch (lvl) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm"); break; + } case 1: + { fee = Config.CH_FRONT1_FEE; break; + } default: + { fee = Config.CH_FRONT2_FEE; break; + } } if (!getClanHall().updateFunctions(player, ClanHall.FUNC_DECO_FRONTPLATEFORM, lvl, fee, Config.CH_FRONT_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) == null))) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java index d170a6fc70..ef88f15bbe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java @@ -203,6 +203,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance switch (jobLevel) { case 0: + { if (Config.CLASS_MASTER_SETTINGS.isAllowed(1)) { sb.append("Come back here when you reached level 20 to change your class.
"); @@ -220,7 +221,9 @@ public final class L2ClassMasterInstance extends L2MerchantInstance sb.append("I can't change your occupation.
"); } break; + } case 1: + { if (Config.CLASS_MASTER_SETTINGS.isAllowed(2)) { sb.append("Come back here when you reached level 40 to change your class.
"); @@ -234,7 +237,9 @@ public final class L2ClassMasterInstance extends L2MerchantInstance sb.append("I can't change your occupation.
"); } break; + } case 2: + { if (Config.CLASS_MASTER_SETTINGS.isAllowed(3)) { sb.append("Come back here when you reached level 76 to change your class.
"); @@ -244,9 +249,12 @@ public final class L2ClassMasterInstance extends L2MerchantInstance sb.append("I can't change your occupation.
"); } break; + } case 3: + { sb.append("There is no class change available for you anymore.
"); break; + } } sb.append(""); html.setHtml(sb.toString()); @@ -414,13 +422,21 @@ public final class L2ClassMasterInstance extends L2MerchantInstance switch (level) { case 0: + { return 20; + } case 1: + { return 40; + } case 2: + { return 76; + } default: + { return Integer.MAX_VALUE; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java index 95d423763f..5fed2b2011 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java @@ -103,56 +103,84 @@ public final class L2CubicInstance implements IIdentifiable switch (_cubicId) { case STORM_CUBIC: + { _skills.add(SkillData.getInstance().getSkill(4049, level)); break; + } case VAMPIRIC_CUBIC: + { _skills.add(SkillData.getInstance().getSkill(4050, level)); break; + } case LIFE_CUBIC: + { _skills.add(SkillData.getInstance().getSkill(4051, level)); doAction(); break; + } case VIPER_CUBIC: + { _skills.add(SkillData.getInstance().getSkill(4052, level)); break; + } case POLTERGEIST_CUBIC: + { _skills.add(SkillData.getInstance().getSkill(4053, level)); _skills.add(SkillData.getInstance().getSkill(4054, level)); _skills.add(SkillData.getInstance().getSkill(4055, level)); break; + } case BINDING_CUBIC: + { _skills.add(SkillData.getInstance().getSkill(4164, level)); break; + } case AQUA_CUBIC: + { _skills.add(SkillData.getInstance().getSkill(4165, level)); break; + } case SPARK_CUBIC: + { _skills.add(SkillData.getInstance().getSkill(4166, level)); break; + } case ATTRACT_CUBIC: + { _skills.add(SkillData.getInstance().getSkill(5115, level)); _skills.add(SkillData.getInstance().getSkill(5116, level)); break; + } case SMART_CUBIC_ARCANALORD: + { _skills.add(SkillData.getInstance().getSkill(4051, 7)); _skills.add(SkillData.getInstance().getSkill(4165, 9)); break; + } case SMART_CUBIC_ELEMENTALMASTER: + { _skills.add(SkillData.getInstance().getSkill(4049, 8)); _skills.add(SkillData.getInstance().getSkill(4166, 9)); break; + } case SMART_CUBIC_SPECTRALMASTER: + { _skills.add(SkillData.getInstance().getSkill(4049, 8)); _skills.add(SkillData.getInstance().getSkill(4052, 6)); break; + } case SMART_CUBIC_EVATEMPLAR: + { _skills.add(SkillData.getInstance().getSkill(4053, 8)); _skills.add(SkillData.getInstance().getSkill(4165, 9)); break; + } case SMART_CUBIC_SHILLIENTEMPLAR: + { _skills.add(SkillData.getInstance().getSkill(4049, 8)); _skills.add(SkillData.getInstance().getSkill(5115, 4)); break; + } } _disappearTask = ThreadPoolManager.schedule(new CubicDisappear(this), cubicDuration * 1000); // disappear } @@ -180,11 +208,15 @@ public final class L2CubicInstance implements IIdentifiable case SMART_CUBIC_SPECTRALMASTER: case SMART_CUBIC_EVATEMPLAR: case SMART_CUBIC_SHILLIENTEMPLAR: + { _actionTask = ThreadPoolManager.scheduleAtFixedRate(new CubicAction(this, _cubicSkillChance), 0, _cubicDelay); break; + } case LIFE_CUBIC: + { _actionTask = ThreadPoolManager.scheduleAtFixedRate(new CubicHeal(this), 0, _cubicDelay); break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DawnPriestInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DawnPriestInstance.java index 6c23623b74..029368601a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DawnPriestInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DawnPriestInstance.java @@ -63,6 +63,7 @@ public class L2DawnPriestInstance extends L2SignsPriestInstance switch (playerCabal) { case SevenSigns.CABAL_DAWN: + { if (isCompResultsPeriod) { filename += "dawn_priest_5.htm"; @@ -98,7 +99,9 @@ public class L2DawnPriestInstance extends L2SignsPriestInstance filename += "dawn_priest_1b.htm"; } break; + } case SevenSigns.CABAL_DUSK: + { if (isSealValidationPeriod) { filename += "dawn_priest_3a.htm"; @@ -108,7 +111,9 @@ public class L2DawnPriestInstance extends L2SignsPriestInstance filename += "dawn_priest_3b.htm"; } break; + } default: + { if (isCompResultsPeriod) { filename += "dawn_priest_5.htm"; @@ -137,6 +142,7 @@ public class L2DawnPriestInstance extends L2SignsPriestInstance filename += "dawn_priest_1a.htm"; } break; + } } final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DuskPriestInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DuskPriestInstance.java index 474a10fb5a..dfbad812f7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DuskPriestInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DuskPriestInstance.java @@ -63,6 +63,7 @@ public class L2DuskPriestInstance extends L2SignsPriestInstance switch (playerCabal) { case SevenSigns.CABAL_DUSK: + { if (isCompResultsPeriod) { filename += "dusk_priest_5.htm"; @@ -98,7 +99,9 @@ public class L2DuskPriestInstance extends L2SignsPriestInstance filename += "dusk_priest_1b.htm"; } break; + } case SevenSigns.CABAL_DAWN: + { if (isSealValidationPeriod) { filename += "dusk_priest_3a.htm"; @@ -108,7 +111,9 @@ public class L2DuskPriestInstance extends L2SignsPriestInstance filename += "dusk_priest_3b.htm"; } break; + } default: + { if (isCompResultsPeriod) { filename += "dusk_priest_5.htm"; @@ -137,6 +142,7 @@ public class L2DuskPriestInstance extends L2SignsPriestInstance filename += "dusk_priest_1a.htm"; } break; + } } final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FestivalGuideInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FestivalGuideInstance.java index d50bdf0ffb..cb7c5015ba 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FestivalGuideInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FestivalGuideInstance.java @@ -50,91 +50,112 @@ public final class L2FestivalGuideInstance extends L2Npc { case 31127: case 31132: + { _festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_31; _festivalOracle = SevenSigns.CABAL_DAWN; _blueStonesNeeded = 900; _greenStonesNeeded = 540; _redStonesNeeded = 270; break; + } case 31128: case 31133: + { _festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_42; _festivalOracle = SevenSigns.CABAL_DAWN; _blueStonesNeeded = 1500; _greenStonesNeeded = 900; _redStonesNeeded = 450; break; + } case 31129: case 31134: + { _festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_53; _festivalOracle = SevenSigns.CABAL_DAWN; _blueStonesNeeded = 3000; _greenStonesNeeded = 1800; _redStonesNeeded = 900; break; + } case 31130: case 31135: + { _festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_64; _festivalOracle = SevenSigns.CABAL_DAWN; _blueStonesNeeded = 4500; _greenStonesNeeded = 2700; _redStonesNeeded = 1350; break; + } case 31131: case 31136: + { _festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_NONE; _festivalOracle = SevenSigns.CABAL_DAWN; _blueStonesNeeded = 6000; _greenStonesNeeded = 3600; _redStonesNeeded = 1800; break; - + } case 31137: case 31142: + { _festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_31; _festivalOracle = SevenSigns.CABAL_DUSK; _blueStonesNeeded = 900; _greenStonesNeeded = 540; _redStonesNeeded = 270; break; + } case 31138: case 31143: + { _festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_42; _festivalOracle = SevenSigns.CABAL_DUSK; _blueStonesNeeded = 1500; _greenStonesNeeded = 900; _redStonesNeeded = 450; break; + } case 31139: case 31144: + { _festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_53; _festivalOracle = SevenSigns.CABAL_DUSK; _blueStonesNeeded = 3000; _greenStonesNeeded = 1800; _redStonesNeeded = 900; break; + } case 31140: case 31145: + { _festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_64; _festivalOracle = SevenSigns.CABAL_DUSK; _blueStonesNeeded = 4500; _greenStonesNeeded = 2700; _redStonesNeeded = 1350; break; + } case 31141: case 31146: + { _festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_NONE; _festivalOracle = SevenSigns.CABAL_DUSK; _blueStonesNeeded = 6000; _greenStonesNeeded = 3600; _redStonesNeeded = 1800; break; + } default: + { _festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_NONE; _festivalOracle = SevenSigns.CABAL_NULL; _blueStonesNeeded = 0; _greenStonesNeeded = 0; _redStonesNeeded = 0; + } } } @@ -153,13 +174,21 @@ public final class L2FestivalGuideInstance extends L2Npc switch (stoneType) { case SevenSigns.SEAL_STONE_BLUE_ID: + { return _blueStonesNeeded; + } case SevenSigns.SEAL_STONE_GREEN_ID: + { return _greenStonesNeeded; + } case SevenSigns.SEAL_STONE_RED_ID: + { return _redStonesNeeded; + } default: + { return -1; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java index 30bd9535ce..27b0793dac 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java @@ -134,18 +134,24 @@ public class L2FortCommanderInstance extends L2DefenderInstance switch (spawn2.getMessageId()) { case 1: + { npcString = NpcStringId.ATTACKING_THE_ENEMY_S_REINFORCEMENTS_IS_NECESSARY_TIME_TO_DIE; break; + } case 2: + { if (attacker instanceof L2Summon) { attacker = ((L2Summon) attacker).getOwner(); } npcString = NpcStringId.EVERYONE_CONCENTRATE_YOUR_ATTACKS_ON_S1_SHOW_THE_ENEMY_YOUR_RESOLVE; break; + } case 3: + { npcString = NpcStringId.SPIRIT_OF_FIRE_UNLEASH_YOUR_POWER_BURN_THE_ENEMY; break; + } } if (npcString != null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java index 747a17f7d1..220c231a1f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java @@ -407,11 +407,15 @@ public class L2FortManagerInstance extends L2MerchantInstance switch (percent) { case 300: + { cost = Config.FS_HPREG1_FEE; break; + } default: // 400 + { cost = Config.FS_HPREG2_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); @@ -431,11 +435,15 @@ public class L2FortManagerInstance extends L2MerchantInstance switch (percent) { case 40: + { cost = Config.FS_MPREG1_FEE; break; + } default: // 50 + { cost = Config.FS_MPREG2_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Provides additional MP recovery for clan members in the fortress." + percent + "%"); @@ -454,11 +462,15 @@ public class L2FortManagerInstance extends L2MerchantInstance switch (percent) { case 45: + { cost = Config.FS_EXPREG1_FEE; break; + } default: // 50 + { cost = Config.FS_EXPREG2_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the fortress." + percent + "%"); @@ -492,15 +504,21 @@ public class L2FortManagerInstance extends L2MerchantInstance switch (percent) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm"); break; + } case 300: + { fee = Config.FS_HPREG1_FEE; break; + } default: // 400 + { fee = Config.FS_HPREG2_FEE; break; + } } if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_HP, percent, fee, Config.FS_HPREG_FEE_RATIO, (getFort().getFunction(Fort.FUNC_RESTORE_HP) == null))) { @@ -537,15 +555,21 @@ public class L2FortManagerInstance extends L2MerchantInstance switch (percent) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm"); break; + } case 40: + { fee = Config.FS_MPREG1_FEE; break; + } default: // 50 + { fee = Config.FS_MPREG2_FEE; break; + } } if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_MP, percent, fee, Config.FS_MPREG_FEE_RATIO, (getFort().getFunction(Fort.FUNC_RESTORE_MP) == null))) { @@ -582,15 +606,21 @@ public class L2FortManagerInstance extends L2MerchantInstance switch (percent) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm"); break; + } case 45: + { fee = Config.FS_EXPREG1_FEE; break; + } default: // 50 + { fee = Config.FS_EXPREG2_FEE; break; + } } if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_EXP, percent, fee, Config.FS_EXPREG_FEE_RATIO, (getFort().getFunction(Fort.FUNC_RESTORE_EXP) == null))) { @@ -682,11 +712,15 @@ public class L2FortManagerInstance extends L2MerchantInstance switch (stage) { case 1: + { cost = Config.FS_SUPPORT1_FEE; break; + } default: + { cost = Config.FS_SUPPORT2_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Enables the use of supplementary magic."); @@ -705,11 +739,15 @@ public class L2FortManagerInstance extends L2MerchantInstance switch (stage) { case 1: + { cost = Config.FS_TELE1_FEE; break; + } default: + { cost = Config.FS_TELE2_FEE; break; + } } html.replace("%cost%", cost + "Adena /" + Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Teleports clan members in a fort to the target Stage " + stage + " staging area"); @@ -743,15 +781,21 @@ public class L2FortManagerInstance extends L2MerchantInstance switch (lvl) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm"); break; + } case 1: + { fee = Config.FS_TELE1_FEE; break; + } default: + { fee = Config.FS_TELE2_FEE; break; + } } if (!getFort().updateFunctions(player, Fort.FUNC_TELEPORT, lvl, fee, Config.FS_TELE_FEE_RATIO, (getFort().getFunction(Fort.FUNC_TELEPORT) == null))) { @@ -788,15 +832,21 @@ public class L2FortManagerInstance extends L2MerchantInstance switch (lvl) { case 0: + { fee = 0; html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm"); break; + } case 1: + { fee = Config.FS_SUPPORT1_FEE; break; + } default: + { fee = Config.FS_SUPPORT2_FEE; break; + } } if (!getFort().updateFunctions(player, Fort.FUNC_SUPPORT, lvl, fee, Config.FS_SUPPORT_FEE_RATIO, (getFort().getFunction(Fort.FUNC_SUPPORT) == null))) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java index ab18fad15a..5d98c27f59 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java @@ -81,14 +81,20 @@ public class L2PetManagerInstance extends L2MerchantInstance switch (val) { case 1: + { exchange(player, 7585, 6650); break; + } case 2: + { exchange(player, 7583, 6648); break; + } case 3: + { exchange(player, 7584, 6649); break; + } } return; } @@ -102,20 +108,30 @@ public class L2PetManagerInstance extends L2MerchantInstance // Info evolve(player, "curent pet summon item", "new pet summon item", "lvl required to evolve") // To ignore evolve just put value 0 where do you like example: evolve(player, 0, 9882, 55); case 1: + { ok = Evolve.doEvolve(player, this, 2375, 9882, 55); break; + } case 2: + { ok = Evolve.doEvolve(player, this, 9882, 10426, 70); break; + } case 3: + { ok = Evolve.doEvolve(player, this, 6648, 10311, 55); break; + } case 4: + { ok = Evolve.doEvolve(player, this, 6650, 10313, 55); break; + } case 5: + { ok = Evolve.doEvolve(player, this, 6649, 10312, 55); break; + } } if (!ok) { @@ -134,20 +150,30 @@ public class L2PetManagerInstance extends L2MerchantInstance { // Info evolve(player, "curent pet summon item", "new pet summon item", "lvl required to evolve") case 1: + { ok = Evolve.doRestore(player, this, 10307, 9882, 55); break; + } case 2: + { ok = Evolve.doRestore(player, this, 10611, 10426, 70); break; + } case 3: + { ok = Evolve.doRestore(player, this, 10308, 4422, 55); break; + } case 4: + { ok = Evolve.doRestore(player, this, 10309, 4423, 55); break; + } case 5: + { ok = Evolve.doRestore(player, this, 10310, 4424, 55); break; + } } if (!ok) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java index 8295ef0c4c..bda6320579 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java @@ -162,6 +162,7 @@ public class L2RaceManagerInstance extends L2Npc { 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; @@ -169,9 +170,11 @@ public class L2RaceManagerInstance extends L2Npc } // 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) { @@ -179,24 +182,31 @@ public class L2RaceManagerInstance extends L2Npc } _minutes--; break; + } case 819: // SystemMessageId.MONSRACE_S1_TICKET_SALES_CLOSED + { // _log.info("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 + { // _log.info("Placing"); _state = RACE_END; sm.addInt(MonsterRace.getInstance().getFirstPlace()); sm.addInt(MonsterRace.getInstance().getSecondPlace()); break; + } } // _logn.info("Counter: "+minutes); // _log.info("State: "+state); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java index 15a21c9c94..ab7209d1b0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java @@ -56,7 +56,9 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance case 25342: case 25346: case 25349: + { setIsRaid(true); + } } } @@ -74,6 +76,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance case 18155: case 18156: case 18157: + { if (_victimSpawnKeyBoxTask != null) { _victimSpawnKeyBoxTask.cancel(true); @@ -85,6 +88,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance } _victimShout = ThreadPoolManager.schedule(new VictimShout(this), 5000); break; + } case 18196: case 18197: case 18198: @@ -101,8 +105,9 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance case 18209: case 18210: case 18211: + { break; - + } case 18231: case 18232: case 18233: @@ -116,21 +121,26 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance case 18241: case 18242: case 18243: + { if (_changeImmortalTask != null) { _changeImmortalTask.cancel(true); } _changeImmortalTask = ThreadPoolManager.schedule(new ChangeImmortal(this), 1600); - break; + } case 18256: + { break; + } case 25339: case 25342: case 25346: case 25349: + { setIsRaid(true); break; + } } super.onSpawn(); } @@ -176,13 +186,14 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance case 18217: case 18218: case 18219: + { if (_onDeadEventTask != null) { _onDeadEventTask.cancel(true); } _onDeadEventTask = ThreadPoolManager.schedule(new OnDeadEvent(this), 3500); break; - + } case 18150: case 18151: case 18152: @@ -191,6 +202,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance case 18155: case 18156: case 18157: + { if (_victimSpawnKeyBoxTask != null) { _victimSpawnKeyBoxTask.cancel(true); @@ -207,7 +219,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance } _onDeadEventTask = ThreadPoolManager.schedule(new OnDeadEvent(this), 3500); break; - + } case 18141: case 18142: case 18143: @@ -216,6 +228,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance case 18146: case 18147: case 18148: + { if (FourSepulchersManager.getInstance().isViscountMobsAnnihilated(mysteriousBoxId)) { if (_onDeadEventTask != null) @@ -225,7 +238,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance _onDeadEventTask = ThreadPoolManager.schedule(new OnDeadEvent(this), 3500); } break; - + } case 18220: case 18221: case 18222: @@ -247,6 +260,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance case 18238: case 18239: case 18240: + { if (FourSepulchersManager.getInstance().isDukeMobsAnnihilated(mysteriousBoxId)) { if (_onDeadEventTask != null) @@ -256,11 +270,12 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance _onDeadEventTask = ThreadPoolManager.schedule(new OnDeadEvent(this), 3500); } break; - + } case 25339: case 25342: case 25346: case 25349: + { giveCup(killer); if (_onDeadEventTask != null) { @@ -268,6 +283,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance } _onDeadEventTask = ThreadPoolManager.schedule(new OnDeadEvent(this), 8500); break; + } } return true; } @@ -298,17 +314,25 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance switch (getId()) { case 25339: + { cupId = 7256; break; + } case 25342: + { cupId = 7257; break; + } case 25346: + { cupId = 7258; break; + } case 25349: + { cupId = 7259; break; + } } final L2PcInstance player = killer.getActingPlayer(); @@ -442,9 +466,10 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance case 18217: case 18218: case 18219: + { FourSepulchersManager.getInstance().spawnKeyBox(_activeChar); break; - + } case 18150: case 18151: case 18152: @@ -453,9 +478,10 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance case 18155: case 18156: case 18157: + { FourSepulchersManager.getInstance().spawnExecutionerOfHalisha(_activeChar); break; - + } case 18141: case 18142: case 18143: @@ -464,9 +490,10 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance case 18146: case 18147: case 18148: + { FourSepulchersManager.getInstance().spawnMonster(_activeChar.mysteriousBoxId); break; - + } case 18220: case 18221: case 18222: @@ -488,15 +515,18 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance case 18238: case 18239: case 18240: + { FourSepulchersManager.getInstance().spawnArchonOfHalisha(_activeChar.mysteriousBoxId); break; - + } case 25339: case 25342: case 25346: case 25349: + { FourSepulchersManager.getInstance().spawnEmperorsGraveNpc(_activeChar.mysteriousBoxId); break; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SignsPriestInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SignsPriestInstance.java index 51d78fa41d..030e876bb8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SignsPriestInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SignsPriestInstance.java @@ -104,6 +104,7 @@ public class L2SignsPriestInstance extends L2Npc switch (val) { case 2: // Purchase Record of the Seven Signs + { if (!player.getInventory().validateCapacity(1)) { player.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); @@ -130,7 +131,9 @@ public class L2SignsPriestInstance extends L2Npc showChatWindow(player, val, "dusk", false); } break; + } case 33: // "I want to participate" request + { final int oldCabal = SevenSigns.getInstance().getPlayerCabal(player.getObjectId()); if (oldCabal != SevenSigns.CABAL_NULL) @@ -185,7 +188,9 @@ public class L2SignsPriestInstance extends L2Npc showChatWindow(player, val, "dusk", false); } break; + } case 34: // Pay the participation fee request + { if ((player.getClassId().level() > 0) && ((player.getAdena() >= Config.SSQ_JOIN_DAWN_ADENA_FEE) || (player.getInventory().getInventoryItemCount(Config.SSQ_MANORS_AGREEMENT_ID, -1) > 0))) { showChatWindow(player, SevenSigns.SEVEN_SIGNS_HTML_PATH + "signs_33_dawn.htm"); @@ -195,11 +200,15 @@ public class L2SignsPriestInstance extends L2Npc showChatWindow(player, SevenSigns.SEVEN_SIGNS_HTML_PATH + "signs_33_dawn_no.htm"); } break; + } case 3: // Join Cabal Intro 1 case 8: // Festival of Darkness Intro - SevenSigns x [0]1 + { showChatWindow(player, val, SevenSigns.getCabalShortName(cabal), false); break; + } case 4: // Join a Cabal - SevenSigns 4 [0]1 x + { final int newSeal = Integer.parseInt(command.substring(15)); if (player.getClassId().level() >= 1) @@ -252,19 +261,27 @@ public class L2SignsPriestInstance extends L2Npc switch (newSeal) { case SevenSigns.SEAL_AVARICE: + { player.sendPacket(SystemMessageId.YOU_VE_CHOSEN_TO_FIGHT_FOR_THE_SEAL_OF_AVARICE_DURING_THIS_QUEST_EVENT_PERIOD); break; + } case SevenSigns.SEAL_GNOSIS: + { player.sendPacket(SystemMessageId.YOU_VE_CHOSEN_TO_FIGHT_FOR_THE_SEAL_OF_GNOSIS_DURING_THIS_QUEST_EVENT_PERIOD); break; + } case SevenSigns.SEAL_STRIFE: + { player.sendPacket(SystemMessageId.YOU_VE_CHOSEN_TO_FIGHT_FOR_THE_SEAL_OF_STRIFE_DURING_THIS_QUEST_EVENT_PERIOD); break; + } } showChatWindow(player, 4, SevenSigns.getCabalShortName(cabal), false); break; + } case 5: + { if (this instanceof L2DawnPriestInstance) { if (SevenSigns.getInstance().getPlayerCabal(player.getObjectId()) == SevenSigns.CABAL_NULL) @@ -288,7 +305,9 @@ public class L2SignsPriestInstance extends L2Npc } } break; + } case 21: + { final int contribStoneId = Integer.parseInt(command.substring(14, 18)); final L2ItemInstance contribBlueStones = player.getInventory().getItemByItemId(SevenSigns.SEAL_STONE_BLUE_ID); @@ -328,26 +347,32 @@ public class L2SignsPriestInstance extends L2Npc switch (contribStoneId) { case SevenSigns.SEAL_STONE_BLUE_ID: + { blueContrib = (Config.ALT_MAXIMUM_PLAYER_CONTRIB - score) / SevenSigns.BLUE_CONTRIB_POINTS; if (blueContrib > contribBlueStoneCount) { blueContrib = contributionCount; } break; + } case SevenSigns.SEAL_STONE_GREEN_ID: + { greenContrib = (Config.ALT_MAXIMUM_PLAYER_CONTRIB - score) / SevenSigns.GREEN_CONTRIB_POINTS; if (greenContrib > contribGreenStoneCount) { greenContrib = contributionCount; } break; + } case SevenSigns.SEAL_STONE_RED_ID: + { redContrib = (Config.ALT_MAXIMUM_PLAYER_CONTRIB - score) / SevenSigns.RED_CONTRIB_POINTS; if (redContrib > contribRedStoneCount) { redContrib = contributionCount; } break; + } } if (redContrib > 0) @@ -412,7 +437,9 @@ public class L2SignsPriestInstance extends L2Npc } } break; + } case 6: // Contribute Seal Stones - SevenSigns 6 x + { stoneType = Integer.parseInt(command.substring(13)); final L2ItemInstance blueStones = player.getInventory().getItemByItemId(SevenSigns.SEAL_STONE_BLUE_ID); @@ -445,24 +472,31 @@ public class L2SignsPriestInstance extends L2Npc switch (stoneType) { case 1: + { contribStoneColor = "Blue"; stoneColorContr = "blue"; stoneIdContr = SevenSigns.SEAL_STONE_BLUE_ID; stoneCountContr = blueStoneCount; break; + } case 2: + { contribStoneColor = "Green"; stoneColorContr = "green"; stoneIdContr = SevenSigns.SEAL_STONE_GREEN_ID; stoneCountContr = greenStoneCount; break; + } case 3: + { contribStoneColor = "Red"; stoneColorContr = "red"; stoneIdContr = SevenSigns.SEAL_STONE_RED_ID; stoneCountContr = redStoneCount; break; + } case 4: + { long tempContribScore = contribScore; redContribCount = (Config.ALT_MAXIMUM_PLAYER_CONTRIB - tempContribScore) / SevenSigns.RED_CONTRIB_POINTS; if (redContribCount > redStoneCount) @@ -546,6 +580,7 @@ public class L2SignsPriestInstance extends L2Npc } } return; + } } if (this instanceof L2DawnPriestInstance) @@ -577,7 +612,9 @@ public class L2SignsPriestInstance extends L2Npc } } break; + } case 7: // Exchange Ancient Adena for Adena - SevenSigns 7 xxxxxxx + { long ancientAdenaConvert = 0; try @@ -611,7 +648,9 @@ public class L2SignsPriestInstance extends L2Npc showChatWindow(player, SevenSigns.SEVEN_SIGNS_HTML_PATH + "blkmrkt_5.htm"); break; + } case 9: // Receive Contribution Rewards + { final int playerCabal = SevenSigns.getInstance().getPlayerCabal(player.getObjectId()); final int winningCabal = SevenSigns.getInstance().getCabalHighestScore(); @@ -644,7 +683,9 @@ public class L2SignsPriestInstance extends L2Npc } } break; + } case 11: // Teleport to Hunting Grounds + { try { final String portInfo = command.substring(14).trim(); @@ -671,7 +712,9 @@ public class L2SignsPriestInstance extends L2Npc _log.log(Level.WARNING, "SevenSigns: Error occurred while teleporting player: " + e.getMessage(), e); } break; + } case 16: + { if (this instanceof L2DawnPriestInstance) { showChatWindow(player, val, "dawn", false); @@ -681,7 +724,9 @@ public class L2SignsPriestInstance extends L2Npc showChatWindow(player, val, "dusk", false); } break; + } case 17: // Exchange Seal Stones for Ancient Adena (Type Choice) - SevenSigns 17 x + { stoneType = Integer.parseInt(command.substring(14)); int stoneId = 0; @@ -693,21 +738,28 @@ public class L2SignsPriestInstance extends L2Npc switch (stoneType) { case 1: + { stoneColor = "blue"; stoneId = SevenSigns.SEAL_STONE_BLUE_ID; stoneValue = SevenSigns.SEAL_STONE_BLUE_VALUE; break; + } case 2: + { stoneColor = "green"; stoneId = SevenSigns.SEAL_STONE_GREEN_ID; stoneValue = SevenSigns.SEAL_STONE_GREEN_VALUE; break; + } case 3: + { stoneColor = "red"; stoneId = SevenSigns.SEAL_STONE_RED_ID; stoneValue = SevenSigns.SEAL_STONE_RED_VALUE; break; + } case 4: + { final L2ItemInstance blueStonesAll = player.getInventory().getItemByItemId(SevenSigns.SEAL_STONE_BLUE_ID); final L2ItemInstance greenStonesAll = player.getInventory().getItemByItemId(SevenSigns.SEAL_STONE_GREEN_ID); final L2ItemInstance redStonesAll = player.getInventory().getItemByItemId(SevenSigns.SEAL_STONE_RED_ID); @@ -756,6 +808,7 @@ public class L2SignsPriestInstance extends L2Npc showChatWindow(player, 18, "dusk", false); } return; + } } final L2ItemInstance stoneInstance = player.getInventory().getItemByItemId(stoneId); @@ -793,7 +846,9 @@ public class L2SignsPriestInstance extends L2Npc _log.warning("Problem with HTML text " + SevenSigns.SEVEN_SIGNS_HTML_PATH + "signs_17.htm: " + path); } break; + } case 18: // Exchange Seal Stones for Ancient Adena - SevenSigns 18 xxxx xxxxxx + { final int convertStoneId = Integer.parseInt(command.substring(14, 18)); long convertCount = 0; @@ -826,14 +881,20 @@ public class L2SignsPriestInstance extends L2Npc switch (convertStoneId) { case SevenSigns.SEAL_STONE_BLUE_ID: + { ancientAdenaReward = SevenSigns.calcAncientAdenaReward(convertCount, 0, 0); break; + } case SevenSigns.SEAL_STONE_GREEN_ID: + { ancientAdenaReward = SevenSigns.calcAncientAdenaReward(0, convertCount, 0); break; + } case SevenSigns.SEAL_STONE_RED_ID: + { ancientAdenaReward = SevenSigns.calcAncientAdenaReward(0, 0, convertCount); break; + } } if (player.destroyItemByItemId("SevenSigns", convertStoneId, convertCount, this, true)) @@ -876,14 +937,18 @@ public class L2SignsPriestInstance extends L2Npc break; } break; + } case 19: // Seal Information (for when joining a cabal) + { final int chosenSeal = Integer.parseInt(command.substring(16)); final String fileSuffix = SevenSigns.getSealName(chosenSeal, true) + "_" + SevenSigns.getCabalShortName(cabal); showChatWindow(player, val, fileSuffix, false); break; + } case 20: // Seal Status (for when joining a cabal) + { final StringBuilder contentBuffer = new StringBuilder(); if (this instanceof L2DawnPriestInstance) { @@ -914,9 +979,12 @@ public class L2SignsPriestInstance extends L2Npc html.setHtml(contentBuffer.toString()); player.sendPacket(html); break; + } default: + { showChatWindow(player, val, null, false); break; + } } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java index c7b1fba94d..46529f4df0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java @@ -84,12 +84,14 @@ public final class L2TeleporterInstance extends L2Npc { case 32534: // Seed of Infinity case 32539: + { if (player.isFlyingMounted()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_A_SEED_WHILE_IN_A_FLYING_TRANSFORMATION_STATE); return; } break; + } } if (st.countTokens() <= 0) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index c55a05545f..8966740710 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -359,9 +359,12 @@ public class L2VillageMasterInstance extends L2NpcInstance 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() >= Config.MAX_SUBCLASS) { @@ -400,7 +403,9 @@ public class L2VillageMasterInstance extends L2NpcInstance return; } break; + } case 2: // Change Class - Initial + { if (player.getSubClasses().isEmpty()) { html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ChangeNo.htm"); @@ -433,7 +438,9 @@ public class L2VillageMasterInstance extends L2NpcInstance } } break; + } case 3: // Change/Cancel Subclass - Initial + { if ((player.getSubClasses() == null) || player.getSubClasses().isEmpty()) { html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyEmpty.htm"); @@ -487,7 +494,9 @@ public class L2VillageMasterInstance extends L2NpcInstance } } 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. */ @@ -553,7 +562,9 @@ public class L2VillageMasterInstance extends L2NpcInstance 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 */ @@ -594,7 +605,9 @@ public class L2VillageMasterInstance extends L2NpcInstance player.setActiveClass(paramOne); player.sendPacket(SystemMessageId.YOU_HAVE_SUCCESSFULLY_SWITCHED_TO_YOUR_SUBCLASS); // Transfer completed. return; + } case 6: // Change/Cancel Subclass - Choice + { // validity check if ((paramOne < 1) || (paramOne > Config.MAX_SUBCLASS)) { @@ -619,20 +632,30 @@ public class L2VillageMasterInstance extends L2NpcInstance switch (paramOne) { case 1: + { html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyChoice1.htm"); break; + } case 2: + { html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyChoice2.htm"); break; + } case 3: + { html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyChoice3.htm"); break; + } 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! */ @@ -671,6 +694,7 @@ public class L2VillageMasterInstance extends L2NpcInstance return; } break; + } } html.replace("%objectId%", String.valueOf(getObjectId())); player.sendPacket(html); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java index 45fc517d95..f5c71bba47 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java @@ -824,17 +824,25 @@ public class PcStat extends PlayableStat switch (getVitalityLevel()) { case 1: + { vitality = Config.RATE_VITALITY_LEVEL_1; break; + } case 2: + { vitality = Config.RATE_VITALITY_LEVEL_2; break; + } case 3: + { vitality = Config.RATE_VITALITY_LEVEL_3; break; + } case 4: + { vitality = Config.RATE_VITALITY_LEVEL_4; break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/PlayerClass.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/PlayerClass.java index 00f1d97fb5..caee096b18 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/PlayerClass.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/PlayerClass.java @@ -255,11 +255,15 @@ public enum PlayerClass switch (player.getRace()) { case ELF: + { subclasses.removeAll(getSet(Race.DARK_ELF, Third)); break; + } case DARK_ELF: + { subclasses.removeAll(getSet(Race.ELF, Third)); break; + } } subclasses.removeAll(getSet(Race.KAMAEL, Third)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java index ed069aa4cb..367deab176 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -795,6 +795,7 @@ public class Duel { case Team1Win: case Team2Surrender: + { restorePlayerConditions(false); // send SystemMessage if (_partyDuel) @@ -810,8 +811,10 @@ public class Duel broadcastToTeam1(sm); broadcastToTeam2(sm); break; + } case Team1Surrender: case Team2Win: + { restorePlayerConditions(false); // send SystemMessage if (_partyDuel) @@ -827,7 +830,9 @@ public class Duel broadcastToTeam1(sm); broadcastToTeam2(sm); break; + } case Canceled: + { stopFighting(); // Don't restore hp, mp, cp restorePlayerConditions(true); @@ -838,7 +843,9 @@ public class Duel broadcastToTeam1(sm); broadcastToTeam2(sm); break; + } case Timeout: + { stopFighting(); // hp,mp,cp seem to be restored in a timeout too... restorePlayerConditions(false); @@ -848,6 +855,7 @@ public class Duel broadcastToTeam1(sm); broadcastToTeam2(sm); break; + } } final ExDuelEnd duelEnd = _partyDuel ? ExDuelEnd.PARTY_DUEL : ExDuelEnd.PLAYER_DUEL; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java index c342670540..b0eb96aedc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -364,12 +364,14 @@ public final class ItemAuction break; } case EXTEND_BY_3_MIN: + { if ((Config.ALT_ITEM_AUCTION_TIME_EXTENDS_ON_BID > 0) && (getAndSetLastBidPlayerObjectId(player.getObjectId()) != player.getObjectId())) { _auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A; _endingTime += Config.ALT_ITEM_AUCTION_TIME_EXTENDS_ON_BID; } break; + } case EXTEND_BY_CONFIG_PHASE_A: { if ((getAndSetLastBidPlayerObjectId(player.getObjectId()) != player.getObjectId()) && (_scheduledAuctionEndingExtendState == ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java index c7775f9220..913e2e4f5a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -912,51 +912,91 @@ public abstract class Inventory extends ItemContainer switch (slot) { case L2Item.SLOT_UNDERWEAR: + { return PAPERDOLL_UNDER; + } case L2Item.SLOT_R_EAR: + { return PAPERDOLL_REAR; + } case L2Item.SLOT_LR_EAR: case L2Item.SLOT_L_EAR: + { return PAPERDOLL_LEAR; + } case L2Item.SLOT_NECK: + { return PAPERDOLL_NECK; + } case L2Item.SLOT_R_FINGER: case L2Item.SLOT_LR_FINGER: + { return PAPERDOLL_RFINGER; + } case L2Item.SLOT_L_FINGER: + { return PAPERDOLL_LFINGER; + } case L2Item.SLOT_HEAD: + { return PAPERDOLL_HEAD; + } case L2Item.SLOT_R_HAND: case L2Item.SLOT_LR_HAND: + { return PAPERDOLL_RHAND; + } case L2Item.SLOT_L_HAND: + { return PAPERDOLL_LHAND; + } case L2Item.SLOT_GLOVES: + { return PAPERDOLL_GLOVES; + } case L2Item.SLOT_CHEST: case L2Item.SLOT_FULL_ARMOR: case L2Item.SLOT_ALLDRESS: + { return PAPERDOLL_CHEST; + } case L2Item.SLOT_LEGS: + { return PAPERDOLL_LEGS; + } case L2Item.SLOT_FEET: + { return PAPERDOLL_FEET; + } case L2Item.SLOT_BACK: + { return PAPERDOLL_CLOAK; + } case L2Item.SLOT_HAIR: case L2Item.SLOT_HAIRALL: + { return PAPERDOLL_HAIR; + } case L2Item.SLOT_HAIR2: + { return PAPERDOLL_HAIR2; + } case L2Item.SLOT_R_BRACELET: + { return PAPERDOLL_RBRACELET; + } case L2Item.SLOT_L_BRACELET: + { return PAPERDOLL_LBRACELET; + } case L2Item.SLOT_DECO: + { return PAPERDOLL_DECO1; // return first we deal with it later + } case L2Item.SLOT_BELT: + { return PAPERDOLL_BELT; + } } return -1; } @@ -1116,70 +1156,110 @@ public abstract class Inventory extends ItemContainer switch (location) { case PAPERDOLL_UNDER: + { slot = L2Item.SLOT_UNDERWEAR; break; + } case PAPERDOLL_LEAR: + { slot = L2Item.SLOT_L_EAR; break; + } case PAPERDOLL_REAR: + { slot = L2Item.SLOT_R_EAR; break; + } case PAPERDOLL_NECK: + { slot = L2Item.SLOT_NECK; break; + } case PAPERDOLL_RFINGER: + { slot = L2Item.SLOT_R_FINGER; break; + } case PAPERDOLL_LFINGER: + { slot = L2Item.SLOT_L_FINGER; break; + } case PAPERDOLL_HAIR: + { slot = L2Item.SLOT_HAIR; break; + } case PAPERDOLL_HAIR2: + { slot = L2Item.SLOT_HAIR2; break; + } case PAPERDOLL_HEAD: + { slot = L2Item.SLOT_HEAD; break; + } case PAPERDOLL_RHAND: + { slot = L2Item.SLOT_R_HAND; break; + } case PAPERDOLL_LHAND: + { slot = L2Item.SLOT_L_HAND; break; + } case PAPERDOLL_GLOVES: + { slot = L2Item.SLOT_GLOVES; break; + } case PAPERDOLL_CHEST: + { slot = item.getItem().getBodyPart(); break; + } case PAPERDOLL_LEGS: + { slot = L2Item.SLOT_LEGS; break; + } case PAPERDOLL_CLOAK: + { slot = L2Item.SLOT_BACK; break; + } case PAPERDOLL_FEET: + { slot = L2Item.SLOT_FEET; break; + } case PAPERDOLL_LBRACELET: + { slot = L2Item.SLOT_L_BRACELET; break; + } case PAPERDOLL_RBRACELET: + { slot = L2Item.SLOT_R_BRACELET; break; + } case PAPERDOLL_DECO1: case PAPERDOLL_DECO2: case PAPERDOLL_DECO3: case PAPERDOLL_DECO4: case PAPERDOLL_DECO5: case PAPERDOLL_DECO6: + { slot = L2Item.SLOT_DECO; break; + } case PAPERDOLL_BELT: + { slot = L2Item.SLOT_BELT; break; + } } return slot; } @@ -1257,75 +1337,119 @@ public abstract class Inventory extends ItemContainer switch (slot) { case L2Item.SLOT_L_EAR: + { pdollSlot = PAPERDOLL_LEAR; break; + } case L2Item.SLOT_R_EAR: + { pdollSlot = PAPERDOLL_REAR; break; + } case L2Item.SLOT_NECK: + { pdollSlot = PAPERDOLL_NECK; break; + } case L2Item.SLOT_R_FINGER: + { pdollSlot = PAPERDOLL_RFINGER; break; + } case L2Item.SLOT_L_FINGER: + { pdollSlot = PAPERDOLL_LFINGER; break; + } case L2Item.SLOT_HAIR: + { pdollSlot = PAPERDOLL_HAIR; break; + } case L2Item.SLOT_HAIR2: + { pdollSlot = PAPERDOLL_HAIR2; break; + } case L2Item.SLOT_HAIRALL: + { setPaperdollItem(PAPERDOLL_HAIR, null); pdollSlot = PAPERDOLL_HAIR; break; + } case L2Item.SLOT_HEAD: + { pdollSlot = PAPERDOLL_HEAD; break; + } case L2Item.SLOT_R_HAND: case L2Item.SLOT_LR_HAND: + { pdollSlot = PAPERDOLL_RHAND; break; + } case L2Item.SLOT_L_HAND: + { pdollSlot = PAPERDOLL_LHAND; break; + } case L2Item.SLOT_GLOVES: + { pdollSlot = PAPERDOLL_GLOVES; break; + } case L2Item.SLOT_CHEST: case L2Item.SLOT_ALLDRESS: case L2Item.SLOT_FULL_ARMOR: + { pdollSlot = PAPERDOLL_CHEST; break; + } case L2Item.SLOT_LEGS: + { pdollSlot = PAPERDOLL_LEGS; break; + } case L2Item.SLOT_BACK: + { pdollSlot = PAPERDOLL_CLOAK; break; + } case L2Item.SLOT_FEET: + { pdollSlot = PAPERDOLL_FEET; break; + } case L2Item.SLOT_UNDERWEAR: + { pdollSlot = PAPERDOLL_UNDER; break; + } case L2Item.SLOT_L_BRACELET: + { pdollSlot = PAPERDOLL_LBRACELET; break; + } case L2Item.SLOT_R_BRACELET: + { pdollSlot = PAPERDOLL_RBRACELET; break; + } case L2Item.SLOT_DECO: + { pdollSlot = PAPERDOLL_DECO1; break; + } case L2Item.SLOT_BELT: + { pdollSlot = PAPERDOLL_BELT; break; + } default: + { _log.info("Unhandled slot type: " + slot); _log.info(Util.getTraceString(Thread.currentThread().getStackTrace())); + } } if (pdollSlot >= 0) { @@ -1400,7 +1524,9 @@ public abstract class Inventory extends ItemContainer case L2Item.SLOT_FEET: case L2Item.SLOT_GLOVES: case L2Item.SLOT_HEAD: + { return; + } } } @@ -1419,7 +1545,6 @@ public abstract class Inventory extends ItemContainer { setPaperdollItem(PAPERDOLL_RHAND, null); } - setPaperdollItem(PAPERDOLL_LHAND, item); break; } @@ -1466,15 +1591,21 @@ public abstract class Inventory extends ItemContainer break; } case L2Item.SLOT_NECK: + { setPaperdollItem(PAPERDOLL_NECK, item); break; + } case L2Item.SLOT_FULL_ARMOR: + { setPaperdollItem(PAPERDOLL_LEGS, null); setPaperdollItem(PAPERDOLL_CHEST, item); break; + } case L2Item.SLOT_CHEST: + { setPaperdollItem(PAPERDOLL_CHEST, item); break; + } case L2Item.SLOT_LEGS: { // handle full armor @@ -1483,20 +1614,26 @@ public abstract class Inventory extends ItemContainer { setPaperdollItem(PAPERDOLL_CHEST, null); } - setPaperdollItem(PAPERDOLL_LEGS, item); break; } case L2Item.SLOT_FEET: + { setPaperdollItem(PAPERDOLL_FEET, item); break; + } case L2Item.SLOT_GLOVES: + { setPaperdollItem(PAPERDOLL_GLOVES, item); break; + } case L2Item.SLOT_HEAD: + { setPaperdollItem(PAPERDOLL_HEAD, item); break; + } case L2Item.SLOT_HAIR: + { final L2ItemInstance hair = getPaperdollItem(PAPERDOLL_HAIR); if ((hair != null) && (hair.getItem().getBodyPart() == L2Item.SLOT_HAIRALL)) { @@ -1506,10 +1643,11 @@ public abstract class Inventory extends ItemContainer { setPaperdollItem(PAPERDOLL_HAIR, null); } - setPaperdollItem(PAPERDOLL_HAIR, item); break; + } case L2Item.SLOT_HAIR2: + { final L2ItemInstance hair2 = getPaperdollItem(PAPERDOLL_HAIR); if ((hair2 != null) && (hair2.getItem().getBodyPart() == L2Item.SLOT_HAIRALL)) { @@ -1519,32 +1657,47 @@ public abstract class Inventory extends ItemContainer { setPaperdollItem(PAPERDOLL_HAIR2, null); } - setPaperdollItem(PAPERDOLL_HAIR2, item); break; + } case L2Item.SLOT_HAIRALL: + { setPaperdollItem(PAPERDOLL_HAIR2, null); setPaperdollItem(PAPERDOLL_HAIR, item); break; + } case L2Item.SLOT_UNDERWEAR: + { setPaperdollItem(PAPERDOLL_UNDER, item); break; + } case L2Item.SLOT_BACK: + { setPaperdollItem(PAPERDOLL_CLOAK, item); break; + } case L2Item.SLOT_L_BRACELET: + { setPaperdollItem(PAPERDOLL_LBRACELET, item); break; + } case L2Item.SLOT_R_BRACELET: + { setPaperdollItem(PAPERDOLL_RBRACELET, item); break; + } case L2Item.SLOT_DECO: + { equipTalisman(item); break; + } case L2Item.SLOT_BELT: + { setPaperdollItem(PAPERDOLL_BELT, item); break; + } case L2Item.SLOT_ALLDRESS: + { // formal dress setPaperdollItem(PAPERDOLL_LEGS, null); setPaperdollItem(PAPERDOLL_LHAND, null); @@ -1556,8 +1709,11 @@ public abstract class Inventory extends ItemContainer setPaperdollItem(PAPERDOLL_GLOVES, null); setPaperdollItem(PAPERDOLL_CHEST, item); break; + } default: + { _log.warning("Unknown body slot " + targetSlot + " for Item ID:" + item.getId()); + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java index fdf63dfc6c..43e4b355a4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1005,10 +1005,14 @@ public final class Formulas switch (shld) { case SHIELD_DEFENSE_SUCCEED: + { mDef += target.getShldDef(); // kamael break; + } case SHIELD_DEFENSE_PERFECT_BLOCK: // perfect block + { return 1; + } } final int mAtk = attacker.getCubicPower(); @@ -1277,11 +1281,15 @@ public final class Formulas switch (shldSuccess) { case SHIELD_DEFENSE_SUCCEED: + { enemy.sendPacket(SystemMessageId.YOUR_SHIELD_DEFENSE_HAS_SUCCEEDED); break; + } case SHIELD_DEFENSE_PERFECT_BLOCK: + { enemy.sendPacket(SystemMessageId.YOUR_EXCELLENT_SHIELD_DEFENSE_WAS_A_SUCCESS); break; + } } } @@ -1370,23 +1378,35 @@ public final class Formulas switch (skill.getBasicProperty()) { case STR: + { targetBaseStat = target.getSTR(); break; + } case DEX: + { targetBaseStat = target.getDEX(); break; + } case CON: + { targetBaseStat = target.getCON(); break; + } case INT: + { targetBaseStat = target.getINT(); break; + } case MEN: + { targetBaseStat = target.getMEN(); break; + } case WIT: + { targetBaseStat = target.getWIT(); break; + } } final double baseMod = ((((((magicLevel - target.getLevel()) + 3) * skill.getLvlBonusRate()) + activateRate) + 30.0) - targetBaseStat); @@ -1552,10 +1572,14 @@ public final class Formulas switch (shld) { case SHIELD_DEFENSE_SUCCEED: + { mDef += target.getShldDef(); break; + } case SHIELD_DEFENSE_PERFECT_BLOCK: // perfect block + { return 1; + } } // Bonus Spiritshot @@ -1976,7 +2000,6 @@ public final class Formulas final double prof = activeChar.calcStat(Stats.CANCEL_PROF, 0, target, null); final double resMod = 1 + (((vuln + prof) * -1) / 100); final double finalRate = rate / resMod; - if (activeChar.isDebug()) { final StatsSet set = new StatsSet(); @@ -1986,7 +2009,6 @@ public final class Formulas set.set("rate", finalRate); Debug.sendSkillDebug(activeChar, target, skill, set); } - // Prevent initialization. final List buffs = target.getEffectList().hasBuffs() ? new ArrayList<>(target.getEffectList().getBuffs()) : new ArrayList<>(1); if (target.getEffectList().hasTriggered()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java index 439306064c..773d29bef0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java @@ -81,23 +81,29 @@ public class FuncEnchant extends AbstractFunction switch (item.getItem().getItemGradeSPlus()) { case S: + { // M. Atk. increases by 4 for all weapons. // Starting at +4, M. Atk. bonus double. value += (4 * enchant) + (8 * overenchant); break; + } case A: case B: case C: + { // M. Atk. increases by 3 for all weapons. // Starting at +4, M. Atk. bonus double. value += (3 * enchant) + (6 * overenchant); break; + } case D: case NONE: + { // M. Atk. increases by 2 for all weapons. Starting at +4, M. Atk. bonus double. // Starting at +4, M. Atk. bonus double. value += (2 * enchant) + (4 * overenchant); break; + } } return value; } @@ -108,6 +114,7 @@ public class FuncEnchant extends AbstractFunction switch (item.getItem().getItemGradeSPlus()) { case S: + { if (item.getWeaponItem().getBodyPart() == L2Item.SLOT_LR_HAND) { if ((type == WeaponType.BOW) || (type == WeaponType.CROSSBOW)) @@ -130,7 +137,9 @@ public class FuncEnchant extends AbstractFunction value += (5 * enchant) + (10 * overenchant); } break; + } case A: + { if (item.getWeaponItem().getBodyPart() == L2Item.SLOT_LR_HAND) { if ((type == WeaponType.BOW) || (type == WeaponType.CROSSBOW)) @@ -153,8 +162,10 @@ public class FuncEnchant extends AbstractFunction 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)) @@ -177,8 +188,10 @@ public class FuncEnchant extends AbstractFunction value += (3 * enchant) + (6 * overenchant); } break; + } case D: case NONE: + { switch (type) { case BOW: @@ -190,12 +203,15 @@ public class FuncEnchant extends AbstractFunction break; } default: + { // P. Atk. increases by 2 for all weapons with the exception of bows. // Starting at +4, P. Atk. bonus double. value += (2 * enchant) + (4 * overenchant); break; + } } break; + } } } return value; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java index d09815c2f5..c6e984801d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java @@ -65,23 +65,35 @@ public class FuncArmorSet extends AbstractFunction switch (getStat()) { case STAT_STR: + { value += set.getSTR(); break; + } case STAT_DEX: + { value += set.getDEX(); break; + } case STAT_INT: + { value += set.getINT(); break; + } case STAT_MEN: + { value += set.getMEN(); break; + } case STAT_CON: + { value += set.getCON(); break; + } case STAT_WIT: + { value += set.getWIT(); break; + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncHenna.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncHenna.java index 9a03fb24af..c1e1e21c20 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncHenna.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncHenna.java @@ -56,23 +56,35 @@ public class FuncHenna extends AbstractFunction switch (getStat()) { case STAT_STR: + { value += pc.getHennaStatSTR(); break; + } case STAT_CON: + { value += pc.getHennaStatCON(); break; + } case STAT_DEX: + { value += pc.getHennaStatDEX(); break; + } case STAT_INT: + { value += pc.getHennaStatINT(); break; + } case STAT_WIT: + { value += pc.getHennaStatWIT(); break; + } case STAT_MEN: + { value += pc.getHennaStatMEN(); break; + } } } return value; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java index 8fc6ff821c..977e40b2f9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java @@ -61,41 +61,63 @@ public final class L2GamePacketHandler implements IPacketHandler, switch (state) { case CONNECTED: + { switch (opcode) { case 0x0e: + { msg = new ProtocolVersion(); break; + } case 0x2b: + { msg = new AuthLogin(); break; + } default: + { printDebug(opcode, buf, state, client); break; + } } break; + } case AUTHED: + { switch (opcode) { case 0x00: + { msg = new Logout(); break; + } case 0x0c: + { msg = new CharacterCreate(); break; + } case 0x0d: + { msg = new CharacterDelete(); break; + } case 0x12: + { msg = new CharacterSelect(); break; + } case 0x13: + { msg = new NewCharacter(); break; + } case 0x7b: + { msg = new CharacterRestore(); break; + } case 0xd0: + { int id2 = -1; if (buf.remaining() >= 2) { @@ -109,218 +131,351 @@ public final class L2GamePacketHandler implements IPacketHandler, } break; } - switch (id2) { case 0x36: + { msg = new RequestGotoLobby(); break; + } case 0x93: + { msg = new RequestEx2ndPasswordCheck(); break; + } case 0x94: + { msg = new RequestEx2ndPasswordVerify(); break; + } case 0x95: + { msg = new RequestEx2ndPasswordReq(); break; + } default: + { printDebugDoubleOpcode(opcode, id2, buf, state, client); + } } break; + } default: + { printDebug(opcode, buf, state, client); break; + } } 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 0x11: + { msg = new EnterWorld(); break; + } case 0x12: + { // CharacterSelect, in case of player spam clicks on loginscreen 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: // SendApperingPacket + { msg = new Appearing(); break; + } case 0x3b: + { if (Config.ALLOW_WAREHOUSE) { 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 = -1; if (buf.remaining() >= 2) { @@ -337,363 +492,600 @@ public final class L2GamePacketHandler implements IPacketHandler, 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 0xa1: + { // msg = new RequestBan(); 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 = -1; if (buf.remaining() >= 2) { @@ -707,253 +1099,413 @@ public final class L2GamePacketHandler implements IPacketHandler, } 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 ExDissmissMpccRoom 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: + { id3 = 0; if (buf.remaining() >= 4) { @@ -967,194 +1519,319 @@ public final class L2GamePacketHandler implements IPacketHandler, 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: + { // 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; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 4490fefd90..2ccce72463 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -347,9 +347,13 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket { case INVENTORY: case PAPERDOLL: + { break; + } default: + { return false; + } } if (item.getItem() instanceof L2Weapon) @@ -358,9 +362,13 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket { case NONE: case FISHINGROD: + { return false; + } default: + { break; + } } } else if (item.getItem() instanceof L2Armor) @@ -371,9 +379,13 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket case L2Item.SLOT_LR_FINGER: case L2Item.SLOT_LR_EAR: case L2Item.SLOT_NECK: + { break; + } default: + { return false; + } } } else @@ -449,15 +461,23 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket { case C: case B: + { return GEMSTONE_D; + } case A: case S: + { return GEMSTONE_C; + } case S80: case S84: + { return GEMSTONE_B; + } default: + { return 0; + } } } @@ -472,40 +492,70 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket switch (lifeStoneGrade) { case GRADE_ACC: + { switch (itemGrade) { case C: + { return 200; + } case B: + { return 300; + } case A: + { return 200; + } case S: + { return 250; + } case S80: + { return 360; + } case S84: + { return 480; + } default: + { return 0; + } } + } default: + { switch (itemGrade) { case C: + { return 20; + } case B: + { return 30; + } case A: + { return 20; + } case S: + { return 25; + } case S80: case S84: + { return 36; + } default: + { return 0; + } } + } } } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java index f798625685..bac64b1602 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java @@ -73,6 +73,7 @@ public class MoveToLocationAirShip extends L2GameClientPacket switch (_command) { case 0: + { if (!ship.canBeControlled()) { return; @@ -82,14 +83,18 @@ public class MoveToLocationAirShip extends L2GameClientPacket ship.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_param1, _param2, z)); } break; + } case 1: + { if (!ship.canBeControlled()) { return; } ship.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); break; + } case 2: + { if (!ship.canBeControlled()) { return; @@ -100,7 +105,9 @@ public class MoveToLocationAirShip extends L2GameClientPacket ship.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(ship.getX(), ship.getY(), z)); } break; + } case 3: + { if (!ship.canBeControlled()) { return; @@ -111,18 +118,18 @@ public class MoveToLocationAirShip extends L2GameClientPacket ship.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(ship.getX(), ship.getY(), z)); } break; + } 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) @@ -134,9 +141,9 @@ public class MoveToLocationAirShip extends L2GameClientPacket } ship.setFuel(ship.getFuel() - fuelConsumption); } - ship.executePath(dst); break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index d1db0860af..ab8a403338 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -138,6 +138,7 @@ public final class RequestActionUse extends L2GameClientPacket switch (_actionId) { case 0: // Sit/Stand + { if (activeChar.isSitting() || !activeChar.isMoving() || activeChar.isFakeDeath()) { useSit(activeChar, target); @@ -147,12 +148,13 @@ public final class RequestActionUse extends L2GameClientPacket // 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(); @@ -162,16 +164,22 @@ public final class RequestActionUse extends L2GameClientPacket 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)) @@ -180,31 +188,31 @@ public final class RequestActionUse extends L2GameClientPacket } } 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_PETS_CANNOT_BE_RETURNED_TO_THEIR_SUMMONING_ITEM); break; } - if (summon.isAttackingNow() || summon.isInCombat() || summon.isMovementDisabled()) { sendPacket(SystemMessageId.A_PET_CANNOT_BE_UNSUMMONED_DURING_BATTLE); break; } - if (summon.isHungry()) { if (summon.isPet() && !((L2PetInstance) summon).getPetData().getFood().isEmpty()) @@ -217,16 +225,19 @@ public final class RequestActionUse extends L2GameClientPacket } 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)) @@ -235,22 +246,32 @@ public final class RequestActionUse extends L2GameClientPacket } } 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); @@ -265,16 +286,21 @@ public final class RequestActionUse extends L2GameClientPacket { 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))) @@ -287,28 +313,44 @@ public final class RequestActionUse extends L2GameClientPacket } } 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()) { @@ -324,10 +366,11 @@ public final class RequestActionUse extends L2GameClientPacket { activeChar.standUp(); } - sendPacket(new RecipeShopManageList(activeChar, false)); break; + } case 52: // Unsummon Servitor + { if (validateSummon(summon, false)) { if (summon.isAttackingNow() || summon.isInCombat()) @@ -338,7 +381,9 @@ public final class RequestActionUse extends L2GameClientPacket summon.unSummon(activeChar); } break; + } case 53: // Move to target (Servitors) + { if (validateSummon(summon, false)) { if ((target != null) && (summon != target) && !summon.isMovementDisabled()) @@ -348,7 +393,9 @@ public final class RequestActionUse extends L2GameClientPacket } } break; + } case 54: // Move to target (Pets) + { if (validateSummon(summon, true)) { if ((target != null) && (summon != target) && !summon.isMovementDisabled()) @@ -358,10 +405,14 @@ public final class RequestActionUse extends L2GameClientPacket } } break; + } case 61: // Private Store Package Sell + { activeChar.tryOpenPrivateSellStore(true); break; + } case 65: // Bot Report Button + { if (Config.BOTREPORT_ENABLE) { BotReportTable.getInstance().reportBot(activeChar); @@ -371,7 +422,9 @@ public final class RequestActionUse extends L2GameClientPacket activeChar.sendMessage("This feature is disabled."); } break; + } case 67: // Steer + { if (activeChar.isInAirShip()) { if (activeChar.getAirShip().setCaptain(activeChar)) @@ -380,7 +433,9 @@ public final class RequestActionUse extends L2GameClientPacket } } break; + } case 68: // Cancel Control + { if (activeChar.isInAirShip() && activeChar.getAirShip().isCaptain(activeChar)) { if (activeChar.getAirShip().setCaptain(null)) @@ -389,10 +444,14 @@ public final class RequestActionUse extends L2GameClientPacket } } break; + } case 69: // Destination Map + { AirShipManager.getInstance().sendAirShipTeleportList(activeChar); break; + } case 70: // Exit Airship + { if (activeChar.isInAirShip()) { if (activeChar.getAirShip().isCaptain(activeChar)) @@ -408,369 +467,602 @@ public final class RequestActionUse extends L2GameClientPacket } } 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(), ChatType.NPC_GENERAL, 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 + { if (summon instanceof L2BabyPetInstance) { 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: + { if (Config.DEBUG) { _log.warning(activeChar.getName() + ": unhandled action type " + _actionId); } break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 042f5e10f9..f3b20bb003 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -61,6 +61,7 @@ public final class RequestBlock extends L2GameClientPacket { case BLOCK: case UNBLOCK: + { // can't use block/unblock for locating invisible characters if (targetId <= 0) { @@ -68,19 +69,16 @@ public final class RequestBlock extends L2GameClientPacket activeChar.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_REGISTER_THE_USER_TO_YOUR_IGNORE_LIST); return; } - if (targetAL > 0) { // Cannot block a GM character. activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_IMPOSE_A_BLOCK_ON_A_GM); return; } - if (activeChar.getObjectId() == targetId) { return; } - if (_type == BLOCK) { BlockList.addToBlockList(activeChar, targetId); @@ -90,19 +88,28 @@ public final class RequestBlock extends L2GameClientPacket BlockList.removeFromBlockList(activeChar, targetId); } break; + } case BLOCKLIST: + { BlockList.sendListToOwner(activeChar); break; + } case ALLBLOCK: + { activeChar.sendPacket(SystemMessageId.MESSAGE_REFUSAL_MODE); BlockList.setBlockAll(activeChar, true); break; + } case ALLUNBLOCK: + { activeChar.sendPacket(SystemMessageId.MESSAGE_ACCEPTANCE_MODE); BlockList.setBlockAll(activeChar, false); break; + } default: + { _log.info("Unknown 0xA9 block type: " + _type); + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index a66a9550bb..16cdc238e5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -74,6 +74,7 @@ public final class RequestConfirmCancelItem extends L2GameClientPacket switch (item.getItem().getCrystalType()) { case C: + { if (item.getCrystalCount() < 1720) { price = 95000; @@ -87,7 +88,9 @@ public final class RequestConfirmCancelItem extends L2GameClientPacket price = 210000; } break; + } case B: + { if (item.getCrystalCount() < 1746) { price = 240000; @@ -97,7 +100,9 @@ public final class RequestConfirmCancelItem extends L2GameClientPacket price = 270000; } break; + } case A: + { if (item.getCrystalCount() < 2160) { price = 330000; @@ -111,17 +116,24 @@ public final class RequestConfirmCancelItem extends L2GameClientPacket 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)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 9c16c1b8b6..5d6d72c1d2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -52,11 +52,15 @@ public final class RequestExCubeGameChangeTeam extends L2GameClientPacket { case 0: case 1: + { // Change Player Team HandysBlockCheckerManager.getInstance().changePlayerToTeam(player, _arena, _team); break; + } case -1: - // Remove Player (me) + { + // Remove Player (me) + } { final int team = HandysBlockCheckerManager.getInstance().getHolder(_arena).getPlayerTeam(player); // client sends two times this packet if click on exit @@ -68,8 +72,10 @@ public final class RequestExCubeGameChangeTeam extends L2GameClientPacket break; } default: + { _log.warning("Wrong Cube Game Team ID: " + _team); break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index c03cd16b62..b36688cebf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -52,15 +52,21 @@ public final class RequestExCubeGameReadyAnswer extends L2GameClientPacket switch (_answer) { case 0: + { // Cancel - Answer No break; + } case 1: + { // OK or Time Over HandysBlockCheckerManager.getInstance().increaseArenaVotes(_arena); break; + } default: + { _log.warning("Unknown Cube Game Answer ID: " + _answer); break; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 10c4c3d4ad..f72b260218 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -179,17 +179,25 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket { case Stone: case Roughore: + { success = Rnd.get(100) < Config.ENCHANT_CHANCE_ELEMENT_STONE; break; + } case Crystal: + { success = Rnd.get(100) < Config.ENCHANT_CHANCE_ELEMENT_CRYSTAL; break; + } case Jewel: + { success = Rnd.get(100) < Config.ENCHANT_CHANCE_ELEMENT_JEWEL; break; + } case Energy: + { success = Rnd.get(100) < Config.ENCHANT_CHANCE_ELEMENT_ENERGY; break; + } } if (success) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index e7ce2a0ca3..ae80d8e2ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -129,6 +129,7 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket switch (item.getItem().getCrystalType()) { case S: + { if (item.getItem() instanceof L2Weapon) { _price = 50000; @@ -138,7 +139,9 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket _price = 40000; } break; + } case S80: + { if (item.getItem() instanceof L2Weapon) { _price = 100000; @@ -148,7 +151,9 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket _price = 80000; } break; + } case S84: + { if (item.getItem() instanceof L2Weapon) { _price = 200000; @@ -158,6 +163,7 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket _price = 160000; } break; + } } return _price; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index bcb4b7f08c..f99e9f048f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -72,6 +72,7 @@ public final class RequestRefineCancel extends L2GameClientPacket switch (targetItem.getItem().getCrystalType()) { case C: + { if (targetItem.getCrystalCount() < 1720) { price = 95000; @@ -85,7 +86,9 @@ public final class RequestRefineCancel extends L2GameClientPacket price = 210000; } break; + } case B: + { if (targetItem.getCrystalCount() < 1746) { price = 240000; @@ -95,7 +98,9 @@ public final class RequestRefineCancel extends L2GameClientPacket price = 270000; } break; + } case A: + { if (targetItem.getCrystalCount() < 2160) { price = 330000; @@ -109,17 +114,24 @@ public final class RequestRefineCancel extends L2GameClientPacket 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 diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java index 8a470edc52..7c70475d1c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -255,8 +255,10 @@ public final class UseItem extends L2GameClientPacket switch (wpn.getItemType()) { case NONE: + { activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; + } } break; } @@ -271,8 +273,10 @@ public final class UseItem extends L2GameClientPacket case RAPIER: case CROSSBOW: case ANCIENTSWORD: + { activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; + } } break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java index cf589c4ac0..920a76d90c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java @@ -40,53 +40,85 @@ public final class EquipUpdate extends L2GameServerPacket switch (_item.getItem().getBodyPart()) { case L2Item.SLOT_L_EAR: + { bodypart = 0x01; break; + } case L2Item.SLOT_R_EAR: + { bodypart = 0x02; break; + } case L2Item.SLOT_NECK: + { bodypart = 0x03; break; + } case L2Item.SLOT_R_FINGER: + { bodypart = 0x04; break; + } case L2Item.SLOT_L_FINGER: + { bodypart = 0x05; break; + } case L2Item.SLOT_HEAD: + { bodypart = 0x06; break; + } case L2Item.SLOT_R_HAND: + { bodypart = 0x07; break; + } case L2Item.SLOT_L_HAND: + { bodypart = 0x08; break; + } case L2Item.SLOT_GLOVES: + { bodypart = 0x09; break; + } case L2Item.SLOT_CHEST: + { bodypart = 0x0a; break; + } case L2Item.SLOT_LEGS: + { bodypart = 0x0b; break; + } case L2Item.SLOT_FEET: + { bodypart = 0x0c; break; + } case L2Item.SLOT_BACK: + { bodypart = 0x0d; break; + } case L2Item.SLOT_LR_HAND: + { bodypart = 0x0e; break; + } case L2Item.SLOT_HAIR: + { bodypart = 0x0f; break; + } case L2Item.SLOT_BELT: + { bodypart = 0x10; break; + } } writeD(bodypart); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index d1fa47a093..c22bcc9d32 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -88,23 +88,33 @@ public class ExEnchantSkillInfoDetail extends L2GameServerPacket 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) && !Config.ES_SP_BOOK_NEEDED) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index a5e7df30d1..e01d926ba6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -53,6 +53,7 @@ public class ExShowBaseAttributeCancelWindow extends L2GameServerPacket switch (item.getItem().getCrystalType()) { case S: + { if (item.getItem() instanceof L2Weapon) { _price = 50000; @@ -62,7 +63,9 @@ public class ExShowBaseAttributeCancelWindow extends L2GameServerPacket _price = 40000; } break; + } case S80: + { if (item.getItem() instanceof L2Weapon) { _price = 100000; @@ -72,7 +75,9 @@ public class ExShowBaseAttributeCancelWindow extends L2GameServerPacket _price = 80000; } break; + } case S84: + { if (item.getItem() instanceof L2Weapon) { _price = 200000; @@ -82,6 +87,7 @@ public class ExShowBaseAttributeCancelWindow extends L2GameServerPacket _price = 160000; } break; + } } return _price; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index bb1117b715..868cfc9833 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -57,43 +57,65 @@ public class ExShowFortressSiegeInfo extends L2GameServerPacket switch (_csize) { case 3: + { switch (_csize2) { case 0: + { writeD(0x03); break; + } case 1: + { writeD(0x02); break; + } case 2: + { writeD(0x01); break; + } case 3: + { writeD(0x00); break; + } } break; + } case 4: // TODO: change 4 to 5 once control room supported + { switch (_csize2) - // TODO: once control room supported, update writeD(0x0x) to support 5th room { + // TODO: once control room supported, update writeD(0x0x) to support 5th room case 0: + { writeD(0x05); break; + } case 1: + { writeD(0x04); break; + } case 2: + { writeD(0x03); break; + } case 3: + { writeD(0x02); break; + } case 4: + { writeD(0x01); break; + } } break; + } } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java index 3b74d8bbca..c69bc6a9b7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java @@ -56,6 +56,7 @@ public class SSQStatus extends L2GameServerPacket switch (_page) { case 1: + { // [ddd cc dd ddd c ddd c] writeD(SevenSigns.getInstance().getCurrentCycle()); @@ -65,29 +66,41 @@ public class SSQStatus extends L2GameServerPacket switch (currentPeriod) { case SevenSigns.PERIOD_COMP_RECRUITING: + { writeD(SystemMessageId.THIS_IS_THE_INITIAL_PERIOD.getId()); break; + } case SevenSigns.PERIOD_COMPETITION: + { writeD(SystemMessageId.THE_SSQ_COMPETITION_PERIOD_IS_UNDERWAY.getId()); break; + } case SevenSigns.PERIOD_COMP_RESULTS: + { writeD(SystemMessageId.THIS_IS_A_PERIOD_WHEN_SERVER_STATISTICS_ARE_CALCULATED.getId()); break; + } case SevenSigns.PERIOD_SEAL_VALIDATION: + { writeD(SystemMessageId.THIS_IS_THE_SEAL_VALIDATION_PERIOD.getId()); break; + } } switch (currentPeriod) { case SevenSigns.PERIOD_COMP_RECRUITING: case SevenSigns.PERIOD_COMP_RESULTS: + { writeD(SystemMessageId.UNTIL_TODAY_AT_6_00_P_M.getId()); break; + } case SevenSigns.PERIOD_COMPETITION: case SevenSigns.PERIOD_SEAL_VALIDATION: + { writeD(SystemMessageId.UNTIL_NEXT_MONDAY_AT_6_00_P_M.getId()); break; + } } writeC(SevenSigns.getInstance().getPlayerCabal(_objectId)); @@ -159,7 +172,9 @@ public class SSQStatus extends L2GameServerPacket writeC(dawnPercent); // Dawn % break; + } case 2: + { // c cc hc [cd (dc (S))] writeH(1); @@ -214,7 +229,9 @@ public class SSQStatus extends L2GameServerPacket } } 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 @@ -261,7 +278,9 @@ public class SSQStatus extends L2GameServerPacket } } break; + } case 4: + { // c cc [cc (ccD)] CT 2.3 update writeC(winningCabal); // Overall predicted winner writeC(3); // Total number of seals @@ -279,13 +298,17 @@ public class SSQStatus extends L2GameServerPacket switch (sealOwner) { case SevenSigns.CABAL_NULL: + { switch (winningCabal) { case SevenSigns.CABAL_NULL: + { writeC(SevenSigns.CABAL_NULL); writeD(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId()); break; + } case SevenSigns.CABAL_DAWN: + { if (dawnPercent >= 35) { writeC(SevenSigns.CABAL_DAWN); @@ -297,7 +320,9 @@ public class SSQStatus extends L2GameServerPacket writeD(SystemMessageId.SINCE_THE_SEAL_WAS_NOT_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_SINCE_LESS_THAN_35_PERCENT_OF_PEOPLE_HAVE_VOTED.getId()); } break; + } case SevenSigns.CABAL_DUSK: + { if (duskPercent >= 35) { writeC(SevenSigns.CABAL_DUSK); @@ -309,12 +334,16 @@ public class SSQStatus extends L2GameServerPacket writeD(SystemMessageId.SINCE_THE_SEAL_WAS_NOT_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_SINCE_LESS_THAN_35_PERCENT_OF_PEOPLE_HAVE_VOTED.getId()); } break; + } } break; + } case SevenSigns.CABAL_DAWN: + { switch (winningCabal) { case SevenSigns.CABAL_NULL: + { if (dawnPercent >= 10) { writeC(SevenSigns.CABAL_DAWN); @@ -326,7 +355,9 @@ public class SSQStatus extends L2GameServerPacket writeD(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId()); } break; + } case SevenSigns.CABAL_DAWN: + { if (dawnPercent >= 10) { writeC(sealOwner); @@ -338,7 +369,9 @@ public class SSQStatus extends L2GameServerPacket writeD(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_LESS_THAN_10_OF_PEOPLE_HAVE_VOTED.getId()); } break; + } case SevenSigns.CABAL_DUSK: + { if (duskPercent >= 35) { writeC(SevenSigns.CABAL_DUSK); @@ -355,12 +388,16 @@ public class SSQStatus extends L2GameServerPacket writeD(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_LESS_THAN_10_OF_PEOPLE_HAVE_VOTED.getId()); } break; + } } break; + } case SevenSigns.CABAL_DUSK: + { switch (winningCabal) { case SevenSigns.CABAL_NULL: + { if (duskPercent >= 10) { writeC(SevenSigns.CABAL_DUSK); @@ -372,7 +409,9 @@ public class SSQStatus extends L2GameServerPacket writeD(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId()); } break; + } case SevenSigns.CABAL_DAWN: + { if (dawnPercent >= 35) { writeC(SevenSigns.CABAL_DAWN); @@ -389,7 +428,9 @@ public class SSQStatus extends L2GameServerPacket writeD(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_LESS_THAN_10_OF_PEOPLE_HAVE_VOTED.getId()); } break; + } case SevenSigns.CABAL_DUSK: + { if (duskPercent >= 10) { writeC(sealOwner); @@ -401,11 +442,14 @@ public class SSQStatus extends L2GameServerPacket writeD(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_LESS_THAN_10_OF_PEOPLE_HAVE_VOTED.getId()); } break; + } } break; + } } } break; + } } } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index f9ad1e8a76..b70e1dc353 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -85,17 +85,25 @@ public final class SiegeDefenderList extends L2GameServerPacket switch (siegeclan.getType()) { case OWNER: + { writeD(0x01); // owner break; + } case DEFENDER_PENDING: + { writeD(0x02); // approved break; + } case DEFENDER: + { writeD(0x03); // waiting approved break; + } default: + { writeD(0x00); break; + } } writeD(clan.getAllyId()); writeS(clan.getAllyName()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java index f2c52807cc..7bb23d889b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java @@ -99,45 +99,71 @@ public class SortedWareHouseWithdrawalList extends L2GameServerPacket switch (itemtype) { case WEAPON: + { _objects = createWeaponList(player.getActiveWarehouse().getItems()); break; + } case ARMOR: + { _objects = createArmorList(player.getActiveWarehouse().getItems()); break; + } case ETCITEM: + { _objects = createEtcItemList(player.getActiveWarehouse().getItems()); break; + } case MATERIAL: + { _objects = createMatList(player.getActiveWarehouse().getItems()); break; + } case RECIPE: + { _objects = createRecipeList(player.getActiveWarehouse().getItems()); break; + } case AMULETT: + { _objects = createAmulettList(player.getActiveWarehouse().getItems()); break; + } case SPELLBOOK: + { _objects = createSpellbookList(player.getActiveWarehouse().getItems()); break; + } case CONSUMABLE: + { _objects = createConsumableList(player.getActiveWarehouse().getItems()); break; + } case SHOT: + { _objects = createShotList(player.getActiveWarehouse().getItems()); break; + } case SCROLL: + { _objects = createScrollList(player.getActiveWarehouse().getItems()); break; + } case SEED: + { _objects = createSeedList(player.getActiveWarehouse().getItems()); break; + } case OTHER: + { _objects = createOtherList(player.getActiveWarehouse().getItems()); break; + } case ALL: default: + { _objects = createAllList(player.getActiveWarehouse().getItems()); break; + } } try @@ -146,36 +172,46 @@ public class SortedWareHouseWithdrawalList extends L2GameServerPacket { case A2Z: case Z2A: + { Collections.sort(_objects, new WarehouseItemNameComparator(sortorder)); break; + } case GRADE: + { if ((itemtype == WarehouseListType.ARMOR) || (itemtype == WarehouseListType.WEAPON)) { Collections.sort(_objects, new WarehouseItemNameComparator(A2Z)); Collections.sort(_objects, new WarehouseItemGradeComparator(A2Z)); } break; + } case LEVEL: + { if (itemtype == WarehouseListType.RECIPE) { Collections.sort(_objects, new WarehouseItemNameComparator(A2Z)); Collections.sort(_objects, new WarehouseItemRecipeComparator(A2Z)); } break; + } case TYPE: + { if (itemtype == WarehouseListType.MATERIAL) { Collections.sort(_objects, new WarehouseItemNameComparator(A2Z)); Collections.sort(_objects, new WarehouseItemTypeComparator(A2Z)); } break; + } case WEAR: + { if (itemtype == WarehouseListType.ARMOR) { Collections.sort(_objects, new WarehouseItemNameComparator(A2Z)); Collections.sort(_objects, new WarehouseItemBodypartComparator(A2Z)); } break; + } } } catch (Exception e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java index eea80e5165..d49beea8c0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java @@ -77,10 +77,15 @@ public final class JavaExecutionContext extends AbstractExecutionContext 3)) { @@ -460,6 +525,7 @@ public abstract class AbstractSagaQuest extends Quest startQuestTimer("Mob_2 has despawned", 1000, npc, player); } return null; + } } } return htmltext; @@ -763,12 +829,15 @@ public abstract class AbstractSagaQuest extends Quest switch (st.getCond()) { case 0: + { if (npcId == _npc[0]) { htmltext = "0-01.htm"; } break; + } case 1: + { if (npcId == _npc[0]) { htmltext = "0-04.htm"; @@ -778,7 +847,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "2-01.htm"; } break; + } case 2: + { if (npcId == _npc[2]) { htmltext = "2-02.htm"; @@ -788,7 +859,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "1-01.htm"; } break; + } case 3: + { if ((npcId == _npc[1]) && hasQuestItems(player, Items[0])) { if ((Items[11] == 0) || hasQuestItems(player, Items[11])) @@ -801,7 +874,9 @@ public abstract class AbstractSagaQuest extends Quest } } break; + } case 4: + { if (npcId == _npc[1]) { htmltext = "1-04.htm"; @@ -811,7 +886,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "2-03.htm"; } break; + } case 5: + { if (npcId == _npc[2]) { htmltext = "2-04.htm"; @@ -821,7 +898,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "5-01.htm"; } break; + } case 6: + { if (npcId == _npc[5]) { htmltext = "5-03.htm"; @@ -831,13 +910,17 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "6-01.htm"; } break; + } case 7: + { if (npcId == _npc[6]) { htmltext = "6-02.htm"; } break; + } case 8: + { if (npcId == _npc[6]) { htmltext = "6-04.htm"; @@ -847,13 +930,17 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "7-01.htm"; } break; + } case 9: + { if (npcId == _npc[7]) { htmltext = "7-05.htm"; } break; + } case 10: + { if (npcId == _npc[7]) { htmltext = "7-07.htm"; @@ -863,8 +950,10 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "3-01.htm"; } break; + } case 11: case 12: + { if (npcId == _npc[3]) { if (hasQuestItems(player, Items[2])) @@ -877,7 +966,9 @@ public abstract class AbstractSagaQuest extends Quest } } break; + } case 13: + { if (npcId == _npc[3]) { htmltext = "3-06.htm"; @@ -887,7 +978,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "8-01.htm"; } break; + } case 14: + { if (npcId == _npc[8]) { htmltext = "8-03.htm"; @@ -897,7 +990,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "11-01.htm"; } break; + } case 15: + { if (npcId == _npc[11]) { htmltext = "11-02.htm"; @@ -907,13 +1002,17 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "9-01.htm"; } break; + } case 16: + { if (npcId == _npc[9]) { htmltext = "9-02.htm"; } break; + } case 17: + { if (npcId == _npc[9]) { htmltext = "9-04.htm"; @@ -923,13 +1022,17 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "10-01.htm"; } break; + } case 18: + { if (npcId == _npc[10]) { htmltext = "10-05.htm"; } break; + } case 19: + { if (npcId == _npc[10]) { htmltext = "10-07.htm"; @@ -939,7 +1042,9 @@ public abstract class AbstractSagaQuest extends Quest htmltext = "0-06.htm"; } break; + } case 20: + { if (npcId == _npc[0]) { if (player.getLevel() >= 76) @@ -994,6 +1099,7 @@ public abstract class AbstractSagaQuest extends Quest } } break; + } } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java index 92a9f3b0e2..42b0e260b7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java @@ -66,15 +66,20 @@ public class Q00002_WhatWomenWant extends Quest switch (event) { case "30223-04.htm": + { st.startQuest(); giveItems(player, ARUJIENS_LETTER1, 1); break; + } case "30223-08.html": + { takeItems(player, ARUJIENS_LETTER3, -1); giveItems(player, POETRY_BOOK, 1); st.setCond(4, true); break; + } case "30223-09.html": + { giveAdena(player, 450, true); st.exitQuest(false, true); // Newbie Guide @@ -82,11 +87,16 @@ public class Q00002_WhatWomenWant extends Quest addExpAndSp(player, 4254, 335); giveAdena(player, 1850, true); break; + } case "30223-03.html": + { break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -99,41 +109,60 @@ public class Q00002_WhatWomenWant extends Quest switch (npc.getId()) { case ARUJIEN: + { switch (st.getState()) { case State.CREATED: + { htmltext = ((player.getRace() != Race.ELF) && (player.getRace() != Race.HUMAN)) ? "30223-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30223-02.htm" : "30223-01.html"; break; + } case State.STARTED: + { switch (st.getCond()) { case 1: + { htmltext = "30223-05.html"; break; + } case 2: + { htmltext = "30223-06.html"; break; + } case 3: + { htmltext = "30223-07.html"; break; + } case 4: + { htmltext = "30223-10.html"; break; + } case 5: + { giveItems(player, EARRING, 1); st.exitQuest(false, true); htmltext = "30223-11.html"; // Newbie Guide // showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_HELPER, 2, 5000); break; + } } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case MIRABEL: + { if (st.isStarted()) { if (st.isCond(1)) @@ -149,7 +178,9 @@ public class Q00002_WhatWomenWant extends Quest } } break; + } case HERBIEL: + { if (st.isStarted() && (st.getCond() > 1)) { if (st.isCond(2)) @@ -165,7 +196,9 @@ public class Q00002_WhatWomenWant extends Quest } } break; + } case GREENIS: + { if (st.isStarted()) { if (st.isCond(4)) @@ -185,6 +218,7 @@ public class Q00002_WhatWomenWant extends Quest } } break; + } } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java index 9d67f20c07..987341644d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java @@ -69,13 +69,19 @@ public class Q00003_WillTheSealBeBroken extends Quest switch (event) { case "30141-03.htm": + { st.startQuest(); break; + } case "30141-05.html": + { break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -92,17 +98,23 @@ public class Q00003_WillTheSealBeBroken extends Quest switch (npc.getId()) { case OMEN_BEAST: + { giveItem(member, st, OMEN_BEAST_EYE, getRegisteredItemIds()); break; + } case STINK_ZOMBIE: case TAINTED_ZOMBIE: + { giveItem(member, st, TAINT_STONE, getRegisteredItemIds()); break; + } case LESSER_SUCCUBUS: case LESSER_SUCCUBUS_TILFO: case LESSER_SUCCUBUS_TUREN: + { giveItem(member, st, SUCCUBUS_BLOOD, getRegisteredItemIds()); break; + } } return super.onKill(npc, player, isSummon); } @@ -115,9 +127,12 @@ public class Q00003_WillTheSealBeBroken extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getRace() != Race.DARK_ELF) ? "30141-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30141-02.htm" : "30141-01.html"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30141-04.html"; @@ -129,9 +144,12 @@ public class Q00003_WillTheSealBeBroken extends Quest htmltext = "30141-06.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java index edf29c7c14..dce94d7b39 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java @@ -71,13 +71,19 @@ public class Q00004_LongLiveThePaagrioLord extends Quest switch (event) { case "30578-03.htm": + { st.startQuest(); break; + } case "30578-05.html": + { break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -90,12 +96,16 @@ public class Q00004_LongLiveThePaagrioLord extends Quest switch (npc.getId()) { case NAKUSIN: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getRace() != Race.ORC) ? "30578-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30578-02.htm" : "30578-01.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30578-04.html"; @@ -111,29 +121,45 @@ public class Q00004_LongLiveThePaagrioLord extends Quest htmltext = "30578-06.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case VARKEES: + { htmltext = giveItem(player, st, npc.getId(), HONEY_KHANDAR, getRegisteredItemIds()); break; + } case URUTU: + { htmltext = giveItem(player, st, npc.getId(), DEEP_SEA_ORB, getRegisteredItemIds()); break; + } case HESTUI: + { htmltext = giveItem(player, st, npc.getId(), BEAR_FUR_CLOAK, getRegisteredItemIds()); break; + } case KUNAI: + { htmltext = giveItem(player, st, npc.getId(), SPIDER_DUST, getRegisteredItemIds()); break; + } case USKA: + { htmltext = giveItem(player, st, npc.getId(), ANCESTOR_SKULL, getRegisteredItemIds()); break; + } case GROOKIN: + { htmltext = giveItem(player, st, npc.getId(), BLOODY_AXE, getRegisteredItemIds()); break; + } } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java index b83dcea2f8..8b5f6489a5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java @@ -68,11 +68,14 @@ public class Q00005_MinersFavor extends Quest switch (event) { case "30554-03.htm": + { st.startQuest(); giveItems(player, BOLTERS_LIST, 1); giveItems(player, BOLTERS_SMELLY_SOCKS, 1); break; + } case "30526-02.html": + { if (!hasQuestItems(player, BOLTERS_SMELLY_SOCKS)) { return "30526-04.html"; @@ -81,11 +84,16 @@ public class Q00005_MinersFavor extends Quest giveItems(player, MINERS_PICK, 1); checkProgress(player, st); break; + } case "30554-05.html": + { break; + } default: + { htmltext = null; break; + } } return htmltext; } @@ -98,12 +106,16 @@ public class Q00005_MinersFavor extends Quest switch (npc.getId()) { case BOLTER: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "30554-02.htm" : "30554-01.html"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30554-04.html"; @@ -119,26 +131,38 @@ public class Q00005_MinersFavor extends Quest htmltext = "30554-06.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case BRUNON: + { if (st.isStarted()) { htmltext = (hasQuestItems(player, MINERS_PICK)) ? "30526-03.html" : "30526-01.html"; } break; + } case REED: + { htmltext = giveItem(player, st, npc.getId(), REDSTONE_BEER); break; + } case SHARI: + { htmltext = giveItem(player, st, npc.getId(), BOOMBOOM_POWDER); break; + } case GARITA: + { htmltext = giveItem(player, st, npc.getId(), MINING_BOOTS); break; + } } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java index 6a02d9d1e0..16f9b0764b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java @@ -201,7 +201,6 @@ public final class Q00106_ForgottenTruth extends Quest } break; } - } } break; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java index c669cf17a6..fcb9e9b9c3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java @@ -231,7 +231,6 @@ public final class Q00108_JumbleTumbleDiamondFuss extends Quest } break; } - } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java index 373e6b2cdb..9a3284f0d1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java @@ -89,12 +89,16 @@ public class Q00151_CureForFever extends Quest switch (npc.getId()) { case ELLIAS: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "30050-02.htm" : "30050-01.htm"; break; + } case State.STARTED: + { if (st.isCond(3) && hasQuestItems(player, FEVER_MEDICINE)) { giveItems(player, ROUND_SHIELD, 1); @@ -112,12 +116,17 @@ public class Q00151_CureForFever extends Quest htmltext = "30050-04.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case YOHANES: + { if (st.isStarted()) { if (st.isCond(2) && hasQuestItems(player, POISON_SAC)) @@ -133,6 +142,7 @@ public class Q00151_CureForFever extends Quest } } break; + } } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java index 5c7a1bedc4..b5e91c3dc4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java @@ -84,9 +84,12 @@ public class Q00153_DeliverGoods extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= 2) ? "30041-01.htm" : "30041-00.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30041-03.html"; @@ -105,9 +108,12 @@ public class Q00153_DeliverGoods extends Quest htmltext = "30041-04.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java index cffb4cb23e..d8252e2a21 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java @@ -67,20 +67,29 @@ public class Q00155_FindSirWindawood extends Quest switch (npc.getId()) { case ABELLOS: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "30042-02.htm" : "30042-01.htm"; break; + } case State.STARTED: + { htmltext = "30042-04.html"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case SIR_COLLIN_WINDAWOOD: + { if (st.isStarted() && hasQuestItems(player, OFFICIAL_LETTER)) { giveItems(player, HASTE_POTION, 1); @@ -88,6 +97,7 @@ public class Q00155_FindSirWindawood extends Quest htmltext = "30311-01.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java index a56291e1ee..28690d9303 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java @@ -96,9 +96,12 @@ public class Q00158_SeedOfEvil extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "30031-02.htm" : "30031-01.html"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30031-04.html"; @@ -112,9 +115,12 @@ public class Q00158_SeedOfEvil extends Quest htmltext = "30031-05.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java index 2077237001..8cc28dc447 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java @@ -174,7 +174,6 @@ public final class Q00160_NerupasRequest extends Quest } qs.setCond(4, true); htmltext = "30152-01.html"; - } else if (hasQuestItems(player, NIGHTSHADE_LEAF)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java index 9eba656c4a..2f838a494f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java @@ -59,15 +59,20 @@ public class Q00161_FruitOfTheMotherTree extends Quest switch (event) { case "30362-04.htm": + { st.startQuest(); giveItems(player, ANDELLRIAS_LETTER, 1); break; + } case "30371-03.html": + { break; + } default: + { htmltext = null; break; - + } } return htmltext; } @@ -81,12 +86,16 @@ public class Q00161_FruitOfTheMotherTree extends Quest switch (npc.getId()) { case ANDELLIA: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30362-03.htm" : "30362-02.htm" : "30362-01.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30362-05.html"; @@ -99,12 +108,17 @@ public class Q00161_FruitOfTheMotherTree extends Quest htmltext = "30362-06.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case THALIA: + { if (st.isStarted()) { if (st.isCond(1) && hasQuestItems(player, ANDELLRIAS_LETTER)) @@ -120,6 +134,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest } } break; + } } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java index 63935f3aec..2f18717835 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java @@ -93,9 +93,12 @@ public class Q00170_DangerousSeduction extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30305-01.htm" : "30305-02.htm" : "30305-03.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30305-05.html"; @@ -108,9 +111,12 @@ public class Q00170_DangerousSeduction extends Quest htmltext = "30305-06.html"; } break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java index 772cd22bcd..acd39e9da5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java @@ -93,9 +93,12 @@ public class Q00277_GatekeepersOffering extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = "30576-02.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30576-04.html"; @@ -107,6 +110,7 @@ public class Q00277_GatekeepersOffering extends Quest htmltext = "30576-05.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java index 22b7ddf75c..5c6c0844f4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java @@ -93,9 +93,12 @@ public class Q00297_GatekeepersFavor extends Quest switch (st.getState()) { case State.CREATED: + { htmltext = "30540-02.htm"; break; + } case State.STARTED: + { if (st.isCond(1)) { htmltext = "30540-04.html"; @@ -107,6 +110,7 @@ public class Q00297_GatekeepersFavor extends Quest htmltext = "30540-05.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java index 078b6d0121..715ee05d47 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java @@ -159,19 +159,24 @@ public final class GeoDataConverter switch (type) { case GeoStructure.TYPE_FLAT_L2J_L2OFF: + { _blocks[ix][iy] = new BlockFlat(buffer, _format); break; - + } case GeoStructure.TYPE_COMPLEX_L2J: + { _blocks[ix][iy] = new BlockComplex(buffer, _format); break; - + } case GeoStructure.TYPE_MULTILAYER_L2J: + { _blocks[ix][iy] = new BlockMultilayer(buffer, _format); break; - + } default: + { throw new IllegalArgumentException("Unknown block type: " + type); + } } } else @@ -183,16 +188,20 @@ public final class GeoDataConverter switch (type) { case GeoStructure.TYPE_FLAT_L2J_L2OFF: + { _blocks[ix][iy] = new BlockFlat(buffer, _format); break; - + } case GeoStructure.TYPE_COMPLEX_L2OFF: + { _blocks[ix][iy] = new BlockComplex(buffer, _format); break; - + } default: + { _blocks[ix][iy] = new BlockMultilayer(buffer, _format); break; + } } } }