Merge branch 'master' of github.com:SupSuper/OpenXcom

Author: Shoes01

.gitignore

@@ -71,10 +71,13 @@ bin/data/TERRAIN
 bin/data/UFOGRAPH
 bin/data/UFOINTRO
 bin/data/UNITS
+bin/data/ANIMS
+bin/data/FLOP_INT
 deps/
 docs/html/
 build/
 Dependencies/
+*.*.user
 #Ignore Vim swap files
 *.swp
 #Ignore NetBeans project directory

Makefile.am

@@ -227,8 +227,8 @@ openxcom_SOURCES = \
 	src/Engine/Exception.h \
 	src/Engine/FastLineClip.cpp \
 	src/Engine/FastLineClip.h \
-	src/Engine/Flc.cpp \
-	src/Engine/Flc.h \
+	src/Engine/FlcPlayer.cpp \
+	src/Engine/FlcPlayer.h \
 	src/Engine/Font.cpp \
 	src/Engine/Font.h \
 	src/Engine/Game.cpp \
@@ -411,6 +411,8 @@ openxcom_SOURCES = \
 	src/Menu/ErrorMessageState.h \
 	src/Menu/ListLoadState.cpp \
 	src/Menu/ListLoadState.h \
+	src/Menu/ListLoadOriginalState.cpp \
+	src/Menu/ListLoadOriginalState.h \
 	src/Menu/MainMenuState.cpp \
 	src/Menu/MainMenuState.h \
 	src/Menu/NewBattleState.cpp \
@@ -490,6 +492,8 @@ openxcom_SOURCES = \
 	src/Ruleset/MapData.h \
 	src/Ruleset/MapDataSet.cpp \
 	src/Ruleset/MapDataSet.h \
+	src/Ruleset/MapScript.cpp \
+	src/Ruleset/MapScript.h \
 	src/Ruleset/MCDPatch.cpp \
 	src/Ruleset/MCDPatch.h \
 	src/Ruleset/RuleAlienMission.cpp \
@@ -524,6 +528,8 @@ openxcom_SOURCES = \
 	src/Ruleset/RuleTerrain.h \
 	src/Ruleset/RuleUfo.cpp \
 	src/Ruleset/RuleUfo.h \
+	src/Ruleset/RuleVideo.cpp \
+	src/Ruleset/RuleVideo.h \
 	src/Ruleset/SoldierNamePool.cpp \
 	src/Ruleset/SoldierNamePool.h \
 	src/Ruleset/StatString.h \
@@ -578,6 +584,9 @@ openxcom_SOURCES = \
 	src/Savegame/SavedBattleGame.h \
 	src/Savegame/SavedGame.cpp \
 	src/Savegame/SavedGame.h \
+	src/Savegame/SaveConverter.cpp \
+	src/Savegame/SaveConverter.h \
+	src/Savegame/SaveConverterXcom1.h \
 	src/Savegame/SerializationHelper.h \
 	src/Savegame/SerializationHelper.cpp \
 	src/Savegame/Soldier.cpp \
@@ -618,6 +627,20 @@ openxcom_SOURCES = \
 	src/Ufopaedia/ArticleStateTextImage.h \
 	src/Ufopaedia/ArticleStateTFTD.cpp \
 	src/Ufopaedia/ArticleStateTFTD.h \
+	src/Ufopaedia/ArticleStateTFTDArmor.cpp \
+	src/Ufopaedia/ArticleStateTFTDArmor.h \
+	src/Ufopaedia/ArticleStateTFTDCraft.cpp \
+	src/Ufopaedia/ArticleStateTFTDCraft.h \
+	src/Ufopaedia/ArticleStateTFTDCraftWeapon.cpp \
+	src/Ufopaedia/ArticleStateTFTDCraftWeapon.h \
+	src/Ufopaedia/ArticleStateTFTDFacility.cpp \
+	src/Ufopaedia/ArticleStateTFTDFacility.h \
+	src/Ufopaedia/ArticleStateTFTDItem.cpp \
+	src/Ufopaedia/ArticleStateTFTDItem.h \
+	src/Ufopaedia/ArticleStateTFTDUso.cpp \
+	src/Ufopaedia/ArticleStateTFTDUso.h \
+	src/Ufopaedia/ArticleStateTFTDVehicle.cpp \
+	src/Ufopaedia/ArticleStateTFTDVehicle.h \
 	src/Ufopaedia/ArticleStateUfo.cpp \
 	src/Ufopaedia/ArticleStateUfo.h \
 	src/Ufopaedia/ArticleStateVehicle.cpp \

bin/data/Ruleset/PSX_Static_Cydonia_Map.rul

@@ -0,0 +1,76 @@
+mapScripts:
+  - type: BOSSBATTLE
+    commands:
+    - type: addBlock
+      groups: 2
+      executions: 2
+      rects:
+        - [1, 0, 1, 1]
+        - [3, 2, 1, 1]
+    - type: addBlock
+      blocks: 15
+      rects:
+        - [2, 3, 2, 2]
+    - type: addBlock
+      blocks: 3
+      executions: 2
+      rects:
+        - [0, 1, 2, 2]
+        - [4, 3, 2, 2]
+    - type: addBlock
+      blocks: 2
+      executions: 2
+      rects:
+        - [2, 0, 2, 2]
+        - [4, 0, 2, 2]
+    - type: addBlock
+      blocks: 8
+      executions: 2
+      rects:
+        - [2, 2, 1, 1]
+        - [2, 5, 1, 1]
+    - type: addBlock
+      blocks: 10
+      executions: 2
+      rects:
+        - [0, 3, 1, 1]
+        - [5, 5, 1, 1]
+    - type: addBlock
+      blocks: 13
+      executions: 2
+      rects:
+        - [1, 4, 1, 1]
+        - [4, 5, 1, 1]
+    - type: addBlock
+      blocks: 14
+      executions: 2
+      rects:
+        - [1, 5, 1, 1]
+        - [3, 5, 1, 1]
+    - type: addBlock
+      blocks: 11
+      rects:
+        - [4, 2, 1, 1]
+    - type: addBlock
+      blocks: 6
+      rects:
+        - [0, 5, 1, 1]
+    - type: fillArea
+      blocks: 7
+    - type: digTunnel
+      direction: both
+      tunnelData:
+        level: 0
+        MCDReplacements:
+          - type: westWall
+            set: 2
+            entry: 18
+          - type: northWall
+            set: 2
+            entry: 17
+          - type: corner
+            set: 2
+            entry: 19
+          - type: floor
+            set: 1
+            entry: 63