Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Corrected "Party of Doom" header information. #1875

Closed
wants to merge 4 commits into from
Closed

Corrected "Party of Doom" header information. #1875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf75fa2
Corrected "Party of Doom" header information.
RussDev7 Aug 11, 2023
676974e
Corrected "Party of Doom" header information.
RussDev7 Aug 11, 2023
b82c44f
Corrected "Party of Doom" header information.
RussDev7 Aug 11, 2023
b93db54
Moved the "Part of Doom" checkbox.
RussDev7 Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/TEdit/Properties/Language.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/TEdit/Properties/Language.ar-BH.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,8 +1248,8 @@
<data name="tool_wp_seed_notraps" xml:space="preserve">
<value>لا الفخاخ</value>
</data>
<data name="tool_wp_afterpartyofdoom" xml:space="preserve">
<value>بعد حفلة الموت</value>
<data name="tool_wp_partyofdoom" xml:space="preserve">
<value>حزب الموت</value>
</data>
<data name="tool_wp_lanternnight_cooldown" xml:space="preserve">
<value>فانوس ليلة التبريد</value>
Expand Down Expand Up @@ -1350,4 +1350,4 @@
<data name="liquid_amount" xml:space="preserve">
<value>الكمية السائلة:</value>
</data>
</root>
</root>
6 changes: 3 additions & 3 deletions src/TEdit/Properties/Language.de-DE.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,8 +1248,8 @@ Klicke auf „Wiederholen“, um einen neuen Ordner auszuwählen, oder auf „Ab
<data name="tool_wp_seed_notraps" xml:space="preserve">
<value>Keine Fallen</value>
</data>
<data name="tool_wp_afterpartyofdoom" xml:space="preserve">
<value>Nach Party of Doom</value>
<data name="tool_wp_partyofdoom" xml:space="preserve">
<value>Party of Doom</value>
</data>
<data name="tool_wp_lanternnight_cooldown" xml:space="preserve">
<value>Laternennacht Cooldown</value>
Expand Down Expand Up @@ -1350,4 +1350,4 @@ Klicke auf „Wiederholen“, um einen neuen Ordner auszuwählen, oder auf „Ab
<data name="liquid_amount" xml:space="preserve">
<value>Flüssigkeitsmenge:</value>
</data>
</root>
</root>
6 changes: 3 additions & 3 deletions src/TEdit/Properties/Language.en.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,8 +1248,8 @@ Press retry to pick a new folder or cancel to use {0} as your terraria path.</va
<data name="tool_wp_seed_notraps" xml:space="preserve">
<value>No Traps</value>
</data>
<data name="tool_wp_afterpartyofdoom" xml:space="preserve">
<value>After Party of Doom</value>
<data name="tool_wp_partyofdoom" xml:space="preserve">
<value>Party of Doom</value>
</data>
<data name="tool_wp_lanternnight_cooldown" xml:space="preserve">
<value>Lantern Night Cooldown</value>
Expand Down Expand Up @@ -1350,4 +1350,4 @@ Press retry to pick a new folder or cancel to use {0} as your terraria path.</va
<data name="liquid_amount" xml:space="preserve">
<value>Liquid Amount:</value>
</data>
</root>
</root>
6 changes: 3 additions & 3 deletions src/TEdit/Properties/Language.pl-PL.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,8 +1248,8 @@ Naciśnij spróbuj ponownie aby wybrać nowy folder lub anuluj aby użyć {0} ja
<data name="tool_wp_seed_notraps" xml:space="preserve">
<value>Bez pułapek</value>
</data>
<data name="tool_wp_afterpartyofdoom" xml:space="preserve">
<value>After Party of Doom</value>
<data name="tool_wp_partyofdoom" xml:space="preserve">
<value>Party of Doom</value>
</data>
<data name="tool_wp_lanternnight_cooldown" xml:space="preserve">
<value>Nocny czas odnowienia latarni</value>
Expand Down Expand Up @@ -1350,4 +1350,4 @@ Naciśnij spróbuj ponownie aby wybrać nowy folder lub anuluj aby użyć {0} ja
<data name="liquid_amount" xml:space="preserve">
<value>Płynna ilość:</value>
</data>
</root>
</root>
6 changes: 3 additions & 3 deletions src/TEdit/Properties/Language.pt-BR.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,8 +1248,8 @@ Clique em tentar novamente para escolher uma nova pasta ou cancelar para usar {0
<data name="tool_wp_seed_notraps" xml:space="preserve">
<value>Sem armadilhas</value>
</data>
<data name="tool_wp_afterpartyofdoom" xml:space="preserve">
<value>Depois do Partido da Perdição</value>
<data name="tool_wp_partyofdoom" xml:space="preserve">
<value>Partido da Perdição</value>
</data>
<data name="tool_wp_lanternnight_cooldown" xml:space="preserve">
<value>Resfriamento noturno da lanterna</value>
Expand Down Expand Up @@ -1350,4 +1350,4 @@ Clique em tentar novamente para escolher uma nova pasta ou cancelar para usar {0
<data name="liquid_amount" xml:space="preserve">
<value>Quantidade Líquida:</value>
</data>
</root>
</root>
6 changes: 3 additions & 3 deletions src/TEdit/Properties/Language.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,8 +1251,8 @@ Press retry to pick a new folder or cancel to use {0} as your terraria path.</va
<data name="tool_wp_seed_notraps" xml:space="preserve">
<value>No Traps</value>
</data>
<data name="tool_wp_afterpartyofdoom" xml:space="preserve">
<value>After Party of Doom</value>
<data name="tool_wp_partyofdoom" xml:space="preserve">
<value>Party of Doom</value>
</data>
<data name="tool_wp_lanternnight_cooldown" xml:space="preserve">
<value>Lantern Night Cooldown</value>
Expand Down Expand Up @@ -1353,4 +1353,4 @@ Press retry to pick a new folder or cancel to use {0} as your terraria path.</va
<data name="liquid_amount" xml:space="preserve">
<value>Liquid Amount:</value>
</data>
</root>
</root>
6 changes: 3 additions & 3 deletions src/TEdit/Properties/Language.ru-RU.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,8 +1248,8 @@
<data name="tool_wp_seed_notraps" xml:space="preserve">
<value>Без ловушек</value>
</data>
<data name="tool_wp_afterpartyofdoom" xml:space="preserve">
<value>После Вечеринки Судьбы</value>
<data name="tool_wp_partyofdoom" xml:space="preserve">
<value>Вечеринка Судьбы</value>
</data>
<data name="tool_wp_lanternnight_cooldown" xml:space="preserve">
<value>Фонарь Ночное охлаждение</value>
Expand Down Expand Up @@ -1350,4 +1350,4 @@
<data name="liquid_amount" xml:space="preserve">
<value>Количество жидкости:</value>
</data>
</root>
</root>
6 changes: 3 additions & 3 deletions src/TEdit/Properties/Language.zh-CN.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,8 +1248,8 @@
<data name="tool_wp_seed_notraps" xml:space="preserve">
<value>无陷阱</value>
</data>
<data name="tool_wp_afterpartyofdoom" xml:space="preserve">
<value>末日派对之后</value>
<data name="tool_wp_partyofdoom" xml:space="preserve">
<value>末日派对</value>
</data>
<data name="tool_wp_lanternnight_cooldown" xml:space="preserve">
<value>灯笼之夜冷却时间</value>
Expand Down Expand Up @@ -1350,4 +1350,4 @@
<data name="liquid_amount" xml:space="preserve">
<value>液体量：</value>
</data>
</root>
</root>
6 changes: 3 additions & 3 deletions src/TEdit/Terraria/World.FileV2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,8 +1024,8 @@

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);
Expand Down Expand Up @@ -1651,7 +1651,7 @@

bool hasHeader2 = false;
bool hasHeader3 = false;
bool hasHeader4 = false;

Check warning on line 1654 in src/TEdit/Terraria/World.FileV2.cs

View workflow job for this annotation

GitHub Actions / build (Debug) 

The variable 'hasHeader4' is assigned but its value is never used

Check warning on line 1654 in src/TEdit/Terraria/World.FileV2.cs

View workflow job for this annotation

GitHub Actions / build (Debug) 

The variable 'hasHeader4' is assigned but its value is never used

Check warning on line 1654 in src/TEdit/Terraria/World.FileV2.cs

View workflow job for this annotation

GitHub Actions / build (Release) 

The variable 'hasHeader4' is assigned but its value is never used

Check warning on line 1654 in src/TEdit/Terraria/World.FileV2.cs

View workflow job for this annotation

GitHub Actions / build (Release) 

The variable 'hasHeader4' is assigned but its value is never used

// check bit[0] to see if header2 has data
if ((header1 & 0b_0000_0001) == 0b_0000_0001)
Expand Down Expand Up @@ -2204,7 +2204,7 @@
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();
Expand Down
8 changes: 4 additions & 4 deletions src/TEdit/Terraria/World.Properties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
7 changes: 4 additions & 3 deletions src/TEdit/View/Sidebar/WorldPropertiesView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,9 @@
<CheckBox IsChecked="{Binding CurrentWorld.CombatBookVolumeTwoWasUsed}" Content="{x:Static p:Language.tool_wp_combatbooktwo}" VerticalAlignment="Center" VerticalContentAlignment="Center" />
<TextBlock />
<CheckBox IsChecked="{Binding CurrentWorld.PeddlersSatchelWasUsed}" Content="{x:Static p:Language.tool_wp_peddlerssatchel}" VerticalAlignment="Center" VerticalContentAlignment="Center" />
<TextBlock Text="{x:Static p:Language.tool_wp_partyofdoom}" HorizontalAlignment="Right" />
<CheckBox IsChecked="{Binding CurrentWorld.PartyOfDoom}" Content="{x:Static p:Language.tool_wp_partyofdoom}" VerticalAlignment="Center" VerticalContentAlignment="Center" />

<Separator Grid.ColumnSpan="2" />
<TextBlock Text="{x:Static p:Language.tool_wp_seed}" HorizontalAlignment="Right" />
<CheckBox IsChecked="{Binding CurrentWorld.DrunkWorld}" Content="{x:Static p:Language.tool_wp_drunk}" VerticalAlignment="Center" VerticalContentAlignment="Center" />
Expand Down Expand Up @@ -513,9 +516,7 @@
<CheckBox IsChecked="{Binding CurrentWorld.DownedCelestialVortex}" Content="{x:Static p:Language.tool_wp_boss_vortexpillar}" VerticalAlignment="Center" VerticalContentAlignment="Center" />
<TextBlock />
<CheckBox IsChecked="{Binding CurrentWorld.DownedCelestialStardust}" Content="{x:Static p:Language.tool_wp_boss_stardustpillar}" VerticalAlignment="Center" VerticalContentAlignment="Center" />
<TextBlock />
<CheckBox IsChecked="{Binding CurrentWorld.AfterPartyOfDoom}" Content="{x:Static p:Language.tool_wp_afterpartyofdoom}" VerticalAlignment="Center" VerticalContentAlignment="Center" />


<Separator Grid.ColumnSpan="2" />
<TextBlock Text="{x:Static p:Language.tool_wp_lanternnight}" HorizontalAlignment="Right"/>
<CheckBox IsChecked="{Binding CurrentWorld.LanternNightCooldown}" Content="{x:Static p:Language.tool_wp_lanternnight_cooldown}" VerticalAlignment="Center" VerticalContentAlignment="Center" />
Expand Down
2 changes: 2 additions & 0 deletions src/TEdit/ViewModel/WorldViewModel.Editor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ public void CropWorld()
memStream.Flush();
var reader = new BinaryReader(memStream);
w.Version = CurrentWorld.Version;

// Check
World.LoadV2(reader, w);
}

Expand Down
Loading