diff --git a/src/mightypork/rogue/world/entity/impl/EntityBrownRat.java b/src/mightypork/rogue/world/entity/impl/EntityBrownRat.java index b9354cb..8ff9040 100644 --- a/src/mightypork/rogue/world/entity/impl/EntityBrownRat.java +++ b/src/mightypork/rogue/world/entity/impl/EntityBrownRat.java @@ -65,12 +65,12 @@ public class EntityBrownRat extends Entity { { // drop rat stuff - if (Calc.rand.nextInt(2) == 0) { + if (Calc.rand.nextInt(2) != 0) { getLevel().dropNear(getCoord(), Items.MEAT.createItem()); return; } - if (Calc.rand.nextInt(4) == 0) { + if (Calc.rand.nextInt(3) == 0) { getLevel().dropNear(getCoord(), Items.CHEESE.createItem()); return; } diff --git a/src/mightypork/rogue/world/gen/rooms/StorageRoom.java b/src/mightypork/rogue/world/gen/rooms/StorageRoom.java index e3050e0..5c40fa2 100644 --- a/src/mightypork/rogue/world/gen/rooms/StorageRoom.java +++ b/src/mightypork/rogue/world/gen/rooms/StorageRoom.java @@ -17,12 +17,15 @@ public class StorageRoom extends SecretRoom { { int maxStuff = Calc.randInt(rand, 3, 5); - for (int i = 0; i < Calc.randInt(rand, 0, 2); i++) { + // at least one meat or cheese. + boolean oneMeat = rand.nextBoolean(); + + for (int i = 0; i < Calc.randInt(rand, oneMeat ? 1 : 0, 3); i++) { map.addItemInArea(Items.MEAT.createItem(), min, max, 50); if (--maxStuff == 0) return; } - for (int i = 0; i < Calc.randInt(rand, 0, 2); i++) { + for (int i = 0; i < Calc.randInt(rand, oneMeat ? 0 : 1, 2); i++) { map.addItemInArea(Items.CHEESE.createItem(), min, max, 50); if (--maxStuff == 0) return; } diff --git a/src/mightypork/rogue/world/item/Item.java b/src/mightypork/rogue/world/item/Item.java index 80c2eb1..8d3881b 100644 --- a/src/mightypork/rogue/world/item/Item.java +++ b/src/mightypork/rogue/world/item/Item.java @@ -5,15 +5,17 @@ import java.io.IOException; import mightypork.gamecore.logging.Log; import mightypork.gamecore.util.annot.DefaultImpl; +import mightypork.gamecore.util.ion.IonBundle; import mightypork.gamecore.util.ion.IonInput; import mightypork.gamecore.util.ion.IonObjBlob; +import mightypork.gamecore.util.ion.IonObjBundled; import mightypork.gamecore.util.ion.IonOutput; import mightypork.gamecore.util.math.Calc; import mightypork.gamecore.util.math.constraints.rect.Rect; import mightypork.rogue.world.PlayerFacade; -public abstract class Item implements IonObjBlob { +public abstract class Item implements IonObjBundled { private final ItemModel model; private ItemRenderer renderer; @@ -42,17 +44,19 @@ public abstract class Item implements IonObjBlob { @Override @DefaultImpl - public void save(IonOutput out) throws IOException + public void save(IonBundle out) throws IOException { - out.writeIntShort(amount); + out.put("c", amount); + out.put("u", uses); } @Override @DefaultImpl - public void load(IonInput in) throws IOException + public void load(IonBundle in) throws IOException { - amount = in.readIntShort(); + amount = in.get("c", amount); + uses = in.get("u", uses); } diff --git a/src/mightypork/rogue/world/item/ItemModel.java b/src/mightypork/rogue/world/item/ItemModel.java index eab653e..23d5921 100644 --- a/src/mightypork/rogue/world/item/ItemModel.java +++ b/src/mightypork/rogue/world/item/ItemModel.java @@ -3,6 +3,8 @@ package mightypork.rogue.world.item; import java.io.IOException; +import mightypork.gamecore.util.ion.Ion; +import mightypork.gamecore.util.ion.IonBundle; import mightypork.gamecore.util.ion.IonInput; import mightypork.gamecore.util.ion.IonOutput; import mightypork.gamecore.util.math.Calc; @@ -46,7 +48,7 @@ public final class ItemModel { } - public Item loadItem(IonInput in) throws IOException + public Item loadItem(IonBundle in) throws IOException { final Item t = createItem(); t.load(in); @@ -54,11 +56,10 @@ public final class ItemModel { } - public void saveItem(IonOutput out, Item tile) throws IOException + public void saveItem(IonBundle out, Item item) throws IOException { - if (itemClass != tile.getClass()) throw new RuntimeException("Item class mismatch."); - - tile.save(out); + if (itemClass != item.getClass()) throw new RuntimeException("Item class mismatch."); + item.save(out); } diff --git a/src/mightypork/rogue/world/item/Items.java b/src/mightypork/rogue/world/item/Items.java index 66197d8..f981d39 100644 --- a/src/mightypork/rogue/world/item/Items.java +++ b/src/mightypork/rogue/world/item/Items.java @@ -4,6 +4,7 @@ package mightypork.rogue.world.item; import java.io.IOException; import java.util.Collection; +import mightypork.gamecore.util.ion.IonBundle; import mightypork.gamecore.util.ion.IonInput; import mightypork.gamecore.util.ion.IonOutput; import mightypork.rogue.world.item.impl.active.ItemHeartPiece; @@ -64,9 +65,8 @@ public final class Items { public static Item loadItem(IonInput in) throws IOException { final int id = in.readIntByte(); - final ItemModel model = get(id); - return model.loadItem(in); + return model.loadItem(in.readBundle()); } @@ -75,7 +75,10 @@ public final class Items { final ItemModel model = item.getModel(); out.writeIntByte(model.id); - model.saveItem(out, item); + + IonBundle ib = new IonBundle(); + model.saveItem(ib, item); + out.writeBundle(ib); }