From 9ea3a404a3dabcff6747349748322821a7cd09b6 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 9 Sep 2010 20:27:35 +1200 Subject: [PATCH] Tidy ra dir --- OpenRA.Mods.RA/RALoadScreen.cs | 2 +- mods/cnc/mod.yaml | 34 +++++++++--------- mods/ra/{extras => bits}/jburn1.aud | Bin mods/ra/{extras => bits}/jchrge1.aud | Bin mods/ra/{extras => bits}/jcrisp1.aud | Bin mods/ra/{extras => bits}/jdance1.aud | Bin mods/ra/{extras => bits}/jjuice1.aud | Bin mods/ra/{extras => bits}/jjump1.aud | Bin mods/ra/{extras => bits}/jlight1.aud | Bin mods/ra/{extras => bits}/jpower1.aud | Bin mods/ra/{extras => bits}/jshock1.aud | Bin mods/ra/{extras => bits}/jyes1.aud | Bin mods/ra/{ => bits}/levelup.shp | Bin mods/ra/{extras => bits}/msub.shp | Bin mods/ra/{extras => bits}/msubicon.shp | Bin mods/ra/{ => bits}/nopower.shp | Bin mods/ra/{ => bits}/playersmoke.shp | Bin mods/ra/{ => bits}/rank.shp | Bin mods/ra/{extras => bits}/shok.shp | Bin mods/ra/{extras => bits}/shokicon.shp | Bin mods/ra/{ => bits}/tire.shp | Bin mods/ra/{extras => bits}/ttnk.shp | Bin mods/ra/{extras => bits}/ttnkicon.shp | Bin mods/ra/chrome.xml | 2 +- mods/ra/dialog2.png | Bin 437 -> 0 bytes mods/ra/dialog3.png | Bin 438 -> 0 bytes mods/ra/dialog4.png | Bin 628 -> 0 bytes mods/ra/mod.yaml | 30 ++++++++-------- mods/ra/{ => rules}/civilian.yaml | 0 mods/ra/{ => rules}/defaults.yaml | 0 mods/ra/{ => rules}/infantry.yaml | 0 mods/ra/{ => rules}/structures.yaml | 0 mods/ra/{ => rules}/system.yaml | 0 mods/ra/{ => rules}/trees.yaml | 0 mods/ra/{ => rules}/vehicles.yaml | 0 .../interior.yaml} | 0 .../{tileset-sno.yaml => tilesets/snow.yaml} | 0 .../temperat.yaml} | 0 mods/ra/{ => uibits}/buttons.png | Bin mods/ra/{ => uibits}/chrome-allies.png | Bin mods/ra/{ => uibits}/chrome-soviet.png | Bin mods/ra/{ => uibits}/dialog.png | Bin mods/ra/{ => uibits}/loadscreen.png | Bin mods/ra/{ => uibits}/musicplayer.png | Bin mods/ra/{ => uibits}/spawnpoints.png | Bin mods/ra/{ => uibits}/tabs.png | Bin mods/ra/widget-panel.png | Bin 3425 -> 0 bytes 47 files changed, 35 insertions(+), 33 deletions(-) rename mods/ra/{extras => bits}/jburn1.aud (100%) rename mods/ra/{extras => bits}/jchrge1.aud (100%) rename mods/ra/{extras => bits}/jcrisp1.aud (100%) rename mods/ra/{extras => bits}/jdance1.aud (100%) rename mods/ra/{extras => bits}/jjuice1.aud (100%) rename mods/ra/{extras => bits}/jjump1.aud (100%) rename mods/ra/{extras => bits}/jlight1.aud (100%) rename mods/ra/{extras => bits}/jpower1.aud (100%) rename mods/ra/{extras => bits}/jshock1.aud (100%) rename mods/ra/{extras => bits}/jyes1.aud (100%) rename mods/ra/{ => bits}/levelup.shp (100%) rename mods/ra/{extras => bits}/msub.shp (100%) rename mods/ra/{extras => bits}/msubicon.shp (100%) rename mods/ra/{ => bits}/nopower.shp (100%) rename mods/ra/{ => bits}/playersmoke.shp (100%) rename mods/ra/{ => bits}/rank.shp (100%) rename mods/ra/{extras => bits}/shok.shp (100%) rename mods/ra/{extras => bits}/shokicon.shp (100%) rename mods/ra/{ => bits}/tire.shp (100%) rename mods/ra/{extras => bits}/ttnk.shp (100%) rename mods/ra/{extras => bits}/ttnkicon.shp (100%) delete mode 100644 mods/ra/dialog2.png delete mode 100644 mods/ra/dialog3.png delete mode 100644 mods/ra/dialog4.png rename mods/ra/{ => rules}/civilian.yaml (100%) rename mods/ra/{ => rules}/defaults.yaml (100%) rename mods/ra/{ => rules}/infantry.yaml (100%) rename mods/ra/{ => rules}/structures.yaml (100%) rename mods/ra/{ => rules}/system.yaml (100%) rename mods/ra/{ => rules}/trees.yaml (100%) rename mods/ra/{ => rules}/vehicles.yaml (100%) rename mods/ra/{tileset-int.yaml => tilesets/interior.yaml} (100%) rename mods/ra/{tileset-sno.yaml => tilesets/snow.yaml} (100%) rename mods/ra/{tileset-tem.yaml => tilesets/temperat.yaml} (100%) rename mods/ra/{ => uibits}/buttons.png (100%) rename mods/ra/{ => uibits}/chrome-allies.png (100%) rename mods/ra/{ => uibits}/chrome-soviet.png (100%) rename mods/ra/{ => uibits}/dialog.png (100%) rename mods/ra/{ => uibits}/loadscreen.png (100%) rename mods/ra/{ => uibits}/musicplayer.png (100%) rename mods/ra/{ => uibits}/spawnpoints.png (100%) rename mods/ra/{ => uibits}/tabs.png (100%) delete mode 100644 mods/ra/widget-panel.png diff --git a/OpenRA.Mods.RA/RALoadScreen.cs b/OpenRA.Mods.RA/RALoadScreen.cs index 2d48d12ca4..7dcfc31d71 100644 --- a/OpenRA.Mods.RA/RALoadScreen.cs +++ b/OpenRA.Mods.RA/RALoadScreen.cs @@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA if (r == null) return; Font = r.BoldFont; - var s = new Sheet("mods/ra/loadscreen.png"); + var s = new Sheet("mods/ra/uibits/loadscreen.png"); Logo = new Sprite(s, new Rectangle(0,0,256,256), TextureChannel.Alpha); Stripe = new Sprite(s, new Rectangle(256,0,256,256), TextureChannel.Alpha); StripeRect = new Rectangle(0, Renderer.Resolution.Height/2 - 128, Renderer.Resolution.Width, 256); diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index 711025bd2c..308e876af2 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -2,23 +2,25 @@ Folders: . - mods/cnc/ - mods/cnc/uibits/ + mods/cnc + mods/cnc/bits + mods/cnc/uibits + mods/cnc/packages Packages: - mods/cnc/bits/snow.mix - mods/cnc/bits/overrides.mix - mods/cnc/packages/speech.mix - mods/cnc/packages/conquer.mix - mods/cnc/packages/sounds.mix - mods/cnc/packages/tempicnh.mix - mods/cnc/packages/updatec.mix - mods/cnc/packages/temperat.mix - mods/cnc/packages/winter.mix - 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 + overrides.mix + snow.mix + speech.mix + conquer.mix + sounds.mix + tempicnh.mix + updatec.mix + temperat.mix + winter.mix + desert.mix + ~movies-gdi.mix + ~movies-nod.mix + ~movies.mix + ~scores.mix Rules: mods/cnc/rules/defaults.yaml: Basic stuff diff --git a/mods/ra/extras/jburn1.aud b/mods/ra/bits/jburn1.aud similarity index 100% rename from mods/ra/extras/jburn1.aud rename to mods/ra/bits/jburn1.aud diff --git a/mods/ra/extras/jchrge1.aud b/mods/ra/bits/jchrge1.aud similarity index 100% rename from mods/ra/extras/jchrge1.aud rename to mods/ra/bits/jchrge1.aud diff --git a/mods/ra/extras/jcrisp1.aud b/mods/ra/bits/jcrisp1.aud similarity index 100% rename from mods/ra/extras/jcrisp1.aud rename to mods/ra/bits/jcrisp1.aud diff --git a/mods/ra/extras/jdance1.aud b/mods/ra/bits/jdance1.aud similarity index 100% rename from mods/ra/extras/jdance1.aud rename to mods/ra/bits/jdance1.aud diff --git a/mods/ra/extras/jjuice1.aud b/mods/ra/bits/jjuice1.aud similarity index 100% rename from mods/ra/extras/jjuice1.aud rename to mods/ra/bits/jjuice1.aud diff --git a/mods/ra/extras/jjump1.aud b/mods/ra/bits/jjump1.aud similarity index 100% rename from mods/ra/extras/jjump1.aud rename to mods/ra/bits/jjump1.aud diff --git a/mods/ra/extras/jlight1.aud b/mods/ra/bits/jlight1.aud similarity index 100% rename from mods/ra/extras/jlight1.aud rename to mods/ra/bits/jlight1.aud diff --git a/mods/ra/extras/jpower1.aud b/mods/ra/bits/jpower1.aud similarity index 100% rename from mods/ra/extras/jpower1.aud rename to mods/ra/bits/jpower1.aud diff --git a/mods/ra/extras/jshock1.aud b/mods/ra/bits/jshock1.aud similarity index 100% rename from mods/ra/extras/jshock1.aud rename to mods/ra/bits/jshock1.aud diff --git a/mods/ra/extras/jyes1.aud b/mods/ra/bits/jyes1.aud similarity index 100% rename from mods/ra/extras/jyes1.aud rename to mods/ra/bits/jyes1.aud diff --git a/mods/ra/levelup.shp b/mods/ra/bits/levelup.shp similarity index 100% rename from mods/ra/levelup.shp rename to mods/ra/bits/levelup.shp diff --git a/mods/ra/extras/msub.shp b/mods/ra/bits/msub.shp similarity index 100% rename from mods/ra/extras/msub.shp rename to mods/ra/bits/msub.shp diff --git a/mods/ra/extras/msubicon.shp b/mods/ra/bits/msubicon.shp similarity index 100% rename from mods/ra/extras/msubicon.shp rename to mods/ra/bits/msubicon.shp diff --git a/mods/ra/nopower.shp b/mods/ra/bits/nopower.shp similarity index 100% rename from mods/ra/nopower.shp rename to mods/ra/bits/nopower.shp diff --git a/mods/ra/playersmoke.shp b/mods/ra/bits/playersmoke.shp similarity index 100% rename from mods/ra/playersmoke.shp rename to mods/ra/bits/playersmoke.shp diff --git a/mods/ra/rank.shp b/mods/ra/bits/rank.shp similarity index 100% rename from mods/ra/rank.shp rename to mods/ra/bits/rank.shp diff --git a/mods/ra/extras/shok.shp b/mods/ra/bits/shok.shp similarity index 100% rename from mods/ra/extras/shok.shp rename to mods/ra/bits/shok.shp diff --git a/mods/ra/extras/shokicon.shp b/mods/ra/bits/shokicon.shp similarity index 100% rename from mods/ra/extras/shokicon.shp rename to mods/ra/bits/shokicon.shp diff --git a/mods/ra/tire.shp b/mods/ra/bits/tire.shp similarity index 100% rename from mods/ra/tire.shp rename to mods/ra/bits/tire.shp diff --git a/mods/ra/extras/ttnk.shp b/mods/ra/bits/ttnk.shp similarity index 100% rename from mods/ra/extras/ttnk.shp rename to mods/ra/bits/ttnk.shp diff --git a/mods/ra/extras/ttnkicon.shp b/mods/ra/bits/ttnkicon.shp similarity index 100% rename from mods/ra/extras/ttnkicon.shp rename to mods/ra/bits/ttnkicon.shp diff --git a/mods/ra/chrome.xml b/mods/ra/chrome.xml index 1b74499780..0f4e28a6b8 100644 --- a/mods/ra/chrome.xml +++ b/mods/ra/chrome.xml @@ -148,7 +148,7 @@ - + diff --git a/mods/ra/dialog2.png b/mods/ra/dialog2.png deleted file mode 100644 index 0acbe00f7f86ef669b0b2cceef918d5874595644..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^RN- z#52TiaHwtqif|TqL>4nJa0`PlBg3pY5H=O_FF7m?D9%KEW0)Vg_KHMBTAg} zb8}PkN*J7rQWHy3QxwWGOEMJPJ$(Zd^79lD6?_wu+gFr31MOt@ba4!+xb^muA@2bL z9+$xFT;~(c#4))EFg=^-_cY+-dtdYU|Gu87Y?>C9){}qX{JO5&yn8tv7&sUh6&P3= r7z7xY2AD&MBmSI?n7MJa&BZI+M-};76j!vKV*mnAS3j3^P64nJa0`PlBg3pY5H=O_FF7m>FVdQ&MBb@0Om2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR461sgd6bN>1LE!Xaw&pxYPk|Eus@Io?q-lbNs)oj0AJIhDS z{z77|*Q6(91`>ZJu6un?BKg~k1=}Q(zX91C*=ygHSou%?_UymArmFw)%X>wfI=#=L;}LIpz!gA{)QpTlFu3yc{y3|0)i><;V;J~F&uFp*=BZJ@Fu z6~T!?uU@qUczG%*MPC29`u*?Nl7QPa_upSD{i}6)Q_Z!g?-w0&FGqa`vZqB(JA26B z3((^W7vBF3X91c&qa2l{#3f8Y*4$SlSh zg|Oaa)i_=_gqb9wvrPP~SSa|cU@2(k3=t?lC4+Gyf5{AsWhbMa9x2yAaUw}t8akE5 zQi3L#YMOkN|5aMd>%`>2)1~m&-jl7z>%$ixrZhKd4ls=)kN@GhAOxI5s;l1+=pg?DAR*(_6rjVbutSDBfk?jv%XfsJ zV<8jNDGv14tRb>|xTQ0;VN_jFGK}A*gQx9e4)n20%drWGoZo!~tnI za2^m83<0tEfLVXvR{ifAbqpKO%ck-h)Nw*8dQlD(k^$tlwo<%ecq6tO%t|g-Tne&u~ODfh^8%2?OA^>l-?CTijt&$vL3 zkt+@fWnQsl3P{r}NIj4%6-a_T7w;7wBi>tHlsF~PTvP=0UYd~b49N;7H=GSh+?`kFI;qc`m11E+JzX#c7}Y&Acc8O)O*Bj_ez=|o>MZ?Dn@6F;(lb8OpH8aF z<|CbkKm8vUilR=j)+kC+odJq#F8s5J5Z7d+U>XHme%uLvry(g*iV)xDL}p6?lMF>e zS*v6OpN%2UzDD2`l>|rq<_xs~AQycW-)bP671dy=@r~vK99N;t8LR(_`s=+Q*@AS| z;=-?i?>RM6l}a|gR(sOVrfb6cWjcPalgsx!kdf-^hP}HfL7C|`^iH6Lrn--_{&o#X zOVW|s$h%-trYOA*N+r@@7@rHTjv>+%X+CXO!N)D6z&J~(Oi2=J*(EBFSz+>Cq?z$| z54)?JYy#3yLU58P{hBmGcp|(k6cE#x38^jpXnEsfrmEfjCWuby0r(ovi z*?Zm%ZJol^Z z*wCiIkK7+5hru+o@hma@i6}9SLUwX?6h|=o+dR`Uj`0+ZeuRv&>~`KpK7GEQ4HAll zK4Hliq{=qV7RlyaWsZV@O#r%$3Kcv>=Ai4JoDr+ zv?cGHrzJ(BsgY{$Kj^srUOFSAg zne7%>nc>RB%hXKOO#6qw48Izl%vUVbke!m-DBLKVDqL)GwhytFz*b;Cx*IjD+Lzhw zVq1OV>{aYakv8^Djrz5iTH(o-+Lm(0a-4ald3Dhws=NMg>}PCc6G#2pG#Q}|>w}GO zLAkP_ntJQHcQe~EBbp=rI@chlO_-sp=CS9AeE2?)S@pK+LIM88u2w|vVa}#B3OT|s zGA+M?y*4D?b01?}IBtMqL*X9A93-YBnM4ms{G#wuyvR=e;n(f~_;<^-Q7!71*)raXHIWu@izw8G4MAx)=?vT2 zsrshU;HqPnJvPl>nt?A@G*{G>7vvV~?tW43Xc}l5vgr0Jx*N9$e=114M+_s5f^xJl z1Vxe*r4!|F<@6-%34eQPvzFg;;ODbi{^N~2dT%?iz0eNrBFUnYg{noY1&{fBHO)m*icq{70=ejx0{rl8~vD0f?r_Ti*Km7MCL8^b$a z8V3o_lwa(!i`br<+HtZ#O4}`daQPFD;nHMDO0Huju;sEm zofex5S>sCZ8*I;?%X(i~-GjR~;xXp2xxOG-?`<{03_WPZqUwQ=T z++i_7OAHo{d)==7vDLl&Gk#c23-JbVi1>q0+8vw!;4*dMJG#pi-ug@7=LEr__4r)# z^CyB0#KvsGW5WH^=(O=zt1hW(^Caig$EnubCt#1 z3#|)I9b6rnExu@uPHruPof#0W)4xzqw+l5sKzzPGyBR&6iP|4Y#bje5BBg%MITK!C z!#CXUi(d48d(8|%OJjP(lnu33HN4~g$DsWN!rC?4kG2JGRqy(21#PKcWR6?(x4dX6 zsKYsW<95T^K7@N5Z*mnW~T&PN7{p5upFW`ad` zYg;W^?;dLJ=*+<96DG7AF6O59=AL?W1Q#ES&KVq&#l?(VWE`c_!>^|2rw_%`#%~wh z)KpPf)(Sk|JS&Hf+#3-oV!L>CF;vIKDjj(;u|0(!%^NMr-OtTz_jyu!zSXhK@s`ln z)yMnkbBMg`ox|IwJDtIE!907f7wIilpYS~uBYOURcVzvw{4|pzGm}V4l6P?CCND|2 z+?#xEhE`?(gb4$Hjsf5|@lrPdcq9YBmNNjVc>u8aJ-^$l55SdFBV8Rt$n4K=vWzj8 z`=?V7owPs{>%9XRccZbB_Ku&ESwr