[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_militarysites_prohibited into lp:widelands

[noreply]

The proposal to merge lp:~widelands-dev/widelands/ai_militarysites_prohibited 
into lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ai_militarysites_prohibited/+merge/337822
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/ai_militarysites_prohibited.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_militarysites_prohibited into lp:widelands

[bunnybot]

Continuous integration builds have changed state:

Travis build 3184. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/342512052.
Appveyor build 2993. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_militarysites_prohibited-2993.
-- 
https://code.launchpad.net/~widelands-dev/widelands/ai_militarysites_prohibited/+merge/337822
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/ai_militarysites_prohibited.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_militarysites_prohibited into lp:widelands

[GunChleoc]

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/ai_militarysites_prohibited/+merge/337822
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/ai_militarysites_prohibited.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_militarysites_prohibited into lp:widelands

[GunChleoc]

Review: Approve

LGTM - the documentation already states that it's allowed for militarysites, so 
nothing to do there.

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/ai_militarysites_prohibited/+merge/337822
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/ai_militarysites_prohibited.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_militarysites_prohibited into lp:widelands

[TiborB]

TiborB has proposed merging 
lp:~widelands-dev/widelands/ai_militarysites_prohibited into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1749716 in widelands: "aihints for military buildings"
  https://bugs.launchpad.net/widelands/+bug/1749716

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ai_militarysites_prohibited/+merge/337822

Adding simple test to consider if a militarysite to be built is 
"prohibited_till" in aihints
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/ai_militarysites_prohibited into lp:widelands.
=== modified file 'src/ai/defaultai_warfare.cc'
--- src/ai/defaultai_warfare.cc	2017-11-13 09:10:04 +
+++ src/ai/defaultai_warfare.cc	2018-02-15 20:40:53 +
@@ -970,6 +970,11 @@
 		return BuildingNecessity::kForbidden;
 	}
 
+	// Skip if the building is prohibited for now
+	if (bo.prohibited_till > gametime) {
+		return BuildingNecessity::kForbidden;
+	}
+
 	bo.primary_priority = 0;
 
 	const uint32_t msites_total = msites_built() + msites_in_constr();

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp