William Simkins vor 8 Jahren
Ursprung
Commit
82e21e379e
2 geänderte Dateien mit 46 neuen und 27 gelöschten Zeilen
  1. 40
    21
      Inventory.java
  2. 6
    6
      package.bluej

+ 40
- 21
Inventory.java Datei anzeigen

@@ -9,31 +9,50 @@ public class Inventory {
9 9
 
10 10
     public void updateQuality() {
11 11
         for (int i = 0; i < items.length; i++) {
12
-            if (!items[i].getName().equals("Aged Brie")) {
13
-                if (items[i].getQuality() > 0) {
14
-                    if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
15
-                        items[i].setQuality(items[i].getQuality() - 1);
16
-                    }
17
-                }
18
-            } else {
19
-                if (items[i].getQuality() < 50) {
20
-                    items[i].setQuality(items[i].getQuality() + 1);
21
-                }
12
+            if (items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
13
+                continue;
22 14
             }
23 15
 
24
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
25
-                items[i].setSellIn(items[i].getSellIn() - 1);
16
+
17
+            if (items[i].getName().equals("Aged Brie")) {
18
+                updateAgedBrie(i);
19
+            }else if(items[i].getName().equals("Conjured Item")){
20
+                updateConjuredItem(i);
21
+            } else{
22
+                updateRegularItem(i);
26 23
             }
27 24
 
28
-            if (items[i].getSellIn() < 0) {
29
-                if (!items[i].getName().equals("Aged Brie")) {
30
-                  items[i].setQuality(items[i].getQuality() - 1);
31
-                } else {
32
-                    if (items[i].getQuality() < 50) {
33
-                        items[i].setQuality(items[i].getQuality() + 1);
34
-                    }
35
-                }
25
+           
26
+            if(items[i].getQuality() < 80){
27
+                items[i].setSellIn(items[i].getSellIn() -1);
36 28
             }
37 29
         }
30
+    }
31
+
32
+
33
+
34
+        public void updateAgedBrie(int i){
35
+        if(items[i].getSellIn() > 0 && items[i].getQuality() <= 49){
36
+            items[i].setQuality(items[i].getQuality() + 1);
37
+        } else if(items[i].getSellIn() < 0 && items[i].getQuality() <= 48){
38
+            items[i].setQuality(items[i].getQuality() + 2);
39
+        }
40
+    }
41
+
42
+    public void updateRegularItem(int i){
43
+        if(items[i].getSellIn() > 0 && items[i].getQuality() > 0){
44
+            items[i].setQuality(items[i].getQuality() - 1);
45
+        } else if(items[i].getSellIn() < 0 && items[i].getQuality() > 1){
46
+            items[i].setQuality(items[i].getQuality() - 2);
47
+        }
48
+    }
49
+
50
+    public void updateConjuredItem(int i){
51
+        if(items[i].getSellIn() > 0 && items[i].getQuality() > 0){
52
+            items[i].setQuality(items[i].getQuality() - 2);
53
+        } else if(items[i].getSellIn() < 0 && items[i].getQuality() > 1){
54
+            items[i].setQuality(items[i].getQuality() - 4);
55
+        }
56
+    }
38 57
 }
39
-}
58
+

+ 6
- 6
package.bluej Datei anzeigen

@@ -5,18 +5,18 @@ dependency1.type=UsesDependency
5 5
 dependency2.from=InventoryTest
6 6
 dependency2.to=Inventory
7 7
 dependency2.type=UsesDependency
8
-editor.fx.0.height=722
9
-editor.fx.0.width=800
10
-editor.fx.0.x=320
11
-editor.fx.0.y=50
8
+editor.fx.0.height=0
9
+editor.fx.0.width=0
10
+editor.fx.0.x=0
11
+editor.fx.0.y=0
12 12
 objectbench.height=164
13 13
 objectbench.width=776
14 14
 package.divider.horizontal=0.6
15 15
 package.divider.vertical=0.6845018450184502
16 16
 package.editor.height=364
17 17
 package.editor.width=674
18
-package.editor.x=577
19
-package.editor.y=61
18
+package.editor.x=258
19
+package.editor.y=46
20 20
 package.frame.height=600
21 21
 package.frame.width=800
22 22
 package.numDependencies=2