Image editing complete.

master
Ben Burlingham 9 years ago
parent fb6155a30d
commit dbabb98481
  1. 2
      controllers/board/troggle.controller.js
  2. 1
      package.json
  3. BIN
      raw/muncher-mini.xcf
  4. BIN
      raw/muncher.xcf
  5. BIN
      raw/title.xcf
  6. BIN
      raw/troggle.xcf
  7. BIN
      res/muncher-mini.png
  8. BIN
      res/muncher.png
  9. BIN
      res/title.png
  10. BIN
      res/troggle.png
  11. 2
      sass/board/grid.scss
  12. 4
      sass/board/message.scss
  13. 5
      sass/board/muncher.scss
  14. 2
      sass/board/scorebar.scss
  15. 17
      sass/board/troggle.scss
  16. 5
      sass/options/options.scss
  17. 5
      sass/reset.scss
  18. 6
      webpack.config.js

@ -72,7 +72,7 @@ const TroggleCtrl = {
getMoveCoords(currX, currY) { getMoveCoords(currX, currY) {
// Randomize movement with boolean flags. Aggression can be controlled here. // 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 moveAlongXAxis = Boolean(Math.random() > 0.5);
const moveInPositiveDirection = Boolean(Math.random() > 0.5); const moveInPositiveDirection = Boolean(Math.random() > 0.5);

@ -17,6 +17,7 @@
"css-loader": "^0.23.1", "css-loader": "^0.23.1",
"express": "^4.13.4", "express": "^4.13.4",
"extract-text-webpack-plugin": "^1.0.1", "extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.8.5",
"immutable": "^3.8.0", "immutable": "^3.8.0",
"jsx-loader": "^0.13.2", "jsx-loader": "^0.13.2",
"node-sass": "^3.4.2", "node-sass": "^3.4.2",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 960 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

@ -7,7 +7,7 @@
.cell { .cell {
border:1px solid purple; border:1px solid purple;
font-size:12px; font-size:14px;
height:100px; height:100px;
line-height:100px; line-height:100px;
position:absolute; position:absolute;

@ -1,6 +1,6 @@
.message { .message {
background:#fff; background:#000;
border:1px solid #000; border:1px solid #fff;
cursor: default; cursor: default;
font-size:14px; font-size:14px;
line-height:40px; line-height:40px;

@ -1,10 +1,7 @@
.muncher { .muncher {
$bg: aqua; background: url('../../res/muncher.png');
background: $bg;
height:100px; height:100px;
margin-top:110px; margin-top:110px;
opacity: 0.5;
position:absolute; position:absolute;
width:100px; width:100px;

@ -32,7 +32,7 @@
} }
.life { .life {
background:lime; background:url('../../res/muncher-mini.png');
display:inline-block; display:inline-block;
height:30px; height:30px;
margin-left:5px; margin-left:5px;

@ -7,15 +7,12 @@
top:110px; top:110px;
width:600px; width:600px;
z-index:0; z-index:0;
}
.troggle {
$bg: crimson;
background: $bg; .troggle {
height:100px; background: url('../../res/troggle.png');
opacity: 0.5; height:100px;
position:absolute; position:absolute;
transition:left 0.3s, top 0.3s; transition:left 0.3s, top 0.3s;
width:100px; width:100px;
}
} }

@ -18,7 +18,7 @@
} }
.option { .option {
border:1px solid #444; border:1px solid #fff;
height:50px; height:50px;
line-height:50px; line-height:50px;
margin:5px auto; margin:5px auto;
@ -27,6 +27,7 @@
} }
.selected { .selected {
background:rgba(17, 250, 87, 0.5); background:#0d0;
border-color:#0d0;
} }
} }

@ -1,6 +1,11 @@
* { * {
box-sizing:border-box; box-sizing:border-box;
color:#fff;
font-family:Emulogic; font-family:Emulogic;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
body {
background:#000;
}

@ -1,7 +1,7 @@
var ExtractTextPlugin = require('extract-text-webpack-plugin'); var ExtractTextPlugin = require('extract-text-webpack-plugin');
module.exports = { module.exports = {
entry: './index.js', entry: './index.js',
module: { module: {
loaders: [ loaders: [
@ -17,6 +17,10 @@ module.exports = {
test: /\.scss$/, test: /\.scss$/,
include: __dirname + '/sass', include: __dirname + '/sass',
loader: ExtractTextPlugin.extract('css!sass') loader: ExtractTextPlugin.extract('css!sass')
},
{
test: /\.png$/,
loader: "file?name=[path][name].[ext]"
} }
] ]
}, },

Loading…
Cancel
Save