games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Gem class is now Sorceress

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-30 23:34:27 +02:00
parent 3abc26e789
commit 7992144763
5 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/adventureMap/CList.cpp
View File

@@ -263,7 +263,7 @@ void CHeroList::CHeroItem::showTooltip()
std::string CHeroList::CHeroItem::getHoverText() std::string CHeroList::CHeroItem::getHoverText()
{ {
return boost::str(boost::format(CGI->generaltexth->allTexts[15]) % hero->getNameTranslated() % hero->type->heroClass->getNameTranslated()); return boost::str(boost::format(CGI->generaltexth->allTexts[15]) % hero->getNameTranslated() % hero->getClassNameTranslated());
} }
void CHeroList::CHeroItem::gesture(bool on, const Point & initialPosition, const Point & finalPosition) void CHeroList::CHeroItem::gesture(bool on, const Point & initialPosition, const Point & finalPosition)

6
client/windows/CHeroWindow.cpp
View File

@@ -190,7 +190,7 @@ void CHeroWindow::update(const CGHeroInstance * hero, bool redrawNeeded)
assert(hero == curHero); assert(hero == curHero);
name->setText(curHero->getNameTranslated()); name->setText(curHero->getNameTranslated());
title->setText((boost::format(CGI->generaltexth->allTexts[342]) % curHero->level % curHero->type->heroClass->getNameTranslated()).str()); title->setText((boost::format(CGI->generaltexth->allTexts[342]) % curHero->level % curHero->getClassNameTranslated()).str());
specArea->text = curHero->type->getSpecialtyDescriptionTranslated(); specArea->text = curHero->type->getSpecialtyDescriptionTranslated();
specImage->setFrame(curHero->type->imageIndex); specImage->setFrame(curHero->type->imageIndex);
@@ -199,8 +199,8 @@ void CHeroWindow::update(const CGHeroInstance * hero, bool redrawNeeded)
tacticsButton = std::make_shared<CToggleButton>(Point(539, 483), AnimationPath::builtin("hsbtns8.def"), std::make_pair(heroscrn[26], heroscrn[31]), 0, EShortcut::HERO_TOGGLE_TACTICS); tacticsButton = std::make_shared<CToggleButton>(Point(539, 483), AnimationPath::builtin("hsbtns8.def"), std::make_pair(heroscrn[26], heroscrn[31]), 0, EShortcut::HERO_TOGGLE_TACTICS);
tacticsButton->addHoverText(CButton::HIGHLIGHTED, CGI->generaltexth->heroscrn[25]); tacticsButton->addHoverText(CButton::HIGHLIGHTED, CGI->generaltexth->heroscrn[25]);
dismissButton->addHoverText(CButton::NORMAL, boost::str(boost::format(CGI->generaltexth->heroscrn[16]) % curHero->getNameTranslated() % curHero->type->heroClass->getNameTranslated())); dismissButton->addHoverText(CButton::NORMAL, boost::str(boost::format(CGI->generaltexth->heroscrn[16]) % curHero->getNameTranslated() % curHero->getClassNameTranslated()));
portraitArea->hoverText = boost::str(boost::format(CGI->generaltexth->allTexts[15]) % curHero->getNameTranslated() % curHero->type->heroClass->getNameTranslated()); portraitArea->hoverText = boost::str(boost::format(CGI->generaltexth->allTexts[15]) % curHero->getNameTranslated() % curHero->getClassNameTranslated());
portraitArea->text = curHero->getBiographyTranslated(); portraitArea->text = curHero->getBiographyTranslated();
portraitImage->setFrame(curHero->getIconIndex()); portraitImage->setFrame(curHero->getIconIndex());

8
client/windows/GUIClasses.cpp
View File

@@ -424,7 +424,7 @@ CLevelWindow::CLevelWindow(const CGHeroInstance * hero, PrimarySkill pskill, std
std::string levelTitleText = CGI->generaltexth->translate("core.genrltxt.445"); std::string levelTitleText = CGI->generaltexth->translate("core.genrltxt.445");
boost::replace_first(levelTitleText, "%s", hero->getNameTranslated()); boost::replace_first(levelTitleText, "%s", hero->getNameTranslated());
boost::replace_first(levelTitleText, "%d", std::to_string(hero->level)); boost::replace_first(levelTitleText, "%d", std::to_string(hero->level));
boost::replace_first(levelTitleText, "%s", hero->type->heroClass->getNameTranslated()); boost::replace_first(levelTitleText, "%s", hero->getClassNameTranslated());
levelTitle = std::make_shared<CLabel>(192, 162, FONT_MEDIUM, ETextAlignment::CENTER, Colors::WHITE, levelTitleText); levelTitle = std::make_shared<CLabel>(192, 162, FONT_MEDIUM, ETextAlignment::CENTER, Colors::WHITE, levelTitleText);
@@ -585,7 +585,7 @@ void CTavernWindow::show(Canvas & to)
//Recruit %s the %s //Recruit %s the %s
if (!recruit->isBlocked()) if (!recruit->isBlocked())
recruit->addHoverText(CButton::NORMAL, boost::str(boost::format(CGI->generaltexth->tavernInfo[3]) % sel->h->getNameTranslated() % sel->h->type->heroClass->getNameTranslated())); recruit->addHoverText(CButton::NORMAL, boost::str(boost::format(CGI->generaltexth->tavernInfo[3]) % sel->h->getNameTranslated() % sel->h->getClassNameTranslated()));
} }
@@ -639,7 +639,7 @@ CTavernWindow::HeroPortrait::HeroPortrait(int & sel, int id, int x, int y, const
description = CGI->generaltexth->allTexts[215]; description = CGI->generaltexth->allTexts[215];
boost::algorithm::replace_first(description, "%s", h->getNameTranslated()); boost::algorithm::replace_first(description, "%s", h->getNameTranslated());
boost::algorithm::replace_first(description, "%d", std::to_string(h->level)); boost::algorithm::replace_first(description, "%d", std::to_string(h->level));
boost::algorithm::replace_first(description, "%s", h->type->heroClass->getNameTranslated()); boost::algorithm::replace_first(description, "%s", h->getClassNameTranslated());
boost::algorithm::replace_first(description, "%d", std::to_string(artifs)); boost::algorithm::replace_first(description, "%d", std::to_string(artifs));
portrait = std::make_shared<CAnimImage>(AnimationPath::builtin("portraitsLarge"), h->getIconIndex()); portrait = std::make_shared<CAnimImage>(AnimationPath::builtin("portraitsLarge"), h->getIconIndex());
@@ -706,7 +706,7 @@ CExchangeWindow::CExchangeWindow(ObjectInstanceID hero1, ObjectInstanceID hero2,
auto genTitle = [](const CGHeroInstance * h) auto genTitle = [](const CGHeroInstance * h)
{ {
boost::format fmt(CGI->generaltexth->allTexts[138]); boost::format fmt(CGI->generaltexth->allTexts[138]);
fmt % h->getNameTranslated() % h->level % h->type->heroClass->getNameTranslated(); fmt % h->getNameTranslated() % h->level % h->getClassNameTranslated();
return boost::str(fmt); return boost::str(fmt);
}; };

18
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -28,7 +28,9 @@
#include "../CCreatureHandler.h" #include "../CCreatureHandler.h"
#include "../CTownHandler.h" #include "../CTownHandler.h"
#include "../mapping/CMap.h" #include "../mapping/CMap.h"
#include "../StartInfo.h"
#include "CGTownInstance.h" #include "CGTownInstance.h"
#include "../campaign/CampaignState.h"
#include "../pathfinder/TurnInfo.h" #include "../pathfinder/TurnInfo.h"
#include "../serializer/JsonSerializeFormat.h" #include "../serializer/JsonSerializeFormat.h"
#include "../mapObjectConstructors/AObjectTypeHandler.h" #include "../mapObjectConstructors/AObjectTypeHandler.h"
@@ -555,7 +557,7 @@ std::string CGHeroInstance::getObjectName() const
{ {
std::string hoverName = VLC->generaltexth->allTexts[15]; std::string hoverName = VLC->generaltexth->allTexts[15];
boost::algorithm::replace_first(hoverName,"%s",getNameTranslated()); boost::algorithm::replace_first(hoverName,"%s",getNameTranslated());
boost::algorithm::replace_first(hoverName,"%s", type->heroClass->getNameTranslated()); boost::algorithm::replace_first(hoverName,"%s", getClassNameTranslated());
return hoverName; return hoverName;
} }
else else
@@ -1099,6 +1101,18 @@ std::string CGHeroInstance::getNameTranslated() const
return VLC->generaltexth->translate(getNameTextID()); return VLC->generaltexth->translate(getNameTextID());
} }
std::string CGHeroInstance::getClassNameTranslated() const
{
return VLC->generaltexth->translate(getClassNameTextID());
}
std::string CGHeroInstance::getClassNameTextID() const
{
if (isCampaignGem())
return "core.genrltxt.735";
return type->heroClass->getNameTranslated();
}
std::string CGHeroInstance::getNameTextID() const std::string CGHeroInstance::getNameTextID() const
{ {
if (!nameCustomTextId.empty()) if (!nameCustomTextId.empty())
@@ -1370,7 +1384,7 @@ PrimarySkill CGHeroInstance::nextPrimarySkill(CRandomGenerator & rand) const
if(primarySkill >= GameConstants::PRIMARY_SKILLS) if(primarySkill >= GameConstants::PRIMARY_SKILLS)
{ {
primarySkill = rand.nextInt(GameConstants::PRIMARY_SKILLS - 1); primarySkill = rand.nextInt(GameConstants::PRIMARY_SKILLS - 1);
logGlobal->error("Wrong values in primarySkill%sLevel for hero class %s", isLowLevelHero ? "Low" : "High", type->heroClass->getNameTranslated()); logGlobal->error("Wrong values in primarySkill%sLevel for hero class %s", isLowLevelHero ? "Low" : "High", getClassNameTranslated());
randomValue = 100 / GameConstants::PRIMARY_SKILLS; randomValue = 100 / GameConstants::PRIMARY_SKILLS;
} }
logGlobal->trace("The hero gets the primary skill %d with a probability of %d %%.", primarySkill, randomValue); logGlobal->trace("The hero gets the primary skill %d with a probability of %d %%.", primarySkill, randomValue);

3
lib/mapObjects/CGHeroInstance.h
View File

@@ -149,6 +149,9 @@ public:
HeroTypeID getPortraitSource() const; HeroTypeID getPortraitSource() const;
int32_t getIconIndex() const; int32_t getIconIndex() const;
std::string getClassNameTranslated() const;
std::string getClassNameTextID() const;
private: private:
std::string getNameTextID() const; std::string getNameTextID() const;
std::string getBiographyTextID() const; std::string getBiographyTextID() const;