Skip to content

Commit

Permalink
Merge pull request #245 from webadict/commit_stream
Browse files Browse the repository at this point in the history
Card Updates
  • Loading branch information
demilich1 authored Sep 15, 2016
2 parents cb15527 + a45d87c commit 39ce36f
Show file tree
Hide file tree
Showing 274 changed files with 367 additions and 165 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"armorBonus": 1
},
"collectible": true,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"attributes": {
"TAUNT": true
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
3 changes: 2 additions & 1 deletion cards/src/main/resources/cards/basic/druid/spell_claw.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"attackBonus": 2,
"armorBonus": 2
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"value": 1
},
"collectible": false,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"class": "HealSpell",
"value": 8
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"class": "GainManaSpell",
"value": 2
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
}
]
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"class": "DamageSpell",
"value": 1
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"target": "FRIENDLY_CHARACTERS",
"value": 2
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
}
]
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
3 changes: 2 additions & 1 deletion cards/src/main/resources/cards/basic/druid/spell_swipe.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"value": 4,
"secondaryValue": 1
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
}
},
"collectible": true,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"value": 2
},
"collectible": true,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
"BATTLECRY": true
},
"collectible": true,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
}
},
"collectible": true,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
}
},
"collectible": true,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
"CHARGE": true
},
"collectible": true,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"token_leokk"
]
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"class": "DamageSpell",
"value": 2
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"class": "SetHpSpell",
"value": 1
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
}
},
"collectible": true,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"value": 1
},
"collectible": true,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"class": "ReceiveCardSpell"
}
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"CHARGE": true
},
"collectible": false,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"attackBonus": 1
},
"collectible": false,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"TAUNT": true
},
"collectible": false,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"value": 1
},
"collectible": true,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
}
},
"collectible": true,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"target": "ENEMY_MINIONS",
"value": 1
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"class": "DrawCardSpell",
"value": 2
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"value": 1,
"howMany": 3
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"class": "DamageSpell",
"value": 6
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"target": "ENEMY_MINIONS",
"value": 4
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"target": "ENEMY_MINIONS",
"attribute": "FROZEN"
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
}
]
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"token_mirror_image"
]
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"class": "TransformMinionSpell",
"card": "token_sheep"
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"TAUNT": true
},
"collectible": false,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
3 changes: 2 additions & 1 deletion cards/src/main/resources/cards/basic/mage/token_sheep.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"heroClass": "ANY",
"rarity": "FREE",
"race": "BEAST",
"description": "",
"collectible": false,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"attributes": {
"BATTLECRY": true
},
"set": "CLASSIC",
"collectible": true,
"set": "BASIC",
"fileFormatVersion": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"SPELL_DAMAGE": 1
},
"collectible": true,
"set": "CLASSIC",
"set": "BASIC",
"fileFormatVersion": 1
}
Loading

0 comments on commit 39ce36f

Please sign in to comment.