[game-data-packager] 01/01: handle split of chocolate-doom into chocolate-doom|heretic|hexen|strife

[Alexandre Detiste]

This is an automated email from the git hooks/post-receive script.

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit a632582c33846ca383437b4dff0654d890ecf970
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon May 4 15:16:06 2015 +0200

    handle split of chocolate-doom into chocolate-doom|heretic|hexen|strife
---
 data/heretic.yaml          | 2 +-
 data/hexen.yaml            | 2 +-
 data/strife.yaml           | 7 +++++++
 game_data_packager/util.py | 7 +++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/data/heretic.yaml b/data/heretic.yaml
index cdff7ac..023d8eb 100644
--- a/data/heretic.yaml
+++ b/data/heretic.yaml
@@ -7,7 +7,7 @@ longname: "Heretic: Shadow of the Serpent Riders"
 copyright: © 1994 Raven Software
 
 plugin: doom_common
-engine: "chocolate-doom | heretic-engine"
+engine: "chocolate-heretic | heretic-engine"
 
 help_text: |
   Please provide HERETIC.WAD from Heretic v1.3, and/or HERETIC1.WAD
diff --git a/data/hexen.yaml b/data/hexen.yaml
index 5b3e84b..437e552 100644
--- a/data/hexen.yaml
+++ b/data/hexen.yaml
@@ -19,7 +19,7 @@ help_text: |
   hexendemo.wad to avoid colliding with the full version of Hexen.
 
 plugin: doom_common
-engine: "chocolate-doom | hexen-engine"
+engine: "chocolate-hexen | hexen-engine"
 
 packages:
   hexen-wad:
diff --git a/data/strife.yaml b/data/strife.yaml
index fdd1ff2..1923478 100644
--- a/data/strife.yaml
+++ b/data/strife.yaml
@@ -8,6 +8,7 @@ longname: Strife
 copyright: © 1996 Rogue Entertainment
 plugin: doom_common
 genre: Role-playing
+engine: "chocolate-strife | strife-engine"
 
 help_text: |
   Please provide the STRIFE1.WAD and VOICES.WAD from
@@ -28,9 +29,15 @@ packages:
     - voices.wad
 
 files:
+  strife0.wad_teaser:
+    unsuitable: Strife 1.2-1.31 is required
+  strife0.wad:
+    unsuitable: Strife 1.2-1.31 is required
   strife1.wad_1.0:
     look_for: [strife1.wad]
     unsuitable: Strife 1.2-1.31 is required
+  strife11.zip:
+    unsuitable: Strife 1.2-1.31 is required
 
 cksums: |
   _ 10493652 strife0.wad_teaser
diff --git a/game_data_packager/util.py b/game_data_packager/util.py
index 3179d2f..8f30fe8 100644
--- a/game_data_packager/util.py
+++ b/game_data_packager/util.py
@@ -101,8 +101,11 @@ class PackageCache:
         if package == 'boom-engine':
             return (self.is_installed('prboom-plus')
                  or self.is_installed('doomsday'))
-        if package in ('heretic-engine', 'hexen-engine'):
-            return (self.is_installed('chocolate-doom')
+        if package == 'heretic-engine':
+            return (self.is_installed('chocolate-heretic')
+                 or self.is_installed('doomsday'))
+        if package == 'hexen-engine':
+            return (self.is_installed('chocolate-hexen')
                  or self.is_installed('doomsday'))
 
         return package in self.installed

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git