X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Ftool.h;h=c2444a834c0100eee6b91cdbb40cd4fece03ead8;hb=refs%2Fheads%2Fmaster;hp=401bb1f53a16f4d0a6ef688814f8b50799ebeb57;hpb=9dd78a8a451a7200bfb68b06e034ffb88e32bcd3;p=dragonfireclient.git diff --git a/src/tool.h b/src/tool.h index 401bb1f53..c2444a834 100644 --- a/src/tool.h +++ b/src/tool.h @@ -1,78 +1,85 @@ /* -Minetest-c55 -Copyright (C) 2010-2011 celeron55, Perttu Ahola +Minetest +Copyright (C) 2010-2013 celeron55, Perttu Ahola 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 #include -#include #include "itemgroup.h" +#include + +struct ItemDefinition; struct ToolGroupCap { - std::map times; - float maxwear; - int maxlevel; + std::unordered_map times; + int maxlevel = 1; + int uses = 20; - ToolGroupCap(): - maxwear(0.05), - maxlevel(1) - {} + ToolGroupCap() = default; bool getTime(int rating, float *time) const { - std::map::const_iterator i = times.find(rating); - if(i == times.end()){ + std::unordered_map::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); }; -// CLANG SUCKS DONKEY BALLS -typedef std::map ToolGCMap; +typedef std::unordered_map ToolGCMap; +typedef std::unordered_map DamageGroup; struct ToolCapabilities { float full_punch_interval; int max_drop_level; - // CLANG SUCKS DONKEY BALLS ToolGCMap groupcaps; + DamageGroup damageGroups; + int punch_attack_uses; ToolCapabilities( - float full_punch_interval_=1.4, - int max_drop_level_=1, - // CLANG SUCKS DONKEY BALLS - ToolGCMap groupcaps_=ToolGCMap() + 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 @@ -81,49 +88,48 @@ struct DigParams // Digging time in seconds float time; // Caused wear - u16 wear; + u32 wear; // u32 because wear could be 65536 (single-use tool) + 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, u32 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 ItemGroupList &groups, - const ToolCapabilities *tp, float time_from_last_punch); - -DigParams getDigParams(const ItemGroupList &groups, - const ToolCapabilities *tp); + const ToolCapabilities *tp, + const u16 initial_wear = 0); struct HitParams { - s16 hp; - s16 wear; + s32 hp; + // Caused wear + u32 wear; // u32 because wear could be 65536 (single-use weapon) - HitParams(s16 hp_=0, s16 wear_=0): + HitParams(s32 hp_ = 0, u32 wear_ = 0): hp(hp_), wear(wear_) {} }; -HitParams getHitParams(const ItemGroupList &groups, - const ToolCapabilities *tp, float time_from_last_punch); +HitParams getHitParams(const ItemGroupList &armor_groups, + const ToolCapabilities *tp, float time_from_last_punch, + u16 initial_wear = 0); -HitParams getHitParams(const ItemGroupList &groups, +HitParams getHitParams(const ItemGroupList &armor_groups, const ToolCapabilities *tp); struct PunchDamageResult { - bool did_punch; - int damage; - int wear; - - PunchDamageResult(): - did_punch(false), - damage(0), - wear(0) - {} + bool did_punch = false; + int damage = 0; + int wear = 0; + + PunchDamageResult() = default; }; struct ItemStack; @@ -132,8 +138,9 @@ PunchDamageResult getPunchDamage( const ItemGroupList &armor_groups, const ToolCapabilities *toolcap, const ItemStack *punchitem, - float time_from_last_punch + float time_from_last_punch, + u16 initial_wear = 0 ); -#endif - +u32 calculateResultWear(const u32 uses, const u16 initial_wear); +f32 getToolRange(const ItemDefinition &def_selected, const ItemDefinition &def_hand);