Flat life on hit affix

4 files changed, 68 insertions, 19 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/affixes/AffixMods.java b/src/main/java/darkknight/jewelrycraft/affixes/AffixMods.java
index 2ac5319..266d70d 100644
--- a/src/main/java/darkknight/jewelrycraft/affixes/AffixMods.java
+++ b/src/main/java/darkknight/jewelrycraft/affixes/AffixMods.java
@@ -52,6 +52,10 @@ public class AffixMods {
 		ModifierEffect health5 = new HealthAffix(5);
 		ModifierEffect health6 = new HealthAffix(6);
 
+		ModifierEffect hitheal1 = new FlatLifeHitAffix(1);
+		ModifierEffect hitheal2 = new FlatLifeHitAffix(2);
+		ModifierEffect hitheal3 = new FlatLifeHitAffix(3);
+
 		prefixes.put("health1", health1);
 		prefixes.put("health2", health2);
 		prefixes.put("health3", health3);
@@ -62,9 +66,9 @@ public class AffixMods {
 		suffixes.put("health1", health1);
 		suffixes.put("health2", health2);
 		suffixes.put("health3", health3);
-		suffixes.put("health4", health4);
-		suffixes.put("health5", health5);
-		suffixes.put("health6", health6);
+		suffixes.put("hitheal1", hitheal1);
+		suffixes.put("hitheal2", hitheal2);
+		suffixes.put("hitheal3", hitheal3);
 
 		WeightedRandomAffix wraHealth1 = new WeightedRandomAffix("health1", 10);
 		WeightedRandomAffix wraHealth2 = new WeightedRandomAffix("health2", 8);
@@ -73,6 +77,10 @@ public class AffixMods {
 		WeightedRandomAffix wraHealth5 = new WeightedRandomAffix("health5", 2);
 		WeightedRandomAffix wraHealth6 = new WeightedRandomAffix("health6", 1);
 
+		WeightedRandomAffix wraHitheal1 = new WeightedRandomAffix("hitheal1", 9);
+		WeightedRandomAffix wraHitheal2 = new WeightedRandomAffix("hitheal2", 8);
+		WeightedRandomAffix wraHitheal3 = new WeightedRandomAffix("hitheal3", 7);
+
 		generalPrefixGen.add(wraHealth1);
 		generalPrefixGen.add(wraHealth2);
 		generalPrefixGen.add(wraHealth3);
@@ -92,10 +100,12 @@ public class AffixMods {
 		ringSuffixGen.add(wraHealth2);
 		braceletSuffixGen.add(wraHealth2);
 		braceletSuffixGen.add(wraHealth3);
-		necklaceSuffixGen.add(wraHealth4);
-		necklaceSuffixGen.add(wraHealth5);
-		earringsSuffixGen.add(wraHealth5);
-		earringsSuffixGen.add(wraHealth6);
+
+		generalSuffixGen.add(wraHitheal1);
+		braceletSuffixGen.add(wraHitheal1);
+		braceletSuffixGen.add(wraHitheal2);
+		necklaceSuffixGen.add(wraHitheal2);
+		necklaceSuffixGen.add(wraHitheal3);
 	}
 
 	public static ModifierEffect getPrefix(String prefix) {
diff --git a/src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java b/src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java
index ec7b044..cbfc4ef 100644
--- a/src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java
+++ b/src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java
@@ -27,4 +27,4 @@ public class DamageAffix extends ModifierEffect {
 		event.ammount *= mult;
 		event.ammount += affFlat;
 	}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/affixes/FlatLifeHitAffix.java b/src/main/java/darkknight/jewelrycraft/affixes/FlatLifeHitAffix.java
new file mode 100644
index 0000000..d11cc41
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/affixes/FlatLifeHitAffix.java
@@ -0,0 +1,27 @@
+package darkknight.jewelrycraft.affixes;
+
+import darkknight.jewelrycraft.api.ModifierEffect;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.event.entity.living.LivingAttackEvent;
+
+public class FlatLifeHitAffix extends ModifierEffect {
+	private int amount;
+
+	public FlatLifeHitAffix(int amount) {
+		super(null);
+
+		this.amount = amount;
+	}
+
+	@Override
+	public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry,
+			LivingAttackEvent event) {
+		if (target instanceof EntityLiving) {
+			player.heal(amount);
+		}
+	}
+}
diff --git a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang
index b87ee5e..47ee386 100755
--- a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang
+++ b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang
@@ -197,18 +197,30 @@ achievement.jewelrycraft.pentagram.desc=§4Challenge:§7 Do not steal health fro
 

 challenge.failed=You failed the challenge:

 

-prefix.jewelrycraft2.health1=Bright

-prefix.jewelrycraft2.health2=Solar

-prefix.jewelrycraft2.health3=Vivid

-

-prefix.jewelrycraft2.health1.desc=+1/2 Heart

-prefix.jewelrycraft2.health2.desc=+1 Heart

-prefix.jewelrycraft2.health3.desc=+3/2 Hearts

+prefix.jewelrycraft2.health1=Hale

+prefix.jewelrycraft2.health2=Healthy

+prefix.jewelrycraft2.health3=Sanguine

+prefix.jewelrycraft2.health4=Stalwart

+prefix.jewelrycraft2.health5=Stout

+prefix.jewelrycraft2.health6=Robust

+

+prefix.jewelrycraft2.health1.desc=+1 Health

+prefix.jewelrycraft2.health2.desc=+2 Health

+prefix.jewelrycraft2.health3.desc=+3 Health

+prefix.jewelrycraft2.health4.desc=+4 Health

+prefix.jewelrycraft2.health5.desc=+5 Health

+prefix.jewelrycraft2.health6.desc=+6 Health

 

 suffix.jewelrycraft2.health1=of the Jackal

 suffix.jewelrycraft2.health2=of the Fox

 suffix.jewelrycraft2.health3=of the Wolf

-

-suffix.jewelrycraft2.health1.desc=+1/2 Heart

-suffix.jewelrycraft2.health2.desc=+1 Heart

-suffix.jewelrycraft2.health3.desc=+3/2 Hearts
\ No newline at end of file
+suffix.jewelrycraft2.hitheal1=of Rejuvination

+suffix.jewelrycraft2.hitheal2=of Restoration

+suffix.jewelrycraft2.hitheal3=of Regrowth

+

+suffix.jewelrycraft2.health1.desc=+1 Health

+suffix.jewelrycraft2.health2.desc=+2 Health

+suffix.jewelrycraft2.health3.desc=+3 Health

+suffix.jewelrycraft2.hitheal1.desc=+1 Health on striking an enemy

+suffix.jewelrycraft2.hitheal2.desc=+2 Health on striking an enemy

+suffix.jewelrycraft2.hitheal3.desc=+3 Health on striking an enemy
\ No newline at end of file