From 003667289c3910c83f7b57f4cb1eb8d8cfe3f650 Mon Sep 17 00:00:00 2001 From: mcmartin Date: Mon, 21 Jan 2008 04:53:17 +0000 Subject: [PATCH] Normalized resource naming across subindices. Each .ls2 file has a consistent name given its resources and the code that controls it. All resources within a subsidiary .ls2 all have a consistent prefix. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2911 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/content/comm/yehat.ls2 | 4 ++-- sc2/content/{sis.ls2 => sis_ship.ls2} | 0 sc2/content/starcon.ls2 | 2 +- sc2/content/uqm.rmp | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) rename sc2/content/{sis.ls2 => sis_ship.ls2} (100%) diff --git a/sc2/content/comm/yehat.ls2 b/sc2/content/comm/yehat.ls2 index 24e6bea56..3f7ff8b6e 100644 --- a/sc2/content/comm/yehat.ls2 +++ b/sc2/content/comm/yehat.ls2 @@ -3,5 +3,5 @@ 1 0 6 comm.yehat.music 1 2 4 comm.yehat.colortable 2 0 4 comm.yehat.dialogue - 3 1 4 comm.rebel.dialogue - 4 1 6 comm.rebel.music + 3 1 4 comm.yehat.rebel.dialogue + 4 1 6 comm.yehat.rebel.music diff --git a/sc2/content/sis.ls2 b/sc2/content/sis_ship.ls2 similarity index 100% rename from sc2/content/sis.ls2 rename to sc2/content/sis_ship.ls2 diff --git a/sc2/content/starcon.ls2 b/sc2/content/starcon.ls2 index 51cef4836..cb47c9d04 100644 --- a/sc2/content/starcon.ls2 +++ b/sc2/content/starcon.ls2 @@ -240,7 +240,7 @@ 187 47 7 comm.talkpet.resources 188 48 7 comm.slyhome.resources 189 4 3 font.player -190 49 7 ship.sis.resources +190 49 7 ship.sis_ship.resources 191 50 7 ship.lastbat.resources 192 51 7 ship.probe.resources 193 15 6 music.mainmenu diff --git a/sc2/content/uqm.rmp b/sc2/content/uqm.rmp index c41c822c0..7745bdb12 100644 --- a/sc2/content/uqm.rmp +++ b/sc2/content/uqm.rmp @@ -106,8 +106,6 @@ 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.rebel.dialogue = STRTAB:comm/rebel/rebel.txt -comm.rebel.music = MUSICRES:comm/rebel/rebel.ogg comm.shofixt.colortable = STRTAB:comm/shofixt/shofixt.ct comm.shofixt.dialogue = STRTAB:comm/shofixt/shofixt.txt comm.shofixt.font = FONTRES:comm/shofixt/shofixt.fon @@ -193,6 +191,8 @@ 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.rebel.music = MUSICRES:comm/rebel/rebel.ogg comm.yehat.resources = RES_INDEX:comm/yehat.ls2 comm.zoqfot.colortable = STRTAB:comm/zoqfot/zoqfot.ct comm.zoqfot.dialogue = STRTAB:comm/zoqfot/zoqfot.txt @@ -728,7 +728,6 @@ ship.shofixti.meleeicons = GFXRES:shofixti/shomicon.ani ship.shofixti.resources = RES_INDEX:shofixti.ls2 ship.shofixti.sounds = SNDRES:shofixti/shosound.snd ship.shofixti.text = STRTAB:shofixti/shotext.txt -ship.sis.resources = RES_INDEX:sis.ls2 ship.sis_ship.code = CODE:sis_ship/sis.cod ship.sis_ship.ditty = MUSICRES:sis_ship/sisditty.mod ship.sis_ship.graphics.blas.large = GFXRES:sis_ship/blasbig.ani @@ -740,6 +739,7 @@ ship.sis_ship.graphics.sis.medium = GFXRES:sis_ship/sis.med ship.sis_ship.graphics.sis.small = GFXRES:sis_ship/sis.sml ship.sis_ship.graphics.sishyper = GFXRES:sis_ship/sishyper.ani ship.sis_ship.icons = GFXRES:sis_ship/sisicons.ani +ship.sis_ship.resources = RES_INDEX:sis_ship.ls2 ship.sis_ship.sounds = SNDRES:sis_ship/sissound.snd slides.ending = STRTAB:slides/ending/ending.txt slides.intro = STRTAB:slides/intro/intro.txt