diff --git a/mods/cnc/bits/chem.shp b/mods/cnc/bits/chem.shp new file mode 100644 index 0000000000..8116e742c7 Binary files /dev/null and b/mods/cnc/bits/chem.shp differ diff --git a/mods/cnc/bits/flame.shp b/mods/cnc/bits/flame.shp new file mode 100644 index 0000000000..d7a7ce418e Binary files /dev/null and b/mods/cnc/bits/flame.shp differ diff --git a/mods/cnc/levelup.shp b/mods/cnc/bits/levelup.shp similarity index 100% rename from mods/cnc/levelup.shp rename to mods/cnc/bits/levelup.shp diff --git a/mods/cnc/mouse2.shp b/mods/cnc/bits/mouse2.shp similarity index 100% rename from mods/cnc/mouse2.shp rename to mods/cnc/bits/mouse2.shp diff --git a/mods/cnc/mouse3.pal b/mods/cnc/bits/mouse3.pal similarity index 100% rename from mods/cnc/mouse3.pal rename to mods/cnc/bits/mouse3.pal diff --git a/mods/cnc/mouse3.shp b/mods/cnc/bits/mouse3.shp similarity index 100% rename from mods/cnc/mouse3.shp rename to mods/cnc/bits/mouse3.shp diff --git a/mods/cnc/mouse4.shp b/mods/cnc/bits/mouse4.shp similarity index 100% rename from mods/cnc/mouse4.shp rename to mods/cnc/bits/mouse4.shp diff --git a/mods/cnc/bits/pdigits.shp b/mods/cnc/bits/pdigits.shp new file mode 100644 index 0000000000..e6b46affef Binary files /dev/null and b/mods/cnc/bits/pdigits.shp differ diff --git a/mods/cnc/rank.shp b/mods/cnc/bits/rank.shp similarity index 100% rename from mods/cnc/rank.shp rename to mods/cnc/bits/rank.shp diff --git a/mods/cnc/bits/shadow.shp b/mods/cnc/bits/shadow.shp new file mode 100644 index 0000000000..8d7d7e76ca Binary files /dev/null and b/mods/cnc/bits/shadow.shp differ diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index af834aa9b0..16749f3a45 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -1,11 +1,12 @@ # Classic Command and Conquer -- Package Manifest Folders: - ./mods/cnc/ - ./ + . + mods/cnc/ + mods/cnc/bits/ + mods/cnc/uibits/ Packages: - mods/cnc/overrides.mix - mods/cnc/snow.mix + mods/cnc/bits/snow.mix mods/cnc/packages/speech.mix mods/cnc/packages/conquer.mix mods/cnc/packages/sounds.mix @@ -16,16 +17,17 @@ Packages: mods/cnc/packages/desert.mix ~mods/cnc/packages/movies-gdi.mix ~mods/cnc/packages/movies-nod.mix + ~mods/cnc/packages/movies.mix ~mods/cnc/packages/scores.mix Rules: - mods/cnc/defaults.yaml: Basic stuff - mods/cnc/system.yaml: Player and world actors - mods/cnc/structures.yaml: - mods/cnc/infantry.yaml: - mods/cnc/vehicles.yaml: - mods/cnc/trees.yaml: - mods/cnc/civilian.yaml: Civilian structures and bridges + mods/cnc/rules/defaults.yaml: Basic stuff + mods/cnc/rules/system.yaml: Player and world actors + mods/cnc/rules/structures.yaml: + mods/cnc/rules/infantry.yaml: + mods/cnc/rules/vehicles.yaml: + mods/cnc/rules/trees.yaml: + mods/cnc/rules/civilian.yaml: Civilian structures and bridges Sequences: mods/cnc/sequences/structures.yaml: @@ -66,10 +68,10 @@ Music: mods/cnc/music.yaml TileSets: - mods/cnc/tileset-des.yaml: Desert - mods/cnc/tileset-win.yaml: Winter - mods/cnc/tileset-tem.yaml: Temperate - mods/cnc/tileset-sno.yaml: Snow + mods/cnc/tilesets/desert.yaml: Desert + mods/cnc/tilesets/winter.yaml: Winter + mods/cnc/tilesets/temperat.yaml: Temperate + mods/cnc/tilesets/snow.yaml: Snow LoadScreen: NullLoadScreen ShellmapUid:d715c86d9d49d153756b86ef87a825ea8fae6756 diff --git a/mods/cnc/overrides.mix b/mods/cnc/overrides.mix deleted file mode 100644 index 1a76af9009..0000000000 Binary files a/mods/cnc/overrides.mix and /dev/null differ diff --git a/mods/cnc/civilian.yaml b/mods/cnc/rules/civilian.yaml similarity index 100% rename from mods/cnc/civilian.yaml rename to mods/cnc/rules/civilian.yaml diff --git a/mods/cnc/defaults.yaml b/mods/cnc/rules/defaults.yaml similarity index 100% rename from mods/cnc/defaults.yaml rename to mods/cnc/rules/defaults.yaml diff --git a/mods/cnc/infantry.yaml b/mods/cnc/rules/infantry.yaml similarity index 100% rename from mods/cnc/infantry.yaml rename to mods/cnc/rules/infantry.yaml diff --git a/mods/cnc/structures.yaml b/mods/cnc/rules/structures.yaml similarity index 100% rename from mods/cnc/structures.yaml rename to mods/cnc/rules/structures.yaml diff --git a/mods/cnc/system.yaml b/mods/cnc/rules/system.yaml similarity index 100% rename from mods/cnc/system.yaml rename to mods/cnc/rules/system.yaml diff --git a/mods/cnc/trees.yaml b/mods/cnc/rules/trees.yaml similarity index 100% rename from mods/cnc/trees.yaml rename to mods/cnc/rules/trees.yaml diff --git a/mods/cnc/vehicles.yaml b/mods/cnc/rules/vehicles.yaml similarity index 100% rename from mods/cnc/vehicles.yaml rename to mods/cnc/rules/vehicles.yaml diff --git a/mods/cnc/snow.mix b/mods/cnc/snow.mix deleted file mode 100644 index a5025b57cc..0000000000 Binary files a/mods/cnc/snow.mix and /dev/null differ diff --git a/mods/cnc/tileset-des.yaml b/mods/cnc/tilesets/desert.yaml similarity index 100% rename from mods/cnc/tileset-des.yaml rename to mods/cnc/tilesets/desert.yaml diff --git a/mods/cnc/tileset-sno.yaml b/mods/cnc/tilesets/snow.yaml similarity index 100% rename from mods/cnc/tileset-sno.yaml rename to mods/cnc/tilesets/snow.yaml diff --git a/mods/cnc/tileset-tem.yaml b/mods/cnc/tilesets/temperat.yaml similarity index 100% rename from mods/cnc/tileset-tem.yaml rename to mods/cnc/tilesets/temperat.yaml diff --git a/mods/cnc/tileset-win.yaml b/mods/cnc/tilesets/winter.yaml similarity index 100% rename from mods/cnc/tileset-win.yaml rename to mods/cnc/tilesets/winter.yaml diff --git a/mods/cnc/buttons.png b/mods/cnc/uibits/buttons.png similarity index 100% rename from mods/cnc/buttons.png rename to mods/cnc/uibits/buttons.png diff --git a/mods/cnc/chrome-gdi.png b/mods/cnc/uibits/chrome-gdi.png similarity index 100% rename from mods/cnc/chrome-gdi.png rename to mods/cnc/uibits/chrome-gdi.png diff --git a/mods/cnc/chrome-nod.png b/mods/cnc/uibits/chrome-nod.png similarity index 100% rename from mods/cnc/chrome-nod.png rename to mods/cnc/uibits/chrome-nod.png diff --git a/mods/cnc/dialog.png b/mods/cnc/uibits/dialog.png similarity index 100% rename from mods/cnc/dialog.png rename to mods/cnc/uibits/dialog.png diff --git a/mods/cnc/dialog2.png b/mods/cnc/uibits/dialog2.png similarity index 100% rename from mods/cnc/dialog2.png rename to mods/cnc/uibits/dialog2.png diff --git a/mods/cnc/dialog3.png b/mods/cnc/uibits/dialog3.png similarity index 100% rename from mods/cnc/dialog3.png rename to mods/cnc/uibits/dialog3.png diff --git a/mods/cnc/dialog4.png b/mods/cnc/uibits/dialog4.png similarity index 100% rename from mods/cnc/dialog4.png rename to mods/cnc/uibits/dialog4.png diff --git a/mods/cnc/musicplayer.png b/mods/cnc/uibits/musicplayer.png similarity index 100% rename from mods/cnc/musicplayer.png rename to mods/cnc/uibits/musicplayer.png diff --git a/mods/cnc/spawnpoints.png b/mods/cnc/uibits/spawnpoints.png similarity index 100% rename from mods/cnc/spawnpoints.png rename to mods/cnc/uibits/spawnpoints.png diff --git a/mods/cnc/tabs.png b/mods/cnc/uibits/tabs.png similarity index 100% rename from mods/cnc/tabs.png rename to mods/cnc/uibits/tabs.png diff --git a/mods/cnc/widget-panel.png b/mods/cnc/uibits/widget-panel.png similarity index 100% rename from mods/cnc/widget-panel.png rename to mods/cnc/uibits/widget-panel.png