diff options
author | Dennis Kobert <d-kobert@web.de> | 2019-06-11 23:38:13 +0200 |
---|---|---|
committer | Dennis Kobert <d-kobert@web.de> | 2019-06-11 23:38:13 +0200 |
commit | 2fa4a0e50ebfc97059c8b84dbd17e79f9afc8a8d (patch) | |
tree | c3b34ccb2737e347a73768536895cbbaab13cc01 /DSACore/Models | |
parent | ec991104f56e90d7bb2878da2fe6ed4e585dfc46 (diff) | |
parent | af74efccf8d21e6151022b71f3cacd3fa83024ee (diff) |
Merge branch 'rework-backend'
Diffstat (limited to 'DSACore/Models')
-rw-r--r-- | DSACore/Models/Database/Advantage.cs | 19 | ||||
-rw-r--r-- | DSACore/Models/Database/CharSpell.cs | 19 | ||||
-rw-r--r-- | DSACore/Models/Database/DatabaseChar.cs | 63 | ||||
-rw-r--r-- | DSACore/Models/Database/Field.cs | 19 | ||||
-rw-r--r-- | DSACore/Models/Database/GeneralSpell.cs | 25 | ||||
-rw-r--r-- | DSACore/Models/Database/Group.cs | 19 | ||||
-rw-r--r-- | DSACore/Models/Database/GroupChar.cs | 18 | ||||
-rw-r--r-- | DSACore/Models/Database/Inventory.cs | 15 | ||||
-rw-r--r-- | DSACore/Models/Database/Talent.cs | 29 | ||||
-rw-r--r-- | DSACore/Models/Database/Weapon.cs | 53 | ||||
-rw-r--r-- | DSACore/Models/Database/WeaponTalent.cs | 18 | ||||
-rw-r--r-- | DSACore/Models/Network/Command.cs | 20 | ||||
-rw-r--r-- | DSACore/Models/Network/CommandResponse.cs | 31 | ||||
-rw-r--r-- | DSACore/Models/Network/Group.cs | 12 | ||||
-rw-r--r-- | DSACore/Models/Network/Token.cs | 21 | ||||
-rw-r--r-- | DSACore/Models/Network/User.cs | 9 |
16 files changed, 26 insertions, 364 deletions
diff --git a/DSACore/Models/Database/Advantage.cs b/DSACore/Models/Database/Advantage.cs deleted file mode 100644 index 67965fc..0000000 --- a/DSACore/Models/Database/Advantage.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace DSACore.Models.Database -{ - public class Advantage - { - public Advantage(string name, string value = "") - { - Name = name ?? throw new ArgumentNullException(nameof(name)); - Value = value ?? throw new ArgumentNullException(nameof(value)); - } - - public string Name { get; set; } - public string Value { get; set; } - } -} diff --git a/DSACore/Models/Database/CharSpell.cs b/DSACore/Models/Database/CharSpell.cs deleted file mode 100644 index 670488c..0000000 --- a/DSACore/Models/Database/CharSpell.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace DSACore.Models.Database -{ - public class CharSpell - { - public CharSpell(string representation, int value) - { - this.representation = representation ?? throw new ArgumentNullException(nameof(representation)); - this.value = value; - } - - public string representation { get; set; } - public int value { get; set; } - } -} diff --git a/DSACore/Models/Database/DatabaseChar.cs b/DSACore/Models/Database/DatabaseChar.cs deleted file mode 100644 index 9cd865f..0000000 --- a/DSACore/Models/Database/DatabaseChar.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using DSALib; - -namespace DSACore.Models.Database -{ - public class DatabaseChar - { - public DatabaseChar() - { - } - - public DatabaseChar(int id, string name, string rasse, List<Field> skills, List<Field> talents, List<Advantage> advantages, List<CharSpell> spells, List<WeaponTalent> weaponTalents) - { - Id = id; - Name = name ?? throw new ArgumentNullException(nameof(name)); - Rasse = rasse ?? throw new ArgumentNullException(nameof(rasse)); - Skills = skills ?? throw new ArgumentNullException(nameof(skills)); - Talents = talents ?? throw new ArgumentNullException(nameof(talents)); - Advantages = advantages ?? throw new ArgumentNullException(nameof(advantages)); - Spells = spells ?? throw new ArgumentNullException(nameof(spells)); - WeaponTalents = weaponTalents ?? throw new ArgumentNullException(nameof(weaponTalents)); - } - - public int Id { get; set; } - - public string Name { get; set; } - - public string Rasse { get; set; } - - public List<Field> Skills { get; set; } = new List<Field>(); - - public List<Field> Talents { get; set; } = new List<Field>(); - - public List<Advantage> Advantages { get; set; } = new List<Advantage>(); - - public List<CharSpell> Spells { get; set; } = new List<CharSpell>(); - - public List<WeaponTalent> WeaponTalents { get; set; } = new List<WeaponTalent>(); - - - public static void LoadChar(DSA_Game.Characters.Character file, out GroupChar group, out DatabaseChar data) - { - group = new GroupChar(); - data = new DatabaseChar(); - - group.Name = file.Name.Split(' ').First(); - group.Weapon = new Weapon(); - group.Lp = group.LpMax = file.Lebenspunkte_Basis; - group.As = group.AsMax = file.Astralpunkte_Basis; - group.Weapon = new Weapon(); - - data.Name = file.Name; - data.Advantages = file.Vorteile.Select(x => new Advantage(x.Name, x.Value)).ToList(); - data.Skills = file.Eigenschaften.Select(x => new Field(x.Key, x.Value)).ToList(); - data.Spells = file.Zauber.Select(x => new CharSpell(x.Representation, x.Value)).ToList(); - data.Talents = file.Talente.Select(x => new Field(x.Name, x.Value)).ToList(); - data.WeaponTalents = file.Kampftalente.Select(x => new WeaponTalent(x.Name, x.At, x.Pa)).ToList(); - } - } -} diff --git a/DSACore/Models/Database/Field.cs b/DSACore/Models/Database/Field.cs deleted file mode 100644 index b14d9da..0000000 --- a/DSACore/Models/Database/Field.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace DSACore.Models.Database -{ - public class Field - { - public Field(string name, int value = 0) - { - Name = name ?? throw new ArgumentNullException(nameof(name)); - this.Value = value; - } - - public string Name { get; set; } - public int Value { get; set; } - } -} diff --git a/DSACore/Models/Database/GeneralSpell.cs b/DSACore/Models/Database/GeneralSpell.cs deleted file mode 100644 index f53081e..0000000 --- a/DSACore/Models/Database/GeneralSpell.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace DSACore.Models.Database -{ - public class GeneralSpell : Talent - { - public char Comlexity = 'A'; - - public GeneralSpell(string name, string roll, char comlexity = 'A') :base(name, roll) - { - Comlexity = comlexity; - } - - public GeneralSpell(string name, string roll) : base(name, roll) - { - } - - public GeneralSpell() - { - } - } -} diff --git a/DSACore/Models/Database/Group.cs b/DSACore/Models/Database/Group.cs deleted file mode 100644 index a7bb929..0000000 --- a/DSACore/Models/Database/Group.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace DSACore.Models.Database -{ - public class Group - { - public string Name { get; set; } - public string Discord { get; set; } - public string Password { get; set; } - public int Id { get; set; } - public List<GroupChar> Chars { get; set; }= new List<GroupChar>(); - - } - - -} diff --git a/DSACore/Models/Database/GroupChar.cs b/DSACore/Models/Database/GroupChar.cs deleted file mode 100644 index 1dfc4ea..0000000 --- a/DSACore/Models/Database/GroupChar.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace DSACore.Models.Database -{ - public class GroupChar - { - public string Name { get; set; } - public int Id { get; set; } - public int Lp { get; set; } - public int LpMax { get; set; } - public int As { get; set; } - public int AsMax { get; set; } - public Weapon Weapon { get; set; } - } -} diff --git a/DSACore/Models/Database/Inventory.cs b/DSACore/Models/Database/Inventory.cs deleted file mode 100644 index e6b47ec..0000000 --- a/DSACore/Models/Database/Inventory.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace DSACore.Models.Database -{ - public class Inventory - { - public int Id { get; set; } - public Dictionary<string, bool> Items { get; set; } = new Dictionary<string, bool>(); - public Dictionary<string, bool> Food { get; set; } = new Dictionary<string, bool>(); - public List<Weapon> Weapons { get; set; } = new List<Weapon>(); - } -} diff --git a/DSACore/Models/Database/Talent.cs b/DSACore/Models/Database/Talent.cs deleted file mode 100644 index aca65a4..0000000 --- a/DSACore/Models/Database/Talent.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace DSACore.Models.Database -{ - public class Talent - { - public Talent() - { - } - - public Talent(string name) - { - Name = name ?? throw new ArgumentNullException(nameof(name)); - } - - public Talent(string name, String roll) - { - Name = name ?? throw new ArgumentNullException(nameof(name)); - Roll = roll.Split('/'); - } - - public string Name { get; set; } - - public string[] Roll { get; set; } = new string[3]; - } -} diff --git a/DSACore/Models/Database/Weapon.cs b/DSACore/Models/Database/Weapon.cs deleted file mode 100644 index b2f8a1e..0000000 --- a/DSACore/Models/Database/Weapon.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace DSACore.Models.Database -{ - public class Weapon - { - public Weapon() - { - } - - public Weapon(string name, string damage, int weight, string weaponTalent, string price) - { - Name = name ?? throw new ArgumentNullException(nameof(name)); - Damage = damage ?? throw new ArgumentNullException(nameof(damage)); - Weight = weight; - WeaponTalent = weaponTalent ?? throw new ArgumentNullException(nameof(weaponTalent)); - Price = price; - } - - public string Name { get; set; } - public string Damage { get; set; } - public int Weight { get; set; } - public string WeaponTalent { get; set; } - public string Price { get; set; } - } - - public class MeleeWeapon : Weapon - { - public string TpKK { get; set; } - public int INI { get; set; } - public string MW { get; set; } - - public MeleeWeapon(string name, string damage, int weight, string weaponTalent, string price) : base(name, damage, weight, weaponTalent, price) - { - } - } - - public class RangedWeapon : Weapon - { - public int AtMod { get; set; } - public int KKMod { get; set; } - public string AtReach { get; set; } - public string TpReach { get; set; } - public int LoadTime { get; set; } - - public RangedWeapon(string name, string damage, int weight, string weaponTalent, string price) : base(name, damage, weight, weaponTalent, price) - { - } - } -} diff --git a/DSACore/Models/Database/WeaponTalent.cs b/DSACore/Models/Database/WeaponTalent.cs deleted file mode 100644 index 4b98d24..0000000 --- a/DSACore/Models/Database/WeaponTalent.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; - -namespace DSACore.Models.Database -{ - public class WeaponTalent - { - public WeaponTalent(string name, int at, int pa) - { - Name = name ?? throw new ArgumentNullException(nameof(name)); - At = at; - Pa = pa; - } - - public string Name { get; set; } - public int At { get; set; } - public int Pa { get; set; } - } -}
\ No newline at end of file diff --git a/DSACore/Models/Network/Command.cs b/DSACore/Models/Network/Command.cs deleted file mode 100644 index 456a896..0000000 --- a/DSACore/Models/Network/Command.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace DSACore.Models.Network -{ - public class Command - { - public ulong GroupId { get; set; } = 0; - public ulong CharId { get; set; } - public string Name { get; set; } - public string CmdIdentifier { get; set; } - public List<string> CmdTexts { get; set; } - public string CmdText => CmdTexts.Count != 0 ? CmdTexts.First() : ""; - - public int Cmdmodifier => CmdTexts.Count != 0 && int.TryParse(CmdTexts.Last(), out int mod) ? mod : 0; - public bool IsDm { get; set; } = false; - } -} diff --git a/DSACore/Models/Network/CommandResponse.cs b/DSACore/Models/Network/CommandResponse.cs deleted file mode 100644 index ed4b7d0..0000000 --- a/DSACore/Models/Network/CommandResponse.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace DSACore.Models.Network -{ - public class CommandResponse - { - public CommandResponse(string message, ResponseType responseType= ResponseType.Broadcast) - { - this.message = message ?? throw new ArgumentNullException(nameof(message)); - ResponseType = responseType; - } - - public string message { get; private set; } - public ResponseType ResponseType { get; private set;} - - public override string ToString() - { - return message; - } - } - - public enum ResponseType - { - Broadcast, - Caller, - Error - } -} diff --git a/DSACore/Models/Network/Group.cs b/DSACore/Models/Network/Group.cs index 76c3efb..efe12ee 100644 --- a/DSACore/Models/Network/Group.cs +++ b/DSACore/Models/Network/Group.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace DSACore.Models.Network { @@ -22,14 +20,11 @@ namespace DSACore.Models.Network public string Password { get; set; } public List<User> Users { get; set; } = new List<User>(); - public int UserCount - { - get { return Users.Count; } - } + public int UserCount => Users.Count; public SendGroup SendGroup() { - return new SendGroup( Name, UserCount); + return new SendGroup(Name, UserCount); } } @@ -44,6 +39,5 @@ namespace DSACore.Models.Network public string Name { get; set; } public int UserCount { get; set; } - } -} +}
\ No newline at end of file diff --git a/DSACore/Models/Network/Token.cs b/DSACore/Models/Network/Token.cs new file mode 100644 index 0000000..451cafc --- /dev/null +++ b/DSACore/Models/Network/Token.cs @@ -0,0 +1,21 @@ +using System; + +namespace DSACore.Models.Network +{ + public class Token + { + private readonly DateTime creation = DateTime.Now; + + public Token(string group) + { + Group = group; + } + + public string Group { get; set; } + + public bool IsValid() + { + return DateTime.Now - creation < TimeSpan.FromMinutes(1); + } + } +}
\ No newline at end of file diff --git a/DSACore/Models/Network/User.cs b/DSACore/Models/Network/User.cs index 04ef0a9..8b8008c 100644 --- a/DSACore/Models/Network/User.cs +++ b/DSACore/Models/Network/User.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace DSACore.Models.Network +namespace DSACore.Models.Network { public class User { @@ -11,4 +6,4 @@ namespace DSACore.Models.Network public string ConnectionId { get; set; } public int Char { get; set; } } -} +}
\ No newline at end of file |