Add translation for tutorial stuff

Kahdeg-15520487 · Jan 28, 2018 · 22850ce · 22850ce
1 parent 1e5e7ab
commit 22850ce
Show file tree

Hide file tree

Showing 17 changed files with 418 additions and 1,341 deletions.
diff --git a/Wartorn/CONTENT_MANAGER.cs b/Wartorn/CONTENT_MANAGER.cs
diff --git a/Wartorn/Content/Content.mgcb b/Wartorn/Content/Content.mgcb
diff --git a/Wartorn/Content/obj/DesktopGL/.mgcontent b/Wartorn/Content/obj/DesktopGL/.mgcontent
diff --git a/Wartorn/Content/sprite/GUI/commandspritesheet.png b/Wartorn/Content/sprite/GUI/commandspritesheet.png
diff --git a/Wartorn/Content/sprite/tutorial/gamescreentutorial_en.png b/Wartorn/Content/sprite/tutorial/gamescreentutorial_en.png
diff --git a/...nt/sprite/tutorial/gamescreentutorial.png → ...sprite/tutorial/gamescreentutorial_vi.png b/...nt/sprite/tutorial/gamescreentutorial.png → ...sprite/tutorial/gamescreentutorial_vi.png
diff --git a/Wartorn/Content/sprite/tutorial/mapeditortutorial_en.png b/Wartorn/Content/sprite/tutorial/mapeditortutorial_en.png
diff --git a/...ent/sprite/tutorial/mapeditortutorial.png → .../sprite/tutorial/mapeditortutorial_vi.png b/...ent/sprite/tutorial/mapeditortutorial.png → .../sprite/tutorial/mapeditortutorial_vi.png
diff --git a/Wartorn/Content/sprite/tutorial/setupscreentutorial_en.png b/Wartorn/Content/sprite/tutorial/setupscreentutorial_en.png
diff --git a/...t/sprite/tutorial/setupscreentutorial.png → ...prite/tutorial/setupscreentutorial_vi.png b/...t/sprite/tutorial/setupscreentutorial.png → ...prite/tutorial/setupscreentutorial_vi.png
diff --git a/Wartorn/Dialog/DropdownDialog.cs b/Wartorn/Dialog/DropdownDialog.cs
@@ -41,6 +41,7 @@ public IEnumerable<string> Options
                 {
                     this.comboBox1.Items.Add(item);
                 }
+				comboBox1.SelectedIndex = 0;
             }
         }
 

diff --git a/Wartorn/Handler.cs b/Wartorn/Handler.cs
@@ -49,6 +49,10 @@ private void OnFormLoad(object sender, EventArgs e)
         {
             frm.ShowInTaskbar = false;
             frm.Opacity = 0;
+
+			MessageEventArgs messageEventArgs = new MessageEventArgs("Choose your language:|en|vi");
+			ShowDropdownBoxMainThread(messageEventArgs);
+			CONTENT_MANAGER.Language = messageEventArgs.message;
         }
 
         private static void MessageShow(object sender, MessageEventArgs e)

diff --git a/Wartorn/Screens/EditorScreen.cs b/Wartorn/Screens/EditorScreen.cs
@@ -91,7 +91,9 @@ public override void Shutdown() {
 		#region InitUI
 
 		private void InitEscapeMenu() {
-			PictureBox picturebox_tutorial = new PictureBox(CONTENT_MANAGER.mapeditortutorial, Point.Zero, null, null);
+			PictureBox picturebox_tutorial = new PictureBox(CONTENT_MANAGER.mapeditortutorial, Point.Zero, null, null) {
+				IsVisible = CONTENT_MANAGER.IsTutorial
+			};
 
 			//escape menu
 			Canvas canvas_Menu = new Canvas();

diff --git a/Wartorn/Screens/MainGameScreen/GameScreen.cs b/Wartorn/Screens/MainGameScreen/GameScreen.cs
@@ -183,7 +183,9 @@ public override bool Init() {
 
 		#region init ui
 		private void InitUI() {
-			PictureBox picturebox_tutorial = new PictureBox(CONTENT_MANAGER.gametutorial, Point.Zero, null, null);
+			PictureBox picturebox_tutorial = new PictureBox(CONTENT_MANAGER.gametutorial, Point.Zero, null, null) {
+				IsVisible = CONTENT_MANAGER.IsTutorial
+			};
 
 			//declare ui elements
 			canvas_SelectedMapCell = new Canvas();
@@ -627,7 +629,20 @@ public override void Update(GameTime gameTime) {
 				//bắt đầu lượt chơi
 				//next state: None
 				case GameState.TurnStart:
-					canvas.GetElementAs<Label>("label_whoseturn").Text = playerInfos[currentPlayer].owner.ToString();
+					var label_whoseturn = canvas.GetElementAs<Label>("label_whoseturn");
+					label_whoseturn.Text = playerInfos[currentPlayer].owner.ToString();
+					switch (playerInfos[currentPlayer].owner) {
+						case Owner.Red:
+							label_whoseturn.foregroundColor = Color.IndianRed;
+							break;
+						case Owner.Blue:
+							label_whoseturn.foregroundColor = Color.CadetBlue;
+							break;
+						case Owner.Green:
+							break;
+						case Owner.Yellow:
+							break;
+					}
 
 					#region trừ fuel cho các unit air và naval
 					foreach (var guid in playerInfos[currentPlayer].ownedUnit) {
@@ -1345,29 +1360,30 @@ private void ShowCommandMenu() {
 			Rectangle cmdslot = CommandSpriteSourceRectangle.GetSprite(cmds.Count, playerInfos[currentPlayer].owner);
 
 			canvas_action_Unit.GetElementAs<PictureBox>("commandslot").SourceRectangle = cmdslot;
-			Point cmdslotPosition = new Point(selectedUnit.X * Constants.MapCellWidth + 50, selectedUnit.Y * Constants.MapCellHeight);
+			//Point cmdslotPosition = new Point(selectedUnit.X * Constants.MapCellWidth + 50, selectedUnit.Y * Constants.MapCellHeight);
+			Point cmdslotPosition = new Point(selectedUnit.X * Constants.MapCellWidth - 2, selectedUnit.Y * Constants.MapCellHeight);
 			canvas_action_Unit.GetElementAs<PictureBox>("commandslot").Position = camera.TranslateFromWorldToScreen(cmdslotPosition.ToVector2()).ToPoint();
 
 			Button firstslot = canvas_action_Unit.GetElementAs<Button>("firstslot");
 			Button secondslot = canvas_action_Unit.GetElementAs<Button>("secondslot");
 			Button thirdslot = canvas_action_Unit.GetElementAs<Button>("thirdslot");
 
-			Point slotPosition = new Point(selectedUnit.X * Constants.MapCellWidth + 50 + 6, selectedUnit.Y * Constants.MapCellHeight + 8);
+			Point slotPosition = new Point(selectedUnit.X * Constants.MapCellWidth + 6, selectedUnit.Y * Constants.MapCellHeight + 8);
 			slotPosition = camera.TranslateFromWorldToScreen(slotPosition.ToVector2()).ToPoint();
 
 			firstslot.Position = slotPosition;
 			firstslot.spriteSourceRectangle = CommandSpriteSourceRectangle.GetSprite(cmds[0]);
 			firstslot.rect = new Rectangle(firstslot.Position, firstslot.spriteSourceRectangle.Size);
 
 			if (cmds.Count > 1) {
-				slotPosition = new Point(selectedUnit.X * Constants.MapCellWidth + 50 + 6, selectedUnit.Y * Constants.MapCellHeight + 16 + 8);
+				slotPosition = new Point(selectedUnit.X * Constants.MapCellWidth + 6, selectedUnit.Y * Constants.MapCellHeight + 16 + 8);
 				slotPosition = camera.TranslateFromWorldToScreen(slotPosition.ToVector2()).ToPoint();
 				secondslot.Position = slotPosition;
 				secondslot.spriteSourceRectangle = CommandSpriteSourceRectangle.GetSprite(cmds[1]);
 				secondslot.rect = new Rectangle(secondslot.Position, secondslot.spriteSourceRectangle.Size);
 			}
 			if (cmds.Count > 2) {
-				slotPosition = new Point(selectedUnit.X * Constants.MapCellWidth + 50 + 6, selectedUnit.Y * Constants.MapCellHeight + 32 + 8);
+				slotPosition = new Point(selectedUnit.X * Constants.MapCellWidth + 6, selectedUnit.Y * Constants.MapCellHeight + 32 + 8);
 				slotPosition = camera.TranslateFromWorldToScreen(slotPosition.ToVector2()).ToPoint();
 				thirdslot.Position = slotPosition;
 				thirdslot.spriteSourceRectangle = CommandSpriteSourceRectangle.GetSprite(cmds[2]);

diff --git a/Wartorn/Screens/MainGameScreen/SetupScreen.cs b/Wartorn/Screens/MainGameScreen/SetupScreen.cs
@@ -60,7 +60,9 @@ private void InitUI()
             //declare ui elements
             Label label_playerinfo = new Label("kahdeg", new Point(10, 20), new Vector2(80, 30), CONTENT_MANAGER.arcadefont);
 
-            PictureBox picturebox_tutorial = new PictureBox(CONTENT_MANAGER.setuptutorial, Point.Zero, null, null);
+			PictureBox picturebox_tutorial = new PictureBox(CONTENT_MANAGER.setuptutorial, Point.Zero, null, null) {
+				IsVisible = CONTENT_MANAGER.IsTutorial
+			};
 
             Button button_selectmap = new Button(UISpriteSheetSourceRectangle.GetSpriteRectangle(SpriteSheetUI.Open), new Point(650, 20), 0.5f);
             Button button_exit = new Button(UISpriteSheetSourceRectangle.GetSpriteRectangle(SpriteSheetUI.Exit), new Point(5, 5), 0.5f);

diff --git a/Wartorn/Wartorn.csproj b/Wartorn/Wartorn.csproj
@@ -164,6 +164,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="license.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="SDL2.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/WartornInstaller/WartornInstaller.iss b/WartornInstaller/WartornInstaller.iss
@@ -34,19 +34,9 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "..\Build\IronPython.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Build\IronPython.Modules.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Build\IronPython.SQLite.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Build\IronPython.Wpf.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Build\Microsoft.Dynamic.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Build\Microsoft.Scripting.AspNet.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Build\Microsoft.Scripting.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Build\Microsoft.Scripting.Metadata.dll"; DestDir: "{app}"; Flags: ignoreversion
-
 Source: "..\Build\MonoGame.Framework.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Build\Utility_Project.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\Build\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Build\NVorbis.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Build\OpenTK.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\Build\SDL2.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\Build\soft_oal.dll"; DestDir: "{app}"; Flags: ignoreversion