Consistency in bad item lists

- Soul Dew is now considered a bad item in Gens 3-4 (was already considered bad in 5-7)
- Quick Powder is now considered a bad item in Gen 4 (was already considered bad in 5-7)
- Weakness reducing berries (e.g. Occa Berry) and some other battle berries are now considerd non-bad items in Gen 4 (was already considered non-bad in 5-7)

2 files changed, 4 insertions, 3 deletions

diff --git a/src/com/dabomstew/pkrandom/constants/Gen3Constants.java b/src/com/dabomstew/pkrandom/constants/Gen3Constants.java
index 53dd029..c5f4b62 100644
--- a/src/com/dabomstew/pkrandom/constants/Gen3Constants.java
+++ b/src/com/dabomstew/pkrandom/constants/Gen3Constants.java
@@ -490,7 +490,7 @@ public class Gen3Constants {
         // non-bad items
         // ban specific pokemon hold items, berries, apricorns, mail
         nonBadItems = allowedItems.copy();
-        nonBadItems.banSingles(Gen3Items.lightBall, Gen3Items.oranBerry);
+        nonBadItems.banSingles(Gen3Items.lightBall, Gen3Items.oranBerry, Gen3Items.soulDew);
         nonBadItems.banRange(Gen3Items.orangeMail, 12); // mail
         nonBadItems.banRange(Gen3Items.figyBerry, 33); // berries
         nonBadItems.banRange(Gen3Items.luckyPunch, 4); // pokemon specific
diff --git a/src/com/dabomstew/pkrandom/constants/Gen4Constants.java b/src/com/dabomstew/pkrandom/constants/Gen4Constants.java
index 5bf0dda..e54d608 100644
--- a/src/com/dabomstew/pkrandom/constants/Gen4Constants.java
+++ b/src/com/dabomstew/pkrandom/constants/Gen4Constants.java
@@ -851,12 +851,13 @@ public class Gen4Constants {
         // ban specific pokemon hold items, berries, apricorns, mail
         nonBadItems = allowedItems.copy();
 
-        nonBadItems.banSingles(Items.oddKeystone, Items.griseousOrb, Items.lightBall, Items.oranBerry);
+        nonBadItems.banSingles(Items.oddKeystone, Items.griseousOrb, Items.soulDew, Items.lightBall,
+                Items.oranBerry, Items.quickPowder);
         nonBadItems.banRange(Items.shoalSalt,2);
         nonBadItems.banRange(Items.growthMulch, 4); // mulch
         nonBadItems.banRange(Items.adamantOrb, 2); // orbs
         nonBadItems.banRange(Items.mail1, 12); // mails
-        nonBadItems.banRange(Items.figyBerry, 54); // berries DansGame
+        nonBadItems.banRange(Items.figyBerry, 25); // berries without useful battle effects
         nonBadItems.banRange(Items.luckyPunch, 4); // pokemon specific
         nonBadItems.banRange(Items.redScarf, 5); // contest scarves