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

Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1

Browse Source 
Conflicts:
	lib/CArtHandler.h
	lib/mapObjects/MiscObjects.cpp
This commit is contained in:
AlexVinS
2016-01-24 15:39:41 +03:00
parent 408f346541 b19e082f37
commit 89d986fc6a
27 changed files with 432 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/CGameState.cpp
View File

@ -1658,15 +1658,16 @@ void CGameState::initStartingBonus()
switch(scenarioOps->playerInfos[elem.first].bonus)
{
case PlayerSettings::GOLD:
elem.second.resources[Res::GOLD] += rand.nextInt(500, 1000);
elem.second.resources[Res::GOLD] += rand.nextInt(5, 10) * 100;
break;
case PlayerSettings::RESOURCE:
{
int res = VLC->townh->factions[scenarioOps->playerInfos[elem.first].castle]->town->primaryRes;
if(res == Res::WOOD_AND_ORE)
{
elem.second.resources[Res::WOOD] += rand.nextInt(5, 10);
elem.second.resources[Res::ORE] += rand.nextInt(5, 10);
int amount = rand.nextInt(5, 10);
elem.second.resources[Res::WOOD] += amount;
elem.second.resources[Res::ORE] += amount;
}
else
{