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

unbitrot cnc; fix double-surrender oddity

Browse Source
This commit is contained in:
Chris Forbes
2010-05-02 15:58:44 +12:00
parent 4bd195e21c
commit 510cfc4afb
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Traits/Player/VictoryConditions.cs
View File

@@ -63,6 +63,7 @@ namespace OpenRA.Traits
a.InflictDamage(a, a.Health, null); a.InflictDamage(a, a.Health, null);
self.Owner.Shroud.Disabled = true; self.Owner.Shroud.Disabled = true;
HasLost = true;
} }
} }

2
mods/cnc/system.yaml
View File

@@ -208,8 +208,6 @@ World:
SpriteNames: ti1,ti2,ti3,ti4,ti5,ti6,ti7,ti8,ti9,ti10,ti11,ti12 SpriteNames: ti1,ti2,ti3,ti4,ti5,ti6,ti7,ti8,ti9,ti10,ti11,ti12
ValuePerUnit: 30 ValuePerUnit: 30
Name: Tiberium Name: Tiberium
GrowthInterval: 2
SpreadInterval: 12
SmudgeLayer@SCORCH: SmudgeLayer@SCORCH:
Type:Scorch Type:Scorch
Types:sc1,sc2,sc3,sc4,sc5,sc6 Types:sc1,sc2,sc3,sc4,sc5,sc6

12
openra-data.sln
View File

@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ra", "ra", "{59F0734D-2F86-
mods\ra\chrome.xml = mods\ra\chrome.xml mods\ra\chrome.xml = mods\ra\chrome.xml
mods\ra\civilian.yaml = mods\ra\civilian.yaml mods\ra\civilian.yaml = mods\ra\civilian.yaml
mods\ra\defaults.yaml = mods\ra\defaults.yaml mods\ra\defaults.yaml = mods\ra\defaults.yaml
mods\ra\dialog.png = mods\ra\dialog.png
mods\ra\infantry.yaml = mods\ra\infantry.yaml mods\ra\infantry.yaml = mods\ra\infantry.yaml
mods\ra\menus.yaml = mods\ra\menus.yaml mods\ra\menus.yaml = mods\ra\menus.yaml
mods\ra\mod.yaml = mods\ra\mod.yaml mods\ra\mod.yaml = mods\ra\mod.yaml
@@ -51,10 +50,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ra-ng", "ra-ng", "{8C56DCEF
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shaders", "shaders", "{119A289F-9059-4B0C-8A5C-5A5D77E6E16C}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shaders", "shaders", "{119A289F-9059-4B0C-8A5C-5A5D77E6E16C}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
chrome-rgba.fx = chrome-rgba.fx shaders\chrome-rgba.fx = shaders\chrome-rgba.fx
chrome-shp.fx = chrome-shp.fx shaders\chrome-shp.fx = shaders\chrome-shp.fx
line.fx = line.fx shaders\line.fx = shaders\line.fx
world-shp.fx = world-shp.fx shaders\world-shp.fx = shaders\world-shp.fx
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "settings", "settings", "{CCCBD235-11AB-4FA2-9641-93038EACAFC8}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "settings", "settings", "{CCCBD235-11AB-4FA2-9641-93038EACAFC8}"
@@ -84,10 +83,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cnc", "cnc", "{65D8A06F-F2D
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
mods\cnc\chrome-gdi.png = mods\cnc\chrome-gdi.png mods\cnc\chrome-gdi.png = mods\cnc\chrome-gdi.png
mods\cnc\chrome-nod.png = mods\cnc\chrome-nod.png mods\cnc\chrome-nod.png = mods\cnc\chrome-nod.png
mods\cnc\chrome.xml = mods\cnc\chrome.xml
mods\cnc\civilian.yaml = mods\cnc\civilian.yaml mods\cnc\civilian.yaml = mods\cnc\civilian.yaml
mods\cnc\compat.yaml = mods\cnc\compat.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\dialog.png = mods\cnc\dialog.png
mods\cnc\infantry.yaml = mods\cnc\infantry.yaml mods\cnc\infantry.yaml = mods\cnc\infantry.yaml
mods\cnc\mod.yaml = mods\cnc\mod.yaml mods\cnc\mod.yaml = mods\cnc\mod.yaml
@@ -98,7 +95,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cnc", "cnc", "{65D8A06F-F2D
mods\cnc\structures.yaml = mods\cnc\structures.yaml mods\cnc\structures.yaml = mods\cnc\structures.yaml
mods\cnc\system.yaml = mods\cnc\system.yaml mods\cnc\system.yaml = mods\cnc\system.yaml
mods\cnc\tabs.png = mods\cnc\tabs.png 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\trees.yaml = mods\cnc\trees.yaml
mods\cnc\vehicles.yaml = mods\cnc\vehicles.yaml mods\cnc\vehicles.yaml = mods\cnc\vehicles.yaml
mods\cnc\voices.yaml = mods\cnc\voices.yaml mods\cnc\voices.yaml = mods\cnc\voices.yaml