diff --git a/assets/data/cards.js b/assets/data/cards.js index 05267ac..2ab1eff 100644 --- a/assets/data/cards.js +++ b/assets/data/cards.js @@ -42,8 +42,8 @@ module.exports = { faction: "Northern Realm", type: 0 }, - "sigismunt_dijkstra": { - name: "Sigismunt Dijkstra", + "sigismund_dijkstra": { + name: "Sigismund Dijkstra", power: 4, ability: "spy", img: "dijkstra", @@ -210,6 +210,40 @@ module.exports = { faction: "Northern Realm", type: 3 }, + "philippa_eilhart": { + name: "Philippa Eilhart", + power: 10, + ability: "hero", + img: "eilhart", + faction: "Northern Realm", + type: 1 + }, + "esterad_thyssen": { + name: "Esterad Thyssen", + power: 10, + ability: "hero", + img: "thyssen", + faction: "Northern Realm", + type: 0 + }, + "siege_tower": { + name: "Siege Tower", + power: 6, + ability: null, + img: "siege_tower", + faction: "Northern Realm", + type: 2 + }, + "catapult": { + name: "Catapult", + power: 8, + ability: "tight_bond", + img: "catapult", + faction: "Northern Realm", + type: 2 + }, + + "decoy": { name: "Decoy", power: -1, @@ -227,6 +261,7 @@ module.exports = { type: 4 }, + "impenetrable_fog": { name: "Impenetrable Fog", power: -1, @@ -402,7 +437,7 @@ module.exports = { "havekar_smuggler": { name: "Havekar Smuggler", power: 5, - ability: "spy", + ability: "muster", img: "smuggler1", faction: "Scoia'tael", type: 0 diff --git a/site/client/app/components/chat.js b/site/client/app/components/chat.js index a091206..8edfa54 100644 --- a/site/client/app/components/chat.js +++ b/site/client/app/components/chat.js @@ -1,5 +1,19 @@ module.exports = { - template: require('../views/chat.html') + template: require('../views/chat.html'), + + data: function() { + return { + message: '' + } + }, + + methods: { + submitChat: function(e) { + e.preventDefault(); + + console.log(this.message); + } + } }; \ No newline at end of file diff --git a/site/client/app/views/chat.html b/site/client/app/views/chat.html index 84df707..fd43c44 100644 --- a/site/client/app/views/chat.html +++ b/site/client/app/views/chat.html @@ -11,7 +11,7 @@ blaa blaa - + \ No newline at end of file diff --git a/site/client/assets/sass/_modal.scss b/site/client/assets/sass/_modal.scss index 9487937..d857970 100644 --- a/site/client/assets/sass/_modal.scss +++ b/site/client/assets/sass/_modal.scss @@ -75,6 +75,7 @@ text-align: center; color: darken(#8798ac, 30%); cursor: pointer; + text-transform: uppercase; @include transition();