diff --git a/controllers/board/troggle.controller.js b/controllers/board/troggle.controller.js index c68cd10..fdb5aeb 100644 --- a/controllers/board/troggle.controller.js +++ b/controllers/board/troggle.controller.js @@ -72,7 +72,7 @@ const TroggleCtrl = { getMoveCoords(currX, currY) { // Randomize movement with boolean flags. Aggression can be controlled here. - const moveToAttack = Boolean(Math.random() > 0.35); + const moveToAttack = Boolean(Math.random() > 0.25); const moveAlongXAxis = Boolean(Math.random() > 0.5); const moveInPositiveDirection = Boolean(Math.random() > 0.5); diff --git a/package.json b/package.json index 06db016..0b727f6 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "css-loader": "^0.23.1", "express": "^4.13.4", "extract-text-webpack-plugin": "^1.0.1", + "file-loader": "^0.8.5", "immutable": "^3.8.0", "jsx-loader": "^0.13.2", "node-sass": "^3.4.2", diff --git a/raw/muncher-mini.xcf b/raw/muncher-mini.xcf new file mode 100644 index 0000000..eede24c Binary files /dev/null and b/raw/muncher-mini.xcf differ diff --git a/raw/muncher.xcf b/raw/muncher.xcf new file mode 100644 index 0000000..a29dd67 Binary files /dev/null and b/raw/muncher.xcf differ diff --git a/raw/title.xcf b/raw/title.xcf index 8526c1d..9079f6f 100644 Binary files a/raw/title.xcf and b/raw/title.xcf differ diff --git a/raw/troggle.xcf b/raw/troggle.xcf new file mode 100644 index 0000000..e92274d Binary files /dev/null and b/raw/troggle.xcf differ diff --git a/res/muncher-mini.png b/res/muncher-mini.png new file mode 100644 index 0000000..4628a08 Binary files /dev/null and b/res/muncher-mini.png differ diff --git a/res/muncher.png b/res/muncher.png new file mode 100644 index 0000000..4dcb15c Binary files /dev/null and b/res/muncher.png differ diff --git a/res/title.png b/res/title.png index cd64153..9f1f023 100644 Binary files a/res/title.png and b/res/title.png differ diff --git a/res/troggle.png b/res/troggle.png new file mode 100644 index 0000000..b0750db Binary files /dev/null and b/res/troggle.png differ diff --git a/sass/board/grid.scss b/sass/board/grid.scss index a7f3fa1..2c30603 100644 --- a/sass/board/grid.scss +++ b/sass/board/grid.scss @@ -7,7 +7,7 @@ .cell { border:1px solid purple; - font-size:12px; + font-size:14px; height:100px; line-height:100px; position:absolute; diff --git a/sass/board/message.scss b/sass/board/message.scss index b8d8c0f..899b171 100644 --- a/sass/board/message.scss +++ b/sass/board/message.scss @@ -1,6 +1,6 @@ .message { - background:#fff; - border:1px solid #000; + background:#000; + border:1px solid #fff; cursor: default; font-size:14px; line-height:40px; diff --git a/sass/board/muncher.scss b/sass/board/muncher.scss index 17f8292..0be4ff6 100644 --- a/sass/board/muncher.scss +++ b/sass/board/muncher.scss @@ -1,10 +1,7 @@ .muncher { - $bg: aqua; - - background: $bg; + background: url('../../res/muncher.png'); height:100px; margin-top:110px; - opacity: 0.5; position:absolute; width:100px; diff --git a/sass/board/scorebar.scss b/sass/board/scorebar.scss index f21c372..db0048b 100644 --- a/sass/board/scorebar.scss +++ b/sass/board/scorebar.scss @@ -32,7 +32,7 @@ } .life { - background:lime; + background:url('../../res/muncher-mini.png'); display:inline-block; height:30px; margin-left:5px; diff --git a/sass/board/troggle.scss b/sass/board/troggle.scss index 6c7dd9c..36e69a6 100644 --- a/sass/board/troggle.scss +++ b/sass/board/troggle.scss @@ -7,15 +7,12 @@ top:110px; width:600px; z-index:0; -} - -.troggle { - $bg: crimson; - background: $bg; - height:100px; - opacity: 0.5; - position:absolute; - transition:left 0.3s, top 0.3s; - width:100px; + .troggle { + background: url('../../res/troggle.png'); + height:100px; + position:absolute; + transition:left 0.3s, top 0.3s; + width:100px; + } } diff --git a/sass/options/options.scss b/sass/options/options.scss index 030385b..78801fd 100644 --- a/sass/options/options.scss +++ b/sass/options/options.scss @@ -18,7 +18,7 @@ } .option { - border:1px solid #444; + border:1px solid #fff; height:50px; line-height:50px; margin:5px auto; @@ -27,6 +27,7 @@ } .selected { - background:rgba(17, 250, 87, 0.5); + background:#0d0; + border-color:#0d0; } } diff --git a/sass/reset.scss b/sass/reset.scss index 8c02784..3f9a360 100644 --- a/sass/reset.scss +++ b/sass/reset.scss @@ -1,6 +1,11 @@ * { box-sizing:border-box; + color:#fff; font-family:Emulogic; margin: 0; padding: 0; } + +body { + background:#000; +} diff --git a/webpack.config.js b/webpack.config.js index 295e670..e9b68b9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,7 +1,7 @@ var ExtractTextPlugin = require('extract-text-webpack-plugin'); module.exports = { - entry: './index.js', + entry: './index.js', module: { loaders: [ @@ -17,6 +17,10 @@ module.exports = { test: /\.scss$/, include: __dirname + '/sass', loader: ExtractTextPlugin.extract('css!sass') + }, + { + test: /\.png$/, + loader: "file?name=[path][name].[ext]" } ] },