From e065d68f71d887a730d29ef2e9237e07f0335d09 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 20 Oct 2016 01:48:09 -0400 Subject: [PATCH] v0.4.3a: implemented a halloween treat --- core/src/main/assets/items.png | Bin 14158 -> 14454 bytes .../items/food/Pasty.java | 43 +++++++++++++----- .../sprites/ItemSpriteSheet.java | 3 +- .../messages/items/items.properties | 6 ++- 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/core/src/main/assets/items.png b/core/src/main/assets/items.png index 776fe23c6767aea4de06631a12e9352dc7d10b38..73a8e0a49085be8d3045762bd3bca1cccba1ea7f 100644 GIT binary patch literal 14454 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 GZ~hMnluVxh literal 14158 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 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java index db8a6d1c1..537a88493 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java @@ -24,6 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Recharging; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; @@ -37,7 +38,7 @@ public class Pasty extends Food { private enum Holiday{ NONE, EASTER, //TBD - HALLOWEEN,//TBD + HWEEN,//2nd week of october though first day of november XMAS //3rd week of december through first week of january } @@ -45,18 +46,25 @@ public class Pasty extends Food { static{ final Calendar calendar = Calendar.getInstance(); - holiday = Holiday.NONE; - //we add 1 to turn it into standard calendar months (1-12 instead of 0-11) - switch(calendar.get(Calendar.MONTH)+1){ - case 1: - if (calendar.get(Calendar.WEEK_OF_MONTH) == 1){ - holiday = Holiday.XMAS; - } + switch(calendar.get(Calendar.MONTH)){ + default: + holiday = Holiday.NONE; break; - case 12: - if (calendar.get(Calendar.WEEK_OF_MONTH) >= 3){ + case Calendar.JANUARY: + if (calendar.get(Calendar.WEEK_OF_MONTH) == 1) + holiday = Holiday.XMAS; + break; + case Calendar.OCTOBER: + if (calendar.get(Calendar.WEEK_OF_MONTH) >= 2) + holiday = Holiday.HWEEN; + break; + case Calendar.NOVEMBER: + if (calendar.get(Calendar.DAY_OF_MONTH) == 1) + holiday = Holiday.HWEEN; + break; + case Calendar.DECEMBER: + if (calendar.get(Calendar.WEEK_OF_MONTH) >= 3) holiday = Holiday.XMAS; - } break; } } @@ -67,7 +75,11 @@ public class Pasty extends Food { case NONE: name = Messages.get(this, "pasty"); image = ItemSpriteSheet.PASTY; - break; + break; + case HWEEN: + name = Messages.get(this, "pie"); + image = ItemSpriteSheet.PUMPKIN_PIE; + break; case XMAS: name = Messages.get(this, "cane"); image = ItemSpriteSheet.CANDY_CANE; @@ -88,6 +100,11 @@ public class Pasty extends Food { switch(holiday){ case NONE: default: break; //do nothing extra + case HWEEN: + //heals for 10% max hp + hero.HP = Math.min(hero.HP + hero.HT/10, hero.HT); + hero.sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 ); + break; case XMAS: Buff.affect( hero, Recharging.class, 2f ); //half of a charge ScrollOfRecharging.charge( hero ); @@ -101,6 +118,8 @@ public class Pasty extends Food { switch(holiday){ case NONE: default: return Messages.get(this, "pasty_desc"); + case HWEEN: + return Messages.get(this, "pie_desc"); case XMAS: return Messages.get(this, "cane_desc"); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index ecfc9ff8a..651d8805f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -241,7 +241,8 @@ public class ItemSpriteSheet { public static final int BLANDFRUIT = FOOD+4; public static final int RATION = FOOD+5; public static final int PASTY = FOOD+6; - public static final int CANDY_CANE = FOOD+7; + public static final int PUMPKIN_PIE = FOOD+7; + public static final int CANDY_CANE = FOOD+8; private static final int QUEST = xy(1, 26); //32 slots public static final int SKULL = QUEST+0; diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index 3a7b83dfc..d29edb833 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -368,10 +368,12 @@ items.food.overpricedration.eat_msg=That food tasted ok. items.food.overpricedration.desc=It looks exactly like a standard ration of food but smaller. items.food.pasty.pasty=pasty +items.food.pasty.pie=pumpkin pie items.food.pasty.cane=candy cane -items.food.food.pasty_desc=This is authentic Cornish pasty with traditional filling of beef and potato. -items.food.food.cane_desc=A huge sugary sweet candy cane! It's big enough to fill you up, and the sugar might give your wands a tiny bit of extra charge too.\n\nHappy Holidays! +items.food.pasty.pasty_desc=This is authentic Cornish pasty with traditional filling of beef and potato. +items.food.pasty.pie_desc=A great big slice of pumpkin pie! Its sweet and spicy flavor will fill you up and give you a tiny bit of healing.\n\nHappy Halloween! +items.food.pasty.cane_desc=A huge sugary sweet candy cane! It's big enough to fill you up, and the sugar might give your wands a tiny bit of extra charge too.\n\nHappy Holidays!