[game-data-packager] 01/01: descent2: add support for CD edition found at thrift shop
Alexandre Detiste
detiste-guest at moszumanska.debian.org
Wed Nov 25 22:04:43 UTC 2015
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 5d01b80f2bb1ebe9ea4dd2fcd06ae282022f0d5e
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date: Wed Nov 25 22:54:53 2015 +0100
descent2: add support for CD edition found at thrift shop
where discount means "No Type O Negative" for you...
----------------------------------
CD-ROM Track List (1 - 9)
#: MSF LSN Type Green? Copy?
1: 00:02:00 000000 data false no
2: 41:30:68 186668 audio false no 2 no
3: 42:16:68 190118 audio false no 2 no
4: 47:17:68 212693 audio false no 2 no
5: 50:59:68 229343 audio false no 2 no
6: 54:34:68 245468 audio false no 2 no
7: 56:54:68 255968 audio false no 2 no
8: 61:21:68 275993 audio false no 2 no
9: 65:02:68 292568 audio false no 2 no
170: 69:31:68 312743 leadout (701 MB raw, 610 MB formatted)
the track durations match that not-yet-supported "app/DESCENT_II.*" rip from GOG.com:
FILE "DESCENT_II.gog" BINARY
TRACK 01 MODE1/2352
INDEX 01 00:00:00
TRACK 02 AUDIO
INDEX 01 14:18:48
TRACK 03 AUDIO
INDEX 01 15:04:48
TRACK 04 AUDIO
INDEX 01 20:05:48
TRACK 05 AUDIO
INDEX 01 23:47:48
TRACK 06 AUDIO
INDEX 01 27:22:48
TRACK 07 AUDIO
INDEX 01 29:42:48
TRACK 08 AUDIO
INDEX 01 34:09:48
TRACK 09 AUDIO
INDEX 01 37:50:48
Continuing from README.TXT, but missing from 'PRIVATE LABEL' editions
(including GOG.com):
10) Haunted
Composer - Type O Negative
11) Are You Descent?
Composer - Ron Valdez
Mixed by - Johann Langlie
12) Techno Industry Composed and mixed by
Johann Langlie
13) Robot Jungle
Composed and mixed by - Johann Langlie
---
data/descent2.yaml | 97 ++++++++++++++++++++++++++++++++++++++-------
game_data_packager/build.py | 4 +-
2 files changed, 83 insertions(+), 18 deletions(-)
diff --git a/data/descent2.yaml b/data/descent2.yaml
index 965ef99..2de7491 100644
--- a/data/descent2.yaml
+++ b/data/descent2.yaml
@@ -29,7 +29,9 @@ packages:
- movies
- extra missions
doc:
- - gog documentation
+ - manual.pdf
+ - refcard.pdf
+ - readme.txt
files:
readme.txt?demo:
@@ -43,6 +45,26 @@ files:
- demo assets
- readme.txt?demo
+ readme.txt:
+ alternatives:
+ - readme.txt?1.1
+ - readme.txt?1.1private_label
+ - readme.txt?gog
+
+ descent2.sow:
+ unpack:
+ format: arj
+ unpack:
+ - '*.PIG'
+ - '*.MN2'
+ - '*.HOG'
+ - 'DESCENT2.*'
+ - 'README.TXT'
+ provides:
+ - full game assets
+ - movies
+ - extra missions
+
setup_descent_1_2.exe:
unpack:
format: innoextract
@@ -66,9 +88,27 @@ files:
- extra missions
- gog documentation
+ manual.pdf:
+ look_for: [manual.pdf,descent2.pdf]
+
+ # is this even neded or the engine can cope with
+ # all files in same directory ?
+ # like most ScummVM sub-engines
+ descent2.dem:
+ install_as: demos/descent2.dem
+ d2-2plyr.hog:
+ install_as: missions/d2-2plyr.hog
+ d2-2plyr.mn2:
+ install_as: missions/d2-2plyr.mn2
+ d2chaos.hog:
+ install_as: missions/d2chaos.hog
+ d2chaos.mn2:
+ install_as: missions/d2chaos.mn2
+
groups:
archives: |
4311406 1b952cc4a4419e24d230589027d73490 d2shar10.tar.gz
+ 23981577 495093db1efc7bf27586cd6819397932 descent2.sow
578313965 a16f246783339962eb5bc0d6e630952b setup_descent_1_2.exe
554371624 a2509588c7ca74b31689aeab19b16173 setup_descent2_2.1.0.10.exe
demo assets: |
@@ -77,9 +117,14 @@ groups:
2292566 e14ea49e03f58622244a25c680e1b6dd d2demo.hog
2800295 a68ed63e074468f38bfad88382741a5a d2demo.pig
88065 ab80e41750af684992cb2e066bb67856 readme.txt?demo
+ original documentation: |
+ 60327 fb089e6d5bc40f7649789c71427c39b2 readme.txt?1.1
+ 60380 e2df3653eaa52a5adb986f14e18c3433 readme.txt?1.1private_label
gog documentation: |
1723326 d3d117ee6bd92f45d38622f66f6d9528 manual.pdf
- 39179 31dbbc0a3c7641036ee4d2adc2ed6f60 readme.txt
+ # readme.txt?gog = heavily trimmed-down readme.txt?1.1private_label
+ # 9 insertions(+), 490 deletions(-)
+ 39179 31dbbc0a3c7641036ee4d2adc2ed6f60 readme.txt?gog
51219 a4904596b63b147e74b302a913b5c4ad refcard.pdf
movies: |
99782888 7853a531b3c2f0e20b3996f4cac14ae4 intro-h.mvl
@@ -87,14 +132,14 @@ groups:
16766970 2e10f1d66cf7ab69db05673a32a9ca72 robots-h.mvl
5087804 f4164b1db5b417aefa9558a0ccb4f6e1 robots-l.mvl
extra missions: |
- 194870 de49d2cef498e744270a8fd48290cb44 missions/d2-2plyr.hog
- 93 02e864529ee9ea0d5003ca46c3766149 missions/d2-2plyr.mn2
- 331847 e096dfef3276ba575309501f85f15f06 missions/d2chaos.hog
- 119 70624a8ef81f7278a7fef8be38aa2732 missions/d2chaos.mn2
+ 194870 de49d2cef498e744270a8fd48290cb44 d2-2plyr.hog
+ 93 02e864529ee9ea0d5003ca46c3766149 d2-2plyr.mn2
+ 331847 e096dfef3276ba575309501f85f15f06 d2chaos.hog
+ 119 70624a8ef81f7278a7fef8be38aa2732 d2chaos.mn2
full game assets: |
5016232 b0619642eeb50ac4d5198499a26b7355 alien1.pig
4912053 a242d46dfd0f16454f6f5377cbb424a5 alien2.pig
- 1168217 6c0d51cd4ff04030e66423895f74be72 demos/descent2.dem
+ 1168217 6c0d51cd4ff04030e66423895f74be72 descent2.dem
1307598 7f30c3d7d4087b8584b49012a53ce022 descent2.ham
7595079 1d4cd6418dd7adfc5d312c04c265e5e6 descent2.hog
2602492 cc802a0558775498748d301b86257e92 descent2.s11
@@ -103,6 +148,27 @@ groups:
4931752 b18a27d1ef0dd04aebbbf818c430a578 groupa.pig
4926111 d2a2f49892935395592bb56ae1a0f21e ice.pig
4833463 4722f02a4c5bfb3b17fe8da8d4141191 water.pig
+ stubbed files: |
+ 1 7fc56270e7a70fa81a5935b72eacbe29 readme.txt?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 intro-h.mvl?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 other-h.mvl?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 robots-h.mvl?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 robots-l.mvl?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 d2-2plyr.hog?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 d2-2plyr.mn2?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 d2chaos.hog?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 d2chaos.mn2?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 alien1.pig?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 alien2.pig?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 descent2.dem?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 descent2.ham?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 descent2.hog?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 descent2.s11?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 descent2.s22?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 fire.pig?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 groupa.pig?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 ice.pig?stub
+ 1 7fc56270e7a70fa81a5935b72eacbe29 water.pig?stub
sha1sums: |
6274ebf0b9a6d8d5983fc094b75e4128fc1a349f d2demo.dem
@@ -111,9 +177,10 @@ sha1sums: |
553132d3273d55c3fb76ee6d1de94b1c5068ae3b d2demo.pig
75eca5ea764a7deebe26f617354b56b322aeba04 readme.txt?demo
fc1740e21858244d33e840d85949084407e2e2fb d2shar10.tar.gz
+ d010a4e8f1bfc6d63eaca256280a676912542993 descent2.sow
80e040199b347f8f17f31afb32d551113cf40956 alien1.pig
2bbb8d941f8b06b56d5ddc7f723a206907a95548 alien2.pig
- 26ab4ceb00ef1cbd1dfd29a6f7bdd9f6bb28de07 demos/descent2.dem
+ 26ab4ceb00ef1cbd1dfd29a6f7bdd9f6bb28de07 descent2.dem
9f621706cbd601bd6938a44f5fb7e5cc55d4b61f descent2.ham
8e73beb4b64a7222fa2b5214282d5e671b313992 descent2.hog
72372b2fc9f88553fae6e26aba34a7c433322051 descent2.s11
@@ -123,10 +190,10 @@ sha1sums: |
f3df0545359e9f2a7f58a4dd07615bd87cce10bf ice.pig
9614aac967aa9f2efe10af553e506e27bb91e5ba intro-h.mvl
a96f3dcb8b0915c686430ff9c3def05d506ad9ff manual.pdf
- 15767e36f12ed8667249e19e948686c13dd5d90b missions/d2-2plyr.hog
- 156f66ae7ae48fff582116bdf0e91e0f3386b3af missions/d2chaos.hog
+ 15767e36f12ed8667249e19e948686c13dd5d90b d2-2plyr.hog
+ 156f66ae7ae48fff582116bdf0e91e0f3386b3af d2chaos.hog
e8f1a2d643feb2731fc05974ab202c4cd3aea0fd other-h.mvl
- 9be0238736785b59a5d7ef6077d5aca865df1135 readme.txt
+ 9be0238736785b59a5d7ef6077d5aca865df1135 readme.txt?gog
f986911bca2d2667ef179f1f8b73fc8162f8304b refcard.pdf
c130ecda730b5ce111947308a33b7911759fb3a5 robots-h.mvl
42be364b135bb2c3497ca39839533bde49c08644 robots-l.mvl
@@ -143,7 +210,7 @@ sha256sums: |
65e8dc58dc7fdc09696f9a06c814ef81f8026b330976a2dced3347895814a4af d2shar10.tar.gz
811fc58caa3e2a72cdfa07d7530b2bb0ca71836a6a2d8a3cb401e4284949c233 alien1.pig
75ef8fa0cba03410c61ad1b58f57dcb1481f1f302985828aab0af90639926055 alien2.pig
- e2fe2989350f14e270b954cbeae63d612493006778b29e2b66e318b679ae9e34 demos/descent2.dem
+ e2fe2989350f14e270b954cbeae63d612493006778b29e2b66e318b679ae9e34 descent2.dem
5233242206c677d65db7f075dd61f2b0a1b7bbe8cd65f56d769efaee1cc38b4d descent2.ham
f1abf516512739c97b43e2e93611a2398fc9f8bc7a014095ebc2b6b2fd21b703 descent2.hog
d444c6f93476f8941936164d2981387a26b0a25e3f9d5e930ef96bfbb86c1e68 descent2.s11
@@ -153,10 +220,10 @@ sha256sums: |
ae6152ef69502b00e51a98d8f04b21f2855a332cd2988ecceb3b909a49fa26a1 ice.pig
b40a60bccbb4e2eea5dad222f85fd63abd29f36a48b5bd60174e10820c174b84 intro-h.mvl
8802bc9b977c80d20c0f0e76b8191f6c2e7137a19468091479326e44bab5ddf4 manual.pdf
- f56f833e1026a35e8a8755987a93d5a0eb5bb12b40b8f190b9e7621ff24cead8 missions/d2-2plyr.hog
- 98acbdbc5d0180160337bac1ce28f3a30688378715fe89a45297b0ed6341b4cf missions/d2chaos.hog
+ f56f833e1026a35e8a8755987a93d5a0eb5bb12b40b8f190b9e7621ff24cead8 d2-2plyr.hog
+ 98acbdbc5d0180160337bac1ce28f3a30688378715fe89a45297b0ed6341b4cf d2chaos.hog
e00a016f6064cbb96b791597d9bd1fe70b3cf2e573778cc3136e3814634fddd0 other-h.mvl
- 0f357bed4ebc8977b8ba952148fac3447c4cff9eab8705d30b0bda639e706acd readme.txt
+ 0f357bed4ebc8977b8ba952148fac3447c4cff9eab8705d30b0bda639e706acd readme.txt?gog
89e424847f0d07e7cf9bd07cd68736a6de5670458fc699bc4dc4a240b6fc430b refcard.pdf
f491f078308a310b53bb46477b916f9de4cce9358a77b733e31b1bce86135b0a robots-h.mvl
601c0374f3f2c86c77621315bdd371c0c86abf956b5e50bf6673747df71990f1 robots-l.mvl
diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 6aee635..92b6b13 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1268,9 +1268,7 @@ class PackagingTask(object):
check_call(['arj', 'e', '-jya',
os.path.join(os.path.dirname(found_name),p)] +
list(to_unpack), cwd=tmpdir)
- for f in to_unpack:
- tmp = os.path.join(tmpdir, f)
- self.consider_file(tmp, True)
+ self.consider_file_or_dir(tmpdir, provider=provider)
elif fmt == 'cat':
self.cat_files(package, provider, wanted)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git
More information about the Pkg-games-commits
mailing list