CYF v0.6.3

Assets/Default/Sprites/UI/SpeechBubbles/leftlarge.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <spritesheet type="single">
-    <sprite name="left">
-        <border x="18" y="16" z="21" w="7"/>
+    <sprite name="leftlarge">
+        <border x="18" y="10" z="21" w="16"/>
     </sprite>
     <wideness>156</wideness>
 </spritesheet>

Assets/Default/Sprites/UI/SpeechBubbles/leftlargeminus.xml

@@ -3,5 +3,5 @@
     <sprite name="left">
         <border x="9" y="8" z="21" w="7"/>
     </sprite>
-    <wideness>165</wideness>
+    <wideness>170</wideness>
 </spritesheet>

Assets/Default/Sprites/UI/SpeechBubbles/leftwide.xml

@@ -3,5 +3,5 @@
     <sprite name="leftwide">
         <border x="12" y="12" z="36" w="11"/>
     </sprite>
-    <wideness>194</wideness>
+    <wideness>190</wideness>
 </spritesheet>

Assets/Default/Sprites/UI/SpeechBubbles/leftwideminus.xml

@@ -3,5 +3,5 @@
     <sprite name="left">
         <border x="9" y="8" z="21" w="7"/>
     </sprite>
-    <wideness>150</wideness>
+    <wideness>140</wideness>
 </spritesheet>

Assets/Default/Sprites/UI/SpeechBubbles/rightlarge.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <spritesheet type="single">
     <sprite name="rightlarge">
-        <border x="38" y="15" z="14" w="19"/>
+        <border x="38" y="15" z="14" w="10"/>
     </sprite>
     <wideness>160</wideness>
 </spritesheet>

Assets/Default/Sprites/UI/SpeechBubbles/rightlargeminus.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <spritesheet type="single">
     <sprite name="right">
-        <border x="19" y="12" z="9" w="8"/>
+        <border x="23" y="12" z="9" w="8"/>
     </sprite>
     <wideness>165</wideness>
 </spritesheet>

Assets/Default/Sprites/UI/SpeechBubbles/rightlong.xml

@@ -3,5 +3,5 @@
     <sprite name="rightlong">
         <border x="21" y="13" z="9" w="13"/>
     </sprite>
-    <wideness>76</wideness>
+    <wideness>77</wideness>
 </spritesheet>

Assets/Default/Sprites/UI/SpeechBubbles/rightwide.xml

@@ -3,5 +3,5 @@
     <sprite name="rightwide">
         <border x="36" y="12" z="12" w="11"/>
     </sprite>
-    <wideness>194</wideness>
+    <wideness>188</wideness>
 </spritesheet>

Assets/Default/Sprites/UI/SpeechBubbles/rightwideminus.xml

@@ -3,5 +3,5 @@
     <sprite name="right">
         <border x="19" y="12" z="9" w="8"/>
     </sprite>
-    <wideness>150</wideness>
+    <wideness>145</wideness>
 </spritesheet>

Assets/Mods/@0.5.0_SEE_CRATE/Lua/Waves/bullettest_touhou.lua

@@ -5,8 +5,8 @@ bg.y = 240
 bg.color = {0,0,0}
 if enemies[1]["name"] ~= "Punderbolt" then
 	local buttoncover = CreateSprite("UI/sq_white", "BelowArena")
-	buttoncover.Scale(640/4,49/4)
-	buttoncover.MoveTo(320,24.5)
+	buttoncover.Scale(640/4,50/4)
+	buttoncover.MoveTo(320,25)
 	buttoncover.color = {0,0,0}
 	local namecover = CreateSprite("UI/sq_white", "BelowArena")
 	namecover.SetPivot(0,0.5)

Assets/Mods/Examples/Lua/Events/BoxTest.lua

@@ -0,0 +1,6 @@
+function EventPage1()
+    General.SetChoice({"Yes", "No"}, "Use the box?")
+    if lastChoice == 0 then
+        Inventory.SpawnBoxMenu()
+    end
+end

Assets/Plugins/MoonSharp/Interpreter/Execution/VM/Processor/Processor.cs

@@ -8,10 +8,11 @@ namespace MoonSharp.Interpreter.Execution.VM
 {
 	sealed partial class Processor
 	{
-		ByteCode m_RootChunk;
+		public ByteCode m_RootChunk;
+		public Instruction m_doFileRequireHack;
 
-		FastStack<DynValue> m_ValueStack = new FastStack<DynValue>(131072);
-		FastStack<CallStackItem> m_ExecutionStack = new FastStack<CallStackItem>(131072);
+		public FastStack<DynValue> m_ValueStack = new FastStack<DynValue>(131072);
+		public FastStack<CallStackItem> m_ExecutionStack = new FastStack<CallStackItem>(131072);
 		List<Processor> m_CoroutinesStack;
 
 		Table m_GlobalTable;

Assets/Plugins/MoonSharp/Interpreter/Execution/VM/Processor/Processor_Errors.cs

@@ -6,10 +6,10 @@ sealed partial class Processor
 	{
 		private SourceRef GetCurrentSourceRef(int instructionPtr)
 		{
-			if (instructionPtr >= 0 && instructionPtr < m_RootChunk.Code.Count)
-			{
+			if (m_doFileRequireHack != null)
+				return m_doFileRequireHack.SourceCodeRef;
+			else if (instructionPtr >= 0 && instructionPtr < m_RootChunk.Code.Count)
 				return m_RootChunk.Code[instructionPtr].SourceCodeRef;
-			}
 			return null;
 		}
 

Assets/Plugins/MoonSharp/Interpreter/Script.cs

@@ -179,9 +179,7 @@ public DynValue LoadString(string code, Table globalTable = null, string codeFri
 
 			m_Sources.Add(source);
 
-			int address = Loader_Fast.LoadChunk(this,
-				source,
-				m_ByteCode);
+			int address = Loader_Fast.LoadChunk(this, source, m_ByteCode, m_MainProcessor);
 
 			SignalSourceCodeChange(source);
 			SignalByteCodeChange();

Assets/Plugins/MoonSharp/Interpreter/Tree/Fast_Interface/Loader_Fast.cs

@@ -41,9 +41,10 @@ private static ScriptLoadingContext CreateLoadingContext(Script script, SourceCo
 			};
 		}
 
-		internal static int LoadChunk(Script script, SourceCode source, ByteCode bytecode)
+		internal static int LoadChunk(Script script, SourceCode source, ByteCode bytecode, Processor processor)
 		{
 			ScriptLoadingContext lcontext = CreateLoadingContext(script, source);
+
 			try
 			{
 				Statement stat;
@@ -55,6 +56,7 @@ internal static int LoadChunk(Script script, SourceCode source, ByteCode bytecod
 
 				//var srcref = new SourceRef(source.SourceID);
 
+
 				using (script.PerformanceStats.StartStopwatch(Diagnostics.PerformanceCounter.Compilation))
 				using (bytecode.EnterSource(null))
 				{
@@ -70,7 +72,9 @@ internal static int LoadChunk(Script script, SourceCode source, ByteCode bytecod
 			}
 			catch (SyntaxErrorException ex)
 			{
-				ex.DecorateMessage(script);
+				Instruction i = new Instruction(lcontext.Lexer.Current.GetSourceRef()) { OpCode = OpCode.Nop, Name = "none" };
+				processor.m_doFileRequireHack = i;
+				ex.DecorateMessage(script, lcontext.Lexer.Current.GetSourceRef());
 				ex.Rethrow();
 				throw;
 			}

Assets/Scenes/TransitionOverworld.unity

@@ -5393,7 +5393,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1731033919}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -6277,6 +6277,7 @@ RectTransform:
   - {fileID: 743800824}
   - {fileID: 670959144}
   - {fileID: 952942992}
+  - {fileID: 1957097253}
   - {fileID: 1117834469}
   m_Father: {fileID: 1779322336}
   m_RootOrder: 8
@@ -7246,6 +7247,79 @@ CanvasRenderer:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1942351437}
   m_CullTransparentMesh: 0
+--- !u!1 &1957097252
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 183300, guid: 65ee94c713ee95942a47240fb8f2ae5c,
+    type: 2}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1957097253}
+  - component: {fileID: 1957097255}
+  - component: {fileID: 1957097254}
+  m_Layer: 5
+  m_Name: itembox
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1957097253
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 22418524, guid: 65ee94c713ee95942a47240fb8f2ae5c,
+    type: 2}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1957097252}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1731033919}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -320, y: -240}
+  m_SizeDelta: {x: 640, y: 480}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &1957097254
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 11481144, guid: 65ee94c713ee95942a47240fb8f2ae5c,
+    type: 2}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1957097252}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 1940471d360cdfc4390f579caff5a009, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &1957097255
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 22269356, guid: 65ee94c713ee95942a47240fb8f2ae5c,
+    type: 2}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1957097252}
+  m_CullTransparentMesh: 0
 --- !u!1 &1977298764
 GameObject:
   m_ObjectHideFlags: 0