mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 12:48:00 +00:00
- Ninjutsu abilities come into play being unblocked.
- Adding AttackerUnblocked trigger back in. Feel free to tweak if this isn't right.
This commit is contained in:
@@ -1105,6 +1105,7 @@ public class AbilityFactory_ChangeZone {
|
||||
|
||||
if(params.containsKey("Ninjutsu")) {
|
||||
AllZone.Combat.addAttacker(tgtC);
|
||||
AllZone.Combat.addUnblockedAttacker(tgtC);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -425,6 +425,11 @@ public class Combat {
|
||||
if (block.size() == 0){
|
||||
// this damage is assigned to a player by setPlayerDamage()
|
||||
addUnblockedAttacker(attacker);
|
||||
|
||||
//Run Unblocked Trigger
|
||||
HashMap<String,Object> runParams = new HashMap<String,Object>();
|
||||
runParams.put("Attacker", attacker);
|
||||
AllZone.TriggerHandler.runTrigger("AttackerUnblocked", runParams);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ public class Trigger_AttackerUnblocked extends Trigger {
|
||||
public boolean performTest(HashMap<String, Object> runParams) {
|
||||
if(mapParams.containsKey("ValidCard"))
|
||||
{
|
||||
if(!matchesValid(runParams.get("Card"),mapParams.get("ValidCard").split(","),hostCard))
|
||||
if(!matchesValid(runParams.get("Attacker"),mapParams.get("ValidCard").split(","),hostCard))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user