Mercurial > mm7

comparison Player.cpp @ 1350:8baf20c8f805

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::GetTempleHealCostModifier simplified
author Grumpy7
date Sat, 13 Jul 2013 01:44:53 +0200
parents e721754db8ee
children f1209ed77782
comparison
equal deleted inserted replaced
1349:e721754db8ee 1350:8baf20c8f805
281 { 281 {
282 baseConditionMultiplier = 10; 282 baseConditionMultiplier = 10;
283 } 283 }
284 conditionTimeMultiplier = GetConditionDayOfWeek(conditionIdx); 284 conditionTimeMultiplier = GetConditionDayOfWeek(conditionIdx);
285 } 285 }
286 else if (conditionIdx < 14) 286 else
287 { 287 {
288 baseConditionMultiplier = 1;
289 conditionTimeMultiplier = 0;
290 for (int i = 0; i <= 13; i++)
291 {
292 v6 = GetConditionDayOfWeek(i);
293 if ( v6 > conditionTimeMultiplier )
294 conditionTimeMultiplier = v6;
295 }
296 if ( !conditionTimeMultiplier )
297 conditionTimeMultiplier = 1;
298 }
299 else{
300 conditionTimeMultiplier = 1; 288 conditionTimeMultiplier = 1;
301 baseConditionMultiplier = 1; 289 baseConditionMultiplier = 1;
290 if (conditionIdx < 14)
291 {
292 for (int i = 0; i <= 13; i++)
293 {
294 v6 = GetConditionDayOfWeek(i);
295 if ( v6 > conditionTimeMultiplier )
296 conditionTimeMultiplier = v6;
297 }
298 }
302 } 299 }
303 result = (int)((double)conditionTimeMultiplier * (double)baseConditionMultiplier * a2); 300 result = (int)((double)conditionTimeMultiplier * (double)baseConditionMultiplier * a2);
304 if ( result < 1 ) 301 if ( result < 1 )
305 result = 1; 302 result = 1;
306 return result; 303 return result;