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

Prohibit parameter assignments.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-05-10 03:29:34 +00:00
parent 2d73110d15
commit 33bbf97afb
1756 changed files with 12542 additions and 10025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java vendored
View File

@@ -55,13 +55,9 @@ public class Bernarde extends AbstractNpcAI
&& (player.getInventory().getInventoryItemCount(DARION_BADGE, -1, false) >= 5) //
&& player.exchangeItemsById("Quest", npc, DARION_BADGE, 5, HOLY_WATER, 1, true))
{
event = "32300-02b.htm";
return "32300-02b.htm";
}
else
{
event = "32300-02c.htm";
}
break;
return "32300-02c.htm";
}
case "Treasure":
{
@@ -71,13 +67,11 @@ public class Bernarde extends AbstractNpcAI
takeItems(player, TREASURE, -1);
return "32300-02d.htm";
}
event = "32300-02e.htm";
break;
return "32300-02e.htm";
}
case "rumors":
{
event = "32300-" + HellboundEngine.getInstance().getLevel() + "r.htm";
break;
return "32300-" + HellboundEngine.getInstance().getLevel() + "r.htm";
}
}
return event;

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java vendored
View File

@@ -106,11 +106,12 @@ public class DarkWaterDragon extends AbstractNpcAI
cancelQuestTimer("2", npc, null);
cancelQuestTimer("3", npc, null);
cancelQuestTimer("4", npc, null);
MY_TRACKING_SET.remove(npc.getObjectId());
player = ID_MAP.remove(npc.getObjectId());
if (player != null)
final PlayerInstance removed = ID_MAP.remove(npc.getObjectId());
if (removed != null)
{
((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), player);
((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), removed);
}
npc.deleteMe();

39
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java vendored
View File

@@ -359,6 +359,7 @@ public class Beleth extends AbstractNpcAI
{
_minions.clear();
Npc spawn;
int a = 0;
for (int i = 0; i < 16; i++)
{
@@ -366,12 +367,12 @@ public class Beleth extends AbstractNpcAI
final int x = (int) ((650 * Math.cos(i * 0.39)) + 16323);
final int y = (int) ((650 * Math.sin(i * 0.39)) + 213170);
npc = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
_minions.add(npc);
spawn = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
_minions.add(spawn);
if (a >= 2)
{
npc.setOverloaded(true);
spawn.setOverloaded(true);
a = 0;
}
}
@@ -382,33 +383,31 @@ public class Beleth extends AbstractNpcAI
{
xm[i] = (int) ((1700 * Math.cos((i * 1.57) + 0.78)) + 16323);
ym[i] = (int) ((1700 * Math.sin((i * 1.57) + 0.78)) + 213170);
npc = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
npc.setImmobilized(true);
_minions.add(npc);
spawn = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
spawn.setImmobilized(true);
_minions.add(spawn);
}
xm[4] = (xm[0] + xm[1]) / 2;
ym[4] = (ym[0] + ym[1]) / 2;
npc = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
npc.setImmobilized(true);
_minions.add(npc);
spawn = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
spawn.setImmobilized(true);
_minions.add(spawn);
xm[5] = (xm[1] + xm[2]) / 2;
ym[5] = (ym[1] + ym[2]) / 2;
npc = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
npc.setImmobilized(true);
_minions.add(npc);
spawn = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
spawn.setImmobilized(true);
_minions.add(spawn);
xm[6] = (xm[2] + xm[3]) / 2;
ym[6] = (ym[2] + ym[3]) / 2;
npc = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
npc.setImmobilized(true);
_minions.add(npc);
spawn = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
spawn.setImmobilized(true);
_minions.add(spawn);
xm[7] = (xm[3] + xm[0]) / 2;
ym[7] = (ym[3] + ym[0]) / 2;
npc = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
npc.setImmobilized(true);
_minions.add(npc);
spawn = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
spawn.setImmobilized(true);
_minions.add(spawn);
xm[8] = (xm[0] + xm[4]) / 2;
ym[8] = (ym[0] + ym[4]) / 2;
_minions.add(addSpawn(FAKE_BELETH, new Location(xm[8], ym[8], -9357, 49152)));

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/Survivor.java vendored
View File

@@ -50,7 +50,7 @@ public class Survivor extends AbstractNpcAI
{
if (player.getLevel() < MIN_LEVEL)
{
event = "32632-3.htm";
return "32632-3.htm";
}
else if (player.getAdena() < 150000)
{

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

@@ -919,8 +919,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
{
_nextSiege.cancel(true);
}
date -= 3600000;
setRegistrationEndString(date);
setRegistrationEndString(date - 3600000);
_nextSiege = ThreadPool.schedule(new SetFinalAttackers(), _rainbow.getNextSiegeTime());
}

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

@@ -57,8 +57,9 @@ public class AdminBuffs implements IAdminCommandHandler
private static final String FONT_RED2 = "</font>";
@Override
public boolean useAdminCommand(String command, PlayerInstance activeChar)
public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
{
String command = commandValue;
if (command.startsWith("admin_getbuffs"))
{
final StringTokenizer st = new StringTokenizer(command, " ");

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

@@ -993,8 +993,9 @@ public class AdminEditChar implements IAdminCommandHandler
activeChar.sendPacket(html);
}
private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
{
PlayerInstance player = targetPlayer;
if (player == null)
{
final WorldObject target = activeChar.getTarget();

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

@@ -101,8 +101,9 @@ public class AdminEffects implements IAdminCommandHandler
};
@Override
public boolean useAdminCommand(String command, PlayerInstance activeChar)
public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
{
String command = commandValue;
final StringTokenizer st = new StringTokenizer(command);
st.nextToken();

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

@@ -159,10 +159,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
private void handleShow(String params, PlayerInstance activeChar)
{
params = params.trim();
String trimmedParams = params.trim();
Creature npc1 = null;
Creature npc2 = null;
if (params.isEmpty())
if (trimmedParams.isEmpty())
{
npc1 = activeChar;
npc2 = (Creature) activeChar.getTarget();
@@ -176,7 +176,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
{
int mid1 = 0;
int mid2 = 0;
final StringTokenizer st = new StringTokenizer(params);
final StringTokenizer st = new StringTokenizer(trimmedParams);
mid1 = Integer.parseInt(st.nextToken());
mid2 = Integer.parseInt(st.nextToken());
npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -290,7 +290,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final StringBuilder replyMSG = new StringBuilder(1000);
replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
if (params.isEmpty())
if (trimmedParams.isEmpty())
{
replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
}
@@ -320,7 +320,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
replyMSG.append("</tr></table><center><br>");
if (params.isEmpty())
if (trimmedParams.isEmpty())
{
replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\" width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
}
@@ -333,7 +333,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
adminReply.setHtml(replyMSG.toString());
activeChar.sendPacket(adminReply);
if (params.length() != 0)
if (trimmedParams.length() != 0)
{
((MonsterInstance) npc1).deleteMe();
((MonsterInstance) npc2).deleteMe();

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

@@ -51,8 +51,9 @@ public class AdminFortSiege implements IAdminCommandHandler
};
@Override
public boolean useAdminCommand(String command, PlayerInstance activeChar)
public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
{
String command = commandValue;
final StringTokenizer st = new StringTokenizer(command, " ");
command = st.nextToken(); // Get actual command

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

@@ -37,9 +37,10 @@ public class AdminInstanceZone implements IAdminCommandHandler
};
@Override
public boolean useAdminCommand(String command, PlayerInstance activeChar)
public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
{
final String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target";
String command = commandValue;
GMAudit.auditGMAction(activeChar.getName(), command, target, "");
if (command.startsWith("admin_instancezone_clear"))
{

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

@@ -69,8 +69,9 @@ public class AdminSiege implements IAdminCommandHandler
};
@Override
public boolean useAdminCommand(String command, PlayerInstance activeChar)
public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
{
String command = commandValue;
final StringTokenizer st = new StringTokenizer(command, " ");
command = st.nextToken(); // Get actual command

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

@@ -82,8 +82,9 @@ public class AdminSkill implements IAdminCommandHandler
private static Skill[] adminSkills;
@Override
public boolean useAdminCommand(String command, PlayerInstance activeChar)
public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
{
String command = commandValue;
if (command.equals("admin_show_skills"))
{
showMainPage(activeChar);
@@ -277,9 +278,9 @@ public class AdminSkill implements IAdminCommandHandler
/**
* TODO: Externalize HTML
* @param activeChar the active Game Master.
* @param page
* @param pageValue
*/
private void removeSkillsPage(PlayerInstance activeChar, int page)
private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
{
final WorldObject target = activeChar.getTarget();
if ((target == null) || !target.isPlayer())
@@ -297,6 +298,7 @@ public class AdminSkill implements IAdminCommandHandler
maxPages++;
}
int page = pageValue;
if (page > maxPages)
{
page = maxPages;

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

@@ -470,7 +470,7 @@ public class AdminSpawn implements IAdminCommandHandler
}
}
private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
{
WorldObject target = activeChar.getTarget();
if (target == null)
@@ -479,6 +479,7 @@ public class AdminSpawn implements IAdminCommandHandler
}
NpcTemplate template;
String monsterId = monsterIdValue;
if (monsterId.matches("[0-9]*"))
{
// First parameter was an ID number
@@ -503,6 +504,8 @@ public class AdminSpawn implements IAdminCommandHandler
spawn.setAmount(mobCount);
spawn.setHeading(activeChar.getHeading());
spawn.setRespawnDelay(respawnTime);
boolean permanent = permanentValue;
if (activeChar.getInstanceId() > 0)
{
spawn.setInstanceId(activeChar.getInstanceId());

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

@@ -44,8 +44,9 @@ public class AdminTerritoryWar implements IAdminCommandHandler
};
@Override
public boolean useAdminCommand(String command, PlayerInstance activeChar)
public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
{
String command = commandValue;
final StringTokenizer st = new StringTokenizer(command);
command = st.nextToken();
if (command.equals("admin_territory_war"))

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -224,7 +224,7 @@ public class NpcViewMod implements IBypassHandler
return sb.toString();
}
private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
{
final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
if (dropList == null)
@@ -249,6 +249,7 @@ public class NpcViewMod implements IBypassHandler
pagesSb.append("</tr></table>");
}
int page = pageValue;
if (page >= pages)
{
page = pages - 1;

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java vendored
View File

@@ -78,7 +78,7 @@ public class RentPet implements IBypassHandler
return false;
}
public static void tryRentPet(PlayerInstance player, int value)
public static void tryRentPet(PlayerInstance player, int petValue)
{
if ((player == null) || player.hasSummon() || player.isMounted() || player.isRentedPet() || player.isTransformed() || player.isCursedWeaponEquipped())
{
@@ -106,6 +106,7 @@ public class RentPet implements IBypassHandler
1800
};
int value = petValue;
if (value > 10)
{
petId = 12526;

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java vendored
View File

@@ -42,7 +42,7 @@ public class ChatGeneral implements IChatHandler
};
@Override
public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
{
boolean vcdUsed = false;
if (text.startsWith("."))
@@ -50,6 +50,7 @@ public class ChatGeneral implements IChatHandler
final StringTokenizer st = new StringTokenizer(text);
final IVoicedCommandHandler vch;
String command = "";
String params = paramsValue;
if (st.countTokens() > 1)
{
command = st.nextToken().substring(1);

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/ClanBoard.java vendored
View File

@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
}
}
private void clanList(PlayerInstance player, int index)
private void clanList(PlayerInstance player, int indexValue)
{
int index = indexValue;
if (index < 1)
{
index = 1;

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java vendored
View File

@@ -36,8 +36,8 @@ public class AreaSummon implements ITargetTypeHandler
public WorldObject[] getTargetList(Skill skill, Creature creature, boolean onlyFirst, Creature target)
{
final List<Creature> targetList = new ArrayList<>();
target = creature.getSummon();
if ((target == null) || !target.isServitor() || target.isDead())
final Creature targetCreature = creature.getSummon();
if ((targetCreature == null) || !targetCreature.isServitor() || targetCreature.isDead())
{
return EMPTY_TARGET_LIST;
}
@@ -46,13 +46,13 @@ public class AreaSummon implements ITargetTypeHandler
{
return new Creature[]
{
target
targetCreature
};
}
final boolean srcInArena = (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE));
final int maxTargets = skill.getAffectLimit();
World.getInstance().forEachVisibleObjectInRange(target, Creature.class, skill.getAffectRange(), obj ->
World.getInstance().forEachVisibleObjectInRange(targetCreature, Creature.class, skill.getAffectRange(), obj ->
{
if (obj == creature)
{

75
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java vendored
View File

@@ -198,45 +198,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
case "DO_One":
{
qs.set("DO", "1");
event = "32122-4d.html";
break;
return "32122-4d.html";
}
case "MI_One":
{
qs.set("MI", "1");
event = "32122-4f.html";
break;
return "32122-4f.html";
}
case "FA_One":
{
qs.set("FA", "1");
event = "32122-4h.html";
break;
return "32122-4h.html";
}
case "SOL_One":
{
qs.set("SOL", "1");
event = "32122-4j.html";
break;
return "32122-4j.html";
}
case "FA2_One":
{
qs.set("FA2", "1");
if (qs.isCond(14) && (qs.getInt("DO") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("FA2") > 0))
{
event = "32122-4n.html";
qs.setCond(15, true);
}
else
{
event = "32122-4m.html";
qs.unset("DO");
qs.unset("MI");
qs.unset("FA");
qs.unset("SOL");
qs.unset("FA2");
return "32122-4n.html";
}
qs.unset("DO");
qs.unset("MI");
qs.unset("FA");
qs.unset("SOL");
qs.unset("FA2");
break;
return "32122-4m.html";
}
case "32122-4m.html":
{
@@ -250,45 +247,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
case "FA_Two":
{
qs.set("FA", "1");
event = "32122-5a.html";
break;
return "32122-5a.html";
}
case "SOL_Two":
{
qs.set("SOL", "1");
event = "32122-5c.html";
break;
return "32122-5c.html";
}
case "TI_Two":
{
qs.set("TI", "1");
event = "32122-5e.html";
break;
return "32122-5e.html";
}
case "SOL2_Two":
{
qs.set("SOL2", "1");
event = "32122-5g.html";
break;
return "32122-5g.html";
}
case "FA2_Two":
{
qs.set("FA2", "1");
if (qs.isCond(15) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("TI") > 0) && (qs.getInt("SOL2") > 0) && (qs.getInt("FA2") > 0))
{
event = "32122-5j.html";
qs.setCond(16, true);
}
else
{
event = "32122-5i.html";
qs.unset("FA");
qs.unset("SOL");
qs.unset("TI");
qs.unset("SOL2");
qs.unset("FA2");
return "32122-5j.html";
}
qs.unset("FA");
qs.unset("SOL");
qs.unset("TI");
qs.unset("SOL2");
qs.unset("FA2");
break;
return "32122-5i.html";
}
case "32122-5i.html":
{
@@ -302,45 +296,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
case "SOL_Three":
{
qs.set("SOL", "1");
event = "32122-6a.html";
break;
return "32122-6a.html";
}
case "FA_Three":
{
qs.set("FA", "1");
event = "32122-6c.html";
break;
return "32122-6c.html";
}
case "MI_Three":
{
qs.set("MI", "1");
event = "32122-6e.html";
break;
return "32122-6e.html";
}
case "FA2_Three":
{
qs.set("FA2", "1");
event = "32122-6g.html";
break;
return "32122-6g.html";
}
case "MI2_Three":
{
qs.set("MI2", "1");
if (qs.isCond(16) && (qs.getInt("SOL") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA2") > 0) && (qs.getInt("MI2") > 0))
{
event = "32122-6j.html";
qs.setCond(17, true);
}
else
{
event = "32122-6i.html";
qs.unset("SOL");
qs.unset("FA");
qs.unset("MI");
qs.unset("FA2");
qs.unset("MI2");
return "32122-6j.html";
}
qs.unset("SOL");
qs.unset("FA");
qs.unset("MI");
qs.unset("FA2");
qs.unset("MI2");
break;
return "32122-6i.html";
}
case "32122-6i.html":
{

14
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java vendored
View File

@@ -383,30 +383,32 @@ public class Q00384_WarehouseKeepersPastime extends Quest
private String fillBoard(QuestState qs, String html)
{
String result = html;
for (int i0 = 0; i0 < 9; i0 += 1)
{
final int i1 = getNumberFromBingoBoard(qs, i0);
if (isSelectedBingoNumber(qs, i1))
{
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
}
else
{
html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
}
}
return html;
return result;
}
private String colorBoard(QuestState qs, String html)
{
String result = html;
for (int i0 = 0; i0 < 9; i0 += 1)
{
final int i1 = getNumberFromBingoBoard(qs, i0);
html = html.replace("<?FontColor" + (i0 + 1) + "?>", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff");
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
result = result.replace("<?FontColor" + (i0 + 1) + "?>", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff");
result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
}
return html;
return result;
}
private String beforeReward(PlayerInstance player, QuestState qs, int num, int npcId)

14
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java vendored
View File

@@ -320,30 +320,32 @@ public class Q00386_StolenDignity extends Quest
private String fillBoard(QuestState qs, String html)
{
String result = html;
for (int i0 = 0; i0 < 9; i0 += 1)
{
final int i1 = getNumberFromBingoBoard(qs, i0);
if (isSelectedBingoNumber(qs, i1))
{
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
}
else
{
html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
}
}
return html;
return result;
}
private String colorBoard(QuestState qs, String html)
{
String result = html;
for (int i0 = 0; i0 < 9; i0 += 1)
{
final int i1 = getNumberFromBingoBoard(qs, i0);
html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
result = result.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
}
return html;
return result;
}
private String beforeReward(PlayerInstance player, QuestState qs, int num)

15
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java vendored
View File

@@ -260,7 +260,7 @@ public class Q00511_AwlUnderFoot extends Quest
return null;
}
protected String enterInstance(PlayerInstance player, int[] coords, FortDungeon dungeon, String ret)
protected String enterInstance(PlayerInstance player, int[] coords, FortDungeon dungeon, String retValue)
{
// check for existing instances for this player
InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
@@ -275,16 +275,19 @@ public class Q00511_AwlUnderFoot extends Quest
teleportPlayer(player, coords, world.getInstanceId());
return "";
}
// New instance
if (retValue != null)
{
return retValue;
}
final String ret = checkConditions(player);
if (ret != null)
{
return ret;
}
ret = checkConditions(player);
if (ret != null)
{
return ret;
}
final Party party = player.getParty();
world = new FAUWorld();
final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId());

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java vendored
View File

@@ -341,8 +341,9 @@ public class Q00660_AidingTheFloranVillage extends Quest
return htmltext;
}
private void tradeItems(PlayerInstance player, long required, long itemCount1, long itemCount2, long itemCount3)
private void tradeItems(PlayerInstance player, long requiredValue, long itemCount1, long itemCount2, long itemCount3)
{
long required = requiredValue;
if (itemCount1 < required)
{
takeItems(player, WATCHING_EYES, itemCount1);

14
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java vendored
View File

@@ -238,7 +238,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
return null;
}
protected String enterInstance(PlayerInstance player, String template, int[] coords, FortDungeon dungeon, String ret)
protected String enterInstance(PlayerInstance player, String template, int[] coords, FortDungeon dungeon, String retValue)
{
InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
if (world != null)
@@ -252,15 +252,17 @@ public class Q00726_LightWithinTheDarkness extends Quest
return "";
}
if (retValue != null)
{
return retValue;
}
final String ret = checkConditions(player);
if (ret != null)
{
return ret;
}
ret = checkConditions(player);
if (ret != null)
{
return ret;
}
final Party party = player.getParty();
world = new PAWORLD();
final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId());

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java vendored
View File

@@ -101,13 +101,9 @@ public class Q10272_LightFragment extends Quest
if (getQuestItemsCount(player, Inventory.ADENA_ID) >= 10000)
{
takeItems(player, Inventory.ADENA_ID, 10000);
event = "32566-05.html";
return "32566-05.html";
}
else
{
event = "32566-04a.html";
}
break;
return "32566-04a.html";
}
case "32567-04.html":
{
@@ -128,7 +124,7 @@ public class Q10272_LightFragment extends Quest
}
else
{
event = "32557-04.html";
return "32557-04.html";
}
break;
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java vendored
View File

@@ -93,7 +93,7 @@ public class DarkElfChange1 extends AbstractNpcAI
player.broadcastUserInfo();
}
}
event = npc.getId() + "-" + suffix + ".html";
return npc.getId() + "-" + suffix + ".html";
}
}
return event;

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java vendored
View File

@@ -112,7 +112,7 @@ public class DarkElfChange2 extends AbstractNpcAI
player.broadcastUserInfo();
}
}
event = "30474-" + suffix + ".html";
return "30474-" + suffix + ".html";
}
}
return event;