Skip to content

Commit

Permalink
refactor: Removed detect box support.
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Removed detectbox support. Hitboxes can achieve the same effect with no damage/hitstun.
  • Loading branch information
christides11 committed Aug 6, 2020
1 parent fc2fc11 commit 3c64b5b
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 9 deletions.
2 changes: 0 additions & 2 deletions Assets/CAF/Combat/Attack Events/AttackEventDefinition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ public class AttackEventDefinition
public bool active = true;
public bool onHit;
public int onHitHitboxGroup;
public bool onDetect;
public int onDetectHitboxGroup;
public uint startFrame = 1;
public uint endFrame = 1;
[SerializeReference] public AttackEvent attackEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -552,12 +552,6 @@ protected virtual void ShowEventInfo(int eventSelected)
attack.events[eventSelected].onHitHitboxGroup = EditorGUILayout.IntField("Hitbox Group",
attack.events[eventSelected].onHitHitboxGroup);
}
attack.events[eventSelected].onDetect = EditorGUILayout.Toggle("On Detect?", attack.events[eventSelected].onDetect);
if (attack.events[eventSelected].onDetect)
{
attack.events[eventSelected].onDetectHitboxGroup = EditorGUILayout.IntField("Detect Group",
attack.events[eventSelected].onDetectHitboxGroup);
}
EditorGUILayout.LabelField(attack.events[eventSelected].attackEvent == null ? "..."
: attack.events[eventSelected].attackEvent.GetName());
if (GUILayout.Button("Set Event"))
Expand Down
2 changes: 1 addition & 1 deletion Assets/CAF/Entities/Managers/EntityHitboxManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ protected virtual void CleanupAllHitboxes()
}

/// <summary>
/// Checks the hitboxes and detectboxes to see what they hit this frame.
/// Checks the hitboxes to see what they hit this frame.
/// This should be called in late update, as physics update right after update.
/// </summary>
public virtual void TickBoxes()
Expand Down

0 comments on commit 3c64b5b

Please sign in to comment.