Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor tweaks 031217 #122

Merged
merged 5 commits into from
Mar 13, 2017
Merged

Minor tweaks 031217 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2919fcf
Changed to 7 to allow for portal out animation to play and properly r…
LtRipley36706 Mar 13, 2017
acb0f06
Filled out RadarColor Enum
LtRipley36706 Mar 13, 2017
7ecefab
Admin = Cyan (not Pink)
LtRipley36706 Mar 13, 2017
31c56ae
Update Session.cs
Mag-nus Mar 13, 2017
93728b4
Merge branch 'master' into MinorTweaks-031217
Mag-nus Mar 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 23 additions & 2 deletions Source/ACE/Network/Enum/RadarColor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,28 @@ namespace ACE.Network.Enum
{
public enum RadarColor : byte
{
Blue = 0x01,
White = 0x09
Default = 0x00,
Blue = 0x01,
Gold = 0x02,
White = 0x03,
Purple = 0x04,
Red = 0x05,
Pink = 0x06,
Green = 0x07,
Yellow = 0x08,
Cyan = 0x09,
BrightGreen = 0x10,
Admin = Cyan,
Advocate = Pink,
Creature = Gold,
LifeStone = Blue,
NPC = Yellow,
PlayerKiller = Red,
Portal = Purple,
Sentinel = Cyan,
Vendor = Yellow,
Fellowship = BrightGreen,
FellowshipLeader = BrightGreen,
PKLite = Pink
}
}
2 changes: 1 addition & 1 deletion Source/ACE/Network/GameMessages/Messages/GameMessageCreateLifestone.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public GameMessageCreateLifestone(Player player) : base(GameMessageOpcode.Object
wo.GameData.Icon = (ushort)0x1036;

wo.GameData.Usable = Usable.UsableRemote;
wo.GameData.RadarColour = RadarColor.Blue;
wo.GameData.RadarColour = RadarColor.LifeStone;
wo.GameData.RadarBehavior = RadarBehavior.ShowAlways;
wo.GameData.UseRadius = 4f;

Expand Down
3 changes: 2 additions & 1 deletion Source/ACE/Network/Session.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ public void Update(double lastTick)

// Live server seemed to take about 6 seconds. 4 seconds is nice because it has smooth animation, and saves the user 2 seconds every logoff
// This could be made 0 for instant logoffs.
if (logOffRequestTime != DateTime.MinValue && logOffRequestTime.AddSeconds(4) <= DateTime.UtcNow)

if (logOffRequestTime != DateTime.MinValue && logOffRequestTime.AddSeconds(6) <= DateTime.UtcNow)
{
logOffRequestTime = DateTime.MinValue;
SendFinalLogOffMessages();
Expand Down