MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Merge branch 'magicbox1.5' into feature-guard-patrol

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-05-06 15:54:45 -05:00
parent 64bde9c197 3191c20a8c
commit df842a2209
11 changed files with 150 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/devcmd/cmds/SlotTestCmd.java
+34 -23
View File
@@ -14,8 +14,11 @@ import engine.Enum.GameObjectType;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.BuildingManager;
import engine.gameManager.ChatManager;
import engine.math.Vector3fImmutable;
import engine.objects.*;
import java.util.ArrayList;
public class SlotTestCmd extends AbstractDevCmd {
public SlotTestCmd() {
@@ -26,6 +29,7 @@ public class SlotTestCmd extends AbstractDevCmd {
protected void _doCmd(PlayerCharacter playerCharacter, String[] args,
AbstractGameObject target) {
ArrayList<BuildingLocation> buildingLocations;
String outString = "Available Slots\r\n";
if (target == null)
@@ -34,36 +38,43 @@ public class SlotTestCmd extends AbstractDevCmd {
if (target.getObjectType() != GameObjectType.Building)
return;
Building building = (Building)target;
Building building = (Building) target;
buildingLocations = BuildingManager._slotLocations.get(building.meshUUID);
if (buildingLocations == null) {
outString = "No slot information for mesh: " + building.meshUUID;
ChatManager.chatSystemInfo(playerCharacter, outString);
return;
}
// Goto slot location
if (args[0].isEmpty() == false) {
int slot = Integer.parseInt(args[0]);
Vector3fImmutable slotLocation;
BuildingLocation buildingLocation = BuildingManager._slotLocations.get(building.meshUUID).get(slot - 1);
slotLocation = building.getLoc().add(buildingLocation.getLocation());
slotLocation = Vector3fImmutable.rotateAroundPoint(building.getLoc(), slotLocation, building.getBounds().getQuaternion().angleY);
playerCharacter.teleport(slotLocation);
return;
}
for (BuildingLocation buildingLocation : BuildingManager._slotLocations.get(building.meshUUID))
outString += buildingLocation.getSlot() + buildingLocation.getLoc().toString() + "\r\n";
outString += buildingLocation.getSlot() + buildingLocation.getLocation().toString() + "\r\n";
outString += "\r\nNeext Available Slot: " + BuildingManager.getAvailableSlot(building);
outString += "\r\nNext Available Slot: " + BuildingManager.getAvailableSlot(building);
if (building.getHirelings().isEmpty() == false) {
outString += "\r\n\r\n";
outString += "Hirelings List: name / slot / floor";
outString += "Hirelings List:";
for (AbstractCharacter hireling : building.getHirelings().keySet()) {
for (AbstractCharacter hireling : building.getHirelings().keySet())
outString += "\r\n" + hireling.getName() + " slot : " + building.getHirelings().get(hireling);
NPC npc;
Mob mob;
outString += "\r\n" + hireling.getName() + " slot " + building.getHirelings().get(hireling);
/* if (hireling.getObjectType().equals(GameObjectType.NPC)) {
npc = (NPC) hireling;
outString += "\r\n" + "location " + npc.inBuildingLoc.toString();
continue;
}
mob = (Mob) hireling;
outString += "\r\n" + "location " + mob.inBuildingLoc.toString();
*/
}
}
ChatManager.chatSystemInfo(playerCharacter,outString);
@@ -72,12 +83,12 @@ public class SlotTestCmd extends AbstractDevCmd {
@Override
protected String _getHelpString() {
return "Temporarily Changes SubRace";
return "Displays slot information for building";
}
@Override
protected String _getUsageString() {
return "' /setBuildingCollidables add/remove 'add creates a collision line.' needs 4 integers. startX, endX, startY, endY";
return "./slottest <target builing> n";
}