adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Major reworking of how addon packs work.

Browse Source 
Addon packs now provide additional files instead of overriding UIO. They 
must provide .rmp files to do the necessary overrides.  The addons 
directory has also been moved outside of packages/ and into content/ 
directly.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2869 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2007-12-09 15:38:05 +00:00
parent 25b4267902
commit 36fcc8b206
75 changed files with 220 additions and 1094 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+5
View File
@@ -1,4 +1,9 @@
Changes towards version 0.7:
- Major change in resource index scheme.
- .lst replaced (mapping to IDs instead of to files)
- .rmp files give the mapping from IDs to files.
- Addons provide additional files instead of overriding UIO
- Addons must provide .rmp files to do the necessary overrides.
- Removed unnecessary _ALIGNED_ON macro usage - SvdB
- The current directory is now among the locations searched for the content
when no explicit location has been specified. (bug fix) - from Nic
sc2/content/3domusic.rmp
+12
View File
@@ -0,0 +1,12 @@
music.arispace = lbm/arispace.ogg
music.battle = lbm/battle.ogg
music.hyper = lbm/hyper.ogg
music.orbit1 = ipanims/orbit1.ogg
music.orbit2 = ipanims/orbit2.ogg
music.orbit3 = ipanims/orbit3.ogg
music.orbit4 = ipanims/orbit4.ogg
music.orbit5 = ipanims/orbit5.ogg
music.outfit = lbm/outfit.ogg
music.shipyard = lbm/shipyard.ogg
music.space = ipanims/space.ogg
music.starbase = lbm/starbase.ogg
sc2/content/androsyn.lst
-16
View File
@@ -1,16 +0,0 @@
1 0 2 androsyn/andicons.ani
1 0 4 androsyn/andtext.txt
1 0 8 androsyn/androsyn.cod
1 1 2 androsyn/andmicon.ani
2 0 5 androsyn/andsound.snd
2 0 6 androsyn/andditty.mod
2 2 2 androsyn/androsyn.big
2 3 2 androsyn/androsyn.med
2 4 2 androsyn/androsyn.sml
2 5 2 androsyn/bubble.big
2 6 2 androsyn/bubble.med
2 7 2 androsyn/bubble.sml
2 8 2 androsyn/blazer.big
2 9 2 androsyn/blazer.med
2 10 2 androsyn/blazer.sml
2 11 2 androsyn/andcap.ani
sc2/content/arilou.lst
-13
View File
@@ -1,13 +0,0 @@
1 0 2 arilou/ariicons.ani
1 0 4 arilou/aritext.txt
1 0 8 arilou/arilou.cod
1 1 2 arilou/arimicon.ani
2 0 5 arilou/arisound.snd
2 0 6 arilou/ariditty.mod
2 2 2 arilou/arilou.big
2 3 2 arilou/arilou.med
2 4 2 arilou/arilou.sml
2 5 2 arilou/warp.big
2 6 2 arilou/warp.med
2 7 2 arilou/warp.sml
2 8 2 arilou/aricap.ani
sc2/content/blackurq.lst
-16
View File
@@ -1,16 +0,0 @@
1 0 2 blackurq/blaicons.ani
1 0 4 blackurq/blatext.txt
1 0 8 blackurq/blackurq.cod
1 1 2 blackurq/blamicon.ani
2 0 5 blackurq/blasound.snd
2 0 6 blackurq/bladitty.mod
2 2 2 blackurq/blackurq.big
2 3 2 blackurq/blackurq.med
2 4 2 blackurq/blackurq.sml
2 5 2 blackurq/buzbig.ani
2 6 2 blackurq/buzmed.ani
2 7 2 blackurq/buzsml.ani
2 8 2 blackurq/gasbig.ani
2 9 2 blackurq/gasmed.ani
2 10 2 blackurq/gassml.ani
2 11 2 blackurq/blacap.ani
sc2/content/chenjesu.lst
-16
View File
@@ -1,16 +0,0 @@
1 0 2 chenjesu/cheicons.ani
1 0 4 chenjesu/chetext.txt
1 0 8 chenjesu/chenjesu.cod
1 1 2 chenjesu/chemicon.ani
2 0 5 chenjesu/chesound.snd
2 0 6 chenjesu/cheditty.mod
2 2 2 chenjesu/chenjesu.big
2 3 2 chenjesu/chenjesu.med
2 4 2 chenjesu/chenjesu.sml
2 5 2 chenjesu/spark.big
2 6 2 chenjesu/spark.med
2 7 2 chenjesu/spark.sml
2 8 2 chenjesu/doggy.big
2 9 2 chenjesu/doggy.med
2 10 2 chenjesu/doggy.sml
2 11 2 chenjesu/checap.ani
sc2/content/chmmr.lst
-16
View File
@@ -1,16 +0,0 @@
1 0 2 chmmr/chmicons.ani
1 0 4 chmmr/chmtext.txt
1 0 8 chmmr/chmmr.cod
1 1 2 chmmr/chmmicon.ani
2 0 5 chmmr/chmsound.snd
2 0 6 chmmr/chmditty.mod
2 2 2 chmmr/chmmr.big
2 3 2 chmmr/chmmr.med
2 4 2 chmmr/chmmr.sml
2 5 2 chmmr/muzbig.ani
2 6 2 chmmr/muzmed.ani
2 7 2 chmmr/muzsml.ani
2 8 2 chmmr/satbig.ani
2 9 2 chmmr/satmed.ani
2 10 2 chmmr/satsml.ani
2 11 2 chmmr/chmcap.ani
sc2/content/comm/arilou.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/arilou/arilou.ani
1 0 3 comm/arilou/arilou.fon
1 0 4 comm/arilou/arilou.txt
1 0 6 comm/arilou/arilou.mod
1 1 4 comm/arilou/arilou.ct
sc2/content/comm/blackur.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/blackur/blackur.ani
1 0 3 comm/blackur/blackur.fon
1 0 4 comm/blackur/blackur.txt
1 0 6 comm/blackur/blackur.mod
1 1 4 comm/blackur/blackur.ct
sc2/content/comm/chmmr.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/chmmr/chmmr.ani
1 0 3 comm/chmmr/chmmr.fon
1 0 4 comm/chmmr/chmmr.txt
1 0 6 comm/chmmr/chmmr.mod
1 1 4 comm/chmmr/chmmr.ct
sc2/content/comm/comandr.lst
-8
View File
@@ -1,8 +0,0 @@
1 0 2 comm/comandr/comandr.ani
1 0 3 comm/comandr/comandr.fon
1 0 4 comm/comandr/comandr.ct
1 0 6 comm/comandr/comandr.mod
2 1 4 comm/comandr/comandr.txt
3 2 4 comm/starbas/starbas.txt
4 1 6 comm/starbas/starbas.ogg
5 2 6 comm/comandr/comlowpw.ogg
sc2/content/comm/druuge.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/druuge/druuge.ani
1 0 3 comm/druuge/druuge.fon
1 0 4 comm/druuge/druuge.txt
1 0 6 comm/druuge/druuge.mod
1 1 4 comm/druuge/druuge.ct
sc2/content/comm/ilwrath.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/ilwrath/ilwrath.ani
1 0 3 comm/ilwrath/ilwrath.fon
1 0 4 comm/ilwrath/ilwrath.txt
1 0 6 comm/ilwrath/ilwrath.mod
1 1 4 comm/ilwrath/ilwrath.ct
sc2/content/comm/melnorm.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/melnorm/melnorm.ani
1 0 3 comm/melnorm/melnorm.fon
1 0 4 comm/melnorm/melnorm.txt
1 0 6 comm/melnorm/melnorm.mod
1 1 4 comm/melnorm/melnorm.ct
sc2/content/comm/mycon.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/mycon/mycon.ani
1 0 3 comm/mycon/mycon.fon
1 0 4 comm/mycon/mycon.txt
1 0 6 comm/mycon/mycon.mod
1 1 4 comm/mycon/mycon.ct
sc2/content/comm/orz.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/orz/orz.ani
1 0 3 comm/orz/orz.fon
1 0 4 comm/orz/orz.txt
1 0 6 comm/orz/orz.mod
1 1 4 comm/orz/orz.ct
sc2/content/comm/pkunk.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/pkunk/pkunk.ani
1 0 3 comm/pkunk/pkunk.fon
1 0 4 comm/pkunk/pkunk.txt
1 0 6 comm/pkunk/pkunk.mod
1 1 4 comm/pkunk/pkunk.ct
sc2/content/comm/shofixt.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/shofixt/shofixt.ani
1 0 3 comm/shofixt/shofixt.fon
1 0 4 comm/shofixt/shofixt.txt
1 0 6 comm/shofixt/shofixt.mod
1 1 4 comm/shofixt/shofixt.ct
sc2/content/comm/slyhome.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/slyhome/slyhome.ani
1 0 3 comm/slyhome/slyhome.fon
1 0 4 comm/slyhome/slyhome.txt
1 0 6 comm/slyhome/slyhome.mod
1 1 4 comm/slyhome/slyhome.ct
sc2/content/comm/slyland.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/slyland/slyland.ani
1 0 3 comm/slyland/slyland.fon
1 0 4 comm/slyland/slyland.txt
1 0 6 comm/slyland/slyland.mod
1 1 4 comm/slyland/slyland.ct
sc2/content/comm/spathi.lst
-10
View File
@@ -1,10 +0,0 @@
1 0 2 comm/spathi/spathi.ani
1 0 3 comm/spathi/spathi.fon
1 0 4 comm/spathi/spathi.txt
1 3 4 comm/spathi/spathi.ct
2 1 2 comm/spahome/spahome.ani
2 1 4 comm/spahome/spahome.ct
2 2 4 comm/spahome/spahome.txt
3 0 6 comm/spathi/spathi.mod
4 1 6 comm/spahome/spahome.ogg
5 2 6 comm/spathi/spafwiff.ogg
sc2/content/comm/supox.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/supox/supox.ani
1 0 3 comm/supox/supox.fon
1 0 4 comm/supox/supox.txt
1 0 6 comm/supox/supox.mod
1 1 4 comm/supox/supox.ct
sc2/content/comm/syreen.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/syreen/syreen.ani
1 0 3 comm/syreen/syreen.fon
1 0 4 comm/syreen/syreen.txt
1 0 6 comm/syreen/syreen.mod
1 1 4 comm/syreen/syreen.ct
sc2/content/comm/talkpet.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/talkpet/talkpet.ani
1 0 3 comm/talkpet/talkpet.fon
1 0 4 comm/talkpet/talkpet.txt
1 0 6 comm/talkpet/talkpet.mod
1 1 4 comm/talkpet/talkpet.ct
sc2/content/comm/thradd.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/thradd/thradd.ani
1 0 3 comm/thradd/thradd.fon
1 0 4 comm/thradd/thradd.txt
1 0 6 comm/thradd/thradd.mod
1 1 4 comm/thradd/thradd.ct
sc2/content/comm/umgah.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/umgah/umgah.ani
1 0 3 comm/umgah/umgah.fon
1 0 4 comm/umgah/umgah.txt
1 0 6 comm/umgah/umgah.mod
1 1 4 comm/umgah/umgah.ct
sc2/content/comm/urquan.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/urquan/urquan.ani
1 0 3 comm/urquan/urquan.fon
1 0 4 comm/urquan/urquan.txt
1 0 6 comm/urquan/urquan.mod
1 1 4 comm/urquan/urquan.ct
sc2/content/comm/utwig.lst
-7
View File
@@ -1,7 +0,0 @@
1 0 2 comm/utwig/utwig.ani
1 0 3 comm/utwig/utwig.fon
1 0 4 comm/utwig/utwig.txt
1 0 6 comm/utwig/utwig.mod
1 1 4 comm/utwig/utwig.ct
2 1 6 comm/utwig/utwigult.ogg
sc2/content/comm/vux.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/vux/vux.ani
1 0 3 comm/vux/vux.fon
1 0 4 comm/vux/vux.txt
1 0 6 comm/vux/vux.mod
1 1 4 comm/vux/vux.ct
sc2/content/comm/yehat.lst
-7
View File
@@ -1,7 +0,0 @@
1 0 2 comm/yehat/yehat.ani
1 0 3 comm/yehat/yehat.fon
1 0 6 comm/yehat/yehat.mod
1 2 4 comm/yehat/yehat.ct
2 0 4 comm/yehat/yehat.txt
3 1 4 comm/rebel/rebel.txt
4 1 6 comm/rebel/rebel.ogg
sc2/content/comm/zoqfot.lst
-5
View File
@@ -1,5 +0,0 @@
1 0 2 comm/zoqfot/zoqfot.ani
1 0 3 comm/zoqfot/zoqfot.fon
1 0 4 comm/zoqfot/zoqfot.txt
1 0 6 comm/zoqfot/zoqfot.mod
1 1 4 comm/zoqfot/zoqfot.ct
sc2/content/druuge.lst
-13
View File
@@ -1,13 +0,0 @@
1 0 2 druuge/druicons.ani
1 0 4 druuge/drutext.txt
1 0 8 druuge/druuge.cod
1 1 2 druuge/drumicon.ani
2 0 5 druuge/drusound.snd
2 0 6 druuge/druditty.mod
2 2 2 druuge/druuge.big
2 3 2 druuge/druuge.med
2 4 2 druuge/druuge.sml
2 5 2 druuge/canbig.ani
2 6 2 druuge/canmed.ani
2 7 2 druuge/cansml.ani
2 8 2 druuge/drucap.ani
sc2/content/human.lst
-13
View File
@@ -1,13 +0,0 @@
1 0 2 human/humicons.ani
1 0 4 human/humtext.txt
1 0 8 human/human.cod
1 1 2 human/hummicon.ani
2 0 5 human/humsound.snd
2 0 6 human/humditty.mod
2 2 2 human/human.big
2 3 2 human/human.med
2 4 2 human/human.sml
2 5 2 human/saturn.big
2 6 2 human/saturn.med
2 7 2 human/saturn.sml
2 8 2 human/humcap.ani
sc2/content/ilwrath.lst
-13
View File
@@ -1,13 +0,0 @@
1 0 2 ilwrath/ilwicons.ani
1 0 4 ilwrath/ilwtext.txt
1 0 8 ilwrath/ilwrath.cod
1 1 2 ilwrath/ilwmicon.ani
2 0 5 ilwrath/ilwsound.snd
2 0 6 ilwrath/ilwditty.mod
2 2 2 ilwrath/ilwrath.big
2 3 2 ilwrath/ilwrath.med
2 4 2 ilwrath/ilwrath.sml
2 5 2 ilwrath/fire.big
2 6 2 ilwrath/fire.med
2 7 2 ilwrath/fire.sml
2 8 2 ilwrath/ilwcap.ani
sc2/content/ipanims/orbit1.mod → sc2/content/ipanims/orbit.mod
View File
sc2/content/ipanims/orbit2.mod
BIN
View File
Binary file not shown.
sc2/content/ipanims/orbit3.mod
BIN
View File
Binary file not shown.
sc2/content/ipanims/orbit4.mod
BIN
View File
Binary file not shown.
sc2/content/ipanims/orbit5.mod
BIN
View File
Binary file not shown.
sc2/content/lastbat.lst
-12
View File
@@ -1,12 +0,0 @@
1 0 8 lastbat/lastbat.cod
2 0 2 lastbat/lastbat.big
2 0 5 lastbat/lassound.snd
2 1 2 lastbat/lastbat.med
2 2 2 lastbat/lastbat.sml
2 3 2 lastbat/senbig.ani
2 4 2 lastbat/senmed.ani
2 5 2 lastbat/sensml.ani
2 6 2 lastbat/genbig.ani
2 7 2 lastbat/genmed.ani
2 8 2 lastbat/gensml.ani
3 9 2 lastbat/lascap.ani
sc2/content/lbm/setupmenu.txt
+4 -4
View File
@@ -184,16 +184,16 @@ Show subtitles for alien speech.
#(CAT_9_OPTS)
PC
3do/Remixes
3do
#(CAT_9_OPT_0_DESC)
Uses the music from the Original PC version.
Prefers .MOD files to .OGG files.
Can still be overriden by addon packs.
Requires a restart of UQM to take effect.
#(CAT_9_OPT_1_DESC)
Uses more modern music, if available.
Prefers .OGG files to .MOD files.
Overrides PC soundtrack with 3do music.
Can be further overridden by addon packs.
Requires a restart of UQM to take effect.
#(CAT_10_OPTS)
sc2/content/melnorme.lst
-16
View File
@@ -1,16 +0,0 @@
1 0 2 melnorme/melicons.ani
1 0 4 melnorme/meltext.txt
1 0 8 melnorme/melnorme.cod
1 1 2 melnorme/melmicon.ani
2 0 5 melnorme/melsound.snd
2 0 6 melnorme/melditty.mod
2 2 2 melnorme/melnorme.big
2 3 2 melnorme/melnorme.med
2 4 2 melnorme/melnorme.sml
2 5 2 melnorme/pumpbig.ani
2 6 2 melnorme/pumpmed.ani
2 7 2 melnorme/pumpsml.ani
2 8 2 melnorme/confubig.ani
2 9 2 melnorme/confumed.ani
2 10 2 melnorme/confusml.ani
2 11 2 melnorme/melcap.ani
sc2/content/mmrnmhrm.lst
-16
View File
@@ -1,16 +0,0 @@
1 0 2 mmrnmhrm/mmricons.ani
1 0 4 mmrnmhrm/mmrtext.txt
1 0 8 mmrnmhrm/mmrnmhrm.cod
1 1 2 mmrnmhrm/mmrmicon.ani
2 0 5 mmrnmhrm/mmrsound.snd
2 0 6 mmrnmhrm/mmrditty.mod
2 2 2 mmrnmhrm/mmrnmhrm.big
2 3 2 mmrnmhrm/mmrnmhrm.med
2 4 2 mmrnmhrm/mmrnmhrm.sml
2 5 2 mmrnmhrm/torp.big
2 6 2 mmrnmhrm/torp.med
2 7 2 mmrnmhrm/torp.sml
2 8 2 mmrnmhrm/ywing.big
2 9 2 mmrnmhrm/ywing.med
2 10 2 mmrnmhrm/ywing.sml
2 11 2 mmrnmhrm/mmrcap.ani
sc2/content/mycon.lst
-13
View File
@@ -1,13 +0,0 @@
1 0 2 mycon/mycicons.ani
1 0 4 mycon/myctext.txt
1 0 8 mycon/mycon.cod
1 1 2 mycon/mycmicon.ani
2 0 5 mycon/mycsound.snd
2 0 6 mycon/mycditty.mod
2 2 2 mycon/mycon.big
2 3 2 mycon/mycon.med
2 4 2 mycon/mycon.sml
2 5 2 mycon/plasma.big
2 6 2 mycon/plasma.med
2 7 2 mycon/plasma.sml
2 8 2 mycon/myccap.ani
sc2/content/orz.lst
-16
View File
@@ -1,16 +0,0 @@
1 0 2 orz/orzicons.ani
1 0 4 orz/orztext.txt
1 0 8 orz/orz.cod
1 1 2 orz/orzmicon.ani
2 0 5 orz/orzsound.snd
2 0 6 orz/orzditty.mod
2 2 2 orz/orz.big
2 3 2 orz/orz.med
2 4 2 orz/orz.sml
2 5 2 orz/howbig.ani
2 6 2 orz/howmed.ani
2 7 2 orz/howsml.ani
2 8 2 orz/turbig.ani
2 9 2 orz/turmed.ani
2 10 2 orz/tursml.ani
2 11 2 orz/orzcap.ani
sc2/content/pkunk.lst
-13
View File
@@ -1,13 +0,0 @@
1 0 2 pkunk/pkuicons.ani
1 0 4 pkunk/pkutext.txt
1 0 8 pkunk/pkunk.cod
1 1 2 pkunk/pkumicon.ani
2 0 5 pkunk/pkusound.snd
2 0 6 pkunk/pkuditty.mod
2 2 2 pkunk/pkunk.big
2 3 2 pkunk/pkunk.med
2 4 2 pkunk/pkunk.sml
2 5 2 pkunk/bugbig.ani
2 6 2 pkunk/bugmed.ani
2 7 2 pkunk/bugsml.ani
2 8 2 pkunk/pkucap.ani
sc2/content/probe.lst
-2
View File
@@ -1,2 +0,0 @@
1 0 2 probe/promicon.ani
1 0 8 probe/probe.cod
sc2/content/shofixti.lst
-20
View File
@@ -1,20 +0,0 @@
1 0 2 shofixti/shoicons.ani
1 0 4 shofixti/shotext.txt
1 0 8 shofixti/shofixti.cod
1 1 2 shofixti/shomicon.ani
2 2 2 shofixti/shofixti.big
2 3 2 shofixti/shofixti.med
2 4 2 shofixti/shofixti.sml
2 5 2 shofixti/destruct.big
2 6 2 shofixti/destruct.med
2 7 2 shofixti/destruct.sml
2 8 2 shofixti/shocap.ani
3 9 2 shofixti/oldshof.big
3 10 2 shofixti/oldshof.med
3 11 2 shofixti/oldshof.sml
3 12 2 shofixti/oldcap.ani
4 0 5 shofixti/shosound.snd
4 0 6 shofixti/shoditty.mod
4 13 2 shofixti/missile.big
4 14 2 shofixti/missile.med
4 15 2 shofixti/missile.sml
sc2/content/sis.lst
-12
View File
@@ -1,12 +0,0 @@
1 0 8 sis_ship/sis.cod
2 0 2 sis_ship/sisicons.ani
2 0 5 sis_ship/sissound.snd
2 0 6 sis_ship/sisditty.mod
2 1 2 sis_ship/sis.big
2 2 2 sis_ship/sis.med
2 3 2 sis_ship/sis.sml
2 4 2 sis_ship/blasbig.ani
2 5 2 sis_ship/blasmed.ani
2 6 2 sis_ship/blassml.ani
2 7 2 sis_ship/siscap.ani
3 8 2 sis_ship/sishyper.ani
sc2/content/slylandr.lst
-10
View File
@@ -1,10 +0,0 @@
1 0 2 slylandr/slyicons.ani
1 0 4 slylandr/slytext.txt
1 0 8 slylandr/slylandr.cod
1 1 2 slylandr/slymicon.ani
2 0 5 slylandr/slysound.snd
2 0 6 slylandr/slyditty.mod
2 2 2 slylandr/slylandr.big
2 3 2 slylandr/slylandr.med
2 4 2 slylandr/slylandr.sml
2 5 2 slylandr/slycap.ani
sc2/content/spathi.lst
-16
View File
@@ -1,16 +0,0 @@
1 0 2 spathi/spaicons.ani
1 0 4 spathi/spatext.txt
1 0 8 spathi/spathi.cod
1 1 2 spathi/spamicon.ani
2 0 5 spathi/spasound.snd
2 0 6 spathi/spaditty.mod
2 2 2 spathi/spathi.big
2 3 2 spathi/spathi.med
2 4 2 spathi/spathi.sml
2 5 2 spathi/missile.big
2 6 2 spathi/missile.med
2 7 2 spathi/missile.sml
2 8 2 spathi/discrim.big
2 9 2 spathi/discrim.med
2 10 2 spathi/discrim.sml
2 11 2 spathi/spacap.ani
sc2/content/starcon.lst
-452
View File
@@ -1,452 +0,0 @@
1 0 4 lbm/scclrtab.ct
2 0 2 lbm/title.ani
3 0 7 arilou.lst
4 1 7 chmmr.lst
5 2 7 human.lst
6 3 7 orz.lst
7 4 7 pkunk.lst
8 5 7 shofixti.lst
9 6 7 spathi.lst
10 7 7 supox.lst
11 8 7 thradd.lst
12 9 7 utwig.lst
13 10 7 vux.lst
14 11 7 yehat.lst
15 12 7 melnorme.lst
16 13 7 druuge.lst
17 14 7 ilwrath.lst
18 15 7 mycon.lst
19 16 7 slylandr.lst
20 17 7 umgah.lst
21 18 7 urquan.lst
22 19 7 zoqfot.lst
23 20 7 syreen.lst
24 21 7 blackurq.lst
25 22 7 androsyn.lst
26 23 7 chenjesu.lst
27 24 7 mmrnmhrm.lst
28 0 3 lbm/starcon.fon
28 1 2 lbm/status.ani
28 1 3 lbm/tiny.fon
28 1 4 lbm/starcon.txt
28 2 2 lbm/activity.ani
29 3 2 lbm/playmenu.ani
30 2 3 lbm/micro.fon
31 4 2 lbm/flagstat.ani
31 5 2 lbm/miscdata.ani
31 287 2 lbm/fontgrad.ani
32 0 5 lbm/menusnd.snd
33 1 5 lbm/gamesnd.snd
34 6 2 lbm/stars.ani
34 7 2 lbm/astbig.ani
34 8 2 lbm/astmed.ani
34 9 2 lbm/astsml.ani
34 10 2 lbm/blabig.ani
34 11 2 lbm/blamed.ani
34 12 2 lbm/blasml.ani
34 13 2 lbm/boobig.ani
34 14 2 lbm/boomed.ani
34 15 2 lbm/boosml.ani
35 16 2 lbm/ambanim.ani
36 2 4 lbm/hyperpal.ct
36 17 2 lbm/hyperstr.ani
37 3 4 lbm/arispace.ct
37 18 2 lbm/arispace.ani
38 0 6 lbm/hyper.mod
39 1 6 lbm/arispace.mod
40 19 2 ipanims/obbkgnd.ani
41 4 4 ipanims/orbplan.ct
41 20 2 ipanims/sis_ip.ani
41 21 2 ipanims/orbplan.ani
41 22 2 ipanims/ip_sun.ani
41 96 4 ipanims/ip_sun.ct
42 2 5 ipanims/landsnds.snd
42 23 2 ipanims/lander.ani
42 24 2 ipanims/quake.ani
42 25 2 ipanims/lightnin.ani
42 26 2 ipanims/lavaspot.ani
42 27 2 ipanims/lndrshld.ani
42 28 2 ipanims/launch.ani
42 29 2 ipanims/return.ani
43 30 2 ipanims/orbview.ani
44 31 2 ipanims/eartmask.ani
45 32 2 ipanims/lifecan.ani
46 33 2 ipanims/lifea.ani
47 34 2 ipanims/lifeb.ani
48 35 2 ipanims/lifec.ani
49 36 2 ipanims/lifed.ani
50 37 2 ipanims/lifee.ani
51 38 2 ipanims/lifef.ani
52 39 2 ipanims/lifeg.ani
53 40 2 ipanims/lifeh.ani
54 41 2 ipanims/lifei.ani
55 42 2 ipanims/lifej.ani
56 43 2 ipanims/lifek.ani
57 44 2 ipanims/lifel.ani
58 45 2 ipanims/lifem.ani
59 46 2 ipanims/lifen.ani
60 47 2 ipanims/lifeo.ani
61 48 2 ipanims/lifep.ani
62 49 2 ipanims/lifeq.ani
63 50 2 ipanims/lifer.ani
64 51 2 ipanims/lifes.ani
65 52 2 ipanims/lifet.ani
66 53 2 ipanims/lifew.ani
67 54 2 ipanims/lifex.ani
68 55 2 ipanims/lifey.ani
69 56 2 ipanims/lifeu.ani
70 57 2 ipanims/lifev.ani
71 58 2 ipanims/lifez.ani
72 5 4 ipanims/str_cts_.ct
72 6 4 ipanims/mtl2xlts.xlt
73 7 4 ipanims/wr1_cts_.ct
74 8 4 ipanims/rst_xlts.xlt
75 9 4 ipanims/co2_cts_.ct
76 10 4 ipanims/bnd_xlts.xlt
77 11 4 ipanims/ylgscts_.ct
78 12 4 ipanims/lll_cts_.ct
79 13 4 ipanims/ylgscts_.ct
80 14 4 ipanims/den_xlts.xlt
81 15 4 ipanims/mtl_cts_.ct
81 16 4 ipanims/mtl1xlts.xlt
82 17 4 ipanims/rrr_cts_.ct
83 18 4 ipanims/ice_cts_.ct
84 19 4 ipanims/ice_xlts.xlt
85 20 4 ipanims/qqq_cts_.ct
86 21 4 ipanims/rst_cts_.ct
87 22 4 ipanims/bnd_cts_.ct
88 23 4 ipanims/rdx_cts_.ct
89 24 4 ipanims/nnn_cts_.ct
90 25 4 ipanims/qqq_cts_.ct
91 26 4 ipanims/rrr_cts_.ct
92 27 4 ipanims/den_cts_.ct
93 28 4 ipanims/blgscts_.ct
94 29 4 ipanims/www_cts_.ct
95 30 4 ipanims/grv_cts_.ct
95 31 4 ipanims/grv_xlts.xlt
96 32 4 ipanims/vigscts_.ct
97 33 4 ipanims/kkk_cts_.ct
98 34 4 ipanims/prgscts_.ct
99 35 4 ipanims/dst_cts_.ct
100 36 4 ipanims/dst_cts_.ct
101 37 4 ipanims/jjj_cts_.ct
102 38 4 ipanims/dst_cts_.ct
103 39 4 ipanims/lit_cts_.ct
104 40 4 ipanims/ylgscts_.ct
105 41 4 ipanims/vigscts_.ct
106 42 4 ipanims/vigscts_.ct
107 43 4 ipanims/orgscts_.ct
108 44 4 ipanims/rai_cts_.ct
108 45 4 ipanims/rai_xlts.xlt
109 46 4 ipanims/hel_cts_.ct
109 47 4 ipanims/hel_xlts.xlt
110 48 4 ipanims/cry_cts_.ct
111 49 4 ipanims/cry_xlts.xlt
112 50 4 ipanims/bnd_cts_.ct
113 51 4 ipanims/cygscts_.ct
114 52 4 ipanims/rdx_cts_.ct
114 53 4 ipanims/rdx1xlts.xlt
115 54 4 ipanims/co2_cts_.ct
116 55 4 ipanims/eme_cts_.ct
117 56 4 ipanims/rst_cts_.ct
118 57 4 ipanims/h2o_xlts.xlt
119 58 4 ipanims/rdx_cts_.ct
120 59 4 ipanims/h2o_cts_.ct
121 60 4 ipanims/h2o_cts_.ct
122 61 4 ipanims/www_cts_.ct
123 62 4 ipanims/co2_cts_.ct
124 63 4 ipanims/wr1_cts_.ct
125 64 4 ipanims/rub_cts_.ct
126 65 4 ipanims/rrr_cts_.ct
127 66 4 ipanims/bbb_cts_.ct
128 67 4 ipanims/gasg.xlt
129 68 4 ipanims/blugasgi.ct
130 69 4 ipanims/cyagasgi.ct
131 70 4 ipanims/grngasgi.ct
132 71 4 ipanims/grygasgi.ct
133 72 4 ipanims/oragasgi.ct
134 73 4 ipanims/purgasgi.ct
135 74 4 ipanims/redgasgi.ct
136 75 4 ipanims/viogasgi.ct
137 76 4 ipanims/yelgasgi.ct
138 3 3 ipanims/lander.fon
138 288 2 ipanims/landfeff.ani
139 59 2 ipanims/moonbase.ani
139 77 4 ipanims/moonbase.txt
140 60 2 ipanims/maidens.ani
140 78 4 ipanims/maidens.txt
141 79 4 ipanims/chmmrbas.txt
142 61 2 ipanims/aquhelix.ani
142 80 4 ipanims/aquhelix.txt
143 62 2 ipanims/drutrans.ani
143 81 4 ipanims/drutrans.txt
144 63 2 ipanims/taadevic.ani
144 82 4 ipanims/taadevic.txt
145 64 2 ipanims/sundevic.ani
145 83 4 ipanims/sundevic.txt
146 65 2 ipanims/syrvault.ani
146 84 4 ipanims/syrvault.txt
147 66 2 ipanims/urqwreck.ani
147 85 4 ipanims/urqwreck.txt
148 67 2 ipanims/utwbomb.ani
148 86 4 ipanims/utwbomb.txt
149 87 4 ipanims/vuxbeast.txt
150 68 2 ipanims/eggcase.ani
150 88 4 ipanims/eggcase.txt
151 69 2 ipanims/spapluto.ani
151 89 4 ipanims/spapluto.txt
152 90 4 ipanims/burruins.txt
153 91 4 ipanims/andruins.txt
154 92 4 ipanims/sphere.txt
155 93 4 ipanims/spindle.txt
156 70 2 ipanims/ruins.ani
157 94 4 ipanims/ruins.txt
158 71 2 ipanims/umgtrans.ani
158 95 4 ipanims/umgtrans.txt
159 2 6 ipanims/space.mod
160 3 6 ipanims/orbit1.mod
160 4 6 ipanims/orbit2.mod
160 5 6 ipanims/orbit3.mod
160 6 6 ipanims/orbit4.mod
160 7 6 ipanims/orbit5.mod
161 14 6 melee/melemenu.ogg
161 72 2 melee/melebkgd.ani
162 73 2 melee/melee.ani
163 8 6 lbm/redalert.mod
163 74 2 lbm/segue.ani
164 75 2 lbm/pickship.ani
165 25 7 comm/arilou.lst
166 26 7 comm/chmmr.lst
167 27 7 comm/comandr.lst
168 28 7 comm/orz.lst
169 29 7 comm/pkunk.lst
170 30 7 comm/shofixt.lst
171 31 7 comm/spathi.lst
172 32 7 comm/supox.lst
173 33 7 comm/thradd.lst
174 34 7 comm/utwig.lst
175 35 7 comm/vux.lst
176 36 7 comm/yehat.lst
177 37 7 comm/melnorm.lst
178 38 7 comm/druuge.lst
179 39 7 comm/ilwrath.lst
180 40 7 comm/mycon.lst
181 41 7 comm/slyland.lst
182 42 7 comm/umgah.lst
183 43 7 comm/urquan.lst
184 44 7 comm/zoqfot.lst
185 45 7 comm/syreen.lst
186 46 7 comm/blackur.lst
187 47 7 comm/talkpet.lst
188 48 7 comm/slyhome.lst
189 4 3 lbm/player.fon
190 49 7 sis.lst
191 50 7 lastbat.lst
192 51 7 probe.lst
193 15 6 lbm/mainmenu.ogg
193 76 2 lbm/newgame.ani
194 77 2 lbm/modules.ani
195 78 2 lbm/sismods.ani
195 79 2 lbm/outfit.ani
196 9 6 lbm/outfit.mod
197 80 2 lbm/sisblu.ani
197 81 2 lbm/shipyard.ani
197 97 4 lbm/dockpani.ct
198 10 6 lbm/shipyard.mod
199 11 6 lbm/starbase.mod
199 82 2 lbm/starbase.ani
200 83 2 lbm/sam__big.ani
201 84 2 lbm/shie_big.ani
201 85 2 lbm/shie_med.ani
201 86 2 lbm/shie_sml.ani
202 87 2 lbm/ool__big.ani
202 88 2 lbm/ool__med.ani
202 89 2 lbm/ool__sml.ani
203 90 2 lbm/ytt__big.ani
203 91 2 lbm/ytt__med.ani
203 92 2 lbm/ytt__sml.ani
204 93 2 lbm/deg__big.ani
204 94 2 lbm/deg__med.ani
204 95 2 lbm/deg__sml.ani
205 96 2 lbm/lan__big.ani
205 97 2 lbm/lan__med.ani
205 98 2 lbm/lan__sml.ani
206 99 2 lbm/tre__big.ani
206 100 2 lbm/tre__med.ani
206 101 2 lbm/tre__sml.ani
207 102 2 lbm/ure__big.ani
207 103 2 lbm/ure__med.ani
207 104 2 lbm/ure__sml.ani
208 105 2 lbm/mtl__big.ani
208 106 2 lbm/mtl__med.ani
208 107 2 lbm/mtl__sml.ani
209 108 2 lbm/rad__big.ani
209 109 2 lbm/rad__med.ani
209 110 2 lbm/rad__sml.ani
210 111 2 lbm/opa__big.ani
210 112 2 lbm/opa__med.ani
210 113 2 lbm/opa__sml.ani
211 114 2 lbm/cya__big.ani
211 115 2 lbm/cya__med.ani
211 116 2 lbm/cya__sml.ani
212 117 2 lbm/aci__big.ani
212 118 2 lbm/aci__med.ani
212 119 2 lbm/aci__sml.ani
213 120 2 lbm/alk__big.ani
213 121 2 lbm/alk__med.ani
213 122 2 lbm/alk__sml.ani
214 123 2 lbm/hal__big.ani
214 124 2 lbm/hal__med.ani
214 125 2 lbm/hal__sml.ani
215 126 2 lbm/gre__big.ani
215 127 2 lbm/gre__med.ani
215 128 2 lbm/gre__sml.ani
216 129 2 lbm/cop__big.ani
216 130 2 lbm/cop__med.ani
216 131 2 lbm/cop__sml.ani
217 132 2 lbm/car__big.ani
217 133 2 lbm/car__med.ani
217 134 2 lbm/car__sml.ani
218 135 2 lbm/ult__big.ani
218 136 2 lbm/ult__med.ani
218 137 2 lbm/ult__sml.ani
219 138 2 lbm/nob__big.ani
219 139 2 lbm/nob__med.ani
219 140 2 lbm/nob__sml.ani
220 141 2 lbm/azu__big.ani
220 142 2 lbm/azu__med.ani
220 143 2 lbm/azu__sml.ani
221 144 2 lbm/cho__big.ani
221 145 2 lbm/cho__med.ani
221 146 2 lbm/cho__sml.ani
222 147 2 lbm/pur__big.ani
222 148 2 lbm/pur__med.ani
222 149 2 lbm/pur__sml.ani
223 150 2 lbm/sup__big.ani
223 151 2 lbm/sup__med.ani
223 152 2 lbm/sup__sml.ani
224 153 2 lbm/pel__big.ani
224 154 2 lbm/pel__med.ani
224 155 2 lbm/pel__sml.ani
225 156 2 lbm/dus__big.ani
225 157 2 lbm/dus__med.ani
225 158 2 lbm/dus__sml.ani
226 159 2 lbm/mar__big.ani
226 160 2 lbm/mar__med.ani
226 161 2 lbm/mar__sml.ani
227 162 2 lbm/cim__big.ani
227 163 2 lbm/cim__med.ani
227 164 2 lbm/cim__sml.ani
228 165 2 lbm/inf__big.ani
228 166 2 lbm/inf__med.ani
228 167 2 lbm/inf__sml.ani
229 168 2 lbm/sel__big.ani
229 169 2 lbm/sel__med.ani
229 170 2 lbm/sel__sml.ani
230 171 2 lbm/aur__big.ani
230 172 2 lbm/aur__med.ani
230 173 2 lbm/aur__sml.ani
231 174 2 lbm/flu__big.ani
231 175 2 lbm/flu__med.ani
231 176 2 lbm/flu__sml.ani
232 177 2 lbm/ult__big.ani
232 178 2 lbm/ult__med.ani
232 179 2 lbm/ult__sml.ani
233 180 2 lbm/plu__big.ani
233 181 2 lbm/plu__med.ani
233 182 2 lbm/plu__sml.ani
234 183 2 lbm/rai__big.ani
234 184 2 lbm/rai__med.ani
234 185 2 lbm/rai__sml.ani
235 186 2 lbm/cra__big.ani
235 187 2 lbm/cra__med.ani
235 188 2 lbm/cra__sml.ani
236 189 2 lbm/sap__big.ani
236 190 2 lbm/sap__med.ani
236 191 2 lbm/sap__sml.ani
237 192 2 lbm/org__big.ani
237 193 2 lbm/org__med.ani
237 194 2 lbm/org__sml.ani
238 195 2 lbm/xen__big.ani
238 196 2 lbm/xen__med.ani
238 197 2 lbm/xen__sml.ani
239 198 2 lbm/red__big.ani
239 199 2 lbm/red__med.ani
239 200 2 lbm/red__sml.ani
240 201 2 lbm/pri__big.ani
240 202 2 lbm/pri__med.ani
240 203 2 lbm/pri__sml.ani
241 204 2 lbm/eme__big.ani
241 205 2 lbm/eme__med.ani
241 206 2 lbm/eme__sml.ani
242 207 2 lbm/chl__big.ani
242 208 2 lbm/chl__med.ani
242 209 2 lbm/chl__sml.ani
243 210 2 lbm/mgn__big.ani
243 211 2 lbm/mgn__med.ani
243 212 2 lbm/mgn__sml.ani
244 213 2 lbm/wat__big.ani
244 214 2 lbm/wat__med.ani
244 215 2 lbm/wat__sml.ani
245 216 2 lbm/tel__big.ani
245 217 2 lbm/tel__med.ani
245 218 2 lbm/tel__sml.ani
246 219 2 lbm/hyd__big.ani
246 220 2 lbm/hyd__med.ani
246 221 2 lbm/hyd__sml.ani
247 222 2 lbm/iod__big.ani
247 223 2 lbm/iod__med.ani
247 224 2 lbm/iod__sml.ani
248 225 2 lbm/vin__big.ani
248 226 2 lbm/vin__med.ani
248 227 2 lbm/vin__sml.ani
249 228 2 lbm/rub__big.ani
249 229 2 lbm/rub__med.ani
249 230 2 lbm/rub__sml.ani
250 231 2 lbm/mgm__big.ani
250 232 2 lbm/mgm__med.ani
250 233 2 lbm/mgm__sml.ani
251 234 2 lbm/cri__big.ani
251 235 2 lbm/cri__med.ani
251 236 2 lbm/cri__sml.ani
252 237 2 lbm/blg__big.ani
252 238 2 lbm/blg__med.ani
252 239 2 lbm/blg__sml.ani
253 240 2 lbm/cyg__big.ani
253 241 2 lbm/cyg__med.ani
253 242 2 lbm/cyg__sml.ani
254 243 2 lbm/gng__big.ani
254 244 2 lbm/gng__med.ani
254 245 2 lbm/gng__sml.ani
255 246 2 lbm/gyg__big.ani
255 247 2 lbm/gyg__med.ani
255 248 2 lbm/gyg__sml.ani
256 249 2 lbm/org__big.ani
256 250 2 lbm/org__med.ani
256 251 2 lbm/org__sml.ani
257 252 2 lbm/pug__big.ani
257 253 2 lbm/pug__med.ani
257 254 2 lbm/pug__sml.ani
258 255 2 lbm/reg__big.ani
258 256 2 lbm/reg__med.ani
258 257 2 lbm/reg__sml.ani
259 258 2 lbm/vig__big.ani
259 259 2 lbm/vig__med.ani
259 260 2 lbm/vig__sml.ani
260 261 2 lbm/yeg__big.ani
260 262 2 lbm/yeg__med.ani
260 263 2 lbm/yeg__sml.ani
261 12 6 lbm/battle.mod
262 264 2 credits/credback.ani
282 13 6 credits/credits.ogg
283 284 2 slides/ending/sis_skel.ani
284 285 2 ipanims/orbenter.ani
285 286 2 lbm/setupmenu.ani
285 287 4 lbm/setupmenu.txt
286 98 4 slides/intro/intro.txt
287 99 4 slides/ending/ending.txt
288 5 3 credits/pt13.fon
288 6 3 credits/pt17.fon
288 7 3 credits/pt45.fon
289 100 4 credits/credits.txt
290 101 4 lbm/joyalpha.txt
sc2/content/supox.lst
-13
View File
@@ -1,13 +0,0 @@
1 0 2 supox/supicons.ani
1 0 4 supox/suptext.txt
1 0 8 supox/supox.cod
1 1 2 supox/supmicon.ani
2 0 5 supox/supsound.snd
2 0 6 supox/supditty.mod
2 2 2 supox/supox.big
2 3 2 supox/supox.med
2 4 2 supox/supox.sml
2 5 2 supox/gobbig.ani
2 6 2 supox/gobmed.ani
2 7 2 supox/gobsml.ani
2 8 2 supox/supcap.ani
sc2/content/syreen.lst
-13
View File
@@ -1,13 +0,0 @@
1 0 2 syreen/syricons.ani
1 0 4 syreen/syrtext.txt
1 0 8 syreen/syreen.cod
1 1 2 syreen/syrmicon.ani
2 0 5 syreen/syrsound.snd
2 0 6 syreen/syrditty.mod
2 2 2 syreen/syreen.big
2 3 2 syreen/syreen.med
2 4 2 syreen/syreen.sml
2 5 2 syreen/dagger.big
2 6 2 syreen/dagger.med
2 7 2 syreen/dagger.sml
2 8 2 syreen/syrcap.ani
sc2/content/thradd.lst
-16
View File
@@ -1,16 +0,0 @@
1 0 2 thradd/thricons.ani
1 0 4 thradd/thrtext.txt
1 0 8 thradd/thradd.cod
1 1 2 thradd/thrmicon.ani
2 0 5 thradd/thrsound.snd
2 0 6 thradd/thrditty.mod
2 2 2 thradd/thradd.big
2 3 2 thradd/thradd.med
2 4 2 thradd/thradd.sml
2 5 2 thradd/horbig.ani
2 6 2 thradd/hormed.ani
2 7 2 thradd/horsml.ani
2 8 2 thradd/napbig.ani
2 9 2 thradd/napmed.ani
2 10 2 thradd/napsml.ani
2 11 2 thradd/thrcap.ani
sc2/content/umgah.lst
-14
View File
@@ -1,14 +0,0 @@
1 0 2 umgah/umgicons.ani
1 0 4 umgah/umgtext.txt
1 0 8 umgah/umgah.cod
1 1 2 umgah/umgmicon.ani
2 0 5 umgah/umgsound.snd
2 0 6 umgah/umgditty.mod
2 2 2 umgah/umgah.big
2 3 2 umgah/umgah.med
2 4 2 umgah/umgah.sml
2 5 2 umgah/spritz.ani
2 6 2 umgah/cone.big
2 7 2 umgah/cone.med
2 8 2 umgah/cone.sml
2 9 2 umgah/umgcap.ani
sc2/content/uqm.rmp
+5 -5
View File
@@ -479,11 +479,11 @@ music.battle = lbm/battle.mod
music.hyper = lbm/hyper.mod
music.mainmenu = lbm/mainmenu.ogg
music.meleemenu = melee/melemenu.ogg
music.orbit1 = ipanims/orbit1.mod
music.orbit2 = ipanims/orbit2.mod
music.orbit3 = ipanims/orbit3.mod
music.orbit4 = ipanims/orbit4.mod
music.orbit5 = ipanims/orbit5.mod
music.orbit1 = ipanims/orbit.mod
music.orbit2 = ipanims/orbit.mod
music.orbit3 = ipanims/orbit.mod
music.orbit4 = ipanims/orbit.mod
music.orbit5 = ipanims/orbit.mod
music.outfit = lbm/outfit.mod
music.redalert = lbm/redalert.mod
music.shipyard = lbm/shipyard.mod
sc2/content/urquan.lst
-16
View File
@@ -1,16 +0,0 @@
1 0 2 urquan/urqicons.ani
1 0 4 urquan/urqtext.txt
1 0 8 urquan/urquan.cod
1 1 2 urquan/urqmicon.ani
2 0 5 urquan/urqsound.snd
2 0 6 urquan/urqditty.mod
2 2 2 urquan/urquan.big
2 3 2 urquan/urquan.med
2 4 2 urquan/urquan.sml
2 5 2 urquan/fusion.big
2 6 2 urquan/fusion.med
2 7 2 urquan/fusion.sml
2 8 2 urquan/fight.big
2 9 2 urquan/fight.med
2 10 2 urquan/fight.sml
2 11 2 urquan/urqcap.ani
sc2/content/utwig.lst
-13
View File
@@ -1,13 +0,0 @@
1 0 2 utwig/utwicons.ani
1 0 4 utwig/utwtext.txt
1 0 8 utwig/utwig.cod
1 1 2 utwig/utwmicon.ani
2 0 5 utwig/utwsound.snd
2 0 6 utwig/utwditty.mod
2 2 2 utwig/utwig.big
2 3 2 utwig/utwig.med
2 4 2 utwig/utwig.sml
2 5 2 utwig/lanbig.ani
2 6 2 utwig/lanmed.ani
2 7 2 utwig/lansml.ani
2 8 2 utwig/utwcap.ani
sc2/content/vux.lst
-14
View File
@@ -1,14 +0,0 @@
1 0 2 vux/vuxicons.ani
1 0 4 vux/vuxtext.txt
1 0 8 vux/vux.cod
1 1 2 vux/vuxmicon.ani
2 0 5 vux/vuxsound.snd
2 0 6 vux/vuxditty.mod
2 2 2 vux/vux.big
2 3 2 vux/vux.med
2 4 2 vux/vux.sml
2 5 2 vux/limpets.big
2 6 2 vux/limpets.med
2 7 2 vux/limpets.sml
2 8 2 vux/slime.ani
2 9 2 vux/vuxcap.ani
sc2/content/yehat.lst
-16
View File
@@ -1,16 +0,0 @@
1 0 2 yehat/yehicons.ani
1 0 4 yehat/yehtext.txt
1 0 8 yehat/yehat.cod
1 1 2 yehat/yehmicon.ani
2 0 5 yehat/yehsound.snd
2 0 6 yehat/yehditty.mod
2 2 2 yehat/yehat.big
2 3 2 yehat/yehat.med
2 4 2 yehat/yehat.sml
2 5 2 yehat/missile.big
2 6 2 yehat/missile.med
2 7 2 yehat/missile.sml
2 8 2 yehat/shield.big
2 9 2 yehat/shield.med
2 10 2 yehat/shield.sml
2 11 2 yehat/yehcap.ani
sc2/content/zoqfot.lst
-16
View File
@@ -1,16 +0,0 @@
1 0 2 zoqfot/zoqicons.ani
1 0 4 zoqfot/zoqtext.txt
1 0 8 zoqfot/zoqfot.cod
1 1 2 zoqfot/zoqmicon.ani
2 0 5 zoqfot/zoqsound.snd
2 0 6 zoqfot/zoqditty.mod
2 2 2 zoqfot/zoqfot.big
2 3 2 zoqfot/zoqfot.med
2 4 2 zoqfot/zoqfot.sml
2 5 2 zoqfot/spitbig.ani
2 6 2 zoqfot/spitmed.ani
2 7 2 zoqfot/spitsml.ani
2 8 2 zoqfot/stibig.ani
2 9 2 zoqfot/stimed.ani
2 10 2 zoqfot/stisml.ani
2 11 2 zoqfot/zoqcap.ani
sc2/src/options.c
+79 -43
View File
@@ -29,6 +29,7 @@
#include "libs/uio.h"
#include "libs/strlib.h"
#include "libs/log.h"
#include "libs/reslib.h"
#include <stdlib.h>
#include <stdio.h>
@@ -45,6 +46,7 @@ int optWhichIntro;
int optWhichShield;
int optSmoothScroll;
int optMeleeScale;
const char **optAddons;
BOOLEAN optSubtitles;
BOOLEAN optStereoSFX;
@@ -66,9 +68,9 @@ INPUT_TEMPLATE input_templates[6];
static const char *findFileInDirs (const char *locs[], int numLocs,
const char *file);
static void mountContentDir (uio_Repository *repository,
const char *contentPath, const char **addons);
const char *contentPath);
static void mountDirZips (uio_MountHandle *contentHandle,
uio_DirHandle *dirHandle);
uio_DirHandle *dirHandle, const char *mountPoint);
// Looks for a file 'file' in all 'numLocs' locations from 'locs'.
@@ -115,7 +117,7 @@ findFileInDirs (const char *locs[], int numLocs, const char *file)
}
void
prepareContentDir (const char *contentDirName, const char **addons)
prepareContentDir (const char *contentDirName)
{
const char *testFile = "version";
const char *loc;
@@ -151,7 +153,7 @@ prepareContentDir (const char *contentDirName, const char **addons)
log_add (log_Debug, "Using '%s' as base content dir.", baseContentPath);
mountContentDir (repository, baseContentPath, addons);
mountContentDir (repository, baseContentPath);
}
void
@@ -280,10 +282,10 @@ prepareMeleeDir (void) {
}
static void
mountContentDir (uio_Repository *repository, const char *contentPath,
const char **addons) {
mountContentDir (uio_Repository *repository, const char *contentPath)
{
uio_MountHandle *contentHandle;
uio_DirHandle *packagesDir, *addonsDir, *addonDir;
uio_DirHandle *packagesDir, *addonsDir;
static uio_AutoMount *autoMount[] = { NULL };
availableAddons = NULL;
@@ -306,35 +308,24 @@ mountContentDir (uio_Repository *repository, const char *contentPath,
}
packagesDir = uio_openDir (repository, "/packages", 0);
if (packagesDir == NULL)
{ // No packages dir means no packages to load.
if (addons[0] != NULL)
{ // addons were specified, but there's no /packages dir,
// let alone a /packages/addons dir.
log_add (log_Warning, "Warning: There's no 'packages/addons' "
"directory in the 'content' directory;\n\t'--addon' "
"options are ignored.");
}
return;
if (packagesDir != NULL)
{
mountDirZips (contentHandle, packagesDir, "/");
uio_closeDir (packagesDir);
}
mountDirZips (contentHandle, packagesDir);
// NB: note the difference between addonsDir and addonDir.
// the former is the dir 'packages/addons', the latter a directory
// the former is the dir 'addons', the latter a directory
// in that dir.
addonsDir = uio_openDirRelative (packagesDir, "addons", 0);
addonsDir = uio_openDirRelative (contentDir, "addons", 0);
if (addonsDir == NULL)
{ // No addon dir found.
log_add (log_Warning, "Warning: There's no 'packages/addons' "
log_add (log_Warning, "Warning: There's no 'addons' "
"directory in the 'content' directory;\n\t'--addon' "
"options are ignored.");
uio_closeDir (packagesDir);
return;
}
uio_closeDir (packagesDir);
availableAddons = uio_getDirList (addonsDir, "", "", match_MATCH_PREFIX);
if (availableAddons != NULL)
{
@@ -351,8 +342,23 @@ mountContentDir (uio_Repository *repository, const char *contentPath,
}
for (i = 0; i < count; i++)
{
log_add (log_Info, " %d. %s", i+1,
availableAddons->names[i]);
static char mountname[128];
uio_DirHandle *addonDir;
const char *addon = availableAddons->names[i];
log_add (log_Info, " %d. %s", i+1, addon);
snprintf(mountname, 128, "addons/%s", addon);
mountname[127]=0;
addonDir = uio_openDirRelative (addonsDir, addon, 0);
if (addonDir == NULL)
{
log_add (log_Warning, "Warning: directory 'addons/%s' "
"not found; addon skipped.", addon);
continue;
}
mountDirZips (contentHandle, addonDir, mountname);
uio_closeDir (addonDir);
}
}
else
@@ -360,26 +366,14 @@ mountContentDir (uio_Repository *repository, const char *contentPath,
log_add (log_Info, "0 available addon packs.");
}
for (; *addons != NULL; addons++)
{
addonDir = uio_openDirRelative (addonsDir, *addons, 0);
if (addonDir == NULL)
{
log_add (log_Warning, "Warning: directory 'packages/addons/%s' "
"not found; addon skipped.", *addons);
continue;
}
mountDirZips (contentHandle, addonDir);
uio_closeDir (addonDir);
}
uio_DirList_free (availableAddons);
availableAddons = NULL;
uio_closeDir (addonsDir);
}
static void
mountDirZips (uio_MountHandle *contentHandle, uio_DirHandle *dirHandle)
mountDirZips (uio_MountHandle *contentHandle, uio_DirHandle *dirHandle, const char *mountPoint)
{
static uio_AutoMount *autoMount[] = { NULL };
uio_DirList *dirList;
@@ -392,7 +386,7 @@ mountDirZips (uio_MountHandle *contentHandle, uio_DirHandle *dirHandle)
for (i = 0; i < dirList->numNames; i++)
{
if (uio_mountDir (repository, "/", uio_FSTYPE_ZIP,
if (uio_mountDir (repository, mountPoint, uio_FSTYPE_ZIP,
dirHandle, dirList->names[i], "/", autoMount,
uio_MOUNT_BELOW | uio_MOUNT_RDONLY,
contentHandle) == NULL)
@@ -405,3 +399,45 @@ mountDirZips (uio_MountHandle *contentHandle, uio_DirHandle *dirHandle)
uio_DirList_free (dirList);
}
void
prepareAddons (const char **addons)
{
uio_DirHandle *addonsDir;
addonsDir = uio_openDirRelative (contentDir, "addons", 0);
if (addonsDir == NULL)
{ // No addon dir found.
log_add (log_Warning, "Warning: There's no 'addons' "
"directory in the 'content' directory;\n\t'--addon' "
"options are ignored.");
return;
}
for (; *addons != NULL; addons++)
{
uio_DirList *indices;
uio_DirHandle *addonDir;
addonDir = uio_openDirRelative (addonsDir, *addons, 0);
if (addonDir == NULL)
{
log_add (log_Warning, "Warning: Addon '%s' not found", *addons);
continue;
}
indices = uio_getDirList (addonDir, "", ".rmp$",
match_MATCH_REGEX);
if (indices != NULL)
{
int i;
for (i = 0; i < indices->numNames; i++)
{
res_LoadFilename (addonDir, indices->names[i]);
}
}
uio_DirList_free (indices);
uio_closeDir (addonDir);
}
uio_closeDir (addonsDir);
}
sc2/src/options.h
+3 -1
View File
@@ -50,6 +50,7 @@ extern uio_DirHandle *meleeDir;
extern char baseContentPath[PATH_MAX];
extern uio_DirList *availableAddons;
extern const char **optAddons;
/* These get edited by TEXTENTRY widgets, so they should have room to
* hold as much as one of them allows by default. */
@@ -64,10 +65,11 @@ typedef struct _input_template {
extern INPUT_TEMPLATE input_templates[6];
void prepareContentDir (const char *contentDirName, const char **addons);
void prepareContentDir (const char *contentDirName);
void prepareConfigDir (const char *configDirName);
void prepareMeleeDir (void);
void prepareSaveDir (void);
void prepareAddons (const char **addons);
#endif
sc2/src/sc2code/libs/resource/getres.c
+11 -3
View File
@@ -72,16 +72,24 @@ MEM_HANDLE
loadResourceDesc (ResourceIndex *idx, ResourceDesc *desc)
{
RES_TYPE resType = GET_TYPE (desc->res);
const char *path;
if (resType >= idx->typeInfo.numTypes ||
idx->typeInfo.handlers[resType].loadFun == NULL)
{
log_add (log_Warning, "Warning: Unable to load '%s'; no handler "
"for type %d defined.", desc->path, resType);
"for type %d defined.", desc->res_id, resType);
return NULL_HANDLE;
}
desc->handle = loadResource (desc->path,
path = res_GetString (desc->res_id);
if (path == NULL)
{
log_add (log_Warning, "Could not decode resource '%s'", desc->res_id);
return NULL_HANDLE;
}
desc->handle = loadResource (path,
idx->typeInfo.handlers[resType].loadFun);
return desc->handle;
}
sc2/src/sc2code/libs/resource/index.h
-1
View File
@@ -24,7 +24,6 @@
typedef struct
{
RESOURCE res;
char *path;
char *res_id;
MEM_HANDLE handle;
//COUNT ref;
sc2/src/sc2code/libs/resource/resinit.c
-10
View File
@@ -86,24 +86,14 @@ static ResourceDesc *
newResourceDesc (RESOURCE res, char *res_id)
{
ResourceDesc *result;
const char *path;
result = HMalloc (sizeof (ResourceDesc));
if (result == NULL)
return NULL;
path = res_GetString (res_id);
if (path == NULL)
{
log_add (log_Warning, "Could not decode resource '%s'", res_id);
HFree (result);
return NULL;
}
// log_add (log_Info, " '%s' -> '%s'.", res_id, path);
result->res = res;
result->path = path;
result->res_id = res_id;
result->handle = NULL_HANDLE;
//result->ref = 0;
sc2/src/sc2code/libs/sound/music.c
+2 -31
View File
@@ -143,37 +143,8 @@ SetMusicVolume (COUNT Volume)
char*
CheckMusicResName (char* fileName)
{
char otherName[256];
const char* otherExt;
char* curExt;
if (strlen (fileName) < 4)
return fileName;
strncpy (otherName, fileName, sizeof (otherName) - 1);
otherName[sizeof (otherName) - 1] = '\0';
switch (optWhichMusic)
{
default:
case OPT_3DO:
otherExt = "ogg";
break;
case OPT_PC:
otherExt = "mod";
break;
}
curExt = otherName + strlen (otherName) - strlen (otherExt);
if (strcmp(curExt, otherExt) != 0)
{
strcpy (curExt, otherExt);
if (fileExists2 (contentDir, otherName))
strcpy (fileName, otherName);
else
log_add (log_Warning, "Requested track '%s' not found.", otherName);
}
if (!fileExists2 (contentDir, fileName))
log_add (log_Warning, "Requested track '%s' not found.", fileName);
return fileName;
}
sc2/src/sc2code/setup.c
+11
View File
@@ -114,6 +114,17 @@ LoadKernel (int argc, char *argv[])
hResIndex = InitResourceSystem ("uqm.rmp", "starcon.ls2", RES_INDEX, NULL);
if (hResIndex == 0)
return FALSE;
/* TODO: This code must die once 3domusic becomes an addon
* pack in its own right. */
if (optWhichMusic == OPT_3DO)
{
res_LoadFilename (contentDir, "3domusic.rmp");
}
/* Now load the rest of the addons, in order. */
prepareAddons (optAddons);
INIT_INSTANCES ();
{
sc2/src/starcon2.c
+2 -2
View File
@@ -419,9 +419,9 @@ main (int argc, char *argv[])
musicVolumeScale = options.musicVolumeScale;
sfxVolumeScale = options.sfxVolumeScale;
speechVolumeScale = options.speechVolumeScale;
optAddons = options.addons;
prepareContentDir (options.contentDir, options.addons);
HFree ((void *) options.addons);
prepareContentDir (options.contentDir);
prepareMeleeDir ();
prepareSaveDir ();
#if 0
sc2/src/uqmversion.h
+2 -2
View File
@@ -21,8 +21,8 @@
#define UQM_MAJOR_VERSION_S "0"
#define UQM_MINOR_VERSION 6
#define UQM_MINOR_VERSION_S "6"
#define UQM_PATCH_VERSION 3
#define UQM_PATCH_VERSION_S "3"
#define UQM_PATCH_VERSION 4
#define UQM_PATCH_VERSION_S "4"
#define UQM_EXTRA_VERSION ""
/* The final version is interpreted as:
* printf ("%d.%d.%d%s", UQM_MAJOR_VERSION, UQM_MINOR_VERSION,
tools/resmap/deploy.py
Executable
+46
View File
@@ -0,0 +1,46 @@
#!/usr/bin/python
import sys
import os
import os.path
import explorer
import mastermap
import relst
if len(sys.argv) < 2:
basedir = os.path.join(os.path.pardir, os.path.pardir, "sc2", "content")
else:
basedir = sys.argv[1]
verbose = True
def deploy_map():
target = os.path.join(basedir, "uqm.rmp")
outfile = file(target, 'wt')
if verbose:
print "Writing %s..." % target
for l in mastermap.create_map(basedir):
print>>outfile, l
outfile.close()
def deploy_ls2(name, pkg):
newpkg = os.path.splitext(name)[0]+'.ls2'
newvals = relst.process(pkg)
outfile = file(newpkg, 'wt')
print "Writing %s..." % newpkg
for l in newvals:
print>>outfile, l
outfile.close()
def deploy_ls2s():
pkgnames = explorer.get_lists(basedir)
packages = [(x, explorer.read_list(x)) for x in pkgnames]
for (name, pkg) in packages:
deploy_ls2(name, pkg)
if __name__ == '__main__':
deploy_map()
deploy_ls2s()
tools/resmap/explorer.py
+2 -2
View File
@@ -3,10 +3,10 @@ import sys
import os
import os.path
def get_lists(d):
def collect_extension(d, ext):
result = []
for (dirpath, dirnames, filenames) in os.walk(d):
for l in [f for f in filenames if f.endswith('.lst')]:
for l in [f for f in filenames if f.endswith(ext)]:
result.append(os.path.join(dirpath, l))
return result
tools/resmap/mastermap.py
+33 -13
View File
@@ -5,6 +5,8 @@ import os.path
import explorer
import stridgen
from optparse import OptionParser
def process (res):
result = []
for line in res:
@@ -24,22 +26,31 @@ def process (res):
result.sort()
return result
def get_resources(d):
def get_lists(d, ext):
result = []
packages = [explorer.read_list(x) for x in explorer.get_lists(d)]
packages = [explorer.read_list(x) for x in explorer.collect_extension(d, ext)]
for package in packages:
for line in package:
if line[1] not in result:
result.append(line[1])
return result
def create_map(d):
resources = get_resources(d)
def get_resources(d, ext):
result = []
if not d.endswith(os.path.sep):
d += os.path.sep
for res in explorer.collect_extension (d, ext):
res = res[len(d):]
if res not in result:
result.append(res)
return result
def create_map(resources):
resmap = process(resources)
keys = []
result = []
for r in resmap:
key = r.split(':')[0]
key = r.split('=')[0].strip()
if key in keys:
result.append("# ERROR: DUPLICATE KEY %s" % key)
else:
@@ -48,12 +59,21 @@ def create_map(d):
return result
if __name__ == "__main__":
if len(sys.argv) < 2:
d = os.path.join(os.path.pardir, os.path.pardir, "sc2", "content")
opts = OptionParser(usage="usage: %prog [options]")
opts.add_option("-d", "--content-dir", dest="d",
help="Directory to search for resources",
default=os.path.join(os.path.pardir, os.path.pardir, "sc2", "content"))
opts.add_option("-r", "--raw", action="store_true", default=False,
dest="raw", help="do not treat target resources as lists")
opts.add_option("-e", "--extension", dest="ext",
help="Extension for files to search", default=".lst")
(options, args)=opts.parse_args()
if options.raw:
l = get_resources(options.d, options.ext)
else:
d = sys.argv[1]
target = os.path.join(d, "uqm.rmp")
print target
print "-"*len(target)
for l in create_map(d):
print l
l = get_lists(options.d, options.ext)
for line in create_map(l):
print line
tools/resmap/stridgen.py
+3
View File
@@ -27,8 +27,10 @@ patterns = [("comm/(.*)/(.*)\.mod", lambda m: "comm.%s.music" % m.group(1)),
("ipanims/(.*)\.fon", lambda m: "font.%s" % m.group(1)),
("ipanims/(.*)\.snd", lambda m: "sounds.%s" % m.group(1)),
("ipanims/(.*)\.mod", lambda m: "music.%s" % m.group(1)),
("ipanims/(.*)\.ogg", lambda m: "music.%s" % m.group(1)),
("lbm/(.*)\.ani", lambda m: "graphics.%s" % m.group(1)),
("lbm/(.*)\.mod", lambda m: "music.%s" % m.group(1)),
("lbm/(.*)\.ogg", lambda m: "music.%s" % m.group(1)),
("lbm/(.*)\.ct", lambda m: "colortable.%s" % m.group(1)),
("lbm/(.*)\.fon", lambda m: "font.%s" % m.group(1)),
("lbm/(.*)snd\.snd", lambda m: "sounds.%s" % m.group(1)),
@@ -43,6 +45,7 @@ patterns = [("comm/(.*)/(.*)\.mod", lambda m: "comm.%s.music" % m.group(1)),
("(.*)/(.*)\.cod", lambda m: "ship.%s.code" % m.group(1)),
("(.*)/(.*)\.snd", lambda m: "ship.%s.sounds" % m.group(1)),
("(.*)/(.*)\.mod", lambda m: "ship.%s.ditty" % m.group(1)),
("(.*)/(.*)\.ogg", lambda m: "ship.%s.ditty" % m.group(1)),
("(.*)/(.*)\.txt", lambda m: "ship.%s.text" % m.group(1)),
("(.*)/(.*)cap\.ani", lambda m: "ship.%s.graphics.captain" % m.group(1)),
("(.*)/(.*)big.*", lambda m: "ship.%s.graphics.%s.large" % (m.group(1), stripdots(m.group(2)))),