From 2ce108e3105ef4ba110c72074ca738cadf4233f0 Mon Sep 17 00:00:00 2001 From: feos Date: Thu, 26 Nov 2015 00:12:25 +0300 Subject: [PATCH] lua: ability to SetBranchText. doesn't make much sense to add text to existing branches from lua, but highly useful to set some text to a new branch. and we also have a default branch text variable now. --- BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 1 + .../Lua/Libraries/EmuLuaLibrary.Tastudio.cs | 16 ++++++++++++++++ .../tools/TAStudio/BookmarksBranchesBox.cs | 3 ++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index 4bfdeeb103..cb2eaa8a4c 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -85,6 +85,7 @@ namespace BizHawk.Client.Common public TasMovieMarkerList Markers { get; set; } public bool BindMarkersToInput { get; set; } public bool UseInputCache { get; set; } + public string NewBranchText = ""; public int CurrentBranch { get; set; } public int BranchCount { get { return Branches.Count; } } public TasBranch GetBranch(int index) diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs index f320d0cedd..eb8bc5f6fa 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs @@ -37,6 +37,22 @@ namespace BizHawk.Client.EmuHawk return GlobalWin.Tools.Has(); // TODO: eventually tastudio should have an engaged flag } + [LuaMethodAttributes( + "setbranchtext", + "adds the given message to the existing branch, or to the branch that will be created next if branch index is not specified" + )] + public void SetBranchText(string text, int? index = null) + { + if (index != null) + { + Tastudio.CurrentTasMovie.GetBranch(index.Value).UserText = text; + } + else + { + Tastudio.CurrentTasMovie.NewBranchText = text; + } + } + [LuaMethodAttributes( "getmarker", "returns the marker text at the given frame, or an empty string if there is no marker for the given frame" diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs index f1e42d5363..1619599899 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs @@ -116,6 +116,7 @@ namespace BizHawk.Client.EmuHawk public void Branch() { TasBranch branch = CreateBranch(); + Movie.NewBranchText = ""; // reset every time it's used Movie.AddBranch(branch); BranchView.RowCount = Movie.BranchCount; Movie.CurrentBranch = Movie.BranchCount - 1; @@ -149,7 +150,7 @@ namespace BizHawk.Client.EmuHawk ChangeLog = new TasMovieChangeLog(Movie), TimeStamp = DateTime.Now, Markers = Movie.Markers.DeepClone(), - UserText = "" + UserText = Movie.NewBranchText }; }