fixes: #9

backend/src/constants/index.ts

@@ -0,0 +1,14 @@
+import { pad } from "./padding.ts";
+
+
+export const WIDTH = 800;
+export const HEIGHT = 800;
+export const ballRadius = 7;
+export const obstacleRadius = 4;
+
+export const gravity = pad(0.6);
+export const horizontalFriction = 0.4;
+export const verticalFriction = 0.8;
+
+export const sinkWidth = 36;
+export const NUM_SINKS = 17;

backend/src/constants/padding.ts

@@ -0,0 +1,9 @@
+export const DECIMAL_MULTIPLIER = 10000;
+
+export function pad(n: number) {
+    return n * DECIMAL_MULTIPLIER;
+}
+
+export function unpad(n: number) {
+    return Math.floor(n / DECIMAL_MULTIPLIER);
+}

backend/src/index.ts

@@ -2,13 +2,16 @@
 import express from "express";
 import { outcomes } from "./outcomes";
 import cors from "cors";
+import { getObstacles } from "./utils/game";
+import { pad, unpad } from "./constants/padding";
+import { WIDTH, ballRadius, horizontalFriction, verticalFriction } from "./constants";
 
 const app = express();
 app.use(cors())
 
 const TOTAL_DROPS = 16;
 
-const MULTIPLIERS: {[ key: number ]: number} = {
+const MULTIPLIERS: { [key: number]: number } = {
     0: 16,
     1: 9,
     2: 2,
@@ -27,27 +30,64 @@ const MULTIPLIERS: {[ key: number ]: number} = {
     15: 9,
     16: 16
 }
+app.post("/stake", (req, res) => {
 
+})
 app.post("/game", (req, res) => {
     let outcome = 0;
-    const pattern = []
-    for (let i = 0; i < TOTAL_DROPS; i++) {
-        if (Math.random() > 0.5) {
-            pattern.push("R")
-            outcome++;
-        } else {
-            pattern.push("L")
-        }
-    }
+    const pattern: Array<'L' | 'R'> = []
+    const obstacles = getObstacles()
+
+    let possiblieOutcomes = outcomes[outcome];
+    const startX = possiblieOutcomes[Math.floor(Math.random() * possiblieOutcomes.length)] || pad(WIDTH / 2 + 13)
+    const startY = pad(50)
+    let x = startX
+    let y = startY
+    let vx = 0
+    let vy = 0
+    // Collision with obstacles
+    obstacles.forEach(obstacle => {
+        const dist = Math.hypot(x - obstacle.x, y - obstacle.y);
+        if (dist < pad(ballRadius + obstacle.radius)) {
+            // Calculate collision angle
+            const angle = Math.atan2(y - obstacle.y, x - obstacle.x);
+            // Reflect velocity
+            const speed = Math.sqrt(vx * vx + vy * vy);
+            vx = (Math.cos(angle) * speed * horizontalFriction);
+            vy = Math.sin(angle) * speed * verticalFriction;
 
+            // Adjust position to prevent sticking
+            const overlap = ballRadius + obstacle.radius - unpad(dist);
+            x += pad(Math.cos(angle) * overlap);
+            y += pad(Math.sin(angle) * overlap);
+            if (pad(Math.cos(angle) * overlap) > 0) {
+                pattern.push('R');
+                outcome++
+            } else {
+                pattern.push('L')
+                outcome--;
+            }
+        }
+    });
+    console.log("Outcomes : ", outcome)
     const multiplier = MULTIPLIERS[outcome];
-    const possiblieOutcomes = outcomes[outcome];
+
+
 
     res.send({
-        point: possiblieOutcomes[Math.floor(Math.random() * possiblieOutcomes.length || 0)],
+        point: startX,
         multiplier,
         pattern
     });
 });
 
-app.listen(3000)
+app.listen(3000)
+
+// for (let i = 0; i < TOTAL_DROPS; i++) {
+//     if (Math.random() > 0.5) {
+//         pattern.push("R")
+//         outcome++;
+//     } else {
+//         pattern.push("L")
+//     }
+// }

backend/src/types/types.d.ts

@@ -0,0 +1,5 @@
+export interface Obstacle {
+    x: number;
+    y: number;
+    radius: number;
+}

backend/src/utils/game.ts

@@ -0,0 +1,18 @@
+import { WIDTH, obstacleRadius } from "../constants";
+import { pad } from "../constants/padding";
+import { Obstacle } from "../types/types";
+
+export const getObstacles = (): Obstacle[] => {
+    const obstacles: Obstacle[] = [];
+    const rows = 18;
+    for (let row = 2; row < rows; row++) {
+        const numObstacles = row + 1;
+        const y = 0 + row * 35;
+        const spacing = 36;
+        for (let col = 0; col < numObstacles; col++) {
+            const x = WIDTH / 2 - spacing * (row / 2 - col);
+            obstacles.push({ x: pad(x), y: pad(y), radius: obstacleRadius });
+        }
+    }
+    return obstacles;
+}

backend/tsconfig.json

@@ -1,109 +1,14 @@
 {
   "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig to read more about this file */
-
-    /* Projects */
-    // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
-    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
-    // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
-    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
-    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
-    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
-
-    /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
-    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
-    // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
-    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
-    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
-    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
-    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
-    // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
-    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
-    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
-    // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
-
-    /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
-    "rootDir": "./src",                                  /* Specify the root folder within your source files. */
-    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
-    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
-    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
-    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
-    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
-    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
-    // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
-    // "allowImportingTsExtensions": true,               /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
-    // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
-    // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
-    // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
-    // "resolveJsonModule": true,                        /* Enable importing .json files. */
-    // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
-    // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
-
-    /* JavaScript Support */
-    // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
-    // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
-    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
-
-    /* Emit */
-    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
-    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
-    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
-    // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
-    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
-    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    "outDir": "./dist",                                   /* Specify an output folder for all emitted files. */
-    // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
-    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
-    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
-    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
-    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
-    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
-    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
-    // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
-    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
-    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
-    // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
-    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
-
-    /* Interop Constraints */
-    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
-    // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
-    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
-    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
-
-    /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
-    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
-    // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
-    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
-    // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
-    // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
-    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
-    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
-    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
-    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
-    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
-    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
-    // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
-    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
-    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
-    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
-    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
-
-    /* Completeness */
-    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+    "target": "es2016",
+    "module": "commonjs",
+    "rootDir": "./src",
+    "outDir": "./dist",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "noEmit": true,
+    "allowImportingTsExtensions": true,
   }
-}
+}