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
Download Patch File Download Diff File Expand all files Collapse all files

19
L2J_Mobius_Classic_2.0_Saviors/.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

106
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/AbstractSagaQuest.java vendored
View File

@@ -168,14 +168,19 @@ public abstract class AbstractSagaQuest extends Quest
case "0-013.htm":
case "0-014.htm":
case "0-015.htm":
{
htmltext = event;
break;
}
case "accept":
{
st.startQuest();
giveItems(player, Items[10], 1);
htmltext = "0-03.htm";
break;
}
case "0-1":
{
if (player.getLevel() < 76)
{
htmltext = "0-02.htm";
@@ -189,7 +194,9 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "0-05.htm";
}
break;
}
case "0-2":
{
if (player.getLevel() < 76)
{
takeItems(player, Items[10], -1);
@@ -241,11 +248,15 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "0-07.htm";
}
break;
}
case "1-3":
{
st.setCond(3);
htmltext = "1-05.htm";
break;
}
case "1-4":
{
st.setCond(4);
takeItems(player, Items[0], 1);
if (Items[11] != 0)
@@ -255,42 +266,60 @@ public abstract class AbstractSagaQuest extends Quest
giveItems(player, Items[1], 1);
htmltext = "1-06.htm";
break;
}
case "2-1":
{
st.setCond(2);
htmltext = "2-05.htm";
break;
}
case "2-2":
{
st.setCond(5);
takeItems(player, Items[1], 1);
giveItems(player, Items[4], 1);
htmltext = "2-06.htm";
break;
}
case "3-5":
{
htmltext = "3-07.htm";
break;
}
case "3-6":
{
st.setCond(11);
htmltext = "3-02.htm";
break;
}
case "3-7":
{
st.setCond(12);
htmltext = "3-03.htm";
break;
}
case "3-8":
{
st.setCond(13);
takeItems(player, Items[2], 1);
giveItems(player, Items[7], 1);
htmltext = "3-08.htm";
break;
}
case "4-1":
{
htmltext = "4-010.htm";
break;
}
case "4-2":
{
giveItems(player, Items[9], 1);
st.setCond(18, true);
htmltext = "4-011.htm";
break;
}
case "4-3":
{
giveItems(player, Items[9], 1);
st.setCond(18, true);
autoChat(npc, Text[13].replace("PLAYERNAME", player.getName()));
@@ -298,19 +327,25 @@ public abstract class AbstractSagaQuest extends Quest
cancelQuestTimer("Mob_2 has despawned", npc, player);
DeleteSpawn(st, npc);
return null;
}
case "5-1":
{
st.setCond(6, true);
takeItems(player, Items[4], 1);
cast(npc, player, 4546, 1);
htmltext = "5-02.htm";
break;
}
case "6-1":
{
st.setCond(8, true);
takeItems(player, Items[5], 1);
cast(npc, player, 4546, 1);
htmltext = "6-03.htm";
break;
}
case "7-1":
{
if (st.getInt("spawned") == 1)
{
htmltext = "7-03.htm";
@@ -329,25 +364,33 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "7-04.htm";
}
break;
}
case "7-2":
{
st.setCond(10, true);
takeItems(player, Items[6], 1);
cast(npc, player, 4546, 1);
htmltext = "7-06.htm";
break;
}
case "8-1":
{
st.setCond(14, true);
takeItems(player, Items[7], 1);
cast(npc, player, 4546, 1);
htmltext = "8-02.htm";
break;
}
case "9-1":
{
st.setCond(17, true);
takeItems(player, Items[8], 1);
cast(npc, player, 4546, 1);
htmltext = "9-03.htm";
break;
}
case "10-1":
{
if (st.getInt("Quest0") == 0)
{
L2Npc Mob_3 = addSpawn(Mob[2], npcSpawnLocations[1], false, 0);
@@ -372,30 +415,42 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "10-04.htm";
}
break;
}
case "10-2":
{
st.setCond(19, true);
takeItems(player, Items[9], 1);
cast(npc, player, 4546, 1);
htmltext = "10-06.htm";
break;
}
case "11-9":
{
st.setCond(15);
htmltext = "11-03.htm";
break;
}
case "Mob_1 Timer 1":
{
autoChat(npc, Text[0].replace("PLAYERNAME", player.getName()));
return null;
}
case "Mob_1 has despawned":
{
autoChat(npc, Text[1].replace("PLAYERNAME", player.getName()));
st.set("spawned", "0");
DeleteSpawn(st, npc);
return null;
}
case "Archon Hellisha has despawned":
{
autoChat(npc, Text[6].replace("PLAYERNAME", player.getName()));
st.set("spawned", "0");
DeleteSpawn(st, npc);
return null;
}
case "Mob_3 Timer 1":
{
L2Npc Mob_2 = FindSpawn(player, (L2Npc) L2World.getInstance().findObject(st.getInt("Mob_2")));
// TODO: Check this
// if (npc.getKnownList().knowsObject(Mob_2))
@@ -408,12 +463,16 @@ public abstract class AbstractSagaQuest extends Quest
cancelQuestTimer("Mob_3 Timer 1", npc, player);
}
return null;
}
case "Mob_3 has despawned":
{
autoChat(npc, Text[15].replace("PLAYERNAME", player.getName()));
st.set("Quest0", "2");
DeleteSpawn(st, npc);
return null;
}
case "Mob_2 Timer 1":
{
autoChat(npc, Text[7].replace("PLAYERNAME", player.getName()));
startQuestTimer("Mob_2 Timer 2", 1500, npc, player);
if (st.getInt("Quest1") == 45)
@@ -421,11 +480,15 @@ public abstract class AbstractSagaQuest extends Quest
st.set("Quest1", "0");
}
return null;
}
case "Mob_2 Timer 2":
{
autoChat(npc, Text[8].replace("PLAYERNAME", player.getName()));
startQuestTimer("Mob_2 Timer 3", 10000, npc, player);
return null;
}
case "Mob_2 Timer 3":
{
if (st.getInt("Quest0") == 0)
{
startQuestTimer("Mob_2 Timer 3", 13000, npc, player);
@@ -439,7 +502,9 @@ public abstract class AbstractSagaQuest extends Quest
}
}
return null;
}
case "Mob_2 has despawned":
{
st.set("Quest1", String.valueOf(st.getInt("Quest1") + 1));
if ((st.getInt("Quest0") == 1) || (st.getInt("Quest0") == 2) || (st.getInt("Quest1") > 3))
{
@@ -460,6 +525,7 @@ public abstract class AbstractSagaQuest extends Quest
startQuestTimer("Mob_2 has despawned", 1000, npc, player);
}
return null;
}
}
}
return htmltext;
@@ -763,12 +829,15 @@ public abstract class AbstractSagaQuest extends Quest
switch (st.getCond())
{
case 0:
{
if (npcId == _npc[0])
{
htmltext = "0-01.htm";
}
break;
}
case 1:
{
if (npcId == _npc[0])
{
htmltext = "0-04.htm";
@@ -778,7 +847,9 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "2-01.htm";
}
break;
}
case 2:
{
if (npcId == _npc[2])
{
htmltext = "2-02.htm";
@@ -788,7 +859,9 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "1-01.htm";
}
break;
}
case 3:
{
if ((npcId == _npc[1]) && hasQuestItems(player, Items[0]))
{
if ((Items[11] == 0) || hasQuestItems(player, Items[11]))
@@ -801,7 +874,9 @@ public abstract class AbstractSagaQuest extends Quest
}
}
break;
}
case 4:
{
if (npcId == _npc[1])
{
htmltext = "1-04.htm";
@@ -811,7 +886,9 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "2-03.htm";
}
break;
}
case 5:
{
if (npcId == _npc[2])
{
htmltext = "2-04.htm";
@@ -821,7 +898,9 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "5-01.htm";
}
break;
}
case 6:
{
if (npcId == _npc[5])
{
htmltext = "5-03.htm";
@@ -831,13 +910,17 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "6-01.htm";
}
break;
}
case 7:
{
if (npcId == _npc[6])
{
htmltext = "6-02.htm";
}
break;
}
case 8:
{
if (npcId == _npc[6])
{
htmltext = "6-04.htm";
@@ -847,13 +930,17 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "7-01.htm";
}
break;
}
case 9:
{
if (npcId == _npc[7])
{
htmltext = "7-05.htm";
}
break;
}
case 10:
{
if (npcId == _npc[7])
{
htmltext = "7-07.htm";
@@ -863,8 +950,10 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "3-01.htm";
}
break;
}
case 11:
case 12:
{
if (npcId == _npc[3])
{
if (hasQuestItems(player, Items[2]))
@@ -877,7 +966,9 @@ public abstract class AbstractSagaQuest extends Quest
}
}
break;
}
case 13:
{
if (npcId == _npc[3])
{
htmltext = "3-06.htm";
@@ -887,7 +978,9 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "8-01.htm";
}
break;
}
case 14:
{
if (npcId == _npc[8])
{
htmltext = "8-03.htm";
@@ -897,7 +990,9 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "11-01.htm";
}
break;
}
case 15:
{
if (npcId == _npc[11])
{
htmltext = "11-02.htm";
@@ -907,13 +1002,17 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "9-01.htm";
}
break;
}
case 16:
{
if (npcId == _npc[9])
{
htmltext = "9-02.htm";
}
break;
}
case 17:
{
if (npcId == _npc[9])
{
htmltext = "9-04.htm";
@@ -923,13 +1022,17 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "10-01.htm";
}
break;
}
case 18:
{
if (npcId == _npc[10])
{
htmltext = "10-05.htm";
}
break;
}
case 19:
{
if (npcId == _npc[10])
{
htmltext = "10-07.htm";
@@ -939,7 +1042,9 @@ public abstract class AbstractSagaQuest extends Quest
htmltext = "0-06.htm";
}
break;
}
case 20:
{
if (npcId == _npc[0])
{
if (player.getLevel() >= 76)
@@ -994,6 +1099,7 @@ public abstract class AbstractSagaQuest extends Quest
}
}
break;
}
}
}
}

34
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java vendored
View File

@@ -66,15 +66,20 @@ public class Q00002_WhatWomenWant extends Quest
switch (event)
{
case "30223-04.htm":
{
st.startQuest();
giveItems(player, ARUJIENS_LETTER1, 1);
break;
}
case "30223-08.html":
{
takeItems(player, ARUJIENS_LETTER3, -1);
giveItems(player, POETRY_BOOK, 1);
st.setCond(4, true);
break;
}
case "30223-09.html":
{
giveAdena(player, 450, true);
st.exitQuest(false, true);
// Newbie Guide
@@ -82,11 +87,16 @@ public class Q00002_WhatWomenWant extends Quest
addExpAndSp(player, 4254, 335);
giveAdena(player, 1850, true);
break;
}
case "30223-03.html":
{
break;
}
default:
{
htmltext = null;
break;
}
}
return htmltext;
}
@@ -99,41 +109,60 @@ public class Q00002_WhatWomenWant extends Quest
switch (npc.getId())
{
case ARUJIEN:
{
switch (st.getState())
{
case State.CREATED:
{
htmltext = ((player.getRace() != Race.ELF) && (player.getRace() != Race.HUMAN)) ? "30223-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30223-02.htm" : "30223-01.html";
break;
}
case State.STARTED:
{
switch (st.getCond())
{
case 1:
{
htmltext = "30223-05.html";
break;
}
case 2:
{
htmltext = "30223-06.html";
break;
}
case 3:
{
htmltext = "30223-07.html";
break;
}
case 4:
{
htmltext = "30223-10.html";
break;
}
case 5:
{
giveItems(player, EARRING, 1);
st.exitQuest(false, true);
htmltext = "30223-11.html";
// Newbie Guide
// showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_HELPER, 2, 5000);
break;
}
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}
case MIRABEL:
{
if (st.isStarted())
{
if (st.isCond(1))
@@ -149,7 +178,9 @@ public class Q00002_WhatWomenWant extends Quest
}
}
break;
}
case HERBIEL:
{
if (st.isStarted() && (st.getCond() > 1))
{
if (st.isCond(2))
@@ -165,7 +196,9 @@ public class Q00002_WhatWomenWant extends Quest
}
}
break;
}
case GREENIS:
{
if (st.isStarted())
{
if (st.isCond(4))
@@ -185,6 +218,7 @@ public class Q00002_WhatWomenWant extends Quest
}
}
break;
}
}
return htmltext;
}

18
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java vendored
View File

@@ -69,13 +69,19 @@ public class Q00003_WillTheSealBeBroken extends Quest
switch (event)
{
case "30141-03.htm":
{
st.startQuest();
break;
}
case "30141-05.html":
{
break;
}
default:
{
htmltext = null;
break;
}
}
return htmltext;
}
@@ -92,17 +98,23 @@ public class Q00003_WillTheSealBeBroken extends Quest
switch (npc.getId())
{
case OMEN_BEAST:
{
giveItem(member, st, OMEN_BEAST_EYE, getRegisteredItemIds());
break;
}
case STINK_ZOMBIE:
case TAINTED_ZOMBIE:
{
giveItem(member, st, TAINT_STONE, getRegisteredItemIds());
break;
}
case LESSER_SUCCUBUS:
case LESSER_SUCCUBUS_TILFO:
case LESSER_SUCCUBUS_TUREN:
{
giveItem(member, st, SUCCUBUS_BLOOD, getRegisteredItemIds());
break;
}
}
return super.onKill(npc, player, isSummon);
}
@@ -115,9 +127,12 @@ public class Q00003_WillTheSealBeBroken extends Quest
switch (st.getState())
{
case State.CREATED:
{
htmltext = (player.getRace() != Race.DARK_ELF) ? "30141-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30141-02.htm" : "30141-01.html";
break;
}
case State.STARTED:
{
if (st.isCond(1))
{
htmltext = "30141-04.html";
@@ -129,9 +144,12 @@ public class Q00003_WillTheSealBeBroken extends Quest
htmltext = "30141-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;
}

26
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java vendored
View File

@@ -71,13 +71,19 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
switch (event)
{
case "30578-03.htm":
{
st.startQuest();
break;
}
case "30578-05.html":
{
break;
}
default:
{
htmltext = null;
break;
}
}
return htmltext;
}
@@ -90,12 +96,16 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
switch (npc.getId())
{
case NAKUSIN:
{
switch (st.getState())
{
case State.CREATED:
{
htmltext = (player.getRace() != Race.ORC) ? "30578-00.htm" : (player.getLevel() >= MIN_LEVEL) ? "30578-02.htm" : "30578-01.htm";
break;
}
case State.STARTED:
{
if (st.isCond(1))
{
htmltext = "30578-04.html";
@@ -111,29 +121,45 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
htmltext = "30578-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}
case VARKEES:
{
htmltext = giveItem(player, st, npc.getId(), HONEY_KHANDAR, getRegisteredItemIds());
break;
}
case URUTU:
{
htmltext = giveItem(player, st, npc.getId(), DEEP_SEA_ORB, getRegisteredItemIds());
break;
}
case HESTUI:
{
htmltext = giveItem(player, st, npc.getId(), BEAR_FUR_CLOAK, getRegisteredItemIds());
break;
}
case KUNAI:
{
htmltext = giveItem(player, st, npc.getId(), SPIDER_DUST, getRegisteredItemIds());
break;
}
case USKA:
{
htmltext = giveItem(player, st, npc.getId(), ANCESTOR_SKULL, getRegisteredItemIds());
break;
}
case GROOKIN:
{
htmltext = giveItem(player, st, npc.getId(), BLOODY_AXE, getRegisteredItemIds());
break;
}
}
return htmltext;
}

24
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java vendored
View File

@@ -68,11 +68,14 @@ public class Q00005_MinersFavor extends Quest
switch (event)
{
case "30554-03.htm":
{
st.startQuest();
giveItems(player, BOLTERS_LIST, 1);
giveItems(player, BOLTERS_SMELLY_SOCKS, 1);
break;
}
case "30526-02.html":
{
if (!hasQuestItems(player, BOLTERS_SMELLY_SOCKS))
{
return "30526-04.html";
@@ -81,11 +84,16 @@ public class Q00005_MinersFavor extends Quest
giveItems(player, MINERS_PICK, 1);
checkProgress(player, st);
break;
}
case "30554-05.html":
{
break;
}
default:
{
htmltext = null;
break;
}
}
return htmltext;
}
@@ -98,12 +106,16 @@ public class Q00005_MinersFavor extends Quest
switch (npc.getId())
{
case BOLTER:
{
switch (st.getState())
{
case State.CREATED:
{
htmltext = (player.getLevel() >= MIN_LEVEL) ? "30554-02.htm" : "30554-01.html";
break;
}
case State.STARTED:
{
if (st.isCond(1))
{
htmltext = "30554-04.html";
@@ -119,26 +131,38 @@ public class Q00005_MinersFavor extends Quest
htmltext = "30554-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}
case BRUNON:
{
if (st.isStarted())
{
htmltext = (hasQuestItems(player, MINERS_PICK)) ? "30526-03.html" : "30526-01.html";
}
break;
}
case REED:
{
htmltext = giveItem(player, st, npc.getId(), REDSTONE_BEER);
break;
}
case SHARI:
{
htmltext = giveItem(player, st, npc.getId(), BOOMBOOM_POWDER);
break;
}
case GARITA:
{
htmltext = giveItem(player, st, npc.getId(), MINING_BOOTS);
break;
}
}
return htmltext;
}

1
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java vendored
View File

@@ -201,7 +201,6 @@ public final class Q00106_ForgottenTruth extends Quest
}
break;
}
}
}
break;

1
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java vendored
View File

@@ -231,7 +231,6 @@ public final class Q00108_JumbleTumbleDiamondFuss extends Quest
}
break;
}
}
break;
}

10
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java vendored
View File

@@ -89,12 +89,16 @@ public class Q00151_CureForFever extends Quest
switch (npc.getId())
{
case ELLIAS:
{
switch (st.getState())
{
case State.CREATED:
{
htmltext = (player.getLevel() >= MIN_LEVEL) ? "30050-02.htm" : "30050-01.htm";
break;
}
case State.STARTED:
{
if (st.isCond(3) && hasQuestItems(player, FEVER_MEDICINE))
{
giveItems(player, ROUND_SHIELD, 1);
@@ -112,12 +116,17 @@ public class Q00151_CureForFever extends Quest
htmltext = "30050-04.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}
case YOHANES:
{
if (st.isStarted())
{
if (st.isCond(2) && hasQuestItems(player, POISON_SAC))
@@ -133,6 +142,7 @@ public class Q00151_CureForFever extends Quest
}
}
break;
}
}
return htmltext;
}

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java vendored
View File

@@ -84,9 +84,12 @@ public class Q00153_DeliverGoods extends Quest
switch (st.getState())
{
case State.CREATED:
{
htmltext = (player.getLevel() >= 2) ? "30041-01.htm" : "30041-00.htm";
break;
}
case State.STARTED:
{
if (st.isCond(1))
{
htmltext = "30041-03.html";
@@ -105,9 +108,12 @@ public class Q00153_DeliverGoods extends Quest
htmltext = "30041-04.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
}
else

10
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java vendored
View File

@@ -67,20 +67,29 @@ public class Q00155_FindSirWindawood extends Quest
switch (npc.getId())
{
case ABELLOS:
{
switch (st.getState())
{
case State.CREATED:
{
htmltext = (player.getLevel() >= MIN_LEVEL) ? "30042-02.htm" : "30042-01.htm";
break;
}
case State.STARTED:
{
htmltext = "30042-04.html";
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}
case SIR_COLLIN_WINDAWOOD:
{
if (st.isStarted() && hasQuestItems(player, OFFICIAL_LETTER))
{
giveItems(player, HASTE_POTION, 1);
@@ -88,6 +97,7 @@ public class Q00155_FindSirWindawood extends Quest
htmltext = "30311-01.html";
}
break;
}
}
return htmltext;
}

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java vendored
View File

@@ -96,9 +96,12 @@ public class Q00158_SeedOfEvil extends Quest
switch (st.getState())
{
case State.CREATED:
{
htmltext = (player.getLevel() >= MIN_LEVEL) ? "30031-02.htm" : "30031-01.html";
break;
}
case State.STARTED:
{
if (st.isCond(1))
{
htmltext = "30031-04.html";
@@ -112,9 +115,12 @@ public class Q00158_SeedOfEvil extends Quest
htmltext = "30031-05.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;
}

1
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java vendored
View File

@@ -174,7 +174,6 @@ public final class Q00160_NerupasRequest extends Quest
}
qs.setCond(4, true);
htmltext = "30152-01.html";
}
else if (hasQuestItems(player, NIGHTSHADE_LEAF))
{

17
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java vendored
View File

@@ -59,15 +59,20 @@ public class Q00161_FruitOfTheMotherTree extends Quest
switch (event)
{
case "30362-04.htm":
{
st.startQuest();
giveItems(player, ANDELLRIAS_LETTER, 1);
break;
}
case "30371-03.html":
{
break;
}
default:
{
htmltext = null;
break;
}
}
return htmltext;
}
@@ -81,12 +86,16 @@ public class Q00161_FruitOfTheMotherTree extends Quest
switch (npc.getId())
{
case ANDELLIA:
{
switch (st.getState())
{
case State.CREATED:
{
htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30362-03.htm" : "30362-02.htm" : "30362-01.htm";
break;
}
case State.STARTED:
{
if (st.isCond(1))
{
htmltext = "30362-05.html";
@@ -99,12 +108,17 @@ public class Q00161_FruitOfTheMotherTree extends Quest
htmltext = "30362-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}
case THALIA:
{
if (st.isStarted())
{
if (st.isCond(1) && hasQuestItems(player, ANDELLRIAS_LETTER))
@@ -120,6 +134,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest
}
}
break;
}
}
return htmltext;
}

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java vendored
View File

@@ -93,9 +93,12 @@ public class Q00170_DangerousSeduction extends Quest
switch (st.getState())
{
case State.CREATED:
{
htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LEVEL) ? "30305-01.htm" : "30305-02.htm" : "30305-03.htm";
break;
}
case State.STARTED:
{
if (st.isCond(1))
{
htmltext = "30305-05.html";
@@ -108,9 +111,12 @@ public class Q00170_DangerousSeduction extends Quest
htmltext = "30305-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;
}

4
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java vendored
View File

@@ -93,9 +93,12 @@ public class Q00277_GatekeepersOffering extends Quest
switch (st.getState())
{
case State.CREATED:
{
htmltext = "30576-02.htm";
break;
}
case State.STARTED:
{
if (st.isCond(1))
{
htmltext = "30576-04.html";
@@ -107,6 +110,7 @@ public class Q00277_GatekeepersOffering extends Quest
htmltext = "30576-05.html";
}
break;
}
}
return htmltext;
}

4
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java vendored
View File

@@ -93,9 +93,12 @@ public class Q00297_GatekeepersFavor extends Quest
switch (st.getState())
{
case State.CREATED:
{
htmltext = "30540-02.htm";
break;
}
case State.STARTED:
{
if (st.isCond(1))
{
htmltext = "30540-04.html";
@@ -107,6 +110,7 @@ public class Q00297_GatekeepersFavor extends Quest
htmltext = "30540-05.html";
}
break;
}
}
return htmltext;
}

19
L2J_Mobius_Classic_2.0_Saviors/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;
}
}
}
}