shiftos-archive/ShiftOS_TheReturn
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #26 from shiftos-game/revert-25-master

Browse source 
Revert "Moved Leigion into its own file"
This commit is contained in:
william341 2017-01-08 15:04:07 -07:00 committed by GitHub
commit d6aa2f4f16
2 changed files with 30 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
ShiftOS.Objects/Legion.cs
View file

@ -1,38 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ShiftOS.Objects
{
public enum LegionRole
{
Admin,
Manager,
Committed,
Trainee,
AwaitingInvite
}
public enum LegionPublicity
{
Public, //Will display on the 'Join Legion' page, anyone can join
PublicInviteOnly, //Will display on the 'Join Legion' page but you must be invited
Unlisted, //Won't display on 'Join Legion', but anyone can join
UnlistedInviteOnly //Won't display in 'Join Legion', and admin/manager invitation is required.
}
public class Legion
{
public string Name { get; set; }
public LegionPublicity Publicity { get; set; }
public ConsoleColor BannerColor { get; set; }
public string Description { get; set; }
public string ShortName { get; set; }
public Dictionary<string, LegionRole> Roles { get; set; }
public Dictionary<LegionRole, string> RoleNames { get; set; }
}
}

30
ShiftOS.Objects/Objects.cs
View file

@ -30,6 +30,36 @@ using System.Threading.Tasks;
namespace ShiftOS.Objects
{
public enum LegionRole
{
Admin,
Manager,
Committed,
Trainee,
AwaitingInvite
}
public enum LegionPublicity
{
Public, //Will display on the 'Join Legion' page, anyone can join
PublicInviteOnly, //Will display on the 'Join Legion' page but you must be invited
Unlisted, //Won't display on 'Join Legion', but anyone can join
UnlistedInviteOnly //Won't display in 'Join Legion', and admin/manager invitation is required.
}
public class Legion
{
public string Name { get; set; }
public LegionPublicity Publicity { get; set; }
public ConsoleColor BannerColor { get; set; }
public string Description { get; set; }
public string ShortName { get; set; }
public Dictionary<string, LegionRole> Roles { get; set; }
public Dictionary<LegionRole, string> RoleNames { get; set; }
}
public class MUDMemo
{