made it so that the AI will stop next to invisible units

src/ai.cpp

@@ -102,7 +102,7 @@ const team& ai_interface::current_team() const
 }
 
 
-void ai_interface::move_unit(location from, location to, std::map<location,paths>& possible_moves)
+gamemap::location ai_interface::move_unit(location from, location to, std::map<location,paths>& possible_moves)
 {
 	assert(info_.units.find(to) == info_.units.end() || from == to);
 
@@ -115,7 +115,7 @@ void ai_interface::move_unit(location from, location to, std::map<location,paths
 		std::cout << "Could not find unit at " << from.x << ", "
 		          << from.y << "\n";
 		assert(false);
-		return;
+		return location();
 	}
 
 	recorder.add_movement(from,to);
@@ -146,6 +146,30 @@ void ai_interface::move_unit(location from, location to, std::map<location,paths
 
 		if(rt != p.routes.end()) {
 			std::vector<location> steps = rt->second.steps;
+
+			//check if there are any invisible units that we uncover
+			for(std::vector<location>::iterator i = steps.begin(); i != steps.end(); ++i) {
+				location adj[6];
+				get_adjacent_tiles(*i,adj);
+				size_t n;
+				for(n = 0; n != 6; ++n) {
+
+					//see if there is an enemy unit next to this tile. Note that we don't
+					//actually have to check if it's invisible, since it being invisible is
+					//the only possibility
+					const unit_map::const_iterator invisible_unit = info_.units.find(adj[n]);
+					if(invisible_unit != info_.units.end() && current_team().is_enemy(invisible_unit->second.side())) {
+						to = *i;
+						steps.erase(i,steps.end());
+						break;
+					}
+				}
+
+				if(n != 6) {
+					break;
+				}
+			}
+
 			steps.push_back(to); //add the destination to the steps
 			info_.disp.move_unit(steps,current_unit);
 		}
@@ -164,6 +188,8 @@ void ai_interface::move_unit(location from, location to, std::map<location,paths
 	if((info_.teams.front().uses_fog() || info_.teams.front().uses_shroud()) && !info_.teams.front().fogged(to.x,to.y)) {
 		game_events::fire("sighted",to);
 	}
+
+	return to;
 }
 
 void ai_interface::calculate_possible_moves(std::map<location,paths>& res, move_map& srcdst, move_map& dstsrc, bool enemy, bool assume_full_movement)
@@ -332,7 +358,10 @@ bool ai::do_combat(std::map<gamemap::location,paths>& possible_moves, const move
 		const bool defender_human = (tgt != units_.end()) ?
 		             teams_[tgt->second.side()-1].is_human() : false;
 
-		move_unit(from,to,possible_moves);
+		const location arrived_at = move_unit(from,to,possible_moves);
+		if(arrived_at != to) {
+			return true;
+		}
 
 		attack_enemy(to,target_loc,weapon);
 
@@ -474,9 +503,14 @@ bool ai::get_healing(std::map<gamemap::location,paths>& possible_moves, const mo
 
 bool ai::should_retreat(const gamemap::location& loc, const move_map& srcdst, const move_map& dstsrc, const move_map& enemy_srcdst, const move_map& enemy_dstsrc) const
 {
+	const double caution = current_team().caution();
+	if(caution <= 0.0) {
+		return false;
+	}
+
 	const double our_power = power_projection(loc,srcdst,dstsrc);
 	const double their_power = power_projection(loc,enemy_srcdst,enemy_dstsrc);
-	return their_power > 2.0*our_power + our_power*current_team().aggression();
+	return caution*their_power > 2.0*our_power + our_power*current_team().aggression();
 }
 
 bool ai::retreat_units(std::map<gamemap::location,paths>& possible_moves, const move_map& srcdst, const move_map& dstsrc, const move_map& enemy_srcdst, const move_map& enemy_dstsrc, unit_map::const_iterator leader)
@@ -609,10 +643,10 @@ void ai::move_to_targets(std::map<gamemap::location,paths>& possible_moves, move
 			}
 		}
 
-		move_unit(move.first,move.second,possible_moves);
+		const location arrived_at = move_unit(move.first,move.second,possible_moves);
 
 		//if we're going to attack someone
-		if(weapon != -1) {
+		if(weapon != -1 && arrived_at == move.second) {
 
 			const location& attacker = move.second;
 				
@@ -638,7 +672,7 @@ void ai::move_to_targets(std::map<gamemap::location,paths>& possible_moves, move
 		//don't allow any other units to move onto the tile our unit
 		//just moved onto
 		typedef std::multimap<location,location>::iterator Itor;
-		std::pair<Itor,Itor> del = dstsrc.equal_range(move.second);
+		std::pair<Itor,Itor> del = dstsrc.equal_range(arrived_at);
 		dstsrc.erase(del.first,del.second);
 	}
 }

src/ai.hpp

@@ -53,7 +53,7 @@ public:
 
 protected:
 	void attack_enemy(const location& u, const location& target, int weapon);
-	void move_unit(location from, location to, std::map<location,paths>& possible_moves);
+	location move_unit(location from, location to, std::map<location,paths>& possible_moves);
 
 	void calculate_possible_moves(std::map<location,paths>& moves, move_map& srcdst, move_map& dstsrc, bool enemy, bool assume_full_movement=false);
 

src/ai_attack.cpp

@@ -410,7 +410,9 @@ double ai::attack_analysis::rating(double aggression) const
 					                     (target_value/resources_used) -
 	   (1.0-aggression)*avg_damage_taken*(resources_used/target_value))/10.0;
 
-	value += support - vulnerability*terrain_quality;
+	if(!leader_threat && vulnerability*terrain_quality > 0.0) {
+		value *= support/(vulnerability*terrain_quality);
+	}
 
 	value /= ((resources_used/2) + (resources_used/2)*terrain_quality);
 

src/team.cpp

@@ -67,6 +67,12 @@ team::team_info::team_info(const config& cfg)
 	else
 		aggression = atof(aggression_val.c_str());
 
+	const std::string& caution_val = cfg["caution"];
+	if(caution_val.empty())
+		caution = 0.0;
+	else
+		caution = atof(caution_val.c_str());
+
 	const std::string& enemies_list = cfg["enemy"];
 	if(!enemies_list.empty()) {
 		std::vector<std::string> venemies = config::split(enemies_list);
@@ -361,6 +367,11 @@ double team::aggression() const
 	return info_.aggression;
 }
 
+double team::caution() const
+{
+	return info_.caution;
+}
+
 bool team::is_human() const
 {
 	return info_.controller == team_info::HUMAN;

src/team.hpp

@@ -43,7 +43,7 @@ public:
 		int income_per_village;
 		std::set<std::string> can_recruit;
 		std::vector<std::string> recruitment_pattern;
-		double aggression;
+		double aggression, caution;
 		std::vector<int> enemies;
 		std::string team_name;
 
@@ -85,6 +85,7 @@ public:
 
 	bool is_enemy(int side) const;
 	double aggression() const;
+	double caution() const;
 
 	bool is_human() const;
 	bool is_network() const;