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

Communications resource information has been folded into starcon.ls2.

Browse Source 
The comm/*.ls2 files have been retired.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2927 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2008-02-25 05:19:49 +00:00
parent 9f577a4abe
commit b3dcf06737
35 changed files with 343 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.7:
- Moved comm resources into starcon.ls2 - Michael
- Repackaged static comm/ship data to it all uniquely named - Michael
- On MacOS X, search for the content in the application bundle, from Nic
- Planetside resource names are now consistent and generatable - Michael
sc2/content/comm/arilou.ls2
-5
View File
@@ -1,5 +0,0 @@
500 0 6 comm.arilou.music
500 1 3 comm.arilou.font
500 2 4 comm.arilou.dialogue
500 3 2 comm.arilou.graphics
500 4 4 comm.arilou.colortable
sc2/content/comm/blackur.ls2
-5
View File
@@ -1,5 +0,0 @@
501 0 6 comm.kohrah.music
501 1 3 comm.kohrah.font
501 2 4 comm.kohrah.dialogue
501 3 4 comm.kohrah.colortable
501 4 2 comm.kohrah.graphics
sc2/content/comm/chmmr.ls2
-5
View File
@@ -1,5 +0,0 @@
502 0 6 comm.chmmr.music
502 1 3 comm.chmmr.font
502 2 4 comm.chmmr.dialogue
502 3 4 comm.chmmr.colortable
502 4 2 comm.chmmr.graphics
sc2/content/comm/comandr.ls2
-8
View File
@@ -1,8 +0,0 @@
503 0 6 comm.commander.music
503 1 6 comm.starbase.music
503 2 6 comm.comlowpw.music
503 3 3 comm.commander.font
503 4 4 comm.commander.colortable
503 5 4 comm.commander.dialogue
503 6 4 comm.starbase.dialogue
503 7 2 comm.commander.graphics
sc2/content/comm/druuge.ls2
-5
View File
@@ -1,5 +0,0 @@
504 0 6 comm.druuge.music
504 1 3 comm.druuge.font
504 2 4 comm.druuge.dialogue
504 3 4 comm.druuge.colortable
504 4 2 comm.druuge.graphics
sc2/content/comm/ilwrath.ls2
-5
View File
@@ -1,5 +0,0 @@
505 0 6 comm.ilwrath.music
505 1 3 comm.ilwrath.font
505 2 4 comm.ilwrath.dialogue
505 3 4 comm.ilwrath.colortable
505 4 2 comm.ilwrath.graphics
sc2/content/comm/melnorm.ls2
-5
View File
@@ -1,5 +0,0 @@
506 0 6 comm.melnorme.music
506 1 3 comm.melnorme.font
506 2 4 comm.melnorme.dialogue
506 3 4 comm.melnorme.colortable
506 4 2 comm.melnorme.graphics
sc2/content/comm/mycon.ls2
-5
View File
@@ -1,5 +0,0 @@
507 0 6 comm.mycon.music
507 1 3 comm.mycon.font
507 2 4 comm.mycon.dialogue
507 3 4 comm.mycon.colortable
507 4 2 comm.mycon.graphics
sc2/content/comm/orz.ls2
-5
View File
@@ -1,5 +0,0 @@
508 0 6 comm.orz.music
508 1 3 comm.orz.font
508 2 4 comm.orz.dialogue
508 3 4 comm.orz.colortable
508 4 2 comm.orz.graphics
sc2/content/comm/pkunk.ls2
-5
View File
@@ -1,5 +0,0 @@
509 0 6 comm.pkunk.music
509 1 3 comm.pkunk.font
509 2 4 comm.pkunk.dialogue
509 3 4 comm.pkunk.colortable
509 4 2 comm.pkunk.graphics
sc2/content/comm/shofixt.ls2
-5
View File
@@ -1,5 +0,0 @@
510 0 6 comm.shofixti.music
510 1 3 comm.shofixti.font
510 2 4 comm.shofixti.dialogue
510 3 4 comm.shofixti.colortable
510 4 2 comm.shofixti.graphics
sc2/content/comm/slyhome.ls2
-5
View File
@@ -1,5 +0,0 @@
511 0 6 comm.slyhome.music
511 1 3 comm.slyhome.font
511 2 4 comm.slyhome.dialogue
511 3 4 comm.slyhome.colortable
511 4 2 comm.slyhome.graphics
sc2/content/comm/slyland.ls2
-5
View File
@@ -1,5 +0,0 @@
512 0 6 comm.slylandro.music
512 1 3 comm.slylandro.font
512 2 4 comm.slylandro.dialogue
512 3 4 comm.slylandro.colortable
512 4 2 comm.slylandro.graphics
sc2/content/comm/spathi.ls2
-10
View File
@@ -1,10 +0,0 @@
513 0 6 comm.spathi.music
513 1 6 comm.spahome.music
513 2 6 comm.spafwiff.music
513 3 3 comm.spathi.font
513 4 4 comm.spathi.dialogue
513 5 4 comm.spahome.colortable
513 6 4 comm.spahome.dialogue
513 7 4 comm.spathi.colortable
513 8 2 comm.spathi.graphics
513 9 2 comm.spahome.graphics
sc2/content/comm/supox.ls2
-5
View File
@@ -1,5 +0,0 @@
514 0 6 comm.supox.music
514 1 3 comm.supox.font
514 2 4 comm.supox.dialogue
514 3 4 comm.supox.colortable
514 4 2 comm.supox.graphics
sc2/content/comm/syreen.ls2
-5
View File
@@ -1,5 +0,0 @@
515 0 6 comm.syreen.music
515 1 3 comm.syreen.font
515 2 4 comm.syreen.dialogue
515 3 4 comm.syreen.colortable
515 4 2 comm.syreen.graphics
sc2/content/comm/talkpet.ls2
-5
View File
@@ -1,5 +0,0 @@
516 0 6 comm.talkingpet.music
516 1 3 comm.talkingpet.font
516 2 4 comm.talkingpet.dialogue
516 3 4 comm.talkingpet.colortable
516 4 2 comm.talkingpet.graphics
sc2/content/comm/thradd.ls2
-5
View File
@@ -1,5 +0,0 @@
517 0 6 comm.thraddash.music
517 1 3 comm.thraddash.font
517 2 4 comm.thraddash.dialogue
517 3 4 comm.thraddash.colortable
517 4 2 comm.thraddash.graphics
sc2/content/comm/umgah.ls2
-5
View File
@@ -1,5 +0,0 @@
518 0 6 comm.umgah.music
518 1 3 comm.umgah.font
518 2 4 comm.umgah.dialogue
518 3 4 comm.umgah.colortable
518 4 2 comm.umgah.graphics
sc2/content/comm/urquan.ls2
-5
View File
@@ -1,5 +0,0 @@
519 0 6 comm.urquan.music
519 1 3 comm.urquan.font
519 2 4 comm.urquan.dialogue
519 3 4 comm.urquan.colortable
519 4 2 comm.urquan.graphics
sc2/content/comm/utwig.ls2
-6
View File
@@ -1,6 +0,0 @@
520 0 6 comm.utwig.music
520 1 6 comm.utwigult.music
520 2 3 comm.utwig.font
520 3 4 comm.utwig.dialogue
520 4 4 comm.utwig.colortable
520 5 2 comm.utwig.graphics
sc2/content/comm/vux.ls2
-5
View File
@@ -1,5 +0,0 @@
521 0 6 comm.vux.music
521 1 3 comm.vux.font
521 2 4 comm.vux.dialogue
521 3 4 comm.vux.colortable
521 4 2 comm.vux.graphics
sc2/content/comm/yehat.ls2
-7
View File
@@ -1,7 +0,0 @@
522 0 6 comm.yehat.music
522 1 6 comm.yehat.rebel.music
522 2 3 comm.yehat.font
522 3 4 comm.yehat.dialogue
522 4 4 comm.yehat.rebel.dialogue
522 5 4 comm.yehat.colortable
522 6 2 comm.yehat.graphics
sc2/content/comm/zoqfot.ls2
-5
View File
@@ -1,5 +0,0 @@
523 0 6 comm.zoqfotpik.music
523 1 3 comm.zoqfotpik.font
523 2 4 comm.zoqfotpik.dialogue
523 3 4 comm.zoqfotpik.colortable
523 4 2 comm.zoqfotpik.graphics
sc2/content/starcon.ls2
+131 -24
View File
@@ -261,30 +261,6 @@
163 8 6 music.redalert
163 74 2 graphics.segue
164 75 2 graphics.pickship
165 25 7 comm.arilou.resources
166 26 7 comm.chmmr.resources
167 27 7 comm.commander.resources
168 28 7 comm.orz.resources
169 29 7 comm.pkunk.resources
170 30 7 comm.shofixti.resources
171 31 7 comm.spathi.resources
172 32 7 comm.supox.resources
173 33 7 comm.thraddash.resources
174 34 7 comm.utwig.resources
175 35 7 comm.vux.resources
176 36 7 comm.yehat.resources
177 37 7 comm.melnorme.resources
178 38 7 comm.druuge.resources
179 39 7 comm.ilwrath.resources
180 40 7 comm.mycon.resources
181 41 7 comm.slylandro.resources
182 42 7 comm.umgah.resources
183 43 7 comm.urquan.resources
184 44 7 comm.zoqfotpik.resources
185 45 7 comm.syreen.resources
186 46 7 comm.kohrah.resources
187 47 7 comm.talkingpet.resources
188 48 7 comm.slyhome.resources
189 4 3 font.player
190 49 7 ship.sis_ship.resources
191 50 7 ship.lastbat.resources
@@ -496,3 +472,134 @@
288 7 3 credits.font.pt45
289 100 4 credits.credits
290 101 4 text.joyalpha
500 0 6 comm.arilou.music
500 1 3 comm.arilou.font
500 2 4 comm.arilou.dialogue
500 3 2 comm.arilou.graphics
500 4 4 comm.arilou.colortable
501 0 6 comm.kohrah.music
501 1 3 comm.kohrah.font
501 2 4 comm.kohrah.dialogue
501 3 4 comm.kohrah.colortable
501 4 2 comm.kohrah.graphics
502 0 6 comm.chmmr.music
502 1 3 comm.chmmr.font
502 2 4 comm.chmmr.dialogue
502 3 4 comm.chmmr.colortable
502 4 2 comm.chmmr.graphics
503 0 6 comm.commander.music
503 1 6 comm.starbase.music
503 2 6 comm.comlowpw.music
503 3 3 comm.commander.font
503 4 4 comm.commander.colortable
503 5 4 comm.commander.dialogue
503 6 4 comm.starbase.dialogue
503 7 2 comm.commander.graphics
504 0 6 comm.druuge.music
504 1 3 comm.druuge.font
504 2 4 comm.druuge.dialogue
504 3 4 comm.druuge.colortable
504 4 2 comm.druuge.graphics
505 0 6 comm.ilwrath.music
505 1 3 comm.ilwrath.font
505 2 4 comm.ilwrath.dialogue
505 3 4 comm.ilwrath.colortable
505 4 2 comm.ilwrath.graphics
506 0 6 comm.melnorme.music
506 1 3 comm.melnorme.font
506 2 4 comm.melnorme.dialogue
506 3 4 comm.melnorme.colortable
506 4 2 comm.melnorme.graphics
507 0 6 comm.mycon.music
507 1 3 comm.mycon.font
507 2 4 comm.mycon.dialogue
507 3 4 comm.mycon.colortable
507 4 2 comm.mycon.graphics
508 0 6 comm.orz.music
508 1 3 comm.orz.font
508 2 4 comm.orz.dialogue
508 3 4 comm.orz.colortable
508 4 2 comm.orz.graphics
509 0 6 comm.pkunk.music
509 1 3 comm.pkunk.font
509 2 4 comm.pkunk.dialogue
509 3 4 comm.pkunk.colortable
509 4 2 comm.pkunk.graphics
510 0 6 comm.shofixti.music
510 1 3 comm.shofixti.font
510 2 4 comm.shofixti.dialogue
510 3 4 comm.shofixti.colortable
510 4 2 comm.shofixti.graphics
511 0 6 comm.slyhome.music
511 1 3 comm.slyhome.font
511 2 4 comm.slyhome.dialogue
511 3 4 comm.slyhome.colortable
511 4 2 comm.slyhome.graphics
512 0 6 comm.slylandro.music
512 1 3 comm.slylandro.font
512 2 4 comm.slylandro.dialogue
512 3 4 comm.slylandro.colortable
512 4 2 comm.slylandro.graphics
513 0 6 comm.spathi.music
513 1 6 comm.spahome.music
513 2 6 comm.spafwiff.music
513 3 3 comm.spathi.font
513 4 4 comm.spathi.dialogue
513 5 4 comm.spahome.colortable
513 6 4 comm.spahome.dialogue
513 7 4 comm.spathi.colortable
513 8 2 comm.spathi.graphics
513 9 2 comm.spahome.graphics
514 0 6 comm.supox.music
514 1 3 comm.supox.font
514 2 4 comm.supox.dialogue
514 3 4 comm.supox.colortable
514 4 2 comm.supox.graphics
515 0 6 comm.syreen.music
515 1 3 comm.syreen.font
515 2 4 comm.syreen.dialogue
515 3 4 comm.syreen.colortable
515 4 2 comm.syreen.graphics
516 0 6 comm.talkingpet.music
516 1 3 comm.talkingpet.font
516 2 4 comm.talkingpet.dialogue
516 3 4 comm.talkingpet.colortable
516 4 2 comm.talkingpet.graphics
517 0 6 comm.thraddash.music
517 1 3 comm.thraddash.font
517 2 4 comm.thraddash.dialogue
517 3 4 comm.thraddash.colortable
517 4 2 comm.thraddash.graphics
518 0 6 comm.umgah.music
518 1 3 comm.umgah.font
518 2 4 comm.umgah.dialogue
518 3 4 comm.umgah.colortable
518 4 2 comm.umgah.graphics
519 0 6 comm.urquan.music
519 1 3 comm.urquan.font
519 2 4 comm.urquan.dialogue
519 3 4 comm.urquan.colortable
519 4 2 comm.urquan.graphics
520 0 6 comm.utwig.music
520 1 6 comm.utwigult.music
520 2 3 comm.utwig.font
520 3 4 comm.utwig.dialogue
520 4 4 comm.utwig.colortable
520 5 2 comm.utwig.graphics
521 0 6 comm.vux.music
521 1 3 comm.vux.font
521 2 4 comm.vux.dialogue
521 3 4 comm.vux.colortable
521 4 2 comm.vux.graphics
522 0 6 comm.yehat.music
522 1 6 comm.yehat.rebel.music
522 2 3 comm.yehat.font
522 3 4 comm.yehat.dialogue
522 4 4 comm.yehat.rebel.dialogue
522 5 4 comm.yehat.colortable
522 6 2 comm.yehat.graphics
523 0 6 comm.zoqfotpik.music
523 1 3 comm.zoqfotpik.font
523 2 4 comm.zoqfotpik.dialogue
523 3 4 comm.zoqfotpik.colortable
523 4 2 comm.zoqfotpik.graphics
sc2/content/uqm.rmp
-24
View File
@@ -9,79 +9,66 @@ comm.arilou.dialogue = STRTAB:comm/arilou/arilou.txt
comm.arilou.font = FONTRES:comm/arilou/arilou.fon
comm.arilou.graphics = GFXRES:comm/arilou/arilou.ani
comm.arilou.music = MUSICRES:comm/arilou/arilou.mod
comm.arilou.resources = RES_INDEX:comm/arilou.ls2
comm.chmmr.colortable = STRTAB:comm/chmmr/chmmr.ct
comm.chmmr.dialogue = STRTAB:comm/chmmr/chmmr.txt
comm.chmmr.font = FONTRES:comm/chmmr/chmmr.fon
comm.chmmr.graphics = GFXRES:comm/chmmr/chmmr.ani
comm.chmmr.music = MUSICRES:comm/chmmr/chmmr.mod
comm.chmmr.resources = RES_INDEX:comm/chmmr.ls2
comm.commander.colortable = STRTAB:comm/comandr/comandr.ct
comm.commander.dialogue = STRTAB:comm/comandr/comandr.txt
comm.commander.font = FONTRES:comm/comandr/comandr.fon
comm.commander.graphics = GFXRES:comm/comandr/comandr.ani
comm.commander.music = MUSICRES:comm/comandr/comandr.mod
comm.commander.resources = RES_INDEX:comm/comandr.ls2
comm.druuge.colortable = STRTAB:comm/druuge/druuge.ct
comm.druuge.dialogue = STRTAB:comm/druuge/druuge.txt
comm.druuge.font = FONTRES:comm/druuge/druuge.fon
comm.druuge.graphics = GFXRES:comm/druuge/druuge.ani
comm.druuge.music = MUSICRES:comm/druuge/druuge.mod
comm.druuge.resources = RES_INDEX:comm/druuge.ls2
comm.ilwrath.colortable = STRTAB:comm/ilwrath/ilwrath.ct
comm.ilwrath.dialogue = STRTAB:comm/ilwrath/ilwrath.txt
comm.ilwrath.font = FONTRES:comm/ilwrath/ilwrath.fon
comm.ilwrath.graphics = GFXRES:comm/ilwrath/ilwrath.ani
comm.ilwrath.music = MUSICRES:comm/ilwrath/ilwrath.mod
comm.ilwrath.resources = RES_INDEX:comm/ilwrath.ls2
comm.kohrah.colortable = STRTAB:comm/blackur/blackur.ct
comm.kohrah.dialogue = STRTAB:comm/blackur/blackur.txt
comm.kohrah.font = FONTRES:comm/blackur/blackur.fon
comm.kohrah.graphics = GFXRES:comm/blackur/blackur.ani
comm.kohrah.music = MUSICRES:comm/blackur/blackur.mod
comm.kohrah.resources = RES_INDEX:comm/blackur.ls2
comm.melnorme.colortable = STRTAB:comm/melnorm/melnorm.ct
comm.melnorme.dialogue = STRTAB:comm/melnorm/melnorm.txt
comm.melnorme.font = FONTRES:comm/melnorm/melnorm.fon
comm.melnorme.graphics = GFXRES:comm/melnorm/melnorm.ani
comm.melnorme.music = MUSICRES:comm/melnorm/melnorm.mod
comm.melnorme.resources = RES_INDEX:comm/melnorm.ls2
comm.mycon.colortable = STRTAB:comm/mycon/mycon.ct
comm.mycon.dialogue = STRTAB:comm/mycon/mycon.txt
comm.mycon.font = FONTRES:comm/mycon/mycon.fon
comm.mycon.graphics = GFXRES:comm/mycon/mycon.ani
comm.mycon.music = MUSICRES:comm/mycon/mycon.mod
comm.mycon.resources = RES_INDEX:comm/mycon.ls2
comm.orz.colortable = STRTAB:comm/orz/orz.ct
comm.orz.dialogue = STRTAB:comm/orz/orz.txt
comm.orz.font = FONTRES:comm/orz/orz.fon
comm.orz.graphics = GFXRES:comm/orz/orz.ani
comm.orz.music = MUSICRES:comm/orz/orz.mod
comm.orz.resources = RES_INDEX:comm/orz.ls2
comm.pkunk.colortable = STRTAB:comm/pkunk/pkunk.ct
comm.pkunk.dialogue = STRTAB:comm/pkunk/pkunk.txt
comm.pkunk.font = FONTRES:comm/pkunk/pkunk.fon
comm.pkunk.graphics = GFXRES:comm/pkunk/pkunk.ani
comm.pkunk.music = MUSICRES:comm/pkunk/pkunk.mod
comm.pkunk.resources = RES_INDEX:comm/pkunk.ls2
comm.shofixti.colortable = STRTAB:comm/shofixt/shofixt.ct
comm.shofixti.dialogue = STRTAB:comm/shofixt/shofixt.txt
comm.shofixti.font = FONTRES:comm/shofixt/shofixt.fon
comm.shofixti.graphics = GFXRES:comm/shofixt/shofixt.ani
comm.shofixti.music = MUSICRES:comm/shofixt/shofixt.mod
comm.shofixti.resources = RES_INDEX:comm/shofixt.ls2
comm.slyhome.colortable = STRTAB:comm/slyhome/slyhome.ct
comm.slyhome.dialogue = STRTAB:comm/slyhome/slyhome.txt
comm.slyhome.font = FONTRES:comm/slyhome/slyhome.fon
comm.slyhome.graphics = GFXRES:comm/slyhome/slyhome.ani
comm.slyhome.music = MUSICRES:comm/slyhome/slyhome.mod
comm.slyhome.resources = RES_INDEX:comm/slyhome.ls2
comm.slylandro.colortable = STRTAB:comm/slyland/slyland.ct
comm.slylandro.dialogue = STRTAB:comm/slyland/slyland.txt
comm.slylandro.font = FONTRES:comm/slyland/slyland.fon
comm.slylandro.graphics = GFXRES:comm/slyland/slyland.ani
comm.slylandro.music = MUSICRES:comm/slyland/slyland.mod
comm.slylandro.resources = RES_INDEX:comm/slyland.ls2
comm.spahome.colortable = STRTAB:comm/spahome/spahome.ct
comm.spahome.dialogue = STRTAB:comm/spahome/spahome.txt
comm.spahome.graphics = GFXRES:comm/spahome/spahome.ani
@@ -91,69 +78,58 @@ comm.spathi.dialogue = STRTAB:comm/spathi/spathi.txt
comm.spathi.font = FONTRES:comm/spathi/spathi.fon
comm.spathi.graphics = GFXRES:comm/spathi/spathi.ani
comm.spathi.music = MUSICRES:comm/spathi/spathi.mod
comm.spathi.resources = RES_INDEX:comm/spathi.ls2
comm.starbase.dialogue = STRTAB:comm/starbas/starbas.txt
comm.supox.colortable = STRTAB:comm/supox/supox.ct
comm.supox.dialogue = STRTAB:comm/supox/supox.txt
comm.supox.font = FONTRES:comm/supox/supox.fon
comm.supox.graphics = GFXRES:comm/supox/supox.ani
comm.supox.music = MUSICRES:comm/supox/supox.mod
comm.supox.resources = RES_INDEX:comm/supox.ls2
comm.syreen.colortable = STRTAB:comm/syreen/syreen.ct
comm.syreen.dialogue = STRTAB:comm/syreen/syreen.txt
comm.syreen.font = FONTRES:comm/syreen/syreen.fon
comm.syreen.graphics = GFXRES:comm/syreen/syreen.ani
comm.syreen.music = MUSICRES:comm/syreen/syreen.mod
comm.syreen.resources = RES_INDEX:comm/syreen.ls2
comm.talkingpet.colortable = STRTAB:comm/talkpet/talkpet.ct
comm.talkingpet.dialogue = STRTAB:comm/talkpet/talkpet.txt
comm.talkingpet.font = FONTRES:comm/talkpet/talkpet.fon
comm.talkingpet.graphics = GFXRES:comm/talkpet/talkpet.ani
comm.talkingpet.music = MUSICRES:comm/talkpet/talkpet.mod
comm.talkingpet.resources = RES_INDEX:comm/talkpet.ls2
comm.thraddash.colortable = STRTAB:comm/thradd/thradd.ct
comm.thraddash.dialogue = STRTAB:comm/thradd/thradd.txt
comm.thraddash.font = FONTRES:comm/thradd/thradd.fon
comm.thraddash.graphics = GFXRES:comm/thradd/thradd.ani
comm.thraddash.music = MUSICRES:comm/thradd/thradd.mod
comm.thraddash.resources = RES_INDEX:comm/thradd.ls2
comm.umgah.colortable = STRTAB:comm/umgah/umgah.ct
comm.umgah.dialogue = STRTAB:comm/umgah/umgah.txt
comm.umgah.font = FONTRES:comm/umgah/umgah.fon
comm.umgah.graphics = GFXRES:comm/umgah/umgah.ani
comm.umgah.music = MUSICRES:comm/umgah/umgah.mod
comm.umgah.resources = RES_INDEX:comm/umgah.ls2
comm.urquan.colortable = STRTAB:comm/urquan/urquan.ct
comm.urquan.dialogue = STRTAB:comm/urquan/urquan.txt
comm.urquan.font = FONTRES:comm/urquan/urquan.fon
comm.urquan.graphics = GFXRES:comm/urquan/urquan.ani
comm.urquan.music = MUSICRES:comm/urquan/urquan.mod
comm.urquan.resources = RES_INDEX:comm/urquan.ls2
comm.utwig.colortable = STRTAB:comm/utwig/utwig.ct
comm.utwig.dialogue = STRTAB:comm/utwig/utwig.txt
comm.utwig.font = FONTRES:comm/utwig/utwig.fon
comm.utwig.graphics = GFXRES:comm/utwig/utwig.ani
comm.utwig.music = MUSICRES:comm/utwig/utwig.mod
comm.utwig.resources = RES_INDEX:comm/utwig.ls2
comm.vux.colortable = STRTAB:comm/vux/vux.ct
comm.vux.dialogue = STRTAB:comm/vux/vux.txt
comm.vux.font = FONTRES:comm/vux/vux.fon
comm.vux.graphics = GFXRES:comm/vux/vux.ani
comm.vux.music = MUSICRES:comm/vux/vux.mod
comm.vux.resources = RES_INDEX:comm/vux.ls2
comm.yehat.colortable = STRTAB:comm/yehat/yehat.ct
comm.yehat.dialogue = STRTAB:comm/yehat/yehat.txt
comm.yehat.font = FONTRES:comm/yehat/yehat.fon
comm.yehat.graphics = GFXRES:comm/yehat/yehat.ani
comm.yehat.music = MUSICRES:comm/yehat/yehat.mod
comm.yehat.rebel.dialogue = STRTAB:comm/rebel/rebel.txt
comm.yehat.resources = RES_INDEX:comm/yehat.ls2
comm.zoqfotpik.colortable = STRTAB:comm/zoqfot/zoqfot.ct
comm.zoqfotpik.dialogue = STRTAB:comm/zoqfot/zoqfot.txt
comm.zoqfotpik.font = FONTRES:comm/zoqfot/zoqfot.fon
comm.zoqfotpik.graphics = GFXRES:comm/zoqfot/zoqfot.ani
comm.zoqfotpik.music = MUSICRES:comm/zoqfot/zoqfot.mod
comm.zoqfotpik.resources = RES_INDEX:comm/zoqfot.ls2
credits.background = GFXRES:credits/credback.ani
credits.credits = STRTAB:credits/credits.txt
credits.font.pt13 = FONTRES:credits/pt13.fon
sc2/src/sc2code/comm.c
+13 -22
View File
@@ -1431,10 +1431,10 @@ HailAlien (void)
}
COUNT
InitCommunication (RESOURCE which_comm)
InitCommunication (CONVERSATION which_comm)
{
COUNT status;
RESOURCE_INDEX hOldIndex, hIndex;
RESOURCE_INDEX hOldIndex;
LOCDATA *LocDataPtr;
#ifdef DEBUG
@@ -1470,7 +1470,7 @@ InitCommunication (RESOURCE which_comm)
}
}
if (which_comm == 0)
if (which_comm == URQUAN_PROBE_CONVERSATION)
{
status = URQUAN_PROBE_SHIP;
which_comm = URQUAN_CONVERSATION;
@@ -1484,8 +1484,10 @@ InitCommunication (RESOURCE which_comm)
}
else
{
status = GET_PACKAGE (which_comm)
- GET_PACKAGE (ARILOU_CONVERSATION) + ARILOU_SHIP;
COUNT commToShip[] = {
RACE_SHIP_FOR_COMM
};
status = commToShip[which_comm];
if (status >= YEHAT_REBEL_SHIP) {
/* conversation exception, set to self */
status = HUMAN_SHIP;
@@ -1504,22 +1506,12 @@ InitCommunication (RESOURCE which_comm)
}
hOldIndex = SetResourceIndex (hResIndex);
hIndex = OpenResourceIndexInstance (which_comm);
if (hIndex == 0)
{
SET_GAME_STATE (BATTLE_SEGUE, 1);
LocDataPtr = 0;
}
else
{
SetResourceIndex (hIndex);
LocDataPtr = init_race (
status != YEHAT_REBEL_SHIP ? which_comm :
YEHAT_REBEL_CONVERSATION);
if (LocDataPtr)
CommData = *LocDataPtr;
}
LocDataPtr = init_race (
status != YEHAT_REBEL_SHIP ? which_comm :
YEHAT_REBEL_CONVERSATION);
if (LocDataPtr)
CommData = *LocDataPtr;
UnlockMutex (GraphicsLock);
@@ -1557,7 +1549,6 @@ InitCommunication (RESOURCE which_comm)
}
SetResourceIndex (hOldIndex);
CloseResourceIndex (hIndex);
UnlockMutex (GraphicsLock);
@@ -1595,7 +1586,7 @@ RaceCommunication (void)
HSHIPFRAG hStarShip;
SHIP_FRAGMENT *FragPtr;
HENCOUNTER hEncounter = 0;
RESOURCE RaceComm[] =
CONVERSATION RaceComm[] =
{
RACE_COMMUNICATION
};
sc2/src/sc2code/commglue.c
+1 -1
View File
@@ -293,7 +293,7 @@ construct_response (UNICODE *buf, int R /* promoted from RESPONSE_REF */, ...)
}
LOCDATA*
init_race (RESOURCE comm_id)
init_race (CONVERSATION comm_id)
{
switch (comm_id)
{
sc2/src/sc2code/commglue.h
+30 -1
View File
@@ -23,6 +23,35 @@
#include "resinst.h"
#include "libs/sound/trackplayer.h"
typedef enum {
ARILOU_CONVERSATION,
CHMMR_CONVERSATION,
COMMANDER_CONVERSATION,
ORZ_CONVERSATION,
PKUNK_CONVERSATION,
SHOFIXTI_CONVERSATION,
SPATHI_CONVERSATION,
SUPOX_CONVERSATION,
THRADD_CONVERSATION,
UTWIG_CONVERSATION,
VUX_CONVERSATION,
YEHAT_CONVERSATION,
MELNORME_CONVERSATION,
DRUUGE_CONVERSATION,
ILWRATH_CONVERSATION,
MYCON_CONVERSATION,
SLYLANDRO_CONVERSATION,
UMGAH_CONVERSATION,
URQUAN_CONVERSATION,
ZOQFOTPIK_CONVERSATION,
SYREEN_CONVERSATION,
BLACKURQ_CONVERSATION,
TALKING_PET_CONVERSATION,
SLYLANDRO_HOME_CONVERSATION,
URQUAN_PROBE_CONVERSATION,
YEHAT_REBEL_CONVERSATION,
INVALID_CONVERSATION,
} CONVERSATION;
extern LOCDATA CommData;
extern int cur_comm;
@@ -69,7 +98,7 @@ extern void GetAllianceName (UNICODE *buf, RESPONSE_REF name_1);
extern void construct_response (UNICODE *buf, int R /* promoted from
RESPONSE_REF */, ...);
extern LOCDATA* init_race (RESOURCE comm_id);
extern LOCDATA* init_race (CONVERSATION comm_id);
extern LOCDATA* init_arilou_comm (void);
sc2/src/sc2code/credits.c
+2 -1
View File
@@ -23,6 +23,7 @@
#include "options.h"
#include "oscill.h"
#include "comm.h"
#include "commglue.h"
#include "resinst.h"
#include "nameref.h"
#include "settings.h"
@@ -587,7 +588,7 @@ static void
OutTakes (void)
{
#define NUM_OUTTAKES 15
static long outtake_list[NUM_OUTTAKES] =
static CONVERSATION outtake_list[NUM_OUTTAKES] =
{
ZOQFOTPIK_CONVERSATION,
TALKING_PET_CONVERSATION,
sc2/src/sc2code/encount.h
+2 -1
View File
@@ -19,6 +19,7 @@
#ifndef _ENCOUNT_H
#define _ENCOUNT_H
#include "commglue.h"
#include "displist.h"
#include "libs/gfxlib.h"
#include "planets/planets.h"
@@ -148,7 +149,7 @@ extern void EncounterBattle (void);
extern void BuildBattle (COUNT which_player);
extern COUNT InitEncounter (void);
extern COUNT UninitEncounter (void);
extern COUNT InitCommunication (RESOURCE which_comm);
extern COUNT InitCommunication (CONVERSATION which_comm);
extern void RaceCommunication (void);
extern void GenerateSOL (BYTE control);
sc2/src/sc2code/ires_ind.h
-24
View File
@@ -27,30 +27,6 @@
#define ANDROSYN_SHIP_INDEX 0x03201607L
#define CHENJESU_SHIP_INDEX 0x03401707L
#define MMRNMHRM_SHIP_INDEX 0x03601807L
#define ARILOU_CONVERSATION 0x14a01907L
#define CHMMR_CONVERSATION 0x14c01a07L
#define COMMANDER_CONVERSATION 0x14e01b07L
#define ORZ_CONVERSATION 0x15001c07L
#define PKUNK_CONVERSATION 0x15201d07L
#define SHOFIXTI_CONVERSATION 0x15401e07L
#define SPATHI_CONVERSATION 0x15601f07L
#define SUPOX_CONVERSATION 0x15802007L
#define THRADD_CONVERSATION 0x15a02107L
#define UTWIG_CONVERSATION 0x15c02207L
#define VUX_CONVERSATION 0x15e02307L
#define YEHAT_CONVERSATION 0x16002407L
#define MELNORME_CONVERSATION 0x16202507L
#define DRUUGE_CONVERSATION 0x16402607L
#define ILWRATH_CONVERSATION 0x16602707L
#define MYCON_CONVERSATION 0x16802807L
#define SLYLANDRO_CONVERSATION 0x16a02907L
#define UMGAH_CONVERSATION 0x16c02a07L
#define URQUAN_CONVERSATION 0x16e02b07L
#define ZOQFOTPIK_CONVERSATION 0x17002c07L
#define SYREEN_CONVERSATION 0x17202d07L
#define BLACKURQ_CONVERSATION 0x17402e07L
#define TALKING_PET_CONVERSATION 0x17602f07L
#define SLYLANDRO_HOME_CONVERSATION 0x17803007L
#define SIS_RES_INDEX 0x17c03107L
#define SAMATRA_RES_INDEX 0x17e03207L
#define PROBE_RES_INDEX 0x18003307L
sc2/src/sc2code/races.h
+32 -5
View File
@@ -360,12 +360,10 @@ enum
NUM_AVAILABLE_RACES
};
#define YEHAT_REBEL_CONVERSATION ((RESOURCE)(~0L))
#define RACE_COMMUNICATION \
ARILOU_CONVERSATION, /* ARILOU_SHIP */ \
CHMMR_CONVERSATION, /* CHMMR_SHIP */ \
NULL_RESOURCE, /* HUMAN_SHIP */ \
INVALID_CONVERSATION, /* HUMAN_SHIP */ \
ORZ_CONVERSATION, /* ORZ_SHIP */ \
PKUNK_CONVERSATION, /* PKUNK_SHIP */ \
SHOFIXTI_CONVERSATION, /* SHOFIXTI_SHIP */ \
@@ -383,11 +381,40 @@ enum
UMGAH_CONVERSATION, /* UMGAH_SHIP */ \
URQUAN_CONVERSATION, /* URQUAN_SHIP */ \
ZOQFOTPIK_CONVERSATION, /* ZOQFOTPIK_SHIP */ \
NULL_RESOURCE, /* SYREEN_SHIP */ \
INVALID_CONVERSATION, /* SYREEN_SHIP */ \
BLACKURQ_CONVERSATION, /* BLACK_URQUAN_SHIP */ \
YEHAT_REBEL_CONVERSATION, /* YEHAT_REBEL_SHIP */ \
NULL_RESOURCE, /* URQUAN_PROBE_SHIP */
URQUAN_PROBE_CONVERSATION, /* URQUAN_PROBE_SHIP */
#define RACE_SHIP_FOR_COMM \
ARILOU_SHIP, /* ARILOU_CONVERSATION */ \
CHMMR_SHIP, /* CHMMR_CONVERSATION */ \
HUMAN_SHIP, /* COMMANDER_CONVERSATION */ \
ORZ_SHIP, /* ORZ_CONVERSATION */ \
PKUNK_SHIP, /* PKUNK_CONVERSATION */ \
SHOFIXTI_SHIP, /* SHOFIXTI_CONVERSATION */ \
SPATHI_SHIP, /* SPATHI_CONVERSATION */ \
SUPOX_SHIP, /* SUPOX_CONVERSATION */ \
THRADDASH_SHIP, /* THRADD_CONVERSATION */ \
UTWIG_SHIP, /* UTWIG_CONVERSATION */ \
VUX_SHIP, /* VUX_CONVERSATION */ \
YEHAT_SHIP, /* YEHAT_CONVERSATION */ \
MELNORME_SHIP, /* MELNORME_CONVERSATION */ \
DRUUGE_SHIP, /* DRUUGE_CONVERSATION */ \
ILWRATH_SHIP, /* ILWRATH_CONVERSATION */ \
MYCON_SHIP, /* MYCON_CONVERSATION */ \
SLYLANDRO_SHIP, /* SLYLANDRO_CONVERSATION */ \
UMGAH_SHIP, /* UMGAH_CONVERSATION */ \
URQUAN_SHIP, /* URQUAN_CONVERSATION */ \
ZOQFOTPIK_SHIP, /* ZOQFOTPIK_CONVERSATION */ \
SYREEN_SHIP, /* SYREEN_CONVERSATION */ \
BLACK_URQUAN_SHIP, /* BLACKURQ_CONVERSATION */ \
UMGAH_SHIP, /* TALKING_PET_CONVERSATION */ \
SLYLANDRO_SHIP, /* SLYLANDRO_HOME_CONVERSATION */ \
URQUAN_PROBE_SHIP, /* URQUAN_PROBE_CONVERSATION */ \
YEHAT_SHIP, /* YEHAT_REBEL_CONVERSATION */ \
HUMAN_SHIP /* INVALID_CONVERSATION */
#define RACE_SHIP_COST \
1600, /* ARILOU_SHIP */ \
3000, /* CHMMR_SHIP */ \