games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fix mana limiter

Browse Source
This commit is contained in:
nordsoft
2023-10-11 01:43:24 +02:00
parent 6093f042dd
commit 2b88e6941c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rewardable/Info.cpp
View File

@@ -112,7 +112,7 @@ void Rewardable::Info::configureLimiter(Rewardable::Configuration & object, CRan
limiter.heroLevel = JsonRandom::loadValue(source["heroLevel"], rng) limiter.heroLevel = JsonRandom::loadValue(source["heroLevel"], rng)
+ JsonRandom::loadValue(source["minLevel"], rng); // VCMI 1.1 compatibilty + JsonRandom::loadValue(source["minLevel"], rng); // VCMI 1.1 compatibilty
limiter.manaPercentage = JsonRandom::loadValue(source["manaPercentage"], rng, -1); limiter.manaPercentage = JsonRandom::loadValue(source["manaPercentage"], rng);
limiter.manaPoints = JsonRandom::loadValue(source["manaPoints"], rng); limiter.manaPoints = JsonRandom::loadValue(source["manaPoints"], rng);
limiter.resources = JsonRandom::loadResources(source["resources"], rng); limiter.resources = JsonRandom::loadResources(source["resources"], rng);

8
lib/rewardable/Limiter.cpp
View File

@@ -27,7 +27,7 @@ Rewardable::Limiter::Limiter()
, daysPassed(0) , daysPassed(0)
, heroExperience(0) , heroExperience(0)
, heroLevel(-1) , heroLevel(-1)
, manaPercentage(-1) , manaPercentage(0)
, manaPoints(0) , manaPoints(0)
, primary(GameConstants::PRIMARY_SKILLS, 0) , primary(GameConstants::PRIMARY_SKILLS, 0)
{ {
@@ -177,9 +177,9 @@ void Rewardable::Limiter::loadComponents(std::vector<Component> & comps,
if (heroLevel) if (heroLevel)
comps.emplace_back(Component::EComponentType::EXPERIENCE, 1, heroLevel, 0); comps.emplace_back(Component::EComponentType::EXPERIENCE, 1, heroLevel, 0);
if (manaPoints || manaPercentage >= 0) if (manaPoints || manaPercentage > 0)
{ {
int absoluteMana = (h->manaLimit() && manaPercentage >= 0) ? (manaPercentage * h->mana / h->manaLimit() / 100) : 0; int absoluteMana = h->manaLimit() ? (manaPercentage * h->mana / h->manaLimit() / 100) : 0;
comps.emplace_back(Component::EComponentType::PRIM_SKILL, 5, absoluteMana + manaPoints, 0); comps.emplace_back(Component::EComponentType::PRIM_SKILL, 5, absoluteMana + manaPoints, 0);
} }
@@ -223,7 +223,7 @@ void Rewardable::Limiter::serializeJson(JsonSerializeFormat & handler)
handler.serializeInt("dayOfWeek", dayOfWeek); handler.serializeInt("dayOfWeek", dayOfWeek);
handler.serializeInt("daysPassed", daysPassed); handler.serializeInt("daysPassed", daysPassed);
resources.serializeJson(handler, "resources"); resources.serializeJson(handler, "resources");
handler.serializeInt("manaPercentage", manaPercentage, -1); handler.serializeInt("manaPercentage", manaPercentage);
handler.serializeInt("heroExperience", heroExperience); handler.serializeInt("heroExperience", heroExperience);
handler.serializeInt("heroLevel", heroLevel); handler.serializeInt("heroLevel", heroLevel);
handler.serializeIdArray("heroes", heroes); handler.serializeIdArray("heroes", heroes);