diff --git a/OpenRa.Game/Bridges.cs b/OpenRa.Game/Bridges.cs index 28d00bcdf0..3a6146c9dd 100644 --- a/OpenRa.Game/Bridges.cs +++ b/OpenRa.Game/Bridges.cs @@ -51,12 +51,12 @@ namespace OpenRa } } - if (replacedTiles.Any()) + /*if (replacedTiles.Any()) { var a = w.CreateActor(template.Bridge, new int2(ni, nj), null); var br = a.traits.Get(); br.SetTiles(w, template, replacedTiles); - } + }*/ } static bool IsBridge(World w, ushort t) diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs index b01e5e3b0e..126b7dee7f 100644 --- a/OpenRa.Game/Game.cs +++ b/OpenRa.Game/Game.cs @@ -77,11 +77,12 @@ namespace OpenRa viewport = new Viewport(clientSize, Game.world.Map.Offset, Game.world.Map.Offset + Game.world.Map.Size, renderer); Timer.Time( "SeqProv, viewport: {0}" ); +/* skipMakeAnims = true; foreach (var treeReference in Game.world.Map.Trees) world.CreateActor(treeReference.Image, new int2(treeReference.Location), null); Timer.Time( "trees: {0}" ); - +*/ world.LoadMapActors(Rules.AllRules); skipMakeAnims = false; Timer.Time( "map actors: {0}" ); diff --git a/OpenRa.Game/Shroud.cs b/OpenRa.Game/Shroud.cs index a70a239463..d4600364f3 100644 --- a/OpenRa.Game/Shroud.cs +++ b/OpenRa.Game/Shroud.cs @@ -147,6 +147,7 @@ namespace OpenRa internal void Draw(SpriteRenderer r) { + return; if (dirty) { dirty = false; diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index 71925e153c..2cbca4f328 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -2,23 +2,32 @@ Folders: ./ - + mods/cnc/ Packages: - main.mix - redalert.mix - conquer.mix - hires.mix - local.mix - sounds.mix - speech.mix - allies.mix - russian.mix + mods/cnc/packages/cclocal.mix + mods/cnc/packages/speech.mix mods/cnc/packages/conquer.mix mods/cnc/packages/general.mix mods/cnc/packages/sounds.mix - mods/cnc/packages/temperat.mix - mods/cnc/packages/desert.mix - mods/cnc/packages/winter.mix + mods/cnc/packages/transit.mix +# Icons for each theatre + mods/cnc/packages/deseicnh.mix + mods/cnc/packages/tempicnh.mix + mods/cnc/packages/winticnh.mix + main.mix + redalert.mix + hires.mix + local.mix + speech.mix + allies.mix + russian.mix + temperat.mix + snow.mix + interior.mix + general.mix + conquer.mix + sounds.mix + LegacyRules: mods/ra/rules.ini: More or less original Red Alert rules file. @@ -26,10 +35,10 @@ LegacyRules: Rules: mods/ra/defaults.yaml: Basic stuff - mods/ra/rules.yaml: OpenRA actorinfos + mods/cnc/rules.yaml: OpenRA actorinfos Sequences: - mods/ra/sequences.xml: Original animation sequences + mods/cnc/sequences.xml: Original animation sequences Assemblies: mods/ra/OpenRa.Mods.RA.dll: Traits used diff --git a/mods/cnc/rules.yaml b/mods/cnc/rules.yaml new file mode 100644 index 0000000000..84468b921e --- /dev/null +++ b/mods/cnc/rules.yaml @@ -0,0 +1,112 @@ +Player: + ProductionQueue: + PlaceBuilding: + +World: + WaterPaletteRotation: + BuildingInfluence: + UnitInfluence: + +MCV: + Inherits: ^Vehicle + Buildable: + TechLevel: 7 + Prerequisites: eye + Owner: allies,soviet + Cost: 5000 + Description: Mobile Construction Vehicle + LongDesc: Deploys into another Construction Yard.\n Unarmed + Selectable: + Priority: 3 + Unit: + HP: 600 + Armor: light + Crewed: yes + Sight: 2 + Speed: 12 + McvDeploy: + RenderUnit: + +HARV: + Inherits: ^Vehicle + Buildable: + TechLevel: 2 + Prerequisites: proc + Owner: allies,soviet + Cost: 1400 + Description: Harvester + LongDesc: Collects Tiberium for processing.\n Unarmed + Selectable: + Priority: 7 + Harvester: + Unit: + HP: 600 + Armor: light + Crewed: yes + Sight: 4 + Speed: 6 + Mobile: + MovementType: Track + RenderUnit: + +FACT: + Inherits: ^Building + Building: + Power: 15 + Footprint: xxx xxx xxx + Dimensions: 3,3 + Capturable: true + Bib: yes + HP: 400 + Armor: wood + Crewed: yes + Sight: 3 + Production: + Produces: Building,Defense + ConstructionYard: + +NUKE: + Inherits: ^Building + Buildable: + Icon: nukeicnh + TechLevel: 1 + Owner: allies,soviet + Cost: 300 + Description: Power Plant + LongDesc: Provides power for other structures + Building: + Power: 100 + Footprint: xx xx + Dimensions: 2,2 + Capturable: true + Bib: yes + HP: 200 + Armor: wood + Crewed: yes + Sight: 2 + +PROC: + Inherits: ^Building + Buildable: + Icon: procicnh + TechLevel: 2 + Prerequisites: nuke + Owner: allies,soviet + Cost: 2000 + Description: Ore Refinery + LongDesc: Converts Ore and Gems into money + Building: + Power: -30 + Footprint: _x_ xxx x== + Dimensions: 3,3 + Capturable: true + Bib: yes + HP: 450 + Armor: wood + Crewed: yes + Sight: 4 + AcceptsOre: + StoresOre: + Pips: 17 + Capacity: 1000 + IronCurtainable: diff --git a/mods/cnc/sequences.xml b/mods/cnc/sequences.xml new file mode 100644 index 0000000000..cd4b909f97 --- /dev/null +++ b/mods/cnc/sequences.xml @@ -0,0 +1,1051 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +