games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-29 21:56:54 +02:00
Code Issues Releases Activity

Creature message meta string

Browse Source
This commit is contained in:
nordsoft 2023-09-27 23:25:19 +02:00
parent 0ac893b80f
commit f9f79255c5
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/CGCreature.cpp
View File

@ -108,7 +108,7 @@ void CGCreature::onHeroVisit( const CGHeroInstance * h ) const
{ {
InfoWindow iw; InfoWindow iw;
iw.player = h->tempOwner; iw.player = h->tempOwner;
iw.text.appendRawString(message); iw.text = message;
iw.type = EInfoWindowMode::MODAL; iw.type = EInfoWindowMode::MODAL;
cb->showInfoDialog(&iw); cb->showInfoDialog(&iw);
} }
@ -578,7 +578,7 @@ void CGCreature::serializeJsonOptions(JsonSerializeFormat & handler)
handler.serializeBool("noGrowing", notGrowingTeam); handler.serializeBool("noGrowing", notGrowingTeam);
handler.serializeBool("neverFlees", neverFlees); handler.serializeBool("neverFlees", neverFlees);
handler.serializeString("rewardMessage", message); handler.serializeStruct("rewardMessage", message);
} }
VCMI_LIB_NAMESPACE_END VCMI_LIB_NAMESPACE_END

3
lib/mapObjects/CGCreature.h
View File

@ -11,6 +11,7 @@
#include "CArmedInstance.h" #include "CArmedInstance.h"
#include "../ResourceSet.h" #include "../ResourceSet.h"
#include "../MetaString.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN
@ -27,7 +28,7 @@ public:
ui32 identifier; //unique code for this monster (used in missions) ui32 identifier; //unique code for this monster (used in missions)
si8 character; //character of this set of creatures (0 - the most friendly, 4 - the most hostile) => on init changed to -4 (compliant) ... 10 value (savage) si8 character; //character of this set of creatures (0 - the most friendly, 4 - the most hostile) => on init changed to -4 (compliant) ... 10 value (savage)
std::string message; //message printed for attacking hero MetaString message; //message printed for attacking hero
TResources resources; // resources given to hero that has won with monsters TResources resources; // resources given to hero that has won with monsters
ArtifactID gainedArtifact; //ID of artifact gained to hero, -1 if none ArtifactID gainedArtifact; //ID of artifact gained to hero, -1 if none
bool neverFlees; //if true, the troops will never flee bool neverFlees; //if true, the troops will never flee

2
lib/mapping/MapFormatH3M.cpp
View File

@ -1099,7 +1099,7 @@ CGObjectInstance * CMapLoaderH3M::readMonster(const int3 & mapPosition, const Ob
bool hasMessage = reader->readBool(); bool hasMessage = reader->readBool();
if(hasMessage) if(hasMessage)
{ {
object->message = readLocalizedString(TextIdentifier("monster", mapPosition.x, mapPosition.y, mapPosition.z, "message")); object->message.appendTextID(readLocalizedString(TextIdentifier("monster", mapPosition.x, mapPosition.y, mapPosition.z, "message")));
reader->readResourses(object->resources); reader->readResourses(object->resources);
object->gainedArtifact = reader->readArtifact(); object->gainedArtifact = reader->readArtifact();
} }