Project cleanup pre merge.

This commit is contained in:
2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
+130 -131
View File
@@ -7,7 +7,6 @@
// www.magicbane.com
package engine.devcmd.cmds;
import engine.Enum.GameObjectType;
@@ -22,161 +21,161 @@ import java.util.concurrent.ThreadLocalRandom;
public class GotoCmd extends AbstractDevCmd {
public GotoCmd() {
public GotoCmd() {
super("goto");
}
@Override
protected void _doCmd(PlayerCharacter pc, String[] words,
AbstractGameObject target) {
Vector3fImmutable loc = null;
@Override
protected void _doCmd(PlayerCharacter pc, String[] words,
AbstractGameObject target) {
Vector3fImmutable loc = null;
// Arg Count Check
// Arg Count Check
if (target != null && words[0].isEmpty()){
AbstractWorldObject targetAgo = (AbstractWorldObject)target;
pc.teleport(targetAgo.getLoc());
return;
}
if (target != null && words[0].isEmpty()) {
AbstractWorldObject targetAgo = (AbstractWorldObject) target;
pc.teleport(targetAgo.getLoc());
return;
}
if (words[0].isEmpty()){
this.sendUsage(pc);
return;
}
if (words[0].isEmpty()) {
this.sendUsage(pc);
return;
}
if (words[0].equalsIgnoreCase("playground")){
if (target instanceof AbstractCharacter){
loc = new Vector3fImmutable(63276,0,-54718);
}
if (words[0].equalsIgnoreCase("playground")) {
if (target instanceof AbstractCharacter) {
loc = new Vector3fImmutable(63276, 0, -54718);
}
if (loc != null)
pc.teleport(loc);
if (loc != null)
pc.teleport(loc);
return;
}
if (words[0].equalsIgnoreCase("coc")){
if (target instanceof AbstractCharacter){
loc = new Vector3fImmutable(98561.656f,0,-13353.778f);
}
return;
}
if (loc != null)
pc.teleport(loc);
if (words[0].equalsIgnoreCase("coc")) {
if (target instanceof AbstractCharacter) {
loc = new Vector3fImmutable(98561.656f, 0, -13353.778f);
}
return;
}
if (loc != null)
pc.teleport(loc);
String cityName = "";
for (String partial: words){
cityName += partial + ' ';
}
return;
}
cityName = cityName.substring(0, cityName.length() - 1);
String cityName = "";
for (String partial : words) {
cityName += partial + ' ';
}
for (AbstractGameObject cityAgo: DbManager.getList(GameObjectType.City)){
City city = (City)cityAgo;
if (city == null)
continue;
if (!city.getCityName().equalsIgnoreCase(cityName))
continue;
Zone zone = city.getParent();
if (zone != null){
if (zone.isNPCCity() || zone.isPlayerCity())
loc = Vector3fImmutable.getRandomPointOnCircle(zone.getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
else
loc = zone.getLoc();
cityName = cityName.substring(0, cityName.length() - 1);
int random = ThreadLocalRandom.current().nextInt(5);
if (random == 1)
break;
}
}
for (AbstractGameObject cityAgo : DbManager.getList(GameObjectType.City)) {
City city = (City) cityAgo;
if (city == null)
continue;
if (!city.getCityName().equalsIgnoreCase(cityName))
continue;
Zone zone = city.getParent();
if (zone != null) {
if (zone.isNPCCity() || zone.isPlayerCity())
loc = Vector3fImmutable.getRandomPointOnCircle(zone.getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
else
loc = zone.getLoc();
if (loc == null){
for (AbstractGameObject zoneAgo: DbManager.getList(GameObjectType.Zone)){
Zone zone = (Zone)zoneAgo;
if (zone == null)
continue;
if (!zone.getName().equalsIgnoreCase(cityName))
continue;
if (zone != null){
if (zone.isNPCCity() || zone.isPlayerCity())
loc = Vector3fImmutable.getRandomPointOnCircle(zone.getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
else
loc = zone.getLoc();
int random = ThreadLocalRandom.current().nextInt(5);
if (random == 1)
break;
}
}
int random = ThreadLocalRandom.current().nextInt(5);
if (random == 1)
break;
}
}
}
if (loc == null && words.length == 1){
if (loc == null) {
for (AbstractGameObject zoneAgo : DbManager.getList(GameObjectType.Zone)) {
Zone zone = (Zone) zoneAgo;
if (zone == null)
continue;
if (!zone.getName().equalsIgnoreCase(cityName))
continue;
if (zone != null) {
if (zone.isNPCCity() || zone.isPlayerCity())
loc = Vector3fImmutable.getRandomPointOnCircle(zone.getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
else
loc = zone.getLoc();
try {
PlayerCharacter pcDest = SessionManager
.getPlayerCharacterByLowerCaseName(words[0]);
if (pcDest == null){
this.throwbackError(pc, "Player or Zone not found by name: "
+ words[0]);
this.throwbackInfo(pc, "If you have spaces in the zone name, replace them with '_'");
return;
}
int random = ThreadLocalRandom.current().nextInt(5);
if (random == 1)
break;
}
}
}
if (loc == null && words.length == 1) {
if (pcDest.getCombinedName().equals(pc.getCombinedName())) {
this
.throwbackError(pc,
"Cannot goto yourself. Well, you can, but you wont go anywhere.");
return;
}
try {
PlayerCharacter pcDest = SessionManager
.getPlayerCharacterByLowerCaseName(words[0]);
if (pcDest == null) {
this.throwbackError(pc, "Player or Zone not found by name: "
+ words[0]);
this.throwbackInfo(pc, "If you have spaces in the zone name, replace them with '_'");
return;
}
loc = pcDest.getLoc();
} catch (Exception e) {
this.throwbackError(pc,
"An unknown exception occurred while attempting to goto a character named '"
+ words[0] + '\'');
return;
}
if (pcDest.getCombinedName().equals(pc.getCombinedName())) {
this
.throwbackError(pc,
"Cannot goto yourself. Well, you can, but you wont go anywhere.");
return;
}
}
if (loc == null) { // lat lon mode
if (words.length != 2) {
throwbackError(pc, this.getUsageString());
return;
}
float lat = 0.0f, lon = 0.0f;
String latLong = '\'' + words[0] + ", " + words[1] + '\'';
loc = pcDest.getLoc();
} catch (Exception e) {
this.throwbackError(pc,
"An unknown exception occurred while attempting to goto a character named '"
+ words[0] + '\'');
return;
}
try {
lat = Float.parseFloat(words[0]);
lon = Float.parseFloat(words[1]);
loc = new Vector3fImmutable(lat, 0f, -lon);
} catch (NumberFormatException e) {
this.throwbackError(pc, "Supplied LatLong: " + latLong
+ " failed to parse to Floats");
return;
}
if (loc == null) { // lat lon mode
if (words.length != 2) {
throwbackError(pc, this.getUsageString());
return;
}
float lat = 0.0f, lon = 0.0f;
String latLong = '\'' + words[0] + ", " + words[1] + '\'';
} catch (Exception e) {
this.throwbackError(pc,
"An unknown exception occurred while attempting to goto LatLong of "
+ latLong);
return;
}
}
if (loc != null) {
pc.teleport(loc);
}
}
try {
lat = Float.parseFloat(words[0]);
lon = Float.parseFloat(words[1]);
loc = new Vector3fImmutable(lat, 0f, -lon);
} catch (NumberFormatException e) {
this.throwbackError(pc, "Supplied LatLong: " + latLong
+ " failed to parse to Floats");
return;
@Override
protected String _getHelpString() {
return "Alters your characters position TO 'lat' and 'long', or TO the position of 'characterName'. This does not transport you BY 'lat' and 'long', but rather TO 'lat' and 'long' ";
}
} catch (Exception e) {
this.throwbackError(pc,
"An unknown exception occurred while attempting to goto LatLong of "
+ latLong);
return;
}
}
if (loc != null) {
pc.teleport(loc);
}
}
@Override
protected String _getUsageString() {
return "'[ /goto lat lon] || [ /goto characterName] || [/goto zoneName \replace spaces with `_`]`";
}
@Override
protected String _getHelpString() {
return "Alters your characters position TO 'lat' and 'long', or TO the position of 'characterName'. This does not transport you BY 'lat' and 'long', but rather TO 'lat' and 'long' ";
}
@Override
protected String _getUsageString() {
return "'[ /goto lat lon] || [ /goto characterName] || [/goto zoneName \replace spaces with `_`]`";
}
}