diff --git a/client/RailEnterprise.Client/assets/i18n/strings.csv b/client/RailEnterprise.Client/assets/i18n/strings.csv index 3aa392b..5b17476 100644 --- a/client/RailEnterprise.Client/assets/i18n/strings.csv +++ b/client/RailEnterprise.Client/assets/i18n/strings.csv @@ -550,3 +550,57 @@ entro,,within fino al,,until da domani,,from tomorrow dal,,from +La tua scalata,,Your climb +Stato patrimoniale,,Balance sheet +Chiedi un prestito,,Request a loan +In attesa del quadro dal server…,,Waiting for the report from the server… +Fido fino a,,Credit up to +squadre di cantiere,,construction crews +Acquisto di industrie,,Industry purchases +Scalate ai concorrenti,,Takeovers of rivals +Concessioni,,Concessions +fondata nel,,founded in +con,,with +verso,,towards +raggiunta nel,,reached in +raggiunta,,reached +avanzamento,,progress +patrimonio,,net worth +Lo storico cresce anno dopo anno,,The history grows year by year +a,,to +in,,in +anno,,year +Hai raggiunto il livello più alto,,You have reached the highest tier +Per diventare,,To become +Patrimonio netto di,,Net worth of +città oltre,,towns over +collegata su,,connected out of +collegate su,,connected out of +Rating creditizio,,Credit rating +attuale,,current +Binari e opere,,Track and structures +Stazioni e depositi,,Stations and depots +Materiale rotabile,,Rolling stock +Industrie possedute,,Owned industries +Merce propria,,Own goods +Partecipazioni,,Shareholdings +Totale attivo,,Total assets +Prestiti al,,Loans at +Prestiti,,Loans +Scoperto di cassa,,Overdraft +Conto economico,,Income statement +(finora),,(so far) +Ricavi da tariffe e noli,,Fares and freight revenue +Altri ricavi,,Other income +Costi operativi,,Operating costs +Interessi,,Interest +Utile netto,,Net profit +Rimborsa,,Repay +Fido disponibile,,Available credit +su,,of +al,,at +In amministrazione controllata non si possono chiedere prestiti,,Loans cannot be requested under receivership +livello più alto,,highest tier +prossimo,,next +Clic per aprire «La tua scalata»,,Click to open «Your climb» +Scalata,,Climb diff --git a/client/RailEnterprise.Client/scripts/App/AutoPilot.cs b/client/RailEnterprise.Client/scripts/App/AutoPilot.cs index 05c6fbb..ad3bb76 100644 --- a/client/RailEnterprise.Client/scripts/App/AutoPilot.cs +++ b/client/RailEnterprise.Client/scripts/App/AutoPilot.cs @@ -240,6 +240,11 @@ public partial class AutoPilot : Node await Until(() => World.Market is not null, "quadro del mercato", 30); await Shot("16_mercato", 40); + // La tua scalata (immagine 08): livelli, sblocchi, requisiti, stato patrimoniale + _game.OpenClimb(); + await Until(() => World.Climb is not null, "quadro della scalata", 30); + await Shot("17_scalata", 40); + // Cronaca provvisoria _game.OpenChronicle(); await Until(() => _game.ChronicleVisible, "cronaca", 30); diff --git a/client/RailEnterprise.Client/scripts/Hud/Toolbar.cs b/client/RailEnterprise.Client/scripts/Hud/Toolbar.cs index 779b81f..b1c7548 100644 --- a/client/RailEnterprise.Client/scripts/Hud/Toolbar.cs +++ b/client/RailEnterprise.Client/scripts/Hud/Toolbar.cs @@ -5,7 +5,7 @@ using static RailEnterprise.Client.App.Localization; namespace RailEnterprise.Client.Hud; /// Strumenti e pannelli della barra sinistra (immagine 01). -public enum Tool { None, Track, Station, Signal, Depot, Trains, Lines, Maintenance, Employment, Industries, Market, Companies, Finance, Demolish } +public enum Tool { None, Track, Station, Signal, Depot, Trains, Lines, Maintenance, Employment, Industries, Market, Companies, Climb, Finance, Demolish } /// /// Barra degli strumenti a sinistra: icone disegnate in codice con l'etichetta sotto. I pulsanti @@ -37,7 +37,7 @@ public partial class Toolbar : PanelContainer { (Tool.Track, "Binari"), (Tool.Station, "Stazione"), (Tool.Signal, "Segnali"), (Tool.Depot, "Deposito"), (Tool.Trains, "Treni"), (Tool.Lines, "Linee"), (Tool.Maintenance, "Officine"), (Tool.Employment, "Impieghi"), - (Tool.Industries, "Industrie"), (Tool.Market, "Mercato"), (Tool.Companies, "Compagnie"), (Tool.Finance, "Finanze"), + (Tool.Industries, "Industrie"), (Tool.Market, "Mercato"), (Tool.Companies, "Compagnie"), (Tool.Climb, "Scalata"), (Tool.Finance, "Finanze"), (Tool.Demolish, "Demolisci"), }) { @@ -159,6 +159,13 @@ public partial class Toolbar : PanelContainer DrawPolyline([c + new Vector2(-11, 8), c + new Vector2(-4, 0), c + new Vector2(2, 5), c + new Vector2(11, -7)], col, w); DrawLine(c + new Vector2(-11, 11), c + new Vector2(11, 11), col, w); break; + case Tool.Climb: + // gradini che salgono verso una bandierina + DrawPolyline([c + new Vector2(-11, 11), c + new Vector2(-11, 5), c + new Vector2(-4, 5), c + new Vector2(-4, -1), + c + new Vector2(3, -1), c + new Vector2(3, -7), c + new Vector2(10, -7), c + new Vector2(10, 11), c + new Vector2(-11, 11)], col, w); + DrawLine(c + new Vector2(10, -7), c + new Vector2(10, -13), col, w); + DrawColoredPolygon([c + new Vector2(10, -13), c + new Vector2(4, -11), c + new Vector2(10, -9)], col); + break; case Tool.Finance: DrawArc(c + new Vector2(0, -7), 9, 0, MathF.Tau, 24, col, w); DrawLine(c + new Vector2(-9, -7), c + new Vector2(-9, 7), col, w); diff --git a/client/RailEnterprise.Client/scripts/Hud/TopBar.cs b/client/RailEnterprise.Client/scripts/Hud/TopBar.cs index 5c328dd..62d915c 100644 --- a/client/RailEnterprise.Client/scripts/Hud/TopBar.cs +++ b/client/RailEnterprise.Client/scripts/Hud/TopBar.cs @@ -1,6 +1,8 @@ using Godot; using RailEnterprise.Client.App; using RailEnterprise.Client.Net; +using RailEnterprise.Client.Panels; +using RailEnterprise.Protocol.Messages; using static RailEnterprise.Client.App.Localization; namespace RailEnterprise.Client.Hud; @@ -11,6 +13,12 @@ public partial class TopBar : PanelContainer private GameSession? _session; private readonly Label _company = UiTheme.TitleLabel("", 30); private readonly PanelContainer _tier = UiTheme.Badge(""); + private readonly Label _climb = UiTheme.Text("", 12, Palette.TextSecondary); + private long _climbRequestedMonth = long.MinValue; + private double _sinceClimbRequest = double.MaxValue; + + /// Clic sul livello: apre «La tua scalata». + public event Action? ClimbRequested; private readonly Label _date = UiTheme.Text("", 17, bold: true); private readonly Label _cash = UiTheme.Text("", 20, Palette.AmberLight, bold: true); private readonly Label _worth = UiTheme.Text("", 20, bold: true); @@ -18,6 +26,7 @@ public partial class TopBar : PanelContainer private readonly Label _server = UiTheme.Text("", 14); private readonly ColorRect _serverDot = new() { CustomMinimumSize = new Vector2(10, 10) }; private readonly List