themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Use full sentence rather than combining words

Browse source
This commit is contained in:
SGKoishi 2022-10-25 08:49:39 -07:00
parent 23c44793e9
commit 95d6baaf6c
No known key found for this signature in database
GPG key ID: 8FFC399070653828
4 changed files with 72 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

88
TShockAPI/Commands.cs
View file

@ -1420,7 +1420,7 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, idents.ToList(), PaginationTools.SendPage(args.Player, pageNumber, idents.ToList(),
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = GetString("Available identifiers ({0}/{1}):"), HeaderFormat = GetString("Available identifiers ({{0}}/{{1}}):"),
FooterFormat = GetString("Type {0}ban help identifiers {{0}} for more.", Specifier), FooterFormat = GetString("Type {0}ban help identifiers {{0}} for more.", Specifier),
NothingToDisplayString = GetString("There are currently no available identifiers."), NothingToDisplayString = GetString("There are currently no available identifiers."),
HeaderTextColor = Color.White, HeaderTextColor = Color.White,
@ -1658,9 +1658,9 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, bans.ToList(), PaginationTools.SendPage(args.Player, pageNumber, bans.ToList(),
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Bans ({0}/{1}):", HeaderFormat = GetString("Bans ({{0}}/{{1}}):"),
FooterFormat = "Type {0}ban list {{0}} for more.".SFormat(Specifier), FooterFormat = GetString("Type {0}ban list {{0}} for more.", Specifier),
NothingToDisplayString = "There are currently no active bans." NothingToDisplayString = GetString("There are currently no active bans.")
}); });
} }
@ -2082,8 +2082,8 @@ namespace TShockAPI
args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(restUsers), new PaginationTools.Settings args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(restUsers), new PaginationTools.Settings
{ {
NothingToDisplayString = GetString("There are currently no active REST users."), NothingToDisplayString = GetString("There are currently no active REST users."),
HeaderFormat = "Active REST Users ({0}/{1}):", HeaderFormat = GetString("Active REST Users ({{0}}/{{1}}):"),
FooterFormat = "Type {0}rest listusers {{0}} for more.".SFormat(Specifier) FooterFormat = GetString("Type {0}rest listusers {{0}} for more.", Specifier)
} }
); );
@ -3216,8 +3216,8 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(warpNames), PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(warpNames),
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Warps ({0}/{1}):", HeaderFormat = GetString("Warps ({{0}}/{{1}}):"),
FooterFormat = "Type {0}warp list {{0}} for more.".SFormat(Specifier), FooterFormat = GetString("Type {0}warp list {{0}} for more.", Specifier),
NothingToDisplayString = GetString("There are currently no warps defined.") NothingToDisplayString = GetString("There are currently no warps defined.")
}); });
#endregion #endregion
@ -3442,8 +3442,8 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, lines, PaginationTools.SendPage(args.Player, pageNumber, lines,
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Group Sub-Commands ({0}/{1}):", HeaderFormat = GetString("Group Sub-Commands ({{0}}/{{1}}):"),
FooterFormat = "Type {0}group help {{0}} for more sub-commands.".SFormat(Specifier) FooterFormat = GetString("Type {0}group help {{0}} for more sub-commands.", Specifier)
} }
); );
} }
@ -3733,8 +3733,8 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(groupNames), PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(groupNames),
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Groups ({0}/{1}):", HeaderFormat = GetString("Groups ({{0}}/{{1}}):"),
FooterFormat = "Type {0}group list {{0}} for more.".SFormat(Specifier) FooterFormat = GetString("Type {0}group list {{0}} for more.", Specifier)
}); });
} }
#endregion #endregion
@ -3762,9 +3762,9 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(permissions), PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(permissions),
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Permissions for " + grp.Name + " ({0}/{1}):", HeaderFormat = GetString("Permissions for {0} ({{0}}/{{1}}):", grp.Name),
FooterFormat = "Type {0}group listperm {1} {{0}} for more.".SFormat(Specifier, grp.Name), FooterFormat = GetString("Type {0}group listperm {1} {{0}} for more.", Specifier, grp.Name),
NothingToDisplayString = "There are currently no permissions for " + grp.Name + "." NothingToDisplayString = GetString($"There are currently no permissions for {grp.Name}.")
}); });
} }
#endregion #endregion
@ -3969,8 +3969,8 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, lines, PaginationTools.SendPage(args.Player, pageNumber, lines,
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Item Ban Sub-Commands ({0}/{1}):", HeaderFormat = GetString("Item Ban Sub-Commands ({{0}}/{{1}}):"),
FooterFormat = "Type {0}itemban help {{0}} for more sub-commands.".SFormat(Specifier) FooterFormat = GetString("Type {0}itemban help {{0}} for more sub-commands.", Specifier)
} }
); );
} }
@ -3987,8 +3987,8 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(itemNames), PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(itemNames),
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Item bans ({0}/{1}):", HeaderFormat = GetString("Item bans ({{0}}/{{1}}):"),
FooterFormat = "Type {0}itemban list {{0}} for more.".SFormat(Specifier), FooterFormat = GetString("Type {0}itemban list {{0}} for more.", Specifier),
NothingToDisplayString = GetString("There are currently no banned items.") NothingToDisplayString = GetString("There are currently no banned items.")
}); });
} }
@ -4147,8 +4147,8 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, lines, PaginationTools.SendPage(args.Player, pageNumber, lines,
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Projectile Ban Sub-Commands ({0}/{1}):", HeaderFormat = GetString("Projectile Ban Sub-Commands ({{0}}/{{1}}):"),
FooterFormat = "Type {0}projban help {{0}} for more sub-commands.".SFormat(Specifier) FooterFormat = GetString("Type {0}projban help {{0}} for more sub-commands.", Specifier)
} }
); );
} }
@ -4165,9 +4165,9 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(projectileIds), PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(projectileIds),
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Projectile bans ({0}/{1}):", HeaderFormat = GetString("Projectile bans ({{0}}/{{1}}):"),
FooterFormat = "Type {0}projban list {{0}} for more.".SFormat(Specifier), FooterFormat = GetString("Type {0}projban list {{0}} for more.", Specifier),
NothingToDisplayString = "There are currently no banned projectiles." NothingToDisplayString = GetString("There are currently no banned projectiles.")
}); });
} }
#endregion #endregion
@ -4323,8 +4323,8 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, lines, PaginationTools.SendPage(args.Player, pageNumber, lines,
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Tile Ban Sub-Commands ({0}/{1}):", HeaderFormat = GetString("Tile Ban Sub-Commands ({{0}}/{{1}}):"),
FooterFormat = "Type {0}tileban help {{0}} for more sub-commands.".SFormat(Specifier) FooterFormat = GetString("Type {0}tileban help {{0}} for more sub-commands.", Specifier)
} }
); );
} }
@ -4341,8 +4341,8 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(tileIds), PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(tileIds),
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Tile bans ({0}/{1}):", HeaderFormat = GetString("Tile bans ({{0}}/{{1}}):"),
FooterFormat = "Type {0}tileban list {{0}} for more.".SFormat(Specifier), FooterFormat = GetString("Type {0}tileban list {{0}} for more.", Specifier),
NothingToDisplayString = GetString("There are currently no banned tiles.") NothingToDisplayString = GetString("There are currently no banned tiles.")
}); });
} }
@ -4903,8 +4903,8 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(regionNames), PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(regionNames),
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Regions ({0}/{1}):", HeaderFormat = GetString("Regions ({{0}}/{{1}}):"),
FooterFormat = "Type {0}region list {{0}} for more.".SFormat(Specifier), FooterFormat = GetString("Type {0}region list {{0}} for more.", Specifier),
NothingToDisplayString = GetString("There are currently no regions defined.") NothingToDisplayString = GetString("There are currently no regions defined.")
}); });
break; break;
@ -5196,7 +5196,7 @@ namespace TShockAPI
args.Player, pageNumber, lines, args.Player, pageNumber, lines,
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = GetString("Available Region Sub-Commands ({0}/{1}):"), HeaderFormat = GetString("Available Region Sub-Commands ({{0}}/{{1}}):"),
FooterFormat = GetString("Type {0}region {{0}} for more sub-commands.", Specifier) FooterFormat = GetString("Type {0}region {{0}} for more sub-commands.", Specifier)
} }
); );
@ -5248,8 +5248,8 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(cmdNames), PaginationTools.SendPage(args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(cmdNames),
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = "Commands ({0}/{1}):", HeaderFormat = GetString("Commands ({{0}}/{{1}}):"),
FooterFormat = "Type {0}help {{0}} for more.".SFormat(Specifier) FooterFormat = GetString("Type {0}help {{0}} for more.", Specifier)
}); });
} }
else else
@ -5545,7 +5545,10 @@ namespace TShockAPI
private static void Wallow(CommandArgs args) private static void Wallow(CommandArgs args)
{ {
args.Player.AcceptingWhispers = !args.Player.AcceptingWhispers; args.Player.AcceptingWhispers = !args.Player.AcceptingWhispers;
args.Player.SendSuccessMessage(GetString($"You {(args.Player.AcceptingWhispers ? "may now" : "will no longer")} receive whispers from other players.")); if (args.Player.AcceptingWhispers)
args.Player.SendInfoMessage(GetString("You may now receive whispers from other players."));
else
args.Player.SendInfoMessage(GetString("You will no longer receive whispers from other players."));
args.Player.SendMessage(GetString($"You can use {Specifier.Color(Utils.GreenHighlight)}{"wa".Color(Utils.GreenHighlight)} to toggle this setting."), Color.White); args.Player.SendMessage(GetString($"You can use {Specifier.Color(Utils.GreenHighlight)}{"wa".Color(Utils.GreenHighlight)} to toggle this setting."), Color.White);
} }
@ -6326,9 +6329,20 @@ namespace TShockAPI
target.Heal(amount); target.Heal(amount);
if (args.Silent) if (args.Silent)
user.SendSuccessMessage(GetString($"You healed {(target == user ? "yourself" : target.Name)} for {amount} HP.")); if (target == user)
user.SendSuccessMessage(GetString($"You healed yourself for {amount} HP."));
else
user.SendSuccessMessage(GetString($"You healed {target.Name} for {amount} HP."));
else else
TSPlayer.All.SendInfoMessage(GetString($"{user.Name} healed {(target == user ? (target.TPlayer.Male ? "himself" : "herself") : target.Name)} for {amount} HP.")); {
if (target == user)
if (target.TPlayer.Male)
TSPlayer.All.SendInfoMessage(GetString($"{user.Name} healed himself for {amount} HP."));
else
TSPlayer.All.SendInfoMessage(GetString($"{user.Name} healed herself for {amount} HP."));
else
TSPlayer.All.SendInfoMessage(GetString($"{user.Name} healed {target.Name} for {amount} HP."));
}
} }
} }
@ -6479,7 +6493,7 @@ namespace TShockAPI
PaginationTools.SendPage(args.Player, pageNumber, lines, PaginationTools.SendPage(args.Player, pageNumber, lines,
new PaginationTools.Settings new PaginationTools.Settings
{ {
HeaderFormat = GetString("Trees types & misc available to use. ({0}/{1}):"), HeaderFormat = GetString("Trees types & misc available to use. ({{0}}/{{1}}):"),
FooterFormat = GetString("Type {0}grow help {{0}} for more sub-commands.", Commands.Specifier) FooterFormat = GetString("Type {0}grow help {{0}} for more sub-commands.", Commands.Specifier)
} }
); );

32
TShockAPI/GetDataHandlers.cs
View file

@ -3523,52 +3523,52 @@ namespace TShockAPI
switch (thingType) switch (thingType)
{ {
case -14: case -14:
thing = GetString("has sent a request to the bunny delivery service"); thing = GetString("{0} has sent a request to the bunny delivery service!", args.Player.Name);
break; break;
case -13: case -13:
thing = GetString("has sent a request to the dog delivery service"); thing = GetString("{0} has sent a request to the dog delivery service!", args.Player.Name);
break; break;
case -12: case -12:
thing = GetString("has sent a request to the cat delivery service"); thing = GetString("{0} has sent a request to the cat delivery service!", args.Player.Name);
break; break;
case -11: case -11:
thing = GetString("applied advanced combat techniques"); thing = GetString("{0} applied advanced combat techniques!", args.Player.Name);
break; break;
case -10: case -10:
thing = GetString("summoned a Blood Moon"); thing = GetString("{0} summoned a Blood Moon!", args.Player.Name);
break; break;
case -8: case -8:
thing = GetString("summoned a Moon Lord"); thing = GetString("{0} summoned a Moon Lord!", args.Player.Name);
break; break;
case -7: case -7:
thing = GetString("summoned a Martian invasion"); thing = GetString("{0} summoned a Martian invasion!", args.Player.Name);
break; break;
case -6: case -6:
thing = GetString("summoned an eclipse"); thing = GetString("{0} summoned an eclipse!", args.Player.Name);
break; break;
case -5: case -5:
thing = GetString("summoned a frost moon"); thing = GetString("{0} summoned a frost moon!", args.Player.Name);
break; break;
case -4: case -4:
thing = GetString("summoned a pumpkin moon"); thing = GetString("{0} summoned a pumpkin moon!", args.Player.Name);
break; break;
case -3: case -3:
thing = GetString("summoned the Pirates"); thing = GetString("{0} summoned the Pirates!", args.Player.Name);
break; break;
case -2: case -2:
thing = GetString("summoned the Snow Legion"); thing = GetString("{0} summoned the Snow Legion!", args.Player.Name);
break; break;
case -1: case -1:
thing = GetString("summoned a Goblin Invasion"); thing = GetString("{0} summoned a Goblin Invasion!", args.Player.Name);
break; break;
default: default:
thing = GetString("summoned the {0}", npc.FullName); thing = GetString("{0} summoned the {1}!", args.Player.Name, npc.FullName);
break; break;
} }
if (TShock.Config.Settings.AnonymousBossInvasions) if (TShock.Config.Settings.AnonymousBossInvasions)
TShock.Utils.SendLogs(GetString("{0} {1}!", args.Player.Name, thing), Color.PaleVioletRed, args.Player); TShock.Utils.SendLogs(thing, Color.PaleVioletRed, args.Player);
else else
TShock.Utils.Broadcast(GetString("{0} {1}!", args.Player.Name, thing), 175, 75, 255); TShock.Utils.Broadcast(thing, 175, 75, 255);
return false; return false;
} }

4
TShockAPI/PaginationTools.cs
View file

@ -102,10 +102,10 @@ namespace TShockAPI
public Settings() public Settings()
{ {
this.IncludeHeader = true; this.IncludeHeader = true;
this.headerFormat = "Page {0} of {1}"; this.headerFormat = GetString("Page {{0}} of {{1}}");
this.HeaderTextColor = Color.Green; this.HeaderTextColor = Color.Green;
this.IncludeFooter = true; this.IncludeFooter = true;
this.footerFormat = "Type /<command> {0} for more."; this.footerFormat = GetString("Type /<command> {{0}} for more.");
this.FooterTextColor = Color.Yellow; this.FooterTextColor = Color.Yellow;
this.NothingToDisplayString = null; this.NothingToDisplayString = null;
this.LineFormatter = null; this.LineFormatter = null;

6
TShockAPI/RegionHandler.cs
View file

@ -151,12 +151,12 @@ namespace TShockAPI
if (output.Count == 0) if (output.Count == 0)
{ {
player.SendInfoMessage(includeUnprotected player.SendInfoMessage(includeUnprotected
? "There are no regions at this point." ? GetString("There are no regions at this point.")
: "There are no regions at this point, or they are not protected."); : GetString("There are no regions at this point, or they are not protected."));
} }
else else
{ {
player.SendInfoMessage(includeUnprotected ? "Regions at this point: " : "Protected regions at this point: "); player.SendInfoMessage(includeUnprotected ? GetString("Regions at this point: ") : GetString("Protected regions at this point: "));
foreach (string line in PaginationTools.BuildLinesFromTerms(output)) foreach (string line in PaginationTools.BuildLinesFromTerms(output))
{ {