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.

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

Feature/add basic trinkets #32

Merged
merged 3 commits into from Mar 24, 2019
Merged

Feature/add basic trinkets #32

merged 3 commits into from Mar 24, 2019

Conversation

dktrotti
Copy link
Contributor

No description provided.

Dominic Trottier added 2 commits March 13, 2019 21:36
Also, somehow the line endings in Character.cs got changed somehow.
Forgive me Father for I have sinned.
@@ -1,137 +1,171 @@
using Assets.Scripts.Moves;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤢

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this file change or did git just die

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean, yes, it was git's fault

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And also, yes, the file was actually changed

@@ -1410,7 +1410,7 @@ PrefabInstance:
- target: {fileID: 2609417324641571755, guid: b049de0ed9494334c9222c97e396c52f,
type: 3}
propertyPath: m_Name
value: Character
value: Dummy
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

private readonly MockInputBuffer inputBuffer;

public override string Name => "Shin Splitter";
public override string Description => "Stop it! That kind of hurts!";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😂

{
public abstract class MoveTrinket : TrinketBase
{
private readonly Events.EventHandler handler;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this should be
using Events;
EventHandler handler;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does github not allow you to make tasks on pull requests? I'm seriously considering moving this project to bitbucket

private readonly MockInputBuffer inputBuffer;

public override string Name => "Fist of the North Star";
public override string Description => "Omae wa mou shindeiru";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nani

private Character owner;

public override string Name => "Frailty of Man";
public override string Description => "People die when they are killed.";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just because you're correct doesn't mean you're right

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wait until we add the trinket that says "You don't die when you are killed"


public override void onEvent(UpdateEvent e)
{
if (trinket.owner.CurrentMove == null)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this checking that there isn't already a move in progress before trying to kick off the next triggered move?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, otherwise you can end up with multiple moves queued that will be done in rapid succession

Copy link
Contributor

@Loonman Loonman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than changing Events.EventHandler to EventHandler with a using directive, looks good! If you have time to answer my other questions that'd be great too.

Hmm, I don't see a way to directly reply to this comment. Fortunately I can just edit it directly! Let me know if you want to go over these changes in a call, it will probably be faster if you have any followup questions.

This change was made to avoid ambigious uses (see System.EventHandler).
While this could be addressed through aliasing, it seems like renaming
it will be easier in the long run.
@dktrotti dktrotti merged commit 2a3f867 into master Mar 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants