diff --git a/src/commands/scene.ts b/src/commands/scene.ts index a869542..8f95087 100644 --- a/src/commands/scene.ts +++ b/src/commands/scene.ts @@ -11,50 +11,26 @@ export default async function handle(command: Command) { return; } - if(command.args.length == 0){ - c.log("Usage: /scene "); - return; - } - - const plane = MazePlaneExcel.fromFloorId(parseInt(command.args[0])) || MazePlaneExcel.fromPlaneId(parseInt(command.args[0])) //Get plane data - let floorId = 10001001 // Default floor data - - if(plane!){ - if(command.args[0].length === 5){//PLANE ID LOGIC - floorId = plane.StartFloorID; - }else if(command.args[0].length === 8){//FLOOR ID LOGIC - if(plane! && plane.FloorIDList.includes(parseInt(command.args[0]))){ - floorId = parseInt(command.args[0]); - }else{ - c.error("cannot find Scene data!"); - return; - } - }else{ - c.error("Invalid FloorID / PlaneID length!"); - return; - } - }else{ - c.error("cannot find Scene data!"); - return; - } - + const planeID = MazePlaneExcel.fromPlaneId(parseInt(command.args[0])) + const uid = Interface.target.player.db._id; const posData = Interface.target.player.db.posData; - const lineup = await Interface.target.player.getLineup(); - const curAvatarEntity = new ActorEntity(Interface.target.player.scene, lineup.leaderSlot, posData.pos); + const lineup2 = await Interface.target.player.getLineup(); + const curAvatarEntity = new ActorEntity(Interface.target.player.scene, lineup2.avatarList[0].id, posData.pos); - const planeId = parseInt(floorId.toString().slice(0,5)); + if (!planeID) return c.log("Usage: /scene "); // Update scene information on player. Interface.target.player.db.posData.planeID = planeID!.PlaneID; Interface.target.player.db.posData.floorID = planeID!.StartFloorID; await Interface.target.player.save() + //ty for tamilpp25 scene Interface.target.send(GetCurSceneInfoScRsp, { retcode: 0, scene: { - planeId: planeId, - floorId: floorId, + planeId: planeID.PlaneID, + floorId: planeID.StartFloorID, entityList: [ curAvatarEntity ], @@ -69,5 +45,5 @@ export default async function handle(command: Command) { Interface.target.sync(); - c.log(`Scene set to floorId: ${floorId}`); + c.log(`Scene set to PlaneID: ${planeID.PlaneID}`); } diff --git a/src/util/excel/MazePlaneExcel.ts b/src/util/excel/MazePlaneExcel.ts index be8ecaf..03d3bd6 100644 --- a/src/util/excel/MazePlaneExcel.ts +++ b/src/util/excel/MazePlaneExcel.ts @@ -55,10 +55,6 @@ export default class MazePlaneExcel { public static fromPlaneId(planeId: number): MazePlaneExcelTableEntry { return MazePlaneExcelTable[planeId.toString()]; } - - public static fromFloorId(floorId: number): MazePlaneExcelTableEntry { - return MazePlaneExcelTable[floorId.toString().slice(0,5)]; - } public static getEntry(entryId: number): MapEntryExcelTableEntry { return MapEntryExcelTable[entryId.toString()];