Merge pull request #10384 from pchote/upgrade-newlines
Fix duplicated end of file newline being saved to upgraded yaml.
This commit is contained in:
RoosterDragon
@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
||||
UpgradeRules.UpgradeActorRules(engineDate, ref yaml, null, 0);
|
||||
|
||||
using (var file = new StreamWriter(filename))
|
||||
file.WriteLine(yaml.WriteToString());
|
||||
file.Write(yaml.WriteToString());
|
||||
}
|
||||
|
||||
Console.WriteLine("Processing Weapons:");
|
||||
@@ -51,7 +51,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
||||
UpgradeRules.UpgradeWeaponRules(engineDate, ref yaml, null, 0);
|
||||
|
||||
using (var file = new StreamWriter(filename))
|
||||
file.WriteLine(yaml.WriteToString());
|
||||
file.Write(yaml.WriteToString());
|
||||
}
|
||||
|
||||
Console.WriteLine("Processing Tilesets:");
|
||||
@@ -62,7 +62,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
||||
UpgradeRules.UpgradeTileset(engineDate, ref yaml, null, 0);
|
||||
|
||||
using (var file = new StreamWriter(filename))
|
||||
file.WriteLine(yaml.WriteToString());
|
||||
file.Write(yaml.WriteToString());
|
||||
}
|
||||
|
||||
Console.WriteLine("Processing Cursors:");
|
||||
@@ -73,7 +73,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
||||
UpgradeRules.UpgradeCursors(engineDate, ref yaml, null, 0);
|
||||
|
||||
using (var file = new StreamWriter(filename))
|
||||
file.WriteLine(yaml.WriteToString());
|
||||
file.Write(yaml.WriteToString());
|
||||
}
|
||||
|
||||
Console.WriteLine("Processing Chrome Metrics:");
|
||||
@@ -84,7 +84,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
||||
UpgradeRules.UpgradeChromeMetrics(engineDate, ref yaml, null, 0);
|
||||
|
||||
using (var file = new StreamWriter(filename))
|
||||
file.WriteLine(yaml.WriteToString());
|
||||
file.Write(yaml.WriteToString());
|
||||
}
|
||||
|
||||
Console.WriteLine("Processing Chrome Layout:");
|
||||
@@ -95,7 +95,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
||||
UpgradeRules.UpgradeChromeLayout(engineDate, ref yaml, null, 0);
|
||||
|
||||
using (var file = new StreamWriter(filename))
|
||||
file.WriteLine(yaml.WriteToString());
|
||||
file.Write(yaml.WriteToString());
|
||||
}
|
||||
|
||||
Console.WriteLine("Processing Maps:");
|
||||
|
||||
@@ -187,4 +187,3 @@ Container@ASSETBROWSER_PANEL:
|
||||
Width: 140
|
||||
Height: 35
|
||||
Text: Back
|
||||
|
||||
|
||||
@@ -43,4 +43,3 @@ Background@COLOR_CHOOSER:
|
||||
Width: 70
|
||||
Height: 25
|
||||
Text: Random
|
||||
|
||||
|
||||
@@ -92,4 +92,3 @@ Container@CONNECTIONFAILED_PANEL:
|
||||
Width: 140
|
||||
Height: 35
|
||||
Text: Abort
|
||||
|
||||
|
||||
@@ -33,4 +33,3 @@ Container@CREDITS_PANEL:
|
||||
Height: 35
|
||||
Text: Back
|
||||
Key: escape
|
||||
|
||||
|
||||
@@ -406,4 +406,3 @@ Container@EDITOR_WORLD_ROOT:
|
||||
Align: Left
|
||||
Font: Bold
|
||||
Contrast: true
|
||||
|
||||
|
||||
@@ -65,4 +65,3 @@ Container@CHAT_PANEL:
|
||||
Height: 15
|
||||
WordWrap: true
|
||||
VAlign: Top
|
||||
|
||||
|
||||
@@ -28,4 +28,3 @@ Container@MAP_PANEL:
|
||||
X: 4
|
||||
Y: 1
|
||||
Width: PARENT_RIGHT - 32
|
||||
|
||||
|
||||
@@ -41,4 +41,3 @@ Container@MISSION_OBJECTIVES:
|
||||
Height: PARENT_BOTTOM
|
||||
Disabled: True
|
||||
TextColorDisabled: FFFFFF
|
||||
|
||||
|
||||
@@ -25,4 +25,3 @@ Container@SCRIPT_ERROR_PANEL:
|
||||
Height: 20
|
||||
Font: Regular
|
||||
Text: Please send this file to the map author so that they can fix this issue.
|
||||
|
||||
|
||||
@@ -112,4 +112,3 @@ Container@SKIRMISH_STATS:
|
||||
Width: 70
|
||||
Height: 25
|
||||
Align: Center
|
||||
|
||||
|
||||
@@ -70,4 +70,3 @@ Container@INGAME_MENU:
|
||||
Width: 140
|
||||
Height: 35
|
||||
Text: Resume
|
||||
|
||||
|
||||
@@ -478,4 +478,3 @@ Background@FMVPLAYER:
|
||||
Y: 0
|
||||
Width: WINDOW_RIGHT
|
||||
Height: WINDOW_BOTTOM
|
||||
|
||||
|
||||
@@ -116,4 +116,3 @@ Container@LOBBY_GLOBALCHAT_PANEL:
|
||||
Height: 25
|
||||
Align: Right
|
||||
Text: Global:
|
||||
|
||||
|
||||
@@ -139,4 +139,3 @@ Background@FORCE_START_DIALOG:
|
||||
Height: 25
|
||||
Text: Cancel
|
||||
Font: Bold
|
||||
|
||||
|
||||
@@ -176,4 +176,3 @@ Container@LOBBY_MAP_PREVIEW:
|
||||
Y: 194
|
||||
Width: PARENT_RIGHT
|
||||
Height: 25
|
||||
|
||||
|
||||
@@ -134,4 +134,3 @@ Container@SERVER_LOBBY:
|
||||
Text: Start Game
|
||||
Container@FACTION_DROPDOWN_PANEL_ROOT:
|
||||
TooltipContainer@TOOLTIP_CONTAINER:
|
||||
|
||||
|
||||
@@ -257,4 +257,3 @@ Container@MENU_BACKGROUND:
|
||||
Y: 10
|
||||
Width: 200
|
||||
Height: 200
|
||||
|
||||
|
||||
@@ -143,4 +143,3 @@ Container@MAPCHOOSER_PANEL:
|
||||
Width: 140
|
||||
Height: 35
|
||||
Text: Ok
|
||||
|
||||
|
||||
@@ -160,4 +160,3 @@ Background@FULLSCREEN_PLAYER:
|
||||
Y: 0
|
||||
Width: WINDOW_RIGHT
|
||||
Height: WINDOW_BOTTOM
|
||||
|
||||
|
||||
@@ -101,4 +101,3 @@ Container@GLOBALCHAT_PANEL:
|
||||
Height: 25
|
||||
Text: Connect
|
||||
Font: Bold
|
||||
|
||||
|
||||
@@ -109,4 +109,3 @@ ScrollPanel@MULTIPLAYER_FILTER_PANEL:
|
||||
Text: Incompatible
|
||||
TextColor: BEBEBE
|
||||
Font: Regular
|
||||
|
||||
|
||||
@@ -240,4 +240,3 @@ Container@INSTALL_MUSIC_PANEL:
|
||||
Width: 140
|
||||
Height: 35
|
||||
Text: Use CD
|
||||
|
||||
|
||||
@@ -294,4 +294,3 @@ Container@REPLAYBROWSER_PANEL:
|
||||
Height: 35
|
||||
Text: Watch
|
||||
TooltipContainer@TOOLTIP_CONTAINER:
|
||||
|
||||
|
||||
@@ -246,4 +246,3 @@ Background@FACTION_DESCRIPTION_TOOLTIP:
|
||||
Height: 14
|
||||
Font: TinyBold
|
||||
VAlign: Top
|
||||
|
||||
|
||||
@@ -193,4 +193,3 @@ Cursors:
|
||||
Length: 8
|
||||
attackoutsiderange-minimap:
|
||||
Start: 8
|
||||
|
||||
|
||||
@@ -387,6 +387,7 @@ Rules:
|
||||
ATWR:
|
||||
Buildable:
|
||||
Prerequisites: ~disabled
|
||||
|
||||
Sequences:
|
||||
|
||||
VoxelSequences:
|
||||
|
||||
@@ -36,4 +36,3 @@ Metrics:
|
||||
IncompatibleGameStartedColor: D2691E
|
||||
GlobalChatTextColor: FFFFFF
|
||||
GlobalChatNotificationColor: D3D3D3
|
||||
|
||||
|
||||
@@ -364,4 +364,3 @@ Player:
|
||||
Attractiveness: -10
|
||||
TargetMetric: Value
|
||||
CheckRadius: 7c0
|
||||
|
||||
|
||||
@@ -259,4 +259,3 @@ ORCA.Husk:
|
||||
Type: CenterPosition
|
||||
RenderSprites:
|
||||
Image: orca
|
||||
|
||||
|
||||
@@ -283,4 +283,3 @@ V37.Husk:
|
||||
Dimensions: 5,2
|
||||
EditorTilesetFilter:
|
||||
RequireTilesets: DESERT
|
||||
|
||||
|
||||
@@ -429,4 +429,3 @@ VICE:
|
||||
WanderMoveRadius: 2
|
||||
MinMoveDelayInTicks: 25
|
||||
MaxMoveDelayInTicks: 45
|
||||
|
||||
|
||||
@@ -723,4 +723,3 @@
|
||||
-GivesBuildableArea:
|
||||
MustBeDestroyed:
|
||||
RequiredForShortGame: false
|
||||
|
||||
|
||||
@@ -147,4 +147,3 @@ STNK.Husk:
|
||||
IntoActor: stnk
|
||||
RenderSprites:
|
||||
Image: stnk.destroyed
|
||||
|
||||
|
||||
@@ -242,4 +242,3 @@ RAPT:
|
||||
Description: Bipedal with enlarged sickle-shaped claw on each hindfoot
|
||||
Armament:
|
||||
Weapon: claw
|
||||
|
||||
|
||||
@@ -102,4 +102,3 @@ FLARE:
|
||||
Name: Flare
|
||||
BodyOrientation:
|
||||
QuantizedFacings: 1
|
||||
|
||||
|
||||
@@ -75,4 +75,3 @@
|
||||
RotationPaletteEffect@water:
|
||||
ExcludePalettes: effect, chrome
|
||||
RotationBase: 32
|
||||
|
||||
|
||||
@@ -79,4 +79,3 @@ LST:
|
||||
PipCount: 5
|
||||
PassengerFacing: 0
|
||||
LoadingUpgrades: notmobile
|
||||
|
||||
|
||||
@@ -942,4 +942,3 @@ ANYHQ:
|
||||
Tooltip:
|
||||
Name: a communications center
|
||||
Description: a communications center
|
||||
|
||||
|
||||
@@ -98,4 +98,3 @@ MISS:
|
||||
HasMinibib: Yes
|
||||
WithMakeAnimation:
|
||||
ProvidesPrerequisite@buildingname:
|
||||
|
||||
|
||||
@@ -205,4 +205,3 @@ TC05:
|
||||
Dimensions: 4,3
|
||||
EditorTilesetFilter:
|
||||
ExcludeTilesets: DESERT
|
||||
|
||||
|
||||
@@ -553,4 +553,3 @@ MHQ:
|
||||
WithIdleOverlay@SPINNER:
|
||||
Sequence: spinner
|
||||
Offset: -256,0,256
|
||||
|
||||
|
||||
@@ -155,4 +155,3 @@ EditorWorld:
|
||||
EditorActorLayer:
|
||||
EditorResourceLayer:
|
||||
EditorSelectionLayer:
|
||||
|
||||
|
||||
@@ -2148,4 +2148,3 @@ Templates:
|
||||
3: Clear
|
||||
4: Clear
|
||||
5: Clear
|
||||
|
||||
|
||||
@@ -1750,4 +1750,3 @@ Templates:
|
||||
5: Tree
|
||||
6: Tree
|
||||
7: Tree
|
||||
|
||||
|
||||
@@ -1749,4 +1749,3 @@ Templates:
|
||||
6: Water
|
||||
7: Clear
|
||||
8: Clear
|
||||
|
||||
|
||||
@@ -1747,4 +1747,3 @@ Templates:
|
||||
5: Tree
|
||||
6: Tree
|
||||
7: Tree
|
||||
|
||||
|
||||
@@ -1782,4 +1782,3 @@ Templates:
|
||||
6: Water
|
||||
7: Clear
|
||||
8: Clear
|
||||
|
||||
|
||||
@@ -82,4 +82,3 @@ Napalm.Crate:
|
||||
Warhead@3Eff: CreateEffect
|
||||
Explosion: med_napalm
|
||||
ImpactSound: flamer2.aud
|
||||
|
||||
|
||||
@@ -139,4 +139,3 @@ ArtilleryShell:
|
||||
Warhead@3Eff: CreateEffect
|
||||
Explosion: poof
|
||||
ImpactSound: XPLOSML2.AUD
|
||||
|
||||
|
||||
@@ -389,4 +389,3 @@ Patriot:
|
||||
Warhead@3Eff: CreateEffect
|
||||
Explosion: poof
|
||||
ImpactSound: xplos.aud
|
||||
|
||||
|
||||
@@ -239,4 +239,3 @@ Demolish:
|
||||
Warhead@2Eff: CreateEffect
|
||||
Explosion: building
|
||||
ImpactSound: xplobig6.aud
|
||||
|
||||
|
||||
@@ -197,4 +197,3 @@ APCGun.AA:
|
||||
DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
|
||||
Warhead@2Eff: CreateEffect
|
||||
Explosion: small_frag
|
||||
|
||||
|
||||
@@ -97,4 +97,3 @@ IonCannon:
|
||||
SmudgeType: Scorch
|
||||
Size: 2,1
|
||||
Delay: 6
|
||||
|
||||
|
||||
@@ -41,4 +41,3 @@ Background@COLOR_CHOOSER:
|
||||
Width: 70
|
||||
Height: 25
|
||||
Text: Random
|
||||
|
||||
|
||||
@@ -112,4 +112,3 @@ Container@SKIRMISH_STATS:
|
||||
Width: 60
|
||||
Height: 25
|
||||
Align: Center
|
||||
|
||||
|
||||
@@ -392,4 +392,3 @@ Container@PLAYER_WIDGETS:
|
||||
Y: 5
|
||||
ImageCollection: scrollbar
|
||||
ImageName: down_arrow
|
||||
|
||||
|
||||
@@ -391,4 +391,3 @@ ScrollPanel@FACTION_DROPDOWN_TEMPLATE:
|
||||
X: 30
|
||||
Width: 70
|
||||
Height: 25
|
||||
|
||||
|
||||
@@ -225,4 +225,3 @@ Container@MAINMENU:
|
||||
Y: 5
|
||||
Width: 200
|
||||
Height: 200
|
||||
|
||||
|
||||
@@ -164,4 +164,3 @@ Background@FULLSCREEN_PLAYER:
|
||||
Y: 0
|
||||
Width: WINDOW_RIGHT
|
||||
Height: WINDOW_BOTTOM
|
||||
|
||||
|
||||
@@ -256,4 +256,3 @@ Background@FACTION_DESCRIPTION_TOOLTIP:
|
||||
Height: 14
|
||||
Font: TinyBold
|
||||
VAlign: Top
|
||||
|
||||
|
||||
@@ -305,4 +305,3 @@ Cursors:
|
||||
Length: 3
|
||||
X: 12
|
||||
Y: 12
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
# General dumping-ground for UI element sizes, etc.
|
||||
|
||||
Metrics:
|
||||
ButtonDepth: 1
|
||||
ButtonFont: Regular
|
||||
@@ -36,4 +35,3 @@ Metrics:
|
||||
IncompatibleGameStartedColor: D2691E
|
||||
GlobalChatTextColor: FFFFFF
|
||||
GlobalChatNotificationColor: D3D3D3
|
||||
|
||||
|
||||
@@ -347,4 +347,3 @@ Player:
|
||||
Attractiveness: -10
|
||||
TargetMetric: Value
|
||||
CheckRadius: 7c0
|
||||
|
||||
|
||||
@@ -112,4 +112,3 @@ carryall.husk:
|
||||
CanHover: True
|
||||
RenderSprites:
|
||||
Image: carryall
|
||||
|
||||
|
||||
@@ -112,4 +112,3 @@ sietch:
|
||||
ProvidesPrerequisite@buildingname:
|
||||
-WithMakeAnimation:
|
||||
-WithCrumbleOverlay:
|
||||
|
||||
|
||||
@@ -304,4 +304,3 @@
|
||||
Range: 2c0, 4c0
|
||||
MustBeDestroyed:
|
||||
RequiredForShortGame: false
|
||||
|
||||
|
||||
@@ -64,4 +64,3 @@ combat_tank_o.husk:
|
||||
Inherits: ^combat_tank.husk
|
||||
TransformOnCapture:
|
||||
IntoActor: combat_tank_o
|
||||
|
||||
|
||||
@@ -266,4 +266,3 @@ nsfremen:
|
||||
RenderSprites:
|
||||
Image: fremen
|
||||
-Cloak:
|
||||
|
||||
|
||||
@@ -285,4 +285,3 @@ upgrade.hightech:
|
||||
RenderSprites:
|
||||
Image: hightech.atreides
|
||||
ProvidesPrerequisite@upgradename:
|
||||
|
||||
|
||||
@@ -79,4 +79,3 @@
|
||||
BaseName: cloak
|
||||
BasePalette: player
|
||||
Alpha: 0.55
|
||||
|
||||
|
||||
@@ -95,4 +95,3 @@ carryall.starport:
|
||||
Queue: Starport
|
||||
Valued:
|
||||
Cost: 1500
|
||||
|
||||
|
||||
@@ -1011,4 +1011,3 @@ conyard.ordos:
|
||||
RenderSprites:
|
||||
Image: conyard.ordos
|
||||
-FactionImages:
|
||||
|
||||
|
||||
@@ -514,4 +514,3 @@ combat_tank_o:
|
||||
HP: 1800
|
||||
SpawnActorOnDeath:
|
||||
Actor: combat_tank_o.husk
|
||||
|
||||
|
||||
@@ -149,4 +149,3 @@ EditorWorld:
|
||||
EditorActorLayer:
|
||||
D2kEditorResourceLayer:
|
||||
EditorSelectionLayer:
|
||||
|
||||
|
||||
@@ -5566,4 +5566,3 @@ Templates:
|
||||
Category: Sand-Detail
|
||||
Tiles:
|
||||
0: Rough
|
||||
|
||||
|
||||
@@ -849,4 +849,3 @@ BloomSpawn:
|
||||
Image: null
|
||||
Warhead@1Eff: CreateEffect
|
||||
Explosion: bloomspawn
|
||||
|
||||
|
||||
@@ -130,4 +130,3 @@ Debris4:
|
||||
Warhead@3Eff: CreateEffect
|
||||
Explosion: large_explosion
|
||||
ImpactSound: EXPLLG5.WAV
|
||||
|
||||
|
||||
@@ -190,4 +190,3 @@ Background@ASSETBROWSER_PANEL:
|
||||
Height: 25
|
||||
Font: Bold
|
||||
Text: Close
|
||||
|
||||
|
||||
@@ -41,4 +41,3 @@ Background@COLOR_CHOOSER:
|
||||
Width: 70
|
||||
Height: 25
|
||||
Text: Random
|
||||
|
||||
|
||||
@@ -99,4 +99,3 @@ Background@TEXT_INPUT_PROMPT:
|
||||
Text: Cancel
|
||||
Font: Bold
|
||||
Key: escape
|
||||
|
||||
|
||||
@@ -89,4 +89,3 @@ Background@CONNECTING_PANEL:
|
||||
Text: Abort
|
||||
Font: Bold
|
||||
Key: escape
|
||||
|
||||
|
||||
@@ -30,4 +30,3 @@ Background@CREDITS_PANEL:
|
||||
Text: Close
|
||||
Font: Bold
|
||||
Key: escape
|
||||
|
||||
|
||||
@@ -61,4 +61,3 @@ Container@CHAT_PANEL:
|
||||
Height: 15
|
||||
WordWrap: true
|
||||
VAlign: Top
|
||||
|
||||
|
||||
@@ -89,4 +89,3 @@ Background@INGAME_DIPLOMACY_BG:
|
||||
Text: Close
|
||||
Key: escape
|
||||
Font: Bold
|
||||
|
||||
|
||||
@@ -8,4 +8,3 @@ Background@FMVPLAYER:
|
||||
Y: 0
|
||||
Width: WINDOW_RIGHT
|
||||
Height: WINDOW_BOTTOM
|
||||
|
||||
|
||||
@@ -28,4 +28,3 @@ Container@MAP_PANEL:
|
||||
X: 4
|
||||
Y: 1
|
||||
Width: PARENT_RIGHT - 32
|
||||
|
||||
|
||||
@@ -41,4 +41,3 @@ Container@MISSION_OBJECTIVES:
|
||||
Height: PARENT_BOTTOM
|
||||
Disabled: True
|
||||
TextColorDisabled: FFFFFF
|
||||
|
||||
|
||||
@@ -25,4 +25,3 @@ Container@SCRIPT_ERROR_PANEL:
|
||||
Height: 20
|
||||
Font: Regular
|
||||
Text: Please send this file to the map author so that they can fix this issue.
|
||||
|
||||
|
||||
@@ -112,4 +112,3 @@ Container@SKIRMISH_STATS:
|
||||
Width: 70
|
||||
Height: 25
|
||||
Align: Center
|
||||
|
||||
|
||||
@@ -381,4 +381,3 @@ Container@PLAYER_WIDGETS:
|
||||
Y: 3
|
||||
ImageCollection: scrollbar
|
||||
ImageName: down_arrow
|
||||
|
||||
|
||||
@@ -145,4 +145,3 @@ Background@MAPCHOOSER_PANEL:
|
||||
Text: Cancel
|
||||
Font: Bold
|
||||
Key: escape
|
||||
|
||||
|
||||
@@ -161,4 +161,3 @@ Background@FULLSCREEN_PLAYER:
|
||||
Y: 0
|
||||
Width: WINDOW_RIGHT
|
||||
Height: WINDOW_BOTTOM
|
||||
|
||||
|
||||
@@ -101,4 +101,3 @@ Container@GLOBALCHAT_PANEL:
|
||||
Height: 25
|
||||
Text: Connect
|
||||
Font: Bold
|
||||
|
||||
|
||||
@@ -110,4 +110,3 @@ ScrollPanel@MULTIPLAYER_FILTER_PANEL:
|
||||
Text: Incompatible
|
||||
TextColor: BEBEBE
|
||||
Font: Regular
|
||||
|
||||
|
||||
@@ -285,4 +285,3 @@ Background@REPLAYBROWSER_PANEL:
|
||||
Font: Bold
|
||||
Key: escape
|
||||
TooltipContainer@TOOLTIP_CONTAINER:
|
||||
|
||||
|
||||
@@ -256,4 +256,3 @@ Background@FACTION_DESCRIPTION_TOOLTIP:
|
||||
Height: 14
|
||||
Font: TinyBold
|
||||
VAlign: Top
|
||||
|
||||
|
||||
@@ -193,4 +193,3 @@ Cursors:
|
||||
attackmove-minimap:
|
||||
Start: 4
|
||||
Length: 4
|
||||
|
||||
|
||||
@@ -43,4 +43,3 @@ Metrics:
|
||||
IncompatibleGameStartedColor: D2691E
|
||||
GlobalChatTextColor: FFFFFF
|
||||
GlobalChatNotificationColor: D3D3D3
|
||||
|
||||
|
||||
@@ -477,4 +477,3 @@ Player:
|
||||
Attractiveness: -10
|
||||
TargetMetric: Value
|
||||
CheckRadius: 7c0
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user