diff --git a/ZoFo/Content/Content.mgcb b/ZoFo/Content/Content.mgcb index ba94670..f2a0e0d 100644 --- a/ZoFo/Content/Content.mgcb +++ b/ZoFo/Content/Content.mgcb @@ -37,6 +37,9 @@ #begin MapData/TileMaps/main.tmj /copy:MapData/TileMaps/main.tmj +#begin MapData/TileSets/IconSet.tsj +/copy:MapData/TileSets/IconSet.tsj + #begin MapData/TileSets/tileset 1 collision.tsj /copy:MapData/TileSets/tileset 1 collision.tsj @@ -607,6 +610,810 @@ /processorParam:TextureFormat=Color /build:Textures/icons/9.png +#begin Textures/icons/Collectables/Ammo.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Collectables/Ammo.png + +#begin Textures/icons/Collectables/BottleOfWater.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Collectables/BottleOfWater.png + +#begin Textures/icons/Collectables/Peeble.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Collectables/Peeble.png + +#begin Textures/icons/Collectables/PureBottleOfWater.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Collectables/PureBottleOfWater.png + +#begin Textures/icons/Collectables/RottenFlesh.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Collectables/RottenFlesh.png + +#begin Textures/icons/Collectables/Steel.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Collectables/Steel.png + +#begin Textures/icons/Collectables/Wood.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Collectables/Wood.png + +#begin Textures/icons/Material/Fabric.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Material/Fabric.png + +#begin Textures/icons/Material/Leather.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Material/Leather.png + +#begin Textures/icons/Material/Paper.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Material/Paper.png + +#begin Textures/icons/Material/Rope.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Material/Rope.png + +#begin Textures/icons/Material/String.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Material/String.png + +#begin Textures/icons/Material/Wooden Plank.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Material/Wooden Plank.png + +#begin Textures/icons/Material/Wool.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Material/Wool.png + +#begin Textures/icons/Misc/Book 2.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Book 2.png + +#begin Textures/icons/Misc/Book 3.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Book 3.png + +#begin Textures/icons/Misc/Book.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Book.png + +#begin Textures/icons/Misc/Candle.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Candle.png + +#begin Textures/icons/Misc/Chest.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Chest.png + +#begin Textures/icons/Misc/Copper Coin.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Copper Coin.png + +#begin Textures/icons/Misc/Crate.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Crate.png + +#begin Textures/icons/Misc/Envolop.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Envolop.png + +#begin Textures/icons/Misc/Gear.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Gear.png + +#begin Textures/icons/Misc/Golden Coin.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Golden Coin.png + +#begin Textures/icons/Misc/Golden Key.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Golden Key.png + +#begin Textures/icons/Misc/Heart.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Heart.png + +#begin Textures/icons/Misc/Iron Key.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Iron Key.png + +#begin Textures/icons/Misc/Lantern.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Lantern.png + +#begin Textures/icons/Misc/Map.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Map.png + +#begin Textures/icons/Misc/Rune Stone.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Rune Stone.png + +#begin Textures/icons/Misc/Scroll.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Scroll.png + +#begin Textures/icons/Misc/Silver Coin.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Silver Coin.png + +#begin Textures/icons/Misc/Silver Key.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Misc/Silver Key.png + +#begin Textures/icons/Monster Part/Bone.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Monster Part/Bone.png + +#begin Textures/icons/Monster Part/Egg.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Monster Part/Egg.png + +#begin Textures/icons/Monster Part/Feather.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Monster Part/Feather.png + +#begin Textures/icons/Monster Part/Monster Egg.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Monster Part/Monster Egg.png + +#begin Textures/icons/Monster Part/Monster Eye.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Monster Part/Monster Eye.png + +#begin Textures/icons/Monster Part/Skull.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Monster Part/Skull.png + +#begin Textures/icons/Monster Part/Slime Gel.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Monster Part/Slime Gel.png + +#begin Textures/icons/Ore & Gem/Coal.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Coal.png + +#begin Textures/icons/Ore & Gem/Copper Ingot.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Copper Ingot.png + +#begin Textures/icons/Ore & Gem/Copper Nugget.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Copper Nugget.png + +#begin Textures/icons/Ore & Gem/Crystal.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Crystal.png + +#begin Textures/icons/Ore & Gem/Cut Emerald.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Cut Emerald.png + +#begin Textures/icons/Ore & Gem/Cut Ruby.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Cut Ruby.png + +#begin Textures/icons/Ore & Gem/Cut Sapphire.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Cut Sapphire.png + +#begin Textures/icons/Ore & Gem/Cut Topaz.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Cut Topaz.png + +#begin Textures/icons/Ore & Gem/Diamond.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Diamond.png + +#begin Textures/icons/Ore & Gem/Emerald.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Emerald.png + +#begin Textures/icons/Ore & Gem/Gold Nugget.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Gold Nugget.png + +#begin Textures/icons/Ore & Gem/Golden Ingot.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Golden Ingot.png + +#begin Textures/icons/Ore & Gem/Obsidian.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Obsidian.png + +#begin Textures/icons/Ore & Gem/Pearl.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Pearl.png + +#begin Textures/icons/Ore & Gem/Ruby.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Ruby.png + +#begin Textures/icons/Ore & Gem/Sapphire.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Sapphire.png + +#begin Textures/icons/Ore & Gem/Silver Nugget.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Silver Nugget.png + +#begin Textures/icons/Ore & Gem/Topaz.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Ore & Gem/Topaz.png + +#begin Textures/icons/Potion/Blue Potion 2.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Potion/Blue Potion 2.png + +#begin Textures/icons/Potion/Blue Potion 3.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Potion/Blue Potion 3.png + +#begin Textures/icons/Potion/Empty Bottle.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Potion/Empty Bottle.png + +#begin Textures/icons/Potion/Green Potion 2.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Potion/Green Potion 2.png + +#begin Textures/icons/Potion/Green Potion 3.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Potion/Green Potion 3.png + +#begin Textures/icons/Potion/Green Potion.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Potion/Green Potion.png + +#begin Textures/icons/Potion/Red Potion 2.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Potion/Red Potion 2.png + +#begin Textures/icons/Potion/Red Potion 3.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Potion/Red Potion 3.png + +#begin Textures/icons/Potion/Red Potion.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/icons/Potion/Red Potion.png + #begin Textures/Test/pickaxe.webp /importer:TextureImporter /processor:TextureProcessor diff --git a/ZoFo/Content/MapData/MapSession.tiled-session b/ZoFo/Content/MapData/MapSession.tiled-session index d0db47c..acfc369 100644 --- a/ZoFo/Content/MapData/MapSession.tiled-session +++ b/ZoFo/Content/MapData/MapSession.tiled-session @@ -10,6 +10,9 @@ "TileMaps" ], "fileStates": { + "": { + "scaleInDock": 1 + }, "TileMaps/TileSets/TileSet 1.tsj": { "scaleInDock": 1 }, @@ -21,15 +24,24 @@ "y": 553.0303030303031 } }, + "TileMaps/main.tmj#IconSet": { + "dynamicWrapping": true, + "scaleInEditor": 1 + }, "TileSets/CollisionTileSet.tsj": { "scaleInDock": 0.75, "scaleInEditor": 1 }, + "TileSets/IconSet.tsj": { + "dynamicWrapping": true + }, "TileSets/TileSet 1.tsj": { + "dynamicWrapping": false, "scaleInDock": 1, "scaleInEditor": 1.5 }, "TileSets/TilesetNature.tsj": { + "dynamicWrapping": false "scaleInDock": 1 }, "TileSets/WallSet.tsj": { @@ -40,7 +52,8 @@ "scaleInDock": 1 } }, - "last.imagePath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/Textures/TileSetImages", + "last.imagePath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/Textures/icons", + "last.objectTemplatePath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/MapData/Templates", "openFiles": [ "TileSets/TileSet 1.tsj", "TileMaps/main.tmj" @@ -52,12 +65,14 @@ "TileSets/CollisionTileSet.tsj", "TileSets/WallSet.tsj" ], - "stampsFolder": "C:/Users/artem/source/repos/ZoFo/ZoFo/Content/MapData/TileStamps", + "stampsFolder": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/MapData/TileStamps", + "tileset.embedInMap": false, "tileset.lastUsedFormat": "json", "tileset.margin": 0, "tileset.spacing": 0, "tileset.tileSize": { "height": 16, "width": 16 - } + }, + "tileset.type": 1 } diff --git a/ZoFo/Content/MapData/Templates/Ammo.tj b/ZoFo/Content/MapData/Templates/Ammo.tj new file mode 100644 index 0000000..6bba547 --- /dev/null +++ b/ZoFo/Content/MapData/Templates/Ammo.tj @@ -0,0 +1,18 @@ +{ "object": + { + "gid":1, + "height":16, + "id":13, + "name":"Ammo", + "rotation":0, + "type":"", + "visible":true, + "width":16 + }, + "tileset": + { + "firstgid":1, + "source":"..\/TileSets\/IconSet.tsj" + }, + "type":"template" +} \ No newline at end of file diff --git a/ZoFo/Content/MapData/Templates/BottleOfWater.tj b/ZoFo/Content/MapData/Templates/BottleOfWater.tj new file mode 100644 index 0000000..14ab412 --- /dev/null +++ b/ZoFo/Content/MapData/Templates/BottleOfWater.tj @@ -0,0 +1,18 @@ +{ "object": + { + "gid":3, + "height":16, + "id":11, + "name":"BottleOfWater", + "rotation":0, + "type":"", + "visible":true, + "width":16 + }, + "tileset": + { + "firstgid":1, + "source":"..\/TileSets\/IconSet.tsj" + }, + "type":"template" +} \ No newline at end of file diff --git a/ZoFo/Content/MapData/Templates/Peeble.tj b/ZoFo/Content/MapData/Templates/Peeble.tj new file mode 100644 index 0000000..70ff1ff --- /dev/null +++ b/ZoFo/Content/MapData/Templates/Peeble.tj @@ -0,0 +1,18 @@ +{ "object": + { + "gid":7, + "height":16, + "id":17, + "name":"Peeble", + "rotation":0, + "type":"", + "visible":true, + "width":16 + }, + "tileset": + { + "firstgid":1, + "source":"..\/TileSets\/IconSet.tsj" + }, + "type":"template" +} \ No newline at end of file diff --git a/ZoFo/Content/MapData/Templates/PureBottleOfWater.tj b/ZoFo/Content/MapData/Templates/PureBottleOfWater.tj new file mode 100644 index 0000000..72944f8 --- /dev/null +++ b/ZoFo/Content/MapData/Templates/PureBottleOfWater.tj @@ -0,0 +1,18 @@ +{ "object": + { + "gid":2, + "height":16, + "id":10, + "name":"PureBottleOfWater", + "rotation":0, + "type":"", + "visible":true, + "width":16 + }, + "tileset": + { + "firstgid":1, + "source":"..\/TileSets\/IconSet.tsj" + }, + "type":"template" +} \ No newline at end of file diff --git a/ZoFo/Content/MapData/Templates/RottenFlesh.tj b/ZoFo/Content/MapData/Templates/RottenFlesh.tj new file mode 100644 index 0000000..620179c --- /dev/null +++ b/ZoFo/Content/MapData/Templates/RottenFlesh.tj @@ -0,0 +1,18 @@ +{ "object": + { + "gid":6, + "height":16, + "id":16, + "name":"RottenFlesh", + "rotation":0, + "type":"", + "visible":true, + "width":16 + }, + "tileset": + { + "firstgid":1, + "source":"..\/TileSets\/IconSet.tsj" + }, + "type":"template" +} \ No newline at end of file diff --git a/ZoFo/Content/MapData/Templates/Steel.tj b/ZoFo/Content/MapData/Templates/Steel.tj new file mode 100644 index 0000000..64fa222 --- /dev/null +++ b/ZoFo/Content/MapData/Templates/Steel.tj @@ -0,0 +1,18 @@ +{ "object": + { + "gid":5, + "height":16, + "id":15, + "name":"Steel", + "rotation":0, + "type":"", + "visible":true, + "width":16 + }, + "tileset": + { + "firstgid":1, + "source":"..\/TileSets\/IconSet.tsj" + }, + "type":"template" +} \ No newline at end of file diff --git a/ZoFo/Content/MapData/Templates/Wood.tj b/ZoFo/Content/MapData/Templates/Wood.tj new file mode 100644 index 0000000..b4c4b4e --- /dev/null +++ b/ZoFo/Content/MapData/Templates/Wood.tj @@ -0,0 +1,18 @@ +{ "object": + { + "gid":4, + "height":16, + "id":12, + "name":"Wood", + "rotation":0, + "type":"", + "visible":true, + "width":16 + }, + "tileset": + { + "firstgid":1, + "source":"..\/TileSets\/IconSet.tsj" + }, + "type":"template" +} \ No newline at end of file diff --git a/ZoFo/Content/MapData/TileSets/IconSet.tsj b/ZoFo/Content/MapData/TileSets/IconSet.tsj new file mode 100644 index 0000000..186df25 --- /dev/null +++ b/ZoFo/Content/MapData/TileSets/IconSet.tsj @@ -0,0 +1,60 @@ +{ "columns":0, + "grid": + { + "height":1, + "orientation":"orthogonal", + "width":1 + }, + "margin":0, + "name":"IconSet", + "spacing":0, + "tilecount":7, + "tiledversion":"1.10.2", + "tileheight":1200, + "tiles":[ + { + "id":0, + "image":"..\/..\/Textures\/icons\/Collectables\/ammunition.png", + "imageheight":512, + "imagewidth":512 + }, + { + "id":1, + "image":"..\/..\/Textures\/icons\/Collectables\/Blue Potion.png", + "imageheight":32, + "imagewidth":32 + }, + { + "id":2, + "image":"..\/..\/Textures\/icons\/Collectables\/Water Bottle.png", + "imageheight":32, + "imagewidth":32 + }, + { + "id":3, + "image":"..\/..\/Textures\/icons\/Collectables\/Wood Log.png", + "imageheight":32, + "imagewidth":32 + }, + { + "id":4, + "image":"..\/..\/Textures\/icons\/Collectables\/Silver Ingot.png", + "imageheight":32, + "imagewidth":32 + }, + { + "id":5, + "image":"..\/..\/Textures\/icons\/Collectables\/Monster Meat.png", + "imageheight":32, + "imagewidth":32 + }, + { + "id":6, + "image":"..\/..\/Textures\/icons\/Collectables\/Stone.png", + "imageheight":1200, + "imagewidth":1200 + }], + "tilewidth":1200, + "type":"tileset", + "version":"1.10" +} \ No newline at end of file diff --git a/ZoFo/Content/Textures/icons/Collectables/Ammo.png b/ZoFo/Content/Textures/icons/Collectables/Ammo.png new file mode 100644 index 0000000..9c793f7 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Collectables/Ammo.png differ diff --git a/ZoFo/Content/Textures/icons/Collectables/BottleOfWater.png b/ZoFo/Content/Textures/icons/Collectables/BottleOfWater.png new file mode 100644 index 0000000..86015b6 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Collectables/BottleOfWater.png differ diff --git a/ZoFo/Content/Textures/icons/Collectables/Peeble.png b/ZoFo/Content/Textures/icons/Collectables/Peeble.png new file mode 100644 index 0000000..dfb4f75 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Collectables/Peeble.png differ diff --git a/ZoFo/Content/Textures/icons/Collectables/PureBottleOfWater.png b/ZoFo/Content/Textures/icons/Collectables/PureBottleOfWater.png new file mode 100644 index 0000000..29812cb Binary files /dev/null and b/ZoFo/Content/Textures/icons/Collectables/PureBottleOfWater.png differ diff --git a/ZoFo/Content/Textures/icons/Collectables/RottenFlesh.png b/ZoFo/Content/Textures/icons/Collectables/RottenFlesh.png new file mode 100644 index 0000000..beb3904 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Collectables/RottenFlesh.png differ diff --git a/ZoFo/Content/Textures/icons/Collectables/Steel.png b/ZoFo/Content/Textures/icons/Collectables/Steel.png new file mode 100644 index 0000000..83cec5d Binary files /dev/null and b/ZoFo/Content/Textures/icons/Collectables/Steel.png differ diff --git a/ZoFo/Content/Textures/icons/Collectables/Wood.png b/ZoFo/Content/Textures/icons/Collectables/Wood.png new file mode 100644 index 0000000..661a581 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Collectables/Wood.png differ diff --git a/ZoFo/Content/Textures/icons/Material/Fabric.png b/ZoFo/Content/Textures/icons/Material/Fabric.png new file mode 100644 index 0000000..86f1fea Binary files /dev/null and b/ZoFo/Content/Textures/icons/Material/Fabric.png differ diff --git a/ZoFo/Content/Textures/icons/Material/Leather.png b/ZoFo/Content/Textures/icons/Material/Leather.png new file mode 100644 index 0000000..5469647 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Material/Leather.png differ diff --git a/ZoFo/Content/Textures/icons/Material/Paper.png b/ZoFo/Content/Textures/icons/Material/Paper.png new file mode 100644 index 0000000..a2745c2 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Material/Paper.png differ diff --git a/ZoFo/Content/Textures/icons/Material/Rope.png b/ZoFo/Content/Textures/icons/Material/Rope.png new file mode 100644 index 0000000..aadc1f6 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Material/Rope.png differ diff --git a/ZoFo/Content/Textures/icons/Material/String.png b/ZoFo/Content/Textures/icons/Material/String.png new file mode 100644 index 0000000..e5b737d Binary files /dev/null and b/ZoFo/Content/Textures/icons/Material/String.png differ diff --git a/ZoFo/Content/Textures/icons/Material/Wooden Plank.png b/ZoFo/Content/Textures/icons/Material/Wooden Plank.png new file mode 100644 index 0000000..002b1f0 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Material/Wooden Plank.png differ diff --git a/ZoFo/Content/Textures/icons/Material/Wool.png b/ZoFo/Content/Textures/icons/Material/Wool.png new file mode 100644 index 0000000..0721e18 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Material/Wool.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Book 2.png b/ZoFo/Content/Textures/icons/Misc/Book 2.png new file mode 100644 index 0000000..3647643 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Book 2.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Book 3.png b/ZoFo/Content/Textures/icons/Misc/Book 3.png new file mode 100644 index 0000000..fc95b46 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Book 3.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Book.png b/ZoFo/Content/Textures/icons/Misc/Book.png new file mode 100644 index 0000000..72da883 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Book.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Candle.png b/ZoFo/Content/Textures/icons/Misc/Candle.png new file mode 100644 index 0000000..668d746 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Candle.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Chest.png b/ZoFo/Content/Textures/icons/Misc/Chest.png new file mode 100644 index 0000000..c489e19 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Chest.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Copper Coin.png b/ZoFo/Content/Textures/icons/Misc/Copper Coin.png new file mode 100644 index 0000000..a3ea56c Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Copper Coin.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Crate.png b/ZoFo/Content/Textures/icons/Misc/Crate.png new file mode 100644 index 0000000..515179f Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Crate.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Envolop.png b/ZoFo/Content/Textures/icons/Misc/Envolop.png new file mode 100644 index 0000000..353d1e2 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Envolop.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Gear.png b/ZoFo/Content/Textures/icons/Misc/Gear.png new file mode 100644 index 0000000..ca61852 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Gear.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Golden Coin.png b/ZoFo/Content/Textures/icons/Misc/Golden Coin.png new file mode 100644 index 0000000..e229bc6 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Golden Coin.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Golden Key.png b/ZoFo/Content/Textures/icons/Misc/Golden Key.png new file mode 100644 index 0000000..6a38826 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Golden Key.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Heart.png b/ZoFo/Content/Textures/icons/Misc/Heart.png new file mode 100644 index 0000000..46c8c85 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Heart.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Iron Key.png b/ZoFo/Content/Textures/icons/Misc/Iron Key.png new file mode 100644 index 0000000..05431f3 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Iron Key.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Lantern.png b/ZoFo/Content/Textures/icons/Misc/Lantern.png new file mode 100644 index 0000000..17c8269 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Lantern.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Map.png b/ZoFo/Content/Textures/icons/Misc/Map.png new file mode 100644 index 0000000..dd03538 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Map.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Rune Stone.png b/ZoFo/Content/Textures/icons/Misc/Rune Stone.png new file mode 100644 index 0000000..c859aa1 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Rune Stone.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Scroll.png b/ZoFo/Content/Textures/icons/Misc/Scroll.png new file mode 100644 index 0000000..a9150e0 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Scroll.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Silver Coin.png b/ZoFo/Content/Textures/icons/Misc/Silver Coin.png new file mode 100644 index 0000000..3fd8a1b Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Silver Coin.png differ diff --git a/ZoFo/Content/Textures/icons/Misc/Silver Key.png b/ZoFo/Content/Textures/icons/Misc/Silver Key.png new file mode 100644 index 0000000..a8d1a88 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Misc/Silver Key.png differ diff --git a/ZoFo/Content/Textures/icons/Monster Part/Bone.png b/ZoFo/Content/Textures/icons/Monster Part/Bone.png new file mode 100644 index 0000000..875f234 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Monster Part/Bone.png differ diff --git a/ZoFo/Content/Textures/icons/Monster Part/Egg.png b/ZoFo/Content/Textures/icons/Monster Part/Egg.png new file mode 100644 index 0000000..72c63b6 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Monster Part/Egg.png differ diff --git a/ZoFo/Content/Textures/icons/Monster Part/Feather.png b/ZoFo/Content/Textures/icons/Monster Part/Feather.png new file mode 100644 index 0000000..266c099 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Monster Part/Feather.png differ diff --git a/ZoFo/Content/Textures/icons/Monster Part/Monster Egg.png b/ZoFo/Content/Textures/icons/Monster Part/Monster Egg.png new file mode 100644 index 0000000..1c25f6f Binary files /dev/null and b/ZoFo/Content/Textures/icons/Monster Part/Monster Egg.png differ diff --git a/ZoFo/Content/Textures/icons/Monster Part/Monster Eye.png b/ZoFo/Content/Textures/icons/Monster Part/Monster Eye.png new file mode 100644 index 0000000..46f7dd9 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Monster Part/Monster Eye.png differ diff --git a/ZoFo/Content/Textures/icons/Monster Part/Skull.png b/ZoFo/Content/Textures/icons/Monster Part/Skull.png new file mode 100644 index 0000000..a43677f Binary files /dev/null and b/ZoFo/Content/Textures/icons/Monster Part/Skull.png differ diff --git a/ZoFo/Content/Textures/icons/Monster Part/Slime Gel.png b/ZoFo/Content/Textures/icons/Monster Part/Slime Gel.png new file mode 100644 index 0000000..348dc3a Binary files /dev/null and b/ZoFo/Content/Textures/icons/Monster Part/Slime Gel.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Coal.png b/ZoFo/Content/Textures/icons/Ore & Gem/Coal.png new file mode 100644 index 0000000..4b31230 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Coal.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Copper Ingot.png b/ZoFo/Content/Textures/icons/Ore & Gem/Copper Ingot.png new file mode 100644 index 0000000..87b5414 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Copper Ingot.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Copper Nugget.png b/ZoFo/Content/Textures/icons/Ore & Gem/Copper Nugget.png new file mode 100644 index 0000000..5bf5b77 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Copper Nugget.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Crystal.png b/ZoFo/Content/Textures/icons/Ore & Gem/Crystal.png new file mode 100644 index 0000000..84b4ad5 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Crystal.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Cut Emerald.png b/ZoFo/Content/Textures/icons/Ore & Gem/Cut Emerald.png new file mode 100644 index 0000000..f6915ff Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Cut Emerald.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Cut Ruby.png b/ZoFo/Content/Textures/icons/Ore & Gem/Cut Ruby.png new file mode 100644 index 0000000..f3324b8 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Cut Ruby.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Cut Sapphire.png b/ZoFo/Content/Textures/icons/Ore & Gem/Cut Sapphire.png new file mode 100644 index 0000000..bc10d18 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Cut Sapphire.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Cut Topaz.png b/ZoFo/Content/Textures/icons/Ore & Gem/Cut Topaz.png new file mode 100644 index 0000000..186ea83 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Cut Topaz.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Diamond.png b/ZoFo/Content/Textures/icons/Ore & Gem/Diamond.png new file mode 100644 index 0000000..ab88c6d Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Diamond.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Emerald.png b/ZoFo/Content/Textures/icons/Ore & Gem/Emerald.png new file mode 100644 index 0000000..71d792a Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Emerald.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Gold Nugget.png b/ZoFo/Content/Textures/icons/Ore & Gem/Gold Nugget.png new file mode 100644 index 0000000..efb2bdc Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Gold Nugget.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Golden Ingot.png b/ZoFo/Content/Textures/icons/Ore & Gem/Golden Ingot.png new file mode 100644 index 0000000..0ce2a77 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Golden Ingot.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Obsidian.png b/ZoFo/Content/Textures/icons/Ore & Gem/Obsidian.png new file mode 100644 index 0000000..7077bfc Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Obsidian.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Pearl.png b/ZoFo/Content/Textures/icons/Ore & Gem/Pearl.png new file mode 100644 index 0000000..c05a104 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Pearl.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Ruby.png b/ZoFo/Content/Textures/icons/Ore & Gem/Ruby.png new file mode 100644 index 0000000..5953f23 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Ruby.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Sapphire.png b/ZoFo/Content/Textures/icons/Ore & Gem/Sapphire.png new file mode 100644 index 0000000..8ee8eb9 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Sapphire.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Silver Nugget.png b/ZoFo/Content/Textures/icons/Ore & Gem/Silver Nugget.png new file mode 100644 index 0000000..12ba6f8 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Silver Nugget.png differ diff --git a/ZoFo/Content/Textures/icons/Ore & Gem/Topaz.png b/ZoFo/Content/Textures/icons/Ore & Gem/Topaz.png new file mode 100644 index 0000000..14f60e0 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Ore & Gem/Topaz.png differ diff --git a/ZoFo/Content/Textures/icons/Potion/Blue Potion 2.png b/ZoFo/Content/Textures/icons/Potion/Blue Potion 2.png new file mode 100644 index 0000000..e3f35cc Binary files /dev/null and b/ZoFo/Content/Textures/icons/Potion/Blue Potion 2.png differ diff --git a/ZoFo/Content/Textures/icons/Potion/Blue Potion 3.png b/ZoFo/Content/Textures/icons/Potion/Blue Potion 3.png new file mode 100644 index 0000000..08bd33c Binary files /dev/null and b/ZoFo/Content/Textures/icons/Potion/Blue Potion 3.png differ diff --git a/ZoFo/Content/Textures/icons/Potion/Empty Bottle.png b/ZoFo/Content/Textures/icons/Potion/Empty Bottle.png new file mode 100644 index 0000000..14d86eb Binary files /dev/null and b/ZoFo/Content/Textures/icons/Potion/Empty Bottle.png differ diff --git a/ZoFo/Content/Textures/icons/Potion/Green Potion 2.png b/ZoFo/Content/Textures/icons/Potion/Green Potion 2.png new file mode 100644 index 0000000..f1cb3eb Binary files /dev/null and b/ZoFo/Content/Textures/icons/Potion/Green Potion 2.png differ diff --git a/ZoFo/Content/Textures/icons/Potion/Green Potion 3.png b/ZoFo/Content/Textures/icons/Potion/Green Potion 3.png new file mode 100644 index 0000000..cab446c Binary files /dev/null and b/ZoFo/Content/Textures/icons/Potion/Green Potion 3.png differ diff --git a/ZoFo/Content/Textures/icons/Potion/Green Potion.png b/ZoFo/Content/Textures/icons/Potion/Green Potion.png new file mode 100644 index 0000000..ffb9a9a Binary files /dev/null and b/ZoFo/Content/Textures/icons/Potion/Green Potion.png differ diff --git a/ZoFo/Content/Textures/icons/Potion/Red Potion 2.png b/ZoFo/Content/Textures/icons/Potion/Red Potion 2.png new file mode 100644 index 0000000..775547c Binary files /dev/null and b/ZoFo/Content/Textures/icons/Potion/Red Potion 2.png differ diff --git a/ZoFo/Content/Textures/icons/Potion/Red Potion 3.png b/ZoFo/Content/Textures/icons/Potion/Red Potion 3.png new file mode 100644 index 0000000..f6e7087 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Potion/Red Potion 3.png differ diff --git a/ZoFo/Content/Textures/icons/Potion/Red Potion.png b/ZoFo/Content/Textures/icons/Potion/Red Potion.png new file mode 100644 index 0000000..4492710 Binary files /dev/null and b/ZoFo/Content/Textures/icons/Potion/Red Potion.png differ diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapElements/Layer.cs b/ZoFo/GameCore/GameManagers/MapManager/MapElements/Layer.cs index cf04682..b02bb26 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapElements/Layer.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapElements/Layer.cs @@ -10,11 +10,14 @@ namespace ZoFo.GameCore.GameManagers.MapManager.MapElements public class Layer { public List Chunks { get; set; } + public List Objects { get; set; } public int Height { get; set; } public int Width { get; set; } public int Id { get; set; } public bool Visibility { get; set; } public string Class { get; set; } public string Type { get; set; } + public string Name { get; set; } + } } diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapElements/Object.cs b/ZoFo/GameCore/GameManagers/MapManager/MapElements/Object.cs index f4c4336..96a15e1 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapElements/Object.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapElements/Object.cs @@ -4,13 +4,16 @@ using System.Linq; using System.Text; using System.Threading.Tasks; + namespace ZoFo.GameCore.GameManagers.MapManager.MapElements { public class Object { public double Height { get; set; } public double Width { get; set; } - public double X { get; set; } - public double Y { get; set; } + public float X { get; set; } + public float Y { get; set; } + public string Template { get; set; } + public string Type { get; set; } } } diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapElements/Template.cs b/ZoFo/GameCore/GameManagers/MapManager/MapElements/Template.cs new file mode 100644 index 0000000..f954c37 --- /dev/null +++ b/ZoFo/GameCore/GameManagers/MapManager/MapElements/Template.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ZoFo.GameCore.GameManagers.MapManager.MapElements; + +namespace ZoFo.GameCore.GameManagers.MapManager.MapElements +{ + public class Template + { + public Object Object { get; set; } + public string Type { get; set; } + } +} diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs index 72dcdea..1aba430 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs @@ -9,6 +9,7 @@ using System.Text; using System.Text.Json; using System.Threading.Tasks; using ZoFo.GameCore.GameManagers.MapManager.MapElements; +using ZoFo.GameCore.GameObjects; using ZoFo.GameCore.GameObjects.MapObjects; using ZoFo.GameCore.GameObjects.MapObjects.StopObjects; @@ -17,9 +18,16 @@ namespace ZoFo.GameCore.GameManagers.MapManager public class MapManager { private static readonly string _templatePath = "Content/MapData/TileMaps/{0}.tmj"; + private static readonly JsonSerializerOptions _options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true }; // Задача настроек для JsonSerialize + private static readonly Dictionary _classPath = new Dictionary() { + { "Collectables", "ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables." }, + { "Enemies", "ZoFo.GameCore.GameObjects.Entities.LivingEntities.Enemies." } + }; //private static readonly float _scale = 1.0f; private List _tileSets = new List(); + private TileMap _tileMap = new TileMap(); + /// /// Загрузка карты. Передаётся название файла карты. По умолчанию main. @@ -28,86 +36,95 @@ namespace ZoFo.GameCore.GameManagers.MapManager public void LoadMap(string mapName = "main") { // Загрузка TileMap - var options = new JsonSerializerOptions - { - PropertyNameCaseInsensitive = true - }; - TileMap tileMap = - JsonSerializer.Deserialize(File.ReadAllText(Path.Combine(AppContext.BaseDirectory, string.Format(_templatePath, mapName))), options); + _tileMap = JsonSerializer.Deserialize(File.ReadAllText(string.Format(_templatePath, mapName)), _options); // Загрузка TileSet-ов по TileSetInfo - List tileSets = new List(); - foreach (TileSetInfo tileSetInfo in tileMap.TileSets) + foreach (TileSetInfo tileSetInfo in _tileMap.TileSets) { TileSet tileSet = LoadTileSet(Path.Combine(AppContext.BaseDirectory, "Content", "MapData", "TileMaps", tileSetInfo.Source)); tileSet.FirstGid = tileSetInfo.FirstGid; - tileSets.Add(tileSet); + _tileSets.Add(tileSet); } - tileSets.Reverse(); + _tileSets.Reverse(); - foreach (var layer in tileMap.Layers) + + foreach (var layer in _tileMap.Layers) { if (layer.Type == "objectgroup") { - + ProcessObjectLayers(layer); } else { - foreach (var chunk in layer.Chunks) + ProcessTileLayers(layer); + } + } + } + + private void ProcessTileLayers(Layer layer) + { + foreach (var chunk in layer.Chunks) + { + for (int i = 0; i < chunk.Data.Length; i++) + { + foreach (var tileSet in _tileSets) { - for (int i = 0; i < chunk.Data.Length; i++) + if (tileSet.FirstGid <= chunk.Data[i]) { - foreach (var tileSet in tileSets) + int number = chunk.Data[i] - tileSet.FirstGid; + + int relativeColumn = number % tileSet.Columns; + int relativeRow = number / tileSet.Columns; // относительно левого угла чанка + + Rectangle sourceRectangle = new Rectangle(relativeColumn * (tileSet.TileWidth + tileSet.Spacing) + tileSet.Margin, + relativeRow * (tileSet.TileHeight + tileSet.Spacing) + tileSet.Margin, + tileSet.TileWidth, tileSet.TileHeight); + + Vector2 position = new Vector2( + (i % chunk.Width) * _tileMap.TileWidth + chunk.X * _tileMap.TileWidth, + (i / chunk.Height) * _tileMap.TileHeight + chunk.Y * _tileMap.TileHeight); + + Tile tile = tileSet.Tiles[number]; // По факту может быть StopObjectom, но на уровне Tiled это все в первую очередь Tile + + switch (tile.Type) { - if (tileSet.FirstGid <= chunk.Data[i]) - { - int number = chunk.Data[i] - tileSet.FirstGid; - - int relativeColumn = number % tileSet.Columns; - int relativeRow = number / tileSet.Columns; // относительно левого угла чанка - - Rectangle sourceRectangle = new Rectangle(relativeColumn * (tileSet.TileWidth + tileSet.Spacing) + tileSet.Margin, - relativeRow * (tileSet.TileHeight + tileSet.Spacing) + tileSet.Margin, - tileSet.TileWidth, tileSet.TileHeight); - - Vector2 position = new Vector2( - (i % chunk.Width) * tileMap.TileWidth + chunk.X * tileMap.TileWidth, - (i / chunk.Height) * tileMap.TileHeight + chunk.Y * tileMap.TileHeight); - - Tile tile = tileSet.Tiles[number]; // По факту может быть StopObjectom, но на уровне Tiled это все в первую очередь Tile - string textureName = Path.Combine(AppContext.BaseDirectory, "Content", "Textures", "TileSetImages", - Path.GetFileName(tileSet.Image).Replace(".png", "")); - switch (tile.Type) - { - case "Tile": - AppManager.Instance.server.RegisterGameObject(new MapObject(position, - new Vector2(tileSet.TileWidth, tileSet.TileHeight), - sourceRectangle, - textureName)); - break; - - case "StopObject": - var collisionRectangles = LoadRectangles(tile); // Грузит коллизии обьектов - - AppManager.Instance.server.RegisterGameObject(new StopObject(position, - new Vector2(tileSet.TileWidth, tileSet.TileHeight), - sourceRectangle, - textureName, - collisionRectangles.ToArray())); - break; - - default: - break; - } + case "Tile": + AppManager.Instance.server.RegisterGameObject(new MapObject(position, + new Vector2(tileSet.TileWidth, tileSet.TileHeight), + sourceRectangle, + "Textures/TileSetImages/" + Path.GetFileName(tileSet.Image).Replace(".png", ""))); + break; + + case "StopObject": + var collisionRectangles = LoadRectangles(tile); // Грузит коллизии обьектов + + AppManager.Instance.server.RegisterGameObject(new StopObject(position, + new Vector2(tileSet.TileWidth, tileSet.TileHeight), + sourceRectangle, + "Textures/TileSetImages/" + Path.GetFileName(tileSet.Image).Replace(".png", ""), + collisionRectangles.ToArray())); + break; + + default: break; - } } + break; } } } } } + private void ProcessObjectLayers(Layer layer) + { + foreach (var item in layer.Objects) + { + string type = Path.GetFileName(item.Template).Replace(".tj", ""); + var collectable = Activator.CreateInstance(Type.GetType(_classPath[layer.Name] + type), new Vector2(item.X, item.Y)); + AppManager.Instance.server.RegisterGameObject(collectable as GameObject); + } + } + /// /// Загружает и парсит TileSet по его пути. /// @@ -115,15 +132,8 @@ namespace ZoFo.GameCore.GameManagers.MapManager /// private TileSet LoadTileSet(string path) { - using (StreamReader reader = new StreamReader(path)) - { - var options = new JsonSerializerOptions //TODO Remove - { - PropertyNameCaseInsensitive = true - }; - string data = reader.ReadToEnd(); - return JsonSerializer.Deserialize(data, options); - } + return JsonSerializer.Deserialize(File.ReadAllText(path), _options); + } /// @@ -146,5 +156,10 @@ namespace ZoFo.GameCore.GameManagers.MapManager return collisionRectangles; } + + private MapElements.Object LoadObject(string path) + { + return JsonSerializer.Deserialize(File.ReadAllText(path), _options); + } } } \ No newline at end of file diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Ammo.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Ammo.cs index 6362c00..8ae256f 100644 --- a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Ammo.cs +++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Ammo.cs @@ -15,7 +15,7 @@ namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables { class Ammo:Collectable { - public override StaticGraphicsComponent graphicsComponent { get; } = new("Textures/icons/8"); + public override StaticGraphicsComponent graphicsComponent { get; } = new(_path + "Ammo"); public Ammo(Vector2 position) : base(position) { graphicsComponent.ObjectDrawRectangle.Width = 20; diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/BottleOfWater.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/BottleOfWater.cs index 77b8cf3..2a4e542 100644 --- a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/BottleOfWater.cs +++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/BottleOfWater.cs @@ -14,7 +14,7 @@ namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables { public class BottleOfWater : Collectable { - public override StaticGraphicsComponent graphicsComponent { get; } = new("BottleOfWater"); + public override StaticGraphicsComponent graphicsComponent { get; } = new(_path + "BottleOfWater"); public BottleOfWater(Vector2 position) : base(position) { diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs index eff3c1f..840a5f4 100644 --- a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs +++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs @@ -7,6 +7,7 @@ using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient; namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables; public class Collectable : Interactable { + protected static readonly string _path = "Textures/icons/Collectables/"; public Collectable(Vector2 position) : base(position) { } diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Peeble.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Peeble.cs index c76552d..9b6ad47 100644 --- a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Peeble.cs +++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Peeble.cs @@ -14,7 +14,7 @@ namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables { public class Peeble:Collectable { - public override StaticGraphicsComponent graphicsComponent { get; } = new("Peeble"); + public override StaticGraphicsComponent graphicsComponent { get; } = new(_path + "Peeble"); public Peeble(Vector2 position) : base(position) { diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/PureBottleOfWater.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/PureBottleOfWater.cs index b0ecc02..d318bf6 100644 --- a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/PureBottleOfWater.cs +++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/PureBottleOfWater.cs @@ -13,7 +13,7 @@ namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables { class PureBottleOfWater:Collectable { - public override StaticGraphicsComponent graphicsComponent { get; } = new("PureBottleOfWater"); + public override StaticGraphicsComponent graphicsComponent { get; } = new(_path + "PureBottleOfWater"); public PureBottleOfWater(Vector2 position) : base(position) { diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/RottenFlesh.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/RottenFlesh.cs index c101506..a1ce270 100644 --- a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/RottenFlesh.cs +++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/RottenFlesh.cs @@ -13,7 +13,7 @@ namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables { class RottenFlesh:Collectable { - public override StaticGraphicsComponent graphicsComponent { get; } = new("RottenFlesh"); + public override StaticGraphicsComponent graphicsComponent { get; } = new(_path + "RottenFlesh"); public RottenFlesh(Vector2 position) : base(position) { diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Steel.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Steel.cs index 538f0dd..a8bbe9d 100644 --- a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Steel.cs +++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Steel.cs @@ -13,7 +13,7 @@ namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables { class Steel:Collectable { - public override StaticGraphicsComponent graphicsComponent { get; } = new("Steel"); + public override StaticGraphicsComponent graphicsComponent { get; } = new(_path + "Steel"); public Steel(Vector2 position) : base(position) { diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Wood.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Wood.cs index 2db30a5..15d6ee6 100644 --- a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Wood.cs +++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Wood.cs @@ -9,7 +9,7 @@ namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables; public class Wood : Collectable { - public override StaticGraphicsComponent graphicsComponent { get; } = new("Wood"); + public override StaticGraphicsComponent graphicsComponent { get; } = new(_path + "Wood"); public Wood(Vector2 position) : base(position) {