Browse Source

Merge branch 'dev' of Gi1dor/game-client into master

Архипов Иван 6 years ago
parent
commit
a24d60939c
94 changed files with 107 additions and 95 deletions
  1. 2 1
      assets/units/human/atraty-rider/unitname.txt
  2. 2 1
      assets/units/human/holy-spirit/unitname.txt
  3. 2 1
      assets/units/human/human-adept-of-subtetly/unitname.txt
  4. 2 1
      assets/units/human/human-aerotheurger/unitname.txt
  5. 2 1
      assets/units/human/human-alchemist/unitname.txt
  6. 1 1
      assets/units/human/human-archer/unitname.txt
  7. 1 1
      assets/units/human/human-army-bowman/unitname.txt
  8. 1 1
      assets/units/human/human-arsonist/unitname.txt
  9. 1 1
      assets/units/human/human-assassin/unitname.txt
  10. 1 1
      assets/units/human/human-avenger/unitname.txt
  11. 1 1
      assets/units/human/human-battle-mage/unitname.txt
  12. 1 1
      assets/units/human/human-berserker/unitname.txt
  13. 1 1
      assets/units/human/human-big-game-hunter/unitname.txt
  14. 1 1
      assets/units/human/human-brigand/unitname.txt
  15. 1 1
      assets/units/human/human-cataphract/unitname.txt
  16. 1 1
      assets/units/human/human-cavalryman/unitname.txt
  17. 1 1
      assets/units/human/human-chastener/unitname.txt
  18. 1 1
      assets/units/human/human-cleric/unitname.txt
  19. 1 1
      assets/units/human/human-clinicaria/unitname.txt
  20. 1 1
      assets/units/human/human-condottier/unitname.txt
  21. 1 1
      assets/units/human/human-dancer-with-shadows/unitname.txt
  22. 1 1
      assets/units/human/human-defender/unitname.txt
  23. 1 1
      assets/units/human/human-demolisher/unitname.txt
  24. 1 1
      assets/units/human/human-deserter/unitname.txt
  25. 1 1
      assets/units/human/human-druid/unitname.txt
  26. 1 1
      assets/units/human/human-duelist/unitname.txt
  27. 1 1
      assets/units/human/human-farstrider/unitname.txt
  28. 1 1
      assets/units/human/human-fencer/unitname.txt
  29. 1 1
      assets/units/human/human-flayer/unitname.txt
  30. 1 1
      assets/units/human/human-floromante/unitname.txt
  31. 1 1
      assets/units/human/human-frost-mage/unitname.txt
  32. 1 1
      assets/units/human/human-guardian/unitname.txt
  33. 1 1
      assets/units/human/human-healer/unitname.txt
  34. 1 1
      assets/units/human/human-hoplite/unitname.txt
  35. 1 1
      assets/units/human/human-hunter/unitname.txt
  36. 1 1
      assets/units/human/human-hydromante/unitname.txt
  37. 1 1
      assets/units/human/human-illusionist/unitname.txt
  38. 1 1
      assets/units/human/human-lightning-mage/unitname.txt
  39. 1 1
      assets/units/human/human-liquidator/unitname.txt
  40. 1 1
      assets/units/human/human-mage/unitname.txt
  41. 1 1
      assets/units/human/human-magus-mage/unitname.txt
  42. 1 1
      assets/units/human/human-marauder/unitname.txt
  43. 1 1
      assets/units/human/human-marksman/unitname.txt
  44. 1 1
      assets/units/human/human-master-of-subtetly/unitname.txt
  45. 1 1
      assets/units/human/human-mistweaver/unitname.txt
  46. 1 1
      assets/units/human/human-monk/unitname.txt
  47. 1 1
      assets/units/human/human-mystic/unitname.txt
  48. 1 1
      assets/units/human/human-outlaw/unitname.txt
  49. 1 1
      assets/units/human/human-paladin/unitname.txt
  50. 1 1
      assets/units/human/human-pathfinder/unitname.txt
  51. 1 1
      assets/units/human/human-pikeman/unitname.txt
  52. 1 1
      assets/units/human/human-poisoner/unitname.txt
  53. 1 1
      assets/units/human/human-priest/unitname.txt
  54. 1 1
      assets/units/human/human-psyonic/unitname.txt
  55. 1 1
      assets/units/human/human-pyromante/unitname.txt
  56. 1 1
      assets/units/human/human-recruit/unitname.txt
  57. 1 1
      assets/units/human/human-rider/unitname.txt
  58. 1 1
      assets/units/human/human-rogue/unitname.txt
  59. 1 1
      assets/units/human/human-royal-archer/unitname.txt
  60. 1 1
      assets/units/human/human-saboteur/unitname.txt
  61. 1 1
      assets/units/human/human-sharpshooter/unitname.txt
  62. 1 1
      assets/units/human/human-skirmisher/unitname.txt
  63. 1 1
      assets/units/human/human-slayer/unitname.txt
  64. 1 1
      assets/units/human/human-spearman/unitname.txt
  65. 1 1
      assets/units/human/human-support-mage/unitname.txt
  66. 1 1
      assets/units/human/human-suppressor/unitname.txt
  67. 1 1
      assets/units/human/human-thug/unitname.txt
  68. 1 1
      assets/units/human/human-tormentor/unitname.txt
  69. 1 1
      assets/units/human/human-trailblazer/unitname.txt
  70. 1 1
      assets/units/human/human-trapper/unitname.txt
  71. 1 1
      assets/units/human/human-voodoo/unitname.txt
  72. 1 1
      assets/units/human/human-warden/unitname.txt
  73. 1 1
      assets/units/human/human-warlord/unitname.txt
  74. 1 1
      assets/units/human/human-warrior/unitname.txt
  75. 1 1
      assets/units/human/human-wild-rider/unitname.txt
  76. 1 1
      assets/units/human/human-witch-doctor/unitname.txt
  77. 1 1
      assets/units/human/treant/unitname.txt
  78. 1 1
      assets/units/human/units.txt
  79. 1 2
      assets/units/races.txt
  80. 1 1
      assets/units/undead/undead-archer/unitname.txt
  81. 1 1
      assets/units/undead/undead-mage/unitname.txt
  82. 1 1
      assets/units/undead/undead-rider/unitname.txt
  83. 1 1
      assets/units/undead/undead-rogue/unitname.txt
  84. 1 1
      assets/units/undead/undead-warrior/unitname.txt
  85. 1 1
      assets/units/undead/units.txt
  86. 2 1
      assets/units/warcraft/blademaster/unitname.txt
  87. 2 1
      assets/units/warcraft/chaosorc/unitname.txt
  88. 2 1
      assets/units/warcraft/nagasummoner/unitname.txt
  89. 2 1
      assets/units/warcraft/necromancer/unitname.txt
  90. 2 1
      assets/units/warcraft/ogremagi/unitname.txt
  91. 2 1
      assets/units/warcraft/rogue/unitname.txt
  92. 1 1
      assets/units/warcraft/units.txt
  93. 2 1
      assets/units/warcraft/wargraider/unitname.txt
  94. 2 1
      assets/units/warcraft/wyvern/unitname.txt

+ 2 - 1
assets/units/human/atraty-rider/unitname.txt

@@ -1 +1,2 @@
-Всадник Атратии
+Всадник Атратии III
+

+ 2 - 1
assets/units/human/holy-spirit/unitname.txt

@@ -1 +1,2 @@
-Святая душа
+Святая душа IV
+

+ 2 - 1
assets/units/human/human-adept-of-subtetly/unitname.txt

@@ -1 +1,2 @@
-Адепт скрытности
+Адепт скрытности III
+

+ 2 - 1
assets/units/human/human-aerotheurger/unitname.txt

@@ -1 +1,2 @@
-Человек-аэротург
+Человек-аэротург III
+

+ 2 - 1
assets/units/human/human-alchemist/unitname.txt

@@ -1 +1,2 @@
-Человек-алхимик
+Человек-алхимик IV
+

+ 1 - 1
assets/units/human/human-archer/unitname.txt

@@ -1 +1 @@
-Человек-лучник
+Человек-лучник I

+ 1 - 1
assets/units/human/human-army-bowman/unitname.txt

@@ -1 +1 @@
-Армейский лучник
+Армейский лучник II

+ 1 - 1
assets/units/human/human-arsonist/unitname.txt

@@ -1 +1 @@
-Человек-поджигатель
+Человек-поджигатель IV

+ 1 - 1
assets/units/human/human-assassin/unitname.txt

@@ -1 +1 @@
-Наёмный убийца
+Наёмный убийца III

+ 1 - 1
assets/units/human/human-avenger/unitname.txt

@@ -1 +1 @@
-Человек-мститель
+Человек-мститель IV

+ 1 - 1
assets/units/human/human-battle-mage/unitname.txt

@@ -1 +1 @@
-Людской боевой маг
+Людской боевой маг II

+ 1 - 1
assets/units/human/human-berserker/unitname.txt

@@ -1 +1 @@
-Человек-берсерк
+Человек-берсерк IV

+ 1 - 1
assets/units/human/human-big-game-hunter/unitname.txt

@@ -1 +1 @@
-Умелый охотник
+Умелый охотник III

+ 1 - 1
assets/units/human/human-brigand/unitname.txt

@@ -1 +1 @@
-Человек-разбойник
+Человек-разбойник III

+ 1 - 1
assets/units/human/human-cataphract/unitname.txt

@@ -1 +1 @@
-Катафракт
+Катафракт III

+ 1 - 1
assets/units/human/human-cavalryman/unitname.txt

@@ -1 +1 @@
-Человек-кавалерист
+Человек-кавалерист II

+ 1 - 1
assets/units/human/human-chastener/unitname.txt

@@ -1 +1 @@
-Человек-каратель
+Человек-каратель III

+ 1 - 1
assets/units/human/human-cleric/unitname.txt

@@ -1 +1 @@
-Человек-клерик
+Человек-клерик IV

+ 1 - 1
assets/units/human/human-clinicaria/unitname.txt

@@ -1 +1 @@
-Клибанарий
+Клибанарий III

+ 1 - 1
assets/units/human/human-condottier/unitname.txt

@@ -1 +1 @@
-Человек-наёмник
+Человек-наёмник II

+ 1 - 1
assets/units/human/human-dancer-with-shadows/unitname.txt

@@ -1 +1 @@
-Танцующий с тенями
+Танцующий с тенями IV

+ 1 - 1
assets/units/human/human-defender/unitname.txt

@@ -1 +1 @@
-Человек-защитник
+Человек-защитник III

+ 1 - 1
assets/units/human/human-demolisher/unitname.txt

@@ -1 +1 @@
-Разрушитель
+Разрушитель III

+ 1 - 1
assets/units/human/human-deserter/unitname.txt

@@ -1 +1 @@
-Человек-дезертир
+Человек-дезертир III

+ 1 - 1
assets/units/human/human-druid/unitname.txt

@@ -1 +1 @@
-Человек-друид
+Человек-друид IV

+ 1 - 1
assets/units/human/human-duelist/unitname.txt

@@ -1 +1 @@
-Человек-дуэлянт
+Человек-дуэлянт III

+ 1 - 1
assets/units/human/human-farstrider/unitname.txt

@@ -1 +1 @@
-Человек-странник
+Человек-странник IV

+ 1 - 1
assets/units/human/human-fencer/unitname.txt

@@ -1 +1 @@
-Человек-фехтовальщик
+Человек-фехтовальщик IV

+ 1 - 1
assets/units/human/human-flayer/unitname.txt

@@ -1 +1 @@
-Человек-живодёр
+Человек-живодёр IV

+ 1 - 1
assets/units/human/human-floromante/unitname.txt

@@ -1 +1 @@
-Человек-флоромант
+Человек-флоромант III

+ 1 - 1
assets/units/human/human-frost-mage/unitname.txt

@@ -1 +1 @@
-Людской маг льда
+Людской маг льда IV

+ 1 - 1
assets/units/human/human-guardian/unitname.txt

@@ -1 +1 @@
-Человек-хранитель
+Человек-хранитель IV

+ 1 - 1
assets/units/human/human-healer/unitname.txt

@@ -1 +1 @@
-Человек-целитель
+Человек-целитель II

+ 1 - 1
assets/units/human/human-hoplite/unitname.txt

@@ -1 +1 @@
-Человек-гоплит
+Человек-гоплит IV

+ 1 - 1
assets/units/human/human-hunter/unitname.txt

@@ -1 +1 @@
-Человек-охотник
+Человек-охотник II

+ 1 - 1
assets/units/human/human-hydromante/unitname.txt

@@ -1 +1 @@
-Человек-гидромант
+Человек-гидромант III

+ 1 - 1
assets/units/human/human-illusionist/unitname.txt

@@ -1 +1 @@
-Человек-иллюзионист
+Человек-иллюзионист IV

+ 1 - 1
assets/units/human/human-lightning-mage/unitname.txt

@@ -1 +1 @@
-Людской маг молний
+Людской маг молний IV

+ 1 - 1
assets/units/human/human-liquidator/unitname.txt

@@ -1 +1 @@
-Человек-ликвидатор
+Человек-ликвидатор IV

+ 1 - 1
assets/units/human/human-mage/unitname.txt

@@ -1 +1 @@
-Человек-маг
+Человек-маг I

+ 1 - 1
assets/units/human/human-magus-mage/unitname.txt

@@ -1 +1 @@
-Людской маг магмы
+Людской маг магмы IV

+ 1 - 1
assets/units/human/human-marauder/unitname.txt

@@ -1 +1 @@
-Человек-мародёр
+Человек-мародёр IV

+ 1 - 1
assets/units/human/human-marksman/unitname.txt

@@ -1 +1 @@
-Меткий стрелок
+Меткий стрелок III

+ 1 - 1
assets/units/human/human-master-of-subtetly/unitname.txt

@@ -1 +1 @@
-Мастер скрытности
+Мастер скрытности III

+ 1 - 1
assets/units/human/human-mistweaver/unitname.txt

@@ -1 +1 @@
-Людской ткач туманов
+Людской ткач туманов IV

+ 1 - 1
assets/units/human/human-monk/unitname.txt

@@ -1 +1 @@
-Человек-монах
+Человек-монах III

+ 1 - 1
assets/units/human/human-mystic/unitname.txt

@@ -1 +1 @@
-Человек-мистик
+Человек-мистик IV

+ 1 - 1
assets/units/human/human-outlaw/unitname.txt

@@ -1 +1 @@
-Человек-изгнанник
+Человек-изгнанник II

+ 1 - 1
assets/units/human/human-paladin/unitname.txt

@@ -1 +1 @@
-Человек-паладин
+Человек-паладин IV

+ 1 - 1
assets/units/human/human-pathfinder/unitname.txt

@@ -1 +1 @@
-Человек-следопыт
+Человек-следопыт III

+ 1 - 1
assets/units/human/human-pikeman/unitname.txt

@@ -1 +1 @@
-Человек-пикинёр
+Человек-пикинёр IV

+ 1 - 1
assets/units/human/human-poisoner/unitname.txt

@@ -1 +1 @@
-Человек-отравитель
+Человек-отравитель IV

+ 1 - 1
assets/units/human/human-priest/unitname.txt

@@ -1 +1 @@
-Человек-жрец
+Человек-жрец III

+ 1 - 1
assets/units/human/human-psyonic/unitname.txt

@@ -1 +1 @@
-Человек-псионик
+Человек-псионик III

+ 1 - 1
assets/units/human/human-pyromante/unitname.txt

@@ -1 +1 @@
-Человек-пиромант
+Человек-пиромант III

+ 1 - 1
assets/units/human/human-recruit/unitname.txt

@@ -1 +1 @@
-Человек-рекрут
+Человек-рекрут II

+ 1 - 1
assets/units/human/human-rider/unitname.txt

@@ -1 +1 @@
-Человек-всадник
+Человек-всадник I

+ 1 - 1
assets/units/human/human-rogue/unitname.txt

@@ -1 +1 @@
-Человек-изгой
+Человек-изгой I

+ 1 - 1
assets/units/human/human-royal-archer/unitname.txt

@@ -1 +1 @@
-Королевский лучник
+Королевский лучник III

+ 1 - 1
assets/units/human/human-saboteur/unitname.txt

@@ -1 +1 @@
-Человек-саботёр
+Человек-саботёр IV

+ 1 - 1
assets/units/human/human-sharpshooter/unitname.txt

@@ -1 +1 @@
-Человек-саботёр
+Снайпер IV

+ 1 - 1
assets/units/human/human-skirmisher/unitname.txt

@@ -1 +1 @@
-Человек-застрельщик
+Человек-застрельщик III

+ 1 - 1
assets/units/human/human-slayer/unitname.txt

@@ -1 +1 @@
-Человек-убийца
+Человек-убийца II

+ 1 - 1
assets/units/human/human-spearman/unitname.txt

@@ -1 +1 @@
-Человек-копейщик
+Человек-копейщик III

+ 1 - 1
assets/units/human/human-support-mage/unitname.txt

@@ -1 +1 @@
-Людской маг поддержки
+Людской маг поддержки II

+ 1 - 1
assets/units/human/human-suppressor/unitname.txt

@@ -1 +1 @@
-Человек-усмиритель
+Человек-усмиритель IV

+ 1 - 1
assets/units/human/human-thug/unitname.txt

@@ -1 +1 @@
-Человек-головорез
+Человек-головорез IV

+ 1 - 1
assets/units/human/human-tormentor/unitname.txt

@@ -1 +1 @@
-Человек-мучитель
+Человек-мучитель IV

+ 1 - 1
assets/units/human/human-trailblazer/unitname.txt

@@ -1 +1 @@
-Человек-первопроходец
+Человек-первопроходец IV

+ 1 - 1
assets/units/human/human-trapper/unitname.txt

@@ -1 +1 @@
-Мастер ловушек
+Мастер ловушек IV

+ 1 - 1
assets/units/human/human-voodoo/unitname.txt

@@ -1 +1 @@
-Людской служитель Вуду
+Людской служитель Вуду IV

+ 1 - 1
assets/units/human/human-warden/unitname.txt

@@ -1 +1 @@
-Человек-смотритель
+Человек-смотритель IV

+ 1 - 1
assets/units/human/human-warlord/unitname.txt

@@ -1 +1 @@
-Завоеватель
+Завоеватель IV

+ 1 - 1
assets/units/human/human-warrior/unitname.txt

@@ -1 +1 @@
-Человек-воин
+Человек-воин I

+ 1 - 1
assets/units/human/human-wild-rider/unitname.txt

@@ -1 +1 @@
-Вольный всадник
+Вольный всадник II

+ 1 - 1
assets/units/human/human-witch-doctor/unitname.txt

@@ -1 +1 @@
-Человек-знахарь
+Человек-знахарь III

+ 1 - 1
assets/units/human/treant/unitname.txt

@@ -1 +1 @@
-Древень
+Древень IV

+ 1 - 1
assets/units/human/units.txt

@@ -2,4 +2,4 @@ human-mage
 human-warrior
 human-rider
 human-rogue
-human-archer
+human-archer

+ 1 - 2
assets/units/races.txt

@@ -1,4 +1,3 @@
 human
 undead
-warcraft
-
+warcraft

+ 1 - 1
assets/units/undead/undead-archer/unitname.txt

@@ -1 +1 @@
-Павший лучник
+Павший лучник I

+ 1 - 1
assets/units/undead/undead-mage/unitname.txt

@@ -1 +1 @@
-Павший маг
+Павший маг I

+ 1 - 1
assets/units/undead/undead-rider/unitname.txt

@@ -1 +1 @@
-Павший всадник
+Павший всадник I

+ 1 - 1
assets/units/undead/undead-rogue/unitname.txt

@@ -1 +1 @@
-Павший изгой
+Павший изгой I

+ 1 - 1
assets/units/undead/undead-warrior/unitname.txt

@@ -1 +1 @@
-Павший воин
+Павший воин I

+ 1 - 1
assets/units/undead/units.txt

@@ -2,4 +2,4 @@ undead-mage
 undead-warrior
 undead-rider
 undead-rogue
-undead-archer
+undead-archer

+ 2 - 1
assets/units/warcraft/blademaster/unitname.txt

@@ -1 +1,2 @@
-Мастер Клинка
+Мастер Клинка
+

+ 2 - 1
assets/units/warcraft/chaosorc/unitname.txt

@@ -1 +1,2 @@
-Демонический орк
+Демонический орк
+

+ 2 - 1
assets/units/warcraft/nagasummoner/unitname.txt

@@ -1 +1,2 @@
-Нага-призывательница
+Нага-призывательница
+

+ 2 - 1
assets/units/warcraft/necromancer/unitname.txt

@@ -1 +1,2 @@
-Некромант
+Некромант
+

+ 2 - 1
assets/units/warcraft/ogremagi/unitname.txt

@@ -1 +1,2 @@
-Огр-маг
+Огр-маг
+

+ 2 - 1
assets/units/warcraft/rogue/unitname.txt

@@ -1 +1,2 @@
-Разбойник
+Разбойник
+

+ 1 - 1
assets/units/warcraft/units.txt

@@ -1,4 +1,4 @@
 blademaster
 nagasummoner
 wargraider
-wyvern
+wyvern

+ 2 - 1
assets/units/warcraft/wargraider/unitname.txt

@@ -1 +1,2 @@
-Волчий всадник
+Волчий всадник
+

+ 2 - 1
assets/units/warcraft/wyvern/unitname.txt

@@ -1 +1,2 @@
-Виверна
+Виверна
+