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

shades dont break hide when moving

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-01-05 11:18:39 -06:00
parent 9f13f5fc5d
commit d8379ae5a9
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/PowersManager.java
+7 -8
View File
@@ -787,14 +787,13 @@ public enum PowersManager {
if (playerCharacter == null || msg == null) if (playerCharacter == null || msg == null)
return; return;
if((msg.getPowerUsedID() == 429495514 || msg.getPowerUsedID() == 429407306) && playerCharacter.getRace().getName().toLowerCase().contains("shade")){ //if((msg.getPowerUsedID() == 429495514 || msg.getPowerUsedID() == 429407306) && playerCharacter.getRace().getName().toLowerCase().contains("shade")){
//use sneak instead of hide // //use sneak instead of hide
PowersBase pb = PowersManager.getPowerByToken(429397210); // PowersBase pb = PowersManager.getPowerByToken(429397210);
float movementPenalty = 0.01f * (50 - msg.getNumTrains()); // int offsetTrains = (40 - msg.getNumTrains()) ;
int offsetTrains = (40 - msg.getNumTrains()) ; // applyPower(playerCharacter,playerCharacter,playerCharacter.loc,429397210,msg.getNumTrains(),false);
applyPower(playerCharacter,playerCharacter,playerCharacter.loc,429397210,msg.getNumTrains(),false); // applyPower(playerCharacter,playerCharacter,playerCharacter.loc,427857146,offsetTrains,false);
applyPower(playerCharacter,playerCharacter,playerCharacter.loc,427857146,offsetTrains,false); //}
}
if(msg.getPowerUsedID() == 429494441) {//wildkins chase if(msg.getPowerUsedID() == 429494441) {//wildkins chase
playerCharacter.removeEffectBySource(EffectSourceType.Root,40,true); playerCharacter.removeEffectBySource(EffectSourceType.Root,40,true);
playerCharacter.removeEffectBySource(EffectSourceType.Snare,40,true); playerCharacter.removeEffectBySource(EffectSourceType.Snare,40,true);
src/engine/objects/AbstractCharacter.java
+9 -1
View File
@@ -1558,7 +1558,15 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
Effect eff = this.effects.get(s); Effect eff = this.effects.get(s);
if (eff == null) if (eff == null)
continue; continue;
if (eff.cancelOnMove() && eff.cancel()) {
Boolean override = false;
if(this.getObjectType().equals(GameObjectType.PlayerCharacter)) {
PlayerCharacter pc = (PlayerCharacter) this;
if (eff.getEffectsBase().getIDString().equals("INVIS-B") && s.equals("Invisible") && pc.getRace().getName().contains("Shade"))
override = true;
}
if (!override && eff.cancelOnMove() && eff.cancel()) {
//System.out.println("canceling on Move"); //System.out.println("canceling on Move");
eff.cancelJob(); eff.cancelJob();
this.effects.remove(s); this.effects.remove(s);