Skip to content

Commit

Permalink
Version 4.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@gameboy9
gameboy9 committed Dec 5, 2023
1 parent 7e62781 commit 8f712d3
Show file tree
Hide file tree
Showing 15 changed files with 58 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Data/Message/system_de.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ MSG_ITEM_NAME_58 <IC_BAG>Cockatrice
MSG_ITEM_NAME_59 <IC_BAG>Seelenschinder
MSG_ITEM_NAME_60 <IC_BAG>Gizarkraut
MSG_ITEM_NAME_61 <IC_BAG>Gizarpfeife
MSG_ITEM_NAME_62 <IC_DRAG>Megalixer
MSG_ITEM_NAME_62 <IC_DRAG>Megalixir
MSG_KEY_NAME_01 <IC_BAG>Mitgliedsausweis
MSG_KEY_NAME_02 <IC_IOBJ>Bombenring
MSG_KEY_NAME_03 <IC_IOBJ>Baronschlüssel
Expand Down
2 changes: 1 addition & 1 deletion Data/Message/system_en.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ MSG_ITEM_NAME_58 <IC_BAG>Cockatrice
MSG_ITEM_NAME_59 <IC_BAG>Mind Flayer
MSG_ITEM_NAME_60 <IC_BAG>Gysahl Greens
MSG_ITEM_NAME_61 <IC_BAG>Gysahl Whistle
MSG_ITEM_NAME_62 <IC_DRAG>Megalixer
MSG_ITEM_NAME_62 <IC_DRAG>Megalixir
MSG_KEY_NAME_01 <IC_BAG>Membership Pass
MSG_KEY_NAME_02 <IC_IOBJ>Bomb Ring
MSG_KEY_NAME_03 <IC_IOBJ>Baron Key
Expand Down
2 changes: 1 addition & 1 deletion Data/Message/system_es.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ MSG_ITEM_NAME_58 <IC_BAG>Tomo de cocatriz
MSG_ITEM_NAME_59 <IC_BAG>Tomo de rompementes
MSG_ITEM_NAME_60 <IC_BAG>Verdura gysahl
MSG_ITEM_NAME_61 <IC_BAG>Silbato de Gysahl
MSG_ITEM_NAME_62 <IC_DRAG>Megalixer
MSG_ITEM_NAME_62 <IC_DRAG>Megalixir
MSG_KEY_NAME_01 <IC_BAG>Carné de socio
MSG_KEY_NAME_02 <IC_IOBJ>Anillo de bom
MSG_KEY_NAME_03 <IC_IOBJ>Llave de Baronia
Expand Down
2 changes: 1 addition & 1 deletion Data/Message/system_fr.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ MSG_ITEM_NAME_58 <IC_BAG>Coquatrice
MSG_ITEM_NAME_59 <IC_BAG>Psychopolype
MSG_ITEM_NAME_60 <IC_BAG>Légume Gysahl
MSG_ITEM_NAME_61 <IC_BAG>Flûte Gysahl
MSG_ITEM_NAME_62 <IC_DRAG>Megalixer
MSG_ITEM_NAME_62 <IC_DRAG>Megalixir
MSG_KEY_NAME_01 <IC_BAG>Carte de membre
MSG_KEY_NAME_02 <IC_IOBJ>Anneau de bombo
MSG_KEY_NAME_03 <IC_IOBJ>Clef de Baron
Expand Down
2 changes: 1 addition & 1 deletion Data/Message/system_it.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ MSG_ITEM_NAME_58 <IC_BAG>Coccatrice
MSG_ITEM_NAME_59 <IC_BAG>Noetikos
MSG_ITEM_NAME_60 <IC_BAG>Erba ghisal
MSG_ITEM_NAME_61 <IC_BAG>Flauto ghisal
MSG_ITEM_NAME_62 <IC_DRAG>Megalixer
MSG_ITEM_NAME_62 <IC_DRAG>Megalixir
MSG_KEY_NAME_01 <IC_BAG>Tessera d'associazione
MSG_KEY_NAME_02 <IC_IOBJ>Anello piros
MSG_KEY_NAME_03 <IC_IOBJ>Chiave di Baron
Expand Down
2 changes: 1 addition & 1 deletion Data/Message/system_ja.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ MSG_ITEM_NAME_58 <IC_BAG>コカトリス
MSG_ITEM_NAME_59 <IC_BAG>マインドフレア
MSG_ITEM_NAME_60 <IC_BAG>ギサールの野菜
MSG_ITEM_NAME_61 <IC_BAG>ギサールの笛
MSG_ITEM_NAME_62 <IC_DRAG>Megalixer
MSG_ITEM_NAME_62 <IC_DRAG>Megalixir
MSG_KEY_NAME_01 <IC_BAG>会員証
MSG_KEY_NAME_02 <IC_IOBJ>ボムの指輪
MSG_KEY_NAME_03 <IC_IOBJ>バロンのカギ
Expand Down
2 changes: 1 addition & 1 deletion Data/Message/system_ko.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ MSG_ITEM_NAME_58 <IC_BAG>코카트리스
MSG_ITEM_NAME_59 <IC_BAG>마인드 플레이어
MSG_ITEM_NAME_60 <IC_BAG>기살의 야채
MSG_ITEM_NAME_61 <IC_BAG>기살의 피리
MSG_ITEM_NAME_62 <IC_DRAG>Megalixer
MSG_ITEM_NAME_62 <IC_DRAG>Megalixir
MSG_KEY_NAME_01 <IC_BAG>회원증
MSG_KEY_NAME_02 <IC_IOBJ>봄의 반지
MSG_KEY_NAME_03 <IC_IOBJ>바론의 열쇠
Expand Down
2 changes: 1 addition & 1 deletion Data/Message/system_pt.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ MSG_ITEM_NAME_58 <IC_BAG>Cocatriz
MSG_ITEM_NAME_59 <IC_BAG>Devorador de Mentes
MSG_ITEM_NAME_60 <IC_BAG>Verduras de Gysahl
MSG_ITEM_NAME_61 <IC_BAG>Apito de Gysahl
MSG_ITEM_NAME_62 <IC_DRAG>Megalixer
MSG_ITEM_NAME_62 <IC_DRAG>Megalixir
MSG_KEY_NAME_01 <IC_BAG>Carteirinha de Sócio
MSG_KEY_NAME_02 <IC_IOBJ>Anel-bomba
MSG_KEY_NAME_03 <IC_IOBJ>Chave de Baron
Expand Down
2 changes: 1 addition & 1 deletion Data/Message/system_ru.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ MSG_ITEM_NAME_58 <IC_BAG>Кокатрис
MSG_ITEM_NAME_59 <IC_BAG>Мозгодер
MSG_ITEM_NAME_60 <IC_BAG>Гисальская зелень
MSG_ITEM_NAME_61 <IC_BAG>Гисальский свисток
MSG_ITEM_NAME_62 <IC_DRAG>Megalixer
MSG_ITEM_NAME_62 <IC_DRAG>Megalixir
MSG_KEY_NAME_01 <IC_BAG>Членская грамота
MSG_KEY_NAME_02 <IC_IOBJ>Взрывное кольцо
MSG_KEY_NAME_03 <IC_IOBJ>Ключ от замка Барон
Expand Down
2 changes: 1 addition & 1 deletion Data/Message/system_th.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ MSG_ITEM_NAME_58 <IC_BAG>คอกกะทริซ
MSG_ITEM_NAME_59 <IC_BAG>มายด์เฟลเยอร์
MSG_ITEM_NAME_60 <IC_BAG>ผักกีซาล
MSG_ITEM_NAME_61 <IC_BAG>นกหวีดกีซาล
MSG_ITEM_NAME_62 <IC_DRAG>Megalixer
MSG_ITEM_NAME_62 <IC_DRAG>Megalixir
MSG_KEY_NAME_01 <IC_BAG>บัตรสมาชิก
MSG_KEY_NAME_02 <IC_IOBJ>แหวนระเบิด
MSG_KEY_NAME_03 <IC_IOBJ>กุญแจบารอน
Expand Down
2 changes: 1 addition & 1 deletion Data/Message/system_zhc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ MSG_ITEM_NAME_58 <IC_BAG>蛇鸡兽
MSG_ITEM_NAME_59 <IC_BAG>夺心魔
MSG_ITEM_NAME_60 <IC_BAG>基萨尔野菜
MSG_ITEM_NAME_61 <IC_BAG>基萨尔之笛
MSG_ITEM_NAME_62 <IC_DRAG>Megalixer
MSG_ITEM_NAME_62 <IC_DRAG>Megalixir
MSG_KEY_NAME_01 <IC_BAG>会员证
MSG_KEY_NAME_02 <IC_IOBJ>爆弹戒指
MSG_KEY_NAME_03 <IC_IOBJ>巴隆的钥匙
Expand Down
2 changes: 1 addition & 1 deletion Data/Message/system_zht.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ MSG_ITEM_NAME_58 <IC_BAG>蛇雞獸
MSG_ITEM_NAME_59 <IC_BAG>精神吸取者
MSG_ITEM_NAME_60 <IC_BAG>基薩爾野菜
MSG_ITEM_NAME_61 <IC_BAG>基薩爾之笛
MSG_ITEM_NAME_62 <IC_DRAG>Megalixer
MSG_ITEM_NAME_62 <IC_DRAG>Megalixir
MSG_KEY_NAME_01 <IC_BAG>會員證
MSG_KEY_NAME_02 <IC_IOBJ>炸彈戒指
MSG_KEY_NAME_03 <IC_IOBJ>巴隆的鑰匙
Expand Down
31 changes: 29 additions & 2 deletions Form1.Designer.cs
View file

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

17 changes: 14 additions & 3 deletions Form1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public partial class FF4FalconDive : Form
Random r1;
const int flagLength = 12;
TextBox[,] heroNames = new TextBox[12, 5];
string checkSum;

public FF4FalconDive()
{
Expand Down Expand Up @@ -305,7 +306,6 @@ private void Randomize_Click(object sender, EventArgs e)
encounterRate.SelectedIndex == 1 || encounterRate.SelectedIndex == 3 ? 3 : 1,
encounterRate.SelectedIndex == 7);

string checkSum = "";
using (SHA1 sha1Crypto = SHA1.Create())
{
using (FileStream stream = File.OpenRead(Path.Combine(dataMainDirectory, "monster_party.csv")))
Expand All @@ -314,9 +314,9 @@ private void Randomize_Click(object sender, EventArgs e)
}
}

Clipboard.SetText(checkSum);
Clipboard.SetText("FF4FD_" + RandoFlags.Text + "_" + RandoSeed.Text + "_" + checkSum);
Messages.updateMessages(Path.Combine(dataDirectory, "Message"), RandoSeed.Text, RandoFlags.Text, checkSum, shardsBeforeSirens.SelectedIndex != 5, party, heroNames, r1);
NewChecksum.Text = "COMPLETE - checksum " + checkSum + " (copied to clipboard)";
NewChecksum.Text = "COMPLETE - checksum " + checkSum + " - copied to clipboard with seed and flags";
}
catch (Exception ex)
{
Expand Down Expand Up @@ -494,5 +494,16 @@ private void flagDefault_Click(object sender, EventArgs e)

determineChecks(null, null);
}

private void FDItemLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
System.Diagnostics.Process.Start("https://docs.google.com/spreadsheets/d/1lULu47K_qzDfWUxVXHlzmDaYO1RL7CbF3A2cvBa1OXk/edit#gid=843831314");
}

private void copyRaceBot_Click(object sender, EventArgs e)
{
Clipboard.SetText("!setmetadata seed " + RandoSeed.Text + " flags " + RandoFlags.Text + " checksum " + checkSum);
NewChecksum.Text = "COMPLETE - checksum " + checkSum + " - copied as !setmetadata command";
}
}
}
6 changes: 3 additions & 3 deletions Inventory/Items.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private class singleItem
public const int decoy = 56; // t3
public const int lightCurtain = 57; // t6
public const int lunarCurtain = 58; // t8
public const int megalixer = 869; // t8
public const int megalixir = 869; // t8

public List<List<int>> tiers = new List<List<int>>
{ new List<int> { potion, phoenixDown, maidensKiss, mallet, dietFood, echoHerbs, eyeDrops, antidote,
Expand All @@ -102,15 +102,15 @@ private class singleItem
new List<int> { xPotion, dryEther, cottage, coeurlWhisker, lightCurtain, hourglass, gaiaDrum },
new List<int> { xPotion, silverApple, somaDrop, silverHourglass },
new List<int> { elixer, goldenApple, goldenHourglass, lunarCurtain },
new List<int> { megalixer, elixer, goldenApple, goldenHourglass, lunarCurtain }
new List<int> { megalixir, elixer, goldenApple, goldenHourglass, lunarCurtain }
};

List<int> jItems = new List<int>
{
maidensKiss, mallet, dietFood, echoHerbs, eyeDrops, antidote, bombFragment, antarcticWind, zeusWrath, bestiary, bellOfSilence,
cross, alarmClock, bombCore, lilithKiss, spiderSilk, decoy, bombArm, arcticWind, rageOfTheGods, gaiaDrum, stardust,
vampireFang, bacchusCider, hermesShoes, unicornHorn, redFang, whiteFang, blueFang, hourglass, coeurlWhisker, lightCurtain,
silverApple, somaDrop, silverHourglass, goldenApple, goldenHourglass, lunarCurtain, emergencyExit, megalixer
silverApple, somaDrop, silverHourglass, goldenApple, goldenHourglass, lunarCurtain, emergencyExit, megalixir
};

public void adjustPrices(string directory, int multiplier, int divisor)
Expand Down

0 comments on commit 8f712d3

Please sign in to comment.