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

added combat events, added combat defense and attack calculations, etc #327

Merged
merged 14 commits into from
Jun 15, 2021

Conversation

Twistt
Copy link
Contributor

@Twistt Twistt commented Jun 5, 2021

No description provided.

@Twistt Twistt closed this Jun 5, 2021
@Tynarus
Copy link
Member

Tynarus commented Jun 5, 2021

wot

Copy link
Member

@Tynarus Tynarus left a comment

Choose a reason for hiding this comment

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

😍

@Twistt Twistt reopened this Jun 5, 2021
@Twistt
Copy link
Contributor Author

Twistt commented Jun 5, 2021

Fixed the build issue - there was a problem with the merge between forks.

import { loopingEvent } from '@engine/game-server';
import { TaskExecutor } from '@engine/world/action';
import { widgetButtonIds } from '../skills/smithing/smelting-constants';
import { magiconnpcActionHandler, MagicOnNPCActionHook, MagicOnNPCAction } from '../../game-engine/world/action/magic-on-npc.action';
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why is this in here? Is this just a template file for prayer that's been copied over from magic-attack.plugin.ts?

I think file this should be left out of the PR or you should update it to a DRAFT and stay on this branch for further development.

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 need it to capture the prayer button press - don't i?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yeh you do but it has imports and references of the original file that don't have to do anything with prayer.

Talking about home teleport button, imports at line 9 etc.

Copy link
Collaborator

Choose a reason for hiding this comment

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

If it's still WIP, I can change the PR to DRAFT so it doesn't get merged like this, because this can probably break stuff if someone tries to fork the server in this state.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok i see what you mean now, ill fix and recommit!

src/game-engine/world/actor/player/attack.ts Outdated Show resolved Hide resolved
src/game-engine/world/action/prayer.action.ts Show resolved Hide resolved
@SchauweM
Copy link
Collaborator

Sidenote: I've found this article that I and others forgot to mention to you before you embarked on this journey. It's regarding the combat options

The Combat Options show different attack styles that a player uses in Combat, which in turn affects what experience they receive. A player's attack style is chosen on the combat screen section of the interface.

https://oldschool.runescape.wiki/w/Combat_Options

Copy link
Member

@Tynarus Tynarus left a comment

Choose a reason for hiding this comment

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

Just one change, looks like a missed typo, or?...

/**
* Button action pipe definition.
*/
export default [ 'magic_on_npc', PrayerActionPipe ] as ActionPipe;
Copy link
Member

Choose a reason for hiding this comment

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

This is using the magic_on_npc action type instead of whatever is setup for prayer

@Tynarus Tynarus merged commit a694911 into runejs:develop Jun 15, 2021
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

4 participants