FatBoy/lakebane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Arguments added to signature

Browse Source
This commit is contained in:
MagicBot
2025-02-18 12:55:38 -05:00
parent 61f8c210ae
commit 2e45d8548f
1 changed files with 59 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/mbEnums.java
+59 -43
View File
@@ -14,11 +14,12 @@ import engine.gameManager.ZoneManager;
import engine.math.Vector2f; import engine.math.Vector2f;
import engine.math.Vector3f; import engine.math.Vector3f;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
import engine.objects.AbstractCharacter; import engine.objects.*;
import engine.objects.ItemTemplate;
import engine.objects.Shrine;
import engine.objects.Zone;
import engine.powers.EffectsBase; import engine.powers.EffectsBase;
import engine.wpak.data.Effect;
import engine.wpak.data.ModifierEntry;
import engine.wpak.data.Power;
import engine.wpak.data.PowerAction;
import engine.wpakpowers.Behaviour; import engine.wpakpowers.Behaviour;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
@@ -677,7 +678,7 @@ public class mbEnums {
RUNE, RUNE,
OFFERING, OFFERING,
RESOURCE, RESOURCE,
REALMCHARTER; REALMCHARTER
} }
// Enum to derive effects for active spires from blueprintUUID // Enum to derive effects for active spires from blueprintUUID
@@ -842,10 +843,10 @@ public class mbEnums {
DRAIN; DRAIN;
public static DamageType getDamageType(String modName) { public static DamageType getDamageType(String modName) {
if(modName.toLowerCase().equals("blind")) if (modName.equalsIgnoreCase("blind"))
modName = "BLINDNESS"; modName = "BLINDNESS";
if(modName.toLowerCase().equals("powerblock")) if (modName.equalsIgnoreCase("powerblock"))
modName = "POWERINHIBITOR"; modName = "POWERINHIBITOR";
DamageType damageType; DamageType damageType;
@@ -1030,7 +1031,7 @@ public class mbEnums {
return SourceType.None; return SourceType.None;
} }
return returnMod; return returnMod;
}catch(Exception e){ } catch (Exception e) {
Logger.error(" MISSING SOURCE TYPE: " + modName); Logger.error(" MISSING SOURCE TYPE: " + modName);
return SourceType.None; return SourceType.None;
} }
@@ -1337,108 +1338,126 @@ public class mbEnums {
public enum ModBehaviorType { public enum ModBehaviorType {
Behavior { Behavior {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.Behaviour(); Behaviour.Behaviour();
} }
}, },
Flag { Flag {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.Flag(); Behaviour.Flag();
} }
}, },
MapIntToInts { MapIntToInts {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.MapIntToInts(); Behaviour.MapIntToInts();
} }
}, },
Standard { Standard {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.Standard(); Behaviour.Standard();
} }
}, },
FPSubTypeAttr { FPSubTypeAttr {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.FPSubTypeAttr(); Behaviour.FPSubTypeAttr();
} }
}, },
SubTypeSourceType { SubTypeSourceType {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.SubTypeSourceType(); Behaviour.SubTypeSourceType();
} }
}, },
SubTypePowerType { SubTypePowerType {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.SubTypePowerType(); Behaviour.SubTypePowerType();
} }
}, },
SubTypeSkill { SubTypeSkill {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.SubTypeSkill(); Behaviour.SubTypeSkill();
} }
}, },
FPSubTypeDmg { FPSubTypeDmg {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.FPSubTypeDmg(); Behaviour.FPSubTypeDmg();
} }
}, },
DD { DD {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.DD(); Behaviour.DD();
} }
}, },
String { String {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.StringBehaviour(); Behaviour.StringBehaviour();
} }
}, },
SubTypeMod { SubTypeMod {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.SubTypeMod(); Behaviour.SubTypeMod();
} }
}, },
SubTypePower { SubTypePower {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.SubTypePower(); Behaviour.SubTypePower();
} }
}, },
SubTypeDmg { SubTypeDmg {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.SubTypeDmg(); Behaviour.SubTypeDmg();
} }
}, },
FPSubTypeSkill { FPSubTypeSkill {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.FPSubTypeSkill(); Behaviour.FPSubTypeSkill();
} }
}, },
FPSubTypeMonster { FPSubTypeMonster {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.FPSubTypeMonster(); Behaviour.FPSubTypeMonster();
} }
}, },
ProcInfo { ProcInfo {
@Override @Override
public void execute() { public void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
Behaviour.ProcInfo(); Behaviour.ProcInfo();
} }
}; };
public abstract void execute(); public abstract void apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank);
} }
public enum MovementState { public enum MovementState {
@@ -1575,7 +1594,7 @@ public class mbEnums {
COMBATRUN, COMBATRUN,
FLYWALK, FLYWALK,
FLYRUN, FLYRUN,
SWIM; SWIM
} }
public enum SexType { public enum SexType {
@@ -2728,14 +2747,11 @@ public class mbEnums {
} }
public boolean canJoin(AbstractCharacter character) { public boolean canJoin(AbstractCharacter character) {
if (this.requiredRaces.contains(character.absRace) == false) if (!this.requiredRaces.contains(character.absRace))
return false; return false;
if (this.requiredClasses.contains(character.absBaseClass) == false && this.requiredClasses.contains(character.absPromotionClass) == false) if (!this.requiredClasses.contains(character.absBaseClass) && !this.requiredClasses.contains(character.absPromotionClass))
return false; return false;
if (this.sexRequired.contains(character.absGender) == false) return this.sexRequired.contains(character.absGender);
return false;
return true;
} }
} }
@@ -3013,14 +3029,14 @@ public class mbEnums {
NoQuit, NoQuit,
Magic, Magic,
NoDrop, NoDrop,
Rare; Rare
} }
public enum ItemUseFlags { public enum ItemUseFlags {
USE_SELF, USE_SELF,
USE_TARGET, USE_TARGET,
EMPTY_DESTROY, EMPTY_DESTROY,
EMPTY_NEWITEM; EMPTY_NEWITEM
} }
public enum AttributeType { public enum AttributeType {
@@ -3142,25 +3158,25 @@ public class mbEnums {
CONFIRM_PRODUCE, CONFIRM_PRODUCE,
CONFIRM_SETPRICE, CONFIRM_SETPRICE,
CONFIRM_DEPOSIT, CONFIRM_DEPOSIT,
CONFIRM_TAKE; CONFIRM_TAKE
} }
public enum ItemModType { public enum ItemModType {
PREFIX, PREFIX,
SUFFIX; SUFFIX
} }
public enum PowerType { public enum PowerType {
None, None,
SPELL, SPELL,
SKILL; SKILL
} }
public enum CostType { public enum CostType {
NONE, NONE,
HEALTH, HEALTH,
MANA, MANA,
STAMINA; STAMINA
} }
public enum AreaType { public enum AreaType {
@@ -3169,7 +3185,7 @@ public class mbEnums {
POINTBLANK, POINTBLANK,
LINE, LINE,
CONE, CONE,
WALL; WALL
} }
public enum ExcludeType { public enum ExcludeType {
@@ -3180,14 +3196,14 @@ public class mbEnums {
NATION, NATION,
PLAYERS, PLAYERS,
ALLBUTGROUP, ALLBUTGROUP,
ALLBUTPETS; ALLBUTPETS
} }
public enum CastingModeType { public enum CastingModeType {
NONE, NONE,
COMBAT, COMBAT,
NONCOMBAT, NONCOMBAT,
BOTH; BOTH
} }
public enum TargetSelectType { public enum TargetSelectType {
@@ -3196,7 +3212,7 @@ public class mbEnums {
GROUP, GROUP,
GUILD, GUILD,
NEARBYMOBS, NEARBYMOBS,
NAME; NAME
} }
public enum CategoryToPowerType { public enum CategoryToPowerType {