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

Changed item count to integer.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-05-04 11:12:58 +00:00
parent 7ab04da480
commit 5103871cce
155 changed files with 661 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/Giran/Alexandria/Alexandria.java vendored
View File

@@ -23,8 +23,8 @@ import java.util.Map;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import ai.AbstractNpcAI;
@@ -124,7 +124,7 @@ public class Alexandria extends AbstractNpcAI
{
private final int _additionalId;
AdditionalItemChanceHolder(int id, int chance, long count, int additionalId)
AdditionalItemChanceHolder(int id, int chance, int count, int additionalId)
{
super(id, chance, count);
_additionalId = additionalId;

6
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java vendored
View File

@@ -803,7 +803,7 @@ public class CastleChamberlain extends AbstractNpcAI
{
if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES))
{
final long amount = (st.hasMoreTokens()) ? Long.parseLong(st.nextToken()) : 0;
final int amount = (st.hasMoreTokens()) ? Integer.parseInt(st.nextToken()) : 0;
if ((amount > 0) && (amount < Inventory.MAX_ADENA))
{
if (player.getAdena() >= amount)
@@ -828,7 +828,7 @@ public class CastleChamberlain extends AbstractNpcAI
{
if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES))
{
final long amount = (st.hasMoreTokens()) ? Long.parseLong(st.nextToken()) : 0;
final int amount = (st.hasMoreTokens()) ? Integer.parseInt(st.nextToken()) : 0;
if (amount <= castle.getTreasury())
{
castle.addToTreasuryNoTax((-1) * amount);
@@ -1276,7 +1276,7 @@ public class CastleChamberlain extends AbstractNpcAI
final int ticketCount = castle.getTicketBuyCount();
if (ticketCount < (Config.SSQ_DAWN_TICKET_QUANTITY / Config.SSQ_DAWN_TICKET_BUNDLE))
{
final long totalCost = Config.SSQ_DAWN_TICKET_PRICE * Config.SSQ_DAWN_TICKET_BUNDLE;
final int totalCost = Config.SSQ_DAWN_TICKET_PRICE * Config.SSQ_DAWN_TICKET_BUNDLE;
if (player.getAdena() >= totalCost)
{
takeItems(player, Inventory.ADENA_ID, totalCost);

16
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java vendored
View File

@@ -87,9 +87,9 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
for (int i = 0; i < spotLeft; i++)
{
long counter = 0;
int counter = 0;
Clan clan = null;
for (Entry<Integer, Long> entry : _warDecreesCount.entrySet())
for (Entry<Integer, Integer> entry : _warDecreesCount.entrySet())
{
final Clan actingClan = ClanTable.getInstance().getClan(entry.getKey());
if ((actingClan == null) || (actingClan.getDissolvingExpiryTime() > 0))
@@ -98,7 +98,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
continue;
}
final long count = entry.getValue();
final int count = entry.getValue();
if (count > counter)
{
counter = count;
@@ -259,7 +259,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
private static final Skill[] DEBUFFS = {};
protected static Map<Integer, Long> _warDecreesCount = new HashMap<>();
protected static Map<Integer, Integer> _warDecreesCount = new HashMap<>();
protected static List<Clan> _acceptedClans = new ArrayList<>(4);
private static Map<String, List<Clan>> _usedTextPassages = new HashMap<>();
private static Map<Clan, Integer> _pendingItemToGet = new HashMap<>();
@@ -393,7 +393,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
}
else
{
final long count = warDecrees.getCount();
final int count = warDecrees.getCount();
_warDecreesCount.put(clan.getId(), count);
player.destroyItem("Rainbow Springs Registration", warDecrees, npc, true);
updateAttacker(clan.getId(), count, false);
@@ -832,7 +832,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
return false;
}
private void updateAttacker(int clanId, long count, boolean remove)
private void updateAttacker(int clanId, int count, boolean remove)
{
try (Connection con = DatabaseFactory.getConnection())
{
@@ -846,7 +846,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
{
statement = con.prepareStatement("INSERT INTO rainbowsprings_attacker_list VALUES (?,?)");
statement.setInt(1, clanId);
statement.setLong(2, count);
statement.setInt(2, count);
}
statement.execute();
statement.close();
@@ -867,7 +867,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
while (rset.next())
{
final int clanId = rset.getInt("clan_id");
final long count = rset.getLong("decrees_count");
final int count = rset.getInt("decrees_count");
_warDecreesCount.put(clanId, count);
}
rset.close();

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -266,7 +266,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
final StringTokenizer st = new StringTokenizer(params, " ");
int skillId = -1;
long price = -1;
int price = -1;
if (st.hasMoreTokens())
{

12
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java vendored
View File

@@ -59,7 +59,7 @@ public class AdminCreateItem implements IAdminCommandHandler
final String id = st.nextToken();
final int idval = Integer.parseInt(id);
final String num = st.nextToken();
final long numval = Long.parseLong(num);
final int numval = Integer.parseInt(num);
createItem(activeChar, activeChar, idval, numval);
}
else if (st.countTokens() == 1)
@@ -92,7 +92,7 @@ public class AdminCreateItem implements IAdminCommandHandler
if (idval > 0)
{
final String num = st.nextToken();
final long numval = Long.parseLong(num);
final int numval = Integer.parseInt(num);
createItem(activeChar, activeChar, idval, numval);
}
}
@@ -131,7 +131,7 @@ public class AdminCreateItem implements IAdminCommandHandler
final String id = st.nextToken();
final int idval = Integer.parseInt(id);
final String num = st.nextToken();
final long numval = Long.parseLong(num);
final int numval = Integer.parseInt(num);
createItem(activeChar, (Player) target, idval, numval);
}
else if (st.countTokens() == 1)
@@ -156,13 +156,13 @@ public class AdminCreateItem implements IAdminCommandHandler
final String val = command.substring(22);
final StringTokenizer st = new StringTokenizer(val);
int idval = 0;
long numval = 0;
int numval = 0;
if (st.countTokens() == 2)
{
final String id = st.nextToken();
idval = Integer.parseInt(id);
final String num = st.nextToken();
numval = Long.parseLong(num);
numval = Integer.parseInt(num);
}
else if (st.countTokens() == 1)
{
@@ -202,7 +202,7 @@ public class AdminCreateItem implements IAdminCommandHandler
return ADMIN_COMMANDS;
}
private void createItem(Player activeChar, Player target, int id, long num)
private void createItem(Player activeChar, Player target, int id, int num)
{
final ItemTemplate template = ItemTable.getInstance().getTemplate(id);
if (template == null)

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Festival.java vendored
View File

@@ -172,14 +172,14 @@ public class Festival implements IBypassHandler
player.sendMessage("You do not have any blood offerings to contribute.");
return true;
}
final long offeringScore = bloodOfferings.getCount() * SevenSignsFestival.FESTIVAL_OFFERING_VALUE;
final int offeringScore = bloodOfferings.getCount() * SevenSignsFestival.FESTIVAL_OFFERING_VALUE;
if (!player.destroyItem("SevenSigns", bloodOfferings, npc, false))
{
return true;
}
final boolean isHighestScore = SevenSignsFestival.getInstance().setFinalScore(player, npc.getFestivalOracle(), npc.getFestivalType(), offeringScore);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_CONTRIBUTION_SCORE_HAS_INCREASED_BY_S1);
sm.addLong(offeringScore);
sm.addInt(offeringScore);
player.sendPacket(sm);
if (isHighestScore)
{

10
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Loto.java vendored
View File

@@ -188,7 +188,7 @@ public class Loto implements IBypassHandler
return;
}
final long price = Config.ALT_LOTTERY_TICKET_PRICE;
final int price = Config.ALT_LOTTERY_TICKET_PRICE;
final int lotonumber = Lottery.getInstance().getId();
int enchant = 0;
int type2 = 0;
@@ -270,10 +270,10 @@ public class Loto implements IBypassHandler
{
message += numbers[i] + " ";
}
final long[] check = Lottery.getInstance().checkTicket(item);
final int[] check = Lottery.getInstance().checkTicket(item);
if (check[0] > 0)
{
switch ((int) check[0])
switch (check[0])
{
case 1:
{
@@ -320,13 +320,13 @@ public class Loto implements IBypassHandler
{
return;
}
final long[] check = Lottery.getInstance().checkTicket(item);
final int[] check = Lottery.getInstance().checkTicket(item);
sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
sm.addItemName(4442);
player.sendPacket(sm);
final long adena = check[1];
final int adena = check[1];
if (adena > 0)
{
player.addAdena("Loto", adena, npc, true);

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Observation.java vendored
View File

@@ -124,7 +124,7 @@ public class Observation implements IBypassHandler
}
final int[] locCost = LOCATIONS[param];
final Location loc = new Location(locCost[0], locCost[1], locCost[2]);
final long cost = locCost[3];
final int cost = locCost[3];
switch (_command)
{
@@ -154,7 +154,7 @@ public class Observation implements IBypassHandler
return false;
}
private void doObserve(Player player, Npc npc, Location pos, long cost)
private void doObserve(Player player, Npc npc, Location pos, int cost)
{
if (player.reduceAdena("Broadcast", cost, npc, true))
{

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java vendored
View File

@@ -90,7 +90,7 @@ public class RentPet implements IBypassHandler
}
int petId;
double price = 1;
int price = 1;
final int[] cost =
{
1800,
@@ -125,7 +125,7 @@ public class RentPet implements IBypassHandler
price *= cost[value - 1];
final int time = ridetime[value - 1];
if (!player.reduceAdena("Rent", (long) price, player.getLastFolkNPC(), true))
if (!player.reduceAdena("Rent", price, player.getLastFolkNPC(), true))
{
return;
}

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java vendored
View File

@@ -79,7 +79,7 @@ public class Harvesting extends AbstractEffect
{
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
sm.addItemName(item.getId());
sm.addLong(item.getCount());
sm.addInt(item.getCount());
}
player.sendPacket(sm);
@@ -96,7 +96,7 @@ public class Harvesting extends AbstractEffect
{
sm = new SystemMessage(SystemMessageId.C1_HARVESTED_S3_S2_S);
sm.addString(player.getName());
sm.addLong(item.getCount());
sm.addInt(item.getCount());
sm.addItemName(item.getId());
}
player.getParty().broadcastToPartyMembers(player, sm);

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java vendored
View File

@@ -111,7 +111,7 @@ public class RestorationRandom extends AbstractEffect
continue;
}
final long itemCount = (long) (item.getCount() * Config.RATE_EXTRACTABLE);
final int itemCount = (int) (item.getCount() * Config.RATE_EXTRACTABLE);
final ItemTemplate template = ItemTable.getInstance().getTemplate(item.getId());
if (template.isStackable())
{

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Give.java vendored
View File

@@ -53,14 +53,14 @@ public class Give implements ITelnetCommand
if (player != null)
{
final int itemId = Integer.parseInt(args[1]);
long amount = 1;
int amount = 1;
int enchanted = 0;
if (args.length > 2)
{
String token = args[2];
if (Util.isDigit(token))
{
amount = Long.parseLong(token);
amount = Integer.parseInt(token);
}
if (args.length > 3)
{

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java vendored
View File

@@ -90,7 +90,7 @@ public class Wedding implements IVoicedCommandHandler
final int partnerId = activeChar.getPartnerId();
final int coupleId = activeChar.getCoupleId();
long adenaAmount = 0;
int adenaAmount = 0;
if (activeChar.isMarried())
{
activeChar.sendMessage("You are now divorced.");

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java vendored
View File

@@ -279,7 +279,7 @@ public class Q00045_ToTalkingIsland extends Quest
final int cond = i.getId();
if (qs.isCond(cond))
{
final int itemId = (int) i.getCount();
final int itemId = i.getCount();
if (hasQuestItems(talker, itemId))
{
htmltext = npc.getId() + "-01.html";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java vendored
View File

@@ -279,7 +279,7 @@ public class Q00046_OnceMoreInTheArmsOfTheMotherTree extends Quest
final int cond = i.getId();
if (qs.isCond(cond))
{
final int itemId = (int) i.getCount();
final int itemId = i.getCount();
if (hasQuestItems(talker, itemId))
{
htmltext = npc.getId() + "-01.html";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java vendored
View File

@@ -279,7 +279,7 @@ public class Q00047_IntoTheDarkElvenForest extends Quest
final int cond = i.getId();
if (qs.isCond(cond))
{
final int itemId = (int) i.getCount();
final int itemId = i.getCount();
if (hasQuestItems(talker, itemId))
{
htmltext = npc.getId() + "-01.html";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java vendored
View File

@@ -279,7 +279,7 @@ public class Q00048_ToTheImmortalPlateau extends Quest
final int cond = i.getId();
if (qs.isCond(cond))
{
final int itemId = (int) i.getCount();
final int itemId = i.getCount();
if (hasQuestItems(talker, itemId))
{
htmltext = npc.getId() + "-01.html";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java vendored
View File

@@ -279,7 +279,7 @@ public class Q00049_TheRoadHome extends Quest
final int cond = i.getId();
if (qs.isCond(cond))
{
final int itemId = (int) i.getCount();
final int itemId = i.getCount();
if (hasQuestItems(talker, itemId))
{
htmltext = npc.getId() + "-01.html";

6
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java vendored
View File

@@ -40,7 +40,7 @@ public class Q00257_TheGuardIsBusy extends Quest
private final int _chance;
private final int _random;
public MobDrop(int random, int chance, int id, long count)
public MobDrop(int random, int chance, int id, int count)
{
super(id, count);
_random = random;
@@ -157,8 +157,8 @@ public class Q00257_TheGuardIsBusy extends Quest
{
if (hasAtLeastOneQuestItem(player, ORC_AMULET, ORC_NECKLACE, WEREWOLF_FANG))
{
final long amulets = getQuestItemsCount(player, ORC_AMULET);
final long common = getQuestItemsCount(player, ORC_NECKLACE, WEREWOLF_FANG);
final int amulets = getQuestItemsCount(player, ORC_AMULET);
final int common = getQuestItemsCount(player, ORC_NECKLACE, WEREWOLF_FANG);
giveAdena(player, ((amulets * 10) + (common * 20) + (((amulets + common) >= 10) ? 1000 : 0)), true);
takeItems(player, -1, ORC_AMULET, ORC_NECKLACE, WEREWOLF_FANG);
htmltext = "30039-07.html";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java vendored
View File

@@ -154,7 +154,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
{
if (hasQuestItems(player, SPIDER_SKIN))
{
final long skins = getQuestItemsCount(player, SPIDER_SKIN);
final int skins = getQuestItemsCount(player, SPIDER_SKIN);
giveAdena(player, (skins * SKIN_REWARD) + ((skins >= 10) ? SKIN_BONUS : 0), true);
takeItems(player, SPIDER_SKIN, -1);
htmltext = "30497-05.html";

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java vendored
View File

@@ -122,8 +122,8 @@ public class Q00260_OrcHunting extends Quest
{
if (hasAtLeastOneQuestItem(player, getRegisteredItemIds()))
{
final long amulets = getQuestItemsCount(player, ORC_AMULET);
final long necklaces = getQuestItemsCount(player, ORC_NECKLACE);
final int amulets = getQuestItemsCount(player, ORC_AMULET);
final int necklaces = getQuestItemsCount(player, ORC_NECKLACE);
giveAdena(player, ((amulets * 12) + (necklaces * 30) + ((amulets + necklaces) >= 10 ? 1000 : 0)), true);
takeItems(player, -1, getRegisteredItemIds());
htmltext = "30221-06.html";

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java vendored
View File

@@ -120,8 +120,8 @@ public class Q00263_OrcSubjugation extends Quest
{
if (hasAtLeastOneQuestItem(player, getRegisteredItemIds()))
{
final long amulets = getQuestItemsCount(player, ORC_AMULET);
final long necklaces = getQuestItemsCount(player, ORC_NECKLACE);
final int amulets = getQuestItemsCount(player, ORC_AMULET);
final int necklaces = getQuestItemsCount(player, ORC_NECKLACE);
giveAdena(player, ((amulets * 20) + (necklaces * 30) + ((amulets + necklaces) >= 10 ? 1100 : 0)), true);
takeItems(player, -1, getRegisteredItemIds());
htmltext = "30346-06.html";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java vendored
View File

@@ -117,7 +117,7 @@ public class Q00265_BondsOfSlavery extends Quest
{
if (hasQuestItems(player, IMP_SHACKLES))
{
final long shackles = getQuestItemsCount(player, IMP_SHACKLES);
final int shackles = getQuestItemsCount(player, IMP_SHACKLES);
giveAdena(player, (shackles * 12) + (shackles >= 10 ? 500 : 0), true);
takeItems(player, IMP_SHACKLES, -1);
htmltext = "30357-06.html";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java vendored
View File

@@ -109,7 +109,7 @@ public class Q00267_WrathOfVerdure extends Quest
{
if (hasQuestItems(player, GOBLIN_CLUB))
{
final long count = getQuestItemsCount(player, GOBLIN_CLUB);
final int count = getQuestItemsCount(player, GOBLIN_CLUB);
rewardItems(player, SILVERY_LEAF, count);
if (count >= 10)
{

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java vendored
View File

@@ -124,8 +124,8 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
{
if (hasAtLeastOneQuestItem(player, BLACK_SOULSTONE, RED_SOULSTONE))
{
final long black = getQuestItemsCount(player, BLACK_SOULSTONE);
final long red = getQuestItemsCount(player, RED_SOULSTONE);
final int black = getQuestItemsCount(player, BLACK_SOULSTONE);
final int red = getQuestItemsCount(player, RED_SOULSTONE);
giveAdena(player, (red * 10) + (black * 3) + ((red > 0) ? (((red + black) >= 10) ? 1800 : 0) : ((black >= 10) ? 1500 : 0)), true);
takeItems(player, -1, BLACK_SOULSTONE, RED_SOULSTONE);
htmltext = (red > 0) ? "30566-07.html" : "30566-06.html";

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java vendored
View File

@@ -120,10 +120,10 @@ public class Q00274_SkirmishWithTheWerewolves extends Quest
}
case 2:
{
final long heads = getQuestItemsCount(player, WEREWOLF_HEAD);
final int heads = getQuestItemsCount(player, WEREWOLF_HEAD);
if (heads >= 40)
{
final long totems = getQuestItemsCount(player, WEREWOLF_TOTEM);
final int totems = getQuestItemsCount(player, WEREWOLF_TOTEM);
giveAdena(player, (heads * 30) + (totems * 600) + 2300, true);
qs.exitQuest(true, true);
htmltext = (totems > 0) ? "30569-07.html" : "30569-06.html";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java vendored
View File

@@ -145,7 +145,7 @@ public class Q00275_DarkWingedSpies extends Quest
}
case 2:
{
final long count = getQuestItemsCount(talker, DARKWING_BAT_FANG);
final int count = getQuestItemsCount(talker, DARKWING_BAT_FANG);
if (count >= MAX_BAT_FANG_COUNT)
{
giveAdena(talker, count * FANG_PRICE, true);

8
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java vendored
View File

@@ -165,10 +165,10 @@ public class Q00292_BrigandsSweep extends Quest
}
else
{
final long necklaces = getQuestItemsCount(talker, GOBLIN_NECKLACE);
final long pendants = getQuestItemsCount(talker, GOBLIN_PENDANT);
final long lordPendants = getQuestItemsCount(talker, GOBLIN_LORD_PENDANT);
final long sum = necklaces + pendants + lordPendants;
final int necklaces = getQuestItemsCount(talker, GOBLIN_NECKLACE);
final int pendants = getQuestItemsCount(talker, GOBLIN_PENDANT);
final int lordPendants = getQuestItemsCount(talker, GOBLIN_LORD_PENDANT);
final int sum = necklaces + pendants + lordPendants;
if (sum > 0)
{
giveAdena(talker, (necklaces * 12) + (pendants * 36) + (lordPendants * 33) + (sum >= 10 ? 1000 : 0), true);

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java vendored
View File

@@ -144,8 +144,8 @@ public class Q00293_TheHiddenVeins extends Quest
{
if (hasAtLeastOneQuestItem(player, CHRYSOLITE_ORE, HIDDEN_ORE_MAP))
{
final long ores = getQuestItemsCount(player, CHRYSOLITE_ORE);
final long maps = getQuestItemsCount(player, HIDDEN_ORE_MAP);
final int ores = getQuestItemsCount(player, CHRYSOLITE_ORE);
final int maps = getQuestItemsCount(player, HIDDEN_ORE_MAP);
giveAdena(player, (ores * 5) + (maps * 500) + (((ores + maps) >= 10) ? 2000 : 0), true);
takeItems(player, -1, CHRYSOLITE_ORE, HIDDEN_ORE_MAP);
htmltext = (ores > 0) ? (maps > 0) ? "30535-10.html" : "30535-06.html" : "30535-09.html";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java vendored
View File

@@ -145,7 +145,7 @@ public class Q00296_TarantulasSpiderSilk extends Quest
{
if (npc.getId() == TRADER_MION)
{
final long silk = getQuestItemsCount(talker, TARANTULA_SPIDER_SILK);
final int silk = getQuestItemsCount(talker, TARANTULA_SPIDER_SILK);
if (silk >= 1)
{
giveAdena(talker, (silk * 30) + (silk >= 10 ? 2000 : 0), true);

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java vendored
View File

@@ -137,8 +137,8 @@ public class Q00306_CrystalOfFireAndIce extends Quest
{
if (hasAtLeastOneQuestItem(player, getRegisteredItemIds()))
{
final long flame = getQuestItemsCount(player, FLAME_SHARD);
final long ice = getQuestItemsCount(player, ICE_SHARD);
final int flame = getQuestItemsCount(player, FLAME_SHARD);
final int ice = getQuestItemsCount(player, ICE_SHARD);
giveAdena(player, ((flame * 40) + (ice * 40) + ((flame + ice) >= 10 ? 5000 : 0)), true);
takeItems(player, -1, getRegisteredItemIds());
htmltext = "30004-07.html";

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java vendored
View File

@@ -152,8 +152,8 @@ public class Q00316_DestroyPlagueCarriers extends Quest
{
if (hasAtLeastOneQuestItem(player, getRegisteredItemIds()))
{
final long wererars = getQuestItemsCount(player, WERERAT_FANG);
final long foulclaws = getQuestItemsCount(player, VAROOL_FOULCLAW_FANG);
final int wererars = getQuestItemsCount(player, WERERAT_FANG);
final int foulclaws = getQuestItemsCount(player, VAROOL_FOULCLAW_FANG);
giveAdena(player, ((wererars * 30) + (foulclaws * 10000) + ((wererars + foulclaws) >= 10 ? 5000 : 0)), true);
takeItems(player, -1, getRegisteredItemIds());
htmltext = "30155-07.html";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java vendored
View File

@@ -74,7 +74,7 @@ public class Q00317_CatchTheWind extends Quest
case "30361-08.html":
case "30361-09.html":
{
final long shardCount = getQuestItemsCount(player, WIND_SHARD);
final int shardCount = getQuestItemsCount(player, WIND_SHARD);
if (shardCount > 0)
{
giveAdena(player, ((shardCount * 40) + (shardCount >= 10 ? 2988 : 0)), true);

24
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java vendored
View File

@@ -133,19 +133,19 @@ public class Q00325_GrimCollector extends Quest
case "30434-06.html":
case "30434-07.html":
{
final long head = getQuestItemsCount(player, ZOMBIE_HEAD);
final long heart = getQuestItemsCount(player, ZOMBIE_HEART);
final long liver = getQuestItemsCount(player, ZOMBIE_LIVER);
final long skull = getQuestItemsCount(player, SKULL);
final long rib = getQuestItemsCount(player, RIB_BONE);
final long spine = getQuestItemsCount(player, SPINE);
final long arm = getQuestItemsCount(player, ARM_BONE);
final long thigh = getQuestItemsCount(player, THIGH_BONE);
final long complete = getQuestItemsCount(player, COMPLETE_SKELETON);
final long totalCount = (head + heart + liver + skull + rib + spine + arm + thigh + complete);
final int head = getQuestItemsCount(player, ZOMBIE_HEAD);
final int heart = getQuestItemsCount(player, ZOMBIE_HEART);
final int liver = getQuestItemsCount(player, ZOMBIE_LIVER);
final int skull = getQuestItemsCount(player, SKULL);
final int rib = getQuestItemsCount(player, RIB_BONE);
final int spine = getQuestItemsCount(player, SPINE);
final int arm = getQuestItemsCount(player, ARM_BONE);
final int thigh = getQuestItemsCount(player, THIGH_BONE);
final int complete = getQuestItemsCount(player, COMPLETE_SKELETON);
final int totalCount = (head + heart + liver + skull + rib + spine + arm + thigh + complete);
if (totalCount > 0)
{
long sum = ((head * 30) + (heart * 20) + (liver * 20) + (skull * 100) + (rib * 40) + (spine * 14) + (arm * 14) + (thigh * 14));
int sum = ((head * 30) + (heart * 20) + (liver * 20) + (skull * 100) + (rib * 40) + (spine * 14) + (arm * 14) + (thigh * 14));
if (totalCount >= 10)
{
sum += 1629;
@@ -171,7 +171,7 @@ public class Q00325_GrimCollector extends Quest
}
case "30434-09.html":
{
final long complete = getQuestItemsCount(player, COMPLETE_SKELETON);
final int complete = getQuestItemsCount(player, COMPLETE_SKELETON);
if (complete > 0)
{
giveAdena(player, ((complete * 341) + 543), true);

8
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java vendored
View File

@@ -124,10 +124,10 @@ public class Q00326_VanquishRemnants extends Quest
}
case State.STARTED:
{
final long red_badges = getQuestItemsCount(player, RED_CROSS_BADGE);
final long blue_badges = getQuestItemsCount(player, BLUE_CROSS_BADGE);
final long black_badges = getQuestItemsCount(player, BLACK_CROSS_BADGE);
final long sum = red_badges + blue_badges + black_badges;
final int red_badges = getQuestItemsCount(player, RED_CROSS_BADGE);
final int blue_badges = getQuestItemsCount(player, BLUE_CROSS_BADGE);
final int black_badges = getQuestItemsCount(player, BLACK_CROSS_BADGE);
final int sum = red_badges + blue_badges + black_badges;
if (sum > 0)
{
if ((sum >= 100) && !hasQuestItems(player, BLACK_LION_MARK))

6
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java vendored
View File

@@ -415,9 +415,9 @@ public class Q00327_RecoverTheFarmland extends Quest
else
{
html = "30597-05.html";
final long dogTags = getQuestItemsCount(player, TUREK_DOG_TAG);
final long medallions = getQuestItemsCount(player, TUREK_MEDALLION);
final long rewardCount = (dogTags * 40) + (medallions * 50) + (((dogTags + medallions) >= 10) ? 619 : 0);
final int dogTags = getQuestItemsCount(player, TUREK_DOG_TAG);
final int medallions = getQuestItemsCount(player, TUREK_MEDALLION);
final int rewardCount = (dogTags * 40) + (medallions * 50) + (((dogTags + medallions) >= 10) ? 619 : 0);
giveAdena(player, rewardCount, true);
takeItems(player, TUREK_DOG_TAG, -1);
takeItems(player, TUREK_MEDALLION, -1);

6
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java vendored
View File

@@ -109,9 +109,9 @@ public class Q00328_SenseForBusiness extends Quest
}
case State.STARTED:
{
final long carcass = getQuestItemsCount(player, MONSTER_EYE_CARCASS);
final long lens = getQuestItemsCount(player, MONSTER_EYE_LENS);
final long gizzards = getQuestItemsCount(player, BASILISK_GIZZARD);
final int carcass = getQuestItemsCount(player, MONSTER_EYE_CARCASS);
final int lens = getQuestItemsCount(player, MONSTER_EYE_LENS);
final int gizzards = getQuestItemsCount(player, BASILISK_GIZZARD);
if ((carcass + lens + gizzards) > 0)
{
giveAdena(player, ((carcass * MONSTER_EYE_CARCASS_ADENA) + (lens * MONSTER_EYE_LENS_ADENA) + (gizzards * BASILISK_GIZZARD_ADENA) + ((carcass + lens + gizzards) >= BONUS_COUNT ? BONUS : 0)), true);

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java vendored
View File

@@ -131,8 +131,8 @@ public class Q00329_CuriosityOfADwarf extends Quest
{
if (hasAtLeastOneQuestItem(player, getRegisteredItemIds()))
{
final long broken = getQuestItemsCount(player, BROKEN_HEARTSTONE);
final long golem = getQuestItemsCount(player, GOLEM_HEARTSTONE);
final int broken = getQuestItemsCount(player, BROKEN_HEARTSTONE);
final int golem = getQuestItemsCount(player, GOLEM_HEARTSTONE);
giveAdena(player, ((broken * 50) + (golem * 1000) + ((broken + golem) >= 10 ? 1183 : 0)), true);
takeItems(player, -1, getRegisteredItemIds());
htmltext = "30437-05.html";

6
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java vendored
View File

@@ -108,9 +108,9 @@ public class Q00331_ArrowOfVengeance extends Quest
}
case State.STARTED:
{
final long harpyFeathers = getQuestItemsCount(player, HARPY_FEATHER);
final long medusaVenoms = getQuestItemsCount(player, MEDUSA_VENOM);
final long wyrmsTeeth = getQuestItemsCount(player, WYRMS_TOOTH);
final int harpyFeathers = getQuestItemsCount(player, HARPY_FEATHER);
final int medusaVenoms = getQuestItemsCount(player, MEDUSA_VENOM);
final int wyrmsTeeth = getQuestItemsCount(player, WYRMS_TOOTH);
if ((harpyFeathers + medusaVenoms + wyrmsTeeth) > 0)
{
giveAdena(player, ((harpyFeathers * HARPY_FEATHER_ADENA) + (medusaVenoms * MEDUSA_VENOM_ADENA) + (wyrmsTeeth * WYRMS_TOOTH_ADENA) + ((harpyFeathers + medusaVenoms + wyrmsTeeth) >= BONUS_COUNT ? BONUS : 0)), true);

8
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java vendored
View File

@@ -1064,10 +1064,10 @@ public class Q00333_HuntOfTheBlackLion extends Quest
{
giveItems(player, LIONS_CLAW, 3);
}
final long ash = getQuestItemsCount(player, UNDEAD_ASH);
final long insignia = getQuestItemsCount(player, BLOODY_AXE_INSIGNIA);
final long fang = getQuestItemsCount(player, DELU_LIZARDMAN_FANG);
final long talon = getQuestItemsCount(player, STAKATO_TALON);
final int ash = getQuestItemsCount(player, UNDEAD_ASH);
final int insignia = getQuestItemsCount(player, BLOODY_AXE_INSIGNIA);
final int fang = getQuestItemsCount(player, DELU_LIZARDMAN_FANG);
final int talon = getQuestItemsCount(player, STAKATO_TALON);
giveAdena(player, ((ash * 35) + (insignia * 35) + ((fang + 35) + (talon * 35))), true);
takeItems(player, UNDEAD_ASH, -1);
takeItems(player, BLOODY_AXE_INSIGNIA, -1);

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java vendored
View File

@@ -114,7 +114,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
{
if (qs.isCond(1))
{
final long count = getQuestItemsCount(player, ARTICLES);
final int count = getQuestItemsCount(player, ARTICLES);
if (count < 1)
{
htmltext = "30754-07.html";

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java vendored
View File

@@ -103,7 +103,7 @@ public class Q00345_MethodToRaiseTheDead extends Quest
}
case "30971-03.html":
{
final long uselessBonePiecesCount = getQuestItemsCount(player, USELESS_BONE_PIECES);
final int uselessBonePiecesCount = getQuestItemsCount(player, USELESS_BONE_PIECES);
if (uselessBonePiecesCount > 0)
{
giveAdena(player, uselessBonePiecesCount * 104, true);
@@ -318,7 +318,7 @@ public class Q00345_MethodToRaiseTheDead extends Quest
case 8:
{
final int memoStateEx = qs.getMemoStateEx(1);
final long uselessBonePiecesCount = getQuestItemsCount(player, USELESS_BONE_PIECES);
final int uselessBonePiecesCount = getQuestItemsCount(player, USELESS_BONE_PIECES);
if ((memoStateEx == 1) || (memoStateEx == 2))
{
giveItems(player, BILL_OF_IASON_HEINE, 3);

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java vendored
View File

@@ -931,7 +931,7 @@ public class Q00348_AnArrogantSearch extends Quest
}
else
{
final long bloodedFabricCount = getQuestItemsCount(player, BLOODED_FABRIC);
final int bloodedFabricCount = getQuestItemsCount(player, BLOODED_FABRIC);
if (bloodedFabricCount >= 10)
{
htmltext = "30864-46.html";

6
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java vendored
View File

@@ -95,14 +95,14 @@ public class Q00351_BlackSwan extends Quest
}
case "30969-02.html":
{
final long lizardFangCount = getQuestItemsCount(player, LIZARD_FANG);
final int lizardFangCount = getQuestItemsCount(player, LIZARD_FANG);
if (lizardFangCount == 0)
{
htmltext = event;
}
else
{
final long adenaBonus = (lizardFangCount >= 10) ? 3880 : 0;
final int adenaBonus = (lizardFangCount >= 10) ? 3880 : 0;
giveAdena(player, adenaBonus + (20 * lizardFangCount), true);
takeItems(player, LIZARD_FANG, -1);
htmltext = "30969-04.html";
@@ -111,7 +111,7 @@ public class Q00351_BlackSwan extends Quest
}
case "30969-05.html":
{
final long barrelOfLeagueCount = getQuestItemsCount(player, BARREL_OF_LEAGUE);
final int barrelOfLeagueCount = getQuestItemsCount(player, BARREL_OF_LEAGUE);
if (barrelOfLeagueCount == 0)
{
htmltext = event;

18
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java vendored
View File

@@ -149,29 +149,29 @@ public class Q00352_HelpRoodRaiseANewPet extends Quest
}
else if (qs.isStarted())
{
final long LienrikEgg1Count = getQuestItemsCount(player, LIENRIK_EGG1);
final long LienrikEgg2Count = getQuestItemsCount(player, LIENRIK_EGG2);
if ((LienrikEgg1Count == 0) && (LienrikEgg2Count == 0))
final int lienrikEgg1Count = getQuestItemsCount(player, LIENRIK_EGG1);
final int lienrikEgg2Count = getQuestItemsCount(player, LIENRIK_EGG2);
if ((lienrikEgg1Count == 0) && (lienrikEgg2Count == 0))
{
htmltext = "31067-06.html";
}
else if ((LienrikEgg1Count >= 1) && (LienrikEgg2Count == 0))
else if ((lienrikEgg1Count >= 1) && (lienrikEgg2Count == 0))
{
if (LienrikEgg1Count >= 10)
if (lienrikEgg1Count >= 10)
{
giveAdena(player, (LienrikEgg1Count * 34) + 4000, true);
giveAdena(player, (lienrikEgg1Count * 34) + 4000, true);
}
else
{
giveAdena(player, (LienrikEgg1Count * 34) + 2000, true);
giveAdena(player, (lienrikEgg1Count * 34) + 2000, true);
}
takeItems(player, LIENRIK_EGG1, -1);
htmltext = "31067-10.html";
}
else if (LienrikEgg1Count >= 1)
else if (lienrikEgg1Count >= 1)
{
giveAdena(player, 4000 + ((LienrikEgg1Count * 34) + (LienrikEgg2Count * 1025)), true);
giveAdena(player, 4000 + ((lienrikEgg1Count * 34) + (lienrikEgg2Count * 1025)), true);
takeItems(player, LIENRIK_EGG1, -1);
takeItems(player, LIENRIK_EGG2, -1);
htmltext = "31067-11.html";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00353_PowerOfDarkness/Q00353_PowerOfDarkness.java vendored
View File

@@ -78,7 +78,7 @@ public class Q00353_PowerOfDarkness extends Quest
}
case State.STARTED:
{
final long stones = getQuestItemsCount(player, STONE);
final int stones = getQuestItemsCount(player, STONE);
if (stones == 0)
{
htmltext = "31044-05.htm";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java vendored
View File

@@ -88,7 +88,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
}
case "ADENA":
{
final long count = getQuestItemsCount(player, ALLIGATOR_TOOTH);
final int count = getQuestItemsCount(player, ALLIGATOR_TOOTH);
if (count >= 100)
{
giveAdena(player, (count * 220) + 10700, true);

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java vendored
View File

@@ -113,7 +113,7 @@ public class Q00355_FamilyHonor extends Quest
}
case "30181-06.html":
{
final long galfredoRomersBustCount = getQuestItemsCount(player, GALFREDO_ROMERS_BUST);
final int galfredoRomersBustCount = getQuestItemsCount(player, GALFREDO_ROMERS_BUST);
if (galfredoRomersBustCount < 1)
{
htmltext = event;
@@ -134,7 +134,7 @@ public class Q00355_FamilyHonor extends Quest
}
case "30181-10.html":
{
final long galfredoRomersBustCount = getQuestItemsCount(player, GALFREDO_ROMERS_BUST);
final int galfredoRomersBustCount = getQuestItemsCount(player, GALFREDO_ROMERS_BUST);
if (galfredoRomersBustCount > 0)
{
giveAdena(player, galfredoRomersBustCount * 120, true);

6
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java vendored
View File

@@ -83,10 +83,10 @@ public class Q00357_WarehouseKeepersAmbition extends Quest
}
case "30686-09.html":
{
final long crystalCount = getQuestItemsCount(player, JADE_CRYSTAL);
final int crystalCount = getQuestItemsCount(player, JADE_CRYSTAL);
if (crystalCount > 0)
{
long adenaReward = crystalCount * 425;
int adenaReward = crystalCount * 425;
if (crystalCount < 100)
{
adenaReward += 13500;
@@ -104,7 +104,7 @@ public class Q00357_WarehouseKeepersAmbition extends Quest
}
case "30686-11.html":
{
final long crystalCount = getQuestItemsCount(player, JADE_CRYSTAL);
final int crystalCount = getQuestItemsCount(player, JADE_CRYSTAL);
if (crystalCount > 0)
{
giveAdena(player, (crystalCount * 425) + ((crystalCount >= 100) ? 40500 : 0), true);

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java vendored
View File

@@ -138,8 +138,8 @@ public class Q00360_PlunderTheirSupplies extends Quest
}
case State.STARTED:
{
final long supplyCount = getQuestItemsCount(player, SUPPLY_ITEMS);
final long recipeCount = getQuestItemsCount(player, RECIPE_OF_SUPPLY);
final int supplyCount = getQuestItemsCount(player, SUPPLY_ITEMS);
final int recipeCount = getQuestItemsCount(player, RECIPE_OF_SUPPLY);
if (supplyCount == 0)
{
if (recipeCount == 0)

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java vendored
View File

@@ -224,7 +224,7 @@ public class Q00365_DevilsLegacy extends Quest
{
if (hasQuestItems(player, PIRATES_TREASURE_CHEST))
{
final long chestCount = getQuestItemsCount(player, PIRATES_TREASURE_CHEST);
final int chestCount = getQuestItemsCount(player, PIRATES_TREASURE_CHEST);
giveAdena(player, (chestCount * 400) + 19800, true);
takeItems(player, PIRATES_TREASURE_CHEST, -1);
htmltext = "30095-04.html";

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java vendored
View File

@@ -121,7 +121,7 @@ public class Q00366_SilverHairedShaman extends Quest
{
if (hasQuestItems(player, SAIRONS_SILVER_HAIR))
{
final long itemCount = getQuestItemsCount(player, SAIRONS_SILVER_HAIR);
final int itemCount = getQuestItemsCount(player, SAIRONS_SILVER_HAIR);
giveAdena(player, (itemCount * 500) + 29000, true);
takeItems(player, SAIRONS_SILVER_HAIR, -1);
htmltext = "30111-04.html";

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java vendored
View File

@@ -128,8 +128,8 @@ public class Q00368_TrespassingIntoTheHolyGround extends Quest
{
if (hasQuestItems(player, BLADE_STAKATO_FANG))
{
final long count = getQuestItemsCount(player, BLADE_STAKATO_FANG);
final long bonus = (count >= 10 ? 9450 : 2000);
final int count = getQuestItemsCount(player, BLADE_STAKATO_FANG);
final int bonus = (count >= 10 ? 9450 : 2000);
giveAdena(player, (count * 250) + bonus, true);
takeItems(player, BLADE_STAKATO_FANG, -1);
htmltext = "30926-04.html";

16
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java vendored
View File

@@ -167,19 +167,19 @@ public class Q00370_AnElderSowsSeeds extends Quest
return htmltext;
}
private final boolean exchangeChapters(Player player, boolean takeAllItems)
private boolean exchangeChapters(Player player, boolean takeAllItems)
{
final long waterChapters = getQuestItemsCount(player, CHAPTER_OF_WATER);
final long earthChapters = getQuestItemsCount(player, CHAPTER_OF_EARTH);
final long windChapters = getQuestItemsCount(player, CHAPTER_OF_WIND);
final long fireChapters = getQuestItemsCount(player, CHAPTER_OF_FIRE);
final long minCount = Util.min(waterChapters, earthChapters, windChapters, fireChapters);
final int waterChapters = getQuestItemsCount(player, CHAPTER_OF_WATER);
final int earthChapters = getQuestItemsCount(player, CHAPTER_OF_EARTH);
final int windChapters = getQuestItemsCount(player, CHAPTER_OF_WIND);
final int fireChapters = getQuestItemsCount(player, CHAPTER_OF_FIRE);
final int minCount = Util.min(waterChapters, earthChapters, windChapters, fireChapters);
if (minCount > 0)
{
giveAdena(player, minCount * 3600, true);
}
final long countToTake = (takeAllItems ? -1 : minCount);
takeItems(player, (int) countToTake, CHAPTER_OF_WATER, CHAPTER_OF_EARTH, CHAPTER_OF_WIND, CHAPTER_OF_FIRE);
final int countToTake = (takeAllItems ? -1 : minCount);
takeItems(player, countToTake, CHAPTER_OF_WATER, CHAPTER_OF_EARTH, CHAPTER_OF_WIND, CHAPTER_OF_FIRE);
return (minCount > 0);
}
}

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java vendored
View File

@@ -104,7 +104,7 @@ public class Q00371_ShrieksOfGhosts extends Quest
}
case "30867-05.html":
{
final long ancientAshUrnCount = getQuestItemsCount(player, ANCIENT_ASH_URN);
final int ancientAshUrnCount = getQuestItemsCount(player, ANCIENT_ASH_URN);
if (ancientAshUrnCount < 1)
{
htmltext = event;

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java vendored
View File

@@ -230,7 +230,7 @@ public class Q00378_GrandFeast extends Quest
takeItems(player, RITRONS_DESSERT_RECIPE, 1);
int item = 0;
int adena = 0;
long quantity = 0;
int quantity = 0;
switch (qs.getMemoStateEx(1))
{
case 11:

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java vendored
View File

@@ -136,7 +136,7 @@ public class Q00510_AClansPrestige extends Quest
}
else
{
final int count = (int) getQuestItemsCount(player, TYRANNOSAURUS_CLAW);
final int count = getQuestItemsCount(player, TYRANNOSAURUS_CLAW);
final int reward = (count < 10) ? (30 * count) : (59 + (30 * count));
playSound(player, QuestSound.ITEMSOUND_QUEST_FANFARE_1);
takeItems(player, TYRANNOSAURUS_CLAW, -1);

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java vendored
View File

@@ -104,7 +104,7 @@ public class Q00624_TheFinestIngredientsPart1 extends Quest
if ((partyMember != null) && partyMember.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
final int item = MONSTER_DROPS.get(npc.getId());
final long count = getQuestItemsCount(partyMember, item);
final int count = getQuestItemsCount(partyMember, item);
if ((count + 1) >= 50)
{
if (count < 50)

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java vendored
View File

@@ -145,8 +145,8 @@ public class Q00648_AnIceMerchantsDream extends Quest
{
if (qs.getCond() >= 1)
{
final long silverCryCount = getQuestItemsCount(player, SILVER_ICE_CRYSTAL);
final long blackCryCount = getQuestItemsCount(player, BLACK_ICE_CRYSTAL);
final int silverCryCount = getQuestItemsCount(player, SILVER_ICE_CRYSTAL);
final int blackCryCount = getQuestItemsCount(player, BLACK_ICE_CRYSTAL);
if ((silverCryCount + blackCryCount) > 0)
{
giveAdena(player, (silverCryCount * 300) + (blackCryCount * 1200), true);

4
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java vendored
View File

@@ -78,8 +78,8 @@ public class Q00659_IdRatherBeCollectingFairyBreath extends Quest
{
if (hasQuestItems(player, FAIRY_BREATH))
{
final long count = getQuestItemsCount(player, FAIRY_BREATH);
final long bonus = ((count >= 10) ? 5365 : 0);
final int count = getQuestItemsCount(player, FAIRY_BREATH);
final int bonus = ((count >= 10) ? 5365 : 0);
takeItems(player, FAIRY_BREATH, -1);
giveAdena(player, (count * 50) + bonus, true);
htmltext = "30634-05.html";

32
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java vendored
View File

@@ -131,7 +131,7 @@ public class Q00660_AidingTheFloranVillage extends Quest
}
case "30291-06.html":
{
final long itemCount = getQuestItemsCount(player, WATCHING_EYES) + getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD) + getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
final int itemCount = getQuestItemsCount(player, WATCHING_EYES) + getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD) + getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
if (itemCount > 0)
{
giveAdena(player, itemCount * 100, true);
@@ -153,10 +153,10 @@ public class Q00660_AidingTheFloranVillage extends Quest
}
case "30291-12.html":
{
final long itemCount1 = getQuestItemsCount(player, WATCHING_EYES);
final long itemCount2 = getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD);
final long itemCount3 = getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
final long itemCount = itemCount1 + itemCount2 + itemCount3;
final int itemCount1 = getQuestItemsCount(player, WATCHING_EYES);
final int itemCount2 = getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD);
final int itemCount3 = getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
final int itemCount = itemCount1 + itemCount2 + itemCount3;
if (itemCount < 100)
{
htmltext = "30291-11.html";
@@ -180,10 +180,10 @@ public class Q00660_AidingTheFloranVillage extends Quest
}
case "30291-16.html":
{
final long itemCount1 = getQuestItemsCount(player, WATCHING_EYES);
final long itemCount2 = getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD);
final long itemCount3 = getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
final long itemCount = itemCount1 + itemCount2 + itemCount3;
final int itemCount1 = getQuestItemsCount(player, WATCHING_EYES);
final int itemCount2 = getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD);
final int itemCount3 = getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
final int itemCount = itemCount1 + itemCount2 + itemCount3;
if (itemCount < 200)
{
htmltext = "30291-15.html";
@@ -214,10 +214,10 @@ public class Q00660_AidingTheFloranVillage extends Quest
}
case "30291-20.html":
{
final long itemCount1 = getQuestItemsCount(player, WATCHING_EYES);
final long itemCount2 = getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD);
final long itemCount3 = getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
final long itemCount = itemCount1 + itemCount2 + itemCount3;
final int itemCount1 = getQuestItemsCount(player, WATCHING_EYES);
final int itemCount2 = getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD);
final int itemCount3 = getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
final int itemCount = itemCount1 + itemCount2 + itemCount3;
if (itemCount < 500)
{
htmltext = "30291-19.html";
@@ -241,7 +241,7 @@ public class Q00660_AidingTheFloranVillage extends Quest
}
case "30291-22.html":
{
final long itemCount = getQuestItemsCount(player, WATCHING_EYES) + getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD) + getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
final int itemCount = getQuestItemsCount(player, WATCHING_EYES) + getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD) + getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
if (itemCount <= 0)
{
htmltext = "30291-23.html";
@@ -341,9 +341,9 @@ public class Q00660_AidingTheFloranVillage extends Quest
return htmltext;
}
private void tradeItems(Player player, long requiredValue, long itemCount1, long itemCount2, long itemCount3)
private void tradeItems(Player player, int requiredValue, int itemCount1, int itemCount2, int itemCount3)
{
long required = requiredValue;
int required = requiredValue;
if (itemCount1 < required)
{
takeItems(player, WATCHING_EYES, itemCount1);

8
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java vendored
View File

@@ -89,10 +89,10 @@ public class Q00661_MakingTheHarvestGroundsSafe extends Quest
}
case "30210-08.html":
{
final long stingCount = getQuestItemsCount(player, BIG_HORNET_STING);
final long gemCount = getQuestItemsCount(player, CLOUD_GEM);
final long clawCount = getQuestItemsCount(player, YOUNG_ARANEID_CLAW);
long reward = (57 * stingCount) + (56 * gemCount) + (60 * clawCount);
final int stingCount = getQuestItemsCount(player, BIG_HORNET_STING);
final int gemCount = getQuestItemsCount(player, CLOUD_GEM);
final int clawCount = getQuestItemsCount(player, YOUNG_ARANEID_CLAW);
int reward = (57 * stingCount) + (56 * gemCount) + (60 * clawCount);
if ((stingCount + gemCount + clawCount) >= 10)
{
reward += 5773;