Skip to content

Commit ed8c82f

Browse files
JavidPackJavidPack
committed
v0.8 release, updated to tModLoader 0.11.7.5, new install procedure
1 parent 94ba7c4 commit ed8c82f

File tree

14 files changed

+325
-17
lines changed

14 files changed

+325
-17
lines changed

‎patches/TerraCustom/Terraria.Localization.Content/es-ES.TerraCustom.json

+213
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,221 @@
11
{
22
"TerraCustom": {
3+
// Tips:
4+
// use vanilla translations: {$GameUI.Enabled} Disabled, CLI.Yes, etc
5+
// use {0} etc to interpolate values
6+
// Not used. Unless we need different order than Reset + noun + Settings?
7+
// //"ResetChallengeOptions": "{$TerraCustom.Reset} {$TerraCustom.ChallengeOptions} {$TerraCustom.Settings}",
8+
// //"ResetChests": "{$TerraCustom.Reset} {$TerraCustom.Chests} {$TerraCustom.Settings}",
9+
10+
// Common
311
"Reset": "Reinicializar",
12+
// "Both": "Both",
13+
// // "Settings": "{$LegacyMenu.14}",
14+
15+
// Choose world size Menu
16+
// "KeepPreviousCustomSize": "Keep Previous Custom Size",
17+
// "LoadAutosavedConfig": "Load Autosaved Config",
418

19+
// Main Menu
20+
// "ResetAll": "Reset All",
21+
// "ReloadtModLoaderMods": "Reload tModLoader mods",
22+
// "Terrain": "Terrain",
23+
// "Ores": "Ores",
24+
// "OreAmount": "Ore Amount",
25+
// "GraphicStyles": "Graphic Styles",
26+
// "Backgrounds": "Backgrounds",
27+
// "Miscellaneous": "Miscellaneous",
528
"ChallengeOptions": "Opciones de desafío",
29+
// "MicroBiomes": "Micro Biomes",
30+
// "Traps": "Traps",
31+
// "VariousSpawns": "Various Spawns",
32+
// "DownedBossesFoundNPCs": "Downed Bosses/Found NPCs",
633
"Chests": "Cofre",
34+
// "SaveLoadSettings": "Save/Load Settings",
35+
// "Debug": "Debug",
36+
// "AreYouSureResetAllSettings": "Are you sure you will reset all the settings?",
37+
38+
// Terrain Menu
39+
// "Use100ForDefaultBehaviorNote": "set to 100% for default behavior",
40+
// "SurfaceHeightVariance": "Surface Height Variance",
41+
// "SurfaceUpperLimit": "Surface Upper Limit",
42+
// "SurfaceLowerLimit": "Surface Lower Limit",
43+
// "BypassSpawnAreaFlatness": "Bypass Spawn Area Flatness",
44+
// "BeachSize": "Beach Size",
45+
// "DungeonSize": "Dungeon Size",
46+
// "DesertScale": "Underground Desert Size",
47+
// "Shallow": "Shallow",
48+
// "Normal": "Normal",
49+
// "Deep": "Deep",
50+
// "JungleScale": "Jungle Scale",
51+
// "UnderworldHouseMult": "Underworld Houses",
52+
// "IceBiomeDepth": "Ice Biome Depth",
53+
// "IceBiomeWidth": "Ice Biome Width",
54+
// "TempleSize": "Temple Size",
55+
// "SurfaceTunnels": "Surface Tunnels",
56+
// "Lakes": "Lakes",
57+
// "LakeScale": "Lake Size",
58+
// "GiantTreeMult": "Giant Trees",
59+
// "NoMultiWire": "No Non-Temple Different Wires",
60+
// "NoGravitate": "Dont Extend Sand Downwards",
61+
// "DoubleDungeon": "Additional Dungeon on Jungle Side",
62+
// "SwapShroomJungle": "Swap Jungle and Mushroom Biomes",
63+
// "Sand": "Sand",
64+
// "Clay": "Clay",
65+
// "Silt": "Silt",
66+
// "Webs": "Webs",
67+
// "SurfaceCaves": "Surface Caves",
68+
// "UndergroundCaves": "Regular Caves",
69+
// "WorldWidth": "World Width",
70+
// "WorldHeight": "World Height",
71+
72+
// Ores Menu
73+
// "AlsoCheckOreAmountNote": "Also check 'Ore Amount' option to get both hardmode ores",
74+
75+
// OreAmount Menu
76+
// "Setting100ForDefaultAmountOfOresNote": "setting 100% will generate default amount of ores",
77+
// "OptionToGenerateAlternateHardmodeOres": "Option to generate alternate hardmode ores in the beginning",
78+
// "GenerateNone": "Generate none",
79+
// "GenerateLittle": "Generate a little",
80+
// "GenerateMedium": "Generate medium amount",
81+
// "GenerateLot": "Generate a lot",
82+
// "SameAmountAsSmashingXAltars": "(Same amount as smashing {0} altars)",
83+
// "PreSmashAltarsGeneratesOpposite": "PreSmash Altars generates opposite set of ores",
84+
// "PreSmashAltarsGeneratesBothSetsOfOres": "PreSmash Altars generates both sets of ores",
85+
// "PreSmashAltarsPreventRandomPatchSpawn": "PreSmash Altars prevent random Corruption/Crimson/Hallow patch spawn",
86+
87+
// GraphicStyles Menu --- TODO: Rewrite these menus so I can localize them
88+
// "MoonStyle": "Moon Style",
89+
// "Tree Style Far Left": "Tree Style Far Left",
90+
// "Tree Style Left": "Tree Style Left",
91+
// "Tree Style Right": "Tree Style Right",
92+
// "Tree Style Far Right": "Tree Style Far Right",
93+
// "Dungeon Color": "Dungeon Color",
94+
// "Moss Color Left": "Moss Color Left",
95+
// "Moss Color Middle": "Moss Color Middle",
96+
// "Moss Color Right": "Moss Color Right",
97+
// "Jungle Shrines": "Jungle Shrines",
98+
// "Iridescent Bricks": "Iridescent Bricks",
99+
// "Mudstone Blocks": "Mudstone Blocks",
100+
// "Rich Mahogany": "Rich Mahogany",
101+
// "Tin Brick": "Tin Brick",
102+
// "Gold Brick": "Gold Brick",
103+
// "Mix": "Mix",
104+
105+
// Backgrounds Menu
106+
// "SurfaceBackgrounds": "Surface Backgrounds",
107+
// "UndergroundBackgrounds": "Underground Backgrounds",
108+
109+
// SurfaceBackgrounds Menu
110+
// "ForestBackground": "Forest Background",
111+
// "CorruptBackground": "Corrupt Background",
112+
// "JungleBackground": "Jungle Background",
113+
// "SnowBackground": "Snow Background",
114+
// "HallowBackground": "Hallow Background",
115+
// "CrimsonBackground": "Crimson Background",
116+
// "DesertBackground": "Desert Background",
117+
// "OceanBackground": "Ocean Background",
118+
119+
// UnderBackgrounds Menu
120+
// "IceBackground": "Ice Background",
121+
// "HellBackground": "Hell Background",
122+
// "JungleBackground": "Jungle Background",
123+
// "CaveBackgroundFarLeft": "Cave Background Far Left",
124+
// "CaveBackgroundLeft": "Cave Background Left",
125+
// "CaveBackgroundMiddle": "Cave Background Middle",
126+
// "CaveBackgroundRight": "Cave Background Right",
127+
// "CaveBackgroundFarRight": "Cave Background Far Right",
128+
129+
// Miscellaneous Menu
130+
// "CorruptionCrimson": "Corruption/Crimson",
131+
// "ForceCorruptionCrimsonAvoidJungleSide": "Force Corruption/Crimson Avoid Jungle Side",
132+
// "ForceCorruptionCrimsonSeparateSides": "Force Corruption/Crimson Separate Sides",
133+
// "CorruptionBiomes": "Corruption Biomes",
134+
// "CrimsonBiomes": "Crimson Biomes",
135+
// "DungeonSide": "Dungeon Side",
136+
// "Hardmode": "Hardmode",
137+
// "SpawnHardmodeStripesIfHardmode": "Spawn Hardmode stripes(if Hardmode is Yes)",
138+
// "Pyramids": "Pyramids",
139+
// "GiantTrees": "Giant Trees",
140+
// "ForceEnchantedSwordShrineReal": "Force Enchanted Sword Shrine Real",
141+
142+
// Challenge Option Menu
143+
// "NoTree": "No tree",
144+
// "NoDungeon": "No dungeon",
145+
// "NoTemple": "No temple",
146+
// "NoSpiderCave": "No spider cave",
147+
// "NoHive": "No hive",
148+
// "NoSnow": "No snow",
149+
// "NoJungle": "No jungle",
150+
// "NoAnthill": "No anthill",
151+
// "NoBeaches": "No beaches",
152+
// "NoPot": "No pot",
153+
// "NoChest": "No chest",
154+
// "NoAltar": "No altar",
155+
// "NoOrbOrHeart": "No orb/heart",
156+
// "NoUnderworld": "No underworld",
157+
158+
// MicroBiomes Menu
159+
// "Setting100ForDefaultAmountBiomesNote": "setting 100% will generate default amount of biomes",
160+
// "EnchantedSword": "Enchanted Sword",
161+
// "Campsite": "Campsite",
162+
// "ThinIce": "Thin Ice",
163+
// "SkyIslands": "Sky Islands",
164+
// "MinecartTracks": "Minecart Tracks",
165+
// "SpiderCaves": "Spider Caves",
166+
// "GraniteCaves": "Granite Caves",
167+
// "MarbleCaves": "Marble Caves",
168+
// "UndergroundCabins": "Underground Cabins",
169+
// "GemstonesNonCave": "Gemstones(non-cave)",
170+
// "GemstoneCaves": "Gemstone Caves",
171+
// "GemstoneCaveSize": "Gemstone Cave Size",
172+
// "Hives": "Hives",
173+
174+
// Traps Menu
175+
// "MiningExplosiveDetonator": "Mining Explosive(Detonator)",
176+
// "TrapsDartExplosiveBoulder": "Traps(Dart,Explosive,Boulder)",
177+
// "AdditionalDartTraps": "Additional Dart Traps",
178+
// "AdditionalBoulderTraps": "Additional Boulder Traps",
179+
// "AdditionalExplosiveTraps": "Additional Explosive Traps",
180+
// "AdditionalGeyserTraps": "Additional Geyser Traps",
181+
// "TempleTraps": "Temple Traps",
182+
183+
// VariousSpawns Menu
184+
// "Setting100ForDefaultAmountNote": "setting 100% will generate default amount",
185+
// "CrystalHearts": "Crystal Hearts",
186+
// "PreDropMeteor": "Pre-Drop Meteor",
187+
// "TreeLowerBound": "Tree Lower Bound",
188+
// "TreeUpperBound": "Tree Upper Bound",
189+
// "MushroomBiomes": "Mushroom Biomes",
190+
// "MushroomSize": "Mushroom Biome Scale",
191+
// "Statues": "Statues",
192+
193+
// Downed Found Menu
194+
// "DownedBosses": "Downed Bosses",
195+
// "FoundNPCs": "Found NPCs",
196+
// "Downed": "Downed",
197+
// "Found": "Found",
198+
199+
// Chest Menu
200+
// "EsimatedXChests": "Esimated {0} chests.",
201+
// "BiomeChestSets": "Biome Chest Sets",
202+
// "Pots": "Pots",
203+
// "JungleShrines": "Jungle Shrines",
204+
// "LivingMahoganyTrees": "Living Mahogany Trees",
205+
// "WaterChests": "Water Chests",
206+
// "SurfaceChests": "Surface Chests",
207+
// "TempleChests": "Temple Chests",
208+
// "ShadowChests": "Shadow Chests",
209+
210+
// SaveLoadSettings Menu
211+
// "SavedSetings": "Saved Setings",
212+
// "EnableThisList": "Enable this List",
213+
// "DeleteThisList": "Delete this List",
214+
// "SaveCurrentSettingsAsNew": "Save Current Settings as New",
215+
// "EnterSettingsName": "Enter Settings name",
216+
217+
// Debug Menu
218+
// "SaveWorldAfterEachStep": "Save World After Each Step",
219+
// "SaveWorldIntModLoaderFolder": "Save World in tModLoader Folder",
7220
}
8221
}

‎patches/TerraCustom/Terraria.Localization.Content/zh-Hans.TerraCustom.json

+32-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
{
22
"TerraCustom": {
3+
// Tips:
4+
// use vanilla translations: {$GameUI.Enabled} Disabled, CLI.Yes, etc
5+
// use {0} etc to interpolate values
6+
// Not used. Unless we need different order than Reset + noun + Settings?
7+
// //"ResetChallengeOptions": "{$TerraCustom.Reset} {$TerraCustom.ChallengeOptions} {$TerraCustom.Settings}",
8+
// //"ResetChests": "{$TerraCustom.Reset} {$TerraCustom.Chests} {$TerraCustom.Settings}",
9+
310
// Common
411
"Reset": "重置",
512
"Both": "并存",
6-
// "Settings": "{$LegacyMenu.14}",
13+
// // "Settings": "{$LegacyMenu.14}",
714

815
// Choose world size Menu
916
"KeepPreviousCustomSize": "保持以前自定义的大小",
@@ -36,9 +43,29 @@
3643
"BypassSpawnAreaFlatness": "随设置调整出生点地形",
3744
"BeachSize": "海洋大小",
3845
"DungeonSize": "地牢大小",
46+
// "DesertScale": "Underground Desert Size",
47+
// "Shallow": "Shallow",
48+
// "Normal": "Normal",
49+
// "Deep": "Deep",
50+
// "JungleScale": "Jungle Scale",
51+
// "UnderworldHouseMult": "Underworld Houses",
52+
// "IceBiomeDepth": "Ice Biome Depth",
53+
// "IceBiomeWidth": "Ice Biome Width",
3954
"TempleSize": "蜥蜴神庙大小",
4055
"SurfaceTunnels": "地表隧道",
4156
"Lakes": "湖泊",
57+
// "LakeScale": "Lake Size",
58+
// "GiantTreeMult": "Giant Trees",
59+
// "NoMultiWire": "No Non-Temple Different Wires",
60+
// "NoGravitate": "Dont Extend Sand Downwards",
61+
// "DoubleDungeon": "Additional Dungeon on Jungle Side",
62+
// "SwapShroomJungle": "Swap Jungle and Mushroom Biomes",
63+
// "Sand": "Sand",
64+
// "Clay": "Clay",
65+
// "Silt": "Silt",
66+
// "Webs": "Webs",
67+
// "SurfaceCaves": "Surface Caves",
68+
// "UndergroundCaves": "Regular Caves",
4269
"WorldWidth": "宽度",
4370
"WorldHeight": "高度",
4471

@@ -53,10 +80,11 @@
5380
"GenerateMedium": "中量新三矿生成",
5481
"GenerateLot": "大量新三矿生成",
5582
"SameAmountAsSmashingXAltars": "（相当于粉碎{0}个祭坛）",
83+
// "PreSmashAltarsGeneratesOpposite": "PreSmash Altars generates opposite set of ores",
5684
"PreSmashAltarsGeneratesBothSetsOfOres": "粉碎祭坛前允许生成两种新矿石",
5785
"PreSmashAltarsPreventRandomPatchSpawn": "粉碎祭坛前防止随机生成腐化/血腥/神圣之地",
5886

59-
// GraphicStyles Menu
87+
// GraphicStyles Menu --- TODO: Rewrite these menus so I can localize them
6088
"MoonStyle": "月亮风格",
6189
"Tree Style Far Left": "最左侧树木风格",
6290
"Tree Style Left": "左侧树木风格",
@@ -159,6 +187,7 @@
159187
"TreeLowerBound": "树木最低高度",
160188
"TreeUpperBound": "树木最高高度",
161189
"MushroomBiomes": "夜光蘑菇地",
190+
// "MushroomSize": "Mushroom Biome Scale",
162191
"Statues": "雕像",
163192

164193
// Downed Found Menu
@@ -183,6 +212,7 @@
183212
"EnableThisList": "启用设置",
184213
"DeleteThisList": "删除设置",
185214
"SaveCurrentSettingsAsNew": "将当前设置保存新设置",
215+
// "EnterSettingsName": "Enter Settings name",
186216

187217
// Debug Menu
188218
"SaveWorldAfterEachStep": "每次调整时都保存世界",

‎patches/TerraCustom/Terraria.ModLoader.Engine/InstallVerifier.cs.patch

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- src/tModLoader/Terraria.ModLoader.Engine/InstallVerifier.cs
2+
+++ src/TerraCustom/Terraria.ModLoader.Engine/InstallVerifier.cs
3+
@@ -83,6 +_,8 @@
4+
return false;
5+
}
6+
#endif
7+
+ IsGoG = true;
8+
+ return true;
9+
// Whether the steam_api file exists, indicating we'd have to check steam installation
10+
if (File.Exists(steamAPIPath))
11+
return CheckSteam();

‎patches/TerraCustom/Terraria.ModLoader.UI/Interface.cs.patch

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- src/tModLoader/Terraria.ModLoader.UI/Interface.cs
2+
+++ src/TerraCustom/Terraria.ModLoader.UI/Interface.cs
3+
@@ -378,7 +_,7 @@
4+
internal static void MessageBoxShow(string text, string caption = null) {
5+
// MessageBox.Show fails on Mac, this method will open a text file to show a message.
6+
caption = caption ?? "Terraria: Error" + $" ({ModLoader.versionedName})";
7+
- string message = $"{text}\n\nA client.log file containing error information has been generated in\n{Path.Combine(Main.SavePath, "Logs")}\n(You will need to share this file if asking for help)";
8+
+ string message = $"{text}\n\nA client.log file containing error information has been generated in\n{Logging.LogDir}\n(You will need to share this file if asking for help)";
9+
#if !MAC
10+
System.Windows.Forms.MessageBox.Show(message, caption);
11+
#else

‎patches/TerraCustom/Terraria.Social/SocialAPI.cs.patch

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--- src/tModLoader/Terraria.Social/SocialAPI.cs
2+
+++ src/TerraCustom/Terraria.Social/SocialAPI.cs
3+
@@ -35,8 +_,8 @@
4+
5+
_mode = mode.Value;
6+
SocialMode mode2 = Mode;
7+
- if (mode2 == SocialMode.Steam)
8+
+ //if (mode2 == SocialMode.Steam)
9+
- LoadSteam();
10+
+ //LoadSteam();
11+
}
12+
13+
public static void Shutdown() {

0 commit comments

Comments
 (0)