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

mobs no longer always hit, mob powers now send power message in chat window

Browse Source
This commit is contained in:
FatBoy-DOTC
2022-06-26 20:01:05 -05:00
parent 45ab56e98d
commit e79a907f3b
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/ai/utilities/CombatUtilities.java
+23 -9
View File
@@ -18,9 +18,11 @@ import engine.gameManager.CombatManager;
import engine.gameManager.PowersManager; import engine.gameManager.PowersManager;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
import engine.net.DispatchMessage; import engine.net.DispatchMessage;
import engine.net.client.msg.PerformActionMsg;
import engine.net.client.msg.TargetedActionMsg; import engine.net.client.msg.TargetedActionMsg;
import engine.objects.*; import engine.objects.*;
import engine.powers.ActionsBase; import engine.powers.ActionsBase;
import engine.powers.PowersBase;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
@@ -274,14 +276,23 @@ public class CombatUtilities {
int passiveAnim = CombatManager.getSwingAnimation(wb, null,mainHand); int passiveAnim = CombatManager.getSwingAnimation(wb, null,mainHand);
if(canSwing(agent)) { if(canSwing(agent)) {
if(triggerDefense(agent,target)) if(triggerDefense(agent,target)) {
swingIsMiss(agent,target, passiveAnim); swingIsMiss(agent, target, passiveAnim);
else if(triggerDodge(agent,target)) return;
swingIsDodge(agent,target, passiveAnim); }
else if(triggerParry(agent,target)) else if(triggerDodge(agent,target)) {
swingIsParry(agent,target, passiveAnim); swingIsDodge(agent, target, passiveAnim);
else if(triggerBlock(agent,target)) return;
swingIsBlock(agent,target, passiveAnim); }
else if (triggerParry(agent, target)){
swingIsParry(agent, target, passiveAnim);
return;
}
else if(triggerBlock(agent,target)) {
swingIsBlock(agent, target, passiveAnim);
return;
}
else else
//check for a cast here? //check for a cast here?
@@ -333,8 +344,11 @@ public class CombatUtilities {
powerRank = 40; powerRank = 40;
break; break;
} }
System.out.println(agent.getMobBase().getFirstName() + " is casting: " + PowersManager.getPowerByToken(powerToken).skillName); //System.out.println(agent.getMobBase().getFirstName() + " is casting: " + PowersManager.getPowerByToken(powerToken).skillName);
PowersManager.applyPower(agent,target,target.getLoc(),powerToken,powerRank, false); PowersManager.applyPower(agent,target,target.getLoc(),powerToken,powerRank, false);
PerformActionMsg msg = new PerformActionMsg();
PowersManager.sendPowerMsg((PlayerCharacter)target,0,msg);
//return;
} }
} }
return; return;