games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity
73019c204d
vcmi/lib/BattleFieldHandler.cpp

93 lines
2.0 KiB
C++
Raw Normal View History

battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
/*
Vlc obstacles [part 1] (#888) * obstacles content handler, entity service and VLC integration
2022-09-15 10:06:54 +02:00
* BattleFieldHandler.cpp, part of VCMI engine
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h"
#include <vcmi/Entity.h>
#include "BattleFieldHandler.h"
vcmi: a bunch of forward definitions
2023-05-05 23:45:09 +02:00
#include "JsonNode.h"
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined preparation for having client and server in a single process
2022-07-26 15:07:42 +02:00
VCMI_LIB_NAMESPACE_BEGIN
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
BattleFieldInfo * BattleFieldHandler::loadFromJson(const std::string & scope, const JsonNode & json, const std::string & identifier, size_t index)
{
Finalization of refactoring: - Entity interface now has getNameTranslated & getNameTextID methods - Entity interface no longer has getName method - removed (most) usages of normalizeIndentifier workaround method - all moddable objects have identifier in form of mod:name - all moddable object register strings in form of mod.type.name
2023-01-18 23:56:01 +02:00
assert(identifier.find(':') == std::string::npos);
vcmi: modernize rest of lib
2023-03-13 23:26:44 +02:00
auto * info = new BattleFieldInfo(BattleField(index), identifier);
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
Always use ResourcePath for referencing images and animations
2023-08-23 14:07:50 +02:00
info->graphics = ImagePath::fromJson(json["graphics"]);
Finalization of refactoring: - Entity interface now has getNameTranslated & getNameTextID methods - Entity interface no longer has getName method - removed (most) usages of normalizeIndentifier workaround method - all moddable objects have identifier in form of mod:name - all moddable object register strings in form of mod.type.name
2023-01-18 23:56:01 +02:00
info->icon = json["icon"].String();
info->name = json["name"].String();
vcmi: modernize rest of lib
2023-03-13 23:26:44 +02:00
for(const auto & b : json["bonuses"].Vector())
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
{
Finalization of refactoring: - Entity interface now has getNameTranslated & getNameTextID methods - Entity interface no longer has getName method - removed (most) usages of normalizeIndentifier workaround method - all moddable objects have identifier in form of mod:name - all moddable object register strings in form of mod.type.name
2023-01-18 23:56:01 +02:00
auto bonus = JsonUtils::parseBonus(b);
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
vcmi: split bonus to enumerator and HeroBonus.h
2023-05-01 00:20:01 +02:00
bonus->source = BonusSource::TERRAIN_OVERLAY;
Renamed new types for consistency with code style
2023-10-21 13:50:42 +02:00
bonus->sid = BonusSourceID(info->getId());
vcmi: split bonus to enumerator and HeroBonus.h
2023-05-01 00:20:01 +02:00
bonus->duration = BonusDuration::ONE_BATTLE;
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
Finalization of refactoring: - Entity interface now has getNameTranslated & getNameTextID methods - Entity interface no longer has getName method - removed (most) usages of normalizeIndentifier workaround method - all moddable objects have identifier in form of mod:name - all moddable object register strings in form of mod.type.name
2023-01-18 23:56:01 +02:00
info->bonuses.push_back(bonus);
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
}
Finalization of refactoring: - Entity interface now has getNameTranslated & getNameTextID methods - Entity interface no longer has getName method - removed (most) usages of normalizeIndentifier workaround method - all moddable objects have identifier in form of mod:name - all moddable object register strings in form of mod.type.name
2023-01-18 23:56:01 +02:00
info->isSpecial = json["isSpecial"].Bool();
for(auto node : json["impassableHexes"].Vector())
vcmi: modernize rest of lib
2023-03-13 23:26:44 +02:00
info->impassableHexes.emplace_back(node.Integer());
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
return info;
}
Integrated defaultMods into mod system
2023-03-15 21:34:29 +02:00
std::vector<JsonNode> BattleFieldHandler::loadLegacyData()
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
{
return std::vector<JsonNode>();
}
const std::vector<std::string> & BattleFieldHandler::getTypeNames() const
{
Replace redundant types with `auto` for the lvalues of template factory functions for smart pointers grep -r --include \*.h --include \*.cpp "= std::" * | grep -v auto | grep -Po ".*[^ ]+ [^ ]+ [^ ]*[ ]*=.*;" | grep -v "auto\|int\|char\|bool\|float|\double\|for\|if\|googletest\|fuzzylite\|size_t\|using\|return" | grep -v double | grep -v si64 | grep -v si32 | grep -v ui32 | grep \< | grep -v float | tr -d '\t' | grep -v assert > redundant_types.txt import re with open("redundant_types.txt") as f: for line in f: line = line.strip() path = line.split(":", 1)[0] original_code = ":".join(line.split(":")[1:]).strip() print() print(path) print(original_code) prefix = "auto " if original_code.startswith("static"): static = True else: static = False cpp_type = " ".join(original_code.split("=")[0].strip().split(" ")[0:-1]) print(cpp_type) if static: new_code = "static auto "+ " ".join(original_code.split(" ")[2:]) else: new_code = "auto "+ " ".join(original_code.split(" ")[1:]) print(new_code) if True: with open(path, "r") as f: filedata = f.read() filedata = filedata.replace(original_code, new_code) with open(path, "w") as f: f.write(filedata)
2024-01-17 14:50:00 +02:00
static auto std::vector<std::string> types = std::vector<std::string> { "battlefield" };
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
return types;
}
int32_t BattleFieldInfo::getIndex() const
{
return battlefield.getNum();
}
int32_t BattleFieldInfo::getIconIndex() const
{
return iconIndex;
}
Finalization of refactoring: - Entity interface now has getNameTranslated & getNameTextID methods - Entity interface no longer has getName method - removed (most) usages of normalizeIndentifier workaround method - all moddable objects have identifier in form of mod:name - all moddable object register strings in form of mod.type.name
2023-01-18 23:56:01 +02:00
std::string BattleFieldInfo::getJsonKey() const
{
return identifier;
}
std::string BattleFieldInfo::getNameTextID() const
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
{
return name;
}
Finalization of refactoring: - Entity interface now has getNameTranslated & getNameTextID methods - Entity interface no longer has getName method - removed (most) usages of normalizeIndentifier workaround method - all moddable objects have identifier in form of mod:name - all moddable object register strings in form of mod.type.name
2023-01-18 23:56:01 +02:00
std::string BattleFieldInfo::getNameTranslated() const
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
{
Finalization of refactoring: - Entity interface now has getNameTranslated & getNameTextID methods - Entity interface no longer has getName method - removed (most) usages of normalizeIndentifier workaround method - all moddable objects have identifier in form of mod:name - all moddable object register strings in form of mod.type.name
2023-01-18 23:56:01 +02:00
return name; // TODO?
battlefields in VLC and custom bonuses for terrain patches
2022-06-28 10:05:30 +02:00
}
void BattleFieldInfo::registerIcons(const IconRegistar & cb) const
{
//cb(getIconIndex(), "BATTLEFIELD", icon);
}
BattleField BattleFieldInfo::getId() const
{
return battlefield;
wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined preparation for having client and server in a single process
2022-07-26 15:07:42 +02:00
}
VCMI_LIB_NAMESPACE_END
Reference in New Issue Copy Permalink