Merge branch 'main' of https://git.mamahaha.work/sangge/hhl_project

Reviewed-on: #9

choice.html

@@ -31,11 +31,11 @@
 
 <div class="image-container">
     <img src="asset/pic/Character_Selection.png" alt="选择角色">
-    <button class="button button1" onclick="location.href='alexgame.html'">亚历山大</button>
+    <button class="button button1" onclick="location.href='alexgame.html'">Alexander</button>
-    <button class="button button2" onclick="location.href='louisgame.html'">路易十六</button>
+    <button class="button button2" onclick="location.href='louisgame.html'">Louis XVI</button>
-    <button class="button button3" onclick="location.href='qinshihuanggame.html'">秦始皇</button>
+    <button class="button button3" onclick="location.href='qinshihuanggame.html'">Qin Shi Huang</button>
-    <button class="button button4" onclick="location.href='elizabethgame.html'">伊丽莎白</button>
+    <button class="button button4" onclick="location.href='elizabethgame.html'">Elizabeth I</button>
-    <button class="button button5" onclick="location.href='nixongame.html'">尼克松</button>
+    <button class="button button5" onclick="location.href='nixongame.html'">Nixon</button>
 </div>
 
 </body>

css/alexgame.css

@@ -20,6 +20,10 @@
     height: 1024px;
     top:50px;
     left: -100px;
+    height: 884px!important;
+    width: 883px!important;
+    top: 204px!important;
+    left: 40px!important;
   }
   #restaurant .dish img {
     position: absolute;

css/louisgame.css

@@ -20,6 +20,10 @@
     height: 1024px;
     top:50px;
     left: -100px;
+    height: 884px!important;
+    width: 883px!important;
+    top: 204px!important;
+    left: 40px!important;
   }
   #restaurant .dish img {
     position: absolute;
@@ -137,22 +141,33 @@
     display: none;
   }
   #cheese img{ /* 芝士 */
-    left: 170px;
+    left: 159px;
     display: none;
+    top: 734px!important;
+    width: 182px!important;
+    height: 207px!important;
   }
   #crepe img{ 
-    left: 380px;
+  
     display: none;
+    left: 347px;
+    top: 735px!important;
+    width: 194px!important;
+    height: 202px!important;
   }
   #foie-gras img{
-    left: 590px;
+    left: 563px;
     display: none;
+    top: 750px!important;
+    width: 190px!important;
+    height: 191px!important;
+    z-index: 3!important;
   }
   #onion-soup img{
     left: 750px;
-    top: 719px!important;
+    top: 725px!important;
-    width: 181px!important;
+    width: 200px!important;
-    height: 183px!important;
+    height: 207px!important;
     display: none;
   }
 

css/nixongame.css

@@ -1,5 +1,5 @@
   body {
-    background-image: url('../asset/pic/louis16/LouisXVI_Restaurant.png'); 
+    background-image: url('../asset/pic/nixon/background.png'); 
     background-repeat: no-repeat;
     background-color: rgb(0, 136, 109);
   }
@@ -36,17 +36,17 @@
     z-index: 4;
   }
 
-  #louis img{ /* louis 16 */
+  #nixon img{ /* nixon 16 */
     top: 235px;
     left: 1050px;
     display: none;
   }
-  #louis1 img{ /* 断头台 */
+  #nixon1 img{ /* 断头台 */
     top: 235px;
     left: 1050px;
     display: none;
   }
-  #louis2 img{ /* 死 */
+  #nixon2 img{ /* 死 */
     top: 235px;
     left: 1050px;
     display: none;

js/nixongame.js

@@ -159,11 +159,11 @@ document.addEventListener("DOMContentLoaded", function() {
     showElement("#dialogueBox img");
 
     // Show all dishes
-    showElement('#champagne img');
+    showElement('#burger img');
-    showElement('#cheese img');
+    showElement('#hot_dog img');
-    showElement('#crepe img');
+    showElement('#apple_pie img');
-    showElement('#foie-gras img');
+    showElement('#fried_chicken img');
-    showElement('#onion-soup img');
+    showElement('#pancakes img');
 
     // Show a random customer
     showElement(customers[RandomCustomerIndex][0]);

nixongame.html

@@ -72,23 +72,23 @@
       </div>
 
       <!-- foods elements -->
-      <div id="champagne" class="dish">
+      <div id="burger" class="dish">
         <img src="asset/pic/nixon/burger.png" alt="burger"
           onclick="handleClick('cham');">
       </div>
-      <div id="cheese" class="dish">
+      <div id="hot_dog" class="dish">
         <img src="asset/pic/nixon/hot_dog.png" alt="hot_dog"
           onclick="handleClick('cheese');">
       </div>
-      <div id="crepe" class="dish">
+      <div id="apple_pie" class="dish">
         <img src="asset/pic/nixon/apple_pie.png" alt="apple_pie"
           onclick="handleClick('crepe');">
       </div>
-      <div id="foie-gras" class="dish">
+      <div id="fried_chicken" class="dish">
         <img src="asset/pic/nixon/fried_chicken.png" alt="fried_chicken"
           onclick="handleClick('foiegras');">
       </div>
-      <div id="onion-soup" class="dish">
+      <div id="pancakes" class="dish">
         <img src="asset/pic/nixon/pancakes.png" alt="pancakes"
           onclick="handleClick('onionsoup');">
       </div>