diff --git a/android-extract-strings.sh b/android-extract-strings.sh index d15312e1f3..f03e4bace8 100755 --- a/android-extract-strings.sh +++ b/android-extract-strings.sh @@ -1,7 +1,7 @@ #!/bin/sh mkdir -p ../translations/lang -git diff 1.6/master -- src/lang/english.txt | tail -n +5 | grep '^+' | cut -b 2- | \ +git diff 1.6/master -- src/lang/english.txt | tail -n +5 | grep '^[+]' | cut -b 2- | \ grep -v "^STR_TABLET_CLOSE\b" | \ grep -v "^STR_TABLET_SHIFT\b" | \ grep -v "^STR_TABLET_CTRL\b" | \ diff --git a/src/lang/english.txt b/src/lang/english.txt index 326e7e9356..fc221a60ba 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -468,7 +468,6 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Message history ############ range for about menu starts STR_ABOUT_MENU_LAND_BLOCK_INFO :Land area information -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TUTORIAL :{BLACK}Tutorial STR_ABOUT_MENU_TOGGLE_CONSOLE :Toggle console STR_ABOUT_MENU_AI_DEBUG :AI/Game script debug @@ -2708,6 +2707,11 @@ STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD #Tutorial window STR_TUTORIAL_WINDOW_TITLE :{BLACK}Tutorial videos STR_TUTORIAL_WINDOW_TOOLTIP :{BLACK}Open a video player to watch tutorial videos +STR_TUTORIAL_ROADS_AND_STATIONS :{BLACK}Building roads and stations, buying vehicles +STR_TUTORIAL_RAILWAYS :{BLACK}Railways and trains +STR_TUTORIAL_ROAD_VEHICLES :{BLACK}Road vehicles +STR_TUTORIAL_SHIPS :{BLACK}Ships and docks +STR_TUTORIAL_CARGO :{BLACK}Cargo types # Save/load game/scenario STR_SAVELOAD_SAVE_CAPTION :{WHITE}Save Game diff --git a/src/tutorial_gui.cpp b/src/tutorial_gui.cpp index 2b913a1158..319a448b92 100644 --- a/src/tutorial_gui.cpp +++ b/src/tutorial_gui.cpp @@ -44,17 +44,35 @@ struct VideoLink_t { }; static VideoLink_t busTutorial[] = { - { "en", "https://www.youtube.com/watch?v=EULXRMR4PyE" }, + { "en", "https://www.youtube.com/watch?v=EULXRMR4PyE" }, { ANY_LANG, "https://www.youtube.com/watch?v=EULXRMR4PyE" }, { NULL, NULL } }; static VideoLink_t trainTutorial[] = { - { "en", "https://www.youtube.com/watch?v=VdMdL2qyZ6s" }, + { "en", "https://www.youtube.com/watch?v=VdMdL2qyZ6s" }, { ANY_LANG, "https://www.youtube.com/watch?v=VdMdL2qyZ6s" }, { NULL, NULL } }; +static VideoLink_t truckTutorial[] = { + { "en", "https://www.youtube.com/watch?v=B-CL-XFGNtw" }, + { ANY_LANG, "https://www.youtube.com/watch?v=B-CL-XFGNtw" }, + { NULL, NULL } +}; + +static VideoLink_t shipTutorial[] = { + { "en", "https://www.youtube.com/watch?v=a5JHlWtIg3A" }, + { ANY_LANG, "https://www.youtube.com/watch?v=a5JHlWtIg3A" }, + { NULL, NULL } +}; + +static VideoLink_t cargoTutorial[] = { + { "en", "https://www.youtube.com/watch?v=GwjiQYsu3xg" }, + { ANY_LANG, "https://www.youtube.com/watch?v=GwjiQYsu3xg" }, + { NULL, NULL } +}; + void OpenExternTutorialVideo(VideoLink_t *tutorial) { const char *link = NULL; @@ -90,32 +108,15 @@ static const NWidgetPart _nested_tutorial_widgets[] = { NWidget(NWID_SPACER), SetMinimalSize(6, 0), SetFill(1, 0), NWidget(NWID_VERTICAL), SetPIP(16, 2, 6), // TODO: make different button IDs - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_LABEL, COLOUR_GREY), SetMinimalSize(120, 12), SetDataTip(STR_SMALLMAP_LEGENDA_BUS_STATION, STR_SMALLMAP_LEGENDA_BUS_STATION), SetFill(1, 1), - NWidget(WWT_LABEL, COLOUR_GREY), SetMinimalSize(120, 12), SetDataTip(STR_SMALLMAP_LEGENDA_ROAD_VEHICLES, STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY), SetFill(1, 1), - EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_IMGBTN, COLOUR_GREY, WID_STL_BUS), SetMinimalSize(120, 20), SetDataTip(SPR_VEH_BUS_SW_VIEW, STR_SMALLMAP_LEGENDA_BUS_STATION), SetFill(1, 1), - NWidget(WWT_IMGBTN, COLOUR_GREY, WID_STL_TRUCK), SetMinimalSize(120, 20), SetDataTip(SPR_IMG_TRUCKLIST, STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY), SetFill(1, 1), - EndContainer(), + NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_STL_BUS), SetMinimalSize(120, 20), SetDataTip(STR_TUTORIAL_ROADS_AND_STATIONS, STR_TUTORIAL_ROADS_AND_STATIONS), SetFill(1, 1), NWidget(NWID_SPACER), SetMinimalSize(0, 10), SetFill(1, 0), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_LABEL, COLOUR_GREY), SetMinimalSize(120, 12), SetDataTip(STR_SMALLMAP_LEGENDA_RAILROADS, STR_SMALLMAP_LEGENDA_RAILROAD_STATION), SetFill(1, 1), - NWidget(WWT_LABEL, COLOUR_GREY), SetMinimalSize(120, 12), SetDataTip(STR_SMALLMAP_LEGENDA_SHIPS, STR_SMALLMAP_LEGENDA_DOCK), SetFill(1, 1), - EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_IMGBTN, COLOUR_GREY, WID_STL_TRAIN), SetMinimalSize(120, 20), SetDataTip(SPR_IMG_TRAINLIST, STR_SMALLMAP_LEGENDA_RAILROAD_STATION), SetFill(0, 1), - NWidget(WWT_IMGBTN, COLOUR_GREY, WID_STL_SHIP), SetMinimalSize(120, 20), SetDataTip(SPR_IMG_SHIPLIST, STR_SMALLMAP_LEGENDA_DOCK), SetFill(0, 1), - EndContainer(), + NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_STL_TRAIN), SetMinimalSize(120, 20), SetDataTip(STR_TUTORIAL_RAILWAYS, STR_TUTORIAL_RAILWAYS), SetFill(1, 1), NWidget(NWID_SPACER), SetMinimalSize(0, 10), SetFill(1, 0), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_LABEL, COLOUR_GREY), SetMinimalSize(120, 12), SetDataTip(STR_SMALLMAP_LEGENDA_AIRCRAFT, STR_SMALLMAP_LEGENDA_AIRPORT_HELIPORT), SetFill(1, 1), - NWidget(WWT_LABEL, COLOUR_GREY), SetMinimalSize(120, 12), SetDataTip(STR_SMALLMAP_LEGENDA_INDUSTRIES, STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES), SetFill(1, 1), - EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_IMGBTN, COLOUR_GREY, WID_STL_AIRPLANE), SetMinimalSize(120, 20), SetDataTip(SPR_IMG_AIRPLANESLIST, STR_SMALLMAP_LEGENDA_AIRPORT_HELIPORT), SetFill(0, 1), - NWidget(WWT_IMGBTN, COLOUR_GREY, WID_STL_FACILALL), SetMinimalSize(120, 20), SetDataTip(SPR_IMG_COMPANY_FINANCE, STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES), SetFill(0, 1), - EndContainer(), + NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_STL_TRUCK), SetMinimalSize(120, 20), SetDataTip(STR_TUTORIAL_ROAD_VEHICLES, STR_TUTORIAL_ROAD_VEHICLES), SetFill(1, 1), + NWidget(NWID_SPACER), SetMinimalSize(0, 10), SetFill(1, 0), + NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_STL_SHIP), SetMinimalSize(120, 20), SetDataTip(STR_TUTORIAL_SHIPS, STR_TUTORIAL_SHIPS), SetFill(1, 1), + NWidget(NWID_SPACER), SetMinimalSize(0, 10), SetFill(1, 0), + NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_STL_FACILALL), SetMinimalSize(120, 20), SetDataTip(STR_TUTORIAL_CARGO, STR_TUTORIAL_CARGO), SetFill(1, 1), EndContainer(), NWidget(NWID_SPACER), SetMinimalSize(6, 0), SetFill(1, 0), EndContainer(), @@ -136,10 +137,6 @@ struct TutorialWindow : public Window { TutorialWindow() : Window(&_tutorial_desc) { this->InitNested(WN_GAME_OPTIONS_ABOUT); - this->SetWidgetDisabledState(WID_STL_TRUCK, true); - this->SetWidgetDisabledState(WID_STL_SHIP, true); - this->SetWidgetDisabledState(WID_STL_AIRPLANE, true); - this->SetWidgetDisabledState(WID_STL_FACILALL, true); video = NULL; counter = 0; } @@ -155,15 +152,18 @@ struct TutorialWindow : public Window { video = busTutorial; break; case WID_STL_TRUCK: + video = truckTutorial; break; case WID_STL_TRAIN: video = trainTutorial; break; case WID_STL_SHIP: + video = shipTutorial; break; case WID_STL_AIRPLANE: break; case WID_STL_FACILALL: + video = cargoTutorial; break; } } @@ -199,7 +199,7 @@ void ShowTutorialWindow() void ShowTutorialWindowOnceAfterInstall() { - static const char * TUTORIAL_SHOWN_FLAG = ".tutorial-shown-2.flag"; + static const char * TUTORIAL_SHOWN_FLAG = ".tutorial-shown-3.flag"; FILE *ff = fopen(TUTORIAL_SHOWN_FLAG, "r"); if (ff) {