Skip to content

Commit

Permalink
2.0 Test 3 (1.4.0.195)
Browse files Browse the repository at this point in the history 
fix #1
fix #3
Изменения:
— Extended не падает от отсутствия директории Tropegen
— Социальные характеристики
— Кнопки перегенерации и их блокировка
  • Loading branch information
@AIexandrKotov
AIexandrKotov committed Jun 22, 2021
1 parent 8563b70 commit 1dfccd3
Show file tree
Hide file tree
Showing 13 changed files with 732 additions and 331 deletions.
4 changes: 2 additions & 2 deletions Tropegen/ChangeFiveChanges.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ namespace Tropegen
public partial class ChangeFiveChanges : Form
{
Archetypes.Changes[] Current;
Extended Reference;
CharacterEditor Reference;
TextBox TBRef;

public event Action OnUpdate;

public ChangeFiveChanges(Extended reference, TextBox tbref, string title, Archetypes.Changes[] changes)
public ChangeFiveChanges(CharacterEditor reference, TextBox tbref, string title, Archetypes.Changes[] changes)
{
InitializeComponent();
Reference = reference;
Expand Down
207 changes: 162 additions & 45 deletions Tropegen/Extended.Designer.cs → Tropegen/CharacterEditor.Designer.cs
View file

Large diffs are not rendered by default.

121 changes: 106 additions & 15 deletions Tropegen/Extended.cs → Tropegen/CharacterEditor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

namespace Tropegen
{
public partial class Extended : Form
public partial class CharacterEditor : Form
{
public static string GetPath() => Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\Tropegen\\";

Expand Down Expand Up @@ -71,20 +71,21 @@ private void SaveButton_Click(object sender, EventArgs e)
CurrentCharacter.Generated = false;
CurrentSavedCharacters.Add(CurrentCharacter);
UpdateSavedListBox();
SavedListBox.SelectedIndex = SavedListBox.Items.Count - 1;
}
}

private void Extended_Load(object sender, EventArgs e)
{
}

public Extended()
public CharacterEditor()
{
InitializeComponent();

FormClosed += (o, e) =>
{
SavedFiles.ForEach(x => { if (x.Edited) x.Save(); });
CharacterFile.SaveAll(SavedFiles);
File.WriteAllText(GetPath() + "last.dat", CurrentFile);
};

Expand All @@ -111,8 +112,8 @@ public Extended()
ResponsibilityComboBox.Items.AddRange(CachedEnum<Archetypes.Responsibility>.Enums.Select(x => Lang.Get(x.Lang())).ToArray());
LoyaltyComboBox.Items.AddRange(CachedEnum<Archetypes.Loyalty>.Enums.Select(x => Lang.Get(x.Lang())).ToArray());
AdaptibilityComboBox.Items.AddRange(CachedEnum<Archetypes.Adaptability>.Enums.Select(x => Lang.Get(x.Lang())).ToArray());
TrustinpeopleComboBox.Items.AddRange(CachedEnum<Archetypes.TrustInPeople>.Enums.Select(x => Lang.Get(x.Lang())).ToArray());
HumorComboBox.Items.AddRange(CachedEnum<Archetypes.Humor>.Enums.Select(x => Lang.Get(x.Lang())).ToArray());
TrustinpeopleComboBox.Items.AddRange(CachedEnum<Archetypes.FaithInPeople>.Enums.Select(x => Lang.Get(x.Lang())).ToArray());
HumorComboBox.Items.AddRange(CachedEnum<Archetypes.Humour>.Enums.Select(x => Lang.Get(x.Lang())).ToArray());

SavedGroup.Text = Lang.Get("Saved");
SearchGroup.Text = Lang.Get("Search");
Expand All @@ -122,17 +123,26 @@ public Extended()
ForcesGroup.Text = Lang.Get("Forces");
SocialGroup.Text = Lang.Get("Social");
TitleGroup.Text = Lang.Get("Title");
LockRandomsButton.Text = Lang.Get("LockRandoms");

SeedLabel.Text = Lang.Get("Seed") + ":";
RandomButton.Text = Lang.Get("Random");
SaveButton.Text = Lang.Get("Save");
NewButton.Text = Lang.Get("New");
FileStripDown.Text = Lang.Get("File");
CharacterListsButton.Text = Lang.Get("CharacterLists");
SaveAllButton.Text = Lang.Get("SaveAll");
SettingsStripDown.Text = Lang.Get("Settings");
Saved_RemoveButton.Text = Lang.Get("Remove");
Saved_DuplicateButton.Text = Lang.Get("Duplicate");

RandomationLawsButton.Text = Lang.Get("RandomationLaws");
CharacterListsButton.Text = Lang.Get("CharacterLists");

RandomPersonality.Text = Lang.Get("RandomPersonality");
RandomAppearance1.Text = Lang.Get("RandomAppHW");
RandomAppearance2.Text = Lang.Get("RandomApp2");
RandomForces.Text = Lang.Get("RandomForces");
RandomSocial.Text = Lang.Get("RandomSocial");

NameLabel.Text = Lang.Get("Name") + ":";
SurnameLabel.Text = Lang.Get("Surname") + ":";
Expand All @@ -153,8 +163,8 @@ public Extended()
ResponsibilityLabel.Text = Lang.Get(CachedEnum<Archetypes.Responsibility>.Type.Lang()) + ":";
LoyaltyLabel.Text = Lang.Get(CachedEnum<Archetypes.Loyalty>.Type.Lang()) + ":";
AdaptibilityLabel.Text = Lang.Get(CachedEnum<Archetypes.Adaptability>.Type.Lang()) + ":";
TrustinpeopleLabel.Text = Lang.Get(CachedEnum<Archetypes.TrustInPeople>.Type.Lang()) + ":";
HumorLabel.Text = Lang.Get(CachedEnum<Archetypes.Humor>.Type.Lang()) + ":";
TrustinpeopleLabel.Text = Lang.Get(CachedEnum<Archetypes.FaithInPeople>.Type.Lang()) + ":";
HumourLabel.Text = Lang.Get(CachedEnum<Archetypes.Humour>.Type.Lang()) + ":";
ForcesPhysical.Text = Lang.Get(CachedEnum<Archetypes.PhysicalPower>.Type.Lang()) + ":";
ForcesMagic.Text = Lang.Get(CachedEnum<Archetypes.MagicPower>.Type.Lang()) + ":";
ForcesWill.Text = Lang.Get(CachedEnum<Archetypes.WillPower>.Type.Lang()) + ":";
Expand Down Expand Up @@ -216,6 +226,24 @@ public Extended()
UpdateCharacterList();
}

public void LockRandoms()
{
RandomPersonality.Enabled = false;
RandomAppearance1.Enabled = false;
RandomAppearance2.Enabled = false;
RandomForces.Enabled = false;
RandomSocial.Enabled = false;
}

public void UnlockRandoms()
{
RandomPersonality.Enabled = true;
RandomAppearance1.Enabled = true;
RandomAppearance2.Enabled = true;
RandomForces.Enabled = true;
RandomSocial.Enabled = true;
}

public void UpdateCharacterList()
{
UpdateSavedListBox();
Expand Down Expand Up @@ -280,7 +308,7 @@ public void FillSocial(Character ch)
LoyaltyComboBox.Text = Lang.Get(ch.Loyalty.Lang());
AdaptibilityComboBox.Text = Lang.Get(ch.Adaptability.Lang());
TrustinpeopleComboBox.Text = Lang.Get(ch.TrustInPeople.Lang());
HumorComboBox.Text = Lang.Get(ch.Humor.Lang());
HumorComboBox.Text = Lang.Get(ch.Humour.Lang());
}

public void FillTitle(Character ch)
Expand Down Expand Up @@ -457,23 +485,26 @@ private void ForcesIntellectButton_Click(object sender, EventArgs e)
cfc.ShowDialog();
}

private void SeedTextBox_Click(object sender, EventArgs e)
private void SeedTextBox_TextChanged(object sender, EventArgs e)
{
if (uint.TryParse(SeedTextBox.Text, out var i))
if (int.TryParse(SeedTextBox.Text, out var i))
{
SeedTextBox.ForeColor = Color.Black;
CurrentCharacter = new CharacterBuilder((int)i).Init();
CurrentCharacter = new CharacterBuilder(i).Init();
UpdateCharacter(CurrentCharacter);
}
else SeedTextBox.ForeColor = Color.Red;
}

private void RandomButton_Click(object sender, EventArgs e)
{
CurrentCharacter = new CharacterBuilder(GlobalSeed.Next()).Init();
var seed = GlobalSeed.Next();
if (Environment.TickCount / 5 % 2 == 0) seed *= -1;
CurrentCharacter = new CharacterBuilder(seed).Init();
AddSeedToBuffer(CurrentCharacter.Seed);
SeedTextBox.Text = CurrentCharacter.Seed.ToString();
UpdateCharacter(CurrentCharacter);
SavedListBox.SelectedIndex = -1;
}

private void NewButton_Click(object sender, EventArgs e)
Expand Down Expand Up @@ -524,6 +555,8 @@ private void ChPredButton_Click(object sender, EventArgs e)
{
BufferId = BufferSeeds.Count - 1;
SeedTextBox.Text = BufferSeeds[BufferId].ToString();
CurrentCharacter = new CharacterBuilder(BufferSeeds[BufferId]).Init();
UpdateCharacter(CurrentCharacter);
}
else
{
Expand All @@ -548,6 +581,7 @@ private void ChPredButton_Click(object sender, EventArgs e)
SeedTextBox.Text = BufferSeeds[BufferId].ToString();
}
if (BufferId == 0) ChPredButton.Enabled = false;
SavedListBox.SelectedIndex = -1;
}

private void ChNextButton_Click(object sender, EventArgs e)
Expand All @@ -559,6 +593,7 @@ private void ChNextButton_Click(object sender, EventArgs e)
if (BufferId > 0) ChPredButton.Enabled = true;
if (BufferId == BufferSeeds.Count - 1) ChNextButton.Enabled = false;
SeedTextBox.Text = BufferSeeds[BufferId].ToString();
SavedListBox.SelectedIndex = -1;
}
}
#endregion
Expand Down Expand Up @@ -749,12 +784,12 @@ private void AdaptibilityComboBox_SelectedIndexChanged(object sender, EventArgs

private void TrustinpeopleComboBox_SelectedIndexChanged(object sender, EventArgs e)
{
CurrentCharacter.TrustInPeople = (Archetypes.TrustInPeople)TrustinpeopleComboBox.SelectedIndex;
CurrentCharacter.TrustInPeople = (Archetypes.FaithInPeople)TrustinpeopleComboBox.SelectedIndex;
}

private void HumorComboBox_SelectedIndexChanged(object sender, EventArgs e)
{
CurrentCharacter.Humor = (Archetypes.Humor)HumorComboBox.SelectedIndex;
CurrentCharacter.Humour = (Archetypes.Humour)HumorComboBox.SelectedIndex;
}

private void NameTextBox_TextChanged(object sender, EventArgs e)
Expand Down Expand Up @@ -788,5 +823,61 @@ private void CharacterListsButton_Click(object sender, EventArgs e)
};
cl.ShowDialog();
}

private void SaveAllButton_Click(object sender, EventArgs e)
{
CharacterFile.SaveAll(SavedFiles);
}

private void RandomPersonality_Click(object sender, EventArgs e)
{
CurrentCharacter.RandomationPerson(GlobalSeed);
FillPerson(CurrentCharacter);
}

private void RandomAppearance1_Click(object sender, EventArgs e)
{
CurrentCharacter.RandomationAppearance1(GlobalSeed);
FillAppearance(CurrentCharacter);
}

private void RandomHairColor_Click(object sender, EventArgs e)
{
CurrentCharacter.RandomHairColor(GlobalSeed);
FillAppearance(CurrentCharacter);
}

private void RandomAppearance2_Click(object sender, EventArgs e)
{
CurrentCharacter.RandomationAppearance2(GlobalSeed);
FillAppearance(CurrentCharacter);
}

private void RandomForces_Click(object sender, EventArgs e)
{
CurrentCharacter.RandomationForces(GlobalSeed);
FillForces(CurrentCharacter);
FillPowers(CurrentCharacter);
}

private void RandomSocial_Click(object sender, EventArgs e)
{
CurrentCharacter.RandomSocial(GlobalSeed);
FillSocial(CurrentCharacter);
}

private void LockRandomsButton_Click(object sender, EventArgs e)
{
if (RandomPersonality.Enabled)
{
LockRandoms();
LockRandomsButton.Text = Lang.Get("UnlockRandoms");
}
else
{
UnlockRandoms();
LockRandomsButton.Text = Lang.Get("LockRandoms");
}
}
}
}
18 changes: 18 additions & 0 deletions Tropegen/Extended.resx → Tropegen/CharacterEditor.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,21 @@
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="FileStripDown.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="SettingsStripDown.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
Expand All @@ -139,6 +154,9 @@
<metadata name="CharacterToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>122, 17</value>
</metadata>
<metadata name="CharacterToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>122, 17</value>
</metadata>
<data name="ChPredButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
Expand Down
14 changes: 11 additions & 3 deletions Tropegen/CharacterFile.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public void Rename(string newname)
Load();
File.Delete(Path);
}
Path = Extended.GetPath() + newname + ".tgc";
Path = CharacterEditor.GetPath() + newname + ".tgc";
Name = newname;
Save();
}
Expand All @@ -54,14 +54,15 @@ public void Remove()

public static CharacterFile New(string name)
{
var cf = new CharacterFile(Extended.GetPath() + name + ".tgc");
var cf = new CharacterFile(CharacterEditor.GetPath() + name + ".tgc");
cf.characterlist = new List<Character>();
return cf;
}

public void Save()
{
Character.Save(Path, CharacterList);
Edited = false;
}

public void Load()
Expand All @@ -80,12 +81,19 @@ public void Load()

public static List<CharacterFile> CharacterFiles()
{
var filenames = Directory.GetFiles(Extended.GetPath(), "*.tgc");
var path = CharacterEditor.GetPath();
if (!Directory.Exists(path)) Directory.CreateDirectory(path);
var filenames = Directory.GetFiles(path, "*.tgc");
var ret = new List<CharacterFile>();
for (var i = 0; i < filenames.Length; i++) ret.Add(new CharacterFile(filenames[i]));
ret.ForEach(x => x.Load());
ret.RemoveAll(x => x.Canceled);
return ret;
}

public static void SaveAll(List<CharacterFile> characterFiles)
{
characterFiles.ForEach(x => { if (x.Edited) x.Save(); });
}
}
}
4 changes: 2 additions & 2 deletions Tropegen/CharacterLists.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ namespace Tropegen
{
public partial class CharacterLists : Form
{
public Extended Reference;
public CharacterLists(Extended extended)
public CharacterEditor Reference;
public CharacterLists(CharacterEditor extended)
{
InitializeComponent();
Reference = extended;
Expand Down
2 changes: 1 addition & 1 deletion Tropegen/Form1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ private void SettingsButton_Click(object sender, EventArgs e)

private void RunExtendedButton_Click(object sender, EventArgs e)
{
var ext = new Extended();
var ext = new CharacterEditor();
ext.FormClosed += (o, e2) =>
{
Visible = true;
Expand Down
10 changes: 5 additions & 5 deletions Tropegen/Tropegen.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@
<Compile Include="CharacterLists.Designer.cs">
<DependentUpon>CharacterLists.cs</DependentUpon>
</Compile>
<Compile Include="Extended.cs">
<Compile Include="CharacterEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Extended.Designer.cs">
<DependentUpon>Extended.cs</DependentUpon>
<Compile Include="CharacterEditor.Designer.cs">
<DependentUpon>CharacterEditor.cs</DependentUpon>
</Compile>
<Compile Include="Form1.cs">
<SubType>Form</SubType>
Expand Down Expand Up @@ -95,8 +95,8 @@
<EmbeddedResource Include="CharacterLists.resx">
<DependentUpon>CharacterLists.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Extended.resx">
<DependentUpon>Extended.cs</DependentUpon>
<EmbeddedResource Include="CharacterEditor.resx">
<DependentUpon>CharacterEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
Expand Down
Loading

0 comments on commit 1dfccd3

Please sign in to comment.