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

Fix Quest, corpse and chest issues #1770

Merged
merged 3 commits into from
Apr 20, 2019
Merged

Fix Quest, corpse and chest issues #1770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efb3158
Update myquests to match plugin expected output
LtRipley36706 Apr 20, 2019
5cef168
Add Quest checking to Chests
LtRipley36706 Apr 20, 2019
a6348fd
Fix issue with corpses on restart
LtRipley36706 Apr 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions Source/ACE.Server/Command/Handlers/PlayerCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,27 @@ public static void HandlePop(Session session, params string[] parameters)
session.Network.EnqueueSend(new GameMessageSystemChat($"Current world population: {PlayerManager.GetAllOnline().Count.ToString()}\n", ChatMessageType.Broadcast));
}

// quest info
[CommandHandler("myquests", AccessLevel.Player, CommandHandlerFlag.RequiresWorld, "Shows the player's quest log")]
// quest info (uses GDLe formatting to match plugin expectations)
[CommandHandler("myquests", AccessLevel.Player, CommandHandlerFlag.RequiresWorld, "Shows your quest log")]
public static void HandleQuests(Session session, params string[] parameters)
{
if (!PropertyManager.GetBool("quest_info_enabled)").Item) return;

var text = "";
if (!PropertyManager.GetBool("quest_info_enabled").Item) return;

foreach (var playerQuest in session.Player.QuestManager.Quests)
{
var text = "";
var questName = QuestManager.GetQuestName(playerQuest.QuestName);
var quest = DatabaseManager.World.GetCachedQuest(questName);
if (quest == null)
{
Console.WriteLine($"Couldn't find quest {playerQuest.QuestName}");
continue;
}
text += $"{playerQuest.QuestName} - {playerQuest.NumTimesCompleted} solves ({playerQuest.LastTimeCompleted})";
text += $"\"{quest.Message}\" {quest.MaxSolves} {quest.MinDelta}\n";
}
text += $"{playerQuest.QuestName.ToLower()} - {playerQuest.NumTimesCompleted} solves ({playerQuest.LastTimeCompleted})";
text += $"\"{quest.Message}\" {quest.MaxSolves} {quest.MinDelta}";

session.Network.EnqueueSend(new GameMessageSystemChat(text, ChatMessageType.Broadcast));
session.Network.EnqueueSend(new GameMessageSystemChat(text, ChatMessageType.Broadcast));
}
}
}
}
19 changes: 19 additions & 0 deletions Source/ACE.Server/WorldObjects/Chest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,25 @@ public override ActivationResult CheckUseRequirements(WorldObject activator)
return new ActivationResult(false);
}

// handle quest requirements
if (Quest != null)
{
if (!player.QuestManager.HasQuest(Quest))
player.QuestManager.Update(Quest);
else
{
if (player.QuestManager.CanSolve(Quest))
{
player.QuestManager.Update(Quest);
}
else
{
player.QuestManager.HandleSolveError(Quest);
return new ActivationResult(false);
}
}
}

return new ActivationResult(true);
}

Expand Down
8 changes: 8 additions & 0 deletions Source/ACE.Server/WorldObjects/Hotspot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,12 @@ public DamageType DamageType
get { return (DamageType)_DamageType; }
}

public bool IsHot
{
get => GetProperty(PropertyBool.IsHot) ?? false;
set { if (!value) RemoveProperty(PropertyBool.IsHot); else SetProperty(PropertyBool.IsHot, value); }
}

private void Activate()
{
foreach (var playerGuid in Players.ToList())
Expand All @@ -141,6 +147,8 @@ private void Activate()

private void Activate(Player player)
{
if (!IsHot) return;

var amount = DamageNext;
var iAmount = (int)Math.Round(amount);

Expand Down
2 changes: 1 addition & 1 deletion Source/ACE.Server/WorldObjects/Player.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ public void HandleAdminvisionToggle(int choice)
var adminObjs = PhysicsObj.ObjMaint.ObjectTable.Values.Where(o => o.WeenieObj.WorldObject.Visibility);
PhysicsObj.enqueue_objs(adminObjs);

var nodrawObjs = PhysicsObj.ObjMaint.ObjectTable.Values.Where(o => o.WeenieObj.WorldObject.NoDraw ?? false);
var nodrawObjs = PhysicsObj.ObjMaint.ObjectTable.Values.Where(o => (o.WeenieObj.WorldObject.NoDraw ?? false) || (o.WeenieObj.WorldObject.UiHidden ?? false));
foreach (var wo in nodrawObjs)
Session.Network.EnqueueSend(new GameMessageUpdateObject(wo.WeenieObj.WorldObject, Adminvision, Adminvision ? true : false));

Expand Down
2 changes: 1 addition & 1 deletion Source/ACE.Server/WorldObjects/WorldObject_Decay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void Decay(TimeSpan elapsed)

var corpse = this as Corpse;

if (corpse != null && corpse.Inventory.Count == 0 && TimeToRot.Value > Corpse.EmptyDecayTime)
if (corpse != null && corpse.InventoryLoaded && corpse.Inventory.Count == 0 && TimeToRot.Value > Corpse.EmptyDecayTime)
{
TimeToRot = Corpse.EmptyDecayTime;
return;
Expand Down