Merge remote-tracking branch 'origin/master'

# Conflicts: # core/src/com/knightwars/game/YamlParser.java # core/src/com/knightwars/game/environment/Map.java # core/src/com/knightwars/tests/BuildingTreeTest.java
rmalmain · Apr 24, 2020 · 1ab355c · 1ab355c
2 parents 63fc056 + d00af50
commit 1ab355c
Showing 1 changed file with 28 additions and 0 deletions.
diff --git a/core/src/com/knightwars/tests/building-structure.yml b/core/src/com/knightwars/tests/building-structure.yml
@@ -0,0 +1,28 @@
+ClassicCastle:
+  - FortifiedCastle
+
+FortifiedCastle:
+  - Citadel1
+  - Garrison1
+  - Market1
+  - Forge1
+
+Citadel1:
+  - Citadel2
+
+Garrison1:
+  - Garrison2
+
+Market1:
+  - Market2
+
+Forge1:
+  Forge2
+
+Citadel2:
+
+Garrison2:
+
+Market2:
+
+Forge2: