Skip to content

Master #31

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

Closed
Parent: Update README.md
wants to merge 7 commits into from
Closed

Master #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c8d26ea
Holiday break updates
ijustcreate Jan 5, 2016
df930f0
Merge branch 'master' of https://github.com/SnpM/Lockstep-Framework
ijustcreate Jan 5, 2016
0a1b346
Merge
nibsbin Jan 5, 2016
cc5068e
Merge remote-tracking branch 'origin/master'
nibsbin Jan 5, 2016
587c1ff
Merge remote-tracking branch 'origin/master'
nibsbin Jan 5, 2016
0d117bc
Merge (reverted from commit 0a1b346b171e43b3271ae5a726f84b8d9a5e8708)
nibsbin Jan 5, 2016
d824bac
Change open file directory; refactor and add check for AC count
nibsbin Jan 5, 2016
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
174 changes: 57 additions & 117 deletions Core/Game/Abilities/Ability.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,58 +6,37 @@
//=======================================================================
using UnityEngine;
using Lockstep.Data;

namespace Lockstep
{
namespace Lockstep {
public abstract class Ability : CerealBehaviour
{
private bool isCasting;

private LSAgent _agent;

public LSAgent Agent
{
get
{
private LSAgent _agent;
public LSAgent Agent {
get {
#if UNITY_EDITOR
if (_agent == null)
return this.GetComponent<LSAgent>();
if (_agent == null) return this.GetComponent<LSAgent> ();
#endif
return _agent;
}
}

public string MyAbilityCode { get; private set; }

public AbilityInterfacer Interfacer { get; private set; }

public int ID { get; private set; }

public Transform CachedTransform { get { return Agent.CachedTransform; } }

public GameObject CachedGameObject { get { return Agent.CachedGameObject; } }

public int VariableContainerTicket { get; private set; }

private LSVariableContainer _variableContainer;

public LSVariableContainer VariableContainer { get { return _variableContainer; } }

public bool IsCasting
{
get
{
return isCasting;
}
protected set
{
if (value != isCasting)
{
if (value == true)
{
return _agent;
}
}
public string MyAbilityCode {get; private set;}
public AbilityInterfacer Interfacer {get; private set;}

public int ID {get; private set;}
public Transform CachedTransform {get {return Agent.CachedTransform;}}
public GameObject CachedGameObject {get {return Agent.CachedGameObject;}}
public int LSVariableContainerTicket {get; private set;}

public bool IsCasting {
get {
return isCasting;
}
protected set {
if (value != isCasting) {
if (value == true) {
Agent.CheckCasting = false;
} else
{
} else {
Agent.CheckCasting = true;
}
isCasting = value;
Expand All @@ -67,116 +46,77 @@ protected set



internal void Setup(LSAgent agent, int id)
{
public void Setup(LSAgent agent, int id) {
System.Type mainType = this.GetType();
if (mainType.IsSubclassOf(typeof(ActiveAbility)))
{
while ( mainType.BaseType != typeof(ActiveAbility))
{
mainType = mainType.BaseType;
}
Interfacer = AbilityInterfacer.FindInterfacer(mainType);

if (Interfacer == null)
{
throw new System.ArgumentException("The Ability of type " + mainType + " has not been registered in database");
}
this.MyAbilityCode = Interfacer.Name;
} else
{
this.MyAbilityCode = mainType.Name;
while (mainType.BaseType != typeof (Ability) && mainType.BaseType != typeof (ActiveAbility)) {
mainType = mainType.BaseType;
}
Interfacer = AbilityInterfacer.FindInterfacer(mainType);
if (Interfacer == null) {
throw new System.ArgumentException("The Ability of type " + mainType + " has not been registered in database");
}
this.MyAbilityCode = Interfacer.Name;
_agent = agent;
ID = id;
TemplateSetup();
ID = id;
TemplateSetup ();
OnSetup();
this.VariableContainerTicket = LSVariableManager.Register(this);
this._variableContainer = LSVariableManager.GetContainer(VariableContainerTicket);
this.LSVariableContainerTicket = LSVariableManager.Register(this);
}

protected virtual void TemplateSetup()
{
protected virtual void TemplateSetup () {

}
}

protected virtual void OnSetup()
{
}
protected virtual void OnSetup() {}

internal void Initialize()
{
VariableContainer.Reset();
public void Initialize() {
IsCasting = false;
OnInitialize();
}

protected virtual void OnInitialize()
{
}
protected virtual void OnInitialize() {}

internal void Simulate()
{
public void Simulate() {
OnSimulate();
if (isCasting)
{
if (isCasting) {
OnCast();
}
}
protected virtual void OnSimulate() {}

protected virtual void OnSimulate()
{
}
public void LateSimulate () {
OnLateSimulate ();
}
protected virtual void OnLateSimulate () {

internal void LateSimulate()
{
OnLateSimulate();
}
}

protected virtual void OnLateSimulate()
{
protected virtual void OnCast() {}

}

protected virtual void OnCast()
{
}

internal void Visualize()
{
public void Visualize() {
OnVisualize();
}

protected virtual void OnVisualize()
{
}
protected virtual void OnVisualize() {}

public void BeginCast()
{
public void BeginCast() {
OnBeginCast();
}

protected virtual void OnBeginCast()
{
}
protected virtual void OnBeginCast() {}

public void StopCast()
{
public void StopCast() {
OnStopCast();
}

protected virtual void OnStopCast()
{
}
protected virtual void OnStopCast() {}

public void Deactivate()
{
public void Deactivate() {
IsCasting = false;
OnDeactivate();
}

protected virtual void OnDeactivate()
{
}
protected virtual void OnDeactivate() {}
}
}
4 changes: 2 additions & 2 deletions Core/Game/Abilities/ActiveAbility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
namespace Lockstep {
public abstract class ActiveAbility : Ability {

public ushort ListenInput {get; private set;}
public InputCode ListenInput {get; private set;}

protected sealed override void TemplateSetup ()
{
ListenInput = Interfacer.ListenInputID;
ListenInput = Interfacer.ListenInput;
}

public void Execute(Command com) {
Expand Down
Loading