games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Restore LF, use JsonKeys for logging, fix BattleHex description

Browse Source
This commit is contained in:
MichalZr6
2025-01-14 10:20:02 +01:00
parent ecdd394bb1
commit a1593948b7
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AI/BattleAI/BattleExchangeVariant.cpp
View File

@@ -349,7 +349,7 @@ MoveTarget BattleExchangeEvaluator::findMoveTowardsUnreachable(
logAi->trace(
"Checking movement towards %d of %s",
enemy->getCount(),
enemy->creatureId().toCreature()->getNameSingularTranslated());
VLC->creatures()->getById(enemy->creatureId())->getJsonKey());
auto distance = dists.distToNearestNeighbour(activeStack, enemy);

56
client/battle/BattleOverlayLogVisualizer.h
View File

@@ -1,28 +1,28 @@
/*
* BattleOverlayLogVisualizer.h, part of VCMI engine
*
* 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
*
*/
#pragma once
#include "../../lib/logging/VisualLogger.h"
#include "BattleRenderer.h"
class Canvas;
class BattleInterface;
class BattleOverlayLogVisualizer : public IBattleOverlayLogVisualizer
{
private:
BattleRenderer::RendererRef & target;
BattleInterface & owner;
public:
BattleOverlayLogVisualizer(BattleRenderer::RendererRef & target, BattleInterface & owner);
void drawText(const BattleHex & hex, int lineNumber, const std::string & text) override;
};
/*
* BattleOverlayLogVisualizer.h, part of VCMI engine
*
* 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
*
*/
#pragma once
#include "../../lib/logging/VisualLogger.h"
#include "BattleRenderer.h"
class Canvas;
class BattleInterface;
class BattleOverlayLogVisualizer : public IBattleOverlayLogVisualizer
{
private:
BattleRenderer::RendererRef & target;
BattleInterface & owner;
public:
BattleOverlayLogVisualizer(BattleRenderer::RendererRef & target, BattleInterface & owner);
void drawText(const BattleHex & hex, int lineNumber, const std::string & text) override;
};

2
lib/CStack.cpp
View File

@@ -167,7 +167,7 @@ std::string CStack::nodeName() const
oss << owner.toString();
oss << " battle stack [" << ID << "]: " << getCount() << " of ";
if(typeID.hasValue())
oss << typeID.toCreature()->getNamePluralTranslated();
oss << typeID.toEntity(VLC)->getJsonKey();
else
oss << "[UNDEFINED TYPE]";

2
lib/battle/BattleHex.h
View File

@@ -28,7 +28,7 @@ class BattleHexArray;
* @brief Represents a battlefield hexagonal tile.
*
* Valid hexes are within the range 0 to 186, excluding some invalid values, ex. castle towers (-2, -3, -4).
* Available hexes are those in the first or last column.
* Available hexes are those valid ones but NOT in the first or last column.
*/
class DLL_LINKAGE BattleHex
{