Merge pull request #25 from dbent/version/0.4.0

Version/0.4.0
Apokee · Aug 11, 2013 · 4d2898a · 4d2898a
2 parents 0d9feb4 + d473977
commit 4d2898a
Show file tree

Hide file tree

Showing 28 changed files with 2,202 additions and 933 deletions.
diff --git a/Dependencies/SharpCompress/SharpCompress.Portable.dll b/Dependencies/SharpCompress/SharpCompress.Portable.dll
diff --git a/GameData/Ketchup/Parts/Dcpu16ComputerStackLarge/part.cfg b/GameData/Ketchup/Parts/Dcpu16ComputerStackLarge/part.cfg
@@ -54,13 +54,45 @@ MODULE
 
 MODULE
 {
-	name = Dcpu16Computer
-	minimumCrew = 0
+	name = Computer
 
 	RESOURCE
 	{
 		name = ElectricCharge
-		rate = 0.05
+		rate = 0.02
+	}
+}
+
+MODULE
+{
+	name = Lem1802
+
+	RESOURCE
+	{
+		name = ElectricCharge
+		rate = 0.01
+	}
+}
+
+MODULE
+{
+	name = GenericKeyboard
+
+	RESOURCE
+	{
+		name = ElectricCharge
+		rate = 0.01
+	}
+}
+
+MODULE
+{
+	name = GenericClock
+
+	RESOURCE
+	{
+		name = ElectricCharge
+		rate = 0.01
 	}
 }
 

diff --git a/GameData/Ketchup/Parts/Dcpu16ComputerStackSmall/part.cfg b/GameData/Ketchup/Parts/Dcpu16ComputerStackSmall/part.cfg
@@ -54,13 +54,45 @@ MODULE
 
 MODULE
 {
-	name = Dcpu16Computer
-	minimumCrew = 0
+	name = Computer
 
 	RESOURCE
 	{
 		name = ElectricCharge
-		rate = 0.05
+		rate = 0.02
+	}
+}
+
+MODULE
+{
+	name = Lem1802
+
+	RESOURCE
+	{
+		name = ElectricCharge
+		rate = 0.01
+	}
+}
+
+MODULE
+{
+	name = GenericKeyboard
+
+	RESOURCE
+	{
+		name = ElectricCharge
+		rate = 0.01
+	}
+}
+
+MODULE
+{
+	name = GenericClock
+
+	RESOURCE
+	{
+		name = ElectricCharge
+		rate = 0.01
 	}
 }
 

diff --git a/Ketchup.sln b/Ketchup.sln
@@ -3,7 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.20617.1 PREVIEW
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ketchup", "Ketchup\Ketchup.csproj", "{05B224A9-D0CC-4EE8-8BE1-822593FC55E6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ketchup", "Source\Ketchup\Ketchup.csproj", "{05B224A9-D0CC-4EE8-8BE1-822593FC55E6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ketchup.Api", "Source\Ketchup.Api\Ketchup.Api.csproj", "{BF83C18A-AD39-4083-A819-5B42B3812664}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{321C0367-C334-4476-BB51-15EC365E65BF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Properties", "Properties", "{4A237490-DCF2-451D-984D-EE3A5CB0A96B}"
+	ProjectSection(SolutionItems) = preProject
+		Source\Properties\GlobalAssemblyInfo.cs = Source\Properties\GlobalAssemblyInfo.cs
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,8 +24,17 @@ Global
 		{05B224A9-D0CC-4EE8-8BE1-822593FC55E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{05B224A9-D0CC-4EE8-8BE1-822593FC55E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{05B224A9-D0CC-4EE8-8BE1-822593FC55E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF83C18A-AD39-4083-A819-5B42B3812664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF83C18A-AD39-4083-A819-5B42B3812664}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF83C18A-AD39-4083-A819-5B42B3812664}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF83C18A-AD39-4083-A819-5B42B3812664}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{BF83C18A-AD39-4083-A819-5B42B3812664} = {321C0367-C334-4476-BB51-15EC365E65BF}
+		{05B224A9-D0CC-4EE8-8BE1-822593FC55E6} = {321C0367-C334-4476-BB51-15EC365E65BF}
+		{4A237490-DCF2-451D-984D-EE3A5CB0A96B} = {321C0367-C334-4476-BB51-15EC365E65BF}
+	EndGlobalSection
 EndGlobal
diff --git a/Ketchup.sln.DotSettings b/Ketchup.sln.DotSettings
@@ -0,0 +1,13 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EX/@EntryIndexedValue">EX</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IA/@EntryIndexedValue">IA</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KCPU/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KCPU/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KVFC/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KVFC/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KVIC/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KVIC/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PC/@EntryIndexedValue">PC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SP/@EntryIndexedValue">SP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VIC/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VIC/@EntryIndexRemoved">True</s:Boolean></wpf:ResourceDictionary>