Unhardcoded Letter Collector rewards.

Thanks to Index.
This commit is contained in:
MobiusDevelopment
2022-06-09 15:59:40 +00:00
parent f41d29758e
commit 3000820cdb
42 changed files with 2956 additions and 1156 deletions

View File

@@ -16,22 +16,122 @@
*/
package events.LetterCollector;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import org.w3c.dom.Document;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.instancemanager.events.LetterCollectorManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.events.EventType;
import org.l2jmobius.gameserver.model.events.ListenerRegisterType;
import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
import org.l2jmobius.gameserver.network.serverpackets.ExLetterCollectorUI;
/**
* @author Mobius
*/
public class LetterCollector extends LongTimeEvent
public class LetterCollector extends LongTimeEvent implements IXmlReader
{
private LetterCollector()
{
if (isEventPeriod())
{
load();
LetterCollectorManager.getInstance().init();
}
}
public void reloadRewards()
{
LetterCollectorManager.getInstance().resetField();
load();
}
@Override
public synchronized void load()
{
parseDatapackFile("data/scripts/events/LetterCollector/rewards.xml");
}
@Override
public void parseDocument(Document doc, File f)
{
final AtomicInteger minimumLevel = new AtomicInteger();
final AtomicInteger maximumLevel = new AtomicInteger();
final Map<String, Integer> letters = new HashMap<>();
forEach(doc, "list", listNode ->
{
forEach(listNode, "params", paramNode ->
{
forEach(paramNode, "minimum", minimumLevelNode -> minimumLevel.set(new StatSet(parseAttributes(minimumLevelNode)).getInt("level")));
forEach(paramNode, "maximum", maximumLevelNode -> maximumLevel.set(new StatSet(parseAttributes(maximumLevelNode)).getInt("level")));
});
forEach(listNode, "letters", letterNode -> forEach(letterNode, "item", itemNode ->
{
StatSet letterSet = new StatSet(parseAttributes(itemNode));
letters.put(letterSet.getString("name"), letterSet.getInt("id"));
}));
forEach(listNode, "reward", rewardNode ->
{
final int id = new StatSet(parseAttributes(rewardNode)).getInt("id");
final AtomicReference<List<ItemHolder>> word = new AtomicReference<>(new ArrayList<>());
final AtomicReference<List<ItemChanceHolder>> rewards = new AtomicReference<>(new ArrayList<>());
AtomicBoolean needToSumAllChance = new AtomicBoolean(false);
AtomicReference<Double> chanceSum = new AtomicReference<>(0.0);
forEach(rewardNode, "word", wordNode ->
{
String[] letter = wordNode.getTextContent().trim().split(";");
for (String token : letter)
{
int count = 1;
for (ItemHolder check : word.get())
{
if (check.getId() == letters.get(token))
{
count = Math.toIntExact(check.getCount() + 1);
word.get().remove(check);
break;
}
}
word.get().add(new ItemHolder(letters.get(token), count));
}
});
forEach(rewardNode, "rewards", rewardsNode ->
{
needToSumAllChance.set(new StatSet(parseAttributes(rewardsNode)).getBoolean("sumChances"));
forEach(rewardsNode, "item", itemNode ->
{
StatSet itemSet = new StatSet(parseAttributes(itemNode));
final double chance = itemSet.getDouble("chance");
if (needToSumAllChance.get())
{
chanceSum.set(chanceSum.get() + chance);
}
rewards.get().add(new ItemChanceHolder(itemSet.getInt("id"), chance, itemSet.getLong("count"), (byte) itemSet.getInt("enchantLevel", 0)));
});
});
LetterCollectorManager lcm = LetterCollectorManager.getInstance();
lcm.addWords(id, word.get());
lcm.addRewards(id, new LetterCollectorManager.LetterCollectorRewardHolder(rewards.get(), chanceSum.get() == 0d ? 100d : chanceSum.get()));
lcm.setLetters(letters);
lcm.setMinLevel(minimumLevel.get());
lcm.setMaxLevel(maximumLevel.get());
});
});
}
@RegisterEvent(EventType.ON_PLAYER_LOGIN)
@@ -46,7 +146,7 @@ public class LetterCollector extends LongTimeEvent
final Player player = event.getPlayer();
if (player != null)
{
player.sendPacket(ExLetterCollectorUI.STATIC_PACKET);
player.sendPacket(new ExLetterCollectorUI(player));
}
}

View File

@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<event name="Letter Collector" active="30 06 2021-29 07 2029" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/eventConfig.xsd">
<!-- Minimum level (5) also set at ExLetterCollectorUI.java -->
<!-- Rewards and items set at ExLetterCollectorTakeReward.java -->
<droplist>
<add item="3875" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's A -->
<add item="3877" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's E -->

View File

@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="rewards.xsd">
<params>
<minimum level="5" />
<maximum level="-1" /> <!-- -1 = no limit -->
</params>
<letters>
<!-- name of letter, for using down / id of this letter -->
<item name="A" id="3875" />
<item name="E" id="3877" />
<item name="G" id="3879" />
<item name="I" id="3881" />
<item name="L" id="3882" />
<item name="N" id="3883" />
<item name="R" id="3885" />
<item name="M" id="34956" />
<item name="S" id="3886" />
<item name="T" id="3886" />
<item name="H" id="3880" />
<item name="II" id="3888" />
<item name="D" id="92021" />
<item name="K" id="93412" />
<item name="U" id="93413" />
</letters>
<!-- client id -->
<reward id="0">
<!-- split letter with ";" / LINEAGE II -> L;I;N;E;A;G;E;II -->
<word>L;I;N;E;A;G;E;II</word> <!-- LINEAGE II -->
<!-- sumChances - sum item chances cumulatively -->
<rewards sumChances="true">
<!-- item id; count; chance; / id="-1" = no reward -->
<item id="49683" count="1" chance="5" /> <!-- Talisman of Baium -->
<item id="91119" count="1" chance="5" /> <!-- Ignis' Necklace -->
<item id="91117" count="1" chance="5" /> <!-- Nebula's Necklace -->
<item id="91121" count="1" chance="5" /> <!-- Procella's Necklace -->
<item id="91123" count="1" chance="5" /> <!-- Petram's Necklace -->
<item id="91952" count="1" chance="5" /> <!-- Ring of Insolance -->
<item id="91953" count="1" chance="5" /> <!-- Dragon Valley's Earring -->
<item id="91035" count="1" chance="15" /> <!-- Water Spirit Ore -->
<item id="91036" count="1" chance="15" /> <!-- Fire Spirit Ore -->
<item id="91037" count="1" chance="15" /> <!-- Wind Spirit Ore -->
<item id="91038" count="1" chance="15" /> <!-- Earth Spirit Ore -->
<item id="91641" count="1" chance="30" /> <!-- Sayha's Blessing -->
<item id="49674" count="1" chance="30" /> <!-- XP Growth Scroll -->
<item id="90907" count="1" chance="30" /> <!-- Soulshot Ticket -->
<item id="91757" count="1" chance="30" /> <!-- Magic Lamp Charging Potion -->
<item id="91974" count="1" chance="30" /> <!-- HP Recovery Potion -->
<item id="3031" count="10" chance="30" /> <!-- Spirit Ore -->
</rewards>
</reward>
<reward id="1">
<word>D;E;A;T;H</word> <!-- DEATH -->
<rewards sumChances="true">
<item id="91012" count="1" chance="5" /> <!-- Top-grade A-grade Weapon Pack -->
<item id="93459" count="1" chance="5" /> <!-- A-grade Armor Pack - Majestic Equipment -->
<item id="93460" count="1" chance="5" /> <!-- A-grade Armor Pack - Equipment of Nightmare -->
<item id="93461" count="1" chance="5" /> <!-- A-grade Armor Pack - Tallum Equipment -->
<item id="93462" count="1" chance="5" /> <!-- A-grade Armor Pack - Dark Crystal Equipment -->
<item id="90015" count="1" chance="5" /> <!-- Top-grade Life Stone - Weapon -->
<item id="93100" count="1" chance="5" /> <!-- Mid-grade Life Stone Shield / Sigil -->
<item id="91938" count="1" chance="5" /> <!-- Primeval Isle's Time Stone -->
<item id="93699" count="1" chance="5" /> <!-- Charging Stone of Random Crafting - 1 charge -->
<item id="91641" count="1" chance="5" /> <!-- Sayha's Blessing -->
<item id="49674" count="1" chance="5" /> <!-- XP Growth Scroll -->
<item id="90907" count="1" chance="5" /> <!-- Soulshot Ticket -->
<item id="91757" count="1" chance="5" /> <!-- Magic Lamp Charging Potion -->
<item id="91974" count="10" chance="5" /> <!-- HP Recovery Potion -->
<item id="3031" count="10" chance="5" /> <!-- Spirit Ore -->
</rewards>
</reward>
<reward id="2">
<word>K;N;I;G;H;T</word> <!-- KNIGHT -->
<rewards sumChances="true">
<item id="93103" count="1" chance="5" /> <!-- Spellbook: Divine Beam -->
<item id="92401" count="1" chance="5" /> <!-- Spellbook: White Guardian -->
<item id="91945" count="1" chance="5" /> <!-- Book of Shadows -->
<item id="91944" count="1" chance="5" /> <!-- Book of Light -->
<item id="91943" count="1" chance="15" /> <!-- Crystal of Shadows -->
<item id="91942" count="1" chance="15" /> <!-- Crystal of Light -->
<item id="8619" count="1" chance="15" /> <!-- Buff Expansion Book Lv. 2 -->
<item id="8620" count="1" chance="15" /> <!-- Buff Expansion Book Lv. 3 -->
<item id="90045" count="1" chance="15" /> <!-- Magical Tablet -->
<item id="91641" count="1" chance="30" /> <!-- Sayha's Blessing -->
<item id="49674" count="1" chance="30" /> <!-- XP Growth Scroll -->
<item id="90907" count="5" chance="30" /> <!-- Soulshot Ticket -->
<item id="91757" count="1" chance="30" /> <!-- Magic Lamp Charging Potion -->
<item id="91974" count="10" chance="30" /> <!-- HP Recovery Potion -->
<item id="3031" count="10" chance="30" /> <!-- Spirit Ore -->
</rewards>
</reward>
<reward id="3">
<word>S;U;M;M;E;R</word> <!-- SUMMER -->
<rewards sumChances="true">
<item id="93976" count="1" chance="5" /> <!-- Blessed Scroll: Enchant A-grade Weapon -->
<item id="93977" count="1" chance="5" /> <!-- Blessed Scroll: Enchant A-grade Armor -->
<item id="729" count="1" chance="5" /> <!-- Scroll: Enchant A-grade Weapon -->
<item id="730" count="1" chance="5" /> <!-- Scroll: Enchant A-grade Armor -->
<item id="947" count="1" chance="5" /> <!-- Scroll: Enchant B-grade Weapon -->
<item id="948" count="1" chance="5" /> <!-- Scroll: Enchant B-grade Armor -->
<item id="91967" count="1" chance="5" /> <!-- Scroll: Enchant Dragon Valley's Earring -->
<item id="91966" count="1" chance="5" /> <!-- Scroll: Enchant Ring of Insolance -->
<item id="91641" count="1" chance="5" /> <!-- Sayha's Blessing -->
<item id="91780" count="1" chance="5" /> <!-- Battle Scroll -->
<item id="93486" count="1" chance="5" /> <!-- Combat Scroll -->
<item id="49674" count="1" chance="5" /> <!-- XP Growth Scroll -->
<item id="90907" count="1" chance="5" /> <!-- Soulshot Ticket -->
<item id="1538" count="1" chance="5" /> <!-- Improved Scroll of Escape -->
<item id="91757" count="1" chance="5" /> <!-- Magic Lamp Charging Potion -->
<item id="91974" count="10" chance="5" /> <!-- HP Recovery Potion -->
<item id="3031" count="10" chance="5" /> <!-- Spirit Ore -->
</rewards>
</reward>
</list>

View File

@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="list" type="listType"/>
<xs:complexType name="minimumType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:string" name="level"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:complexType name="maximumType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:string" name="level"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:complexType name="paramsType">
<xs:sequence>
<xs:element type="minimumType" name="minimum"/>
<xs:element type="maximumType" name="maximum"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="itemType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:string" name="name" use="optional"/>
<xs:attribute type="xs:string" name="id" use="optional"/>
<xs:attribute type="xs:string" name="count" use="optional"/>
<xs:attribute type="xs:string" name="chance" use="optional"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:complexType name="lettersType">
<xs:sequence>
<xs:element type="itemType" name="item" maxOccurs="unbounded" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="rewardsType">
<xs:sequence>
<xs:element type="itemType" name="item" maxOccurs="unbounded" minOccurs="0"/>
</xs:sequence>
<xs:attribute type="xs:string" name="sumChances"/>
</xs:complexType>
<xs:complexType name="rewardType">
<xs:sequence>
<xs:element type="xs:string" name="word"/>
<xs:element type="rewardsType" name="rewards"/>
</xs:sequence>
<xs:attribute type="xs:string" name="id"/>
</xs:complexType>
<xs:complexType name="listType">
<xs:sequence>
<xs:element type="paramsType" name="params"/>
<xs:element type="lettersType" name="letters"/>
<xs:element type="rewardType" name="reward" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:schema>

View File

@@ -0,0 +1,169 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.instancemanager.events;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
/**
* @author Index
*/
public class LetterCollectorManager
{
protected static final Logger LOGGER = Logger.getLogger(LetterCollectorManager.class.getName());
private final Map<Integer, LetterCollectorRewardHolder> _rewards = new HashMap<>();
private final Map<Integer, List<ItemHolder>> _words = new HashMap<>();
private final Map<String, Integer> _letter = new HashMap<>();
private final Map<Integer, Boolean> _needToSumAllChance = new HashMap<>();
private int _minLevel = 1;
private int _maxLevel = Config.PLAYER_MAXIMUM_LEVEL;
protected LetterCollectorManager()
{
}
public void init()
{
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _rewards.size() + " words.");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _letter.size() + " letters.");
}
public int getMinLevel()
{
return _minLevel;
}
public void setMinLevel(int minLevel)
{
_minLevel = minLevel;
}
public int getMaxLevel()
{
return _maxLevel;
}
public void setMaxLevel(int maxLevel)
{
if (maxLevel < 1)
{
_maxLevel = Config.PLAYER_MAXIMUM_LEVEL;
}
else
{
_maxLevel = maxLevel;
}
}
public LetterCollectorRewardHolder getRewards(int id)
{
return _rewards.get(id);
}
public List<ItemHolder> getWord(int id)
{
return _words.get(id);
}
public void setRewards(Map<Integer, LetterCollectorRewardHolder> rewards)
{
_rewards.putAll(rewards);
}
public void setWords(Map<Integer, List<ItemHolder>> words)
{
_words.putAll(words);
}
public void addRewards(int id, LetterCollectorRewardHolder rewards)
{
_rewards.put(id, rewards);
}
public void addWords(int id, List<ItemHolder> words)
{
_words.put(id, words);
}
public void resetField()
{
_minLevel = 1;
_rewards.clear();
_words.clear();
_needToSumAllChance.clear();
}
public void setLetters(Map<String, Integer> letters)
{
_letter.putAll(letters);
}
public Map<String, Integer> getLetters()
{
return _letter;
}
public void setNeedToSumAllChance(int id, boolean needToSumAllChance)
{
_needToSumAllChance.put(id, needToSumAllChance);
}
public boolean getNeedToSumAllChance(int id)
{
return _needToSumAllChance.get(id);
}
public static class LetterCollectorRewardHolder
{
final List<ItemChanceHolder> _rewards;
final double _chance;
public LetterCollectorRewardHolder(List<ItemChanceHolder> rewards, double chance)
{
_rewards = rewards;
_chance = chance;
}
public List<ItemChanceHolder> getRewards()
{
return _rewards;
}
public double getChance()
{
return _chance;
}
}
public static LetterCollectorManager getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final LetterCollectorManager INSTANCE = new LetterCollectorManager();
}
}

View File

@@ -16,114 +16,24 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.List;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.instancemanager.events.LetterCollectorManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* @author Index, Mobius
*/
public class ExLetterCollectorTakeReward implements IClientIncomingPacket
{
// Items
private static final int A = 3875;
private static final int E = 3877;
private static final int G = 3879;
private static final int I = 3881;
private static final int L = 3882;
private static final int N = 3883;
private static final int R = 3885;
private static final int M = 34956;
private static final int S = 3886;
private static final int T = 3886;
private static final int H = 3880;
private static final int II = 3888;
private static final int D = 92021;
private static final int K = 93412;
private static final int U = 93413;
// Rewards
private static final ItemChanceHolder[] LINEAGE_II_REWARDS =
{
new ItemChanceHolder(49683, 5, 1), // Talisman of Baium
new ItemChanceHolder(91119, 5, 1), // Ignis' Necklace
new ItemChanceHolder(91117, 5, 1), // Nebula's Necklace
new ItemChanceHolder(91121, 5, 1), // Procella's Necklace
new ItemChanceHolder(91123, 5, 1), // Petram's Necklace
new ItemChanceHolder(91952, 5, 1), // Ring of Insolance
new ItemChanceHolder(91953, 5, 1), // Dragon Valley's Earring
new ItemChanceHolder(91035, 15, 1), // Water Spirit Ore
new ItemChanceHolder(91036, 15, 1), // Fire Spirit Ore
new ItemChanceHolder(91037, 15, 1), // Wind Spirit Ore
new ItemChanceHolder(91038, 15, 1), // Earth Spirit Ore
new ItemChanceHolder(91641, 30, 1), // Sayha's Blessing
new ItemChanceHolder(49674, 30, 1), // XP Growth Scroll
new ItemChanceHolder(90907, 30, 5), // Soulshot Ticket
new ItemChanceHolder(91757, 30, 1), // Magic Lamp Charging Potion
new ItemChanceHolder(91974, 30, 10), // HP Recovery Potion
new ItemChanceHolder(3031, 30, 10), // Spirit Ore
};
private static final ItemChanceHolder[] DEATH_REWARDS =
{
new ItemChanceHolder(91012, 5, 1), // Top-grade A-grade Weapon Pack
new ItemChanceHolder(93459, 5, 1), // A-grade Armor Pack - Majestic Equipment
new ItemChanceHolder(93460, 5, 1), // A-grade Armor Pack - Equipment of Nightmare
new ItemChanceHolder(93461, 5, 1), // A-grade Armor Pack - Tallum Equipment
new ItemChanceHolder(93462, 5, 1), // A-grade Armor Pack - Dark Crystal Equipment
new ItemChanceHolder(90015, 15, 1), // Top-grade Life Stone - Weapon
new ItemChanceHolder(93100, 15, 1), // Mid-grade Life Stone Shield / Sigil
new ItemChanceHolder(91938, 15, 1), // Primeval Isle's Time Stone
new ItemChanceHolder(93699, 15, 1), // Charging Stone of Random Crafting - 1 charge
new ItemChanceHolder(91641, 30, 1), // Sayha's Blessing
new ItemChanceHolder(49674, 30, 1), // XP Growth Scroll
new ItemChanceHolder(90907, 30, 5), // Soulshot Ticket
new ItemChanceHolder(91757, 30, 1), // Magic Lamp Charging Potion
new ItemChanceHolder(91974, 30, 10), // HP Recovery Potion
new ItemChanceHolder(3031, 30, 10), // Spirit Ore
};
private static final ItemChanceHolder[] KNIGHT_REWARDS =
{
new ItemChanceHolder(93103, 5, 1), // Spellbook: Divine Beam
new ItemChanceHolder(92401, 5, 1), // Spellbook: White Guardian
new ItemChanceHolder(91945, 5, 1), // Book of Shadows
new ItemChanceHolder(91944, 5, 1), // Book of Light
new ItemChanceHolder(91943, 15, 1), // Crystal of Shadows
new ItemChanceHolder(91942, 15, 1), // Crystal of Light
new ItemChanceHolder(8619, 15, 1), // Buff Expansion Book Lv. 2
new ItemChanceHolder(8620, 15, 1), // Buff Expansion Book Lv. 3
new ItemChanceHolder(90045, 15, 1), // Magical Tablet
new ItemChanceHolder(91641, 30, 1), // Sayha's Blessing
new ItemChanceHolder(49674, 30, 1), // XP Growth Scroll
new ItemChanceHolder(90907, 30, 5), // Soulshot Ticket
new ItemChanceHolder(91757, 30, 1), // Magic Lamp Charging Potion
new ItemChanceHolder(91974, 30, 10), // HP Recovery Potion
new ItemChanceHolder(3031, 30, 10), // Spirit Ore
};
private static final ItemChanceHolder[] SUMMER_REWARDS =
{
new ItemChanceHolder(93976, 5, 1), // Blessed Scroll: Enchant A-grade Weapon
new ItemChanceHolder(93977, 5, 1), // Blessed Scroll: Enchant A-grade Armor
new ItemChanceHolder(729, 5, 1), // Scroll: Enchant A-grade Weapon
new ItemChanceHolder(730, 5, 1), // Scroll: Enchant A-grade Armor
new ItemChanceHolder(947, 15, 1), // Scroll: Enchant B-grade Weapon
new ItemChanceHolder(948, 15, 1), // Scroll: Enchant B-grade Armor
new ItemChanceHolder(91967, 15, 1), // Scroll: Enchant Dragon Valley's Earring
new ItemChanceHolder(91966, 15, 1), // Scroll: Enchant Ring of Insolance
new ItemChanceHolder(91641, 30, 1), // Sayha's Blessing
new ItemChanceHolder(91780, 30, 1), // Battle Scroll
new ItemChanceHolder(93486, 30, 1), // Combat Scroll
new ItemChanceHolder(49674, 30, 1), // XP Growth Scroll
new ItemChanceHolder(90907, 30, 5), // Soulshot Ticket
new ItemChanceHolder(1538, 30, 1), // Improved Scroll of Escape
new ItemChanceHolder(91757, 30, 1), // Magic Lamp Charging Potion
new ItemChanceHolder(91974, 30, 10), // HP Recovery Potion
new ItemChanceHolder(3031, 30, 10), // Spirit Ore
};
private int _wordId;
@Override
@@ -148,110 +58,53 @@ public class ExLetterCollectorTakeReward implements IClientIncomingPacket
return;
}
switch (_wordId)
final LetterCollectorManager.LetterCollectorRewardHolder lcrh = LetterCollectorManager.getInstance().getRewards(_wordId);
if (lcrh == null)
{
case 0:
return;
}
for (ItemHolder needLetter : LetterCollectorManager.getInstance().getWord(_wordId))
{
if (inventory.getInventoryItemCount(needLetter.getId(), -1) < needLetter.getCount())
{
if ((inventory.getInventoryItemCount(L, -1) < 1) || //
(inventory.getInventoryItemCount(I, -1) < 1) || //
(inventory.getInventoryItemCount(N, -1) < 1) || //
(inventory.getInventoryItemCount(E, -1) < 2) || //
(inventory.getInventoryItemCount(A, -1) < 1) || //
(inventory.getInventoryItemCount(G, -1) < 1) || //
(inventory.getInventoryItemCount(II, -1) < 1))
{
return;
}
player.destroyItemByItemId("LetterCollector", L, 1, player, true);
player.destroyItemByItemId("LetterCollector", I, 1, player, true);
player.destroyItemByItemId("LetterCollector", N, 1, player, true);
player.destroyItemByItemId("LetterCollector", E, 1, player, true);
player.destroyItemByItemId("LetterCollector", A, 1, player, true);
player.destroyItemByItemId("LetterCollector", G, 1, player, true);
player.destroyItemByItemId("LetterCollector", E, 1, player, true);
player.destroyItemByItemId("LetterCollector", II, 1, player, true);
player.addItem("LetterCollector", getRandomReward(LINEAGE_II_REWARDS), player, true);
break;
}
case 1:
{
if ((inventory.getInventoryItemCount(D, -1) < 1) || //
(inventory.getInventoryItemCount(E, -1) < 1) || //
(inventory.getInventoryItemCount(A, -1) < 1) || //
(inventory.getInventoryItemCount(T, -1) < 1) || //
(inventory.getInventoryItemCount(H, -1) < 1))
{
return;
}
player.destroyItemByItemId("LetterCollector", D, 1, player, true);
player.destroyItemByItemId("LetterCollector", E, 1, player, true);
player.destroyItemByItemId("LetterCollector", A, 1, player, true);
player.destroyItemByItemId("LetterCollector", T, 1, player, true);
player.destroyItemByItemId("LetterCollector", H, 1, player, true);
player.addItem("LetterCollector", getRandomReward(DEATH_REWARDS), player, true);
break;
}
case 2:
{
if ((inventory.getInventoryItemCount(K, -1) < 1) || //
(inventory.getInventoryItemCount(N, -1) < 1) || //
(inventory.getInventoryItemCount(I, -1) < 1) || //
(inventory.getInventoryItemCount(G, -1) < 1) || //
(inventory.getInventoryItemCount(H, -1) < 1) || //
(inventory.getInventoryItemCount(T, -1) < 1))
{
return;
}
player.destroyItemByItemId("LetterCollector", K, 1, player, true);
player.destroyItemByItemId("LetterCollector", N, 1, player, true);
player.destroyItemByItemId("LetterCollector", I, 1, player, true);
player.destroyItemByItemId("LetterCollector", G, 1, player, true);
player.destroyItemByItemId("LetterCollector", H, 1, player, true);
player.destroyItemByItemId("LetterCollector", T, 1, player, true);
player.addItem("LetterCollector", getRandomReward(KNIGHT_REWARDS), player, true);
break;
}
case 3:
{
if ((inventory.getInventoryItemCount(S, -1) < 1) || //
(inventory.getInventoryItemCount(U, -1) < 1) || //
(inventory.getInventoryItemCount(M, -1) < 2) || //
(inventory.getInventoryItemCount(E, -1) < 1) || //
(inventory.getInventoryItemCount(R, -1) < 1))
{
return;
}
player.destroyItemByItemId("LetterCollector", S, 1, player, true);
player.destroyItemByItemId("LetterCollector", U, 1, player, true);
player.destroyItemByItemId("LetterCollector", M, 1, player, true);
player.destroyItemByItemId("LetterCollector", M, 1, player, true);
player.destroyItemByItemId("LetterCollector", E, 1, player, true);
player.destroyItemByItemId("LetterCollector", R, 1, player, true);
player.addItem("LetterCollector", getRandomReward(SUMMER_REWARDS), player, true);
break;
return;
}
}
for (ItemHolder destroyLetter : LetterCollectorManager.getInstance().getWord(_wordId))
{
if (!player.destroyItemByItemId("LetterCollector", destroyLetter.getId(), destroyLetter.getCount(), player, true))
{
return;
}
}
final ItemHolder rewardItem = getRandomReward(lcrh.getRewards(), lcrh.getChance());
if (rewardItem == null)
{
player.sendPacket(new SystemMessage(SystemMessageId.NOTHING_HAPPENED));
return;
}
player.addItem("LetterCollector", rewardItem.getId(), rewardItem.getCount(), player, true);
}
private ItemChanceHolder getRandomReward(ItemChanceHolder[] rewards)
private ItemHolder getRandomReward(List<ItemChanceHolder> rewards, double holderChance)
{
ItemChanceHolder reward = null;
while (reward == null)
final double chance = Rnd.get(holderChance);
double itemChance = 0;
for (ItemChanceHolder rewardItem : rewards)
{
final ItemChanceHolder random = rewards[Rnd.get(rewards.length)];
if ((Rnd.get(100) < random.getChance()) && (ItemTable.getInstance().getTemplate(random.getId()) != null))
itemChance += rewardItem.getChance();
if (chance <= itemChance)
{
reward = random;
if (rewardItem.getId() == -1)
{
return null;
}
return rewardItem;
}
}
return reward;
return null;
}
}

View File

@@ -16,7 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.instancemanager.events.LetterCollectorManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
@@ -24,12 +27,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class ExLetterCollectorUI implements IClientOutgoingPacket
{
public static final ExLetterCollectorUI STATIC_PACKET = new ExLetterCollectorUI();
final int _minimumLevel;
private static final int LETTER_COLLECTOR_MIN_LEVEL = 5;
private ExLetterCollectorUI()
public ExLetterCollectorUI(Player player)
{
_minimumLevel = player.getLevel() <= LetterCollectorManager.getInstance().getMaxLevel() ? LetterCollectorManager.getInstance().getMinLevel() : Config.PLAYER_MAXIMUM_LEVEL;
}
@Override
@@ -37,7 +39,7 @@ public class ExLetterCollectorUI implements IClientOutgoingPacket
{
OutgoingPackets.EX_LETTER_COLLECTOR_UI_LAUNCHER.writeId(packet);
packet.writeC(1); // enabled (0x00 - no, 0x01 -yes)
packet.writeD(LETTER_COLLECTOR_MIN_LEVEL); // Minimum Level
packet.writeD(_minimumLevel); // Minimum Level
return true;
}
}