new type of AI goal : target_location

src/ai/composite/goal.cpp

@@ -121,7 +121,7 @@ void target_unit_goal::add_targets(std::back_insert_iterator< std::vector< targe
 	//find the enemy leaders and explicit targets
 	foreach (const unit &u, *resources::units) {
 		if (u.matches_filter(vconfig(criteria), u.get_location())) {
-			LOG_AI_GOAL << "found explicit target... " << u.get_location() << " with value: " << value() << "\n";
+			LOG_AI_GOAL << "found explicit target unit at ... " << u.get_location() << " with value: " << value() << "\n";
 			*target_list = target(u.get_location(), value(), target::EXPLICIT);
 		}
 	}
@@ -137,6 +137,49 @@ target_unit_goal::target_unit_goal(readonly_context &context, const config &cfg)
 }
 
 
+void target_location_goal::on_create()
+{
+	goal::on_create();
+	if (cfg_.has_attribute("value")) {
+		try {
+			value_ = boost::lexical_cast<double>(cfg_["value"]);
+		} catch (boost::bad_lexical_cast){
+			ERR_AI_GOAL << "bad value of goal"<<std::endl;
+			value_ = 0;
+		}
+	}
+	const config &criteria = cfg_.child("criteria");
+	if (criteria) {
+		filter_ptr_ = boost::shared_ptr<terrain_filter>(new terrain_filter(vconfig(criteria),get_info().units));
+	}
+}
+
+void target_location_goal::add_targets(std::back_insert_iterator< std::vector< target > > target_list)
+{
+	if (!(this)->active()) {
+		return;
+	}
+
+	if (!filter_ptr_) return;
+
+	std::set<map_location> items;
+	filter_ptr_->get_locations(items);
+	foreach (const map_location &loc, items)
+	{
+		LOG_AI_GOAL << "found explicit target location ... " << loc << " with value: " << value() << std::endl;
+		*target_list = target(loc, value(), target::EXPLICIT);
+	}
+
+}
+
+target_location_goal::target_location_goal(readonly_context &context, const config &cfg)
+	: goal(context,cfg)
+	, value_(0.0)
+{
+}
+
+
+
 void protect_goal::on_create()
 {
 	goal::on_create();

src/ai/composite/goal.hpp

@@ -98,6 +98,26 @@ private:
 };
 
 
+class target_location_goal : public goal {
+public:
+	target_location_goal(readonly_context &context, const config &cfg);
+
+
+	virtual void add_targets(std::back_insert_iterator< std::vector< target > > target_list);
+
+
+	virtual void on_create();
+
+private:
+	double value() const
+	{
+		return value_;
+	}
+	boost::shared_ptr<terrain_filter> filter_ptr_;
+	double value_;
+};
+
+
 class protect_goal : public goal {
 public:
 	protect_goal(readonly_context &context, const config &cfg, bool protect_only_own_unit, bool protect_unit);

src/ai/registry.cpp

@@ -123,6 +123,14 @@ static register_goal_factory<target_unit_goal>
 	goal_factory("");
 
 
+static register_goal_factory<target_unit_goal>
+	goal_factory_target("target");
+
+
+static register_goal_factory<target_location_goal>
+	goal_factory_target_location("target_location");
+
+
 static register_goal_factory<protect_location_goal>
 	goal_factory_protect("protect");