diff --git a/mods/d2k/chrome.yaml b/mods/d2k/chrome.yaml index 81993a5bba..ebc7405138 100644 --- a/mods/d2k/chrome.yaml +++ b/mods/d2k/chrome.yaml @@ -168,11 +168,11 @@ tabs-normal: tabs.png harkonnen-Ship: 134,200,27,41 flags: buttons.png - atreides: 60,84,30,15 - harkonnen: 60,84,30,15 - orodos: 60,84,30,15 - random: 60,84,30,15 - spectator: 60,84,30,15 + atreides: 0,84,21,107 + harkonnen: 22,84,45,107 + orodos: 45,84,67,107 + random: 67,84,90,107 + spectator: 67,84,90,107 dialog2: dialog.png background: 513,1,126,126 diff --git a/mods/d2k/maps/test.oramap b/mods/d2k/maps/test.oramap index d97a361db9..7b592f36c1 100644 Binary files a/mods/d2k/maps/test.oramap and b/mods/d2k/maps/test.oramap differ diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml new file mode 100644 index 0000000000..52df17fd4d --- /dev/null +++ b/mods/d2k/rules/atreides.yaml @@ -0,0 +1,148 @@ +CONYARDA: + Inherits: ^CONYARD + Buildable: + Owner: atreides + +PWRA: + Inherits: ^POWER + Buildable: + Prerequisites: conyarda + Owner: atreides + +REFA: + Inherits: ^REFINERY + Buildable: + Prerequisites: pwra + Owner: atreides + RenderBuildingWarFactory: + Image: REFA + +BARRA: + Inherits: ^BARRACKS + Buildable: + Prerequisites: pwra + Owner: atreides + +HIGHTECHA: + Inherits: ^HIGHTECH + Buildable: + Prerequisites: radara + Owner: atreides + +RESEARCHA: + Inherits: ^RESEARCH + Buildable: + Prerequisites: radara,heavya + Owner: atreides + +PALACEA: + Inherits: ^PALACE + Buildable: + Prerequisites: researcha + Owner: atreides + +SILOA: + Inherits: ^SILO + Buildable: + Prerequisites: refa + Owner: atreides + +LIGHTA: + Inherits: ^LIGHT + Buildable: + Prerequisites: refa + Owner: atreides + RenderBuildingWarFactory: + Image: LIGHTA + +HEAVYA: + Inherits: ^HEAVY + Buildable: + Prerequisites: lighta + Owner: atreides + RenderBuildingWarFactory: + Image: HEAVYA + +RADARA: + Inherits: ^RADAR + Buildable: + Prerequisites: barra + Owner: atreides + +STARPORTA: + Inherits: ^STARPORT + Buildable: + Prerequisites: radara + Owner: atreides + ProductionQueue: + QueuedAudio: AI_ORDER.AUD + ReadyAudio: AI_REINF.AUD + OnHoldAudio: AI_HOLD.AUD + CancelledAudio: AI_CANCL.AUD + +WALLA: + Inherits: ^Wall + Buildable: + Prerequisites: conyarda + Owner: atreides + +GUNTOWERA: + Inherits: ^GUNTOWER + Buildable: + Prerequisites: barra + Owner: atreides + +REPAIRA: + Inherits: ^REPAIR + Buildable: + Prerequisites: heavya + Owner: atreides + +#TODO: game has to spawn MCVA, MCVH, MCVO instead of MCV for everyone +MCV: + Inherits: ^MCV + Buildable: + Prerequisites: heavya,repaira + Owner: atreides + Transforms: + Facing: 10 + IntoActor: conyarda + Offset:-1,-1 + TransformSounds: + NoTransformSounds: AI_DPLOY.AUD + RenderUnit: + Image: MCV + +COMBATA: + Inherits: ^COMBAT + Buildable: + Prerequisites: heavya + Owner: atreides + +SONIC: + Inherits: ^Vehicle + Buildable: + Queue: Vehicle + BuildPaletteOrder: 15 + Prerequisites: heavya,researcha + Owner: atreides + Valued: + Cost: 1500 + Tooltip: + Name: Sonic Tank + Description: Fires a sound wave\n Strong vs Infantry.\n Weak vs Tanks + Selectable: + Bounds: 24,24 + Health: + HP: 150 + Armor: + Type: Light + Mobile: + Speed: 8 + RevealsShroud: + Range: 7 + RenderUnit: + AttackFrontal: + PrimaryWeapon: TTankZap + PrimaryOffset: 0,0,0,-5 + AutoTarget: \ No newline at end of file diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml index 46e4a5e7c8..1a31090e45 100644 --- a/mods/d2k/rules/system.yaml +++ b/mods/d2k/rules/system.yaml @@ -1,17 +1,18 @@ +#TODO: Currently only uses the Atreides voices. Player: TechTree: ClassicProductionQueue@Building: Type: Building BuildSpeed: .4 LowPowerSlowdown: 3 - QueuedAudio: abldgin1.aud - ReadyAudio: conscmp1.aud + QueuedAudio: AI_BUILD.AUD + ReadyAudio: AI_BDRDY.AUD ClassicProductionQueue@Defense: Type: Defense BuildSpeed: .4 LowPowerSlowdown: 3 - QueuedAudio: abldgin1.aud - ReadyAudio: conscmp1.aud + QueuedAudio: AI_BUILD.AUD + ReadyAudio: AI_BDRDY.AUD ClassicProductionQueue@Vehicle: Type: Vehicle BuildSpeed: .4 @@ -27,8 +28,8 @@ Player: PlaceBuilding: SupportPowerManager: ConquestVictoryConditions: - WinNotification:misnwon1.aud - LoseNotification:misnlst1.aud + WinNotification:AI_MWIN.AUD + LoseNotification:AI_MFAIL.AUD PowerManager: AllyRepair: PlayerResources: @@ -152,9 +153,6 @@ CRATE: UseCashTick: yes LevelUpCrateAction: SelectionShares: 40 - ExplodeCrateAction@fire: - Weapon: CrateNapalm - SelectionShares: 5 ExplodeCrateAction@boom: Weapon: CrateExplosion SelectionShares: 5 @@ -167,9 +165,6 @@ CRATE: RevealMapCrateAction: SelectionShares: 1 Effect: reveal-map - SupportPowerCrateAction@parabombs: - SelectionShares: 5 - Proxy: powerproxy.parabombs GiveMcvCrateAction: SelectionShares: 2 NoBaseSelectionShares: 9001 diff --git a/mods/d2k/uibits/buttons.png b/mods/d2k/uibits/buttons.png new file mode 100644 index 0000000000..edeff9875f Binary files /dev/null and b/mods/d2k/uibits/buttons.png differ diff --git a/mods/d2k/uibits/dialog.png b/mods/d2k/uibits/dialog.png index 98e461bc53..0b3d11767e 100644 Binary files a/mods/d2k/uibits/dialog.png and b/mods/d2k/uibits/dialog.png differ diff --git a/ripD2kGameFiles.sh b/ripD2kGameFiles.sh index 9886252544..dc3c5a1334 100755 --- a/ripD2kGameFiles.sh +++ b/ripD2kGameFiles.sh @@ -5,6 +5,14 @@ PAL="mods/d2k/bits/d2k.pal" mono OpenRA.Utility.exe --r8 $R8 $PAL 0 2 "overlay" mono OpenRA.Utility.exe --shp overlay.png 32 +mono OpenRA.Utility.exe --r8 $R8 $PAL 40 101 "shroud" +mono OpenRA.Utility.exe --shp shroud.png 32 +mono OpenRA.Utility.exe --r8 $R8 $PAL 102 105 "crates" +mono OpenRA.Utility.exe --shp crates.png 32 +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 206 457 "rifle" --infantry