Author: dragonking
Date: Thu Jul 31 17:19:01 2008
New Revision: 28291
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28291&view=rev
Log:
Some more advanced improvements to recruitment formula and small one for
debug_print
Modified:
trunk/data/recruitment.fai
trunk/src/formula_function.cpp
Modified: trunk/data/recruitment.fai
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/recruitment.fai?rev=28291&r1=28290&r2=28291&view=diff
==============================================================================
--- trunk/data/recruitment.fai (original)
+++ trunk/data/recruitment.fai Thu Jul 31 17:19:01 2008
@@ -528,25 +528,41 @@
[]
);
-
-if(my_leader.loc = loc(11,23),
- if( my_side.gold>20,
- initialize_weapon_specials_map(self) +
+def create_recruits_map(ai*)
+ if(vars.recruits_map_creator != turn,
[
+ set_var('recruits_map_creator', turn ),
+ set_var('recruits_map',
+ recruitment_list_builder(
+ eval(ai),
+ evaluate_attackers(ai),
+ evaluate_defenders(ai)
+ )
+ )
+ ],
+ []
+ );
+
+if(vars.turn_initialized = turn,
+ if(my_leader.loc = loc(11,23),
+ if( debug_print('Najtanszy rekrut: ', choose(
+ vars.recruits_map,
+ -key.cost
+ )).key.cost <
+ my_side.gold,
recruit(
unit_chooser(
self,
- recruitment_list_builder(
- eval(self),
- evaluate_attackers(self),
- evaluate_defenders(self)
- )
- )
- )
- ],
- fallback('')
+ vars.recruits_map
+ )
+ ),
+ fallback('')
+ ),
+ if(vars.check = turn,
+ [set_var('check', 0), fallback('')],
+ [set_var('check', turn), move(my_leader.loc,
nearest_keep(my_leader.loc))])
),
- if(vars.check = turn,
- [set_var('check', 0), fallback('')],
- [set_var('check', turn), move(my_leader.loc,
nearest_keep(my_leader.loc))])
+ [set_var('turn_initialized', turn)] +
+ initialize_weapon_specials_map(self) +
+ create_recruits_map(self)
)
Modified: trunk/src/formula_function.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/formula_function.cpp?rev=28291&r1=28290&r2=28291&view=diff
==============================================================================
--- trunk/src/formula_function.cpp (original)
+++ trunk/src/formula_function.cpp Thu Jul 31 17:19:01 2008
@@ -277,13 +277,13 @@
if( args().size() == 1)
{
- var1.serialize_to_string(str1);
+ str1 = var1.to_debug_string();
std::cout<< str1 << std::endl;
return var1;
} else {
str1 = var1.string_cast();
const variant var2 = args()[1]->evaluate(variables);
- var2.serialize_to_string(str2);
+ str2 = var2.to_debug_string();
std::cout<< str1 << str2 << std::endl;
return var2;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
