Compare commits
43 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e4096bebbd | |||
| 547060b7a6 | |||
| ba6738d27a | |||
| 06c6468013 | |||
| 548796994f | |||
| 580452d68b | |||
| a570d127be | |||
| a949a08e30 | |||
| 412f7f956f | |||
| aea6869ca0 | |||
| 950523ddcc | |||
| 631989e626 | |||
| 12f6d7574d | |||
| 85dcad1c2a | |||
| defa0d8bb8 | |||
| 85872b66da | |||
| 09c9dfbc06 | |||
| d014aafe45 | |||
| d331093acd | |||
| 75ea9de4e5 | |||
| 13207c16f6 | |||
| b625ea2707 | |||
| 6f752935ab | |||
| 49005c6647 | |||
| b2bd3b7a92 | |||
| 461e4e1c3d | |||
| 0d1d00e2d1 | |||
| ec6825d651 | |||
| cb561c3b6b | |||
| cf0f0cf022 | |||
| f85673e661 | |||
| 84347f8290 | |||
| fd2fe92714 | |||
| 955b94eb08 | |||
| a9aa6e9660 | |||
| afc080074f | |||
| 1039fb1d0b | |||
| a955778eed | |||
| 7717707518 | |||
| 28836a7a4f | |||
| 5511dc7899 | |||
| e5b2247204 | |||
| 0404ca1a94 |
@@ -58,6 +58,9 @@ public abstract class dbHandlerBase {
|
||||
|
||||
int id = rs.getInt(1);
|
||||
|
||||
if (id == 39052)
|
||||
Logger.info(id);
|
||||
|
||||
if (DbManager.inCache(localObjectType, id)) {
|
||||
objectList.add((T) DbManager.getFromCache(localObjectType, id));
|
||||
} else {
|
||||
|
||||
@@ -312,7 +312,7 @@ public class InfoCmd extends AbstractDevCmd {
|
||||
if (targetPC.getGuild() != null) {
|
||||
output += "Name: " + targetPC.getGuild().getName();
|
||||
output += newline;
|
||||
output += "State: " + targetPC.getGuild().getGuildState();
|
||||
output += "State: " + targetPC.getGuild().guildState;
|
||||
output += newline;
|
||||
output += "Realms Owned:" + targetPC.getGuild().getRealmsOwned();
|
||||
output += newline;
|
||||
@@ -320,7 +320,7 @@ public class InfoCmd extends AbstractDevCmd {
|
||||
output += newline;
|
||||
output += "Nation Name: " + targetPC.getGuild().getNation().getName();
|
||||
output += newline;
|
||||
output += "Nation State: " + targetPC.getGuild().getNation().getGuildState();
|
||||
output += "Nation State: " + targetPC.getGuild().getNation().guildState;
|
||||
output += newline;
|
||||
output += "Realms Owned:" + targetPC.getGuild().getNation().getRealmsOwned();
|
||||
output += newline;
|
||||
|
||||
@@ -462,11 +462,12 @@ public enum CombatManager {
|
||||
|
||||
if (damage > 0) {
|
||||
|
||||
if (AbstractCharacter.IsAbstractCharacter(target))
|
||||
if (AbstractCharacter.IsAbstractCharacter(target)) {
|
||||
((AbstractCharacter) target).modifyHealth(-damage, attacker, true);
|
||||
else
|
||||
((AbstractCharacter) target).cancelOnTakeDamage();
|
||||
}else {
|
||||
((Building) target).modifyHealth(-damage, attacker);
|
||||
|
||||
}
|
||||
int attackAnim = getSwingAnimation(null, null, slot);
|
||||
if (attacker.charItemManager.getEquipped().get(slot) != null) {
|
||||
if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
|
||||
|
||||
@@ -164,6 +164,15 @@ public enum ConfigManager {
|
||||
Logger.info("Compiling regex");
|
||||
|
||||
regex.put(MB_LOGIN_FNAME_REGEX, Pattern.compile(MB_LOGIN_FNAME_REGEX.getValue()));
|
||||
|
||||
Logger.info("Loading WPAK data");
|
||||
|
||||
// *** Needs powermanager collection
|
||||
// defined before activation.
|
||||
// EffectsParser.parseWpakFile();
|
||||
// PowersParser.parseWpakFile();
|
||||
// PowerActionParser.parseWpakFile();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -49,8 +49,15 @@ public enum ForgeManager implements Runnable {
|
||||
public static final ConcurrentHashMap<NPC, ConcurrentHashMap.KeySetView<WorkOrder, Boolean>> vendorWorkOrderLookup = new ConcurrentHashMap<>();
|
||||
public static final ConcurrentHashMap<Item, WorkOrder> itemWorkOrderLookup = new ConcurrentHashMap<>();
|
||||
|
||||
@Override
|
||||
public static void start() {
|
||||
|
||||
Thread forgeManager;
|
||||
forgeManager = new Thread(FORGE_MANAGER);
|
||||
forgeManager.setName("Forge Manager");
|
||||
forgeManager.start();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
WorkOrder workOrder;
|
||||
@@ -112,14 +119,6 @@ public enum ForgeManager implements Runnable {
|
||||
}
|
||||
}
|
||||
|
||||
public static void start() {
|
||||
|
||||
Thread forgeManager;
|
||||
forgeManager = new Thread(FORGE_MANAGER);
|
||||
forgeManager.setName("Forge Manager");
|
||||
forgeManager.start();
|
||||
}
|
||||
|
||||
public static int submit(WorkOrder workOrder) {
|
||||
|
||||
// Must have a city to roll anything
|
||||
|
||||
+96
-3
@@ -841,16 +841,28 @@ public class mbEnums {
|
||||
DRAIN;
|
||||
|
||||
public static DamageType getDamageType(String modName) {
|
||||
|
||||
if (modName.isEmpty())
|
||||
return DamageType.NONE;
|
||||
|
||||
if(modName.toLowerCase().equals("blind"))
|
||||
modName = "BLINDNESS";
|
||||
|
||||
if(modName.toLowerCase().equals("powerblock"))
|
||||
modName = "POWERINHIBITOR";
|
||||
|
||||
DamageType damageType;
|
||||
if (modName.isEmpty())
|
||||
//validity check for not looking up damage type that doesn't exist
|
||||
boolean valid = false;
|
||||
for(DamageType type : DamageType.values()){
|
||||
if(type.name().equals(modName))
|
||||
valid = true;
|
||||
}
|
||||
|
||||
if(!valid)
|
||||
return DamageType.NONE;
|
||||
|
||||
DamageType damageType;
|
||||
|
||||
try {
|
||||
damageType = DamageType.valueOf(modName.replace(",", "").toUpperCase());
|
||||
} catch (Exception e) {
|
||||
@@ -2732,7 +2744,7 @@ public class mbEnums {
|
||||
DIAMOND(1580010, 1540225085, -1730704107, 2000, 20),
|
||||
GALVOR(1580017, -1683992404, -1596311545, 2000, 5),
|
||||
IRON(1580002, -1673518119, 2504297, 2000, 20),
|
||||
LUMBER(1580004, 1628412684, -1603256692, 10000, 100),
|
||||
LUMBER(1580004, -1628412684, -1603256692, 10000, 100),
|
||||
MANDRAKE(1580007, 1519910613, 1191391799, 1000, 10),
|
||||
MITHRIL(1580021, 626743397, -1761257186, 500, 5),
|
||||
OAK(1580005, -1653034775, 74767, 3000, 30),
|
||||
@@ -3022,5 +3034,86 @@ public class mbEnums {
|
||||
PREFIX,
|
||||
SUFFIX;
|
||||
}
|
||||
|
||||
public enum PowerType {
|
||||
None,
|
||||
SPELL,
|
||||
SKILL
|
||||
}
|
||||
|
||||
public enum CostType {
|
||||
NONE,
|
||||
HEALTH,
|
||||
MANA,
|
||||
STAMINA
|
||||
}
|
||||
|
||||
public enum AreaType {
|
||||
NONE,
|
||||
SPHERE,
|
||||
POINTBLANK,
|
||||
LINE,
|
||||
CONE,
|
||||
WALL
|
||||
}
|
||||
|
||||
public enum ExcludeType {
|
||||
NONE,
|
||||
CASTER,
|
||||
GROUP,
|
||||
GUILD,
|
||||
NATION,
|
||||
PLAYERS,
|
||||
ALLBUTGROUP,
|
||||
ALLBUTPETS
|
||||
}
|
||||
|
||||
public enum CastingModeType {
|
||||
NONE,
|
||||
COMBAT,
|
||||
NONCOMBAT,
|
||||
BOTH
|
||||
}
|
||||
|
||||
public enum TargetSelectType {
|
||||
NONE,
|
||||
CLICK,
|
||||
GROUP,
|
||||
GUILD,
|
||||
NEARBYMOBS,
|
||||
NAME
|
||||
}
|
||||
|
||||
public enum CategoryToPowerType {
|
||||
None,
|
||||
GreaterThanOrEqualTo,
|
||||
GreaterThan,
|
||||
Always
|
||||
}
|
||||
|
||||
public enum ModificationType {
|
||||
ADD,
|
||||
MULTIPLY
|
||||
}
|
||||
|
||||
public enum ServerConfig {
|
||||
MBDB_108("AERYNTH", "ARAC", "MOURNING", 300000),
|
||||
MBDB_192("DALGOTH", "ARAC", "GOOK", 300001),
|
||||
MBDB_162("VORGINA", "LORE", "SAEDRON", 300002),
|
||||
MBDB_164("VORGINA", "ARAC", "THURIN", 300002);
|
||||
|
||||
public final String mapType;
|
||||
public final String ruleType;
|
||||
public final String serverName;
|
||||
public final int realmMap;
|
||||
|
||||
ServerConfig(String mapType, String ruleType, String serverName, int realmMap) {
|
||||
|
||||
this.mapType = mapType;
|
||||
this.ruleType = ruleType;
|
||||
this.serverName = serverName;
|
||||
this.realmMap = realmMap;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -173,7 +173,7 @@ public class AbandonAssetMsgHandler extends AbstractClientMsgHandler {
|
||||
}
|
||||
|
||||
sourceGuild.setCityUUID(0);
|
||||
sourceGuild.setGuildState(GuildState.Errant);
|
||||
sourceGuild.guildState = GuildState.Errant;
|
||||
sourceGuild.setNation(null);
|
||||
|
||||
// Transfer the city assets
|
||||
|
||||
@@ -38,8 +38,8 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
|
||||
|
||||
AcceptSubInviteMsg msg = (AcceptSubInviteMsg) baseMsg;
|
||||
PlayerCharacter sourcePlayer;
|
||||
Guild sourceGuild;
|
||||
Guild targetGuild;
|
||||
Guild swornGuild;
|
||||
Guild nation;
|
||||
Dispatch dispatch;
|
||||
|
||||
// get PlayerCharacter of person sending sub invite
|
||||
@@ -49,21 +49,21 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
|
||||
if (sourcePlayer == null)
|
||||
return true;
|
||||
|
||||
sourceGuild = sourcePlayer.getGuild();
|
||||
targetGuild = (Guild) DbManager.getObject(GameObjectType.Guild, msg.guildUUID());
|
||||
swornGuild = sourcePlayer.getGuild();
|
||||
nation = (Guild) DbManager.getObject(GameObjectType.Guild, msg.guildUUID());
|
||||
|
||||
//must be source guild to sub to
|
||||
|
||||
if (targetGuild == null) {
|
||||
if (nation == null) {
|
||||
ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
|
||||
return true;
|
||||
}
|
||||
if (sourceGuild == null) {
|
||||
if (swornGuild == null) {
|
||||
ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
|
||||
return true;
|
||||
}
|
||||
|
||||
if (sourceGuild.equals(targetGuild))
|
||||
if (swornGuild.equals(nation))
|
||||
return true;
|
||||
|
||||
if (GuildStatusController.isGuildLeader(sourcePlayer.getGuildStatus()) == false) {
|
||||
@@ -74,7 +74,7 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
|
||||
//source guild is limited to 7 subs
|
||||
//TODO this should be based on TOL rank
|
||||
|
||||
if (!targetGuild.canSubAGuild(sourceGuild)) {
|
||||
if (!nation.canSubAGuild(swornGuild)) {
|
||||
ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
|
||||
return true;
|
||||
}
|
||||
@@ -82,24 +82,20 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
|
||||
//all tests passed, let's Handle code
|
||||
//Update Target Guild State.
|
||||
|
||||
sourceGuild.upgradeGuildState(false);
|
||||
swornGuild.guildState = GuildState.Petitioner;
|
||||
|
||||
//Add sub so GuildMaster can Swear in.
|
||||
|
||||
ArrayList<Guild> subs = targetGuild.getSubGuildList();
|
||||
subs.add(sourceGuild);
|
||||
|
||||
targetGuild.setGuildState(GuildState.Nation);
|
||||
|
||||
ArrayList<Guild> subGuildList = nation.getSubGuildList();
|
||||
subGuildList.add(swornGuild);
|
||||
|
||||
//Let's send the message back.
|
||||
|
||||
ChatManager.chatGuildInfo(sourcePlayer, "Your guild is now a " + swornGuild.guildState.name() + '.');
|
||||
msg.setUnknown02(1);
|
||||
msg.setResponse("Your guild is now a " + sourceGuild.getGuildState().name() + '.');
|
||||
msg.setResponse("Your guild is now a " + swornGuild.guildState.name() + '.');
|
||||
dispatch = Dispatch.borrow(sourcePlayer, msg);
|
||||
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
|
||||
ChatManager.chatSystemInfo(sourcePlayer, "Your guild is now a " + sourceGuild.getGuildState().name() + '.');
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,8 +35,8 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
|
||||
|
||||
BreakFealtyMsg bfm;
|
||||
PlayerCharacter player;
|
||||
Guild toBreak;
|
||||
Guild guild;
|
||||
Guild nation;
|
||||
Guild protectorate;
|
||||
Dispatch dispatch;
|
||||
|
||||
bfm = (BreakFealtyMsg) baseMsg;
|
||||
@@ -49,47 +49,58 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
|
||||
if (player == null)
|
||||
return true;
|
||||
|
||||
toBreak = (Guild) DbManager.getObject(GameObjectType.Guild, bfm.getGuildUUID());
|
||||
nation = (Guild) DbManager.getObject(GameObjectType.Guild, bfm.getGuildUUID());
|
||||
|
||||
if (toBreak == null) {
|
||||
if (nation == null) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
|
||||
return true;
|
||||
}
|
||||
|
||||
guild = player.getGuild();
|
||||
protectorate = player.getGuild();
|
||||
|
||||
if (guild == null) {
|
||||
if (protectorate == null) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "You do not belong to a guild!");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (toBreak.isNPCGuild()) {
|
||||
if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
|
||||
if (nation.isNPCGuild()) {
|
||||
if (!GuildStatusController.isGuildLeader(player.getGuildStatus())) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "Only guild leader can break fealty!");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(), WorldServer.worldUUID)) {
|
||||
if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), WorldServer.worldUUID)) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
|
||||
return true;
|
||||
}
|
||||
|
||||
switch (guild.getGuildState()) {
|
||||
switch (protectorate.guildState) {
|
||||
case Sworn:
|
||||
guild.setNation(null);
|
||||
GuildManager.updateAllGuildTags(guild);
|
||||
GuildManager.updateAllGuildBinds(guild, null);
|
||||
protectorate.setNation(Guild.getErrantNation());
|
||||
GuildManager.updateAllGuildTags(protectorate);
|
||||
GuildManager.updateAllGuildBinds(protectorate, null);
|
||||
protectorate.guildState = mbEnums.GuildState.Errant;
|
||||
break;
|
||||
case Province:
|
||||
guild.setNation(guild);
|
||||
GuildManager.updateAllGuildTags(guild);
|
||||
GuildManager.updateAllGuildBinds(guild, guild.getOwnedCity());
|
||||
case Protectorate:
|
||||
protectorate.setNation(protectorate);
|
||||
GuildManager.updateAllGuildTags(protectorate);
|
||||
GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity());
|
||||
|
||||
boolean isNation = false;
|
||||
|
||||
for (Guild subGuild : protectorate.getSubGuildList())
|
||||
if (subGuild.getOwnedCity() != null)
|
||||
isNation = true;
|
||||
|
||||
if (isNation)
|
||||
protectorate.guildState = mbEnums.GuildState.Nation;
|
||||
else
|
||||
protectorate.guildState = mbEnums.GuildState.Sovereign;
|
||||
break;
|
||||
}
|
||||
|
||||
guild.downgradeGuildState();
|
||||
|
||||
SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
@@ -101,16 +112,16 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
|
||||
City.lastCityUpdate = System.currentTimeMillis();
|
||||
|
||||
|
||||
ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(guild.getObjectUUID());
|
||||
ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
|
||||
|
||||
for (PlayerCharacter member : guildMembers) {
|
||||
ChatManager.chatGuildInfo(member, guild.getName() + " has broke fealty from " + toBreak.getName() + '!');
|
||||
ChatManager.chatGuildInfo(member, protectorate.getName() + " has broke fealty from " + nation.getName() + '!');
|
||||
}
|
||||
|
||||
ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(toBreak.getObjectUUID());
|
||||
ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID());
|
||||
|
||||
for (PlayerCharacter member : breakFealtyMembers) {
|
||||
ChatManager.chatGuildInfo(member, guild.getName() + " has broken fealty from " + toBreak.getName() + '!');
|
||||
ChatManager.chatGuildInfo(member, protectorate.getName() + " has broken fealty from " + nation.getName() + '!');
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -118,44 +129,40 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
|
||||
|
||||
}
|
||||
|
||||
if (!toBreak.getSubGuildList().contains(guild)) {
|
||||
if (!nation.getSubGuildList().contains(protectorate)) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "Failure to break fealty!");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
|
||||
if (!GuildStatusController.isGuildLeader(player.getGuildStatus())) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "Only guild leader can break fealty!");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (Bane.getBaneByAttackerGuild(guild) != null) {
|
||||
if (Bane.getBaneByAttackerGuild(protectorate) != null) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "You may break fealty with active bane!");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(), WorldServer.worldUUID)) {
|
||||
if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), WorldServer.worldUUID)) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
|
||||
return true;
|
||||
}
|
||||
|
||||
switch (guild.getGuildState()) {
|
||||
switch (protectorate.guildState) {
|
||||
case Sworn:
|
||||
guild.setNation(null);
|
||||
GuildManager.updateAllGuildTags(guild);
|
||||
GuildManager.updateAllGuildBinds(guild, null);
|
||||
protectorate.setNation(Guild.getErrantNation());
|
||||
GuildManager.updateAllGuildTags(protectorate);
|
||||
GuildManager.updateAllGuildBinds(protectorate, null);
|
||||
break;
|
||||
case Province:
|
||||
guild.setNation(guild);
|
||||
GuildManager.updateAllGuildTags(guild);
|
||||
GuildManager.updateAllGuildBinds(guild, guild.getOwnedCity());
|
||||
protectorate.setNation(protectorate);
|
||||
GuildManager.updateAllGuildTags(protectorate);
|
||||
GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity());
|
||||
break;
|
||||
}
|
||||
|
||||
guild.downgradeGuildState();
|
||||
toBreak.getSubGuildList().remove(guild);
|
||||
|
||||
if (toBreak.getSubGuildList().isEmpty())
|
||||
toBreak.downgradeGuildState();
|
||||
nation.getSubGuildList().remove(protectorate);
|
||||
|
||||
SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
@@ -167,17 +174,16 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
|
||||
|
||||
City.lastCityUpdate = System.currentTimeMillis();
|
||||
|
||||
|
||||
ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(guild.getObjectUUID());
|
||||
ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
|
||||
|
||||
for (PlayerCharacter member : guildMembers) {
|
||||
ChatManager.chatGuildInfo(member, guild.getName() + " has broke fealty from " + toBreak.getName() + '!');
|
||||
ChatManager.chatGuildInfo(member, protectorate.getName() + " has broke fealty from " + nation.getName() + '!');
|
||||
}
|
||||
|
||||
ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(toBreak.getObjectUUID());
|
||||
ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID());
|
||||
|
||||
for (PlayerCharacter member : breakFealtyMembers) {
|
||||
ChatManager.chatGuildInfo(member, guild.getName() + " has broken fealty from " + toBreak.getName() + '!');
|
||||
ChatManager.chatGuildInfo(member, protectorate.getName() + " has broken fealty from " + nation.getName() + '!');
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
@@ -78,7 +78,7 @@ public class ChannelMuteMsgHandler extends AbstractClientMsgHandler {
|
||||
}
|
||||
|
||||
sourceGuild.setCityUUID(0);
|
||||
sourceGuild.setGuildState(GuildState.Errant);
|
||||
sourceGuild.guildState = GuildState.Errant;
|
||||
sourceGuild.setNation(null);
|
||||
|
||||
// Transfer the city assets
|
||||
|
||||
@@ -99,7 +99,7 @@ public class DisbandGuildHandler extends AbstractClientMsgHandler {
|
||||
player.setGuildLeader(false);
|
||||
player.setInnerCouncil(false);
|
||||
guild.setGuildLeaderUUID(0);
|
||||
guild.setNation(null);
|
||||
guild.setNation(Guild.getErrantNation());
|
||||
|
||||
DbManager.GuildQueries.DELETE_GUILD(guild);
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
|
||||
return true;
|
||||
}
|
||||
|
||||
switch (toDismiss.getGuildState()) {
|
||||
switch (toDismiss.guildState) {
|
||||
case Sworn:
|
||||
|
||||
if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(), WorldServer.worldUUID)) {
|
||||
@@ -85,8 +85,8 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
|
||||
return true;
|
||||
}
|
||||
nation.getSubGuildList().remove(toDismiss);
|
||||
toDismiss.downgradeGuildState();
|
||||
toDismiss.setNation(null);
|
||||
toDismiss.guildState = mbEnums.GuildState.Errant;
|
||||
toDismiss.setNation(Guild.getErrantNation());
|
||||
GuildManager.updateAllGuildBinds(toDismiss, null);
|
||||
|
||||
break;
|
||||
@@ -96,24 +96,35 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
|
||||
return true;
|
||||
}
|
||||
nation.getSubGuildList().remove(toDismiss);
|
||||
toDismiss.downgradeGuildState();
|
||||
toDismiss.guildState = mbEnums.GuildState.Sovereign;
|
||||
toDismiss.setNation(toDismiss);
|
||||
|
||||
break;
|
||||
case Petitioner:
|
||||
|
||||
nation.getSubGuildList().remove(toDismiss);
|
||||
toDismiss.downgradeGuildState();
|
||||
|
||||
if (toDismiss.getNation().isEmptyGuild())
|
||||
toDismiss.guildState = mbEnums.GuildState.Errant;
|
||||
else
|
||||
toDismiss.guildState = mbEnums.GuildState.Sovereign;
|
||||
|
||||
break;
|
||||
case Protectorate:
|
||||
if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(), WorldServer.worldUUID)) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
|
||||
return true;
|
||||
}
|
||||
nation.getSubGuildList().remove(toDismiss);
|
||||
toDismiss.downgradeGuildState();
|
||||
toDismiss.guildState = mbEnums.GuildState.Sovereign;
|
||||
toDismiss.setNation(toDismiss);
|
||||
break;
|
||||
}
|
||||
|
||||
GuildManager.updateAllGuildTags(toDismiss);
|
||||
|
||||
if (nation.getSubGuildList().isEmpty())
|
||||
nation.downgradeGuildState();
|
||||
nation.guildState = mbEnums.GuildState.Sovereign;
|
||||
|
||||
SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
|
||||
@@ -79,18 +79,14 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
GuildManager.updateAllGuildBinds(player.getGuild(), npc.getGuild().getOwnedCity());
|
||||
|
||||
|
||||
//update Guild state.
|
||||
player.getGuild().setNation(npc.getGuild());
|
||||
GuildManager.updateAllGuildTags(player.getGuild());
|
||||
|
||||
//update state twice, errant to petitioner, to sworn.
|
||||
player.getGuild().upgradeGuildState(false);//to petitioner
|
||||
player.getGuild().upgradeGuildState(false);//to sworn
|
||||
|
||||
//update state
|
||||
player.getGuild().guildState = mbEnums.GuildState.Sworn;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -88,8 +88,8 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
|
||||
// Validate that the player is the leader of a guild
|
||||
// that is not currently Sovereign *** BUG? Doesn't look right. isGuildLeader()?
|
||||
|
||||
if ((playerCharacter.getGuild().getGuildState() != GuildState.Sworn
|
||||
|| playerCharacter.getGuild().getGuildState() != GuildState.Errant) == false) {
|
||||
if ((playerCharacter.getGuild().guildState != GuildState.Sworn
|
||||
|| playerCharacter.getGuild().guildState != GuildState.Errant) == false) {
|
||||
PlaceAssetMsg.sendPlaceAssetError(origin, 17, ""); // Your is not an errant or soverign guild
|
||||
return false;
|
||||
}
|
||||
@@ -161,7 +161,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
|
||||
|
||||
// Errant guilds cannot place assets
|
||||
|
||||
if (player.getGuild().getGuildState() == GuildState.Errant) {
|
||||
if (player.getGuild().guildState == GuildState.Errant) {
|
||||
PlaceAssetMsg.sendPlaceAssetError(origin, 1, "Only sovereign or sworn guilds may place assets.");
|
||||
return false;
|
||||
}
|
||||
@@ -774,7 +774,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
|
||||
|
||||
playerCharacter.getGuild().setNation(playerCharacter.getGuild());
|
||||
playerNation = playerCharacter.getGuild();
|
||||
playerNation.setGuildState(GuildState.Sovereign);
|
||||
playerNation.guildState = GuildState.Sovereign;
|
||||
|
||||
// Update guild binds and tags
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
|
||||
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
|
||||
PlayerCharacter player;
|
||||
SwearInGuildMsg swearInMsg;
|
||||
Guild targetGuild;
|
||||
Guild protectorate;
|
||||
Guild nation;
|
||||
Dispatch dispatch;
|
||||
|
||||
@@ -47,9 +47,9 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
|
||||
if (player == null)
|
||||
return true;
|
||||
|
||||
targetGuild = (Guild) DbManager.getObject(GameObjectType.Guild, swearInMsg.getGuildUUID());
|
||||
protectorate = (Guild) DbManager.getObject(GameObjectType.Guild, swearInMsg.getGuildUUID());
|
||||
|
||||
if (targetGuild == null) {
|
||||
if (protectorate == null) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
|
||||
return true;
|
||||
}
|
||||
@@ -66,44 +66,43 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "Your guild is not a nation!");
|
||||
return true;
|
||||
}
|
||||
if (!nation.getSubGuildList().contains(targetGuild)) {
|
||||
|
||||
if (!nation.getSubGuildList().contains(protectorate)) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "Your do not have such authority!");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!Guild.canSwearIn(targetGuild)) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, targetGuild.getGuildState().name() + "cannot be sworn in");
|
||||
if (protectorate.guildState.equals(GuildState.Petitioner) == false)
|
||||
return true;
|
||||
}
|
||||
|
||||
if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "Your do not have such authority!");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!DbManager.GuildQueries.UPDATE_PARENT(targetGuild.getObjectUUID(), nation.getObjectUUID())) {
|
||||
if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), nation.getObjectUUID())) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
|
||||
return true;
|
||||
}
|
||||
|
||||
switch (targetGuild.getGuildState()) {
|
||||
case Petitioner:
|
||||
GuildManager.updateAllGuildBinds(targetGuild, nation.getOwnedCity());
|
||||
break;
|
||||
case Protectorate:
|
||||
break;
|
||||
default:
|
||||
//shouldn't get here.
|
||||
break;
|
||||
}
|
||||
//shouldn't get here.
|
||||
if (protectorate.guildState.equals(GuildState.Petitioner))
|
||||
GuildManager.updateAllGuildBinds(protectorate, nation.getOwnedCity());
|
||||
|
||||
//update Guild state.
|
||||
targetGuild.setNation(nation);
|
||||
GuildManager.updateAllGuildTags(targetGuild);
|
||||
targetGuild.upgradeGuildState(false);
|
||||
|
||||
if (nation.getGuildState() == GuildState.Sovereign)
|
||||
nation.upgradeGuildState(true);
|
||||
if (protectorate.getNation().isEmptyGuild())
|
||||
protectorate.guildState = GuildState.Sworn;
|
||||
else
|
||||
protectorate.guildState = GuildState.Protectorate;
|
||||
|
||||
protectorate.setNation(nation);
|
||||
GuildManager.updateAllGuildTags(protectorate);
|
||||
|
||||
if (nation.guildState == GuildState.Sovereign) {
|
||||
if (protectorate.guildState.equals(GuildState.Protectorate))
|
||||
nation.guildState = GuildState.Nation;
|
||||
}
|
||||
|
||||
SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
@@ -113,15 +112,14 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
|
||||
|
||||
ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID());
|
||||
|
||||
for (PlayerCharacter member : guildMembers) {
|
||||
ChatManager.chatGuildInfo(member, "Your Guild is now a Nation!");
|
||||
}
|
||||
for (PlayerCharacter member : guildMembers)
|
||||
ChatManager.chatGuildInfo(member, protectorate.getName() + " has sworn fealty to you.");
|
||||
|
||||
ArrayList<PlayerCharacter> swornMembers = SessionManager.getActivePCsInGuildID(targetGuild.getObjectUUID());
|
||||
ArrayList<PlayerCharacter> swornMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
|
||||
|
||||
for (PlayerCharacter member : swornMembers)
|
||||
ChatManager.chatGuildInfo(member, "Your Guild has sworn fealty to " + nation.getName() + '.');
|
||||
|
||||
for (PlayerCharacter member : swornMembers) {
|
||||
ChatManager.chatGuildInfo(member, "Your Guild has sword fealty to " + nation.getName() + '.');
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Logger.error(e.getMessage());
|
||||
return true;
|
||||
|
||||
@@ -437,7 +437,7 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
|
||||
else
|
||||
writer.putInt((int) timeLeft / 1000); // Time remaing until bane/Seconds
|
||||
|
||||
if (attackerGuild.getGuildState() == GuildState.Sworn)
|
||||
if (attackerGuild.guildState == GuildState.Sworn)
|
||||
writer.putInt(4); //3 capture/errant,4 capture/sworn, 5 destroy/soveirgn.
|
||||
else
|
||||
writer.putInt(5);
|
||||
|
||||
@@ -63,7 +63,7 @@ public class SendGuildEntryMsg extends ClientNetMsg {
|
||||
if (subsAndSovs.size() > 0) {
|
||||
|
||||
for (Guild guild : subsAndSovs) {
|
||||
int state = guild.getGuildState().getStateID();
|
||||
int state = guild.guildState.getStateID();
|
||||
|
||||
writer.putInt(guild.getObjectType().ordinal());
|
||||
writer.putInt(guild.getObjectUUID());
|
||||
|
||||
@@ -602,10 +602,10 @@ public class Building extends AbstractWorldObject {
|
||||
|
||||
this.isDeranking.compareAndSet(false, true);
|
||||
|
||||
if ((bane.getOwner().getGuild().getGuildState() == GuildState.Sovereign) ||
|
||||
(bane.getOwner().getGuild().getGuildState() == GuildState.Protectorate) ||
|
||||
(bane.getOwner().getGuild().getGuildState() == GuildState.Province) ||
|
||||
(bane.getOwner().getGuild().getGuildState() == GuildState.Nation))
|
||||
if ((bane.getOwner().getGuild().guildState == GuildState.Sovereign) ||
|
||||
(bane.getOwner().getGuild().guildState == GuildState.Protectorate) ||
|
||||
(bane.getOwner().getGuild().guildState == GuildState.Province) ||
|
||||
(bane.getOwner().getGuild().guildState == GuildState.Nation))
|
||||
siegeResult = SiegeResult.DESTROY;
|
||||
else
|
||||
siegeResult = SiegeResult.CAPTURE;
|
||||
@@ -959,7 +959,7 @@ public class Building extends AbstractWorldObject {
|
||||
// Altitude of this building is derived from the heightmap engine.
|
||||
|
||||
Vector3fImmutable tempLoc = new Vector3fImmutable(this.statLat + this.parentZone.absX, 0, this.statLon + this.parentZone.absZ);
|
||||
tempLoc = new Vector3fImmutable(tempLoc.x, Terrain.getWorldHeight(tempLoc), tempLoc.z);
|
||||
tempLoc = new Vector3fImmutable(tempLoc.x, Terrain.getWorldHeight(tempLoc) + this.statAlt, tempLoc.z);
|
||||
this.setLoc(tempLoc);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -306,8 +306,22 @@ public class City extends AbstractWorldObject {
|
||||
if (city.parentZone == null)
|
||||
continue;
|
||||
|
||||
//can't repledge to a guild you're already part of
|
||||
// Can't teleport to something without a tree
|
||||
|
||||
if (city.getTOL() == null)
|
||||
continue;
|
||||
|
||||
// No abandoned cities
|
||||
|
||||
if (city.getTOL().getGuild().isEmptyGuild())
|
||||
continue;
|
||||
|
||||
// No destroyed cities
|
||||
|
||||
if (city.getTOL().getRank() == -1)
|
||||
continue;
|
||||
|
||||
//can't repledge to a guild you're already part of
|
||||
if (repledge && city.getGuild().equals(playerCharacter.guild))
|
||||
continue;
|
||||
|
||||
@@ -799,10 +813,10 @@ public class City extends AbstractWorldObject {
|
||||
|
||||
// Determine if this city is a nation capitol
|
||||
|
||||
if (this.getGuild().getGuildState() == GuildState.Nation)
|
||||
if (this.getGuild().guildState == GuildState.Nation)
|
||||
for (Guild sub : this.getGuild().getSubGuildList()) {
|
||||
|
||||
if ((sub.getGuildState() == GuildState.Protectorate) || (sub.getGuildState() == GuildState.Province)) {
|
||||
if ((sub.guildState == GuildState.Protectorate) || (sub.guildState == GuildState.Province)) {
|
||||
this.isCapital = 1;
|
||||
break;
|
||||
}
|
||||
@@ -1159,7 +1173,8 @@ public class City extends AbstractWorldObject {
|
||||
sourceNation.getSubGuildList().remove(sourceGuild);
|
||||
|
||||
if (sourceNation.getSubGuildList().isEmpty())
|
||||
sourceNation.downgradeGuildState();
|
||||
sourceNation.guildState = GuildState.Sovereign;
|
||||
|
||||
}
|
||||
|
||||
// Link the mew guild with the tree
|
||||
@@ -1172,7 +1187,7 @@ public class City extends AbstractWorldObject {
|
||||
sourceGuild.setCityUUID(this.getObjectUUID());
|
||||
|
||||
sourceGuild.setNation(sourceGuild);
|
||||
sourceGuild.setGuildState(GuildState.Sovereign);
|
||||
sourceGuild.guildState = GuildState.Sovereign;
|
||||
GuildManager.updateAllGuildTags(sourceGuild);
|
||||
GuildManager.updateAllGuildBinds(sourceGuild, this);
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ public class Guild extends AbstractWorldObject {
|
||||
private ArrayList<Guild> recommendList = new ArrayList<>();
|
||||
private ArrayList<Guild> subGuildList;
|
||||
private int nationUUID = 0;
|
||||
private GuildState guildState = GuildState.Errant;
|
||||
public GuildState guildState = GuildState.Errant;
|
||||
private String hash;
|
||||
private boolean ownerIsNPC;
|
||||
|
||||
@@ -206,23 +206,6 @@ public class Guild extends AbstractWorldObject {
|
||||
return a.nation.getObjectUUID() == b.nation.getObjectUUID() && !a.nation.isEmptyGuild();
|
||||
}
|
||||
|
||||
public static boolean canSwearIn(Guild toSub) {
|
||||
|
||||
boolean canSwear = false;
|
||||
|
||||
switch (toSub.guildState) {
|
||||
|
||||
case Protectorate:
|
||||
case Petitioner:
|
||||
canSwear = true;
|
||||
break;
|
||||
default:
|
||||
canSwear = false;
|
||||
}
|
||||
|
||||
return canSwear;
|
||||
}
|
||||
|
||||
public static void _serializeForClientMsg(Guild guild, ByteBufferWriter writer) {
|
||||
Guild.serializeForClientMsg(guild, writer, null, false);
|
||||
}
|
||||
@@ -644,65 +627,6 @@ public class Guild extends AbstractWorldObject {
|
||||
|
||||
}
|
||||
|
||||
public void upgradeGuildState(boolean nation) {
|
||||
if (nation) {
|
||||
this.guildState = GuildState.Nation;
|
||||
return;
|
||||
}
|
||||
switch (this.guildState) {
|
||||
|
||||
case Errant:
|
||||
this.guildState = GuildState.Petitioner;
|
||||
break;
|
||||
case Sworn:
|
||||
//Can't upgrade
|
||||
break;
|
||||
case Protectorate:
|
||||
this.guildState = GuildState.Province;
|
||||
break;
|
||||
case Petitioner:
|
||||
this.guildState = GuildState.Sworn;
|
||||
break;
|
||||
case Province:
|
||||
//Can't upgrade
|
||||
break;
|
||||
case Nation:
|
||||
//Can't upgrade
|
||||
break;
|
||||
case Sovereign:
|
||||
this.guildState = GuildState.Protectorate;
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void downgradeGuildState() {
|
||||
|
||||
switch (this.guildState) {
|
||||
case Errant:
|
||||
break;
|
||||
case Sworn:
|
||||
this.guildState = GuildState.Errant;
|
||||
break;
|
||||
case Protectorate:
|
||||
this.guildState = GuildState.Sovereign;
|
||||
break;
|
||||
case Petitioner:
|
||||
this.guildState = GuildState.Errant;
|
||||
break;
|
||||
case Province:
|
||||
this.guildState = GuildState.Sovereign;
|
||||
break;
|
||||
case Nation:
|
||||
this.guildState = GuildState.Sovereign;
|
||||
break;
|
||||
case Sovereign:
|
||||
this.guildState = GuildState.Errant;
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public boolean canSubAGuild(Guild toSub) {
|
||||
|
||||
boolean canSub;
|
||||
@@ -726,10 +650,12 @@ public class Guild extends AbstractWorldObject {
|
||||
default:
|
||||
canSub = false;
|
||||
}
|
||||
|
||||
City nationCap = City.getCity(nation.cityUUID);
|
||||
if (nation.getSubGuildList().size() >= nationCap.getRank()) {
|
||||
|
||||
if (nation.getSubGuildList().size() >= nationCap.getRank())
|
||||
canSub = false;
|
||||
}
|
||||
|
||||
return canSub;
|
||||
}
|
||||
|
||||
@@ -901,14 +827,6 @@ public class Guild extends AbstractWorldObject {
|
||||
return motto;
|
||||
}
|
||||
|
||||
public GuildState getGuildState() {
|
||||
return guildState;
|
||||
}
|
||||
|
||||
public void setGuildState(GuildState guildState) {
|
||||
this.guildState = guildState;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the realmsOwned
|
||||
*/
|
||||
@@ -930,18 +848,14 @@ public class Guild extends AbstractWorldObject {
|
||||
if (!DbManager.GuildQueries.UPDATE_PARENT(subGuild.getObjectUUID(), WorldServer.worldUUID))
|
||||
Logger.debug("Failed to set Nation Guild for Guild with UID " + subGuild.getObjectUUID());
|
||||
|
||||
// Guild without any subs is no longer a nation
|
||||
|
||||
if (subGuild.getOwnedCity() == null) {
|
||||
subGuild.nation = null;
|
||||
subGuild.guildState = GuildState.Errant;
|
||||
subGuild.nation = Guild.getErrantNation();
|
||||
} else {
|
||||
subGuild.nation = subGuild;
|
||||
subGuild.guildState = GuildState.Sovereign;
|
||||
}
|
||||
|
||||
// Downgrade guild
|
||||
|
||||
subGuild.downgradeGuildState();
|
||||
|
||||
// Remove from collection
|
||||
|
||||
subGuildList.remove(subGuild);
|
||||
|
||||
@@ -220,8 +220,7 @@ public class Mine extends AbstractGameObject {
|
||||
// Only inactive mines are returned.
|
||||
|
||||
for (Mine mine : Mine.mineMap.keySet()) {
|
||||
if (mine.owningGuild.getObjectUUID() == guildID &&
|
||||
mine.isActive == false)
|
||||
if (mine.owningGuild.getObjectUUID() == guildID)
|
||||
mineList.add(mine);
|
||||
}
|
||||
return mineList;
|
||||
|
||||
@@ -512,29 +512,6 @@ public class NPC extends AbstractCharacter {
|
||||
return MinionType.ContractToMinionMap.containsKey(contractID);
|
||||
}
|
||||
|
||||
public static boolean UpdateEquipSetID(NPC npc, int equipSetID) {
|
||||
|
||||
if (!LootManager._bootySetMap.containsKey(equipSetID))
|
||||
return false;
|
||||
|
||||
if (!DbManager.NPCQueries.UPDATE_EQUIPSET(npc, equipSetID))
|
||||
return false;
|
||||
|
||||
npc.equipmentSetID = equipSetID;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public static boolean UpdateRaceID(NPC npc, int raceID) {
|
||||
|
||||
if (!DbManager.NPCQueries.UPDATE_MOBBASE(npc, raceID))
|
||||
return false;
|
||||
|
||||
npc.loadID = raceID;
|
||||
npc.mobBase = MobBase.getMobBase(npc.loadID);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static NPCProfits GetNPCProfits(NPC npc) {
|
||||
return NPCProfits.ProfitCache.get(npc.currentID);
|
||||
}
|
||||
|
||||
@@ -63,8 +63,8 @@ public class DestroyCityThread implements Runnable {
|
||||
|
||||
//Successful Update of guild
|
||||
|
||||
formerGuild.setGuildState(mbEnums.GuildState.Errant);
|
||||
formerGuild.setNation(null);
|
||||
formerGuild.guildState = mbEnums.GuildState.Errant;
|
||||
formerGuild.setNation(Guild.getErrantNation());
|
||||
formerGuild.setCityUUID(0);
|
||||
GuildManager.updateAllGuildTags(formerGuild);
|
||||
GuildManager.updateAllGuildBinds(formerGuild, null);
|
||||
@@ -95,6 +95,12 @@ public class DestroyCityThread implements Runnable {
|
||||
if (cityBuilding == null)
|
||||
continue;
|
||||
|
||||
// check null bluepritn and log error
|
||||
if (cityBuilding.getBlueprint() == null){
|
||||
Logger.error("Null Blueprint for building ID: " + cityBuilding.getObjectUUID());
|
||||
continue;
|
||||
}
|
||||
|
||||
// Do nothing with the banestone. It will be removed elsewhere
|
||||
|
||||
if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
|
||||
|
||||
@@ -50,8 +50,8 @@ public class TransferCityThread implements Runnable {
|
||||
|
||||
if (formerGuild != null)
|
||||
if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
|
||||
formerGuild.setGuildState(mbEnums.GuildState.Errant);
|
||||
formerGuild.setNation(null);
|
||||
formerGuild.guildState = mbEnums.GuildState.Errant;
|
||||
formerGuild.setNation(Guild.getErrantNation());
|
||||
formerGuild.setCityUUID(0);
|
||||
GuildManager.updateAllGuildTags(formerGuild);
|
||||
GuildManager.updateAllGuildBinds(formerGuild, null);
|
||||
@@ -63,13 +63,11 @@ public class TransferCityThread implements Runnable {
|
||||
|
||||
subGuildList = new ArrayList<>();
|
||||
|
||||
for (Guild subGuild : formerGuild.getSubGuildList()) {
|
||||
for (Guild subGuild : formerGuild.getSubGuildList())
|
||||
subGuildList.add(subGuild);
|
||||
}
|
||||
|
||||
for (Guild subGuild : subGuildList) {
|
||||
for (Guild subGuild : subGuildList)
|
||||
formerGuild.removeSubGuild(subGuild);
|
||||
}
|
||||
}
|
||||
|
||||
//Reset TOL to rank 1
|
||||
|
||||
@@ -0,0 +1,285 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2024
|
||||
// www.magicbane.com
|
||||
|
||||
package engine.wpak;
|
||||
|
||||
import engine.gameManager.ConfigManager;
|
||||
import engine.mbEnums;
|
||||
import engine.wpak.data.ConditionEntry;
|
||||
import engine.wpak.data.Effect;
|
||||
import engine.wpak.data.ModifierEntry;
|
||||
import org.pmw.tinylog.Logger;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class EffectsParser {
|
||||
|
||||
public static String effectsPath = ConfigManager.DEFAULT_DATA_DIR + "wpak/Effects.cfg";
|
||||
private static final Pattern EFFECT_REGEX = Pattern.compile("(?<=EFFECTBEGIN)(.+?)(?=EFFECTEND)", Pattern.DOTALL);
|
||||
private static final Pattern SOURCE_REGEX = Pattern.compile("(?<=SOURCEBEGIN)(.+?)(?=SOURCEEND)", Pattern.DOTALL);
|
||||
private static final Pattern MODS_REGEX = Pattern.compile("(?<=MODSBEGIN)(.+?)(?=MODSEND)", Pattern.DOTALL);
|
||||
private static final Pattern CONDITIONS_REGEX = Pattern.compile("(?<=CONDITIONBEGIN)(.+?)(?=CONDITIONEND)", Pattern.DOTALL);
|
||||
private static final Pattern STRSPLIT_REGEX = Pattern.compile("([^\"]\\S*|\"[^\"]*\")\\s*"); // Regex ignores spaces within quotes
|
||||
|
||||
public static void parseWpakFile() {
|
||||
|
||||
// Read .wpak file from disk
|
||||
|
||||
byte[] fileData;
|
||||
|
||||
try {
|
||||
fileData = Files.readAllBytes(Paths.get(effectsPath));
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
String fileContents = new String(fileData);
|
||||
|
||||
// Iterate over effect entries from .wpak data
|
||||
|
||||
Matcher matcher = EFFECT_REGEX.matcher(fileContents);
|
||||
|
||||
while (matcher.find()) {
|
||||
try {
|
||||
Effect effect = parseEffectEntry(matcher.group());
|
||||
// WpakPowerManager._effectsLookup.put(effect.effect_id, effect);
|
||||
} catch (Exception e) {
|
||||
Logger.error("EFFECT PARSE FAILED: " + e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static Effect parseEffectEntry(String effectData) {
|
||||
|
||||
Effect effect = new Effect();
|
||||
|
||||
// Parse fields that lie outside the other tags
|
||||
|
||||
effect.isItemEffect = effectData.contains("IsItemEffect");
|
||||
effect.isSpireEffect = effectData.contains("IsSpireEffect");
|
||||
effect.ignoreNoMod = effectData.contains("IgnoreNoMod");
|
||||
effect.dontSave = effectData.contains("DontSave");
|
||||
|
||||
// Remove all lines that contain a # and leading/trailing blank lines
|
||||
|
||||
effectData = effectData.replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", "");
|
||||
effectData = effectData.trim();
|
||||
|
||||
// Parse effect entry header
|
||||
|
||||
String firstLine;
|
||||
ArrayList<String> effectHeader = new ArrayList<>();
|
||||
|
||||
// Some effects exist without sources/mods or conditions
|
||||
// (ACID "MOB" 0)
|
||||
|
||||
if (effectData.indexOf('\n') > 0)
|
||||
firstLine = effectData.substring(0, effectData.indexOf('\n'));
|
||||
else
|
||||
firstLine = effectData;
|
||||
|
||||
Matcher matcher = STRSPLIT_REGEX.matcher(firstLine);
|
||||
|
||||
while (matcher.find())
|
||||
effectHeader.add(matcher.group().trim());
|
||||
|
||||
effect.effect_id = effectHeader.get(0);
|
||||
effect.effect_name = effectHeader.get(1);
|
||||
effect.effect_name = effect.effect_name.replaceAll("\"", "");
|
||||
|
||||
// Some effect mods have no icon
|
||||
// (SEEINVIS-SHADE "See Invis")
|
||||
|
||||
if (effectHeader.size() == 3)
|
||||
effect.icon = Integer.parseInt(effectHeader.get(2));
|
||||
else
|
||||
effect.icon = 0;
|
||||
|
||||
// Parse source entries
|
||||
|
||||
matcher = SOURCE_REGEX.matcher(effectData);
|
||||
|
||||
while (matcher.find())
|
||||
effect.sources.add(matcher.group().trim());
|
||||
|
||||
// Parse modifier entries
|
||||
|
||||
matcher = MODS_REGEX.matcher(effectData);
|
||||
|
||||
// Iterate effect entries from .wpak config data
|
||||
|
||||
while (matcher.find()) {
|
||||
ModifierEntry modifierEntry = parseModEntry(matcher.group());
|
||||
effect.mods.add(modifierEntry);
|
||||
}
|
||||
|
||||
// Parse Conditions
|
||||
|
||||
matcher = CONDITIONS_REGEX.matcher(effectData);
|
||||
|
||||
while (matcher.find()) {
|
||||
String[] conditions = matcher.group().trim().split("\n");
|
||||
|
||||
for (String condition : conditions) {
|
||||
List<String> parameters = Arrays.asList(condition.trim().split("\\s+"));
|
||||
Iterator<String> iterator = parameters.iterator();
|
||||
|
||||
ConditionEntry conditionEntry = new ConditionEntry();
|
||||
conditionEntry.condition = iterator.next();
|
||||
conditionEntry.arg = Integer.parseInt(iterator.next());
|
||||
|
||||
if (iterator.hasNext())
|
||||
conditionEntry.curveType = mbEnums.CompoundCurveType.valueOf(iterator.next());
|
||||
|
||||
while (iterator.hasNext())
|
||||
conditionEntry.damageTypes.add(mbEnums.DamageType.valueOf(iterator.next().toUpperCase()));
|
||||
|
||||
effect.conditions.add(conditionEntry);
|
||||
}
|
||||
}
|
||||
|
||||
return effect;
|
||||
}
|
||||
|
||||
private static ModifierEntry parseModEntry(String modData) {
|
||||
|
||||
ModifierEntry modifierEntry = new ModifierEntry();
|
||||
|
||||
String[] modEntries = modData.trim().split("\n");
|
||||
|
||||
for (String modEntry : modEntries) {
|
||||
|
||||
ArrayList<String> modValues = new ArrayList<>();
|
||||
Matcher matcher = STRSPLIT_REGEX.matcher(modEntry.trim());
|
||||
|
||||
while (matcher.find())
|
||||
modValues.add(matcher.group().trim());
|
||||
|
||||
modifierEntry.type = mbEnums.ModType.valueOf(modValues.get(0).trim());
|
||||
|
||||
switch (modifierEntry.type) {
|
||||
case AnimOverride:
|
||||
modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
|
||||
modifierEntry.max = Float.parseFloat(modValues.get(2).trim());
|
||||
break;
|
||||
case Health:
|
||||
case Mana:
|
||||
case Stamina:
|
||||
modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
|
||||
modifierEntry.max = Float.parseFloat(modValues.get(2).trim());
|
||||
modifierEntry.percentage = Float.parseFloat(modValues.get(3).trim());
|
||||
modifierEntry.value = Float.parseFloat(modValues.get(4).trim()); // Always zero
|
||||
modifierEntry.compoundCurveType = mbEnums.CompoundCurveType.valueOf(modValues.get(5).trim());
|
||||
modifierEntry.arg1 = modValues.get(6).trim();
|
||||
break;
|
||||
case Attr:
|
||||
case Resistance:
|
||||
case Skill:
|
||||
case HealthRecoverRate:
|
||||
case ManaRecoverRate:
|
||||
case StaminaRecoverRate:
|
||||
case DamageShield:
|
||||
case HealthFull:
|
||||
case ManaFull:
|
||||
case StaminaFull:
|
||||
case Slay:
|
||||
case Fade:
|
||||
case Durability:
|
||||
modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
|
||||
modifierEntry.max = Float.parseFloat(modValues.get(2).trim());
|
||||
modifierEntry.compoundCurveType = mbEnums.CompoundCurveType.valueOf(modValues.get(3).trim());
|
||||
|
||||
if (modValues.size() > 4)
|
||||
modifierEntry.arg1 = modValues.get(4).trim(); // Some HeathFull entries do not have an argument
|
||||
break;
|
||||
case MeleeDamageModifier:
|
||||
case OCV:
|
||||
case DCV:
|
||||
case AttackDelay:
|
||||
case AdjustAboveDmgCap:
|
||||
case DamageCap:
|
||||
case ArmorPiercing:
|
||||
case Speed:
|
||||
case PowerDamageModifier:
|
||||
case DR:
|
||||
case PassiveDefense:
|
||||
case MaxDamage:
|
||||
case Value:
|
||||
case WeaponSpeed:
|
||||
case MinDamage:
|
||||
case PowerCost:
|
||||
case Block:
|
||||
case Parry:
|
||||
case Dodge:
|
||||
case WeaponRange:
|
||||
case ScanRange:
|
||||
case ScaleHeight:
|
||||
case ScaleWidth:
|
||||
modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
|
||||
modifierEntry.max = Float.parseFloat(modValues.get(2).trim());
|
||||
modifierEntry.compoundCurveType = mbEnums.CompoundCurveType.valueOf(modValues.get(3).trim());
|
||||
break;
|
||||
case ItemName:
|
||||
case BlockedPowerType:
|
||||
case ImmuneTo:
|
||||
case BlackMantle:
|
||||
modifierEntry.arg1 = modValues.get(1).trim();
|
||||
|
||||
// Some BlockedPowerType entries have only one argument
|
||||
|
||||
if (modValues.size() > 2)
|
||||
modifierEntry.arg2 = modValues.get(2).trim();
|
||||
break;
|
||||
case NoMod:
|
||||
case ConstrainedAmbidexterity:
|
||||
case ProtectionFrom:
|
||||
case ExclusiveDamageCap:
|
||||
case IgnoreDamageCap:
|
||||
modifierEntry.arg1 = modValues.get(1).trim();
|
||||
break;
|
||||
case WeaponProc:
|
||||
modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
|
||||
modifierEntry.arg1 = modValues.get(2).trim();
|
||||
modifierEntry.max = Float.parseFloat(modValues.get(3).trim());
|
||||
break;
|
||||
case BladeTrails: // These tags have no parms or are not parsed
|
||||
case ImmuneToAttack:
|
||||
case ImmuneToPowers:
|
||||
case Ambidexterity:
|
||||
case Silenced:
|
||||
case IgnorePassiveDefense:
|
||||
case Stunned:
|
||||
case PowerCostHealth:
|
||||
case Charmed:
|
||||
case Fly:
|
||||
case CannotMove:
|
||||
case CannotTrack:
|
||||
case CannotAttack:
|
||||
case CannotCast:
|
||||
case SpireBlock:
|
||||
case Invisible:
|
||||
case SeeInvisible:
|
||||
break;
|
||||
default:
|
||||
Logger.error("Unhandled type: " + modifierEntry.type);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return modifierEntry;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,308 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2024
|
||||
// www.magicbane.com
|
||||
|
||||
package engine.wpak;
|
||||
|
||||
import engine.gameManager.ConfigManager;
|
||||
import engine.mbEnums;
|
||||
import engine.wpak.data.Effect;
|
||||
import engine.wpak.data.PowerAction;
|
||||
import engine.wpak.data.StatTransfer;
|
||||
import engine.wpak.data.TrackEntry;
|
||||
import org.pmw.tinylog.Logger;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class PowerActionParser {
|
||||
private static final Pattern STRSPLIT_REGEX = Pattern.compile("([^\"]\\S*|\"[^\"]*\")\\s*");
|
||||
private static final Pattern POWER_ACTION_REGEX = Pattern.compile("(?<=POWERACTIONBEGIN)(.+?)(?=POWERACTIONEND)", Pattern.DOTALL);
|
||||
private static final String powerActionPath = ConfigManager.DEFAULT_DATA_DIR + "wpak/PowerActions.cfg";
|
||||
|
||||
public static void parseWpakFile() {
|
||||
|
||||
// Read .wpak file from disk
|
||||
|
||||
byte[] fileData;
|
||||
|
||||
try {
|
||||
fileData = Files.readAllBytes(Paths.get(powerActionPath));
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
String fileContents = new String(fileData);
|
||||
|
||||
// Iterate over power entries from .wpak data
|
||||
|
||||
Matcher matcher = POWER_ACTION_REGEX.matcher(fileContents);
|
||||
|
||||
while (matcher.find()) {
|
||||
|
||||
PowerAction powerAction = parsePowerActionEntry(matcher.group().trim());
|
||||
// WpakPowerManager._powerActionLookup.put(Hasher.SBStringHash(powerAction.action_id), powerAction);
|
||||
}
|
||||
}
|
||||
|
||||
private static PowerAction parsePowerActionEntry(String powerActionData) {
|
||||
|
||||
PowerAction powerAction = new PowerAction();
|
||||
Effect effect;
|
||||
StatTransfer statTransfer;
|
||||
TrackEntry trackEntry;
|
||||
|
||||
// Remove all lines that contain a # and leading/trailing blank lines
|
||||
|
||||
powerActionData = powerActionData.replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", "").trim();
|
||||
|
||||
List<String> lineData = Arrays.asList(powerActionData.split("\n"));
|
||||
|
||||
// Parse effect entry header
|
||||
|
||||
Iterator<String> entryIterator = lineData.iterator();
|
||||
String headerLine = entryIterator.next();
|
||||
List<String> headerData = new ArrayList<>();
|
||||
|
||||
Matcher matcher = STRSPLIT_REGEX.matcher(headerLine.trim());
|
||||
|
||||
while (matcher.find())
|
||||
headerData.add(matcher.group().trim());
|
||||
|
||||
Iterator<String> headerIterator = headerData.iterator();
|
||||
powerAction.action_id = headerIterator.next();
|
||||
powerAction.action_type = mbEnums.PowerActionType.valueOf(headerIterator.next());
|
||||
|
||||
switch (powerAction.action_type) {
|
||||
case RemoveEffect:
|
||||
effect = new Effect();
|
||||
effect.effect_id = headerIterator.next();
|
||||
powerAction.effects.add(effect);
|
||||
break;
|
||||
case CreateMob:
|
||||
powerAction.petRace = Integer.parseInt(headerIterator.next());
|
||||
powerAction.petLevel = Integer.parseInt(headerIterator.next());
|
||||
break;
|
||||
case DamageOverTime:
|
||||
effect = new Effect();
|
||||
effect.effect_id = headerIterator.next();
|
||||
effect.cycleDuration = Integer.parseInt(headerIterator.next());
|
||||
effect.cycleDelay = Integer.parseInt(headerIterator.next());
|
||||
powerAction.effects.add(effect);
|
||||
break;
|
||||
case ApplyEffects:
|
||||
int level = Integer.parseInt(headerIterator.next());
|
||||
|
||||
while (headerIterator.hasNext()) {
|
||||
effect = new Effect();
|
||||
effect.level = level;
|
||||
effect.effect_id = headerIterator.next();
|
||||
powerAction.effects.add(effect);
|
||||
}
|
||||
break;
|
||||
case Transform:
|
||||
case Invis:
|
||||
case ApplyEffect:
|
||||
case DeferredPower:
|
||||
case DirectDamage:
|
||||
case SpireDisable:
|
||||
while (headerIterator.hasNext()) {
|
||||
effect = new Effect();
|
||||
effect.effect_id = headerIterator.next();
|
||||
|
||||
// Some applyEffect entries are naked withot a level
|
||||
|
||||
if (headerData.size() > 3)
|
||||
effect.level = Integer.parseInt(headerIterator.next());
|
||||
|
||||
powerAction.effects.add(effect);
|
||||
}
|
||||
break;
|
||||
case TransferStat:
|
||||
statTransfer = new StatTransfer();
|
||||
statTransfer.fromStat = mbEnums.CostType.valueOf(headerIterator.next());
|
||||
statTransfer.toStat = mbEnums.CostType.valueOf(headerIterator.next());
|
||||
statTransfer.ramp = Float.parseFloat(headerIterator.next());
|
||||
statTransfer.rampCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
|
||||
statTransfer.efficiency = Float.parseFloat(headerIterator.next());
|
||||
statTransfer.efficiencyCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
|
||||
statTransfer.fromStatBool = Boolean.parseBoolean(headerIterator.next());
|
||||
statTransfer.isDrain = Boolean.parseBoolean(headerIterator.next());
|
||||
powerAction.statTransfer = statTransfer;
|
||||
break;
|
||||
case TransferStatOT:
|
||||
statTransfer = new StatTransfer();
|
||||
statTransfer.fromStat = mbEnums.CostType.valueOf(headerIterator.next());
|
||||
statTransfer.toStat = mbEnums.CostType.valueOf(headerIterator.next());
|
||||
statTransfer.ramp = Float.parseFloat(headerIterator.next());
|
||||
statTransfer.rampCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
|
||||
statTransfer.efficiency = Float.parseFloat(headerIterator.next());
|
||||
statTransfer.efficiencyCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
|
||||
statTransfer.fromStatBool = Boolean.parseBoolean(headerIterator.next());
|
||||
statTransfer.isDrain = Boolean.parseBoolean(headerIterator.next());
|
||||
statTransfer.transfer_action = headerIterator.next();
|
||||
statTransfer.transfer_ticks = Integer.parseInt(headerIterator.next());
|
||||
powerAction.statTransfer = statTransfer;
|
||||
break;
|
||||
case Charm:
|
||||
effect = new Effect();
|
||||
effect.effect_id = headerIterator.next();
|
||||
effect.level = Integer.parseInt(headerIterator.next());
|
||||
effect.type = headerIterator.next();
|
||||
powerAction.effects.add(effect);
|
||||
break;
|
||||
case Block:
|
||||
effect = new Effect();
|
||||
effect.effect_id = headerIterator.next();
|
||||
effect.level = Integer.parseInt(headerIterator.next());
|
||||
powerAction.effects.add(effect);
|
||||
break;
|
||||
case Resurrect:
|
||||
powerAction.levelCap = Integer.parseInt(headerIterator.next());
|
||||
break;
|
||||
case SetItemFlag:
|
||||
powerAction.itemFlag = mbEnums.ItemFlags.valueOf(headerIterator.next());
|
||||
break;
|
||||
case Track:
|
||||
trackEntry = new TrackEntry();
|
||||
trackEntry.action_id = headerIterator.next();
|
||||
trackEntry.trackPlayer = Boolean.parseBoolean(headerIterator.next());
|
||||
trackEntry.trackCorpse = Boolean.parseBoolean(headerIterator.next());
|
||||
trackEntry.filter = mbEnums.MonsterType.valueOf(headerIterator.next());
|
||||
trackEntry.min = Integer.parseInt(headerIterator.next());
|
||||
trackEntry.max = Integer.parseInt(headerIterator.next());
|
||||
powerAction.trackEntry = trackEntry;
|
||||
break;
|
||||
case Teleport:
|
||||
if (headerIterator.hasNext())
|
||||
powerAction.ignoreNoTeleSpire = Boolean.parseBoolean(headerIterator.next());
|
||||
break;
|
||||
case Recall: // No arguments for these tags or not parsed
|
||||
case Summon:
|
||||
case TreeChoke:
|
||||
case SimpleDamage:
|
||||
case MobRecall: // One argument always zero
|
||||
case ClearAggro:
|
||||
case ClearNearbyAggro:
|
||||
case Peek:
|
||||
case ClaimMine:
|
||||
case RunegateTeleport:
|
||||
case Steal:
|
||||
break;
|
||||
default:
|
||||
Logger.error("Unhandled type " + powerAction.action_type + " for Pow4erAction: " + powerAction.action_id);
|
||||
break;
|
||||
}
|
||||
|
||||
// Process key value pairs after header
|
||||
|
||||
while (entryIterator.hasNext()) {
|
||||
String lineValue = entryIterator.next();
|
||||
List<String> lineValues = Arrays.asList(lineValue.split("="));
|
||||
String key = lineValues.get(0).trim();
|
||||
List<String> arguments;
|
||||
|
||||
switch (key) {
|
||||
case "BODYPARTS":
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
|
||||
for (String bodyPart : arguments)
|
||||
powerAction.bodyParts.add(Integer.parseInt(bodyPart));
|
||||
break;
|
||||
case "FEMALEBODYPARTS":
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
|
||||
for (String bodyPart : arguments)
|
||||
powerAction.femaleBodyParts.add(Integer.parseInt(bodyPart));
|
||||
break;
|
||||
case "SCALEFACTOR":
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
|
||||
for (String scaleFactor : arguments)
|
||||
powerAction.scaleFactor.add(Float.parseFloat(scaleFactor));
|
||||
break;
|
||||
case "ISRESISTABLE":
|
||||
powerAction.isResistible = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "ISAGGRESSIVE":
|
||||
powerAction.isAggressive = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "BLADETRAILS":
|
||||
powerAction.bladeTrails = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "SHOULDSHOWWEAPONS":
|
||||
powerAction.shouldShowWeapons = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "SHOULDSHOWARMOR":
|
||||
powerAction.shouldShowArmor = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "APPLYEFFECTBLANK":
|
||||
powerAction.applyEffectBlank = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "WEAROFFEFFECTBLANK":
|
||||
powerAction.wearOffEffectBlank = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "ATTACKANIMS":
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
|
||||
for (String animation : arguments)
|
||||
powerAction.attackAnimations.add(Integer.parseInt(animation));
|
||||
break;
|
||||
case "REMOVEALL":
|
||||
powerAction.removeAll = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "EFFECTID":
|
||||
effect = new Effect();
|
||||
effect.effect_id = lineValues.get(1).trim();
|
||||
powerAction.effects.add(effect);
|
||||
break;
|
||||
case "LEVELCAP":
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
powerAction.levelCap = Integer.parseInt(arguments.get(0));
|
||||
|
||||
if (arguments.size() > 1) // Not all level caps have a curve
|
||||
powerAction.levelCapCurve = mbEnums.CompoundCurveType.valueOf(arguments.get(1));
|
||||
break;
|
||||
case "CLEARAGGRO":
|
||||
powerAction.clearAggro = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "TARGETBECOMESPET":
|
||||
powerAction.targetBecomesPet = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "DESTROYOLDPET":
|
||||
powerAction.destroyOldPet = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "DAMAGETYPE":
|
||||
powerAction.damageType = mbEnums.DamageType.valueOf(lineValues.get(1).trim().toUpperCase());
|
||||
break;
|
||||
case "ROOTFSMID":
|
||||
powerAction.rootFsmID = mbEnums.MobBehaviourType.valueOf(lineValues.get(1).trim());
|
||||
break;
|
||||
case "SPLASHDAMAGE":
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
powerAction.splashDamageMin = Integer.parseInt(arguments.get(0));
|
||||
powerAction.splashDamageMax = Integer.parseInt(arguments.get(1));
|
||||
break;
|
||||
case "APPLYEFFECTOTHER":
|
||||
case "APPLYEFFECTSELF":
|
||||
case "WEAROFFEFFECTOTHER": // Keys not parsed go here.
|
||||
case "WEAROFFEFFECTSELF":
|
||||
break;
|
||||
default:
|
||||
Logger.error("Unhandled variable type:" + key + " for powerAction: " + powerAction.action_id);
|
||||
}
|
||||
}
|
||||
return powerAction;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,319 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2024
|
||||
// www.magicbane.com
|
||||
|
||||
package engine.wpak;
|
||||
|
||||
import engine.gameManager.ConfigManager;
|
||||
import engine.mbEnums;
|
||||
import engine.wpak.data.*;
|
||||
import org.pmw.tinylog.Logger;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class PowersParser {
|
||||
|
||||
private static final Pattern POWER_REGEX = Pattern.compile("(?<=POWERBEGIN)(.+?)(?=POWEREND)", Pattern.DOTALL);
|
||||
private static final Pattern STRSPLIT_REGEX = Pattern.compile("([^\"]\\S*|\"[^\"]*\")\\s*");
|
||||
private static final Pattern CONDITION_REGEX = Pattern.compile("(?<=CONDITIONBEGIN)(.+?)(?=CONDITIONEND)", Pattern.DOTALL);
|
||||
private static final String powersPath = ConfigManager.DEFAULT_DATA_DIR + "wpak/Powers.cfg";
|
||||
|
||||
public static void parseWpakFile() {
|
||||
|
||||
// Read .wpak file from disk
|
||||
|
||||
byte[] fileData;
|
||||
|
||||
try {
|
||||
fileData = Files.readAllBytes(Paths.get(powersPath));
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
String fileContents = new String(fileData);
|
||||
|
||||
// Iterate over power entries from .wpak data
|
||||
|
||||
Matcher matcher = POWER_REGEX.matcher(fileContents);
|
||||
|
||||
while (matcher.find()) {
|
||||
|
||||
Power power = parsePowerEntry(matcher.group().trim());
|
||||
// @TODO WpakPowerManager._powersLookup.put(Hasher.SBStringHash(power.power_id), power);
|
||||
}
|
||||
}
|
||||
|
||||
private static Power parsePowerEntry(String powerData) {
|
||||
|
||||
Power powerEntry = new Power();
|
||||
StringBuilder conditionBuilder = new StringBuilder();
|
||||
StringBuilder powerBuilder = new StringBuilder();
|
||||
String conditionString;
|
||||
String powerString;
|
||||
java.util.Iterator<String> iterator;
|
||||
java.util.Iterator<String> argumentIterator;
|
||||
int endPos = 0;
|
||||
|
||||
// Separate out any conditions from the power data
|
||||
|
||||
Matcher matcher = CONDITION_REGEX.matcher(powerData);
|
||||
|
||||
while (matcher.find()) {
|
||||
conditionBuilder.append(matcher.group().trim());
|
||||
powerBuilder.append(powerData, endPos, matcher.start());
|
||||
endPos = matcher.end();
|
||||
}
|
||||
|
||||
powerBuilder.append(powerData.substring(endPos));
|
||||
|
||||
// Cleanup dangling tags and lines that contain a # and leading/trailing blank lines
|
||||
|
||||
powerString = powerBuilder.toString().replaceAll("CONDITIONBEGINCONDITIONEND", "")
|
||||
.replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", "");
|
||||
conditionString = conditionBuilder.toString().replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", "");
|
||||
|
||||
// Parse header line in power data
|
||||
|
||||
List<String> lineData = Arrays.asList(powerString.trim().split("\n"));
|
||||
List<String> powerHeader = new ArrayList<>();
|
||||
|
||||
String headerString = lineData.get(0);
|
||||
headerString = headerString.replace("\n", " ");
|
||||
|
||||
matcher = STRSPLIT_REGEX.matcher(headerString);
|
||||
|
||||
while (matcher.find())
|
||||
powerHeader.add(matcher.group().trim());
|
||||
|
||||
iterator = powerHeader.iterator();
|
||||
|
||||
powerEntry.power_id = iterator.next();
|
||||
powerEntry.power = iterator.next().replaceAll("\"", "");
|
||||
|
||||
PowerEntry power = new PowerEntry();
|
||||
power.power_type = mbEnums.PowerType.valueOf(iterator.next());
|
||||
power.icon = Integer.parseInt(iterator.next());
|
||||
power.focusLine = iterator.next().replaceAll("\"", "");
|
||||
powerEntry.powers.add(power);
|
||||
|
||||
String nextValue = iterator.next();
|
||||
|
||||
// Account for second definition
|
||||
|
||||
if (nextValue.equals("SPELL") || nextValue.equals("SKILL")) {
|
||||
power = new PowerEntry();
|
||||
power.power_type = mbEnums.PowerType.valueOf(nextValue);
|
||||
power.icon = Integer.parseInt(iterator.next());
|
||||
power.focusLine = iterator.next().replaceAll("\"", "");
|
||||
powerEntry.powers.add(power);
|
||||
powerEntry.target_type = mbEnums.PowerTargetType.valueOf(iterator.next());
|
||||
} else
|
||||
powerEntry.target_type = mbEnums.PowerTargetType.valueOf(nextValue);
|
||||
|
||||
powerEntry.range = Integer.parseInt(iterator.next());
|
||||
powerEntry.areaType = mbEnums.AreaType.valueOf(iterator.next());
|
||||
powerEntry.areaRange = Integer.parseInt(iterator.next());
|
||||
powerEntry.excludeType = mbEnums.ExcludeType.valueOf(iterator.next());
|
||||
powerEntry.costType = mbEnums.CostType.valueOf(iterator.next());
|
||||
powerEntry.cost = Float.parseFloat(iterator.next());
|
||||
powerEntry.difficulty = Float.parseFloat(iterator.next());
|
||||
powerEntry.precision = Float.parseFloat(iterator.next());
|
||||
// Cleanup init_time in client data which is 0.35.1 or some such
|
||||
powerEntry.init_time = Float.parseFloat(iterator.next().replaceAll("(\\.0)+$", ""));
|
||||
powerEntry.release_time = Float.parseFloat(iterator.next());
|
||||
powerEntry.recycle_time = Float.parseFloat(iterator.next());
|
||||
powerEntry.hitRollYN = Integer.parseInt(iterator.next());
|
||||
powerEntry.castingMode = mbEnums.CastingModeType.valueOf(iterator.next());
|
||||
powerEntry.initAmin = Integer.parseInt(iterator.next());
|
||||
powerEntry.releaseAnim = Integer.parseInt(iterator.next());
|
||||
powerEntry.targetSelect = mbEnums.TargetSelectType.valueOf(iterator.next());
|
||||
|
||||
// Process key value pairs after header
|
||||
|
||||
iterator = lineData.iterator();
|
||||
iterator.next(); // Ignore header
|
||||
|
||||
while (iterator.hasNext()) {
|
||||
|
||||
String lineValue = iterator.next();
|
||||
List<String> lineValues = Arrays.asList(lineValue.split("="));
|
||||
String key = lineValues.get(0).trim();
|
||||
ActionEntry actionEntry;
|
||||
List<String> arguments;
|
||||
Matcher argumentMatcher;
|
||||
|
||||
switch (key) {
|
||||
case "ACTION":
|
||||
actionEntry = new ActionEntry();
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
actionEntry.action_id = arguments.get(0);
|
||||
actionEntry.minTrains = Integer.parseInt(arguments.get(1));
|
||||
actionEntry.maxTrains = Integer.parseInt(arguments.get(2));
|
||||
actionEntry.duration = Float.parseFloat(arguments.get(3));
|
||||
actionEntry.curve = mbEnums.CompoundCurveType.valueOf(arguments.get(4));
|
||||
actionEntry.stackingCategory = arguments.get(5);
|
||||
actionEntry.stackingPriority = Integer.parseInt(arguments.get(6));
|
||||
actionEntry.categoryToPower = mbEnums.CategoryToPowerType.valueOf(arguments.get(7));
|
||||
powerEntry.actionEntries.add(actionEntry);
|
||||
break;
|
||||
case "MaxLevel":
|
||||
powerEntry.maxLevel = Integer.parseInt(lineValues.get(1).trim());
|
||||
break;
|
||||
case "HateValue":
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
powerEntry.hateValue = Integer.parseInt(arguments.get(0));
|
||||
|
||||
// Not all entries have a curve. Defaults to DefaultFlat;
|
||||
|
||||
if (arguments.size() > 1)
|
||||
powerEntry.hateCurve = mbEnums.CompoundCurveType.valueOf(arguments.get(1));
|
||||
break;
|
||||
case "LOOPANIMID":
|
||||
powerEntry.loopAnimID = Integer.parseInt(lineValues.get(1).trim());
|
||||
break;
|
||||
case "GRANTOVERRIDEVAR":
|
||||
powerEntry.grantOverrideVar = lineValues.get(1).trim();
|
||||
break;
|
||||
case "DESCRIPTION":
|
||||
powerEntry.description.add(lineValues.get(1).trim());
|
||||
break;
|
||||
case "CATEGORY":
|
||||
powerEntry.category = mbEnums.PowerCategoryType.valueOf(lineValues.get(1).trim());
|
||||
break;
|
||||
case "CURVE":
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
powerEntry.curves.put(arguments.get(0), mbEnums.CompoundCurveType.valueOf(arguments.get(1)));
|
||||
break;
|
||||
case "EQPREREQ":
|
||||
argumentMatcher = STRSPLIT_REGEX.matcher(lineValues.get(1).trim());
|
||||
arguments = new ArrayList<>();
|
||||
|
||||
while (argumentMatcher.find())
|
||||
arguments.add(argumentMatcher.group().trim());
|
||||
|
||||
argumentIterator = arguments.iterator();
|
||||
|
||||
while (argumentIterator.hasNext()) {
|
||||
EquipmentPreReq equipmentPreReq = new EquipmentPreReq();
|
||||
equipmentPreReq.slot = mbEnums.EquipSlotType.valueOf(argumentIterator.next());
|
||||
equipmentPreReq.skill = argumentIterator.next().replaceAll("\"", "");
|
||||
|
||||
if (argumentIterator.hasNext())
|
||||
equipmentPreReq.required = Integer.parseInt(argumentIterator.next());
|
||||
else
|
||||
equipmentPreReq.required = 0;
|
||||
|
||||
powerEntry.equipmentPreReq.add(equipmentPreReq);
|
||||
}
|
||||
break;
|
||||
case "CANCASTWHILEMOVING":
|
||||
powerEntry.canCastWhileMoving = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "CANCASTWHILEFLYING":
|
||||
powerEntry.canCastWhileFlying = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "BLADETRAILS":
|
||||
powerEntry.bladeTrails = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "EFFECTPREREQ":
|
||||
Effect effectPreReq = new Effect();
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
effectPreReq.effect_id = arguments.get(9);
|
||||
effectPreReq.level = Integer.parseInt(arguments.get(1));
|
||||
effectPreReq.message = arguments.get(2);
|
||||
powerEntry.effectPreReqs.add(effectPreReq);
|
||||
break;
|
||||
case "MONSTERTYPERESTRICTS":
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
|
||||
for (String restriction : arguments)
|
||||
powerEntry.monsterRestricts.add(mbEnums.MonsterType.valueOf(restriction.trim()));
|
||||
break;
|
||||
case "MONSTERTYPEPREREQS":
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
|
||||
for (String restriction : arguments)
|
||||
powerEntry.monsterPrereqs.add(mbEnums.MonsterType.valueOf(restriction.trim()));
|
||||
break;
|
||||
case "SHOULDCHECKPATH":
|
||||
powerEntry.shouldCheckPath = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "STICKY":
|
||||
powerEntry.sticky = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "PULSEINFO":
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
powerEntry.pulseCycle = Integer.parseInt(arguments.get(0));
|
||||
powerEntry.pulseDuration = Integer.parseInt(arguments.get(1));
|
||||
break;
|
||||
case "MAXNUMMOBTARGETS":
|
||||
powerEntry.maxMobTargets = Integer.parseInt(lineValues.get(1).trim());
|
||||
break;
|
||||
case "MAXNUMPLAYERTARGETS":
|
||||
powerEntry.maxPlayerTargets = Integer.parseInt(lineValues.get(1).trim());
|
||||
break;
|
||||
case "ISADMINPOWER":
|
||||
powerEntry.isAdminPower = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "ISPROJECTILE":
|
||||
powerEntry.isProjectile = Boolean.parseBoolean(lineValues.get(1).trim());
|
||||
break;
|
||||
case "CASTERSPULSEPARTICLE":
|
||||
powerEntry.casterPulseParticle = Integer.parseInt(lineValues.get(1).trim());
|
||||
break;
|
||||
case "TARGETEFFECTPREREQS_ORED":
|
||||
Effect preReq = new Effect();
|
||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||
preReq.effect_id = arguments.get(0);
|
||||
preReq.level = Integer.parseInt(arguments.get(1));
|
||||
powerEntry.targetEffectPrereqs.add(preReq);
|
||||
break;
|
||||
case "SOUNDS": // Values not parsed
|
||||
case "APPLYDAMAGESELF":
|
||||
case "APPLYDAMAGECASTER":
|
||||
case "APPLYDAMAGEOTHER":
|
||||
case "APPLYDAMAGETARGET":
|
||||
case "APPLYEFFECTSELF":
|
||||
case "APPLYEFFECTOTHER":
|
||||
case "APPLYEFFECTCASTER":
|
||||
case "APPLYEFFECTTARGET":
|
||||
case "FIZZLEOTHER":
|
||||
case "FIZZLESELF":
|
||||
case "INITSTRING":
|
||||
case "SUCCESSOTHER":
|
||||
case "SUCCESSSELF":
|
||||
case "WEAROFFEFFECTOTHER":
|
||||
case "WEAROFFEFFECTSELF":
|
||||
break;
|
||||
default:
|
||||
Logger.error("Unhandled variable type:" + key + " for power: " + powerEntry.power_id);
|
||||
}
|
||||
}
|
||||
|
||||
// Parse power conditions
|
||||
|
||||
if (conditionString.isEmpty() == false) {
|
||||
|
||||
List<String> conditions = Arrays.asList(conditionString.split("\n"));
|
||||
|
||||
for (String condition : conditions) {
|
||||
List<String> parameters = Arrays.asList(condition.trim().split("\\s+"));
|
||||
powerEntry.conditions.put(parameters.get(0), Float.parseFloat(parameters.get(1)));
|
||||
}
|
||||
}
|
||||
return powerEntry;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2024
|
||||
// www.magicbane.com
|
||||
|
||||
package engine.wpak.data;
|
||||
|
||||
import engine.mbEnums;
|
||||
|
||||
public class ActionEntry {
|
||||
|
||||
public String action_id;
|
||||
public int minTrains;
|
||||
public int maxTrains;
|
||||
public float duration;
|
||||
public String stackingCategory;
|
||||
public mbEnums.CompoundCurveType curve;
|
||||
public int stackingPriority;
|
||||
public mbEnums.CategoryToPowerType categoryToPower;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2024
|
||||
// www.magicbane.com
|
||||
//
|
||||
package engine.wpak.data;
|
||||
|
||||
import engine.mbEnums;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
public class ConditionEntry {
|
||||
public String condition;
|
||||
public int arg;
|
||||
public mbEnums.CompoundCurveType curveType;
|
||||
public EnumSet<mbEnums.DamageType> damageTypes = EnumSet.noneOf(mbEnums.DamageType.class);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2024
|
||||
// www.magicbane.com
|
||||
|
||||
package engine.wpak.data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.Objects;
|
||||
|
||||
public class Effect {
|
||||
public String effect_id;
|
||||
public String effect_name;
|
||||
public int icon;
|
||||
public HashSet<String> sources = new HashSet<>();
|
||||
public ArrayList<ModifierEntry> mods = new ArrayList<>();
|
||||
public ArrayList<ConditionEntry> conditions = new ArrayList<>();
|
||||
|
||||
// Additional variables outside of tags or parsed
|
||||
// elsewhere from Effects.cfg
|
||||
|
||||
public boolean isItemEffect;
|
||||
public boolean isSpireEffect;
|
||||
public boolean ignoreNoMod;
|
||||
public boolean dontSave;
|
||||
|
||||
public String type;
|
||||
public int level;
|
||||
public String message;
|
||||
public int cycleDuration;
|
||||
public int cycleDelay;
|
||||
|
||||
public boolean equals(Object o) {
|
||||
if (this == o)
|
||||
return true;
|
||||
if (o == null || getClass() != o.getClass())
|
||||
return false;
|
||||
|
||||
Effect effect = (Effect) o;
|
||||
return Objects.equals(effect_id, effect.effect_id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return effect_id.hashCode(); // Use only the id field for hashCode
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2024
|
||||
// www.magicbane.com
|
||||
|
||||
package engine.wpak.data;
|
||||
|
||||
import engine.mbEnums;
|
||||
|
||||
public class EquipmentPreReq {
|
||||
|
||||
public mbEnums.EquipSlotType slot;
|
||||
public String skill;
|
||||
public int required;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2024
|
||||
// www.magicbane.com
|
||||
|
||||
package engine.wpak.data;
|
||||
|
||||
import engine.mbEnums;
|
||||
|
||||
public class ModifierEntry {
|
||||
public mbEnums.ModType type;
|
||||
public float min;
|
||||
public float max;
|
||||
public float percentage;
|
||||
public float value;
|
||||
public mbEnums.CompoundCurveType compoundCurveType;
|
||||
public String arg1; // ItemName "Masterwork" ""
|
||||
public String arg2; // ItemName "" "of the Defender"
|
||||
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2024
|
||||
// www.magicbane.com
|
||||
|
||||
package engine.wpak.data;
|
||||
|
||||
import engine.mbEnums;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashMap;
|
||||
import java.util.Objects;
|
||||
|
||||
public class Power {
|
||||
public String power_id;
|
||||
public String power;
|
||||
public ArrayList<PowerEntry> powers = new ArrayList<>();
|
||||
public mbEnums.PowerTargetType target_type;
|
||||
public int range;
|
||||
public mbEnums.AreaType areaType;
|
||||
public int areaRange;
|
||||
public mbEnums.ExcludeType excludeType;
|
||||
public mbEnums.CostType costType;
|
||||
public float cost;
|
||||
public float difficulty;
|
||||
public float precision;
|
||||
public float init_time;
|
||||
public float release_time;
|
||||
public float recycle_time;
|
||||
public int hitRollYN;
|
||||
public mbEnums.CastingModeType castingMode;
|
||||
public int initAmin;
|
||||
public int releaseAnim;
|
||||
public mbEnums.TargetSelectType targetSelect;
|
||||
|
||||
// Additional key/value type power entries
|
||||
|
||||
public ArrayList<ActionEntry> actionEntries = new ArrayList<>();
|
||||
public int maxLevel;
|
||||
public int hateValue;
|
||||
public mbEnums.CompoundCurveType hateCurve = mbEnums.CompoundCurveType.DefaultFlat;
|
||||
public int loopAnimID;
|
||||
public String grantOverrideVar;
|
||||
public ArrayList<String> description = new ArrayList<>();
|
||||
public HashMap<String, mbEnums.CompoundCurveType> curves = new HashMap<>();
|
||||
public mbEnums.PowerCategoryType category;
|
||||
public boolean canCastWhileMoving = false;
|
||||
public boolean bladeTrails = false;
|
||||
public ArrayList<Effect> effectPreReqs = new ArrayList<>();
|
||||
public ArrayList<EquipmentPreReq> equipmentPreReq = new ArrayList<>();
|
||||
public EnumSet<mbEnums.MonsterType> monsterRestricts = EnumSet.noneOf(mbEnums.MonsterType.class);
|
||||
public EnumSet<mbEnums.MonsterType> monsterPrereqs = EnumSet.noneOf(mbEnums.MonsterType.class);
|
||||
public boolean shouldCheckPath = false;
|
||||
public boolean sticky = false;
|
||||
public int pulseCycle;
|
||||
public int pulseDuration;
|
||||
public int maxMobTargets;
|
||||
public int maxPlayerTargets;
|
||||
public boolean isAdminPower = false;
|
||||
public int casterPulseParticle;
|
||||
public ArrayList<Effect> targetEffectPrereqs = new ArrayList<>();
|
||||
public boolean canCastWhileFlying = false;
|
||||
public boolean isProjectile = false;
|
||||
public HashMap<String, Float> conditions = new HashMap<>();
|
||||
|
||||
public boolean isSpell() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean isSkill() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean isChant() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean equals(Object o) {
|
||||
if (this == o)
|
||||
return true;
|
||||
if (o == null || getClass() != o.getClass())
|
||||
return false;
|
||||
|
||||
Power power = (Power) o;
|
||||
return Objects.equals(power_id, power.power_id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return power_id.hashCode(); // Use only the id field for hashCode
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2024
|
||||
// www.magicbane.com
|
||||
|
||||
package engine.wpak.data;
|
||||
|
||||
import engine.mbEnums;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Objects;
|
||||
|
||||
public class PowerAction {
|
||||
|
||||
// Header values
|
||||
|
||||
public String action_id;
|
||||
public mbEnums.PowerActionType action_type;
|
||||
public ArrayList<Effect> effects = new ArrayList<>();
|
||||
public int petLevel;
|
||||
public int petRace;
|
||||
public StatTransfer statTransfer;
|
||||
public int levelCap;
|
||||
public mbEnums.CompoundCurveType levelCapCurve;
|
||||
public TrackEntry trackEntry;
|
||||
|
||||
// Additional variables after header go here.
|
||||
|
||||
public ArrayList<Integer> bodyParts = new ArrayList<>();
|
||||
public ArrayList<Integer> femaleBodyParts = new ArrayList<>();
|
||||
public boolean shouldShowWeapons = false;
|
||||
public boolean shouldShowArmor = false;
|
||||
public boolean bladeTrails = false;
|
||||
public boolean isResistible = false;
|
||||
public ArrayList<Float> scaleFactor = new ArrayList<>();
|
||||
public ArrayList<Integer> attackAnimations = new ArrayList<>();
|
||||
public boolean isAggressive;
|
||||
public mbEnums.DamageType damageType;
|
||||
public boolean applyEffectBlank = false;
|
||||
public boolean wearOffEffectBlank = false;
|
||||
public boolean removeAll = false;
|
||||
public boolean clearAggro = false;
|
||||
public boolean targetBecomesPet = false;
|
||||
public boolean destroyOldPet = false;
|
||||
public mbEnums.ItemFlags itemFlag;
|
||||
public mbEnums.MobBehaviourType rootFsmID;
|
||||
public int splashDamageMin;
|
||||
public int splashDamageMax;
|
||||
public boolean ignoreNoTeleSpire = false;
|
||||
|
||||
public boolean equals(Object o) {
|
||||
if (this == o)
|
||||
return true;
|
||||
if (o == null || getClass() != o.getClass())
|
||||
return false;
|
||||
|
||||
PowerAction powerAction = (PowerAction) o;
|
||||
return Objects.equals(action_id, powerAction.action_id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return action_id.hashCode(); // Use only the id field for hashCode
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2024
|
||||
// www.magicbane.com
|
||||
|
||||
package engine.wpak.data;
|
||||
|
||||
import engine.mbEnums;
|
||||
|
||||
public class PowerEntry {
|
||||
public mbEnums.PowerType power_type;
|
||||
public int icon;
|
||||
public String focusLine;
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2024
|
||||
// www.magicbane.com
|
||||
|
||||
package engine.wpak.data;
|
||||
|
||||
import engine.mbEnums;
|
||||
|
||||
public class StatTransfer {
|
||||
public mbEnums.CostType fromStat;
|
||||
public float ramp;
|
||||
public mbEnums.CompoundCurveType rampCurve;
|
||||
public mbEnums.CostType toStat;
|
||||
public float efficiency;
|
||||
public mbEnums.CompoundCurveType efficiencyCurve;
|
||||
public boolean fromStatBool;
|
||||
public boolean isDrain;
|
||||
public String transfer_action;
|
||||
public int transfer_ticks;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
|
||||
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
|
||||
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
|
||||
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
|
||||
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
|
||||
// Magicbane Emulator Project © 2013 - 2022
|
||||
// www.magicbane.com
|
||||
|
||||
package engine.wpak.data;
|
||||
|
||||
import engine.mbEnums;
|
||||
|
||||
public class TrackEntry {
|
||||
|
||||
public String action_id;
|
||||
public Boolean trackPlayer;
|
||||
public Boolean trackCorpse;
|
||||
public mbEnums.MonsterType filter;
|
||||
public int min;
|
||||
public int max;
|
||||
}
|
||||
Reference in New Issue
Block a user