Skip to content

Commit

Permalink
cardesc add type text
Browse files Browse the repository at this point in the history
  • Loading branch information
@cryham
cryham committed Apr 7, 2024
1 parent 139fe3f commit 28ca39f
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 31 deletions.
15 changes: 9 additions & 6 deletions data/gui/core_language_en_tag.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@
<Tag name="TipCarType">Vehicle type, primary destination. Some can still be used on gravel even if not meant for it.</Tag>
<Tag name="TipCarYear">Year when this vehicle's production started.</Tag>
<Tag name="TipCarDifficulty">Vehicle handling difficulty. Higher values require more skill driving this vehicle well on tracks, and bring more trouble.</Tag>
<Tag name="TipCarWidth">Year when this vehicle's production started.</Tag>
<Tag name="TipCarWidth">Rating of vehicle's width. Higher values mean more trouble in narrow tracks.</Tag>

<Tag name="TipDrivability">Drivability tells how well will vehicle drive on track. If undrivable, best to change vehicle. Many vehicles can't handle certain track properties. Gravel type cars handle all tracks well.</Tag>
<Tag name="TipRating">Quality rating. Higher values mean: well made, playable, good looking and interesting design.</Tag>
Expand Down Expand Up @@ -1669,15 +1669,18 @@
<Tag name="CarDesc_O">An experimental, perfectly stabilized, rotating sphere. Uses advanced spacecraft propulsion to easily move in any direction. Very fast but very bouncy.</Tag>
<Tag name="CarDesc_Pipes">NOTE: Currently impossible to use in pipes.</Tag>

<Tag name="CarDesc_H1">Slow hovercraft, powered with only one propeller for hovering and thrust. Medium speed. Goes sideways much after turning. Brakes added. Does hover over water. Fun to drive but very loud and inefficient.</Tag>
<Tag name="CarDesc_H2">Fast racing hovercraft, powered with two propellers and engines. One for hovering and separate for thrust. Fast speed and goes less sideways. Brakes added. Does hover over water. Fun to drive and do stunts.</Tag>
<Tag name="CarDesc_H1">Slow hovercraft, powered with only one propeller for hovering and thrust. Slower speed. Goes sideways much after turning. Needs boost to jump over. Fun to drive but very loud and inefficient. Brakes added.</Tag>
<Tag name="CarDesc_H2">Fast racing hovercraft, powered with two propellers and engines. One for hovering and separate for thrust. Normal speed and still goes sideways but less. May need boost to jump over. Fun to drive and do stunts. Brakes added.</Tag>
<Tag name="CarDesc_Hovercraft">Does hover over water, but can be forced under if on side.</Tag>

<Tag name="CarDesc_R1">Latest antigravity stabilized hovering car. Fast and rather easy to drive. Somewhat big and bulky. Suited for all tracks and stunts.</Tag>
<Tag name="CarDesc_R2">Antigravity hovering car. Small, fast, agile and easy to drive. Suited for all tracks and stunts.</Tag>
<Tag name="CarDesc_R1">First antigravity hovering car. Fast and rather easy to drive. But somewhat big and bulky, goes more sideways.</Tag>
<Tag name="CarDesc_R2">Antigravity hovering car. Small, fast, agile and easy to drive. For all tracks and stunts.</Tag>
<Tag name="CarDesc_R3">Antigravity hovering car. Long, fast, easy to drive. Suited for all tracks and stunts.</Tag>
<Tag name="CarDesc_HoverHandbrake">Handbrake pushes down and lets steer more.</Tag>

<Tag name="CarDesc_Q1">First working prototype of antigravity hovering drone. Not very fast. Suited for all tracks and stunts.</Tag>
<Tag name="CarDesc_Q1">First working prototype of antigravity hovering drone. Not very fast.</Tag>
<Tag name="CarDesc_Q3">Incredibly fast antigravity drone. Very agile, needs quick reactions. Press throttle sparingly and briefly at first.</Tag>
<Tag name="CarDesc_HoverFluids">By antigravity it ignores all fluids completely.</Tag>


<!-- TIP Hints title+text (in How To Play) -->
Expand Down
48 changes: 25 additions & 23 deletions locale/sr.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-07 22:18+0200\n"
"POT-Creation-Date: 2024-04-07 23:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -1431,55 +1431,55 @@ msgid "Track Drivability"
msgstr ""

#. MAIN Vehicle basic stats
#: src/game/Gui_UtilCar.cpp:282
#: src/game/Gui_UtilCar.cpp:284
msgctxt "Undrivable"
msgid "Undrivable"
msgstr ""

#. MAIN Vehicle Stats
#: src/game/Gui_UtilCar.cpp:427
#: src/game/Gui_UtilCar.cpp:429
msgctxt "Car_Mass"
msgid "Mass"
msgstr ""

#. MAIN Vehicle Stats
#: src/game/Gui_UtilCar.cpp:430
#: src/game/Gui_UtilCar.cpp:432
msgctxt "Car_MassFront"
msgid "Mass on front"
msgstr ""

#. MAIN Vehicle Stats
#: src/game/Gui_UtilCar.cpp:434
#: src/game/Gui_UtilCar.cpp:436
msgctxt "Car_MaxTorque"
msgid "Max Torque"
msgstr ""

#. MAIN Vehicle Stats
#: src/game/Gui_UtilCar.cpp:437
#: src/game/Gui_UtilCar.cpp:439
msgctxt "Car_MaxPower"
msgid "Max Power"
msgstr ""

#. MAIN Vehicle Stats
#: src/game/Gui_UtilCar.cpp:440
#: src/game/Gui_UtilCar.cpp:442
msgctxt "Car_BhpPerTon"
msgid "Bhp per tonne"
msgstr ""

#. MAIN Vehicle Stats
#: src/game/Gui_UtilCar.cpp:448
#: src/game/Gui_UtilCar.cpp:450
msgctxt "Car_TopSpeed"
msgid "Top Speed"
msgstr ""

#. MAIN Vehicle Stats
#: src/game/Gui_UtilCar.cpp:456:460:464
#: src/game/Gui_UtilCar.cpp:458:462:466
msgctxt "Car_TimeTo"
msgid "Time to"
msgstr ""

#. MAIN Vehicle Stats
#: src/game/Gui_UtilCar.cpp:468
#: src/game/Gui_UtilCar.cpp:470
msgctxt "Car_StopTimeFrom"
msgid "Stop time from"
msgstr ""
Expand Down Expand Up @@ -1660,7 +1660,7 @@ msgstr ""
#: :1517..SingleRace.Setup.Steering.Text
#: data/gui/Game_Options.layout:405
#: ..Options.View.HUD.Button
#: src/game/Gui_UtilCar.cpp:445
#: src/game/Gui_UtilCar.cpp:447
#: src/common/GuiCom_Track.cpp:480
msgctxt "UnitKmh"
msgid "km/h"
Expand All @@ -1669,7 +1669,7 @@ msgstr ""
#. Units
#: data/gui/Game_Options.layout:409
#: ..Options.View.HUD.Button
#: src/game/Gui_UtilCar.cpp:446
#: src/game/Gui_UtilCar.cpp:448
#: src/common/GuiCom_Track.cpp:480
msgctxt "UnitMph"
msgid "mph"
Expand Down Expand Up @@ -1711,39 +1711,39 @@ msgid "MB"
msgstr ""

#. Units
#: src/game/Gui_UtilCar.cpp:428
#: src/game/Gui_UtilCar.cpp:430
msgctxt "UnitKg"
msgid "kg"
msgstr ""

#. Units
#: src/game/Gui_UtilCar.cpp:435
#: src/game/Gui_UtilCar.cpp:437
msgctxt "UnitNm"
msgid "Nm"
msgstr ""

#. Units
#: src/game/Gui_UtilCar.cpp:435:438:454
#: src/game/Gui_UtilCar.cpp:437:440:456
msgctxt "at"
msgid "at"
msgstr ""

#. Units
#: src/game/Gui_UtilCar.cpp:435:438
#: src/game/Gui_UtilCar.cpp:437:440
msgctxt "UnitRpm"
msgid "rpm"
msgstr ""

#. Units
#: src/game/Gui_UtilCar.cpp:438
#: src/game/Gui_UtilCar.cpp:440
msgctxt "UnitBhp"
msgid "bhp"
msgstr ""

#. Units
#: data/gui/Game.layout:564
#: ..SingleRace.Vehicle.Text
#: src/game/Gui_UtilCar.cpp:454:457:461:465:469
#: src/game/Gui_UtilCar.cpp:456:459:463:467:471
msgctxt "UnitS"
msgid "s"
msgstr ""
Expand Down Expand Up @@ -8950,9 +8950,9 @@ msgid "Fast racing hovercraft, powered with two propellers and engines. One for
msgstr ""

#. Car descriptions
#: src/game/Gui_UtilCar.cpp:258
#: src/game/Gui_UtilCar.cpp:256
msgctxt "CarDesc_Hovercraft"
msgid "Does hover over water always."
msgid "Does hover over water, but can be forced under if on side."
msgstr ""

#. Car descriptions
Expand All @@ -8971,13 +8971,14 @@ msgid "Antigravity hovering car. Long, fast, easy to drive. Suited for all track
msgstr ""

#. Car descriptions
#: src/game/Gui_UtilCar.cpp:258
msgctxt "CarDesc_HoverHandbrake"
msgid "Handbrake pushes down and lets steer more."
msgstr ""

#. Car descriptions
msgctxt "CarDesc_Q1"
msgid "First working prototype of antigravity hovering drone. Not very fast. Suited for all tracks and stunts. With handbrake goes down and steers faster."
msgid "First working prototype of antigravity hovering drone. Not very fast."
msgstr ""

#. Car descriptions
Expand All @@ -8986,8 +8987,9 @@ msgid "Incredibly fast antigravity drone. Very agile, needs quick reactions. Pre
msgstr ""

#. Car descriptions
msgctxt "CarDesc_Drone"
msgid "This antigravity ignores all fluids completely."
#: src/game/Gui_UtilCar.cpp:260
msgctxt "CarDesc_HoverFluids"
msgid "By antigravity it ignores all fluids completely."
msgstr ""

#. TIP Hints title+text (in How To Play)
Expand Down
8 changes: 6 additions & 2 deletions src/game/Gui_UtilCar.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ void CGui::listCarChng(MultiList2* li, size_t)
String sd = String("#BFD3E5")+TR("#{CarDesc_"+sListCar+"}");

// car info
bool car = true;
bool car = true; // engine info
int id = data->cars->carmap[sListCar];
if (id > 0 && txCarSpeed && barCarSpeed)
{ const CarInfo& ci = data->cars->cars[id-1];
Expand All @@ -253,8 +253,12 @@ void CGui::listCarChng(MultiList2* li, size_t)
// hide engine bhp
if (ci.type == "Spaceship" || ci.type == "Other")
{ car = false; sd += TR("#E0E060 \n#{CarDesc_Pipes}"); } // warn pipes
if (ci.type == "Hovercraft")
{ sd += TR("#80C0FF #{CarDesc_Hovercraft}"); }
if (ci.type == "Hover" || ci.type == "Drone")
{ car = false; }
{ car = false; sd += TR("#9090FF #{CarDesc_HoverHandbrake}"); }
if (ci.type == "Hover" || ci.type == "Drone")
{ car = false; sd += TR("#4090F0 #{CarDesc_HoverFluids}"); }

float v = std::max(0.f, 1.f - ci.speed/13.f);
barCarSpeed->setImageCoord(IntCoord(v*128.f,0,128,16));
Expand Down

0 comments on commit 28ca39f

Please sign in to comment.