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

Siege skill related additions.

Browse Source 
Thanks to dontknowdontcare.
This commit is contained in:
MobiusDevelopment 2022-08-07 00:49:34 +00:00
parent f2dbf81567
commit 44af95d071
225 changed files with 3151 additions and 1586 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java vendored
View File

@ -94,7 +94,7 @@ public class SkillConditionMasterHandler
SkillConditionHandler.getInstance().registerHandler("OpHaveSummon", OpHaveSummonSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHaveSummonedNpc", OpHaveSummonedNpcSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHome", OpHomeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiegeTime", OpInSiegeTimeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiege", OpInSiegeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInstantzone", OpInstantzoneSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpMainjob", OpMainjobSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpNeedAgathion", OpNeedAgathionSkillCondition::new);

6
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java vendored
View File

@ -33,12 +33,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class OpCheckResidenceSkillCondition implements ISkillCondition
{
private final Set<Integer> _residencesId = new HashSet<>();
private final Set<Integer> _residenceIds = new HashSet<>();
private final boolean _isWithin;
public OpCheckResidenceSkillCondition(StatSet params)
{
_residencesId.addAll(params.getList("residencesId", Integer.class));
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
_isWithin = params.getBoolean("isWithin");
}
@ -53,7 +53,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition
final ClanHall clanHall = ClanHallData.getInstance().getClanHallByClan(clan);
if (clanHall != null)
{
return _isWithin ? _residencesId.contains(clanHall.getResidenceId()) : !_residencesId.contains(clanHall.getResidenceId());
return _isWithin ? _residenceIds.contains(clanHall.getResidenceId()) : !_residenceIds.contains(clanHall.getResidenceId());
}
}
}

75
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeSkillCondition.java vendored Normal file
View File

@ -0,0 +1,75 @@
/*
* 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 handlers.skillconditionhandlers;
import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.siege.FortSiege;
import org.l2jmobius.gameserver.model.siege.Siege;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
/**
* @author dontknowdontcare
*/
public class OpInSiegeSkillCondition implements ISkillCondition
{
private final Set<Integer> _residenceIds = new HashSet<>();
public OpInSiegeSkillCondition(StatSet params)
{
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
for (int id : _residenceIds)
{
if (valid(caster, id))
{
return true;
}
}
return false;
}
private boolean valid(Creature caster, int id)
{
final FortSiege fortSiege = FortSiegeManager.getInstance().getSiege(id);
if (fortSiege != null)
{
return fortSiege.isInProgress() && fortSiege.getFort().getZone().isInsideZone(caster);
}
final Siege castleSiege = SiegeManager.getInstance().getSiege(id);
if (castleSiege != null)
{
return castleSiege.isInProgress() && castleSiege.getCastle().getZone().isInsideZone(caster);
}
// TODO: Check for clan hall siege
return false;
}
}

40
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java vendored
View File

@ -1,40 +0,0 @@
/*
* 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 handlers.skillconditionhandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.zone.ZoneId;
/**
* @author Mobius
*/
public class OpInSiegeTimeSkillCondition implements ISkillCondition
{
public OpInSiegeTimeSkillCondition(StatSet params)
{
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return caster.isInsideZone(ZoneId.SIEGE);
}
}

4
L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@ -661,7 +661,7 @@
<conditions>
<condition name="CanSummonPet" />
<condition name="OpCheckResidence">
<residencesId>
<residenceIds>
<item>36</item>
<item>37</item>
<item>38</item>
@ -675,7 +675,7 @@
<item>55</item>
<item>56</item>
<item>57</item>
</residencesId>
</residenceIds>
<isWithin>false</isWithin>
</condition>
</conditions>

39
L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/15200-15299.xml vendored
View File

@ -1559,10 +1559,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>64</time>
<condition name="OpInSiege">
<residenceIds>
<item>64</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33767</npcId> <!-- Jacquard -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15284" toLevel="1" name="Summon Brakel">
<!-- Summons Brakel, the Herald from the Fortress of Resistance. The Clan Hall Siege for the contestable Fortress of Resistance runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Brakel teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1576,10 +1585,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>21</time>
<condition name="OpInSiege">
<residenceIds>
<item>21</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33769</npcId> <!-- Brakel -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15285" toLevel="1" name="Summon Loken">
<!-- Summons Loken, the Herald from Devastated Castle. The Clan Hall Siege for the contestable Devastated Castle runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Loken teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1593,10 +1611,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>34</time>
<condition name="OpInSiege">
<residenceIds>
<item>34</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33771</npcId> <!-- Loken -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15286" toLevel="1" name="Blood Siphon Master">
<!-- Steals a large portion of the target's HP. -->

2
L2J_Mobius_01.0_Ertheia/dist/game/data/xsd/skills.xsd vendored
View File

@ -486,7 +486,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="isFemale" type="xs:boolean" />
<xs:element minOccurs="0" name="residencesId">
<xs:element minOccurs="0" name="residenceIds">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="item" type="xs:unsignedByte" />

11
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -184,10 +184,9 @@ public class SkillData implements IXmlReader
/**
* @param addNoble
* @param hasCastle
* @return an array with siege skills. If addNoble == true, will add also Advanced headquarters.
*/
public List<Skill> getSiegeSkills(boolean addNoble, boolean hasCastle)
public List<Skill> getSiegeSkills(boolean addNoble)
{
final List<Skill> temp = new LinkedList<>();
temp.add(_skills.get(getSkillHashCode(CommonSkill.IMPRIT_OF_LIGHT.getId(), 1)));
@ -197,11 +196,9 @@ public class SkillData implements IXmlReader
{
temp.add(_skills.get(getSkillHashCode(326, 1))); // Build Advanced Headquarters
}
if (hasCastle)
{
temp.add(_skills.get(getSkillHashCode(844, 1))); // Outpost Construction
temp.add(_skills.get(getSkillHashCode(845, 1))); // Outpost Demolition
}
temp.add(_skills.get(getSkillHashCode(15283, 1))); // Summon Jacquard
temp.add(_skills.get(getSkillHashCode(15284, 1))); // Summon Brakel
temp.add(_skills.get(getSkillHashCode(15285, 1))); // Summon Loken
return temp;
}

18
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
View File

@ -22,6 +22,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -60,7 +61,7 @@ public class FortSiegeManager
private int _siegeLength = 60; // Time in minute. Changeable in fortsiege.properties
private int _countDownLength = 10; // Time in minute. Changeable in fortsiege.properties
private int _suspiciousMerchantRespawnDelay = 180; // Time in minute. Changeable in fortsiege.properties
private List<FortSiege> _sieges;
private final Map<Integer, FortSiege> _sieges = new ConcurrentHashMap<>();
protected FortSiegeManager()
{
@ -255,18 +256,19 @@ public class FortSiegeManager
return _countDownLength;
}
public List<FortSiege> getSieges()
public Collection<FortSiege> getSieges()
{
if (_sieges == null)
{
_sieges = new CopyOnWriteArrayList<>();
}
return _sieges;
return _sieges.values();
}
public FortSiege getSiege(int fortId)
{
return _sieges.get(fortId);
}
public void addSiege(FortSiege fortSiege)
{
getSieges().add(fortSiege);
_sieges.put(fortSiege.getFort().getResidenceId(), fortSiege);
}
public boolean isCombat(int itemId)

19
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@ -20,6 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@ -64,7 +65,7 @@ public class SiegeManager
public void addSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.isNoble(), character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.isNoble()))
{
character.addSkill(sk, false);
}
@ -110,7 +111,7 @@ public class SiegeManager
public void removeSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.isNoble(), character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.isNoble()))
{
character.removeSkill(sk);
}
@ -263,7 +264,7 @@ public class SiegeManager
return _bloodAllianceReward;
}
public List<Siege> getSieges()
public Collection<Siege> getSieges()
{
final List<Siege> sieges = new LinkedList<>();
for (Castle castle : CastleManager.getInstance().getCastles())
@ -273,6 +274,18 @@ public class SiegeManager
return sieges;
}
public Siege getSiege(int castleId)
{
for (Castle castle : CastleManager.getInstance().getCastles())
{
if (castle.getResidenceId() == castleId)
{
return castle.getSiege();
}
}
return null;
}
private void loadTrapUpgrade(int castleId)
{
try (Connection con = DatabaseFactory.getConnection();

2
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java vendored
View File

@ -94,7 +94,7 @@ public class SkillConditionMasterHandler
SkillConditionHandler.getInstance().registerHandler("OpHaveSummon", OpHaveSummonSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHaveSummonedNpc", OpHaveSummonedNpcSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHome", OpHomeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiegeTime", OpInSiegeTimeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiege", OpInSiegeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInstantzone", OpInstantzoneSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpMainjob", OpMainjobSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpNeedAgathion", OpNeedAgathionSkillCondition::new);

6
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java vendored
View File

@ -33,12 +33,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class OpCheckResidenceSkillCondition implements ISkillCondition
{
private final Set<Integer> _residencesId = new HashSet<>();
private final Set<Integer> _residenceIds = new HashSet<>();
private final boolean _isWithin;
public OpCheckResidenceSkillCondition(StatSet params)
{
_residencesId.addAll(params.getList("residencesId", Integer.class));
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
_isWithin = params.getBoolean("isWithin");
}
@ -53,7 +53,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition
final ClanHall clanHall = ClanHallData.getInstance().getClanHallByClan(clan);
if (clanHall != null)
{
return _isWithin ? _residencesId.contains(clanHall.getResidenceId()) : !_residencesId.contains(clanHall.getResidenceId());
return _isWithin ? _residenceIds.contains(clanHall.getResidenceId()) : !_residenceIds.contains(clanHall.getResidenceId());
}
}
}

75
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeSkillCondition.java vendored Normal file
View File

@ -0,0 +1,75 @@
/*
* 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 handlers.skillconditionhandlers;
import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.siege.FortSiege;
import org.l2jmobius.gameserver.model.siege.Siege;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
/**
* @author dontknowdontcare
*/
public class OpInSiegeSkillCondition implements ISkillCondition
{
private final Set<Integer> _residenceIds = new HashSet<>();
public OpInSiegeSkillCondition(StatSet params)
{
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
for (int id : _residenceIds)
{
if (valid(caster, id))
{
return true;
}
}
return false;
}
private boolean valid(Creature caster, int id)
{
final FortSiege fortSiege = FortSiegeManager.getInstance().getSiege(id);
if (fortSiege != null)
{
return fortSiege.isInProgress() && fortSiege.getFort().getZone().isInsideZone(caster);
}
final Siege castleSiege = SiegeManager.getInstance().getSiege(id);
if (castleSiege != null)
{
return castleSiege.isInProgress() && castleSiege.getCastle().getZone().isInsideZone(caster);
}
// TODO: Check for clan hall siege
return false;
}
}

40
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java vendored
View File

@ -1,40 +0,0 @@
/*
* 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 handlers.skillconditionhandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.zone.ZoneId;
/**
* @author Mobius
*/
public class OpInSiegeTimeSkillCondition implements ISkillCondition
{
public OpInSiegeTimeSkillCondition(StatSet params)
{
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return caster.isInsideZone(ZoneId.SIEGE);
}
}

4
L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@ -658,7 +658,7 @@
<conditions>
<condition name="CanSummonPet" />
<condition name="OpCheckResidence">
<residencesId>
<residenceIds>
<item>36</item>
<item>37</item>
<item>38</item>
@ -672,7 +672,7 @@
<item>55</item>
<item>56</item>
<item>57</item>
</residencesId>
</residenceIds>
<isWithin>false</isWithin>
</condition>
</conditions>

39
L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/15200-15299.xml vendored
View File

@ -1559,10 +1559,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>64</time>
<condition name="OpInSiege">
<residenceIds>
<item>64</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33767</npcId> <!-- Jacquard -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15284" toLevel="1" name="Summon Brakel">
<!-- Summons Brakel, the Herald from the Fortress of Resistance. The Clan Hall Siege for the contestable Fortress of Resistance runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Brakel teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1576,10 +1585,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>21</time>
<condition name="OpInSiege">
<residenceIds>
<item>21</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33769</npcId> <!-- Brakel -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15285" toLevel="1" name="Summon Loken">
<!-- Summons Loken, the Herald from Devastated Castle. The Clan Hall Siege for the contestable Devastated Castle runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Loken teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1593,10 +1611,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>34</time>
<condition name="OpInSiege">
<residenceIds>
<item>34</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33771</npcId> <!-- Loken -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15286" toLevel="1" name="Blood Siphon Master">
<!-- Steals a large portion of the target's HP. -->

2
L2J_Mobius_02.5_Underground/dist/game/data/xsd/skills.xsd vendored
View File

@ -490,7 +490,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="isFemale" type="xs:boolean" />
<xs:element minOccurs="0" name="residencesId">
<xs:element minOccurs="0" name="residenceIds">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="item" type="xs:unsignedByte" />

11
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -184,10 +184,9 @@ public class SkillData implements IXmlReader
/**
* @param addNoble
* @param hasCastle
* @return an array with siege skills. If addNoble == true, will add also Advanced headquarters.
*/
public List<Skill> getSiegeSkills(boolean addNoble, boolean hasCastle)
public List<Skill> getSiegeSkills(boolean addNoble)
{
final List<Skill> temp = new LinkedList<>();
temp.add(_skills.get(getSkillHashCode(CommonSkill.IMPRIT_OF_LIGHT.getId(), 1)));
@ -197,11 +196,9 @@ public class SkillData implements IXmlReader
{
temp.add(_skills.get(getSkillHashCode(326, 1))); // Build Advanced Headquarters
}
if (hasCastle)
{
temp.add(_skills.get(getSkillHashCode(844, 1))); // Outpost Construction
temp.add(_skills.get(getSkillHashCode(845, 1))); // Outpost Demolition
}
temp.add(_skills.get(getSkillHashCode(15283, 1))); // Summon Jacquard
temp.add(_skills.get(getSkillHashCode(15284, 1))); // Summon Brakel
temp.add(_skills.get(getSkillHashCode(15285, 1))); // Summon Loken
return temp;
}

18
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
View File

@ -22,6 +22,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -60,7 +61,7 @@ public class FortSiegeManager
private int _siegeLength = 60; // Time in minute. Changeable in fortsiege.properties
private int _countDownLength = 10; // Time in minute. Changeable in fortsiege.properties
private int _suspiciousMerchantRespawnDelay = 180; // Time in minute. Changeable in fortsiege.properties
private List<FortSiege> _sieges;
private final Map<Integer, FortSiege> _sieges = new ConcurrentHashMap<>();
protected FortSiegeManager()
{
@ -255,18 +256,19 @@ public class FortSiegeManager
return _countDownLength;
}
public List<FortSiege> getSieges()
public Collection<FortSiege> getSieges()
{
if (_sieges == null)
{
_sieges = new CopyOnWriteArrayList<>();
}
return _sieges;
return _sieges.values();
}
public FortSiege getSiege(int fortId)
{
return _sieges.get(fortId);
}
public void addSiege(FortSiege fortSiege)
{
getSieges().add(fortSiege);
_sieges.put(fortSiege.getFort().getResidenceId(), fortSiege);
}
public boolean isCombat(int itemId)

19
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@ -20,6 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@ -64,7 +65,7 @@ public class SiegeManager
public void addSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.addSkill(sk, false);
}
@ -110,7 +111,7 @@ public class SiegeManager
public void removeSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.removeSkill(sk);
}
@ -263,7 +264,7 @@ public class SiegeManager
return _bloodAllianceReward;
}
public List<Siege> getSieges()
public Collection<Siege> getSieges()
{
final List<Siege> sieges = new LinkedList<>();
for (Castle castle : CastleManager.getInstance().getCastles())
@ -272,6 +273,18 @@ public class SiegeManager
}
return sieges;
}
public Siege getSiege(int castleId)
{
for (Castle castle : CastleManager.getInstance().getCastles())
{
if (castle.getResidenceId() == castleId)
{
return castle.getSiege();
}
}
return null;
}
private void loadTrapUpgrade(int castleId)
{

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java vendored
View File

@ -94,7 +94,7 @@ public class SkillConditionMasterHandler
SkillConditionHandler.getInstance().registerHandler("OpHaveSummon", OpHaveSummonSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHaveSummonedNpc", OpHaveSummonedNpcSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHome", OpHomeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiegeTime", OpInSiegeTimeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiege", OpInSiegeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInstantzone", OpInstantzoneSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpMainjob", OpMainjobSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpNeedAgathion", OpNeedAgathionSkillCondition::new);

6
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java vendored
View File

@ -33,12 +33,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class OpCheckResidenceSkillCondition implements ISkillCondition
{
private final Set<Integer> _residencesId = new HashSet<>();
private final Set<Integer> _residenceIds = new HashSet<>();
private final boolean _isWithin;
public OpCheckResidenceSkillCondition(StatSet params)
{
_residencesId.addAll(params.getList("residencesId", Integer.class));
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
_isWithin = params.getBoolean("isWithin");
}
@ -53,7 +53,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition
final ClanHall clanHall = ClanHallData.getInstance().getClanHallByClan(clan);
if (clanHall != null)
{
return _isWithin ? _residencesId.contains(clanHall.getResidenceId()) : !_residencesId.contains(clanHall.getResidenceId());
return _isWithin ? _residenceIds.contains(clanHall.getResidenceId()) : !_residenceIds.contains(clanHall.getResidenceId());
}
}
}

75
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeSkillCondition.java vendored Normal file
View File

@ -0,0 +1,75 @@
/*
* 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 handlers.skillconditionhandlers;
import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.siege.FortSiege;
import org.l2jmobius.gameserver.model.siege.Siege;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
/**
* @author dontknowdontcare
*/
public class OpInSiegeSkillCondition implements ISkillCondition
{
private final Set<Integer> _residenceIds = new HashSet<>();
public OpInSiegeSkillCondition(StatSet params)
{
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
for (int id : _residenceIds)
{
if (valid(caster, id))
{
return true;
}
}
return false;
}
private boolean valid(Creature caster, int id)
{
final FortSiege fortSiege = FortSiegeManager.getInstance().getSiege(id);
if (fortSiege != null)
{
return fortSiege.isInProgress() && fortSiege.getFort().getZone().isInsideZone(caster);
}
final Siege castleSiege = SiegeManager.getInstance().getSiege(id);
if (castleSiege != null)
{
return castleSiege.isInProgress() && castleSiege.getCastle().getZone().isInsideZone(caster);
}
// TODO: Check for clan hall siege
return false;
}
}

40
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java vendored
View File

@ -1,40 +0,0 @@
/*
* 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 handlers.skillconditionhandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.zone.ZoneId;
/**
* @author Mobius
*/
public class OpInSiegeTimeSkillCondition implements ISkillCondition
{
public OpInSiegeTimeSkillCondition(StatSet params)
{
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return caster.isInsideZone(ZoneId.SIEGE);
}
}

4
L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@ -658,7 +658,7 @@
<conditions>
<condition name="CanSummonPet" />
<condition name="OpCheckResidence">
<residencesId>
<residenceIds>
<item>36</item>
<item>37</item>
<item>38</item>
@ -672,7 +672,7 @@
<item>55</item>
<item>56</item>
<item>57</item>
</residencesId>
</residenceIds>
<isWithin>false</isWithin>
</condition>
</conditions>

39
L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/15200-15299.xml vendored
View File

@ -1559,10 +1559,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>64</time>
<condition name="OpInSiege">
<residenceIds>
<item>64</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33767</npcId> <!-- Jacquard -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15284" toLevel="1" name="Summon Brakel">
<!-- Summons Brakel, the Herald from the Fortress of Resistance. The Clan Hall Siege for the contestable Fortress of Resistance runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Brakel teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1576,10 +1585,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>21</time>
<condition name="OpInSiege">
<residenceIds>
<item>21</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33769</npcId> <!-- Brakel -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15285" toLevel="1" name="Summon Loken">
<!-- Summons Loken, the Herald from Devastated Castle. The Clan Hall Siege for the contestable Devastated Castle runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Loken teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1593,10 +1611,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>34</time>
<condition name="OpInSiege">
<residenceIds>
<item>34</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33771</npcId> <!-- Loken -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15286" toLevel="1" name="Blood Siphon Master">
<!-- Steals a large portion of the target's HP. -->

2
L2J_Mobius_03.0_Helios/dist/game/data/xsd/skills.xsd vendored
View File

@ -490,7 +490,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="isFemale" type="xs:boolean" />
<xs:element minOccurs="0" name="residencesId">
<xs:element minOccurs="0" name="residenceIds">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="item" type="xs:unsignedByte" />

11
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -184,10 +184,9 @@ public class SkillData implements IXmlReader
/**
* @param addNoble
* @param hasCastle
* @return an array with siege skills. If addNoble == true, will add also Advanced headquarters.
*/
public List<Skill> getSiegeSkills(boolean addNoble, boolean hasCastle)
public List<Skill> getSiegeSkills(boolean addNoble)
{
final List<Skill> temp = new LinkedList<>();
temp.add(_skills.get(getSkillHashCode(CommonSkill.IMPRIT_OF_LIGHT.getId(), 1)));
@ -197,11 +196,9 @@ public class SkillData implements IXmlReader
{
temp.add(_skills.get(getSkillHashCode(326, 1))); // Build Advanced Headquarters
}
if (hasCastle)
{
temp.add(_skills.get(getSkillHashCode(844, 1))); // Outpost Construction
temp.add(_skills.get(getSkillHashCode(845, 1))); // Outpost Demolition
}
temp.add(_skills.get(getSkillHashCode(15283, 1))); // Summon Jacquard
temp.add(_skills.get(getSkillHashCode(15284, 1))); // Summon Brakel
temp.add(_skills.get(getSkillHashCode(15285, 1))); // Summon Loken
return temp;
}

18
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
View File

@ -22,6 +22,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -60,7 +61,7 @@ public class FortSiegeManager
private int _siegeLength = 60; // Time in minute. Changeable in fortsiege.properties
private int _countDownLength = 10; // Time in minute. Changeable in fortsiege.properties
private int _suspiciousMerchantRespawnDelay = 180; // Time in minute. Changeable in fortsiege.properties
private List<FortSiege> _sieges;
private final Map<Integer, FortSiege> _sieges = new ConcurrentHashMap<>();
protected FortSiegeManager()
{
@ -255,18 +256,19 @@ public class FortSiegeManager
return _countDownLength;
}
public List<FortSiege> getSieges()
public Collection<FortSiege> getSieges()
{
if (_sieges == null)
{
_sieges = new CopyOnWriteArrayList<>();
}
return _sieges;
return _sieges.values();
}
public FortSiege getSiege(int fortId)
{
return _sieges.get(fortId);
}
public void addSiege(FortSiege fortSiege)
{
getSieges().add(fortSiege);
_sieges.put(fortSiege.getFort().getResidenceId(), fortSiege);
}
public boolean isCombat(int itemId)

19
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@ -20,6 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@ -64,7 +65,7 @@ public class SiegeManager
public void addSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.addSkill(sk, false);
}
@ -110,7 +111,7 @@ public class SiegeManager
public void removeSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.removeSkill(sk);
}
@ -263,7 +264,7 @@ public class SiegeManager
return _bloodAllianceReward;
}
public List<Siege> getSieges()
public Collection<Siege> getSieges()
{
final List<Siege> sieges = new LinkedList<>();
for (Castle castle : CastleManager.getInstance().getCastles())
@ -272,6 +273,18 @@ public class SiegeManager
}
return sieges;
}
public Siege getSiege(int castleId)
{
for (Castle castle : CastleManager.getInstance().getCastles())
{
if (castle.getResidenceId() == castleId)
{
return castle.getSiege();
}
}
return null;
}
private void loadTrapUpgrade(int castleId)
{

2
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java vendored
View File

@ -95,7 +95,7 @@ public class SkillConditionMasterHandler
SkillConditionHandler.getInstance().registerHandler("OpHaveSummon", OpHaveSummonSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHaveSummonedNpc", OpHaveSummonedNpcSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHome", OpHomeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiegeTime", OpInSiegeTimeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiege", OpInSiegeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInstantzone", OpInstantzoneSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpMainjob", OpMainjobSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpNeedAgathion", OpNeedAgathionSkillCondition::new);

6
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java vendored
View File

@ -33,12 +33,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class OpCheckResidenceSkillCondition implements ISkillCondition
{
private final Set<Integer> _residencesId = new HashSet<>();
private final Set<Integer> _residenceIds = new HashSet<>();
private final boolean _isWithin;
public OpCheckResidenceSkillCondition(StatSet params)
{
_residencesId.addAll(params.getList("residencesId", Integer.class));
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
_isWithin = params.getBoolean("isWithin");
}
@ -53,7 +53,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition
final ClanHall clanHall = ClanHallData.getInstance().getClanHallByClan(clan);
if (clanHall != null)
{
return _isWithin ? _residencesId.contains(clanHall.getResidenceId()) : !_residencesId.contains(clanHall.getResidenceId());
return _isWithin ? _residenceIds.contains(clanHall.getResidenceId()) : !_residenceIds.contains(clanHall.getResidenceId());
}
}
}

75
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeSkillCondition.java vendored Normal file
View File

@ -0,0 +1,75 @@
/*
* 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 handlers.skillconditionhandlers;
import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.siege.FortSiege;
import org.l2jmobius.gameserver.model.siege.Siege;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
/**
* @author dontknowdontcare
*/
public class OpInSiegeSkillCondition implements ISkillCondition
{
private final Set<Integer> _residenceIds = new HashSet<>();
public OpInSiegeSkillCondition(StatSet params)
{
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
for (int id : _residenceIds)
{
if (valid(caster, id))
{
return true;
}
}
return false;
}
private boolean valid(Creature caster, int id)
{
final FortSiege fortSiege = FortSiegeManager.getInstance().getSiege(id);
if (fortSiege != null)
{
return fortSiege.isInProgress() && fortSiege.getFort().getZone().isInsideZone(caster);
}
final Siege castleSiege = SiegeManager.getInstance().getSiege(id);
if (castleSiege != null)
{
return castleSiege.isInProgress() && castleSiege.getCastle().getZone().isInsideZone(caster);
}
// TODO: Check for clan hall siege
return false;
}
}

40
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java vendored
View File

@ -1,40 +0,0 @@
/*
* 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 handlers.skillconditionhandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.zone.ZoneId;
/**
* @author Mobius
*/
public class OpInSiegeTimeSkillCondition implements ISkillCondition
{
public OpInSiegeTimeSkillCondition(StatSet params)
{
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return caster.isInsideZone(ZoneId.SIEGE);
}
}

4
L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@ -658,7 +658,7 @@
<conditions>
<condition name="CanSummonPet" />
<condition name="OpCheckResidence">
<residencesId>
<residenceIds>
<item>36</item>
<item>37</item>
<item>38</item>
@ -672,7 +672,7 @@
<item>55</item>
<item>56</item>
<item>57</item>
</residencesId>
</residenceIds>
<isWithin>false</isWithin>
</condition>
</conditions>

39
L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/15200-15299.xml vendored
View File

@ -1559,10 +1559,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>64</time>
<condition name="OpInSiege">
<residenceIds>
<item>64</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33767</npcId> <!-- Jacquard -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15284" toLevel="1" name="Summon Brakel">
<!-- Summons Brakel, the Herald from the Fortress of Resistance. The Clan Hall Siege for the contestable Fortress of Resistance runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Brakel teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1576,10 +1585,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>21</time>
<condition name="OpInSiege">
<residenceIds>
<item>21</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33769</npcId> <!-- Brakel -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15285" toLevel="1" name="Summon Loken">
<!-- Summons Loken, the Herald from Devastated Castle. The Clan Hall Siege for the contestable Devastated Castle runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Loken teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1593,10 +1611,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>34</time>
<condition name="OpInSiege">
<residenceIds>
<item>34</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33771</npcId> <!-- Loken -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15286" toLevel="1" name="Blood Siphon Master">
<!-- Steals a large portion of the target's HP. -->

2
L2J_Mobius_04.0_GrandCrusade/dist/game/data/xsd/skills.xsd vendored
View File

@ -494,7 +494,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="isFemale" type="xs:boolean" />
<xs:element minOccurs="0" name="residencesId">
<xs:element minOccurs="0" name="residenceIds">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="item" type="xs:unsignedByte" />

11
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -184,10 +184,9 @@ public class SkillData implements IXmlReader
/**
* @param addNoble
* @param hasCastle
* @return an array with siege skills. If addNoble == true, will add also Advanced headquarters.
*/
public List<Skill> getSiegeSkills(boolean addNoble, boolean hasCastle)
public List<Skill> getSiegeSkills(boolean addNoble)
{
final List<Skill> temp = new LinkedList<>();
temp.add(_skills.get(getSkillHashCode(CommonSkill.IMPRIT_OF_LIGHT.getId(), 1)));
@ -197,11 +196,9 @@ public class SkillData implements IXmlReader
{
temp.add(_skills.get(getSkillHashCode(326, 1))); // Build Advanced Headquarters
}
if (hasCastle)
{
temp.add(_skills.get(getSkillHashCode(844, 1))); // Outpost Construction
temp.add(_skills.get(getSkillHashCode(845, 1))); // Outpost Demolition
}
temp.add(_skills.get(getSkillHashCode(15283, 1))); // Summon Jacquard
temp.add(_skills.get(getSkillHashCode(15284, 1))); // Summon Brakel
temp.add(_skills.get(getSkillHashCode(15285, 1))); // Summon Loken
return temp;
}

18
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
View File

@ -22,6 +22,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -60,7 +61,7 @@ public class FortSiegeManager
private int _siegeLength = 60; // Time in minute. Changeable in fortsiege.properties
private int _countDownLength = 10; // Time in minute. Changeable in fortsiege.properties
private int _suspiciousMerchantRespawnDelay = 180; // Time in minute. Changeable in fortsiege.properties
private List<FortSiege> _sieges;
private final Map<Integer, FortSiege> _sieges = new ConcurrentHashMap<>();
protected FortSiegeManager()
{
@ -255,18 +256,19 @@ public class FortSiegeManager
return _countDownLength;
}
public List<FortSiege> getSieges()
public Collection<FortSiege> getSieges()
{
if (_sieges == null)
{
_sieges = new CopyOnWriteArrayList<>();
}
return _sieges;
return _sieges.values();
}
public FortSiege getSiege(int fortId)
{
return _sieges.get(fortId);
}
public void addSiege(FortSiege fortSiege)
{
getSieges().add(fortSiege);
_sieges.put(fortSiege.getFort().getResidenceId(), fortSiege);
}
public boolean isCombat(int itemId)

19
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@ -20,6 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@ -64,7 +65,7 @@ public class SiegeManager
public void addSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.addSkill(sk, false);
}
@ -110,7 +111,7 @@ public class SiegeManager
public void removeSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.removeSkill(sk);
}
@ -263,7 +264,7 @@ public class SiegeManager
return _bloodAllianceReward;
}
public List<Siege> getSieges()
public Collection<Siege> getSieges()
{
final List<Siege> sieges = new LinkedList<>();
for (Castle castle : CastleManager.getInstance().getCastles())
@ -272,6 +273,18 @@ public class SiegeManager
}
return sieges;
}
public Siege getSiege(int castleId)
{
for (Castle castle : CastleManager.getInstance().getCastles())
{
if (castle.getResidenceId() == castleId)
{
return castle.getSiege();
}
}
return null;
}
private void loadTrapUpgrade(int castleId)
{

2
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java vendored
View File

@ -95,7 +95,7 @@ public class SkillConditionMasterHandler
SkillConditionHandler.getInstance().registerHandler("OpHaveSummon", OpHaveSummonSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHaveSummonedNpc", OpHaveSummonedNpcSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHome", OpHomeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiegeTime", OpInSiegeTimeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiege", OpInSiegeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInstantzone", OpInstantzoneSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpMainjob", OpMainjobSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpNeedAgathion", OpNeedAgathionSkillCondition::new);

6
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java vendored
View File

@ -33,12 +33,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class OpCheckResidenceSkillCondition implements ISkillCondition
{
private final Set<Integer> _residencesId = new HashSet<>();
private final Set<Integer> _residenceIds = new HashSet<>();
private final boolean _isWithin;
public OpCheckResidenceSkillCondition(StatSet params)
{
_residencesId.addAll(params.getList("residencesId", Integer.class));
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
_isWithin = params.getBoolean("isWithin");
}
@ -53,7 +53,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition
final ClanHall clanHall = ClanHallData.getInstance().getClanHallByClan(clan);
if (clanHall != null)
{
return _isWithin ? _residencesId.contains(clanHall.getResidenceId()) : !_residencesId.contains(clanHall.getResidenceId());
return _isWithin ? _residenceIds.contains(clanHall.getResidenceId()) : !_residenceIds.contains(clanHall.getResidenceId());
}
}
}

75
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeSkillCondition.java vendored Normal file
View File

@ -0,0 +1,75 @@
/*
* 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 handlers.skillconditionhandlers;
import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.siege.FortSiege;
import org.l2jmobius.gameserver.model.siege.Siege;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
/**
* @author dontknowdontcare
*/
public class OpInSiegeSkillCondition implements ISkillCondition
{
private final Set<Integer> _residenceIds = new HashSet<>();
public OpInSiegeSkillCondition(StatSet params)
{
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
for (int id : _residenceIds)
{
if (valid(caster, id))
{
return true;
}
}
return false;
}
private boolean valid(Creature caster, int id)
{
final FortSiege fortSiege = FortSiegeManager.getInstance().getSiege(id);
if (fortSiege != null)
{
return fortSiege.isInProgress() && fortSiege.getFort().getZone().isInsideZone(caster);
}
final Siege castleSiege = SiegeManager.getInstance().getSiege(id);
if (castleSiege != null)
{
return castleSiege.isInProgress() && castleSiege.getCastle().getZone().isInsideZone(caster);
}
// TODO: Check for clan hall siege
return false;
}
}

40
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java vendored
View File

@ -1,40 +0,0 @@
/*
* 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 handlers.skillconditionhandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.zone.ZoneId;
/**
* @author Mobius
*/
public class OpInSiegeTimeSkillCondition implements ISkillCondition
{
public OpInSiegeTimeSkillCondition(StatSet params)
{
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return caster.isInsideZone(ZoneId.SIEGE);
}
}

4
L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@ -658,7 +658,7 @@
<conditions>
<condition name="CanSummonPet" />
<condition name="OpCheckResidence">
<residencesId>
<residenceIds>
<item>36</item>
<item>37</item>
<item>38</item>
@ -672,7 +672,7 @@
<item>55</item>
<item>56</item>
<item>57</item>
</residencesId>
</residenceIds>
<isWithin>false</isWithin>
</condition>
</conditions>

39
L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/15200-15299.xml vendored
View File

@ -1563,10 +1563,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>64</time>
<condition name="OpInSiege">
<residenceIds>
<item>64</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33767</npcId> <!-- Jacquard -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15284" toLevel="1" name="Summon Brakel">
<!-- Summons Brakel, the Herald from the Fortress of Resistance. The Clan Hall Siege for the contestable Fortress of Resistance runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Brakel teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1580,10 +1589,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>21</time>
<condition name="OpInSiege">
<residenceIds>
<item>21</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33769</npcId> <!-- Brakel -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15285" toLevel="1" name="Summon Loken">
<!-- Summons Loken, the Herald from Devastated Castle. The Clan Hall Siege for the contestable Devastated Castle runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Loken teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1597,10 +1615,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>34</time>
<condition name="OpInSiege">
<residenceIds>
<item>34</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33771</npcId> <!-- Loken -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15286" toLevel="1" name="Blood Siphon Master">
<!-- Steals a large portion of the target's HP. -->

2
L2J_Mobius_05.0_Salvation/dist/game/data/xsd/skills.xsd vendored
View File

@ -492,7 +492,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="isFemale" type="xs:boolean" />
<xs:element minOccurs="0" name="residencesId">
<xs:element minOccurs="0" name="residenceIds">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="item" type="xs:unsignedByte" />

11
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -184,10 +184,9 @@ public class SkillData implements IXmlReader
/**
* @param addNoble
* @param hasCastle
* @return an array with siege skills. If addNoble == true, will add also Advanced headquarters.
*/
public List<Skill> getSiegeSkills(boolean addNoble, boolean hasCastle)
public List<Skill> getSiegeSkills(boolean addNoble)
{
final List<Skill> temp = new LinkedList<>();
temp.add(_skills.get(getSkillHashCode(CommonSkill.IMPRIT_OF_LIGHT.getId(), 1)));
@ -197,11 +196,9 @@ public class SkillData implements IXmlReader
{
temp.add(_skills.get(getSkillHashCode(326, 1))); // Build Advanced Headquarters
}
if (hasCastle)
{
temp.add(_skills.get(getSkillHashCode(844, 1))); // Outpost Construction
temp.add(_skills.get(getSkillHashCode(845, 1))); // Outpost Demolition
}
temp.add(_skills.get(getSkillHashCode(15283, 1))); // Summon Jacquard
temp.add(_skills.get(getSkillHashCode(15284, 1))); // Summon Brakel
temp.add(_skills.get(getSkillHashCode(15285, 1))); // Summon Loken
return temp;
}

18
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
View File

@ -22,6 +22,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -60,7 +61,7 @@ public class FortSiegeManager
private int _siegeLength = 60; // Time in minute. Changeable in fortsiege.properties
private int _countDownLength = 10; // Time in minute. Changeable in fortsiege.properties
private int _suspiciousMerchantRespawnDelay = 180; // Time in minute. Changeable in fortsiege.properties
private List<FortSiege> _sieges;
private final Map<Integer, FortSiege> _sieges = new ConcurrentHashMap<>();
protected FortSiegeManager()
{
@ -255,18 +256,19 @@ public class FortSiegeManager
return _countDownLength;
}
public List<FortSiege> getSieges()
public Collection<FortSiege> getSieges()
{
if (_sieges == null)
{
_sieges = new CopyOnWriteArrayList<>();
}
return _sieges;
return _sieges.values();
}
public FortSiege getSiege(int fortId)
{
return _sieges.get(fortId);
}
public void addSiege(FortSiege fortSiege)
{
getSieges().add(fortSiege);
_sieges.put(fortSiege.getFort().getResidenceId(), fortSiege);
}
public boolean isCombat(int itemId)

19
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@ -20,6 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@ -64,7 +65,7 @@ public class SiegeManager
public void addSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.addSkill(sk, false);
}
@ -110,7 +111,7 @@ public class SiegeManager
public void removeSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.removeSkill(sk);
}
@ -263,7 +264,7 @@ public class SiegeManager
return _bloodAllianceReward;
}
public List<Siege> getSieges()
public Collection<Siege> getSieges()
{
final List<Siege> sieges = new LinkedList<>();
for (Castle castle : CastleManager.getInstance().getCastles())
@ -272,6 +273,18 @@ public class SiegeManager
}
return sieges;
}
public Siege getSiege(int castleId)
{
for (Castle castle : CastleManager.getInstance().getCastles())
{
if (castle.getResidenceId() == castleId)
{
return castle.getSiege();
}
}
return null;
}
private void loadTrapUpgrade(int castleId)
{

2
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java vendored
View File

@ -95,7 +95,7 @@ public class SkillConditionMasterHandler
SkillConditionHandler.getInstance().registerHandler("OpHaveSummon", OpHaveSummonSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHaveSummonedNpc", OpHaveSummonedNpcSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHome", OpHomeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiegeTime", OpInSiegeTimeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiege", OpInSiegeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInstantzone", OpInstantzoneSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpMainjob", OpMainjobSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpNeedAgathion", OpNeedAgathionSkillCondition::new);

6
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java vendored
View File

@ -33,12 +33,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class OpCheckResidenceSkillCondition implements ISkillCondition
{
private final Set<Integer> _residencesId = new HashSet<>();
private final Set<Integer> _residenceIds = new HashSet<>();
private final boolean _isWithin;
public OpCheckResidenceSkillCondition(StatSet params)
{
_residencesId.addAll(params.getList("residencesId", Integer.class));
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
_isWithin = params.getBoolean("isWithin");
}
@ -53,7 +53,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition
final ClanHall clanHall = ClanHallData.getInstance().getClanHallByClan(clan);
if (clanHall != null)
{
return _isWithin ? _residencesId.contains(clanHall.getResidenceId()) : !_residencesId.contains(clanHall.getResidenceId());
return _isWithin ? _residenceIds.contains(clanHall.getResidenceId()) : !_residenceIds.contains(clanHall.getResidenceId());
}
}
}

75
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeSkillCondition.java vendored Normal file
View File

@ -0,0 +1,75 @@
/*
* 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 handlers.skillconditionhandlers;
import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.siege.FortSiege;
import org.l2jmobius.gameserver.model.siege.Siege;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
/**
* @author dontknowdontcare
*/
public class OpInSiegeSkillCondition implements ISkillCondition
{
private final Set<Integer> _residenceIds = new HashSet<>();
public OpInSiegeSkillCondition(StatSet params)
{
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
for (int id : _residenceIds)
{
if (valid(caster, id))
{
return true;
}
}
return false;
}
private boolean valid(Creature caster, int id)
{
final FortSiege fortSiege = FortSiegeManager.getInstance().getSiege(id);
if (fortSiege != null)
{
return fortSiege.isInProgress() && fortSiege.getFort().getZone().isInsideZone(caster);
}
final Siege castleSiege = SiegeManager.getInstance().getSiege(id);
if (castleSiege != null)
{
return castleSiege.isInProgress() && castleSiege.getCastle().getZone().isInsideZone(caster);
}
// TODO: Check for clan hall siege
return false;
}
}

40
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java vendored
View File

@ -1,40 +0,0 @@
/*
* 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 handlers.skillconditionhandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.zone.ZoneId;
/**
* @author Mobius
*/
public class OpInSiegeTimeSkillCondition implements ISkillCondition
{
public OpInSiegeTimeSkillCondition(StatSet params)
{
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return caster.isInsideZone(ZoneId.SIEGE);
}
}

4
L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@ -678,7 +678,7 @@
<conditions>
<condition name="CanSummonPet" />
<condition name="OpCheckResidence">
<residencesId>
<residenceIds>
<item>36</item>
<item>37</item>
<item>38</item>
@ -692,7 +692,7 @@
<item>55</item>
<item>56</item>
<item>57</item>
</residencesId>
</residenceIds>
<isWithin>false</isWithin>
</condition>
</conditions>

39
L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/15200-15299.xml vendored
View File

@ -1563,10 +1563,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>64</time>
<condition name="OpInSiege">
<residenceIds>
<item>64</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33767</npcId> <!-- Jacquard -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15284" toLevel="1" name="Summon Brakel">
<!-- Summons Brakel, the Herald from the Fortress of Resistance. The Clan Hall Siege for the contestable Fortress of Resistance runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Brakel teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1580,10 +1589,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>21</time>
<condition name="OpInSiege">
<residenceIds>
<item>21</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33769</npcId> <!-- Brakel -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15285" toLevel="1" name="Summon Loken">
<!-- Summons Loken, the Herald from Devastated Castle. The Clan Hall Siege for the contestable Devastated Castle runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Loken teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1597,10 +1615,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>34</time>
<condition name="OpInSiege">
<residenceIds>
<item>34</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33771</npcId> <!-- Loken -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15286" toLevel="1" name="Blood Siphon Master">
<!-- Steals a large portion of the target's HP. -->

2
L2J_Mobius_05.5_EtinasFate/dist/game/data/xsd/skills.xsd vendored
View File

@ -397,7 +397,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="isFemale" type="xs:boolean" />
<xs:element minOccurs="0" name="residencesId">
<xs:element minOccurs="0" name="residenceIds">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="item" type="xs:unsignedByte" />

11
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -184,10 +184,9 @@ public class SkillData implements IXmlReader
/**
* @param addNoble
* @param hasCastle
* @return an array with siege skills. If addNoble == true, will add also Advanced headquarters.
*/
public List<Skill> getSiegeSkills(boolean addNoble, boolean hasCastle)
public List<Skill> getSiegeSkills(boolean addNoble)
{
final List<Skill> temp = new LinkedList<>();
temp.add(_skills.get(getSkillHashCode(CommonSkill.IMPRIT_OF_LIGHT.getId(), 1)));
@ -197,11 +196,9 @@ public class SkillData implements IXmlReader
{
temp.add(_skills.get(getSkillHashCode(326, 1))); // Build Advanced Headquarters
}
if (hasCastle)
{
temp.add(_skills.get(getSkillHashCode(844, 1))); // Outpost Construction
temp.add(_skills.get(getSkillHashCode(845, 1))); // Outpost Demolition
}
temp.add(_skills.get(getSkillHashCode(15283, 1))); // Summon Jacquard
temp.add(_skills.get(getSkillHashCode(15284, 1))); // Summon Brakel
temp.add(_skills.get(getSkillHashCode(15285, 1))); // Summon Loken
return temp;
}

18
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
View File

@ -22,6 +22,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -60,7 +61,7 @@ public class FortSiegeManager
private int _siegeLength = 60; // Time in minute. Changeable in fortsiege.properties
private int _countDownLength = 10; // Time in minute. Changeable in fortsiege.properties
private int _suspiciousMerchantRespawnDelay = 180; // Time in minute. Changeable in fortsiege.properties
private List<FortSiege> _sieges;
private final Map<Integer, FortSiege> _sieges = new ConcurrentHashMap<>();
protected FortSiegeManager()
{
@ -255,18 +256,19 @@ public class FortSiegeManager
return _countDownLength;
}
public List<FortSiege> getSieges()
public Collection<FortSiege> getSieges()
{
if (_sieges == null)
{
_sieges = new CopyOnWriteArrayList<>();
}
return _sieges;
return _sieges.values();
}
public FortSiege getSiege(int fortId)
{
return _sieges.get(fortId);
}
public void addSiege(FortSiege fortSiege)
{
getSieges().add(fortSiege);
_sieges.put(fortSiege.getFort().getResidenceId(), fortSiege);
}
public boolean isCombat(int itemId)

19
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@ -20,6 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@ -64,7 +65,7 @@ public class SiegeManager
public void addSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.addSkill(sk, false);
}
@ -110,7 +111,7 @@ public class SiegeManager
public void removeSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.removeSkill(sk);
}
@ -263,7 +264,7 @@ public class SiegeManager
return _bloodAllianceReward;
}
public List<Siege> getSieges()
public Collection<Siege> getSieges()
{
final List<Siege> sieges = new LinkedList<>();
for (Castle castle : CastleManager.getInstance().getCastles())
@ -272,6 +273,18 @@ public class SiegeManager
}
return sieges;
}
public Siege getSiege(int castleId)
{
for (Castle castle : CastleManager.getInstance().getCastles())
{
if (castle.getResidenceId() == castleId)
{
return castle.getSiege();
}
}
return null;
}
private void loadTrapUpgrade(int castleId)
{

2
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java vendored
View File

@ -95,7 +95,7 @@ public class SkillConditionMasterHandler
SkillConditionHandler.getInstance().registerHandler("OpHaveSummon", OpHaveSummonSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHaveSummonedNpc", OpHaveSummonedNpcSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHome", OpHomeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiegeTime", OpInSiegeTimeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiege", OpInSiegeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInstantzone", OpInstantzoneSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpMainjob", OpMainjobSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpNeedAgathion", OpNeedAgathionSkillCondition::new);

6
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java vendored
View File

@ -33,12 +33,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class OpCheckResidenceSkillCondition implements ISkillCondition
{
private final Set<Integer> _residencesId = new HashSet<>();
private final Set<Integer> _residenceIds = new HashSet<>();
private final boolean _isWithin;
public OpCheckResidenceSkillCondition(StatSet params)
{
_residencesId.addAll(params.getList("residencesId", Integer.class));
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
_isWithin = params.getBoolean("isWithin");
}
@ -53,7 +53,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition
final ClanHall clanHall = ClanHallData.getInstance().getClanHallByClan(clan);
if (clanHall != null)
{
return _isWithin ? _residencesId.contains(clanHall.getResidenceId()) : !_residencesId.contains(clanHall.getResidenceId());
return _isWithin ? _residenceIds.contains(clanHall.getResidenceId()) : !_residenceIds.contains(clanHall.getResidenceId());
}
}
}

75
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeSkillCondition.java vendored Normal file
View File

@ -0,0 +1,75 @@
/*
* 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 handlers.skillconditionhandlers;
import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.siege.FortSiege;
import org.l2jmobius.gameserver.model.siege.Siege;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
/**
* @author dontknowdontcare
*/
public class OpInSiegeSkillCondition implements ISkillCondition
{
private final Set<Integer> _residenceIds = new HashSet<>();
public OpInSiegeSkillCondition(StatSet params)
{
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
for (int id : _residenceIds)
{
if (valid(caster, id))
{
return true;
}
}
return false;
}
private boolean valid(Creature caster, int id)
{
final FortSiege fortSiege = FortSiegeManager.getInstance().getSiege(id);
if (fortSiege != null)
{
return fortSiege.isInProgress() && fortSiege.getFort().getZone().isInsideZone(caster);
}
final Siege castleSiege = SiegeManager.getInstance().getSiege(id);
if (castleSiege != null)
{
return castleSiege.isInProgress() && castleSiege.getCastle().getZone().isInsideZone(caster);
}
// TODO: Check for clan hall siege
return false;
}
}

40
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java vendored
View File

@ -1,40 +0,0 @@
/*
* 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 handlers.skillconditionhandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.zone.ZoneId;
/**
* @author Mobius
*/
public class OpInSiegeTimeSkillCondition implements ISkillCondition
{
public OpInSiegeTimeSkillCondition(StatSet params)
{
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return caster.isInsideZone(ZoneId.SIEGE);
}
}

4
L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@ -678,7 +678,7 @@
<conditions>
<condition name="CanSummonPet" />
<condition name="OpCheckResidence">
<residencesId>
<residenceIds>
<item>36</item>
<item>37</item>
<item>38</item>
@ -692,7 +692,7 @@
<item>55</item>
<item>56</item>
<item>57</item>
</residencesId>
</residenceIds>
<isWithin>false</isWithin>
</condition>
</conditions>

39
L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/15200-15299.xml vendored
View File

@ -1575,10 +1575,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>64</time>
<condition name="OpInSiege">
<residenceIds>
<item>64</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33767</npcId> <!-- Jacquard -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15284" toLevel="1" name="Summon Brakel">
<!-- Summons Brakel, the Herald from the Fortress of Resistance. The Clan Hall Siege for the contestable Fortress of Resistance runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Brakel teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1592,10 +1601,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>21</time>
<condition name="OpInSiege">
<residenceIds>
<item>21</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33769</npcId> <!-- Brakel -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15285" toLevel="1" name="Summon Loken">
<!-- Summons Loken, the Herald from Devastated Castle. The Clan Hall Siege for the contestable Devastated Castle runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Loken teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1609,10 +1627,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>34</time>
<condition name="OpInSiege">
<residenceIds>
<item>34</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33771</npcId> <!-- Loken -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15286" toLevel="1" name="Blood Siphon Master">
<!-- Steals a large portion of the target's HP. -->

2
L2J_Mobius_06.0_Fafurion/dist/game/data/xsd/skills.xsd vendored
View File

@ -397,7 +397,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="isFemale" type="xs:boolean" />
<xs:element minOccurs="0" name="residencesId">
<xs:element minOccurs="0" name="residenceIds">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="item" type="xs:unsignedByte" />

11
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -184,10 +184,9 @@ public class SkillData implements IXmlReader
/**
* @param addNoble
* @param hasCastle
* @return an array with siege skills. If addNoble == true, will add also Advanced headquarters.
*/
public List<Skill> getSiegeSkills(boolean addNoble, boolean hasCastle)
public List<Skill> getSiegeSkills(boolean addNoble)
{
final List<Skill> temp = new LinkedList<>();
temp.add(_skills.get(getSkillHashCode(CommonSkill.IMPRIT_OF_LIGHT.getId(), 1)));
@ -197,11 +196,9 @@ public class SkillData implements IXmlReader
{
temp.add(_skills.get(getSkillHashCode(326, 1))); // Build Advanced Headquarters
}
if (hasCastle)
{
temp.add(_skills.get(getSkillHashCode(844, 1))); // Outpost Construction
temp.add(_skills.get(getSkillHashCode(845, 1))); // Outpost Demolition
}
temp.add(_skills.get(getSkillHashCode(15283, 1))); // Summon Jacquard
temp.add(_skills.get(getSkillHashCode(15284, 1))); // Summon Brakel
temp.add(_skills.get(getSkillHashCode(15285, 1))); // Summon Loken
return temp;
}

18
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
View File

@ -22,6 +22,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -60,7 +61,7 @@ public class FortSiegeManager
private int _siegeLength = 60; // Time in minute. Changeable in fortsiege.properties
private int _countDownLength = 10; // Time in minute. Changeable in fortsiege.properties
private int _suspiciousMerchantRespawnDelay = 180; // Time in minute. Changeable in fortsiege.properties
private List<FortSiege> _sieges;
private final Map<Integer, FortSiege> _sieges = new ConcurrentHashMap<>();
protected FortSiegeManager()
{
@ -255,18 +256,19 @@ public class FortSiegeManager
return _countDownLength;
}
public List<FortSiege> getSieges()
public Collection<FortSiege> getSieges()
{
if (_sieges == null)
{
_sieges = new CopyOnWriteArrayList<>();
}
return _sieges;
return _sieges.values();
}
public FortSiege getSiege(int fortId)
{
return _sieges.get(fortId);
}
public void addSiege(FortSiege fortSiege)
{
getSieges().add(fortSiege);
_sieges.put(fortSiege.getFort().getResidenceId(), fortSiege);
}
public boolean isCombat(int itemId)

19
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@ -20,6 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@ -64,7 +65,7 @@ public class SiegeManager
public void addSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.addSkill(sk, false);
}
@ -110,7 +111,7 @@ public class SiegeManager
public void removeSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.removeSkill(sk);
}
@ -263,7 +264,7 @@ public class SiegeManager
return _bloodAllianceReward;
}
public List<Siege> getSieges()
public Collection<Siege> getSieges()
{
final List<Siege> sieges = new LinkedList<>();
for (Castle castle : CastleManager.getInstance().getCastles())
@ -272,6 +273,18 @@ public class SiegeManager
}
return sieges;
}
public Siege getSiege(int castleId)
{
for (Castle castle : CastleManager.getInstance().getCastles())
{
if (castle.getResidenceId() == castleId)
{
return castle.getSiege();
}
}
return null;
}
private void loadTrapUpgrade(int castleId)
{

2
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java vendored
View File

@ -95,7 +95,7 @@ public class SkillConditionMasterHandler
SkillConditionHandler.getInstance().registerHandler("OpHaveSummon", OpHaveSummonSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHaveSummonedNpc", OpHaveSummonedNpcSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHome", OpHomeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiegeTime", OpInSiegeTimeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiege", OpInSiegeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInstantzone", OpInstantzoneSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpMainjob", OpMainjobSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpNeedAgathion", OpNeedAgathionSkillCondition::new);

6
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java vendored
View File

@ -33,12 +33,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class OpCheckResidenceSkillCondition implements ISkillCondition
{
private final Set<Integer> _residencesId = new HashSet<>();
private final Set<Integer> _residenceIds = new HashSet<>();
private final boolean _isWithin;
public OpCheckResidenceSkillCondition(StatSet params)
{
_residencesId.addAll(params.getList("residencesId", Integer.class));
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
_isWithin = params.getBoolean("isWithin");
}
@ -53,7 +53,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition
final ClanHall clanHall = ClanHallData.getInstance().getClanHallByClan(clan);
if (clanHall != null)
{
return _isWithin ? _residencesId.contains(clanHall.getResidenceId()) : !_residencesId.contains(clanHall.getResidenceId());
return _isWithin ? _residenceIds.contains(clanHall.getResidenceId()) : !_residenceIds.contains(clanHall.getResidenceId());
}
}
}

75
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeSkillCondition.java vendored Normal file
View File

@ -0,0 +1,75 @@
/*
* 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 handlers.skillconditionhandlers;
import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.siege.FortSiege;
import org.l2jmobius.gameserver.model.siege.Siege;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
/**
* @author dontknowdontcare
*/
public class OpInSiegeSkillCondition implements ISkillCondition
{
private final Set<Integer> _residenceIds = new HashSet<>();
public OpInSiegeSkillCondition(StatSet params)
{
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
for (int id : _residenceIds)
{
if (valid(caster, id))
{
return true;
}
}
return false;
}
private boolean valid(Creature caster, int id)
{
final FortSiege fortSiege = FortSiegeManager.getInstance().getSiege(id);
if (fortSiege != null)
{
return fortSiege.isInProgress() && fortSiege.getFort().getZone().isInsideZone(caster);
}
final Siege castleSiege = SiegeManager.getInstance().getSiege(id);
if (castleSiege != null)
{
return castleSiege.isInProgress() && castleSiege.getCastle().getZone().isInsideZone(caster);
}
// TODO: Check for clan hall siege
return false;
}
}

40
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java vendored
View File

@ -1,40 +0,0 @@
/*
* 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 handlers.skillconditionhandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.zone.ZoneId;
/**
* @author Mobius
*/
public class OpInSiegeTimeSkillCondition implements ISkillCondition
{
public OpInSiegeTimeSkillCondition(StatSet params)
{
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return caster.isInsideZone(ZoneId.SIEGE);
}
}

4
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@ -678,7 +678,7 @@
<conditions>
<condition name="CanSummonPet" />
<condition name="OpCheckResidence">
<residencesId>
<residenceIds>
<item>36</item>
<item>37</item>
<item>38</item>
@ -692,7 +692,7 @@
<item>55</item>
<item>56</item>
<item>57</item>
</residencesId>
</residenceIds>
<isWithin>false</isWithin>
</condition>
</conditions>

39
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/15200-15299.xml vendored
View File

@ -1575,10 +1575,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>64</time>
<condition name="OpInSiege">
<residenceIds>
<item>64</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33767</npcId> <!-- Jacquard -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15284" toLevel="1" name="Summon Brakel">
<!-- Summons Brakel, the Herald from the Fortress of Resistance. The Clan Hall Siege for the contestable Fortress of Resistance runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Brakel teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1592,10 +1601,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>21</time>
<condition name="OpInSiege">
<residenceIds>
<item>21</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33769</npcId> <!-- Brakel -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15285" toLevel="1" name="Summon Loken">
<!-- Summons Loken, the Herald from Devastated Castle. The Clan Hall Siege for the contestable Devastated Castle runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Loken teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1609,10 +1627,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>34</time>
<condition name="OpInSiege">
<residenceIds>
<item>34</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33771</npcId> <!-- Loken -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15286" toLevel="1" name="Blood Siphon Master">
<!-- Steals a large portion of the target's HP. -->

2
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/xsd/skills.xsd vendored
View File

@ -397,7 +397,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="isFemale" type="xs:boolean" />
<xs:element minOccurs="0" name="residencesId">
<xs:element minOccurs="0" name="residenceIds">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="item" type="xs:unsignedByte" />

11
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -184,10 +184,9 @@ public class SkillData implements IXmlReader
/**
* @param addNoble
* @param hasCastle
* @return an array with siege skills. If addNoble == true, will add also Advanced headquarters.
*/
public List<Skill> getSiegeSkills(boolean addNoble, boolean hasCastle)
public List<Skill> getSiegeSkills(boolean addNoble)
{
final List<Skill> temp = new LinkedList<>();
temp.add(_skills.get(getSkillHashCode(CommonSkill.IMPRIT_OF_LIGHT.getId(), 1)));
@ -197,11 +196,9 @@ public class SkillData implements IXmlReader
{
temp.add(_skills.get(getSkillHashCode(326, 1))); // Build Advanced Headquarters
}
if (hasCastle)
{
temp.add(_skills.get(getSkillHashCode(844, 1))); // Outpost Construction
temp.add(_skills.get(getSkillHashCode(845, 1))); // Outpost Demolition
}
temp.add(_skills.get(getSkillHashCode(15283, 1))); // Summon Jacquard
temp.add(_skills.get(getSkillHashCode(15284, 1))); // Summon Brakel
temp.add(_skills.get(getSkillHashCode(15285, 1))); // Summon Loken
return temp;
}

18
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
View File

@ -22,6 +22,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -60,7 +61,7 @@ public class FortSiegeManager
private int _siegeLength = 60; // Time in minute. Changeable in fortsiege.properties
private int _countDownLength = 10; // Time in minute. Changeable in fortsiege.properties
private int _suspiciousMerchantRespawnDelay = 180; // Time in minute. Changeable in fortsiege.properties
private List<FortSiege> _sieges;
private final Map<Integer, FortSiege> _sieges = new ConcurrentHashMap<>();
protected FortSiegeManager()
{
@ -255,18 +256,19 @@ public class FortSiegeManager
return _countDownLength;
}
public List<FortSiege> getSieges()
public Collection<FortSiege> getSieges()
{
if (_sieges == null)
{
_sieges = new CopyOnWriteArrayList<>();
}
return _sieges;
return _sieges.values();
}
public FortSiege getSiege(int fortId)
{
return _sieges.get(fortId);
}
public void addSiege(FortSiege fortSiege)
{
getSieges().add(fortSiege);
_sieges.put(fortSiege.getFort().getResidenceId(), fortSiege);
}
public boolean isCombat(int itemId)

19
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@ -20,6 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@ -64,7 +65,7 @@ public class SiegeManager
public void addSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.addSkill(sk, false);
}
@ -110,7 +111,7 @@ public class SiegeManager
public void removeSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.removeSkill(sk);
}
@ -263,7 +264,7 @@ public class SiegeManager
return _bloodAllianceReward;
}
public List<Siege> getSieges()
public Collection<Siege> getSieges()
{
final List<Siege> sieges = new LinkedList<>();
for (Castle castle : CastleManager.getInstance().getCastles())
@ -272,6 +273,18 @@ public class SiegeManager
}
return sieges;
}
public Siege getSiege(int castleId)
{
for (Castle castle : CastleManager.getInstance().getCastles())
{
if (castle.getResidenceId() == castleId)
{
return castle.getSiege();
}
}
return null;
}
private void loadTrapUpgrade(int castleId)
{

2
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java vendored
View File

@ -96,7 +96,7 @@ public class SkillConditionMasterHandler
SkillConditionHandler.getInstance().registerHandler("OpHaveSummon", OpHaveSummonSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHaveSummonedNpc", OpHaveSummonedNpcSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHome", OpHomeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiegeTime", OpInSiegeTimeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiege", OpInSiegeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInstantzone", OpInstantzoneSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpMainjob", OpMainjobSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpNeedAgathion", OpNeedAgathionSkillCondition::new);

6
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java vendored
View File

@ -33,12 +33,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class OpCheckResidenceSkillCondition implements ISkillCondition
{
private final Set<Integer> _residencesId = new HashSet<>();
private final Set<Integer> _residenceIds = new HashSet<>();
private final boolean _isWithin;
public OpCheckResidenceSkillCondition(StatSet params)
{
_residencesId.addAll(params.getList("residencesId", Integer.class));
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
_isWithin = params.getBoolean("isWithin");
}
@ -53,7 +53,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition
final ClanHall clanHall = ClanHallData.getInstance().getClanHallByClan(clan);
if (clanHall != null)
{
return _isWithin ? _residencesId.contains(clanHall.getResidenceId()) : !_residencesId.contains(clanHall.getResidenceId());
return _isWithin ? _residenceIds.contains(clanHall.getResidenceId()) : !_residenceIds.contains(clanHall.getResidenceId());
}
}
}

75
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeSkillCondition.java vendored Normal file
View File

@ -0,0 +1,75 @@
/*
* 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 handlers.skillconditionhandlers;
import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.siege.FortSiege;
import org.l2jmobius.gameserver.model.siege.Siege;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
/**
* @author dontknowdontcare
*/
public class OpInSiegeSkillCondition implements ISkillCondition
{
private final Set<Integer> _residenceIds = new HashSet<>();
public OpInSiegeSkillCondition(StatSet params)
{
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
for (int id : _residenceIds)
{
if (valid(caster, id))
{
return true;
}
}
return false;
}
private boolean valid(Creature caster, int id)
{
final FortSiege fortSiege = FortSiegeManager.getInstance().getSiege(id);
if (fortSiege != null)
{
return fortSiege.isInProgress() && fortSiege.getFort().getZone().isInsideZone(caster);
}
final Siege castleSiege = SiegeManager.getInstance().getSiege(id);
if (castleSiege != null)
{
return castleSiege.isInProgress() && castleSiege.getCastle().getZone().isInsideZone(caster);
}
// TODO: Check for clan hall siege
return false;
}
}

40
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java vendored
View File

@ -1,40 +0,0 @@
/*
* 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 handlers.skillconditionhandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.zone.ZoneId;
/**
* @author Mobius
*/
public class OpInSiegeTimeSkillCondition implements ISkillCondition
{
public OpInSiegeTimeSkillCondition(StatSet params)
{
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return caster.isInsideZone(ZoneId.SIEGE);
}
}

4
L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@ -678,7 +678,7 @@
<conditions>
<condition name="CanSummonPet" />
<condition name="OpCheckResidence">
<residencesId>
<residenceIds>
<item>36</item>
<item>37</item>
<item>38</item>
@ -692,7 +692,7 @@
<item>55</item>
<item>56</item>
<item>57</item>
</residencesId>
</residenceIds>
<isWithin>false</isWithin>
</condition>
</conditions>

39
L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/15200-15299.xml vendored
View File

@ -1595,10 +1595,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>64</time>
<condition name="OpInSiege">
<residenceIds>
<item>64</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33767</npcId> <!-- Jacquard -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15284" toLevel="1" name="Summon Brakel">
<!-- Summons Brakel, the Herald from the Fortress of Resistance. The Clan Hall Siege for the contestable Fortress of Resistance runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Brakel teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1612,10 +1621,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>21</time>
<condition name="OpInSiege">
<residenceIds>
<item>21</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33769</npcId> <!-- Brakel -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15285" toLevel="1" name="Summon Loken">
<!-- Summons Loken, the Herald from Devastated Castle. The Clan Hall Siege for the contestable Devastated Castle runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Loken teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1629,10 +1647,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>34</time>
<condition name="OpInSiege">
<residenceIds>
<item>34</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33771</npcId> <!-- Loken -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15286" toLevel="1" name="Blood Siphon Master">
<!-- Steals a large portion of the target's HP. -->

2
L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/skills.xsd vendored
View File

@ -397,7 +397,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="isFemale" type="xs:boolean" />
<xs:element minOccurs="0" name="residencesId">
<xs:element minOccurs="0" name="residenceIds">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="item" type="xs:unsignedByte" />

11
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -184,10 +184,9 @@ public class SkillData implements IXmlReader
/**
* @param addNoble
* @param hasCastle
* @return an array with siege skills. If addNoble == true, will add also Advanced headquarters.
*/
public List<Skill> getSiegeSkills(boolean addNoble, boolean hasCastle)
public List<Skill> getSiegeSkills(boolean addNoble)
{
final List<Skill> temp = new LinkedList<>();
temp.add(_skills.get(getSkillHashCode(CommonSkill.IMPRIT_OF_LIGHT.getId(), 1)));
@ -197,11 +196,9 @@ public class SkillData implements IXmlReader
{
temp.add(_skills.get(getSkillHashCode(326, 1))); // Build Advanced Headquarters
}
if (hasCastle)
{
temp.add(_skills.get(getSkillHashCode(844, 1))); // Outpost Construction
temp.add(_skills.get(getSkillHashCode(845, 1))); // Outpost Demolition
}
temp.add(_skills.get(getSkillHashCode(15283, 1))); // Summon Jacquard
temp.add(_skills.get(getSkillHashCode(15284, 1))); // Summon Brakel
temp.add(_skills.get(getSkillHashCode(15285, 1))); // Summon Loken
return temp;
}

18
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
View File

@ -22,6 +22,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -60,7 +61,7 @@ public class FortSiegeManager
private int _siegeLength = 60; // Time in minute. Changeable in fortsiege.properties
private int _countDownLength = 10; // Time in minute. Changeable in fortsiege.properties
private int _suspiciousMerchantRespawnDelay = 180; // Time in minute. Changeable in fortsiege.properties
private List<FortSiege> _sieges;
private final Map<Integer, FortSiege> _sieges = new ConcurrentHashMap<>();
protected FortSiegeManager()
{
@ -255,18 +256,19 @@ public class FortSiegeManager
return _countDownLength;
}
public List<FortSiege> getSieges()
public Collection<FortSiege> getSieges()
{
if (_sieges == null)
{
_sieges = new CopyOnWriteArrayList<>();
}
return _sieges;
return _sieges.values();
}
public FortSiege getSiege(int fortId)
{
return _sieges.get(fortId);
}
public void addSiege(FortSiege fortSiege)
{
getSieges().add(fortSiege);
_sieges.put(fortSiege.getFort().getResidenceId(), fortSiege);
}
public boolean isCombat(int itemId)

19
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@ -20,6 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@ -64,7 +65,7 @@ public class SiegeManager
public void addSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.addSkill(sk, false);
}
@ -110,7 +111,7 @@ public class SiegeManager
public void removeSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.removeSkill(sk);
}
@ -263,7 +264,7 @@ public class SiegeManager
return _bloodAllianceReward;
}
public List<Siege> getSieges()
public Collection<Siege> getSieges()
{
final List<Siege> sieges = new LinkedList<>();
for (Castle castle : CastleManager.getInstance().getCastles())
@ -272,6 +273,18 @@ public class SiegeManager
}
return sieges;
}
public Siege getSiege(int castleId)
{
for (Castle castle : CastleManager.getInstance().getCastles())
{
if (castle.getResidenceId() == castleId)
{
return castle.getSiege();
}
}
return null;
}
private void loadTrapUpgrade(int castleId)
{

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java vendored
View File

@ -96,7 +96,7 @@ public class SkillConditionMasterHandler
SkillConditionHandler.getInstance().registerHandler("OpHaveSummon", OpHaveSummonSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHaveSummonedNpc", OpHaveSummonedNpcSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpHome", OpHomeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiegeTime", OpInSiegeTimeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInSiege", OpInSiegeSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpInstantzone", OpInstantzoneSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpMainjob", OpMainjobSkillCondition::new);
SkillConditionHandler.getInstance().registerHandler("OpNeedAgathion", OpNeedAgathionSkillCondition::new);

6
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java vendored
View File

@ -33,12 +33,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class OpCheckResidenceSkillCondition implements ISkillCondition
{
private final Set<Integer> _residencesId = new HashSet<>();
private final Set<Integer> _residenceIds = new HashSet<>();
private final boolean _isWithin;
public OpCheckResidenceSkillCondition(StatSet params)
{
_residencesId.addAll(params.getList("residencesId", Integer.class));
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
_isWithin = params.getBoolean("isWithin");
}
@ -53,7 +53,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition
final ClanHall clanHall = ClanHallData.getInstance().getClanHallByClan(clan);
if (clanHall != null)
{
return _isWithin ? _residencesId.contains(clanHall.getResidenceId()) : !_residencesId.contains(clanHall.getResidenceId());
return _isWithin ? _residenceIds.contains(clanHall.getResidenceId()) : !_residenceIds.contains(clanHall.getResidenceId());
}
}
}

75
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeSkillCondition.java vendored Normal file
View File

@ -0,0 +1,75 @@
/*
* 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 handlers.skillconditionhandlers;
import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.siege.FortSiege;
import org.l2jmobius.gameserver.model.siege.Siege;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
/**
* @author dontknowdontcare
*/
public class OpInSiegeSkillCondition implements ISkillCondition
{
private final Set<Integer> _residenceIds = new HashSet<>();
public OpInSiegeSkillCondition(StatSet params)
{
_residenceIds.addAll(params.getList("residenceIds", Integer.class));
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
for (int id : _residenceIds)
{
if (valid(caster, id))
{
return true;
}
}
return false;
}
private boolean valid(Creature caster, int id)
{
final FortSiege fortSiege = FortSiegeManager.getInstance().getSiege(id);
if (fortSiege != null)
{
return fortSiege.isInProgress() && fortSiege.getFort().getZone().isInsideZone(caster);
}
final Siege castleSiege = SiegeManager.getInstance().getSiege(id);
if (castleSiege != null)
{
return castleSiege.isInProgress() && castleSiege.getCastle().getZone().isInsideZone(caster);
}
// TODO: Check for clan hall siege
return false;
}
}

40
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java vendored
View File

@ -1,40 +0,0 @@
/*
* 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 handlers.skillconditionhandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.zone.ZoneId;
/**
* @author Mobius
*/
public class OpInSiegeTimeSkillCondition implements ISkillCondition
{
public OpInSiegeTimeSkillCondition(StatSet params)
{
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return caster.isInsideZone(ZoneId.SIEGE);
}
}

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@ -678,7 +678,7 @@
<conditions>
<condition name="CanSummonPet" />
<condition name="OpCheckResidence">
<residencesId>
<residenceIds>
<item>36</item>
<item>37</item>
<item>38</item>
@ -692,7 +692,7 @@
<item>55</item>
<item>56</item>
<item>57</item>
</residencesId>
</residenceIds>
<isWithin>false</isWithin>
</condition>
</conditions>

39
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/15200-15299.xml vendored
View File

@ -1595,10 +1595,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>64</time>
<condition name="OpInSiege">
<residenceIds>
<item>64</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33767</npcId> <!-- Jacquard -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15284" toLevel="1" name="Summon Brakel">
<!-- Summons Brakel, the Herald from the Fortress of Resistance. The Clan Hall Siege for the contestable Fortress of Resistance runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Brakel teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1612,10 +1621,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>21</time>
<condition name="OpInSiege">
<residenceIds>
<item>21</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33769</npcId> <!-- Brakel -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15285" toLevel="1" name="Summon Loken">
<!-- Summons Loken, the Herald from Devastated Castle. The Clan Hall Siege for the contestable Devastated Castle runs between 21:00 and 22:00 on the Friday of the Castle Siege week. Loken teleports you to the battleground, and despawns after 5 min. Cooldown is 30 min. -->
@ -1629,10 +1647,19 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpInSiegeTime">
<time>34</time>
<condition name="OpInSiege">
<residenceIds>
<item>34</item>
</residenceIds>
</condition>
</conditions>
<effects>
<effect name="SummonNpc">
<npcId>33771</npcId> <!-- Loken -->
<npcCount>1</npcCount>
<despawnDelay>300000</despawnDelay>
</effect>
</effects>
</skill>
<skill id="15286" toLevel="1" name="Blood Siphon Master">
<!-- Steals a large portion of the target's HP. -->

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/xsd/skills.xsd vendored
View File

@ -397,7 +397,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="isFemale" type="xs:boolean" />
<xs:element minOccurs="0" name="residencesId">
<xs:element minOccurs="0" name="residenceIds">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="item" type="xs:unsignedByte" />

11
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -184,10 +184,9 @@ public class SkillData implements IXmlReader
/**
* @param addNoble
* @param hasCastle
* @return an array with siege skills. If addNoble == true, will add also Advanced headquarters.
*/
public List<Skill> getSiegeSkills(boolean addNoble, boolean hasCastle)
public List<Skill> getSiegeSkills(boolean addNoble)
{
final List<Skill> temp = new LinkedList<>();
temp.add(_skills.get(getSkillHashCode(CommonSkill.IMPRIT_OF_LIGHT.getId(), 1)));
@ -197,11 +196,9 @@ public class SkillData implements IXmlReader
{
temp.add(_skills.get(getSkillHashCode(326, 1))); // Build Advanced Headquarters
}
if (hasCastle)
{
temp.add(_skills.get(getSkillHashCode(844, 1))); // Outpost Construction
temp.add(_skills.get(getSkillHashCode(845, 1))); // Outpost Demolition
}
temp.add(_skills.get(getSkillHashCode(15283, 1))); // Summon Jacquard
temp.add(_skills.get(getSkillHashCode(15284, 1))); // Summon Brakel
temp.add(_skills.get(getSkillHashCode(15285, 1))); // Summon Loken
return temp;
}

18
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
View File

@ -22,6 +22,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -60,7 +61,7 @@ public class FortSiegeManager
private int _siegeLength = 60; // Time in minute. Changeable in fortsiege.properties
private int _countDownLength = 10; // Time in minute. Changeable in fortsiege.properties
private int _suspiciousMerchantRespawnDelay = 180; // Time in minute. Changeable in fortsiege.properties
private List<FortSiege> _sieges;
private final Map<Integer, FortSiege> _sieges = new ConcurrentHashMap<>();
protected FortSiegeManager()
{
@ -255,18 +256,19 @@ public class FortSiegeManager
return _countDownLength;
}
public List<FortSiege> getSieges()
public Collection<FortSiege> getSieges()
{
if (_sieges == null)
{
_sieges = new CopyOnWriteArrayList<>();
}
return _sieges;
return _sieges.values();
}
public FortSiege getSiege(int fortId)
{
return _sieges.get(fortId);
}
public void addSiege(FortSiege fortSiege)
{
getSieges().add(fortSiege);
_sieges.put(fortSiege.getFort().getResidenceId(), fortSiege);
}
public boolean isCombat(int itemId)

19
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@ -20,6 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@ -64,7 +65,7 @@ public class SiegeManager
public void addSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.addSkill(sk, false);
}
@ -110,7 +111,7 @@ public class SiegeManager
public void removeSiegeSkills(Player character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0))
{
character.removeSkill(sk);
}
@ -263,7 +264,7 @@ public class SiegeManager
return _bloodAllianceReward;
}
public List<Siege> getSieges()
public Collection<Siege> getSieges()
{
final List<Siege> sieges = new LinkedList<>();
for (Castle castle : CastleManager.getInstance().getCastles())
@ -272,6 +273,18 @@ public class SiegeManager
}
return sieges;
}
public Siege getSiege(int castleId)
{
for (Castle castle : CastleManager.getInstance().getCastles())
{
if (castle.getResidenceId() == castleId)
{
return castle.getSiege();
}
}
return null;
}
private void loadTrapUpgrade(int castleId)
{

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