From 8fa1fc23455ac65cb7bc429e41a6b83c2c3f25e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 15 Apr 2013 12:59:08 +0200 Subject: [PATCH] mapped DATA.R8 completely, fixes #2341 d2k is now completely independened from RA MIX/SHP files --- .../Widgets/Logic/D2kExtractGameFilesLogic.cs | 303 +++++++++-- mods/d2k/bits/clock.shp | Bin 0 -> 7334 bytes mods/d2k/bits/levelup.shp | Bin 0 -> 5280 bytes mods/d2k/bits/nopower.shp | Bin 0 -> 2410 bytes mods/d2k/bits/rank.shp | Bin 0 -> 654 bytes mods/d2k/bits/speed.shp | Bin 0 -> 1945 bytes mods/d2k/mod.yaml | 14 +- mods/d2k/rules/aircraft.yaml | 3 +- mods/d2k/rules/structures.yaml | 11 +- mods/d2k/rules/system.yaml | 24 +- mods/d2k/sequences.yaml | 503 +++++++----------- mods/d2k/weapons.yaml | 38 +- 12 files changed, 491 insertions(+), 405 deletions(-) create mode 100644 mods/d2k/bits/clock.shp create mode 100644 mods/d2k/bits/levelup.shp create mode 100644 mods/d2k/bits/nopower.shp create mode 100644 mods/d2k/bits/rank.shp create mode 100644 mods/d2k/bits/speed.shp diff --git a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs index 0ba7f6e108..63ec8a7ad4 100644 --- a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs +++ b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs @@ -65,26 +65,41 @@ namespace OpenRA.Mods.D2k.Widgets.Logic { new string[] {"--r8", PathToDataR8, PathToPalette, "0", "2", Path.Combine(PathToSHPs, "overlay")}, new string[] {"--r8", PathToDataR8, PathToPalette, "3", "3", Path.Combine(PathToSHPs, "repairing")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4", "4", Path.Combine(PathToSHPs, "black")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "5", "8", Path.Combine(PathToSHPs, "selectionedges")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "9", "9", Path.Combine(PathToSHPs, "bar1")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "10", "10", Path.Combine(PathToSHPs, "bar2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "11", "11", Path.Combine(PathToSHPs, "bar3")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "12", "12", Path.Combine(PathToSHPs, "bar4")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "13", "13", Path.Combine(PathToSHPs, "bar5")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "14", "14", Path.Combine(PathToSHPs, "bar6")}, new string[] {"--r8", PathToDataR8, PathToPalette, "15", "16", Path.Combine(PathToSHPs, "dots")}, new string[] {"--r8", PathToDataR8, PathToPalette, "17", "26", Path.Combine(PathToSHPs, "numbers")}, - //new string[] {"--r8", PathToDataR8, PathToPalette, "40", "101", Path.Combine(PathToSHPs, "shadow")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "27", "37", Path.Combine(PathToSHPs, "credits")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "40", "101", Path.Combine(PathToSHPs, "d2kshadow")}, new string[] {"--r8", PathToDataR8, PathToPalette, "102", "105", Path.Combine(PathToSHPs, "crates")}, new string[] {"--r8", PathToDataR8, PathToPalette, "107", "109", Path.Combine(PathToSHPs, "spicebloom")}, new string[] {"--r8", PathToDataR8, PathToPalette, "110", "111", Path.Combine(PathToSHPs, "stars")}, - new string[] {"--r8", PathToDataR8, PathToPalette, "112", "112", Path.Combine(PathToSHPs, "greenuparrow")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "112", "113", Path.Combine(PathToSHPs, "greenuparrow")}, new string[] {"--r8", PathToDataR8, PathToPalette, "114", "129", Path.Combine(PathToSHPs, "rockcrater1")}, new string[] {"--r8", PathToDataR8, PathToPalette, "130", "145", Path.Combine(PathToSHPs, "rockcrater2")}, new string[] {"--r8", PathToDataR8, PathToPalette, "146", "161", Path.Combine(PathToSHPs, "sandcrater1")}, new string[] {"--r8", PathToDataR8, PathToPalette, "162", "177", Path.Combine(PathToSHPs, "sandcrater2")}, - // ? + new string[] {"--r8", PathToDataR8, PathToPalette, "178", "193", Path.Combine(PathToSHPs, "unknown")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "194", "205", Path.Combine(PathToSHPs, "unknown2")}, new string[] {"--r8", PathToDataR8, PathToPalette, "206", "381", Path.Combine(PathToSHPs, "rifle"), "--infantry"}, new string[] {"--r8", PathToDataR8, PathToPalette, "382", "457", Path.Combine(PathToSHPs, "rifledeath"), "--infantrydeath"}, - new string[] {"--r8", PathToDataR8, PathToPalette, "458", "693", Path.Combine(PathToSHPs, "bazooka"), "--infantry"}, - new string[] {"--r8", PathToDataR8, PathToPalette, "694", "929", Path.Combine(PathToSHPs, "fremen"), "--infantry"}, - new string[] {"--r8", PathToDataR8, PathToPalette, "930", "1165", Path.Combine(PathToSHPs, "sardaukar"), "--infantry"}, - new string[] {"--r8", PathToDataR8, PathToPalette, "1166", "1221", Path.Combine(PathToSHPs, "engineer"), "--infantry"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "458", "633", Path.Combine(PathToSHPs, "bazooka"), "--infantry"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "634", "693", Path.Combine(PathToSHPs, "bazookadeath"), "--infantrydeath"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "694", "869", Path.Combine(PathToSHPs, "fremen"), "--infantry"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "870", "929", Path.Combine(PathToSHPs, "fremendeath"), "--infantrydeath"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "930", "1105", Path.Combine(PathToSHPs, "sardaukar"), "--infantry"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "1106", "1165", Path.Combine(PathToSHPs, "sardaukardeath"), "--infantrydeath"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "1166", "1341", Path.Combine(PathToSHPs, "engineer"), "--infantry"}, new string[] {"--r8", PathToDataR8, PathToPalette, "1342", "1401", Path.Combine(PathToSHPs, "engineerdeath"), "--infantrydeath"}, - new string[] {"--r8", PathToDataR8, PathToPalette, "1402", "1502", Path.Combine(PathToSHPs, "thumper"), "--infantry"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "1402", "1457", Path.Combine(PathToSHPs, "thumper"), "--infantry"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "1458", "1462", Path.Combine(PathToSHPs, "thumping"), "--infantrydeath"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "1463", "1542", Path.Combine(PathToSHPs, "thumper2"), "--infantry"}, new string[] {"--r8", PathToDataR8, PathToPalette, "1543", "1602", Path.Combine(PathToSHPs, "thumperdeath"), "--infantrydeath"}, new string[] {"--r8", PathToDataR8, PathToPalette, "1603", "1634", Path.Combine(PathToSHPs, "missiletank"), "--vehicle"}, new string[] {"--r8", PathToDataR8, PathToPalette, "1635", "1666", Path.Combine(PathToSHPs, "trike"), "--vehicle"}, @@ -102,8 +117,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] {"--r8", PathToDataR8, PathToPalette, "2083", "2114", Path.Combine(PathToSHPs, "devast"), "--vehicle"}, new string[] {"--r8", PathToDataR8, PathToPalette, "2115", "2146", Path.Combine(PathToSHPs, "combathturret"), "--vehicle"}, new string[] {"--r8", PathToDataR8, PathToPalette, "2147", "2148", Path.Combine(PathToSHPs, "deathhandmissile")}, - - new string[] {"--r8", PathToDataR8, PathToPalette, "2245", "2284", Path.Combine(PathToSHPs, "saboteur"), "--infantry"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "2149", "2324", Path.Combine(PathToSHPs, "saboteur"), "--infantry"}, new string[] {"--r8", PathToDataR8, PathToPalette, "2325", "2388", Path.Combine(PathToSHPs, "saboteurdeath"), "--infantrydeath"}, new string[] {"--r8", PathToDataR8, PathToPalette, "2389", "2420", Path.Combine(PathToSHPs, "deviatortank"), "--vehicle"}, new string[] {"--r8", PathToDataR8, PathToPalette, "2421", "2452", Path.Combine(PathToSHPs, "raider"), "--vehicle"}, @@ -168,19 +182,69 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] {"--r8", PathToDataR8, PathToPalette, "2999", "3000", Path.Combine(PathToSHPs, "starportc"), "--building"}, new string[] {"--r8", PathToDataR8, PathToPalette, "3001", "3003", Path.Combine(PathToSHPs, "heavyc"), "--building"}, new string[] {"--r8", PathToDataR8, PathToPalette, "3004", "3005", Path.Combine(PathToSHPs, "palacec"), "--building"}, - //conyardc repetition + new string[] {"--r8", PathToDataR8, PathToPalette, "3006", "3007", Path.Combine(PathToSHPs, "conyardh2"), "--building"}, new string[] {"--r8", PathToDataR8, PathToPalette, "3008", "3013", Path.Combine(PathToSHPs, "plates")}, - //projectiles + new string[] {"--r8", PathToDataR8, PathToPalette, "3014", "3014", Path.Combine(PathToSHPs, "unknown3"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3015", "3078", Path.Combine(PathToSHPs, "rpg"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3079", "3087", Path.Combine(PathToSHPs, "unknown4"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3088", "3247", Path.Combine(PathToSHPs, "missile"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3248", "3279", Path.Combine(PathToSHPs, "doubleblast"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3280", "3283", Path.Combine(PathToSHPs, "bombs"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3284", "3287", Path.Combine(PathToSHPs, "unknown6"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3288", "3289", Path.Combine(PathToSHPs, "unknown7"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3290", "3303", Path.Combine(PathToSHPs, "unknown8"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3304", "3305", Path.Combine(PathToSHPs, "unknown9"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3306", "3369", Path.Combine(PathToSHPs, "missile2"), "--projectile"}, new string[] {"--r8", PathToDataR8, PathToPalette, "3370", "3380", Path.Combine(PathToSHPs, "unload"), "--projectile"}, - //explosions - new string[] {"--r8", PathToDataR8, PathToPalette, "3549", "3564", Path.Combine(PathToSHPs, "wormjaw")}, - new string[] {"--r8", PathToDataR8, PathToPalette, "3565", "3585", Path.Combine(PathToSHPs, "wormdust")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3381", "3385", Path.Combine(PathToSHPs, "harvest"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3386", "3389", Path.Combine(PathToSHPs, "miniboom"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3390", "3402", Path.Combine(PathToSHPs, "mediboom"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3403", "3417", Path.Combine(PathToSHPs, "mediboom2"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3418", "3420", Path.Combine(PathToSHPs, "minifire"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3421", "3428", Path.Combine(PathToSHPs, "miniboom2"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3429", "3432", Path.Combine(PathToSHPs, "minibooms"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3433", "3447", Path.Combine(PathToSHPs, "bigboom"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3448", "3470", Path.Combine(PathToSHPs, "bigboom2"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3471", "3493", Path.Combine(PathToSHPs, "bigboom3"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3494", "3501", Path.Combine(PathToSHPs, "unknown10"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3502", "3509", Path.Combine(PathToSHPs, "unknown11"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3510", "3511", Path.Combine(PathToSHPs, "unknown12"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3512", "3530", Path.Combine(PathToSHPs, "movingsand"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3531", "3534", Path.Combine(PathToSHPs, "unknown13"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3535", "3539", Path.Combine(PathToSHPs, "unknown14"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3540", "3543", Path.Combine(PathToSHPs, "unknown15"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3544", "3548", Path.Combine(PathToSHPs, "unknown16"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3549", "3564", Path.Combine(PathToSHPs, "wormjaw"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3565", "3585", Path.Combine(PathToSHPs, "wormdust"), "--projectile"}, new string[] {"--r8", PathToDataR8, PathToPalette, "3586", "3600", Path.Combine(PathToSHPs, "wormsigns1")}, new string[] {"--r8", PathToDataR8, PathToPalette, "3601", "3610", Path.Combine(PathToSHPs, "wormsigns2")}, new string[] {"--r8", PathToDataR8, PathToPalette, "3611", "3615", Path.Combine(PathToSHPs, "wormsigns3")}, new string[] {"--r8", PathToDataR8, PathToPalette, "3616", "3620", Path.Combine(PathToSHPs, "wormsigns4")}, - //new string[] {"--r8", PathToDataR8, PathToPalette, "3679", "3686", "sell"}, - //explosions and muzzle flash + new string[] {"--r8", PathToDataR8, PathToPalette, "3621", "3625", Path.Combine(PathToSHPs, "rings"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3626", "3630", Path.Combine(PathToSHPs, "minipiff"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3631", "3678", Path.Combine(PathToSHPs, "movingsand2"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3679", "3686", Path.Combine(PathToSHPs, "selling"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3687", "3693", Path.Combine(PathToSHPs, "shockwave"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3694", "3711", Path.Combine(PathToSHPs, "electroplosion"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3712", "3722", Path.Combine(PathToSHPs, "fire"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3723", "3734", Path.Combine(PathToSHPs, "fire2"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3735", "3738", Path.Combine(PathToSHPs, "unknown21"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3739", "3742", Path.Combine(PathToSHPs, "unknown22"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3743", "3774", Path.Combine(PathToSHPs, "doublemuzzle"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3775", "3806", Path.Combine(PathToSHPs, "muzzle"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3807", "3838", Path.Combine(PathToSHPs, "doubleblastmuzzle"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3839", "3870", Path.Combine(PathToSHPs, "minimuzzle"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3871", "3872", Path.Combine(PathToSHPs, "unknown17"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3873", "3875", Path.Combine(PathToSHPs, "unknown18"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3876", "3876", Path.Combine(PathToSHPs, "unknown19"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3877", "3884", Path.Combine(PathToSHPs, "burst"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3885", "3898", Path.Combine(PathToSHPs, "fire3"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3899", "3910", Path.Combine(PathToSHPs, "energy"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3911", "3946", Path.Combine(PathToSHPs, "reveal"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3947", "3964", Path.Combine(PathToSHPs, "orbit"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3965", "3979", Path.Combine(PathToSHPs, "mushroomcloud"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3980", "3987", Path.Combine(PathToSHPs, "mediboom3"), "--projectile"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "3988", "4010", Path.Combine(PathToSHPs, "largeboom"), "--projectile"}, new string[] {"--r8", PathToDataR8, PathToPalette, "4011", "4011", Path.Combine(PathToSHPs, "rifleicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4012", "4012", Path.Combine(PathToSHPs, "bazookaicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4013", "4013", Path.Combine(PathToSHPs, "engineericon")}, @@ -189,7 +253,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic 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")}, - new string[] {"--r8", PathToDataR8, PathToPalette, "4019", "4019", Path.Combine(PathToSHPs, "harvestericon")}, // == 4044 + new string[] {"--r8", PathToDataR8, PathToPalette, "4019", "4019", Path.Combine(PathToSHPs, "harvestericon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4020", "4020", Path.Combine(PathToSHPs, "combataicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4021", "4021", Path.Combine(PathToSHPs, "combathicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4022", "4022", Path.Combine(PathToSHPs, "combatoicon")}, @@ -199,33 +263,55 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] {"--r8", PathToDataR8, PathToPalette, "4026", "4026", Path.Combine(PathToSHPs, "siegetankicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4027", "4027", Path.Combine(PathToSHPs, "sonictankicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4028", "4028", Path.Combine(PathToSHPs, "devasticon")}, - new string[] {"--r8", PathToDataR8, PathToPalette, "4029", "4029", Path.Combine(PathToSHPs, "carryallicon")}, // == 4030 - new string[] {"--r8", PathToDataR8, PathToPalette, "4031", "4031", Path.Combine(PathToSHPs, "orniicon")}, // == 4062 - new string[] {"--r8", PathToDataR8, PathToPalette, "4032", "4032", Path.Combine(PathToSHPs, "fremenicon")}, // == 4033 + new string[] {"--r8", PathToDataR8, PathToPalette, "4029", "4029", Path.Combine(PathToSHPs, "carryallicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4030", "4030", Path.Combine(PathToSHPs, "carryallicon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4031", "4031", Path.Combine(PathToSHPs, "orniicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4032", "4032", Path.Combine(PathToSHPs, "fremenicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4033", "4033", Path.Combine(PathToSHPs, "fremenicon2")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4034", "4034", Path.Combine(PathToSHPs, "saboteuricon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4035", "4035", Path.Combine(PathToSHPs, "deathhandicon")}, - // "4036..4045 = repetitions - new string[] {"--r8", PathToDataR8, PathToPalette, "4046", "4046", Path.Combine(PathToSHPs, "conyardaicon")}, // == 4049 + new string[] {"--r8", PathToDataR8, PathToPalette, "4036", "4036", Path.Combine(PathToSHPs, "rifleicon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4037", "4037", Path.Combine(PathToSHPs, "bazookaicon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4038", "4038", Path.Combine(PathToSHPs, "engineericon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4039", "4039", Path.Combine(PathToSHPs, "thumpericon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4040", "4040", Path.Combine(PathToSHPs, "sardaukaricon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4041", "4041", Path.Combine(PathToSHPs, "trikeicon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4042", "4042", Path.Combine(PathToSHPs, "raidericon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4043", "4043", Path.Combine(PathToSHPs, "quadicon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4044", "4044", Path.Combine(PathToSHPs, "harvestericon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4045", "4045", Path.Combine(PathToSHPs, "combataicon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4046", "4046", Path.Combine(PathToSHPs, "conyardaicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4047", "4047", Path.Combine(PathToSHPs, "conyardhicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4048", "4048", Path.Combine(PathToSHPs, "conyardoicon")}, - new string[] {"--r8", PathToDataR8, PathToPalette, "4050", "4050", Path.Combine(PathToSHPs, "4plateicon")}, // == 4051..4052 - new string[] {"--r8", PathToDataR8, PathToPalette, "4053", "4053", Path.Combine(PathToSHPs, "6plateicon")}, // == 4054..4055 + new string[] {"--r8", PathToDataR8, PathToPalette, "4049", "4049", Path.Combine(PathToSHPs, "conyardaicon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4050", "4050", Path.Combine(PathToSHPs, "4plateaicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4051", "4051", Path.Combine(PathToSHPs, "4platehicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4052", "4052", Path.Combine(PathToSHPs, "4plateoicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4053", "4053", Path.Combine(PathToSHPs, "6plateaicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4054", "4054", Path.Combine(PathToSHPs, "6platehicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4055", "4055", Path.Combine(PathToSHPs, "6plateoicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4056", "4056", Path.Combine(PathToSHPs, "pwraicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4057", "4057", Path.Combine(PathToSHPs, "pwrhicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4058", "4058", Path.Combine(PathToSHPs, "pwroicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4059", "4059", Path.Combine(PathToSHPs, "barraicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4060", "4060", Path.Combine(PathToSHPs, "barrhicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4061", "4061", Path.Combine(PathToSHPs, "barroicon")}, - new string[] {"--r8", PathToDataR8, PathToPalette, "4063", "4063", Path.Combine(PathToSHPs, "wallicon")}, // == 4061..4062 + new string[] {"--r8", PathToDataR8, PathToPalette, "4062", "4062", Path.Combine(PathToSHPs, "orniicon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4063", "4063", Path.Combine(PathToSHPs, "wallaicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4064", "4064", Path.Combine(PathToSHPs, "wallhicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4065", "4065", Path.Combine(PathToSHPs, "walloicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4066", "4066", Path.Combine(PathToSHPs, "refaicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4067", "4067", Path.Combine(PathToSHPs, "refhicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4068", "4068", Path.Combine(PathToSHPs, "refoicon")}, - new string[] {"--r8", PathToDataR8, PathToPalette, "4069", "4069", Path.Combine(PathToSHPs, "turreticon")}, // == 4070..4071 - new string[] {"--r8", PathToDataR8, PathToPalette, "4072", "4072", Path.Combine(PathToSHPs, "radaraicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4069", "4069", Path.Combine(PathToSHPs, "guntoweraicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4070", "4070", Path.Combine(PathToSHPs, "guntowerhicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4071", "4071", Path.Combine(PathToSHPs, "guntoweroicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4072", "4072", Path.Combine(PathToSHPs, "radaraicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4073", "4073", Path.Combine(PathToSHPs, "radarhicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4074", "4074", Path.Combine(PathToSHPs, "radaroicon")}, - new string[] {"--r8", PathToDataR8, PathToPalette, "4075", "4075", Path.Combine(PathToSHPs, "rturreticon")}, // == 4076..4077 + new string[] {"--r8", PathToDataR8, PathToPalette, "4075", "4075", Path.Combine(PathToSHPs, "rockettoweraicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4076", "4076", Path.Combine(PathToSHPs, "rockettowerhicon")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4077", "4077", Path.Combine(PathToSHPs, "rockettoweroicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4078", "4078", Path.Combine(PathToSHPs, "hightechaicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4079", "4079", Path.Combine(PathToSHPs, "hightechhicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4080", "4080", Path.Combine(PathToSHPs, "hightechoicon")}, @@ -238,12 +324,12 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] {"--r8", PathToDataR8, PathToPalette, "4087", "4087", Path.Combine(PathToSHPs, "heavyaicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4088", "4088", Path.Combine(PathToSHPs, "heavyhicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4089", "4089", Path.Combine(PathToSHPs, "heavyoicon")}, - // 4090 == orniicon - // 4091 == heavyhicon + new string[] {"--r8", PathToDataR8, PathToPalette, "4090", "4090", Path.Combine(PathToSHPs, "orniicon3")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4091", "4091", Path.Combine(PathToSHPs, "heavyhicon2")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4092", "4092", Path.Combine(PathToSHPs, "starportaicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4093", "4093", Path.Combine(PathToSHPs, "starporthicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4094", "4094", Path.Combine(PathToSHPs, "starportoicon")}, - // 4095 = orniicon + new string[] {"--r8", PathToDataR8, PathToPalette, "4095", "4095", Path.Combine(PathToSHPs, "orniicon4")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4096", "4096", Path.Combine(PathToSHPs, "repairaicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4097", "4097", Path.Combine(PathToSHPs, "repairhicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4098", "4098", Path.Combine(PathToSHPs, "repairoicon")}, @@ -253,12 +339,15 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] {"--r8", PathToDataR8, PathToPalette, "4102", "4102", Path.Combine(PathToSHPs, "palaceaicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4103", "4103", Path.Combine(PathToSHPs, "palacehicon")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4104", "4104", Path.Combine(PathToSHPs, "palaceoicon")}, - // 4105 = orniicon - // 4106..4107 = radaraicon - // 4108 = conyardaicon + new string[] {"--r8", PathToDataR8, PathToPalette, "4105", "4105", Path.Combine(PathToSHPs, "orniicon5")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4106", "4106", Path.Combine(PathToSHPs, "radaraicon2")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4107", "4107", Path.Combine(PathToSHPs, "radaraicon3")}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4108", "4108", Path.Combine(PathToSHPs, "conyardaicon3")}, new string[] {"--r8", PathToDataR8, PathToPalette, "4109", "4150", Path.Combine(PathToSHPs, "conmake"), "--building"}, new string[] {"--r8", PathToDataR8, PathToPalette, "4151", "4174", Path.Combine(PathToSHPs, "wtrpmake"), "--building"}, new string[] {"--r8", PathToDataR8, PathToPalette, "4175", "4194", Path.Combine(PathToSHPs, "barramake"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4195", "4212", Path.Combine(PathToSHPs, "barrhmake"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4213", "4230", Path.Combine(PathToSHPs, "barromake"), "--building"}, new string[] {"--r8", PathToDataR8, PathToPalette, "4231", "4253", Path.Combine(PathToSHPs, "refmake"), "--building"}, new string[] {"--r8", PathToDataR8, PathToPalette, "4254", "4273", Path.Combine(PathToSHPs, "radarmake"), "--building"}, new string[] {"--r8", PathToDataR8, PathToPalette, "4274", "4294", Path.Combine(PathToSHPs, "highmake"), "--building"}, @@ -271,9 +360,21 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] {"--r8", PathToDataR8, PathToPalette, "4413", "4435", Path.Combine(PathToSHPs, "palacemake"), "--building"}, new string[] {"--r8", PathToDataR8, PathToPalette, "4436", "4449", Path.Combine(PathToSHPs, "cranea"), "--building"}, new string[] {"--r8", PathToDataR8, PathToPalette, "4450", "4463", Path.Combine(PathToSHPs, "craneh"), "--building"}, - new string[] {"--r8", PathToDataR8, PathToPalette, "4463", "4477", Path.Combine(PathToSHPs, "craneo"), "--building"}, - new string[] {"--r8", PathToDataR8, PathToPalette, "4760", "4819", Path.Combine(PathToSHPs, "windtrap_anim"), "--building"}, //? - new string[] {"--r8", PathToDataR8, PathToPalette, "4820", "4840", Path.Combine(PathToSHPs, "missile_launch"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4464", "4477", Path.Combine(PathToSHPs, "craneo"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4478", "4491", Path.Combine(PathToSHPs, "cranea2"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4492", "4501", Path.Combine(PathToSHPs, "windtrapa"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4502", "4511", Path.Combine(PathToSHPs, "windtraph"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4512", "4521", Path.Combine(PathToSHPs, "windtrapo"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4522", "4552", Path.Combine(PathToSHPs, "disha"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4553", "4582", Path.Combine(PathToSHPs, "dishh"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4583", "4613", Path.Combine(PathToSHPs, "disho"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4614", "4643", Path.Combine(PathToSHPs, "highweld"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4644", "4673", Path.Combine(PathToSHPs, "lightweld"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4674", "4721", Path.Combine(PathToSHPs, "heavyweld"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4722", "4744", Path.Combine(PathToSHPs, "unknown20"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4745", "4759", Path.Combine(PathToSHPs, "marker"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4760", "4819", Path.Combine(PathToSHPs, "windtrapzaps"), "--building"}, + new string[] {"--r8", PathToDataR8, PathToPalette, "4820", "4840", Path.Combine(PathToSHPs, "deathhandlaunch"), "--building"}, new string[] {"--r8", Path.Combine(Platform.SupportDir, "Content/d2k/MOUSE.R8"), PathToPalette, "0", "264", Path.Combine(PathToSHPs, "mouse")}, new string[] {"--r8", Path.Combine(Platform.SupportDir, "Content/d2k/BLOXBASE.R8"), PathToPalette, "0", "799", Path.Combine(PathToTilesets, "BASE"), "--tileset"}, new string[] {"--r8", Path.Combine(Platform.SupportDir, "Content/d2k/BLOXBASE.R8"), PathToPalette, "748", "749", Path.Combine(PathToSHPs, "spice0")}, @@ -289,10 +390,19 @@ namespace OpenRA.Mods.D2k.Widgets.Logic { new string[] {"--shp", Path.Combine(PathToSHPs, "overlay.png"), "32"}, new string[] {"--shp", Path.Combine(PathToSHPs, "repairing.png"), "24"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "numbers.png"), "8"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "black.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "selectionedges.png"), "8"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "bar1.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "bar2.png"), "24"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "bar3.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "bar4.png"), "64"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "bar5.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "bar6.png"), "32"}, new string[] {"--shp", Path.Combine(PathToSHPs, "dots.png"), "4"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "numbers.png"), "8"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "credits.png"), "10"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "d2kshadow.png"), "32"}, new string[] {"--shp", Path.Combine(PathToSHPs, "crates.png"), "32"}, - //new string[] {"--shp", Path.Combine(PathToSHPs, "shadow.png"), "32"}, new string[] {"--shp", Path.Combine(PathToSHPs, "spicebloom.png"), "32"}, new string[] {"--shp", Path.Combine(PathToSHPs, "stars.png"), "16"}, new string[] {"--shp", Path.Combine(PathToSHPs, "greenuparrow.png"), "16"}, @@ -300,14 +410,21 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] {"--shp", Path.Combine(PathToSHPs, "rockcrater2.png"), "32"}, new string[] {"--shp", Path.Combine(PathToSHPs, "sandcrater1.png"), "32"}, new string[] {"--shp", Path.Combine(PathToSHPs, "sandcrater2.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown.png"), "64"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown2.png"), "64"}, new string[] {"--shp", Path.Combine(PathToSHPs, "rifle.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "rifledeath.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "bazooka.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "bazookadeath.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "fremen.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "fremendeath.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "sardaukar.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "sardaukardeath.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "engineer.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "engineerdeath.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "thumper.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "thumping.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "thumper2.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "thumperdeath.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "missiletank.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "trike.png"), "32"}, @@ -386,14 +503,73 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] {"--shp", Path.Combine(PathToSHPs, "starporto.png"), "96"}, new string[] {"--shp", Path.Combine(PathToSHPs, "lighto.png"), "96"}, new string[] {"--shp", Path.Combine(PathToSHPs, "palaceo.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "sietch.png"), "64"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "starportc.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "heavyc.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "palacec.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "conyardh2.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "plates.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown3.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "rpg.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown4.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "missile.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "doubleblast.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "bombs.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown6.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown7.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown8.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown9.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "missile2.png"), "16"}, new string[] {"--shp", Path.Combine(PathToSHPs, "unload.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "harvest.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "miniboom.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "mediboom.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "mediboom2.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "minifire.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "miniboom2.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "minibooms.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "bigboom.png"), "64"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "bigboom2.png"), "72"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "bigboom3.png"), "72"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown10.png"), "24"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown11.png"), "84"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown12.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "movingsand.png"), "72"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown13.png"), "72"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown14.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown15.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown16.png"), "32"}, new string[] {"--shp", Path.Combine(PathToSHPs, "wormjaw.png"), "68"}, new string[] {"--shp", Path.Combine(PathToSHPs, "wormdust.png"), "68"}, new string[] {"--shp", Path.Combine(PathToSHPs, "wormsigns1.png"), "16"}, new string[] {"--shp", Path.Combine(PathToSHPs, "wormsigns2.png"), "16"}, new string[] {"--shp", Path.Combine(PathToSHPs, "wormsigns3.png"), "16"}, new string[] {"--shp", Path.Combine(PathToSHPs, "wormsigns4.png"), "16"}, - //new string[] {"--shp", Path.Combine(PathToSHPs, "sell.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "rings.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "minipiff.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "movingsand2.png"), "64"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "selling.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "shockwave.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "electroplosion.png"), "64"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "fire.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "fire2.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown21.png"), "12"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown22.png"), "24"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "doublemuzzle.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "muzzle.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "doubleblastmuzzle.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "minimuzzle.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown17.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown18.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown19.png"), "16"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "burst.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "fire3.png"), "120"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "energy.png"), "48"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "reveal.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "orbit.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "mushroomcloud.png"), "72"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "mediboom3.png"), "32"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "largeboom.png"), "72"}, new string[] {"--shp", Path.Combine(PathToSHPs, "rifleicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "bazookaicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "engineericon.png"), "60"}, @@ -420,23 +596,33 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] {"--shp", Path.Combine(PathToSHPs, "conyardaicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "conyardhicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "conyardoicon.png"), "60"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "4plateicon.png"), "60"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "6plateicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "4plateaicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "4platehicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "4plateoicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "6plateaicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "6platehicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "6plateoicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "pwraicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "pwrhicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "pwroicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "barraicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "barrhicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "barroicon.png"), "60"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "wallicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "wallaicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "wallhicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "walloicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "refaicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "refhicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "refoicon.png"), "60"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "turreticon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "guntoweraicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "guntowerhicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "guntoweroicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "radaraicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "radarhicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "radaroicon.png"), "60"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "rturreticon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "rockettoweraicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "rockettowerhicon.png"), "60"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "rockettoweroicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "hightechaicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "hightechhicon.png"), "60"}, new string[] {"--shp", Path.Combine(PathToSHPs, "hightechoicon.png"), "60"}, @@ -464,6 +650,8 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] {"--shp", Path.Combine(PathToSHPs, "conmake.png"), "96"}, new string[] {"--shp", Path.Combine(PathToSHPs, "wtrpmake.png"), "64"}, new string[] {"--shp", Path.Combine(PathToSHPs, "barramake.png"), "80"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "barrhmake.png"), "64"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "barromake.png"), "64"}, new string[] {"--shp", Path.Combine(PathToSHPs, "refmake.png"), "120"}, new string[] {"--shp", Path.Combine(PathToSHPs, "radarmake.png"), "96"}, new string[] {"--shp", Path.Combine(PathToSHPs, "highmake.png"), "96"}, @@ -477,15 +665,21 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] {"--shp", Path.Combine(PathToSHPs, "cranea.png"), "96"}, new string[] {"--shp", Path.Combine(PathToSHPs, "craneh.png"), "96"}, new string[] {"--shp", Path.Combine(PathToSHPs, "craneo.png"), "96"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "windtrap_anim.png"), "96"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "missile_launch.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "windtrapa.png"), "64"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "windtraph.png"), "64"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "windtrapo.png"), "64"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "disha.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "dishh.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "disho.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "highweld.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "lightweld.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "heavyweld.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "unknown20.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "marker.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "windtrapzaps.png"), "96"}, + new string[] {"--shp", Path.Combine(PathToSHPs, "deathhandlaunch.png"), "96"}, new string[] {"--shp", Path.Combine(PathToSHPs, "mouse.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "spice0.png"), "32"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "sietch.png"), "64"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "starportc.png"), "96"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "heavyc.png"), "96"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "palacec.png"), "96"}, - new string[] {"--shp", Path.Combine(PathToSHPs, "plates.png"), "32"}, }; var SHPsToTranspose = new string[][] @@ -496,8 +690,9 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] {"--transpose", Path.Combine(PathToSHPs, "fremen.shp"), Path.Combine(PathToSHPs, "fremen.shp"), "8", "8", "6", "56", "8", "5", "112", "8", "3", "136", "8", "5"}, new string[] {"--transpose", Path.Combine(PathToSHPs, "sardaukar.shp"), Path.Combine(PathToSHPs, "sardaukar.shp"), "8", "8", "6", "56", "8", "5", "112", "8", "3", "136", "8", "5"}, new string[] {"--transpose", Path.Combine(PathToSHPs, "thumper.shp"), Path.Combine(PathToSHPs, "thumper.shp"), "8", "8", "6"}, + new string[] {"--transpose", Path.Combine(PathToSHPs, "thumper2.shp"), Path.Combine(PathToSHPs, "thumper2.shp"), "8", "8", "5"}, new string[] {"--transpose", Path.Combine(PathToSHPs, "engineer.shp"), Path.Combine(PathToSHPs, "engineer.shp"), "8", "8", "6"}, - new string[] {"--transpose", Path.Combine(PathToSHPs, "saboteur.shp"), Path.Combine(PathToSHPs, "saboteur.shp"), "8", "8", "4"}, + new string[] {"--transpose", Path.Combine(PathToSHPs, "saboteur.shp"), Path.Combine(PathToSHPs, "saboteur.shp"), "8", "8", "6", "56", "8", "5", "112", "8", "3", "136", "8", "5"}, }; var onError = (Action)(s => Game.RunAfterTick(() => diff --git a/mods/d2k/bits/clock.shp b/mods/d2k/bits/clock.shp new file mode 100644 index 0000000000000000000000000000000000000000..d55ae3cf3cd734ef0438a6adb83a7ec953ef1827 GIT binary patch literal 7334 zcmc&&S&tP}5U!pxb7$XYn1Nwwc0>e36htL6kq2LV@ySHr_zga}&-(xsovyox@M)*{ zv?L%pA5a9ls)*Wg{(KRIJp9BDvEA+{bZo!q^!f$1OW1BNR(nq|g{5p$iQ3CcC@g2Y zC$=YKbbLjue~I5ri#K=wqK}HdvUeuzhZr;hQjfDy{1;jzpABhBHLwkYM-s6Fl2j5z1joy6i#7# zNrT!~8YrB`_LGfjmp4&3gYEVvwXd^1i|wXnwZCtsa5mdFV*BD43g@srxkdGJEqdSj zRto3w`1x2*9INAV$5FU|$2-TVy`hc5g>3)XruIGt<9}BDx@ygpB3ip_Sy$I8_fH3P zcCESAK`X0ov{yv5a@ma)l&x6Vb*-avb!%5w_1|AqcDA-g1I3O%z4?x~*f;W_$hrP} z61da$jV5Ozq6l#^%&W*?wxca*B!F{*T*i&VJd1SxkX zM9SPrf|R;$k&HVkdNMBh7HXV%B31u-rWK`dDD}F%J1gKjpe^5Qfu$HPP)7NC*+&AT)r2kN^fCAgkDY zxWEt56IV1_?sh7WTrQRPs{q*g{jF;QMPE5ec#E;Y&S2nz0}6}IF|FVh08@VSHecF zg7tz0Oac!oH8ACP7{J5mw@l!&@;$>CO->8eGeNRM9@h#usGPZ4s%rwKU%@##Xo_>>`UeA3N&%YjJs&?=$h2;Z5MnQ}=pE_h1=<_MGZ1ZU}Dv^Cc)kLOB$jMdA z2{H{=l#`(+;6_tY&LpeEj`>NAemlxcS#bqpK5IU6#-7ihv50kQYc)xR`B5%`uZUfB~d5h+`H)*~i-^w|`7zgDTgSD4`11&bv z!E1S>NTqGRN4i`fW{?YD#o}&kAjUomKyS$3p!?nHw7|Va54cxpp?ifMbT89Gu8S7A z^|V--`B9kxCvg)L$K2?VzQP;x*ht9o8PW5r1>(gx0UyQ%vH_U@9*hIS5A5scVYil+ zxYhKiTSbq#PFk8HQbnF+UeHT1a%r=mfmgdP$qT@M-@Z<=4DIw@3Pza{qzKXj ziv%g*Qvmn~J)p0lM}~!+rop#`lBdxs^guvFw{QTQzpNS zXuivLdM=QIjJzYELB*de+_){d+l^Z%zqfDXHoBAF^Vf;a&Bi;$G2HJ3Th{R=paqUy zI4M1GJqNMIosrRK@2z&nodMS3uk0pdqlYn-BOl&so$l$?+EzUJfb&v?W52b zx0aYa)q3JL)|GPW!4qQ6-I!Ava-mS>*hCIza@|f2O BbRPf! literal 0 HcmV?d00001 diff --git a/mods/d2k/bits/levelup.shp b/mods/d2k/bits/levelup.shp new file mode 100644 index 0000000000000000000000000000000000000000..10fce43ef2d66d0455584c85e3ba8401d812b5a8 GIT binary patch literal 5280 zcmeHK%T2^E6wCo64jed803}4qAstWyN1v&INLvBg66nOO@n+te{KaN>4@8+Sl(}0lXIB8 z*ROmL=C3_|(ZOdNsB-`Hciqa~x_-y`MSszM4V~Yu16uDQ$YL&CiV+rG(GIE%G{^Gbs7cob#4HC+ c@LVSg=QW$mZ~da>{K<2iJ^AnTTYeF~0kndZ&Hw-a literal 0 HcmV?d00001 diff --git a/mods/d2k/bits/nopower.shp b/mods/d2k/bits/nopower.shp new file mode 100644 index 0000000000000000000000000000000000000000..3bb46e04a056626855e5c4e26350ad2f9025b7c3 GIT binary patch literal 2410 zcmeHIyKTcT5G4WwLE1D& z*(nTvs*D@d)}~JYu2fUNLBQiJDiJT>;he{+qaP7jt=$F+v{%Y^R<^4&&j%T`*6k3_ zl&&mUYHLj$z|KLqERE@_yB12N4dw@)W<4;drdX$tVd-`A>`gI-^P9mpFAqL)|JzdW z{0qeQ7>!E;Ige{tE=xmlbYP`mehDCF!qDEn29rwB@O1>m*8UuocvO+C@Wf|3cSjk)nSB-JtJIed zuHp)n93jc!8HojN7dR*kiNNT%gr)xycjFOGl7A}oclC`5t}=+cGnE2D2K~uA_kjxr zf$0cI4tx5EU+}xWN!41PO2t|LZ9y<(@58OHnr_PZHddNcFA>-s!h(V@GB)eD&A42Sx?*}ZNx-4G6 zVtMoYzO{Py{JGoP9<|Gn;y%C>MFo=-uT(;cv^h&ITjTP%p1aF{DUQ}JJ4eQ-%Aruw zwoY=AZ<1-qkufTMIsWCFWXf(*Dnc`X^zQgzSD%QP-6!=@T*74hp86R5a_ksGxMKPO D%j+*N literal 0 HcmV?d00001 diff --git a/mods/d2k/bits/speed.shp b/mods/d2k/bits/speed.shp new file mode 100644 index 0000000000000000000000000000000000000000..9b99c1b846669a9ef22c25e12a3714d56bdec815 GIT binary patch literal 1945 zcmc&#U5Fc16#nj=OgEc4A=?Pj?#tkV)&XH37TPh2gSz0uY!cWdK8WoUq{>p7_^{xE z4|_8kck;7R3jLF5!P4N9RL}=SYx|gt{h5s0F0KgnNp}atl2Qu7;<-tdR^NOOFS+O3 zxk=7B-*>-r=SiqwNaHD70`MKML=G`v$@SB0`24}h|2gu9IV`#Uj6+v}*YES;@8%R( za(zmHo}~SsmEr!230QJ{A_09j?cYlb_up1w$@PW`Jx%-byN3HejQsOs!{=ioe{M`x z_h<-gzYA1-|MnrcQ7`Jgg{o-=D-cHTA-We4d;(G4ejgB6x~cfS-xwI?w^&%^e(15t zWl@XqRh~8K+%yF>9J{iP_nFzMjm74<0;-w>E3ZIR0&GGmaN)$wjhrb920*a9%pc zvOm#L$Y`hj5phkiXY;ir&&yExu$J`sFkB6ZI3c6el5>0*jm}wy82}$bCiqdB)H1-Y z)5Ct~(?wH%v*-xlVKGqHYQ$jLV(RA*)xQLoq8KsB-}T4y)yJ%;%-)DmHp zbA~2WoGQ3TWoh>z#DNBRk4uaJaGc-Jw!g%4t zC}2I&r%^|;{XMf=#8bY>ect48Oh7;W8_-(0Y#7EG^;kM$xb+g9GG4}k3=5CIVvZ+t zkPL$*SO+o(D@Sxq_!hf$jed4_gZ|TDB+GE1pn%Rb>h2#Lt{N}W@KkkvVq$^{mK94! z{<1=AjFsGxmt@ov1sbQ3EYy(9((Kc0U*)#lqWY-^C3H0(`sdGks?@`lrxGhNgH!^q zbI#9TS1BQhaVfZreS*|Q9Muz)w$#AbOpQ1iE1Vo@?jSM%~<* z1hrdHt4W1Nlg^7JXQo7|rD)PY1jLP&D=Qaf5-Ty#@MA3i*4Sr*ag5*T%U zo+xxNUSio6E3GCZu_p&is-;?z9!fJ3twNG$D8%U*X_`EnZSsD<#oF@l&qz*3pR=i* z{_xMcshtkl+H|Q$b`3kuP3?5asOMIBDce#gbCVWzioHTiE0nk~Ff1z=CEuGWG^t2l zDzs#+{l_VG{;zxOzq_!vX91U9BX?gT^?+_isTuhe=)6jAo?LeYu4x+G)AGuH1(kg_ TzD95v+lQp?=)(OMZ>zrm_tSJj literal 0 HcmV?d00001 diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 30aa17706c..233542a134 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -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 diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index 2fc86dc6a6..a9911baa91 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -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 \ No newline at end of file + Name: Crate Carryall diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index c29e1c67da..9887290023 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -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= === diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml index 5cfe79a7f1..7e8d584cd8 100644 --- a/mods/d2k/rules/system.yaml +++ b/mods/d2k/rules/system.yaml @@ -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 diff --git a/mods/d2k/sequences.yaml b/mods/d2k/sequences.yaml index 28dd8eb311..d90565e37d 100644 --- a/mods/d2k/sequences.yaml +++ b/mods/d2k/sequences.yaml @@ -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 \ No newline at end of file + Start: 1 + +bombs: + open: + Start: 0 + Length: 4 + idle: + Start: 0 + Length: 4 + +parach: + open: + Start: 0 + Length: 5 + idle: + Start: 5 + Length: 11 diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index b1413efc69..a30ee42b22 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -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: