Skip to content

Commit

Permalink
Merge pull request #516 from Nashet/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Nashet authored Sep 6, 2018
2 parents 75d92fa + c97e7b9 commit 40bc606
Show file tree
Hide file tree
Showing 199 changed files with 9,167 additions and 6,060 deletions.
52 changes: 26 additions & 26 deletions Assets/EconomicSimulation/Diagrams/GeneralClasses.cd
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<Class Name="Nashet.EconomicSimulation.ProductionType" Collapsed="true" BaseTypeListCollapsed="true">
<Position X="54.25" Y="2.5" Width="1.5" />
<TypeIdentifier>
<HashCode>BAKAAEABGAAMAwBEAAAEABAgAcCGAYoAYEA6AAkQABE=</HashCode>
<HashCode>BAKAAEABGAAMAxBEAAAEABAgAcCGAYoAYEA6AAkQABE=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\FactoryType.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" Collapsed="true" />
Expand All @@ -137,7 +137,7 @@
<Class Name="Nashet.EconomicSimulation.Product" Collapsed="true" BaseTypeListCollapsed="true">
<Position X="52.5" Y="2.5" Width="1.5" />
<TypeIdentifier>
<HashCode>gQlAggCSAMABECIVUAgAMAKUFxyACCOmsiAqkgYBEQk=</HashCode>
<HashCode>AQFAggCSAMABECIV0AgAMAKUFxyAACOmsqAqkkQBEQk=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\Product.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" Collapsed="true" />
Expand Down Expand Up @@ -196,7 +196,7 @@
<Class Name="Nashet.EconomicSimulation.Consumer" Collapsed="true">
<Position X="33" Y="1.75" Width="1.5" />
<TypeIdentifier>
<HashCode>AAIAABQAgIAAIKAAAAAAAAACAAAAAAAAAAAABCQAAAA=</HashCode>
<HashCode>AAIEABQAgIAAIKAAAAAAAAAAAAAAAAAAAAAABCQAAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Consumer.cs</FileName>
</TypeIdentifier>
</Class>
Expand All @@ -217,7 +217,7 @@
<Class Name="Nashet.EconomicSimulation.Country" Collapsed="true">
<Position X="44.25" Y="6.25" Width="1.5" />
<TypeIdentifier>
<HashCode>ucLH0AMK4rzXhorPptnFTTLAHaFtTowAoUJH5a2gGpY=</HashCode>
<HashCode>uULG0AMK4rzXhoJPptnFTTLgHaFtTowBoUJH5a2oGpY=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Country.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
Expand All @@ -233,14 +233,14 @@
<Class Name="Nashet.EconomicSimulation.MainCamera" Collapsed="true">
<Position X="52.5" Y="1.5" Width="1.5" />
<TypeIdentifier>
<HashCode>ABQUQAAAkqgEQAJAAAVAAgAEAEBABAK4igFAACAAAAE=</HashCode>
<HashCode>ABQUQAAAkqgGQAJAAAVAAgAEAGBABAK4igFAAAgAICE=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\EntryPoint\MainCamera.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Nashet.EconomicSimulation.Game" Collapsed="true">
<Position X="49" Y="1.5" Width="1.5" />
<TypeIdentifier>
<HashCode>AAABAAAChAMAGhIAAKAEkAAEAAAIAAAABgAEAQAgICQ=</HashCode>
<HashCode>AACBAAAChAMCHhIAAIAEkAAEAAAIAAAABgAEAQAgICQ=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Game.cs</FileName>
</TypeIdentifier>
</Class>
Expand All @@ -263,7 +263,7 @@
<Class Name="Nashet.EconomicSimulation.MultiSeller" Collapsed="true">
<Position X="44.25" Y="4.75" Width="1.5" />
<TypeIdentifier>
<HashCode>gAAABCAAgIAAAAaAIBAAEABCAAEAEAAECAASAAhAgEA=</HashCode>
<HashCode>gAAABCAAgIAAAAaAIAAAEABCAAEAEAAECAACAAhAgEA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\MultiSeller.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
Expand All @@ -278,7 +278,7 @@
<Class Name="Nashet.EconomicSimulation.Province" Collapsed="true" BaseTypeListCollapsed="true">
<Position X="56" Y="2.5" Width="1.5" />
<TypeIdentifier>
<HashCode>HQEBKkRGoiegkaiaC4iQeCSAFQYoABHSG8SQgFR3UA4=</HashCode>
<HashCode>DQEBCERGoCcgGagSKwCQUCSgFYYoBBGCFMyQAFA/UA4=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Province.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" Collapsed="true" />
Expand All @@ -294,14 +294,14 @@
<Class Name="Nashet.EconomicSimulation.World" Collapsed="true">
<Position X="52.5" Y="3.5" Width="1.5" />
<TypeIdentifier>
<HashCode>IQJRABAgACWAAQBIgsAwQIEACQAAEGAACIAIQAAACFA=</HashCode>
<HashCode>AAIQQBAgECFABYBAosAgQIMgGYIgFGAACIAIQAAICFA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Mono\World.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Nashet.EconomicSimulation.Market" Collapsed="true">
<Position X="19.5" Y="1.75" Width="1.5" />
<TypeIdentifier>
<HashCode>AhIBgBEAAoCIARCEQCCKAAABSQACFSAAgAEAQEQAACE=</HashCode>
<HashCode>AhIBgBEAAoCIARCFQCCKABABSQACFSAAgEUAQEwAAAE=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Market.cs</FileName>
</TypeIdentifier>
</Class>
Expand All @@ -326,32 +326,32 @@
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\Ownership.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Nashet.EconomicSimulation.IHasCountry" Collapsed="true">
<Position X="52.25" Y="5.75" Width="1.5" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Interfaces.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Nashet.EconomicSimulation.IWayOfLifeChange">
<Position X="57.75" Y="5.75" Width="1.5" />
<Interface Name="Nashet.EconomicSimulation.ISeller" Collapsed="true">
<Position X="49" Y="4.75" Width="1.5" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Interfaces.cs</FileName>
<HashCode>AAAAACAAAAAAAAAAAAAAEAAAAAEAAAAAAAAAAABAAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Interfaces\ISeller.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Nashet.EconomicSimulation.IInvestable" Collapsed="true">
<Position X="52.25" Y="7" Width="1.5" />
<TypeIdentifier>
<HashCode>AAACAEAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Interfaces.cs</FileName>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Interfaces\IInvestable.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Nashet.EconomicSimulation.ISeller" Collapsed="true">
<Position X="49" Y="4.75" Width="1.5" />
<Interface Name="Nashet.EconomicSimulation.IWayOfLifeChange">
<Position X="57.75" Y="5.75" Width="1.5" />
<TypeIdentifier>
<HashCode>AAAAACAAAAAAAAAAAAAAEAAAAAEAAAAAAAAAAABAAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Interfaces.cs</FileName>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Interfaces\IWayOfLifeChange.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Nashet.EconomicSimulation.IHasCountry" Collapsed="true">
<Position X="52.25" Y="5.75" Width="1.5" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Interfaces\IHasCountry.cs</FileName>
</TypeIdentifier>
</Interface>
<Font Name="Segoe UI" Size="9" />
Expand Down
203 changes: 203 additions & 0 deletions Assets/EconomicSimulation/Diagrams/Reforms.cd
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
<?xml version="1.0" encoding="utf-8"?>
<ClassDiagram MajorVersion="1" MinorVersion="1">
<Class Name="Nashet.EconomicSimulation.Reforms.Separatism">
<Position X="12.5" Y="6.75" Width="2" />
<Compartments>
<Compartment Name="Nested Types" Collapsed="false" />
</Compartments>
<NestedTypes>
<Class Name="Nashet.EconomicSimulation.Reforms.Separatism.Goal">
<TypeIdentifier>
<NewMemberFileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\Separatism.cs</NewMemberFileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
</Class>
</NestedTypes>
<TypeIdentifier>
<HashCode>AABAABEAAAAAAABAABAAAAAAAAAAAIAAAAAAAAAABAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\Separatism.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Nashet.EconomicSimulation.Reforms.Economy">
<Position X="15.25" Y="6.75" Width="2" />
<Compartments>
<Compartment Name="Nested Types" Collapsed="false" />
</Compartments>
<NestedTypes>
<Class Name="Nashet.EconomicSimulation.Reforms.Economy.EconomyReformValue">
<TypeIdentifier>
<NewMemberFileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\Economy.cs</NewMemberFileName>
</TypeIdentifier>
</Class>
</NestedTypes>
<TypeIdentifier>
<HashCode>AAACIABBAYEKAoAAARAgCAABAgIQAAAAQAAAgAAQABE=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\Economy.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Nashet.EconomicSimulation.Reforms.Government">
<Position X="18" Y="6.75" Width="2" />
<Compartments>
<Compartment Name="Nested Types" Collapsed="false" />
</Compartments>
<NestedTypes>
<Class Name="Nashet.EconomicSimulation.Reforms.Government.GovernmentReformValue" Collapsed="true">
<TypeIdentifier>
<NewMemberFileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\Government.cs</NewMemberFileName>
</TypeIdentifier>
</Class>
</NestedTypes>
<TypeIdentifier>
<HashCode>AAAAIAAQwACBAgAAAxAAgAAABRIAAIQABAAiESIAAQI=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\Government.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Nashet.EconomicSimulation.Reforms.MinimalWage">
<Position X="5.25" Y="6.75" Width="2" />
<Compartments>
<Compartment Name="Nested Types" Collapsed="false" />
</Compartments>
<NestedTypes>
<Class Name="Nashet.EconomicSimulation.Reforms.MinimalWage.MinWageReformValue">
<TypeIdentifier>
<NewMemberFileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\MinimalWage.cs</NewMemberFileName>
</TypeIdentifier>
</Class>
</NestedTypes>
<TypeIdentifier>
<HashCode>AAAAAABAAAAAAgAAKBAAAAAAAAAAQAAAAAAQAAEAgAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\MinimalWage.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Nashet.EconomicSimulation.Reforms.MinorityPolicy">
<Position X="23.5" Y="6.75" Width="1.5" />
<NestedTypes>
<Class Name="Nashet.EconomicSimulation.Reforms.MinorityPolicy.MinorityPolicyValue" Collapsed="true">
<TypeIdentifier>
<NewMemberFileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\MinorityPolicy.cs</NewMemberFileName>
</TypeIdentifier>
</Class>
</NestedTypes>
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAgAAABAAAEAAAAAAAAAAABAAAAAgAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\MinorityPolicy.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Nashet.EconomicSimulation.Reforms.Serfdom">
<Position X="20.75" Y="6.75" Width="2" />
<Compartments>
<Compartment Name="Nested Types" Collapsed="false" />
</Compartments>
<NestedTypes>
<Class Name="Nashet.EconomicSimulation.Reforms.Serfdom.SerfdomReformValue" Collapsed="true">
<TypeIdentifier>
<NewMemberFileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\Serfdom.cs</NewMemberFileName>
</TypeIdentifier>
</Class>
</NestedTypes>
<TypeIdentifier>
<HashCode>AACAAAIAAIAAggAEABAAAEAAAAAAAAAAAAAAAAAAABI=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\Serfdom.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Nashet.EconomicSimulation.Reforms.UnemploymentSubsidies">
<Position X="2.5" Y="6.75" Width="2" />
<Compartments>
<Compartment Name="Nested Types" Collapsed="false" />
</Compartments>
<NestedTypes>
<Class Name="Nashet.EconomicSimulation.Reforms.UnemploymentSubsidies.UnemploymentReformValue">
<TypeIdentifier>
<NewMemberFileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\UnemploymentSubsidies.cs</NewMemberFileName>
</TypeIdentifier>
</Class>
</NestedTypes>
<TypeIdentifier>
<HashCode>AAAAAABAAAAAAgAACBAAAAAAAAAAQAAAAAAQAAEAgAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\UnemploymentSubsidies.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Nashet.EconomicSimulation.Reforms.ProcentReform">
<Position X="8.75" Y="6.75" Width="2" />
<Compartments>
<Compartment Name="Nested Types" Collapsed="false" />
</Compartments>
<NestedTypes>
<Class Name="Nashet.EconomicSimulation.Reforms.ProcentReform.ProcentReformValue">
<TypeIdentifier>
<NewMemberFileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\ProcentReform.cs</NewMemberFileName>
</TypeIdentifier>
</Class>
</NestedTypes>
<TypeIdentifier>
<HashCode>AAAAACAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\ProcentReform.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Nashet.EconomicSimulation.Reforms.AbstractReformValue">
<Position X="1.5" Y="12.5" Width="1.5" />
<TypeIdentifier>
<HashCode>EAAAAACAACAgggAAAAAAAAAABAAAAKAAACAAAAAQBQA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\AbstractReformValue.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
</Class>
<Class Name="Nashet.EconomicSimulation.Reforms.TaxationForPoor">
<Position X="8" Y="11.75" Width="1.5" />
<Compartments>
<Compartment Name="Nested Types" Collapsed="false" />
</Compartments>
<NestedTypes>
<Class Name="Nashet.EconomicSimulation.Reforms.TaxationForPoor.PoorTaxValue">
<TypeIdentifier>
<NewMemberFileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\TaxationForPoor.cs</NewMemberFileName>
</TypeIdentifier>
</Class>
</NestedTypes>
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\TaxationForPoor.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Nashet.EconomicSimulation.Reforms.TaxationForRich">
<Position X="10.25" Y="11.75" Width="1.5" />
<Compartments>
<Compartment Name="Nested Types" Collapsed="false" />
</Compartments>
<NestedTypes>
<Class Name="Nashet.EconomicSimulation.Reforms.TaxationForRich.RichTaxValue">
<TypeIdentifier>
<NewMemberFileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\TaxationForRich.cs</NewMemberFileName>
</TypeIdentifier>
</Class>
</NestedTypes>
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\TaxationForRich.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Nashet.EconomicSimulation.Reforms.AbstractReform">
<Position X="13" Y="0.5" Width="1.5" />
<TypeIdentifier>
<HashCode>AAiAAAAAAAAAAoAEoAAAAAAAAQMEAIAAACAgAAAQgiA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\AbstractReform.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
</Class>
<Class Name="Nashet.EconomicSimulation.Reforms.NamedReformValue" BaseTypeListCollapsed="true">
<Position X="1.5" Y="17.25" Width="1.5" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAIAEIAAAAAAAAAAEAIAAAAAAAAAAAAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\NamedReformValue.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" Collapsed="true" />
</Class>
<Interface Name="Nashet.EconomicSimulation.Reforms.IReformValue" Collapsed="true">
<Position X="26" Y="0.5" Width="1.5" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAgAAAAAAAAAAAAAAAIAAACAAAAAQBAA=</HashCode>
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\IReformValue.cs</FileName>
</TypeIdentifier>
</Interface>
<Font Name="Segoe UI" Size="9" />
</ClassDiagram>
9 changes: 9 additions & 0 deletions Assets/EconomicSimulation/Diagrams/Reforms.cd.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 40bc606

Please sign in to comment.