diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/.gitattributes b/oppgaver/uke7/pokemonOppgaveObjektIntro/.gitattributes deleted file mode 100644 index dfe0770..0000000 --- a/oppgaver/uke7/pokemonOppgaveObjektIntro/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/bulbasaur.png b/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/bulbasaur.png deleted file mode 100644 index a211f21..0000000 Binary files a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/bulbasaur.png and /dev/null differ diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/drowzee.png b/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/drowzee.png deleted file mode 100644 index 6c7bb4f..0000000 Binary files a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/drowzee.png and /dev/null differ diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/flygon.png b/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/flygon.png deleted file mode 100644 index ac44d7f..0000000 Binary files a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/flygon.png and /dev/null differ diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/oranguru.png b/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/oranguru.png deleted file mode 100644 index 865531d..0000000 Binary files a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/oranguru.png and /dev/null differ diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/pikachu.png b/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/pikachu.png deleted file mode 100644 index dea9ecf..0000000 Binary files a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/pikachu.png and /dev/null differ diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/pokemonTrainerIdle.png b/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/pokemonTrainerIdle.png deleted file mode 100644 index 6c46a7d..0000000 Binary files a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/pokemonTrainerIdle.png and /dev/null differ diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/pokemonTrainerThrow.png b/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/pokemonTrainerThrow.png deleted file mode 100644 index 4b05ca4..0000000 Binary files a/oppgaver/uke7/pokemonOppgaveObjektIntro/Images/pokemonTrainerThrow.png and /dev/null differ diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/index.html b/oppgaver/uke7/pokemonOppgaveObjektIntro/index.html deleted file mode 100644 index fc7c016..0000000 --- a/oppgaver/uke7/pokemonOppgaveObjektIntro/index.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - Pokemon - - - - -
- - - - \ No newline at end of file diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/objExample.js b/oppgaver/uke7/pokemonOppgaveObjektIntro/objExample.js deleted file mode 100644 index 8ca294b..0000000 --- a/oppgaver/uke7/pokemonOppgaveObjektIntro/objExample.js +++ /dev/null @@ -1,22 +0,0 @@ -let mariusSinLommebok = { - kort: ["Visa", "Mastercard", "Førerkort", "Kundeklubb"], - mynter: 82, - sedler: 50, - pictures: ["kattepus1.png", "kattepus2.png"], - isBroke: true, -}; - -// Variabler: -let pikachuName = "Pikachu"; -let pikachuHealth = 45; -let pikachuImage = "/Images/pikachu.png"; -let pikachuSound = "/Audio/pikachu.mp3"; -let pikachuLevel = 8; - -// Objekt: -let pikachu = { - health: 45, - image: "/Images/pikachu.png", - sound: "/Audio/pikachu.mp3", - level: 8, -}; \ No newline at end of file diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/objekter1.md b/oppgaver/uke7/pokemonOppgaveObjektIntro/objekter1.md deleted file mode 100644 index 2289052..0000000 --- a/oppgaver/uke7/pokemonOppgaveObjektIntro/objekter1.md +++ /dev/null @@ -1,5 +0,0 @@ -Introduksjon til objekter: - -1. Hva er det? -2. Hvorfor skal vi bruke det? -3. Eksempel på sånn vi har gjort det uten og hvordan vi kan gjøre det med objekter isteden \ No newline at end of file diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/objekter2.md b/oppgaver/uke7/pokemonOppgaveObjektIntro/objekter2.md deleted file mode 100644 index ab76921..0000000 --- a/oppgaver/uke7/pokemonOppgaveObjektIntro/objekter2.md +++ /dev/null @@ -1,5 +0,0 @@ -Objekter 2, en litt mer avansert introduksjon - -1. Lister av objekter -2. Lager spillet nesten ferdig -3. Dere får en oppgave å løse fra videoen \ No newline at end of file diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/script.js b/oppgaver/uke7/pokemonOppgaveObjektIntro/script.js deleted file mode 100644 index 5412c56..0000000 --- a/oppgaver/uke7/pokemonOppgaveObjektIntro/script.js +++ /dev/null @@ -1,93 +0,0 @@ -let pikachuName = "Pikachu" - -let pikachu = { - name: "Pikachu", - health: 45, - image: "Images/pikachu.png", - level: 8, -}; - -let bulbasaur = { - name: "Bulbasaur", - health: 70, - image: "Images/bulbasaur.png", - level: 12, -}; - -let oranguru = { - name: "Oranguru", - health: 170, - image: "Images/oranguru.png", - level: 45, -}; - -let drowzee = { - name: "Drowzee", - health: 90, - image: "Images/drowzee.png", - level: 33, -}; - -let possiblePokemon = [pikachu, bulbasaur, oranguru, drowzee]; -let randomPokemon = null; - -let playerName = "Bjarne"; -let playerImage = "/Images/pokemonTrainerIdle.png"; -let playerPokemon = []; - -let app = document.getElementById("app"); - -updateView(); - -function updateView() { - getRandomPokemon() - app.innerHTML = /*HTML*/ ` -
-
-
${randomPokemon.name}
-
lvl: ${randomPokemon.level}
- -
- -
-
- -
${playerName}
-
- -
- - - -
- -
-
- `; -} - -function caughtPokemonView(){ - app.innerHTML = /*HTML*/` -
-

Du fanget ${playerPokemon[playerPokemon.length - 1].name}

-
- - -
-
- `; -} - -function catchPokemon(){ - playerPokemon.push(randomPokemon); - caughtPokemonView(); -} - -function showPokemon(){ - console.log(playerPokemon); -} - -function getRandomPokemon(){ - let randomNum = Math.floor(Math.random() * possiblePokemon.length); - randomPokemon = possiblePokemon[randomNum]; -} diff --git a/oppgaver/uke7/pokemonOppgaveObjektIntro/style.css b/oppgaver/uke7/pokemonOppgaveObjektIntro/style.css deleted file mode 100644 index b30d6d6..0000000 --- a/oppgaver/uke7/pokemonOppgaveObjektIntro/style.css +++ /dev/null @@ -1,72 +0,0 @@ -@import url("https://fonts.googleapis.com/css2?family=Orbitron&family=Roboto+Condensed:wght@700&display=swap"); - -html::-webkit-scrollbar { - display: none; -} - -#app { - display: flex; - align-items: center; - justify-content: center; - height: 98vh; - width: 98vw; - font-family: "Orbitron", sans-serif; - font-family: "Roboto Condensed", sans-serif; - font-size: 32px; -} - -.opposingPokemon { - margin-left: 50%; -} - -button { - height: 100px; - width: 100px; -} - -.buttonContainer { - width: 200px; - display: flex; - margin-bottom: 22px; - margin-left: 50%; -} - -img { - width: auto; - height: 250px; -} - -.bottomScreen { - display: flex; - align-items: flex-end; - justify-content: center; - flex-direction: row; -} - -.caughtContainer { - display: flex; - align-items: center; - justify-content: center; - flex-direction: column; -} - -.pokemonPartyContainer { - display: grid; - grid-template-columns: repeat(2, 220px); -} - -.pokemonBoxDisplay { - display: flex; - flex-direction: column; - align-items: center; - - border: 3px solid rgb(107, 222, 115); - background-image: linear-gradient(rgb(0, 107, 33), rgb(49, 222, 82)); - margin: 10px; - padding: 5px; -} - -.partyImg { - width: 40px; - height: 40px; -} \ No newline at end of file