aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish Duty-System (Clothing)

Browse Source
This commit is contained in:
VegaZ
2018-11-21 17:20:53 +01:00
parent 5e7a8ac0ae
commit 8919e76b75
5 changed files with 44 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Model/DatabaseContext.cs
View File

@@ -35,7 +35,6 @@ namespace reallife_gamemode.Model
public DbSet<Server.Entities.Character> Characters { get; set; } public DbSet<Server.Entities.Character> Characters { get; set; }
public DbSet<Server.Entities.CharacterCloth> CharacterClothes { get; set; } public DbSet<Server.Entities.CharacterCloth> CharacterClothes { get; set; }
public DbSet<Server.Entities.DutyCloth> DutyClothes { get; set; } public DbSet<Server.Entities.DutyCloth> DutyClothes { get; set; }
public DbSet<Server.Entities.DutyProp> DutyProps { get; set; }
public DbSet<Server.Entities.MaleCombination> MaleCombinations { get; set; } public DbSet<Server.Entities.MaleCombination> MaleCombinations { get; set; }
public DbSet<Server.Entities.FemaleCombination> FemaleCombinations { get; set; } public DbSet<Server.Entities.FemaleCombination> FemaleCombinations { get; set; }
public DbSet<Server.Entities.User> Users { get; set; } public DbSet<Server.Entities.User> Users { get; set; }

7
Server/Entities/DutyCloth.cs
View File

@@ -22,7 +22,10 @@ namespace reallife_gamemode.Server.Entities
public int FactionId { get; set; } public int FactionId { get; set; }
public Faction Faction { get; set; } public Faction Faction { get; set; }
public int ComponentId { get; set; } public bool Gender { get; set; }
public int Drawable { get; set; }
public byte SlotType { get; set; }
public int SlotId { get; set; }
public int ClothId { get; set; }
} }
} }

28
Server/Entities/DutyProp.cs
View File

@@ -1,28 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
/**
* @overview Life of German Reallife - Entities DutyProp DutyProp.cs
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Entities
{
public class DutyProp
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int Id { get; set; }
[ForeignKey("Faction")]
public int FactionId { get; set; }
public Faction Faction { get; set; }
public int PropId { get; set; }
public int Drawable { get; set; }
}
}

55
Server/Events/Key.cs
View File

@@ -63,7 +63,7 @@ namespace reallife_gamemode.Server.Events
player.NametagColor = nameTagColor; player.NametagColor = nameTagColor;
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
{ {
List<CharacterCloth> clothes = context.CharacterClothes.ToList().FindAll(u => u.UserId == user.Id); List<CharacterCloth> clothes = context.CharacterClothes.ToList().FindAll(u => u.UserId == user.Id && u.Duty == true);
foreach(var cloth in clothes) foreach(var cloth in clothes)
{ {
@@ -81,7 +81,6 @@ namespace reallife_gamemode.Server.Events
{ {
player.ClearAccessory(cloth.SlotId); player.ClearAccessory(cloth.SlotId);
} }
} }
} }
} }
@@ -92,11 +91,7 @@ namespace reallife_gamemode.Server.Events
player.SendNotification("Du bist nun ~r~außer Dienst."); player.SendNotification("Du bist nun ~r~außer Dienst.");
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", false); NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", false);
player.NametagColor = new Color(255, 255, 255); player.NametagColor = new Color(255, 255, 255);
UpdateCharacterCloth.LoadCharacterDefaults(player);
player.ClearAccessory(0);
//Gespeicherte Props laden lassen
player.SetDefaultClothes();
//Gespeicherte Klamotten laden lassen
} }
} }
} }
@@ -128,28 +123,44 @@ namespace reallife_gamemode.Server.Events
if (nearest == null) return; if (nearest == null) return;
if (player.Position.DistanceTo(nearest.Position) <= 1.5 && nearest.FactionId == user.FactionId) if (player.Position.DistanceTo(nearest.Position) <= 1.5 && nearest.FactionId == user.FactionId)
{ {
string[] hats; List<string> hats = new List<string>();
string[] tops; List<string> tops = new List<string>();
string[] legs; List<string> legs = new List<string>();
string[] shoes; List<string> shoes = new List<string>();
//TODO in Datenbank auslagern using (var context = new DatabaseContext())
if(user.GetCharacter().Gender == false) //Wenn männlich
{ {
hats = new string[] { "Keinen", "5", "12", "39", "46", "123", "124", "125"}; List<DutyCloth> clothes = context.DutyClothes.ToList().FindAll(c => c.FactionId == user.FactionId && c.Gender == user.GetCharacter().Gender);
tops = new string[] { "55", "26"}; foreach(var cloth in clothes)
legs = new string[] { "24", "28" }; {
shoes = new string[] { "24", "25"}; if(cloth.SlotType == 1)
{
if (cloth.ClothId != -1)
{
hats.Add(cloth.ClothId.ToString());
} }
else else
{ {
hats = new string[] { "Keinen", "12", "38", "45", "122", "123", "124" }; hats.Add("Keinen");
tops = new string[] { "48", "43" }; }
legs = new string[] { "34", "37", "102" }; continue;
shoes = new string[] { "24", "25" };
} }
player.TriggerEvent("showDutyClothMenu", hats, tops, legs, shoes); switch (cloth.SlotId)
{
case 11:
tops.Add(cloth.ClothId.ToString());
break;
case 4:
legs.Add(cloth.ClothId.ToString());
break;
case 6:
shoes.Add(cloth.ClothId.ToString());
break;
}
}
}
player.TriggerEvent("showDutyClothMenu", hats.ToArray(), tops.ToArray(), legs.ToArray(), shoes.ToArray());
} }
} }

2
Server/Events/UpdateCharacterCloth.cs
View File

@@ -177,7 +177,7 @@ namespace reallife_gamemode.Server.Events
foreach(var cloth in charClothes) foreach(var cloth in charClothes)
{ {
if(cloth.SlotType == 0) if(cloth.SlotType == 1)
{ {
if (cloth.ClothId == -1) if (cloth.ClothId == -1)
{ {