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

Partial sync L2jUnity free release Feb 20th 2015.

Browse Source
This commit is contained in:
MobiusDev
2016-10-28 08:58:02 +00:00
parent 4628bd3d86
commit 01a48c62cd
219 changed files with 1825 additions and 2935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_Test/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java vendored
View File

@@ -58,11 +58,11 @@ public final class DevastatedCastle extends ClanHallSiegeEngine
{
if (npc.getId() == MIKHAIL)
{
broadcastNpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.GLORY_TO_ADEN_THE_KINGDOM_OF_THE_LION_GLORY_TO_SIR_GUSTAV_OUR_IMMORTAL_LORD);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.GLORY_TO_ADEN_THE_KINGDOM_OF_THE_LION_GLORY_TO_SIR_GUSTAV_OUR_IMMORTAL_LORD);
}
else if (npc.getId() == DIETRICH)
{
broadcastNpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.SOLDIERS_OF_GUSTAV_GO_FORTH_AND_DESTROY_THE_INVADERS);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.SOLDIERS_OF_GUSTAV_GO_FORTH_AND_DESTROY_THE_INVADERS);
}
return null;
}
@@ -94,7 +94,7 @@ public final class DevastatedCastle extends ClanHallSiegeEngine
if ((npc.getCurrentHp() < GUSTAV_TRIGGER_HP) && (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST))
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.THIS_IS_UNBELIEVABLE_HAVE_I_REALLY_BEEN_DEFEATED_I_SHALL_RETURN_AND_TAKE_YOUR_HEAD);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_UNBELIEVABLE_HAVE_I_REALLY_BEEN_DEFEATED_I_SHALL_RETURN_AND_TAKE_YOUR_HEAD);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, SkillData.getInstance().getSkill(4235, 1), npc);
}
}

10
L2J_Mobius_Test/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java vendored
View File

@@ -61,15 +61,15 @@ public final class FortressOfTheDead extends ClanHallSiegeEngine
{
if (npc.getId() == LIDIA)
{
broadcastNpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.HMM_THOSE_WHO_ARE_NOT_OF_THE_BLOODLINE_ARE_COMING_THIS_WAY_TO_TAKE_OVER_THE_CASTLE_HUMPH_THE_BITTER_GRUDGES_OF_THE_DEAD_YOU_MUST_NOT_MAKE_LIGHT_OF_THEIR_POWER);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.HMM_THOSE_WHO_ARE_NOT_OF_THE_BLOODLINE_ARE_COMING_THIS_WAY_TO_TAKE_OVER_THE_CASTLE_HUMPH_THE_BITTER_GRUDGES_OF_THE_DEAD_YOU_MUST_NOT_MAKE_LIGHT_OF_THEIR_POWER);
}
else if (npc.getId() == ALFRED)
{
broadcastNpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.HEH_HEH_I_SEE_THAT_THE_FEAST_HAS_BEGUN_BE_WARY_THE_CURSE_OF_THE_HELLMANN_FAMILY_HAS_POISONED_THIS_LAND);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.HEH_HEH_I_SEE_THAT_THE_FEAST_HAS_BEGUN_BE_WARY_THE_CURSE_OF_THE_HELLMANN_FAMILY_HAS_POISONED_THIS_LAND);
}
else if (npc.getId() == GISELLE)
{
broadcastNpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.ARISE_MY_FAITHFUL_SERVANTS_YOU_MY_PEOPLE_WHO_HAVE_INHERITED_THE_BLOOD_IT_IS_THE_CALLING_OF_MY_DAUGHTER_THE_FEAST_OF_BLOOD_WILL_NOW_BEGIN);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.ARISE_MY_FAITHFUL_SERVANTS_YOU_MY_PEOPLE_WHO_HAVE_INHERITED_THE_BLOOD_IT_IS_THE_CALLING_OF_MY_DAUGHTER_THE_FEAST_OF_BLOOD_WILL_NOW_BEGIN);
}
return null;
}
@@ -114,11 +114,11 @@ public final class FortressOfTheDead extends ClanHallSiegeEngine
if ((npcId == ALFRED) || (npcId == GISELLE))
{
broadcastNpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.AARGH_IF_I_DIE_THEN_THE_MAGIC_FORCE_FIELD_OF_BLOOD_WILL);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.AARGH_IF_I_DIE_THEN_THE_MAGIC_FORCE_FIELD_OF_BLOOD_WILL);
}
if (npcId == LIDIA)
{
broadcastNpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.GRARR_FOR_THE_NEXT_2_MINUTES_OR_SO_THE_GAME_ARENA_ARE_WILL_BE_CLEANED_THROW_ANY_ITEMS_YOU_DON_T_NEED_TO_THE_FLOOR_NOW);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.GRARR_FOR_THE_NEXT_2_MINUTES_OR_SO_THE_GAME_ARENA_ARE_WILL_BE_CLEANED_THROW_ANY_ITEMS_YOU_DON_T_NEED_TO_THE_FLOOR_NOW);
_missionAccomplished = true;
synchronized (this)
{

19
L2J_Mobius_Test/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java vendored
View File

@@ -24,8 +24,10 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config;
@@ -53,7 +55,6 @@ import com.l2jmobius.gameserver.model.entity.clanhall.SiegeStatus;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.util.Broadcast;
import com.l2jmobius.gameserver.util.Util;
@@ -262,7 +263,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
static Map<Integer, Long> _warDecreesCount = new HashMap<>();
static List<L2Clan> _acceptedClans = new ArrayList<>(4);
private static Map<String, ArrayList<L2Clan>> _usedTextPassages = new HashMap<>();
private static Map<String, Set<L2Clan>> _usedTextPassages = new HashMap<>();
private static Map<L2Clan, Integer> _pendingItemToGet = new HashMap<>();
static SiegableHall _rainbow;
@@ -536,7 +537,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
if (_usedTextPassages.containsKey(passage))
{
final ArrayList<L2Clan> list = _usedTextPassages.get(passage);
Set<L2Clan> list = _usedTextPassages.get(passage);
if (list.contains(clan))
{
@@ -790,22 +791,24 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
private static void shoutRandomText(L2Npc npc)
{
final int length = _textPassages.length;
int length = _textPassages.length;
if (_usedTextPassages.size() >= length)
{
return;
}
final int randomPos = getRandom(length);
if (_usedTextPassages.containsKey(_textPassages[randomPos]))
int randomPos = getRandom(length);
String message = _textPassages[randomPos];
if (_usedTextPassages.containsKey(message))
{
shoutRandomText(npc);
}
else
{
_usedTextPassages.put(_textPassages[randomPos], new ArrayList<L2Clan>());
npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_SHOUT, npc.getId(), _textPassages[randomPos]));
_usedTextPassages.put(message, new HashSet<>());
npc.broadcastSay(ChatType.NPC_SHOUT, message);
}
}