added modifier collections

in the general config, you can define a set of modifiers like this

general:
    modifiers:
        modifier_name:
            checks:
                - condition condition_var action action_var
                - condition condition_var action action_var
            pass-condition: a string value that can be one of the following ANY, ALL

You can also define some in the spell*.yml files as follows

modifiers:
    modifier_name:
        checks:
            - condition condition_var action action_var
            - condition condition_var action action_var
        pass-condition: a string value that can be one of the following ANY, ALL

to reference the modifier collection, you just slip this into your modifiers listed on a spell
- collection <modifier_name> action action_var
where <modifier_name> is the name that you assigned to the modifier collection as shown above

Just a heads up that for the modifier actions inside this, I recommend that you use stop rather than denied most of the time, because the denied action will actually cancel the event being processed whereas the stop action will just say that this specific check counts as a fail.

Author: TheComputerGeek2

src/com/nisovin/magicspells/MagicSpells.java

@@ -159,6 +159,8 @@ public class MagicSpells extends JavaPlugin {
 	MagicLogger magicLogger;
 	LifeLengthTracker lifeLengthTracker;
 
+	MagicConfig config;
+	
 	// profiling
 	HashMap<String, Long> profilingTotalTime;
 	HashMap<String, Integer> profilingRuns;
@@ -197,7 +199,7 @@ void load() {
 			if (!(new File(getDataFolder(), "spells-regular.yml")).exists()) saveResource("spells-regular.yml", false);
 			if (!(new File(getDataFolder(), "zones.yml")).exists()) saveResource("zones.yml", false);
 		}
-		MagicConfig config = new MagicConfig(this);
+		config = new MagicConfig(this);
 		if (!config.isLoaded()) {
 			MagicSpells.log(Level.SEVERE, "Error in config file, stopping config load");
 			return;
@@ -1233,6 +1235,8 @@ void unload() {
 		strCantBind = null;
 		strConsoleName = null;
 
+		config = null;
+		
 		// remove star permissions (to allow new spells to be added to them)
 		getServer().getPluginManager().removePermission("magicspells.grant.*");
 		getServer().getPluginManager().removePermission("magicspells.cast.*");
@@ -1259,6 +1263,10 @@ public ClassLoader getPluginClassLoader() {
 		return getClassLoader();
 	}
 
+	public MagicConfig getMagicConfig() {
+		return config;
+	}
+	
 }
 
 /*

src/com/nisovin/magicspells/castmodifiers/Condition.java

@@ -134,6 +134,7 @@ static Condition getConditionByName(String name) {
 		conditions.put("saturationbelow", SaturationBelowCondition.class);
 		conditions.put("moneymorethan", MoneyMoreThanCondition.class);
 		conditions.put("moneylessthan", MoneyLessThanCondition.class);
+		conditions.put("collection", MultiCondition.class);
 	}
 
 }

src/com/nisovin/magicspells/castmodifiers/IModifier.java

@@ -0,0 +1,19 @@
+package com.nisovin.magicspells.castmodifiers;
+
+import org.bukkit.entity.Player;
+
+import com.nisovin.magicspells.events.MagicSpellsGenericPlayerEvent;
+import com.nisovin.magicspells.events.ManaChangeEvent;
+import com.nisovin.magicspells.events.SpellCastEvent;
+import com.nisovin.magicspells.events.SpellTargetEvent;
+import com.nisovin.magicspells.events.SpellTargetLocationEvent;
+
+public interface IModifier {
+	public boolean apply(SpellCastEvent event);
+	public boolean apply(ManaChangeEvent event);
+	public boolean apply(SpellTargetEvent event);
+	public boolean apply(SpellTargetLocationEvent event);
+	public boolean apply(MagicSpellsGenericPlayerEvent event);
+	public boolean check(Player player);
+
+}

src/com/nisovin/magicspells/castmodifiers/Modifier.java

@@ -17,7 +17,7 @@
 import com.nisovin.magicspells.spells.TargetedLocationSpell;
 import com.nisovin.magicspells.util.Util;
 
-public class Modifier {
+public class Modifier implements IModifier {
 
 	boolean negated = false;
 	Condition condition;
@@ -28,6 +28,9 @@ public class Modifier {
 	String modifierVarString;
 	String strModifierFailed = null;
 
+	//is this a condition that will want to access the events directly?
+	boolean alertCondition = false;
+	
 	public static Modifier factory(String s) {
 		Modifier m = new Modifier();
 		String[] s1 = s.split("\\$\\$");
@@ -75,13 +78,24 @@ public static Modifier factory(String s) {
 			m.strModifierFailed = s1[1].trim();
 		}
 
+		//check for the alert condition
+		if (m.condition instanceof IModifier) {
+			m.alertCondition = true;
+		}
+		
 		// done
 		return m;
 	}
 
+	@Override
 	public boolean apply(SpellCastEvent event) {
 		Player player = event.getCaster();
-		boolean check = condition.check(player);
+		boolean check;
+		if (alertCondition) {
+			check = ((IModifier)condition).apply(event);
+		} else {
+			check = condition.check(player);
+		}
 		if (negated) check = !check;
 		if (!check && type == ModifierType.REQUIRED) {
 			event.setCancelled(true);
@@ -120,9 +134,15 @@ public boolean apply(SpellCastEvent event) {
 		return true;
 	}
 
+	@Override
 	public boolean apply(ManaChangeEvent event) {
 		Player player = event.getPlayer();
-		boolean check = condition.check(player);
+		boolean check;
+		if (alertCondition) {
+			check = ((IModifier)condition).apply(event);
+		} else {
+			check = condition.check(player);
+		}
 		if (negated) check = !check;
 		if (!check && type == ModifierType.REQUIRED) {
 			event.setNewAmount(event.getOldAmount());
@@ -154,9 +174,17 @@ public boolean apply(ManaChangeEvent event) {
 		return true;
 	}
 
+	@Override
 	public boolean apply(SpellTargetEvent event) {
 		Player player = event.getCaster();
-		boolean check = condition.check(player, event.getTarget());
+		
+		boolean check;
+		if (alertCondition) {
+			check = ((IModifier)condition).apply(event);
+		} else {
+			check = condition.check(player, event.getTarget());
+		}
+		
 		if (negated) check = !check;
 		if (!check && type == ModifierType.REQUIRED) {
 			event.setCancelled(true);
@@ -190,9 +218,15 @@ public boolean apply(SpellTargetEvent event) {
 		return true;
 	}
 
+	@Override
 	public boolean apply(SpellTargetLocationEvent event) {
 		Player player = event.getCaster();
-		boolean check = condition.check(player, event.getTargetLocation());
+		boolean check;
+		if (alertCondition) {
+			check = ((IModifier)condition).apply(event);
+		} else {
+			check = condition.check(player, event.getTargetLocation());
+		}
 		if (negated) check = !check;
 		if (!check && type == ModifierType.REQUIRED) {
 			event.setCancelled(true);
@@ -216,8 +250,14 @@ public boolean apply(SpellTargetLocationEvent event) {
 		return true;
 	}
 
+	@Override
 	public boolean apply(MagicSpellsGenericPlayerEvent event) {
-		boolean check = condition.check(event.getPlayer());
+		boolean check;
+		if (alertCondition) {
+			check = ((IModifier)condition).check(event.getPlayer());
+		} else {
+			check = condition.check(event.getPlayer());
+		}
 		if (negated) check = !check;
 		if (!check && type == ModifierType.REQUIRED) {
 			event.setCancelled(true);
@@ -243,6 +283,7 @@ public boolean apply(MagicSpellsGenericPlayerEvent event) {
 		return true;
 	}
 
+	@Override
 	public boolean check(Player player) {
 		boolean check = condition.check(player);
 		if (negated) check = !check;