[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: game-data-packager: stripping first directory component



Hi,

Quoting Alexandre Detiste (2018-04-17 09:08:42)
> Sorry for the late response,

no worries! :)

> you can overide unar behaviour by following this example:
> 
> data/policequest4.yaml
>   pq4.gog:
>     unpack:
>       format: unar
>       unpack: ['*']
>     provides:
>     - assets
> 
> This way it will extract everything to a temporary location,
> even the useless bits (*.exe), and GDP will find the demo assets.

This works!! Thank you! I now see how other games use these wildcards as well.

I attached my patch if anybody wants to commit it. I can also commit it myself
if you approve my application for the Debian Games Salsa team. :)

> 2018-04-17 7:02 UTC+02:00, Johannes Schauer <josch@debian.org>:
> > then maybe the problem is, that g-d-p tries to specifically only extract
> > the requested files
> This seemed a good default behaviour I/O, cpu, storage-wise.
> Other unpacker will ignore the directory prefix just fine
> (ex: innoextract)

Agreed.

But maybe this should be documented somewhere? So far, I only found
doc/adding_a_game.mdwn and the yaml files themselves as "docs".

Thanks!

cheers, josch
From dfc292cef05a5ea54e18bdd6cc32db7d4c6667c7 Mon Sep 17 00:00:00 2001
From: Johannes Schauer <josch@debian.org>
Date: Fri, 13 Apr 2018 17:13:49 +0200
Subject: [PATCH] heroes3.yaml: replace Windows demo with MacOS demo

The MacOS demo contains the all the non-graphical assets from the
complete edition. The only graphics missing are those for towns not
included in the demo. There exists a vcmi mod that disables the missing
assets and thus makes the game playable just with the data from the
MacOS demo.

The Windows Demo on the other hand only contains the base RoE game without
expansion and is incompatible with vcmi because texts have different IDs and
many assets are plainly missing. vcmi never worked with this demo.
---
 data/heroes3.yaml | 60 +++++++++++++++++++++----------------------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/data/heroes3.yaml b/data/heroes3.yaml
index 0ee3a89e..56262b19 100644
--- a/data/heroes3.yaml
+++ b/data/heroes3.yaml
@@ -117,52 +117,41 @@ files:
     - Maps/One Bad Day - Allied.h3m?gog
     - Maps/One Bad Day - Allied.h3m?alt
 
-  h3demo.exe:
+  heroes_3_complete_demo.sit:
+    download: https://archive.org/download/heroes_3_complete_demo/heroes_3_complete_demo.sit
     unpack:
-      format: cabextract
-    provides:
-      - data1.cab
-      - data1.hdr
-
-  data1.cab:
-    other_parts:
-    - data1.hdr
-    unpack:
-      format: unshield
+      format: unar
+      unpack: ['*']
     provides:
     - demo assets
 
-
 groups:
   archives: |
     2243829   18170b8d757074a462f8a2b6fa646ed9 core.zip
     973162040 0c97452fc4da4e8811173f21df873fab setup_homm_3_complete_4.0_(10665).exe
     967891752 6c3ee33a531bd0604679581ab267d8a3 setup_homm_3_complete_french_4.0_(10665).exe
-    98265058  33e40e8236126f63bc6f8f70568c379d h3demo.exe
-    2068480   522b6f45f534058d02a561838559b1f4 h3demo.exe?the_actual_game_executable
     97009730  bd14ddb43fe2140881ed89a875867149 data1.cab
     5706      3cce739f4983909021b811ee2f402145 data1.hdr
+    110524563 49343f4fc8c5820c28f4bc8c39a2e149 heroes_3_complete_demo.sit
 
   demo assets: |
-    22712791  dce7bcf8a06dae045e6eb127f5294aae Data/H3bitmap.lod?demo
-    46999681  c5b9456ca0d28cdef7f19566375e3ba6 Data/H3sprite.lod?demo
-    13215944  ff3332e9fc9de99fe5a1922fa43d917e Data/Heroes3.snd?demo
-    9879856   c8b126c985257c4601ca98ff30f81985 Data/Video.vid?demo
-    373939    9a1299585d2f9b3f37e2f72f9debd5f5 MP3/AITheme0.mp3?demo
-    1358024   b447710df17d447ae143b7772cadca0a MP3/Combat01.mp3?demo
-    1019600   6a32233d1c23801c2203b90067e68e37 MP3/Dirt.mp3?demo
-    77245     ffeed2a7164a86bff576222abdc966ba MP3/Defend Castle.mp3?demo
-    39364     7de8733e194b9844658cc8375af1b95c MP3/LoseCastle.mp3?demo
-    56626     1a114795ae8be2248ed0d390942cea9e MP3/LoseCombat.mp3?demo
-    594316    f14bf57dacf3f0ddc763bd4b0b0515b9 MP3/MainMenu.mp3?demo
-    51823     cc240953f079d4601474b9c47eb76d3b MP3/Retreat Battle.mp3?demo
-    1128564   9389b1f14e3e418f9c2480f15b61c713 MP3/StrongHold.mp3?demo
-    40957     5fda483908583a4fd21383ce6307b0ab MP3/Surrender Battle.mp3?demo
-    122246    6278a8cfddfbe636adfe8f6e940f8b40 MP3/UltimateLose.mp3?demo
-    914987    fd35611d3f19342b22ffc21027a6948d MP3/Water.mp3?demo
-    43670     48b22b0264dec2d14daaf4164ae9e3a7 MP3/Win Battle.mp3?demo
-    592114    7ff47ab64d33ca2d26e666cf736ac69d MP3/Win Scenario.mp3?demo
-    10011     570ffc5fc046aca44723261c94e90426 Maps/H3demo.h3m
+    126278    3ba8d66f908c00c61714a44f5af95414 music/Win Battle?demo
+    2676550   1b7cdbe7a3d23f3693ee82a7540fb173 music/WATER?demo
+    117574    9cbfafc690724413a1ebef246c8fb24b music/Surrender Battle?demo
+    3303238   293a79b9c10172e6ed414d12cb4d3453 music/StrongHold?demo
+    148038    9e91892268c0c665f9dd2fec91bf123d music/Retreat Battle?demo
+    163270    412a6e40f1216d98631f77c60224c64d music/LoseCombat?demo
+    111046    c1548b4ab55a9cc3cbab06d6a46ce54c music/LoseCastle?demo
+    2983366   7c397eb79d3f90f1af4fd19bf6b2c361 music/DIRT?demo
+    224198    c46742c5950c7fdc34d795a840d7a968 music/Defend Castle?demo
+    3975622   8d34029cd4c5b420735c8601bccec262 music/COMBAT01?demo
+    1092422   a54e53326791f191da88f620cde7bac1 music/AITheme0?demo
+    9981      c9035cba7310b736b72b609c081d9d7b maps/H3DEMO.H3M?demo
+    7402663   e79f491203c701d81646315ff6019bfb data/h3ab_spr.lod?demo
+    24721482  6242e1399f650ae72fa99806f9330a9d data/h3bitmap.lod?demo
+    49501869  3c9c7637d1aee5dd0fb8c2b91d58c217 data/h3sprite.lod?demo
+    12018808  d032957a7dd6b1a9c2e3a62b7ed7f73d data/heroes3.snd?demo
+    5853304   b8853018665fa515a2d472a10f374eee data/video.vid?demo
 
   assets: |
     12131193  ad94c8a434f855f147a07ee6a7cd4506 Data/H3ab_spr.lod?gog
@@ -638,9 +627,7 @@ groups:
 sha1sums: |
   7cf1ecec73e8c2f2c2619415cd16749be5641942  setup_homm_3_complete_4.0_(10665).exe
   7e5a737c51530a1888033d188ab0635825ee622f  setup_homm_3_complete_french_4.0_(10665).exe
-  8d44f794a3fe80bea524f90b38fed3325ca3d1cb  h3demo.exe
-  c09db3ae02d1928ff62031d8bcedfeac5f47a9e2  data1.cab
-  31eeb4ea63330b634c53a61fb32c5bce555b48b4  data1.hdr
+  7c970cec5706af93f2c17c851ee82b2de54f5d53  heroes_3_complete_demo.sit
 
   b1039b86a60759ca360eed43a21c156f8c50ad4d  Data/H3ab_ahd.snd
   bbbdb74ce8d5a73bd257771783c3dcac6fa1f9ee  Data/H3ab_ahd.vid
@@ -931,4 +918,3 @@ sha1sums: |
   195ca64a5b24e11c3327cafa4f39230b5ad5ad19  Mods/vcmi/Sprites/SYSOB12.DEF
   2212d012e95db45bc78129a5b523a1c7800bf337  Mods/vcmi/Sprites/chftke.def
 ...
-
-- 
2.16.1

Attachment: signature.asc
Description: signature


Reply to: