fix: merge conflicts

I messed up the merge conflicts

Author: TFJ2021

src/game/main.ts

@@ -8,8 +8,9 @@ import {Credits} from './scenes/Credits.ts';
 import {Controls} from './scenes/Controls.ts';
 import {ThatGame} from './thatFolder/ThatGame.ts';
 import {Leaderboard} from './scenes/Leaderboard.ts';
+import {get3} from "./thatFolder/ThatPlayer.ts";
 import Gamepad = Phaser.Input.Gamepad.Gamepad;
-import { get3 } from "./thatFolder/ThatPlayer.ts";
+import Image = Phaser.GameObjects.Image;
 
 // Config
 const gameW: number = 1024;
@@ -32,7 +33,6 @@ export const globalConsts = {
   debug: debugMode,
   pixelFont: pixelFontName,
   apiURL: api,
-  getRandomInt: getRandomInt,
   backgroundSpeed: speed,
   houseSpeed: speed,
   spriteSpeed: speed,
@@ -102,10 +102,11 @@ export function escapeOption(that: Scene, gamepad?: Gamepad): void {
       return;
     }
   }
+}
 
 
 // Get random Int between to points
-function getRandomInt(min: number, max: number): number {
+export function getRandomInt(min: number, max: number): number {
   const minCeiled: number = Math.ceil(min);
   const maxFloored: number = Math.floor(max);
   return Math.floor(Math.random() * (maxFloored - minCeiled + 1) + minCeiled)

src/game/thatFolder/ThatObstacle.ts

@@ -1,5 +1,5 @@
 import {Scene} from "phaser";
-import {globalConsts} from '../main.ts';
+import {getRandomInt, globalConsts} from '../main.ts';
 
 // Every obstacle
 export enum obstacleType {
@@ -9,7 +9,7 @@ export enum obstacleType {
   ROCKS = "ROCKS",
   MARKER = "MARKER",
   GIFT = "GIFT",
-  BREAK ="BREAK",
+  BREAK = "BREAK",
 }
 
 // Every obstacle that can be randomly generated
@@ -35,7 +35,7 @@ interface obstacleProperties {
 // Settings for every obstacle
 export const obstaclePropertiesMap: Record<obstacleType, obstacleProperties> = {
   [obstacleType.BIRDBLUE]: {
-    y: () => globalConsts.getRandomInt(globalConsts.gameHeight * 0.4, globalConsts.gameHeight * 0.8),
+    y: () => getRandomInt(globalConsts.gameHeight * 0.4, globalConsts.gameHeight * 0.8),
     sprites: ["birdBlue"],
     width: 16,
     height: 6,
@@ -45,7 +45,7 @@ export const obstaclePropertiesMap: Record<obstacleType, obstacleProperties> = {
     weight: 100
   },
   [obstacleType.BIRDPINK]: {
-    y: () => globalConsts.getRandomInt(globalConsts.gameHeight * 0.4, globalConsts.gameHeight * 0.8),
+    y: () => getRandomInt(globalConsts.gameHeight * 0.4, globalConsts.gameHeight * 0.8),
     sprites: ["birdPink"],
     width: 16,
     height: 6,
@@ -85,7 +85,7 @@ export const obstaclePropertiesMap: Record<obstacleType, obstacleProperties> = {
     weight: 0
   },
   [obstacleType.GIFT]: {
-    y: () => globalConsts.getRandomInt(globalConsts.gameHeight * 0.6, globalConsts.gameHeight * 0.8),
+    y: () => getRandomInt(globalConsts.gameHeight * 0.6, globalConsts.gameHeight * 0.8),
     sprites: ["gift1", "gift2", "gift3", "gift4"],
     width: 18,
     height: 18,
@@ -94,15 +94,16 @@ export const obstaclePropertiesMap: Record<obstacleType, obstacleProperties> = {
     scale: 2,
     weight: 0
   },
-    [obstacleType.BREAK]: {
-  y: () => globalConsts.gameHeight - 90,
+  [obstacleType.BREAK]: {
+    y: () => globalConsts.gameHeight - 90,
     sprites: ["sign"],
     width: 164,
     height: 100,
     offsetX: 90,
     offsetY: 70,
     scale: 6,
-    weight: 100}
+    weight: 100
+  }
 };
 
 // Gets random type

src/game/thatFolder/ThatSection.ts

@@ -1,5 +1,5 @@
 import {Scene} from 'phaser';
-import {globalConsts} from '../main.ts';
+import {getRandomInt, globalConsts} from '../main.ts';
 import {getRandomObstacleType, obstaclePropertiesMap, obstacleType, ThatObstacle} from './ThatObstacle.ts';
 
 // Position type
@@ -29,10 +29,10 @@ export class ThatSection {
   // Constructor
   constructor(currentScene: Scene, pause: boolean, offset: number = 2) {
     this.scene = currentScene;
-    this.randomVoidOut = globalConsts.getRandomInt(this.minVoidout, this.maxVoidout);
+    this.randomVoidOut = getRandomInt(this.minVoidout, this.maxVoidout);
 
     // Gift generation
-    if (globalConsts.getRandomInt(0, this.giftProbability) == 1) {
+    if (getRandomInt(0, this.giftProbability) == 1) {
       const gift = this.generateObstacle(offset - 1, obstacleType.GIFT);
       this.gift = gift;
       this.obstacles.push(gift);
@@ -46,7 +46,7 @@ export class ThatSection {
     );
     // This lines controls if the next should be a break
     this.marker.sprite.setAlpha(
-      !pause ? (globalConsts.getRandomInt(0, this.breakProbability) == 0 ? 0 : 1) : 1
+      !pause ? (getRandomInt(0, this.breakProbability) == 0 ? 0 : 1) : 1
     );
     this.marker.sprite.setVisible(false);
     this.obstacles.push(this.marker);
@@ -56,8 +56,8 @@ export class ThatSection {
       for (let i = 0; i < this.amountObstacle; i++) {
         this.obstacles.push(this.generateObstacle(offset - 1));
       }
-    } else{
-      this.obstacles.push(new ThatObstacle(obstacleType.BREAK,this.scene,30+globalConsts.gameWidth*(offset-1) ))
+    } else {
+      this.obstacles.push(new ThatObstacle(obstacleType.BREAK, this.scene, 30 + globalConsts.gameWidth * (offset - 1)))
     }
 
     // Debug
@@ -83,7 +83,7 @@ export class ThatSection {
     let tries: number = 0;
     while (true) {
       currentPos = {
-        x: globalConsts.getRandomInt(globalConsts.gameWidth * 0.1, globalConsts.gameWidth * 0.9) + offset * globalConsts.gameWidth,
+        x: getRandomInt(globalConsts.gameWidth * 0.1, globalConsts.gameWidth * 0.9) + offset * globalConsts.gameWidth,
         y: property.y()
       };
       let valid: boolean = true;