From 766d154877a1bcb320fdd0d6d19362192bb9b5d2 Mon Sep 17 00:00:00 2001 From: dvaer Date: Tue, 20 Aug 2024 19:27:53 +0300 Subject: [PATCH] Craft --- ZoFo/Content/Content.mgcb | 92 +++++++++--------- .../Collectables/{Peeble.png => Pebble.png} | Bin .../GameManagers/ItemManager/ItemManager.cs | 36 ++++++- .../GameManagers/ItemManager/PlayerData.cs | 8 ++ 4 files changed, 86 insertions(+), 50 deletions(-) rename ZoFo/Content/Textures/icons/Collectables/{Peeble.png => Pebble.png} (100%) diff --git a/ZoFo/Content/Content.mgcb b/ZoFo/Content/Content.mgcb index e565961..7bd8471 100644 --- a/ZoFo/Content/Content.mgcb +++ b/ZoFo/Content/Content.mgcb @@ -44,9 +44,6 @@ #begin MapData/TileMaps/main.tmj /copy:MapData/TileMaps/main.tmj -#begin MapData/TileSets/bonfire.tsj -/copy:MapData/TileSets/bonfire.tsj - #begin MapData/TileSets/IconSet.tsj /copy:MapData/TileSets/IconSet.tsj @@ -89,12 +86,30 @@ /processorParam:Quality=Best /build:sounds/Loot.wav +#begin sounds/Loot.wav +/importer:WavImporter +/processor:SoundEffectProcessor +/processorParam:Quality=Best +/build:sounds/Loot.wav + #begin sounds/Odevanie odezdi.wav /importer:WavImporter /processor:SoundEffectProcessor /processorParam:Quality=Best /build:sounds/Odevanie odezdi.wav +#begin sounds/Odevanie odezdi.wav +/importer:WavImporter +/processor:SoundEffectProcessor +/processorParam:Quality=Best +/build:sounds/Odevanie odezdi.wav + +#begin sounds/Pieot wodichky.wav +/importer:WavImporter +/processor:SoundEffectProcessor +/processorParam:Quality=Best +/build:sounds/Pieot wodichky.wav + #begin sounds/Pieot wodichky.wav /importer:WavImporter /processor:SoundEffectProcessor @@ -107,6 +122,18 @@ /processorParam:Quality=Best /build:sounds/Sshetchik geigera.wav +#begin sounds/Sshetchik geigera.wav +/importer:WavImporter +/processor:SoundEffectProcessor +/processorParam:Quality=Best +/build:sounds/Sshetchik geigera.wav + +#begin sounds/Tabletki 2.wav +/importer:WavImporter +/processor:SoundEffectProcessor +/processorParam:Quality=Best +/build:sounds/Tabletki 2.wav + #begin sounds/Tabletki 2.wav /importer:WavImporter /processor:SoundEffectProcessor @@ -119,6 +146,18 @@ /processorParam:Quality=Best /build:sounds/Zombi napal.wav +#begin sounds/Zombi napal.wav +/importer:WavImporter +/processor:SoundEffectProcessor +/processorParam:Quality=Best +/build:sounds/Zombi napal.wav + +#begin sounds/Zombi stoit.wav +/importer:WavImporter +/processor:SoundEffectProcessor +/processorParam:Quality=Best +/build:sounds/Zombi stoit.wav + #begin sounds/Zombi stoit.wav /importer:WavImporter /processor:SoundEffectProcessor @@ -224,33 +263,6 @@ #begin Textures/Animations/player_right_idle.animation /copy:Textures/Animations/player_right_idle.animation -#begin Textures/Animations/player_run_down.animation -/copy:Textures/Animations/player_run_down.animation - -#begin Textures/Animations/player_run_left_down.animation -/copy:Textures/Animations/player_run_left_down.animation - -#begin Textures/Animations/player_run_left_up.animation -/copy:Textures/Animations/player_run_left_up.animation - -#begin Textures/Animations/player_run_left.animation -/copy:Textures/Animations/player_run_left.animation - -#begin Textures/Animations/player_run_right_down.animation -/copy:Textures/Animations/player_run_right_down.animation - -#begin Textures/Animations/player_run_right_up.animation -/copy:Textures/Animations/player_run_right_up.animation - -#begin Textures/Animations/player_run_right.animation -/copy:Textures/Animations/player_run_right.animation - -#begin Textures/Animations/player_run_right.zip -/copy:Textures/Animations/player_run_right.zip - -#begin Textures/Animations/player_run_up.animation -/copy:Textures/Animations/player_run_up.animation - #begin Textures/Animations/player_running_top_rotate.animation /copy:Textures/Animations/player_running_top_rotate.animation @@ -394,20 +406,8 @@ /processorParam:MakeSquare=False /processorParam:TextureFormat=Color /build:Textures/AnimationTextures/Zombie/zombie_spritesheet_v2.png - -#begin Textures/GUI/back.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/GUI/back.png -#begin Textures/Effects/explosion.png +#begin Textures/GUI/back.png /importer:TextureImporter /processor:TextureProcessor /processorParam:ColorKeyColor=255,0,255,255 @@ -417,7 +417,7 @@ /processorParam:ResizeToPowerOfTwo=False /processorParam:MakeSquare=False /processorParam:TextureFormat=Color -/build:Textures/Effects/explosion.png +/build:Textures/GUI/back.png #begin Textures/GUI/background/base.png /importer:TextureImporter @@ -767,7 +767,7 @@ /processorParam:TextureFormat=Color /build:Textures/icons/Collectables/BottleOfWater.png -#begin Textures/icons/Collectables/Peeble.png +#begin Textures/icons/Collectables/Pebble.png /importer:TextureImporter /processor:TextureProcessor /processorParam:ColorKeyColor=255,0,255,255 @@ -777,7 +777,7 @@ /processorParam:ResizeToPowerOfTwo=False /processorParam:MakeSquare=False /processorParam:TextureFormat=Color -/build:Textures/icons/Collectables/Peeble.png +/build:Textures/icons/Collectables/Pebble.png #begin Textures/icons/Collectables/PureBottleOfWater.png /importer:TextureImporter diff --git a/ZoFo/Content/Textures/icons/Collectables/Peeble.png b/ZoFo/Content/Textures/icons/Collectables/Pebble.png similarity index 100% rename from ZoFo/Content/Textures/icons/Collectables/Peeble.png rename to ZoFo/Content/Textures/icons/Collectables/Pebble.png diff --git a/ZoFo/GameCore/GameManagers/ItemManager/ItemManager.cs b/ZoFo/GameCore/GameManagers/ItemManager/ItemManager.cs index 2b4cc3d..e805e8d 100644 --- a/ZoFo/GameCore/GameManagers/ItemManager/ItemManager.cs +++ b/ZoFo/GameCore/GameManagers/ItemManager/ItemManager.cs @@ -25,19 +25,47 @@ namespace ZoFo.GameCore.GameManagers.ItemManager public void Initialize() { tagItemPairs = new Dictionary(); - tagItemPairs.Add("rottenflesh", new ItemInfo("rottenflesh", "БУХАТЬ", "Textures/icons/Collectables/RottenFlesh",false,null)); - tagItemPairs.Add("purebottleofwater", new ItemInfo("purebottleofwater", "БУХАТЬ 2", "Textures/icons/Collectables/PureBottleOfWater",false,null)); - tagItemPairs.Add("bottleofwater", new ItemInfo("bottleofwater", "БУХАТЬ", "Textures/icons/Collectables/BottleOfWater",false,null)); + tagItemPairs.Add("rottenflesh", new ItemInfo("rottenflesh", "гниль", "Textures/icons/Collectables/RottenFlesh",false,null)); + tagItemPairs.Add("bottleofwater", new ItemInfo("bottleofwater", "грязная водка", "Textures/icons/Collectables/BottleOfWater",false,null)); //tagItemPairs.Add("antiradin", new ItemInfo("antiradin", "радиацию опускает", "Textures/icons/Collectables/Ammo",false,null)); tagItemPairs.Add("ammo", new ItemInfo("ammo", "деньги в метро", "Textures/icons/Collectables/Ammo",false,null)); tagItemPairs.Add("wood", new ItemInfo("wood", "бревна кусок", "Textures/icons/Collectables/Wood",false,null)); - tagItemPairs.Add("peeble", new ItemInfo("peeble", "пять галек", "Textures/icons/Collectables/Peeble", false, null)); + tagItemPairs.Add("fabric", new ItemInfo("fabric", "смотя какой fabric", "Textures/icons/Material/Fabric",false,null)); + tagItemPairs.Add("paper", new ItemInfo("paper", "бумага", "Textures/icons/Material/Paper",false,null)); + tagItemPairs.Add("pebble", new ItemInfo("pebble", "пять галек", "Textures/icons/Collectables/Pebble", false, null)); tagItemPairs.Add("steel", new ItemInfo("steel", "метал, метал, \nжелезо, метал", "Textures/icons/Collectables/Steel", false, null)); tagItemPairs.Add("pickaxe", new ItemInfo("pickaxe", "прямой путь к \nстановлению каменьщиком", "Textures/Test/pickaxe", true, new Dictionary() { {"wood", 2}, {"steel", 3} })); + tagItemPairs.Add("plank", new ItemInfo("plank", "проосто доска", "Textures/icons/Material/Wooden Plank", true, new Dictionary() + { + {"wood", 1} + })); + tagItemPairs.Add("gear", new ItemInfo("gear", "настройки", "Textures/icons/Misc/Gear", true, new Dictionary() + { + {"steel", 3} + })); + tagItemPairs.Add("purebottleofwater", new ItemInfo("purebottleofwater", "чистая водка", "Textures/icons/Collectables/PureBottleOfWater", true, new Dictionary() + { + {"bottleofwater", 1}, + {"wood", 2} + })); + tagItemPairs.Add("leather", new ItemInfo("leather", "кожа", "Textures/icons/Material/Leather", true, new Dictionary() + { + {"rottenflash", 1}, + {"wood", 2} + })); + tagItemPairs.Add("crate", new ItemInfo("crate", "коробка", "Textures/icons/Misc/Crate", true, new Dictionary() + { + {"plank", 5} + })); + tagItemPairs.Add("book", new ItemInfo("book", "книга", "Textures/icons/Misc/Book", true, new Dictionary() + { + {"leather", 2}, + {"paper", 5} + })); } } diff --git a/ZoFo/GameCore/GameManagers/ItemManager/PlayerData.cs b/ZoFo/GameCore/GameManagers/ItemManager/PlayerData.cs index a4a5c0d..4731f3a 100644 --- a/ZoFo/GameCore/GameManagers/ItemManager/PlayerData.cs +++ b/ZoFo/GameCore/GameManagers/ItemManager/PlayerData.cs @@ -52,6 +52,14 @@ namespace ZoFo.GameCore.GameManagers.ItemManager public void LoadPlayerData() { + /*items.Add("wood", 100); + items.Add("steel", 100); + items.Add("bottleofwater", 100); + items.Add("rottenflesh", 100); + items.Add("pebble", 100); + items.Add("ammo", 100); + items.Add("fabric", 100); + items.Add("paper", 100);*/ if (File.Exists("Items.txt")) { string data;