Commit dd2360bb authored by Palko's avatar Palko
Browse files

merge

parents 56a9694e e0457773
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@
  "type": "module",
  "scripts": {
    "dev": "vite",
    "localbuild": "vite build",
    "build": "vite build --base=/deadline-christmas-game/",
    "preview": "vite preview",
    "check": "svelte-check --tsconfig ./tsconfig.json"
+0 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
  import Student from "./Student.svelte";
  import { gameState } from "../../stores";
  import bg from "../../assets/background.jpg";
  // gameState.adssda
</script>

<div class="wrapper" style="background-image: url('{bg}')">
@@ -13,7 +12,6 @@

<style>
  .wrapper {
    /* background-image: url("images/lab/background.jpg"); */
    background-size: contain;
    background-repeat: no-repeat;
    height: 100%;
+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
  import _, { cloneDeep } from "lodash";
  import { onMount } from "svelte";
  import { initialGameState, initialSettings } from "../../initialSettings";
  import { gameScreen, gameState, onTick } from "../../stores";
  import { gameScreen, gameState, onTick, finishedPapers } from "../../stores";
  import DeadlineCounter from "../components/DeadlineCounter.svelte";
  import { setInterval, clearInterval } from "requestanimationframe-timer";
  import Info from "../components/Info.svelte";
@@ -26,6 +26,8 @@
  }

  onMount(() => {
    $finishedPapers = [];

    $onTick.push(() => {
      $gameState.ticks += 1;
    });