From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 16 Oct 2011 22:58:38 +0000 (+0300)
Subject: Fix punching of oerkkis
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=cfd19dcdb5ad7b623b3b7961577af6e9bbe18520;p=zefram%2Fminetest%2Fminetest_engine.git

Fix punching of oerkkis
---

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 9569b658..61a2df25 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -684,11 +684,25 @@ std::string Oerkki1SAO::getStaticData()
 	return os.str();
 }
 
-u16 Oerkki1SAO::punch(const std::string &toolname, v3f dir)
+u16 Oerkki1SAO::punch(const std::string &toolname, v3f dir,
+		const std::string &playername)
 {
 	m_speed_f += dir*12*BS;
 
-	u16 amount = 20;
+	u16 amount = 5;
+	/* See tool names in inventory.h */
+	if(toolname == "WSword")
+		amount = 10;
+	if(toolname == "STSword")
+		amount = 12;
+	if(toolname == "SteelSword")
+		amount = 16;
+	if(toolname == "STAxe")
+		amount = 7;
+	if(toolname == "SteelAxe")
+		amount = 9;
+	if(toolname == "SteelPick")
+		amount = 7;
 	doDamage(amount);
 	return 65536/100;
 }
diff --git a/src/content_sao.h b/src/content_sao.h
index a335c12b..f0ebf4f6 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -96,7 +96,8 @@ public:
 	std::string getClientInitializationData();
 	std::string getStaticData();
 	InventoryItem* createPickedUpItem(){return NULL;}
-	u16 punch(const std::string &toolname, v3f dir);
+	u16 punch(const std::string &toolname, v3f dir,
+			const std::string &playername);
 	bool isPeaceful(){return false;}
 private:
 	void doDamage(u16 d);