[game-data-packager] 08/11: enable TNT Doom patch for Golden Key on level 31

[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 8aae1b0861180ded936f4065c2169f94837ee811
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Thu Jun 4 13:07:53 2015 +0200

    enable TNT Doom patch for Golden Key on level 31
    
    http://classicdoom.com/pctnt31p.htm
    
    use new support to enable nerve.wad to work
    with FreeDoom
---
 data/compet_n.yaml                      | 12 ++++++------
 data/doom2.yaml                         |  3 +++
 data/final-doom.yaml                    |  5 ++++-
 game_data_packager/games/doom_common.py |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/data/compet_n.yaml b/data/compet_n.yaml
index b04f72a..4b08992 100644
--- a/data/compet_n.yaml
+++ b/data/compet_n.yaml
@@ -23,22 +23,22 @@ packages:
     main_wads:
       av.wad:
          name: Alien Vendetta (2nd Ed.)
-         args: -deh av.deh
+         args: -file %s -deh av.deh
       class_ep.wad:
          name: The Classic Episode (1st Ed.)
-         args: -iwad doom.wad -warp 2 1
+         args: -iwad doom.wad -file %s -warp 2 1
       hr.wad:
          name: Hell Revealed
-         args: hrmus.wad
+         args: -file %s hrmus.wad
       mm.wad:
          name: Memento Mori
-         args: mm11fix.wad mmmus.wad
+         args: -file %s mm11fix.wad mmmus.wad
       mm2.wad:
          name: Memento Mori II
-         args: mm2mus.wad
+         args: -file %s mm2mus.wad
       requiem.wad:
          name: Requiem
-         args: req21fix.wad reqmus.wad
+         args: -file %s req21fix.wad reqmus.wad
     install_to: usr/share/games/doom
     install:
     - av.wad
diff --git a/data/doom2.yaml b/data/doom2.yaml
index 3630a26..3c6eedc 100644
--- a/data/doom2.yaml
+++ b/data/doom2.yaml
@@ -36,6 +36,9 @@ packages:
       id: 208200
       path: "common/DOOM 3 BFG Edition"
     install_to: usr/share/games/doom
+    main_wads:
+      nerve.wad:
+        args: -file %s
     install:
     - nerve.wad
 
diff --git a/data/final-doom.yaml b/data/final-doom.yaml
index 1b8e16a..6fa805c 100644
--- a/data/final-doom.yaml
+++ b/data/final-doom.yaml
@@ -25,7 +25,10 @@ packages:
       conflicts: freedoom (<< 0.6.4-4), freedm (<< 0.6.4-4)
     install:
     - tnt.wad
-    #- tnt31.wad
+    - tnt31.wad
+    main_wads:
+      tnt.wad:
+        args: -iwad %s -file tnt31.wad
     install_to: usr/share/games/doom
 
   plutonia-wad:
diff --git a/game_data_packager/games/doom_common.py b/game_data_packager/games/doom_common.py
index 1a140e2..d6c5f64 100644
--- a/game_data_packager/games/doom_common.py
+++ b/game_data_packager/games/doom_common.py
@@ -133,7 +133,7 @@ class DoomGameData(GameData):
             entry['GenericName'] = self.genre + ' game'
             entry['TryExec'] = package.program
             if 'args' in quirks:
-                args = '-file ' + main_wad + ' ' + quirks['args']
+                args = quirks['args'] % main_wad
             elif package.expansion_for:
                 iwad = self.packages[package.expansion_for].only_file
                 assert iwad is not None, "Couldn't find %s's IWAD" % main_wad

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