Make all hogs say Yessir taunt on their turn start (replaces revenge taunts)
authorWuzzy <almikes@aol.com>
Sat, 15 Apr 2017 04:28:00 +0200
changeset 12253 8e9603088f99
parent 12252 5ac38cf14d91
child 12254 9d501bd1169c
Make all hogs say Yessir taunt on their turn start (replaces revenge taunts) Rationale: The taunts Illgetyou, JustYouWait were fairly odd and almost always inapproriate to the situation as most voicepacks clearly assume these to be used for revenge only (e.g. “You'll gonna pay for that.” was played at turn start because of this.).
ChangeLog.txt
hedgewars/uTeams.pas
--- a/ChangeLog.txt	Fri Apr 14 07:27:56 2017 +0200
+++ b/ChangeLog.txt	Sat Apr 15 04:28:00 2017 +0200
@@ -35,6 +35,7 @@
  * Fixed hedgehogs saying “Missed” when drowning enemy without dealing damage
  * Fixed enemy saying "Missed” when giving poison without direct damage
  * Fixed incorrect time box tooltip when in Sudden Death
+ * Foreign and computer hedgehogs oddly said revenge taunts instead of “Yes, Sir” on their start of turn
  * Various other fixes
 
 Highlander:
--- a/hedgewars/uTeams.pas	Fri Apr 14 07:27:56 2017 +0200
+++ b/hedgewars/uTeams.pas	Sat Apr 15 04:28:00 2017 +0200
@@ -331,17 +331,7 @@
 
 if (TurnTimeLeft > 0) and (CurrentHedgehog^.BotLevel = 0) then
     begin
-    if CurrentTeam^.ExtDriven then
-        begin
-        if GetRandom(2) = 0 then
-             AddVoice(sndIllGetYou, CurrentTeam^.voicepack)
-        else AddVoice(sndJustYouWait, CurrentTeam^.voicepack)
-        end
-    else
-        begin
-        GetRandom(2); // needed to avoid extdriven desync
-        AddVoice(sndYesSir, CurrentTeam^.voicepack);
-        end;
+    AddVoice(sndYesSir, CurrentTeam^.voicepack);
     if cHedgehogTurnTime < 1000000 then
         ReadyTimeLeft:= cReadyDelay;
     s:= ansistring(CurrentTeam^.TeamName);
@@ -350,11 +340,7 @@
 else
     begin
     if TurnTimeLeft > 0 then
-        begin
-        if GetRandom(2) = 0 then
-             AddVoice(sndIllGetYou, CurrentTeam^.voicepack)
-        else AddVoice(sndJustYouWait, CurrentTeam^.voicepack)
-        end;
+        AddVoice(sndYesSir, CurrentTeam^.voicepack);
     ReadyTimeLeft:= 0
     end;
 end;