Vincent Sima 8 anos atrás
pai
commit
36e5b41c1f
2 arquivos alterados com 23 adições e 26 exclusões
  1. 17
    20
      Inventory.java
  2. 6
    6
      package.bluej

+ 17
- 20
Inventory.java Ver arquivo

@@ -9,31 +9,28 @@ 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
-                    }
12
+            if(items[i].getName().equals("Aged Brie")){
13
+                if(items[i].getQuality() < 50){
14
+                    items[i].setQuality(items[i].getQuality() + 1);
15
+                } 
16
+                if(items[i].getSellIn() < 0 && items[i].getQuality() < 50){
17
+                    items[i].setQuality(items[i].getQuality() + 1);
17 18
                 }
19
+            } else if(items[i].getName().equals("Sulfuras, Hand of Ragnaros")){
20
+                items[i].setQuality(items[i].getQuality() + 0);
21
+
18 22
             } else {
19
-                if (items[i].getQuality() < 50) {
20
-                    items[i].setQuality(items[i].getQuality() + 1);
23
+                if(items[i].getSellIn() > 0 && items[i].getQuality() > 0){
24
+                    items[i].setQuality(items[i].getQuality() - 1);
21 25
                 }
26
+                if(items[i].getSellIn() <= 0 && items[i].getQuality() > 0){
27
+                items[i].setQuality(items[i].getQuality() - 2);}
22 28
             }
23
-
24
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
29
+            
30
+            if(items[i].getQuality() < 80){
25 31
                 items[i].setSellIn(items[i].getSellIn() - 1);
26 32
             }
27
-
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
-                }
36 33
             }
37 34
         }
38
-}
39
-}
35
+    }
36
+

+ 6
- 6
package.bluej Ver arquivo

@@ -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
8
+editor.fx.0.height=709
9 9
 editor.fx.0.width=800
10
-editor.fx.0.x=320
11
-editor.fx.0.y=50
10
+editor.fx.0.x=255
11
+editor.fx.0.y=23
12 12
 objectbench.height=164
13
-objectbench.width=776
13
+objectbench.width=461
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=27
19
+package.editor.y=36
20 20
 package.frame.height=600
21 21
 package.frame.width=800
22 22
 package.numDependencies=2