Merge branch '807-D2E_Undo'

NPBruce · Apr 27, 2018 · de77a9c · de77a9c
2 parents f03d2b6 + 44fc85a
commit de77a9c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/unity/Assets/Resources/version.txt b/unity/Assets/Resources/version.txt
@@ -1 +1 @@
-2.0.0
+2.0.1
diff --git a/unity/Assets/Scripts/Quest/Quest.cs b/unity/Assets/Scripts/Quest/Quest.cs
@@ -857,7 +857,7 @@ public void LoadQuest(IniData saveData)
         eManager = new EventManager(saveData.Get("EventManager"));
 
         // Update the screen
-        game.stageUI.Update();
+        game.stageUI = new NextStageButton();
         game.monsterCanvas.UpdateList();
         game.heroCanvas.UpdateStatus();
     }

diff --git a/unity/Assets/StreamingAssets/content/MoM/sot/items.ini b/unity/Assets/StreamingAssets/content/MoM/sot/items.ini
@@ -1,6 +1,6 @@
 [ItemCommonPainkillers]
 name={ffg:COMMON_ITEM_PAINKILLERS}
-image={import}/img/CommonItem_Painkillers
+image={import}/img/CommonItem_Aspirin
 traits=equipment common
 
 [ItemCommonBindingPowder]