Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix EmpyreanCrucibleInstance #5

Open
wants to merge 10 commits into
base: 4.8
Choose a base branch
from
Open

Fix EmpyreanCrucibleInstance #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
294e991
Fix EmpyreanCrucibleInstance
w4terbomb Jun 27, 2024
4397f29
Merge branch 'beyond-aion:4.8' into 4.8
w4terbomb Jul 11, 2024
03b3931
refactory EmoteManager
w4terbomb Jul 11, 2024
09b96fb
Merge branch 'beyond-aion:4.8' into 4.8
w4terbomb Jul 11, 2024
657ffd9
Merge branch 'beyond-aion:4.8' into 4.8
w4terbomb Jul 24, 2024
1763269
Fix EmpyreanCrucibleInstance
w4terbomb Jul 26, 2024
6330e95
Merge remote-tracking branch 'origin/4.8' into 4.8
w4terbomb Jul 26, 2024
2d737af
Merge remote-tracking branch 'refs/remotes/origin/4.8' into empyrean
neon-dev Aug 4, 2024
201d9af
Resolved most points from the review
neon-dev Aug 4, 2024
ec1b3a9
Fixup
neon-dev Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 10 additions & 39 deletions game-server/data/handlers/ai/instance/empyreanCrucible/EmpyreanArbiterAI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import static com.aionemu.gameserver.model.DialogAction.SETPRO1;

import java.util.function.Consumer;

import com.aionemu.gameserver.ai.AIName;
import com.aionemu.gameserver.ai.NpcAI;
import com.aionemu.gameserver.model.gameobjects.Npc;
Expand All @@ -27,41 +25,22 @@ public EmpyreanArbiterAI(Npc owner) {

@Override
protected void handleDialogStart(Player player) {
if (player.getInventory().getFirstItemByItemId(186000124) != null) {
PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(getObjectId(), 1011));
} else {
// to do
PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(getObjectId(), 0));
}
int dialogId = player.getInventory().getFirstItemByItemId(186000124) == null ? 0 : 1011;
PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(getObjectId(), dialogId));
}

@Override
public boolean onDialogSelect(Player player, int dialogActionId, int questId, int extendedRewardIndex) {
int instanceId = getPosition().getInstanceId();

if (dialogActionId == SETPRO1 && player.getInventory().decreaseByItemId(186000124, 1)) {
switch (getNpcId()) {
case 799573:
TeleportService.teleportTo(player, 300300000, instanceId, 358.2547f, 349.26443f, 96.09108f, (byte) 59);
break;
case 205426:
TeleportService.teleportTo(player, 300300000, instanceId, 1260.15f, 812.34f, 358.6056f, (byte) 90);
break;
case 205427:
TeleportService.teleportTo(player, 300300000, instanceId, 1616.0248f, 154.43837f, 126f, (byte) 10);
break;
case 205428:
TeleportService.teleportTo(player, 300300000, instanceId, 1793.9233f, 796.92f, 469.36542f, (byte) 60);
break;
case 205429:
TeleportService.teleportTo(player, 300300000, instanceId, 1776.4169f, 1749.9952f, 303.69553f, (byte) 0);
break;
case 205430:
TeleportService.teleportTo(player, 300300000, instanceId, 1328.935f, 1742.0771f, 316.74188f, (byte) 0);
break;
case 205431:
TeleportService.teleportTo(player, 300300000, instanceId, 1760.9441f, 1278.033f, 394.23764f, (byte) 0);
break;
case 799573 -> TeleportService.teleportTo(player, 300300000, instanceId, 358.2547f, 349.26443f, 96.09108f, (byte) 59);
case 205426 -> TeleportService.teleportTo(player, 300300000, instanceId, 1260.15f, 812.34f, 358.6056f, (byte) 90);
case 205427 -> TeleportService.teleportTo(player, 300300000, instanceId, 1616.0248f, 154.43837f, 126f, (byte) 10);
case 205428 -> TeleportService.teleportTo(player, 300300000, instanceId, 1793.9233f, 796.92f, 469.36542f, (byte) 60);
case 205429 -> TeleportService.teleportTo(player, 300300000, instanceId, 1776.4169f, 1749.9952f, 303.69553f, (byte) 0);
case 205430 -> TeleportService.teleportTo(player, 300300000, instanceId, 1328.935f, 1742.0771f, 316.74188f, (byte) 0);
case 205431 -> TeleportService.teleportTo(player, 300300000, instanceId, 1760.9441f, 1278.033f, 394.23764f, (byte) 0);
}
InstanceScore<?> instance = getPosition().getWorldMapInstance().getInstanceHandler().getInstanceScore();
if (instance != null) {
Expand All @@ -71,15 +50,7 @@ public boolean onDialogSelect(Player player, int dialogActionId, int questId, in
}
}
PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(getObjectId(), 0));

getPosition().getWorldMapInstance().forEachPlayer(new Consumer<Player>() {

@Override
public void accept(Player p) {
PacketSendUtility.sendPacket(p, SM_SYSTEM_MESSAGE.STR_MSG_FRIENDLY_MOVE_COMBATAREA_IDARENA(player.getName()));
}

});
PacketSendUtility.broadcastToMap(getOwner(), SM_SYSTEM_MESSAGE.STR_MSG_FRIENDLY_MOVE_COMBATAREA_IDARENA(player.getName()));
}
return true;
}
Expand Down
121 changes: 34 additions & 87 deletions game-server/data/handlers/ai/instance/empyreanCrucible/EmpyreanRecordKeeperAI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import com.aionemu.gameserver.utils.PacketSendUtility;

/**
* @author xTz, Luzien
* @author xTz, Luzien, w4terbomb
*/
@AIName("empyreanrecordkeeper")
public class EmpyreanRecordKeeperAI extends NpcAI {
Expand All @@ -25,41 +25,22 @@ public EmpyreanRecordKeeperAI(Npc owner) {
@Override
public void handleSpawned() {
super.handleSpawned();
int msg = 0;
switch (getNpcId()) {
case 799568:
msg = 1111460;
break;
case 799569:
msg = 1111461;
break;
case 205331:
msg = 1111462;
break;
case 205338:
msg = 1111463;
break;
case 205339:
msg = 1111464;
break;
case 205340:
msg = 1111465;
break;
case 205341:
msg = 1111466;
break;
case 205342:
msg = 1111467;
break;
case 205343:
msg = 1111468;
break;
case 205344:
msg = 1111469;
}
if (msg != 0) {
int msg = switch (getNpcId()) {
case 799568 -> 1111460;
case 799569 -> 1111461;
case 205331 -> 1111462;
case 205337 -> 1111459;
case 205338 -> 1111463;
case 205339 -> 1111464;
case 205340 -> 1111465;
case 205341 -> 1111466;
case 205342 -> 1111467;
case 205343 -> 1111468;
case 205344 -> 1111469;
default -> 0;
};
if (msg != 0)
PacketSendUtility.broadcastMessage(getOwner(), msg, 1000);
}
}

@Override
Expand All @@ -73,60 +54,26 @@ public boolean onDialogSelect(Player player, int dialogActionId, int questId, in
if (dialogActionId == SETPRO1) {
PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(getObjectId(), 0));
switch (getNpcId()) {
case 799567:
instanceHandler.onChangeStage(StageType.START_STAGE_1_ELEVATOR);
break;
case 799568:
instanceHandler.onChangeStage(StageType.START_STAGE_2_ELEVATOR);
break;
case 799569:
instanceHandler.onChangeStage(StageType.START_STAGE_3_ELEVATOR);
break;
case 205331:
instanceHandler.onChangeStage(StageType.START_STAGE_4_ELEVATOR);
break;
case 205338: // teleport to stage 5
instanceHandler.onChangeStage(StageType.START_STAGE_5);
break;
case 205332:
instanceHandler.onChangeStage(StageType.START_STAGE_5_ROUND_1);
break;
case 205339: // teleport to stage 6
instanceHandler.onChangeStage(StageType.START_STAGE_6);
break;
case 205333:
instanceHandler.onChangeStage(StageType.START_STAGE_6_ROUND_1);
break;
case 205340: // teleport to stage 7
instanceHandler.onChangeStage(StageType.START_STAGE_7);
break;
case 205334:
instanceHandler.onChangeStage(StageType.START_STAGE_7_ROUND_1);
break;
case 205341: // teleport to stage 8
instanceHandler.onChangeStage(StageType.START_STAGE_8);
break;
case 205335:
instanceHandler.onChangeStage(StageType.START_STAGE_8_ROUND_1);
break;
case 205342: // teleport to stage 9
instanceHandler.onChangeStage(StageType.START_STAGE_9);
break;
case 205336:
instanceHandler.onChangeStage(StageType.START_STAGE_9_ROUND_1);
break;
case 205343: // teleport to stage 9
instanceHandler.onChangeStage(StageType.START_STAGE_10);
break;
case 205337:
instanceHandler.onChangeStage(StageType.START_STAGE_10_ROUND_1);
break;
case 205344: // get score
getPosition().getWorldMapInstance().getInstanceHandler().doReward(player);
break;
case 799567 -> instanceHandler.onChangeStage(StageType.START_STAGE_1_ELEVATOR);
case 799568 -> instanceHandler.onChangeStage(StageType.START_STAGE_2_ELEVATOR);
case 799569 -> instanceHandler.onChangeStage(StageType.START_STAGE_3_ELEVATOR);
case 205331 -> instanceHandler.onChangeStage(StageType.START_STAGE_4_ELEVATOR);
case 205338 -> instanceHandler.onChangeStage(StageType.START_STAGE_5);
case 205332 -> instanceHandler.onChangeStage(StageType.START_STAGE_5_ROUND_1);
case 205339 -> instanceHandler.onChangeStage(StageType.START_STAGE_6);
case 205333 -> instanceHandler.onChangeStage(StageType.START_STAGE_6_ROUND_1);
case 205340 -> instanceHandler.onChangeStage(StageType.START_STAGE_7);
case 205334 -> instanceHandler.onChangeStage(StageType.START_STAGE_7_ROUND_1);
case 205341 -> instanceHandler.onChangeStage(StageType.START_STAGE_8);
case 205335 -> instanceHandler.onChangeStage(StageType.START_STAGE_8_ROUND_1);
case 205342 -> instanceHandler.onChangeStage(StageType.START_STAGE_9);
case 205336 -> instanceHandler.onChangeStage(StageType.START_STAGE_9_ROUND_1);
case 205343 -> instanceHandler.onChangeStage(StageType.START_STAGE_10);
case 205337 -> instanceHandler.onChangeStage(StageType.START_STAGE_10_ROUND_1);
case 205344 -> getPosition().getWorldMapInstance().getInstanceHandler().doReward(player);
}
AIActions.deleteOwner(this);
} else if (dialogActionId == SETPRO2 && getNpcId() == 799567) { // start with stage 7
} else if (dialogActionId == SETPRO2 && getNpcId() == 799567) {
PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(getObjectId(), 0));
instanceHandler.onChangeStage(StageType.START_STAGE_7);
AIActions.deleteOwner(this);
Expand Down
Loading