Skip to content

Commit

Permalink
Merge pull request #448 from THEXN/master
Browse files Browse the repository at this point in the history
更新:先整一个i18n看看
  • Loading branch information
THEXN authored Sep 2, 2024
2 parents 135175e + 78ec40c commit acffeda
Show file tree
Hide file tree
Showing 12 changed files with 203 additions and 82 deletions.
2 changes: 1 addition & 1 deletion src/AdditionalPylons/AdditionalPylons.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

<Import Project="..\..\template.targets" />

</Project>
</Project>
45 changes: 25 additions & 20 deletions src/AdditionalPylons/AdditionalPylonsPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@ namespace AdditionalPylons;
[ApiVersion(2, 1)]
public class AdditionalPylonsPlugin : TerrariaPlugin
{


#region Plugin Properties
public override string Name => "[放置更多晶塔] AdditionalPylons";

public override Version Version => new Version(1, 0, 1);
public override Version Version => new Version(1, 0, 2);

public override string Author => "Stealownz,肝帝熙恩优化1449";

public override string Description => " 自定义晶塔可放置的数量,至少为一个,且所有晶塔都无视环境";
public override string Description => "自定义晶塔可放置的数量,至少为一个,且所有晶塔都无视环境";


public AdditionalPylonsPlugin(Main game) : base(game)
Expand All @@ -43,7 +41,7 @@ private static void LoadConfig()
private static void ReloadConfig(ReloadEventArgs args)
{
LoadConfig();
args.Player?.SendSuccessMessage("[{0}]重新加载配置完毕。", typeof(AdditionalPylonsPlugin).Name);
args.Player?.SendSuccessMessage(GetString("[无限晶塔]重新加载配置完毕."));
}

#region Plugin Overrides
Expand Down Expand Up @@ -218,64 +216,71 @@ private void SendPlayerPylonSystem(int playerId, bool addPylons)
case 4875:
if (count >= Config.JungleTowerLimit)
{
TShock.Players[playerId].SendErrorMessage("丛林晶塔数量已达到上限。");
TShock.Players[playerId].SendErrorMessage(GetString("丛林晶塔数量已达到上限。"));
return;
}
break;

case 4876:
if (count >= Config.ForestTowerLimit)
if (count >= Config.SurfacePurityTowerLimit)
{
TShock.Players[playerId].SendErrorMessage("森林晶塔数量已达到上限。");
TShock.Players[playerId].SendErrorMessage(GetString("森林晶塔数量已达到上限。"));
return;
}
break;

case 4916:
if (count >= Config.HolyTowerLimit)
if (count >= Config.HallowTowerLimit)
{
TShock.Players[playerId].SendErrorMessage("神圣晶塔数量已达到上限。");
TShock.Players[playerId].SendErrorMessage(GetString("神圣晶塔数量已达到上限。"));
return;
}
break;

case 4917:
if (count >= Config.CaveTowerLimit)
if (count >= Config.UndergroundTowerLimit)
{
TShock.Players[playerId].SendErrorMessage("洞穴晶塔数量已达到上限。");
TShock.Players[playerId].SendErrorMessage(GetString("洞穴晶塔数量已达到上限。"));
return;
}
break;

case 4918:
if (count >= Config.OceanTowerLimit)
if (count >= Config.BeachTowerLimit)
{
TShock.Players[playerId].SendErrorMessage("海洋晶塔数量已达到上限。");
TShock.Players[playerId].SendErrorMessage(GetString("海洋晶塔数量已达到上限。"));
return;
}
break;

case 4919:
if (count >= Config.DesertTowerLimit)
{
TShock.Players[playerId].SendErrorMessage("沙漠晶塔数量已达到上限。");
TShock.Players[playerId].SendErrorMessage(GetString("沙漠晶塔数量已达到上限。"));
return;
}
break;

case 4920:
if (count >= Config.SnowTowerLimit)
{
TShock.Players[playerId].SendErrorMessage("雪原晶塔数量已达到上限。");
TShock.Players[playerId].SendErrorMessage(GetString("雪原晶塔数量已达到上限。"));
return;
}
break;

case 4921:
if (count >= Config.MushroomTowerLimit)
if (count >= Config.GlowingMushroomTowerLimit)
{
TShock.Players[playerId].SendErrorMessage("蘑菇晶塔数量已达到上限。");
TShock.Players[playerId].SendErrorMessage(GetString("蘑菇晶塔数量已达到上限。"));
return;
}
break;

case 4951:
if (count >= Config.UniversalTowerLimit)
if (count >= Config.VictoryTowerLimit)
{
TShock.Players[playerId].SendErrorMessage("万能晶塔数量已达到上限。");
TShock.Players[playerId].SendErrorMessage(GetString("万能晶塔数量已达到上限。"));
return;
}
break;
Expand Down
12 changes: 6 additions & 6 deletions src/AdditionalPylons/Configuration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ internal class Configuration
[JsonProperty("丛林晶塔数量上限")]
public int JungleTowerLimit = 2;
[JsonProperty("森林晶塔数量上限")]
public int ForestTowerLimit = 2;
public int SurfacePurityTowerLimit = 2;
[JsonProperty("神圣晶塔数量上限")]
public int HolyTowerLimit = 2;
public int HallowTowerLimit = 2;
[JsonProperty("洞穴晶塔数量上限")]
public int CaveTowerLimit = 2;
public int UndergroundTowerLimit = 2;
[JsonProperty("海洋晶塔数量上限")]
public int OceanTowerLimit = 2;
public int BeachTowerLimit = 2;
[JsonProperty("沙漠晶塔数量上限")]
public int DesertTowerLimit = 2;
[JsonProperty("雪原晶塔数量上限")]
public int SnowTowerLimit = 2;
[JsonProperty("蘑菇晶塔数量上限")]
public int MushroomTowerLimit = 2;
public int GlowingMushroomTowerLimit = 2;
[JsonProperty("万能晶塔数量上限")]
public int UniversalTowerLimit = 2;
public int VictoryTowerLimit = 2;


public void Write(string path)
Expand Down
2 changes: 2 additions & 0 deletions src/AdditionalPylons/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
## 更新日志

```
v1.0.2
i18n适配
v1.0.1 完善卸载函数
```

Expand Down
57 changes: 57 additions & 0 deletions src/AdditionalPylons/i18n/en-US.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2024-09-01 10:36:56+0800\n"
"PO-Revision-Date: 2024-09-01 12:44+0800\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 3.5\n"
"X-Poedit-Basepath: .\n"

#: ..\..\AdditionalPylonsPlugin.cs:45
msgid "[无限晶塔]重新加载配置完毕."
msgstr "[AdditionalPylons] Config reloaded."

#: ..\..\AdditionalPylonsPlugin.cs:219
msgid "丛林晶塔数量已达到上限。"
msgstr "The number of Jungle Pylon has reached its maximum."

#: ..\..\AdditionalPylonsPlugin.cs:243
msgid "洞穴晶塔数量已达到上限。"
msgstr "The number of Underground Pylon has reached its maximum."

#: ..\..\AdditionalPylonsPlugin.cs:251
msgid "海洋晶塔数量已达到上限。"
msgstr "The number of Beach Pylon has reached its maximum."

#: ..\..\AdditionalPylonsPlugin.cs:275
msgid "蘑菇晶塔数量已达到上限。"
msgstr "The number of Glowing Mushroom Pylon has reached its maximum."

#: ..\..\AdditionalPylonsPlugin.cs:227
msgid "森林晶塔数量已达到上限。"
msgstr "The number of Surface Purity Pylon has reached its maximum."

#: ..\..\AdditionalPylonsPlugin.cs:259
msgid "沙漠晶塔数量已达到上限。"
msgstr "The number of Desert Pylon has reached its maximum."

#: ..\..\AdditionalPylonsPlugin.cs:235
msgid "神圣晶塔数量已达到上限。"
msgstr "The number of Hallow Pylon has reached its maximum."

#: ..\..\AdditionalPylonsPlugin.cs:283
msgid "万能晶塔数量已达到上限。"
msgstr "The number of Victory Pylon has reached its maximum."

#: ..\..\AdditionalPylonsPlugin.cs:267
msgid "雪原晶塔数量已达到上限。"
msgstr "The number of Snow Pylon has reached its maximum."

#: ..\..\AdditionalPylonsPlugin.cs:21
msgid "自定义晶塔可放置的数量,至少为一个,且所有晶塔都无视环境"
msgstr "Customize the number of crystal towers that can be placed, at least one, and all of them ignore the environment"
52 changes: 52 additions & 0 deletions src/AdditionalPylons/i18n/template.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
msgid ""
msgstr ""
"Project-Id-Version: AdditionalPylons\n"
"POT-Creation-Date: 2024-09-01 17:54:38+0800\n"
"PO-Revision-Date: 2024-09-01 17:54:38+0800\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: GetText.NET Extractor\n"

#: ..\..\AdditionalPylonsPlugin.cs:45
msgid "[无限晶塔]重新加载配置完毕."
msgstr ""

#: ..\..\AdditionalPylonsPlugin.cs:219
msgid "丛林晶塔数量已达到上限。"
msgstr ""

#: ..\..\AdditionalPylonsPlugin.cs:243
msgid "洞穴晶塔数量已达到上限。"
msgstr ""

#: ..\..\AdditionalPylonsPlugin.cs:251
msgid "海洋晶塔数量已达到上限。"
msgstr ""

#: ..\..\AdditionalPylonsPlugin.cs:275
msgid "蘑菇晶塔数量已达到上限。"
msgstr ""

#: ..\..\AdditionalPylonsPlugin.cs:227
msgid "森林晶塔数量已达到上限。"
msgstr ""

#: ..\..\AdditionalPylonsPlugin.cs:259
msgid "沙漠晶塔数量已达到上限。"
msgstr ""

#: ..\..\AdditionalPylonsPlugin.cs:235
msgid "神圣晶塔数量已达到上限。"
msgstr ""

#: ..\..\AdditionalPylonsPlugin.cs:283
msgid "万能晶塔数量已达到上限。"
msgstr ""

#: ..\..\AdditionalPylonsPlugin.cs:267
msgid "雪原晶塔数量已达到上限。"
msgstr ""

7 changes: 4 additions & 3 deletions src/AutoPluginManager/AutoPluginManager.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\..\template.targets" />

<Import Project="..\..\template.targets" />
<ItemGroup>
<Folder Include="i18n\" />
</ItemGroup>
</Project>
Loading

0 comments on commit acffeda

Please sign in to comment.