MagicBane
/
Server
92
0
Fork 5
Code Issues 13 Pull Requests Projects Releases Wiki Activity
Browse Source

Package reformat

feature-config-parsing2
MagicBot 1 year ago
parent
ee0fc67984
commit
740949812c
2 changed files with 209 additions and 209 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/engine/wpak/EffectsParser.java
  2. 416
      src/engine/wpak/PowerActionParser.java

2
src/engine/wpak/EffectsParser.java
Unescape View File

@ -57,7 +57,7 @@ public class EffectsParser {
} }
private static EffectEntry parseEffectEntry(String effectData) { private static EffectEntry parseEffectEntry(String effectData) {
EffectEntry effectEntry = new EffectEntry(); EffectEntry effectEntry = new EffectEntry();
// Remove all lines that contain a # and leading/trailing blank lines // Remove all lines that contain a # and leading/trailing blank lines

416
src/engine/wpak/PowerActionParser.java
Unescape View File

@ -62,244 +62,244 @@ public class PowerActionParser {
StatTransfer statTransfer; StatTransfer statTransfer;
TrackEntry trackEntry; TrackEntry trackEntry;
// Remove all lines that contain a # and leading/trailing blank lines // Remove all lines that contain a # and leading/trailing blank lines
powerActionData = powerActionData.replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", "").trim(); powerActionData = powerActionData.replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", "").trim();
String[] lineData = powerActionData.split("\n"); String[] lineData = powerActionData.split("\n");
// Parse effect entry header // Parse effect entry header
Iterator<String> entryIterator = Arrays.stream(lineData).iterator(); Iterator<String> entryIterator = Arrays.stream(lineData).iterator();
String headerLine = entryIterator.next(); String headerLine = entryIterator.next();
ArrayList<String> headerData = new ArrayList<>(); ArrayList<String> headerData = new ArrayList<>();
Matcher matcher = STRSPLIT_REGEX.matcher(headerLine.trim()); Matcher matcher = STRSPLIT_REGEX.matcher(headerLine.trim());
while (matcher.find()) while (matcher.find())
headerData.add(matcher.group().trim()); headerData.add(matcher.group().trim());
Iterator<String> headerIterator = headerData.iterator(); Iterator<String> headerIterator = headerData.iterator();
powerActionEntry.action_id = headerIterator.next(); powerActionEntry.action_id = headerIterator.next();
powerActionEntry.action_type = headerIterator.next(); powerActionEntry.action_type = headerIterator.next();
switch (powerActionEntry.action_type) { switch (powerActionEntry.action_type) {
case "RemoveEffect": case "RemoveEffect":
effectDescription = new EffectDescription();
effectDescription.effect_id = headerIterator.next();
powerActionEntry.effects.add(effectDescription);
break;
case "CreateMob":
powerActionEntry.petLevel = Integer.parseInt(headerIterator.next());
powerActionEntry.petRace = Integer.parseInt(headerIterator.next());
break;
case "DamageOverTime":
effectDescription = new EffectDescription();
effectDescription.effect_id = headerIterator.next();
effectDescription.cycleDuration = Integer.parseInt(headerIterator.next());
effectDescription.cycleDelay = Integer.parseInt(headerIterator.next());
powerActionEntry.effects.add(effectDescription);
break;
case "ApplyEffects":
int level = Integer.parseInt(headerIterator.next());
while (headerIterator.hasNext()) {
effectDescription = new EffectDescription(); effectDescription = new EffectDescription();
effectDescription.level = level;
effectDescription.effect_id = headerIterator.next(); effectDescription.effect_id = headerIterator.next();
powerActionEntry.effects.add(effectDescription); powerActionEntry.effects.add(effectDescription);
break; }
case "CreateMob": break;
powerActionEntry.petLevel = Integer.parseInt(headerIterator.next()); case "Transform":
powerActionEntry.petRace = Integer.parseInt(headerIterator.next()); case "Invis":
break; case "ApplyEffect":
case "DamageOverTime": case "DeferredPower":
case "DirectDamage":
case "SpireDisable":
while (headerIterator.hasNext()) {
effectDescription = new EffectDescription(); effectDescription = new EffectDescription();
effectDescription.effect_id = headerIterator.next(); effectDescription.effect_id = headerIterator.next();
effectDescription.cycleDuration = Integer.parseInt(headerIterator.next());
effectDescription.cycleDelay = Integer.parseInt(headerIterator.next()); // Some applyEffect entries are naked withot a level
if (headerData.size() > 3)
effectDescription.level = Integer.parseInt(headerIterator.next());
powerActionEntry.effects.add(effectDescription); powerActionEntry.effects.add(effectDescription);
}
break;
case "TransferStat":
statTransfer = new StatTransfer();
statTransfer.fromStat = mbEnums.CostType.valueOf(headerIterator.next());
statTransfer.toStat = mbEnums.CostType.valueOf(headerIterator.next());
statTransfer.fromStatValue = Float.parseFloat(headerIterator.next());
statTransfer.fromCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
statTransfer.toStatValue = Float.parseFloat(headerIterator.next());
statTransfer.toCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
statTransfer.fromStatBool = Boolean.parseBoolean(headerIterator.next());
statTransfer.toStatBool = Boolean.parseBoolean(headerIterator.next());
powerActionEntry.statTransfer = statTransfer;
break;
case "TransferStatOT":
statTransfer = new StatTransfer();
statTransfer.fromStat = mbEnums.CostType.valueOf(headerIterator.next());
statTransfer.toStat = mbEnums.CostType.valueOf(headerIterator.next());
statTransfer.fromStatValue = Float.parseFloat(headerIterator.next());
statTransfer.fromCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
statTransfer.toStatValue = Float.parseFloat(headerIterator.next());
statTransfer.toCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
statTransfer.fromStatBool = Boolean.parseBoolean(headerIterator.next());
statTransfer.toStatBool = Boolean.parseBoolean(headerIterator.next());
statTransfer.transfer_action = headerIterator.next();
statTransfer.transfer_ticks = Integer.parseInt(headerIterator.next());
powerActionEntry.statTransfer = statTransfer;
break;
case "Charm":
effectDescription = new EffectDescription();
effectDescription.effect_id = headerIterator.next();
effectDescription.level = Integer.parseInt(headerIterator.next());
effectDescription.type = headerIterator.next();
powerActionEntry.effects.add(effectDescription);
break;
case "Block":
effectDescription = new EffectDescription();
effectDescription.effect_id = headerIterator.next();
effectDescription.level = Integer.parseInt(headerIterator.next());
powerActionEntry.effects.add(effectDescription);
break;
case "Resurrect":
powerActionEntry.levelCap = Integer.parseInt(headerIterator.next());
break;
case "SetItemFlag":
powerActionEntry.itemFlag = mbEnums.ItemFlags.valueOf(headerIterator.next());
break;
case "Track":
trackEntry = new TrackEntry();
trackEntry.action_id = headerIterator.next();
trackEntry.unknown1 = Boolean.parseBoolean(headerIterator.next());
trackEntry.unknown2 = Boolean.parseBoolean(headerIterator.next());
trackEntry.type = headerIterator.next();
trackEntry.min = Integer.parseInt(headerIterator.next());
trackEntry.max = Integer.parseInt(headerIterator.next());
powerActionEntry.trackEntry = trackEntry;
break;
case "Recall": // No arguments for these tags or not parsed
case "Summon":
case "Teleport":
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 " + powerActionEntry.action_type + " for Pow4erAction: " + powerActionEntry.action_id);
break;
}
// Process key value pairs after header
while (entryIterator.hasNext()) {
String lineValue = entryIterator.next();
String[] lineValues = lineValue.split("=");
String key = lineValues[0].trim();
String[] arguments;
switch (key) {
case "BODYPARTS":
arguments = lineValues[1].trim().split("\\s+");
for (String bodyPart : arguments)
powerActionEntry.bodyparts.add(Integer.parseInt(bodyPart));
break; break;
case "ApplyEffects": case "FEMALEBODYPARTS":
int level = Integer.parseInt(headerIterator.next()); arguments = lineValues[1].trim().split("\\s+");
while (headerIterator.hasNext()) { for (String bodyPart : arguments)
effectDescription = new EffectDescription(); powerActionEntry.femaleBodyParts.add(Integer.parseInt(bodyPart));
effectDescription.level = level;
effectDescription.effect_id = headerIterator.next();
powerActionEntry.effects.add(effectDescription);
}
break; break;
case "Transform": case "SCALEFACTOR":
case "Invis": arguments = lineValues[1].trim().split("\\s+");
case "ApplyEffect":
case "DeferredPower": for (String scaleFactor : arguments)
case "DirectDamage": powerActionEntry.scaleFactor.add(Float.parseFloat(scaleFactor));
case "SpireDisable":
while (headerIterator.hasNext()) {
effectDescription = new EffectDescription();
effectDescription.effect_id = headerIterator.next();
// Some applyEffect entries are naked withot a level
if (headerData.size() > 3)
effectDescription.level = Integer.parseInt(headerIterator.next());
powerActionEntry.effects.add(effectDescription);
}
break; break;
case "TransferStat": case "ISRESISTABLE":
statTransfer = new StatTransfer(); powerActionEntry.isResistible = Boolean.parseBoolean(lineValues[1].trim());
statTransfer.fromStat = mbEnums.CostType.valueOf(headerIterator.next());
statTransfer.toStat = mbEnums.CostType.valueOf(headerIterator.next());
statTransfer.fromStatValue = Float.parseFloat(headerIterator.next());
statTransfer.fromCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
statTransfer.toStatValue = Float.parseFloat(headerIterator.next());
statTransfer.toCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
statTransfer.fromStatBool = Boolean.parseBoolean(headerIterator.next());
statTransfer.toStatBool = Boolean.parseBoolean(headerIterator.next());
powerActionEntry.statTransfer = statTransfer;
break; break;
case "TransferStatOT": case "ISAGGRESSIVE":
statTransfer = new StatTransfer(); powerActionEntry.isAggressive = Boolean.parseBoolean(lineValues[1].trim());
statTransfer.fromStat = mbEnums.CostType.valueOf(headerIterator.next());
statTransfer.toStat = mbEnums.CostType.valueOf(headerIterator.next());
statTransfer.fromStatValue = Float.parseFloat(headerIterator.next());
statTransfer.fromCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
statTransfer.toStatValue = Float.parseFloat(headerIterator.next());
statTransfer.toCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
statTransfer.fromStatBool = Boolean.parseBoolean(headerIterator.next());
statTransfer.toStatBool = Boolean.parseBoolean(headerIterator.next());
statTransfer.transfer_action = headerIterator.next();
statTransfer.transfer_ticks = Integer.parseInt(headerIterator.next());
powerActionEntry.statTransfer = statTransfer;
break; break;
case "Charm": case "BLADETRAILS":
effectDescription = new EffectDescription(); powerActionEntry.bladeTrails = Boolean.parseBoolean(lineValues[1].trim());
effectDescription.effect_id = headerIterator.next();
effectDescription.level = Integer.parseInt(headerIterator.next());
effectDescription.type = headerIterator.next();
powerActionEntry.effects.add(effectDescription);
break; break;
case "Block": case "SHOULDSHOWWEAPONS":
powerActionEntry.shouldShowWeapons = Boolean.parseBoolean(lineValues[1].trim());
break;
case "SHOULDSHOWARMOR":
powerActionEntry.shouldShowArmor = Boolean.parseBoolean(lineValues[1].trim());
break;
case "APPLYEFFECTBLANK":
powerActionEntry.applyEffectBlank = Boolean.parseBoolean(lineValues[1].trim());
break;
case "WEAROFFEFFECTBLANK":
powerActionEntry.wearOffEffectBlank = Boolean.parseBoolean(lineValues[1].trim());
break;
case "ATTACKANIMS":
arguments = lineValues[1].trim().split("\\s+");
for (String animation : arguments)
powerActionEntry.attackAnimations.add(Integer.parseInt(animation));
break;
case "REMOVEALL":
powerActionEntry.removeAll = Boolean.parseBoolean(lineValues[1].trim());
break;
case "EFFECTID":
effectDescription = new EffectDescription(); effectDescription = new EffectDescription();
effectDescription.effect_id = headerIterator.next(); effectDescription.effect_id = lineValues[1].trim();
effectDescription.level = Integer.parseInt(headerIterator.next());
powerActionEntry.effects.add(effectDescription); powerActionEntry.effects.add(effectDescription);
break; break;
case "Resurrect": case "LEVELCAP":
powerActionEntry.levelCap = Integer.parseInt(headerIterator.next()); arguments = lineValues[1].trim().split("\\s+");
powerActionEntry.levelCap = Integer.parseInt(arguments[0]);
if (arguments.length > 1) // Not all level caps have a curve
powerActionEntry.levelCurve = mbEnums.CompoundCurveType.valueOf(arguments[1]);
break;
case "CLEARAGGRO":
powerActionEntry.clearAggro = Boolean.parseBoolean(lineValues[1].trim());
break; break;
case "SetItemFlag": case "TARGETBECOMESPET":
powerActionEntry.itemFlag = mbEnums.ItemFlags.valueOf(headerIterator.next()); powerActionEntry.targetBecomesPet = Boolean.parseBoolean(lineValues[1].trim());
break; break;
case "Track": case "DESTROYOLDPET":
trackEntry = new TrackEntry(); powerActionEntry.destroyOldPet = Boolean.parseBoolean(lineValues[1].trim());
trackEntry.action_id = headerIterator.next();
trackEntry.unknown1 = Boolean.parseBoolean(headerIterator.next());
trackEntry.unknown2 = Boolean.parseBoolean(headerIterator.next());
trackEntry.type = headerIterator.next();
trackEntry.min = Integer.parseInt(headerIterator.next());
trackEntry.max = Integer.parseInt(headerIterator.next());
powerActionEntry.trackEntry = trackEntry;
break; break;
case "Recall": // No arguments for these tags or not parsed case "DAMAGETYPE":
case "Summon": powerActionEntry.damageType = mbEnums.DamageType.valueOf(lineValues[1].trim().toUpperCase());
case "Teleport":
case "TreeChoke":
case "SimpleDamage":
case "MobRecall": // One argument always zero
case "ClearAggro":
case "ClearNearbyAggro":
case "Peek":
case "ClaimMine":
case "RunegateTeleport":
case "Steal":
break; break;
default: case "ROOTFSMID":
Logger.error("Unhandled type " + powerActionEntry.action_type + " for Pow4erAction: " + powerActionEntry.action_id); powerActionEntry.rootFsmID = mbEnums.MobBehaviourType.valueOf(lineValues[1].trim());
break; break;
case "SPLASHDAMAGE":
arguments = lineValues[1].trim().split("\\s+");
powerActionEntry.splashDamageMin = Integer.parseInt(arguments[0]);
powerActionEntry.splashDamageMax = Integer.parseInt(arguments[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: " + powerActionEntry.action_id);
} }
}
// Process key value pairs after header
while (entryIterator.hasNext()) {
String lineValue = entryIterator.next();
String[] lineValues = lineValue.split("=");
String key = lineValues[0].trim();
String[] arguments;
switch (key) {
case "BODYPARTS":
arguments = lineValues[1].trim().split("\\s+");
for (String bodyPart : arguments)
powerActionEntry.bodyparts.add(Integer.parseInt(bodyPart));
break;
case "FEMALEBODYPARTS":
arguments = lineValues[1].trim().split("\\s+");
for (String bodyPart : arguments)
powerActionEntry.femaleBodyParts.add(Integer.parseInt(bodyPart));
break;
case "SCALEFACTOR":
arguments = lineValues[1].trim().split("\\s+");
for (String scaleFactor : arguments)
powerActionEntry.scaleFactor.add(Float.parseFloat(scaleFactor));
break;
case "ISRESISTABLE":
powerActionEntry.isResistible = Boolean.parseBoolean(lineValues[1].trim());
break;
case "ISAGGRESSIVE":
powerActionEntry.isAggressive = Boolean.parseBoolean(lineValues[1].trim());
break;
case "BLADETRAILS":
powerActionEntry.bladeTrails = Boolean.parseBoolean(lineValues[1].trim());
break;
case "SHOULDSHOWWEAPONS":
powerActionEntry.shouldShowWeapons = Boolean.parseBoolean(lineValues[1].trim());
break;
case "SHOULDSHOWARMOR":
powerActionEntry.shouldShowArmor = Boolean.parseBoolean(lineValues[1].trim());
break;
case "APPLYEFFECTBLANK":
powerActionEntry.applyEffectBlank = Boolean.parseBoolean(lineValues[1].trim());
break;
case "WEAROFFEFFECTBLANK":
powerActionEntry.wearOffEffectBlank = Boolean.parseBoolean(lineValues[1].trim());
break;
case "ATTACKANIMS":
arguments = lineValues[1].trim().split("\\s+");
for (String animation : arguments)
powerActionEntry.attackAnimations.add(Integer.parseInt(animation));
break;
case "REMOVEALL":
powerActionEntry.removeAll = Boolean.parseBoolean(lineValues[1].trim());
break;
case "EFFECTID":
effectDescription = new EffectDescription();
effectDescription.effect_id = lineValues[1].trim();
powerActionEntry.effects.add(effectDescription);
break;
case "LEVELCAP":
arguments = lineValues[1].trim().split("\\s+");
powerActionEntry.levelCap = Integer.parseInt(arguments[0]);
if (arguments.length > 1) // Not all level caps have a curve
powerActionEntry.levelCurve = mbEnums.CompoundCurveType.valueOf(arguments[1]);
break;
case "CLEARAGGRO":
powerActionEntry.clearAggro = Boolean.parseBoolean(lineValues[1].trim());
break;
case "TARGETBECOMESPET":
powerActionEntry.targetBecomesPet = Boolean.parseBoolean(lineValues[1].trim());
break;
case "DESTROYOLDPET":
powerActionEntry.destroyOldPet = Boolean.parseBoolean(lineValues[1].trim());
break;
case "DAMAGETYPE":
powerActionEntry.damageType = mbEnums.DamageType.valueOf(lineValues[1].trim().toUpperCase());
break;
case "ROOTFSMID":
powerActionEntry.rootFsmID = mbEnums.MobBehaviourType.valueOf(lineValues[1].trim());
break;
case "SPLASHDAMAGE":
arguments = lineValues[1].trim().split("\\s+");
powerActionEntry.splashDamageMin = Integer.parseInt(arguments[0]);
powerActionEntry.splashDamageMax = Integer.parseInt(arguments[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: " + powerActionEntry.action_id);
}
}
return powerActionEntry; return powerActionEntry;
} }
} }

Write Preview
Loading…
Cancel
Save