Compare commits
3 Commits
ef0c9533a4
...
log_chat_s
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
50277c59d7 | ||
|
|
2a13752203 | ||
|
|
8ce3ea5f2c |
@@ -637,11 +637,6 @@ namespace OpenRA
|
||||
{
|
||||
return new LineSplitEnumerator(str.AsSpan(), separator);
|
||||
}
|
||||
|
||||
public static bool TryParseInt32Invariant(string s, out int i)
|
||||
{
|
||||
return int.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
|
||||
}
|
||||
}
|
||||
|
||||
public ref struct LineSplitEnumerator
|
||||
|
||||
@@ -20,6 +20,24 @@ namespace OpenRA.Network
|
||||
{
|
||||
public const int ChatMessageMaxLength = 2500;
|
||||
|
||||
[FluentReference("player")]
|
||||
const string Joined = "notification-joined";
|
||||
|
||||
[FluentReference("player")]
|
||||
const string Left = "notification-lobby-disconnected";
|
||||
|
||||
[FluentReference]
|
||||
const string GameStarted = "notification-game-has-started";
|
||||
|
||||
[FluentReference]
|
||||
const string GameSaved = "notification-game-saved";
|
||||
|
||||
[FluentReference("player")]
|
||||
const string GamePaused = "notification-game-paused";
|
||||
|
||||
[FluentReference("player")]
|
||||
const string GameUnpaused = "notification-game-unpaused";
|
||||
|
||||
public static int? KickVoteTarget { get; internal set; }
|
||||
|
||||
static Player FindPlayerByClient(this World world, Session.Client c)
|
||||
@@ -60,16 +78,8 @@ namespace OpenRA.Network
|
||||
}
|
||||
|
||||
case "DisableChatEntry":
|
||||
{
|
||||
if (OrderNotFromServerOrWorldIsReplay(clientId, world))
|
||||
break;
|
||||
|
||||
// Server may send MaxValue to indicate that it is disabled until further notice
|
||||
if (order.ExtraData == uint.MaxValue)
|
||||
TextNotificationsManager.ChatDisabledUntil = uint.MaxValue;
|
||||
else
|
||||
TextNotificationsManager.ChatDisabledUntil = Game.RunTime + order.ExtraData;
|
||||
|
||||
{
|
||||
if (OrderNotFromServerOrWorldIsReplay(clientId, world))
|
||||
break;
|
||||
|
||||
// Server may send MaxValue to indicate that it is disabled until further notice
|
||||
@@ -101,26 +111,6 @@ namespace OpenRA.Network
|
||||
break;
|
||||
}
|
||||
|
||||
case "StartKickVote":
|
||||
{
|
||||
if (OrderNotFromServerOrWorldIsReplay(clientId, world))
|
||||
break;
|
||||
|
||||
KickVoteTarget = (int)order.ExtraData;
|
||||
break;
|
||||
}
|
||||
|
||||
case "EndKickVote":
|
||||
{
|
||||
if (OrderNotFromServerOrWorldIsReplay(clientId, world))
|
||||
break;
|
||||
|
||||
if (KickVoteTarget == (int)order.ExtraData)
|
||||
KickVoteTarget = null;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case "Chat":
|
||||
{
|
||||
var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Linguini.Bundle" Version="0.5.0" />
|
||||
<PackageReference Include="Linguini.Bundle" Version="0.8.1" />
|
||||
<PackageReference Include="OpenRA-Eluant" Version="1.0.22" />
|
||||
<PackageReference Include="Mono.NAT" Version="3.0.4" />
|
||||
<PackageReference Include="SharpZipLib" Version="1.4.2" />
|
||||
|
||||
@@ -319,7 +319,7 @@ namespace OpenRA.Server
|
||||
|
||||
MapStatusCache = new MapStatusCache(modData, MapStatusChanged, type == ServerType.Dedicated && settings.EnableLintChecks);
|
||||
|
||||
playerMessageTracker = new PlayerMessageTracker(this, DispatchOrdersToClient, SendLocalizedMessageTo);
|
||||
playerMessageTracker = new PlayerMessageTracker(this, DispatchOrdersToClient, SendFluentMessageTo);
|
||||
VoteKickTracker = new VoteKickTracker(this);
|
||||
|
||||
LobbyInfo = new Session
|
||||
|
||||
@@ -17,22 +17,22 @@ namespace OpenRA.Server
|
||||
{
|
||||
public sealed class VoteKickTracker
|
||||
{
|
||||
[TranslationReference("kickee")]
|
||||
[FluentReference("kickee")]
|
||||
const string InsufficientVotes = "notification-insufficient-votes-to-kick";
|
||||
|
||||
[TranslationReference]
|
||||
[FluentReference]
|
||||
const string AlreadyVoted = "notification-kick-already-voted";
|
||||
|
||||
[TranslationReference("kicker", "kickee")]
|
||||
[FluentReference("kicker", "kickee")]
|
||||
const string VoteKickStarted = "notification-vote-kick-started";
|
||||
|
||||
[TranslationReference]
|
||||
[FluentReference]
|
||||
const string UnableToStartAVote = "notification-unable-to-start-a-vote";
|
||||
|
||||
[TranslationReference("kickee", "percentage")]
|
||||
[FluentReference("kickee", "percentage")]
|
||||
const string VoteKickProgress = "notification-vote-kick-in-progress";
|
||||
|
||||
[TranslationReference("kickee")]
|
||||
[FluentReference("kickee")]
|
||||
const string VoteKickEnded = "notification-vote-kick-ended";
|
||||
|
||||
readonly Dictionary<int, bool> voteTracker = new();
|
||||
@@ -76,7 +76,7 @@ namespace OpenRA.Server
|
||||
|| (voteInProgress && this.kickee.Client != kickee) // Disallow starting new votes when one is already ongoing.
|
||||
|| !ClientHasPower(kicker))
|
||||
{
|
||||
server.SendLocalizedMessageTo(conn, UnableToStartAVote);
|
||||
server.SendFluentMessageTo(conn, UnableToStartAVote);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ namespace OpenRA.Server
|
||||
if (!kickee.IsObserver && !server.HasClientWonOrLost(kickee))
|
||||
{
|
||||
// Vote kick cannot be the sole deciding factor for a game.
|
||||
server.SendLocalizedMessageTo(conn, InsufficientVotes, Translation.Arguments("kickee", kickee.Name));
|
||||
server.SendFluentMessageTo(conn, InsufficientVotes, new object[] { "kickee", kickee.Name });
|
||||
EndKickVote();
|
||||
return false;
|
||||
}
|
||||
@@ -126,7 +126,7 @@ namespace OpenRA.Server
|
||||
{
|
||||
if (time + server.Settings.VoteKickerCooldown > kickeeConn.ConnectionTimer.ElapsedMilliseconds)
|
||||
{
|
||||
server.SendLocalizedMessageTo(conn, UnableToStartAVote);
|
||||
server.SendFluentMessageTo(conn, UnableToStartAVote);
|
||||
return false;
|
||||
}
|
||||
else
|
||||
@@ -135,7 +135,7 @@ namespace OpenRA.Server
|
||||
|
||||
Log.Write("server", $"Vote kick started on {kickeeID}.");
|
||||
voteKickTimer = Stopwatch.StartNew();
|
||||
server.SendLocalizedMessage(VoteKickStarted, Translation.Arguments("kicker", kicker.Name, "kickee", kickee.Name));
|
||||
server.SendFluentMessage(VoteKickStarted, "kicker", kicker.Name, "kickee", kickee.Name);
|
||||
server.DispatchServerOrdersToClients(new Order("StartKickVote", null, false) { ExtraData = (uint)kickeeID }.Serialize());
|
||||
this.kickee = (kickee, kickeeConn);
|
||||
voteKickerStarter = (kicker, conn);
|
||||
@@ -145,7 +145,7 @@ namespace OpenRA.Server
|
||||
voteTracker[conn.PlayerIndex] = vote;
|
||||
else
|
||||
{
|
||||
server.SendLocalizedMessageTo(conn, AlreadyVoted, null);
|
||||
server.SendFluentMessageTo(conn, AlreadyVoted);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -168,9 +168,9 @@ namespace OpenRA.Server
|
||||
}
|
||||
|
||||
var votesNeeded = eligiblePlayers / 2 + 1;
|
||||
server.SendLocalizedMessage(VoteKickProgress, Translation.Arguments(
|
||||
server.SendFluentMessage(VoteKickProgress,
|
||||
"kickee", kickee.Name,
|
||||
"percentage", votesFor * 100 / eligiblePlayers));
|
||||
"percentage", votesFor * 100 / eligiblePlayers);
|
||||
|
||||
// If a player or players during a vote lose or disconnect, it is possible that a downvote will
|
||||
// kick a client. Guard against that situation.
|
||||
@@ -210,7 +210,7 @@ namespace OpenRA.Server
|
||||
return;
|
||||
|
||||
if (sendMessage)
|
||||
server.SendLocalizedMessage(VoteKickEnded, Translation.Arguments("kickee", kickee.Client.Name));
|
||||
server.SendFluentMessage(VoteKickEnded, "kickee", kickee.Client.Name);
|
||||
|
||||
server.DispatchServerOrdersToClients(new Order("EndKickVote", null, false) { ExtraData = (uint)kickee.Client.Index }.Serialize());
|
||||
|
||||
|
||||
@@ -57,10 +57,10 @@ namespace OpenRA.Mods.Common.Server
|
||||
[FluentReference]
|
||||
const string NoKickGameStarted = "notification-no-kick-game-started";
|
||||
|
||||
[TranslationReference("admin", "player")]
|
||||
[FluentReference("admin", "player")]
|
||||
const string AdminKicked = "notification-admin-kicked";
|
||||
|
||||
[TranslationReference("player")]
|
||||
[FluentReference("player")]
|
||||
const string Kicked = "notification-kicked";
|
||||
|
||||
[FluentReference("admin", "player")]
|
||||
@@ -159,35 +159,37 @@ namespace OpenRA.Mods.Common.Server
|
||||
[FluentReference]
|
||||
const string YouWereKicked = "notification-you-were-kicked";
|
||||
|
||||
[TranslationReference]
|
||||
[FluentReference]
|
||||
const string VoteKickDisabled = "notification-vote-kick-disabled";
|
||||
|
||||
readonly IDictionary<string, Func<S, Connection, Session.Client, string, bool>> commandHandlers = new Dictionary<string, Func<S, Connection, Session.Client, string, bool>>
|
||||
{
|
||||
{ "state", State },
|
||||
{ "startgame", StartGame },
|
||||
{ "slot", Slot },
|
||||
{ "allow_spectators", AllowSpectators },
|
||||
{ "spectate", Specate },
|
||||
{ "slot_close", SlotClose },
|
||||
{ "slot_open", SlotOpen },
|
||||
{ "slot_bot", SlotBot },
|
||||
{ "map", Map },
|
||||
{ "option", Option },
|
||||
{ "assignteams", AssignTeams },
|
||||
{ "kick", Kick },
|
||||
{ "vote_kick", VoteKick },
|
||||
{ "make_admin", MakeAdmin },
|
||||
{ "make_spectator", MakeSpectator },
|
||||
{ "name", Name },
|
||||
{ "faction", Faction },
|
||||
{ "team", Team },
|
||||
{ "handicap", Handicap },
|
||||
{ "spawn", Spawn },
|
||||
{ "clear_spawn", ClearPlayerSpawn },
|
||||
{ "color", PlayerColor },
|
||||
{ "sync_lobby", SyncLobby }
|
||||
};
|
||||
readonly IDictionary<string, Func<S, Connection, Session.Client, string, bool>> commandHandlers =
|
||||
new Dictionary<string, Func<S, Connection, Session.Client, string, bool>>
|
||||
{
|
||||
{ "state", State },
|
||||
{ "startgame", StartGame },
|
||||
{ "slot", Slot },
|
||||
{ "allow_spectators", AllowSpectators },
|
||||
{ "spectate", Specate },
|
||||
{ "slot_close", SlotClose },
|
||||
{ "slot_open", SlotOpen },
|
||||
{ "slot_bot", SlotBot },
|
||||
{ "map", Map },
|
||||
{ "option", Option },
|
||||
{ "reset_options", ResetOptions },
|
||||
{ "assignteams", AssignTeams },
|
||||
{ "kick", Kick },
|
||||
{ "vote_kick", VoteKick },
|
||||
{ "make_admin", MakeAdmin },
|
||||
{ "make_spectator", MakeSpectator },
|
||||
{ "name", Name },
|
||||
{ "faction", Faction },
|
||||
{ "team", Team },
|
||||
{ "handicap", Handicap },
|
||||
{ "spawn", Spawn },
|
||||
{ "clear_spawn", ClearPlayerSpawn },
|
||||
{ "color", PlayerColor },
|
||||
{ "sync_lobby", SyncLobby }
|
||||
};
|
||||
|
||||
static bool ValidateSlotCommand(S server, Connection conn, Session.Client client, string arg, bool requiresHost)
|
||||
{
|
||||
@@ -871,7 +873,7 @@ namespace OpenRA.Mods.Common.Server
|
||||
}
|
||||
|
||||
Log.Write("server", $"Kicking client {kickClientID}.");
|
||||
server.SendLocalizedMessage(AdminKicked, Translation.Arguments("admin", client.Name, "player", kickClient.Name));
|
||||
server.SendFluentMessage(AdminKicked, "admin", client.Name, "player", kickClient.Name);
|
||||
server.SendOrderTo(kickConn, "ServerError", YouWereKicked);
|
||||
server.DropClient(kickConn);
|
||||
|
||||
@@ -896,13 +898,13 @@ namespace OpenRA.Mods.Common.Server
|
||||
var split = s.Split(' ');
|
||||
if (split.Length != 2)
|
||||
{
|
||||
server.SendLocalizedMessageTo(conn, MalformedCommand, Translation.Arguments("command", "vote_kick"));
|
||||
server.SendFluentMessageTo(conn, MalformedCommand, new object[] { "command", "vote_kick" });
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!server.Settings.EnableVoteKick)
|
||||
{
|
||||
server.SendLocalizedMessageTo(conn, VoteKickDisabled);
|
||||
server.SendFluentMessageTo(conn, VoteKickDisabled);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -911,27 +913,27 @@ namespace OpenRA.Mods.Common.Server
|
||||
|
||||
if (kickConn == null)
|
||||
{
|
||||
server.SendLocalizedMessageTo(conn, KickNone);
|
||||
server.SendFluentMessageTo(conn, KickNone);
|
||||
return true;
|
||||
}
|
||||
|
||||
var kickClient = server.GetClient(kickConn);
|
||||
if (client == kickClient)
|
||||
{
|
||||
server.SendLocalizedMessageTo(conn, NoKickSelf);
|
||||
server.SendFluentMessageTo(conn, NoKickSelf);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!bool.TryParse(split[1], out var vote))
|
||||
{
|
||||
server.SendLocalizedMessageTo(conn, MalformedCommand, Translation.Arguments("command", "vote_kick"));
|
||||
server.SendFluentMessageTo(conn, MalformedCommand, new object[] { "command", "vote_kick" });
|
||||
return true;
|
||||
}
|
||||
|
||||
if (server.VoteKickTracker.VoteKick(conn, client, kickConn, kickClient, kickClientID, vote))
|
||||
{
|
||||
Log.Write("server", $"Kicking client {kickClientID}.");
|
||||
server.SendLocalizedMessage(Kicked, Translation.Arguments("player", kickClient.Name));
|
||||
server.SendFluentMessage(Kicked, "player", kickClient.Name);
|
||||
server.SendOrderTo(kickConn, "ServerError", YouWereKicked);
|
||||
server.DropClient(kickConn);
|
||||
|
||||
|
||||
@@ -192,7 +192,8 @@ namespace OpenRA.Mods.Common.Traits
|
||||
return true;
|
||||
|
||||
var dropRange = carryall.Info.DropRange;
|
||||
self.QueueActivity(true, new DeliverUnit(self, Target.FromCell(self.World, carryable.Destination ?? self.Location), dropRange, carryall.Info.TargetLineColor));
|
||||
QueueChild(new DeliverUnit(self, Target.FromCell(self.World, carryable.Destination ?? self.Location), dropRange, carryall.Info.TargetLineColor));
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -103,31 +103,31 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
|
||||
{
|
||||
case "cnc":
|
||||
fromBackup = true;
|
||||
tilesetExtensionsNode = new List<MiniYamlNode>()
|
||||
tilesetExtensionsNode = new List<MiniYamlNodeBuilder>()
|
||||
{
|
||||
new MiniYamlNode("TEMPERAT", ".tem"),
|
||||
new MiniYamlNode("SNOW", ".sno"),
|
||||
new MiniYamlNode("INTERIOR", ".int"),
|
||||
new MiniYamlNode("DESERT", ".des"),
|
||||
new MiniYamlNode("JUNGLE", ".jun"),
|
||||
new("TEMPERAT", ".tem"),
|
||||
new("SNOW", ".sno"),
|
||||
new("INTERIOR", ".int"),
|
||||
new("DESERT", ".des"),
|
||||
new("JUNGLE", ".jun"),
|
||||
};
|
||||
break;
|
||||
case "ra":
|
||||
fromBackup = true;
|
||||
tilesetExtensionsNode = new List<MiniYamlNode>()
|
||||
tilesetExtensionsNode = new List<MiniYamlNodeBuilder>()
|
||||
{
|
||||
new MiniYamlNode("TEMPERAT", ".tem"),
|
||||
new MiniYamlNode("SNOW", ".sno"),
|
||||
new MiniYamlNode("INTERIOR", ".int"),
|
||||
new MiniYamlNode("DESERT", ".des"),
|
||||
new("TEMPERAT", ".tem"),
|
||||
new("SNOW", ".sno"),
|
||||
new("INTERIOR", ".int"),
|
||||
new("DESERT", ".des"),
|
||||
};
|
||||
break;
|
||||
case "ts":
|
||||
fromBackup = true;
|
||||
tilesetExtensionsNode = new List<MiniYamlNode>()
|
||||
tilesetExtensionsNode = new List<MiniYamlNodeBuilder>()
|
||||
{
|
||||
new MiniYamlNode("TEMPERATE", ".tem"),
|
||||
new MiniYamlNode("SNOW", ".sno"),
|
||||
new("TEMPERATE", ".tem"),
|
||||
new("SNOW", ".sno"),
|
||||
};
|
||||
break;
|
||||
}
|
||||
@@ -148,10 +148,10 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
|
||||
if (tilesetCodesNode == null && modData.Manifest.Id == "ts")
|
||||
{
|
||||
fromBackup = true;
|
||||
tilesetCodesNode = new List<MiniYamlNode>()
|
||||
tilesetCodesNode = new List<MiniYamlNodeBuilder>()
|
||||
{
|
||||
new MiniYamlNode("TEMPERATE", "t"),
|
||||
new MiniYamlNode("SNOW", "a"),
|
||||
new("TEMPERATE", "t"),
|
||||
new("SNOW", "a"),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -50,10 +50,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
[FluentReference]
|
||||
const string Gone = "label-client-state-disconnected";
|
||||
|
||||
[TranslationReference]
|
||||
[FluentReference]
|
||||
const string KickTooltip = "button-kick-player";
|
||||
|
||||
[TranslationReference("player")]
|
||||
[FluentReference("player")]
|
||||
const string KickTitle = "dialog-kick.title";
|
||||
|
||||
[FluentReference]
|
||||
@@ -62,28 +62,28 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
[FluentReference]
|
||||
const string KickAccept = "dialog-kick.confirm";
|
||||
|
||||
[TranslationReference]
|
||||
[FluentReference]
|
||||
const string KickVoteTooltip = "button-vote-kick-player";
|
||||
|
||||
[TranslationReference("player")]
|
||||
[FluentReference("player")]
|
||||
const string VoteKickTitle = "dialog-vote-kick.title";
|
||||
|
||||
[TranslationReference]
|
||||
[FluentReference]
|
||||
const string VoteKickPrompt = "dialog-vote-kick.prompt";
|
||||
|
||||
[TranslationReference("bots")]
|
||||
[FluentReference("bots")]
|
||||
const string VoteKickPromptBreakBots = "dialog-vote-kick.prompt-break-bots";
|
||||
|
||||
[TranslationReference]
|
||||
[FluentReference]
|
||||
const string VoteKickVoteStart = "dialog-vote-kick.vote-start";
|
||||
|
||||
[TranslationReference]
|
||||
[FluentReference]
|
||||
const string VoteKickVoteFor = "dialog-vote-kick.vote-for";
|
||||
|
||||
[TranslationReference]
|
||||
[FluentReference]
|
||||
const string VoteKickVoteAgainst = "dialog-vote-kick.vote-against";
|
||||
|
||||
[TranslationReference]
|
||||
[FluentReference]
|
||||
const string VoteKickVoteCancel = "dialog-vote-kick.vote-cancel";
|
||||
|
||||
[ObjectCreator.UseCtor]
|
||||
@@ -133,10 +133,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
var teamTemplate = playerPanel.Get<ScrollItemWidget>("TEAM_TEMPLATE");
|
||||
var playerTemplate = playerPanel.Get("PLAYER_TEMPLATE");
|
||||
var spectatorTemplate = playerPanel.Get("SPECTATOR_TEMPLATE");
|
||||
var unmuteTooltip = TranslationProvider.GetString(Unmute);
|
||||
var muteTooltip = TranslationProvider.GetString(Mute);
|
||||
var kickTooltip = TranslationProvider.GetString(KickTooltip);
|
||||
var voteKickTooltip = TranslationProvider.GetString(KickVoteTooltip);
|
||||
var unmuteTooltip = FluentProvider.GetMessage(Unmute);
|
||||
var muteTooltip = FluentProvider.GetMessage(Mute);
|
||||
var kickTooltip = FluentProvider.GetMessage(KickTooltip);
|
||||
var voteKickTooltip = FluentProvider.GetMessage(KickVoteTooltip);
|
||||
playerPanel.RemoveChildren();
|
||||
|
||||
var teams = world.Players.Where(p => !p.NonCombatant && p.Playable)
|
||||
@@ -159,13 +159,14 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
{
|
||||
ConfirmationDialogs.ButtonPrompt(modData,
|
||||
title: VoteKickTitle,
|
||||
titleArguments: Translation.Arguments("player", client.Name),
|
||||
text: botsCount > 0 ? VoteKickPromptBreakBots : VoteKickPrompt,
|
||||
textArguments: Translation.Arguments("bots", botsCount),
|
||||
titleArguments: new object[] { "player", client.Name },
|
||||
textArguments: new object[] { "bots", botsCount },
|
||||
onConfirm: () =>
|
||||
{
|
||||
orderManager.IssueOrder(Order.Command($"vote_kick {client.Index} {true}"));
|
||||
hideMenu(false);
|
||||
closeMenu();
|
||||
},
|
||||
confirmText: VoteKickVoteStart,
|
||||
onCancel: () => hideMenu(false));
|
||||
@@ -174,31 +175,33 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
|
||||
ConfirmationDialogs.ButtonPrompt(modData,
|
||||
title: VoteKickTitle,
|
||||
titleArguments: Translation.Arguments("player", client.Name),
|
||||
text: botsCount > 0 ? VoteKickPromptBreakBots : VoteKickPrompt,
|
||||
textArguments: Translation.Arguments("bots", botsCount),
|
||||
titleArguments: new object[] { "player", client.Name },
|
||||
textArguments: new object[] { "bots", botsCount },
|
||||
onConfirm: () =>
|
||||
{
|
||||
orderManager.IssueOrder(Order.Command($"vote_kick {client.Index} {true}"));
|
||||
hideMenu(false);
|
||||
closeMenu();
|
||||
},
|
||||
confirmText: VoteKickVoteFor,
|
||||
onCancel: () => hideMenu(false),
|
||||
cancelText: VoteKickVoteCancel,
|
||||
onOther: () =>
|
||||
{
|
||||
Ui.CloseWindow();
|
||||
orderManager.IssueOrder(Order.Command($"vote_kick {client.Index} {false}"));
|
||||
hideMenu(false);
|
||||
closeMenu();
|
||||
},
|
||||
otherText: VoteKickVoteAgainst,
|
||||
onCancel: () => hideMenu(false),
|
||||
cancelText: VoteKickVoteCancel);
|
||||
otherText: VoteKickVoteAgainst);
|
||||
}
|
||||
else
|
||||
{
|
||||
ConfirmationDialogs.ButtonPrompt(modData,
|
||||
title: KickTitle,
|
||||
titleArguments: Translation.Arguments("player", client.Name),
|
||||
text: KickPrompt,
|
||||
titleArguments: new object[] { "player", client.Name },
|
||||
onConfirm: () =>
|
||||
{
|
||||
orderManager.IssueOrder(Order.Command($"kick {client.Index} {false}"));
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Metadata:
|
||||
Title: All mods
|
||||
Version: release-20231010
|
||||
Version: release-20250330
|
||||
Hidden: true
|
||||
|
||||
FileSystem: DefaultFileSystem
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Metadata:
|
||||
Title: mod-title
|
||||
Version: {DEV_VERSION}
|
||||
Version: release-20250330
|
||||
Hidden: true
|
||||
|
||||
FileSystem: DefaultFileSystem
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Metadata:
|
||||
Title: Tiberian Dawn
|
||||
Version: release-20231010
|
||||
Title: mod-title
|
||||
Version: release-20250330
|
||||
Website: https://www.openra.net
|
||||
WebIcon32: https://www.openra.net/images/icons/cnc_32x32.png
|
||||
WindowTitle: mod-windowtitle
|
||||
@@ -40,7 +40,7 @@ FileSystem: ContentInstallerFileSystem
|
||||
|
||||
MapFolders:
|
||||
cnc|maps: System
|
||||
~^SupportDir|maps/cnc/release-20231010: User
|
||||
~^SupportDir|maps/cnc/release-20250330: User
|
||||
|
||||
Rules:
|
||||
cnc|rules/misc.yaml
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Metadata:
|
||||
Title: mod-title
|
||||
Version: {DEV_VERSION}
|
||||
Version: release-20250330
|
||||
Hidden: true
|
||||
|
||||
FileSystem: DefaultFileSystem
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Metadata:
|
||||
Title: Dune 2000
|
||||
Version: release-20231010
|
||||
Title: mod-title
|
||||
Version: release-20250330
|
||||
Website: https://www.openra.net
|
||||
WebIcon32: https://www.openra.net/images/icons/d2k_32x32.png
|
||||
WindowTitle: mod-windowtitle
|
||||
@@ -37,7 +37,7 @@ FileSystem: ContentInstallerFileSystem
|
||||
|
||||
MapFolders:
|
||||
d2k|maps: System
|
||||
~^SupportDir|maps/d2k/release-20231010: User
|
||||
~^SupportDir|maps/d2k/release-20250330: User
|
||||
|
||||
Rules:
|
||||
d2k|rules/misc.yaml
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
Metadata:
|
||||
Title: Mod Content Manager
|
||||
Version: release-20231010
|
||||
Hidden: true
|
||||
|
||||
Packages:
|
||||
^EngineDir
|
||||
^EngineDir|mods/modcontent: modcontent
|
||||
^EngineDir|mods/common: common
|
||||
|
||||
Rules:
|
||||
modcontent|rules.yaml
|
||||
|
||||
Cursors:
|
||||
modcontent|cursors.yaml
|
||||
|
||||
Chrome:
|
||||
modcontent|chrome.yaml
|
||||
|
||||
Assemblies:
|
||||
^BinDir|OpenRA.Mods.Common.dll
|
||||
|
||||
ChromeLayout:
|
||||
modcontent|content.yaml
|
||||
|
||||
Notifications:
|
||||
modcontent|notifications.yaml
|
||||
|
||||
LoadScreen: ModContentLoadScreen
|
||||
Image: ^EngineDir|mods/modcontent/chrome.png
|
||||
Image2x: ^EngineDir|mods/modcontent/chrome-2x.png
|
||||
Image3x: ^EngineDir|mods/modcontent/chrome-3x.png
|
||||
|
||||
ChromeMetrics:
|
||||
common|metrics.yaml
|
||||
modcontent|metrics.yaml
|
||||
|
||||
Translations:
|
||||
common|languages/en.ftl
|
||||
|
||||
Fonts:
|
||||
Tiny:
|
||||
Font: common|FreeSans.ttf
|
||||
Size: 10
|
||||
Ascender: 8
|
||||
TinyBold:
|
||||
Font: common|FreeSansBold.ttf
|
||||
Size: 10
|
||||
Ascender: 8
|
||||
Regular:
|
||||
Font: common|FreeSans.ttf
|
||||
Size: 14
|
||||
Ascender: 11
|
||||
Bold:
|
||||
Font: common|FreeSansBold.ttf
|
||||
Size: 14
|
||||
Ascender: 11
|
||||
MediumBold:
|
||||
Font: common|FreeSansBold.ttf
|
||||
Size: 18
|
||||
Ascender: 14
|
||||
BigBold:
|
||||
Font: common|FreeSansBold.ttf
|
||||
Size: 24
|
||||
Ascender: 18
|
||||
|
||||
SoundFormats:
|
||||
|
||||
SpriteFormats: PngSheet
|
||||
|
||||
TerrainFormat: DefaultTerrain
|
||||
|
||||
SpriteSequenceFormat: DefaultSpriteSequence
|
||||
|
||||
ModelSequenceFormat: PlaceholderModelSequence
|
||||
@@ -1,6 +1,6 @@
|
||||
Metadata:
|
||||
Title: mod-title
|
||||
Version: {DEV_VERSION}
|
||||
Version: release-20250330
|
||||
Hidden: true
|
||||
|
||||
FileSystem: DefaultFileSystem
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Metadata:
|
||||
Title: Red Alert
|
||||
Version: release-20231010
|
||||
Title: mod-title
|
||||
Version: release-20250330
|
||||
Website: https://www.openra.net
|
||||
WebIcon32: https://www.openra.net/images/icons/ra_32x32.png
|
||||
WindowTitle: mod-windowtitle
|
||||
@@ -68,7 +68,7 @@ FileSystem: ContentInstallerFileSystem
|
||||
|
||||
MapFolders:
|
||||
ra|maps: System
|
||||
~^SupportDir|maps/ra/release-20231010: User
|
||||
~^SupportDir|maps/ra/release-20250330: User
|
||||
|
||||
Rules:
|
||||
ra|rules/misc.yaml
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Metadata:
|
||||
Title: mod-title
|
||||
Version: {DEV_VERSION}
|
||||
Version: release-20250330
|
||||
Hidden: true
|
||||
|
||||
FileSystem: DefaultFileSystem
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Metadata:
|
||||
Title: Tiberian Sun
|
||||
Version: release-20231010
|
||||
Title: mod-title
|
||||
Version: release-20250330
|
||||
Website: https://www.openra.net
|
||||
WebIcon32: https://www.openra.net/images/icons/ts_32x32.png
|
||||
WindowTitle: mod-windowtitle
|
||||
@@ -44,7 +44,7 @@ FileSystem: ContentInstallerFileSystem
|
||||
|
||||
MapFolders:
|
||||
ts|maps: System
|
||||
~^SupportDir|maps/ts/release-20231010: User
|
||||
~^SupportDir|maps/ts/release-20250330: User
|
||||
|
||||
Rules:
|
||||
ts|rules/ai.yaml
|
||||
|
||||
Reference in New Issue
Block a user