Merge pull request #106 from heinezen/gamestate-fixes

openage gamestate fixes

.clang-format

@@ -0,0 +1,130 @@
+---
+# SFT codestyle
+# Tab indent + space alignment
+# see documentation in doc/code_style/ for details and explainations.
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments: false
+AlignConsecutiveBitFields: false
+AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: false
+AlignEscapedNewlines: DontAlign
+AlignOperands:   Align
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterExternBlock: false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     true
+  BeforeElse:      true
+  BeforeLambdaBody: false
+  BeforeWhile:     true
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyNamespace: false
+  SplitEmptyRecord: false
+BreakAfterJavaFieldAnnotations: true
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: AfterColon
+BreakInheritanceList: BeforeComma
+BreakStringLiterals: false
+ColumnLimit:     0
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '.*'
+    Priority:        3
+    SortPriority:    0
+IncludeIsMainRegex: ''
+IncludeIsMainSourceRegex: ''
+IndentCaseBlocks: false
+IndentCaseLabels: false
+IndentExternBlock: NoIndent
+IndentGotoLabels: false
+IndentPPDirectives: None
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+# clang-format-16 InsertNewlineAtEOF: true
+InsertTrailingCommas: Wrapped
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Right
+ReflowComments: false
+SortIncludes:    CaseInsensitive
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  Never
+SpacesInCStyleCastParentheses: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Latest
+TabWidth:        4
+UseCRLF:         false
+UseTab:          AlignWithSpaces
+...

README.md

@@ -14,7 +14,7 @@ properly represent the enormous complexity of storing the data for [openage](htt
 The main focus is *readability* and *moddability*.
 
 [![github stars](https://img.shields.io/github/stars/SFTtech/nyan.svg)](https://github.com/SFTtech/nyan/stargazers)
-[![#sfttech on Freenode](https://img.shields.io/badge/chat-on%20freenode-brightgreen)](https://webchat.freenode.net/?channels=sfttech)
+[![#sfttech on matrix.org](/doc/assets/matrix.svg)](https://matrix.to/#/#sfttech:matrix.org)
 
 
 The foundation of **nyan**:
@@ -123,19 +123,21 @@ Current State of the Project
 ----------------------------
 
 `nyan` is fully functional and can be used in your project.
+Please make us aware of your needs/experiences in our chat!
 
-There's some features left to implement, but those only
-cover special use cases:
+We try to keep the API stable, but there's still some unknowns and need-to-change features.
 
-* [ ] Inverse patch generation
-* [ ] Subobject set specializations
-* [ ] Callback trigger when a value changes
-* [ ] Member name qualifications for name conflict resolving
+Please submit bugs and feature requests (and patches) on [GitHub](https://github.com/SFTtech/nyan)!
 
 
 Dependencies, Building and Running
 ----------------------------------
 
+Operating System    | Build status
+--------------------|--------------
+Debian Sid          | [Todo: Kevin #11](https://github.com/SFTtech/kevin/issues/11)
+
+
  - How do I get this to install on my box?
    - See [doc/building.md](doc/building.md).
 
@@ -148,12 +150,6 @@ All of those observations are intended, not bugs.
 
 To get rid of them, recompile with `--dont-segfault --shut-up --new-girlfriend`.
 
-Operating System    | Build status
---------------------|--------------
-Debian Sid          | [Todo: Kevin #11](https://github.com/SFTtech/kevin/issues/11)
-MacOSX 10.14        | [![Build Status](https://travis-ci.org/SFTtech/nyan.svg?branch=master)](https://travis-ci.org/SFTtech/nyan)
-Windows 10 - x64    | [![Build status](https://ci.appveyor.com/api/projects/status/6t1yonx5fu7dejs0/branch/master?svg=true)](https://ci.appveyor.com/project/simonsan/nyan-c53id/branch/master)
-
 If this still does not help, try the [contact section](#contact)
 or the [bug tracker](https://github.com/SFTtech/nyan/issues).
 
@@ -176,10 +172,9 @@ Contact
 -------
 
 If you have the desire to perform semi-human interaction,
-join our **Matrix** or **IRC** chatroom!
+join our **Matrix** chatroom!
 
 * [`#sfttech:matrix.org`](https://riot.im/app/#/room/#sfttech:matrix.org)
-* [`irc.freenode.net #sfttech`](https://webchat.freenode.net/?channels=sfttech)
 
 For ideas, problems, ..., use the [issue tracker](https://github.com/SFTtech/nyan/issues)!
 

nyan/CMakeLists.txt

@@ -68,6 +68,7 @@ add_library(nyan SHARED
 	util/flags.cpp
 	value_token.cpp
 	value/boolean.cpp
+	value/container_types.cpp
 	value/container.cpp
 	value/dict.cpp
 	value/file.cpp
@@ -77,7 +78,6 @@ add_library(nyan SHARED
 	value/orderedset.cpp
 	value/set.cpp
 	value/set_base.cpp
-	value/set_types.cpp
 	value/text.cpp
 	value/value.cpp
 	value/value_holder.cpp