Skip to content

Commit

Permalink
cose
Browse files Browse the repository at this point in the history
  • Loading branch information
happy-salmon-salm committed Nov 26, 2017
1 parent 1356a9d commit 8c00993
Show file tree
Hide file tree
Showing 7 changed files with 129 additions and 37 deletions.
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
.eslintrc.js

\.vscode/

.node_modules/
node_modules/
91 changes: 91 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
// JSHint Default Configuration File (as on JSHint website)
// See http://jshint.com/docs/ for more details

"maxerr" : 50, // {int} Maximum error before stopping

// Enforcing
"bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
"camelcase" : false, // true: Identifiers must be in camelCase
"curly" : true, // true: Require {} for every new block or scope
"eqeqeq" : true, // true: Require triple equals (===) for comparison
"forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
"freeze" : true, // true: prohibits overwriting prototypes of native objects such as Array, Date etc.
"immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
"latedef" : false, // true: Require variables/functions to be defined before being used
"newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
"noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
"noempty" : true, // true: Prohibit use of empty blocks
"nonbsp" : true, // true: Prohibit "non-breaking whitespace" characters.
"nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
"plusplus" : false, // true: Prohibit use of `++` and `--`
"quotmark" : false, // Quotation mark consistency:
// false : do nothing (default)
// true : ensure whatever is used is consistent
// "single" : require single quotes
// "double" : require double quotes
"undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
"unused" : true, // Unused variables:
// true : all variables, last function parameter
// "vars" : all variables only
// "strict" : all variables, all function parameters
"strict" : true, // true: Requires all functions run in ES5 Strict Mode
"maxparams" : false, // {int} Max number of formal params allowed per function
"maxdepth" : false, // {int} Max depth of nested blocks (within functions)
"maxstatements" : false, // {int} Max number statements per function
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function
"maxlen" : false, // {int} Max number of characters per line
"varstmt" : false, // true: Disallow any var statements. Only `let` and `const` are allowed.

// Relaxing
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
"boss" : false, // true: Tolerate assignments where comparisons would be expected
"debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
"eqnull" : false, // true: Tolerate use of `== null`
"esversion" : 6, // {int} Specify the ECMAScript version to which the code must adhere.
"moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
// (ex: `for each`, multiple try/catch, function expression…)
"evil" : false, // true: Tolerate use of `eval` and `new Function()`
"expr" : false, // true: Tolerate `ExpressionStatement` as Programs
"funcscope" : false, // true: Tolerate defining variables inside control statements
"globalstrict" : true, // true: Allow global "use strict" (also enables 'strict')
"iterator" : false, // true: Tolerate using the `__iterator__` property
"lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
"laxbreak" : false, // true: Tolerate possibly unsafe line breakings
"laxcomma" : false, // true: Tolerate comma-first style coding
"loopfunc" : false, // true: Tolerate functions being defined in loops
"multistr" : false, // true: Tolerate multi-line strings
"noyield" : false, // true: Tolerate generator functions with no yield statement in them.
"notypeof" : false, // true: Tolerate invalid typeof operator values
"proto" : false, // true: Tolerate using the `__proto__` property
"scripturl" : false, // true: Tolerate script-targeted URLs
"shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
"validthis" : false, // true: Tolerate using this in a non-constructor function

// Environments
"browser" : true, // Web Browser (window, document, etc)
"browserify" : false, // Browserify (node.js code in the browser)
"couch" : false, // CouchDB
"devel" : true, // Development/debugging (alert, confirm, etc)
"dojo" : false, // Dojo Toolkit
"jasmine" : false, // Jasmine
"jquery" : true, // jQuery
"mocha" : true, // Mocha
"mootools" : false, // MooTools
"node" : true, // Node.js
"nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
"phantom" : false, // PhantomJS
"prototypejs" : false, // Prototype and Scriptaculous
"qunit" : false, // QUnit
"rhino" : false, // Rhino
"shelljs" : false, // ShellJS
"typed" : false, // Globals for typed array constructions
"worker" : false, // Web Workers
"wsh" : false, // Windows Scripting Host
"yui" : false, // Yahoo User Interface

// Custom Globals
"globals" : {} // additional predefined global variables
}
19 changes: 8 additions & 11 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ body {

/*
#status {
font-weight: bold;
float: right;
font-weight: bold;
float: right;
}
*/

.bold {
font-weight: bold;
}
Expand Down Expand Up @@ -46,23 +45,21 @@ body {
}

.column.left {
float:left;
float: left;
}

.column.right {
float:right;
float: right;
}

.countdown {
/*
-webkit-transition: all 5s;
-moz-transition: all 5s;
-o-transition: all 5s;
transition: all 5s;
transition-timing-function : linear;*/
-o-transition: all 5s;
transition: all 5s;
transition-timing-function : linear;
color: #f33;
font-size: 21px;

}

.cost {
Expand All @@ -81,6 +78,6 @@ button {
color: initial;
}

.ascii-art{
.ascii-art {
white-space: pre;
}
14 changes: 8 additions & 6 deletions js/main.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
const {app, BrowserWindow} = require('electron')
const path = require('path')
const url = require('url')
'use strict';

const {app, BrowserWindow} = require('electron');
const path = require('path');
const url = require('url');

// Keep a global reference of the window object, if you don't, the window will
// be closed automatically when the JavaScript object is garbage collected.
let win
let win;

function createWindow () {
// Create the browser window.
win = new BrowserWindow({width: 1280, height: 768})
win = new BrowserWindow({width: 1280, height: 768});

// and load the index.html of the app.
win.loadURL(url.format({
Expand All @@ -18,7 +20,7 @@ function createWindow () {
}))

// Open the DevTools.
win.webContents.openDevTools()
win.webContents.openDevTools();

// Emitted when the window is closed.
win.on('closed', () => {
Expand Down
8 changes: 3 additions & 5 deletions js/notifications.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

var Notifications = {
GAIN_CSS: "award",
LOSS_CSS: "cost",
Expand Down Expand Up @@ -26,8 +28,4 @@ var Notifications = {
notifications[0].remove();
}
}




}
};
6 changes: 4 additions & 2 deletions js/renderer.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
'use strict';

function onPayTaxes() {
if (World.gIsGameOver) {
return;
}
let t = -Math.floor((World.money * 0.9 * Math.random() + 50));
Notifications.create("You have paid " + Math.abs(t) + " in taxes", t);
World.setMoney(t);
World.addMoney(t);

}

Expand All @@ -14,7 +16,7 @@ function onWork() {
}
let wage = Math.floor(1000 * Math.random());
Notifications.create("You have gained " + wage, wage);
World.setMoney(wage);
World.addMoney(wage);
World.syncUI();
}

Expand Down
24 changes: 14 additions & 10 deletions js/world.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
'use strict';

var World = {
DAYS_TO_PAY: 10,
money: 0,
gametime: 0,
gRefreshInterval: null,
gIsGameOver: false,
gRefreshInterval: null,
moneyDiv: document.getElementById("money"),
timeDiv: document.getElementById("time"),
moneyDiv: document.getElementById('money'),
timeDiv: document.getElementById('time'),
init: function () {
$("#bnRestart").hide();
$('#bnRestart').hide();

this.gametime = this.DAYS_TO_PAY;
Notifications.init();
Expand All @@ -22,16 +23,19 @@ var World = {
World.gameloop();
}, 1000);
},
setMoney: function (amount) {
addMoney: function (amount) {
this.money += amount;
},
setMoney: function (amount) {
this.money = amount;
},
syncUI: function () {
this.moneyDiv.innerText = "Money: " + this.money;
this.moneyDiv.innerText = 'Money: ' + this.money;
this.timeDiv.innerText = this.gametime;
if(this.timeDiv.innerText >= 0 && this.timeDiv.innerText <= 5){
this.timeDiv.className = "countdown";
this.timeDiv.className = 'countdown';
} else {
this.timeDiv.className = "";
this.timeDiv.className = '';
}
},
gameloop: function () {
Expand All @@ -52,8 +56,8 @@ var World = {
if (World.money <= 0) {
this.gIsGameOver = true;
clearInterval(this.gRefreshInterval);
Notifications.create("GAME OVER :(");
$("#bnRestart").show();
Notifications.create('GAME OVER :(');
$('#bnRestart').show();
}
}
}

0 comments on commit 8c00993

Please sign in to comment.