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

Partial sync latest Test changes to HighFive.

Browse Source
This commit is contained in:
MobiusDev
2016-10-28 08:59:28 +00:00
parent 01a48c62cd
commit 2555bab9e7
56 changed files with 212 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Amaskari.java vendored
View File

@@ -76,7 +76,7 @@ public final class Amaskari extends AbstractNpcAI
{
if (event.equalsIgnoreCase("stop_toggle"))
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, AMASKARI_NPCSTRING_ID[2]);
npc.broadcastSay(ChatType.NPC_GENERAL, AMASKARI_NPCSTRING_ID[2]);
((L2MonsterInstance) npc).clearAggroList();
((L2MonsterInstance) npc).getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
npc.setIsInvul(false);
@@ -86,11 +86,11 @@ public final class Amaskari extends AbstractNpcAI
{
if (getRandom(100) > 20)
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, MINIONS_NPCSTRING_ID[2]);
npc.broadcastSay(ChatType.NPC_GENERAL, MINIONS_NPCSTRING_ID[2]);
}
else if (getRandom(100) > 40)
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, MINIONS_NPCSTRING_ID[3]);
npc.broadcastSay(ChatType.NPC_GENERAL, MINIONS_NPCSTRING_ID[3]);
}
startQuestTimer("onspawn_msg", (getRandom(8) + 1) * 30000, npc, null);
}
@@ -102,12 +102,12 @@ public final class Amaskari extends AbstractNpcAI
{
if ((npc.getId() == AMASKARI) && (getRandom(1000) < 25))
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, AMASKARI_NPCSTRING_ID[0]);
npc.broadcastSay(ChatType.NPC_GENERAL, AMASKARI_NPCSTRING_ID[0]);
for (L2MonsterInstance minion : ((L2MonsterInstance) npc).getMinionList().getSpawnedMinions())
{
if ((minion != null) && !minion.isDead() && (getRandom(10) == 0))
{
broadcastNpcSay(minion, ChatType.NPC_GENERAL, MINIONS_NPCSTRING_ID[0]);
minion.broadcastSay(ChatType.NPC_GENERAL, MINIONS_NPCSTRING_ID[0]);
minion.setCurrentHp(minion.getCurrentHp() - (minion.getCurrentHp() / 5));
}
}
@@ -123,7 +123,7 @@ public final class Amaskari extends AbstractNpcAI
final L2MonsterInstance master = ((L2MonsterInstance) npc).getLeader();
if ((master != null) && !master.isDead())
{
broadcastNpcSay(master, ChatType.NPC_GENERAL, AMASKARI_NPCSTRING_ID[1]);
master.broadcastSay(ChatType.NPC_GENERAL, AMASKARI_NPCSTRING_ID[1]);
final BuffInfo info = master.getEffectList().getBuffInfoBySkillId(BUFF_ID);
if ((info != null) && (info.getSkill().getAbnormalLvl() == 3) && master.isInvul())
{
@@ -143,7 +143,7 @@ public final class Amaskari extends AbstractNpcAI
}
else
{
broadcastNpcSay(master, ChatType.NPC_GENERAL, AMASKARI_NPCSTRING_ID[3]);
master.broadcastSay(ChatType.NPC_GENERAL, AMASKARI_NPCSTRING_ID[3]);
// master.doCast(INVINCIBILITY.getSkill())
master.setIsInvul(true);
startQuestTimer("stop_toggle", 10000, master, null);
@@ -159,7 +159,7 @@ public final class Amaskari extends AbstractNpcAI
{
if (getRandom(1000) > 300)
{
broadcastNpcSay(minion, ChatType.NPC_GENERAL, MINIONS_NPCSTRING_ID[1]);
minion.broadcastSay(ChatType.NPC_GENERAL, MINIONS_NPCSTRING_ID[1]);
}
HellboundEngine.getInstance().updateTrust(30, true);
minion.deleteMe();

4
L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Keltas.java vendored
View File

@@ -159,7 +159,7 @@ public final class Keltas extends AbstractNpcAI
final L2Npc keltas = _spawnedKeltas;
if ((keltas != null) && !keltas.isDead())
{
broadcastNpcSay(keltas, ChatType.NPC_SHOUT, NpcStringId.THAT_IS_IT_FOR_TODAY_LET_S_RETREAT_EVERYONE_PULL_BACK);
keltas.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.THAT_IS_IT_FOR_TODAY_LET_S_RETREAT_EVERYONE_PULL_BACK);
keltas.deleteMe();
keltas.getSpawn().decreaseCount(keltas);
despawnMinions();
@@ -180,7 +180,7 @@ public final class Keltas extends AbstractNpcAI
public final String onSpawn(L2Npc npc)
{
_spawnedKeltas = (L2MonsterInstance) npc;
broadcastNpcSay(_spawnedKeltas, ChatType.NPC_SHOUT, NpcStringId.GUYS_SHOW_THEM_OUR_POWER);
_spawnedKeltas.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.GUYS_SHOW_THEM_OUR_POWER);
spawnMinions();
startQuestTimer("despawn", 1800000, null, null);
return super.onSpawn(npc);

4
L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Natives/Natives.java vendored
View File

@@ -108,7 +108,7 @@ public final class Natives extends AbstractNpcAI
if (getQuestItemsCount(player, MARK_OF_BETRAYAL) >= 10)
{
takeItems(player, MARK_OF_BETRAYAL, 10);
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.ALRIGHT_NOW_LEODAS_IS_YOURS);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALRIGHT_NOW_LEODAS_IS_YOURS);
HellboundEngine.getInstance().updateTrust(-50, true);
for (int doorId : DOORS)
@@ -146,7 +146,7 @@ public final class Natives extends AbstractNpcAI
}
else if ((npc.getId() == NATIVE) && event.equalsIgnoreCase("hungry_death"))
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.HUN_HUNGRY);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HUN_HUNGRY);
npc.doDie(null);
}
else if (npc.getId() == INCASTLE)

4
L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Quarry/Quarry.java vendored
View File

@@ -101,7 +101,7 @@ public final class Quarry extends AbstractNpcAI
return null;
}
}
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.HUN_HUNGRY);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HUN_HUNGRY);
npc.doDie(npc);
break;
}
@@ -174,7 +174,7 @@ public final class Quarry extends AbstractNpcAI
startQuestTimer("DECAY", 1000, npc, null);
try
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.THANK_YOU_FOR_THE_RESCUE_IT_S_A_SMALL_GIFT);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THANK_YOU_FOR_THE_RESCUE_IT_S_A_SMALL_GIFT);
}
catch (Exception e)
{

2
L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Ranku.java vendored
View File

@@ -77,7 +77,7 @@ public final class Ranku extends AbstractNpcAI
{
if ((minion != null) && !minion.isDead() && !MY_TRACKING_SET.contains(minion.getObjectId()))
{
broadcastNpcSay(minion, ChatType.NPC_GENERAL, NpcStringId.DON_T_KILL_ME_PLEASE_SOMETHING_S_STRANGLING_ME);
minion.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DON_T_KILL_ME_PLEASE_SOMETHING_S_STRANGLING_ME);
startQuestTimer("checkup", 1000, npc, null);
MY_TRACKING_SET.add(minion.getObjectId());
}

2
L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Slaves.java vendored
View File

@@ -79,7 +79,7 @@ public final class Slaves extends AbstractNpcAI
slave.clearAggroList();
slave.abortAttack();
slave.abortCast();
broadcastNpcSay(slave, ChatType.NPC_GENERAL, NpcStringId.THANK_YOU_FOR_SAVING_ME_FROM_THE_CLUTCHES_OF_EVIL);
slave.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THANK_YOU_FOR_SAVING_ME_FROM_THE_CLUTCHES_OF_EVIL);
if ((HellboundEngine.getInstance().getLevel() >= 1) && (HellboundEngine.getInstance().getLevel() <= 2))
{

4
L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java vendored
View File

@@ -139,7 +139,7 @@ public final class AnomicFoundry extends AbstractNpcAI
int atkIndex = _atkIndex.containsKey(npc.getObjectId()) ? _atkIndex.get(npc.getObjectId()) : 0;
if (atkIndex == 0)
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.ENEMY_INVASION_HURRY_UP);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ENEMY_INVASION_HURRY_UP);
cancelQuestTimer("return_laborer", npc, null);
startQuestTimer("return_laborer", 60000, npc, null);
@@ -180,7 +180,7 @@ public final class AnomicFoundry extends AbstractNpcAI
{
if (getRandom(10000) < 8000)
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.PROCESS_SHOULDN_T_BE_DELAYED_BECAUSE_OF_ME);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.PROCESS_SHOULDN_T_BE_DELAYED_BECAUSE_OF_ME);
if (respawnTime < respawnMax)
{
respawnTime += 10000;

4
L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java vendored
View File

@@ -586,7 +586,7 @@ public final class TowerOfNaia extends AbstractNpcAI
MinionList.spawnMinion(_lock, 18493);
MinionList.spawnMinion(_lock, 18493);
}
broadcastNpcSay(_controller, ChatType.NPC_GENERAL, NpcStringId.EMERGENCY_EMERGENCY_THE_OUTER_WALL_IS_WEAKENING_RAPIDLY);
_controller.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMERGENCY_EMERGENCY_THE_OUTER_WALL_IS_WEAKENING_RAPIDLY);
_counter -= 10;
}
}
@@ -690,7 +690,7 @@ public final class TowerOfNaia extends AbstractNpcAI
{
if ((spore != null) && !spore.isDead() && (spore.getId() == npcId))
{
broadcastNpcSay(spore, ChatType.NPC_GENERAL, SPORES_NPCSTRING_ID[getRandom(4)], el);
spore.broadcastSay(ChatType.NPC_GENERAL, SPORES_NPCSTRING_ID[getRandom(4)], el);
}
}
}

24
L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java vendored
View File

@@ -570,7 +570,7 @@ public final class TullyWorkshop extends AbstractNpcAI
{
if (postMortemSpawn.indexOf(npc) == 11)
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.HA_HA_YOU_WERE_SO_AFRAID_OF_DEATH_LET_ME_SEE_IF_YOU_FIND_ME_IN_TIME_MAYBE_YOU_CAN_FIND_A_WAY);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HA_HA_YOU_WERE_SO_AFRAID_OF_DEATH_LET_ME_SEE_IF_YOU_FIND_ME_IN_TIME_MAYBE_YOU_CAN_FIND_A_WAY);
npc.deleteMe();
return null;
}
@@ -744,7 +744,7 @@ public final class TullyWorkshop extends AbstractNpcAI
if (event.equalsIgnoreCase("repair_device"))
{
broadcastNpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.DE_ACTIVATE_THE_ALARM);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.DE_ACTIVATE_THE_ALARM);
brokenContraptions.remove(npc.getObjectId());
}
else if (event.equalsIgnoreCase("despawn_servant") && !npc.isDead())
@@ -1221,7 +1221,7 @@ public final class TullyWorkshop extends AbstractNpcAI
{
if ((_npc != null) && (_npc.getId() == INGENIOUS_CONTRAPTION))
{
broadcastNpcSay(_npc, ChatType.NPC_SHOUT, NpcStringId.S1_MINUTE_S_ARE_REMAINING, Integer.toString((countdownTime / 60000)));
_npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.S1_MINUTE_S_ARE_REMAINING, Integer.toString((countdownTime / 60000)));
}
}
}
@@ -1255,35 +1255,35 @@ public final class TullyWorkshop extends AbstractNpcAI
{
if ((_npc != null) && (_npc.getId() == INGENIOUS_CONTRAPTION))
{
broadcastNpcSay(_npc, ChatType.NPC_SHOUT, NpcStringId.S1_SECOND_S_REMAINING, Integer.toString((countdownTime / 1000)));
_npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.S1_SECOND_S_REMAINING, Integer.toString((countdownTime / 1000)));
}
}
}, 60000, 10000);
broadcastNpcSay(postMortemSpawn.get(0), ChatType.NPC_SHOUT, NpcStringId.DETONATOR_INITIALIZATION_TIME_SET_FOR_S1_MINUTE_S_FROM_NOW, Integer.toString((countdownTime / 60000)));
postMortemSpawn.get(0).broadcastSay(ChatType.NPC_SHOUT, NpcStringId.DETONATOR_INITIALIZATION_TIME_SET_FOR_S1_MINUTE_S_FROM_NOW, Integer.toString((countdownTime / 60000)));
}
else if ((npcId == TIMETWISTER_GOLEM) && (_countdown != null))
{
if (getRandom(1000) >= 700)
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.A_FATAL_ERROR_HAS_OCCURRED);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.A_FATAL_ERROR_HAS_OCCURRED);
if (countdownTime > 180000)
{
countdownTime = Math.max(countdownTime - 180000, 60000);
if ((postMortemSpawn != null) && (postMortemSpawn.size() > 0) && (postMortemSpawn.get(0) != null) && (postMortemSpawn.get(0).getId() == INGENIOUS_CONTRAPTION))
{
broadcastNpcSay(postMortemSpawn.get(0), ChatType.NPC_SHOUT, NpcStringId.ZZZZ_CITY_INTERFERENCE_ERROR_FORWARD_EFFECT_CREATED);
postMortemSpawn.get(0).broadcastSay(ChatType.NPC_SHOUT, NpcStringId.ZZZZ_CITY_INTERFERENCE_ERROR_FORWARD_EFFECT_CREATED);
}
}
}
else
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.TIME_RIFT_DEVICE_ACTIVATION_SUCCESSFUL);
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIME_RIFT_DEVICE_ACTIVATION_SUCCESSFUL);
if ((countdownTime > 0) && (countdownTime <= 420000))
{
countdownTime += 180000;
if ((postMortemSpawn != null) && (postMortemSpawn.size() > 0) && (postMortemSpawn.get(0) != null) && (postMortemSpawn.get(0).getId() == INGENIOUS_CONTRAPTION))
{
broadcastNpcSay(postMortemSpawn.get(0), ChatType.NPC_SHOUT, NpcStringId.ZZZZ_CITY_INTERFERENCE_ERROR_RECURRENCE_EFFECT_CREATED);
postMortemSpawn.get(0).broadcastSay(ChatType.NPC_SHOUT, NpcStringId.ZZZZ_CITY_INTERFERENCE_ERROR_RECURRENCE_EFFECT_CREATED);
}
}
}
@@ -1365,11 +1365,11 @@ public final class TullyWorkshop extends AbstractNpcAI
if (((npc.getId() - 22404) == 3) || ((npc.getId() - 22404) == 6))
{
broadcastNpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.I_FAILED_PLEASE_FORGIVE_ME_DARION);
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.I_FAILED_PLEASE_FORGIVE_ME_DARION);
}
else
{
broadcastNpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.S1_I_LL_BE_BACK_DON_T_GET_COMFORTABLE, killer.getName());
npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.S1_I_LL_BE_BACK_DON_T_GET_COMFORTABLE, killer.getName());
}
}
else if (((npcId == TEMENIR) || (npcId == DRAXIUS) || (npcId == KIRETCENAH)) && spawnedFollowers.contains(npc))
@@ -1444,7 +1444,7 @@ public final class TullyWorkshop extends AbstractNpcAI
}
else if ((npcId >= SERVANT_FIRST) && (npcId <= SERVANT_LAST) && (skillId == 5392))
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.S1_THANK_YOU_FOR_GIVING_ME_YOUR_LIFE, player.getName());
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.S1_THANK_YOU_FOR_GIVING_ME_YOUR_LIFE, player.getName());
final int dmg = (int) (player.getCurrentHp() / (npc.getId() - 22404));
player.reduceCurrentHp(dmg, null, null);
npc.setCurrentHp((npc.getCurrentHp() + 10) - (npc.getId() - 22404));

12
L2J_Mobius_HighFive/dist/game/data/scripts/hellbound/Instances/UrbanArea/UrbanArea.java vendored
View File

@@ -198,8 +198,8 @@ public final class UrbanArea extends AbstractInstance
{
if (!npc.isAffectedBySkill(STONE.getSkillId()) || world.isAmaskariDead)
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[0]);
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[2]);
npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[0]);
npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[2]);
}
else
{
@@ -209,8 +209,8 @@ public final class UrbanArea extends AbstractInstance
npc.stopSkillEffects(false, STONE.getSkillId());
}
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[0]);
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[1]);
npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[0]);
npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[1]);
HellboundEngine.getInstance().updateTrust(10, true);
npc.scheduleDespawn(3000);
// Try to call Amaskari
@@ -258,7 +258,7 @@ public final class UrbanArea extends AbstractInstance
if (!npc.isBusy())
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NPCSTRING_ID[0]);
npc.broadcastSay(ChatType.NPC_GENERAL, NPCSTRING_ID[0]);
npc.setBusy(true);
if ((world.spawnedAmaskari != null) && !world.spawnedAmaskari.isDead() && (getRandom(1000) < 25) && Util.checkIfInRange(1000, npc, world.spawnedAmaskari, false))
@@ -302,7 +302,7 @@ public final class UrbanArea extends AbstractInstance
}
if (msgId >= 0)
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NPCSTRING_ID[msgId], range);
npc.broadcastSay(ChatType.NPC_GENERAL, NPCSTRING_ID[msgId], range);
}
npc.setBusy(true);
npc.setBusyMessage("atk");