# HG changeset patch
# User Wuzzy
# Date 1536954277 -3600
# Node ID 1f884e988e254b480b840ff8d3091814f6108171
# Parent  22c353323b985c1760f3bcae426b337121e8f167
Taunts: threaten the enemy

diff -r 22c353323b98 -r 1f884e988e25 Taunts.wiki
--- a/Taunts.wiki	Fri Sep 14 20:17:51 2018 +0100
+++ b/Taunts.wiki	Fri Sep 14 20:44:37 2018 +0100
@@ -27,12 +27,12 @@
 || `sndFlawless` || `Flawless.ogg` || flawless victory || … a team won without any damage taken. || “Flawless victory!” ||
 || `sndHello` || `Hello.ogg` || generic greeting || … hedgehog is in the time box and waves hello or a player enters a room in online play. || “Hi!” ||
 || `sndHurry` || `Hurry.ogg` || hustle || … 5 seconds on the clock are remaining. || “Hurry!” ||
-|| `sndIllGetYou` || `Illgetyou.ogg` || enemy turn || … computer-controlled team or team over the net starts turn. Played instead of `sndYesSir`. || “You’ve ticked off the wrong hog, buddy.” ||
+|| `sndIllGetYou` || `Illgetyou.ogg` || threatening the enemy || … computer-controlled team or team over the net starts turn. Played instead of `sndYesSir`. || “You’ve ticked off the wrong hog, buddy.” ||
 || `sndIncoming` || `Incoming.ogg` || air attack || … an airborne attack is ordered. || “This is going to hurt.” ||
 || `sndJump1` || `Jump1.ogg` || long jump || … a hedgehog makes a long jump. || “Hep!” ||
 || `sndJump2` || `Jump2.ogg` || backjump || … a hedgehog makes a backjump. || “Woah!” ||
 || `sndJump3` || `Jump3.ogg` || high jump || … a hedgehog makes a high jump. || “Hep!” ||
-|| `sndJustYouWait` || `Justyouwait.ogg` || enemy turn || … computer-controlled team or team over the net starts turn. Played instead of `sndYesSir`. || "You're gonna pay for that!" ||
+|| `sndJustYouWait` || `Justyouwait.ogg` || threatening the enemy || … computer-controlled team or team over the net starts turn. Played instead of `sndYesSir`.  || "You're gonna pay for that!" ||
 || `sndKamikaze` || `Kamikaze.ogg` || kamikaze || … a hedgehog launches kamikaze. || “Kamikaze!” ||
 || `sndLaugh` || `Laugh.ogg` || evil laughter || … a hedgehog uses a mine, dynamite or cake. || “He-he-he-he-he-he-he-he-he!” ||
 || `sndMelon` || `Melon.ogg` || watermelon bomb || … a hedgehog throws a watermelon bomb || “Melon’s away!” ||
@@ -58,11 +58,13 @@
 || `sndVictory` || `Victory.ogg` || victory || … a team wins with at least 1 hedgehog lost on their side. || “Victory is ours!” ||
 || `sndWatchIt` || `Watchit.ogg` || clumsy outcome || … a hedgehog clumsily deals damage to clam members. || “Watch where you’re shooting!” ||
 || `sndYesSir` || `Yessir.ogg` || turn start || … the turn of your own team begins (not played for computer players and teams controlled by players over the network, see `sndIllGetYou` and `sndJustYouWait`). || “Yes, sir!” ||
-|| `sndRegret` || `Youllregretthat.ogg` || enemy turn || …  an enemy team attacked your hedgehog, but did not kill it. || “You gonna wish you haven’t done that.” ||
+|| `sndRegret` || `Youllregretthat.ogg` || enemy turn || … an enemy team attacked your hedgehog, but did not kill it. || “You gonna wish you haven’t done that.” ||
 
 Note: The “General idea” gives the rough idea/style this taunt is supposed to have. This is just a guideline, you do not have to follow this. But following this makes it easier to re-use taunts in future versions and game styles.
 The “Used when …” column says when the taunt is actually used in the current Hedgewars version. Note the usage in styles is not mentioned here.
 
+Note: `sndIllGetYou` and `sndIllGetYou` might be changed in future due to their confusing names. To be safe, keep the general idea of “threatening the enemy” in mind, then it should be safe. https://issues.hedgewars.org/show_bug.cgi?id=184
+
 == List of *unused* taunt files ==
 There are a couple of taunt files found in the repository which *aren't used in the game*. Adding these files to your voice pack won't have any effect. But maybe, just maybe, there might be a slim possibility of a slight chance that these taunts might probably be supported in future Hedgewars versions, if you are lucky. Maybe. So you might want to consider these files. Or not.