From aaf1ff0c79adca7758c53797eac1ef71f3cb690e Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <hegenberg@tixeltec.com>
Date: Tue, 10 Jan 2023 08:35:47 +0100
Subject: [PATCH] changed game logic to generate player always in first
 walkable field and door/stairs in last

---
 scripts/game.js     | 23 +++++++++++------------
 views/game.view.php | 10 +++++-----
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/scripts/game.js b/scripts/game.js
index 9ba0a7d..646db98 100644
--- a/scripts/game.js
+++ b/scripts/game.js
@@ -249,14 +249,14 @@
       const key = takeFreeCell(freeCells);
       if (!i) {
         if(count < 5) {
-          game.stairs = key;
-          game.items[key] = "s";
+          game.stairs = freeCells[freeCells.length - 1];
+          game.items[freeCells[freeCells.length - 1]] = "s";
         } else {
-          game.door = key;
-          game.items[key] = "D";
+          game.door = freeCells[freeCells.length - 1];
+          game.items[freeCells[freeCells.length - 1]] = "D";
         }
       } else {
-        game.items[key] = ROT.RNG.getItem(["g"]);
+        game.items[key] = "g";
       }
     }
   }
@@ -343,10 +343,16 @@
 
   // both the player and monster initial position is set
   function createBeing(what, freeCells) {
+    if (what == makePlayer) {
+      const pos = posFromKey(freeCells[0]);
+      const being = what(pos[0], pos[1]);
+      return being; 
+    } else {
     const key = takeFreeCell(freeCells);
     const pos = posFromKey(key);
     const being = what(pos[0], pos[1]);
     return being;
+    }
   }
 
   /******************
@@ -534,7 +540,6 @@
    ******************************/
   // this is how the player fights a monster
   function checkSolution(solution, answer) {
-    console.log("Click: " + solution + " Antwort: " + answer);
     if (solution == answer) {
       return true;
     } else {
@@ -589,9 +594,6 @@
   }
 
   async function combat(hitter, receiver) {
-    console.log("hitter: " + hitter.name);
-    console.log("receiver: " + receiver.name);
-    console.log(hitter.stats.hp);
     let msg = [];
     const randomValue = (min, max) =>
       Math.floor(Math.random() * (max - min)) + min;
@@ -601,13 +603,11 @@
     const clicked = await setupButtons(answerValue);
     let fight = checkSolution(clicked, answerValue);
     if(fight) {
-      console.log(fight);
       msg.push("You hit the monster");
       hitter.stats.hp -= 1;
       sfx["hit"].play();
       //Game.player.stats.xp += 1;
     } else {
-      console.log(false);
       sfx["miss"].play();
       msg.push("The monster hit you.");
       Game.player.stats.hp -= 1;
@@ -838,7 +838,6 @@
     }
     if (code == 70 && ev.altKey && ev.ctrlKey && ev.shiftKey) {
       document.body.requestFullscreen();
-      console.log("Full screen pressed.");
       return;
     }
     if (code == 190) {
diff --git a/views/game.view.php b/views/game.view.php
index d32dc18..90f0751 100644
--- a/views/game.view.php
+++ b/views/game.view.php
@@ -51,7 +51,7 @@
                    class="nes-radio is-dark"
                    name="menu-items"
                    checked/>
-            <span>Instructions</span>
+            <span>Anleitung</span>
           </label>
 		  <br/>
           <label>
@@ -63,7 +63,7 @@
           </label>
         </div>
       </div>
-      <button id="play" class="nes-btn is-success action">Play</button>
+      <button id="play" class="nes-btn is-success action">Start</button>
     </div>
 
     <!-- credits screen -->
@@ -93,10 +93,10 @@
 
     <!-- instructions screen -->
     <div id="instructions" class="screen modal">
-      <p>Instructions</p>
+      <p>Anleitung</p>
       <div class="nes-container is-rounded is-dark">
-        <p>Du musst dich durch denn Dungeon kämpfen und denn Weg in den höchsten Raum finden. du kämpfst durch das Lösen von Matheaufgaben.
-        Solltest du eine falsche Antwort geben erleidest du Schaden, ansonsten fügst du deinem Gegner Schaden zu.</p>
+        <p>Kämpfe dich durch denn Dungeon und finde den Weg in den untersten Raum. Durch das Lösen der Matheaufgaben fügst deinen Gegnern Schaden zu.
+        Bei einer falschen Antwort erleidest du Schaden.</p>
         <p>Benutze die Pfeiltasten um dich zu bewegen.</p>
       </div>
       <button class="nes-btn is-success action">Ok</button>