epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make cursor always transparent, fix Arrakis tileset

Browse Source 
transparency bugs some cnc cursors, slice BLOXBASE better
This commit is contained in:
Matthias Mailänder
2012-06-15 11:06:59 +02:00
parent 722c7a5f7d
commit 801ff5cc17
4 changed files with 1265 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Graphics/CursorProvider.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Graphics
var sequences = new MiniYaml(null, sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal)); var sequences = new MiniYaml(null, sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal));
foreach (var s in sequences.NodesDict["Palettes"].Nodes) foreach (var s in sequences.NodesDict["Palettes"].Nodes)
Game.modData.Palette.AddPalette(s.Key, new Palette(FileSystem.Open(s.Value.Value), false)); Game.modData.Palette.AddPalette(s.Key, new Palette(FileSystem.Open(s.Value.Value), true));
foreach (var s in sequences.NodesDict["Cursors"].Nodes) foreach (var s in sequences.NodesDict["Cursors"].Nodes)
LoadSequencesForCursor(s.Key, s.Value); LoadSequencesForCursor(s.Key, s.Value);

3
OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
View File

@@ -438,7 +438,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
new string[] {"--shp", Path.Combine(PathToSHPs, "cranea.png"), "96"}, new string[] {"--shp", Path.Combine(PathToSHPs, "cranea.png"), "96"},
new string[] {"--shp", Path.Combine(PathToSHPs, "craneh.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, "craneo.png"), "96"},
new string[] {"--shp", Path.Combine(PathToSHPs, "windtrap_anim.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, "missile_launch.png"), "96"},
new string[] {"--shp", Path.Combine(PathToSHPs, "mouse.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "mouse.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "spice0.png"), "32"}, new string[] {"--shp", Path.Combine(PathToSHPs, "spice0.png"), "32"},
@@ -487,6 +487,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
File.Delete(Path.Combine(PathToTilesets, "{0}.tsx".F(set))); File.Delete(Path.Combine(PathToTilesets, "{0}.tsx".F(set)));
File.Delete(Path.Combine(PathToTilesets, "{0}.png".F(set))); File.Delete(Path.Combine(PathToTilesets, "{0}.png".F(set)));
File.Delete(Path.Combine(PathToTilesets, "{0}.yaml".F(set.ToLower()))); File.Delete(Path.Combine(PathToTilesets, "{0}.yaml".F(set.ToLower())));
File.Delete(Path.Combine(PathToTilesets, "{0}.pal".F(set.ToLower())));
c++; c++;
} }

102
mods/d2k/tilesets/BASE.tsx
View File

@@ -1004,18 +1004,6 @@
<template> <template>
<cell x="2" y="15" /> <cell x="2" y="15" />
</template> </template>
<template>
<cell x="3" y="15" />
<cell x="3" y="16" />
<cell x="4" y="16" />
<cell x="4" y="15" />
</template>
<template>
<cell x="6" y="15" />
<cell x="6" y="16" />
<cell x="7" y="16" />
<cell x="7" y="15" />
</template>
<template> <template>
<cell x="8" y="14" /> <cell x="8" y="14" />
</template> </template>
@@ -1199,23 +1187,6 @@
<cell x="18" y="27" /> <cell x="18" y="27" />
<cell x="18" y="28" /> <cell x="18" y="28" />
</template> </template>
<template>
<cell x="12" y="27" />
<cell x="13" y="27" />
<cell x="14" y="27" />
<cell x="15" y="27" />
<cell x="16" y="27" />
<cell x="16" y="28" />
<cell x="16" y="29" />
<cell x="15" y="29" />
<cell x="14" y="29" />
<cell x="13" y="29" />
<cell x="12" y="29" />
<cell x="12" y="28" />
<cell x="13" y="28" />
<cell x="14" y="28" />
<cell x="15" y="28" />
</template>
<template> <template>
<cell x="11" y="30" /> <cell x="11" y="30" />
<cell x="12" y="30" /> <cell x="12" y="30" />
@@ -1641,20 +1612,6 @@
<cell x="14" y="24" /> <cell x="14" y="24" />
<cell x="14" y="23" /> <cell x="14" y="23" />
</template> </template>
<template>
<cell x="11" y="23" />
<cell x="12" y="23" />
<cell x="13" y="23" />
<cell x="13" y="24" />
<cell x="12" y="24" />
<cell x="11" y="24" />
<cell x="11" y="25" />
<cell x="12" y="25" />
<cell x="13" y="25" />
<cell x="13" y="26" />
<cell x="12" y="26" />
<cell x="11" y="26" />
</template>
<template> <template>
<cell x="10" y="24" /> <cell x="10" y="24" />
<cell x="10" y="25" /> <cell x="10" y="25" />
@@ -1945,4 +1902,63 @@
<cell x="16" y="34" /> <cell x="16" y="34" />
<cell x="16" y="33" /> <cell x="16" y="33" />
</template> </template>
<template>
<cell x="3" y="15" />
</template>
<template>
<cell x="4" y="15" />
</template>
<template>
<cell x="4" y="16" />
</template>
<template>
<cell x="3" y="16" />
</template>
<template>
<cell x="11" y="25" />
<cell x="12" y="25" />
<cell x="13" y="25" />
<cell x="13" y="26" />
<cell x="12" y="26" />
<cell x="11" y="26" />
</template>
<template>
<cell x="11" y="24" />
<cell x="12" y="24" />
<cell x="13" y="24" />
<cell x="13" y="23" />
<cell x="12" y="23" />
<cell x="11" y="23" />
</template>
<template>
<cell x="12" y="27" />
<cell x="12" y="28" />
<cell x="13" y="28" />
<cell x="14" y="28" />
<cell x="15" y="28" />
<cell x="16" y="28" />
<cell x="16" y="27" />
<cell x="15" y="27" />
<cell x="14" y="27" />
<cell x="13" y="27" />
</template>
<template>
<cell x="15" y="29" />
</template>
<template>
<cell x="16" y="29" />
</template>
<template>
<cell x="6" y="15" />
<cell x="7" y="15" />
</template>
<template>
<cell x="7" y="16" />
<cell x="6" y="16" />
</template>
<template>
<cell x="12" y="29" />
<cell x="13" y="29" />
<cell x="14" y="29" />
</template>
</tileset> </tileset>

2438
mods/d2k/tilesets/arrakis.yaml
View File

File diff suppressed because it is too large Load Diff