diff --git a/OpenRa.FileFormats/FieldLoader.cs b/OpenRa.FileFormats/FieldLoader.cs index f5f1b1616f..ab521d305c 100644 --- a/OpenRa.FileFormats/FieldLoader.cs +++ b/OpenRa.FileFormats/FieldLoader.cs @@ -11,7 +11,8 @@ namespace OpenRa.FileFormats foreach (var x in ini) { var field = self.GetType().GetField(x.Key.Trim()); - field.SetValue(self, GetValue(field.FieldType, x.Value.Trim())); + if( field != null ) + field.SetValue(self, GetValue(field.FieldType, x.Value.Trim())); } } diff --git a/OpenRa.FileFormats/FileSystem.cs b/OpenRa.FileFormats/FileSystem.cs index 387023aa39..5d015acddc 100644 --- a/OpenRa.FileFormats/FileSystem.cs +++ b/OpenRa.FileFormats/FileSystem.cs @@ -27,6 +27,10 @@ namespace OpenRa.FileFormats FileSystem.Mount( new Package( "speech.mix" ) ); FileSystem.Mount( new Package( "allies.mix" ) ); FileSystem.Mount( new Package( "russian.mix" ) ); + + FileSystem.Mount( new Package( "temperat.mix" ) ); + FileSystem.Mount( new Package( "snow.mix" ) ); + FileSystem.Mount( new Package( "interior.mix" ) ); } public static void MountAftermathPackages() diff --git a/OpenRa.FileFormats/Walkability.cs b/OpenRa.FileFormats/Walkability.cs index a94045b6f2..ef9426ff37 100644 --- a/OpenRa.FileFormats/Walkability.cs +++ b/OpenRa.FileFormats/Walkability.cs @@ -6,7 +6,7 @@ namespace OpenRa.FileFormats { public class TileTemplate { - public int Index; + public int Index; // not valid for `interior` stuff. only used for bridges. public string Name; public int2 Size; public string Bridge; @@ -36,10 +36,11 @@ namespace OpenRa.FileFormats p => int.Parse(p.Key.Substring(8)), p => int.Parse(p.Value)), Name = section.GetValue("Name", null).ToLowerInvariant(), - Index = int.Parse(section.Name.Substring(3)), Bridge = section.GetValue("bridge", null), HP = float.Parse(section.GetValue("hp", "0")) }; + tile.Index = -1; + int.TryParse(section.Name.Substring(3), out tile.Index); walkability[tile.Name] = tile; } diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs index e9e2f4db2e..30b3812138 100644 --- a/OpenRa.Game/Game.cs +++ b/OpenRa.Game/Game.cs @@ -46,7 +46,6 @@ namespace OpenRa Game.changePending = false; Game.mapName = mapName; SheetBuilder.Initialize(renderer); - SpriteSheetBuilder.Initialize(); FileSystem.UnmountTemporaryPackages(); Timer.Time( "reset: {0}" ); diff --git a/OpenRa.Game/Graphics/SpriteSheetBuilder.cs b/OpenRa.Game/Graphics/SpriteSheetBuilder.cs index 3b168da665..b7054962ff 100644 --- a/OpenRa.Game/Graphics/SpriteSheetBuilder.cs +++ b/OpenRa.Game/Graphics/SpriteSheetBuilder.cs @@ -6,13 +6,19 @@ namespace OpenRa.Graphics { static class SpriteSheetBuilder { - public static void Initialize() + public static void Initialize( Map map ) { + exts = new[] { + "." + map.Theater.Substring( 0, 3 ).ToLowerInvariant(), + ".shp", + ".tem", + ".sno", + ".int" }; sprites = new Cache( LoadSprites ); } static Cache sprites; - static readonly string[] exts = { ".tem", ".sno", ".int", ".shp" }; + static string[] exts; static Sprite[] LoadSprites(string filename) { diff --git a/OpenRa.Game/World.cs b/OpenRa.Game/World.cs index 43e2d4c670..c3fb15b429 100644 --- a/OpenRa.Game/World.cs +++ b/OpenRa.Game/World.cs @@ -56,9 +56,8 @@ namespace OpenRa Map = new Map( Rules.AllRules ); Timer.Time( "new Map: {0}" ); - FileSystem.MountTemporary( new Package( Map.Theater + ".mix" ) ); - Timer.Time( "mount temporary packages: {0}" ); TileSet = new TileSet( Map.TileSuffix ); + SpriteSheetBuilder.Initialize( Map ); Timer.Time( "Tileset: {0}" ); BuildingInfluence = new BuildingInfluenceMap( this ); diff --git a/SequenceEditor/Program.cs b/SequenceEditor/Program.cs index ad668bddd6..1059ccc730 100644 --- a/SequenceEditor/Program.cs +++ b/SequenceEditor/Program.cs @@ -76,8 +76,6 @@ namespace SequenceEditor } catch( FileNotFoundException ){} - FileSystem.MountTemporary(new Package("temperat.mix")); - XmlFilename = args.FirstOrDefault( x => x.EndsWith(".xml") ) ?? "sequences.xml"; Doc = new XmlDocument(); Doc.Load(XmlFilename); diff --git a/mods/ra/defaults.yaml b/mods/ra/defaults.yaml index f40786f5d9..eaba4444d7 100644 --- a/mods/ra/defaults.yaml +++ b/mods/ra/defaults.yaml @@ -41,3 +41,7 @@ Selectable: Priority: 3 Building: + Dimensions: 1,1 + Footprint: x + RenderBuilding: + diff --git a/mods/ra/rules.yaml b/mods/ra/rules.yaml index 03e7482096..b9baabb446 100644 --- a/mods/ra/rules.yaml +++ b/mods/ra/rules.yaml @@ -114,7 +114,6 @@ GAP: Armor: wood Crewed: yes Sight: 10 - RenderBuilding: IronCurtainable: MRJ: @@ -155,6 +154,7 @@ MINP: InvisibleToOthers: -Selectable: -Building: + -RenderBuilding: MINV: Mine: @@ -170,6 +170,7 @@ MINV: InvisibleToOthers: -Selectable: -Building: + -RenderBuilding: BR1: Bridge: @@ -246,7 +247,6 @@ MSLO: Armor: heavy Crewed: yes Sight: 5 - RenderBuilding: IronCurtainable: SPEN: @@ -270,7 +270,6 @@ SPEN: Armor: light WaterBound: yes Sight: 4 - RenderBuilding: ProductionSurround: Produces: Ship IronCurtainable: @@ -296,7 +295,6 @@ SYRD: Armor: light WaterBound: yes Sight: 4 - RenderBuilding: ProductionSurround: Produces: Ship IronCurtainable: @@ -321,7 +319,6 @@ IRON: Armor: wood Crewed: yes Sight: 10 - RenderBuilding: IronCurtainable: IronCurtain: @@ -345,7 +342,6 @@ PDOX: Armor: wood Crewed: yes Sight: 10 - RenderBuilding: Chronosphere: IronCurtainable: @@ -375,6 +371,7 @@ TSLA: FireDelay: 8 AutoTarget: IronCurtainable: + -RenderBuilding: AGUN: RequiresPower: @@ -404,6 +401,7 @@ AGUN: SecondaryWeapon: ZSU-23 AutoTarget: IronCurtainable: + -RenderBuilding: DOME: RequiresPower: @@ -426,7 +424,6 @@ DOME: Armor: wood Crewed: yes Sight: 10 - RenderBuilding: ProvidesRadar: IronCurtainable: @@ -1067,14 +1064,11 @@ PBOX: LongDesc: Basic defensive structure.\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks, Aircraft Building: Power: -15 - Footprint: x - Dimensions: 1,1 HP: 400 Armor: wood Crewed: yes Sight: 5 Turreted: - RenderBuilding: AttackTurreted: PrimaryWeapon: Vulcan AutoTarget: @@ -1091,14 +1085,11 @@ HBOX: LongDesc: Hidden defensive structure.\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks, Aircraft Building: Power: -15 - Footprint: x - Dimensions: 1,1 HP: 600 Armor: wood Crewed: yes Sight: 5 Turreted: - RenderBuilding: AttackTurreted: PrimaryWeapon: Vulcan AutoTarget: @@ -1115,8 +1106,6 @@ GUN: LongDesc: Anti-Armor base defense.\n Strong vs Tanks\n Weak vs Infantry, Aircraft Building: Power: -40 - Footprint: x - Dimensions: 1,1 HP: 400 Armor: heavy Crewed: yes @@ -1129,6 +1118,7 @@ GUN: PrimaryWeapon: TurretGun AutoTarget: IronCurtainable: + -RenderBuilding: FTUR: Inherits: ^Building @@ -1143,13 +1133,10 @@ FTUR: ROT: 10 Building: Power: -20 - Footprint: x - Dimensions: 1,1 HP: 400 Armor: heavy Crewed: yes Sight: 6 - RenderBuilding: AttackTurreted: PrimaryWeapon: FireballLauncher PrimaryOffset: 0,0,12,8 @@ -1181,6 +1168,7 @@ SAM: PrimaryWeapon: Nike AutoTarget: IronCurtainable: + -RenderBuilding: ATEK: Inherits: ^Building @@ -1202,7 +1190,6 @@ ATEK: Armor: wood Crewed: yes Sight: 10 - RenderBuilding: IronCurtainable: GpsLaunchSite: @@ -1225,7 +1212,6 @@ WEAP: Armor: light Crewed: yes Sight: 4 - RenderBuilding: RenderWarFactory: RallyPoint: Production: @@ -1244,7 +1230,6 @@ FACT: Armor: heavy Crewed: yes Sight: 5 - RenderBuilding: Production: Produces: Building,Defense ConstructionYard: @@ -1269,7 +1254,6 @@ PROC: Armor: wood Crewed: yes Sight: 6 - RenderBuilding: AcceptsOre: StoresOre: Pips: 17 @@ -1287,8 +1271,6 @@ SILO: LongDesc: Stores excess harvested Ore Building: Power: -10 - Footprint: x - Dimensions: 1,1 Capturable: true HP: 300 Armor: wood @@ -1298,6 +1280,7 @@ SILO: Pips: 5 Capacity: 1500 IronCurtainable: + -RenderBuilding: HPAD: Inherits: ^Building @@ -1318,7 +1301,6 @@ HPAD: Armor: wood Crewed: yes Sight: 5 - RenderBuilding: Production: SpawnOffset: 0,-4 Produces: Plane @@ -1344,7 +1326,6 @@ AFLD: Armor: heavy Crewed: yes Sight: 7 - RenderBuilding: Production: Produces: Plane BelowUnits: @@ -1369,7 +1350,6 @@ POWR: Armor: wood Crewed: yes Sight: 4 - RenderBuilding: IronCurtainable: APWR: @@ -1391,7 +1371,6 @@ APWR: Armor: wood Crewed: yes Sight: 4 - RenderBuilding: IronCurtainable: STEK: @@ -1414,7 +1393,6 @@ STEK: Armor: wood Crewed: yes Sight: 4 - RenderBuilding: IronCurtainable: BARR: @@ -1436,7 +1414,6 @@ BARR: Armor: wood Crewed: yes Sight: 5 - RenderBuilding: RallyPoint: Production: Produces: Infantry @@ -1461,7 +1438,6 @@ TENT: Armor: wood Crewed: yes Sight: 5 - RenderBuilding: RallyPoint: Production: Produces: Infantry @@ -1478,12 +1454,9 @@ KENN: LongDesc: Produces attack dogs Building: Power: -10 - Footprint: x - Dimensions: 1,1 HP: 400 Armor: wood Sight: 4 - RenderBuilding: RallyPoint: Production: IronCurtainable: @@ -1506,7 +1479,6 @@ FIX: Armor: wood Crewed: yes Sight: 5 - RenderBuilding: BelowUnits: Reservable: IronCurtainable: @@ -1623,7 +1595,6 @@ T01: Building: Footprint: __ x_ Dimensions: 2,2 - RenderBuilding: -Selectable: T02: @@ -1631,7 +1602,6 @@ T02: Building: Footprint: __ x_ Dimensions: 2,2 - RenderBuilding: -Selectable: T03: @@ -1639,7 +1609,6 @@ T03: Building: Footprint: __ x_ Dimensions: 2,2 - RenderBuilding: -Selectable: T05: @@ -1647,7 +1616,6 @@ T05: Building: Footprint: __ x_ Dimensions: 2,2 - RenderBuilding: -Selectable: T06: @@ -1655,7 +1623,6 @@ T06: Building: Footprint: __ x_ Dimensions: 2,2 - RenderBuilding: -Selectable: T07: @@ -1663,7 +1630,6 @@ T07: Building: Footprint: __ x_ Dimensions: 2,2 - RenderBuilding: -Selectable: T08: @@ -1671,7 +1637,6 @@ T08: Building: Footprint: x_ Dimensions: 2,1 - RenderBuilding: -Selectable: T10: @@ -1679,7 +1644,6 @@ T10: Building: Footprint: __ xx Dimensions: 2,2 - RenderBuilding: -Selectable: T11: @@ -1687,7 +1651,6 @@ T11: Building: Footprint: __ xx Dimensions: 2,2 - RenderBuilding: -Selectable: T12: @@ -1695,7 +1658,6 @@ T12: Building: Footprint: __ x_ Dimensions: 2,2 - RenderBuilding: -Selectable: T13: @@ -1703,7 +1665,6 @@ T13: Building: Footprint: __ x_ Dimensions: 2,2 - RenderBuilding: -Selectable: T14: @@ -1711,7 +1672,6 @@ T14: Building: Footprint: ___ xx_ Dimensions: 3,2 - RenderBuilding: -Selectable: T15: @@ -1719,7 +1679,6 @@ T15: Building: Footprint: ___ xx_ Dimensions: 3,2 - RenderBuilding: -Selectable: T16: @@ -1727,7 +1686,6 @@ T16: Building: Footprint: __ x_ Dimensions: 2,2 - RenderBuilding: -Selectable: T17: @@ -1735,7 +1693,6 @@ T17: Building: Footprint: __ x_ Dimensions: 2,2 - RenderBuilding: -Selectable: TC01: @@ -1743,7 +1700,6 @@ TC01: Building: Footprint: ___ xx_ Dimensions: 3,2 - RenderBuilding: -Selectable: TC02: @@ -1751,7 +1707,6 @@ TC02: Building: Footprint: _x_ xx_ Dimensions: 3,2 - RenderBuilding: -Selectable: TC03: @@ -1759,7 +1714,6 @@ TC03: Building: Footprint: xx_ xx_ Dimensions: 3,2 - RenderBuilding: -Selectable: TC04: @@ -1767,7 +1721,6 @@ TC04: Building: Footprint: ____ xxx_ x___ Dimensions: 4,3 - RenderBuilding: -Selectable: TC05: @@ -1775,18 +1728,49 @@ TC05: Building: Footprint: __x_ xxx_ _xx_ Dimensions: 4,3 - RenderBuilding: -Selectable: MINE: Inherits: ^Building - Building: - Footprint: x - Dimensions: 1,1 - RenderBuilding: SeedsOre: -Selectable: +BOXES01: + Inherits: ^Building + -Selectable: + +BOXES02: + Inherits: ^Building + -Selectable: + +BOXES03: + Inherits: ^Building + -Selectable: + +BOXES04: + Inherits: ^Building + -Selectable: + +BOXES05: + Inherits: ^Building + -Selectable: + +BOXES06: + Inherits: ^Building + -Selectable: + +BOXES07: + Inherits: ^Building + -Selectable: + +BOXES08: + Inherits: ^Building + -Selectable: + +BOXES09: + Inherits: ^Building + -Selectable: + FCOM: Inherits: ^Building Building: @@ -1799,7 +1783,6 @@ FCOM: Armor: wood Crewed: yes Sight: 10 - RenderBuilding: V01: Inherits: ^Building @@ -1810,7 +1793,6 @@ V01: Repairable: false HP: 400 Armor: wood - RenderBuilding: V02: Inherits: ^Building @@ -1820,7 +1802,6 @@ V02: Repairable: false HP: 400 Armor: wood - RenderBuilding: V03: Inherits: ^Building @@ -1830,7 +1811,6 @@ V03: Repairable: false HP: 400 Armor: wood - RenderBuilding: V04: Inherits: ^Building @@ -1840,7 +1820,6 @@ V04: Repairable: false HP: 400 Armor: wood - RenderBuilding: V05: Inherits: ^Building @@ -1850,7 +1829,6 @@ V05: Repairable: false HP: 400 Armor: wood - RenderBuilding: V06: Inherits: ^Building @@ -1860,7 +1838,6 @@ V06: Repairable: false HP: 400 Armor: wood - RenderBuilding: V07: Inherits: ^Building @@ -1870,127 +1847,90 @@ V07: Repairable: false HP: 400 Armor: wood - RenderBuilding: V08: Inherits: ^Building Building: - Footprint: x - Dimensions: 1,1 Repairable: false HP: 400 Armor: wood - RenderBuilding: V09: Inherits: ^Building Building: - Footprint: x - Dimensions: 1,1 Repairable: false HP: 400 Armor: wood - RenderBuilding: V10: Inherits: ^Building Building: - Footprint: x - Dimensions: 1,1 Repairable: false HP: 400 Armor: wood - RenderBuilding: V11: Inherits: ^Building Building: - Footprint: x - Dimensions: 1,1 Repairable: false HP: 400 Armor: wood - RenderBuilding: V12: Inherits: ^Building Building: - Footprint: x - Dimensions: 1,1 Repairable: false HP: 400 Armor: wood - RenderBuilding: V13: Inherits: ^Building Building: - Footprint: x - Dimensions: 1,1 Repairable: false HP: 400 Armor: wood - RenderBuilding: V14: Inherits: ^Building Building: - Footprint: x - Dimensions: 1,1 Repairable: false HP: 400 Armor: wood - RenderBuilding: V15: Inherits: ^Building Building: - Footprint: x - Dimensions: 1,1 Repairable: false HP: 400 Armor: wood - RenderBuilding: V16: Inherits: ^Building Building: - Footprint: x - Dimensions: 1,1 Repairable: false HP: 400 Armor: wood - RenderBuilding: V17: Inherits: ^Building Building: - Footprint: x - Dimensions: 1,1 Repairable: false HP: 400 Armor: wood - RenderBuilding: V18: Inherits: ^Building Building: - Footprint: x - Dimensions: 1,1 Repairable: false HP: 400 Armor: wood - RenderBuilding: V19: Inherits: ^Building Building: - Footprint: x - Dimensions: 1,1 Repairable: false HP: 400 Armor: wood - RenderBuilding: V20: Inherits: ^Building @@ -1998,6 +1938,8 @@ V20: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2007,6 +1949,8 @@ V21: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2016,6 +1960,8 @@ V22: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2025,6 +1971,8 @@ V23: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2034,6 +1982,8 @@ V24: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2043,6 +1993,8 @@ V25: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2052,6 +2004,8 @@ V26: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2061,6 +2015,8 @@ V27: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2070,6 +2026,8 @@ V28: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2079,6 +2037,8 @@ V29: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2088,6 +2048,8 @@ V30: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2097,6 +2059,8 @@ V31: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2106,6 +2070,8 @@ V32: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2115,6 +2081,8 @@ V33: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2124,6 +2092,8 @@ V34: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2133,6 +2103,8 @@ V35: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2142,6 +2114,8 @@ V36: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2151,6 +2125,8 @@ V37: Repairable: false HP: 400 Armor: wood + -Dimensions: + -Footprint: RenderBuilding: Image: FCOM @@ -2159,13 +2135,10 @@ BARL: Selectable: Priority: 0 Building: - Footprint: x - Dimensions: 1,1 Repairable: false BaseNormal: no Adjacent: 0 HP: 10 - RenderBuilding: Explodes: BRL3: @@ -2173,13 +2146,10 @@ BRL3: Selectable: Priority: 0 Building: - Footprint: x - Dimensions: 1,1 Repairable: false BaseNormal: no Adjacent: 0 HP: 10 - RenderBuilding: Explodes: MISS: @@ -2193,7 +2163,6 @@ MISS: Bib: yes HP: 400 Armor: wood - RenderBuilding: DOG: Inherits: ^Infantry diff --git a/mods/ra/sequences.xml b/mods/ra/sequences.xml index 91c0d64530..9942d501d4 100644 --- a/mods/ra/sequences.xml +++ b/mods/ra/sequences.xml @@ -680,6 +680,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1054,4 +1081,4 @@ - \ No newline at end of file + diff --git a/mods/ra/trees.ini b/mods/ra/trees.ini index dc5d6c14f9..8ecab4f2cb 100644 --- a/mods/ra/trees.ini +++ b/mods/ra/trees.ini @@ -20,6 +20,15 @@ TC03 TC04 TC05 MINE +BOXES01 +BOXES02 +BOXES03 +BOXES04 +BOXES05 +BOXES06 +BOXES07 +BOXES08 +BOXES09 [T01] Description=Tree @@ -188,3 +197,76 @@ Footprint=x Dimensions=1,1 Name=MINE Selectable=no + +[BOXES01] +Description=Boxes +Traits=Building, RenderBuilding +Footprint=x +Dimensions=1,1 +Name=BOXES01 +Selectable=no + +[BOXES02] +Description=Boxes +Traits=Building, RenderBuilding +Footprint=x +Dimensions=1,1 +Name=BOXES02 +Selectable=no + +[BOXES03] +Description=Boxes +Traits=Building, RenderBuilding +Footprint=x +Dimensions=1,1 +Name=BOXES03 +Selectable=no + +[BOXES04] +Description=Boxes +Traits=Building, RenderBuilding +Footprint=x +Dimensions=1,1 +Name=BOXES04 +Selectable=no + +[BOXES05] +Description=Boxes +Traits=Building, RenderBuilding +Footprint=x +Dimensions=1,1 +Name=BOXES05 +Selectable=no + +[BOXES06] +Description=Boxes +Traits=Building, RenderBuilding +Footprint=x +Dimensions=1,1 +Name=BOXES06 +Selectable=no + +[BOXES07] +Description=Boxes +Traits=Building, RenderBuilding +Footprint=x +Dimensions=1,1 +Name=BOXES07 +Selectable=no + +[BOXES08] +Description=Boxes +Traits=Building, RenderBuilding +Footprint=x +Dimensions=1,1 +Name=BOXES08 +Selectable=no + +[BOXES09] +Description=Boxes +Traits=Building, RenderBuilding +Footprint=x +Dimensions=1,1 +Name=BOXES09 +Selectable=no + diff --git a/templates.ini b/templates.ini index b3d10064a0..990bc437a4 100644 --- a/templates.ini +++ b/templates.ini @@ -2835,8 +2835,825 @@ tiletype19=2 tiletype23=2 tiletype24=2 + +; interior tiles + + +;;;;;; the interior `clear` tile is incompatible with the temperat/snow ones. +;[INT_clear1] +;Name=clear1 +;width=1 +;height=1 +;tiletype0=7 + +[INT_arro0001] +Name=arro0001 +width=1 +height=1 +tiletype0=0 +[INT_arro0002] +Name=arro0002 +width=1 +height=1 +tiletype0=0 +[INT_arro0003] +Name=arro0003 +width=1 +height=1 +tiletype0=0 +[Blah] +Name=arro0004 +width=1 +height=1 +tiletype0=0 +[INT_arro0005] +Name=arro0005 +width=1 +height=1 +tiletype0=0 +[INT_arro0006] +Name=arro0006 +width=1 +height=1 +tiletype0=0 +[INT_arro0007] +Name=arro0007 +width=1 +height=1 +tiletype0=0 +[INT_arro0008] +Name=arro0008 +width=1 +height=1 +tiletype0=0 +[INT_arro0009] +Name=arro0009 +width=1 +height=1 +tiletype0=0 +[INT_arro0010] +Name=arro0010 +width=1 +height=1 +tiletype0=0 +[INT_arro0011] +Name=arro0011 +width=1 +height=1 +tiletype0=0 +[INT_arro0012] +Name=arro0012 +width=1 +height=1 +tiletype0=0 +[INT_arro0013] +Name=arro0013 +width=1 +height=1 +tiletype0=0 +[INT_arro0014] +Name=arro0014 +width=1 +height=1 +tiletype0=0 +[INT_arro0015] +Name=arro0015 +width=1 +height=1 +tiletype0=0 + +[INT_flor0001] +Name=flor0001 +width=1 +height=1 +tiletype0=0 +[INT_flor0002] +Name=flor0002 +width=1 +height=1 +tiletype0=0 +[INT_flor0003] +Name=flor0003 +width=1 +height=1 +tiletype0=0 +[INT_flor0004] +Name=flor0004 +width=1 +height=1 +tiletype0=0 +[INT_flor0005] +Name=flor0005 +width=1 +height=1 +tiletype0=0 +[INT_flor0006] +Name=flor0006 +width=1 +height=1 +tiletype0=0 +[INT_flor0007] +Name=flor0007 +width=1 +height=1 +tiletype0=0 + +[INT_gflr0001] +Name=gflr0001 +width=1 +height=1 +tiletype0=0 +[INT_gflr0002] +Name=gflr0002 +width=1 +height=1 +tiletype0=0 +[INT_gflr0003] +Name=gflr0003 +width=1 +height=1 +tiletype0=0 +[INT_gflr0004] +Name=gflr0004 +width=1 +height=1 +tiletype0=0 +[INT_gflr0005] +Name=gflr0005 +width=1 +height=1 +tiletype0=0 + +[INT_gstr0001] +Name=gstr0001 +width=1 +height=1 +tiletype0=0 +[INT_gstr0002] +Name=gstr0002 +width=1 +height=1 +tiletype0=0 +[INT_gstr0003] +Name=gstr0003 +width=1 +height=1 +tiletype0=0 +[INT_gstr0004] +Name=gstr0004 +width=1 +height=1 +tiletype0=0 +[INT_gstr0005] +Name=gstr0005 +width=1 +height=1 +tiletype0=0 +[INT_gstr0006] +Name=gstr0006 +width=1 +height=1 +tiletype0=0 +[INT_gstr0007] +Name=gstr0007 +width=1 +height=1 +tiletype0=0 +[INT_gstr0008] +Name=gstr0008 +width=1 +height=1 +tiletype0=0 +[INT_gstr0009] +Name=gstr0009 +width=1 +height=1 +tiletype0=0 +[INT_gstr0010] +Name=gstr0010 +width=1 +height=1 +tiletype0=0 +[INT_gstr0011] +Name=gstr0011 +width=1 +height=1 +tiletype0=0 + +[INT_lwal0001] +Name=lwal0001 +width=1 +height=1 +tiletype0=7 +[INT_lwal0002] +Name=lwal0002 +width=1 +height=1 +tiletype0=7 +[INT_lwal0003] +Name=lwal0003 +width=1 +height=1 +tiletype0=7 +[INT_lwal0004] +Name=lwal0004 +width=1 +height=1 +tiletype0=7 +[INT_lwal0005] +Name=lwal0005 +width=1 +height=1 +tiletype0=7 +[INT_lwal0006] +Name=lwal0006 +width=1 +height=1 +tiletype0=7 +[INT_lwal0007] +Name=lwal0007 +width=1 +height=1 +tiletype0=7 +[INT_lwal0008] +Name=lwal0008 +width=1 +height=1 +tiletype0=7 +[INT_lwal0009] +Name=lwal0009 +width=1 +height=1 +tiletype0=7 +[INT_lwal0010] +Name=lwal0010 +width=1 +height=1 +tiletype0=7 +[INT_lwal0011] +Name=lwal0011 +width=1 +height=1 +tiletype0=7 +[INT_lwal0012] +Name=lwal0012 +width=1 +height=1 +tiletype0=7 +[INT_lwal0013] +Name=lwal0013 +width=1 +height=1 +tiletype0=7 +[INT_lwal0014] +Name=lwal0014 +width=1 +height=1 +tiletype0=7 +[INT_lwal0015] +Name=lwal0015 +width=1 +height=1 +tiletype0=7 +[INT_lwal0016] +Name=lwal0016 +width=1 +height=1 +tiletype0=7 +[INT_lwal0017] +Name=lwal0017 +width=1 +height=1 +tiletype0=7 +[INT_lwal0018] +Name=lwal0018 +width=1 +height=1 +tiletype0=7 +[INT_lwal0019] +Name=lwal0019 +width=1 +height=1 +tiletype0=7 +[INT_lwal0020] +Name=lwal0020 +width=1 +height=1 +tiletype0=7 +[INT_lwal0021] +Name=lwal0021 +width=1 +height=1 +tiletype0=7 +[INT_lwal0022] +Name=lwal0022 +width=1 +height=1 +tiletype0=7 +[INT_lwal0023] +Name=lwal0023 +width=1 +height=1 +tiletype0=7 +[INT_lwal0024] +Name=lwal0024 +width=1 +height=1 +tiletype0=7 +[INT_lwal0025] +Name=lwal0025 +width=1 +height=1 +tiletype0=7 +[INT_lwal0026] +Name=lwal0026 +width=1 +height=1 +tiletype0=7 +[INT_lwal0027] +Name=lwal0027 +width=1 +height=1 +tiletype0=7 + +[INT_strp0001] +Name=strp0001 +width=1 +height=1 +tiletype0=0 +[INT_strp0002] +Name=strp0002 +width=1 +height=1 +tiletype0=0 +[INT_strp0003] +Name=strp0003 +width=1 +height=1 +tiletype0=0 +[INT_strp0004] +Name=strp0004 +width=1 +height=1 +tiletype0=0 +[INT_strp0005] +Name=strp0005 +width=1 +height=1 +tiletype0=0 +[INT_strp0006] +Name=strp0006 +width=1 +height=1 +tiletype0=0 +[INT_strp0007] +Name=strp0007 +width=1 +height=1 +tiletype0=0 +[INT_strp0008] +Name=strp0008 +width=1 +height=1 +tiletype0=0 +[INT_strp0009] +Name=strp0009 +width=1 +height=1 +tiletype0=0 +[INT_strp0010] +Name=strp0010 +width=1 +height=1 +tiletype0=0 +[INT_strp0011] +Name=strp0011 +width=1 +height=1 +tiletype0=0 + +[INT_wall0001] +Name=wall0001 +width=1 +height=1 +tiletype0=7 +[INT_wall0002] +Name=wall0002 +width=1 +height=1 +tiletype0=7 +[INT_wall0003] +Name=wall0003 +width=1 +height=1 +tiletype0=7 +[INT_wall0004] +Name=wall0004 +width=1 +height=1 +tiletype0=7 +[INT_wall0005] +Name=wall0005 +width=1 +height=1 +tiletype0=7 +[INT_wall0006] +Name=wall0006 +width=1 +height=1 +tiletype0=7 +[INT_wall0007] +Name=wall0007 +width=1 +height=1 +tiletype0=7 +[INT_wall0008] +Name=wall0008 +width=1 +height=1 +tiletype0=7 +[INT_wall0009] +Name=wall0009 +width=1 +height=1 +tiletype0=7 +[INT_wall0010] +Name=wall0010 +width=1 +height=1 +tiletype0=7 +[INT_wall0011] +Name=wall0011 +width=1 +height=1 +tiletype0=7 +[INT_wall0012] +Name=wall0012 +width=1 +height=1 +tiletype0=7 +[INT_wall0013] +Name=wall0013 +width=1 +height=1 +tiletype0=7 +[INT_wall0014] +Name=wall0014 +width=1 +height=1 +tiletype0=7 +[INT_wall0015] +Name=wall0015 +width=1 +height=1 +tiletype0=7 +[INT_wall0016] +Name=wall0016 +width=1 +height=1 +tiletype0=7 +[INT_wall0017] +Name=wall0017 +width=1 +height=1 +tiletype0=7 +[INT_wall0018] +Name=wall0018 +width=1 +height=1 +tiletype0=7 +[INT_wall0019] +Name=wall0019 +width=1 +height=1 +tiletype0=7 +[INT_wall0020] +Name=wall0020 +width=1 +height=1 +tiletype0=7 +[INT_wall0021] +Name=wall0021 +width=1 +height=1 +tiletype0=7 +[INT_wall0022] +Name=wall0022 +width=1 +height=1 +tiletype0=7 + +[INT_wall0023] +Name=wall0023 +width=2 +height=2 +tiletype0=7 +tiletype1=7 +tiletype2=7 +[INT_wall0024] +Name=wall0024 +width=2 +height=2 +tiletype0=7 +tiletype1=7 +tiletype2=7 +[INT_wall0025] +Name=wall0025 +width=2 +height=2 +tiletype0=7 +tiletype1=7 +tiletype2=7 +[INT_wall0026] +Name=wall0026 +width=2 +height=2 +tiletype0=7 +tiletype1=7 +tiletype2=7 +[INT_wall0027] +Name=wall0027 +width=2 +height=2 +tiletype0=7 +tiletype1=7 +tiletype3=7 +[INT_wall0028] +Name=wall0028 +width=2 +height=2 +tiletype0=7 +tiletype1=7 +tiletype3=7 +[INT_wall0029] +Name=wall0029 +width=2 +height=2 +tiletype0=7 +tiletype1=7 +tiletype3=7 +[INT_wall0030] +Name=wall0030 +width=2 +height=2 +tiletype0=7 +tiletype1=7 +tiletype3=7 +[INT_wall0031] +Name=wall0031 +width=2 +height=2 +tiletype0=7 +tiletype2=7 +tiletype3=7 +[INT_wall0032] +Name=wall0032 +width=2 +height=2 +tiletype0=7 +tiletype2=7 +tiletype3=7 +[INT_wall0033] +Name=wall0033 +width=2 +height=2 +tiletype0=7 +tiletype2=7 +tiletype3=7 +[INT_wall0034] +Name=wall0034 +width=2 +height=2 +tiletype0=7 +tiletype2=7 +tiletype3=7 +[INT_wall0035] +Name=wall0035 +width=2 +height=2 +tiletype1=7 +tiletype2=7 +tiletype3=7 +[INT_wall0036] +Name=wall0036 +width=2 +height=2 +tiletype1=7 +tiletype2=7 +tiletype3=7 +[INT_wall0037] +Name=wall0037 +width=2 +height=2 +tiletype1=7 +tiletype2=7 +tiletype3=7 +[INT_wall0038] +Name=wall0038 +width=2 +height=2 +tiletype1=7 +tiletype2=7 +tiletype3=7 + +[INT_wall0039] +Name=wall0039 +width=2 +height=3 +tiletype0=7 +tiletype2=7 +tiletype3=7 +tiletype4=7 +[INT_wall0040] +Name=wall0040 +width=2 +height=3 +tiletype0=7 +tiletype2=7 +tiletype3=7 +tiletype4=7 +[INT_wall0041] +Name=wall0041 +width=2 +height=3 +tiletype1=7 +tiletype2=7 +tiletype3=7 +tiletype5=7 +[INT_wall0042] +Name=wall0042 +width=2 +height=3 +tiletype1=7 +tiletype2=7 +tiletype3=7 +tiletype5=7 + +[INT_wall0043] +Name=wall0043 +width=3 +height=2 +tiletype1=7 +tiletype3=7 +tiletype4=7 +tiletype5=7 +[INT_wall0044] +Name=wall0044 +width=3 +height=2 +tiletype1=7 +tiletype3=7 +tiletype4=7 +tiletype5=7 +[INT_wall0045] +Name=wall0045 +width=3 +height=2 +tiletype1=7 +tiletype3=7 +tiletype4=7 +tiletype5=7 +[INT_wall0046] +Name=wall0046 +width=3 +height=2 +tiletype1=7 +tiletype3=7 +tiletype4=7 +tiletype5=7 +[INT_wall0047] +Name=wall0047 +width=3 +height=2 +tiletype0=7 +tiletype1=7 +tiletype2=7 +tiletype4=7 +[INT_wall0048] +Name=wall0048 +width=3 +height=2 +tiletype0=7 +tiletype1=7 +tiletype2=7 +tiletype4=7 +[INT_wall0049] +Name=wall0049 +width=3 +height=3 +tiletype1=7 +tiletype3=7 +tiletype4=7 +tiletype5=7 +tiletype7=7 + +[INT_xtra0001] +Name=xtra0001 +width=1 +height=1 +tiletype0=7 +[INT_xtra0002] +Name=xtra0002 +width=2 +height=1 +tiletype0=7 +tiletype1=0 +[INT_xtra0003] +Name=xtra0003 +width=1 +height=1 +tiletype0=7 +[INT_xtra0004] +Name=xtra0004 +width=1 +height=2 +tiletype0=7 +tiletype1=0 +[INT_xtra0005] +Name=xtra0005 +width=1 +height=1 +tiletype0=7 +[INT_xtra0006] +Name=xtra0006 +width=2 +height=1 +tiletype0=7 +tiletype1=0 +[INT_xtra0007] +Name=xtra0007 +width=1 +height=1 +tiletype0=7 +[INT_xtra0008] +Name=xtra0008 +width=1 +height=2 +tiletype0=7 +tiletype1=0 +[INT_xtra0009] +Name=xtra0009 +width=1 +height=1 +tiletype0=7 +[INT_xtra0010] +Name=xtra0010 +width=1 +height=1 +tiletype0=7 +[INT_xtra0011] +Name=xtra0011 +width=1 +height=1 +tiletype0=7 +[INT_xtra0012] +Name=xtra0012 +width=1 +height=2 +tiletype0=7 +tiletype1=0 +[INT_xtra0013] +Name=xtra0013 +width=1 +height=2 +tiletype0=7 +tiletype1=0 +[INT_xtra0014] +Name=xtra0014 +width=3 +height=2 +tiletype0=0 +tiletype1=7 +tiletype2=0 +tiletype3=0 +tiletype4=0 +tiletype5=0 +[INT_xtra0015] +Name=xtra0015 +width=3 +height=2 +tiletype0=7 +tiletype1=7 +tiletype2=7 +tiletype3=7 +tiletype4=7 +tiletype5=7 +[INT_xtra0016] +Name=xtra0016 +width=2 +height=4 +tiletype0=7 +tiletype1=7 +tiletype2=7 +tiletype3=7 +tiletype4=7 +tiletype5=7 +tiletype6=7 +tiletype7=7 + +; special tile [TEM65534] Name=Bogus width=1 height=1 -tiletype0=10 \ No newline at end of file +tiletype0=10