Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #147 from badgerman/hotfix-3.4.4 

Hotfix 3.4.4, guards
This commit is contained in:
Enno Rehling 2015-02-20 20:22:59 +01:00
parent 5dee3caab8 58fae8e90d
commit e31737db7c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/buildno.h
View File

@ -1,3 +1,3 @@
#define VERSION_MAJOR 3 #define VERSION_MAJOR 3
#define VERSION_MINOR 4 #define VERSION_MINOR 4
#define VERSION_BUILD 3 #define VERSION_BUILD 4

12
src/move.c
View File

@ -919,17 +919,17 @@ static unit *bewegung_blockiert_von(unit * reisender, region * r)
} }
if (guard) { if (guard) {
prob += base_prob; /* 30% base chance */ prob += base_prob; /* 30% base chance */
prob = +guard_count*guard_number_prob; prob += guard_count*guard_number_prob;
if (r->terrain == newterrain(T_GLACIER)) if (r->terrain == newterrain(T_GLACIER))
prob = +region_type_prob * 2; prob += region_type_prob * 2;
if (r->terrain == newterrain(T_SWAMP)) if (r->terrain == newterrain(T_SWAMP))
prob = +region_type_prob * 2; prob += region_type_prob * 2;
if (r->terrain == newterrain(T_MOUNTAIN)) if (r->terrain == newterrain(T_MOUNTAIN))
prob = +region_type_prob; prob += region_type_prob;
if (r->terrain == newterrain(T_VOLCANO)) if (r->terrain == newterrain(T_VOLCANO))
prob = +region_type_prob; prob += region_type_prob;
if (r->terrain == newterrain(T_VOLCANO_SMOKING)) if (r->terrain == newterrain(T_VOLCANO_SMOKING))
prob = +region_type_prob; prob += region_type_prob;
if (prob > 0 && chance(prob)) { if (prob > 0 && chance(prob)) {
return guard; return guard;