games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Fix treasure chests

Browse Source
This commit is contained in:
Ivan Savenko 2023-10-19 15:41:41 +03:00
parent 8f4791914e
commit 01920bb74e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/objects/rewardablePickable.json
View File

@ -235,7 +235,7 @@
}, },
{ {
"appearChance" : { "max" : 33 }, "appearChance" : { "max" : 33 },
"gainedExp" : 1500, "heroExperience" : 1500,
"removeObject" : true, "removeObject" : true,
}, },
{ {
@ -245,7 +245,7 @@
}, },
{ {
"appearChance" : { "min" : 33, "max" : 65 }, "appearChance" : { "min" : 33, "max" : 65 },
"gainedExp" : 1000, "heroExperience" : 1000,
"removeObject" : true, "removeObject" : true,
}, },
{ {
@ -255,7 +255,7 @@
}, },
{ {
"appearChance" : { "min" : 65, "max" : 95 }, "appearChance" : { "min" : 65, "max" : 95 },
"gainedExp" : 500, "heroExperience" : 500,
"removeObject" : true, "removeObject" : true,
}, },
{ {

6
lib/mapObjects/CRewardableObject.cpp
View File

@ -58,9 +58,6 @@ std::vector<Component> CRewardableObject::loadComponents(const CGHeroInstance *
if (rewardIndices.empty()) if (rewardIndices.empty())
return result; return result;
if (!configuration.showScoutedPreview)
return result;
if (configuration.selectMode != Rewardable::SELECT_FIRST) if (configuration.selectMode != Rewardable::SELECT_FIRST)
{ {
for (auto index : rewardIndices) for (auto index : rewardIndices)
@ -317,6 +314,9 @@ std::vector<Component> CRewardableObject::getPopupComponentsImpl(PlayerColor pla
if (!wasScouted(player)) if (!wasScouted(player))
return {}; return {};
if (!configuration.showScoutedPreview)
return {};
auto rewardIndices = getAvailableRewards(hero, Rewardable::EEventType::EVENT_FIRST_VISIT); auto rewardIndices = getAvailableRewards(hero, Rewardable::EEventType::EVENT_FIRST_VISIT);
if (rewardIndices.empty() && !configuration.info.empty()) if (rewardIndices.empty() && !configuration.info.empty())
rewardIndices.push_back(0); rewardIndices.push_back(0);