progtime/ZoFo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'DevelopmentX' of github.com:progtime-net/ZoFo into DevelopmentX

Browse source
This commit is contained in:
AnloGames 2024-08-20 20:09:04 +03:00
commit 00a7cd7c7b
9 changed files with 104 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
ZoFo/Content/Content.mgcb
View file

@ -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
@ -95,12 +92,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
@ -113,6 +128,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
@ -125,6 +152,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
@ -400,6 +439,7 @@
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Textures/AnimationTextures/Zombie/zombie_spritesheet_v2.png
#begin Textures/Effects/explosion.png
/importer:TextureImporter
@ -413,7 +453,7 @@
/processorParam:TextureFormat=Color
/build:Textures/Effects/explosion.png
#begin Textures/GUI/back.png
#begin Textures/GUI/back.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
@ -422,7 +462,7 @@
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/processorParam:TextureFormat=Color
/build:Textures/GUI/back.png
#begin Textures/GUI/background/base.png
@ -532,8 +572,20 @@
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Textures/GUI/Button2.png
#begin Textures/GUI/checkboxs_off.png
#begin Textures/GUI/ButtonI.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/ButtonI.png
#begin Textures/GUI/checkboxs_off.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
@ -761,7 +813,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
@ -771,7 +823,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

BIN
ZoFo/Content/Textures/GUI/Button.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 740 B

After

Width:  |  Height:  |  Size: 15 KiB

BIN
ZoFo/Content/Textures/GUI/ButtonI.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 931 B

BIN
ZoFo/Content/Textures/GUI/back.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
ZoFo/Content/Textures/icons/Collectables/Peeble.png → ZoFo/Content/Textures/icons/Collectables/Pebble.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB

2
ZoFo/GameCore/GUI/BaseGUI.cs
View file

@ -54,7 +54,6 @@ public class BaseGUI : AbstractGUI
rectangle = new Rectangle(width / 2 - (height / 16 + (int)(width / 2.5)) / 2,
height / 2 - (int)(height / 1.5) / 2,
height / 40 + width / 5, (int)(height / 1.5)),
mainColor = Color.LightGray,
textureName = "Textures/GUI/Back"
};
Elements.Add(baseItemBack);
@ -62,7 +61,6 @@ public class BaseGUI : AbstractGUI
{
rectangle = new Rectangle(width / 2 + height / 160, height / 2 - (int)(height / 1.5) / 2,
height / 40 + width / 5, (int)(height / 1.5)),
mainColor = Color.LightGray,
textureName = "Textures/GUI/Back"
};
Elements.Add(baseCraftBack);

8
ZoFo/GameCore/GUI/HUD.cs
View file

@ -30,7 +30,6 @@ public class HUD : AbstractGUI
textureName = "Textures/GUI/Button2"
};
Elements.Add(pauseButton);
pauseButton.LoadTexture(AppManager.Instance.Content);
pauseButton.LeftButtonPressed += () =>
{
AppManager.Instance.SoundManager.StartAmbientSound("Button click");
@ -42,12 +41,11 @@ public class HUD : AbstractGUI
};
Button invButton = new Button(Manager)
{
fontName = "Fonts\\Font3", scale = 0.4f, text = "inv", fontColor = Color.Black,
fontName = "Fonts\\Font3", scale = 0.4f, fontColor = Color.Black,
mainColor = Color.Transparent, rectangle = new Rectangle(width - width / 30 - width / 40, height / 15 + width / 40, width / 40, width / 40),
textureName = "Textures/GUI/Button2"
};
textureName = "Textures/GUI/ButtonI"
};
Elements.Add(invButton);
invButton.LoadTexture(AppManager.Instance.Content);
invButton.LeftButtonPressed += () =>
{
overlayGUI = new InventoryGUI();

36
ZoFo/GameCore/GameManagers/ItemManager/ItemManager.cs
View file

@ -25,19 +25,47 @@ namespace ZoFo.GameCore.GameManagers.ItemManager
public void Initialize()
{
tagItemPairs = new Dictionary<string, ItemInfo>();
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<string, int>()
{
{"wood", 2},
{"steel", 3}
}));
tagItemPairs.Add("plank", new ItemInfo("plank", "проосто доска", "Textures/icons/Material/Wooden Plank", true, new Dictionary<string, int>()
{
{"wood", 1}
}));
tagItemPairs.Add("gear", new ItemInfo("gear", "настройки", "Textures/icons/Misc/Gear", true, new Dictionary<string, int>()
{
{"steel", 3}
}));
tagItemPairs.Add("purebottleofwater", new ItemInfo("purebottleofwater", "чистая водка", "Textures/icons/Collectables/PureBottleOfWater", true, new Dictionary<string, int>()
{
{"bottleofwater", 1},
{"wood", 2}
}));
tagItemPairs.Add("leather", new ItemInfo("leather", "кожа", "Textures/icons/Material/Leather", true, new Dictionary<string, int>()
{
{"rottenflash", 1},
{"wood", 2}
}));
tagItemPairs.Add("crate", new ItemInfo("crate", "коробка", "Textures/icons/Misc/Crate", true, new Dictionary<string, int>()
{
{"plank", 5}
}));
tagItemPairs.Add("book", new ItemInfo("book", "книга", "Textures/icons/Misc/Book", true, new Dictionary<string, int>()
{
{"leather", 2},
{"paper", 5}
}));
}
}

8
ZoFo/GameCore/GameManagers/ItemManager/PlayerData.cs
View file

@ -61,6 +61,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;