From 9b1e798b3597389bc17c8b3f9f450efe92d6d7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 2 Jun 2012 15:36:31 +0200 Subject: [PATCH] added spice as a ressource still needs work though --- OpenRA.Mods.D2k/D2kLoadScreen.cs | 4 ++-- README | 2 +- mods/d2k/TODO | 4 ++-- mods/d2k/maps/test.oramap | Bin 1118 -> 1141 bytes mods/d2k/rules/defaults.yaml | 6 +++--- mods/d2k/rules/system.yaml | 27 +++++++++++---------------- mods/d2k/tilesets/arrakis.yaml | 6 ++++++ mods/d2k/voices.yaml | 2 +- ripD2kGameFiles.sh | 14 +++++++++----- 9 files changed, 35 insertions(+), 30 deletions(-) diff --git a/OpenRA.Mods.D2k/D2kLoadScreen.cs b/OpenRA.Mods.D2k/D2kLoadScreen.cs index 2136ae8a04..bfa77774ea 100644 --- a/OpenRA.Mods.D2k/D2kLoadScreen.cs +++ b/OpenRA.Mods.D2k/D2kLoadScreen.cs @@ -9,6 +9,7 @@ #endregion using System.Collections.Generic; +using System.IO; using System.Drawing; using OpenRA.FileFormats; using OpenRA.Graphics; @@ -36,8 +37,7 @@ namespace OpenRA.Mods.D2k // can display loadscreen as early as possible r = Game.Renderer; if (r == null) return; - - var s = new Sheet("mods/d2k/uibits/loadscreen.png"); + var s = new Sheet(Path.Combine(Path.Combine(Path.Combine("mods", "d2k"), "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/README b/README index 29dd89bc6d..c4b4efc183 100644 --- a/README +++ b/README @@ -2,4 +2,4 @@ OpenRA is a Libre/Free Real Time Strategy game engine supporting early Westwood Distributed mods include a reimagining and updating of both the Red Alert and Command & Conquer multiplayer games. This repository tries to add Dune 2000. It is already a standalone mod, but still falls back to Red Alert gamefiles at some times. -Please read INSTALL on how to install an OpenRA development environment, HACKING for an overview of the engine and mods/d2k/TODO to find out about the still missing features. You need to copy "Dune 2000/Data/GAMESFX" and "Dune 2000/DATA/DATA.R8" to ~/.openra/Content/d2k/ and run the bash script ripD2kGameFiles.sh before starting the d2k mod. \ No newline at end of file +Please read INSTALL on how to install an OpenRA development environment, HACKING for an overview of the engine and mods/d2k/TODO to find out about the still missing features. You need to copy "Dune 2000/Data/GAMESFX" and "Dune 2000/DATA/DATA.R8" and "Dune 2000/DATA/MOUSE.R8" to ~/.openra/Content/d2k/ and run the bash script ripD2kGameFiles.sh before starting the d2k mod. \ No newline at end of file diff --git a/mods/d2k/TODO b/mods/d2k/TODO index 3c2d789564..32c7c0a3b1 100644 --- a/mods/d2k/TODO +++ b/mods/d2k/TODO @@ -7,7 +7,8 @@ # welding animation (factories) missing # chimney animation (refinery) missing # create a tileset extractor for gamefiles to remove copyrighted content from distribution -# replace ore with spice and mines with spice blooms +# replace mines with spice blooms +# spice tiles do not fit # add Smudge Types (stored in SHPs not in tileset) # add game logic for concrete plates (use terrain overlay from bridges/ressources) # allow placing turrets on walls @@ -33,7 +34,6 @@ # add install rules to makefile (once more polished) # add sonic tank weapon (currently uses tesla) # make deviator change the allegiance of ememy units (currently shoots rockets) -# replace RA mouse.shp, nopower.shp with Dune 2000 equivalent # complete Arrakis tileset (blocked by issue #2178) # allow frigate to deliver 5 units at once to starport # starport prices should vary diff --git a/mods/d2k/maps/test.oramap b/mods/d2k/maps/test.oramap index 7b592f36c1071c458b2136eabde2fbb6463d7a9d..f2dc2e50a9760d694beca262489d3494f1edaa54 100644 GIT binary patch delta 643 zcmcb|@s*=Kz?+#xgn@y9gF&VGki(jj=Mqhs7#LU`7#Y}sqPd9$dP$jiZ||P%yJaB3 zdf_~$E~|0QkBJqxE5G=K_?mPwB_6QIEj?H9P^UKa>8;HQFKzEJ1NAX5B;4&)J8tIw zrX%ZzcuK0#r9w2o&VlGJ`17lzPzvcYkU89-~W0S_t)-`Pu|^m z<4kNXYs8j%_Q}3W&fd8i(eQ5nyZt-<|2zHH+VbC*H(P(N|8sg?eHyd8@0|Km^Xh*! zpPl>vXZb(P>VNew`OV7b)xd?-<=@ZW^#1?9gyOeb?W?~0)2#cy_wOxv+p7N}`~Tmo zd)qH}cYoLY`uzRh-22b{Kl*GL_iw!Z|1DkLWM0a=)x4y6t9HrWzx?2^MG)7|)>SyU=%1^9c34=c zs_>t&{5*k+-Jj?G{Ls=7H)p@R#DDK!<-0muLsn0|!zh`#x1QZqXVI&_)*4BIq3`cI z3U;rk`p?%D;d1qNdB71RV8p{gLw3;r^uO2g!3f=2hClUxZgqW)-v2e)9;_pIKO;&) j+8n?%laUjiq9%W0)?o(nCM&W?Ge%9eWszq40!}6XVCXl{ delta 664 zcmey$agU=uz?+#xgn@y9gCTMCE{C1xYuCv!F)*+?FfypK^LGRk?=O%x@;nv_^|NOt@pZ&#q?6(O%xcqZ{QBKht z`P&>HUjC6^8T&U{?|;4a*8cL<_0wP6x4X9nLe2dbyQuzm#r?1Eh5p_?{(I-P*&S!^ zT#jgP{awD{rpv7}w!N$`{=WX({r$cFyZa}H}Udih85-@m=JZ~E)3>bv&W=ga?I zJpW$&(fj+i_y4`<|NZ}?_xEq}$GwkdXvp;4KFj;a(%WTace7N2wf|pnsqQT4{HFbX z%kNvCvvRkyU9NjG?dSSw^;zwg>v~E|{y)3_XY-Li^1D(~|B283@4Te>=layEYoEy! z_B|6R>`Ig0X#W4}C;!zM=O>=KI8SNrqPy<5X4gYP7EbQS`*v7ZsjBdwvHU!Ni`}2+ z|NPL>5jW@mnRa!TFOUBGZT|RwN&WKf2$!vs?=eb-Uj1Dja71aV%@&YBR%Ea890B=?{kQ@^bW&`QFK-CNk08#%q^Z)<= diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index b9a5a7e09a..650b2c5157 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -6,7 +6,7 @@ Clear: 80 Rough: 40 Road: 100 - Ore: 70 + Spice: 70 Beach: 40 ROT: 5 SelectionDecorations: @@ -38,7 +38,7 @@ Clear: 80 Rough: 70 Road: 100 - Ore: 70 + Spice: 70 Beach: 70 ROT: 5 SelectionDecorations: @@ -77,7 +77,7 @@ Clear: 90 Rough: 80 Road: 100 - Ore: 80 + Spice: 80 Beach: 80 SelectionDecorations: Selectable: diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml index b89f4c3f53..66e5a89148 100644 --- a/mods/d2k/rules/system.yaml +++ b/mods/d2k/rules/system.yaml @@ -100,10 +100,6 @@ Player: PlayerColorPalette: BasePalette: d2k PaletteFormat: d2k - DebugResourceCash: - DebugResourceOre: - DebugResourceOreCapacity: - -GpsWatcher: BaseAttackNotifier: Audio: AI_ATACK.AUD @@ -112,9 +108,7 @@ World: Widget: INGAME_ROOT ObserverWidget: OBSERVER_ROOT ScreenShaker: - -WaterPaletteRotation: NukePaletteEffect: - -LightPaletteRotator: BuildingInfluence: ChooseBuildTabOnSelect: CrateSpawner: @@ -179,15 +173,16 @@ World: Race: ordos # BibLayer: ResourceLayer: -# ResourceType@spice: -# ResourceType: 1 -# Palette: d2k -# SpriteNames: spice #? -# ValuePerUnit: 25 -# Name: Spice -# PipColor: Yellow -# AllowedTerrainTypes: Sand -# AllowUnderActors: false + ResourceType@spice: + ResourceType: 1 + Palette: d2k + TerrainType: Spice + SpriteNames: spice0 + ValuePerUnit: 35 + Name: Spice + PipColor: Yellow + AllowedTerrainTypes: Clear + AllowUnderActors: false # SmudgeLayer@SCORCH: # Type:Scorch # SmokePercentage:50 @@ -232,7 +227,7 @@ CRATE: Name: Crate Crate: Lifetime: 120 - TerrainTypes: Clear, Rough, Road, Water, Ore, Beach + TerrainTypes: Clear, Rough, Road, Water, Beach GiveCashCrateAction: Amount: 1000 SelectionShares: 50 diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index b32dcd1fe0..403a0c1de3 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -12,6 +12,12 @@ Terrain: AcceptSmudge: True IsWater: False Color: 255,255,255,255 + TerrainType@Spice: + Type: Spice + Buildable: False + AcceptSmudge: False + IsWater: False + Color: 255,255,255,255 Templates: Template@0: diff --git a/mods/d2k/voices.yaml b/mods/d2k/voices.yaml index 852581dcca..43d6e6a85c 100644 --- a/mods/d2k/voices.yaml +++ b/mods/d2k/voices.yaml @@ -1,4 +1,4 @@ -# requires Dune 2000/DATA/GAMESFX copied to OpenRA/Content/d2k +# requires Dune 2000/DATA/GAMESFX copied to ~/.openra/Content/d2k GenericVoice: Variants: diff --git a/ripD2kGameFiles.sh b/ripD2kGameFiles.sh index 8767030ea7..631fbb4ca0 100755 --- a/ripD2kGameFiles.sh +++ b/ripD2kGameFiles.sh @@ -1,5 +1,5 @@ #!/bin/bash -R8="/home/matthias/.openra/Content/d2k/DATA.R8" +R8="$HOME/.openra/Content/d2k/DATA.R8" PAL="mods/d2k/bits/d2k.pal" mono OpenRA.Utility.exe --r8 $R8 $PAL 0 2 "overlay" @@ -13,8 +13,8 @@ mono OpenRA.Utility.exe --r8 $R8 $PAL 106 109 "spicebloom" mono OpenRA.Utility.exe --shp spicebloom.png 32 -mono OpenRA.Utility.exe --r8 $R8 $PAL 194 205 "spice" -mono OpenRA.Utility.exe --shp spice.png 48 +#mono OpenRA.Utility.exe --r8 $R8 $PAL 194 205 "spice" +#mono OpenRA.Utility.exe --shp spice.png 48 mono OpenRA.Utility.exe --r8 $R8 $PAL 206 381 "rifle" --infantry mono OpenRA.Utility.exe --shp rifle.png 48 mono OpenRA.Utility.exe --r8 $R8 $PAL 382 457 "rifledeath" --infantrydeath @@ -376,10 +376,14 @@ mono OpenRA.Utility.exe --shp windtrap_anim.png 96 mono OpenRA.Utility.exe --r8 $R8 $PAL 4820 4840 "missile_launch" mono OpenRA.Utility.exe --shp missile_launch.png 96 -R8="/home/matthias/.openra/Content/d2k/MOUSE.R8" -PAL="mods/d2k/bits/d2k.pal" +R8="$HOME/.openra/Content/d2k/MOUSE.R8" mono OpenRA.Utility.exe --r8 $R8 $PAL 0 264 "mouse" --transparent mono OpenRA.Utility.exe --shp mouse.png 48 +R8="$HOME/.openra/Content/d2k/BLOXBASE.R8" +mono OpenRA.Utility.exe --r8 $R8 $PAL 0 799 "BLOXBASE" +#mono OpenRA.Utility.exe --r8 $R8 $PAL 748 757 "spice0" +#mono OpenRA.Utility.exe --shp spice0.png 32 + mv *.shp mods/d2k/bits \ No newline at end of file