Skip to content

Commit

Permalink
Add Russian translation for new /help pages and chat messages #115
Browse files Browse the repository at this point in the history
  • Loading branch information
@yavl
yavl committed Mar 2, 2019
1 parent 1393c31 commit 84c1476
Show file tree
Hide file tree
Showing 2 changed files with 133 additions and 18 deletions.
118 changes: 116 additions & 2 deletions bin/data/languages/ru.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,10 @@
"key": "Biologist",
"value": "\u0411\u0438\u043e\u043b\u043e\u0433"
},
{
"key": "Looper",
"value": "\u041b\u0443\u043f\u0435\u0440"
},
{
"key": "Smoker",
"value": "\u041a\u0443\u0440\u0438\u043b\u044c\u0449\u0438\u043a"
Expand Down Expand Up @@ -185,6 +189,10 @@
"key": "Undead",
"value": "\u0411\u0435\u0441\u0441\u043c\u0435\u0440\u0442\u043d\u044b\u0439"
},
{
"key": "Voodoo",
"value": "\u0412\u0443\u0434\u0443"
},
{
"key": "Unknown class",
"value": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0439 \u043a\u043b\u0430\u0441\u0441"
Expand Down Expand Up @@ -334,21 +342,37 @@
"value": "\u0412\u0440\u0430\u0447 \u043c\u043e\u0436\u0435\u0442 \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u0430\u0432\u043b\u0438\u0432\u0430\u0442\u044c \u043b\u044e\u0434\u0435\u0439, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044f \u0441\u0432\u043e\u0439 \u043c\u043e\u043b\u043e\u0442, \u0447\u0442\u043e\u0431\u044b \u0434\u0430\u0442\u044c \u0438\u043c \u0431\u0440\u043e\u043d\u044e."
},
{
"key": "He has also a powerful shotgun that can pullback infected.",
"key": "Grenades with medicine give armor to everybody in their range, including heroes and medic themself",
"value": "\u0413\u0440\u0430\u043d\u0430\u0442\u044b \u0441 \u043b\u0435\u043a\u0430\u0440\u0441\u0442\u0432\u043e\u043c \u0434\u0430\u044e\u0442 \u0431\u0440\u043e\u043d\u044e \u0432\u0441\u0435\u043c, \u043a\u0442\u043e \u0432 \u0440\u0430\u0434\u0438\u0443\u0441\u0435, \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u0445\u0440\u0430\u0431\u0440\u0435\u0446\u043e\u0432 \u0438 \u0441\u0430\u043c\u0438\u0445 \u0432\u0440\u0430\u0447\u0435\u0439."
},
{
"key": "Laser revives infected zombies, but at great cost - 17 hp and armor.",
"value": "\u041c\u043e\u0436\u0435\u0442 \u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0438\u0442\u044c \u0437\u0430\u0440\u0430\u0436\u0435\u043d\u043d\u043e\u0433\u043e \u043f\u0440\u0438 \u043f\u043e\u043c\u043e\u0449\u0438 \u043b\u0430\u0437\u0435\u0440\u0430, \u043f\u043e\u0442\u0440\u0430\u0442\u0438\u0432 17 \u0435\u0434\u0438\u043d\u0438\u0446 \u0437\u0434\u043e\u0440\u043e\u0432\u044c\u044f."
},
{
"key": "Medic has also a powerful shotgun that can pullback infected.",
"value": "\u0422\u0430\u043a\u0436\u0435 \u043e\u043d \u043e\u0431\u043b\u0430\u0434\u0430\u0435\u0442 \u043c\u043e\u0449\u043d\u044b\u043c \u0434\u0440\u043e\u0431\u043e\u0432\u0438\u043a\u043e\u043c, \u0441\u043f\u043e\u0441\u043e\u0431\u043d\u044b\u043c \u043e\u0442\u0442\u0430\u043b\u043a\u0438\u0432\u0430\u0442\u044c \u0437\u0430\u0440\u0430\u0436\u0451\u043d\u043d\u044b\u0445."
},
{
"key": "The Hero has a shotgun, a laser rifle and grenades.",
"value": "\u0423 \u0445\u0440\u0430\u0431\u0440\u0435\u0446\u0430 \u0435\u0441\u0442\u044c \u0434\u0440\u043e\u0431\u043e\u0432\u0438\u043a, \u043b\u0430\u0437\u0435\u0440\u043d\u0430\u044f \u0432\u0438\u043d\u0442\u043e\u0432\u043a\u0430 \u0438 \u0433\u0440\u0430\u043d\u0430\u0442\u044b."
},
{
"key": "The Hero must find a flag hidden in the map.",
"key": "The Hero must find a flag only visible to them hidden in the map.",
"value": "\u0425\u0440\u0430\u0431\u0440\u0435\u0446 \u0434\u043e\u043b\u0436\u0435\u043d \u043d\u0430\u0439\u0442\u0438 \u0437\u043d\u0430\u043c\u044f \u0441\u043f\u0440\u044f\u0442\u0430\u043d\u043d\u043e\u0435 \u043d\u0430 \u043a\u0430\u0440\u0442\u0435."
},
{
"key": "Once taken, the flag gives 1 health point, 4 armor points, and full ammo to all humans, furthermore full health and armor to the hero.",
"value": "\u041a\u043e\u0433\u0434\u0430 \u043e\u043d \u043f\u043e\u0434\u0431\u0438\u0440\u0430\u0435\u0442 \u0437\u043d\u0430\u043c\u044f, \u043e\u043d\u043e \u0440\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u044f\u0435\u0442 \u043a\u0430\u0436\u0434\u043e\u043c\u0443 \u0447\u0435\u043b\u043e\u0432\u0435\u043a\u0443 \u043e\u0434\u043d\u043e \u043e\u0447\u043a\u043e \u0437\u0434\u043e\u0440\u043e\u0432\u044c\u044f \u0438 \u0447\u0435\u0442\u044b\u0440\u0435 \u043e\u0447\u043a\u0430 \u0431\u0440\u043e\u043d\u0438, \u0430 \u0436\u0438\u0437\u043d\u044c \u0435\u0433\u043e \u0441\u0430\u043c\u043e\u0433\u043e \u043f\u043e\u043b\u043d\u043e\u0441\u0442\u044c\u044e \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u0430\u0432\u043b\u0438\u0432\u0430\u0435\u0442\u0441\u044f."
},
{
"key": "The gift to all humans is only applied when the flag is surrounded by hearts and armor. This gift cooldown is shared between all heros.",
"value": "\u041d\u0430\u0433\u0440\u0430\u0434\u0430 \u043b\u044e\u0434\u044f\u043c \u043d\u0430\u0447\u0438\u0441\u043b\u044f\u0435\u0442\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0435\u0441\u043b\u0438 \u0437\u043d\u0430\u043c\u044f \u043e\u043a\u0440\u0443\u0436\u0435\u043d\u043e \u0437\u043d\u0430\u0447\u043a\u0430\u043c\u0438. \u0412\u0440\u0435\u043c\u044f \u043f\u043e\u044f\u0432\u043b\u0435\u043d\u0438\u044f \u0442\u0430\u043a\u043e\u0433\u043e \u0437\u043d\u0430\u043c\u0435\u043d\u0438 \u043e\u0431\u0449\u0435\u0435 \u0434\u043b\u044f \u0432\u0441\u0435\u0445."
},
{
"key": "Cannot find a flag? Stand still for some seconds, maybe you will get enlightened.",
"value": "\u0415\u0441\u043b\u0438 \u0441\u0442\u043e\u044f\u0442\u044c \u043d\u0430 \u043c\u0435\u0441\u0442\u0435, \u043f\u043e\u044f\u0432\u0438\u0442\u0441\u044f \u043f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0430 \u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0438 \u0444\u043b\u0430\u0433\u0430."
},
{
"key": "The hero cannot be healed by a medic, but he can withstand a thrust by an infected, an his health suffice.",
"value": "\u0425\u0440\u0430\u0431\u0440\u0435\u0446 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0432\u044b\u043b\u0435\u0447\u0435\u043d \u0432\u0440\u0430\u0447\u043e\u043c, \u043d\u043e \u043e\u043d \u043c\u043e\u0436\u0435\u0442 \u0432\u044b\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u043e\u0434\u0438\u043d \u0443\u0434\u0430\u0440 \u0437\u0430\u0440\u0430\u0436\u0451\u043d\u043d\u043e\u0433\u043e, \u0435\u0441\u043b\u0438 \u0435\u0433\u043e \u0431\u0440\u043e\u043d\u044f \u043a\u0440\u0435\u043f\u043a\u0430."
Expand Down Expand Up @@ -489,6 +513,34 @@
"key": "She can also inflict 1 damage point per second by hooking humans.",
"value": "\u0410 \u0442\u0430\u043a\u0436\u0435 \u043e\u043d\u0430 \u043d\u0430\u043d\u043e\u0441\u0438\u0442 1 \u0443\u0440\u043e\u043d\u0430 \u0432 \u0441\u0435\u043a\u0443\u043d\u0434\u0443 \u0447\u0435\u043b\u043e\u0432\u0435\u043a\u0443, \u043a \u043a\u043e\u0442\u043e\u0440\u043e\u043c\u0443 \u043f\u0440\u0438\u0446\u0435\u043f\u043b\u0435\u043d\u0430 \u0446\u0435\u043f\u043e\u0447\u043a\u043e\u0439 (\u0445\u0443\u043a\u043e\u043c)."
},
{
"key": "The Voodoo can infect humans and heal infected with his hammer.",
"value": "\u0412\u0443\u0434\u0443 \u043c\u043e\u0436\u0435\u0442 \u0437\u0430\u0440\u0430\u0436\u0430\u0442\u044c \u043b\u044e\u0434\u0435\u0439 \u0438 \u043b\u0435\u0447\u0438\u0442\u044c \u0437\u0430\u0440\u0430\u0436\u0451\u043d\u043d\u044b\u0445 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0441\u0432\u043e\u0435\u0433\u043e \u043c\u043e\u043b\u043e\u0442\u0430."
},
{
"key": "He does not die immediately when killed but instead enters Spirit mode and defies death for a brief span of time.",
"value": "\u041f\u0440\u0438 \u043f\u043e\u043d\u0438\u0436\u0435\u043d\u0438\u0438 \u0437\u0434\u043e\u0440\u043e\u0432\u044c\u044f \u043e\u043d \u043d\u0435 \u0443\u043c\u0438\u0440\u0430\u0435\u0442 \u0441\u0440\u0430\u0437\u0443, \u043d\u043e \u043f\u0435\u0440\u0435\u0445\u043e\u0434\u0438\u0442 \u0432 \u0440\u0435\u0436\u0438\u043c \u0434\u0443\u0445\u0430 \u0438 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u043e\u0435 \u0432\u0440\u0435\u043c\u044f \u043e\u0441\u0442\u0430\u0435\u0442\u0441\u044f \u0436\u0438\u0432\u044b\u043c."
},
{
"key": "While in Spirit mode he cannot be killed. When his time is up he finally dies.",
"value": "\u0411\u0443\u0434\u0443\u0447\u0438 \u0432 \u0440\u0435\u0436\u0438\u043c\u0435 \u0434\u0443\u0445\u0430, \u043e\u043d \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0443\u0431\u0438\u0442. \u041e\u043d \u0443\u043c\u0440\u0435\u0442 \u0441\u0430\u043c \u0441\u043f\u0443\u0441\u0442\u044f \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u043e\u0435 \u0432\u0440\u0435\u043c\u044f."
},
{
"key": "Bat",
"value": "\u041b\u0435\u0442\u0443\u0447\u0430\u044f \u043c\u044b\u0448\u044c"
},
{
"key": "The Bat can infect humans and heal infected with his hammer.",
"value": "\u041c\u044b\u0448\u044c \u043c\u043e\u0436\u0435\u0442 \u0437\u0430\u0440\u0430\u0436\u0430\u0442\u044c \u043b\u044e\u0434\u0435\u0439 \u0438 \u043b\u0435\u0447\u0438\u0442\u044c \u0437\u0430\u0440\u0430\u0436\u0451\u043d\u043d\u044b\u0445 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0441\u0432\u043e\u0435\u0433\u043e \u043c\u043e\u043b\u043e\u0442\u0430."
},
{
"key": "He can jump multiple times in air.",
"value": "\u041c\u043e\u0436\u0435\u0442 \u0434\u0435\u043b\u0430\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043f\u0440\u044b\u0436\u043a\u043e\u0432 \u0432 \u0432\u043e\u0437\u0434\u0443\u0445\u0435."
},
{
"key": "He can also inflict 1 damage point per second by hooking humans.",
"value": "\u0415\u0449\u0435 \u043e\u043d\u0430 \u043d\u0430\u043d\u043e\u0441\u0438\u0442 \u0443\u0440\u043e\u043d \u0447\u0435\u043b\u043e\u0432\u0435\u043a\u0443, \u043a \u043a\u043e\u0442\u043e\u0440\u043e\u043c\u0443 \u043f\u0440\u0438\u0446\u0435\u043f\u043b\u0435\u043d\u0430 \u0446\u0435\u043f\u043e\u0447\u043a\u043e\u0439 (\u0445\u0443\u043a\u043e\u043c)."
},
{
"key": "Targeted chat messages",
"value": "\u0426\u0435\u043b\u0435\u0432\u044b\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f"
Expand Down Expand Up @@ -561,6 +613,10 @@
"key": "Laser wall: {sec:RemainingTime}",
"value": "\u0421\u0442\u0435\u043d\u0430: {sec:RemainingTime}"
},
{
"key": "Looper laser wall: {sec:RemainingTime}",
"value": "\u0421\u0442\u0435\u043d\u0430: {sec:RemainingTime}"
},
{
"key": "{int:NumBombs} bombs left",
"one": "{int:NumBombs} \u0431\u043e\u043c\u0431\u0430 \u043e\u0441\u0442\u0430\u043b\u0430\u0441\u044c.",
Expand Down Expand Up @@ -633,4 +689,62 @@
"key": "The Hero found the flag!",
"value": "\u0425\u0440\u0430\u0431\u0440\u0435\u0446 \u043d\u0430\u0448\u0451\u043b \u0437\u043d\u0430\u043c\u044f!"
},
{
"key": "The looper has a laser wall that slows down zombies and a low-range-laser-pistol.",
"value": "\u041b\u0443\u043f\u0435\u0440 \u043c\u043e\u0436\u0435\u0442 \u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0441\u0442\u0435\u043d\u044b, \u0437\u0430\u043c\u0435\u0434\u043b\u044f\u044e\u0449\u0438\u0435 \u0437\u0430\u0440\u0430\u0436\u0435\u043d\u043d\u044b\u0445, \u0430 \u0442\u0430\u043a\u0436\u0435 \u0441\u0442\u0440\u0435\u043b\u044f\u0442\u044c \u043a\u043e\u0440\u043e\u0442\u043a\u0438\u043c \u043b\u0430\u0437\u0435\u0440\u043e\u043c."
},
{
"key": "White hole",
"value": "\u0411\u0435\u043b\u0430\u044f \u0434\u044b\u0440\u0430"
},
{
"key": "Receive it by killing at least one zombie.",
"value": "\u041c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0443\u0431\u0438\u0432 \u043a\u0430\u043a \u043c\u0438\u043d\u0438\u043c\u0443\u043c \u043e\u0434\u043d\u043e\u0433\u043e \u0437\u043e\u043c\u0431\u0438."
},
{
"key": "White hole",
"value": "\u0411\u0435\u043b\u0430\u044f \u0434\u044b\u0440\u0430"
},
{
"key": "Receive it by killing at least {int:NumKills} zombies as scientist.",
"one": "\u041c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0443\u0431\u0438\u0432 \u043a\u0430\u043a \u043c\u0438\u043d\u0438\u043c\u0443\u043c {int:NumKills} \u0437\u043e\u043c\u0431\u0438 \u0437\u0430 \u0443\u0447\u0435\u043d\u043e\u0433\u043e.",
"few": "\u041c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0443\u0431\u0438\u0432 \u043a\u0430\u043a \u043c\u0438\u043d\u0438\u043c\u0443\u043c {int:NumKills} \u0437\u043e\u043c\u0431\u0438 \u0437\u0430 \u0443\u0447\u0435\u043d\u043e\u0433\u043e.",
"many": "\u041c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0443\u0431\u0438\u0432 \u043a\u0430\u043a \u043c\u0438\u043d\u0438\u043c\u0443\u043c {int:NumKills} \u0437\u043e\u043c\u0431\u0438 \u0437\u0430 \u0443\u0447\u0435\u043d\u043e\u0433\u043e.",
},
{
"key": "Use it with your laser rifle, the indicator around your Tee will show you if it is available",
"value": "\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0431\u0435\u043b\u0443\u044e \u0434\u044b\u0440\u0443 \u043c\u043e\u0436\u043d\u043e \u043f\u0440\u0438 \u043f\u043e\u043c\u043e\u0449\u0438 \u043b\u0430\u0437\u0435\u0440\u0430, \u043a\u043e\u0433\u0434\u0430 \u0432\u043e\u043a\u0440\u0443\u0433 \u0432\u0430\u0441 \u043f\u043e\u044f\u0432\u0438\u0442\u0441\u044f \u0438\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440."
},
{
"key": "Puts humans and zombies into a vulnerable state by pulling them into its center",
"value": "\u041f\u0440\u0438\u0442\u044f\u0433\u0438\u0432\u0430\u0435\u0442 \u043b\u044e\u0434\u0435\u0439 \u0438 \u0437\u043e\u043c\u0431\u0438 \u043a \u0446\u0435\u043d\u0442\u0440\u0443 \u044d\u0442\u043e\u0439 \u0434\u044b\u0440\u044b."
},
{
"key": "Additionally he can place white holes with the laser rifle. Further information on /help whitehole",
"value": "\u0422\u0430\u043a\u0436\u0435 \u043f\u0440\u0438 \u043f\u043e\u043c\u043e\u0449\u0438 \u043b\u0430\u0437\u0435\u0440\u0430 \u043e\u043d \u043c\u043e\u0436\u0435\u0442 \u0440\u0430\u0437\u043c\u0435\u0441\u0442\u0438\u0442\u044c \u0431\u0435\u043b\u0443\u044e \u0434\u044b\u0440\u0443. \u0418\u043d\u0444\u043e: /help whitehole"
},
{
"key": "All witches are already here",
"value": "\u0412\u0441\u0435 \u0432\u0435\u0434\u044c\u043c\u044b \u0443\u0436\u0435 \u043f\u0440\u0438\u0437\u0432\u0430\u043d\u044b"
},
{
"key": "Too few zombies",
"value": "\u0421\u043b\u0438\u0448\u043a\u043e\u043c \u043c\u0430\u043b\u043e \u0437\u043e\u043c\u0431\u0438"
},
{
"key": "{str:PlayerName} is calling for Witch! ({int:NumCallers}/{int:NumCallersLimit}) To call witch write: /witch",
"value": "{str:PlayerName} \u043f\u0440\u0438\u0437\u044b\u0432\u0430\u0435\u0442 \u0412\u0435\u0434\u044c\u043c\u0443! ({int:NumCallers}/{int:NumCallersLimit}) \u0427\u0442\u043e\u0431\u044b \u043f\u0440\u0438\u0437\u0430\u0442\u044c \u0432\u0435\u0434\u044c\u043c\u0443, \u043d\u0430\u043f\u0438\u0448\u0438: /witch"
},
{
"key": "Witch ({int:NumCallers}/{int:NumCallersLimit})",
"value": "\u0412\u0435\u0434\u044c\u043c\u0430 ({int:NumCallers}/{int:NumCallersLimit})"
},
{
"key": "You can't call witch twice",
"value": "\u0412\u044b \u0443\u0436\u0435 \u043f\u0440\u0438\u0437\u044b\u0432\u0430\u043b\u0438 \u0412\u0435\u0434\u044c\u043c\u0443"
},
{
"key": "Witch {str:PlayerName} has arrived!",
"value": "\u0412\u0435\u0434\u044c\u043c\u0430{str:PlayerName} \u043f\u0440\u0438\u0431\u044b\u043b\u0430!"
},
]}
33 changes: 17 additions & 16 deletions src/game/server/gamecontext.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3586,13 +3586,13 @@ bool CGameContext::ConHelp(IConsole::IResult *pResult, void *pUserData)
Buffer.append("\n\n");
pSelf->Server()->Localization()->Format_L(Buffer, pLanguage, _("The Hero must find a flag only visible to them hidden in the map."), NULL);
Buffer.append("\n\n");
pSelf->Server()->Localization()->Format_L(Buffer, pLanguage, _("Once taken, the flag gifts 1 health point, 4 armor points, and full ammo to all humans, furthermore full health and armor to the hero."), NULL);
pSelf->Server()->Localization()->Format_L(Buffer, pLanguage, _("Once taken, the flag gives 1 health point, 4 armor points, and full ammo to all humans, furthermore full health and armor to the hero."), NULL);
Buffer.append("\n\n");
pSelf->Server()->Localization()->Format_L(Buffer, pLanguage, _("The gift to all humans is only applied when the flag is surrounded by hearts and armor. This gift cooldown is shared between all heros."), NULL);
Buffer.append("\n\n");
pSelf->Server()->Localization()->Format_L(Buffer, pLanguage, _("Cannot find a flag? Stand still for some seconds, maybe you will get enlightened."), NULL);
Buffer.append("\n\n");
pSelf->Server()->Localization()->Format_L(Buffer, pLanguage, _("The hero cannot be healed by a medic, but he can withstand a thrust by an infected, an his health suffice."), NULL);
//pSelf->Server()->Localization()->Format_L(Buffer, pLanguage, _("The hero cannot be healed by a medic, but he can withstand a thrust by an infected, an his health suffice."), NULL);

This comment has been minimized.

Sign in to view

Copy link
@yavl

yavl Mar 3, 2019

Author Owner

commented out because the help page was too long

pSelf->SendMOTD(ClientID, Buffer.buffer());
}
Expand Down Expand Up @@ -4011,13 +4011,11 @@ bool CGameContext::ConWitch(IConsole::IResult *pResult, void *pUserData)
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "conwitch", aBuf);

if (pSelf->GetZombieCount(PLAYERCLASS_WITCH) >= MAX_WITCHES) {
str_format(aBuf, sizeof(aBuf), "All witches are already here", MAX_WITCHES);
pSelf->SendChatTarget(ClientID, aBuf);
pSelf->SendChatTarget_Localization(ClientID, CHATCATEGORY_DEFAULT, _("All witches are already here"));
return true;
}
if (pSelf->GetZombieCount() <= MIN_ZOMBIES) {
str_format(aBuf, sizeof(aBuf), "Too few zombies");
pSelf->SendChatTarget(ClientID, aBuf);
pSelf->SendChatTarget_Localization(ClientID, CHATCATEGORY_DEFAULT, _("Too few zombies"));
return true;
}

Expand All @@ -4026,24 +4024,27 @@ bool CGameContext::ConWitch(IConsole::IResult *pResult, void *pUserData)
if(!(std::find(wc.begin(), wc.end(), ClientID) != wc.end())) {
wc.push_back(ClientID); // add to witch callers vector
callers_count += 1;
if (callers_count == 1)
str_format(aBuf, sizeof(aBuf), "%s is calling for Witch! (%d/%d) To call witch write: /witch",
pSelf->Server()->ClientName(ClientID), callers_count, REQUIRED_CALLERS_COUNT);
else
str_format(aBuf, sizeof(aBuf), "Witch (%d/%d)", callers_count, REQUIRED_CALLERS_COUNT);
if (callers_count == 1) {
pSelf->SendChatTarget_Localization(-1, CHATCATEGORY_DEFAULT, _("{str:PlayerName} is calling for Witch! ({int:NumCallers}/{int:NumCallersLimit}) To call witch write: /witch"),
"PlayerName", pSelf->Server()->ClientName(ClientID),
"NumCallers", &callers_count,
"NumCallersLimit", &REQUIRED_CALLERS_COUNT);
}
else {
pSelf->SendChatTarget_Localization(-1, CHATCATEGORY_DEFAULT, _("Witch ({int:NumCallers}/{int:NumCallersLimit})"),
"NumCallers", &callers_count,
"NumCallersLimit", &REQUIRED_CALLERS_COUNT);
}
}
else {
str_format(aBuf, sizeof(aBuf), "You can't call witch twice");
pSelf->SendChatTarget(ClientID, aBuf);
pSelf->SendChatTarget_Localization(ClientID, CHATCATEGORY_DEFAULT, _("You can't call witch twice"));
return true;
}
}
else {
int witch_id = pSelf->RandomZombieToWitch();
str_format(aBuf, sizeof(aBuf), "Witch %s has arrived!", pSelf->Server()->ClientName(witch_id));
pSelf->SendChatTarget_Localization(ClientID, CHATCATEGORY_DEFAULT, _("Witch {str:PlayerName} has arrived!"), "PlayerName", pSelf->Server()->ClientName(witch_id));
}

pSelf->SendChatTarget(-1, aBuf);
return true;
}

Expand Down

0 comments on commit 84c1476

Please sign in to comment.