diff --git a/assets/data/abilities.js b/assets/data/abilities.js index 90aa448..ddc1b25 100644 --- a/assets/data/abilities.js +++ b/assets/data/abilities.js @@ -2,7 +2,7 @@ module.exports = { "agile": { name: "agile", - description: "Can be placed in either the Close Combat or Ranged Combat row. Cannot be moved once placed.", + description: "Agile: Can be placed in either the Close Combat or Ranged Combat row. Cannot be moved once placed.", cancelPlacement: true, onBeforePlace: function(card){ var self = this; @@ -19,7 +19,7 @@ module.exports = { }, "medic": { name: "medic", - description: "Choose one card from your discard pile (excluding heroes / special cards) to play instantly.", + description: "Medic: Choose one card from your discard pile (excluding heroes / special cards) to play instantly.", waitResponse: true, onAfterPlace: function(card){ var discard = this.getDiscard(); @@ -36,7 +36,7 @@ module.exports = { }, "morale_boost": { name: "morale_boost", - description: "Adds +1 strength to all units in the row, excluding itself.", + description: "Morale Boost: Adds +1 strength to all units in the row, excluding itself.", onEachCardPlace: function(card){ var field = this.field[card.getType()]; var id = card.getID(); @@ -61,7 +61,7 @@ module.exports = { }, "muster": { name: "muster", - description: "Find any cards with the same name in your deck and play them instantly.", + description: "Muster: Find any cards with the same name in your deck and play them instantly.", onAfterPlace: function(card){ var musterType = card.getMusterType(); var self = this; @@ -87,7 +87,7 @@ module.exports = { }, "tight_bond": { name: "tight_bond", - description: "Place next to a card with the name same to double the strength of both cards.", + description: "Tight Bond: Place next to a card with the name same to double the strength of both cards.", onAfterPlace: function(card){ var field = this.field[card.getType()]; var cards = field.get(); @@ -103,10 +103,11 @@ module.exports = { }, "spy": { name: "spy", - description: "Place on your opponents battlefield (counts towards their total strength) then draw two new cards from your deck.", + description: "Spy: Place on your opponents battlefield (counts towards their total strength) then draw two new cards from your deck.", changeSide: true, onAfterPlace: function(){ this.draw(2); + this.sendNotification(this.getName() + " activated Spy! Draws +2 cards.") } }, "weather_fog": { @@ -245,7 +246,7 @@ module.exports = { }, "commanders_horn": { name: "commanders_horn", - description: "Commander's Horn: Doubles the strength of all unit cards in a row. Limited to 1 per row.", + description: "Commander's Horn: Doubles the strength of all unit cards in a row. Except this card.", commandersHorn: true }, "commanders_horn_card": { @@ -341,6 +342,22 @@ module.exports = { this.setHorn("commanders_horn", 0); } }, + "emreis_leader4": { + name: "Emhyr vas Emreis the Relentless", + description: "Draw a card from your opponent's discard pile.", + onActivate: function(card){ + var discard = this.foe.getDiscard(); + + discard = this.filter(discard, { + "ability": "hero", + "type": [card.constructor.TYPE.SPECIAL, card.constructor.TYPE.WEATHER] + }) + + this.send("played:emreis_leader4", { + cards: JSON.stringify(discard) + }, true); + } + }, "hero": { name: "hero", description: "Hero: Not affected by special cards, weather cards or abilities." diff --git a/assets/data/cards.js b/assets/data/cards.js index 6555b0f..413d6d3 100644 --- a/assets/data/cards.js +++ b/assets/data/cards.js @@ -10,6 +10,14 @@ module.exports = { + "none": { + name: "none", + power: 0, + ability: null, + img: "foot_soldier1", + faction: "northern", + type: 0 + }, "redanian_foot_soldier": { name: "Redanian Foot Soldier", power: 1, @@ -868,6 +876,14 @@ module.exports = { //nilfgaardian + "emreis_relentless": { + name: "Emhyr vas Emreis the Relentless", + power: -1, + ability: "emreis_leader4", + img: "emhyr_relentless", + faction: "nilfgaardian", + type: 3 + }, "tibor_eggebracht": { name: "test", power: 10, @@ -925,12 +941,12 @@ module.exports = { type: 1 }, "sweers": { - name: "test", - power: 0, + name: "Sweers", + power: 2, ability: null, - img: null, + img: "sweers", faction: "nilfgaardian", - type: 0 + type: 2 }, "nausicaa_cavalry_rider": { name: "Nausicaa Cavalry Rider", diff --git a/assets/data/deck.js b/assets/data/deck.js index 2051978..ea55735 100644 --- a/assets/data/deck.js +++ b/assets/data/deck.js @@ -6,16 +6,14 @@ module.exports = { "redanian_foot_soldier", "redanian_foot_soldier", "poor_fucking_infantry", - "redanian_foot_soldier", "poor_fucking_infantry", + "redanian_foot_soldier", "yarpen_zigrin", "blue_stripes_commando", "sigismund_dijkstra", "prince_stennis", "siegfried_of_denesle", "ves", - "vernon_roche", - "john_natalis", "sheldon_skaggs", "sabrina_glevissig", "crinfrid_reavers_dragon_hunter", @@ -27,75 +25,80 @@ module.exports = { "ballista", "trebuchet", "thaler", + "foltest_siegemaster", + + "vernon_roche", + "john_natalis", + "dandelion", + "villentretenmerth", + "biting_frost", - "torrential_rain", - "clear_weather", "impenetrable_fog", + "clear_weather", + "clear_weather", "commanders_horn", "commanders_horn", - "decoy" + "decoy", + "decoy", + "scorch", + "scorch" ] }, "nilfgaardian": { //test only faction: "nilfgaardian", data: [ - "redanian_foot_soldier", - "redanian_foot_soldier", - "poor_fucking_infantry", - "redanian_foot_soldier", - "poor_fucking_infantry", - "yarpen_zigrin", - "blue_stripes_commando", - "sigismund_dijkstra", - "prince_stennis", - "siegfried_of_denesle", - "ves", - "vernon_roche", - "john_natalis", - "sheldon_skaggs", - "sabrina_glevissig", - "crinfrid_reavers_dragon_hunter", - "sile_de_tansarville", - "keira_metz", - "dethmold", - "kaedweni_siege_expert", - "dun_banner_medic", - "ballista", - "trebuchet", - "thaler", - "foltest_siegemaster", + "emreis_relentless", + "tibor_eggebracht", + "letho_of_gulet", + "morvran_voorhis", + "menno_coehoorn", + "siege_technician", + "etolian_auxiliary_archers", + "albrich", + "nausicaa_cavalry_rider", + "nausicaa_cavalry_rider", + "nausicaa_cavalry_rider", + "impera_brigade_guard", + "impera_brigade_guard", + "impera_brigade_guard", + "vattier_de_rideaux", + "shilard_fitz_oesterlen", + "stefan_skellen", + "heavy_zerrikanian_fire_scorpion", + "heavy_zerrikanian_fire_scorpion", + "black_infantry_archer", + "black_infantry_archer", + "young_emmisary", + "young_emmisary", + "young_emmisary", + "avallach", + "dandelion", + "decoy", + "decoy", + "scorch", + "scorch", + "commanders_horn", + "commanders_horn", + "impenetrable_fog", "biting_frost", "torrential_rain", - "clear_weather", - "impenetrable_fog", - "commanders_horn", - "commanders_horn", - "decoy" + "clear_weather" ] }, "scoiatael": { faction: "scoiatael", data: [ "francesca_the_beautiful", - "commanders_horn", - "commanders_horn", - "saesenthessis", - "iorveth", - "isengrim_faoiltiarnah", - "eithne", + + "havekar_healer", "riordain", "havekar_smuggler", "havekar_smuggler", "havekar_smuggler", + "havekar_smuggler", "toruviel", - "decoy", - "decoy", - "biting_frost", - "torrential_rain", - "clear_weather", - "impenetrable_fog", "elven_skirmisher", "elven_skirmisher", "dwarven_skirmisher", @@ -103,7 +106,6 @@ module.exports = { "ciaran_aep_easnillien", "vrihedd_brigade_recruit", "dol_blathanna_archer", - "havekar_smuggler", "mahakaman_defender", "vrihedd_brigade_veteran", "dennis_cranmer", @@ -113,7 +115,24 @@ module.exports = { "yaevinn", "barclay_els", "dol_blathanna_scout", - "milva" + "milva", + + "saesenthessis", + "iorveth", + "isengrim_faoiltiarnah", + "eithne", + "avallach", + + "scorch", + "scorch", + "commanders_horn", + "commanders_horn", + "decoy", + "decoy", + "biting_frost", + "biting_frost", + "torrential_rain", + "clear_weather" ] }, @@ -121,12 +140,25 @@ module.exports = { faction: "monster", data: [ "eredin_king_of_the_wild_hunt", + "kayran", "leshen", "imlerith", "draug", - "ghoul", + "avallach", + "dandelion", + "decoy", + "decoy", + "scorch", + "scorch", + "commanders_horn", + "commanders_horn", + "torrential_rain", + "clear_weather", + "impenetrable_fog", + + "ghoul", "nekker", "nekker", "wyvern", @@ -135,17 +167,11 @@ module.exports = { "gargoyle", "cockatrice", "harpy", - "biting_frost", - "torrential_rain", - "clear_weather", - "impenetrable_fog", "endrega", "vampire_bruxa", "vampire_fleder", "vampire_garkain", "vampire_ekimmara", - "commanders_horn", - "commanders_horn", "vampire_ekimmara", "arachas", "botchling", @@ -156,7 +182,6 @@ module.exports = { "frightener", "ice_giant", "grave_hag", - //"vampire_katakan", "crone_whispess", "crone_brewess", "crone_weavess",