Aleena Rose-Mathew пре 8 година
родитељ
комит
ac6fe8d245
2 измењених фајлова са 67 додато и 34 уклоњено
  1. 59
    26
      Inventory.java
  2. 8
    8
      package.bluej

+ 59
- 26
Inventory.java Прегледај датотеку

3
     private Item[] items;
3
     private Item[] items;
4
 
4
 
5
     public Inventory(Item[] items) {
5
     public Inventory(Item[] items) {
6
-        super();
7
         this.items = items;
6
         this.items = items;
8
     }
7
     }
9
 
8
 
10
-    public void updateQuality() {
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
-                }
22
-            }
9
+    public void updateQuality()
10
+    {
11
+        for(int i=0;i<items.length;i++)
12
+        {
23
 
13
 
24
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
25
-                items[i].setSellIn(items[i].getSellIn() - 1);
14
+            if(items[i].getName().equals("Sulfuras,Hand Of Rangnaros"))
15
+            {
16
+                continue;
26
             }
17
             }
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
-                }
18
+            if(items[i].getName().equals("Aged Brie"))
19
+            {
20
+                agedBrieUpdate(i);
21
+            }
22
+            else if(items[i].getName().equals("Conjured Mage Water"))
23
+            {
24
+                conjuredItemUpdate(i);
25
+            }
26
+            else
27
+            {
28
+                regularItemUpdate(i);
29
+            }
30
+            if(items[i].getQuality()<80)
31
+            {
32
+                items[i].setSellIn(items[i].getSellIn()-1);
36
             }
33
             }
37
         }
34
         }
35
+    }
36
+    public void agedBrieUpdate(int i)
37
+    {
38
+        if(items[i].getSellIn()>0&&items[i].getQuality()<=49)
39
+        {
40
+            items[i].setQuality(items[i].getQuality()+1);
41
+        }
42
+        else if(items[i].getSellIn()<0&&items[i].getQuality()<=48)
43
+        {
44
+            items[i].setQuality(items[i].getQuality()+2);
45
+        }
46
+    }
47
+    public void regularItemUpdate(int i)
48
+    {
49
+        if(items[i].getSellIn()>0&& items[i].getQuality()>0)
50
+        {
51
+            items[i].setQuality(items[i].getQuality()-1);
52
+        }
53
+        else if(items[i].getSellIn()<0&&items[i].getQuality()>1)
54
+        {
55
+            items[i].setQuality(items[i].getQuality()-2);
56
+        }
57
+    }
58
+    public void conjuredItemUpdate(int i)
59
+    {
60
+        if(items[i].getSellIn()>0&&items[i].getQuality()>0)
61
+        {
62
+            items[i].setQuality(items[i].getQuality()-2);
63
+        }
64
+        else if(items[i].getSellIn()<0&&items[i].getQuality()>1)
65
+        {
66
+            items[i].setQuality(items[i].getQuality()-4);
67
+        }
68
+    }
38
 }
69
 }
39
-}
70
+
71
+    
72
+

+ 8
- 8
package.bluej Прегледај датотеку

6
 dependency2.to=Inventory
6
 dependency2.to=Inventory
7
 dependency2.type=UsesDependency
7
 dependency2.type=UsesDependency
8
 editor.fx.0.height=722
8
 editor.fx.0.height=722
9
-editor.fx.0.width=800
10
-editor.fx.0.x=320
11
-editor.fx.0.y=50
12
-objectbench.height=164
13
-objectbench.width=776
9
+editor.fx.0.width=683
10
+editor.fx.0.x=11
11
+editor.fx.0.y=23
12
+objectbench.height=234
13
+objectbench.width=461
14
 package.divider.horizontal=0.6
14
 package.divider.horizontal=0.6
15
-package.divider.vertical=0.6845018450184502
16
-package.editor.height=364
15
+package.divider.vertical=0.5553505535055351
16
+package.editor.height=294
17
 package.editor.width=674
17
 package.editor.width=674
18
-package.editor.x=577
18
+package.editor.x=480
19
 package.editor.y=61
19
 package.editor.y=61
20
 package.frame.height=600
20
 package.frame.height=600
21
 package.frame.width=800
21
 package.frame.width=800