diff --git a/.gitignore b/.gitignore index de6b248..0e8700e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ node_modules public/build public/index.html test/spec +assets/cards/* +client/scss/_cards.scss /site/.idea /site/server/vendor diff --git a/assets/cards/arachas1.png b/assets/original_cards/monster/arachas1.png similarity index 100% rename from assets/cards/arachas1.png rename to assets/original_cards/monster/arachas1.png diff --git a/assets/cards/arachas2.png b/assets/original_cards/monster/arachas2.png similarity index 100% rename from assets/cards/arachas2.png rename to assets/original_cards/monster/arachas2.png diff --git a/assets/cards/arachas3.png b/assets/original_cards/monster/arachas3.png similarity index 100% rename from assets/cards/arachas3.png rename to assets/original_cards/monster/arachas3.png diff --git a/assets/cards/arachas_behemoth.png b/assets/original_cards/monster/arachas_behemoth.png similarity index 100% rename from assets/cards/arachas_behemoth.png rename to assets/original_cards/monster/arachas_behemoth.png diff --git a/assets/cards/botchling.png b/assets/original_cards/monster/botchling.png similarity index 100% rename from assets/cards/botchling.png rename to assets/original_cards/monster/botchling.png diff --git a/assets/cards/celaeno_harpy.png b/assets/original_cards/monster/celaeno_harpy.png similarity index 100% rename from assets/cards/celaeno_harpy.png rename to assets/original_cards/monster/celaeno_harpy.png diff --git a/assets/cards/cockatrice.png b/assets/original_cards/monster/cockatrice.png similarity index 100% rename from assets/cards/cockatrice.png rename to assets/original_cards/monster/cockatrice.png diff --git a/assets/cards/crone_brewess.png b/assets/original_cards/monster/crone_brewess.png similarity index 100% rename from assets/cards/crone_brewess.png rename to assets/original_cards/monster/crone_brewess.png diff --git a/assets/cards/crone_weavess.png b/assets/original_cards/monster/crone_weavess.png similarity index 100% rename from assets/cards/crone_weavess.png rename to assets/original_cards/monster/crone_weavess.png diff --git a/assets/cards/crone_whispess.png b/assets/original_cards/monster/crone_whispess.png similarity index 100% rename from assets/cards/crone_whispess.png rename to assets/original_cards/monster/crone_whispess.png diff --git a/assets/cards/draug.png b/assets/original_cards/monster/draug.png similarity index 100% rename from assets/cards/draug.png rename to assets/original_cards/monster/draug.png diff --git a/assets/cards/earth_elemental.png b/assets/original_cards/monster/earth_elemental.png similarity index 100% rename from assets/cards/earth_elemental.png rename to assets/original_cards/monster/earth_elemental.png diff --git a/assets/cards/endrega.png b/assets/original_cards/monster/endrega.png similarity index 100% rename from assets/cards/endrega.png rename to assets/original_cards/monster/endrega.png diff --git a/assets/cards/eredin_bringer.png b/assets/original_cards/monster/eredin_bringer.png similarity index 100% rename from assets/cards/eredin_bringer.png rename to assets/original_cards/monster/eredin_bringer.png diff --git a/assets/cards/eredin_commander.png b/assets/original_cards/monster/eredin_commander.png similarity index 100% rename from assets/cards/eredin_commander.png rename to assets/original_cards/monster/eredin_commander.png diff --git a/assets/cards/eredin_destroyer.png b/assets/original_cards/monster/eredin_destroyer.png similarity index 100% rename from assets/cards/eredin_destroyer.png rename to assets/original_cards/monster/eredin_destroyer.png diff --git a/assets/cards/eredin_king.png b/assets/original_cards/monster/eredin_king.png similarity index 100% rename from assets/cards/eredin_king.png rename to assets/original_cards/monster/eredin_king.png diff --git a/assets/cards/fiend.png b/assets/original_cards/monster/fiend.png similarity index 100% rename from assets/cards/fiend.png rename to assets/original_cards/monster/fiend.png diff --git a/assets/cards/fire_elemental.png b/assets/original_cards/monster/fire_elemental.png similarity index 100% rename from assets/cards/fire_elemental.png rename to assets/original_cards/monster/fire_elemental.png diff --git a/assets/cards/foglet.png b/assets/original_cards/monster/foglet.png similarity index 100% rename from assets/cards/foglet.png rename to assets/original_cards/monster/foglet.png diff --git a/assets/cards/forktail.png b/assets/original_cards/monster/forktail.png similarity index 100% rename from assets/cards/forktail.png rename to assets/original_cards/monster/forktail.png diff --git a/assets/cards/frightener.png b/assets/original_cards/monster/frightener.png similarity index 100% rename from assets/cards/frightener.png rename to assets/original_cards/monster/frightener.png diff --git a/assets/cards/gargoyle.png b/assets/original_cards/monster/gargoyle.png similarity index 100% rename from assets/cards/gargoyle.png rename to assets/original_cards/monster/gargoyle.png diff --git a/assets/cards/ghoul1.png b/assets/original_cards/monster/ghoul1.png similarity index 100% rename from assets/cards/ghoul1.png rename to assets/original_cards/monster/ghoul1.png diff --git a/assets/cards/ghoul2.png b/assets/original_cards/monster/ghoul2.png similarity index 100% rename from assets/cards/ghoul2.png rename to assets/original_cards/monster/ghoul2.png diff --git a/assets/cards/ghoul3.png b/assets/original_cards/monster/ghoul3.png similarity index 100% rename from assets/cards/ghoul3.png rename to assets/original_cards/monster/ghoul3.png diff --git a/assets/cards/grave_hag.png b/assets/original_cards/monster/grave_hag.png similarity index 100% rename from assets/cards/grave_hag.png rename to assets/original_cards/monster/grave_hag.png diff --git a/assets/cards/griffin.png b/assets/original_cards/monster/griffin.png similarity index 100% rename from assets/cards/griffin.png rename to assets/original_cards/monster/griffin.png diff --git a/assets/cards/harpy.png b/assets/original_cards/monster/harpy.png similarity index 100% rename from assets/cards/harpy.png rename to assets/original_cards/monster/harpy.png diff --git a/assets/cards/ice_giant.png b/assets/original_cards/monster/ice_giant.png similarity index 100% rename from assets/cards/ice_giant.png rename to assets/original_cards/monster/ice_giant.png diff --git a/assets/cards/imlerith.png b/assets/original_cards/monster/imlerith.png similarity index 100% rename from assets/cards/imlerith.png rename to assets/original_cards/monster/imlerith.png diff --git a/assets/cards/kayran.png b/assets/original_cards/monster/kayran.png similarity index 100% rename from assets/cards/kayran.png rename to assets/original_cards/monster/kayran.png diff --git a/assets/cards/leshen.png b/assets/original_cards/monster/leshen.png similarity index 100% rename from assets/cards/leshen.png rename to assets/original_cards/monster/leshen.png diff --git a/assets/cards/nekker1.png b/assets/original_cards/monster/nekker1.png similarity index 100% rename from assets/cards/nekker1.png rename to assets/original_cards/monster/nekker1.png diff --git a/assets/cards/nekker2.png b/assets/original_cards/monster/nekker2.png similarity index 100% rename from assets/cards/nekker2.png rename to assets/original_cards/monster/nekker2.png diff --git a/assets/cards/nekker3.png b/assets/original_cards/monster/nekker3.png similarity index 100% rename from assets/cards/nekker3.png rename to assets/original_cards/monster/nekker3.png diff --git a/assets/cards/plague_maiden.png b/assets/original_cards/monster/plague_maiden.png similarity index 100% rename from assets/cards/plague_maiden.png rename to assets/original_cards/monster/plague_maiden.png diff --git a/assets/cards/vampire_bruxa.png b/assets/original_cards/monster/vampire_bruxa.png similarity index 100% rename from assets/cards/vampire_bruxa.png rename to assets/original_cards/monster/vampire_bruxa.png diff --git a/assets/cards/vampire_ekimmara.png b/assets/original_cards/monster/vampire_ekimmara.png similarity index 100% rename from assets/cards/vampire_ekimmara.png rename to assets/original_cards/monster/vampire_ekimmara.png diff --git a/assets/cards/vampire_fleder.png b/assets/original_cards/monster/vampire_fleder.png similarity index 100% rename from assets/cards/vampire_fleder.png rename to assets/original_cards/monster/vampire_fleder.png diff --git a/assets/cards/vampire_garkain.png b/assets/original_cards/monster/vampire_garkain.png similarity index 100% rename from assets/cards/vampire_garkain.png rename to assets/original_cards/monster/vampire_garkain.png diff --git a/assets/cards/werewolf.png b/assets/original_cards/monster/werewolf.png similarity index 100% rename from assets/cards/werewolf.png rename to assets/original_cards/monster/werewolf.png diff --git a/assets/cards/wyvern.png b/assets/original_cards/monster/wyvern.png similarity index 100% rename from assets/cards/wyvern.png rename to assets/original_cards/monster/wyvern.png diff --git a/assets/cards/avallach.png b/assets/original_cards/neutral/avallach.png similarity index 100% rename from assets/cards/avallach.png rename to assets/original_cards/neutral/avallach.png diff --git a/assets/cards/ciri.png b/assets/original_cards/neutral/ciri.png similarity index 100% rename from assets/cards/ciri.png rename to assets/original_cards/neutral/ciri.png diff --git a/assets/cards/clear.png b/assets/original_cards/neutral/clear.png similarity index 100% rename from assets/cards/clear.png rename to assets/original_cards/neutral/clear.png diff --git a/assets/cards/dandelion.png b/assets/original_cards/neutral/dandelion.png similarity index 100% rename from assets/cards/dandelion.png rename to assets/original_cards/neutral/dandelion.png diff --git a/assets/cards/decoy.png b/assets/original_cards/neutral/decoy.png similarity index 100% rename from assets/cards/decoy.png rename to assets/original_cards/neutral/decoy.png diff --git a/assets/cards/fog.png b/assets/original_cards/neutral/fog.png similarity index 100% rename from assets/cards/fog.png rename to assets/original_cards/neutral/fog.png diff --git a/assets/cards/frost.png b/assets/original_cards/neutral/frost.png similarity index 100% rename from assets/cards/frost.png rename to assets/original_cards/neutral/frost.png diff --git a/assets/cards/geralt.png b/assets/original_cards/neutral/geralt.png similarity index 100% rename from assets/cards/geralt.png rename to assets/original_cards/neutral/geralt.png diff --git a/assets/cards/horn.png b/assets/original_cards/neutral/horn.png similarity index 100% rename from assets/cards/horn.png rename to assets/original_cards/neutral/horn.png diff --git a/assets/cards/rain.png b/assets/original_cards/neutral/rain.png similarity index 100% rename from assets/cards/rain.png rename to assets/original_cards/neutral/rain.png diff --git a/assets/cards/scorch.png b/assets/original_cards/neutral/scorch.png similarity index 100% rename from assets/cards/scorch.png rename to assets/original_cards/neutral/scorch.png diff --git a/assets/cards/triss.png b/assets/original_cards/neutral/triss.png similarity index 100% rename from assets/cards/triss.png rename to assets/original_cards/neutral/triss.png diff --git a/assets/cards/vesemir.png b/assets/original_cards/neutral/vesemir.png similarity index 100% rename from assets/cards/vesemir.png rename to assets/original_cards/neutral/vesemir.png diff --git a/assets/cards/villentretenmerth.png b/assets/original_cards/neutral/villentretenmerth.png similarity index 100% rename from assets/cards/villentretenmerth.png rename to assets/original_cards/neutral/villentretenmerth.png diff --git a/assets/cards/yen.png b/assets/original_cards/neutral/yen.png similarity index 100% rename from assets/cards/yen.png rename to assets/original_cards/neutral/yen.png diff --git a/assets/cards/zoltan.png b/assets/original_cards/neutral/zoltan.png similarity index 100% rename from assets/cards/zoltan.png rename to assets/original_cards/neutral/zoltan.png diff --git a/assets/cards/albrich.png b/assets/original_cards/nilfgaardian/albrich.png similarity index 100% rename from assets/cards/albrich.png rename to assets/original_cards/nilfgaardian/albrich.png diff --git a/assets/cards/assire_var_anahid.png b/assets/original_cards/nilfgaardian/assire_var_anahid.png similarity index 100% rename from assets/cards/assire_var_anahid.png rename to assets/original_cards/nilfgaardian/assire_var_anahid.png diff --git a/assets/cards/aux_archers1.png b/assets/original_cards/nilfgaardian/aux_archers1.png similarity index 100% rename from assets/cards/aux_archers1.png rename to assets/original_cards/nilfgaardian/aux_archers1.png diff --git a/assets/cards/aux_archers2.png b/assets/original_cards/nilfgaardian/aux_archers2.png similarity index 100% rename from assets/cards/aux_archers2.png rename to assets/original_cards/nilfgaardian/aux_archers2.png diff --git a/assets/cards/black_infantry_archer1.png b/assets/original_cards/nilfgaardian/black_infantry_archer1.png similarity index 100% rename from assets/cards/black_infantry_archer1.png rename to assets/original_cards/nilfgaardian/black_infantry_archer1.png diff --git a/assets/cards/black_infantry_archer2.png b/assets/original_cards/nilfgaardian/black_infantry_archer2.png similarity index 100% rename from assets/cards/black_infantry_archer2.png rename to assets/original_cards/nilfgaardian/black_infantry_archer2.png diff --git a/assets/cards/ceallach.png b/assets/original_cards/nilfgaardian/ceallach.png similarity index 100% rename from assets/cards/ceallach.png rename to assets/original_cards/nilfgaardian/ceallach.png diff --git a/assets/cards/cynthia.png b/assets/original_cards/nilfgaardian/cynthia.png similarity index 100% rename from assets/cards/cynthia.png rename to assets/original_cards/nilfgaardian/cynthia.png diff --git a/assets/cards/eggebracht.png b/assets/original_cards/nilfgaardian/eggebracht.png similarity index 100% rename from assets/cards/eggebracht.png rename to assets/original_cards/nilfgaardian/eggebracht.png diff --git a/assets/cards/emhyr_emperor.png b/assets/original_cards/nilfgaardian/emhyr_emperor.png similarity index 100% rename from assets/cards/emhyr_emperor.png rename to assets/original_cards/nilfgaardian/emhyr_emperor.png diff --git a/assets/cards/emhyr_imperial.png b/assets/original_cards/nilfgaardian/emhyr_imperial.png similarity index 100% rename from assets/cards/emhyr_imperial.png rename to assets/original_cards/nilfgaardian/emhyr_imperial.png diff --git a/assets/cards/emhyr_relentless.png b/assets/original_cards/nilfgaardian/emhyr_relentless.png similarity index 100% rename from assets/cards/emhyr_relentless.png rename to assets/original_cards/nilfgaardian/emhyr_relentless.png diff --git a/assets/cards/emhyr_white.png b/assets/original_cards/nilfgaardian/emhyr_white.png similarity index 100% rename from assets/cards/emhyr_white.png rename to assets/original_cards/nilfgaardian/emhyr_white.png diff --git a/assets/cards/fire_scorpion.png b/assets/original_cards/nilfgaardian/fire_scorpion.png similarity index 100% rename from assets/cards/fire_scorpion.png rename to assets/original_cards/nilfgaardian/fire_scorpion.png diff --git a/assets/cards/heavy_fire_scorpion.png b/assets/original_cards/nilfgaardian/heavy_fire_scorpion.png similarity index 100% rename from assets/cards/heavy_fire_scorpion.png rename to assets/original_cards/nilfgaardian/heavy_fire_scorpion.png diff --git a/assets/cards/impera_brigade_guard.png b/assets/original_cards/nilfgaardian/impera_brigade_guard.png similarity index 100% rename from assets/cards/impera_brigade_guard.png rename to assets/original_cards/nilfgaardian/impera_brigade_guard.png diff --git a/assets/cards/letho.png b/assets/original_cards/nilfgaardian/letho.png similarity index 100% rename from assets/cards/letho.png rename to assets/original_cards/nilfgaardian/letho.png diff --git a/assets/cards/menno.png b/assets/original_cards/nilfgaardian/menno.png similarity index 100% rename from assets/cards/menno.png rename to assets/original_cards/nilfgaardian/menno.png diff --git a/assets/cards/morteisen.png b/assets/original_cards/nilfgaardian/morteisen.png similarity index 100% rename from assets/cards/morteisen.png rename to assets/original_cards/nilfgaardian/morteisen.png diff --git a/assets/cards/nausicaa_cavalry_rider.png b/assets/original_cards/nilfgaardian/nausicaa_cavalry_rider.png similarity index 100% rename from assets/cards/nausicaa_cavalry_rider.png rename to assets/original_cards/nilfgaardian/nausicaa_cavalry_rider.png diff --git a/assets/cards/puttkammer.png b/assets/original_cards/nilfgaardian/puttkammer.png similarity index 100% rename from assets/cards/puttkammer.png rename to assets/original_cards/nilfgaardian/puttkammer.png diff --git a/assets/cards/rainfarn.png b/assets/original_cards/nilfgaardian/rainfarn.png similarity index 100% rename from assets/cards/rainfarn.png rename to assets/original_cards/nilfgaardian/rainfarn.png diff --git a/assets/cards/renauld.png b/assets/original_cards/nilfgaardian/renauld.png similarity index 100% rename from assets/cards/renauld.png rename to assets/original_cards/nilfgaardian/renauld.png diff --git a/assets/cards/rotten_mangonel.png b/assets/original_cards/nilfgaardian/rotten_mangonel.png similarity index 100% rename from assets/cards/rotten_mangonel.png rename to assets/original_cards/nilfgaardian/rotten_mangonel.png diff --git a/assets/cards/shilard.png b/assets/original_cards/nilfgaardian/shilard.png similarity index 100% rename from assets/cards/shilard.png rename to assets/original_cards/nilfgaardian/shilard.png diff --git a/assets/cards/siege_engineer.png b/assets/original_cards/nilfgaardian/siege_engineer.png similarity index 100% rename from assets/cards/siege_engineer.png rename to assets/original_cards/nilfgaardian/siege_engineer.png diff --git a/assets/cards/siege_tech.png b/assets/original_cards/nilfgaardian/siege_tech.png similarity index 100% rename from assets/cards/siege_tech.png rename to assets/original_cards/nilfgaardian/siege_tech.png diff --git a/assets/cards/stefan_skellen.png b/assets/original_cards/nilfgaardian/stefan_skellen.png similarity index 100% rename from assets/cards/stefan_skellen.png rename to assets/original_cards/nilfgaardian/stefan_skellen.png diff --git a/assets/cards/sweers.png b/assets/original_cards/nilfgaardian/sweers.png similarity index 100% rename from assets/cards/sweers.png rename to assets/original_cards/nilfgaardian/sweers.png diff --git a/assets/cards/vanhemar.png b/assets/original_cards/nilfgaardian/vanhemar.png similarity index 100% rename from assets/cards/vanhemar.png rename to assets/original_cards/nilfgaardian/vanhemar.png diff --git a/assets/cards/vattier.png b/assets/original_cards/nilfgaardian/vattier.png similarity index 100% rename from assets/cards/vattier.png rename to assets/original_cards/nilfgaardian/vattier.png diff --git a/assets/cards/vigo.png b/assets/original_cards/nilfgaardian/vigo.png similarity index 100% rename from assets/cards/vigo.png rename to assets/original_cards/nilfgaardian/vigo.png diff --git a/assets/cards/voorhis.png b/assets/original_cards/nilfgaardian/voorhis.png similarity index 100% rename from assets/cards/voorhis.png rename to assets/original_cards/nilfgaardian/voorhis.png diff --git a/assets/cards/vreemde.png b/assets/original_cards/nilfgaardian/vreemde.png similarity index 100% rename from assets/cards/vreemde.png rename to assets/original_cards/nilfgaardian/vreemde.png diff --git a/assets/cards/young_emissary1.png b/assets/original_cards/nilfgaardian/young_emissary1.png similarity index 100% rename from assets/cards/young_emissary1.png rename to assets/original_cards/nilfgaardian/young_emissary1.png diff --git a/assets/cards/young_emissary2.png b/assets/original_cards/nilfgaardian/young_emissary2.png similarity index 100% rename from assets/cards/young_emissary2.png rename to assets/original_cards/nilfgaardian/young_emissary2.png diff --git a/assets/cards/ballista1.png b/assets/original_cards/northern/ballista1.png similarity index 100% rename from assets/cards/ballista1.png rename to assets/original_cards/northern/ballista1.png diff --git a/assets/cards/ballista2.png b/assets/original_cards/northern/ballista2.png similarity index 100% rename from assets/cards/ballista2.png rename to assets/original_cards/northern/ballista2.png diff --git a/assets/cards/catapult.png b/assets/original_cards/northern/catapult.png similarity index 100% rename from assets/cards/catapult.png rename to assets/original_cards/northern/catapult.png diff --git a/assets/cards/commando.png b/assets/original_cards/northern/commando.png similarity index 100% rename from assets/cards/commando.png rename to assets/original_cards/northern/commando.png diff --git a/assets/cards/crinfrid.png b/assets/original_cards/northern/crinfrid.png similarity index 100% rename from assets/cards/crinfrid.png rename to assets/original_cards/northern/crinfrid.png diff --git a/assets/cards/dethmold.png b/assets/original_cards/northern/dethmold.png similarity index 100% rename from assets/cards/dethmold.png rename to assets/original_cards/northern/dethmold.png diff --git a/assets/cards/dijkstra.png b/assets/original_cards/northern/dijkstra.png similarity index 100% rename from assets/cards/dijkstra.png rename to assets/original_cards/northern/dijkstra.png diff --git a/assets/cards/eilhart.png b/assets/original_cards/northern/eilhart.png similarity index 100% rename from assets/cards/eilhart.png rename to assets/original_cards/northern/eilhart.png diff --git a/assets/cards/foltest_commander.png b/assets/original_cards/northern/foltest_commander.png similarity index 100% rename from assets/cards/foltest_commander.png rename to assets/original_cards/northern/foltest_commander.png diff --git a/assets/cards/foltest_forged.png b/assets/original_cards/northern/foltest_forged.png similarity index 100% rename from assets/cards/foltest_forged.png rename to assets/original_cards/northern/foltest_forged.png diff --git a/assets/cards/foltest_king.png b/assets/original_cards/northern/foltest_king.png similarity index 100% rename from assets/cards/foltest_king.png rename to assets/original_cards/northern/foltest_king.png diff --git a/assets/cards/foltest_siege.png b/assets/original_cards/northern/foltest_siege.png similarity index 100% rename from assets/cards/foltest_siege.png rename to assets/original_cards/northern/foltest_siege.png diff --git a/assets/cards/foot_soldier1.png b/assets/original_cards/northern/foot_soldier1.png similarity index 100% rename from assets/cards/foot_soldier1.png rename to assets/original_cards/northern/foot_soldier1.png diff --git a/assets/cards/foot_solider2.png b/assets/original_cards/northern/foot_solider2.png similarity index 100% rename from assets/cards/foot_solider2.png rename to assets/original_cards/northern/foot_solider2.png diff --git a/assets/cards/infantry.png b/assets/original_cards/northern/infantry.png similarity index 100% rename from assets/cards/infantry.png rename to assets/original_cards/northern/infantry.png diff --git a/assets/cards/keira.png b/assets/original_cards/northern/keira.png similarity index 100% rename from assets/cards/keira.png rename to assets/original_cards/northern/keira.png diff --git a/assets/cards/medic.png b/assets/original_cards/northern/medic.png similarity index 100% rename from assets/cards/medic.png rename to assets/original_cards/northern/medic.png diff --git a/assets/cards/natalis.png b/assets/original_cards/northern/natalis.png similarity index 100% rename from assets/cards/natalis.png rename to assets/original_cards/northern/natalis.png diff --git a/assets/cards/roche.png b/assets/original_cards/northern/roche.png similarity index 100% rename from assets/cards/roche.png rename to assets/original_cards/northern/roche.png diff --git a/assets/cards/sabrina.png b/assets/original_cards/northern/sabrina.png similarity index 100% rename from assets/cards/sabrina.png rename to assets/original_cards/northern/sabrina.png diff --git a/assets/cards/siege_expert1.png b/assets/original_cards/northern/siege_expert1.png similarity index 100% rename from assets/cards/siege_expert1.png rename to assets/original_cards/northern/siege_expert1.png diff --git a/assets/cards/siege_expert2.png b/assets/original_cards/northern/siege_expert2.png similarity index 100% rename from assets/cards/siege_expert2.png rename to assets/original_cards/northern/siege_expert2.png diff --git a/assets/cards/siege_expert3.png b/assets/original_cards/northern/siege_expert3.png similarity index 100% rename from assets/cards/siege_expert3.png rename to assets/original_cards/northern/siege_expert3.png diff --git a/assets/cards/siege_tower.png b/assets/original_cards/northern/siege_tower.png similarity index 100% rename from assets/cards/siege_tower.png rename to assets/original_cards/northern/siege_tower.png diff --git a/assets/cards/siegfried.png b/assets/original_cards/northern/siegfried.png similarity index 100% rename from assets/cards/siegfried.png rename to assets/original_cards/northern/siegfried.png diff --git a/assets/cards/sile.png b/assets/original_cards/northern/sile.png similarity index 100% rename from assets/cards/sile.png rename to assets/original_cards/northern/sile.png diff --git a/assets/cards/skaggs.png b/assets/original_cards/northern/skaggs.png similarity index 100% rename from assets/cards/skaggs.png rename to assets/original_cards/northern/skaggs.png diff --git a/assets/cards/stennis.png b/assets/original_cards/northern/stennis.png similarity index 100% rename from assets/cards/stennis.png rename to assets/original_cards/northern/stennis.png diff --git a/assets/cards/thaler.png b/assets/original_cards/northern/thaler.png similarity index 100% rename from assets/cards/thaler.png rename to assets/original_cards/northern/thaler.png diff --git a/assets/cards/thyssen.png b/assets/original_cards/northern/thyssen.png similarity index 100% rename from assets/cards/thyssen.png rename to assets/original_cards/northern/thyssen.png diff --git a/assets/cards/trebuchet1.png b/assets/original_cards/northern/trebuchet1.png similarity index 100% rename from assets/cards/trebuchet1.png rename to assets/original_cards/northern/trebuchet1.png diff --git a/assets/cards/trebuchet2.png b/assets/original_cards/northern/trebuchet2.png similarity index 100% rename from assets/cards/trebuchet2.png rename to assets/original_cards/northern/trebuchet2.png diff --git a/assets/cards/ves.png b/assets/original_cards/northern/ves.png similarity index 100% rename from assets/cards/ves.png rename to assets/original_cards/northern/ves.png diff --git a/assets/cards/yarpen.png b/assets/original_cards/northern/yarpen.png similarity index 100% rename from assets/cards/yarpen.png rename to assets/original_cards/northern/yarpen.png diff --git a/assets/cards/archer.png b/assets/original_cards/scoiatael/archer.png similarity index 100% rename from assets/cards/archer.png rename to assets/original_cards/scoiatael/archer.png diff --git a/assets/cards/barclay.png b/assets/original_cards/scoiatael/barclay.png similarity index 100% rename from assets/cards/barclay.png rename to assets/original_cards/scoiatael/barclay.png diff --git a/assets/cards/cranmer.png b/assets/original_cards/scoiatael/cranmer.png similarity index 100% rename from assets/cards/cranmer.png rename to assets/original_cards/scoiatael/cranmer.png diff --git a/assets/cards/defender1.png b/assets/original_cards/scoiatael/defender1.png similarity index 100% rename from assets/cards/defender1.png rename to assets/original_cards/scoiatael/defender1.png diff --git a/assets/cards/defender2.png b/assets/original_cards/scoiatael/defender2.png similarity index 100% rename from assets/cards/defender2.png rename to assets/original_cards/scoiatael/defender2.png diff --git a/assets/cards/defender3.png b/assets/original_cards/scoiatael/defender3.png similarity index 100% rename from assets/cards/defender3.png rename to assets/original_cards/scoiatael/defender3.png diff --git a/assets/cards/defender4.png b/assets/original_cards/scoiatael/defender4.png similarity index 100% rename from assets/cards/defender4.png rename to assets/original_cards/scoiatael/defender4.png diff --git a/assets/cards/defender5.png b/assets/original_cards/scoiatael/defender5.png similarity index 100% rename from assets/cards/defender5.png rename to assets/original_cards/scoiatael/defender5.png diff --git a/assets/cards/easnillien.png b/assets/original_cards/scoiatael/easnillien.png similarity index 100% rename from assets/cards/easnillien.png rename to assets/original_cards/scoiatael/easnillien.png diff --git a/assets/cards/eithne.png b/assets/original_cards/scoiatael/eithne.png similarity index 100% rename from assets/cards/eithne.png rename to assets/original_cards/scoiatael/eithne.png diff --git a/assets/cards/elven_skirmisher1.png b/assets/original_cards/scoiatael/elven_skirmisher1.png similarity index 100% rename from assets/cards/elven_skirmisher1.png rename to assets/original_cards/scoiatael/elven_skirmisher1.png diff --git a/assets/cards/elven_skirmisher2.png b/assets/original_cards/scoiatael/elven_skirmisher2.png similarity index 100% rename from assets/cards/elven_skirmisher2.png rename to assets/original_cards/scoiatael/elven_skirmisher2.png diff --git a/assets/cards/elven_skirmisher3.png b/assets/original_cards/scoiatael/elven_skirmisher3.png similarity index 100% rename from assets/cards/elven_skirmisher3.png rename to assets/original_cards/scoiatael/elven_skirmisher3.png diff --git a/assets/cards/fidhail.png b/assets/original_cards/scoiatael/fidhail.png similarity index 100% rename from assets/cards/fidhail.png rename to assets/original_cards/scoiatael/fidhail.png diff --git a/assets/cards/francesca_beautiful.png b/assets/original_cards/scoiatael/francesca_beautiful.png similarity index 100% rename from assets/cards/francesca_beautiful.png rename to assets/original_cards/scoiatael/francesca_beautiful.png diff --git a/assets/cards/francesca_daisy.png b/assets/original_cards/scoiatael/francesca_daisy.png similarity index 100% rename from assets/cards/francesca_daisy.png rename to assets/original_cards/scoiatael/francesca_daisy.png diff --git a/assets/cards/francesca_pureblood.png b/assets/original_cards/scoiatael/francesca_pureblood.png similarity index 100% rename from assets/cards/francesca_pureblood.png rename to assets/original_cards/scoiatael/francesca_pureblood.png diff --git a/assets/cards/francesca_queen.png b/assets/original_cards/scoiatael/francesca_queen.png similarity index 100% rename from assets/cards/francesca_queen.png rename to assets/original_cards/scoiatael/francesca_queen.png diff --git a/assets/cards/healer.png b/assets/original_cards/scoiatael/healer.png similarity index 100% rename from assets/cards/healer.png rename to assets/original_cards/scoiatael/healer.png diff --git a/assets/cards/healer2.png b/assets/original_cards/scoiatael/healer2.png similarity index 100% rename from assets/cards/healer2.png rename to assets/original_cards/scoiatael/healer2.png diff --git a/assets/cards/healer3.png b/assets/original_cards/scoiatael/healer3.png similarity index 100% rename from assets/cards/healer3.png rename to assets/original_cards/scoiatael/healer3.png diff --git a/assets/cards/iorveth.png b/assets/original_cards/scoiatael/iorveth.png similarity index 100% rename from assets/cards/iorveth.png rename to assets/original_cards/scoiatael/iorveth.png diff --git a/assets/cards/isengrim.png b/assets/original_cards/scoiatael/isengrim.png similarity index 100% rename from assets/cards/isengrim.png rename to assets/original_cards/scoiatael/isengrim.png diff --git a/assets/cards/milva.png b/assets/original_cards/scoiatael/milva.png similarity index 100% rename from assets/cards/milva.png rename to assets/original_cards/scoiatael/milva.png diff --git a/assets/cards/recruit.png b/assets/original_cards/scoiatael/recruit.png similarity index 100% rename from assets/cards/recruit.png rename to assets/original_cards/scoiatael/recruit.png diff --git a/assets/cards/riordain.png b/assets/original_cards/scoiatael/riordain.png similarity index 100% rename from assets/cards/riordain.png rename to assets/original_cards/scoiatael/riordain.png diff --git a/assets/cards/saesenthessis.png b/assets/original_cards/scoiatael/saesenthessis.png similarity index 100% rename from assets/cards/saesenthessis.png rename to assets/original_cards/scoiatael/saesenthessis.png diff --git a/assets/cards/scout1.png b/assets/original_cards/scoiatael/scout1.png similarity index 100% rename from assets/cards/scout1.png rename to assets/original_cards/scoiatael/scout1.png diff --git a/assets/cards/scout2.png b/assets/original_cards/scoiatael/scout2.png similarity index 100% rename from assets/cards/scout2.png rename to assets/original_cards/scoiatael/scout2.png diff --git a/assets/cards/scout3.png b/assets/original_cards/scoiatael/scout3.png similarity index 100% rename from assets/cards/scout3.png rename to assets/original_cards/scoiatael/scout3.png diff --git a/assets/cards/sivney.png b/assets/original_cards/scoiatael/sivney.png similarity index 100% rename from assets/cards/sivney.png rename to assets/original_cards/scoiatael/sivney.png diff --git a/assets/cards/skirmisher1.png b/assets/original_cards/scoiatael/skirmisher1.png similarity index 100% rename from assets/cards/skirmisher1.png rename to assets/original_cards/scoiatael/skirmisher1.png diff --git a/assets/cards/skirmisher2.png b/assets/original_cards/scoiatael/skirmisher2.png similarity index 100% rename from assets/cards/skirmisher2.png rename to assets/original_cards/scoiatael/skirmisher2.png diff --git a/assets/cards/skirmisher3.png b/assets/original_cards/scoiatael/skirmisher3.png similarity index 100% rename from assets/cards/skirmisher3.png rename to assets/original_cards/scoiatael/skirmisher3.png diff --git a/assets/cards/smuggler1.png b/assets/original_cards/scoiatael/smuggler1.png similarity index 100% rename from assets/cards/smuggler1.png rename to assets/original_cards/scoiatael/smuggler1.png diff --git a/assets/cards/smuggler2.png b/assets/original_cards/scoiatael/smuggler2.png similarity index 100% rename from assets/cards/smuggler2.png rename to assets/original_cards/scoiatael/smuggler2.png diff --git a/assets/cards/smuggler3.png b/assets/original_cards/scoiatael/smuggler3.png similarity index 100% rename from assets/cards/smuggler3.png rename to assets/original_cards/scoiatael/smuggler3.png diff --git a/assets/cards/toruviel.png b/assets/original_cards/scoiatael/toruviel.png similarity index 100% rename from assets/cards/toruviel.png rename to assets/original_cards/scoiatael/toruviel.png diff --git a/assets/cards/veteran1.png b/assets/original_cards/scoiatael/veteran1.png similarity index 100% rename from assets/cards/veteran1.png rename to assets/original_cards/scoiatael/veteran1.png diff --git a/assets/cards/veteran2.png b/assets/original_cards/scoiatael/veteran2.png similarity index 100% rename from assets/cards/veteran2.png rename to assets/original_cards/scoiatael/veteran2.png diff --git a/assets/cards/yaevinn.png b/assets/original_cards/scoiatael/yaevinn.png similarity index 100% rename from assets/cards/yaevinn.png rename to assets/original_cards/scoiatael/yaevinn.png diff --git a/client/scss/main.scss b/client/scss/main.scss index 0e5a19e..612ea3c 100644 --- a/client/scss/main.scss +++ b/client/scss/main.scss @@ -1,6 +1,7 @@ //@import "style"; @import "backbone.modal"; @import "backbone.modal.theme"; +@import "cards"; $height: 600px; $game-height: 800px; @@ -116,8 +117,13 @@ $game-height: 800px; margin: 3px; height: 90px; overflow: hidden; - img { + /*img { height: 120px; + }*/ + + i { + display: block; + transform: scale(1); } /*.card-attr-power { @@ -161,7 +167,10 @@ $game-height: 800px; position: fixed; //left:0; z-index: 110; - height: 100px !important; + //height: 100px !important; + i { + display: block; + } .preview-description { width: 238px; min-height: 200px; @@ -176,65 +185,67 @@ $game-height: 800px; } -i { - display: block; - float: left; - height: 40px; - width: 40px; - background: url("../../assets/ruby-grey.png"); - &.ruby { - background: url("../../assets/ruby.png"); - } -} - -.field { - &.field-frost { - background: #ffffff; /* Old browsers */ - background: -moz-linear-gradient(top, #ffffff 0%, #2365ff 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#2365ff)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #ffffff 0%,#2365ff 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #ffffff 0%,#2365ff 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #ffffff 0%,#2365ff 100%); /* IE10+ */ - background: linear-gradient(to bottom, #ffffff 0%,#2365ff 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#2365ff',GradientType=0 ); /* IE6-9 */ - - } - &.field-fog { - background: #ffffff; /* Old browsers */ - background: -moz-linear-gradient(top, #ffffff 0%, #232f30 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#232f30)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #ffffff 0%,#232f30 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #ffffff 0%,#232f30 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #ffffff 0%,#232f30 100%); /* IE10+ */ - background: linear-gradient(to bottom, #ffffff 0%,#232f30 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#232f30',GradientType=0 ); /* IE6-9 */ - } - &.field-rain { - background: #ffffff; /* Old browsers */ - background: -moz-linear-gradient(top, #ffffff 0%, #9b9b9b 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#9b9b9b)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #ffffff 0%,#9b9b9b 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #ffffff 0%,#9b9b9b 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #ffffff 0%,#9b9b9b 100%); /* IE10+ */ - background: linear-gradient(to bottom, #ffffff 0%,#9b9b9b 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#9b9b9b',GradientType=0 ); /* IE6-9 */ - - } -} - -.playcard-banner { - position: fixed; - border: 1px solid red; - background: orangered; - width: 100%; - height: 250px; - left: 0; - text-align: center; - top: 200px; - z-index: 200; - .card { - position: relative; - left: 50%; - top: 30%; +.gwent-lives{ + i { + display: block; + float: left; + height: 40px; + width: 40px; + background: url("../../assets/ruby-grey.png"); + &.ruby { + background: url("../../assets/ruby.png"); + } + } + + .field { + &.field-frost { + background: #ffffff; /* Old browsers */ + background: -moz-linear-gradient(top, #ffffff 0%, #2365ff 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#2365ff)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #ffffff 0%,#2365ff 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #ffffff 0%,#2365ff 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #ffffff 0%,#2365ff 100%); /* IE10+ */ + background: linear-gradient(to bottom, #ffffff 0%,#2365ff 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#2365ff',GradientType=0 ); /* IE6-9 */ + + } + &.field-fog { + background: #ffffff; /* Old browsers */ + background: -moz-linear-gradient(top, #ffffff 0%, #232f30 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#232f30)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #ffffff 0%,#232f30 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #ffffff 0%,#232f30 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #ffffff 0%,#232f30 100%); /* IE10+ */ + background: linear-gradient(to bottom, #ffffff 0%,#232f30 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#232f30',GradientType=0 ); /* IE6-9 */ + } + &.field-rain { + background: #ffffff; /* Old browsers */ + background: -moz-linear-gradient(top, #ffffff 0%, #9b9b9b 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#9b9b9b)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #ffffff 0%,#9b9b9b 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #ffffff 0%,#9b9b9b 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #ffffff 0%,#9b9b9b 100%); /* IE10+ */ + background: linear-gradient(to bottom, #ffffff 0%,#9b9b9b 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#9b9b9b',GradientType=0 ); /* IE6-9 */ + + } + } + + .playcard-banner { + position: fixed; + border: 1px solid red; + background: orangered; + width: 100%; + height: 250px; + left: 0; + text-align: center; + top: 200px; + z-index: 200; + .card { + position: relative; + left: 50%; + top: 30%; + } } } diff --git a/client/templates/cards.handlebars b/client/templates/cards.handlebars index 260ec08..828b5a0 100644 --- a/client/templates/cards.handlebars +++ b/client/templates/cards.handlebars @@ -1,3 +1,3 @@
- +
\ No newline at end of file diff --git a/client/templates/fieldCards.handlebars b/client/templates/fieldCards.handlebars index 5bd88f8..208415a 100644 --- a/client/templates/fieldCards.handlebars +++ b/client/templates/fieldCards.handlebars @@ -1,6 +1,6 @@ {{#each this}}
{{#if diff}}{{diff}}{{/if}} - +
{{/each}} \ No newline at end of file diff --git a/client/templates/modal.medic.handlebars b/client/templates/modal.medic.handlebars index c014dd9..d644364 100644 --- a/client/templates/modal.medic.handlebars +++ b/client/templates/modal.medic.handlebars @@ -2,10 +2,8 @@

Choose one card from your discard

- {{#each medicDiscard.cards}} -
- -
+ {{#each medicDiscard.cards as |val key|}} + {{>card val}} {{/each}}
diff --git a/client/templates/modal.redraw.handlebars b/client/templates/modal.redraw.handlebars index 3d3201b..1c892ef 100644 --- a/client/templates/modal.redraw.handlebars +++ b/client/templates/modal.redraw.handlebars @@ -2,10 +2,8 @@

Choose up to 2 cards you wish to redraw!

- {{#each handCards}} -
- -
+ {{#each handCards as |val key|}} + {{>card val}} {{/each}}
diff --git a/client/templates/preview.handlebars b/client/templates/preview.handlebars index cb7536e..3c9ac72 100644 --- a/client/templates/preview.handlebars +++ b/client/templates/preview.handlebars @@ -1,4 +1,4 @@ - +

{{card.name}}

{{#each abilities as |val key|}} diff --git a/gulpfile.js b/gulpfile.js index 4455f97..b4e0513 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,10 +2,15 @@ var browserify = require('browserify'); var gulp = require('gulp'); var source = require('vinyl-source-stream'); var fs = require("fs"); +var spritesmith = require("gulp.spritesmith"); var babelify = require("babelify"); var livereload = require("gulp-livereload"); var sass = require("gulp-sass"); var handlebars = require("browserify-handlebars"); +var imagemin = require('gulp-imagemin'); +var gm = require("gulp-gm"); +var sprity = require("sprity"); +var gulpif = require("gulp-if"); livereload({start: true}); //fast install @@ -67,7 +72,9 @@ gulp.task("watch", function(){ gulp.watch("./test/src/*", ["unit tests"]); }) -gulp.task("index", function() { + + +gulp.task("index", function(){ gulp.src("./client/index.html") .pipe(gulp.dest("./public/")); @@ -75,4 +82,44 @@ gulp.task("index", function() { .pipe(gulp.dest("./public/build")); }) -gulp.task("default", ["watch", "browserify", "sass", "unit tests", "index"]); +gulp.task('resize', function(){ + if(fs.existsSync(__dirname + "/assets/cards/lg/monster/arachas1.png")) { + console.log("skip resizing"); + return; + } + gulp.src('./assets/original_cards/**/*.png') + .pipe(gm(function(gmfile){ + return gmfile.resize(null, 120); + })) + .pipe(gulp.dest('./assets/cards/sm/')); + + gulp.src('./assets/original_cards/**/*.png') + .pipe(gm(function(gmfile){ + return gmfile.resize(null, 450); + })) + .pipe(gulp.dest('./assets/cards/lg/')); +}); + +gulp.task("sprite", function(){ + /*if(fs.existsSync(__dirname + "/public/build/")) { + console.log("skip resizing"); + return; + }*/ + sprity.src({ + src: "./assets/cards/**/*.png", + style: "_cards.scss", + //"style-type": "scss", + processor: "css", + engine: "gm", + orientation: "binary-tree", + split: true, + cssPath: "../../public/build/", + prefix: "card", + name: "cards", + margin: 0 + //template: "./client/scss/_cards.hbs" + }) + .pipe(gulpif("*.png", gulp.dest("./public/build/"), gulp.dest("./client/scss/"))) +}) + +gulp.task("default", ["watch", "browserify", "sass", "unit tests", "index", "resize", "sprite"]);