Merge lp:~widelands-dev/widelands/attack_fix into lp:widelands

[TiborB]

This is purely (a quick) AI fix of attacking logic:
- visibility of enemy site is checked (there is no "fog of war" for AI so we must check it...)
- changed algorithm to pick random amount of available soldiers for attack (generally AI tent to pick "almost all" available soldiers, now it pick lesser number)

[GunChleoc (gunchleoc)]

Code LGTM - Just one question in the diff comments.

review: Approve

[TiborB (tiborb95)]

I am going to change it - you are right

[GunChleoc (gunchleoc)]

BTW there is another one: Wh->can_attack() && is_visible

Sorry, I was being lazy.

[TiborB (tiborb95)]

no, I had to remember it. How to clean it up? Can we reverse trunk? Or commit another revision to trunk?

[TiborB (tiborb95)]

I fixed it in my branch in the meantime

[GunChleoc (gunchleoc)]

Since the branch is already pushed and it's a small change, I'd say you can do the change directly on trunk - just make sure that you don't break anything.

Or you can do it in this branch and merge it again.

[TiborB (tiborb95)]

I will merge my branch to trunk again...

2015-08-03 23:19 GMT+02:00 GunChleoc <email address hidden>:

> Since the branch is already pushed and it's a small change, I'd say you
> can do the change directly on trunk - just make sure that you don't break
> anything.
>
> Or you can do it in this branch and merge it again.
> --
>
> https://code.launchpad.net/~widelands-dev/widelands/attack_fix/+merge/266796
> Your team Widelands Developers is subscribed to branch
> lp:~widelands-dev/widelands/attack_fix.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~widelands-dev
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~widelands-dev
> More help : https://help.launchpad.net/ListHelp
>

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2015-07-27 20:25:32 +0000
+++ src/ai/defaultai.cc	2015-08-03 21:09:23 +0000
@@ -4893,6 +4893,9 @@
 		uint8_t defenders_strength = 0;
 		bool is_warehouse = false;
 		bool is_attackable = false;
+		// we cannot attack unvisible site and there is no other way to find out
+		const bool is_visible = (1 < player_->vision
+			 	(Map::get_index(coords_unhash(site->first), map.get_width())));
 		uint16_t owner_number = 100;
 
 		// testing if we can attack the building - result is a flag
@@ -4900,6 +4903,7 @@
 		FCoords f = map.get_fcoords(coords_unhash(site->first));
 		uint32_t site_to_be_removed = std::numeric_limits<uint32_t>::max();
 		Flag* flag = nullptr;
+
 		if (upcast(MilitarySite, bld, f.field->get_immovable())) {
 			if (player_->is_hostile(bld->owner())) {
 				std::vector<Soldier *> defenders;
@@ -4907,7 +4911,7 @@
 				defenders_strength = calculate_strength(defenders);
 
 				flag = &bld->base_flag();
-				if (bld->can_attack()) {
+				if (is_visible && bld->can_attack()) {
 					is_attackable = true;
 				}
 				owner_number = bld->owner().player_number();
@@ -4922,7 +4926,7 @@
 
 				flag = &Wh->base_flag();
 				is_warehouse = true;
-				if (Wh->can_attack()) {
+				if (Wh->can_attack() && is_visible) {
 					is_attackable = true;
 				}
 				owner_number = Wh->owner().player_number();
@@ -5054,9 +5058,9 @@
 	// attacking
 	FCoords f = map.get_fcoords(coords_unhash(best_target));
 	// setting no attack counter here
-	// this gauranties that it will not be attacked in next 4
+	// this gauranties that it will not be attacked in next 3
 	// turns
-	enemy_sites[best_target].no_attack_counter = -4;
+	enemy_sites[best_target].no_attack_counter = -3;
 
 	Flag* flag = nullptr;  // flag of a building to be attacked
 	if (upcast(MilitarySite, bld, f.field->get_immovable())) {
@@ -5069,8 +5073,19 @@
 
 	// how many attack soldiers we can send?
 	uint32_t attackers = player_->find_attack_soldiers(*flag);
-	// Just add some randomness
-	attackers -= gametime % 3;
+
+	// Of course not all of them:
+	// reduce by 0-3 for attackers below 10
+	// but for soldiers in range 10-40 reduce by much more.
+	// Soldiers above 40 are ignored for calculation
+
+	// Number of soldiers in the range 10-40, random portion of
+	// them will be used
+	uint32_t above_ten = (attackers > 10)? attackers - 10 : 0;
+	above_ten = (above_ten > 30) ? 30 : above_ten;
+
+	attackers = attackers - (gametime % 3) - ((above_ten > 0) ? gametime % above_ten : 0);
+
 	if (attackers <= 0) {
 		return false;
 	}