lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code format braces.

Browse Source
This commit is contained in:
MobiusDev 2017-08-31 11:54:12 +00:00
parent ce279555a0
commit 3615456155
297 changed files with 6280 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs
View File

@ -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

12
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java vendored
View File

@ -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;
}

26
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java vendored
View File

@ -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;
}
}
}
}

5
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java vendored
View File

@ -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))

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java vendored
View File

@ -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;
}
}

1
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java vendored
View File

@ -111,7 +111,6 @@ public class Q10384_AnAudienceWithTauti extends Quest
{
htmltext = "maestro_ferguson_q10384_09.html";
}
}
else if (qs.isCompleted())
{

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java vendored
View File

@ -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;

8
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java vendored
View File

@ -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)
{

10
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java vendored
View File

@ -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)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java vendored
View File

@ -152,8 +152,10 @@ public final class Q10740_NeverForget extends Quest
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}

8
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java vendored
View File

@ -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;
}

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java vendored
View File

@ -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;

10
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java vendored
View File

@ -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;
}

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java vendored
View File

@ -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;
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java vendored
View File

@ -114,7 +114,9 @@ public final class Q10745_TheSecretIngredients extends Quest
break;
}
default:
{
htmltext = null;
}
}
return htmltext;
}

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java vendored
View File

@ -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;
}

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java vendored
View File

@ -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;
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java vendored
View File

@ -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();

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/Expression.java
View File

@ -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)
{

14
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/Operators.java
View File

@ -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;
}
}
}
}

14
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java
View File

@ -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())

19
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java
View File

@ -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;
}
}
}
}

19
L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs
View File

@ -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

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java vendored
View File

@ -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))

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java vendored
View File

@ -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;
}
}

1
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java vendored
View File

@ -111,7 +111,6 @@ public class Q10384_AnAudienceWithTauti extends Quest
{
htmltext = "maestro_ferguson_q10384_09.html";
}
}
else if (qs.isCompleted())
{

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java vendored
View File

@ -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;

8
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java vendored
View File

@ -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)
{

10
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java vendored
View File

@ -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)
{

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java vendored
View File

@ -152,8 +152,10 @@ public final class Q10740_NeverForget extends Quest
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}

8
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java vendored
View File

@ -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;
}

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java vendored
View File

@ -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;

10
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java vendored
View File

@ -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;
}

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java vendored
View File

@ -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;
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java vendored
View File

@ -114,7 +114,9 @@ public final class Q10745_TheSecretIngredients extends Quest
break;
}
default:
{
htmltext = null;
}
}
return htmltext;
}

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java vendored
View File

@ -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;
}

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java vendored
View File

@ -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;
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java vendored
View File

@ -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();

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/Expression.java
View File

@ -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)
{

14
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/Operators.java
View File

@ -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;
}
}
}
}

14
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java
View File

@ -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())

19
L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java
View File

@ -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;
}
}
}
}

19
L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs
View File

@ -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

5
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java vendored
View File

@ -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))

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java vendored
View File

@ -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;
}
}

1
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java vendored
View File

@ -124,7 +124,6 @@ public class Q10384_AnAudienceWithTauti extends Quest
{
htmltext = "maestro_ferguson_q10384_09.html";
}
}
else if (qs.isCompleted())
{

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java vendored
View File

@ -211,7 +211,9 @@ public final class Q10542_SearchingForNewPower extends Quest
break;
}
default:
{
break;
}
}
if (npcStringId != null)
{

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java vendored
View File

@ -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;

8
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java vendored
View File

@ -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)
{

10
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java vendored
View File

@ -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)
{

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java vendored
View File

@ -152,8 +152,10 @@ public final class Q10740_NeverForget extends Quest
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}

8
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java vendored
View File

@ -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;
}

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java vendored
View File

@ -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;

10
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java vendored
View File

@ -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;
}

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java vendored
View File

@ -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;
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java vendored
View File

@ -114,7 +114,9 @@ public final class Q10745_TheSecretIngredients extends Quest
break;
}
default:
{
htmltext = null;
}
}
return htmltext;
}

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java vendored
View File

@ -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;
}

8
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java vendored
View File

@ -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;
}

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java vendored
View File

@ -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;
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java vendored
View File

@ -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();

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/Expression.java
View File

@ -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)
{

14
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/Operators.java
View File

@ -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;
}
}
}
}

14
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java
View File

@ -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())

19
L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java
View File

@ -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;
}
}
}
}

18
L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs
View File

@ -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

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/BeastFarm.java vendored
View File

@ -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));

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/DragonValley.java vendored
View File

@ -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;
}
}
}
}

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java vendored
View File

@ -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);
}

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SilentValley.java vendored
View File

@ -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);

14
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/StakatoNest.java vendored
View File

@ -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<L2PcInstance> 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)
{

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java vendored
View File

@ -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.

95
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java vendored
View File

@ -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("<fstring>1300" + fortId + "</fstring>");
sb.append(" (<fstring>" + fortType + "</fstring>)");
@ -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() + "!");
}
}
}
}

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java vendored
View File

@ -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";
}
}
}
}

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java vendored
View File

@ -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;
}

11
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java vendored
View File

@ -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"))

20
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java vendored
View File

@ -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;

20
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java vendored
View File

@ -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;

148
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java vendored
View File

@ -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 <font color=LEVEL>" + formatAdena(price) + "</font> 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 "<html><head><title>" + TITLE_NAME + "</title></head><body><center><img src=\"L2UI_CH3.herotower_deco\" width=256 height=32><br>Do you really want to delete '" + eventParam2 + "' scheme?<br><br><button value=\"Yes\" action=\"bypass -h Quest " + QUEST_LOADING_INFO + " delete " + eventParam1 + " x x\" width=50 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"><button value=\"No\" action=\"bypass -h Quest " + QUEST_LOADING_INFO + " delete_1 x x x\" width=50 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"><br><font color=303030>" + TITLE_NAME + "</font></center></body></html>";
}
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:<br>You need: <font color=LEVEL>" + 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<Integer> 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);
}

34
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/EnergySeeds.java vendored
View File

@ -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;
}
}
}

11
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Lindvior.java vendored
View File

@ -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);
}

24
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Maguen.java vendored
View File

@ -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;
}

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/StarStones.java vendored
View File

@ -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)
{

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java vendored
View File

@ -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[][] {};
}

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java vendored
View File

@ -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[][] {};
}

14
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java vendored
View File

@ -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;
}

18
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java vendored
View File

@ -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();
}

16
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java vendored
View File

@ -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)

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java vendored
View File

@ -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;
}
}
}

14
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java vendored
View File

@ -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;
}
}
}
}

50
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java vendored
View File

@ -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"))

45
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java vendored
View File

@ -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;
}
}
}
}

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java vendored
View File

@ -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("<spawn npcId=\"" + i + "\" x=\"" + x + "\" y=\"" + y + "\" z=\"" + z + "\" heading=\"" + h + "\" respawn=\"0\" />");
break;
}
case 2:
{
_log.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },");
break;
}
}
}

12
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java vendored
View File

@ -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);

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Augment.java vendored
View File

@ -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)

51
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java vendored
View File

@ -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<Integer> 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("<html><body>Festival Guide:<br>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.<br>");
if (dawnScore > 0)
{
strBuffer.append("Dawn: " + calculateDate(dawnData.getString("date")) + ". Score " + dawnScore + "<br>" + dawnData.getString("members") + "<br>");
@ -233,7 +215,6 @@ public class Festival implements IBypassHandler
{
strBuffer.append("Dawn: No record exists. Score 0<br>");
}
if (duskScore > 0)
{
strBuffer.append("Dusk: " + calculateDate(duskData.getString("date")) + ". Score " + duskScore + "<br>" + duskData.getString("members") + "<br>");
@ -242,7 +223,6 @@ public class Festival implements IBypassHandler
{
strBuffer.append("Dusk: No record exists. Score 0<br>");
}
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 + "<br>Affilated side: " + cabalStr + "<br>" + overallData.getString("members") + "<br>");
}
else
{
strBuffer.append("Consecutive top scores: No record exists. Score 0<br>");
}
strBuffer.append("<a action=\"bypass -h npc_" + npc.getObjectId() + "_Chat 0\">Go back.</a></body></html>");
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;
}

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java vendored
View File

@ -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.";
}

38
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java vendored
View File

@ -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<List<Integer>> 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<String> 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;
}
}
}
}

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java vendored
View File

@ -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;
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/PartyOther.java vendored
View File

@ -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[]

32
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java vendored
View File

@ -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)

Some files were not shown because too many files have changed in this diff Show More