scaled gryphon rider image down

data/maps/map-tutorial

@@ -20,5 +20,5 @@ ggggggggggfffffffgggghhmh
 ggtggCtggffffffgggghhhhmm
 gggCCCCgggfgfgggggghmmmmm
 ggfC2Cgtggggggggghhhhmmmm
-ggffCfggggggggghthhmmmmmm
+tgffCfggggggggghthhmmmmmm
-ttggfggggggtgghhhhhmmmmmm
+gtggfggggggtgghhhhhmmmmmm

data/scenarios/Snow_Plains.cfg

@@ -64,14 +64,14 @@ Defeat
 		description=Li'sar
 		[/recall]
 		[message]
-		id=msgsnowplains1
+		id=msgsnowplains1a
-		description=Delfador
+		description=Kalenz
-		message="These fields of snow were once home of the Ice Elves. They moved on many decades ago. Legends say the left a great sword of fire behind."
+		message="These fields of snow were once the home of my people. We moved on centuries ago. Legends say a great sword of fire was left behind."
 		[/message]
 		[message]
 		id=msgsnowplains2
 		description=Konrad
-		message="This sword may prove useful on our journy ahead. It must be in one of the towns before us."
+		message="This sword may prove useful on our journey ahead. I wonder where it could be hidden."
 		[/message]
 	[/event]
 

src/actions.cpp

@@ -1098,8 +1098,6 @@ bool clear_shroud(display& disp, const gamemap& map, const game_data& gamedata,
 		}
 	}
 
-	disp.recalculate_minimap();
-
 	return result;
 }
 
@@ -1208,6 +1206,7 @@ size_t move_unit(display* disp, const game_data& gamedata, const gamemap& map,
 	if(disp != NULL) {
 		disp->invalidate_unit();
 		disp->invalidate(steps.back());
+		disp->recalculate_minimap();
 	}
 
 	int orig_tower_owner = -1;

src/ai_attack.cpp

@@ -214,9 +214,9 @@ int choose_weapon(const gamemap& map, std::map<location,unit>& units,
 		//TODO: improve this rating formula!
 		const double rating =
 		   (double(stats.chance_to_hit_defender)/100.0)*
-		               minimum<int>(stats.damage_defender_takes*stats.nattacks,d_hitpoints) -
+		               minimum<int>(stats.damage_defender_takes,d_hitpoints)*stats.nattacks -
 		   (double(stats.chance_to_hit_attacker)/100.0)*
-		               minimum<int>(stats.damage_attacker_takes*stats.ndefends,a_hitpoints);
+		               minimum<int>(stats.damage_attacker_takes,a_hitpoints)*stats.ndefends;
 		if(rating > current_rating || current_choice == -1) {
 			current_choice = a;
 			current_rating = rating;

src/font.cpp

@@ -124,7 +124,7 @@ const SDL_Color& get_side_colour(int side)
 	                                   {0x00,0xFF,0x00,0},
 	                                   {0xFF,0xFF,0x00,0},
 	                                   {0xFF,0x55,0x55,0},
-	                                   {0xFF,0x55,0x55,0} };
+	                                   {0xFF,0x00,0xFF,0} };
 
 	static const size_t nsides = sizeof(sides)/sizeof(*sides);
 

src/map.cpp

@@ -227,7 +227,7 @@ gamemap::TERRAIN gamemap::get_terrain(const gamemap::location& loc) const
 	TERRAIN used_terrain = 0;
 	int terrain_count = 0;
 	for(int i = 0; i != nitems; ++i) {
-		if(items[i] != used_terrain) {
+		if(items[i] != used_terrain && underlying_terrain(items[i]) != TOWER) {
 			const int c = std::count(items+i+1,items+nitems,items[i]) + 1;
 			if(c > terrain_count) {
 				used_terrain = items[i];

src/playturn.cpp

@@ -847,6 +847,7 @@ void turn_info::undo()
 	recorder.undo();
 
 	clear_shroud(gui_,map_,gameinfo_,units_,teams_,team_num_-1);
+	gui_.recalculate_minimap();
 }
 
 void turn_info::redo()
@@ -1226,6 +1227,7 @@ void turn_info::do_recruit(const std::string& name)
 		undo_stack_.clear();
 		redo_stack_.clear();
 
+		gui_.recalculate_minimap();
 		gui_.invalidate_game_status();
 		gui_.invalidate_all();
 	}