v0.2.3: Blueberries

core/src/main/assets/messages/actors/actors.properties

@@ -880,7 +880,7 @@ actors.mobs.npcs.blacksmith.desc=This troll blacksmith looks like all trolls loo
 actors.mobs.npcs.gardner.name=gardner
 actors.mobs.npcs.gardner.desc=A common gardner. Or is he? Which gardner would hide in away in the sewers?
 actors.mobs.npcs.gardner.quest=Why I'm hiding in away in the sewers? Well, as you seen, I'm just a common gardener...\n\n_Blueberries_! I want to eat blueberries like crazy! But the season has passed... I heard that there was a blueberry garden on the upper level of this dungeon, then broke in, but the dungeon was dangerous to me so I had to stay at the entrance. Can you help me to pick some blueberries? Little is enough, please.
-actors.mobs.npcs.gardner.reminder=Blueberries... blueberries...
+actors.mobs.npcs.gardner.reminder=blueberry... blueberry...
 actors.mobs.npcs.gardner.def_verb=blocked
 actors.mobs.npcs.gardner.yummy=Tastes better than expected...
 

core/src/main/assets/messages/items/items.properties

@@ -488,7 +488,7 @@ items.food.berry.eat_msg=That berry was tasty!
 items.food.berry.desc=This small berry was found by the huntress among the dungeon's vegetation. It can be eaten quickly, restores a small amount of satiety, and might contain a usable seed!
 
 items.food.blueberry.name=blueberries
-items.food.blueberry.eat_msg=That blueberries were tasty!
+items.food.blueberry.eat_msg=Those blueberries were tasty!
 items.food.blueberry.desc=These small blueberries were found among the blueberry garden. They can be eaten quickly, restore a small amount of satiety.
 
 items.food.blandfruit.name=blandfruit

core/src/main/assets/messages/levels/levels.properties

@@ -12,7 +12,7 @@ levels.features.chasm.rankings_desc=Died on Impact
 levels.rooms.special.berrygardenroom$bush.name=Blueberry bush
 levels.rooms.special.berrygardenroom$bush.desc=A blueberry bush, Have no idea who planted it here.
 levels.rooms.special.berrygardenroom$bush.ripe=A blueberry bush, Have no idea who planted it here.\n\nThe blueberries are ripe, ready to pick.
-levels.rooms.special.berrygardenroom$bush.bloom=A blueberry bush, Have no idea who planted it here.\n\nFlowers blooming. In a few months, this bush will bear blueberries.
+levels.rooms.special.berrygardenroom$bush.bloom=A blueberry bush, Have no idea who planted it here.\n\nFlowers blooming. In a few months, this bush will bear blueberry.
 
 levels.rooms.special.massgraveroom$bones.name=Mass grave
 levels.rooms.special.massgraveroom$bones.desc=Bones litter the floor, what happened here?

core/src/main/java/com/tianscar/carbonizedpixeldungeon/actors/hero/Hero.java

@@ -85,7 +85,7 @@
 import com.tianscar.carbonizedpixeldungeon.items.artifacts.TalismanOfForesight;
 import com.tianscar.carbonizedpixeldungeon.items.artifacts.TimekeepersHourglass;
 import com.tianscar.carbonizedpixeldungeon.items.bags.MagicalHolster;
-import com.tianscar.carbonizedpixeldungeon.items.food.Blueberries;
+import com.tianscar.carbonizedpixeldungeon.items.food.Blueberry;
 import com.tianscar.carbonizedpixeldungeon.items.journal.Guidebook;
 import com.tianscar.carbonizedpixeldungeon.items.keys.CrystalKey;
 import com.tianscar.carbonizedpixeldungeon.items.keys.GoldenKey;
@@ -1976,7 +1976,7 @@ public void onOperateComplete() {
 			if (src instanceof BerryGardenRoom.Bush) {
 				((BerryGardenRoom.Bush) src).frame(0);
 
-				Dungeon.level.drop(new Blueberries().quantity(Random.Int(1, 3)), pos).sprite.drop();
+				Dungeon.level.drop(new Blueberry().quantity(Random.Int(1, 3)), pos).sprite.drop();
 				spend( Key.TIME_TO_UNLOCK );
 			}
 

core/src/main/java/com/tianscar/carbonizedpixeldungeon/actors/mobs/npcs/Gardner.java

@@ -27,7 +27,7 @@
 import com.tianscar.carbonizedpixeldungeon.Dungeon;
 import com.tianscar.carbonizedpixeldungeon.actors.Char;
 import com.tianscar.carbonizedpixeldungeon.actors.buffs.Buff;
-import com.tianscar.carbonizedpixeldungeon.items.food.Blueberries;
+import com.tianscar.carbonizedpixeldungeon.items.food.Blueberry;
 import com.tianscar.carbonizedpixeldungeon.journal.Notes;
 import com.tianscar.carbonizedpixeldungeon.levels.Level;
 import com.tianscar.carbonizedpixeldungeon.levels.rooms.Room;
@@ -100,7 +100,7 @@ public void call() {
 				});
 			}
 			else {
-				Blueberries berries = Dungeon.hero.belongings.getItem(Blueberries.class);
+				Blueberry berries = Dungeon.hero.belongings.getItem(Blueberry.class);
 
 				if (berries != null) {
 

core/src/main/java/com/tianscar/carbonizedpixeldungeon/items/food/Blueberries.java → core/src/main/java/com/tianscar/carbonizedpixeldungeon/items/food/Blueberry.java

@@ -26,10 +26,10 @@
 import com.tianscar.carbonizedpixeldungeon.actors.hero.Talent;
 import com.tianscar.carbonizedpixeldungeon.sprites.ItemSpriteSheet;
 
-public class Blueberries extends Food {
+public class Blueberry extends Food {
 
 	{
-		image = ItemSpriteSheet.BLUEBERRIES;
+		image = ItemSpriteSheet.BLUEBERRY;
 		energy = Hunger.HUNGRY/3f; //100 food value
 
 		bones = false;

core/src/main/java/com/tianscar/carbonizedpixeldungeon/sprites/ItemSpriteSheet.java

@@ -657,7 +657,7 @@ private static void assignItemRect( int item, int width, int height ) {
 	public static final int BLANDFRUIT  = FOOD+10;
 	public static final int BLAND_CHUNKS= FOOD+11;
 	public static final int BERRY       = FOOD+12;
-	public static final int BLUEBERRIES = FOOD+13;
+	public static final int BLUEBERRY = FOOD+13;
 	public static final int CHEESE      = FOOD+14;
 	static{
 		assignItemRect(MEAT,        15, 11);
@@ -673,7 +673,7 @@ private static void assignItemRect( int item, int width, int height ) {
 		assignItemRect(BLANDFRUIT,  9,  12);
 		assignItemRect(BLAND_CHUNKS,14, 6);
 		assignItemRect(BERRY,       9,  11);
-		assignItemRect(BLUEBERRIES, 13, 11);
+		assignItemRect(BLUEBERRY, 13, 11);
 		assignItemRect(CHEESE,      15, 13);
 	}
 

core/src/main/java/com/tianscar/carbonizedpixeldungeon/ui/changelist/carbonizedpd/v0_2_X_Changes.java

@@ -78,7 +78,7 @@ public static void add_v0_2_3_Changes( ArrayList<ChangeInfo> changeInfos ) {
 		changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.CHEESE),
 				Messages.get(Cheese.class, "name"),
 				"在老鼠王的房间会固定刷新一块。效果等价于全肉大饼。"));
-		changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.BLUEBERRIES),
+		changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.BLUEBERRY),
 				"蓝莓花园",
 				"在下水道的每层（Boss层除外）固定刷新一个蓝莓花园（如果是大型层则两个），每个蓝莓花园会刷新1-2个可供采摘的蓝莓丛。蓝莓能回复少量饱食度。"));
 		changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.OVERPRICED),

core/src/main/java/com/tianscar/carbonizedpixeldungeon/windows/WndGardner.java

@@ -25,7 +25,7 @@
 import com.tianscar.carbonizedpixeldungeon.actors.mobs.npcs.Gardner;
 import com.tianscar.carbonizedpixeldungeon.items.Item;
 import com.tianscar.carbonizedpixeldungeon.items.food.Blandfruit;
-import com.tianscar.carbonizedpixeldungeon.items.food.Blueberries;
+import com.tianscar.carbonizedpixeldungeon.items.food.Blueberry;
 import com.tianscar.carbonizedpixeldungeon.messages.Messages;
 import com.tianscar.carbonizedpixeldungeon.scenes.PixelScene;
 import com.tianscar.carbonizedpixeldungeon.sprites.ItemSprite;
@@ -40,7 +40,7 @@ public class WndGardner extends Window {
 	private static final int BTN_HEIGHT = 20;
 	private static final int GAP        = 2;
 
-	public WndGardner(final Blueberries berries) {
+	public WndGardner(final Blueberry berries) {
 
 		super();