completed

Inventory.java

@@ -7,33 +7,52 @@ public class Inventory {
         this.items = items;
     }
 
-    public void updateQuality() {
-        for (int i = 0; i < items.length; i++) {
-            if (!items[i].getName().equals("Aged Brie")) {
-                if (items[i].getQuality() > 0) {
-                    if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                        items[i].setQuality(items[i].getQuality() - 1);
-                    }
-                }
-            } else {
-                if (items[i].getQuality() < 50) {
-                    items[i].setQuality(items[i].getQuality() + 1);
-                }
+    public void updateAgedBrie(int i) {
+        for (i = 0; i < items.length; i++) {
+            if(items[i].getSellIn() > 0 && items[i].getQuality() <= 49){
+                items[i].setQuality(items[i].getQuality() + 1);
+            }
+            else if (items[i].getSellIn() < 0 && items[i].getQuality() <= 48) {
+                items[i].setQuality(items[i].getQuality() + 2);
             }
+        }
+    }
 
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-                items[i].setSellIn(items[i].getSellIn() - 1);
+    public void updateNormalItems(int i) {
+        for (i = 0; i < items.length; i++) {
+            if(items[i].getSellIn() > 0 && items[i].getQuality() >= 1){
+                items[i].setQuality(items[i].getQuality() - 1);
+            }
+            else if (items[i].getSellIn() < 0 && items[i].getQuality() >= 2) {
+                items[i].setQuality(items[i].getQuality() - 2);
+            }
+        }
+    }
+    
+    public void updateConjuredItems(int i) {
+        for (i = 0; i < items.length; i++) {
+            if(items[i].getSellIn() > 0 && items[i].getQuality() >= 1){
+                items[i].setQuality(items[i].getQuality() - 2);
             }
+            else if (items[i].getSellIn() < 0 && items[i].getQuality() <= 2) {
+                items[i].setQuality(items[i].getQuality() - 4);
+            }
+        }
+    }
 
-            if (items[i].getSellIn() < 0) {
-                if (!items[i].getName().equals("Aged Brie")) {
-                  items[i].setQuality(items[i].getQuality() - 1);
-                } else {
-                    if (items[i].getQuality() < 50) {
-                        items[i].setQuality(items[i].getQuality() + 1);
-                    }
-                }
+    public void updateQuality() {
+        for (int i = 0; i < items.length; i++) {
+            if (items[i].getName().equals("Aged Brie")) {
+                updateAgedBrie(i);
             }
+            else if (items[i].getQuality() < 80) {
+                items[i].setSellIn(items[i].getSellIn() - 1);
+                updateNormalItems(i);
+            }
+            //else {
+            //updateNormalItems(i);
+            //}
         }
+    }
 }
-}
+

package.bluej

@@ -5,18 +5,18 @@ dependency1.type=UsesDependency
 dependency2.from=InventoryTest
 dependency2.to=Inventory
 dependency2.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=320
-editor.fx.0.y=50
+editor.fx.0.height=812
+editor.fx.0.width=1440
+editor.fx.0.x=-24
+editor.fx.0.y=23
 objectbench.height=164
-objectbench.width=776
+objectbench.width=461
 package.divider.horizontal=0.6
 package.divider.vertical=0.6845018450184502
 package.editor.height=364
 package.editor.width=674
 package.editor.x=577
-package.editor.y=61
+package.editor.y=60
 package.frame.height=600
 package.frame.width=800
 package.numDependencies=2