Merge conflict resolution

red-the-random-dev · red-the-random-dev · commit c0c3a8031fb3 · 2021-10-02T11:06:37.000+03:00
diff --git a/Objects/Dynamics/PlayerObject.cs b/Objects/Dynamics/PlayerObject.cs
@@ -10,7 +10,7 @@ public enum Direction
         Up=0, Down=1, Left=2, Right=3
     };
 
-    public class Player : DynamicRectObject
+    public class PlayerObject : DynamicRectObject
     {
         protected Point SightAreaSize;
         public Direction SightDirection; 
@@ -19,14 +19,15 @@ public virtual Rectangle SightArea
         {
             get
             {
+                Rectangle c = Collider;
                 switch (SightDirection)
                 {
                     case Direction.Up:
                     {
                             return new Rectangle
                             (
-                                Collider.X + Collider.Width / 2 - SightAreaSize.X,
-                                Collider.Y - SightAreaSize.Y,
+                                c.X + c.Width / 2 - SightAreaSize.X,
+                                c.Y - SightAreaSize.Y,
                                 SightAreaSize.X,
                                 SightAreaSize.Y
                             );
@@ -35,8 +36,8 @@ public virtual Rectangle SightArea
                     {
                             return new Rectangle
                             (
-                                Collider.X + Collider.Width / 2 - SightAreaSize.X,
-                                Collider.Y + Collider.Height + SightAreaSize.Y,
+                                c.X + c.Width / 2 - SightAreaSize.X,
+                                c.Y + c.Height + SightAreaSize.Y,
                                 SightAreaSize.X,
                                 SightAreaSize.Y
                             );
@@ -45,28 +46,28 @@ public virtual Rectangle SightArea
                     {
                             return new Rectangle
                             (
-                                Collider.X - SightArea.X,
-                                Collider.Y + Collider.Height / 2 - SightAreaSize.Y,
-                                SightAreaSize.X,
-                                SightAreaSize.Y
+                                c.X - SightAreaSize.X,
+                                c.Y + c.Height / 2 - SightAreaSize.Y,
+                                SightAreaSize.Y,
+                                SightAreaSize.X
                             );
                     }
                     case Direction.Right:
                     {
                             return new Rectangle
                             (
-                                Collider.X + Collider.Width + SightArea.X,
-                                Collider.Y + Collider.Height / 2 - SightAreaSize.Y,
-                                SightAreaSize.X,
-                                SightAreaSize.Y
+                                c.X + c.Width + SightAreaSize.X,
+                                c.Y + c.Height / 2 - SightAreaSize.Y,
+                                SightAreaSize.Y,
+                                SightAreaSize.X
                             );
                     }
                     default:
                     {
                             return new Rectangle
                             (
-                                Collider.X + Collider.Width / 2 - SightAreaSize.X / 2,
-                                Collider.Y + Collider.Height / 2 - SightAreaSize.Y / 2,
+                                c.X + c.Width / 2 - SightAreaSize.X / 2,
+                                c.Y + c.Height / 2 - SightAreaSize.Y / 2,
                                 SightAreaSize.X,
                                 SightAreaSize.Y
                             );
@@ -75,7 +76,7 @@ public virtual Rectangle SightArea
             }
         }
 
-        public Player(Point StartLocation, Point colliderSize, Single mass, Point sightAreaSize) : base(StartLocation, colliderSize, mass, false)
+        public PlayerObject(Point StartLocation, Point colliderSize, Single mass, Point sightAreaSize) : base(StartLocation, colliderSize, mass, false)
         {
             SightAreaSize = sightAreaSize;
         }
diff --git a/Scripting/Pipeline/ScriptImporter.cs b/Scripting/Pipeline/ScriptImporter.cs
@@ -2,16 +2,14 @@
 using Scripting = DotRPG.Scripting;
 using System.IO;
 
-using TImport = System.String;
-
 namespace DotRPG.Scripting.Pipeline
 {
     [ContentImporter(".lua", DisplayName = "DotRPG embeddable script handler", DefaultProcessor = "ScriptProcessor")]
-    public class ScriptImporter : ContentImporter<TImport>
+    public class ScriptImporter : ContentImporter<LuaModule>
     {
-        public override TImport Import(string filename, ContentImporterContext context)
+        public override LuaModule Import(string filename, ContentImporterContext context)
         {
-            return File.ReadAllText(filename);
+            return new Scripting::LuaModule(File.ReadAllText(filename));
         }
     }
 }
diff --git a/Scripting/Pipeline/ScriptProcessor.cs b/Scripting/Pipeline/ScriptProcessor.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.Xna.Framework.Content.Pipeline;
 
-using TInput = System.String;
+using TInput = DotRPG.Scripting.LuaModule;
 using TOutput = DotRPG.Scripting.LuaModule;
 
 namespace ScriptImporter
@@ -10,7 +10,7 @@ class ScriptProcessor : ContentProcessor<TInput, TOutput>
     {
         public override TOutput Process(TInput input, ContentProcessorContext context)
         {
-            return new TOutput(input);
+            return input;
         }
     }
 }
diff --git a/Scripting/SceneSwitchSet.cs b/Scripting/SceneSwitchSet.cs
@@ -0,0 +1,12 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DotRPG.Scripting
+{
+    public class SceneSwitchSet
+    {
+        public Boolean AutoScroll = false;
+        public Boolean ExitDialog = false;
+    }
+}
diff --git a/_Example/DotRPG.Example.csproj b/_Example/DotRPG.Example.csproj
@@ -31,5 +31,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Objects\DotRPG.Objects.csproj" />
     <ProjectReference Include="..\Objects\Dynamics\DotRPG.Objects.Dynamics.csproj" />
+    <ProjectReference Include="..\Scripting\DotRPG.Scripting.csproj" />
   </ItemGroup>
 </Project>
diff --git a/_Example/Game1.cs b/_Example/Game1.cs
@@ -86,7 +86,7 @@ public static void SetFrameNumber(Object sender, EventArgs e, GameTime gameTime)
 
         private void StartScroll(Object sender, EventArgs e, GameTime gameTime)
         {
-            ActiveFrame = Frames[1];
+            ActiveFrame = Frames[2];
             ActiveFrame.LoadContent();
         }
 
@@ -104,6 +104,8 @@ protected override void Initialize()
             Frames[0].Initialize();
             Frames.Add(new DynamicsTestFrame(this, ResourceHGlobal, LogicEventSet));
             Frames[1].Initialize();
+            Frames.Add(new ScriptTest(this, ResourceHGlobal, LogicEventSet));
+            Frames[2].Initialize();
             base.Initialize();
         }
 
diff --git a/_Example/GameData/DotRPG.Example_data.mgcb b/_Example/GameData/DotRPG.Example_data.mgcb
@@ -27,6 +27,9 @@
 /processorParam:TextureFormat=Compressed
 /build:Fonts/MainFont_Large.spritefont
 
+#begin Scripts/dialog.lua
+/copy:Scripts/dialog.lua
+
 #begin Sounds/clickText.wav
 /importer:WavImporter
 /processor:SoundEffectProcessor
diff --git a/_Example/GameData/Scripts/dialog.lua b/_Example/GameData/Scripts/dialog.lua
@@ -4,26 +4,26 @@ event_counts = {7}
 
 function loop(objID, eventID, frameTime, totalTime)
     if objID == 0 then
-        if eventID == 0 then
-            dialog.Text = "You ran across white rectangular object.\nSo what?"
-        elseif eventID == 1 then
-            dialog.Text = "You should better go elsewhere."
-            scene.ExitDialog = true
-        elseif eventID == 2 then
-            dialog.Text = "A white rectangular object."
-            scene.ExitDialog = true
-        elseif eventID == 3 then
-            dialog.Text = "You've never seen object that is more white\nand rectangular than this one."
-            scene.ExitDialog = true
-        elseif eventID == 4 then
-            dialog.Text = "Don't you have better things to do?"
-            scene.ExitDialog = true
-        elseif eventID == 5 then
-            dialog.Text = "You ran across white rect"
-            scene.AutoScroll = true
-        elseif eventID == 6 then
-            dialog.Text = "COME ON, QUIT IT ALREADY!"
-            scene.ExitDialog = true
-        end
+    if eventID == 0 then
+        dialog.Text = "You ran across white rectangular object.\nSo what?"
+    elseif eventID == 1 then
+        dialog.Text = "You should better go elsewhere."
+        scene.ExitDialog = true
+    elseif eventID == 2 then
+        dialog.Text = "A white rectangular object."
+        scene.ExitDialog = true
+    elseif eventID == 3 then
+        dialog.Text = "You've never seen object that is more white\nand rectangular than this one."
+        scene.ExitDialog = true
+    elseif eventID == 4 then
+        dialog.Text = "Don't you have better things to do?"
+        scene.ExitDialog = true
+    elseif eventID == 5 then
+        dialog.Text = "You ran across white rect"
+        scene.AutoScroll = true
+    elseif eventID == 6 then
+        dialog.Text = "COME ON, QUIT IT ALREADY!"
+        scene.ExitDialog = true
     end
+end
 end

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public enum Direction`
`10`	`10`	`Up=0, Down=1, Left=2, Right=3`
`11`	`11`	`};`
`12`	`12`
`13`		`- public class Player : DynamicRectObject`
	`13`	`+ public class PlayerObject : DynamicRectObject`
`14`	`14`	`{`
`15`	`15`	`protected Point SightAreaSize;`
`16`	`16`	`public Direction SightDirection;`
`@@ -19,14 +19,15 @@ public virtual Rectangle SightArea`
`19`	`19`	`{`
`20`	`20`	`get`
`21`	`21`	`{`
	`22`	`+ Rectangle c = Collider;`
`22`	`23`	`switch (SightDirection)`
`23`	`24`	`{`
`24`	`25`	`case Direction.Up:`
`25`	`26`	`{`
`26`	`27`	`return new Rectangle`
`27`	`28`	`(`
`28`		`- Collider.X + Collider.Width / 2 - SightAreaSize.X,`
`29`		`- Collider.Y - SightAreaSize.Y,`
	`29`	`+ c.X + c.Width / 2 - SightAreaSize.X,`
	`30`	`+ c.Y - SightAreaSize.Y,`
`30`	`31`	`SightAreaSize.X,`
`31`	`32`	`SightAreaSize.Y`
`32`	`33`	`);`
`@@ -35,8 +36,8 @@ public virtual Rectangle SightArea`
`35`	`36`	`{`
`36`	`37`	`return new Rectangle`
`37`	`38`	`(`
`38`		`- Collider.X + Collider.Width / 2 - SightAreaSize.X,`
`39`		`- Collider.Y + Collider.Height + SightAreaSize.Y,`
	`39`	`+ c.X + c.Width / 2 - SightAreaSize.X,`
	`40`	`+ c.Y + c.Height + SightAreaSize.Y,`
`40`	`41`	`SightAreaSize.X,`
`41`	`42`	`SightAreaSize.Y`
`42`	`43`	`);`
`@@ -45,28 +46,28 @@ public virtual Rectangle SightArea`
`45`	`46`	`{`
`46`	`47`	`return new Rectangle`
`47`	`48`	`(`
`48`		`- Collider.X - SightArea.X,`
`49`		`- Collider.Y + Collider.Height / 2 - SightAreaSize.Y,`
`50`		`- SightAreaSize.X,`
`51`		`- SightAreaSize.Y`
	`49`	`+ c.X - SightAreaSize.X,`
	`50`	`+ c.Y + c.Height / 2 - SightAreaSize.Y,`
	`51`	`+ SightAreaSize.Y,`
	`52`	`+ SightAreaSize.X`
`52`	`53`	`);`
`53`	`54`	`}`
`54`	`55`	`case Direction.Right:`
`55`	`56`	`{`
`56`	`57`	`return new Rectangle`
`57`	`58`	`(`
`58`		`- Collider.X + Collider.Width + SightArea.X,`
`59`		`- Collider.Y + Collider.Height / 2 - SightAreaSize.Y,`
`60`		`- SightAreaSize.X,`
`61`		`- SightAreaSize.Y`
	`59`	`+ c.X + c.Width + SightAreaSize.X,`
	`60`	`+ c.Y + c.Height / 2 - SightAreaSize.Y,`
	`61`	`+ SightAreaSize.Y,`
	`62`	`+ SightAreaSize.X`
`62`	`63`	`);`
`63`	`64`	`}`
`64`	`65`	`default:`
`65`	`66`	`{`
`66`	`67`	`return new Rectangle`
`67`	`68`	`(`
`68`		`- Collider.X + Collider.Width / 2 - SightAreaSize.X / 2,`
`69`		`- Collider.Y + Collider.Height / 2 - SightAreaSize.Y / 2,`
	`69`	`+ c.X + c.Width / 2 - SightAreaSize.X / 2,`
	`70`	`+ c.Y + c.Height / 2 - SightAreaSize.Y / 2,`
`70`	`71`	`SightAreaSize.X,`
`71`	`72`	`SightAreaSize.Y`
`72`	`73`	`);`
`@@ -75,7 +76,7 @@ public virtual Rectangle SightArea`
`75`	`76`	`}`
`76`	`77`	`}`
`77`	`78`
`78`		`- public Player(Point StartLocation, Point colliderSize, Single mass, Point sightAreaSize) : base(StartLocation, colliderSize, mass, false)`
	`79`	`+ public PlayerObject(Point StartLocation, Point colliderSize, Single mass, Point sightAreaSize) : base(StartLocation, colliderSize, mass, false)`
`79`	`80`	`{`
`80`	`81`	`SightAreaSize = sightAreaSize;`
`81`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,14 @@`
`2`	`2`	`using Scripting = DotRPG.Scripting;`
`3`	`3`	`using System.IO;`
`4`	`4`
`5`		`-using TImport = System.String;`
`6`		`-`
`7`	`5`	`namespace DotRPG.Scripting.Pipeline`
`8`	`6`	`{`
`9`	`7`	`[ContentImporter(".lua", DisplayName = "DotRPG embeddable script handler", DefaultProcessor = "ScriptProcessor")]`
`10`		`- public class ScriptImporter : ContentImporter<TImport>`
	`8`	`+ public class ScriptImporter : ContentImporter<LuaModule>`
`11`	`9`	`{`
`12`		`- public override TImport Import(string filename, ContentImporterContext context)`
	`10`	`+ public override LuaModule Import(string filename, ContentImporterContext context)`
`13`	`11`	`{`
`14`		`- return File.ReadAllText(filename);`
	`12`	`+ return new Scripting::LuaModule(File.ReadAllText(filename));`
`15`	`13`	`}`
`16`	`14`	`}`
`17`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Microsoft.Xna.Framework.Content.Pipeline;`
`2`	`2`
`3`		`-using TInput = System.String;`
	`3`	`+using TInput = DotRPG.Scripting.LuaModule;`
`4`	`4`	`using TOutput = DotRPG.Scripting.LuaModule;`
`5`	`5`
`6`	`6`	`namespace ScriptImporter`
`@@ -10,7 +10,7 @@ class ScriptProcessor : ContentProcessor<TInput, TOutput>`
`10`	`10`	`{`
`11`	`11`	`public override TOutput Process(TInput input, ContentProcessorContext context)`
`12`	`12`	`{`
`13`		`- return new TOutput(input);`
	`13`	`+ return input;`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public static void SetFrameNumber(Object sender, EventArgs e, GameTime gameTime)`
`86`	`86`
`87`	`87`	`private void StartScroll(Object sender, EventArgs e, GameTime gameTime)`
`88`	`88`	`{`
`89`		`- ActiveFrame = Frames[1];`
	`89`	`+ ActiveFrame = Frames[2];`
`90`	`90`	`ActiveFrame.LoadContent();`
`91`	`91`	`}`
`92`	`92`
`@@ -104,6 +104,8 @@ protected override void Initialize()`
`104`	`104`	`Frames[0].Initialize();`
`105`	`105`	`Frames.Add(new DynamicsTestFrame(this, ResourceHGlobal, LogicEventSet));`
`106`	`106`	`Frames[1].Initialize();`
	`107`	`+ Frames.Add(new ScriptTest(this, ResourceHGlobal, LogicEventSet));`
	`108`	`+ Frames[2].Initialize();`
`107`	`109`	`base.Initialize();`
`108`	`110`	`}`
`109`	`111`