Skip to content

Commit

Permalink
Add ability to manually change object text
Browse files Browse the repository at this point in the history
  • Loading branch information
ShootMe committed May 6, 2019
1 parent 45366b8 commit ceb3e57
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 55 deletions.
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: Guid("064cb7c7-bd5d-4175-8156-f6224ddd13e4")]
[assembly: AssemblyVersion("1.2.9.0")]
[assembly: AssemblyFileVersion("1.2.9.0")]
[assembly: AssemblyVersion("1.3.0.0")]
[assembly: AssemblyFileVersion("1.3.0.0")]
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ Simple Level Editor for the game Baba Is You
- Run and enjoy

## Change Log
- 1.3.0
- Features
- Added ability to manually specify object text if it doesnt exist as an image to object editor

- 1.2.9
- Fixes
- Fixed rule parser with the facing word
Expand Down
116 changes: 65 additions & 51 deletions Views/ObjectEditor.Designer.cs

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

17 changes: 15 additions & 2 deletions Views/ObjectEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ private void imgCurrent_Click(object sender, EventArgs e) {
if (result == DialogResult.OK) {
Sprite sprite = (Sprite)selector.SelectedItem;
Edit.Name = sender == imgImage ? Edit.Name : sprite.Name;
txtObjectText.Text = Edit.Name;
Edit.Sprite = sender == imgImage ? sprite.Name : Edit.Sprite;
Edit.SpriteInRoot = sender == imgImage ? sprite.IsRoot : Edit.SpriteInRoot;
Edit.IsObject = Edit.Name.IndexOf("text_") < 0;
Expand Down Expand Up @@ -209,10 +210,10 @@ private void UpdateImages() {
lblOperatorType.Visible = !Edit.IsObject;
txtOperatorType.Visible = !Edit.IsObject;
if (!Edit.IsObject) {
ClientSize = new Size(ClientSize.Width, 352);
ClientSize = new Size(ClientSize.Width, 344);
DrawImage(imgActive);
} else {
ClientSize = new Size(ClientSize.Width, 274);
ClientSize = new Size(ClientSize.Width, 264);
}

toolTips.SetToolTip(imgObject, Edit.Name);
Expand All @@ -226,6 +227,7 @@ private void UpdateImages() {
txtArgExtra.Text = Edit.ArgExtra;
txtOperatorType.Text = Edit.OperatorType;
txtArgType.Text = Edit.ArgType;
txtObjectText.Text = Edit.Name;
}
private void DrawImage(PictureBox img, bool useNameOnly = false) {
if (img.Image != null) {
Expand Down Expand Up @@ -273,5 +275,16 @@ private void txtArgExtra_TextChanged(object sender, EventArgs e) {
private void txtArgType_TextChanged(object sender, EventArgs e) {
Edit.ArgType = string.IsNullOrEmpty(txtArgType.Text) ? null : txtArgType.Text;
}
private void txtObjectText_TextChanged(object sender, EventArgs e) {
Edit.Name = txtObjectText.Text;
DrawImage(imgObject, true);
}
private void txtObjectText_Validated(object sender, EventArgs e) {
if (string.IsNullOrEmpty(txtObjectText.Text)) {
txtObjectText.Text = DefaultItem.Name;
}
Edit.Name = txtObjectText.Text;
DrawImage(imgObject, true);
}
}
}
3 changes: 3 additions & 0 deletions Views/ObjectEditor.resx
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,7 @@
<metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

0 comments on commit ceb3e57

Please sign in to comment.