Added missing Benusta random reward in some instances.

Contributed by CostyKiller.
This commit is contained in:
MobiusDevelopment 2022-07-05 07:38:36 +00:00
parent 637bf5f0a4
commit 0e06cf26aa
12 changed files with 135 additions and 22 deletions

View File

@ -55,8 +55,9 @@ public class BaylorWarzone extends AbstractInstance
// Skills
private static final SkillHolder INVIS_NPC_SOCIAL_SKILL = new SkillHolder(5401, 1);
private static final SkillHolder BAYLOR_SOCIAL_SKILL = new SkillHolder(5402, 1);
// Item
// Items
private static final ItemHolder BENUSTAS_REWARD_BOX = new ItemHolder(81151, 1);
private static final ItemHolder BENUSTAS_SHINING_REWARD_BOX = new ItemHolder(81452, 1);
// Locations
private static final Location BATTLE_PORT = new Location(153567, 143319, -12736);
// Misc
@ -333,6 +334,7 @@ public class BaylorWarzone extends AbstractInstance
@Override
public void onInstanceCreated(Instance instance, Player player)
{
instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
getTimers().addTimer("BATTLE_PORT", 3000, e ->
{
instance.getPlayers().forEach(p -> p.teleToLocation(BATTLE_PORT));
@ -352,6 +354,11 @@ public class BaylorWarzone extends AbstractInstance
{
giveItems(member, BENUSTAS_REWARD_BOX);
}
final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer();
if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{
giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX);
}
world.finishInstance();
}
else

View File

@ -115,8 +115,9 @@ public class AshenShadowRevolutionaries extends AbstractInstance
23652, // Unit Guard
34103, // Revolutionaries Altar
};
// Item
// Items
private static final ItemHolder BENUSTAS_REWARD_BOX = new ItemHolder(81151, 1);
private static final ItemHolder BENUSTAS_SHINING_REWARD_BOX = new ItemHolder(81452, 1);
// Locations
private static final Location QUEST_GIVER_LOCATION = new Location(-77648, 155665, -3190, 21220);
private static final Location COMMANDER_LOCATION_1 = new Location(-81911, 154244, -3177);
@ -292,6 +293,12 @@ public class AshenShadowRevolutionaries extends AbstractInstance
return npc.getId() + ".html";
}
@Override
public void onInstanceCreated(Instance instance, Player player)
{
instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
}
@Override
public String onKill(Npc npc, Player player, boolean isSummon)
{
@ -300,6 +307,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
{
return null;
}
final int id = npc.getId();
if (id == SIGNALMAN)
{
@ -329,6 +337,11 @@ public class AshenShadowRevolutionaries extends AbstractInstance
{
giveItems(member, BENUSTAS_REWARD_BOX);
}
final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer();
if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{
giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX);
}
world.spawnGroup("wave_3");
world.finishInstance();
}

View File

@ -41,11 +41,10 @@ public class NightmareKamaloka extends AbstractInstance
private static final int BENUSTA = 34542;
private static final int DARK_RIDER = 26102;
private static final int INVISIBLE_NPC = 18919;
// Item
// Items
private static final ItemHolder BENUSTAS_REWARD_BOX = new ItemHolder(81151, 1);
// Skills
// private static final int DARK_RIDER_UD = 16574;
//@formatter:off
private static final ItemHolder BENUSTAS_SHINING_REWARD_BOX = new ItemHolder(81452, 1);
// Misc
private static final Map<Integer, Integer> BOSS_MAP = new HashMap<>();
static
{
@ -55,8 +54,6 @@ public class NightmareKamaloka extends AbstractInstance
BOSS_MAP.put(26099, 18170008); // Sirra
BOSS_MAP.put(DARK_RIDER, -1); // Dark Rider
}
//@formatter:on
// Misc
private static final int TEMPLATE_ID = 258;
public NightmareKamaloka()
@ -65,7 +62,6 @@ public class NightmareKamaloka extends AbstractInstance
addStartNpc(BENUSTA);
addTalkId(BENUSTA);
addSpawnId(INVISIBLE_NPC);
// addAttackId(DARK_RIDER_UD);
addKillId(BOSS_MAP.keySet());
}
@ -149,6 +145,12 @@ public class NightmareKamaloka extends AbstractInstance
return super.onSpawn(npc);
}
@Override
public void onInstanceCreated(Instance instance, Player player)
{
instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
}
@Override
public String onKill(Npc npc, Player killer, boolean isSummon)
{
@ -162,6 +164,11 @@ public class NightmareKamaloka extends AbstractInstance
{
giveItems(member, BENUSTAS_REWARD_BOX);
}
final Player randomPlayer = instance.getFirstPlayer().getParty().getRandomPlayer();
if ((randomPlayer != null) && (getRandom(100) < 80) && (instance.getPlayersCount() == instance.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{
giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX);
}
instance.finishInstance();
}
else
@ -172,13 +179,6 @@ public class NightmareKamaloka extends AbstractInstance
return super.onKill(npc, killer, isSummon);
}
/*
* @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { if (npc.getId() == DARK_RIDER_UD) { if ((npc.getCurrentHpPercent() >= 95) && npc.isScriptValue(0)) {
* npc.doCast(SkillData.getInstance().getSkill(DARK_RIDER_UD, 1)); npc.setScriptValue(1); } else if ((npc.getCurrentHpPercent() >= 75) && npc.isScriptValue(1)) { npc.doCast(SkillData.getInstance().getSkill(DARK_RIDER_UD, 2)); npc.setScriptValue(2); } else if ((npc.getCurrentHpPercent() >= 50) &&
* npc.isScriptValue(2)) { npc.doCast(SkillData.getInstance().getSkill(DARK_RIDER_UD, 3)); npc.setScriptValue(3); } else if ((npc.getCurrentHpPercent() >= 25) && npc.isScriptValue(3)) { npc.doCast(SkillData.getInstance().getSkill(DARK_RIDER_UD, 4)); npc.setScriptValue(4); } } } return
* super.onAttack(npc, attacker, damage, isSummon); }
*/
public static void main(String[] args)
{
new NightmareKamaloka();

View File

@ -47,7 +47,7 @@ public class BaylorWarzone extends AbstractInstance
{
// NPCs
private static final int BAYLOR = 29213;
private static final int BAYLOR_110 = 29186;
private static final int BAYLOR_110 = 29380;
private static final int PRISON_GUARD = 29104;
private static final int BENUSTA = 34542;
private static final int INVISIBLE_NPC_1 = 29106;
@ -56,8 +56,9 @@ public class BaylorWarzone extends AbstractInstance
// Skills
private static final SkillHolder INVIS_NPC_SOCIAL_SKILL = new SkillHolder(5401, 1);
private static final SkillHolder BAYLOR_SOCIAL_SKILL = new SkillHolder(5402, 1);
// Item
// Items
private static final ItemHolder BENUSTAS_REWARD_BOX = new ItemHolder(81151, 1);
private static final ItemHolder BENUSTAS_SHINING_REWARD_BOX = new ItemHolder(81452, 1);
private static final ItemHolder BENUSTAS_REWARD_BOX_110 = new ItemHolder(81741, 1);
// Locations
private static final Location BATTLE_PORT = new Location(153567, 143319, -12736);
@ -344,6 +345,7 @@ public class BaylorWarzone extends AbstractInstance
@Override
public void onInstanceCreated(Instance instance, Player player)
{
instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
getTimers().addTimer("BATTLE_PORT", 3000, e ->
{
instance.getPlayers().forEach(p -> p.teleToLocation(BATTLE_PORT));
@ -364,6 +366,11 @@ public class BaylorWarzone extends AbstractInstance
{
giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110);
}
final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer();
if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{
giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX);
}
world.finishInstance();
}
else

View File

@ -148,6 +148,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
};
// Items
private static final ItemHolder BENUSTAS_REWARD_BOX = new ItemHolder(81151, 1);
private static final ItemHolder BENUSTAS_SHINING_REWARD_BOX = new ItemHolder(81452, 1);
private static final ItemHolder BENUSTAS_REWARD_BOX_110 = new ItemHolder(81741, 1);
// Locations
private static final Location QUEST_GIVER_LOCATION = new Location(-77648, 155665, -3190, 21220);
@ -333,6 +334,12 @@ public class AshenShadowRevolutionaries extends AbstractInstance
return npc.getId() + ".html";
}
@Override
public void onInstanceCreated(Instance instance, Player player)
{
instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
}
@Override
public String onKill(Npc npc, Player player, boolean isSummon)
{
@ -375,6 +382,11 @@ public class AshenShadowRevolutionaries extends AbstractInstance
{
giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110);
}
final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer();
if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{
giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX);
}
world.spawnGroup("wave_3");
world.finishInstance();
}

View File

@ -44,6 +44,7 @@ public class NightmareKamaloka extends AbstractInstance
private static final int INVISIBLE_NPC = 18919;
// Items
private static final ItemHolder BENUSTAS_REWARD_BOX = new ItemHolder(81151, 1);
private static final ItemHolder BENUSTAS_SHINING_REWARD_BOX = new ItemHolder(81452, 1);
private static final ItemHolder BENUSTAS_REWARD_BOX_110 = new ItemHolder(81741, 1);
// Misc
private static final Map<Integer, Integer> BOSS_MAP = new HashMap<>();
@ -159,6 +160,12 @@ public class NightmareKamaloka extends AbstractInstance
return super.onSpawn(npc);
}
@Override
public void onInstanceCreated(Instance instance, Player player)
{
instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
}
@Override
public String onKill(Npc npc, Player killer, boolean isSummon)
{
@ -172,6 +179,11 @@ public class NightmareKamaloka extends AbstractInstance
{
giveItems(member, instance.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110);
}
final Player randomPlayer = instance.getFirstPlayer().getParty().getRandomPlayer();
if ((randomPlayer != null) && (getRandom(100) < 80) && (instance.getPlayersCount() == instance.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{
giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX);
}
instance.finishInstance();
}
else

View File

@ -47,7 +47,7 @@ public class BaylorWarzone extends AbstractInstance
{
// NPCs
private static final int BAYLOR = 29213;
private static final int BAYLOR_110 = 29186;
private static final int BAYLOR_110 = 29380;
private static final int PRISON_GUARD = 29104;
private static final int BENUSTA = 34542;
private static final int INVISIBLE_NPC_1 = 29106;
@ -56,8 +56,9 @@ public class BaylorWarzone extends AbstractInstance
// Skills
private static final SkillHolder INVIS_NPC_SOCIAL_SKILL = new SkillHolder(5401, 1);
private static final SkillHolder BAYLOR_SOCIAL_SKILL = new SkillHolder(5402, 1);
// Item
// Items
private static final ItemHolder BENUSTAS_REWARD_BOX = new ItemHolder(81151, 1);
private static final ItemHolder BENUSTAS_SHINING_REWARD_BOX = new ItemHolder(81452, 1);
private static final ItemHolder BENUSTAS_REWARD_BOX_110 = new ItemHolder(81741, 1);
// Locations
private static final Location BATTLE_PORT = new Location(153567, 143319, -12736);
@ -344,6 +345,7 @@ public class BaylorWarzone extends AbstractInstance
@Override
public void onInstanceCreated(Instance instance, Player player)
{
instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
getTimers().addTimer("BATTLE_PORT", 3000, e ->
{
instance.getPlayers().forEach(p -> p.teleToLocation(BATTLE_PORT));
@ -364,6 +366,11 @@ public class BaylorWarzone extends AbstractInstance
{
giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110);
}
final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer();
if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{
giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX);
}
world.finishInstance();
}
else

View File

@ -148,6 +148,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
};
// Items
private static final ItemHolder BENUSTAS_REWARD_BOX = new ItemHolder(81151, 1);
private static final ItemHolder BENUSTAS_SHINING_REWARD_BOX = new ItemHolder(81452, 1);
private static final ItemHolder BENUSTAS_REWARD_BOX_110 = new ItemHolder(81741, 1);
// Locations
private static final Location QUEST_GIVER_LOCATION = new Location(-77648, 155665, -3190, 21220);
@ -333,6 +334,12 @@ public class AshenShadowRevolutionaries extends AbstractInstance
return npc.getId() + ".html";
}
@Override
public void onInstanceCreated(Instance instance, Player player)
{
instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
}
@Override
public String onKill(Npc npc, Player player, boolean isSummon)
{
@ -375,6 +382,11 @@ public class AshenShadowRevolutionaries extends AbstractInstance
{
giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110);
}
final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer();
if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{
giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX);
}
world.spawnGroup("wave_3");
world.finishInstance();
}

View File

@ -44,6 +44,7 @@ public class NightmareKamaloka extends AbstractInstance
private static final int INVISIBLE_NPC = 18919;
// Items
private static final ItemHolder BENUSTAS_REWARD_BOX = new ItemHolder(81151, 1);
private static final ItemHolder BENUSTAS_SHINING_REWARD_BOX = new ItemHolder(81452, 1);
private static final ItemHolder BENUSTAS_REWARD_BOX_110 = new ItemHolder(81741, 1);
// Misc
private static final Map<Integer, Integer> BOSS_MAP = new HashMap<>();
@ -159,6 +160,12 @@ public class NightmareKamaloka extends AbstractInstance
return super.onSpawn(npc);
}
@Override
public void onInstanceCreated(Instance instance, Player player)
{
instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
}
@Override
public String onKill(Npc npc, Player killer, boolean isSummon)
{
@ -172,6 +179,11 @@ public class NightmareKamaloka extends AbstractInstance
{
giveItems(member, instance.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110);
}
final Player randomPlayer = instance.getFirstPlayer().getParty().getRandomPlayer();
if ((randomPlayer != null) && (getRandom(100) < 80) && (instance.getPlayersCount() == instance.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{
giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX);
}
instance.finishInstance();
}
else

View File

@ -47,7 +47,7 @@ public class BaylorWarzone extends AbstractInstance
{
// NPCs
private static final int BAYLOR = 29213;
private static final int BAYLOR_110 = 29186;
private static final int BAYLOR_110 = 29380;
private static final int PRISON_GUARD = 29104;
private static final int BENUSTA = 34542;
private static final int INVISIBLE_NPC_1 = 29106;
@ -56,8 +56,9 @@ public class BaylorWarzone extends AbstractInstance
// Skills
private static final SkillHolder INVIS_NPC_SOCIAL_SKILL = new SkillHolder(5401, 1);
private static final SkillHolder BAYLOR_SOCIAL_SKILL = new SkillHolder(5402, 1);
// Item
// Items
private static final ItemHolder BENUSTAS_REWARD_BOX = new ItemHolder(81151, 1);
private static final ItemHolder BENUSTAS_SHINING_REWARD_BOX = new ItemHolder(81452, 1);
private static final ItemHolder BENUSTAS_REWARD_BOX_110 = new ItemHolder(81741, 1);
// Locations
private static final Location BATTLE_PORT = new Location(153567, 143319, -12736);
@ -344,6 +345,7 @@ public class BaylorWarzone extends AbstractInstance
@Override
public void onInstanceCreated(Instance instance, Player player)
{
instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
getTimers().addTimer("BATTLE_PORT", 3000, e ->
{
instance.getPlayers().forEach(p -> p.teleToLocation(BATTLE_PORT));
@ -364,6 +366,11 @@ public class BaylorWarzone extends AbstractInstance
{
giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110);
}
final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer();
if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{
giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX);
}
world.finishInstance();
}
else

View File

@ -148,6 +148,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
};
// Items
private static final ItemHolder BENUSTAS_REWARD_BOX = new ItemHolder(81151, 1);
private static final ItemHolder BENUSTAS_SHINING_REWARD_BOX = new ItemHolder(81452, 1);
private static final ItemHolder BENUSTAS_REWARD_BOX_110 = new ItemHolder(81741, 1);
// Locations
private static final Location QUEST_GIVER_LOCATION = new Location(-77648, 155665, -3190, 21220);
@ -333,6 +334,12 @@ public class AshenShadowRevolutionaries extends AbstractInstance
return npc.getId() + ".html";
}
@Override
public void onInstanceCreated(Instance instance, Player player)
{
instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
}
@Override
public String onKill(Npc npc, Player player, boolean isSummon)
{
@ -375,6 +382,11 @@ public class AshenShadowRevolutionaries extends AbstractInstance
{
giveItems(member, world.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110);
}
final Player randomPlayer = world.getFirstPlayer().getParty().getRandomPlayer();
if ((randomPlayer != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{
giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX);
}
world.spawnGroup("wave_3");
world.finishInstance();
}

View File

@ -44,6 +44,7 @@ public class NightmareKamaloka extends AbstractInstance
private static final int INVISIBLE_NPC = 18919;
// Items
private static final ItemHolder BENUSTAS_REWARD_BOX = new ItemHolder(81151, 1);
private static final ItemHolder BENUSTAS_SHINING_REWARD_BOX = new ItemHolder(81452, 1);
private static final ItemHolder BENUSTAS_REWARD_BOX_110 = new ItemHolder(81741, 1);
// Misc
private static final Map<Integer, Integer> BOSS_MAP = new HashMap<>();
@ -159,6 +160,12 @@ public class NightmareKamaloka extends AbstractInstance
return super.onSpawn(npc);
}
@Override
public void onInstanceCreated(Instance instance, Player player)
{
instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
}
@Override
public String onKill(Npc npc, Player killer, boolean isSummon)
{
@ -172,6 +179,11 @@ public class NightmareKamaloka extends AbstractInstance
{
giveItems(member, instance.getTemplateId() == TEMPLATE_IDS[0] ? BENUSTAS_REWARD_BOX : BENUSTAS_REWARD_BOX_110);
}
final Player randomPlayer = instance.getFirstPlayer().getParty().getRandomPlayer();
if ((randomPlayer != null) && (getRandom(100) < 80) && (instance.getPlayersCount() == instance.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{
giveItems(randomPlayer, BENUSTAS_SHINING_REWARD_BOX);
}
instance.finishInstance();
}
else