From edb8a1f79dfa3ce530951a7372bc60aeac02d4fa Mon Sep 17 00:00:00 2001
From: Arthur Uzulin <fuj1nman@hotmail.com>
Date: Sun, 17 Nov 2013 22:38:30 +1100
Subject: [PATCH] More achievement stuffs

- Added 3 more achievements (+1 NYI)
---
 resources/assets/tinker/lang/en_US.lang           |   8 ++++++++
 .../items/achievementIcons/enemySlayer.png        | Bin 0 -> 507 bytes
 .../items/achievementIcons/preparedFight.png      | Bin 0 -> 488 bytes
 src/tconstruct/common/TContent.java               |   5 ++++-
 src/tconstruct/items/TitleIcon.java               |   2 +-
 src/tconstruct/util/TCraftingHandler.java         |   1 +
 src/tconstruct/util/TEventHandler.java            |  10 +++++++++-
 src/tconstruct/util/TEventHandlerAchievement.java |   6 +++++-
 8 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 resources/assets/tinker/textures/items/achievementIcons/enemySlayer.png
 create mode 100644 resources/assets/tinker/textures/items/achievementIcons/preparedFight.png

diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang
index 7a71ef61..2fbfdb43 100644
--- a/resources/assets/tinker/lang/en_US.lang
+++ b/resources/assets/tinker/lang/en_US.lang
@@ -568,8 +568,16 @@ achievement.tconstruct.beginner=Learning to Tinker
 achievement.tconstruct.pattern=Stencil Worker
 achievement.tconstruct.tinkerer=Tinkerer
 achievement.tconstruct.proTinkerer=Pro Tinkerer
+achievement.tconstruct.smelteryMaker=Smeltery Creator
+achievement.tconstruct.preparedFight=Prepared to Fight
+achievement.tconstruct.enemySlayer=Enemy Slayer
+achievement.tconstruct.convenientDuo=Convenient Duo(NYI)
 
 achievement.tconstruct.beginner.desc=Open the "Materials and You" manual
 achievement.tconstruct.pattern.desc=Craft your first blank pattern
 achievement.tconstruct.tinkerer.desc=Create your first tool
 achievement.tconstruct.proTinkerer.desc=Craft your first tier 2 tool
+achievement.tconstruct.smelteryMaker.desc=Craft a smeltery component
+achievement.tconstruct.preparedFight.desc=Create your first weapon
+achievement.tconstruct.enemySlayer.desc=Slay an enemy
+achievement.tconstruct.convenientDuo=Kill an enemy with a frying pan, and then cook their meat in it
diff --git a/resources/assets/tinker/textures/items/achievementIcons/enemySlayer.png b/resources/assets/tinker/textures/items/achievementIcons/enemySlayer.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed167221e076eadb9fa22756814a3ac1e6a776ae
GIT binary patch
literal 507
zcmV<X0R;YuP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3t*5AS1@N9*Y0~0f<RN
zK~y-)os&OE!%z^$zi6RICE7?ysY|<Ags32hf`6uFks>+?cIi;+A{PHF;v~4VSsYXp
zrOpx&x1<%Ev`dGkI8;F*iWqcIL{K`MgCrPh6?4<^?tS;&`yG#ggAkg%Waf=d#QQ!0
zZ5)SUzkmiO;$wFeS6S)*&Xv$Gt#=I2eBq3`CME~~nC}-2HBJC<e|w3=!%lEs7U%Ld
zzB=d98I)wXMhioYQ}r%S6b@5X5U8{}NcEh}u)1gol>lJj{s5EuDdch)*Pd4F`vgc*
z3T%K!E}g+Zdp9=LmMxtPqMP?1?H@<aYzrQT#%shSS!SM|Uw(!pMw6r^R5IiX(h@3F
zLc=r?iP^>$qe=R%bD0U}Wo-pXN})HvqrAEYKYZ{<lcXGN)_}7eOwX*)^jjZzF$hD^
zKi9VvVSZb$jloT}h&}BAhN6QPgK+a63+|r{M%ginOwA!*Sc0$>VGKpbyYc#G6UHo_
xxSFuD9zzMbZDg}v_bFe=JNcOn04!im;sflOvpT_*&v*a;002ovPDHLkV1ncG&$R#m

literal 0
HcmV?d00001

diff --git a/resources/assets/tinker/textures/items/achievementIcons/preparedFight.png b/resources/assets/tinker/textures/items/achievementIcons/preparedFight.png
new file mode 100644
index 0000000000000000000000000000000000000000..56bc99c9961aa703861169ebc5018d3af20ec203
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3t*55(gK=t}6fl0d+}4
zK~y-)ol`wX0$~__t`rHuP_UC)j3x=JAP9n@rMpEWbZN*2heI18$XeP8T5OIG3f(m%
zXt>LvO_v7mprHs3D(Rz!vVx-FZ94J%>F3_*<$J#8eV+IE_&8Xov1pWxzSjzQej^3%
z@CfcT6+KqS^%{d~kpI7Os!}HDxJao=nT$2K){9Ju697EiU1PI23Xj``%eNaeE1#wJ
zP%RYNxL``0zG@|+K!CErAXSfMsGG7;jSN&tA(mf6D3M3bZbw1WuzWhuraV0~j*bHW
zz`;9__C+wU){m#zNJrbxFRz_L62l2nC52ewid0FVRHaOFLd;}a3@50SXEPd)+hqdk
zHHOLU6==IT_~3;voFMt+pe;DlL2`A6k{?sxML(FV0|0^<f&1xsO&Q!~FOX9o!DJo0
z=!b)MLX{Ny(}0j`frO=Xlqy>YW(1DOIzHL^uR}NkJh%1Xa6g7BbdzNR@48BJ@>YIk
e4}eBsR_Yr@ZoXpZ6+n0Z0000<MNUMnLSTYsX36OQ

literal 0
HcmV?d00001

diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java
index 311bf597..d44de802 100644
--- a/src/tconstruct/common/TContent.java
+++ b/src/tconstruct/common/TContent.java
@@ -2412,6 +2412,9 @@ public class TContent implements IFuelHandler
     	achievements.put("tconstruct.beginner", new Achievement(2001, "tconstruct.beginner", 0, 0, manualBook, null).setIndependent().registerAchievement());
     	achievements.put("tconstruct.pattern", new Achievement(2002, "tconstruct.pattern", 2, 1, blankPattern, achievements.get("tconstruct.beginner")).registerAchievement());
     	achievements.put("tconstruct.tinkerer", new Achievement(2003, "tconstruct.tinkerer", 2, 2, new ItemStack(titleIcon, 1, 4096), achievements.get("tconstruct.pattern")).registerAchievement());
-    	achievements.put("tconstruct.proTinkerer", new Achievement(2004, "tconstruct.proTinkerer", 4, 3, new ItemStack(titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")).setSpecial().registerAchievement());
+    	achievements.put("tconstruct.preparedFight", new Achievement(2004, "tconstruct.preparedFight", 1, 3, new ItemStack(titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")).registerAchievement());
+    	achievements.put("tconstruct.proTinkerer", new Achievement(2005, "tconstruct.proTinkerer", 4, 3, new ItemStack(titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial().registerAchievement());
+    	achievements.put("tconstruct.smelteryMaker", new Achievement(2006, "tconstruct.smelteryMaker", -2, -1, smeltery, achievements.get("tconstruct.beginner")).registerAchievement());
+    	achievements.put("tconstruct.enemySlayer", new Achievement(2007, "tconstruct.enemySlayer", 0, 5, new ItemStack(titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")).registerAchievement());
     }
 }
diff --git a/src/tconstruct/items/TitleIcon.java b/src/tconstruct/items/TitleIcon.java
index 3962470b..a83218c8 100644
--- a/src/tconstruct/items/TitleIcon.java
+++ b/src/tconstruct/items/TitleIcon.java
@@ -27,7 +27,7 @@ public class TitleIcon extends Item
     int[] secondaryColor = { 0x1567BF, 0xFFEC6E };
     String[] mobNames = { "TConstruct.EdibleSlime", "TConstruct.KingSlime" };
     
-    String[] achievementIconNames = new String[] {"tinkerer", "proTinkerer"};
+    String[] achievementIconNames = new String[] {"tinkerer", "preparedFight", "proTinkerer", "enemySlayer"};
     Icon[] achievementIcons = new Icon[achievementIconNames.length];
     
     public TitleIcon(int par1)
diff --git a/src/tconstruct/util/TCraftingHandler.java b/src/tconstruct/util/TCraftingHandler.java
index 34b1a116..a632d75a 100644
--- a/src/tconstruct/util/TCraftingHandler.java
+++ b/src/tconstruct/util/TCraftingHandler.java
@@ -42,6 +42,7 @@ public class TCraftingHandler implements ICraftingHandler
                     tags.setBoolean("smelteryManual", true);
                     AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.manualBook, 1, 2));
                 }
+                player.addStat(TAchievements.achievements.get("tconstruct.smelteryMaker"), 1);
             }
         }
     }
diff --git a/src/tconstruct/util/TEventHandler.java b/src/tconstruct/util/TEventHandler.java
index 0024e72e..2074937d 100644
--- a/src/tconstruct/util/TEventHandler.java
+++ b/src/tconstruct/util/TEventHandler.java
@@ -1,5 +1,7 @@
 package tconstruct.util;
 
+import tconstruct.achievements.TAchievements;
+
 import java.util.Random;
 
 import net.minecraft.block.Block;
@@ -402,7 +404,13 @@ public class TEventHandler
     @ForgeSubscribe
     public void onLivingDeath (LivingDeathEvent event)
     {
-
+    	Entity cause = event.source.getSourceOfDamage();
+    	if(cause != null && cause instanceof EntityPlayer){
+    		EntityPlayer murderer = (EntityPlayer)cause;
+    		if(murderer.getHeldItem().getItem() instanceof Weapon){
+    			murderer.addStat(TAchievements.achievements.get("tconstruct.enemySlayer"), 1);
+    		}
+    	}
     }
 
     void addDrops (LivingDropsEvent event, ItemStack dropStack)
diff --git a/src/tconstruct/util/TEventHandlerAchievement.java b/src/tconstruct/util/TEventHandlerAchievement.java
index 4deacfd9..eb04a650 100644
--- a/src/tconstruct/util/TEventHandlerAchievement.java
+++ b/src/tconstruct/util/TEventHandlerAchievement.java
@@ -5,7 +5,7 @@ import net.minecraftforge.event.ForgeSubscribe;
 import tconstruct.achievements.TAchievements;
 import tconstruct.blocks.logic.ToolForgeLogic;
 import tconstruct.library.event.ToolCraftedEvent;
-import tconstruct.library.tools.ToolCore;
+import tconstruct.library.tools.*;
 
 public class TEventHandlerAchievement {
 
@@ -14,6 +14,10 @@ public class TEventHandlerAchievement {
 		if(event.player != null && !(event.player instanceof FakePlayer)){
 			event.player.addStat(TAchievements.achievements.get("tconstruct.tinkerer"), 1);
 			
+			if(event.tool != null && event.tool.getItem() instanceof Weapon){
+				event.player.addStat(TAchievements.achievements.get("tconstruct.preparedFight"), 1);
+			}
+			
 			if(event.inventory != null && event.inventory instanceof ToolForgeLogic && event.tool.getItem() instanceof ToolCore && ((ToolCore)event.tool.getItem()).durabilityTypeExtra() != 0){
 				event.player.addStat(TAchievements.achievements.get("tconstruct.proTinkerer"), 1);
 			}