added special infantry, fixed UI, added new map

This commit is contained in:
Matthias Mailänder
2012-06-16 14:17:35 +02:00
parent c1fb5dd5f5
commit 959875c709
15 changed files with 339 additions and 34 deletions

View File

@@ -164,7 +164,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
new string[] {"--r8", PathToDataR8, PathToPalette, "4012", "4012", Path.Combine(PathToSHPs, "bazookaicon")},
new string[] {"--r8", PathToDataR8, PathToPalette, "4013", "4013", Path.Combine(PathToSHPs, "engineericon")},
new string[] {"--r8", PathToDataR8, PathToPalette, "4014", "4014", Path.Combine(PathToSHPs, "thumpericon")},
new string[] {"--r8", PathToDataR8, PathToPalette, "4015", "4015", Path.Combine(PathToSHPs, "sadaukaricon")},
new string[] {"--r8", PathToDataR8, PathToPalette, "4015", "4015", Path.Combine(PathToSHPs, "sardaukaricon")},
new string[] {"--r8", PathToDataR8, PathToPalette, "4016", "4016", Path.Combine(PathToSHPs, "trikeicon")},
new string[] {"--r8", PathToDataR8, PathToPalette, "4017", "4017", Path.Combine(PathToSHPs, "raidericon")},
new string[] {"--r8", PathToDataR8, PathToPalette, "4018", "4018", Path.Combine(PathToSHPs, "quadicon")},
@@ -276,7 +276,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
new string[] {"--shp", Path.Combine(PathToSHPs, "sandcrater2.png"), "32"},
new string[] {"--shp", Path.Combine(PathToSHPs, "rifle.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "rifledeath.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "rocket.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "bazooka.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "fremen.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "sardaukar.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "engineer.png"), "48"},
@@ -288,9 +288,9 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
new string[] {"--shp", Path.Combine(PathToSHPs, "quad.png"), "32"},
new string[] {"--shp", Path.Combine(PathToSHPs, "harvester.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "combata.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "siege.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "siegetank.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "dmcv.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "sonic.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "sonictank.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "combataturret.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "siegeturret.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "carryall.png"), "64"},
@@ -365,7 +365,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
new string[] {"--shp", Path.Combine(PathToSHPs, "bazookaicon.png"), "60"},
new string[] {"--shp", Path.Combine(PathToSHPs, "engineericon.png"), "60"},
new string[] {"--shp", Path.Combine(PathToSHPs, "thumpericon.png"), "60"},
new string[] {"--shp", Path.Combine(PathToSHPs, "sadaukaricon.png"), "60"},
new string[] {"--shp", Path.Combine(PathToSHPs, "sardaukaricon.png"), "60"},
new string[] {"--shp", Path.Combine(PathToSHPs, "trikeicon.png"), "60"},
new string[] {"--shp", Path.Combine(PathToSHPs, "raidericon.png"), "60"},
new string[] {"--shp", Path.Combine(PathToSHPs, "quadicon.png"), "60"},

View File

@@ -52,6 +52,8 @@ namespace OpenRA.Utility
using (var destStream = File.Create(dest))
ShpWriter.Write(destStream, width, srcImage.Height,
srcImage.ToFrames(width));
Console.WriteLine(dest+" saved");
}
static IEnumerable<byte[]> ToFrames(this Bitmap bitmap, int width)

View File

@@ -3,7 +3,7 @@ Background@INSTALL_PANEL:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:600
Height:300
Height:350
Children:
Label@TITLE:
X:0
@@ -22,35 +22,42 @@ Background@INSTALL_PANEL:
Align:Center
Label@DESC2:
X:0
Y:70
Y:90
Width:PARENT_RIGHT
Height:25
Text:It requires the original Dune 2000 (and still some Red Alert) game content.
Align:Center
Label@DESC4:
X:0
Y:110
Width:PARENT_RIGHT
Height:25
Text:You need to copy "Dune 2000/Data/GAMESFX" folder and "Dune 2000/DATA/*.R8" files
Align:Center
Label@DESC5:
Label@DESC3:
X:0
Y:130
Width:PARENT_RIGHT
Height:25
Text: from your local Dune 2000 installation to ~/.openra/Content/d2k/ (Linux)
Text:The easiest way is to simply click download to get 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:150
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:190
Y:250
Width:PARENT_RIGHT
Height:25
Text: Put in your Dune 2000 CD and click "Copy Music" to (optionally) download the tracks.

View File

@@ -149,12 +149,12 @@ Cursors:
start:104
c4:
start:252
length: 8
length: 4
x: 12
y: 12
c4-minimap:
start:252
length: 8
length: 4
x: 12
y: 12
guard:

Binary file not shown.

View File

@@ -93,7 +93,7 @@ Movies:
LoadScreen: D2kLoadScreen
InstallerMenuWidget: INSTALL_PANEL
TestFile: carryall.shp
PackageURL: DunePatch106R8Data.zip
PackageURL: http://open-ra.org/get-dependency.php?file=d2k-packages
ServerTraits:
LobbyCommands

View File

@@ -21,7 +21,7 @@ CARRYALL:
InitialFacing: 0
ROT: 5
Speed: 15
LandableTerrainTypes: Sand, Rock, Spice, Dune
LandableTerrainTypes: Sand, Rock, Transition, Spice, Dune
RepairBuildings: repaira,repairo,repairh
RearmBuildings: hightecha
RenderUnit:

View File

@@ -136,4 +136,40 @@ SONICTANK:
AttackFrontal:
PrimaryWeapon: TTankZap
PrimaryOffset: 0,0,0,-5
AutoTarget:
AutoTarget:
FREMEN:
Inherits: ^Infantry
Valued:
Cost: 1000
Tooltip:
Name: Fremen
Description: Elite sniper infantry unit.\n Strong vs Infantry\n Weak vs Vehicles\n Special Ability: Invisible
Buildable:
Queue: Infantry
BuildPaletteOrder: 50
Owner: atreides
Prerequisites: palacea
Selectable:
Bounds: 12,17,0,-6
# Voice: CommandoVoice
Mobile:
Speed: 5
Health:
HP: 200
Passenger:
PipType: Red
RevealsShroud:
Range: 6
AutoTarget:
ScanRadius: 5
AttackFrontal:
PrimaryWeapon: Sniper
RenderInfantryProne:
-RenderInfantry:
TakeCover:
Cloak:
InitialDelay: 125
CloakDelay: 125
CloakSound:
UncloakSound:

View File

@@ -5,6 +5,7 @@
TerrainSpeeds:
Sand: 80
Rock: 90
Transition: 85
Concrete: 100
Spice: 70
SpiceBlobs: 70
@@ -38,6 +39,7 @@
TerrainSpeeds:
Sand: 80
Rock: 90
Transition: 85
Concrete: 100
Spice: 70
SpiceBlobs: 70
@@ -78,6 +80,7 @@
TerrainSpeeds:
Sand: 80
Rock: 90
Transition: 85
Concrete: 100
Spice: 70
SpiceBlobs: 70

View File

@@ -143,4 +143,35 @@ DEVAST:
EmptyWeapon: UnitExplodeSmall
LeavesHusk:
Selectable:
Bounds: 44,38,0,-4
Bounds: 44,38,0,-4
SARDAUKAR:
Inherits: ^Infantry
Buildable:
Queue: Infantry
BuildPaletteOrder: 110
Prerequisites: palaceh
Owner: harkonnen
Valued:
Cost: 200
Tooltip:
Name: Sardaukar
Description: Heavy infantry.
Selectable:
# Voice: TanyaVoice
Bounds: 12,17,0,-9
Health:
HP: 150
Mobile:
Speed: 5
RevealsShroud:
Range: 6
Passenger:
PipType: Red
TakeCover:
-RenderInfantry:
RenderInfantryProne:
AttackFrontal:
PrimaryWeapon: Vulcan
SecondaryWeapon: Dragon
PrimaryOffset: 0,0,0,-13

View File

@@ -166,4 +166,36 @@ DEVIATORTANK:
PrimaryWeapon: MammothTusk
PrimaryLocalOffset: -7,2,0,0,25, 7,2,0,0,-25
PrimaryRecoil: 1
AutoTarget:
AutoTarget:
SABOTEUR:
Inherits: ^Infantry
Buildable:
Queue: Infantry
BuildPaletteOrder: 110
Prerequisites: palaceo
Owner: ordos
Valued:
Cost: 1000
Tooltip:
Name: Saboteur
Description: Sneaky infantry, armed with explosives.\n Strong vs Buildings\n Weak vs Everything\n Special Ability: destroy buildings
Selectable:
# Voice: TanyaVoice
Bounds: 12,17,0,-9
Health:
HP: 100
Mobile:
Speed: 5
RevealsShroud:
Range: 6
C4Demolition:
C4Delay: 45
Passenger:
PipType: Red
TakeCover:
-RenderInfantry:
RenderInfantryProne:
-AutoTarget:
AttackMove:
JustMove: true

View File

@@ -86,6 +86,8 @@ Player:
powrh: 35%
powro: 35%
UnitsToBuild:
rifle: 30%
bazooka: 30%
trike: 30%
raider: 30%
quad: 40%
@@ -116,6 +118,7 @@ World:
Maximum: 3
SpawnInterval: 120
WaterChance: 0
ValidGround: Sand, Dune, Rock
PaletteFromCurrentTileset:
Name: terrain
PaletteFromFile@d2k:

View File

@@ -147,9 +147,9 @@ rifle:
die5: rifledeath
Start: 26
Length: 7
die6: electro
Start: 0
Length: *
die6: rifledeath
Start: 26
Length: 7
die-crushed: rifledeath
Start: 54
Length: 22
@@ -204,9 +204,9 @@ bazooka:
die5: rifledeath
Start: 26
Length: 7
die6: electro
Start: 0
Length: *
die6: rifledeath
Start: 26
Length: 7
die-crushed: rifledeath
Start: 54
Length: 22
@@ -238,9 +238,111 @@ engineer:
die5: rifledeath
Start: 26
Length: 7
die6: electro
die6: rifledeath
Start: 26
Length: 7
die-crushed: rifledeath
Start: 54
Length: 22
Tick: 1600
fremen:
stand:
Start: 0
Length: *
Facings: 8
stand2:
Start: 0
Facings: 8
run:
Start: 8
Length: 6
Facings: 8
die1: rifledeath
Start: 0
Length: 5
die2: rifledeath
Start: 5
Length: 7
die3: rifledeath
Start: 12
Length: 7
die4: rifledeath
Start: 19
Length: 7
die5: rifledeath
Start: 26
Length: 7
die6: rifledeath
Start: 26
Length: 7
die-crushed: rifledeath
Start: 54
Length: 22
Tick: 1600
saboteur:
stand:
Start: 0
Facings: 8
stand2:
Start: 0
Facings: 8
run:
Start: 8
Length: 4
Facings: 8
die1: rifledeath
Start: 0
Length: 5
die2: rifledeath
Start: 5
Length: 7
die3: rifledeath
Start: 12
Length: 7
die4: rifledeath
Start: 19
Length: 7
die5: rifledeath
Start: 26
Length: 7
die6: rifledeath
Start: 26
Length: 7
die-crushed: rifledeath
Start: 54
Length: 22
Tick: 1600
sardaukar:
stand:
Start: 0
Facings: 8
stand2:
Start: 0
Facings: 8
run:
Start: 8
Length: 4
Facings: 8
die1: rifledeath
Start: 0
Length: 5
die2: rifledeath
Start: 5
Length: 7
die3: rifledeath
Start: 12
Length: 7
die4: rifledeath
Start: 19
Length: 7
die5: rifledeath
Start: 26
Length: 7
die6: rifledeath
Start: 26
Length: 7
die-crushed: rifledeath
Start: 54
Length: 22

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

@@ -467,4 +467,93 @@ RedEye:
Explosion: med_explosion
InfDeath: 2
SmudgeType: Crater
Damage: 40
Damage: 40
Sniper:
Report: GUN11
ROF: 40
Range: 7
Projectile: Bullet
Speed: 100
Warhead:
Damage: 100
Spread: 1
Versus:
None: 100%
Wood: 5%
Light: 5%
Heavy: 5%
InfDeath: 1
Vulcan:
ROF: 30
Range: 6
Report: GUN13
Projectile: Bullet
Speed: 100
ContrailLength: 1000
Warhead@1:
Spread: 3
Versus:
Wood: 50%
Light: 60%
Heavy: 25%
Concrete: 25%
Explosion: piffs
InfDeath: 1
Damage: 10
Warhead@2:
Spread: 3
Versus:
Wood: 50%
Light: 60%
Heavy: 25%
Concrete: 25%
Explosion: piffs
InfDeath: 1
Damage: 10
Delay: 2
Warhead@3:
Spread: 3
Versus:
Wood: 50%
Light: 60%
Heavy: 25%
Concrete: 25%
Explosion: piffs
InfDeath: 1
Damage: 10
Delay: 4
Warhead@4:
Spread: 3
Versus:
Wood: 50%
Light: 60%
Heavy: 25%
Concrete: 25%
Explosion: piffs
InfDeath: 1
Damage: 10
Delay: 6
Warhead@5:
Spread: 3
Versus:
Wood: 50%
Light: 60%
Heavy: 25%
Concrete: 25%
Explosion: piffs
InfDeath: 1
Damage: 10
Delay: 8
Warhead@6:
Spread: 3
Versus:
Wood: 50%
Light: 60%
Heavy: 25%
Concrete: 25%
Explosion: piffs
InfDeath: 1
Damage: 10
Delay: 10