diff --git a/images/16x16DungeonTileset.png b/images/16x16DungeonTileset.png index 911f162..f0b1f20 100644 Binary files a/images/16x16DungeonTileset.png and b/images/16x16DungeonTileset.png differ diff --git a/images/monster_imp.png b/images/monster_imp.png new file mode 100644 index 0000000..45390d5 Binary files /dev/null and b/images/monster_imp.png differ diff --git a/images/monster_necromancer.png b/images/monster_necromancer.png new file mode 100644 index 0000000..f7c6451 Binary files /dev/null and b/images/monster_necromancer.png differ diff --git a/images/npc_knight_green.png b/images/npc_knight_green.png new file mode 100644 index 0000000..548af1d Binary files /dev/null and b/images/npc_knight_green.png differ diff --git a/images/weapon_silver_topaz.png b/images/weapon_silver_topaz.png new file mode 100644 index 0000000..28c463d Binary files /dev/null and b/images/weapon_silver_topaz.png differ diff --git a/images/weapon_sword_red.png b/images/weapon_sword_red.png new file mode 100644 index 0000000..4e157f1 Binary files /dev/null and b/images/weapon_sword_red.png differ diff --git a/images/weapon_sword_ruby.png b/images/weapon_sword_ruby.png new file mode 100644 index 0000000..c0433d1 Binary files /dev/null and b/images/weapon_sword_ruby.png differ diff --git a/scripts/game.js b/scripts/game.js index 739e760..1ff9aef 100644 --- a/scripts/game.js +++ b/scripts/game.js @@ -33,7 +33,7 @@ "═": [352, 160], // room edge "║": [336, 176], // room edge "o": [40, 72], // room corner - "D": [16, 16], //Door to win + "D": [416, 176], //Door to win "s": [288, 112], //stairs to next Stage }, width: 25, @@ -539,18 +539,21 @@ let random2 = eval(`${answerValue}${randomOperator} ${randomValue(1, 4)}`); if (random1 === random2){ random2 += 1; + if (random2 === answerValue) { + random2 += 1; + } } else if (random1 < 1) { - random1 += 1; + random1 = 1; } else if (random2 < 1) { - random2 += 1; + random2 = 1; } - if (randomVar == 1) { + if (randomVar === 1) { document.getElementById("answer1").innerHTML = `${answerValue}`; document.getElementById("answer2").innerHTML = random1; document.getElementById("answer3").innerHTML = random2; - } else if (randomVar == 2) { + } else if (randomVar === 2) { document.getElementById("answer1").innerHTML = random1; document.getElementById("answer2").innerHTML = `${answerValue}`; document.getElementById("answer3").innerHTML = random2; diff --git a/styles/game.css b/styles/game.css index 8f5715a..277b15e 100644 --- a/styles/game.css +++ b/styles/game.css @@ -85,7 +85,7 @@ a:hover { right: 0px; width: 100%; height: 100%; - background-color: #222323; + background-color: #422835; } #title { diff --git a/styles/style.css b/styles/style.css new file mode 100644 index 0000000..ff9f88e --- /dev/null +++ b/styles/style.css @@ -0,0 +1,4 @@ + +body { + background-color: #4a313c; +} diff --git a/views/partials/nav.php b/views/partials/nav.php index 931f2ed..cb1cc6b 100644 --- a/views/partials/nav.php +++ b/views/partials/nav.php @@ -12,7 +12,7 @@