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

2
L2J_Mobius_Classic_1.0/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_Classic_1.0/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_Classic_1.0/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_Classic_1.0/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_Classic_1.0/dist/game/data/stats/skills/02000-02099.xml vendored
View File

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

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

@@ -377,7 +377,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" />

18
L2J_Mobius_Classic_1.0/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)

15
L2J_Mobius_Classic_1.0/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;
@@ -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();