- Several fixes to "Prevent all combat damage that would be dealt to and dealt by CARDNAME.".

- Added Prevent all combat damage that would be dealt dealt by CARDNAME.
- Added 6 cards with combat damage prevention.

.gitattributes

@@ -997,6 +997,7 @@ res/cardsfolder/delusions_of_mediocrity.txt -text svneol=native#text/plain
 res/cardsfolder/demigod_of_revenge.txt -text svneol=native#text/plain
 res/cardsfolder/demolish.txt -text svneol=native#text/plain
 res/cardsfolder/demonic_consultation.txt -text svneol=native#text/plain
+res/cardsfolder/demonic_torment.txt -text svneol=native#text/plain
 res/cardsfolder/demonic_tutor.txt -text svneol=native#text/plain
 res/cardsfolder/demons_horn.txt -text svneol=native#text/plain
 res/cardsfolder/demons_jester.txt -text svneol=native#text/plain
@@ -1072,6 +1073,7 @@ res/cardsfolder/do_or_die.txt -text svneol=native#text/plain
 res/cardsfolder/dodecapod.txt -text svneol=native#text/plain
 res/cardsfolder/dogged_hunter.txt -text svneol=native#text/plain
 res/cardsfolder/dogpile.txt -text svneol=native#text/plain
+res/cardsfolder/dolmen_gate.txt -text svneol=native#text/plain
 res/cardsfolder/donate.txt -text svneol=native#text/plain
 res/cardsfolder/doom_blade.txt -text svneol=native#text/plain
 res/cardsfolder/doomed_necromancer.txt -text svneol=native#text/plain
@@ -1563,6 +1565,7 @@ res/cardsfolder/gelectrode.txt -text svneol=native#text/plain
 res/cardsfolder/gemhide_sliver.txt -text svneol=native#text/plain
 res/cardsfolder/gemstone_array.txt -text svneol=native#text/plain
 res/cardsfolder/gemstone_mine.txt -text svneol=native#text/plain
+res/cardsfolder/generals_kabuto.txt -text svneol=native#text/plain
 res/cardsfolder/genesis.txt -text svneol=native#text/plain
 res/cardsfolder/geothermal_crevice.txt -text svneol=native#text/plain
 res/cardsfolder/gerrards_battle_cry.txt -text svneol=native#text/plain
@@ -3379,6 +3382,7 @@ res/cardsfolder/sanctum_gargoyle.txt -text svneol=native#text/plain
 res/cardsfolder/sanctum_plowbeast.txt -text svneol=native#text/plain
 res/cardsfolder/sandbar_merfolk.txt -text svneol=native#text/plain
 res/cardsfolder/sandbar_serpent.txt -text svneol=native#text/plain
+res/cardsfolder/sandskin.txt -text svneol=native#text/plain
 res/cardsfolder/sandsower.txt -text svneol=native#text/plain
 res/cardsfolder/sandstone_warrior.txt -text svneol=native#text/plain
 res/cardsfolder/sandstorm.txt -text svneol=native#text/plain
@@ -3853,6 +3857,7 @@ res/cardsfolder/staff_of_domination.txt -text svneol=native#text/plain
 res/cardsfolder/staff_of_the_ages.txt -text svneol=native#text/plain
 res/cardsfolder/stalker_hag.txt -text svneol=native#text/plain
 res/cardsfolder/stalking_assassin.txt -text svneol=native#text/plain
+res/cardsfolder/stalking_bloodsucker.txt -text svneol=native#text/plain
 res/cardsfolder/stalking_stones.txt -text svneol=native#text/plain
 res/cardsfolder/stalwart_shield_bearers.txt -text svneol=native#text/plain
 res/cardsfolder/stampede_driver.txt -text svneol=native#text/plain
@@ -3866,6 +3871,7 @@ res/cardsfolder/starlight_invoker.txt -text svneol=native#text/plain
 res/cardsfolder/starlit_angel.txt -text svneol=native#text/plain
 res/cardsfolder/starstorm.txt -text svneol=native#text/plain
 res/cardsfolder/stasis.txt -text svneol=native#text/plain
+res/cardsfolder/statecraft.txt -text svneol=native#text/plain
 res/cardsfolder/staunch_defenders.txt -text svneol=native#text/plain
 res/cardsfolder/steadfast_guard.txt -text svneol=native#text/plain
 res/cardsfolder/steadfastness.txt -text svneol=native#text/plain

res/cardsfolder/demonic_torment.txt

@@ -0,0 +1,9 @@
+Name:Demonic Torment
+ManaCost:2 B
+Types:Enchantment Aura
+Text:Enchanted creature can't attack.\r\nPrevent all combat damage that would be dealt by enchanted creature.
+K:Enchant creature
+K:enPumpCurse:HIDDEN CARDNAME can't attack. & HIDDEN Prevent all combat damage that would be dealt dealt by CARDNAME.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/demonic_torment.jpg
+End

res/cardsfolder/dolmen_gate.txt

@@ -0,0 +1,8 @@
+Name:Dolmen Gate
+ManaCost:2
+Types:Artifact
+Text:no text
+K:stPumpAll:Creature.attacking+YouCtrl:0/0/HIDDEN Prevent all combat damage that would be dealt to CARDNAME.:No Condition:Prevent all combat damage that would be dealt to attacking creatures you control.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dolmen_gate.jpg
+End

res/cardsfolder/generals_kabuto.txt

@@ -0,0 +1,8 @@
+Name:General's Kabuto
+ManaCost:4
+Types:Artifact Equipment
+Text:Equipped creature has shroud. (It can't be the target of spells or abilities.)\r\nPrevent all combat damage that would be dealt to equipped creature.
+K:eqPump 2:Shroud & HIDDEN Prevent all combat damage that would be dealt to CARDNAME.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/generals_kabuto.jpg
+End

res/cardsfolder/heart_of_light.txt

@@ -1,7 +1,7 @@
 Name:Heart of Light
 ManaCost:2 W
 Types:Enchantment Aura
-Text:Prevent all combat damage that would be dealt to and dealt by enchanted creature.
+Text:Prevent all damage that would be dealt to and dealt by enchanted creature. (Note: affects only combat damage at the moment)
 K:Enchant creature
 K:enPumpCurse:HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME.
 SVar:Rarity:Common

res/cardsfolder/sandskin.txt

@@ -0,0 +1,9 @@
+Name:Sandskin
+ManaCost:2 W
+Types:Enchantment Aura
+Text:Prevent all combat damage that would be dealt to and dealt by enchanted creature.
+K:Enchant creature
+K:enPumpCurse:HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sandskin.jpg
+End

res/cardsfolder/stalking_bloodsucker.txt

@@ -0,0 +1,10 @@
+Name:Stalking Bloodsucker
+ManaCost:4 B B
+Types:Creature Vampire
+Text:no text
+PT:4/4
+K:Flying
+K:abPump 1 B Discard<1/Any>:+2/+2
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/stalking_bloodsucker.jpg
+End

res/cardsfolder/statecraft.txt

@@ -0,0 +1,9 @@
+Name:Statecraft
+ManaCost:3 U
+Types:Enchantment
+Text:no text
+K:stPumpAll:Creature.YouCtrl:0/0/HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME.:No Condition:Prevent all combat damage that would be dealt to and dealt by creatures you control.
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/statecraft.jpg
+End

src/forge/GameAction.java

@@ -3726,8 +3726,9 @@ public class GameAction {
             int damageToAdd = damage;
             //AllZone.GameAction.addDamage(c, crd , assignedDamageMap.get(crd));
             
-            if (source.getKeyword().contains("Prevent all combat damage that would be dealt to and dealt by CARDNAME."))
-            	damage = 0;
+            if (source.getKeyword().contains("Prevent all combat damage that would be dealt to and dealt by CARDNAME.")
+        			|| source.getKeyword().contains("Prevent all combat damage that would be dealt dealt by CARDNAME."))
+            	damageToAdd = 0;
             else {
 	            if((source.getKeyword().contains("Wither") || source.getKeyword().contains("Infect")) && card.isCreature()) {
 	                damageToAdd = 0;
@@ -3749,10 +3750,9 @@ public class GameAction {
 	                AllZone.GameAction.destroy(card);
 	                AllZone.Combat.removeFromCombat(card);
 	            }
-	            
-	            //totalDamage += damageToAdd;
-	            map.put(source, damageToAdd);
             }
+	        //totalDamage += damageToAdd;
+	        map.put(source, damageToAdd);
         }
         
         if(isCardInPlay(card)) {
@@ -3856,6 +3856,9 @@ public class GameAction {
     */
     public void addCombatDamage(String player, Card source, int damage)
     {
+    	if (source.getKeyword().contains("Prevent all combat damage that would be dealt to and dealt by CARDNAME.")
+    			|| source.getKeyword().contains("Prevent all combat damage that would be dealt dealt by CARDNAME."))
+        	damage = 0;
     	//addDamage(player, source, damage);
     	if (source.getKeyword().contains("Infect"))
     		addPoison(player, damage);