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

update data sln; 4-wide bibs

Browse Source
This commit is contained in:
Chris Forbes
2010-02-06 09:16:08 +13:00
parent 5b702b76cf
commit 848c927a81
4 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRa.Game/Graphics/OverlayRenderer.cs
View File

@@ -16,7 +16,7 @@ namespace OpenRa.Graphics
static string[] smudgeSpriteNames =
{
"bib3", "bib2", "sc1", "sc2", "sc3", "sc4", "sc5", "sc6",
"bib3", "bib2", "bib1", "sc1", "sc2", "sc3", "sc4", "sc5", "sc6",
"cr1", "cr2", "cr3", "cr4", "cr5", "cr6",
};

4
OpenRa.Game/Smudge.cs
View File

@@ -5,8 +5,8 @@ namespace OpenRa
{
static class Smudge
{
const int firstScorch = 11;
const int firstCrater = 17;
const int firstScorch = 19;
const int firstCrater = 25;
const int framesPerCrater = 5;
public static void AddSmudge(this Map map, bool isCrater, int x, int y)

5
OpenRa.Game/Traits/RenderBuilding.cs
View File

@@ -10,8 +10,7 @@ namespace OpenRa.Traits
public class RenderBuilding : RenderSimple, INotifyDamage, INotifySold
{
const int SmallBibStart = 1;
const int LargeBibStart = 5;
static readonly int[] bibStarts = { 0, 0, 1, 5, 11 };
public RenderBuilding(Actor self)
: base(self)
@@ -38,7 +37,7 @@ namespace OpenRa.Traits
{
var size = buildingInfo.Dimensions.X;
var bibOffset = buildingInfo.Dimensions.Y - 1;
var startIndex = (size == 2) ? SmallBibStart : LargeBibStart;
var startIndex = bibStarts[size];
for (int i = 0; i < 2 * size; i++)
{

56
openra-data.sln
View File

@@ -9,7 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ra", "ra", "{59F0734D-2F86-
mods\ra\defaults.yaml = mods\ra\defaults.yaml
mods\ra\merge-rules.yaml = mods\ra\merge-rules.yaml
mods\ra\mod.yaml = mods\ra\mod.yaml
mods\ra\nopower.shp = mods\ra\nopower.shp
mods\ra\rules.ini = mods\ra\rules.ini
mods\ra\rules.yaml = mods\ra\rules.yaml
mods\ra\sequences.xml = mods\ra\sequences.xml
mods\ra\trees.ini = mods\ra\trees.ini
mods\ra\units.ini = mods\ra\units.ini
@@ -53,18 +55,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "globals", "globals", "{27CA
tileSet.til = tileSet.til
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "remaps", "remaps", "{F1386D81-84EA-4600-AE3C-C3C4D042B8D7}"
ProjectSection(SolutionItems) = preProject
blue.rem = blue.rem
gold.rem = gold.rem
gray.rem = gray.rem
green.rem = green.rem
orange.rem = orange.rem
red.rem = red.rem
salmon.rem = salmon.rem
teal.rem = teal.rem
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{3FB8CE49-01F3-4EB1-8DB9-FC6168464091}"
ProjectSection(SolutionItems) = preProject
doc\aud format.txt = doc\aud format.txt
@@ -74,6 +64,45 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{3FB8CE49-01F
doc\shp dune 2.txt = doc\shp dune 2.txt
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "remaps", "remaps", "{CA06F234-23DF-4DF3-95D5-42F6C67A387D}"
ProjectSection(SolutionItems) = preProject
mods\ra\blue.rem = mods\ra\blue.rem
mods\ra\gold.rem = mods\ra\gold.rem
mods\ra\gray.rem = mods\ra\gray.rem
mods\ra\green.rem = mods\ra\green.rem
mods\ra\orange.rem = mods\ra\orange.rem
mods\ra\red.rem = mods\ra\red.rem
mods\ra\salmon.rem = mods\ra\salmon.rem
mods\ra\teal.rem = mods\ra\teal.rem
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cnc", "cnc", "{65D8A06F-F2DF-4000-A4F7-AFDB4C282698}"
ProjectSection(SolutionItems) = preProject
mods\cnc\chrome-allies.png = mods\cnc\chrome-allies.png
mods\cnc\chrome-soviet.png = mods\cnc\chrome-soviet.png
mods\cnc\chrome.xml = mods\cnc\chrome.xml
mods\cnc\civilian.yaml = mods\cnc\civilian.yaml
mods\cnc\compat.yaml = mods\cnc\compat.yaml
mods\cnc\defaults.yaml = mods\cnc\defaults.yaml
mods\cnc\dialog.png = mods\cnc\dialog.png
mods\cnc\infantry.yaml = mods\cnc\infantry.yaml
mods\cnc\minimal.ini = mods\cnc\minimal.ini
mods\cnc\mod.yaml = mods\cnc\mod.yaml
mods\cnc\sequences-infantry.xml = mods\cnc\sequences-infantry.xml
mods\cnc\sequences-structures.xml = mods\cnc\sequences-structures.xml
mods\cnc\sequences-vehicles.xml = mods\cnc\sequences-vehicles.xml
mods\cnc\sequences.xml = mods\cnc\sequences.xml
mods\cnc\structures.yaml = mods\cnc\structures.yaml
mods\cnc\system.yaml = mods\cnc\system.yaml
mods\cnc\tabs.png = mods\cnc\tabs.png
mods\cnc\temperat_ra.pal = mods\cnc\temperat_ra.pal
mods\cnc\trees.yaml = mods\cnc\trees.yaml
mods\cnc\vehicles.yaml = mods\cnc\vehicles.yaml
mods\cnc\voices.ini = mods\cnc\voices.ini
mods\cnc\weapons.ini = mods\cnc\weapons.ini
mods\cnc\widget-panel.png = mods\cnc\widget-panel.png
EndProjectSection
EndProject
Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -82,6 +111,7 @@ Global
{59F0734D-2F86-4C26-8171-CF45EE01E97A} = {F0BAF862-166C-402E-AF8E-16CA1A5EB585}
{8DA16338-FA8F-4CCD-8731-CBFCF5E31A78} = {F0BAF862-166C-402E-AF8E-16CA1A5EB585}
{8C56DCEF-63A3-4E69-B826-20C5F7EF4C43} = {F0BAF862-166C-402E-AF8E-16CA1A5EB585}
{F1386D81-84EA-4600-AE3C-C3C4D042B8D7} = {27CA9A65-2FEE-4995-B7F0-E5BE1BB5494B}
{65D8A06F-F2DF-4000-A4F7-AFDB4C282698} = {F0BAF862-166C-402E-AF8E-16CA1A5EB585}
{CA06F234-23DF-4DF3-95D5-42F6C67A387D} = {59F0734D-2F86-4C26-8171-CF45EE01E97A}
EndGlobalSection
EndGlobal