Beta 9

Aether89 · May 6, 2018 · 3c5295e · 3c5295e
1 parent 2464555
commit 3c5295e
Show file tree

Hide file tree

Showing 32 changed files with 2,456 additions and 196 deletions.
diff --git a/Magatama/Data/Init.xml b/Magatama/Data/Init.xml
@@ -3,19 +3,20 @@
 <Root>
 	<GameVersion value="Ep4" />
 	<Class Ep1="6" Ep2="8" Ep4="8" />
-	<Default SectionIDNumber="5" SectionIDName="Pinkal" FeedingTime="210" RacialRestriction="False" />
-	<Mag MaxLevel="200" Synchro="20" IQ="0" DEF="5" POW="0" DEX="0" MIND="0">
-		<!--Item Cost -->
-		<Monomate Cost="50" />
-		<Dimate Cost="300" />
-		<Trimate Cost="2000" />
-		<Monofluid Cost="100" />
-		<Difluid Cost="500" />
-		<Trifluid Cost="3600" />
-		<Antidote Cost="60" />
-		<Antiparalysis Cost="60" />
-		<SolAtomizer Cost="300" />
-		<MoonAtomizer Cost="500" />
-		<StarAtomizer Cost="5000" />
-	</Mag>
+	<Default SectionIDNumber="5" SectionIDName="Pinkal" FeedingTime="210" RacialRestriction="False" MaxQty="1000" MinLoad="100" />
+	<Mag MaxLevel="200" Synchro="20" IQ="0" DEF="5" POW="0" DEX="0" MIND="0" />
+	<!--Item Cost -->
+	<Monomate Cost="50" />
+	<Dimate Cost="300" />
+	<Trimate Cost="2000" />
+	<Monofluid Cost="100" />
+	<Difluid Cost="500" />
+	<Trifluid Cost="3600" />
+	<Antidote Cost="60" />
+	<Antiparalysis Cost="60" />
+	<SolAtomizer Cost="300" />
+	<MoonAtomizer Cost="500" />
+	<StarAtomizer Cost="5000" />
+	<!--Value for the Increase and Decrease Contextual Menu-->
+	<PlusMinus Value1="5" Value2="10" Value3="25" Value4="100" Value5="250" Value6="1000" />
 </Root>
diff --git a/Magatama/Data/Theme.xml b/Magatama/Data/Theme.xml
@@ -23,7 +23,8 @@
 <Activation text="Activation" color="White" color2="White"/><!-- color2 is for the Percentage number below the text -->
 
 <Items text="Items" color="White"/>
-<Qty text="Qty" color="White"/>
+<Qty text="Qty" color="White" max="100.
+"/>
 <History text="History" color="White"/>
 <TotalCost text="Total Cost" color="White"/>
 
@@ -70,11 +71,28 @@
 <InitialSectionID text="Initial Section ID" color="White"/>
 <Time text="Time Between Feeding" color="White"/>
 <Seconds text="Seconds" color="White"/>
+<MaxQty text="Maximum Feed Items Quantity" color ="White"/>
+<MinLoad text="Minimum for Loading" color="White"/>
 
 <SettingsItems text="Items" color="White"/>
 <SettingsCost text="Cost" color="White"/>
 <SettingsRacialRestriction text="Mag Racials Restrictions" color="White"/>
 <InitialStats text="Initial Stats" color="White"/>
+<SettingsWarning text="/!\ For change to take effect you will need to reload or start a new mag. /!\" color="yellow"/>
+
+<SettingsPlusMinus text="Increase &amp;&amp; Decrease" color="White"/> <!-- the double &amp; is required to display ampersand in a string otherwise used for shortcut -->
+<SettingsValue01 text="Value 01" color="White"/>
+<SettingsValue02 text="Value 02" color="White"/>
+<SettingsValue03 text="Value 03" color="White"/>
+<SettingsValue04 text="Value 04" color="White"/>
+<SettingsValue05 text="Value 05" color="White"/>
+<SettingsValue06 text="Value 06" color="White"/>
+
+<SettingsTabGeneral text="General" color="White"/>
+<SettingsTabMag text="Mag" color="White"/>
+<SettingsTabCost text="Costs" color="White"/>
+<SettingsTabValue text="Value" color="White"/>
+
 
 <!-- About  Interface -->
 
@@ -85,4 +103,35 @@
 <fluid color="Blue"/>
 <Anti color="Goldenrod"/>
 <Atomizer color="Red"/>
+
+<!-- Menu Strings use &amp; to determine The keyboard key-->
+<File text="&amp;File"/><!-- Also a Contextual Menu-->
+<FileNew text="&amp;New Mag"/><!-- Also a Contextual Menu-->
+<FileNewBlank text="New &amp;Blank Mag"/><!-- Also a Contextual Menu-->
+<FileOpen text="&amp;Open"/><!-- Also a Contextual Menu-->
+<FileSave text="&amp;Save"/><!-- Also a Contextual Menu-->
+<FileSaveAs text="Save &amp;As..."/><!-- Also a Contextual Menu-->
+<FileOutput text="&amp;ExportOutput"/><!-- Also a Contextual Menu-->
+<FileExit text="E&amp;xit"/>
+
+<EditUndo text="&amp;Undo"/><!-- Also a Contextual Menu-->
+<EditRedo text="&amp;Redo"/><!-- Also a Contextual Menu-->
+<EditResetQty text="&amp;Reset Quantity"/>
+<EditStats text="&amp;Set Stats"/>
+<EditSettings text="S&amp;ettings"/>
+
+
+<!-- Contextual Menu Stringst -->
+<cmsIncrease text="&amp;Increase"/>
+<cmsDecrease text="&amp;Decrease"/>
+<byX text="by "/><!-- the space is required otherwise will get by5 rather than by 5-->
+
+<SetTo3 text="Set to &amp;3"/>
+<SetToMax text="Set to &amp;Maximum"/>
+<SetToHalf text="Set to &amp;Half"/>
+<SetToZero text="Set to &amp;Zero"/>
+
+<Help text="&amp;?"/>
+<HelpAbout text="About &amp;Magatama"/>
+
 </Root>
diff --git a/Magatama/Graphics/SectionID/LBluefull.png b/Magatama/Graphics/SectionID/LBluefull.png
diff --git a/Magatama/Graphics/SectionID/LGreenhil.png b/Magatama/Graphics/SectionID/LGreenhil.png
diff --git a/Magatama/Graphics/SectionID/LOran.png b/Magatama/Graphics/SectionID/LOran.png
diff --git a/Magatama/Graphics/SectionID/LPinkal.png b/Magatama/Graphics/SectionID/LPinkal.png
diff --git a/Magatama/Graphics/SectionID/LPurplenum.png b/Magatama/Graphics/SectionID/LPurplenum.png
diff --git a/Magatama/Graphics/SectionID/LRedria.png b/Magatama/Graphics/SectionID/LRedria.png
diff --git a/Magatama/Graphics/SectionID/LSkyly.png b/Magatama/Graphics/SectionID/LSkyly.png
diff --git a/Magatama/Graphics/SectionID/LViridia.png b/Magatama/Graphics/SectionID/LViridia.png
diff --git a/Magatama/Graphics/SectionID/LWhitill.png b/Magatama/Graphics/SectionID/LWhitill.png
diff --git a/Magatama/Graphics/SectionID/LYellowboze.png b/Magatama/Graphics/SectionID/LYellowboze.png
diff --git a/Magatama/Graphics/SectionID/README.txt b/Magatama/Graphics/SectionID/README.txt
@@ -0,0 +1,4 @@
+Section ids
+
+This stack downloaded from https://sta.sh/228vdfo1qxma
+
diff --git a/Magatama/Graphics/Template/bg_template_settings.pdn b/Magatama/Graphics/Template/bg_template_settings.pdn
diff --git a/Magatama/Graphics/Theme/bg_settings.png b/Magatama/Graphics/Theme/bg_settings.png
diff --git a/Magatama/Graphics/Theme/bg_settings_tab1.png b/Magatama/Graphics/Theme/bg_settings_tab1.png
diff --git a/Magatama/Graphics/Theme/bg_settings_tab2.png b/Magatama/Graphics/Theme/bg_settings_tab2.png
diff --git a/Magatama/Graphics/Theme/bg_settings_tab3.png b/Magatama/Graphics/Theme/bg_settings_tab3.png
diff --git a/Magatama/Graphics/Theme/bg_settings_tab4.png b/Magatama/Graphics/Theme/bg_settings_tab4.png
diff --git a/Magatama/Magatama Editor/Magatama Editor.vbproj b/Magatama/Magatama Editor/Magatama Editor.vbproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <StartupObject>Magatama_Editor.My.MyApplication</StartupObject>
     <RootNamespace>Magatama_Editor</RootNamespace>
-    <AssemblyName>Magatama Editor</AssemblyName>
+    <AssemblyName>MagDex</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
@@ -36,7 +36,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>Magatama Editor.xml</DocumentationFile>
+    <DocumentationFile>MagDex.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -46,7 +46,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>Magatama Editor.xml</DocumentationFile>
+    <DocumentationFile>MagDex.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/Magatama/Magatama.sln b/Magatama/Magatama.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27428.2037
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Magatama", "Magatama\Magatama.vbproj", "{F50AA5A3-70C5-42CF-859F-540A8FE15304}"
 EndProject
@@ -19,8 +19,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F50AA5A3-70C5-42CF-859F-540A8FE15304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F50AA5A3-70C5-42CF-859F-540A8FE15304}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F50AA5A3-70C5-42CF-859F-540A8FE15304}.Debug|x64.ActiveCfg = Debug|x64
-		{F50AA5A3-70C5-42CF-859F-540A8FE15304}.Debug|x64.Build.0 = Debug|x64
+		{F50AA5A3-70C5-42CF-859F-540A8FE15304}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F50AA5A3-70C5-42CF-859F-540A8FE15304}.Debug|x64.Build.0 = Debug|Any CPU
 		{F50AA5A3-70C5-42CF-859F-540A8FE15304}.Debug|x86.ActiveCfg = Debug|x86
 		{F50AA5A3-70C5-42CF-859F-540A8FE15304}.Debug|x86.Build.0 = Debug|x86
 		{F50AA5A3-70C5-42CF-859F-540A8FE15304}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -45,4 +45,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8FDB3A2B-9AFC-4D08-A4A4-D27FF76069BA}
+	EndGlobalSection
 EndGlobal
diff --git a/Magatama/Magatama/My Project/AssemblyInfo.vb b/Magatama/Magatama/My Project/AssemblyInfo.vb
@@ -9,10 +9,10 @@ Imports System.Runtime.InteropServices
 ' Vérifiez les valeurs des attributs de l'assembly
 
 <Assembly: AssemblyTitle("Magatama")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("a Modern Mag Planner/Calculator")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("Magatama")>
-<Assembly: AssemblyCopyright("Copyright ©  2016")>
+<Assembly: AssemblyCopyright("")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' en utilisant '*', comme indiqué ci-dessous :
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("0.9.0.0")>
+<Assembly: AssemblyFileVersion("0.9.0.0")>
diff --git a/Magatama/Magatama/My Project/Settings.Designer.vb b/Magatama/Magatama/My Project/Settings.Designer.vb
diff --git a/Magatama/Magatama/My Project/Settings.settings b/Magatama/Magatama/My Project/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="strVer" Type="System.String" Scope="User">
-      <Value Profile="(Default)">βeta 8</Value>
+      <Value Profile="(Default)">βeta 9</Value>
     </Setting>
     <Setting Name="strSoft" Type="System.String" Scope="User">
       <Value Profile="(Default)">Magatama</Value>

diff --git a/Magatama/Magatama/My Project/app.manifest b/Magatama/Magatama/My Project/app.manifest
@@ -20,7 +20,7 @@
       </requestedPrivileges>
       <applicationRequestMinimum>
         <defaultAssemblyRequest permissionSetReference="Custom" />
-        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" />
+        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
       </applicationRequestMinimum>
     </security>
   </trustInfo>

diff --git a/Magatama/Magatama/app.config b/Magatama/Magatama/app.config
@@ -29,7 +29,7 @@
     <userSettings>
         <Magatama.My.MySettings>
             <setting name="strVer" serializeAs="String">
-                <value>βeta 8</value>
+                <value>βeta 9</value>
             </setting>
             <setting name="strSoft" serializeAs="String">
                 <value>Magatama</value>

diff --git a/Magatama/Magatama/frmAbout.vb b/Magatama/Magatama/frmAbout.vb
@@ -48,9 +48,12 @@ Public Class frmAbout
             & vbNewLine & "http://universps.online.fr" & vbNewLine & vbNewLine & "Phantasy Star Cave" _
             & vbNewLine & "http://www.pscave.com" & vbNewLine & vbNewLine & "Phantasy Star Online Wiki" _
             & vbNewLine & "http://pso.wikia.com/" & vbNewLine & vbNewLine & "Rico Journals by Koala Cuddle Party" _
-            & vbNewLine & "http://koalacuddleparty.com/" & vbNewLine & vbNewLine & "Schtack for is PSO gsl Editor and PVM/XVM Tool" _
-            & vbNewLine & vbNewLine & "-- Beta Tester --" & vbNewLine & vbNewLine & " [ Ephinea ] " & vbNewLine & "-Spuz" & vbNewLine _
-            & "-Henonk" & vbNewLine & vbNewLine & " [ ULTIMA ] " & vbNewLine & "-Fyrewolf5" & vbNewLine & vbNewLine)
+            & vbNewLine & "http://koalacuddleparty.com/" & vbNewLine & vbNewLine & "Cyane For the High Quality Section ID Icons" _
+            & vbNewLine & "https://www.facebook.com/cyaneworks/" & vbNewLine & "" _
+            & vbNewLine & "-- Beta Tester --" & vbNewLine & vbNewLine & " [ Ephinea ] " & vbNewLine & "- Spuz" & vbNewLine _
+            & "- Henonk" & vbNewLine & "- conenubi701" & vbNewLine & "- Endler" & vbNewLine & "- MagicLuthee" & vbNewLine & "- Aleron Ives" & vbNewLine _
+            & "- Nux" & vbNewLine & "- flatmen" & vbNewLine & "- NDW" & vbNewLine & vbNewLine & " [ ULTIMA ] " & vbNewLine & "- Fyrewolf5" & vbNewLine _
+            & "- Lemon" & vbNewLine & "- thelionorion" & vbNewLine & "- orgodemir" & vbNewLine & "- Soly" & vbNewLine & vbNewLine)
 
         btnOK.Focus()
     End Sub