mapped DATA.R8 completely, fixes #2341

d2k is now completely independened from RA MIX/SHP files
This commit is contained in:
Matthias Mailänder
2013-04-15 12:59:08 +02:00
parent 7470189be1
commit 8fa1fc2345
12 changed files with 491 additions and 405 deletions

BIN
mods/d2k/bits/clock.shp Normal file

Binary file not shown.

BIN
mods/d2k/bits/levelup.shp Normal file

Binary file not shown.

BIN
mods/d2k/bits/nopower.shp Normal file

Binary file not shown.

BIN
mods/d2k/bits/rank.shp Normal file

Binary file not shown.

BIN
mods/d2k/bits/speed.shp Normal file

Binary file not shown.

View File

@@ -9,22 +9,14 @@ Folders:
./mods/d2k
./mods/d2k/bits
./mods/d2k/uibits
./mods/ra/uibits
~^/Content/d2k
~^/Content/d2k/GAMESFX
~^/Content/d2k/Music
~^/Content/d2k/Tilesets
~^/Content/d2k/SHPs
./mods/ra/bits
./mods/ra/uibits
~^/Content/ra
Packages:
~main.mix
redalert.mix
conquer.mix
hires.mix
local.mix
sounds.mix
Rules:
mods/d2k/rules/system.yaml
@@ -89,8 +81,8 @@ Movies:
LoadScreen: D2kLoadScreen
InstallerMenuWidget: INSTALL_PANEL
TestFile: plates.shp
PackageURL: http://open-ra.org/get-dependency.php?file=d2k-packages
TestFile: deathhandlaunch.shp
PackageURL: http://open-ra.org/get-dependency.php?file=d2k-complete-packages
ServerTraits:
LobbyCommands

View File

@@ -138,6 +138,7 @@ ORNI.bomber:
CARRYALL.infantry:
ParaDrop:
LZRange: 5
ChuteSound:
Inherits: ^Plane
Health:
HP: 200
@@ -174,4 +175,4 @@ BADR:
ParaDrop:
LZRange: 4
Tooltip:
Name: Crate Carryall
Name: Crate Carryall

View File

@@ -333,8 +333,8 @@ WALL:
Value: 0
Tooltip:
Name: Concrete Wall
Description: Stops units and blocks enemy fire
Icon: wallicon
Description: Stop units and blocks enemy fire.
Icon: wallaicon
AppearsOnRadar:
Building:
BuildSounds: CHUNG.aud
@@ -377,7 +377,7 @@ GUNTOWER:
Tooltip:
Name: Gun Tower
Description: Defensive structure\n Strong vs Tanks\n Weak vs Infantry, Aircraft
Icon: turreticon
Icon: guntoweraicon
Building:
Power: -20
Adjacent: 4
@@ -432,9 +432,9 @@ ROCKETTOWER:
Valued:
Cost: 750
Tooltip:
Name: Missile Tower
Icon: rturreticon
Name: Rocket Tower
Description: Defensive structure\n Strong vs Infantry, Aircraft\n Weak vs Tanks\n\n Requires power to operate
Icon: rockettoweraicon
Building:
Power: -30
Adjacent: 4
@@ -493,6 +493,7 @@ REPAIR:
Tooltip:
Name: Repair Pad
Description: Repairs vehicles\n Allows construction of MCVs
Image: repairaicon
Building:
Power: -25
Footprint: =x= =x= ===

View File

@@ -303,7 +303,7 @@ World:
ShadowIndex: 3
PaletteFromFile@effect:
Name: effect
Filename: temperat.pal
Filename: d2k.pal
ShadowIndex: 4
PaletteFromFile@colorpicker:
Name: colorpicker
@@ -359,7 +359,7 @@ World:
BibWidths: 3, 2
ResourceLayer:
ResourceClaimLayer:
ResourceType@spice:
ResourceType@Spice:
ResourceType: 1
Palette: d2k
TerrainType: Spice
@@ -369,14 +369,16 @@ World:
PipColor: green
AllowedTerrainTypes: Sand
AllowUnderActors: false
SmudgeLayer@rock:
Type:RockCrater
Types:rockcrater1,rockcrater2
Depths:15,15
SmudgeLayer@sand:
Type:SandCrater
Types:sandcrater1,sandcrater2
Depths:15,15
SmudgeLayer@Rock:
Type: RockCrater
Types: rockcrater1, rockcrater2
Depths: 15, 15
SmokePercentage: 0
SmudgeLayer@Sand:
Type: SandCrater
Types: sandcrater1, sandcrater2
Depths: 15, 15
SmokePercentage: 0
SpawnMapActors:
CreateMPPlayers:
MPStartLocations:
@@ -512,7 +514,7 @@ SPICEBLOOM:
# Tooltip:
# Name: Sandworm
# Description: Attracted by vibrations in the sand. Will eat units whole and has a large appetite.
# Icon: wormjaw
# Icon: black
# Health:
# HP: 10000
# Radius: 3

View File

@@ -259,42 +259,28 @@ bazooka:
Length: 5
Facings: 8
Tick: 120
die1:
Start: 176
Length: 8
Tick: 120
die2:
Start: 184
Length: 8
Tick: 120
die3:
Start: 192
Length: 8
Tick: 120
die4:
Start: 200
Length: 8
Tick: 120
die5:
Start: 176
Length: 8
Tick: 120
die6:
Start: 184
Length: 8
Tick: 120
die-crushed:
Start: 208
Length: 8
Tick: 240
idle1:
Start: 216
Length: 8
Tick: 160
idle2:
Start: 224
Length: 8
Tick: 160
die1: bazookadeath
Start: 0
Length: 5
die2: bazookadeath
Start: 5
Length: 7
die3: bazookadeath
Start: 12
Length: 7
die4: bazookadeath
Start: 19
Length: 7
die5: bazookadeath
Start: 26
Length: 7
die6: bazookadeath
Start: 26
Length: 7
die-crushed: bazookadeath
Start: 34
Length: 26
Tick: 1600
engineer:
stand:
@@ -307,35 +293,29 @@ engineer:
Start: 8
Length: 6
Facings: 8
Tick: 110
die1: rifledeath
Start: 12
Length: 12
Tick: 80
die2: rifledeath
Start: 12
Length: 12
Tick: 80
die3: rifledeath
Start: 36
Length: 12
Tick: 80
die4: rifledeath
Start: 24
Length: 12
Tick: 80
die5: rifledeath
Tick: 120
die1: engineerdeath
Start: 0
Length: 12
Tick: 80
die6: rifledeath
Length: 5
die2: engineerdeath
Start: 5
Length: 7
die3: engineerdeath
Start: 12
Length: 12
Tick: 80
die-crushed: rifledeath
Start: 48
Length: 12
Tick: 160
Length: 7
die4: engineerdeath
Start: 19
Length: 7
die5: engineerdeath
Start: 26
Length: 7
die6: engineerdeath
Start: 26
Length: 7
die-crushed: engineerdeath
Start: 34
Length: 26
Tick: 1600
thumper:
stand:
@@ -349,49 +329,43 @@ thumper:
Length: 6
Facings: 8
Tick: 120
heal:
Start: 60
heal: thumping
Start: 0
Length: 4
Tick: 480
die1: rifledeath
Start: 12
Length: 12
Tick: 80
die2: rifledeath
Start: 12
Length: 12
Tick: 80
die3: rifledeath
Start: 36
Length: 12
Tick: 80
die4: rifledeath
Start: 24
Length: 12
Tick: 80
die5: rifledeath
die1: thumperdeath
Start: 0
Length: 12
Tick: 80
die6: rifledeath
Length: 5
die2: thumperdeath
Start: 5
Length: 7
die3: thumperdeath
Start: 12
Length: 12
Tick: 80
die-crushed: rifledeath
Start: 48
Length: 12
Tick: 160
Length: 7
die4: thumperdeath
Start: 19
Length: 7
die5: thumperdeath
Start: 26
Length: 7
die6: thumperdeath
Start: 26
Length: 7
die-crushed: thumperdeath
Start: 34
Length: 26
Tick: 1600
thumping:
idle: thumper
Start: 56
idle:
Start: 0
Length: 4
Tick: 150
make: thumper
Start: 56
make:
Start: 0
Length: 4
damaged-idle: thumper
Start: 56
damaged-idle:
Start: 0
Length: 4
Tick: 150
@@ -431,34 +405,28 @@ fremen:
Length: 5
Facings: 8
Tick: 120
die1: rifledeath
Start: 12
Length: 12
Tick: 80
die2: rifledeath
Start: 12
Length: 12
Tick: 80
die3: rifledeath
Start: 36
Length: 12
Tick: 80
die4: rifledeath
Start: 24
Length: 12
Tick: 80
die5: rifledeath
die1: fremendeath
Start: 0
Length: 12
Tick: 80
die6: rifledeath
Length: 5
die2: fremendeath
Start: 5
Length: 7
die3: fremendeath
Start: 12
Length: 12
Tick: 80
die-crushed: rifledeath
Start: 48
Length: 12
Tick: 160
Length: 7
die4: fremendeath
Start: 19
Length: 7
die5: fremendeath
Start: 26
Length: 7
die6: fremendeath
Start: 26
Length: 7
die-crushed: fremendeath
Start: 34
Length: 26
Tick: 1600
saboteur:
stand:
@@ -467,39 +435,50 @@ saboteur:
stand2:
Start: 0
Facings: 8
stand3:
Start: 0
Facings: 8
run:
Start: 8
Length: 4
Length: 6
Facings: 8
Tick: 100
die1: rifledeath
Start: 12
Length: 12
Tick: 80
die2: rifledeath
Start: 12
Length: 12
Tick: 80
die3: rifledeath
Start: 36
Length: 12
Tick: 80
die4: rifledeath
Start: 24
Length: 12
Tick: 80
die5: rifledeath
Tick: 120
prone-stand:
Start: 104
Length: 1
Facings: 8
prone-run:
Start: 112
Length: 3
Facings: 8
Tick: 120
standup-0:
Start: 96
Length: 1
Facings: 8
Tick: 120
die1: saboteurdeath
Start: 0
Length: 12
Tick: 80
die6: rifledeath
Length: 5
die2: saboteurdeath
Start: 5
Length: 7
die3: saboteurdeath
Start: 12
Length: 12
Tick: 80
die-crushed: rifledeath
Start: 48
Length: 12
Tick: 160
Length: 7
die4: saboteurdeath
Start: 19
Length: 7
die5: saboteurdeath
Start: 26
Length: 7
die6: saboteurdeath
Start: 26
Length: 7
die-crushed: saboteurdeath
Start: 34
Length: 26
Tick: 1600
sardaukar:
stand:
@@ -537,34 +516,28 @@ sardaukar:
Length: 5
Facings: 8
Tick: 120
die1: rifledeath
Start: 12
Length: 12
Tick: 80
die2: rifledeath
Start: 12
Length: 12
Tick: 80
die3: rifledeath
Start: 36
Length: 12
Tick: 80
die4: rifledeath
Start: 24
Length: 12
Tick: 80
die5: rifledeath
die1: sardaukardeath
Start: 0
Length: 12
Tick: 80
die6: rifledeath
Length: 5
die2: sardaukardeath
Start: 5
Length: 7
die3: sardaukardeath
Start: 12
Length: 12
Tick: 80
die-crushed: rifledeath
Start: 48
Length: 12
Tick: 160
Length: 7
die4: sardaukardeath
Start: 19
Length: 7
die5: sardaukardeath
Start: 26
Length: 7
die6: sardaukardeath
Start: 26
Length: 7
die-crushed: sardaukardeath
Start: 34
Length: 26
Tick: 1600
conyarda:
idle:
@@ -791,7 +764,7 @@ pwrh:
barrh:
idle:
Start: 0
make: barramake
make: barrhmake
Start: 0
Length: *
damaged-idle:
@@ -953,7 +926,7 @@ pwro:
barro:
idle:
Start: 0
make: barramake
make: barromake
Start: 0
Length: *
damaged-idle:
@@ -1094,13 +1067,11 @@ pips:
pip-green: dots
Start: 1
#falls back to RA, but looks ok
clock:
idle:
Start: 0
Length: *
#falls back to RA, but looks ok
powerdown:
disabled: speed
Start: 3
@@ -1111,7 +1082,6 @@ poweroff:
Length: *
Tick: 160
#falls back to RA, but looks okay
rank:
rank:
Start: 0
@@ -1137,90 +1107,47 @@ rallypoint:
Start: 0
Length: *
#TODO: falls back to RA
dragon:
rpg:
idle:
Start: 0
Facings: 32
#TODO: falls back to RA
explosion:
piff: piff
piff: minipiff
Start: 0
Length: *
piffs: piffpiff
piffs: minipiff
Start: 0
Length: *
small_explosion: veh-hit3
small_explosion: miniboom
Start: 0
Length: *
med_explosion: veh-hit2
med_explosion: mediboom
Start: 0
Length: *
large_splash: h2o_exp1
napalm: mediboom2
Start: 0
Length: *
napalm: napalm2
Start: 0
Length: *
napalm2: napalm2
nuke: mushroomcloud
Start: 0
Length: *
Tick: 60
nuke: atomsfx
napalm2: mediboom2
Start: 0
Length: *
Tick: 60
med_splash: h2o_exp2
self_destruct: bigboom
Start: 0
Length: *
self_destruct: art-exp1
building: bigboom2
Start: 0
Length: *
building: fball1
large_explosion: largeboom
Start: 0
Length: *
small_splash: h2o_exp3
small_napalm: miniboom2
Start: 0
Length: *
large_explosion: frag1
Start: 0
Length: *
small_napalm: napalm1
Start: 0
Length: *
#TODO: falls back to RA
smokey:
idle:
Start: 0
Length: *
#TODO: falls back to RA
smoke_m:
idle:
Start: 0
Length: *
loop:
Start: 49
Length: 42
end:
Start: 0
Length: 26
#TODO: falls back to RA
120mm:
idle:
Start: 0
#TODO: falls back to RA
litning:
bright:
Start: 0
Length: 4
dim:
Start: 4
Length: 4
crate:
idle: crates
@@ -1228,54 +1155,14 @@ crate:
land: crates
Start: 0
#TODO: falls back to RA
crate-effects:
speed: speed
dollar: selling
Start: 0
Length: *
dollar: dollar
reveal-map: orbit
Start: 0
Length: *
reveal-map: earth
Start: 0
Length: *
hide-map: empulse
Start: 0
Length: *
fpower: fpower
Start: 0
Length: *
gps: gpsbox
Start: 0
Length: *
invuln: invulbox
Start: 0
Length: *
heal: invun
Start: 0
Length: *
nuke: missile2
Start: 0
Length: *
parabombs: parabox
Start: 0
Length: *
sonar: sonarbox
Start: 0
Length: *
stealth: stealth2
Start: 0
Length: *
timequake: tquake
Start: 0
Length: *
armor: armor
Start: 0
Length: *
chrono: chronbox
Start: 0
Length: *
airstrike: deviator
hide-map: reveal
Start: 0
Length: *
levelup: levelup
@@ -1294,6 +1181,11 @@ missile:
Start: 0
Facings: 32
missile2:
idle:
Start: 0
Facings: 32
spicebloom:
make:
Start: 0
@@ -1346,24 +1238,6 @@ atomic:
Start: 1
Length: 1
# falls back to RA
parabomb:
open:
Start: 0
Length: 8
idle:
Start: 8
Length: 5
# falls back to RA
parach:
open:
Start: 0
Length: 5
idle:
Start: 5
Length: 11
plates:
idle:
Start: 0
@@ -1379,7 +1253,7 @@ plates:
Length: 6
fire:
1: fire1
1: fire
Start: 0
Length: *
2: fire2
@@ -1388,12 +1262,39 @@ fire:
3: fire3
Start: 0
Length: *
4: fire4
4: fire
Start: 0
Length: *
smoke_m:
idle: minifire
Start: 0
Length: *
loop: minifire
Start: 0
Length: *
end: minifire
Start: 0
Length: 3
palacec:
idle:
Start: 0
damaged-idle:
Start: 1
Start: 1
bombs:
open:
Start: 0
Length: 4
idle:
Start: 0
Length: 4
parach:
open:
Start: 0
Length: 5
idle:
Start: 5
Length: 11

View File

@@ -30,9 +30,9 @@ Bazooka:
High: true
Shadow: yes
Proximity: true
Trail: smokey
ContrailLength: 10
Inaccuracy: 3
Image: DRAGON
Image: RPG
ROT: 5
RangeLimit: 35
Warhead:
@@ -44,11 +44,10 @@ Bazooka:
Heavy: 90%
Concrete: 40%
Explosion: med_explosion
WaterExplosion: med_splash
InfDeath: 4
SmudgeType: SandCrater, RockCrater
Damage: 50
ImpactSound: kaboom12
ImpactSound: EXPLSML2
Sniper:
ROF: 100
@@ -178,9 +177,8 @@ QuadRockets:
Shadow: yes
Proximity: yes
Inaccuracy: 3
Image: DRAGON
Image: MISSILE
ROT: 10
Trail: smokey
Speed: 40
RangeLimit: 40
Warhead:
@@ -193,8 +191,7 @@ QuadRockets:
Concrete: 60%
InfDeath: 4
Explosion: med_explosion
WaterExplosion: med_splash
ImpactSound: kaboom12
ImpactSound: EXPLSML2
SmudgeType: SandCrater, RockCrater
Damage: 70
@@ -233,7 +230,7 @@ TowerMissile:
Shadow: yes
Proximity: yes
Inaccuracy: 12
Image: DRAGON
Image: MISSILE2
ROT: 10
Trail: smokey
Speed: 45
@@ -247,8 +244,8 @@ TowerMissile:
Heavy: 40%
Concrete: 35%
InfDeath: 3
Explosion: large_explosion
ImpactSound: kaboom12
Explosion: small_explosion
ImpactSound: EXPLSML2
SmudgeType: SandCrater, RockCrater
Damage: 50
@@ -309,7 +306,6 @@ DevBullet:
Light: 65%
Concrete: 75%
Explosion: large_explosion
#ImpactSound: kaboom12
InfDeath: 4
SmudgeType: SandCrater, RockCrater
Damage: 40
@@ -329,7 +325,7 @@ DevBullet:
Shadow: yes
Inaccuracy: 55
Angle: 0.2
Image: MISSILE
Image: MISSILE2
ROT: 5
ContrailLength: 5
Warhead:
@@ -340,9 +336,8 @@ DevBullet:
Light: 65%
Heavy: 75%
InfDeath: 4
Explosion: large_explosion
WaterExplosion: med_splash
ImpactSound: explsml1
Explosion: med_explosion
ImpactSound: EXPLSML2
SmudgeType: SandCrater, RockCrater
Damage: 75
@@ -367,10 +362,10 @@ FakeMissile:
Light: 0%
Heavy: 0%
Concrete: 0%
Explosion: napalm2
SmudgeType:
Explosion: med_explosion
SmudgeType: SandCrater, RockCrater
Damage: 0
ImpactSound: firebl3
ImpactSound: EXPLSML2
155mm:
ROF: 120
@@ -383,7 +378,6 @@ FakeMissile:
Shadow: yes
Angle: .1
Inaccuracy: 45
Image: 120MM
ContrailLength: 20
Warhead:
Spread: 12
@@ -467,7 +461,7 @@ ParaBomb:
Range: 4.5
Report:
Projectile: GravityBomb
Image: PARABOMB
Image: BOMBS
Warhead:
Spread: 6
Versus:
@@ -484,7 +478,7 @@ ParaBomb:
Napalm:
ROF: 6
Projectile: GravityBomb
Image: PARABOMB
Image: BOMBS
Warhead:
Spread: 20
Versus: