diff --git a/.dockerignore b/.dockerignore index 93f1361..ca76da4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,3 @@ node_modules npm-debug.log +*.xcf diff --git a/client/scripts/10-conf.coffee b/client/scripts/10-conf.coffee index d95672d..9b4131e 100644 --- a/client/scripts/10-conf.coffee +++ b/client/scripts/10-conf.coffee @@ -1,16 +1,16 @@ CONF = playmat: - w: 1600 - h: 900 + w: 2000 + h: 1000 card: - w: 172 - h: 240 + w: 225 + h: 315 bigcard: - x: (1600 - 1200) / 2 - y: (1800 - 1675) / 2 + x: (2000 - 1200) / 2 + y: (2000 - 1675) / 2 w: 1200 h: 1675 diff --git a/client/scripts/30-scene-Battle.coffee b/client/scripts/30-scene-Battle.coffee index 8cb662d..3641bae 100644 --- a/client/scripts/30-scene-Battle.coffee +++ b/client/scripts/30-scene-Battle.coffee @@ -25,7 +25,7 @@ Crafty.defineScene "Battle", -> Crafty.trigger 'ViewportResize' # Example playmats at https://imgur.com/a/VSosu#cwGQdAS - Crafty.sprite 997, 582, '//i.imgur.com/cwGQdAS.png', + Crafty.sprite 2000, 1000, 'assets/ff7.jpg', playmat: [ 0 0 diff --git a/client/scripts/40-test-entities.coffee b/client/scripts/40-test-entities.coffee index 3f4633b..f124134 100644 --- a/client/scripts/40-test-entities.coffee +++ b/client/scripts/40-test-entities.coffee @@ -8,20 +8,14 @@ Crafty.sprite 480, 670, '//www.fftcgmognet.com/images/cards/hd/1/1/107.jpg', 0 ] -card = Crafty.e 'shantotto, AllyCard' - .attr { - x: 0 - y: 0 - } - .bind 'DoubleClick', -> - @destroy() - return +Crafty.e 'shantotto, AllyCard, Backup' + .place 0, 0 -Crafty.e 'shantotto, AllyCard' +Crafty.e 'shantotto, AllyCard, Backup' .place 300, 0 -Crafty.e 'shantotto, AllyCard' +Crafty.e 'shantotto, AllyCard, Backup' .place 600, 0 -Crafty.e 'shantotto, EnemyCard' +Crafty.e 'shantotto, EnemyCard, Backup' .place 900, 0 diff --git a/static/assets/board.xcf b/static/assets/board.xcf new file mode 100644 index 0000000..fc612f5 Binary files /dev/null and b/static/assets/board.xcf differ diff --git a/static/assets/ff7.jpg b/static/assets/ff7.jpg new file mode 100644 index 0000000..e72aabc Binary files /dev/null and b/static/assets/ff7.jpg differ diff --git a/static/assets/ranx.jpg b/static/assets/ranx.jpg new file mode 100644 index 0000000..4498d33 Binary files /dev/null and b/static/assets/ranx.jpg differ