New slow from boucman:

added no ZoC and reordering attack features, taken away removing-attack feature

src/actions.cpp

@@ -629,13 +629,6 @@ battle_stats evaluate_battle_stats(const gamemap& map,
 		res.amount_attacker_drains = res.damage_defender_takes/2;
 	}
 
-	static const std::string slowed_string("slowed");
-	if(a->second.has_flag(slowed_string) && res.nattacks > 1)
-		--res.nattacks;
-
-	if(d->second.has_flag(slowed_string) && res.ndefends > 1)
-		--res.ndefends;
-
 	// FIXME: doesn't take into account berserk+slow or drain
 	if (strings && res.amount_attacker_drains == 0 &&
 		res.amount_defender_drains == 0 &&
@@ -720,13 +713,15 @@ void attack(display& gui, const gamemap& map,
 	int orig_attacks = stats.nattacks;
 	int orig_defends = stats.ndefends;
 	int to_the_death = stats.to_the_death ? 30 : 0;
+	bool slow_affects_attacker = a->second.has_flag("slowed");
+	bool slow_affects_defender = d->second.has_flag("slowed");
 
 	static const std::string poison_string("poison");
 
 	while(stats.nattacks > 0 || stats.ndefends > 0) {
 		LOG_NG << "start of attack loop...\n";
 
-		if(stats.nattacks > 0 && stats.defender_strikes_first == false) {
+		if(stats.nattacks > 0 && stats.defender_strikes_first == false && slow_affects_attacker == false) {
 			add_random_separator();
 			const int ran_num = get_random();
 			bool hits = (ran_num%100) < stats.chance_to_hit_defender;
@@ -871,13 +866,10 @@ void attack(display& gui, const gamemap& map,
 					d->second.set_flag("poisoned");
 				}
 
-				if(stats.attacker_slows && d->second.has_flag("slowed") == false) {
+				if(stats.attacker_slows) {
+					slow_affects_defender = true;
 					gui.float_label(d->first,_("slowed"),255,0,0);
 					d->second.set_flag("slowed");
-					if (orig_defends > 1) {
-						if (stats.ndefends > 0) --stats.ndefends;
-						--orig_defends;
-					}
 				}
 
 				//if the defender is turned to stone, the fight stops immediately
@@ -893,11 +885,15 @@ void attack(display& gui, const gamemap& map,
 
 			--stats.nattacks;
 		}
+		// slow and initiative are cumulative
+		if(!stats.defender_strikes_first) {
+			slow_affects_attacker = false;
+		}
 
 		//if the defender got to strike first, they use it up here.
 		stats.defender_strikes_first = false;
 
-		if(stats.ndefends > 0) {
+		if(stats.ndefends > 0 && slow_affects_defender == false) {
 			LOG_NG << "doing defender attack...\n";
 			add_random_separator();
 
@@ -1037,13 +1033,10 @@ void attack(display& gui, const gamemap& map,
 					a->second.set_flag("poisoned");
 				}
 
-				if(stats.defender_slows && a->second.has_flag("slowed") == false) {
+				if(stats.defender_slows) {
+					slow_affects_attacker = true;
 					gui.float_label(a->first,_("slowed"),255,0,0);
 					a->second.set_flag("slowed");
-					if (orig_attacks > 1) {
-						if (stats.nattacks > 0) --stats.nattacks;
-						--orig_attacks;
-					}
 				}
 
 
@@ -1060,6 +1053,7 @@ void attack(display& gui, const gamemap& map,
 
 			--stats.ndefends;
 		}
+		slow_affects_defender = false;
 
 		// continue the fight to death; if one of the units got stoned,
 		// either nattacks or ndefends is -1

src/ai_attack.cpp

@@ -369,7 +369,6 @@ void ai::attack_analysis::analyze(const gamemap& map, unit_map& units, int num_s
 
 		int defenderxp = 0;
 
-		bool defender_slowed = false;
 
 		int defhp = target_hp;
 		for(size_t i = 0; i != movements.size() && defhp; ++i) {
@@ -379,13 +378,6 @@ void ai::attack_analysis::analyze(const gamemap& map, unit_map& units, int num_s
 			int attacks = stat.nattacks;
 			int defends = stat.ndefends;
 
-			if(defender_slowed && defends > 1) {
-				--defends;
-
-				//give an extra bonus based on slowing here
-				avg_damage_taken -= stat.damage_defender_takes;
-			}
-
 			unit_map::const_iterator att = units.find(movements[i].first);
 			double cost = att->second.type().cost();
 
@@ -419,9 +411,6 @@ void ai::attack_analysis::analyze(const gamemap& map, unit_map& units, int num_s
 							atthp = hitpoints[i];
 						}
 
-						if(stat.attacker_slows && !defender_slowed && defend_it->second.has_flag("slowed") == false) {
-							defender_slowed = true;
-						}
 					}
 
 					--attacks;

src/reports.cpp

@@ -136,7 +136,7 @@ report generate_report(TYPE type, const gamemap& map, const unit_map& units,
 		}
 		if(u->second.has_flag("slowed")) {
 			unit_status << "misc/slowed.png";
-			tooltip << _("slowed: ") << _("This unit has been slowed. It moves at half normal speed and receives one less attack than normal in combat.");
+			tooltip << _("slowed: ") << _("This unit has been slowed. It emits no zone of control, moves at half speed and ennemies will be able to strike earlier once during a fight");
 			res.add_image(unit_status,tooltip);
 		}
 		if(u->second.has_flag("poisoned")) {

src/unit.cpp

@@ -504,7 +504,7 @@ bool unit::has_goto() const
 
 bool unit::emits_zoc() const
 {
-	return type().has_zoc() && stone() == false;
+	return type().has_zoc() && stone() == false && !has_flag("slowed");
 }
 
 bool unit::matches_filter(const config& cfg) const