diff --git a/Mods/vcmi/config/vcmi/english.json b/Mods/vcmi/config/vcmi/english.json index 3342a2cfc..1beb0b556 100644 --- a/Mods/vcmi/config/vcmi/english.json +++ b/Mods/vcmi/config/vcmi/english.json @@ -13,13 +13,14 @@ "vcmi.adventureMap.monsterThreat.levels.10" : "Deadly", "vcmi.adventureMap.monsterThreat.levels.11" : "Impossible", - "vcmi.adventureMap.confirmRestartGame" : "Are you sure you want to restart the game?", - "vcmi.adventureMap.noTownWithMarket" : "There are no available marketplaces!", - "vcmi.adventureMap.noTownWithTavern" : "There are no available towns with taverns!", - "vcmi.adventureMap.spellUnknownProblem" : "There is an unknown problem with this spell! No more information is available.", - "vcmi.adventureMap.playerAttacked" : "Player has been attacked: %s", - "vcmi.adventureMap.moveCostDetails" : "Movement points - Cost: %TURNS turns + %POINTS points, Remaining points: %REMAINING", - "vcmi.adventureMap.moveCostDetailsNoTurns" : "Movement points - Cost: %POINTS points, Remaining points: %REMAINING", + "vcmi.adventureMap.confirmRestartGame" : "Are you sure you want to restart the game?", + "vcmi.adventureMap.noTownWithMarket" : "There are no available marketplaces!", + "vcmi.adventureMap.noTownWithTavern" : "There are no available towns with taverns!", + "vcmi.adventureMap.spellUnknownProblem" : "There is an unknown problem with this spell! No more information is available.", + "vcmi.adventureMap.playerAttacked" : "Player has been attacked: %s", + "vcmi.adventureMap.moveCostDetails" : "Movement points - Cost: %TURNS turns + %POINTS points, Remaining points: %REMAINING", + "vcmi.adventureMap.moveCostDetailsNoTurns" : "Movement points - Cost: %POINTS points, Remaining points: %REMAINING", + "vcmi.adventureMap.replayOpponentTurnNotImplemented" : "Sorry, replay opponent turn is not implemented yet!", "vcmi.capitalColors.0" : "Red", "vcmi.capitalColors.1" : "Blue", @@ -72,7 +73,6 @@ "vcmi.lobby.noUnderground" : "no underground", "vcmi.lobby.sortDate" : "Sorts maps by change date", - "vcmi.client.errors.invalidMap" : "{Invalid map or campaign}\n\nFailed to start game! Selected map or campaign might be invalid or corrupted. Reason:\n%s", "vcmi.client.errors.missingCampaigns" : "{Missing data files}\n\nCampaigns data files were not found! You may be using incomplete or corrupted Heroes 3 data files. Please reinstall game data.", "vcmi.server.errors.existingProcess" : "Another VCMI server process is running. Please terminate it before starting a new game.", "vcmi.server.errors.modsToEnable" : "{Following mods are required}", @@ -171,8 +171,10 @@ "vcmi.battleOptions.showStickyHeroInfoWindows.hover": "Show heroes statistics windows", "vcmi.battleOptions.showStickyHeroInfoWindows.help": "{Show heroes statistics windows}\n\nPermanently toggle on heroes statistics windows that show primary stats and spell points.", "vcmi.battleOptions.skipBattleIntroMusic.hover": "Skip Intro Music", - "vcmi.battleOptions.skipBattleIntroMusic.help": "{Skip Intro Music}\n\nAllow actions during the intro music that plays at the beginning of each battle.", - + "vcmi.battleOptions.skipBattleIntroMusic.help": "{Skip Intro Music}\n\nAllow actions during the intro music that plays at the beginning of each battle.", + "vcmi.battleOptions.endWithAutocombat.hover": "Ends battle", + "vcmi.battleOptions.endWithAutocombat.help": "{Ends battle}\n\nAuto-Combat plays battle to end instant", + "vcmi.adventureMap.revisitObject.hover" : "Revisit Object", "vcmi.adventureMap.revisitObject.help" : "{Revisit Object}\n\nIf a hero currently stands on a Map Object, he can revisit the location.", @@ -233,8 +235,6 @@ "vcmi.heroWindow.openBackpack.hover" : "Open artifact backpack window", "vcmi.heroWindow.openBackpack.help" : "Opens window that allows easier artifact backpack management.", - "vcmi.tavernWindow.inviteHero" : "Invite hero", - "vcmi.commanderWindow.artifactMessage" : "Do you want to return this artifact to the hero?", "vcmi.creatureWindow.showBonuses.hover" : "Switch to bonuses view", diff --git a/Mods/vcmi/config/vcmi/german.json b/Mods/vcmi/config/vcmi/german.json index 8a50c204b..8457d20b1 100644 --- a/Mods/vcmi/config/vcmi/german.json +++ b/Mods/vcmi/config/vcmi/german.json @@ -13,13 +13,14 @@ "vcmi.adventureMap.monsterThreat.levels.10" : "Tödlich", "vcmi.adventureMap.monsterThreat.levels.11" : "Unmöglich", - "vcmi.adventureMap.confirmRestartGame" : "Seid Ihr sicher, dass Ihr das Spiel neu starten wollt?", - "vcmi.adventureMap.noTownWithMarket" : "Kein Marktplatz verfügbar!", - "vcmi.adventureMap.noTownWithTavern" : "Keine Stadt mit Taverne verfügbar!", - "vcmi.adventureMap.spellUnknownProblem" : "Unbekanntes Problem mit diesem Zauberspruch, keine weiteren Informationen verfügbar.", - "vcmi.adventureMap.playerAttacked" : "Spieler wurde attackiert: %s", - "vcmi.adventureMap.moveCostDetails" : "Bewegungspunkte - Kosten: %TURNS Runden + %POINTS Punkte, Verbleibende Punkte: %REMAINING", - "vcmi.adventureMap.moveCostDetailsNoTurns" : "Bewegungspunkte - Kosten: %POINTS Punkte, Verbleibende Punkte: %REMAINING", + "vcmi.adventureMap.confirmRestartGame" : "Seid Ihr sicher, dass Ihr das Spiel neu starten wollt?", + "vcmi.adventureMap.noTownWithMarket" : "Kein Marktplatz verfügbar!", + "vcmi.adventureMap.noTownWithTavern" : "Keine Stadt mit Taverne verfügbar!", + "vcmi.adventureMap.spellUnknownProblem" : "Unbekanntes Problem mit diesem Zauberspruch, keine weiteren Informationen verfügbar.", + "vcmi.adventureMap.playerAttacked" : "Spieler wurde attackiert: %s", + "vcmi.adventureMap.moveCostDetails" : "Bewegungspunkte - Kosten: %TURNS Runden + %POINTS Punkte, Verbleibende Punkte: %REMAINING", + "vcmi.adventureMap.moveCostDetailsNoTurns" : "Bewegungspunkte - Kosten: %POINTS Punkte, Verbleibende Punkte: %REMAINING", + "vcmi.adventureMap.replayOpponentTurnNotImplemented" : "Das Wiederholen des gegnerischen Zuges ist aktuell noch nicht implementiert!", "vcmi.capitalColors.0" : "Rot", "vcmi.capitalColors.1" : "Blau", @@ -171,6 +172,8 @@ "vcmi.battleOptions.showStickyHeroInfoWindows.help": "{Statistikfenster für Helden anzeigen}\n\nDauerhaftes Einschalten des Statistikfenster für Helden, das die primären Werte und Zauberpunkte anzeigt.", "vcmi.battleOptions.skipBattleIntroMusic.hover": "Intro-Musik überspringen", "vcmi.battleOptions.skipBattleIntroMusic.help": "{Intro-Musik überspringen}\n\n Überspringe die kurze Musik, die zu Beginn eines jeden Kampfes gespielt wird, bevor die Action beginnt. Kann auch durch Drücken der ESC-Taste übersprungen werden.", + "vcmi.battleOptions.endWithAutocombat.hover": "Kampf beenden", + "vcmi.battleOptions.endWithAutocombat.help": "{Kampf beenden}\n\nAutokampf spielt den Kampf sofort zu Ende", "vcmi.adventureMap.revisitObject.hover" : "Objekt erneut besuchen", "vcmi.adventureMap.revisitObject.help" : "{Objekt erneut besuchen}\n\nSteht ein Held gerade auf einem Kartenobjekt, kann er den Ort erneut aufsuchen.", @@ -232,8 +235,6 @@ "vcmi.heroWindow.openBackpack.hover" : "Artefakt-Rucksack-Fenster öffnen", "vcmi.heroWindow.openBackpack.help" : "Öffnet ein Fenster, das die Verwaltung des Artefakt-Rucksacks erleichtert", - "vcmi.tavernWindow.inviteHero" : "Helden einladen", - "vcmi.commanderWindow.artifactMessage" : "Möchtet Ihr diesen Artefakt dem Helden zurückgeben?", "vcmi.creatureWindow.showBonuses.hover" : "Wechsle zur Bonus-Ansicht", diff --git a/client/adventureMap/AdventureOptions.cpp b/client/adventureMap/AdventureOptions.cpp index 265f8e5a0..24bafa2fa 100644 --- a/client/adventureMap/AdventureOptions.cpp +++ b/client/adventureMap/AdventureOptions.cpp @@ -23,6 +23,7 @@ #include "../../CCallback.h" #include "../../lib/StartInfo.h" +#include "../../lib/CGeneralTextHandler.h" AdventureOptions::AdventureOptions() : CWindowObject(PLAYER_COLORED, ImagePath::builtin("ADVOPTS")) @@ -30,12 +31,7 @@ AdventureOptions::AdventureOptions() OBJECT_CONSTRUCTION_CAPTURING(255-DISPOSE); viewWorld = std::make_shared(Point(24, 23), AnimationPath::builtin("ADVVIEW.DEF"), CButton::tooltip(), [&](){ close(); }, EShortcut::ADVENTURE_VIEW_WORLD); - viewWorld->addCallback( [] { LOCPLINT->viewWorldMap(); }); - - exit = std::make_shared(Point(204, 313), AnimationPath::builtin("IOK6432.DEF"), CButton::tooltip(), std::bind(&AdventureOptions::close, this), EShortcut::GLOBAL_RETURN); - - scenInfo = std::make_shared(Point(24, 198), AnimationPath::builtin("ADVINFO.DEF"), CButton::tooltip(), [&](){ close(); }, EShortcut::ADVENTURE_VIEW_SCENARIO); - scenInfo->addCallback(AdventureOptions::showScenarioInfo); + viewWorld->addCallback([] { LOCPLINT->viewWorldMap(); }); puzzle = std::make_shared(Point(24, 81), AnimationPath::builtin("ADVPUZ.DEF"), CButton::tooltip(), [&](){ close(); }, EShortcut::ADVENTURE_VIEW_PUZZLE); puzzle->addCallback(std::bind(&CPlayerInterface::showPuzzleMap, LOCPLINT)); @@ -45,6 +41,14 @@ AdventureOptions::AdventureOptions() dig->addCallback(std::bind(&CPlayerInterface::tryDigging, LOCPLINT, h)); else dig->block(true); + + scenInfo = std::make_shared(Point(24, 198), AnimationPath::builtin("ADVINFO.DEF"), CButton::tooltip(), [&](){ close(); }, EShortcut::ADVENTURE_VIEW_SCENARIO); + scenInfo->addCallback(AdventureOptions::showScenarioInfo); + + replay = std::make_shared(Point(24, 257), AnimationPath::builtin("ADVTURN.DEF"), CButton::tooltip(), [&](){ close(); }); + replay->addCallback([]{ LOCPLINT->showInfoDialog(CGI->generaltexth->translate("vcmi.adventureMap.replayOpponentTurnNotImplemented")); }); + + exit = std::make_shared(Point(203, 313), AnimationPath::builtin("IOK6432.DEF"), CButton::tooltip(), std::bind(&AdventureOptions::close, this), EShortcut::GLOBAL_RETURN); } void AdventureOptions::showScenarioInfo() diff --git a/client/adventureMap/AdventureOptions.h b/client/adventureMap/AdventureOptions.h index 41b47c56e..b049e74a0 100644 --- a/client/adventureMap/AdventureOptions.h +++ b/client/adventureMap/AdventureOptions.h @@ -21,7 +21,7 @@ class AdventureOptions : public CWindowObject std::shared_ptr puzzle; std::shared_ptr dig; std::shared_ptr scenInfo; - /*std::shared_ptr replay*/ + std::shared_ptr replay; public: AdventureOptions();