From 0acdea2852d31aa7220f8792bf62dd280138c757 Mon Sep 17 00:00:00 2001 From: Andreas Schmitt Date: Thu, 10 Jun 2021 11:43:28 +0200 Subject: [PATCH 1/5] Shows payment based on average transit speed Prior to this change, the charts were pretty useless. They indicated at most what cargos were speed sensitive and which ones were not. This change lets the graph show the average transit speed to profit mapping. With this graph it becomes obvious after exactly what speed any further speed increase brings no further profit. This makes train selection way easier. --- src/graph_gui.cpp | 7 +++++-- src/lang/english.txt | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 59f8d40088..05430dddad 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -1048,10 +1048,13 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { int i = 0; const CargoSpec *cs; + const float factor = 200.0f * 28.57f * 0.4f; + FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) { this->colours[i] = cs->legend_colour; - for (uint j = 0; j != 20; j++) { - this->cost[i][j] = GetTransportedGoodsIncome(10, 20, j * 4 + 4, cs->Index()); + for (int j = 0; j != 20; j++) { + const byte ctt = static_cast(factor / ((static_cast(j) + 1) * 10.0f)); + this->cost[i][j] = GetTransportedGoodsIncome(1, 200, ctt, cs->Index()); } i++; } diff --git a/src/lang/english.txt b/src/lang/english.txt index 80eae3b445..22f3e8d7ce 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -598,7 +598,7 @@ STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION :{WHITE}Company STR_GRAPH_COMPANY_VALUES_CAPTION :{WHITE}Company values STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION :{WHITE}Cargo Payment Rates -STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL :{TINY_FONT}{BLACK}Days in transit +STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL :{TINY_FONT}{BLACK}Average transit speed (km/h) STR_GRAPH_CARGO_PAYMENT_RATES_TITLE :{TINY_FONT}{BLACK}Payment for delivering 10 units (or 10,000 litres) of cargo a distance of 20 squares STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLACK}Enable all STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Disable all From 8e27202524cf0b9792193240a36e739f75302397 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 13 Jun 2021 20:49:35 +0100 Subject: [PATCH 2/5] Add strings for velocity unit names --- src/lang/afrikaans.txt | 4 ++++ src/lang/arabic_egypt.txt | 5 +++++ src/lang/basque.txt | 4 ++++ src/lang/belarusian.txt | 4 ++++ src/lang/brazilian_portuguese.txt | 5 +++++ src/lang/catalan.txt | 5 +++++ src/lang/chuvash.txt | 4 ++++ src/lang/croatian.txt | 4 ++++ src/lang/czech.txt | 5 +++++ src/lang/danish.txt | 4 ++++ src/lang/dutch.txt | 5 +++++ src/lang/english.txt | 5 +++++ src/lang/english_AU.txt | 4 ++++ src/lang/english_US.txt | 5 +++++ src/lang/esperanto.txt | 4 ++++ src/lang/estonian.txt | 5 +++++ src/lang/faroese.txt | 4 ++++ src/lang/finnish.txt | 5 +++++ src/lang/french.txt | 5 +++++ src/lang/frisian.txt | 4 ++++ src/lang/gaelic.txt | 4 ++++ src/lang/galician.txt | 4 ++++ src/lang/german.txt | 5 +++++ src/lang/greek.txt | 4 ++++ src/lang/hebrew.txt | 4 ++++ src/lang/hungarian.txt | 5 +++++ src/lang/icelandic.txt | 4 ++++ src/lang/ido.txt | 4 ++++ src/lang/indonesian.txt | 5 +++++ src/lang/irish.txt | 4 ++++ src/lang/italian.txt | 5 +++++ src/lang/japanese.txt | 4 ++++ src/lang/korean.txt | 5 +++++ src/lang/latin.txt | 4 ++++ src/lang/latvian.txt | 5 +++++ src/lang/lithuanian.txt | 5 +++++ src/lang/luxembourgish.txt | 5 +++++ src/lang/macedonian.txt | 4 ++++ src/lang/malay.txt | 4 ++++ src/lang/maltese.txt | 4 ++++ src/lang/marathi.txt | 4 ++++ src/lang/norwegian_bokmal.txt | 5 +++++ src/lang/norwegian_nynorsk.txt | 4 ++++ src/lang/persian.txt | 4 ++++ src/lang/polish.txt | 5 +++++ src/lang/portuguese.txt | 5 +++++ src/lang/romanian.txt | 5 +++++ src/lang/russian.txt | 5 +++++ src/lang/serbian.txt | 5 +++++ src/lang/simplified_chinese.txt | 5 +++++ src/lang/slovak.txt | 5 +++++ src/lang/slovenian.txt | 4 ++++ src/lang/spanish.txt | 5 +++++ src/lang/spanish_MX.txt | 5 +++++ src/lang/swedish.txt | 5 +++++ src/lang/tamil.txt | 4 ++++ src/lang/thai.txt | 4 ++++ src/lang/traditional_chinese.txt | 4 ++++ src/lang/turkish.txt | 4 ++++ src/lang/ukrainian.txt | 5 +++++ src/lang/urdu.txt | 4 ++++ src/lang/vietnamese.txt | 5 +++++ src/lang/welsh.txt | 4 ++++ 63 files changed, 283 insertions(+) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 8fa840247b..b9f0577c1d 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -196,6 +196,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mpu +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}pk STR_UNITS_POWER_METRIC :{COMMA}{NBSP}pk STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 11ce506392..ede0b8f279 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -195,6 +195,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}ك STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}م/ث STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}مربعات/ اليوم +STR_UNIT_NAME_VELOCITY_IMPERIAL :ميل/س +STR_UNIT_NAME_VELOCITY_METRIC :كم/س +STR_UNIT_NAME_VELOCITY_SI :م/ث +STR_UNIT_NAME_VELOCITY_GAMEUNITS :مربعات/ اليوم + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}حصان STR_UNITS_POWER_METRIC :{COMMA}{NBSP}حصان STR_UNITS_POWER_SI :{COMMA}{NBSP}ك واط diff --git a/src/lang/basque.txt b/src/lang/basque.txt index fe0439e806..2250c99bf3 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -194,6 +194,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 333c8a427c..1e3cf876ca 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -507,6 +507,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}м STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}км/г STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}м/с +STR_UNIT_NAME_VELOCITY_IMPERIAL :міль/г +STR_UNIT_NAME_VELOCITY_METRIC :км/г +STR_UNIT_NAME_VELOCITY_SI :м/с + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}к.с. STR_UNITS_POWER_METRIC :{COMMA}{NBSP}к.с. STR_UNITS_POWER_SI :{COMMA}{NBSP}кВт diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 718c242b96..91a9c7597c 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}quadrados/dia +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :quadrados/dia + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}cv STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index d797d312fd..99843f6cc3 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}cel·les/dia +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :cel·les/dia + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}cv STR_UNITS_POWER_METRIC :{COMMA}{NBSP}cv STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/chuvash.txt b/src/lang/chuvash.txt index e6168d8416..5471098cff 100644 --- a/src/lang/chuvash.txt +++ b/src/lang/chuvash.txt @@ -155,6 +155,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} мил/ STR_UNITS_VELOCITY_METRIC :{COMMA} км/с STR_UNITS_VELOCITY_SI :{COMMA} м/ҫ +STR_UNIT_NAME_VELOCITY_IMPERIAL :мил/с +STR_UNIT_NAME_VELOCITY_METRIC :км/с +STR_UNIT_NAME_VELOCITY_SI :м/ҫ + STR_UNITS_POWER_SI :{COMMA}кВт diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index b0dff6cecb..db7889a273 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -291,6 +291,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}KS STR_UNITS_POWER_METRIC :{COMMA}{NBSP}KS STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 4f77e8a609..6c5b0f6174 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -271,6 +271,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}políčka/den +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :políčka/den + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/danish.txt b/src/lang/danish.txt index bc73f9dbfd..f5be292f04 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -195,6 +195,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} miles/t STR_UNITS_VELOCITY_METRIC :{COMMA} km/t STR_UNITS_VELOCITY_SI :{COMMA} m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :miles/t +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}hk STR_UNITS_POWER_METRIC :{COMMA}hk STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index daf0ed96fc..a90e435a79 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}tegels/dag +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/u +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :tegels/dag + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}pk STR_UNITS_POWER_METRIC :{COMMA}{NBSP}pk STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/english.txt b/src/lang/english.txt index 22f3e8d7ce..c0539669cd 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}tiles/day +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :tiles/day + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 3c8a4075a0..460cf0a549 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index db95dee0bf..1851fd0123 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}tiles/day +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :tiles/day + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 9b32e7bd00..f1dc71ddb5 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -194,6 +194,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}ĉp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}ĉp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 8a4a25ec78..814bf10e0f 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -253,6 +253,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA} km/h STR_UNITS_VELOCITY_SI :{COMMA} m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ruutu/päev +STR_UNIT_NAME_VELOCITY_IMPERIAL :miili tunnis +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :ruutu/päev + STR_UNITS_POWER_IMPERIAL :{COMMA}hj STR_UNITS_POWER_METRIC :{COMMA}hj STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 6191f8411e..f14f5915d8 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -194,6 +194,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph STR_UNITS_VELOCITY_METRIC :{COMMA} km/t STR_UNITS_VELOCITY_SI :{COMMA} m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/t +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}hp STR_UNITS_POWER_METRIC :{COMMA}hp STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 8cba2e9482..70a518c1d8 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ruutua/vrk +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :ruutua/vrk + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hv STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hv STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/french.txt b/src/lang/french.txt index f3e12e38b3..088b9cbac1 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}cases/jour +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :cases/jour + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}ch STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index 47c17dc9f5..cfc3843cc4 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/o STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mpo +STR_UNIT_NAME_VELOCITY_METRIC :km/o +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 4af2f92dfa..ce94b8c7fa 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -381,6 +381,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/galician.txt b/src/lang/galician.txt index ee4251702b..a9c224101a 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -196,6 +196,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph STR_UNITS_VELOCITY_METRIC :{COMMA} km/h STR_UNITS_VELOCITY_SI :{COMMA} m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}cv STR_UNITS_POWER_METRIC :{COMMA}cv STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/german.txt b/src/lang/german.txt index fcc9b530c1..f1724dd482 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}Kacheln/Tag +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :Kacheln/Tag + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}PS STR_UNITS_POWER_METRIC :{COMMA}{NBSP}PS STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/greek.txt b/src/lang/greek.txt index aaebaae59f..5ff021336a 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -256,6 +256,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}μ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}χλμ/ώρα STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :μίλια/ώρα +STR_UNIT_NAME_VELOCITY_METRIC :χλμ/ώρα +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index b50bc7908a..12d7fdef22 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -207,6 +207,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} מיי STR_UNITS_VELOCITY_METRIC :{COMMA} קמ"ש STR_UNITS_VELOCITY_SI :{COMMA} מטר\שניה +STR_UNIT_NAME_VELOCITY_IMPERIAL :מייל לשעה +STR_UNIT_NAME_VELOCITY_METRIC :קמ"ש +STR_UNIT_NAME_VELOCITY_SI :מטר\שניה + STR_UNITS_POWER_IMPERIAL :{COMMA}כ"ס STR_UNITS_POWER_METRIC :{COMMA}כ"ס STR_UNITS_POWER_SI :{COMMA}קילו וואט diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 5682ba7548..2e17900e3d 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -259,6 +259,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}mező/nap +STR_UNIT_NAME_VELOCITY_IMPERIAL :mi/h +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :mező/nap + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}LE STR_UNITS_POWER_METRIC :{COMMA}{NBSP}LE STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 0bec239c41..65e7670a90 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -194,6 +194,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mílur/ STR_UNITS_VELOCITY_METRIC :{COMMA} km/klst STR_UNITS_VELOCITY_SI :{COMMA} m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mílur/klst +STR_UNIT_NAME_VELOCITY_METRIC :km/klst +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}hö. STR_UNITS_POWER_METRIC :{COMMA}hö. STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/ido.txt b/src/lang/ido.txt index 17c345de69..a6d5fa5887 100644 --- a/src/lang/ido.txt +++ b/src/lang/ido.txt @@ -192,6 +192,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph STR_UNITS_VELOCITY_METRIC :{COMMA} km/h STR_UNITS_VELOCITY_SI :{COMMA} m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}kp STR_UNITS_POWER_METRIC :{COMMA}kp STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 2484e7cdaa..86f3425aa4 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}meter/detik STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ubin/hari +STR_UNIT_NAME_VELOCITY_IMPERIAL :mil/j +STR_UNIT_NAME_VELOCITY_METRIC :km/jam +STR_UNIT_NAME_VELOCITY_SI :meter/detik +STR_UNIT_NAME_VELOCITY_GAMEUNITS :ubin/hari + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}dk STR_UNITS_POWER_METRIC :{COMMA}{NBSP}dk STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/irish.txt b/src/lang/irish.txt index a7e08bbdb2..8ccd07326c 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}m/ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/u STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :m/u +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}hp STR_UNITS_POWER_METRIC :{COMMA}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 4a2814f3f5..2e9b821b91 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -198,6 +198,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}riquadri/giorno +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :riquadri/giorno + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 1c4fc75013..af6561c707 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -194,6 +194,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}mph STR_UNITS_VELOCITY_METRIC :{COMMA}km/h STR_UNITS_VELOCITY_SI :{COMMA}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}英馬力 STR_UNITS_POWER_METRIC :{COMMA}仏馬力 STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 2ee7932ad7..f75db7480e 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}km/h STR_UNITS_VELOCITY_SI :{COMMA}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}칸/일 +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :칸/일 + STR_UNITS_POWER_IMPERIAL :{COMMA}마력 STR_UNITS_POWER_METRIC :{COMMA}마력 STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/latin.txt b/src/lang/latin.txt index 082fe46173..ab968e302c 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -383,6 +383,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 99f7bf7e34..98d61b7065 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -198,6 +198,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}lauciņi/diena +STR_UNIT_NAME_VELOCITY_IMPERIAL :jūdzes stundā +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :lauciņi/diena + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}ZS STR_UNITS_POWER_METRIC :{COMMA}{NBSP}ZS STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 76ca613e42..97672d1561 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -391,6 +391,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}langeliai per dieną +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :langeliai per dieną + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}AG STR_UNITS_POWER_METRIC :{COMMA}{NBSP}AG STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index ad05ede8e1..a26c877e65 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}Felder/Dag +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :Felder/Dag + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}bhp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}ps STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/macedonian.txt b/src/lang/macedonian.txt index cc0a16c13e..cd36e80ce7 100644 --- a/src/lang/macedonian.txt +++ b/src/lang/macedonian.txt @@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph STR_UNITS_VELOCITY_METRIC :{COMMA} km/h STR_UNITS_VELOCITY_SI :{COMMA} m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}кс STR_UNITS_POWER_METRIC :{COMMA}кс STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/malay.txt b/src/lang/malay.txt index a90c8ad5d5..4f24c1ecb0 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} bp/j STR_UNITS_VELOCITY_METRIC :{COMMA} km/j STR_UNITS_VELOCITY_SI :{COMMA} m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :bp/j +STR_UNIT_NAME_VELOCITY_METRIC :km/j +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}kk STR_UNITS_POWER_METRIC :{COMMA}kk STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/maltese.txt b/src/lang/maltese.txt index 3db52e0855..f574ea4e9d 100644 --- a/src/lang/maltese.txt +++ b/src/lang/maltese.txt @@ -146,6 +146,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph STR_UNITS_VELOCITY_METRIC :{COMMA} km/h STR_UNITS_VELOCITY_SI :{COMMA} m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}hp STR_UNITS_POWER_METRIC :{COMMA}hp STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/marathi.txt b/src/lang/marathi.txt index ad242f806c..71f7d02864 100644 --- a/src/lang/marathi.txt +++ b/src/lang/marathi.txt @@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph STR_UNITS_VELOCITY_METRIC :{COMMA} किमी / तास STR_UNITS_VELOCITY_SI :{COMMA} m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :किमी / तास +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}hp STR_UNITS_POWER_METRIC :{COMMA}hp diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 6c8aaaf8e4..3d11d376b0 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -198,6 +198,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ruter/dag +STR_UNIT_NAME_VELOCITY_IMPERIAL :mi/t +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :ruter/dag + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hk STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hk STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 50b894f2fc..b97300e745 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -195,6 +195,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mi/t STR_UNITS_VELOCITY_METRIC :{COMMA} km/t STR_UNITS_VELOCITY_SI :{COMMA} m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mi/t +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA} hk STR_UNITS_POWER_METRIC :{COMMA} hk STR_UNITS_POWER_SI :{COMMA} kW diff --git a/src/lang/persian.txt b/src/lang/persian.txt index f68c121575..86c7eb8b79 100644 --- a/src/lang/persian.txt +++ b/src/lang/persian.txt @@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}م STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}کیلومتر بر ساعت STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}متر بر ثانیه +STR_UNIT_NAME_VELOCITY_IMPERIAL :مایل بر ساعت +STR_UNIT_NAME_VELOCITY_METRIC :کیلومتر بر ساعت +STR_UNIT_NAME_VELOCITY_SI :متر بر ثانیه + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}اسب بخار STR_UNITS_POWER_METRIC :{COMMA}{NBSP}اسب بخار STR_UNITS_POWER_SI :{COMMA}{NBSP}کیلووات diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 544692a8e8..d2f79739bb 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -575,6 +575,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}p{P ole ola ól}/dzień +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :pola/dzień + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}KM STR_UNITS_POWER_METRIC :{COMMA}{NBSP}KM STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index f86404c56c..c7b26d1c9f 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA} km/h STR_UNITS_VELOCITY_SI :{COMMA} m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP} blocos / dia +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :quadrados/dia + STR_UNITS_POWER_IMPERIAL :{COMMA}cv STR_UNITS_POWER_METRIC :{COMMA}cv STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index c0d55cb64a..3f9b30aaa8 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -182,6 +182,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA} km/h STR_UNITS_VELOCITY_SI :{COMMA} m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}dale/zi +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :dale/zi + STR_UNITS_POWER_IMPERIAL :{COMMA}cp STR_UNITS_POWER_METRIC :{COMMA}cp STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/russian.txt b/src/lang/russian.txt index c473dc9f98..6a37609b82 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -322,6 +322,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}к STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}м/с STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}кл./день +STR_UNIT_NAME_VELOCITY_IMPERIAL :миль/ч +STR_UNIT_NAME_VELOCITY_METRIC :км/ч +STR_UNIT_NAME_VELOCITY_SI :м/с +STR_UNIT_NAME_VELOCITY_GAMEUNITS :клетки в день + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}лс STR_UNITS_POWER_METRIC :{COMMA}{NBSP}лс STR_UNITS_POWER_SI :{COMMA}{NBSP}кВт diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 1a48da03a0..4e7eb251c1 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -384,6 +384,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA} km/h STR_UNITS_VELOCITY_SI :{COMMA} m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}pločica/dan +STR_UNIT_NAME_VELOCITY_IMPERIAL :milja na sat +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :pločica/dan + STR_UNITS_POWER_IMPERIAL :{COMMA}ks STR_UNITS_POWER_METRIC :{COMMA}ks STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 93933ff0e6..c673aa5f5d 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP} STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}米/秒 STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}格/天 +STR_UNIT_NAME_VELOCITY_IMPERIAL :英里/小时 +STR_UNIT_NAME_VELOCITY_METRIC :千米/小时 +STR_UNIT_NAME_VELOCITY_SI :米/秒 +STR_UNIT_NAME_VELOCITY_GAMEUNITS :格/天 + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}匹马力 STR_UNITS_POWER_METRIC :{COMMA}{NBSP}匹马力 STR_UNITS_POWER_SI :{COMMA}{NBSP}千瓦 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 93564d078a..a0f4ea05f8 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -260,6 +260,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA} km/h STR_UNITS_VELOCITY_SI :{COMMA} m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}políč{P ko ka ok}/deň +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :políčka/deň + STR_UNITS_POWER_IMPERIAL :{COMMA}hp STR_UNITS_POWER_METRIC :{COMMA}hp STR_UNITS_POWER_SI :{COMMA}kW diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 6c30097b4b..2006bd0ab9 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -346,6 +346,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph STR_UNITS_VELOCITY_METRIC :{COMMA} km/h STR_UNITS_VELOCITY_SI :{COMMA} m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}KM STR_UNITS_POWER_METRIC :{COMMA}KM STR_UNITS_POWER_SI :{COMMA} kW diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 83fc657f4f..ce6c37f0de 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}casillas/día +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :casillas/día + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}cv STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index eadc408e24..2781d340bd 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}casillas/día +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :casillas/día + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}cv STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 06e9d2c34e..ec17e02b83 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}rutor/dag +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :rutor/dag + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hk STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hk STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index aae33a4a0e..07a6f5c09f 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -195,6 +195,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/thai.txt b/src/lang/thai.txt index 7be5ac879d..bddab615f3 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} ไม STR_UNITS_VELOCITY_METRIC :{COMMA} กม./ชม. STR_UNITS_VELOCITY_SI :{COMMA} ม./วิ. +STR_UNIT_NAME_VELOCITY_IMPERIAL :ไมล์/ชม. +STR_UNIT_NAME_VELOCITY_METRIC :กม./ชม. +STR_UNIT_NAME_VELOCITY_SI :ม./วิ. + STR_UNITS_POWER_IMPERIAL :{COMMA} แรงม้า STR_UNITS_POWER_METRIC :{COMMA} แรงม้า STR_UNITS_POWER_SI :{COMMA} กิโลวัตต์ diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 548f68be48..489e5dc03a 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP} STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}公里/小時 STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}米/秒 +STR_UNIT_NAME_VELOCITY_IMPERIAL :英里/小時 +STR_UNIT_NAME_VELOCITY_METRIC :公里/小時 +STR_UNIT_NAME_VELOCITY_SI :米/秒 + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}匹 STR_UNITS_POWER_METRIC :{COMMA}{NBSP}匹 STR_UNITS_POWER_SI :{COMMA}{NBSP}千瓦 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 52f7f31d76..82d440237a 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -196,6 +196,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mi STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/s STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mil/s +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}bg STR_UNITS_POWER_METRIC :{COMMA}{NBSP}bg STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 5c57a834d1..81252b80c1 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -321,6 +321,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}к STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}м/с STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}клітинок/день +STR_UNIT_NAME_VELOCITY_IMPERIAL :миль/год +STR_UNIT_NAME_VELOCITY_METRIC :км/год +STR_UNIT_NAME_VELOCITY_SI :м/с +STR_UNIT_NAME_VELOCITY_GAMEUNITS :клітинок/день + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}к.с. STR_UNITS_POWER_METRIC :{COMMA}{NBSP}к.с. STR_UNITS_POWER_SI :{COMMA}{NBSP}кВт diff --git a/src/lang/urdu.txt b/src/lang/urdu.txt index 253cb16251..3bbcf434e4 100644 --- a/src/lang/urdu.txt +++ b/src/lang/urdu.txt @@ -194,6 +194,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} میل STR_UNITS_VELOCITY_METRIC :{COMMA} کلو میٹر فی گھنٹھ STR_UNITS_VELOCITY_SI :{COMMA} میٹر فی سیکنڈ +STR_UNIT_NAME_VELOCITY_IMPERIAL :میل فی گھنٹھ +STR_UNIT_NAME_VELOCITY_METRIC :کلو میٹر فی گھنٹھ +STR_UNIT_NAME_VELOCITY_SI :میٹر فی سیکنڈ + STR_UNITS_POWER_IMPERIAL :{COMMA} ھارس پآور STR_UNITS_POWER_METRIC :{COMMA} ھارس پآور STR_UNITS_POWER_SI :{COMMA} کلو واٹ diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index b8aa00a5f1..0cb6ddf033 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ô/ngày +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s +STR_UNIT_NAME_VELOCITY_GAMEUNITS :ô/ngày + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index f3765b0d77..88a8b48426 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNIT_NAME_VELOCITY_IMPERIAL :mph +STR_UNIT_NAME_VELOCITY_METRIC :km/h +STR_UNIT_NAME_VELOCITY_SI :m/s + STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp STR_UNITS_POWER_SI :{COMMA}{NBSP}kW From f786b372c0cdeb84e9fb1a18bf46ff0b3ff7d5c1 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 13 Jun 2021 22:41:17 +0100 Subject: [PATCH 3/5] Add function for speed unit conversion to unit values --- src/strings.cpp | 14 ++++++++++++++ src/unit_conversion.h | 1 + 2 files changed, 15 insertions(+) diff --git a/src/strings.cpp b/src/strings.cpp index bfb868da2d..869ebbac42 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -798,6 +798,20 @@ uint ConvertSpeedToDisplaySpeed(uint speed) return _units_velocity[_settings_game.locale.units_velocity].c.ToDisplay(speed, false); } +/** + * Convert the given (internal) speed to the display speed, in units (not decimal values). + * @param speed the speed to convert + * @return the converted speed. + */ +uint ConvertSpeedToUnitDisplaySpeed(uint speed) +{ + uint result = ConvertSpeedToDisplaySpeed(speed); + for (uint i = 0; i < _units_velocity[_settings_game.locale.units_velocity].decimal_places; i++) { + result /= 10; + } + return result; +} + /** * Convert the given display speed to the (internal) speed. * @param speed the speed to convert diff --git a/src/unit_conversion.h b/src/unit_conversion.h index 7ca3bca424..beed23807b 100644 --- a/src/unit_conversion.h +++ b/src/unit_conversion.h @@ -8,6 +8,7 @@ /** @file unit_conversion.h Functions related to unit conversion. */ uint ConvertSpeedToDisplaySpeed(uint speed); +uint ConvertSpeedToUnitDisplaySpeed(uint speed); uint ConvertDisplaySpeedToSpeed(uint speed); uint ConvertWeightToDisplayWeight(uint weight); uint ConvertDisplayWeightToWeight(uint weight); From f438daa0bc0af2c6c8ea0420c02117377a0623c1 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 13 Jun 2021 23:57:14 +0100 Subject: [PATCH 4/5] Use localised units for payment graph X axis Match quantities in graph title --- src/graph_gui.cpp | 39 +++++++++++++++++++++++++++++++++------ src/lang/english.txt | 3 ++- src/settings.cpp | 6 ++++++ src/table/settings.ini | 3 ++- 4 files changed, 43 insertions(+), 8 deletions(-) diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 05430dddad..45d47a7f72 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -22,6 +22,7 @@ #include "core/geometry_func.hpp" #include "currency.h" #include "zoom_func.h" +#include "unit_conversion.h" #include "widgets/graph_widget.h" @@ -887,8 +888,7 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { this->num_on_x_axis = 20; this->num_vert_lines = 20; this->month = 0xFF; - this->x_values_start = 10; - this->x_values_increment = 10; + this->SetXAxis(); this->CreateNestedTree(); this->vscroll = this->GetScrollbar(WID_CPR_MATRIX_SCROLLBAR); @@ -900,6 +900,23 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { this->FinishInitNested(window_number); } + void SetXAxis() + { + uint16 x_scale; + switch (_settings_game.locale.units_velocity) { + case 2: + x_scale = 5; + break; + case 3: + x_scale = 1; + break; + default: + x_scale = 10; + } + this->x_values_start = x_scale; + this->x_values_increment = x_scale; + } + void OnInit() override { /* Width of the legend blob. */ @@ -1039,6 +1056,7 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { void OnInvalidateData(int data = 0, bool gui_scope = true) override { if (!gui_scope) return; + this->SetXAxis(); this->OnHundredthTick(); } @@ -1048,18 +1066,27 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { int i = 0; const CargoSpec *cs; - const float factor = 200.0f * 28.57f * 0.4f; + const float factor = 200.0f * 28.57f * 0.4f * ConvertSpeedToUnitDisplaySpeed(1 << 16) / (1.6f * static_cast(1 << 16)); FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) { this->colours[i] = cs->legend_colour; for (int j = 0; j != 20; j++) { - const byte ctt = static_cast(factor / ((static_cast(j) + 1) * 10.0f)); - this->cost[i][j] = GetTransportedGoodsIncome(1, 200, ctt, cs->Index()); + const byte ctt = static_cast(factor / static_cast((j + 1) * this->x_values_increment)); + this->cost[i][j] = GetTransportedGoodsIncome(10, 20, ctt, cs->Index()); } i++; } this->num_dataset = i; } + + void SetStringParameters(int widget) const override + { + switch (widget) { + case WID_CPR_FOOTER: + SetDParam(0, STR_UNIT_NAME_VELOCITY_IMPERIAL + _settings_game.locale.units_velocity); + break; + } + } }; static const NWidgetPart _nested_cargo_payment_rates_widgets[] = { @@ -1093,7 +1120,7 @@ static const NWidgetPart _nested_cargo_payment_rates_widgets[] = { EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(NWID_SPACER), SetMinimalSize(WD_RESIZEBOX_WIDTH, 0), SetFill(1, 0), SetResize(1, 0), - NWidget(WWT_TEXT, COLOUR_BROWN, WID_CPR_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL, STR_NULL), + NWidget(WWT_TEXT, COLOUR_BROWN, WID_CPR_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL_SPEED, STR_NULL), NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0), NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_CPR_RESIZE), EndContainer(), diff --git a/src/lang/english.txt b/src/lang/english.txt index c0539669cd..d02489a3b5 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -603,7 +603,8 @@ STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION :{WHITE}Company STR_GRAPH_COMPANY_VALUES_CAPTION :{WHITE}Company values STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION :{WHITE}Cargo Payment Rates -STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL :{TINY_FONT}{BLACK}Average transit speed (km/h) +STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL :{TINY_FONT}{BLACK}Days in transit +STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL_SPEED :{TINY_FONT}{BLACK}Average transit speed ({STRING}) STR_GRAPH_CARGO_PAYMENT_RATES_TITLE :{TINY_FONT}{BLACK}Payment for delivering 10 units (or 10,000 litres) of cargo a distance of 20 squares STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLACK}Enable all STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Disable all diff --git a/src/settings.cpp b/src/settings.cpp index 4884c5b3f5..e9c9bae17e 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1520,6 +1520,12 @@ static bool ClimateThresholdModeChanged(int32 p1) return true; } +static bool VelocityUnitsChanged(int32 p1) { + InvalidateWindowClassesData(WC_PAYMENT_RATES); + MarkWholeScreenDirty(); + return true; +} + /** Checks if any settings are set to incorrect values, and sets them to correct values in that case. */ static void ValidateSettings() { diff --git a/src/table/settings.ini b/src/table/settings.ini index b1000f307f..d0c91524bc 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -61,6 +61,7 @@ static bool ViewportMapShowTunnelModeChanged(int32 p1); static bool ViewportMapLandscapeModeChanged(int32 p1); static bool UpdateLinkgraphColours(int32 p1); static bool ClimateThresholdModeChanged(int32 p1); +static bool VelocityUnitsChanged(int32 p1); static bool UpdateClientName(int32 p1); static bool UpdateServerPassword(int32 p1); @@ -4103,7 +4104,7 @@ guiflags = SGF_MULTISTRING def = 1 max = 3 full = _locale_units -proc = RedrawScreen +proc = VelocityUnitsChanged cat = SC_BASIC str = STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY strhelp = STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT From fd4b5cc0838c5c7c28389b0559dee91fd05d9d34 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 14 Jun 2021 00:52:46 +0100 Subject: [PATCH 5/5] Add buttons to cargo payment graph to select x-axis Save in misc settings --- src/graph_gui.cpp | 53 ++++++++++++++++++++++++++----------- src/graph_gui.h | 2 ++ src/lang/english.txt | 5 ++++ src/settings.cpp | 1 + src/table/misc_settings.ini | 8 ++++++ src/widgets/graph_widget.h | 2 ++ 6 files changed, 56 insertions(+), 15 deletions(-) diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 45d47a7f72..0abc45ab04 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -40,6 +40,8 @@ static CargoTypes _legend_excluded_cargo; static const OverflowSafeInt64 INVALID_DATAPOINT(INT64_MAX); // Value used for a datapoint that shouldn't be drawn. static const uint INVALID_DATAPOINT_POS = UINT_MAX; // Used to determine if the previous point was drawn. +uint8 _cargo_payment_x_mode; + /****************/ /* GRAPH LEGEND */ /****************/ @@ -894,6 +896,9 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { this->vscroll = this->GetScrollbar(WID_CPR_MATRIX_SCROLLBAR); this->vscroll->SetCount(_sorted_standard_cargo_specs_size); + this->SetWidgetLoweredState(WID_CPR_DAYS, _cargo_payment_x_mode == 0); + this->SetWidgetLoweredState(WID_CPR_SPEED, _cargo_payment_x_mode == 1); + /* Initialise the dataset */ this->OnHundredthTick(); @@ -902,16 +907,18 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { void SetXAxis() { - uint16 x_scale; - switch (_settings_game.locale.units_velocity) { - case 2: - x_scale = 5; - break; - case 3: - x_scale = 1; - break; - default: - x_scale = 10; + uint16 x_scale = 10; + if (_cargo_payment_x_mode) { + switch (_settings_game.locale.units_velocity) { + case 2: + x_scale = 5; + break; + case 3: + x_scale = 1; + break; + default: + x_scale = 10; + } } this->x_values_start = x_scale; this->x_values_increment = x_scale; @@ -1035,6 +1042,16 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { } break; } + + case WID_CPR_DAYS: + case WID_CPR_SPEED: + _cargo_payment_x_mode = widget - WID_CPR_DAYS; + this->SetWidgetLoweredState(WID_CPR_DAYS, _cargo_payment_x_mode == 0); + this->SetWidgetLoweredState(WID_CPR_SPEED, _cargo_payment_x_mode == 1); + this->SetXAxis(); + this->OnHundredthTick(); + this->SetDirty(); + break; } } @@ -1071,7 +1088,7 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) { this->colours[i] = cs->legend_colour; for (int j = 0; j != 20; j++) { - const byte ctt = static_cast(factor / static_cast((j + 1) * this->x_values_increment)); + const byte ctt = _cargo_payment_x_mode ? static_cast(factor / static_cast((j + 1) * this->x_values_increment)) : (j + 1) * 4; this->cost[i][j] = GetTransportedGoodsIncome(10, 20, ctt, cs->Index()); } i++; @@ -1083,7 +1100,12 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { { switch (widget) { case WID_CPR_FOOTER: - SetDParam(0, STR_UNIT_NAME_VELOCITY_IMPERIAL + _settings_game.locale.units_velocity); + if (_cargo_payment_x_mode) { + SetDParam(0, STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL_SPEED); + SetDParam(1, STR_UNIT_NAME_VELOCITY_IMPERIAL + _settings_game.locale.units_velocity); + } else { + SetDParam(0, STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL); + } break; } } @@ -1106,6 +1128,8 @@ static const NWidgetPart _nested_cargo_payment_rates_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CPR_GRAPH), SetMinimalSize(495, 0), SetFill(1, 1), SetResize(1, 1), NWidget(NWID_VERTICAL), + NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_CPR_DAYS), SetDataTip(STR_GRAPH_CARGO_DAYS_MODE, STR_GRAPH_CARGO_TOOLTIP_DAYS_MODE), SetFill(1, 0), + NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_CPR_SPEED), SetDataTip(STR_GRAPH_CARGO_SPEED_MODE, STR_GRAPH_CARGO_TOOLTIP_SPEED_MODE), SetFill(1, 0), NWidget(NWID_SPACER), SetMinimalSize(0, 24), SetFill(0, 1), NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CPR_ENABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_ENABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL), SetFill(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CPR_DISABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_DISABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL), SetFill(1, 0), @@ -1119,9 +1143,8 @@ static const NWidgetPart _nested_cargo_payment_rates_widgets[] = { NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(0, 1), SetResize(0, 1), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(NWID_SPACER), SetMinimalSize(WD_RESIZEBOX_WIDTH, 0), SetFill(1, 0), SetResize(1, 0), - NWidget(WWT_TEXT, COLOUR_BROWN, WID_CPR_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL_SPEED, STR_NULL), - NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0), + NWidget(NWID_SPACER), SetMinimalSize(WD_RESIZEBOX_WIDTH, 0), SetFill(0, 0), SetResize(0, 0), + NWidget(WWT_TEXT, COLOUR_BROWN, WID_CPR_FOOTER), SetMinimalSize(0, 6), SetAlignment(SA_CENTER), SetPadding(2, 0, 2, 0), SetDataTip(STR_JUST_STRING1, STR_NULL), SetFill(1, 0), SetResize(1, 0), NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_CPR_RESIZE), EndContainer(), EndContainer(), diff --git a/src/graph_gui.h b/src/graph_gui.h index 8338878c01..07a0c2f66a 100644 --- a/src/graph_gui.h +++ b/src/graph_gui.h @@ -10,6 +10,8 @@ #ifndef GRAPH_GUI_H #define GRAPH_GUI_H +extern uint8 _cargo_payment_x_mode; + void ShowOperatingProfitGraph(); void ShowIncomeGraph(); void ShowDeliveredCargoGraph(); diff --git a/src/lang/english.txt b/src/lang/english.txt index d02489a3b5..bb0082862e 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -613,6 +613,11 @@ STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Display STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Toggle graph for cargo type on/off STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING} +STR_GRAPH_CARGO_DAYS_MODE :{TINY_FONT}{BLACK}Days in transit +STR_GRAPH_CARGO_SPEED_MODE :{TINY_FONT}{BLACK}Average speed +STR_GRAPH_CARGO_TOOLTIP_DAYS_MODE :{BLACK}Display days in transit on the x-axis of the graph +STR_GRAPH_CARGO_TOOLTIP_SPEED_MODE :{BLACK}Display average transit speed on the x-axis of the graph + STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Show detailed performance ratings # Graph key window diff --git a/src/settings.cpp b/src/settings.cpp index e9c9bae17e..9a1cb30775 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -72,6 +72,7 @@ #include "scope_info.h" #include "viewport_func.h" #include "gui.h" +#include "graph_gui.h" #include "void_map.h" #include "station_base.h" diff --git a/src/table/misc_settings.ini b/src/table/misc_settings.ini index 1d3f94fc22..eab963d0ee 100644 --- a/src/table/misc_settings.ini +++ b/src/table/misc_settings.ini @@ -381,5 +381,13 @@ min = 0 max = ZEM_END - 1 cat = SC_BASIC +[SDTG_VAR] +name = ""cargo_payment_x_mode"" +type = SLE_UINT8 +var = _cargo_payment_x_mode +def = 0 +min = 0 +max = 1 + [SDTG_END] diff --git a/src/widgets/graph_widget.h b/src/widgets/graph_widget.h index 7c6478f640..14205b47b7 100644 --- a/src/widgets/graph_widget.h +++ b/src/widgets/graph_widget.h @@ -49,6 +49,8 @@ enum CargoPaymentRatesWidgets { WID_CPR_DISABLE_CARGOES, ///< Disable cargoes button. WID_CPR_MATRIX, ///< Cargo list. WID_CPR_MATRIX_SCROLLBAR,///< Cargo list scrollbar. + WID_CPR_DAYS, ///< Days in transit mode. + WID_CPR_SPEED, ///< Speed mode. }; /** Widget of the #CompanyLeagueWindow class. */