Permalink
Browse files

replace PackageContent yamls with XCC database

  • Loading branch information...
1 parent 112034a commit be3b18057a8d086a5989e83750ff57b396a15a18 @Mailaender Mailaender committed May 18, 2013
@@ -25,7 +25,6 @@ public static class Rules
public static Dictionary<string, MusicInfo> Music;
public static Dictionary<string, string> Movies;
public static Dictionary<string, TileSet> TileSets;
- public static Dictionary<string, string> PackageContents;
public static void LoadRules(Manifest m, Map map)
{
@@ -36,7 +35,6 @@ public static void LoadRules(Manifest m, Map map)
Notifications = LoadYamlRules(m.Notifications, map.Notifications, (k, _) => new SoundInfo(k.Value));
Music = LoadYamlRules(m.Music, new List<MiniYamlNode>(), (k, _) => new MusicInfo(k.Key, k.Value));
Movies = LoadYamlRules(m.Movies, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
- PackageContents = LoadYamlRules(m.PackageContents, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
TileSets = new Dictionary<string, TileSet>();
foreach (var file in m.TileSets)
@@ -44,7 +44,6 @@ public AssetBrowserLogic(Widget widget, Action onExit, World world)
sourceDropdown.OnMouseDown = _ => ShowSourceDropdown(sourceDropdown);
sourceDropdown.GetText = () => AssetSource == SourceType.Folders ? "Folders"
: AssetSource == SourceType.Packages ? "Packages" : "None";
- sourceDropdown.Disabled = !Rules.PackageContents.Keys.Any();
spriteImage = panel.Get<ShpImageWidget>("SPRITE");
@@ -234,9 +233,9 @@ public static void PopulateAssetList()
assetList.RemoveChildren();
AvailableShps.Clear();
- if (AssetSource == SourceType.Folders)
+ foreach (var folder in FileSystem.FolderPaths)
{
- foreach (var folder in FileSystem.FolderPaths)
+ if (AssetSource == SourceType.Folders)
{
if (Directory.Exists(folder))
{
@@ -248,14 +247,27 @@ public static void PopulateAssetList()
}
}
}
- }
-
- if (AssetSource == SourceType.Packages)
- foreach (var hiddenFile in Rules.PackageContents.Keys)
+ else if (AssetSource == SourceType.Packages)
{
- AddAsset(assetList, hiddenFile, template);
- AvailableShps.Add(hiddenFile);
+ if (Directory.Exists(folder))
+ {
+ var mixs = Directory.GetFiles(folder, "*.mix");
+ foreach (var mix in mixs)
+ {
+ var package = new MixFile(mix, 0);
+ foreach (string hiddenFile in package.AllFileNames())
+ {
+ if (hiddenFile.Contains("shp"))
+ {
+ AddAsset(assetList, hiddenFile, template);
+ AvailableShps.Add(hiddenFile);
+ }
+ }
+ }
+ }
}
+ }
}
+
}
}
View
Binary file not shown.
View
@@ -29,8 +29,6 @@ Packages:
~scores2.mix
~transit.mix
-PackageContents:
-
Rules:
mods/cnc/rules/defaults.yaml
mods/cnc/rules/system.yaml
View
@@ -21,8 +21,6 @@ Packages:
~main.mix
conquer.mix
-PackageContents:
-
Rules:
mods/d2k/rules/system.yaml
mods/d2k/rules/defaults.yaml
View
@@ -1,227 +0,0 @@
-# conquer.mix filename list for the game asset browser
-#appear1.aud:
-#beepy6.aud:
-#briefing.aud:
-#clock1.aud:
-#country1.aud:
-#country4.aud:
-#keystrok.aud:
-#mapwipe2.aud:
-#mapwipe5.aud:
-#scold1.aud:
-#sfx4.aud:
-#toney10.aud:
-#toney4.aud:
-#toney7.aud:
-#type.fnt:
-#alibackh.pcx:
-#sovback.pcx:
-120mm.shp:
-1tnk.shp:light tank
-2tnk.shp:medium tank
-3tnk.shp:heavy tank
-4tnk.shp:mammoth tank
-50cal.shp:
-afld.shp:
-afldmake.shp:
-agun.shp:
-agunmake.shp:
-apc.shp:
-apwr.shp:
-apwrmake.shp:
-armor.shp:
-art-exp1.shp:
-arty.shp:
-atek.shp:
-atekmake.shp:
-atomicdn.shp:
-atomicup.shp:
-atomsfx.shp:
-badr.shp:
-bar3bhr.shp:
-bar3blu.shp:
-bar3red.shp:
-bar3rhr.shp:
-barb.shp:
-barl.shp:
-barr.shp:
-barrmake.shp:
-bio.shp:
-biomake.shp:
-bomb.shp:
-bomblet.shp:
-brik.shp:
-brl3.shp:
-burn-l.shp:
-burn-m.shp:
-burn-s.shp:
-ca.shp:
-chronbox.shp:
-countrya.shp:
-countrye.shp:
-credsa.shp:
-credsahr.shp:
-credsu.shp:
-credsuhr.shp:
-cycl.shp:
-dd.shp:
-deviator.shp:
-dog.shp:
-dogbullt.shp:
-dollar.shp:
-dome.shp:
-domemake.shp:
-dragon.shp:
-earth.shp:
-ebtn-dn.shp:
-electdog.shp:
-empulse.shp:
-fact.shp:
-factmake.shp:
-fb1.shp:
-fb2.shp:
-fball1.shp:
-fcom.shp:
-fenc.shp:
-fire1.shp:
-fire2.shp:
-fire3.shp:
-fire4.shp:
-fix.shp:
-fixmake.shp:
-flagfly.shp:
-flak.shp:
-flmspt.shp:
-fpls.shp:
-fpower.shp:
-frag1.shp:
-ftnk.shp:
-ftur.shp:
-fturmake.shp:
-gap.shp:
-gapmake.shp:
-gpsbox.shp:
-gun.shp:
-gunfire.shp:
-gunmake.shp:
-h2o_exp1.shp:
-h2o_exp2.shp:
-h2o_exp3.shp:
-harv.shp:
-heli.shp:
-hind.shp:
-hisc1-hr.shp:
-hisc2-hr.shp:
-hiscore1.shp:
-hiscore2.shp:
-hosp.shp:
-hospmake.shp:
-hpad.shp:
-hpadmake.shp:
-invulbox.shp:
-invun.shp:
-iron.shp:
-ironmake.shp:
-jeep.shp:
-kenn.shp:
-kennmake.shp:
-litning.shp:
-lrotor.shp:
-lst.shp:
-mcv.shp:
-mgg.shp:
-mgun.shp:
-mhq.shp:
-mig.shp:
-mine.shp:
-minigun.shp:
-minp.shp:
-minpmake.shp:
-minv.shp:
-minvmake.shp:
-miss.shp:
-missile.shp:
-missile2.shp:
-mlrs.shp:
-mnly.shp:
-mrj.shp:
-napalm1.shp:
-napalm2.shp:
-napalm3.shp:
-orca.shp:
-parabomb.shp:
-parabox.shp:
-parach.shp:
-patriot.shp:
-pbox.shp:
-pboxmake.shp:
-pdox.shp:
-pdoxmake.shp:
-piff.shp:
-piffpiff.shp:
-powr.shp:
-powrmake.shp:
-pt.shp:
-pumpmake.shp:
-radarfrm.shp:
-rapid.shp:
-rrotor.shp:
-sam.shp:
-samfire.shp:
-sammake.shp:
-sbag.shp:
-scrate.shp:
-select.shp:
-repair.shp:
-shadow.shp:
-silo.shp:
-silomake.shp:
-smig.shp:
-smoke_m.shp:
-smokey.shp:
-smokland.shp:
-sonarbox.shp:
-speed.shp:
-spen.shp:
-spenmake.shp:
-sputdoor.shp:
-sputnik.shp:
-ss.shp:
-ssam.shp:
-stealth2.shp:
-stek.shp:
-stekmake.shp:
-stnk.shp:
-syrd.shp:
-syrdmake.shp:
-tent.shp:
-tentmake.shp:
-time.shp:
-timehr.shp:
-tquake.shp:
-tran.shp:
-truk.shp:
-tsla.shp:
-tslamake.shp:
-turr.shp:
-twinkle1.shp:
-twinkle2.shp:
-twinkle3.shp:
-u2.shp:
-v19.shp:
-v2.shp:
-v2rl.shp:
-veh-hit1.shp:
-veh-hit2.shp:
-wake.shp:
-wcrate.shp:
-weap.shp:
-weap2.shp:
-weapmake.shp:
-wood.shp:
-wwcrate.shp:
-yak.shp:
-#trans.icn:
-#ali-tran.wsa:
-#mltiplyr.wsa:
-#sov-tran.wsa:
Oops, something went wrong.

2 comments on commit be3b180

Owner

Mailaender replied May 19, 2013

I think we need to rename global mix database.dat as our build scripts do not like spaces in filenames.

Pinging @OlafvdSpek‎, but I guess it is GNU GPL v3 just as the other stuff from XCC Utilities.

whitespace in filenames are just stupid, never do it

Please sign in to comment.