From e3e56c299952e2db990f7075b724a64eab9d0509 Mon Sep 17 00:00:00 2001
From: GammelJAN <jan.ehehalt@gmail.com>
Date: Wed, 27 May 2020 11:00:54 +0200
Subject: [PATCH] EHRE

---
 core/assets/sprites/dmgAmulet.png             | Bin 0 -> 1444 bytes
 .../dungeoncrawler/control/Controller.java    |   1 +
 .../model/DungeonGenerator.java               |   6 ++++-
 .../com/dungeoncrawler/model/Inventory.java   |  17 +++----------
 .../dungeoncrawler/model/items/Amulet.java    |   6 ++---
 .../dungeoncrawler/model/items/DmgAmulet.java |  23 +++++++++++++++++
 .../com/dungeoncrawler/view/HudContainer.java |  18 ++++++++++---
 core/src/com/dungeoncrawler/view/Map.java     |   1 +
 .../com/dungeoncrawler/view/MapContainer.java |  24 +++++++++++-------
 .../com/dungeoncrawler/view/MapGenerator.java |   6 +++++
 10 files changed, 72 insertions(+), 30 deletions(-)
 create mode 100644 core/assets/sprites/dmgAmulet.png
 create mode 100644 core/src/com/dungeoncrawler/model/items/DmgAmulet.java

diff --git a/core/assets/sprites/dmgAmulet.png b/core/assets/sprites/dmgAmulet.png
new file mode 100644
index 0000000000000000000000000000000000000000..f727c11c2806adfbb1fa1e3a2933814c9ddab4be
GIT binary patch
literal 1444
zcmV;V1zY-wP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ%j3f99lutAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi<J1kq|hSPgX4a@yZ5+z2MCP{Q_Y?UK-DZG
z6_1J8+^Xn*g%86BU;rVBnR+6<m_gU^bq^0;@1i`b`?)_ypOQBj;1P-Em~L3a8^kl4
zmd<&fILu0tLVQj<ZqNmZAGt2O{KmQHu)s6JMkX~+93~cv9V~Y+D;X;BG;u^xHOd#V
zE-Re3IIEQ!Yu%H-Fqqd?(p;xGf;g6tKoTNk)KEqR7NWFjq?kz2eyods$nhu1C6lWR
zMvetkp+a)};D7MDTeC1V=_UnZfbYe&KSlxnF3_yo_V=-EH%|cXGjOG~{nZ9A`$>Ae
ztwoN2{%zpmx~<83z~v4w_@qmQ<VaqcLZJY>pV2qvfY2?_yXN-R+Q;bwkfE-YZ-9eC
zV5~^l>s{U*=<My^Gp+u908&(Pny4&B-2eap24YJ`L;y_yD*y}n>Q@c`000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2jm4C2pt9%<upqG000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}000AfNkl<ZXx{BuO=}ZT6g_W}p)D1KTDys&ltK`SLIpRK
zxNu?UwmVnuEA$7rXr&9$b+ao7E~=Y?8$(1Wtz;2wQ>vwf&<{$-R7^k8CTVLjGw-?R
zOdR7(GMTS5kh{rbc=I^t-gED}_W><yS<711G8;zR+&moQ2h`_SN?d9R0^uM(2jC$9
z3V^G%K9&;6g&+_P^78;fwboIF97k}u;`OQK_i;VZA`So_2Qa4N*=IUyCyn-DK#>4#
z0Av8!SW3L+I)QMIPXZV)03Ff!WW-<}BVzlth!7j#nGW!X#qCB62r&iYPAnzf)ceqH
zS2Dt({K^J!-Dt&9qDq2LhAgE_H2TnIp)5{o5;B_*<PQKA94=-H8wYg1uiH072s${9
zboF)n$i@Mkt6a#{xp5KzN)lUM+m)W@&gdrxyl)s4jWn5Fp{R?1Qr`hUoZXbBcJk~v
zA;@u;588+(S7k-M)(B9BegI$$va)f+MepmDV^L;LEEC`et^&YmiOqZ5?x;@k6(y`&
zBA_I%3;>5Gbh%NDo1eoKO9To<HbEJV0bq5H3SI+OWz^1-LCX>%K!?r4%C?M@GshYM
z2AnlYI%-?47kv)RVM(Lta~8bO@3HsCl{}1EKFG2sbcGOf0ziCIeB?3sF#w2fOHo_R
zoYJeKAVKnI3{9G87)=pa-J`;dE+3qzLg64k5KD<m;UND7z#xF%IInOe0Bw{ZM+n+U
zmBGl;Jn-O_|Kp`LGGu3t)fqckH4F;)stz+Pq4>5G4F~xl8?s1NbD)8zBPOJ6-tJ%b
zz3J-Yo&tCgONrwq!7l>1r~a2IetljSC#-;VVx$~V$2~JLs+itbNn+n-H>D{jPxHF9
ztcgO+dmZiETqv@rQVJbyMe07tzW$IGWePzLWCi#&B}rWaZ?%<(>>kO}GKIhx3VI|I
z>D*Q$>=t;-z0m3&70yJqB2o6!pyG_N^SW-T6ndHi+JsK0)02rrqWofbc$id1!|vUu
zD-qC^z24s5@{5_7nKJmJQ~JKvDca}=Ae~OLOeO;W*xK5HN+_St0{}vy5OJG;--%6n
zdV0#w`F!3J;I<|7a`a+MI-FJTxp#kaRh3cG5CDMf%=iD~(^LfRjNZlD*MWbu?zR4H
yS0S|$sWNH=0o%6{fk1#XrGzeuIYOY3QTPK%XM^2>D|=S}0000<MNUMnLSTYd(}jEh

literal 0
HcmV?d00001

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index 5596943..0160172 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -1,3 +1,4 @@
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/core/src/com/dungeoncrawler/model/DungeonGenerator.java b/core/src/com/dungeoncrawler/model/DungeonGenerator.java
index 5cc09d8..16ad2a8 100644
--- a/core/src/com/dungeoncrawler/model/DungeonGenerator.java
+++ b/core/src/com/dungeoncrawler/model/DungeonGenerator.java
@@ -7,6 +7,7 @@ package com.dungeoncrawler.model;
 
 import com.dungeoncrawler.model.entities.*;
 import com.dungeoncrawler.model.items.Amulet;
+import com.dungeoncrawler.model.items.DmgAmulet;
 import com.dungeoncrawler.model.items.Potion;
 import com.dungeoncrawler.model.items.Key;
 import java.util.ArrayList;
@@ -225,7 +226,7 @@ public class DungeonGenerator {
 
                 Item tempItem;
 
-                int id = (int) (Math.random() * 2);
+                int id = (int) (Math.random() * 3);
                 switch(id){
                     case 0:
                         tempItem = new Amulet(lvl);
@@ -234,6 +235,9 @@ public class DungeonGenerator {
                     case 1:
                         tempItem = new Potion(lvl);
                         break;
+                    case 2:
+                        tempItem = new DmgAmulet(lvl);
+                        break;
 
                     default:
                         tempItem = null;
diff --git a/core/src/com/dungeoncrawler/model/Inventory.java b/core/src/com/dungeoncrawler/model/Inventory.java
index 1bfea1d..cbb946e 100644
--- a/core/src/com/dungeoncrawler/model/Inventory.java
+++ b/core/src/com/dungeoncrawler/model/Inventory.java
@@ -35,20 +35,9 @@ public class Inventory {
         else{
             if(items[selected] == null || items[selected].getId() == 0 || items[selected].getId() == 1){}
             else{
-                switch(items[selected].getId()){
-                    case 0:
-                        break;
-                    case 1:
-                        Item temp1 = items[slot];
-                        items[slot] = items[selected];
-                        items[selected] = temp1;
-                        break;
-                    case 2:
-                        Item temp2 = items[slot];
-                        items[slot] = items[selected];
-                        items[selected] = temp2;
-                        break;
-                }
+                Item temp = items[slot];
+                items[slot] = items[selected];
+                items[selected] = temp;
             }
         }
     }
diff --git a/core/src/com/dungeoncrawler/model/items/Amulet.java b/core/src/com/dungeoncrawler/model/items/Amulet.java
index 695fa8a..c1c93f2 100644
--- a/core/src/com/dungeoncrawler/model/items/Amulet.java
+++ b/core/src/com/dungeoncrawler/model/items/Amulet.java
@@ -15,9 +15,9 @@ public class Amulet extends Item {
     
     public Amulet(int lvl) {
         super(lvl);
-        this.dmg = 8 * lvl;
-        this.heal = 0 * lvl;
-        this.movementBoost = 10;
+        this.extraHp = 10 * lvl;
+        this.def = 3 * lvl;
+        this.movementBoost = 0;
         this.id = 2;
     }
     
diff --git a/core/src/com/dungeoncrawler/model/items/DmgAmulet.java b/core/src/com/dungeoncrawler/model/items/DmgAmulet.java
new file mode 100644
index 0000000..2170607
--- /dev/null
+++ b/core/src/com/dungeoncrawler/model/items/DmgAmulet.java
@@ -0,0 +1,23 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.dungeoncrawler.model.items;
+
+import com.dungeoncrawler.model.Item;
+
+/**
+ *
+ * @author jonathan
+ */
+public class DmgAmulet extends Item {
+    
+    public DmgAmulet(int lvl) {
+        super(lvl);
+        this.dmg = 8 * lvl;
+        this.movementBoost = 1;
+        this.id = 3;
+    }
+    
+}
diff --git a/core/src/com/dungeoncrawler/view/HudContainer.java b/core/src/com/dungeoncrawler/view/HudContainer.java
index 7a9ffa2..476f5ec 100644
--- a/core/src/com/dungeoncrawler/view/HudContainer.java
+++ b/core/src/com/dungeoncrawler/view/HudContainer.java
@@ -168,6 +168,12 @@ public class HudContainer {
                         selectedName = "Amulet  ";
                         perk = "Damage: ";
                         selectedPerkValue = items[selected].getDmg();
+                        break;
+                    case 3:
+                        selectedName = "Damage-Amulet  ";
+                        perk = "Damage: ";
+                        selectedPerkValue = items[selected].getDmg();
+                        break;
                 
                 }
                 font.draw(batch, selectedName + lvl, HudPosX + 40, HudPosY + 210);
@@ -184,7 +190,6 @@ public class HudContainer {
             switch(item.getId()){
                 case 0:
                     if(InventoryItemSprites[x] == null){
-                        //InventoryItemTextures[i] = new Texture("sprites/itemTest.png");
                         InventoryItemTextures[x] = new Texture("sprites/key.png");
                         InventoryItemSprites[x] = new Sprite(InventoryItemTextures[x]);
                         InventoryItemSprites[x].setX(invXPos[x]);
@@ -194,7 +199,6 @@ public class HudContainer {
                     break;
                 case 1:
                     if(InventoryItemSprites[x] == null){
-                        //InventoryItemTextures[i] = new Texture("sprites/itemTest.png");
                         InventoryItemTextures[x] = new Texture("sprites/potion.png");
                         InventoryItemSprites[x] = new Sprite(InventoryItemTextures[x]);
                         InventoryItemSprites[x].setX(invXPos[x]);
@@ -204,7 +208,6 @@ public class HudContainer {
                     break;
                 case 2:
                         if(InventoryItemSprites[x] == null){
-                            //InventoryItemTextures[i] = new Texture("sprites/itemTest.png");
                             InventoryItemTextures[x]= new Texture("sprites/amulet.png");
                             InventoryItemSprites[x] = new Sprite(InventoryItemTextures[x]);
                             InventoryItemSprites[x].setX(invXPos[x]);
@@ -212,6 +215,15 @@ public class HudContainer {
                             break;
                         }
                     break;
+                case 3:
+                        if(InventoryItemSprites[x] == null){
+                            InventoryItemTextures[x]= new Texture("sprites/dmgAmulet.png");
+                            InventoryItemSprites[x] = new Sprite(InventoryItemTextures[x]);
+                            InventoryItemSprites[x].setX(invXPos[x]);
+                            InventoryItemSprites[x].setY(invYPos[x]);
+                            break;
+                        }
+                    break;
             }
         }
     
diff --git a/core/src/com/dungeoncrawler/view/Map.java b/core/src/com/dungeoncrawler/view/Map.java
index fd87c75..e2fa357 100644
--- a/core/src/com/dungeoncrawler/view/Map.java
+++ b/core/src/com/dungeoncrawler/view/Map.java
@@ -1,3 +1,4 @@
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/core/src/com/dungeoncrawler/view/MapContainer.java b/core/src/com/dungeoncrawler/view/MapContainer.java
index d3675b9..6a1083e 100644
--- a/core/src/com/dungeoncrawler/view/MapContainer.java
+++ b/core/src/com/dungeoncrawler/view/MapContainer.java
@@ -39,21 +39,27 @@ public class MapContainer {
     
     
     public void addItem(int width, int height, int xPos, int yPos, Item i){
+        AnimatedObject ao;
         switch(i.getId()){
             case 0: // key
-                AnimatedObject ao1 = new AnimatedObject(new Texture("sprites/key.png"), width, height);
-                mapItems.add(ao1);
-                ao1.setSpritePosition(xPos, yPos);
+                ao = new AnimatedObject(new Texture("sprites/key.png"), width, height);
+                mapItems.add(ao);
+                ao.setSpritePosition(xPos, yPos);
                 break;
             case 1: // potion
-                AnimatedObject ao2 = new AnimatedObject(new Texture("sprites/potion.png"), width, height);
-                mapItems.add(ao2);
-                ao2.setSpritePosition(xPos, yPos);
+                ao = new AnimatedObject(new Texture("sprites/potion.png"), width, height);
+                mapItems.add(ao);
+                ao.setSpritePosition(xPos, yPos);
                 break;
             case 2: // amulet
-                AnimatedObject ao3 = new AnimatedObject(new Texture("sprites/amulet.png"), width, height);
-                mapItems.add(ao3);
-                ao3.setSpritePosition(xPos, yPos);
+                ao = new AnimatedObject(new Texture("sprites/amulet.png"), width, height);
+                mapItems.add(ao);
+                ao.setSpritePosition(xPos, yPos);
+                break;
+            case 3: // DamageAmulet
+                ao = new AnimatedObject(new Texture("sprites/dmgAmulet.png"), width, height);
+                mapItems.add(ao);
+                ao.setSpritePosition(xPos, yPos);
                 break;
                 
         }
diff --git a/core/src/com/dungeoncrawler/view/MapGenerator.java b/core/src/com/dungeoncrawler/view/MapGenerator.java
index a98b605..c7ccf67 100644
--- a/core/src/com/dungeoncrawler/view/MapGenerator.java
+++ b/core/src/com/dungeoncrawler/view/MapGenerator.java
@@ -30,6 +30,7 @@ public class MapGenerator {
     Texture amulet;
     Texture key;
     Texture potion;
+    Texture DmgAmulet;
     Texture doorTop;
     Texture doorLeft;
     Texture doorRight;
@@ -43,6 +44,7 @@ public class MapGenerator {
         }
         torchT = new Texture("sprites/torch.png");
         amulet = new Texture("sprites/amulet.png");
+        DmgAmulet = new Texture("sprites/dmgAmulet.png");
         key = new Texture("sprites/key.png");
         potion = new Texture("sprites/potion.png");
         doorTop = new Texture("sprites/door.png");
@@ -399,6 +401,10 @@ public class MapGenerator {
                     case 2:
                         itemSprite = new AnimatedObject(amulet, 48, 48);
                         break;
+
+                    case 3:
+                        itemSprite = new AnimatedObject(DmgAmulet, 48, 48);
+                        break;
                 }
                 
                 itemSprite.getSprite().setPosition(container.getxPos(), container.getyPos());