X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Ftool.h;h=59dd501f51de3a75b0694ff42cf47cf6c18df6cd;hb=b3b075ea02034306256b486dd45410aa765f035a;hp=cc2401a0d49637e043396798d7f6d7112677bb53;hpb=562ac3bce9fae076562bd2e92e7d330c296ac1b0;p=dragonfireclient.git

diff --git a/src/tool.h b/src/tool.h
index cc2401a0d..59dd501f5 100644
--- a/src/tool.h
+++ b/src/tool.h
@@ -1,72 +1,85 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef TOOL_HEADER
-#define TOOL_HEADER
+#pragma once
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 #include <string>
 #include <iostream>
-#include <map>
+#include "itemgroup.h"
+#include <json/json.h>
+
+struct ItemDefinition;
 
 struct ToolGroupCap
 {
-	std::map<int, float> times;
-	float maxwear;
-	int maxlevel;
+	std::unordered_map<int, float> times;
+	int maxlevel = 1;
+	int uses = 20;
 
-	ToolGroupCap():
-		maxwear(0.05),
-		maxlevel(1)
-	{}
+	ToolGroupCap() = default;
 
 	bool getTime(int rating, float *time) const
 	{
-		std::map<int, float>::const_iterator i = times.find(rating);
-		if(i == times.end()){
+		std::unordered_map<int, float>::const_iterator i = times.find(rating);
+		if (i == times.end()) {
 			*time = 0;
 			return false;
 		}
 		*time = i->second;
 		return true;
 	}
+
+	void toJson(Json::Value &object) const;
+	void fromJson(const Json::Value &json);
 };
 
+
+typedef std::unordered_map<std::string, struct ToolGroupCap> ToolGCMap;
+typedef std::unordered_map<std::string, s16> DamageGroup;
+
 struct ToolCapabilities
 {
 	float full_punch_interval;
 	int max_drop_level;
-	std::map<std::string, ToolGroupCap> groupcaps;
+	ToolGCMap groupcaps;
+	DamageGroup damageGroups;
+	int punch_attack_uses;
 
 	ToolCapabilities(
-			float full_punch_interval_=3.0,
-			int max_drop_level_=1,
-			std::map<std::string, ToolGroupCap> groupcaps_ =
-					std::map<std::string, ToolGroupCap>()
+			float full_punch_interval_ = 1.4f,
+			int max_drop_level_ = 1,
+			const ToolGCMap &groupcaps_ = ToolGCMap(),
+			const DamageGroup &damageGroups_ = DamageGroup(),
+			int punch_attack_uses_ = 0
 	):
 		full_punch_interval(full_punch_interval_),
 		max_drop_level(max_drop_level_),
-		groupcaps(groupcaps_)
+		groupcaps(groupcaps_),
+		damageGroups(damageGroups_),
+		punch_attack_uses(punch_attack_uses_)
 	{}
 
-	void serialize(std::ostream &os) const;
+	void serialize(std::ostream &os, u16 version) const;
 	void deSerialize(std::istream &is);
+	void serializeJson(std::ostream &os) const;
+	void deserializeJson(std::istream &is);
 };
 
 struct DigParams
@@ -76,36 +89,53 @@ struct DigParams
 	float time;
 	// Caused wear
 	u16 wear;
+	std::string main_group;
 
-	DigParams(bool a_diggable=false, float a_time=0, u16 a_wear=0):
+	DigParams(bool a_diggable = false, float a_time = 0.0f, u16 a_wear = 0,
+			const std::string &a_main_group = ""):
 		diggable(a_diggable),
 		time(a_time),
-		wear(a_wear)
+		wear(a_wear),
+		main_group(a_main_group)
 	{}
 };
 
-DigParams getDigParams(const std::map<std::string, int> &groups,
-		const ToolCapabilities *tp, float time_from_last_punch);
-
-DigParams getDigParams(const std::map<std::string, int> &groups,
+DigParams getDigParams(const ItemGroupList &groups,
 		const ToolCapabilities *tp);
 
 struct HitParams
 {
 	s16 hp;
-	s16 wear;
+	u16 wear;
 
-	HitParams(s16 hp_=0, s16 wear_=0):
+	HitParams(s16 hp_ = 0, u16 wear_ = 0):
 		hp(hp_),
 		wear(wear_)
 	{}
 };
 
-HitParams getHitParams(const std::map<std::string, int> &groups,
+HitParams getHitParams(const ItemGroupList &armor_groups,
 		const ToolCapabilities *tp, float time_from_last_punch);
 
-HitParams getHitParams(const std::map<std::string, int> &groups,
+HitParams getHitParams(const ItemGroupList &armor_groups,
 		const ToolCapabilities *tp);
 
-#endif
+struct PunchDamageResult
+{
+	bool did_punch = false;
+	int damage = 0;
+	int wear = 0;
+
+	PunchDamageResult() = default;
+};
+
+struct ItemStack;
+
+PunchDamageResult getPunchDamage(
+		const ItemGroupList &armor_groups,
+		const ToolCapabilities *toolcap,
+		const ItemStack *punchitem,
+		float time_from_last_punch
+);
 
+f32 getToolRange(const ItemDefinition &def_selected, const ItemDefinition &def_hand);