From 5970a423c55e1a85a04829f99c340add10504966 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Fri, 23 Mar 2018 15:14:34 -0400 Subject: [PATCH 01/23] What --- .vscode/launch.json | 18 ++++++++++++++++++ app.ts | 12 ++++++++++++ tsconfig.json | 12 ++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 .vscode/launch.json create mode 100644 app.ts create mode 100644 tsconfig.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..9e0a25b6 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,18 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Launch Program", + "program": "${workspaceFolder}/app.ts", + "preLaunchTask": "tsc: build - tsconfig.json", + "outFiles": [ + "${workspaceFolder}/js/**/*.js" + ] + } + ] +} \ No newline at end of file diff --git a/app.ts b/app.ts new file mode 100644 index 00000000..15f8fedc --- /dev/null +++ b/app.ts @@ -0,0 +1,12 @@ +class Casino { + greeting: string; + constructor (message: string) { + this.greeting = message; + } + greet() { + return "Hello, " + this.greeting; + } + showGreeting() { + return "Greeting: " + this.greeting; + } +} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 00000000..874bfeee --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,12 @@ +{ + "compilerOptions": { + "target": "es5", + "noImplicitAny": false, + "sourceMap": true, + "watch": true, + "outDir": "js" + }, + "files": [ + "app.ts" + ] + } \ No newline at end of file From b78ea0087507f5092c5a2c411374d56e7c98a605 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Fri, 23 Mar 2018 15:24:44 -0400 Subject: [PATCH 02/23] Oh boy --- .vscode/launch.json | 44 ++++++++++++++++++++++++++++++++++++++++++++ app.js | 12 ++++++++++++ app.ts | 18 +++++++----------- 3 files changed, 63 insertions(+), 11 deletions(-) create mode 100644 app.js diff --git a/.vscode/launch.json b/.vscode/launch.json index 9e0a25b6..252a2274 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,6 +4,50 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Launch Program", + "program": "${workspaceFolder}/app.js" + }, + { + "type": "node", + "request": "launch", + "name": "Gulp task", + "program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js", + "args": [ + "task" + ] + }, + { + "type": "node", + "request": "launch", + "name": "Electron Main", + "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", + "program": "${workspaceFolder}/main.js", + "protocol": "legacy" + }, + { + "type": "node", + "request": "attach", + "name": "Attach to Remote", + "address": "TCP/IP address of process to be debugged", + "port": 9229, + "localRoot": "${workspaceFolder}", + "remoteRoot": "Absolute path to the remote directory containing the program" + }, + { + "type": "node", + "request": "attach", + "name": "Attach by Process ID", + "processId": "${command:PickProcess}" + }, + { + "type": "node", + "request": "attach", + "name": "Attach", + "port": 9229 + }, { "type": "node", "request": "launch", diff --git a/app.js b/app.js new file mode 100644 index 00000000..15c75212 --- /dev/null +++ b/app.js @@ -0,0 +1,12 @@ +var Casino = /** @class */ (function () { + function Casino(message) { + this.greeting = message; + } + Casino.prototype.greet = function () { + return "Hello, " + this.greeting; + }; + Casino.prototype.showGreeting = function () { + return "Greeting: " + this.greeting; + }; + return Casino; +}()); diff --git a/app.ts b/app.ts index 15f8fedc..b37a2960 100644 --- a/app.ts +++ b/app.ts @@ -1,12 +1,8 @@ -class Casino { - greeting: string; - constructor (message: string) { - this.greeting = message; +class Startup { + public static main(): number { + console.log('Hello World'); + return 0; } - greet() { - return "Hello, " + this.greeting; - } - showGreeting() { - return "Greeting: " + this.greeting; - } -} \ No newline at end of file +} + +Startup.main(); \ No newline at end of file From 9278c725c2d9064a649155776f4af5acb76450b5 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Fri, 23 Mar 2018 15:37:55 -0400 Subject: [PATCH 03/23] Hello world --- app.js | 16 +++++++--------- app.ts | 3 ++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app.js b/app.js index 15c75212..15f28289 100644 --- a/app.js +++ b/app.js @@ -1,12 +1,10 @@ -var Casino = /** @class */ (function () { - function Casino(message) { - this.greeting = message; +var Startup = /** @class */ (function () { + function Startup() { } - Casino.prototype.greet = function () { - return "Hello, " + this.greeting; + Startup.main = function () { + console.log('Hello World'); + return 0; }; - Casino.prototype.showGreeting = function () { - return "Greeting: " + this.greeting; - }; - return Casino; + return Startup; }()); +Startup.main(); diff --git a/app.ts b/app.ts index b37a2960..399c16f3 100644 --- a/app.ts +++ b/app.ts @@ -1,6 +1,7 @@ class Startup { public static main(): number { - console.log('Hello World'); + var webElement = document.getElementById("display"); + webElement.innerText += "Hello World"; return 0; } } From 5ddd4ed2456c54c0b19ec18604ed1ab31b2a6914 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Fri, 23 Mar 2018 15:47:09 -0400 Subject: [PATCH 04/23] Nevermind --- .vscode/tasks.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .vscode/tasks.json diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..250affa3 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,18 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "type": "typescript", + "tsconfig": "tsconfig.json", + "problemMatcher": [ + "$tsc" + ], + "group": { + "kind": "build", + "isDefault": true + } + } + ] +} \ No newline at end of file From 14f59ac98b06dc39526d44ea785b5db2c43edc92 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Fri, 23 Mar 2018 15:48:56 -0400 Subject: [PATCH 05/23] Maybe --- app.js | 2 +- app.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index 15f28289..570a549e 100644 --- a/app.js +++ b/app.js @@ -7,4 +7,4 @@ var Startup = /** @class */ (function () { }; return Startup; }()); -Startup.main(); +Startup.main(); \ No newline at end of file diff --git a/app.ts b/app.ts index 399c16f3..909a41c3 100644 --- a/app.ts +++ b/app.ts @@ -2,7 +2,7 @@ class Startup { public static main(): number { var webElement = document.getElementById("display"); webElement.innerText += "Hello World"; - return 0; + return 1; } } From f5a60b2263d4ae8c8f05dd725c8d525b6c167ff5 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Fri, 23 Mar 2018 16:04:28 -0400 Subject: [PATCH 06/23] Might work lol --- app.js | 10 ---------- js/app.js | 12 ++++++++++++ js/app.js.map | 1 + tsconfig.json | 1 + 4 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 app.js create mode 100644 js/app.js create mode 100644 js/app.js.map diff --git a/app.js b/app.js deleted file mode 100644 index 570a549e..00000000 --- a/app.js +++ /dev/null @@ -1,10 +0,0 @@ -var Startup = /** @class */ (function () { - function Startup() { - } - Startup.main = function () { - console.log('Hello World'); - return 0; - }; - return Startup; -}()); -Startup.main(); \ No newline at end of file diff --git a/js/app.js b/js/app.js new file mode 100644 index 00000000..bc9cf0a7 --- /dev/null +++ b/js/app.js @@ -0,0 +1,12 @@ +var Startup = /** @class */ (function () { + function Startup() { + } + Startup.main = function () { + var webElement = document.getElementById("display"); + webElement.innerText += "Hello World"; + return 1; + }; + return Startup; +}()); +Startup.main(); +//# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map new file mode 100644 index 00000000..4263b874 --- /dev/null +++ b/js/app.js.map @@ -0,0 +1 @@ +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA;IAAA;IAMA,CAAC;IALiB,YAAI,GAAlB;QACI,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,UAAU,CAAC,SAAS,IAAI,aAAa,CAAC;QACtC,MAAM,CAAC,CAAC,CAAC;IACb,CAAC;IACL,cAAC;AAAD,CAAC,AAND,IAMC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC"} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 874bfeee..d0262167 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,6 +6,7 @@ "watch": true, "outDir": "js" }, + "compileOnSave": true, "files": [ "app.ts" ] From 9a0bc2e8e140e631297fd25f6ed6ab9bd95ee7d6 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Fri, 23 Mar 2018 16:13:18 -0400 Subject: [PATCH 07/23] Hello world running, CASINO TIME BABY --- app.ts | 3 +-- js/app.js | 1 - js/app.js.map | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app.ts b/app.ts index 909a41c3..acc13fbc 100644 --- a/app.ts +++ b/app.ts @@ -1,8 +1,7 @@ class Startup { - public static main(): number { + public static main(): void { var webElement = document.getElementById("display"); webElement.innerText += "Hello World"; - return 1; } } diff --git a/js/app.js b/js/app.js index bc9cf0a7..4bbb8a6f 100644 --- a/js/app.js +++ b/js/app.js @@ -4,7 +4,6 @@ var Startup = /** @class */ (function () { Startup.main = function () { var webElement = document.getElementById("display"); webElement.innerText += "Hello World"; - return 1; }; return Startup; }()); diff --git a/js/app.js.map b/js/app.js.map index 4263b874..3b33e7c6 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA;IAAA;IAMA,CAAC;IALiB,YAAI,GAAlB;QACI,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,UAAU,CAAC,SAAS,IAAI,aAAa,CAAC;QACtC,MAAM,CAAC,CAAC,CAAC;IACb,CAAC;IACL,cAAC;AAAD,CAAC,AAND,IAMC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA;IAAA;IAKA,CAAC;IAJiB,YAAI,GAAlB;QACI,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,UAAU,CAAC,SAAS,IAAI,aAAa,CAAC;IAC1C,CAAC;IACL,cAAC;AAAD,CAAC,AALD,IAKC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC"} \ No newline at end of file From 4170341678f15c969947120b21926d8856ee7cc8 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Fri, 23 Mar 2018 17:08:17 -0400 Subject: [PATCH 08/23] Input working --- app.ts | 14 +++++++++++++- index.html | 2 +- js/app.js | 8 +++++++- js/app.js.map | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app.ts b/app.ts index acc13fbc..93d6a0c9 100644 --- a/app.ts +++ b/app.ts @@ -1,7 +1,19 @@ class Startup { + public static main(): void { + + + var webElement = document.getElementById("display"); - webElement.innerText += "Hello World"; + var userInput = document.getElementById("user_input") + var button = document.getElementById("submitButton"); + + button.addEventListener("click", (e: Event) => addToDisplayText(userInput.value)) + + function addToDisplayText(text: string) { + webElement.innerText += '\n'; + webElement.innerText += text; + } } } diff --git a/index.html b/index.html index d2c3c254..e09aaf78 100644 --- a/index.html +++ b/index.html @@ -22,7 +22,7 @@

TypeScript Casino

- +
diff --git a/js/app.js b/js/app.js index 4bbb8a6f..0cab8f0e 100644 --- a/js/app.js +++ b/js/app.js @@ -3,7 +3,13 @@ var Startup = /** @class */ (function () { } Startup.main = function () { var webElement = document.getElementById("display"); - webElement.innerText += "Hello World"; + var userInput = document.getElementById("user_input"); + var button = document.getElementById("submitButton"); + button.addEventListener("click", function (e) { return addToDisplayText(userInput.value); }); + function addToDisplayText(text) { + webElement.innerText += '\n'; + webElement.innerText += text; + } }; return Startup; }()); diff --git a/js/app.js.map b/js/app.js.map index 3b33e7c6..16f96ca8 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA;IAAA;IAKA,CAAC;IAJiB,YAAI,GAAlB;QACI,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,UAAU,CAAC,SAAS,IAAI,aAAa,CAAC;IAC1C,CAAC;IACL,cAAC;AAAD,CAAC,AALD,IAKC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA;IAAA;IAiBA,CAAC;IAfiB,YAAI,GAAlB;QAII,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,SAAS,GAAqB,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAA;QACvE,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAErD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAK,OAAA,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAjC,CAAiC,CAAC,CAAA;QAEjF,0BAA0B,IAAY;YAClC,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;YAC7B,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;QACjC,CAAC;IACL,CAAC;IACL,cAAC;AAAD,CAAC,AAjBD,IAiBC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC"} \ No newline at end of file From f69fe7d73e643a586a95d3333d5b196fee869495 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Sat, 24 Mar 2018 16:32:40 -0400 Subject: [PATCH 09/23] Profile built --- app.ts | 25 ++++++++++++++++++------- js/app.js | 12 ++++++++++++ js/app.js.map | 2 +- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/app.ts b/app.ts index 93d6a0c9..ee2710d7 100644 --- a/app.ts +++ b/app.ts @@ -1,14 +1,11 @@ class Startup { - public static main(): void { - - - var webElement = document.getElementById("display"); - var userInput = document.getElementById("user_input") + var userInput = document.getElementById("user_input"); var button = document.getElementById("submitButton"); - button.addEventListener("click", (e: Event) => addToDisplayText(userInput.value)) + webElement.innerText += "Welcome to the worst casino you've ever seen!"; + button.addEventListener("click", (e: Event) => addToDisplayText(userInput.value)); function addToDisplayText(text: string) { webElement.innerText += '\n'; @@ -17,4 +14,18 @@ class Startup { } } -Startup.main(); \ No newline at end of file +Startup.main(); + +class Profile { + id: number = 1; + name: string; + balance: number; + constructor(name: string, balance: number) { + this.name = name; + this.balance = balance; + } + public getBalance(){ + return this.balance; + } +} + diff --git a/js/app.js b/js/app.js index 0cab8f0e..2b814e8e 100644 --- a/js/app.js +++ b/js/app.js @@ -5,6 +5,7 @@ var Startup = /** @class */ (function () { var webElement = document.getElementById("display"); var userInput = document.getElementById("user_input"); var button = document.getElementById("submitButton"); + webElement.innerText += "Welcome to the worst casino you've ever seen!"; button.addEventListener("click", function (e) { return addToDisplayText(userInput.value); }); function addToDisplayText(text) { webElement.innerText += '\n'; @@ -14,4 +15,15 @@ var Startup = /** @class */ (function () { return Startup; }()); Startup.main(); +var Profile = /** @class */ (function () { + function Profile(name, balance) { + this.id = 1; + this.name = name; + this.balance = balance; + } + Profile.prototype.getBalance = function () { + return this.balance; + }; + return Profile; +}()); //# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map index 16f96ca8..d5680ea0 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA;IAAA;IAiBA,CAAC;IAfiB,YAAI,GAAlB;QAII,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,SAAS,GAAqB,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAA;QACvE,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAErD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAK,OAAA,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAjC,CAAiC,CAAC,CAAA;QAEjF,0BAA0B,IAAY;YAClC,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;YAC7B,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;QACjC,CAAC;IACL,CAAC;IACL,cAAC;AAAD,CAAC,AAjBD,IAiBC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA;IAAA;IAcA,CAAC;IAbiB,YAAI,GAAlB;QACI,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,SAAS,GAAqB,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACxE,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAErD,UAAU,CAAC,SAAS,IAAI,+CAA+C,CAAC;QACxE,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAK,OAAA,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAjC,CAAiC,CAAC,CAAC;QAElF,0BAA0B,IAAY;YAClC,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;YAC7B,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;QACjC,CAAC;IACL,CAAC;IACL,cAAC;AAAD,CAAC,AAdD,IAcC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC;AAEf;IAII,iBAAY,IAAY,EAAE,OAAe;QAHzC,OAAE,GAAW,CAAC,CAAC;QAIX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IACM,4BAAU,GAAjB;QACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACL,cAAC;AAAD,CAAC,AAXD,IAWC"} \ No newline at end of file From ae5d377be832d3ccf8ced350699e53276d0e3226 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Sat, 24 Mar 2018 16:55:45 -0400 Subject: [PATCH 10/23] Interfaces --- app.ts | 12 ++++++++++++ js/app.js | 5 +++++ js/app.js.map | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app.ts b/app.ts index ee2710d7..8ed03353 100644 --- a/app.ts +++ b/app.ts @@ -29,3 +29,15 @@ class Profile { } } +interface GameInterface { + start(); + end(); +} + +interface GamblingInterface { + bet(); +} + +class SlotMachine { + +} \ No newline at end of file diff --git a/js/app.js b/js/app.js index 2b814e8e..ebef3ca5 100644 --- a/js/app.js +++ b/js/app.js @@ -26,4 +26,9 @@ var Profile = /** @class */ (function () { }; return Profile; }()); +var SlotMachine = /** @class */ (function () { + function SlotMachine() { + } + return SlotMachine; +}()); //# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map index d5680ea0..9ca4ad96 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA;IAAA;IAcA,CAAC;IAbiB,YAAI,GAAlB;QACI,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,SAAS,GAAqB,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACxE,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAErD,UAAU,CAAC,SAAS,IAAI,+CAA+C,CAAC;QACxE,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAK,OAAA,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAjC,CAAiC,CAAC,CAAC;QAElF,0BAA0B,IAAY;YAClC,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;YAC7B,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;QACjC,CAAC;IACL,CAAC;IACL,cAAC;AAAD,CAAC,AAdD,IAcC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC;AAEf;IAII,iBAAY,IAAY,EAAE,OAAe;QAHzC,OAAE,GAAW,CAAC,CAAC;QAIX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IACM,4BAAU,GAAjB;QACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACL,cAAC;AAAD,CAAC,AAXD,IAWC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA;IAAA;IAcA,CAAC;IAbiB,YAAI,GAAlB;QACI,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,SAAS,GAAqB,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACxE,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAErD,UAAU,CAAC,SAAS,IAAI,+CAA+C,CAAC;QACxE,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAK,OAAA,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAjC,CAAiC,CAAC,CAAC;QAElF,0BAA0B,IAAY;YAClC,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;YAC7B,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;QACjC,CAAC;IACL,CAAC;IACL,cAAC;AAAD,CAAC,AAdD,IAcC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC;AAEf;IAII,iBAAY,IAAY,EAAE,OAAe;QAHzC,OAAE,GAAW,CAAC,CAAC;QAIX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IACM,4BAAU,GAAjB;QACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACL,cAAC;AAAD,CAAC,AAXD,IAWC;AAWD;IAAA;IAEA,CAAC;IAAD,kBAAC;AAAD,CAAC,AAFD,IAEC"} \ No newline at end of file From 092e0141d78c65f1377366bac838f2c6e184db2e Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Sat, 24 Mar 2018 18:46:22 -0400 Subject: [PATCH 11/23] Slotmachine started --- app.ts | 45 +++++++++++++++++++++++++++------------------ js/app.js | 5 +++++ js/app.js.map | 2 +- 3 files changed, 33 insertions(+), 19 deletions(-) diff --git a/app.ts b/app.ts index 8ed03353..f72e8e63 100644 --- a/app.ts +++ b/app.ts @@ -1,25 +1,28 @@ +var webWindow = document.getElementById("display"); +var userInput = document.getElementById("user_input"); +var button = document.getElementById("submitButton"); + +webWindow.innerText += "Welcome to the worst casino you've ever seen!"; + +function addToDisplayText(text: string) { + webWindow.innerText += '\n'; + webWindow.innerText += text; +} + class Startup { public static main(): void { - var webElement = document.getElementById("display"); - var userInput = document.getElementById("user_input"); - var button = document.getElementById("submitButton"); + // var webWindow = document.getElementById("display"); + // var userInput = document.getElementById("user_input"); + // var button = document.getElementById("submitButton"); - webElement.innerText += "Welcome to the worst casino you've ever seen!"; button.addEventListener("click", (e: Event) => addToDisplayText(userInput.value)); - - function addToDisplayText(text: string) { - webElement.innerText += '\n'; - webElement.innerText += text; - } } } -Startup.main(); - class Profile { - id: number = 1; - name: string; - balance: number; + private id: number = 1; + private name: string; + private balance: number; constructor(name: string, balance: number) { this.name = name; this.balance = balance; @@ -31,13 +34,19 @@ class Profile { interface GameInterface { start(); - end(); } interface GamblingInterface { bet(); } -class SlotMachine { - -} \ No newline at end of file +class SlotMachine implements GameInterface{ + start() { + var firstReel = Math.floor(Math.random() * 5) + 1; + var secondReel = Math.floor(Math.random() * 5) + 1; + var thirdReel = Math.floor(Math.random() * 5) + 1; + // Implement gambling interface and add betting too + } +} + +Startup.main(); \ No newline at end of file diff --git a/js/app.js b/js/app.js index ebef3ca5..eaf7ca28 100644 --- a/js/app.js +++ b/js/app.js @@ -31,4 +31,9 @@ var SlotMachine = /** @class */ (function () { } return SlotMachine; }()); +var SlotMachineReel = /** @class */ (function () { + function SlotMachineReel() { + } + return SlotMachineReel; +}()); //# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map index 9ca4ad96..e5ec6e11 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA;IAAA;IAcA,CAAC;IAbiB,YAAI,GAAlB;QACI,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,SAAS,GAAqB,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACxE,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAErD,UAAU,CAAC,SAAS,IAAI,+CAA+C,CAAC;QACxE,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAK,OAAA,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAjC,CAAiC,CAAC,CAAC;QAElF,0BAA0B,IAAY;YAClC,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;YAC7B,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;QACjC,CAAC;IACL,CAAC;IACL,cAAC;AAAD,CAAC,AAdD,IAcC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC;AAEf;IAII,iBAAY,IAAY,EAAE,OAAe;QAHzC,OAAE,GAAW,CAAC,CAAC;QAIX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IACM,4BAAU,GAAjB;QACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACL,cAAC;AAAD,CAAC,AAXD,IAWC;AAWD;IAAA;IAEA,CAAC;IAAD,kBAAC;AAAD,CAAC,AAFD,IAEC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA;IAAA;IAcA,CAAC;IAbiB,YAAI,GAAlB;QACI,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,SAAS,GAAqB,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACxE,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAErD,UAAU,CAAC,SAAS,IAAI,+CAA+C,CAAC;QACxE,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAK,OAAA,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAjC,CAAiC,CAAC,CAAC;QAElF,0BAA0B,IAAY;YAClC,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;YAC7B,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;QACjC,CAAC;IACL,CAAC;IACL,cAAC;AAAD,CAAC,AAdD,IAcC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC;AAEf;IAII,iBAAY,IAAY,EAAE,OAAe;QAHzC,OAAE,GAAW,CAAC,CAAC;QAIX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IACM,4BAAU,GAAjB;QACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACL,cAAC;AAAD,CAAC,AAXD,IAWC;AAWD;IAAA;IAEA,CAAC;IAAD,kBAAC;AAAD,CAAC,AAFD,IAEC;AAED;IAAA;IAEA,CAAC;IAAD,sBAAC;AAAD,CAAC,AAFD,IAEC"} \ No newline at end of file From fb284e8fee38ed04318d64259c0e475f0430bbd0 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Sat, 24 Mar 2018 18:47:59 -0400 Subject: [PATCH 12/23] js file updated with last commit --- js/app.js | 32 ++++++++++++++++++-------------- js/app.js.map | 2 +- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/js/app.js b/js/app.js index eaf7ca28..b182593c 100644 --- a/js/app.js +++ b/js/app.js @@ -1,20 +1,22 @@ +var webWindow = document.getElementById("display"); +var userInput = document.getElementById("user_input"); +var button = document.getElementById("submitButton"); +webWindow.innerText += "Welcome to the worst casino you've ever seen!"; +function addToDisplayText(text) { + webWindow.innerText += '\n'; + webWindow.innerText += text; +} var Startup = /** @class */ (function () { function Startup() { } Startup.main = function () { - var webElement = document.getElementById("display"); - var userInput = document.getElementById("user_input"); - var button = document.getElementById("submitButton"); - webElement.innerText += "Welcome to the worst casino you've ever seen!"; + // var webWindow = document.getElementById("display"); + // var userInput = document.getElementById("user_input"); + // var button = document.getElementById("submitButton"); button.addEventListener("click", function (e) { return addToDisplayText(userInput.value); }); - function addToDisplayText(text) { - webElement.innerText += '\n'; - webElement.innerText += text; - } }; return Startup; }()); -Startup.main(); var Profile = /** @class */ (function () { function Profile(name, balance) { this.id = 1; @@ -29,11 +31,13 @@ var Profile = /** @class */ (function () { var SlotMachine = /** @class */ (function () { function SlotMachine() { } + SlotMachine.prototype.start = function () { + var firstReel = Math.floor(Math.random() * 5) + 1; + var secondReel = Math.floor(Math.random() * 5) + 1; + var thirdReel = Math.floor(Math.random() * 5) + 1; + // Implement gambling interface and add betting too + }; return SlotMachine; }()); -var SlotMachineReel = /** @class */ (function () { - function SlotMachineReel() { - } - return SlotMachineReel; -}()); +Startup.main(); //# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map index e5ec6e11..9236a584 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA;IAAA;IAcA,CAAC;IAbiB,YAAI,GAAlB;QACI,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,SAAS,GAAqB,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACxE,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAErD,UAAU,CAAC,SAAS,IAAI,+CAA+C,CAAC;QACxE,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAK,OAAA,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAjC,CAAiC,CAAC,CAAC;QAElF,0BAA0B,IAAY;YAClC,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;YAC7B,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC;QACjC,CAAC;IACL,CAAC;IACL,cAAC;AAAD,CAAC,AAdD,IAcC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC;AAEf;IAII,iBAAY,IAAY,EAAE,OAAe;QAHzC,OAAE,GAAW,CAAC,CAAC;QAIX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IACM,4BAAU,GAAjB;QACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACL,cAAC;AAAD,CAAC,AAXD,IAWC;AAWD;IAAA;IAEA,CAAC;IAAD,kBAAC;AAAD,CAAC,AAFD,IAEC;AAED;IAAA;IAEA,CAAC;IAAD,sBAAC;AAAD,CAAC,AAFD,IAEC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA,IAAI,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;AACnD,IAAI,SAAS,GAAqB,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;AACxE,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;AAErD,SAAS,CAAC,SAAS,IAAI,+CAA+C,CAAC;AAEvE,0BAA0B,IAAY;IAClC,SAAS,CAAC,SAAS,IAAI,IAAI,CAAC;IAC5B,SAAS,CAAC,SAAS,IAAI,IAAI,CAAC;AAChC,CAAC;AAED;IAAA;IAQA,CAAC;IAPiB,YAAI,GAAlB;QACI,sDAAsD;QACtD,2EAA2E;QAC3E,wDAAwD;QAExD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAK,OAAA,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAjC,CAAiC,CAAC,CAAC;IACtF,CAAC;IACL,cAAC;AAAD,CAAC,AARD,IAQC;AAED;IAII,iBAAY,IAAY,EAAE,OAAe;QAHjC,OAAE,GAAW,CAAC,CAAC;QAInB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IACM,4BAAU,GAAjB;QACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACL,cAAC;AAAD,CAAC,AAXD,IAWC;AAUD;IAAA;IAOA,CAAC;IANG,2BAAK,GAAL;QACI,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QAClD,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QAClD,mDAAmD;IACvD,CAAC;IACL,kBAAC;AAAD,CAAC,AAPD,IAOC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC"} \ No newline at end of file From b0ad1fd9225d69a53b3a9594c1ceb45d128f5d7b Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Sun, 25 Mar 2018 14:07:43 -0400 Subject: [PATCH 13/23] Structure progress, casino built, just need slot machine logic --- app.ts | 75 ++++++++++++++++++++++++++++++++---------------- js/app.js | 79 +++++++++++++++++++++++++++++++++++++-------------- js/app.js.map | 2 +- 3 files changed, 109 insertions(+), 47 deletions(-) diff --git a/app.ts b/app.ts index f72e8e63..f8c628b8 100644 --- a/app.ts +++ b/app.ts @@ -2,34 +2,25 @@ var webWindow = document.getElementById("display"); var userInput = document.getElementById("user_input"); var button = document.getElementById("submitButton"); -webWindow.innerText += "Welcome to the worst casino you've ever seen!"; - function addToDisplayText(text: string) { webWindow.innerText += '\n'; webWindow.innerText += text; } -class Startup { - public static main(): void { - // var webWindow = document.getElementById("display"); - // var userInput = document.getElementById("user_input"); - // var button = document.getElementById("submitButton"); - - button.addEventListener("click", (e: Event) => addToDisplayText(userInput.value)); - } -} - class Profile { private id: number = 1; - private name: string; - private balance: number; - constructor(name: string, balance: number) { - this.name = name; - this.balance = balance; - } - public getBalance(){ + private _name: string = null; + private _balance: number = 0; + constructor() {} + get balance(): number { return this.balance; } + set balance(theBalance: number) { + this.balance = theBalance; + } + set name(theName: string) { + this._name = theName; + } } interface GameInterface { @@ -40,13 +31,49 @@ interface GamblingInterface { bet(); } +// Player initialization had to be removed to here because this language is bleh +var player:Profile = null; + class SlotMachine implements GameInterface{ start() { - var firstReel = Math.floor(Math.random() * 5) + 1; - var secondReel = Math.floor(Math.random() * 5) + 1; - var thirdReel = Math.floor(Math.random() * 5) + 1; - // Implement gambling interface and add betting too + addToDisplayText("Welcome to slot machine! Win triple your bet for 3 matching numbers or 1.5x for 2."); + while(true) { + var currentInput; + var currentBalance = player.balance; + addToDisplayText("You have $" + currentBalance + ". Enter a number less than your total to bet."); + addToDisplayText("Enter anything else to quit."); + button.addEventListener("click", (e: Event) => currentInput = userInput.value); + addToDisplayText("You entered " + currentInput + "."); + if ((!isNaN(currentInput)) && (currentInput <= currentBalance)) { + addToDisplayText("Valid input! Spinning reels..."); + var firstReel = Math.floor(Math.random() * 5) + 1; + var secondReel = Math.floor(Math.random() * 5) + 1; + var thirdReel = Math.floor(Math.random() * 5) + 1; + + // More logic please + } else { + addToDisplayText("Invalid input! Bye-bye!"); + break; + } + } + } +} + +class Startup { + public static main(): void { + addToDisplayText("Please enter your name:"); + button.addEventListener("click", (e: Event) => player.name = userInput.value); + addToDisplayText("Please enter how many dollary doos you want to start with:") + button.addEventListener("click", (e: Event) => player.balance = +userInput.value); + addToDisplayText("My girlfriend cut her hand and we spent all weekend in the hospital so there is only a slot machine lol"); + } } -Startup.main(); \ No newline at end of file +webWindow.innerText = "Welcome to the worst casino you've ever seen!"; +Startup.main(); + + + +// Here for posterity +// button.addEventListener("click", (e: Event) => addToDisplayText(userInput.value)); diff --git a/js/app.js b/js/app.js index b182593c..5640be84 100644 --- a/js/app.js +++ b/js/app.js @@ -1,43 +1,78 @@ var webWindow = document.getElementById("display"); var userInput = document.getElementById("user_input"); var button = document.getElementById("submitButton"); -webWindow.innerText += "Welcome to the worst casino you've ever seen!"; function addToDisplayText(text) { webWindow.innerText += '\n'; webWindow.innerText += text; } -var Startup = /** @class */ (function () { - function Startup() { - } - Startup.main = function () { - // var webWindow = document.getElementById("display"); - // var userInput = document.getElementById("user_input"); - // var button = document.getElementById("submitButton"); - button.addEventListener("click", function (e) { return addToDisplayText(userInput.value); }); - }; - return Startup; -}()); var Profile = /** @class */ (function () { - function Profile(name, balance) { + function Profile() { this.id = 1; - this.name = name; - this.balance = balance; + this._name = null; + this._balance = 0; } - Profile.prototype.getBalance = function () { - return this.balance; - }; + Object.defineProperty(Profile.prototype, "balance", { + get: function () { + return this.balance; + }, + set: function (theBalance) { + this.balance = theBalance; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Profile.prototype, "name", { + set: function (theName) { + this._name = theName; + }, + enumerable: true, + configurable: true + }); return Profile; }()); +// Player initialization had to be removed to here because this language is bleh +var player = null; var SlotMachine = /** @class */ (function () { function SlotMachine() { } SlotMachine.prototype.start = function () { - var firstReel = Math.floor(Math.random() * 5) + 1; - var secondReel = Math.floor(Math.random() * 5) + 1; - var thirdReel = Math.floor(Math.random() * 5) + 1; - // Implement gambling interface and add betting too + addToDisplayText("Welcome to slot machine! Win triple your bet for 3 matching numbers or 1.5x for 2."); + while (true) { + var currentInput; + var currentBalance = player.balance; + addToDisplayText("You have $" + currentBalance + ". Enter a number less than your total to bet."); + addToDisplayText("Enter anything else to quit."); + button.addEventListener("click", function (e) { return currentInput = userInput.value; }); + addToDisplayText("You entered " + currentInput + "."); + if ((!isNaN(currentInput)) && (currentInput <= currentBalance)) { + addToDisplayText("Valid input! Spinning reels..."); + var firstReel = Math.floor(Math.random() * 5) + 1; + var secondReel = Math.floor(Math.random() * 5) + 1; + var thirdReel = Math.floor(Math.random() * 5) + 1; + // More logic please + } + else { + addToDisplayText("Invalid input! Bye-bye!"); + break; + } + } }; return SlotMachine; }()); +var Startup = /** @class */ (function () { + function Startup() { + } + Startup.main = function () { + addToDisplayText("Please enter your name:"); + button.addEventListener("click", function (e) { return player.name = userInput.value; }); + addToDisplayText("Please enter how many dollary doos you want to start with:"); + button.addEventListener("click", function (e) { return player.balance = +userInput.value; }); + addToDisplayText("My girlfriend cut her hand and we spent all weekend in the hospital so there is only a slot machine lol"); + }; + return Startup; +}()); +webWindow.innerText = "Welcome to the worst casino you've ever seen!"; Startup.main(); +// Here for posterity +// button.addEventListener("click", (e: Event) => addToDisplayText(userInput.value)); //# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map index 9236a584..3b0e100d 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA,IAAI,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;AACnD,IAAI,SAAS,GAAqB,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;AACxE,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;AAErD,SAAS,CAAC,SAAS,IAAI,+CAA+C,CAAC;AAEvE,0BAA0B,IAAY;IAClC,SAAS,CAAC,SAAS,IAAI,IAAI,CAAC;IAC5B,SAAS,CAAC,SAAS,IAAI,IAAI,CAAC;AAChC,CAAC;AAED;IAAA;IAQA,CAAC;IAPiB,YAAI,GAAlB;QACI,sDAAsD;QACtD,2EAA2E;QAC3E,wDAAwD;QAExD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAK,OAAA,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAjC,CAAiC,CAAC,CAAC;IACtF,CAAC;IACL,cAAC;AAAD,CAAC,AARD,IAQC;AAED;IAII,iBAAY,IAAY,EAAE,OAAe;QAHjC,OAAE,GAAW,CAAC,CAAC;QAInB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IACM,4BAAU,GAAjB;QACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACL,cAAC;AAAD,CAAC,AAXD,IAWC;AAUD;IAAA;IAOA,CAAC;IANG,2BAAK,GAAL;QACI,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QAClD,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QAClD,mDAAmD;IACvD,CAAC;IACL,kBAAC;AAAD,CAAC,AAPD,IAOC;AAED,OAAO,CAAC,IAAI,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file From d985f6914e1f0c3b4c460700102d34af43006b43 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Sun, 25 Mar 2018 14:32:07 -0400 Subject: [PATCH 14/23] Might work lol --- app.ts | 25 +++++++++++++++++++------ js/app.js | 23 ++++++++++++++++++++--- js/app.js.map | 2 +- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/app.ts b/app.ts index f8c628b8..1d63896f 100644 --- a/app.ts +++ b/app.ts @@ -34,23 +34,36 @@ interface GamblingInterface { // Player initialization had to be removed to here because this language is bleh var player:Profile = null; -class SlotMachine implements GameInterface{ - start() { +class SlotMachine { + public static start() { addToDisplayText("Welcome to slot machine! Win triple your bet for 3 matching numbers or 1.5x for 2."); while(true) { var currentInput; var currentBalance = player.balance; + var payout; addToDisplayText("You have $" + currentBalance + ". Enter a number less than your total to bet."); addToDisplayText("Enter anything else to quit."); - button.addEventListener("click", (e: Event) => currentInput = userInput.value); + button.addEventListener("click", (e: Event) => currentInput = +userInput.value); + player.balance = currentBalance - currentInput; addToDisplayText("You entered " + currentInput + "."); if ((!isNaN(currentInput)) && (currentInput <= currentBalance)) { addToDisplayText("Valid input! Spinning reels..."); var firstReel = Math.floor(Math.random() * 5) + 1; var secondReel = Math.floor(Math.random() * 5) + 1; var thirdReel = Math.floor(Math.random() * 5) + 1; - - // More logic please + addToDisplayText("|| " + firstReel + " | " + secondReel + " | " + thirdReel + " ||"); + if (firstReel == secondReel && thirdReel) { + payout = currentInput * 3; + addToDisplayText("JACKPOT!!") + } else if (((firstReel == secondReel) && (firstReel != thirdReel)) || + ((firstReel == thirdReel) && (firstReel != secondReel)) || + ((secondReel == thirdReel) && (secondReel != firstReel))) { + payout = Math.floor(currentInput * 1.5); + } else { + payout = 0; + } + addToDisplayText("Your payout: $" + payout); + player.balance += payout; } else { addToDisplayText("Invalid input! Bye-bye!"); break; @@ -66,12 +79,12 @@ class Startup { addToDisplayText("Please enter how many dollary doos you want to start with:") button.addEventListener("click", (e: Event) => player.balance = +userInput.value); addToDisplayText("My girlfriend cut her hand and we spent all weekend in the hospital so there is only a slot machine lol"); - } } webWindow.innerText = "Welcome to the worst casino you've ever seen!"; Startup.main(); +SlotMachine.start(); diff --git a/js/app.js b/js/app.js index 5640be84..dfdddc6e 100644 --- a/js/app.js +++ b/js/app.js @@ -35,21 +35,37 @@ var player = null; var SlotMachine = /** @class */ (function () { function SlotMachine() { } - SlotMachine.prototype.start = function () { + SlotMachine.start = function () { addToDisplayText("Welcome to slot machine! Win triple your bet for 3 matching numbers or 1.5x for 2."); while (true) { var currentInput; var currentBalance = player.balance; + var payout; addToDisplayText("You have $" + currentBalance + ". Enter a number less than your total to bet."); addToDisplayText("Enter anything else to quit."); - button.addEventListener("click", function (e) { return currentInput = userInput.value; }); + button.addEventListener("click", function (e) { return currentInput = +userInput.value; }); + player.balance = currentBalance - currentInput; addToDisplayText("You entered " + currentInput + "."); if ((!isNaN(currentInput)) && (currentInput <= currentBalance)) { addToDisplayText("Valid input! Spinning reels..."); var firstReel = Math.floor(Math.random() * 5) + 1; var secondReel = Math.floor(Math.random() * 5) + 1; var thirdReel = Math.floor(Math.random() * 5) + 1; - // More logic please + addToDisplayText("|| " + firstReel + " | " + secondReel + " | " + thirdReel + " ||"); + if (firstReel == secondReel && thirdReel) { + payout = currentInput * 3; + addToDisplayText("JACKPOT!!"); + } + else if (((firstReel == secondReel) && (firstReel != thirdReel)) || + ((firstReel == thirdReel) && (firstReel != secondReel)) || + ((secondReel == thirdReel) && (secondReel != firstReel))) { + payout = Math.floor(currentInput * 1.5); + } + else { + payout = 0; + } + addToDisplayText("Your payout: $" + payout); + player.balance += payout; } else { addToDisplayText("Invalid input! Bye-bye!"); @@ -73,6 +89,7 @@ var Startup = /** @class */ (function () { }()); webWindow.innerText = "Welcome to the worst casino you've ever seen!"; Startup.main(); +SlotMachine.start(); // Here for posterity // button.addEventListener("click", (e: Event) => addToDisplayText(userInput.value)); //# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map index 3b0e100d..4030c7be 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file From 975cf1d1b7b85d81a0550b734c9fe928ec65a4f2 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Sun, 25 Mar 2018 14:36:45 -0400 Subject: [PATCH 15/23] Rudeness removed --- app.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/app.ts b/app.ts index 1d63896f..1d43420b 100644 --- a/app.ts +++ b/app.ts @@ -78,7 +78,6 @@ class Startup { button.addEventListener("click", (e: Event) => player.name = userInput.value); addToDisplayText("Please enter how many dollary doos you want to start with:") button.addEventListener("click", (e: Event) => player.balance = +userInput.value); - addToDisplayText("My girlfriend cut her hand and we spent all weekend in the hospital so there is only a slot machine lol"); } } From 7cf724abff42c526dc7d248917e8c9fb713f7b28 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Sun, 25 Mar 2018 14:38:19 -0400 Subject: [PATCH 16/23] js updated --- js/app.js | 1 - js/app.js.map | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/js/app.js b/js/app.js index dfdddc6e..ac2a3f73 100644 --- a/js/app.js +++ b/js/app.js @@ -83,7 +83,6 @@ var Startup = /** @class */ (function () { button.addEventListener("click", function (e) { return player.name = userInput.value; }); addToDisplayText("Please enter how many dollary doos you want to start with:"); button.addEventListener("click", function (e) { return player.balance = +userInput.value; }); - addToDisplayText("My girlfriend cut her hand and we spent all weekend in the hospital so there is only a slot machine lol"); }; return Startup; }()); diff --git a/js/app.js.map b/js/app.js.map index 4030c7be..c9146110 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file From 3d6da26717b1c9f2987a6748fd966a3f6a9c2115 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Sun, 25 Mar 2018 15:11:07 -0400 Subject: [PATCH 17/23] testing input wait loop --- app.ts | 25 +++++++++++++++++++++++-- js/app.js | 22 ++++++++++++++++++++-- js/app.js.map | 2 +- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/app.ts b/app.ts index 1d43420b..7a5533fd 100644 --- a/app.ts +++ b/app.ts @@ -7,6 +7,24 @@ function addToDisplayText(text: string) { webWindow.innerText += text; } +function waitAndGetUserInputString(): string { + var theNumber; + while (theNumber = null) { + button.addEventListener("click", (e: Event) => theNumber = userInput.value); + } + button.removeEventListener("click", (e: Event) => userInput); + return theNumber; +} + +function waitAndGetUserInputNumber(): number { + var theNumber; + while (theNumber = null) { + button.addEventListener("click", (e: Event) => theNumber = +userInput.value); + } + button.removeEventListener("click", (e: Event) => userInput); + return theNumber; +} + class Profile { private id: number = 1; private _name: string = null; @@ -23,6 +41,7 @@ class Profile { } } +// sigh interface GameInterface { start(); } @@ -75,9 +94,11 @@ class SlotMachine { class Startup { public static main(): void { addToDisplayText("Please enter your name:"); - button.addEventListener("click", (e: Event) => player.name = userInput.value); + player.name = waitAndGetUserInputString(); + // button.addEventListener("click", (e: Event) => player.name = userInput.value); addToDisplayText("Please enter how many dollary doos you want to start with:") - button.addEventListener("click", (e: Event) => player.balance = +userInput.value); + player.balance = waitAndGetUserInputNumber(); + // button.addEventListener("click", (e: Event) => player.balance = +userInput.value); } } diff --git a/js/app.js b/js/app.js index ac2a3f73..fca1344e 100644 --- a/js/app.js +++ b/js/app.js @@ -5,6 +5,22 @@ function addToDisplayText(text) { webWindow.innerText += '\n'; webWindow.innerText += text; } +function waitAndGetUserInputString() { + var theNumber; + while (theNumber = null) { + button.addEventListener("click", function (e) { return theNumber = userInput.value; }); + } + button.removeEventListener("click", function (e) { return userInput; }); + return theNumber; +} +function waitAndGetUserInputNumber() { + var theNumber; + while (theNumber = null) { + button.addEventListener("click", function (e) { return theNumber = +userInput.value; }); + } + button.removeEventListener("click", function (e) { return userInput; }); + return theNumber; +} var Profile = /** @class */ (function () { function Profile() { this.id = 1; @@ -80,9 +96,11 @@ var Startup = /** @class */ (function () { } Startup.main = function () { addToDisplayText("Please enter your name:"); - button.addEventListener("click", function (e) { return player.name = userInput.value; }); + player.name = waitAndGetUserInputString(); + // button.addEventListener("click", (e: Event) => player.name = userInput.value); addToDisplayText("Please enter how many dollary doos you want to start with:"); - button.addEventListener("click", function (e) { return player.balance = +userInput.value; }); + player.balance = waitAndGetUserInputNumber(); + // button.addEventListener("click", (e: Event) => player.balance = +userInput.value); }; return Startup; }()); diff --git a/js/app.js.map b/js/app.js.map index c9146110..69912657 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file From 403b8dda4d96971036efb6dc7fe2e2d138ecc792 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Sun, 25 Mar 2018 15:13:53 -0400 Subject: [PATCH 18/23] Test --- app.ts | 2 +- js/app.js | 2 +- js/app.js.map | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app.ts b/app.ts index 7a5533fd..b1ef5b3f 100644 --- a/app.ts +++ b/app.ts @@ -12,7 +12,7 @@ function waitAndGetUserInputString(): string { while (theNumber = null) { button.addEventListener("click", (e: Event) => theNumber = userInput.value); } - button.removeEventListener("click", (e: Event) => userInput); + button.removeEventListener("click", (e: Event) => userInput.value); return theNumber; } diff --git a/js/app.js b/js/app.js index fca1344e..ee65676c 100644 --- a/js/app.js +++ b/js/app.js @@ -10,7 +10,7 @@ function waitAndGetUserInputString() { while (theNumber = null) { button.addEventListener("click", function (e) { return theNumber = userInput.value; }); } - button.removeEventListener("click", function (e) { return userInput; }); + button.removeEventListener("click", function (e) { return userInput.value; }); return theNumber; } function waitAndGetUserInputNumber() { diff --git a/js/app.js.map b/js/app.js.map index 69912657..9eefafcd 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file From 16b6448d9e4e8194c0e914890a8eb33cc6894562 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Mon, 26 Mar 2018 08:10:09 -0400 Subject: [PATCH 19/23] Test --- app.ts | 4 ++-- js/app.js | 4 ++-- js/app.js.map | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app.ts b/app.ts index b1ef5b3f..50eab402 100644 --- a/app.ts +++ b/app.ts @@ -12,7 +12,7 @@ function waitAndGetUserInputString(): string { while (theNumber = null) { button.addEventListener("click", (e: Event) => theNumber = userInput.value); } - button.removeEventListener("click", (e: Event) => userInput.value); + button.removeEventListener("click", waitAndGetUserInputString); return theNumber; } @@ -21,7 +21,7 @@ function waitAndGetUserInputNumber(): number { while (theNumber = null) { button.addEventListener("click", (e: Event) => theNumber = +userInput.value); } - button.removeEventListener("click", (e: Event) => userInput); + button.removeEventListener("click", waitAndGetUserInputNumber); return theNumber; } diff --git a/js/app.js b/js/app.js index ee65676c..403e8d61 100644 --- a/js/app.js +++ b/js/app.js @@ -10,7 +10,7 @@ function waitAndGetUserInputString() { while (theNumber = null) { button.addEventListener("click", function (e) { return theNumber = userInput.value; }); } - button.removeEventListener("click", function (e) { return userInput.value; }); + button.removeEventListener("click", waitAndGetUserInputString); return theNumber; } function waitAndGetUserInputNumber() { @@ -18,7 +18,7 @@ function waitAndGetUserInputNumber() { while (theNumber = null) { button.addEventListener("click", function (e) { return theNumber = +userInput.value; }); } - button.removeEventListener("click", function (e) { return userInput; }); + button.removeEventListener("click", waitAndGetUserInputNumber); return theNumber; } var Profile = /** @class */ (function () { diff --git a/js/app.js.map b/js/app.js.map index 9eefafcd..2e5564d0 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file From 8ee62d95a89526d13fd11a3fd5c0fe60e8e2072c Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Mon, 26 Mar 2018 08:46:30 -0400 Subject: [PATCH 20/23] I'm an idiot --- app.ts | 14 ++++++++++---- js/app.js | 14 ++++++++++---- js/app.js.map | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/app.ts b/app.ts index 50eab402..8a50994f 100644 --- a/app.ts +++ b/app.ts @@ -9,8 +9,11 @@ function addToDisplayText(text: string) { function waitAndGetUserInputString(): string { var theNumber; - while (theNumber = null) { - button.addEventListener("click", (e: Event) => theNumber = userInput.value); + button.addEventListener("click", (e: Event) => theNumber = userInput.value); + while (theNumber == null) { + if (theNumber != null) { + break; + } } button.removeEventListener("click", waitAndGetUserInputString); return theNumber; @@ -18,8 +21,11 @@ function waitAndGetUserInputString(): string { function waitAndGetUserInputNumber(): number { var theNumber; - while (theNumber = null) { - button.addEventListener("click", (e: Event) => theNumber = +userInput.value); + button.addEventListener("click", (e: Event) => theNumber = +userInput.value); + while (theNumber == null) { + if (theNumber != null) { + break; + } } button.removeEventListener("click", waitAndGetUserInputNumber); return theNumber; diff --git a/js/app.js b/js/app.js index 403e8d61..4e9b2884 100644 --- a/js/app.js +++ b/js/app.js @@ -7,16 +7,22 @@ function addToDisplayText(text) { } function waitAndGetUserInputString() { var theNumber; - while (theNumber = null) { - button.addEventListener("click", function (e) { return theNumber = userInput.value; }); + button.addEventListener("click", function (e) { return theNumber = userInput.value; }); + while (theNumber == null) { + if (theNumber != null) { + break; + } } button.removeEventListener("click", waitAndGetUserInputString); return theNumber; } function waitAndGetUserInputNumber() { var theNumber; - while (theNumber = null) { - button.addEventListener("click", function (e) { return theNumber = +userInput.value; }); + button.addEventListener("click", function (e) { return theNumber = +userInput.value; }); + while (theNumber == null) { + if (theNumber != null) { + break; + } } button.removeEventListener("click", waitAndGetUserInputNumber); return theNumber; diff --git a/js/app.js.map b/js/app.js.map index 2e5564d0..f253d393 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file From 1b2baa346979489ee1fd2005bd7bcef138d9a466 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Mon, 26 Mar 2018 09:02:10 -0400 Subject: [PATCH 21/23] Changed button --- app.ts | 5 +++++ index.html | 2 +- js/app.js | 4 ++++ js/app.js.map | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app.ts b/app.ts index 8a50994f..d010bc39 100644 --- a/app.ts +++ b/app.ts @@ -1,12 +1,17 @@ var webWindow = document.getElementById("display"); var userInput = document.getElementById("user_input"); var button = document.getElementById("submitButton"); +var TEST_INPUT; function addToDisplayText(text: string) { webWindow.innerText += '\n'; webWindow.innerText += text; } +function EVENT_TO_INPUT() { + TEST_INPUT = userInput.value; +} + function waitAndGetUserInputString(): string { var theNumber; button.addEventListener("click", (e: Event) => theNumber = userInput.value); diff --git a/index.html b/index.html index e09aaf78..62d4bebc 100644 --- a/index.html +++ b/index.html @@ -22,7 +22,7 @@

TypeScript Casino

- +
diff --git a/js/app.js b/js/app.js index 4e9b2884..a6d467c6 100644 --- a/js/app.js +++ b/js/app.js @@ -1,10 +1,14 @@ var webWindow = document.getElementById("display"); var userInput = document.getElementById("user_input"); var button = document.getElementById("submitButton"); +var TEST_INPUT; function addToDisplayText(text) { webWindow.innerText += '\n'; webWindow.innerText += text; } +function EVENT_TO_INPUT() { + TEST_INPUT = userInput.value; +} function waitAndGetUserInputString() { var theNumber; button.addEventListener("click", function (e) { return theNumber = userInput.value; }); diff --git a/js/app.js.map b/js/app.js.map index f253d393..ffdc8781 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file From d52cfc0f8708e4ec02c14190f50c990344c7b873 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Mon, 26 Mar 2018 09:03:40 -0400 Subject: [PATCH 22/23] Test onclick --- app.ts | 4 ++-- js/app.js | 4 ++-- js/app.js.map | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app.ts b/app.ts index d010bc39..1bd8ef20 100644 --- a/app.ts +++ b/app.ts @@ -14,13 +14,13 @@ function EVENT_TO_INPUT() { function waitAndGetUserInputString(): string { var theNumber; - button.addEventListener("click", (e: Event) => theNumber = userInput.value); + button.addEventListener("onclick", (e: Event) => theNumber = userInput.value); while (theNumber == null) { if (theNumber != null) { break; } } - button.removeEventListener("click", waitAndGetUserInputString); + button.removeEventListener("onclick", waitAndGetUserInputString); return theNumber; } diff --git a/js/app.js b/js/app.js index a6d467c6..6ca8beb2 100644 --- a/js/app.js +++ b/js/app.js @@ -11,13 +11,13 @@ function EVENT_TO_INPUT() { } function waitAndGetUserInputString() { var theNumber; - button.addEventListener("click", function (e) { return theNumber = userInput.value; }); + button.addEventListener("onclick", function (e) { return theNumber = userInput.value; }); while (theNumber == null) { if (theNumber != null) { break; } } - button.removeEventListener("click", waitAndGetUserInputString); + button.removeEventListener("onclick", waitAndGetUserInputString); return theNumber; } function waitAndGetUserInputNumber() { diff --git a/js/app.js.map b/js/app.js.map index ffdc8781..884cfe84 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file From c7b13d018ec2f708c701edd0999eadc5dd232976 Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Mon, 26 Mar 2018 09:29:06 -0400 Subject: [PATCH 23/23] Eric's solution --- app.ts | 128 +++++++++++++++++++++++++++++--------------------- js/app.js | 126 +++++++++++++++++++++++++++++-------------------- js/app.js.map | 2 +- 3 files changed, 152 insertions(+), 104 deletions(-) diff --git a/app.ts b/app.ts index 1bd8ef20..cc55188e 100644 --- a/app.ts +++ b/app.ts @@ -1,40 +1,36 @@ -var webWindow = document.getElementById("display"); -var userInput = document.getElementById("user_input"); -var button = document.getElementById("submitButton"); -var TEST_INPUT; - -function addToDisplayText(text: string) { - webWindow.innerText += '\n'; - webWindow.innerText += text; -} +// var window = document.getElementById("display"); +// var userInput = document.getElementById("user_input"); +// var button = document.getElementById("submitButton"); +// var TEST_INPUT; -function EVENT_TO_INPUT() { - TEST_INPUT = userInput.value; -} +// function addToDisplayText(text: string) { +// window.innerText += '\n'; +// window.innerText += text; +// } -function waitAndGetUserInputString(): string { - var theNumber; - button.addEventListener("onclick", (e: Event) => theNumber = userInput.value); - while (theNumber == null) { - if (theNumber != null) { - break; - } - } - button.removeEventListener("onclick", waitAndGetUserInputString); - return theNumber; -} +// function waitAndGetUserInputString(): string { +// var theNumber; +// button.addEventListener("onclick", (e: Event) => theNumber = userInput.value); +// while (theNumber == null) { +// if (theNumber != null) { +// break; +// } +// } +// button.removeEventListener("onclick", waitAndGetUserInputString); +// return theNumber; +// } -function waitAndGetUserInputNumber(): number { - var theNumber; - button.addEventListener("click", (e: Event) => theNumber = +userInput.value); - while (theNumber == null) { - if (theNumber != null) { - break; - } - } - button.removeEventListener("click", waitAndGetUserInputNumber); - return theNumber; -} +// function waitAndGetUserInputNumber(): number { +// var theNumber; +// button.addEventListener("click", (e: Event) => theNumber = +userInput.value); +// while (theNumber == null) { +// if (theNumber != null) { +// break; +// } +// } +// button.removeEventListener("click", waitAndGetUserInputNumber); +// return theNumber; +// } class Profile { private id: number = 1; @@ -66,25 +62,25 @@ var player:Profile = null; class SlotMachine { public static start() { - addToDisplayText("Welcome to slot machine! Win triple your bet for 3 matching numbers or 1.5x for 2."); + UI.display("Welcome to slot machine! Win triple your bet for 3 matching numbers or 1.5x for 2."); while(true) { var currentInput; var currentBalance = player.balance; var payout; - addToDisplayText("You have $" + currentBalance + ". Enter a number less than your total to bet."); - addToDisplayText("Enter anything else to quit."); - button.addEventListener("click", (e: Event) => currentInput = +userInput.value); + UI.display("You have $" + currentBalance + ". Enter a number less than your total to bet."); + UI.display("Enter anything else to quit."); + currentInput = UI.lastInput; player.balance = currentBalance - currentInput; - addToDisplayText("You entered " + currentInput + "."); + UI.display("You entered " + currentInput + "."); if ((!isNaN(currentInput)) && (currentInput <= currentBalance)) { - addToDisplayText("Valid input! Spinning reels..."); + UI.display("Valid input! Spinning reels..."); var firstReel = Math.floor(Math.random() * 5) + 1; var secondReel = Math.floor(Math.random() * 5) + 1; var thirdReel = Math.floor(Math.random() * 5) + 1; - addToDisplayText("|| " + firstReel + " | " + secondReel + " | " + thirdReel + " ||"); + UI.display("|| " + firstReel + " | " + secondReel + " | " + thirdReel + " ||"); if (firstReel == secondReel && thirdReel) { payout = currentInput * 3; - addToDisplayText("JACKPOT!!") + UI.display("JACKPOT!!") } else if (((firstReel == secondReel) && (firstReel != thirdReel)) || ((firstReel == thirdReel) && (firstReel != secondReel)) || ((secondReel == thirdReel) && (secondReel != firstReel))) { @@ -92,10 +88,10 @@ class SlotMachine { } else { payout = 0; } - addToDisplayText("Your payout: $" + payout); + UI.display("Your payout: $" + payout); player.balance += payout; } else { - addToDisplayText("Invalid input! Bye-bye!"); + UI.display("Invalid input! Bye-bye!"); break; } } @@ -104,20 +100,46 @@ class SlotMachine { class Startup { public static main(): void { - addToDisplayText("Please enter your name:"); - player.name = waitAndGetUserInputString(); + UI.display("Welcome to the worst casino you've ever seen!"); + UI.display("Please enter your name:"); + player.name = UI.lastInput; // button.addEventListener("click", (e: Event) => player.name = userInput.value); - addToDisplayText("Please enter how many dollary doos you want to start with:") - player.balance = waitAndGetUserInputNumber(); + UI.display("Please enter how many dollary doos you want to start with:") + player.balance = UI.lastInput; // button.addEventListener("click", (e: Event) => player.balance = +userInput.value); } } -webWindow.innerText = "Welcome to the worst casino you've ever seen!"; -Startup.main(); -SlotMachine.start(); +class UI { + static userInput = document.getElementById("user_input"); + static window = document.getElementById('display'); + static button = document.getElementById('submit'); + static _lastInput: any; + private static _instance: UI; + + private constructor() { + UI.button.addEventListener("click", (e: Event) => { UI._lastInput = UI.userInput.value }); + UI.button.addEventListener("click", (e: Event) => { UI.userInput.value = '' }); + } + + static display(input: any): void { + this.window.innerText += input + '\n'; + } + + static clearScreen(): void { + this.window.innerText = ''; + } + public static get Instance(): UI { + return this._instance || (this._instance = new UI()); + } + public static get lastInput(): any { + return this._lastInput; + } -// Here for posterity -// button.addEventListener("click", (e: Event) => addToDisplayText(userInput.value)); +} + +const UIInstance = UI.Instance; +Startup.main(); +SlotMachine.start(); \ No newline at end of file diff --git a/js/app.js b/js/app.js index 6ca8beb2..f9e41e42 100644 --- a/js/app.js +++ b/js/app.js @@ -1,36 +1,33 @@ -var webWindow = document.getElementById("display"); -var userInput = document.getElementById("user_input"); -var button = document.getElementById("submitButton"); -var TEST_INPUT; -function addToDisplayText(text) { - webWindow.innerText += '\n'; - webWindow.innerText += text; -} -function EVENT_TO_INPUT() { - TEST_INPUT = userInput.value; -} -function waitAndGetUserInputString() { - var theNumber; - button.addEventListener("onclick", function (e) { return theNumber = userInput.value; }); - while (theNumber == null) { - if (theNumber != null) { - break; - } - } - button.removeEventListener("onclick", waitAndGetUserInputString); - return theNumber; -} -function waitAndGetUserInputNumber() { - var theNumber; - button.addEventListener("click", function (e) { return theNumber = +userInput.value; }); - while (theNumber == null) { - if (theNumber != null) { - break; - } - } - button.removeEventListener("click", waitAndGetUserInputNumber); - return theNumber; -} +// var window = document.getElementById("display"); +// var userInput = document.getElementById("user_input"); +// var button = document.getElementById("submitButton"); +// var TEST_INPUT; +// function addToDisplayText(text: string) { +// window.innerText += '\n'; +// window.innerText += text; +// } +// function waitAndGetUserInputString(): string { +// var theNumber; +// button.addEventListener("onclick", (e: Event) => theNumber = userInput.value); +// while (theNumber == null) { +// if (theNumber != null) { +// break; +// } +// } +// button.removeEventListener("onclick", waitAndGetUserInputString); +// return theNumber; +// } +// function waitAndGetUserInputNumber(): number { +// var theNumber; +// button.addEventListener("click", (e: Event) => theNumber = +userInput.value); +// while (theNumber == null) { +// if (theNumber != null) { +// break; +// } +// } +// button.removeEventListener("click", waitAndGetUserInputNumber); +// return theNumber; +// } var Profile = /** @class */ (function () { function Profile() { this.id = 1; @@ -62,25 +59,25 @@ var SlotMachine = /** @class */ (function () { function SlotMachine() { } SlotMachine.start = function () { - addToDisplayText("Welcome to slot machine! Win triple your bet for 3 matching numbers or 1.5x for 2."); + UI.display("Welcome to slot machine! Win triple your bet for 3 matching numbers or 1.5x for 2."); while (true) { var currentInput; var currentBalance = player.balance; var payout; - addToDisplayText("You have $" + currentBalance + ". Enter a number less than your total to bet."); - addToDisplayText("Enter anything else to quit."); - button.addEventListener("click", function (e) { return currentInput = +userInput.value; }); + UI.display("You have $" + currentBalance + ". Enter a number less than your total to bet."); + UI.display("Enter anything else to quit."); + currentInput = UI.lastInput; player.balance = currentBalance - currentInput; - addToDisplayText("You entered " + currentInput + "."); + UI.display("You entered " + currentInput + "."); if ((!isNaN(currentInput)) && (currentInput <= currentBalance)) { - addToDisplayText("Valid input! Spinning reels..."); + UI.display("Valid input! Spinning reels..."); var firstReel = Math.floor(Math.random() * 5) + 1; var secondReel = Math.floor(Math.random() * 5) + 1; var thirdReel = Math.floor(Math.random() * 5) + 1; - addToDisplayText("|| " + firstReel + " | " + secondReel + " | " + thirdReel + " ||"); + UI.display("|| " + firstReel + " | " + secondReel + " | " + thirdReel + " ||"); if (firstReel == secondReel && thirdReel) { payout = currentInput * 3; - addToDisplayText("JACKPOT!!"); + UI.display("JACKPOT!!"); } else if (((firstReel == secondReel) && (firstReel != thirdReel)) || ((firstReel == thirdReel) && (firstReel != secondReel)) || @@ -90,11 +87,11 @@ var SlotMachine = /** @class */ (function () { else { payout = 0; } - addToDisplayText("Your payout: $" + payout); + UI.display("Your payout: $" + payout); player.balance += payout; } else { - addToDisplayText("Invalid input! Bye-bye!"); + UI.display("Invalid input! Bye-bye!"); break; } } @@ -105,18 +102,47 @@ var Startup = /** @class */ (function () { function Startup() { } Startup.main = function () { - addToDisplayText("Please enter your name:"); - player.name = waitAndGetUserInputString(); + UI.display("Welcome to the worst casino you've ever seen!"); + UI.display("Please enter your name:"); + player.name = UI.lastInput; // button.addEventListener("click", (e: Event) => player.name = userInput.value); - addToDisplayText("Please enter how many dollary doos you want to start with:"); - player.balance = waitAndGetUserInputNumber(); + UI.display("Please enter how many dollary doos you want to start with:"); + player.balance = UI.lastInput; // button.addEventListener("click", (e: Event) => player.balance = +userInput.value); }; return Startup; }()); -webWindow.innerText = "Welcome to the worst casino you've ever seen!"; +var UI = /** @class */ (function () { + function UI() { + UI.button.addEventListener("click", function (e) { UI._lastInput = UI.userInput.value; }); + UI.button.addEventListener("click", function (e) { UI.userInput.value = ''; }); + } + UI.display = function (input) { + this.window.innerText += input + '\n'; + }; + UI.clearScreen = function () { + this.window.innerText = ''; + }; + Object.defineProperty(UI, "Instance", { + get: function () { + return this._instance || (this._instance = new UI()); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(UI, "lastInput", { + get: function () { + return this._lastInput; + }, + enumerable: true, + configurable: true + }); + UI.userInput = document.getElementById("user_input"); + UI.window = document.getElementById('display'); + UI.button = document.getElementById('submit'); + return UI; +}()); +var UIInstance = UI.Instance; Startup.main(); SlotMachine.start(); -// Here for posterity -// button.addEventListener("click", (e: Event) => addToDisplayText(userInput.value)); //# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map index 884cfe84..2c5670a0 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../app.ts"],"names":[],"mappings":"AAAA,mDAAmD;AACnD,2EAA2E;AAC3E,wDAAwD;AACxD,kBAAkB;AAElB,4CAA4C;AAC5C,gCAAgC;AAChC,gCAAgC;AAChC,IAAI;AAEJ,iDAAiD;AACjD,qBAAqB;AACrB,qFAAqF;AACrF,kCAAkC;AAClC,mCAAmC;AACnC,qBAAqB;AACrB,YAAY;AACZ,QAAQ;AACR,wEAAwE;AACxE,wBAAwB;AACxB,IAAI;AAEJ,iDAAiD;AACjD,qBAAqB;AACrB,oFAAoF;AACpF,kCAAkC;AAClC,mCAAmC;AACnC,qBAAqB;AACrB,YAAY;AACZ,QAAQ;AACR,sEAAsE;AACtE,wBAAwB;AACxB,IAAI;AAEJ;IAII;QAHQ,OAAE,GAAW,CAAC,CAAC;QACf,UAAK,GAAW,IAAI,CAAC;QACrB,aAAQ,GAAW,CAAC,CAAC;IACd,CAAC;IAChB,sBAAI,4BAAO;aAAX;YACI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;QACxB,CAAC;aACD,UAAY,UAAkB;YAC1B,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;QAC9B,CAAC;;;OAHA;IAID,sBAAI,yBAAI;aAAR,UAAS,OAAe;YACpB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;QACzB,CAAC;;;OAAA;IACL,cAAC;AAAD,CAAC,AAdD,IAcC;AAWD,gFAAgF;AAChF,IAAI,MAAM,GAAW,IAAI,CAAC;AAE1B;IAAA;IAoCA,CAAC;IAnCiB,iBAAK,GAAnB;QACI,EAAE,CAAC,OAAO,CAAC,oFAAoF,CAAC,CAAC;QACjG,OAAM,IAAI,EAAE,CAAC;YACT,IAAI,YAAY,CAAC;YACjB,IAAI,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC;YACpC,IAAI,MAAM,CAAC;YACX,EAAE,CAAC,OAAO,CAAC,YAAY,GAAG,cAAc,GAAG,+CAA+C,CAAC,CAAC;YAC5F,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;YAC3C,YAAY,GAAG,EAAE,CAAC,SAAS,CAAC;YAC5B,MAAM,CAAC,OAAO,GAAG,cAAc,GAAG,YAAY,CAAC;YAC/C,EAAE,CAAC,OAAO,CAAC,cAAc,GAAG,YAAY,GAAG,GAAG,CAAC,CAAC;YAChD,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,YAAY,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC;gBAC7D,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;gBAC7C,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBAClD,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBACnD,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBAClD,EAAE,CAAC,OAAO,CAAC,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,KAAK,GAAG,SAAS,GAAG,KAAK,CAAC,CAAC;gBAC/E,EAAE,CAAC,CAAC,SAAS,IAAI,UAAU,IAAI,SAAS,CAAC,CAAC,CAAC;oBACvC,MAAM,GAAG,YAAY,GAAG,CAAC,CAAC;oBAC1B,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;gBAC3B,CAAC;gBAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC;oBACtD,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,IAAI,UAAU,CAAC,CAAC;oBACvD,CAAC,CAAC,UAAU,IAAI,SAAS,CAAC,IAAI,CAAC,UAAU,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;oBACvD,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,GAAG,CAAC,CAAC;gBAC5C,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,MAAM,GAAG,CAAC,CAAC;gBACf,CAAC;gBACb,EAAE,CAAC,OAAO,CAAC,gBAAgB,GAAG,MAAM,CAAC,CAAC;gBACtC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC;YAC7B,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;gBACtC,KAAK,CAAC;YACV,CAAC;QACL,CAAC;IACL,CAAC;IACL,kBAAC;AAAD,CAAC,AApCD,IAoCC;AAED;IAAA;IAUA,CAAC;IATiB,YAAI,GAAlB;QACI,EAAE,CAAC,OAAO,CAAC,+CAA+C,CAAC,CAAC;QAC5D,EAAE,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC;QAC3B,iFAAiF;QACjF,EAAE,CAAC,OAAO,CAAC,4DAA4D,CAAC,CAAA;QACxE,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC;QAC9B,qFAAqF;IACzF,CAAC;IACL,cAAC;AAAD,CAAC,AAVD,IAUC;AAED;IAOI;QACI,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAO,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAA,CAAC,CAAC,CAAC,CAAC;QAC1F,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAO,EAAE,CAAC,SAAS,CAAC,KAAK,GAAG,EAAE,CAAA,CAAC,CAAC,CAAC,CAAC;IACnF,CAAC;IAEM,UAAO,GAAd,UAAe,KAAU;QACrB,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,KAAK,GAAG,IAAI,CAAC;IAC1C,CAAC;IAEM,cAAW,GAAlB;QACI,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC;IAC/B,CAAC;IAED,sBAAkB,cAAQ;aAA1B;YACI,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC;QACzD,CAAC;;;OAAA;IAED,sBAAkB,eAAS;aAA3B;YACI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;QAC3B,CAAC;;;OAAA;IAzBM,YAAS,GAAqB,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IACpE,SAAM,GAAmB,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IAC5D,SAAM,GAAmB,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAyBtE,SAAC;CAAA,AA5BD,IA4BC;AAED,IAAM,UAAU,GAAG,EAAE,CAAC,QAAQ,CAAC;AAC/B,OAAO,CAAC,IAAI,EAAE,CAAC;AACf,WAAW,CAAC,KAAK,EAAE,CAAC"} \ No newline at end of file