Merge remote-tracking branch 'upstream/master' into sort_soldiers

Author: myk002

Makefile.am

@@ -324,8 +324,6 @@ openxcom_SOURCES = \
 	src/Geoscape/CraftErrorState.h \
 	src/Geoscape/CraftPatrolState.cpp \
 	src/Geoscape/CraftPatrolState.h \
-	src/Geoscape/DefeatState.cpp \
-	src/Geoscape/DefeatState.h \
 	src/Geoscape/DogfightState.cpp \
 	src/Geoscape/DogfightState.h \
 	src/Geoscape/FundingState.cpp \
@@ -370,8 +368,6 @@ openxcom_SOURCES = \
 	src/Geoscape/UfoDetectedState.h \
 	src/Geoscape/UfoLostState.cpp \
 	src/Geoscape/UfoLostState.h \
-	src/Geoscape/VictoryState.cpp \
-	src/Geoscape/VictoryState.h \
 	src/Interface/ArrowButton.cpp \
 	src/Interface/ArrowButton.h \
 	src/Interface/Bar.cpp \
@@ -410,12 +406,12 @@ openxcom_SOURCES = \
 	src/Menu/AbandonGameState.h \
 	src/Menu/ConfirmLoadState.cpp \
 	src/Menu/ConfirmLoadState.h \
+	src/Menu/CutsceneState.cpp \
+	src/Menu/CutsceneState.h \
 	src/Menu/DeleteGameState.cpp \
 	src/Menu/DeleteGameState.h \
 	src/Menu/ErrorMessageState.cpp \
 	src/Menu/ErrorMessageState.h \
-	src/Menu/IntroState.cpp \
-	src/Menu/IntroState.h \
 	src/Menu/ListGamesState.cpp \
 	src/Menu/ListGamesState.h \
 	src/Menu/ListLoadOriginalState.cpp \
@@ -458,10 +454,14 @@ openxcom_SOURCES = \
 	src/Menu/PauseState.h \
 	src/Menu/SaveGameState.cpp \
 	src/Menu/SaveGameState.h \
+	src/Menu/SlideshowState.cpp \
+	src/Menu/SlideshowState.h \
 	src/Menu/StartState.cpp \
 	src/Menu/StartState.h \
 	src/Menu/TestState.cpp \
 	src/Menu/TestState.h \
+	src/Menu/VideoState.cpp \
+	src/Menu/VideoState.h \
 	src/Resource/ResourcePack.cpp \
 	src/Resource/ResourcePack.h \
 	src/Resource/XcomResourcePack.cpp \

README.md

@@ -23,8 +23,8 @@ at:
 
 Do not use modded versions (e.g. with XcomUtil) as they may cause bugs and
 crashes.  Copy the UFO subfolders to the UFO subdirectory in OpenXcom's data
-folder and/or the TFTD subfolders to the TFTD subdirectory in OpenXcom's data
-folder (see below for data folder locations).
+or user folder and/or the TFTD subfolders to the TFTD subdirectory in OpenXcom's
+data or user folder (see below for folder locations).
 
 ## Mods
 
@@ -87,6 +87,10 @@ passing a commandline argument when running OpenXcom.  For example:
 
     openxcom -data "$HOME/bin/OpenXcom/usr/share/openxcom"
 
+or, if you have a fully self-contained installation:
+
+    openxcom -data "$HOME/games/openxcom/data" -user "$HOME/games/openxcom/user" -config "$HOME/games/openxcom/config"
+
 ### Windows
 
 User and Config folder:

bin/TFTD/README.txt

@@ -1,6 +1,11 @@
 Copy all the X-COM: Terror From the Deep subfolders to this directory!
 
+If you can't write to this directory, you can also create a TFTD folder in your
+user folder (where your OpenXcom savegames are) and copy your TFTD subfolders
+there.
+
 After the copy, this directory should contain at least the following items:
+  ANIMS (optional -- not all TFTD versions have this directory)
   FLOP_INT
   GEODATA
   GEOGRAPH

bin/UFO/README.txt

@@ -1,5 +1,9 @@
 Copy all the UFO: Enemy Unknown / X-COM: UFO Defense subfolders to this directory!
 
+If you can't write to this directory, you can also create a UFO folder in your
+user folder (where your OpenXcom savegames are) and copy your UFO subfolders
+there.
+
 After the copy, this directory should contain at least the following items:
   GEODATA
   GEOGRAPH

bin/common/Ruleset/soldierNames.rul

@@ -0,0 +1,4 @@
+# pull in all *.nam files in the SoldierName virtual directory by default
+# mods can override with specific files if desired
+soldierNames:
+  - SoldierName/

bin/standard/xcom1/Language/en-GB.yml

@@ -1176,8 +1176,9 @@ en-GB:
   STR_PSISTRENGTHEVAL: "Psi-Strength Evaluation"
   STR_PSISTRENGTHEVAL_DESC: "Evaluates the psionic strength of all soldiers after the appropriate research has been completed."
   STR_REMOVE_SELECTED: "Remove Selected"
-  STR_LIVE_ALIENS: "Live Aliens"
-  STR_DEAD_ALIENS: "Dead Aliens"
+  STR_LIVE_ALIENS: "Live{NEWLINE}Specimens"
+  STR_DEAD_ALIENS: "Rejected{NEWLINE}Specimens"
+  STR_UNDER_INTERROGATION: "Being{NEWLINE}Studied"
   STR_CONTAINMENT_EXCEEDED: "ALIEN CONTAINMENT LIMITS EXCEEDED!{SMALLLINE}Insufficient containment space at {0}. You must remove excess aliens from containment (who will then die)."
   STR_MANAGE_CONTAINMENT: "Manage Alien Containment"
   STR_STORAGE_EXCEEDED: "STORAGE SPACE EXCEEDED!{SMALLLINE}Insufficient storage space at {0}. You must sell off excess items."

bin/standard/xcom1/Language/en-US.yml

@@ -1176,8 +1176,9 @@ en-US:
   STR_PSISTRENGTHEVAL: "Psi-Strength Evaluation"
   STR_PSISTRENGTHEVAL_DESC: "Evaluates the psionic strength of all soldiers after the appropriate research has been completed."
   STR_REMOVE_SELECTED: "Remove Selected"
-  STR_LIVE_ALIENS: "Live Aliens"
-  STR_DEAD_ALIENS: "Dead Aliens"
+  STR_LIVE_ALIENS: "Live{NEWLINE}Specimens"
+  STR_DEAD_ALIENS: "Rejected{NEWLINE}Specimens"
+  STR_UNDER_INTERROGATION: "Being{NEWLINE}Studied"
   STR_CONTAINMENT_EXCEEDED: "ALIEN CONTAINMENT LIMITS EXCEEDED!{SMALLLINE}Insufficient containment space at {0}. You must remove excess aliens from containment (who will then die)."
   STR_MANAGE_CONTAINMENT: "Manage Alien Containment"
   STR_STORAGE_EXCEEDED: "STORAGE SPACE EXCEEDED!{SMALLLINE}Insufficient storage space at {0}. You must sell off excess items."

bin/standard/xcom1/alienDeployments.rul

@@ -1223,8 +1223,8 @@ alienDeployments:
     shade: 15
     race: STR_SECTOID
     nextStage: STR_MARS_THE_FINAL_ASSAULT
-    noRetreat: true
     finalDestination: true
+    loseCutscene: losegame
     briefing:
       textOffset: -16
       palette: 6
@@ -1380,13 +1380,13 @@ alienDeployments:
       - UBASE
     shade: 5
     race: STR_MIXED
-    noRetreat: true
-    finalMission: true
+    winCutscene: wingame
+    loseCutscene: losegame
     briefing:
       textOffset: -16
       palette: 6
       music: GMNEWMAR
       showTarget: false
       showCraft: false
       background: BACK01.SCR
-    script: BOSSBATTLE
+    script: BOSSBATTLE

bin/standard/xcom1/cutscenes.rul

@@ -1,4 +1,50 @@
 cutscenes:
   - type: intro
+    useUfoAudioSequence: true
     videos:
-      - UFOINTRO/UFOINT.FLI
+      - UFOINTRO/UFOINT.FLI
+  - type: wingame
+    slideshow:
+      transitionSeconds: 30
+      musicId: "GMWIN"
+      slides:
+        - imagePath: "UFOINTRO/PICT1.LBM"
+          caption: STR_VICTORY_1
+          captionSize: [195, 56]
+          captionPos: [5, 0]
+          captionColor: 249
+        - imagePath: "UFOINTRO/PICT2.LBM"
+          caption: STR_VICTORY_2
+          captionSize: [232, 64]
+          captionPos: [88, 136]
+          captionColor: 249
+        - imagePath: "UFOINTRO/PICT3.LBM"
+          caption: STR_VICTORY_3
+          captionSize: [254, 48]
+          captionPos: [66, 152]
+          captionColor: 249
+        - imagePath: "UFOINTRO/PICT6.LBM"
+          caption: STR_VICTORY_4
+          captionSize: [300, 200]
+          captionPos: [5, 0]
+          captionColor: 249
+        - imagePath: "UFOINTRO/PICT7.LBM"
+          caption: STR_VICTORY_5
+          captionSize: [310, 42]
+          captionPos: [5, 158]
+          captionColor: 249
+  - type: losegame
+    slideshow:
+      transitionSeconds: 30
+      musicId: "GMLOSE"
+      slides:
+        - imagePath: "UFOINTRO/PICT4.LBM"
+          caption: STR_GAME_OVER_1
+          captionSize: [190, 104]
+          captionPos: [0, 0]
+          captionColor: 249
+        - imagePath: "UFOINTRO/PICT5.LBM"
+          caption: STR_GAME_OVER_2
+          captionSize: [200, 34]
+          captionPos: [32, 0]
+          captionColor: 249

bin/standard/xcom1/font.rul

@@ -0,0 +1,2 @@
+fontName: Font.dat
+