games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Merge pull request #3159 from IvanSavenko/beta

Browse Source 
Merge beta -> develop (rebased)
This commit is contained in:
Ivan Savenko 2023-11-07 22:49:29 +02:00 committed by GitHub
commit 2835044282
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/commanders.json
View File

@ -3,9 +3,9 @@
//Commander receives these bonuses on level-up
"bonusPerLevel":
[
["CREATURE_DAMAGE", 1, "creatureDamageMin", 0 ], //+1 minimum damage
["CREATURE_DAMAGE", 2, "creatureDamageMax", 0 ], //+2 maximum damage
["STACK_HEALTH", 5, null, 0 ] //+5 hp
["CREATURE_DAMAGE", 2, "creatureDamageMin", 0 ], //+2 minimum damage
["CREATURE_DAMAGE", 4, "creatureDamageMax", 0 ], //+4 maximum damage
["STACK_HEALTH", 20, null, 0 ] //+5 hp
],
//Value of bonuses given by each skill level
"skillLevels":

2
launcher/modManager/cmodlist.cpp
View File

@ -105,7 +105,7 @@ bool CModEntry::isVisible() const
return false;
}
return !localData.isEmpty() || !repository.isEmpty();
return !localData.isEmpty() || (!repository.isEmpty() && !repository.contains("mod"));
}
bool CModEntry::isTranslation() const

6
lib/mapObjects/MiscObjects.cpp
View File

@ -210,7 +210,7 @@ void CGMine::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) con
void CGMine::serializeJsonOptions(JsonSerializeFormat & handler)
{
CArmedInstance::serializeJsonOptions(handler);
serializeJsonOwner(handler);
if(isAbandoned())
{
if(handler.saving)
@ -241,10 +241,6 @@ void CGMine::serializeJsonOptions(JsonSerializeFormat & handler)
}
}
}
else
{
serializeJsonOwner(handler);
}
}
GameResID CGResource::resourceID() const