From e2595b1730a1180bdeec633853ae6c0cd7b3b1df Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Fri, 20 Nov 2020 22:33:55 -0500
Subject: [PATCH] v0.9.1: implemented a T2 on-eat talent for each hero

---
 .../main/assets/interfaces/talent_icons.png   | Bin 1130 -> 1375 bytes
 .../assets/messages/actors/actors.properties  |   8 ++++--
 .../actors/buffs/ArtifactRecharge.java        |  19 ++++++++++++---
 .../actors/hero/Hero.java                     |   5 ++++
 .../actors/hero/Talent.java                   |  23 ++++++++++++++----
 .../items/artifacts/HornOfPlenty.java         |  11 +++++++--
 .../items/food/Food.java                      |   7 ++++--
 .../exotic/ScrollOfMysticalEnergy.java        |   2 +-
 .../items/spells/WildEnergy.java              |   2 +-
 9 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/core/src/main/assets/interfaces/talent_icons.png b/core/src/main/assets/interfaces/talent_icons.png
index 1e7b26125816a3ab80a6f25349489b485f182964..073d0be528e9ee57d50b53a48561a96bb7a2349c 100644
GIT binary patch
delta 1324
zcmV+{1=ITK2;T~jBp_o@OjJbx00029005x>|NsC000000003djnVFfU034A)B!2+^
z005Z)|1&cHSSGk)xMx^B%*@Q0k6i!HGXKQo{{SlQlg=+Usq+8;00DGTPE!Ct=GbNc
z00gQ@L_t(|0b*caL;(y8fOgG8*L52Rq7dzI!rOaq|NoWIk{W0|q@{F`z&r2VD+<mA
zm=hMQ;&4QHzdJ(f%g^^ml%LD}|9{Rv0ARd?3=jfBg`F@6`uSeit+1hh{eBjJ0|F)k
zNX!C$bIbyesR;Pp(WrnJBVYo6f%(%V=Rb@9rv+I38FogW0^$hv2@?RH-()1bfZfC-
zAg&46Pc$kZssJ!81prF|V&?*4!Y=_%cWwb#6c8r?W&r&PIE&yW2pS-17k_}UARq#k
zze53M#`#&~F$l&E9OnEcs3w5*G1qrG1I7f#7=Uvh7r+4&04@;|Km%zY_4QML`5P7x
z6IlT4&&9$1fV%)U$-v;eXuSqva9-LM!0C^}1rQ1Wj7|+}0vMednmh&>U~o&o<^V!%
z31kCY2vT1Yz-OUmAB7oUFn<EE8NiXL05?Gz$Rn*U1<*jly+96NBR>NGyK=;PcK{@`
zz7RkIjW$Caw8O0lz!6$s2F4Nkx!!M@9|MoU1dO0S7=*n5VZXwL0&vMk;kgY)@jd{!
zbO0>Q^eBMaI4qCf1g!~#z7Hq`<a+S7KLPCLbAo~S0SY)IyZ}s00)Ju>aCK$(r2sFi
zO#$rYkm4{W_}?9NSrQP}1c0<DfbDGL9uPS10d4_H0-_;HKm=T0r@!{kcOiiJ;b+5|
zfXvXJ0PW``zach60PBsRLjl^)`~1Ec$|M0akOorUp#W`%eg3%}<{A$S&WqM}xCx2?
zH~*ag?(%`rsX^=eJAVfCeSqZW5^w^T35M49_aLP21Hk+S1^6XE14w9ncLKDZXW#E<
zzzlD|{LuQ&1pI1;*9B;Rn<KPdKmY6Z+vd;hFtH)XwCZmJt-tw)Y$kw9I$$<n!&1Pl
zg92FIsesfD-`$UYz;+m*f{BOI0<0d72GFH|=mju8kX5(|@P9x7HxrY9m;^jMjS{*P
z5GMf!2K`oytbmGu*tvj60r&Tu0n^(cxEb(pQb06%UII~OfP5=PR=`OC-EM;H=aHcR
zpb&tn0DT|Op8$Oyur7cG(m?C`6QJ#|E&+kTdC~gr1?X1;Auu{MbT2^rc|8XG0x&rF
zxe&CzKLPqaKz}F&&_Et(eUAdz&;JDh^HCu69SG>L9d1Ct^D_m!9I;-n_pe9j=Ue6n
zP+tOG0A7T(dgWCJ!gd0HH=uqByuX`(_xCK|!{Gz~p8%ExfC9co8WNCt0eruG1GVRX
zcM5o~3Sj-`Cq5Siq<<mf8?6Y)&CvJm`}@1r3|Vf&Mt@lVr+*T_`cE^kBmfj((Rpb>
zK%4{^+6;LC&vgN;2Q2@vl0R7RpV!2X8Q5MxtOzhDfIPz}1+X4z1q>_sL(c!h-wg>c
z1HhnP33wi1ejA?@@Cg;5`4g6$o1hukUI6=f7z~i|&jRev2?4AJ>zDJlC!l;E0PX^5
z=;l9{0DldnL0MnGGqu$vAnh<1JEUQL3cxc@0S4zq>sRtOxe00j3P?je1{s|iRs}!>
zG<giNpZ80ED)d1p8{k6F`sE#<(FY-YA3y>1M`0SsqguV<^0)UWEd9LxpP_m)<c@-}
iz69+yL%-VLKLCVp2G=Szmu&z5002ovPDHLkU;%<C*Fs7F

delta 1077
zcmV-51j_s03hD@uBpp#uOjJbx00029005x>|Ns9000930003djnVFf9L?nOzGcy2K
zCTCbZ%*@Q0k6i!HGXDT7-7iB#00001bW%=J06^y0W&i*K$4Nv%RCodHn}?3;It)Z(
z<-||hd&~cS=!+x|E<<~J2`FT4v4nsC=75w;Zg#aA_Ox21J<a#)J^lFp&oxK@yGLq*
zlt>F&|FRAUV6*uLfRV&RfU19g0RA)T1VGLi3IG`7zdoA(aVO{)K;DT>RRMtYUtm;O
z0P9Je0LUHyaw`DPGk{!WOF-#vj)49FoMdzeA_7u91t{tgz)8{RN!B$e^CT^s{{pDr
z4A>DU+5u4Ra|R;<fJ&s@0`lJxfLzr8Q2v~a<qtXqbVw!{*P}lGN`HUGGe|Q4vM&E!
zT!R8Im=Y*CKw2t+N}#BlS78Adip>3gW&osw4nYy<s26Ae%F1Q{l&4nOn+u=|0LOOt
z(*VF~9`8Tj?CHJzLH#q8fXRH47fyo{PMc5afB-nB0>HGv%;o`bZUp<jBLdJhP>f*@
z!4XFMJYWu>#iMOR0J(nvm>dl9j{q=MSpZC$0OShb;(`*71r!5-x<RTP+X0R=0Pq%o
z>;WLf0HAg_>kLTBd(aW^7Jyu2OW>T#%lfx`9uk23W3%Bs08K+c0GbD65CHj~q}?(A
z#TN|`0r+`<@o$@<rV2m=>cYnd1z_4?<KIjLRpUv<^>Fb~4?%wez~sLHpi@4{x-j_o
zpx2<82RQ#K0Sf@x18jWES7AR7z@C2sU`s#*sIu`f0r+_U$iL}|ByEs?Y<xrj$9DK#
z0N&8mo_>0NIRBCoUp0U<RsGd3>tFy>((U$_e-;2-8+8Jpw!=5KyFaKM1|gVq*D-)>
z0mwfz6ea=g1mJ&aQYQfN1fYn)eJjQSpicl<0B&!m4A3+PlL2?#1F#ujr(mW6`UIeU
zo+bf+82~y3;O7DF1CZ}dZUNs8`x0=HaXtD3PzkUIK-T3yJOJO%&#ysS0HEZT|M&p>
zJiuuVKm_{f1=P=f0)Q@npa72T@aF;C-wVLQp5BZ9{QiG%{(<EZumE^)n#F%phXVkQ
zuzU+VJrw{?PYuAckpTcNKtKSR2e5tI!qR)dlK?y|0#N+R3oj7?XdbX#Z@1f}W~lmx
zN}>T!`d0voe<=h)0>~49tpxxx0QbuP6c5FJKmd6G02lzsf6*L(;!6sI22cpV;J*@Z
zzmxoz^{amXUI+@n{=NV*Q2iqSls~Tlu=9k70Os=mbPCj^$$yoA2-Jm(4+_Ax!^n23
z%k~z)y>0;+*Tcuh2au8g)TO@$WnCD;1DMYPR02ZbUxXR~6@rV82w*-B5P;=ZVG(F6
v8y^*bod@`z3@tZ9<|;7p5dj?A;r{{i1>>h$hB6IA00000NkvXXu0mjfzU0wi

diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties
index 52816e900..b784eec6f 100644
--- a/core/src/main/assets/messages/actors/actors.properties
+++ b/core/src/main/assets/messages/actors/actors.properties
@@ -324,6 +324,8 @@ actors.hero.talent.test_subject.title=test subject
 actors.hero.talent.test_subject.desc=_+1:_ Whenever the Warrior identifies an item, he heals for _2 HP_.\n\n_+2:_ Whenever the Warrior identifies an item, he heals for _3 HP_.
 actors.hero.talent.iron_will.title=iron will
 actors.hero.talent.iron_will.desc=_+1:_ The max shield provided by the Warrior's seal is _increased by 1_.\n\n_+2:_ The max shield provided by the Warrior's seal is _increased by 2_.
+actors.hero.talent.iron_stomach.title=iron stomach
+actors.hero.talent.iron_stomach.desc=_+1:_ Eating food takes the Warrior 1 turn and grants him _75% damage resistance_ while eating.\n\n_+1:_ Eating food takes the Warrior 1 turn and grants him _100% damage resistance_ while eating.
 
 actors.hero.talent.empowering_meal.title=empowering meal
 actors.hero.talent.empowering_meal.desc=_+1:_ Eating food grants the Mage _2 bonus damage_ on his next 3 wand zaps.\n\n_+1:_ Eating food grants the Mage _3 bonus damage_ on his next 3 wand zaps.
@@ -334,7 +336,7 @@ actors.hero.talent.tested_hypothesis.desc=_+1:_ Whenever the Mage identifies an
 actors.hero.talent.backup_barrier.title=backup barrier
 actors.hero.talent.backup_barrier.desc=_+1:_ The Mage gains _3 shielding_ whenever he spends the last charge in his staff.\n\n_+2:_ The Mage gains _5 shielding_ whenever he spends the last charge in his staff.
 actors.hero.talent.energizing_meal.title=energizing meal
-actors.hero.talent.energizing_meal.desc=_+1:_ Eating food grants the Mage _5 turns of wand recharging_.\n\n_+2:_ Eating food grants the Mage _8 turns of wand recharging_.
+actors.hero.talent.energizing_meal.desc=_+1:_ Eating food takes the Mage 1 turn and grants him _5 turns of wand recharging_.\n\n_+1:_ Eating food takes the Mage 1 turn and grants him _8 turns of wand recharging_.
 actors.hero.talent.energizing_upgrade.title=energizing upgrade
 actors.hero.talent.energizing_upgrade.desc=_+1:_ The Mage's staff recharges for _1 extra charge_ whenever the Mage upgrades it.\n\n_+2:_ The Mage's staff recharges for _2 extra charges_ whenever the Mage upgrades it.
 
@@ -346,6 +348,8 @@ actors.hero.talent.sucker_punch.title=sucker punch
 actors.hero.talent.sucker_punch.desc=_+1:_ The Rogue deals _1-2 bonus damage_ the first time he surprise attacks an enemy.\n\n_+2:_ The Rogue deals _2 bonus damage_ the first time he surprise attacks an enemy.
 actors.hero.talent.protective_shadows.title=protective shadows
 actors.hero.talent.protective_shadows.desc=_+1:_ The Rogue gains one shielding _every other turn_ his cloak is activated, _to a max of 3_.\n\n_+2:_ The Rogue gains one shielding _every turn_ his cloak is activated, _to a max of 5_.
+actors.hero.talent.mystical_meal.title=mystical meal
+actors.hero.talent.mystical_meal.desc=_+1:_ Eating food takes the Rogue 1 turn and grants him _3 turns of artifact recharging_.\n\n_+2:_ Eating food takes the rogue 1 turn and grants him _5 turns of artifact recharging_.\n\nThis talent cannot be used to let the horn of plenty recharge itself.
 
 actors.hero.talent.natures_bounty.title=nature's bounty
 actors.hero.talent.natures_bounty.desc=_+1:_ The Huntress can find _4 berries_ hidden in tall grass as she explores the earlier stages of the dungeon.\n\n_+2:_ The Huntress can find _6 berries_ hidden in tall grass as she explores the earlier stages of the dungeon.
@@ -356,7 +360,7 @@ actors.hero.talent.followup_strike.desc=_+1:_ When the Huntress hits an enemy wi
 actors.hero.talent.natures_aid.title=nature's aid
 actors.hero.talent.natures_aid.desc=_+1:_ The Huntress gains 2 armor of barkskin for _4 turns_ when a plant is trampled in her vision.\n\n_+2:_ The Huntress gains 2 armor of barkskin for _6 turns_ when a plant is trampled in her vision.
 actors.hero.talent.invigorating_meal.title=invigorating meal
-actors.hero.talent.invigorating_meal.desc=_+1:_ Eating food takes 1 turn and grants the Huntress _1 turn of haste_.\n\n_+2:_ Eating food takes 1 turn and grants the Huntress _2 turns of haste_.
+actors.hero.talent.invigorating_meal.desc=_+1:_ Eating food takes the Huntress 1 turn (berries are eaten instantly) and grants her _2 turns of haste_.\n\n_+1:_ Eating food takes the Huntress 1 turn (berries are eaten instantly) and grants her _3 turns of haste_.
 
 actors.hero.hero.name=you
 actors.hero.hero.leave=You can't leave yet, the rest of the dungeon awaits below!
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ArtifactRecharge.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ArtifactRecharge.java
index a15a313e5..46aec3f84 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ArtifactRecharge.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ArtifactRecharge.java
@@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.Artifact;
+import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.HornOfPlenty;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.watabou.noosa.Image;
@@ -38,6 +39,7 @@ public class ArtifactRecharge extends Buff {
 	}
 
 	private int left;
+	public boolean ignoreHornOfPlenty;
 	
 	@Override
 	public boolean act() {
@@ -46,10 +48,14 @@ public class ArtifactRecharge extends Buff {
 			Belongings b = ((Hero) target).belongings;
 			
 			if (b.artifact instanceof Artifact){
-				((Artifact)b.artifact).charge((Hero)target);
+				if (!(b.artifact instanceof HornOfPlenty) || !ignoreHornOfPlenty) {
+					((Artifact) b.artifact).charge((Hero) target);
+				}
 			}
 			if (b.misc instanceof Artifact){
-				((Artifact)b.misc).charge((Hero)target);
+				if (!(b.misc instanceof HornOfPlenty) || !ignoreHornOfPlenty) {
+					((Artifact) b.misc).charge((Hero) target);
+				}
 			}
 		}
 		
@@ -63,12 +69,14 @@ public class ArtifactRecharge extends Buff {
 		return true;
 	}
 	
-	public void set( int amount ){
+	public ArtifactRecharge set( int amount ){
 		left = amount;
+		return this;
 	}
 	
-	public void prolong( int amount ){
+	public ArtifactRecharge prolong( int amount ){
 		left += amount;
+		return this;
 	}
 	
 	@Override
@@ -97,16 +105,19 @@ public class ArtifactRecharge extends Buff {
 	}
 	
 	private static final String LEFT = "left";
+	private static final String IGNORE_HORN = "ignore_horn";
 	
 	@Override
 	public void storeInBundle(Bundle bundle) {
 		super.storeInBundle(bundle);
 		bundle.put( LEFT, left );
+		bundle.put( IGNORE_HORN, ignoreHornOfPlenty );
 	}
 	
 	@Override
 	public void restoreFromBundle(Bundle bundle) {
 		super.restoreFromBundle(bundle);
 		left = bundle.getInt(LEFT);
+		ignoreHornOfPlenty = bundle.getBoolean(IGNORE_HORN);
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
index 3741abfca..82a1adfd8 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
@@ -1137,6 +1137,11 @@ public class Hero extends Char {
 			dmg -= AntiMagic.drRoll(belongings.armor.buffedLvl());
 		}
 
+		if (buff(Talent.WarriorFoodImmunity.class) != null){
+			if (pointsInTalent(Talent.IRON_STOMACH) == 1)       dmg = Math.round(dmg*0.25f);
+			else if (pointsInTalent(Talent.IRON_STOMACH) == 2)  dmg = Math.round(dmg*0.00f);
+		}
+
 		int preHP = HP + shielding();
 		super.damage( dmg, src );
 		int postHP = HP + shielding();
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
index dd965a831..4c7a23002 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
@@ -24,8 +24,10 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.hero;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ArtifactRecharge;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.CounterBuff;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FlavourBuff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Haste;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Recharging;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.WandEmpower;
@@ -33,6 +35,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
+import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.HornOfPlenty;
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
@@ -55,7 +58,7 @@ public enum Talent {
 	ARMSMASTERS_INTUITION(1),
 	TEST_SUBJECT(2),
 	IRON_WILL(3),
-	TEST_WARRIOR_T2_1(4),
+	IRON_STOMACH(4),
 	TEST_WARRIOR_T2_2(5),
 	TEST_WARRIOR_T2_3(6),
 	TEST_WARRIOR_T2_4(7),
@@ -75,7 +78,7 @@ public enum Talent {
 	THIEFS_INTUITION(33),
 	SUCKER_PUNCH(34),
 	PROTECTIVE_SHADOWS(35),
-	TEST_ROGUE_T2_1(36),
+	MYSTICAL_MEAL(36),
 	TEST_ROGUE_T2_2(37),
 	TEST_ROGUE_T2_3(38),
 	TEST_ROGUE_T2_4(39),
@@ -144,7 +147,7 @@ public enum Talent {
 	public static class CachedRationsDropped extends CounterBuff{};
 	public static class NatureBerriesAvailable extends CounterBuff{};
 
-	public static void onFoodEaten( Hero hero, float foodVal ){
+	public static void onFoodEaten( Hero hero, float foodVal, Item foodSource ){
 		if (hero.hasTalent(HEARTY_MEAL)){
 			//3/5 HP healed, when hero is below 25% health
 			if (hero.HP <= hero.HT/4) {
@@ -156,6 +159,9 @@ public enum Talent {
 				hero.sprite.emitter().burst(Speck.factory(Speck.HEALING), 1+hero.pointsInTalent(HEARTY_MEAL));
 			}
 		}
+		if (hero.hasTalent(IRON_STOMACH)){
+			Buff.affect(hero, WarriorFoodImmunity.class, 1f);
+		}
 		if (hero.hasTalent(EMPOWERING_MEAL)){
 			//2/3 bonus wand damage for next 3 zaps
 			Buff.affect( hero, WandEmpower.class).set(1 + hero.pointsInTalent(EMPOWERING_MEAL), 3);
@@ -166,12 +172,19 @@ public enum Talent {
 			Buff.affect( hero, Recharging.class, 2 + 3*(hero.pointsInTalent(ENERGIZING_MEAL)) );
 			ScrollOfRecharging.charge( hero );
 		}
+		if (hero.hasTalent(MYSTICAL_MEAL)){
+			//3/5 turns of recharging
+			Buff.affect( hero, ArtifactRecharge.class).set(1 + 2*(hero.pointsInTalent(MYSTICAL_MEAL))).ignoreHornOfPlenty = foodSource instanceof HornOfPlenty;
+			ScrollOfRecharging.charge( hero );
+		}
 		if (hero.hasTalent(INVIGORATING_MEAL)){
 			//effectively 1/2 turns of haste
 			Buff.affect( hero, Haste.class, 0.67f+hero.pointsInTalent(INVIGORATING_MEAL));
 		}
 	}
 
+	public static class WarriorFoodImmunity extends FlavourBuff{};
+
 	public static float itemIDSpeedFactor( Hero hero, Item item ){
 		// 1.75x/2.5x speed with huntress talent
 		float factor = 1f + hero.pointsInTalent(SURVIVALISTS_INTUITION)*0.75f;
@@ -287,13 +300,13 @@ public enum Talent {
 		//tier 2+
 		switch (cls){
 			case WARRIOR: default:
-				Collections.addAll(tierTalents, TEST_WARRIOR_T2_1, TEST_WARRIOR_T2_2, TEST_WARRIOR_T2_3, TEST_WARRIOR_T2_4, TEST_WARRIOR_T2_5);
+				Collections.addAll(tierTalents, IRON_STOMACH, TEST_WARRIOR_T2_2, TEST_WARRIOR_T2_3, TEST_WARRIOR_T2_4, TEST_WARRIOR_T2_5);
 				break;
 			case MAGE:
 				Collections.addAll(tierTalents, ENERGIZING_MEAL, ENERGIZING_UPGRADE, TEST_MAGE_T2_3, TEST_MAGE_T2_4, TEST_MAGE_T2_5);
 				break;
 			case ROGUE:
-				Collections.addAll(tierTalents, TEST_ROGUE_T2_1, TEST_ROGUE_T2_2, TEST_ROGUE_T2_3, TEST_ROGUE_T2_4, TEST_ROGUE_T2_5);
+				Collections.addAll(tierTalents, MYSTICAL_MEAL, TEST_ROGUE_T2_2, TEST_ROGUE_T2_3, TEST_ROGUE_T2_4, TEST_ROGUE_T2_5);
 				break;
 			case HUNTRESS:
 				Collections.addAll(tierTalents, INVIGORATING_MEAL, TEST_HUNTRESS_T2_2, TEST_HUNTRESS_T2_3, TEST_HUNTRESS_T2_4, TEST_HUNTRESS_T2_5);
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java
index dc10be4ce..4fb01cc15 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java
@@ -98,7 +98,7 @@ public class HornOfPlenty extends Artifact {
 				if (chargesToUse > charge) chargesToUse = charge;
 				hunger.satisfy(satietyPerCharge * chargesToUse);
 
-				Talent.onFoodEaten(hero, satietyPerCharge * chargesToUse);
+				Talent.onFoodEaten(hero, satietyPerCharge * chargesToUse, this);
 
 				Statistics.foodEaten++;
 
@@ -110,7 +110,14 @@ public class HornOfPlenty extends Artifact {
 				Sample.INSTANCE.play(Assets.Sounds.EAT);
 				GLog.i( Messages.get(this, "eat") );
 
-				hero.spend(Food.TIME_TO_EAT);
+				if (Dungeon.hero.hasTalent(Talent.IRON_STOMACH)
+						|| Dungeon.hero.hasTalent(Talent.ENERGIZING_MEAL)
+						|| Dungeon.hero.hasTalent(Talent.MYSTICAL_MEAL)
+						|| Dungeon.hero.hasTalent(Talent.INVIGORATING_MEAL)){
+					hero.spend(Food.TIME_TO_EAT - 2);
+				} else {
+					hero.spend(Food.TIME_TO_EAT);
+				}
 
 				Badges.validateFoodEaten();
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java
index 037ad8a45..983366170 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java
@@ -74,7 +74,7 @@ public class Food extends Item {
 			satisfy(hero);
 			GLog.i( message );
 
-			Talent.onFoodEaten(hero, energy);
+			Talent.onFoodEaten(hero, energy, this);
 			
 			hero.sprite.operate( hero.pos );
 			hero.busy();
@@ -90,7 +90,10 @@ public class Food extends Item {
 	}
 
 	protected float eatingTime(){
-		if (Dungeon.hero.hasTalent(Talent.INVIGORATING_MEAL)){
+		if (Dungeon.hero.hasTalent(Talent.IRON_STOMACH)
+			|| Dungeon.hero.hasTalent(Talent.ENERGIZING_MEAL)
+			|| Dungeon.hero.hasTalent(Talent.MYSTICAL_MEAL)
+			|| Dungeon.hero.hasTalent(Talent.INVIGORATING_MEAL)){
 			return TIME_TO_EAT - 2;
 		} else {
 			return TIME_TO_EAT;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfMysticalEnergy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfMysticalEnergy.java
index 90c900959..bed201078 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfMysticalEnergy.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfMysticalEnergy.java
@@ -39,7 +39,7 @@ public class ScrollOfMysticalEnergy extends ExoticScroll {
 	public void doRead() {
 		
 		//append buff
-		Buff.affect(curUser, ArtifactRecharge.class).set( 30 );
+		Buff.affect(curUser, ArtifactRecharge.class).set( 30 ).ignoreHornOfPlenty = false;
 
 		Sample.INSTANCE.play( Assets.Sounds.READ );
 		Sample.INSTANCE.play( Assets.Sounds.CHARGEUP );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java
index 89006834d..0a483e6f8 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java
@@ -64,7 +64,7 @@ public class WildEnergy extends TargetedSpell {
 				}
 
 				Buff.affect(hero, Recharging.class, 8f);
-				Buff.affect(hero, ArtifactRecharge.class).prolong( 8 );
+				Buff.affect(hero, ArtifactRecharge.class).prolong( 8 ).ignoreHornOfPlenty = false;
 				
 				detach( curUser.belongings.backpack );
 				updateQuickslot();