diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj index 4677860648..eff78bf6ff 100644 --- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj +++ b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj @@ -79,7 +79,6 @@ - @@ -91,10 +90,6 @@ copy "$(TargetPath)" "$(SolutionDir)mods/d2k/" cd "$(SolutionDir)" - - {F33337BE-CB69-4B24-850F-07D23E408DDF} - OpenRA.Utility - {0DFB103F-2962-400F-8C6D-E2C28CCBA633} OpenRA.Game @@ -103,10 +98,6 @@ cd "$(SolutionDir)" {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA} OpenRA.FileFormats - - {1A8E50CC-EE32-4E57-8842-0C39C8EA7541} - OpenRA.TilesetBuilder - {4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E} OpenRA.Mods.RA diff --git a/OpenRA.Mods.D2k/Widgets/Logic/D2kInstallFromCDLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/D2kInstallFromCDLogic.cs index d00498fe0a..4aa3b87da5 100644 --- a/OpenRA.Mods.D2k/Widgets/Logic/D2kInstallFromCDLogic.cs +++ b/OpenRA.Mods.D2k/Widgets/Logic/D2kInstallFromCDLogic.cs @@ -14,7 +14,6 @@ using System.Linq; using System.Threading; using OpenRA.FileFormats; using OpenRA.FileFormats.Graphics; -using OpenRA.Utility; using OpenRA.Widgets; namespace OpenRA.Mods.D2k.Widgets.Logic diff --git a/OpenRA.Mods.D2k/Widgets/Logic/D2kInstallLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/D2kInstallLogic.cs index faaf5cd925..5eaf77340f 100644 --- a/OpenRA.Mods.D2k/Widgets/Logic/D2kInstallLogic.cs +++ b/OpenRA.Mods.D2k/Widgets/Logic/D2kInstallLogic.cs @@ -33,9 +33,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic panel.Get("COPY_BUTTON").OnClick = () => Ui.OpenWindow("INSTALL_FROMCD_PANEL", args); - panel.Get("EXTRACT_BUTTON").OnClick = () => - Ui.OpenWindow("EXTRACT_GAMEFILES_PANEL", args); - panel.Get("QUIT_BUTTON").OnClick = Game.Exit; panel.Get("MODS_BUTTON").OnClick = () => diff --git a/mods/d2k/bits/rockcrater1.shp b/mods/d2k/bits/rockcrater1.shp new file mode 100644 index 0000000000..1a800f2d8b Binary files /dev/null and b/mods/d2k/bits/rockcrater1.shp differ diff --git a/mods/d2k/bits/rockcrater2.shp b/mods/d2k/bits/rockcrater2.shp new file mode 100644 index 0000000000..ce4cca6e97 Binary files /dev/null and b/mods/d2k/bits/rockcrater2.shp differ diff --git a/mods/d2k/bits/sandcrater1.shp b/mods/d2k/bits/sandcrater1.shp new file mode 100644 index 0000000000..326dd7d78a Binary files /dev/null and b/mods/d2k/bits/sandcrater1.shp differ diff --git a/mods/d2k/bits/sandcrater2.shp b/mods/d2k/bits/sandcrater2.shp new file mode 100644 index 0000000000..b2c6b5c032 Binary files /dev/null and b/mods/d2k/bits/sandcrater2.shp differ diff --git a/mods/d2k/bits/spice0.shp b/mods/d2k/bits/spice0.shp new file mode 100644 index 0000000000..ebf845306e Binary files /dev/null and b/mods/d2k/bits/spice0.shp differ diff --git a/mods/d2k/chrome/gameinit.yaml b/mods/d2k/chrome/gameinit.yaml index d847aa27fc..e521aa3c73 100644 --- a/mods/d2k/chrome/gameinit.yaml +++ b/mods/d2k/chrome/gameinit.yaml @@ -3,7 +3,7 @@ Background@INSTALL_PANEL: X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 Width:630 - Height:350 + Height:200 Children: Label@TITLE: X:0 @@ -13,51 +13,23 @@ Background@INSTALL_PANEL: Text:Content files missing Align:Center Font:Bold - Label@DESC1: + Label@WELCOME: X:0 Y:50 Width:PARENT_RIGHT Height:25 - Text:This is the work in progress Dune 2000 mod. + Text:This is the work in progress Dune 2000 mod. It requires the original game files. Align:Center - Label@DESC2: + Label@DOWNLOAD: X:0 Y:90 Width:PARENT_RIGHT Height:25 - Text:It requires the original Dune 2000 assets whose fileformats differ from other C&C games. + Text:The easiest way is to simply click "Download" to fetch a minimal subset to get started. Align:Center - Label@DESC3: + Label@VIA_CD: X:0 - Y:130 - Width:PARENT_RIGHT - Height:25 - Text:The easiest way is to simply click download to fetch already prepared files and restart. - Align:Center - Label@DESC4: - X:0 - Y:170 - Width:PARENT_RIGHT - Height:25 - Text:You can also copy "Dune 2000/Data/GAMESFX" folder and "Dune 2000/DATA/*.R8" files - Align:Center - Label@DESC5: - X:0 - Y:190 - Width:PARENT_RIGHT - Height:25 - Text: from your local Dune 2000 1.03 installation to ~/.openra/Content/d2k/ (Linux) - Align:Center - Label@DESC6: - X:0 - Y:210 - Width:PARENT_RIGHT - Height:25 - Text: or "My Documents/OpenRA/Content/d2k/" (Windows) and click "Extract Data". - Align:Center - Label@DESC7: - X:0 - Y:250 + Y:110 Width:PARENT_RIGHT Height:25 Text: Put in your Dune 2000 CD and click "From CD" to extract game assets including music. @@ -76,13 +48,6 @@ Background@INSTALL_PANEL: Height:25 Text:From CD Font:Bold - Button@EXTRACT_BUTTON: - X:260 - Y:PARENT_BOTTOM - 45 - Width:110 - Height:25 - Text:Extract Data - Font:Bold Button@MODS_BUTTON: X:PARENT_RIGHT - 250 Y:PARENT_BOTTOM - 45 @@ -205,69 +170,4 @@ Background@INSTALL_FROMCD_PANEL: Height:25 Text:Back Font:Bold - Key:escape - -Background@EXTRACT_GAMEFILES_PANEL: - Logic:D2kExtractGameFilesLogic - X:(WINDOW_RIGHT - WIDTH)/2 - Y:(WINDOW_BOTTOM - HEIGHT)/2 - Width:500 - Height:160 - Children: - Label@TITLE: - X:0 - Y:20 - Width:PARENT_RIGHT - Height:25 - Text:Extracting and Converting Dune 2000 Gamefiles - Align:Center - Font:Bold - Container@EXTRACTING: - Width:PARENT_RIGHT - Height:PARENT_BOTTOM - Visible: false - Children: - ProgressBar@PROGRESS_BAR: - X:50 - Y:55 - Width:PARENT_RIGHT - 100 - Height:25 - Label@STATUS_LABEL: - X:50 - Y:80 - Width:PARENT_RIGHT - 100 - Height:25 - Align:Left - Container@COPY_FILES: - Width:PARENT_RIGHT - Height:PARENT_BOTTOM - Visible: false - Children: - Label@INFO: - Y:50 - Width:PARENT_RIGHT - Height:25 - Text:Gamefiles not not found. - Align:Center - Label@INFO2: - Y:70 - Width:PARENT_RIGHT - Height:25 - Text:Please copy the Data/*.R8 files from your Dune 2000 installation to OpenRAs Content/d2k directory then click Retry. - Align:Center - Button@RETRY_BUTTON: - X:PARENT_RIGHT - 280 - Y:PARENT_BOTTOM - 45 - Width:120 - Height:25 - Text:Retry - Font:Bold - Key:return - Button@BACK_BUTTON: - X:PARENT_RIGHT - 140 - Y:PARENT_BOTTOM - 45 - Width:120 - Height:25 - Text:Back - Font:Bold - Key:escape + Key:escape \ No newline at end of file diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 36af4a4e98..974a513e5c 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -10,16 +10,11 @@ Folders: ./mods/d2k/bits ./mods/d2k/uibits ./mods/ra/uibits - ~^/Content/ra ~^/Content/d2k ~^/Content/d2k/GAMESFX ~^/Content/d2k/Music - ~^/Content/d2k/Tilesets - ~^/Content/d2k/SHPs Packages: - ~main.mix - conquer.mix SOUND.RS Rules: @@ -101,8 +96,8 @@ Movies: LoadScreen: D2kLoadScreen InstallerMenuWidget: INSTALL_PANEL - TestFile: SOUND.RS - PackageURL: http://open-ra.org/get-dependency.php?file=d2k-complete-packages + TestFile: DATA.R8 + PackageURL: http://open-ra.org/get-dependency.php?file=d2k-103-packages ServerTraits: LobbyCommands