Skip to content

Commit 5e5767f

Browse files
RobosturmRobosturm
authored
Merge pull request #1946 from FruityGumGuiltyFruit/master
Update co_yukio.js
2 parents 61a4725 + d8997d4 commit 5e5767f

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎game/gamemap.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ QString GameMap::getMapTagsText()
489489
}
490490
if (GameEnums::MapFilterFlags_Symetric & m_headerInfo.m_mapFlags)
491491
{
492-
ret += tr("Symetric\n");
492+
ret += tr("Symmetric\n");
493493
}
494494
if (GameEnums::MapFilterFlags_PvP & m_headerInfo.m_mapFlags)
495495
{

‎resources/scripts/cos/co_yukio.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ var Constructor = function()
320320
// CO - Intel
321321
this.getBio = function(co)
322322
{
323-
return qsTr("Founder of the Dark Matter Cooperation. He's the primary reason for invasions of Sturm and Von Bolt. He uses war as a way of making money and doesn't care if people die.");
323+
return qsTr("Founder of the Dark Matter Cooperation. He's the primary reason for the invasions of Sturm and Von Bolt. He uses war as a way of making money and doesn't care if people die.");
324324
};
325325
this.getHits = function(co)
326326
{
@@ -332,7 +332,7 @@ var Constructor = function()
332332
};
333333
this.getCODescription = function(co)
334334
{
335-
return qsTr("As the leader of dark matter, his troops have special armor, as well as armor piercing weapons.");
335+
return qsTr("As the leader of Dark Matter, his troops have special armor, as well as armor-piercing weapons.");
336336
};
337337
this.getLongCODescription = function(co, map)
338338
{
@@ -344,14 +344,14 @@ var Constructor = function()
344344
}
345345
var text = qsTr("\nSpecial Unit:\nLogistic Truck\n") +
346346
qsTr("\nGlobal Effect: \nEnemy attacks deal -%0% damage to Yukio's units. If an attack from Yukio's units would deal at least %2 HP damage, they deal an additional defense-ignoring -%1 HP of damage.") +
347-
qsTr("\n\nCO Zone Effect: \nEnemy attacks deal -%3% damage to Yukio's units. If an attack from Yukio's units would deal at least %5 HP damage, they deal an additional defense-ignoring -%4 HP of damage. Yukio's units also gain +%5% firepower and +%6% defence.");
347+
qsTr("\n\nCO Zone Effect: \nEnemy attacks deal -%3% damage to Yukio's units. If an attack from Yukio's units would deal at least %5 HP damage, they deal an additional defense-ignoring -%4 HP of damage. Yukio's units also gain +%6% firepower and +%7% defense.");
348348
text = replaceTextArgs(text, [values[0], values[1], values[2],
349349
CO_YUKIO.d2dCoZoneTrueDefenseBonus, CO_YUKIO.d2dCoZoneTrueDamageBonus/10, CO_YUKIO.d2dCoZoneMinTrueDamage/10, CO_YUKIO.d2dCoZoneOffBonus, CO_YUKIO.d2dCoZoneDefBonus]);
350350
return text;
351351
};
352352
this.getPowerDescription = function(co)
353353
{
354-
var text = qsTr("A small army deploys to fight for Yukio. A random 40% of his owned buildings, if empty, will randomly deploy either a Light Tank, Anti Air, or Artillery, ready to move. Enemy attacks deal -%0% damage to Yukio's units. If an attack from Yukio's units would deal at least %1 HP damage, they deal an additional defense-ignoring -%2 HP of damage. Yukio's units also gain +%3% firepower and +%4% defence.");
354+
var text = qsTr("A small army deploys to fight for Yukio. A random 40% of his unoccupied cities will randomly deploy either a Light Tank, Anti Air, or Artillery, ready to move. \nEnemy attacks deal -%0% damage to Yukio's units. If an attack from Yukio's units would deal at least %1 HP damage, they deal an additional defense-ignoring -%2 HP of damage. Yukio's units also gain +%3% firepower and +%4% defense.");
355355
text = replaceTextArgs(text, [CO_YUKIO.powerTrueDefenseBonus, CO_YUKIO.powerMinTrueDamage/10, CO_YUKIO.powerTrueDamageBonus/10,
356356
CO_YUKIO.powerOffBonus, CO_YUKIO.powerDefBonus]);
357357
return text;
@@ -362,7 +362,7 @@ var Constructor = function()
362362
};
363363
this.getSuperPowerDescription = function(co)
364364
{
365-
var text = qsTr("A large army deploys to fight for Yukio. A random 70% of his owned buildings, if empty, will randomly deploy either a Light Tank, Anti Air, Artillery, Heavy Tank, or Battle Copter, ready to move. In order to support the invasion, a bombardment is launched dealing -%0 HP of damage to a random 50% of all enemies. Enemy attacks deal -%1% damage to Yukio's units. If an attack from Yukio's units would deal at least %2 HP damage, they deal an additional defense-ignoring -%3 HP of damage. Yukio's units also gain +%4% firepower and +%5% defence.");
365+
var text = qsTr("A large army deploys to fight for Yukio. A random 70% of his unoccupied cities will randomly deploy either a Light Tank, Anti Air, Artillery, Heavy Tank, or Battle Copter, ready to move. In order to support the invasion, a bombardment is launched dealing -%0 HP of damage to a random 50% of all enemies. \nEnemy attacks deal -%1% damage to Yukio's units. If an attack from Yukio's units would deal at least %2 HP damage, they deal an additional defense-ignoring -%3 HP of damage. Yukio's units also gain +%4% firepower and +%5% defense.");
366366
text = replaceTextArgs(text, [CO_YUKIO.superPowerBombDamage, CO_YUKIO.powerTrueDefenseBonus, CO_YUKIO.powerMinTrueDamage/10, CO_YUKIO.powerTrueDamageBonus/10,
367367
CO_YUKIO.powerOffBonus, CO_YUKIO.powerDefBonus]);
368368
return text;
@@ -376,7 +376,7 @@ var Constructor = function()
376376
return [qsTr("I'll show you what true power means."),
377377
qsTr("Me? I'm the evil that destroys you."),
378378
qsTr("Your weapons are the rubbish my factories dispose of."),
379-
qsTr("Victory is mine! Alea iacta est!"),
379+
qsTr("Victory is mine! Alea iacta est!"),
380380
qsTr("I'll become the ruler of this world!")];
381381
};
382382
this.getVictorySentences = function(co)

‎resources/ui/mapSelectionFilterDialog.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@
360360
<Checkbox>
361361
<x>lastX + lastWidth + 10</x>
362362
<y>lastY</y>
363-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map needs to be predeoployed.")</tooltip>
363+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map needs to be predeployed.")</tooltip>
364364
<startValue>mapSelectionFilter.getFlagActive(GameEnums.MapFilterFlags_Predeployed)</startValue>
365365
<onEvent>mapSelectionFilter.setFlagActive(GameEnums.MapFilterFlags_Predeployed, input);</onEvent>
366366
</Checkbox>
@@ -421,7 +421,7 @@
421421
<x>10</x>
422422
<y>lastY + lastHeight + 10</y>
423423
<width>200</width>
424-
<text>QT_TRANSLATE_NOOP("GAME","Symetric:")</text>
424+
<text>QT_TRANSLATE_NOOP("GAME","Symmetric:")</text>
425425
<font>"main"</font>
426426
<fontSize>24</fontSize>
427427
</Label>
@@ -518,7 +518,7 @@
518518
<Checkbox>
519519
<x>lastX + lastWidth + 10</x>
520520
<y>lastY</y>
521-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed to be played against an ai.")</tooltip>
521+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed to be played against an AI.")</tooltip>
522522
<startValue>mapSelectionFilter.getFlagActive(GameEnums.MapFilterFlags_VsAi)</startValue>
523523
<onEvent>mapSelectionFilter.setFlagActive(GameEnums.MapFilterFlags_VsAi, input);</onEvent>
524524
</Checkbox>
@@ -578,7 +578,7 @@
578578
<Checkbox>
579579
<x>lastX + lastWidth + 10</x>
580580
<y>lastY</y>
581-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as historical map.")</tooltip>
581+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a historical map.")</tooltip>
582582
<startValue>mapSelectionFilter.getFlagActive(GameEnums.MapFilterFlags_Historical)</startValue>
583583
<onEvent>mapSelectionFilter.setFlagActive(GameEnums.MapFilterFlags_Historical, input);</onEvent>
584584
</Checkbox>
@@ -616,7 +616,7 @@
616616
<Checkbox>
617617
<x>lastX + lastWidth + 10</x>
618618
<y>lastY</y>
619-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as low funds map.")</tooltip>
619+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a low funds map.")</tooltip>
620620
<startValue>mapSelectionFilter.getFlagActive(GameEnums.MapFilterFlags_LowFunds)</startValue>
621621
<onEvent>mapSelectionFilter.setFlagActive(GameEnums.MapFilterFlags_LowFunds, input);</onEvent>
622622
</Checkbox>
@@ -646,7 +646,7 @@
646646
<Checkbox>
647647
<x>lastX + lastWidth + 10</x>
648648
<y>lastY</y>
649-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as high funds map.")</tooltip>
649+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a high funds map.")</tooltip>
650650
<startValue>mapSelectionFilter.getFlagActive(GameEnums.MapFilterFlags_HighFunds)</startValue>
651651
<onEvent>mapSelectionFilter.setFlagActive(GameEnums.MapFilterFlags_HighFunds, input);</onEvent>
652652
</Checkbox>
@@ -684,7 +684,7 @@
684684
<Checkbox>
685685
<x>lastX + lastWidth + 10</x>
686686
<y>lastY</y>
687-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as naval map.")</tooltip>
687+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a naval map.")</tooltip>
688688
<startValue>mapSelectionFilter.getFlagActive(GameEnums.MapFilterFlags_Naval)</startValue>
689689
<onEvent>mapSelectionFilter.setFlagActive(GameEnums.MapFilterFlags_Naval, input);</onEvent>
690690
</Checkbox>
@@ -714,7 +714,7 @@
714714
<Checkbox>
715715
<x>lastX + lastWidth + 10</x>
716716
<y>lastY</y>
717-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as ground map.")</tooltip>
717+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a ground map.")</tooltip>
718718
<startValue>mapSelectionFilter.getFlagActive(GameEnums.MapFilterFlags_Ground)</startValue>
719719
<onEvent>mapSelectionFilter.setFlagActive(GameEnums.MapFilterFlags_Ground, input);</onEvent>
720720
</Checkbox>
@@ -744,7 +744,7 @@
744744
<Checkbox>
745745
<x>lastX + lastWidth + 10</x>
746746
<y>lastY</y>
747-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as air map.")</tooltip>
747+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as an air map.")</tooltip>
748748
<startValue>mapSelectionFilter.getFlagActive(GameEnums.MapFilterFlags_Air)</startValue>
749749
<onEvent>mapSelectionFilter.setFlagActive(GameEnums.MapFilterFlags_Air, input);</onEvent>
750750
</Checkbox>
@@ -774,7 +774,7 @@
774774
<Checkbox>
775775
<x>lastX + lastWidth + 10</x>
776776
<y>lastY</y>
777-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as fog of war map.")</tooltip>
777+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a fog of war map.")</tooltip>
778778
<startValue>mapSelectionFilter.getFlagActive(GameEnums.MapFilterFlags_FogOfWar)</startValue>
779779
<onEvent>mapSelectionFilter.setFlagActive(GameEnums.MapFilterFlags_FogOfWar, input);</onEvent>
780780
</Checkbox>
@@ -804,7 +804,7 @@
804804
<Checkbox>
805805
<x>lastX + lastWidth + 10</x>
806806
<y>lastY</y>
807-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as scripted map.")</tooltip>
807+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a scripted map.")</tooltip>
808808
<startValue>mapSelectionFilter.getFlagActive(GameEnums.MapFilterFlags_Scripted)</startValue>
809809
<onEvent>mapSelectionFilter.setFlagActive(GameEnums.MapFilterFlags_Scripted, input);</onEvent>
810810
</Checkbox>

0 commit comments

Comments
 (0)