From cf75fa2cd1d2cd7328c9098d8e240bb7f39d5241 Mon Sep 17 00:00:00 2001 From: DannyRuss <33048298+RussDev7@users.noreply.github.com> Date: Fri, 11 Aug 2023 14:01:47 -0500 Subject: [PATCH 1/4] Corrected "Party of Doom" header information. --- src/TEdit/Properties/Language.Designer.cs | 6 +++--- src/TEdit/Properties/Language.ar-BH.resx | 6 +++--- src/TEdit/Properties/Language.de-DE.resx | 6 +++--- src/TEdit/Properties/Language.en.resx | 6 +++--- src/TEdit/Properties/Language.pl-PL.resx | 6 +++--- src/TEdit/Properties/Language.pt-BR.resx | 6 +++--- src/TEdit/Properties/Language.resx | 6 +++--- src/TEdit/Properties/Language.ru-RU.resx | 6 +++--- src/TEdit/Properties/Language.zh-CN.resx | 6 +++--- src/TEdit/Terraria/World.FileV2.cs | 6 +++--- src/TEdit/Terraria/World.Properties.cs | 8 ++++---- src/TEdit/ViewModel/WorldViewModel.Editor.cs | 2 ++ 12 files changed, 36 insertions(+), 34 deletions(-) diff --git a/src/TEdit/Properties/Language.Designer.cs b/src/TEdit/Properties/Language.Designer.cs index dd52d4ab..dee308e5 100644 --- a/src/TEdit/Properties/Language.Designer.cs +++ b/src/TEdit/Properties/Language.Designer.cs @@ -2159,11 +2159,11 @@ public static string tool_wp_adamantite { } /// - /// Looks up a localized string similar to After Party of Doom. + /// Looks up a localized string similar to Party of Doom. /// - public static string tool_wp_afterpartyofdoom { + public static string tool_wp_partyofdoom { get { - return ResourceManager.GetString("tool_wp_afterpartyofdoom", resourceCulture); + return ResourceManager.GetString("tool_wp_partyofdoom", resourceCulture); } } diff --git a/src/TEdit/Properties/Language.ar-BH.resx b/src/TEdit/Properties/Language.ar-BH.resx index 89e5208b..3d11dad7 100644 --- a/src/TEdit/Properties/Language.ar-BH.resx +++ b/src/TEdit/Properties/Language.ar-BH.resx @@ -1248,8 +1248,8 @@ لا الفخاخ - - بعد حفلة الموت + + حزب الموت فانوس ليلة التبريد @@ -1350,4 +1350,4 @@ الكمية السائلة: - \ No newline at end of file + diff --git a/src/TEdit/Properties/Language.de-DE.resx b/src/TEdit/Properties/Language.de-DE.resx index 39279839..a4784865 100644 --- a/src/TEdit/Properties/Language.de-DE.resx +++ b/src/TEdit/Properties/Language.de-DE.resx @@ -1248,8 +1248,8 @@ Klicke auf „Wiederholen“, um einen neuen Ordner auszuwählen, oder auf „Ab Keine Fallen - - Nach Party of Doom + + Party of Doom Laternennacht Cooldown @@ -1350,4 +1350,4 @@ Klicke auf „Wiederholen“, um einen neuen Ordner auszuwählen, oder auf „Ab Flüssigkeitsmenge: - \ No newline at end of file + diff --git a/src/TEdit/Properties/Language.en.resx b/src/TEdit/Properties/Language.en.resx index 4abfc4d8..66407516 100644 --- a/src/TEdit/Properties/Language.en.resx +++ b/src/TEdit/Properties/Language.en.resx @@ -1248,8 +1248,8 @@ Press retry to pick a new folder or cancel to use {0} as your terraria path. No Traps - - After Party of Doom + + Party of Doom Lantern Night Cooldown @@ -1350,4 +1350,4 @@ Press retry to pick a new folder or cancel to use {0} as your terraria path. Liquid Amount: - \ No newline at end of file + diff --git a/src/TEdit/Properties/Language.pl-PL.resx b/src/TEdit/Properties/Language.pl-PL.resx index 9b14a664..ceb3d940 100644 --- a/src/TEdit/Properties/Language.pl-PL.resx +++ b/src/TEdit/Properties/Language.pl-PL.resx @@ -1248,8 +1248,8 @@ Naciśnij spróbuj ponownie aby wybrać nowy folder lub anuluj aby użyć {0} ja Bez pułapek - - After Party of Doom + + Party of Doom Nocny czas odnowienia latarni @@ -1350,4 +1350,4 @@ Naciśnij spróbuj ponownie aby wybrać nowy folder lub anuluj aby użyć {0} ja Płynna ilość: - \ No newline at end of file + diff --git a/src/TEdit/Properties/Language.pt-BR.resx b/src/TEdit/Properties/Language.pt-BR.resx index 1406b4c2..eb7a8890 100644 --- a/src/TEdit/Properties/Language.pt-BR.resx +++ b/src/TEdit/Properties/Language.pt-BR.resx @@ -1248,8 +1248,8 @@ Clique em tentar novamente para escolher uma nova pasta ou cancelar para usar {0 Sem armadilhas - - Depois do Partido da Perdição + + Partido da Perdição Resfriamento noturno da lanterna @@ -1350,4 +1350,4 @@ Clique em tentar novamente para escolher uma nova pasta ou cancelar para usar {0 Quantidade Líquida: - \ No newline at end of file + diff --git a/src/TEdit/Properties/Language.resx b/src/TEdit/Properties/Language.resx index 24f2a546..4b1daeec 100644 --- a/src/TEdit/Properties/Language.resx +++ b/src/TEdit/Properties/Language.resx @@ -1251,8 +1251,8 @@ Press retry to pick a new folder or cancel to use {0} as your terraria path. No Traps - - After Party of Doom + + Party of Doom Lantern Night Cooldown @@ -1353,4 +1353,4 @@ Press retry to pick a new folder or cancel to use {0} as your terraria path. Liquid Amount: - \ No newline at end of file + diff --git a/src/TEdit/Properties/Language.ru-RU.resx b/src/TEdit/Properties/Language.ru-RU.resx index 3dc3ecde..e345aa9e 100644 --- a/src/TEdit/Properties/Language.ru-RU.resx +++ b/src/TEdit/Properties/Language.ru-RU.resx @@ -1248,8 +1248,8 @@ Без ловушек - - После Вечеринки Судьбы + + Вечеринка Судьбы Фонарь Ночное охлаждение @@ -1350,4 +1350,4 @@ Количество жидкости: - \ No newline at end of file + diff --git a/src/TEdit/Properties/Language.zh-CN.resx b/src/TEdit/Properties/Language.zh-CN.resx index 2df9a511..071cf723 100644 --- a/src/TEdit/Properties/Language.zh-CN.resx +++ b/src/TEdit/Properties/Language.zh-CN.resx @@ -1248,8 +1248,8 @@ 无陷阱 - - 末日派对之后 + + 末日派对 灯笼之夜冷却时间 @@ -1350,4 +1350,4 @@ 液体量： - \ No newline at end of file + diff --git a/src/TEdit/Terraria/World.FileV2.cs b/src/TEdit/Terraria/World.FileV2.cs index a23ea07e..469f2550 100644 --- a/src/TEdit/Terraria/World.FileV2.cs +++ b/src/TEdit/Terraria/World.FileV2.cs @@ -1024,8 +1024,8 @@ public static int SaveHeaderFlags(World world, BinaryWriter bw, int version, Tex if (world.Version >= 257) { - bw.Write(world.AfterPartyOfDoom); - debugger?.WriteLine("\"AfterPartyOfDoom\": {0},", world.AfterPartyOfDoom); + bw.Write(world.PartyOfDoom); + debugger?.WriteLine("\"PartyOfDoom\": {0},", world.PartyOfDoom); } bw.Write(world.InvasionDelay); @@ -2204,7 +2204,7 @@ public static void LoadHeaderFlags(BinaryReader r, World w, int expectedPosition w.ShadowOrbCount = (int)r.ReadByte(); w.AltarCount = r.ReadInt32(); w.HardMode = r.ReadBoolean(); - if (w.Version >= 257) { w.AfterPartyOfDoom = r.ReadBoolean(); } + if (w.Version >= 257) { w.PartyOfDoom = r.ReadBoolean(); } w.InvasionDelay = r.ReadInt32(); w.InvasionSize = r.ReadInt32(); w.InvasionType = r.ReadInt32(); diff --git a/src/TEdit/Terraria/World.Properties.cs b/src/TEdit/Terraria/World.Properties.cs index 5a9f086a..4663216d 100644 --- a/src/TEdit/Terraria/World.Properties.cs +++ b/src/TEdit/Terraria/World.Properties.cs @@ -1609,12 +1609,12 @@ private static NpcName GetNewNpc(int id) private byte _MoondialCooldown = 0; - private bool _AfterPartyOfDoom = false; + private bool _PartyOfDoom = false; - public bool AfterPartyOfDoom + public bool PartyOfDoom { - get { return _AfterPartyOfDoom; } - set { Set(nameof(AfterPartyOfDoom), ref _AfterPartyOfDoom, value); } + get { return _PartyOfDoom; } + set { Set(nameof(PartyOfDoom), ref _PartyOfDoom, value); } } public byte MoondialCooldown { diff --git a/src/TEdit/ViewModel/WorldViewModel.Editor.cs b/src/TEdit/ViewModel/WorldViewModel.Editor.cs index c339ec4d..e089c144 100644 --- a/src/TEdit/ViewModel/WorldViewModel.Editor.cs +++ b/src/TEdit/ViewModel/WorldViewModel.Editor.cs @@ -107,6 +107,8 @@ public void CropWorld() memStream.Flush(); var reader = new BinaryReader(memStream); w.Version = CurrentWorld.Version; + + // Check World.LoadV2(reader, w); } From 676974e61e639d0b494f0e4a437de7bdd874c7c0 Mon Sep 17 00:00:00 2001 From: DannyRuss <33048298+RussDev7@users.noreply.github.com> Date: Fri, 11 Aug 2023 14:04:28 -0500 Subject: [PATCH 2/4] Corrected "Party of Doom" header information. --- src/TEdit/View/Sidebar/WorldPropertiesView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TEdit/View/Sidebar/WorldPropertiesView.xaml b/src/TEdit/View/Sidebar/WorldPropertiesView.xaml index a4a1ab11..8be7a4ff 100644 --- a/src/TEdit/View/Sidebar/WorldPropertiesView.xaml +++ b/src/TEdit/View/Sidebar/WorldPropertiesView.xaml @@ -514,7 +514,7 @@ - + From b82c44f945f6274dce4a3e64da0db49d55515519 Mon Sep 17 00:00:00 2001 From: DannyRuss <33048298+RussDev7@users.noreply.github.com> Date: Fri, 11 Aug 2023 14:25:38 -0500 Subject: [PATCH 3/4] Corrected "Party of Doom" header information. From b93db54119cb573ddd34668b59e5bdb1ff9144a4 Mon Sep 17 00:00:00 2001 From: DannyRuss <33048298+RussDev7@users.noreply.github.com> Date: Fri, 11 Aug 2023 14:26:46 -0500 Subject: [PATCH 4/4] Moved the "Part of Doom" checkbox. --- src/TEdit/View/Sidebar/WorldPropertiesView.xaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/TEdit/View/Sidebar/WorldPropertiesView.xaml b/src/TEdit/View/Sidebar/WorldPropertiesView.xaml index 8be7a4ff..a2684735 100644 --- a/src/TEdit/View/Sidebar/WorldPropertiesView.xaml +++ b/src/TEdit/View/Sidebar/WorldPropertiesView.xaml @@ -417,6 +417,9 @@ + + + @@ -513,9 +516,7 @@ - - - +