From 67330a757bbc60f572d6d969dfd376e534eacaa1 Mon Sep 17 00:00:00 2001 From: BinaryConstruct Date: Sat, 27 Aug 2011 01:37:23 -0500 Subject: [PATCH] Update to settings.xml file closes #105 --- TEdit.sln | 1 - TEdit/Properties/AssemblyInfo.cs | 4 +- TEdit/RenderWorld/ColorProperty.cs | 153 +++++++ TEdit/RenderWorld/Settings.cs | 160 -------- TEdit/RenderWorld/TileColor.cs | 86 ---- TEdit/RenderWorld/WorldRenderer.cs | 32 +- TEdit/RenderWorld/WorldSettings.cs | 107 +++++ TEdit/TEdit.csproj | 10 +- TEdit/TerrariaWorld/Item.cs | 2 +- TEdit/TerrariaWorld/TileProperties.cs | 371 ----------------- TEdit/TerrariaWorld/World.File.cs | 9 +- TEdit/TerrariaWorld/World.cs | 5 +- TEdit/Tools/Clipboard/ClipboardBuffer.File.cs | 6 +- TEdit/Tools/TilePicker.cs | 20 +- TEdit/Tools/Tool/DungeonPointPicker.cs | 3 +- TEdit/Tools/Tool/SpawnPointPicker.cs | 4 +- TEdit/Tools/Tool/SpritePlacer.cs | 6 +- TEdit/ViewModels/WorldViewModel.cs | 4 +- TEdit/colors.txt | 128 ------ TEdit/items.txt | 375 ------------------ TEdit/settings.xml | 104 ++--- 21 files changed, 371 insertions(+), 1219 deletions(-) create mode 100644 TEdit/RenderWorld/ColorProperty.cs delete mode 100644 TEdit/RenderWorld/Settings.cs delete mode 100644 TEdit/RenderWorld/TileColor.cs create mode 100644 TEdit/RenderWorld/WorldSettings.cs delete mode 100644 TEdit/TerrariaWorld/TileProperties.cs delete mode 100644 TEdit/colors.txt delete mode 100644 TEdit/items.txt diff --git a/TEdit.sln b/TEdit.sln index 67861759..7c0bcd9c 100644 --- a/TEdit.sln +++ b/TEdit.sln @@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject changelog.txt = changelog.txt GPL.txt = GPL.txt - README = README EndProjectSection EndProject Global diff --git a/TEdit/Properties/AssemblyInfo.cs b/TEdit/Properties/AssemblyInfo.cs index a2c1495b..36e2e0dd 100644 --- a/TEdit/Properties/AssemblyInfo.cs +++ b/TEdit/Properties/AssemblyInfo.cs @@ -52,5 +52,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.8.4")] -[assembly: AssemblyFileVersion("2.0.8.4")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.8.5")] +[assembly: AssemblyFileVersion("2.0.8.5")] \ No newline at end of file diff --git a/TEdit/RenderWorld/ColorProperty.cs b/TEdit/RenderWorld/ColorProperty.cs new file mode 100644 index 00000000..0fc7336f --- /dev/null +++ b/TEdit/RenderWorld/ColorProperty.cs @@ -0,0 +1,153 @@ +using System; +using System.Windows.Media; +using TEdit.Common; + +namespace TEdit.RenderWorld +{ + [Serializable] + public class TileProperty : ColorProperty + { + private bool _isFramed; + public bool IsFramed + { + get { return _isFramed; } + set + { + if (_isFramed != value) + { + _isFramed = value; + RaisePropertyChanged("IsFramed"); + } + } + } + + private bool _isSolid; + public bool IsSolid + { + get { return _isSolid; } + set + { + if (_isSolid != value) + { + _isSolid = value; + RaisePropertyChanged("IsSolid"); + } + } + } + + private bool _IsSolidTop; + public bool IsSolidTop + { + get { return this._IsSolidTop; } + set + { + if (this._IsSolidTop != value) + { + this._IsSolidTop = value; + this.RaisePropertyChanged("IsSolidTop"); + } + } + } + + + } + + [Serializable] + public class ItemProperty : ObservableObject + { + private int _id; + public int Id + { + get { return _id; } + set + { + if (_id != value) + { + _id = value; + RaisePropertyChanged("Id"); + } + } + } + + private string _name; + public string Name + { + get { return _name; } + set + { + if (_name != value) + { + _name = value; + RaisePropertyChanged("Name"); + } + } + } + + + + } + + [Serializable] + public class ColorProperty : ObservableObject + { + private Color _color; + private byte _id; + private string _name; + + public ColorProperty() + { + } + + public ColorProperty(byte id, Color color, string name) + { + _id = id; + _name = name; + _color = color; + } + + public byte ID + { + get { return _id; } + set + { + if (_id != value) + { + _id = value; + RaisePropertyChanged("ID"); + } + } + } + + + public string Name + { + get { return _name; } + set + { + if (_name != value) + { + _name = value; + RaisePropertyChanged("Name"); + } + } + } + + public Color Color + { + get { return _color; } + set + { + if (_color != value) + { + _color = value; + RaisePropertyChanged("Color"); + } + } + } + + public override string ToString() + { + return String.Format("{0}|{1}|#{2:x2}{3:x2}{4:x2}{5:x2}", ID, Name, Color.A, Color.R, Color.G, Color.B); + } + } +} \ No newline at end of file diff --git a/TEdit/RenderWorld/Settings.cs b/TEdit/RenderWorld/Settings.cs deleted file mode 100644 index 0a94aca4..00000000 --- a/TEdit/RenderWorld/Settings.cs +++ /dev/null @@ -1,160 +0,0 @@ -using System; -using System.Collections.ObjectModel; -using System.IO; -using System.Linq; -using System.Windows.Media; - -namespace TEdit.RenderWorld -{ - public static class Settings - { - #region FileSection enum - - public enum FileSection - { - WALLCOLORS, - TILECOLORS, - LIQUIDCOLORS - } - - #endregion - - private static readonly TileColor[] _tiles = new TileColor[byte.MaxValue+1]; - private static readonly TileColor[] _walls = new TileColor[byte.MaxValue+1]; - private static readonly ObservableCollection _items = new ObservableCollection(); - - static Settings() - { - Load("colors.txt"); - LoadItems("items.txt"); - OnSettingsLoaded(null, new EventArgs()); - } - - public static ObservableCollection Items - { - get { return _items; } - } - - public static TileColor[] Tiles - { - get { return _tiles; } - } - - public static TileColor[] Walls - { - get { return _walls; } - } - - public static Color Water { get; set; } - public static Color Lava { get; set; } - public static event EventHandler SettingsLoaded; - - private static void OnSettingsLoaded(object sender, EventArgs e) - { - if (SettingsLoaded != null) - SettingsLoaded(sender, e); - } - - - public static void LoadItems(string filename) - { - using (TextReader sr = new StreamReader(filename)) - { - var items = new ObservableCollection(); - string line = string.Empty; - while ((line = sr.ReadLine()) != null) - { - items.Add(line.Split('|')[1]); - } - foreach (string item in items.OrderBy(x => x)) - { - _items.Add(item); - } - } - } - - public static void Load(string filename) - { - Water = Color.FromArgb(128, 0, 64, 255); - Lava = Color.FromArgb(255, 255, 96, 0); - - for (int i = 0; i <= byte.MaxValue; i++) - { - _tiles[i] = new TileColor {Color = Colors.Magenta, ID = (byte)i, Name = "Unknown"}; - _walls[i] = new TileColor {Color = Colors.Magenta, ID = (byte)i, Name = "Unknown"}; - } - - - using (TextReader sr = new StreamReader(filename)) - { - FileSection section = FileSection.LIQUIDCOLORS; - string line = string.Empty; - while ((line = sr.ReadLine()) != null) - { - if (string.IsNullOrEmpty(line) || line.StartsWith("#") || line.StartsWith("//")) - continue; - - if (string.Equals(line, FileSection.WALLCOLORS.ToString())) - section = FileSection.WALLCOLORS; - else if (string.Equals(line, FileSection.TILECOLORS.ToString())) - section = FileSection.TILECOLORS; - else if (string.Equals(line, FileSection.LIQUIDCOLORS.ToString())) - section = FileSection.LIQUIDCOLORS; - else - { - TileColor lineproperty = TileColor.FromString(line); - if (lineproperty != null) - { - switch (section) - { - case FileSection.WALLCOLORS: - _walls[lineproperty.ID] = lineproperty; - break; - case FileSection.TILECOLORS: - _tiles[lineproperty.ID] = lineproperty; - break; - case FileSection.LIQUIDCOLORS: - if (string.Equals(lineproperty.Name, "Water", - StringComparison.InvariantCultureIgnoreCase)) - Water = lineproperty.Color; - else if (string.Equals(lineproperty.Name, "Lava", - StringComparison.InvariantCultureIgnoreCase)) - Lava = lineproperty.Color; - break; - } - } - } - } - } - } - - public static void Save(string filename) - { - using (TextWriter sr = new StreamWriter(filename)) - { - sr.WriteLine("# File structure is"); - sr.WriteLine("# BlockID|BlockName|Color"); - sr.WriteLine("# Color is in ARGB HEX, e.g. AARRGGBB"); - - sr.WriteLine(FileSection.LIQUIDCOLORS.ToString()); - sr.WriteLine((new TileColor(1, Water, "Water")).ToString()); - sr.WriteLine((new TileColor(2, Lava, "Lava")).ToString()); - - sr.WriteLine(FileSection.WALLCOLORS.ToString()); - for (int i = 0; i <= byte.MaxValue; i++) - { - if (!string.Equals(_walls[i].Name, "Unknown", StringComparison.InvariantCultureIgnoreCase)) - sr.WriteLine(_walls[i].ToString()); - } - - - sr.WriteLine(FileSection.TILECOLORS.ToString()); - for (int i = 0; i <= byte.MaxValue; i++) - { - if (!string.Equals(_tiles[i].Name, "Unknown", StringComparison.InvariantCultureIgnoreCase)) - sr.WriteLine(_tiles[i].ToString()); - } - } - } - } -} \ No newline at end of file diff --git a/TEdit/RenderWorld/TileColor.cs b/TEdit/RenderWorld/TileColor.cs deleted file mode 100644 index fe27583c..00000000 --- a/TEdit/RenderWorld/TileColor.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System; -using System.Windows.Media; -using TEdit.Common; - -namespace TEdit.RenderWorld -{ - [Serializable] - public class TileColor : ObservableObject - { - private Color _Color; - private byte _ID; - private string _Name; - - public TileColor() - { - } - - public TileColor(byte id, Color color, string name) - { - _ID = id; - _Name = name; - _Color = color; - } - - public byte ID - { - get { return _ID; } - set - { - if (_ID != value) - { - _ID = value; - RaisePropertyChanged("ID"); - } - } - } - - - public string Name - { - get { return _Name; } - set - { - if (_Name != value) - { - _Name = value; - RaisePropertyChanged("Name"); - } - } - } - - public Color Color - { - get { return _Color; } - set - { - if (_Color != value) - { - _Color = value; - RaisePropertyChanged("Color"); - } - } - } - - public override string ToString() - { - return String.Format("{0}|{1}|#{2:x2}{3:x2}{4:x2}{5:x2}", ID, Name, Color.A, Color.R, Color.G, Color.B); - } - - public static TileColor FromString(string line) - { - string[] splitline = line.Split(new[] {',', '|'}); - if (splitline.Length == 3) - { - byte id = 0; - byte.TryParse(splitline[0], out id); - - string name = splitline[1]; - var color = (Color) ColorConverter.ConvertFromString(splitline[2]); - - return new TileColor(id, color, name); - } - return null; - } - } -} \ No newline at end of file diff --git a/TEdit/RenderWorld/WorldRenderer.cs b/TEdit/RenderWorld/WorldRenderer.cs index f0d65acc..e8e32497 100644 --- a/TEdit/RenderWorld/WorldRenderer.cs +++ b/TEdit/RenderWorld/WorldRenderer.cs @@ -22,7 +22,7 @@ public class WorldRenderer public string GetTileName(Tile tile, out string wall) { string tilename = String.Empty; - wall = Settings.Walls[tile.Wall].Name; + wall = WorldSettings.Walls[tile.Wall].Name; if (!tile.IsActive) return "[empty]"; @@ -36,7 +36,7 @@ public string GetTileName(Tile tile, out string wall) } else { - tilename = Settings.Tiles[tile.Type].Name; + tilename = WorldSettings.Tiles[tile.Type].Name; } return tilename; @@ -229,24 +229,32 @@ private Color GetTileColor(int y, Tile tile, bool isHell = false) { Color c; - if (isHell) - c = Settings.Walls[13].Color; - else if (y > _world.Header.WorldRockLayer && tile.Wall == 0) - c = Settings.Walls[1].Color; - else if (y > _world.Header.WorldSurface && tile.Wall == 0) - c = Settings.Walls[2].Color; + if (tile.Wall > 0) + { + c = WorldSettings.Walls[tile.Wall].Color; + } else - c = Settings.Walls[tile.Wall].Color; + { + if (isHell) + c = WorldSettings.GlobalColors["Hell"]; + else if (y > _world.Header.WorldRockLayer && tile.Wall == 0) + c = WorldSettings.GlobalColors["Rock"]; + else if (y > _world.Header.WorldSurface && tile.Wall == 0) + c = WorldSettings.GlobalColors["Earth"]; + else + c = WorldSettings.GlobalColors["Sky"]; + } + if (tile.IsActive) - c = AlphaBlend(c, Settings.Tiles[tile.Type].Color); + c = AlphaBlend(c, WorldSettings.Tiles[tile.Type].Color); if (tile.Liquid > 0) { if (tile.IsLava) - c = AlphaBlend(c, Settings.Lava); + c = AlphaBlend(c, WorldSettings.GlobalColors["Lava"]); else - c = AlphaBlend(c, Settings.Water); + c = AlphaBlend(c, WorldSettings.GlobalColors["Water"]); } return c; } diff --git a/TEdit/RenderWorld/WorldSettings.cs b/TEdit/RenderWorld/WorldSettings.cs new file mode 100644 index 00000000..abd2f268 --- /dev/null +++ b/TEdit/RenderWorld/WorldSettings.cs @@ -0,0 +1,107 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.IO; +using System.Linq; +using System.Windows.Media; +using System.Xml.Linq; + +namespace TEdit.RenderWorld +{ + public static class WorldSettings + { + private static readonly TileProperty[] _tiles = new TileProperty[byte.MaxValue + 1]; + private static readonly ColorProperty[] _walls = new ColorProperty[byte.MaxValue + 1]; + private static readonly Dictionary _globals = new Dictionary(); + private static readonly ObservableCollection _items = new ObservableCollection(); + + static WorldSettings() + { + LoadXMLSettings("settings.xml"); + OnSettingsLoaded(null, new EventArgs()); + } + + private static void LoadXMLSettings(string file) + { + + // Populate Defaults + for (int i = 0; i <= byte.MaxValue; i++) + { + _tiles[i] = new TileProperty { Color = Colors.Magenta, ID = (byte)i, Name = "UNKNOWN" }; + _walls[i] = new ColorProperty { Color = Colors.Magenta, ID = (byte)i, Name = "UNKNOWN" }; + } + _globals.Clear(); + _items.Clear(); + + // load xml file + var xmlSettings = XElement.Load(file); + + // read tiles + foreach (var tile in xmlSettings.Elements("Tiles").Elements("Tile")) + { + var curTile = _tiles[(int)tile.Attribute("num")]; + + curTile.IsFramed = ((bool?)tile.Attribute("isFramed") ?? false); + curTile.IsSolid = ((bool?)tile.Attribute("isSolid") ?? false); + curTile.IsSolidTop = ((bool?)tile.Attribute("isSolidTop") ?? false); + curTile.Name = (string)tile.Attribute("name"); + curTile.Color = (Color)ColorConverter.ConvertFromString((string)tile.Attribute("color")) ; + } + + // read walls + foreach (var wall in xmlSettings.Elements("Walls").Elements("Wall")) + { + var curWall = _walls[(int)wall.Attribute("num")]; + curWall.Name = (string)wall.Attribute("name"); + curWall.Color = (Color)ColorConverter.ConvertFromString((string)wall.Attribute("color")); + } + + // read items + foreach (var item in xmlSettings.Elements("Items").Elements("Item")) + { + //var curItem = new ItemProperty + //{ + // Id = (int) item.Attribute("num"), + // Name = (string) item.Attribute("name") + //}; + _items.Add((string)item.Attribute("name")); + } + + // read global colors + foreach (var globalColor in xmlSettings.Elements("GlobalColors").Elements("GlobalColor")) + { + _globals.Add((string)globalColor.Attribute("name"),(Color)ColorConverter.ConvertFromString((string)globalColor.Attribute("color"))); + } + } + + public static ObservableCollection Items + { + get { return _items; } + } + + public static Dictionary GlobalColors + { + get { return _globals; } + } + + public static TileProperty[] Tiles + { + get { return _tiles; } + } + + public static ColorProperty[] Walls + { + get { return _walls; } + } + + public static Color Water { get; set; } + public static Color Lava { get; set; } + public static event EventHandler SettingsLoaded; + + private static void OnSettingsLoaded(object sender, EventArgs e) + { + if (SettingsLoaded != null) + SettingsLoaded(sender, e); + } + } +} \ No newline at end of file diff --git a/TEdit/TEdit.csproj b/TEdit/TEdit.csproj index 7203fec2..ed0d3c1d 100644 --- a/TEdit/TEdit.csproj +++ b/TEdit/TEdit.csproj @@ -98,8 +98,8 @@ - - + + @@ -110,7 +110,6 @@ - @@ -272,7 +271,7 @@ - + Always @@ -299,9 +298,6 @@ - - Always - diff --git a/TEdit/TerrariaWorld/Item.cs b/TEdit/TerrariaWorld/Item.cs index c7f37c87..963cd893 100644 --- a/TEdit/TerrariaWorld/Item.cs +++ b/TEdit/TerrariaWorld/Item.cs @@ -64,7 +64,7 @@ public string Name public ObservableCollection ValidItems { - get { return Settings.Items; } + get { return WorldSettings.Items; } } public Visibility IsVisible diff --git a/TEdit/TerrariaWorld/TileProperties.cs b/TEdit/TerrariaWorld/TileProperties.cs deleted file mode 100644 index 6062df3a..00000000 --- a/TEdit/TerrariaWorld/TileProperties.cs +++ /dev/null @@ -1,371 +0,0 @@ -namespace TEdit.TerrariaWorld -{ - public static class TileProperties - { - //var xmlSettings = XElement.Load("settings.xml"); - // foreach (var tile in xmlSettings.Elements("Tiles").Elements("Tile")) - // { - // if ((bool?)tile.Attribute("isFramed") ?? false) - // { - // //do stuff - // } - // } - public const byte MaxTileTypes = 86; - public const byte MaxWallTypes = 14; - - public static bool[] TileCut = new bool[byte.MaxValue+1]; - public static bool[] TileAlch = new bool[byte.MaxValue+1]; - public static int[] TileShine = new int[byte.MaxValue+1]; - public static bool[] WallHouse = new bool[byte.MaxValue+1]; - public static bool[] TileStone = new bool[byte.MaxValue+1]; - public static bool[] TileWaterDeath = new bool[byte.MaxValue+1]; - public static bool[] TileLavaDeath = new bool[byte.MaxValue+1]; - public static bool[] TileTable = new bool[byte.MaxValue+1]; - public static bool[] TileBlockLight = new bool[byte.MaxValue+1]; - public static bool[] TileDungeon = new bool[byte.MaxValue+1]; - public static bool[] TileSolidTop = new bool[byte.MaxValue+1]; - public static bool[] TileSolid = new bool[byte.MaxValue+1]; - public static bool[] TileNoAttach = new bool[byte.MaxValue+1]; - public static bool[] TileNoFail = new bool[byte.MaxValue+1]; - public static bool[] TileFrameImportant = new bool[byte.MaxValue+1]; - public static string[] TileName = new string[byte.MaxValue+1]; - - static TileProperties() - { - for (int i = 0; i <= byte.MaxValue; i++) - { - TileCut[i] = false; - TileAlch[i] = false; - TileShine[i] = 0; - WallHouse[i] = false; - TileStone[i] = false; - TileWaterDeath[i] = false; - TileLavaDeath[i] = false; - TileTable[i] = false; - TileBlockLight[i] = false; - TileDungeon[i] = false; - TileSolidTop[i] = false; - TileSolid[i] = false; - TileNoAttach[i] = false; - TileNoFail[i] = false; - TileFrameImportant[i] = false; - TileName[i] = string.Empty; - } - - TileAlch[82] = true; - TileAlch[83] = true; - TileAlch[84] = true; - TileBlockLight[0] = true; - TileBlockLight[10] = true; - TileBlockLight[10] = true; - TileBlockLight[1] = true; - TileBlockLight[22] = true; - TileBlockLight[23] = true; - TileBlockLight[25] = true; - TileBlockLight[2] = true; - TileBlockLight[30] = true; - TileBlockLight[32] = true; - TileBlockLight[37] = true; - TileBlockLight[38] = true; - TileBlockLight[39] = true; - TileBlockLight[40] = true; - TileBlockLight[41] = true; - TileBlockLight[43] = true; - TileBlockLight[44] = true; - TileBlockLight[45] = true; - TileBlockLight[46] = true; - TileBlockLight[47] = true; - TileBlockLight[48] = true; - TileBlockLight[51] = true; - TileBlockLight[52] = true; - TileBlockLight[53] = true; - TileBlockLight[56] = true; - TileBlockLight[57] = true; - TileBlockLight[58] = true; - TileBlockLight[59] = true; - TileBlockLight[60] = true; - TileBlockLight[62] = true; - TileBlockLight[63] = true; - TileBlockLight[64] = true; - TileBlockLight[65] = true; - TileBlockLight[66] = true; - TileBlockLight[67] = true; - TileBlockLight[68] = true; - TileBlockLight[6] = true; - TileBlockLight[70] = true; - TileBlockLight[75] = true; - TileBlockLight[76] = true; - TileBlockLight[7] = true; - TileBlockLight[8] = true; - TileBlockLight[9] = true; - TileCut[24] = true; - TileCut[28] = true; - TileCut[32] = true; - TileCut[3] = true; - TileCut[51] = true; - TileCut[52] = true; - TileCut[61] = true; - TileCut[62] = true; - TileCut[69] = true; - TileCut[71] = true; - TileCut[73] = true; - TileCut[74] = true; - TileCut[82] = true; - TileCut[83] = true; - TileCut[84] = true; - TileDungeon[41] = true; - TileDungeon[43] = true; - TileDungeon[44] = true; - - TileFrameImportant[10] = true; - TileFrameImportant[11] = true; - TileFrameImportant[12] = true; - TileFrameImportant[13] = true; - TileFrameImportant[14] = true; - TileFrameImportant[15] = true; - TileFrameImportant[16] = true; - TileFrameImportant[17] = true; - TileFrameImportant[18] = true; - TileFrameImportant[20] = true; - TileFrameImportant[21] = true; - TileFrameImportant[24] = true; - TileFrameImportant[26] = true; - TileFrameImportant[27] = true; - TileFrameImportant[28] = true; - TileFrameImportant[29] = true; - TileFrameImportant[31] = true; - TileFrameImportant[33] = true; - TileFrameImportant[34] = true; - TileFrameImportant[35] = true; - TileFrameImportant[36] = true; - TileFrameImportant[3] = true; - TileFrameImportant[42] = true; - TileFrameImportant[50] = true; - TileFrameImportant[55] = true; - TileFrameImportant[5] = true; - TileFrameImportant[61] = true; - TileFrameImportant[71] = true; - TileFrameImportant[72] = true; - TileFrameImportant[73] = true; - TileFrameImportant[74] = true; - TileFrameImportant[77] = true; - TileFrameImportant[78] = true; - TileFrameImportant[79] = true; - TileFrameImportant[81] = true; - TileFrameImportant[82] = true; - TileFrameImportant[83] = true; - TileFrameImportant[84] = true; - TileFrameImportant[85] = true; - TileFrameImportant[86] = true; - TileFrameImportant[87] = true; - TileFrameImportant[88] = true; - TileFrameImportant[89] = true; - TileFrameImportant[90] = true; - TileFrameImportant[91] = true; - TileFrameImportant[92] = true; - TileFrameImportant[93] = true; - TileFrameImportant[94] = true; - TileFrameImportant[95] = true; - TileFrameImportant[96] = true; - TileFrameImportant[97] = true; - TileFrameImportant[98] = true; - TileFrameImportant[99] = true; - TileFrameImportant[100] = true; - TileFrameImportant[101] = true; - TileFrameImportant[102] = true; - TileFrameImportant[103] = true; - TileFrameImportant[104] = true; - TileFrameImportant[105] = true; - TileFrameImportant[106] = true; - TileLavaDeath[100] = true; - TileLavaDeath[101] = true; - TileLavaDeath[102] = true; - TileLavaDeath[103] = true; - TileLavaDeath[104] = true; - TileLavaDeath[105] = true; - TileLavaDeath[10] = true; - TileLavaDeath[11] = true; - TileLavaDeath[12] = true; - TileLavaDeath[13] = true; - TileLavaDeath[14] = true; - TileLavaDeath[15] = true; - TileLavaDeath[16] = true; - TileLavaDeath[17] = true; - TileLavaDeath[18] = true; - TileLavaDeath[19] = true; - TileLavaDeath[20] = true; - TileLavaDeath[27] = true; - TileLavaDeath[28] = true; - TileLavaDeath[29] = true; - TileLavaDeath[32] = true; - TileLavaDeath[33] = true; - TileLavaDeath[34] = true; - TileLavaDeath[35] = true; - TileLavaDeath[36] = true; - TileLavaDeath[3] = true; - TileLavaDeath[42] = true; - TileLavaDeath[49] = true; - TileLavaDeath[50] = true; - TileLavaDeath[52] = true; - TileLavaDeath[55] = true; - TileLavaDeath[5] = true; - TileLavaDeath[61] = true; - TileLavaDeath[62] = true; - TileLavaDeath[69] = true; - TileLavaDeath[71] = true; - TileLavaDeath[72] = true; - TileLavaDeath[73] = true; - TileLavaDeath[74] = true; - TileLavaDeath[79] = true; - TileLavaDeath[80] = true; - TileLavaDeath[81] = true; - TileLavaDeath[86] = true; - TileLavaDeath[87] = true; - TileLavaDeath[88] = true; - TileLavaDeath[89] = true; - TileLavaDeath[91] = true; - TileLavaDeath[92] = true; - TileLavaDeath[93] = true; - TileLavaDeath[94] = true; - TileLavaDeath[95] = true; - TileLavaDeath[96] = true; - TileLavaDeath[97] = true; - TileLavaDeath[98] = true; - TileLavaDeath[99] = true; - TileName[13] = "Bottle"; - TileName[14] = "Table"; - TileName[15] = "Chair"; - TileName[16] = "Anvil"; - TileName[17] = "Furnace"; - TileName[18] = "Workbench"; - TileName[26] = "Demon Altar"; - TileName[77] = "Hellforge"; - TileName[86] = "Loom"; - TileName[94] = "Keg"; - TileName[96] = "Cooking Pot"; - TileNoAttach[101] = true; - TileNoAttach[102] = true; - TileNoAttach[10] = true; - TileNoAttach[13] = true; - TileNoAttach[14] = true; - TileNoAttach[15] = true; - TileNoAttach[16] = true; - TileNoAttach[17] = true; - TileNoAttach[18] = true; - TileNoAttach[19] = true; - TileNoAttach[19] = true; - TileNoAttach[20] = true; - TileNoAttach[21] = true; - TileNoAttach[27] = true; - TileNoAttach[3] = true; - TileNoAttach[4] = true; - TileNoAttach[50] = true; - TileNoAttach[86] = true; - TileNoAttach[87] = true; - TileNoAttach[88] = true; - TileNoAttach[89] = true; - TileNoAttach[90] = true; - TileNoAttach[91] = true; - TileNoAttach[92] = true; - TileNoAttach[93] = true; - TileNoAttach[94] = true; - TileNoAttach[95] = true; - TileNoAttach[96] = true; - TileNoAttach[97] = true; - TileNoAttach[98] = true; - TileNoAttach[99] = true; - TileNoFail[24] = true; - TileNoFail[32] = true; - TileNoFail[32] = true; - TileNoFail[3] = true; - TileNoFail[4] = true; - TileNoFail[50] = true; - TileNoFail[61] = true; - TileNoFail[69] = true; - TileNoFail[73] = true; - TileNoFail[74] = true; - TileNoFail[82] = true; - TileNoFail[83] = true; - TileNoFail[84] = true; - TileSolidTop[101] = true; - TileSolidTop[14] = true; - TileSolidTop[16] = true; - TileSolidTop[18] = true; - TileSolidTop[19] = true; - TileSolidTop[87] = true; - TileSolidTop[88] = true; - TileSolid[0] = true; - TileSolid[10] = true; - TileSolid[11] = false; - TileSolid[19] = true; - TileSolid[1] = true; - TileSolid[22] = true; - TileSolid[23] = true; - TileSolid[25] = true; - TileSolid[2] = true; - TileSolid[30] = true; - TileSolid[37] = true; - TileSolid[38] = true; - TileSolid[39] = true; - TileSolid[3] = false; - TileSolid[40] = true; - TileSolid[41] = true; - TileSolid[43] = true; - TileSolid[44] = true; - TileSolid[45] = true; - TileSolid[46] = true; - TileSolid[47] = true; - TileSolid[48] = true; - TileSolid[4] = false; - TileSolid[53] = true; - TileSolid[54] = true; - TileSolid[56] = true; - TileSolid[57] = true; - TileSolid[58] = true; - TileSolid[59] = true; - TileSolid[5] = false; - TileSolid[60] = true; - TileSolid[63] = true; - TileSolid[64] = true; - TileSolid[65] = true; - TileSolid[66] = true; - TileSolid[67] = true; - TileSolid[68] = true; - TileSolid[6] = true; - TileSolid[70] = true; - TileSolid[75] = true; - TileSolid[76] = true; - TileSolid[7] = true; - TileSolid[8] = true; - TileSolid[9] = true; - TileStone[63] = true; - TileStone[64] = true; - TileStone[65] = true; - TileStone[66] = true; - TileStone[67] = true; - TileStone[68] = true; - TileTable[101] = true; - TileTable[14] = true; - TileTable[18] = true; - TileTable[19] = true; - TileTable[87] = true; - TileTable[88] = true; - TileWaterDeath[4] = true; - TileWaterDeath[51] = true; - TileWaterDeath[93] = true; - TileWaterDeath[98] = true; - WallHouse[10] = true; - WallHouse[11] = true; - WallHouse[12] = true; - WallHouse[16] = true; - WallHouse[17] = true; - WallHouse[18] = true; - WallHouse[19] = true; - WallHouse[1] = true; - WallHouse[20] = true; - WallHouse[4] = true; - WallHouse[5] = true; - WallHouse[6] = true; - } - } -} \ No newline at end of file diff --git a/TEdit/TerrariaWorld/World.File.cs b/TEdit/TerrariaWorld/World.File.cs index d8ee3e36..0f5c5992 100644 --- a/TEdit/TerrariaWorld/World.File.cs +++ b/TEdit/TerrariaWorld/World.File.cs @@ -3,6 +3,7 @@ using System.ComponentModel; using System.Diagnostics; using System.IO; +using TEdit.RenderWorld; using TEdit.TerrariaWorld.Structures; namespace TEdit.TerrariaWorld @@ -144,7 +145,7 @@ public void Load(string filename) { tile.Type = reader.ReadByte(); - if (TileProperties.TileFrameImportant[tile.Type]) + if (WorldSettings.Tiles[tile.Type].IsFramed) tile.Frame = new PointShort(reader.ReadInt16(), reader.ReadInt16()); else tile.Frame = new PointShort(-1, -1); @@ -308,7 +309,7 @@ public void SaveFile(string filename) if (Tiles[x, y].IsActive) { writer.Write(Tiles[x, y].Type); - if (TileProperties.TileFrameImportant[Tiles[x, y].Type]) + if (WorldSettings.Tiles[Tiles[x, y].Type].IsFramed) { writer.Write(Tiles[x, y].Frame.X); writer.Write(Tiles[x, y].Frame.Y); @@ -513,7 +514,7 @@ public void SaveFileCompressed1(string filename) if (cacheTile.IsActive) { writer.Write(cacheTile.Type); - if (TileProperties.TileFrameImportant[cacheTile.Type]) + if (WorldSettings.Tiles[cacheTile.Type].IsFramed) { writer.Write(cacheTile.Frame.X); writer.Write(cacheTile.Frame.Y); @@ -749,7 +750,7 @@ public void SaveFileCompressed2(string filename) if (cacheTile.IsActive) { writer.Write(cacheTile.Type); - if (TileProperties.TileFrameImportant[cacheTile.Type]) + if (WorldSettings.Tiles[cacheTile.Type].IsFramed) { writer.Write(cacheTile.Frame.X); writer.Write(cacheTile.Frame.Y); diff --git a/TEdit/TerrariaWorld/World.cs b/TEdit/TerrariaWorld/World.cs index cf7a4f9e..25aac571 100644 --- a/TEdit/TerrariaWorld/World.cs +++ b/TEdit/TerrariaWorld/World.cs @@ -2,6 +2,7 @@ using System.ComponentModel.Composition; using System.Linq; using TEdit.Common; +using TEdit.RenderWorld; using TEdit.TerrariaWorld.Structures; using TEdit.Tools; @@ -118,7 +119,7 @@ public void SetTileXY(ref int x, ref int y, ref TilePicker tile, ref SelectionAr curTile.Type = tile.Tile.Value; // if the tile is solid and there isn't a mask, remove the liquid - if (!tile.TileMask.IsActive && TileProperties.TileSolid[curTile.Type] && curTile.Liquid > 0) + if (!tile.TileMask.IsActive && WorldSettings.Tiles[curTile.Type].IsSolid && curTile.Liquid > 0) curTile.Liquid = 0; } } @@ -136,7 +137,7 @@ public void SetTileXY(ref int x, ref int y, ref TilePicker tile, ref SelectionAr } } - if (tile.Liquid.IsActive && (!curTile.IsActive || !TileProperties.TileSolid[curTile.Type])) + if (tile.Liquid.IsActive && (!curTile.IsActive || !WorldSettings.Tiles[curTile.Type].IsSolid)) { if (tile.IsEraser) { diff --git a/TEdit/Tools/Clipboard/ClipboardBuffer.File.cs b/TEdit/Tools/Clipboard/ClipboardBuffer.File.cs index 03c672d9..587d66a9 100644 --- a/TEdit/Tools/Clipboard/ClipboardBuffer.File.cs +++ b/TEdit/Tools/Clipboard/ClipboardBuffer.File.cs @@ -1,4 +1,6 @@ using System.IO; +using TEdit.Properties; +using TEdit.RenderWorld; using TEdit.TerrariaWorld; using TEdit.TerrariaWorld.Structures; @@ -24,7 +26,7 @@ public void Save(string filename) if (Tiles[x, y].IsActive) { writer.Write(Tiles[x, y].Type); - if (TileProperties.TileFrameImportant[Tiles[x, y].Type]) + if (WorldSettings.Tiles[Tiles[x, y].Type].IsFramed) { writer.Write(Tiles[x, y].Frame.X); writer.Write(Tiles[x, y].Frame.Y); @@ -131,7 +133,7 @@ public static ClipboardBuffer Load(string filename) if (tile.IsActive) { tile.Type = reader.ReadByte(); - if (TileProperties.TileFrameImportant[tile.Type]) + if (WorldSettings.Tiles[tile.Type].IsFramed) tile.Frame = new PointShort(reader.ReadInt16(), reader.ReadInt16()); else tile.Frame = new PointShort(-1, -1); diff --git a/TEdit/Tools/TilePicker.cs b/TEdit/Tools/TilePicker.cs index ef027a53..77b0a236 100644 --- a/TEdit/Tools/TilePicker.cs +++ b/TEdit/Tools/TilePicker.cs @@ -11,8 +11,9 @@ namespace TEdit.Tools [Export] public class TilePicker : ObservableObject { - [NonSerialized] private readonly ObservableCollection _tiles = new ObservableCollection(); - [NonSerialized] private readonly ObservableCollection _walls = new ObservableCollection(); + [NonSerialized] + private readonly ObservableCollection _tiles = new ObservableCollection(); + [NonSerialized] private readonly ObservableCollection _walls = new ObservableCollection(); private bool _IsEraser; private TilePickerLiquidProperty _Liquid; private TilePickerProperty _Tile; @@ -22,15 +23,16 @@ public class TilePicker : ObservableObject public TilePicker() { - for (int i = 0; i < TileProperties.MaxWallTypes; i++) + for (int i = 0; i < byte.MaxValue; i++) { - _walls.Add(Settings.Walls[i]); + if (WorldSettings.Walls[i].Name != "UNKNOWN") + _walls.Add(WorldSettings.Walls[i]); } - for (int i = 0; i < TileProperties.MaxTileTypes; i++) + for (int i = 0; i < byte.MaxValue; i++) { - if (TileProperties.TileSolid[i]) - _tiles.Add(Settings.Tiles[i]); + if (WorldSettings.Tiles[i].Name != "UNKNOWN" && !WorldSettings.Tiles[i].IsFramed && i != 4) + _tiles.Add(WorldSettings.Tiles[i]); } _Wall = new TilePickerProperty {IsActive = false, Value = 0}; @@ -42,12 +44,12 @@ public TilePicker() _IsEraser = false; } - public ObservableCollection Walls + public ObservableCollection Walls { get { return _walls; } } - public ObservableCollection Tiles + public ObservableCollection Tiles { get { return _tiles; } } diff --git a/TEdit/Tools/Tool/DungeonPointPicker.cs b/TEdit/Tools/Tool/DungeonPointPicker.cs index 2484a982..925f6093 100644 --- a/TEdit/Tools/Tool/DungeonPointPicker.cs +++ b/TEdit/Tools/Tool/DungeonPointPicker.cs @@ -4,6 +4,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using TEdit.Common; +using TEdit.RenderWorld; using TEdit.TerrariaWorld; namespace TEdit.Tools.Tool @@ -94,7 +95,7 @@ public override bool MoveTool(TileMouseEventArgs e) private void SetSpawn(TileMouseEventArgs e) { - if (!TileProperties.TileSolid[_world.Tiles[e.Tile.X, e.Tile.Y].Type] || + if (!WorldSettings.Tiles[_world.Tiles[e.Tile.X, e.Tile.Y].Type].IsSolid || !_world.Tiles[e.Tile.X, e.Tile.Y].IsActive) { _world.Header.DungeonEntrance = e.Tile; diff --git a/TEdit/Tools/Tool/SpawnPointPicker.cs b/TEdit/Tools/Tool/SpawnPointPicker.cs index c966481e..f9a51bba 100644 --- a/TEdit/Tools/Tool/SpawnPointPicker.cs +++ b/TEdit/Tools/Tool/SpawnPointPicker.cs @@ -4,6 +4,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using TEdit.Common; +using TEdit.RenderWorld; using TEdit.TerrariaWorld; namespace TEdit.Tools.Tool @@ -92,7 +93,8 @@ public override bool MoveTool(TileMouseEventArgs e) private void SetSpawn(TileMouseEventArgs e) { - if (!TileProperties.TileSolid[_world.Tiles[e.Tile.X, e.Tile.Y].Type] || + + if (!WorldSettings.Tiles[_world.Tiles[e.Tile.X, e.Tile.Y].Type].IsSolid || !_world.Tiles[e.Tile.X, e.Tile.Y].IsActive) { _world.Header.SpawnTile = e.Tile; diff --git a/TEdit/Tools/Tool/SpritePlacer.cs b/TEdit/Tools/Tool/SpritePlacer.cs index d1d9d36a..f152fc29 100644 --- a/TEdit/Tools/Tool/SpritePlacer.cs +++ b/TEdit/Tools/Tool/SpritePlacer.cs @@ -102,9 +102,9 @@ private void PlaceBrownChest(PointInt32 p) // Validate free space if (!_world.Tiles[x, y].IsActive && !_world.Tiles[x + 1, y].IsActive && !_world.Tiles[x, y + 1].IsActive && !_world.Tiles[x + 1, y + 1].IsActive) { - // Validate floor - if ((_world.Tiles[x, y + 2].IsActive && (TileProperties.TileSolid[_world.Tiles[x, y + 2].Type] || TileProperties.TileSolidTop[_world.Tiles[x, y + 2].Type])) && - (_world.Tiles[x+1, y + 2].IsActive && (TileProperties.TileSolid[_world.Tiles[x+1, y + 2].Type] || TileProperties.TileSolidTop[_world.Tiles[x+1, y + 2].Type]))) + // Validate floor WorldSettings.Tiles[].IsSolid + if ((_world.Tiles[x, y + 2].IsActive && (WorldSettings.Tiles[_world.Tiles[x, y + 2].Type].IsSolid)) && + (_world.Tiles[x + 1, y + 2].IsActive && (WorldSettings.Tiles[_world.Tiles[x + 1, y + 2].Type].IsSolid))) { // Place Chest var tp = new TilePicker(); diff --git a/TEdit/ViewModels/WorldViewModel.cs b/TEdit/ViewModels/WorldViewModel.cs index 1121fb20..471d96ec 100644 --- a/TEdit/ViewModels/WorldViewModel.cs +++ b/TEdit/ViewModels/WorldViewModel.cs @@ -673,8 +673,8 @@ private void OnMouseOverPixel(TileMouseEventArgs e) Tile overTile = _world.Tiles[e.Tile.X, e.Tile.Y]; - string wallName = Settings.Walls[overTile.Wall].Name + "[" + overTile.Wall + "]"; - string tileName = overTile.IsActive ? Settings.Tiles[overTile.Type].Name + "[" + overTile.Type + "]" : "[empty]"; + string wallName = WorldSettings.Walls[overTile.Wall].Name + "[" + overTile.Wall + "]"; + string tileName = overTile.IsActive ? WorldSettings.Tiles[overTile.Type].Name + "[" + overTile.Type + "]" : "[empty]"; string fluidname = "[no fluid]"; if (overTile.Liquid > 0) { diff --git a/TEdit/colors.txt b/TEdit/colors.txt deleted file mode 100644 index 85f6940e..00000000 --- a/TEdit/colors.txt +++ /dev/null @@ -1,128 +0,0 @@ -LIQUIDCOLORS -1|Water|#80000cff -2|Lava|#F0ff4800 -WALLCOLORS -0|Sky|#ff9bd1ff -1|WallStone|#ff424242 -2|WallDirt|#ff583d2e -3|WallCorruption|#ff312545 -4|WallWood|#ff4a2e1c -5|WallBrick|#ff454545 -6|WallRed|#ff500000 -7|WallBlue|#ff000060 -8|WallGreen|#ff005000 -9|WallPink|#ff48004F -10|WallGold|#ff774707 -11|WallSilver|#ff828282 -12|WallCopper|#ff3F1907 -13|WallHellstone|#ff3F0707 -14|WallObsidian|#ff000060 -15|WallPlayerMud|#ff005500 -16|WallPlayerDirt|#ff583d2e -20|WallPlayerObsidian|#ff000060 -TILECOLORS -0|Dirt|#ff916a4f -1|Stone|#ff808080 -2|Grass|#ff1cd85e -3|Plants|#ff0d6524 -4|Torches|#fffd3e03 -5|Trees|#ff634631 -6|Iron|#ff6b594e -7|Copper|#ffc6561d -8|Gold|#ffb9a417 -9|Silver|#ffd9dfdf -10|Door1|#ff00fff2 -11|Door2|#ff00fff2 -12|HeartStone|#ffff0000 -13|Bottle|#ff00fff2 -14|Table|#ff00fff2 -15|Chair|#ff00fff2 -16|Anvil|#ff00fff2 -17|Furnace|#ff00fff2 -18|Workbench|#ff00fff2 -19|WoodenPlatform|#ff6B3A18 -20|PlantsDecorative|#ff0d6524 -21|Chest|#ffFFD800 -22|Demonite|#ff625fa7 -23|CorruptionGrass|#ff8d89df -24|CorruptionPlants|#ff8d89df -25|Ebonstone|#ff4b4a82 -26|DemonAltar|#ff9000FF -27|Sunflower|#ffC4FF14 -28|Pot|#ff8C2726 -29|PiggyBank|#ff00fff2 -30|BlockWood|#ff684934 -31|ShadowOrb|#ff000000 -32|CorruptionVines|#ff7a618f -33|Candle|#fffd3e03 -34|ChandlerCopper|#fffd3e03 -35|ChandlerSilver|#fffd3e03 -36|ChandlerGold|#fffd3e03 -37|Meterorite|#ffdf9f89 -38|BlockStone|#ff909090 -39|BlockRedStone|#ffb200ff -40|Clay|#ffac5b4d -41|BlockBlueStone|#ff545498 -42|LightGlobe|#ffef904b -43|BlockGreenStone|#ff39A851 -44|BlockPinkStone|#ffB200FF -45|BlockGold|#ffFFD514 -46|BlockSilver|#ffE5E5E5 -47|BlockCopper|#ffFF5900 -48|Spikes|#ff6d6d6d -49|CandleBlue|#ff2B8FFF -50|Books|#ff00fff2 -51|Web|#ffffffff -52|Vines|#ff0d6524 -53|Sand|#ffffda38 -54|Glass|#20FFFFFF -55|Signs|#ffFFAE5E -56|Obsidian|#ff5751ad -57|Ash|#ff44444c -58|Hellstone|#ff662222 -59|Mud|#ff5c4449 -60|UndergroundJungleGrass|#ff8fd71d -61|UndergroundJunglePlants|#ff8fd71d -62|UndergroundJungleVines|#ff8ace1c -63|GemSapphire|#ff2a82fa -64|GemRuby|#ff2a82fa -65|GemEmerald|#ff2a82fa -66|GemTopaz|#ff2a82fa -67|GemAmethyst|#ff2a82fa -68|GemDiamond|#ff2a82fa -69|UndergroundJungleThorns|#ff5e3037 -70|UndergroundMushroomGrass|#ff5d7fff -71|UndergroundMushroomPlants|#ffb1ae83 -72|UndergroundMushroomTrees|#ff968f6e -73|Plants2|#ff0d6524 -74|Plants3|#ff0d6524 -75|BlockObsidian|#ffb200ff -76|BlockHellstone|#ffC6001D -77|Hellforge|#ffD50010 -78|DecorativePot|#ff00fff2 -79|Bed|#ff00fff2 -80|Cactus|#ff00a500 -81|Coral|#ffe55340 -82|HerbSprouts|#ffff7800 -83|HerbStalks|#ffff7800 -84|Herbs|#ffff7800 -85|Tombstone|#ffc0c0c0 -86|Loom|#ffff00ff -87|Piano|#ff00fff2 -88|Dresser|#ff00fff2 -89|Bench|#ff00fff2 -90|Bathtub|#ff00fff2 -91|Banner|#ff00fff2 -92|StreetLamp|#ff00fff2 -93|TikiTorch|#ff00fff2 -94|Keg|#ff00fff2 -95|ChineseLantern|#ff00fff2 -96|CookingPot|#ff00fff2 -97|Safe|#ffff00ff -98|SkullLantern|#ffff00ff -100|Candelabra|#ffff00ff -101|Bookcase|#ffff00ff -102|Throne|#ffff00ff -104|GrandFatherClock|#ffff00ff -105|Statue|#ff00fff2 -106|Sawmill|#ff00fff2 \ No newline at end of file diff --git a/TEdit/items.txt b/TEdit/items.txt deleted file mode 100644 index ae225679..00000000 --- a/TEdit/items.txt +++ /dev/null @@ -1,375 +0,0 @@ -0|[empty] -1|Iron Pickaxe -2|Dirt Block -3|Stone Block -4|Iron Broadsword -5|Mushroom -6|Iron Shortsword -7|Iron Hammer -8|Torch -9|Wood -10|Iron Axe -11|Iron Ore -12|Copper Ore -13|Gold Ore -14|Silver Ore -15|Copper Watch -16|Silver Watch -17|Gold Watch -18|Depth Meter -19|Gold Bar -20|Copper Bar -21|Silver Bar -22|Iron Bar -23|Gel -24|Wooden Sword -25|Wooden Door -26|Stone Wall -27|Acorn -28|Lesser Healing Potion -29|Life Crystal -30|Dirt Wall -31|Bottle -32|Wooden Table -33|Furnace -34|Wooden Chair -35|Iron Anvil -36|Work Bench -37|Goggles -38|Lens -39|Wooden Bow -40|Wooden Arrow -41|Flaming Arrow -42|Shuriken -43|Suspicious Looking Eye -44|Demon Bow -45|War Axe of the Night -46|Light's Bane -47|Unholy Arrow -48|Chest -49|Band of Regeneration -50|Magic Mirror -51|Jester's Arrow -52|Angel Statue -53|Cloud in a Bottle -54|Hermes Boots -55|Enchanted Boomerang -56|Demonite Ore -57|Demonite Bar -58|Heart -59|Corrupt Seeds -60|Vile Mushroom -61|Ebonstone Block -62|Grass Seeds -63|Sunflower -64|Vilethorn -65|Starfury -66|Purification Powder -67|Vile Powder -68|Rotten Chunk -69|Worm Tooth -70|Worm Food -71|Copper Coin -72|Silver Coin -73|Gold Coin -74|Platinum Coin -75|Fallen Star -76|Copper Greaves -77|Iron Greaves -78|Silver Greaves -79|Gold Greaves -80|Copper Chainmail -81|Iron Chainmail -82|Silver Chainmail -83|Gold Chainmail -84|Grappling Hook -85|Iron Chain -86|Shadow Scale -87|Piggy Bank -88|Mining Helmet -89|Copper Helmet -90|Iron Helmet -91|Silver Helmet -92|Gold Helmet -93|Wood Wall -94|Wood Platform -95|Flintlock Pistol -96|Musket -97|Musket Ball -98|Minishark -99|Iron Bow -100|Shadow Greaves -101|Shadow Scalemail -102|Shadow Helmet -103|Nightmare Pickaxe -104|The Breaker -105|Candle -106|Copper Chandelier -107|Silver Chandelier -108|Gold Chandelier -109|Mana Crystal -110|Lesser Mana Potion -111|Band of Starpower -112|Flower of Fire -113|Magic Missile -114|Dirt Rod -115|Orb of Light -116|Meteorite -117|Meteorite Bar -118|Hook -119|Flamarang -120|Molten Fury -121|Fiery Greatsword -122|Molten Pickaxe -123|Meteor Helmet -124|Meteor Suit -125|Meteor Leggings -126|Bottled Water -127|Space Gun -128|Rocket Boots -129|Gray Brick -130|Gray Brick Wall -131|Red Brick -132|Red Brick Wall -133|Clay Block -134|Blue Brick -135|Blue Brick Wall -136|Chain Lantern -137|Green Brick -138|Green Brick Wall -139|Pink Brick -140|Pink Brick Wall -141|Gold Brick -142|Gold Brick Wall -143|Silver Brick -144|Silver Brick Wall -145|Copper Brick -146|Copper Brick Wall -147|Spike -148|Water Candle -149|Book -150|Cobweb -151|Necro Helmet -152|Necro Breastplate -153|Necro Greaves -154|Bone -155|Muramasa -156|Cobalt Shield -157|Aqua Scepter -158|Lucky Horseshoe -159|Shiny Red Balloon -160|Harpoon -161|Spiky Ball -162|Ball O' Hurt -163|Blue Moon -164|Handgun -165|Water Bolt -166|Bomb -167|Dynamite -168|Grenade -169|Sand Block -170|Glass -171|Sign -172|Ash Block -173|Obsidian -174|Hellstone -175|Hellstone Bar -176|Mud Block -181|Amethyst -180|Topaz -177|Sapphire -179|Emerald -178|Ruby -182|Diamond -183|Glowing Mushroom -184|Star -185|Ivy Whip -186|Breathing Reed -187|Flipper -188|Healing Potion -189|Mana Potion -190|Blade of Grass -191|Thorn Chakram -192|Obsidian Brick -193|Obsidian Skull -194|Mushroom Grass Seeds -195|Jungle Grass Seeds -196|Wooden Hammer -197|Star Cannon -198|Blue Phaseblade -199|Red Phaseblade -200|Green Phaseblade -201|Purple Phaseblade -202|White Phaseblade -203|Yellow Phaseblade -204|Meteor Hamaxe -205|Empty Bucket -206|Water Bucket -207|Lava Bucket -208|Jungle Rose -209|Stinger -210|Vine -211|Feral Claws -212|Anklet of the Wind -213|Staff of Regrowth -214|Hellstone Brick -215|Whoopie Cushion -216|Shackle -217|Molten Hamaxe -218|Flamelash -219|Phoenix Blaster -220|Sunfury -221|Hellforge -222|Clay Pot -223|Nature's Gift -224|Bed -225|Silk -226|Lesser Restoration Potion -227|Restoration Potion -228|Jungle Hat -229|Jungle Shirt -230|Jungle Pants -231|Molten Helmet -232|Molten Breastplate -233|Molten Greaves -234|Meteor Shot -235|Sticky Bomb -236|Black Lens -237|Sunglasses -238|Wizard Hat -239|Top Hat -240|Tuxedo Shirt -241|Tuxedo Pants -242|Summer Hat -243|Bunny Hood -244|Plumber's Hat -245|Plumber's Shirt -246|Plumber's Pants -247|Hero's Hat -248|Hero's Shirt -249|Hero's Pants -250|Fish Bowl -251|Archaeologist's Hat -252|Archaeologist's Jacket -253|Archaeologist's Pants -254|Black Dye -255|Green Dye -256|Ninja Hood -257|Ninja Shirt -258|Ninja Pants -259|Leather -260|Red Hat -261|Goldfish -262|Robe -263|Robot Hat -264|Gold Crown -265|Hellfire Arrow -266|Sandgun -267|Guide Voodoo Doll -268|Diving Helmet -269|Familiar Shirt -270|Familiar Pants -271|Familiar Wig -272|Demon Scythe -273|Night's Edge -274|Dark Lance -275|Coral -276|Cactus -277|Trident -278|Silver Bullet -279|Throwing Knife -280|Spear -281|Blowpipe -282|Glowstick -283|Seed -284|Wooden Boomerang -285|Aglet -286|Sticky Glowstick -287|Poisoned Knife -288|Obsidian Skin Potion -289|Regeneration Potion -290|Swiftness Potion -291|Gills Potion -292|Ironskin Potion -293|Mana Regeneration Potion -294|Magic Power Potion -295|Featherfall Potion -296|Spelunker Potion -297|Invisibility Potion -298|Shine Potion -299|Night Owl Potion -300|Battle Potion -301|Thorns Potion -302|Water Walking Potion -303|Archery Potion -304|Hunter Potion -305|Gravitation Potion -306|Gold Chest -307|Daybloom Seeds -308|Moonglow Seeds -309|Blinkroot Seeds -310|Deathweed Seeds -311|Waterleaf Seeds -312|Fireblossom Seeds -313|Daybloom -314|Moonglow -315|Blinkroot -316|Deathweed -317|Waterleaf -318|Fireblossom -319|Shark Fin -320|Feather -321|Tombstone -322|Mime Mask -323|Antlion Mandible -324|Illegal Gun Parts -325|The Doctor's Shirt -326|The Doctor's Pants -327|Golden Key -328|Shadow Chest -329|Shadow Key -330|Obsidian Brick Wall -331|Jungle Spores -332|Loom -333|Piano -334|Dresser -335|Bench -336|Bathtub -337|Red Banner -338|Green Banner -339|Blue Banner -340|Yellow Banner -341|Lamp Post -342|Tiki Torch -343|Barrel -344|Chinese Lantern -345|Cooking Pot -346|Safe -347|Skull Lantern -348|Trash Can -349|Candelabra -350|Pink Vase -351|Mug -352|Keg -353|Ale -354|Bookcase -355|Throne -356|Bowl -357|Bowl of Soup -358|Toilet -359|Grandfather Clock -360|Statue -361|Goblin Battle Standard -362|Tattered Cloth -363|Silver Broadsword -364|Silver Shortsword -365|Gold Broadsword -366|Gold Shortsword -367|Copper Broadsword -368|Copper Shortsword -369|Silver Bow -370|Gold Bow -371|Copper Bow -372|Copper Hammer -373|Silver Hammer -374|Gold Hammer \ No newline at end of file diff --git a/TEdit/settings.xml b/TEdit/settings.xml index cd9f67f9..b906f35e 100644 --- a/TEdit/settings.xml +++ b/TEdit/settings.xml @@ -4,88 +4,88 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - + + - - - + + + - + - + - - - - - + + + + + - - - - - - + + + + + + - - + + - - - - - + + + + + - - - - - - + + + + + + - + - - + + @@ -96,8 +96,8 @@ - - + + @@ -110,7 +110,7 @@ - +