Add several special weapons, various fixes #279
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Would be awesome if we could open smaller PRs in future, usually try to keep one feature per PR ;) |
tobywisener
reviewed
Sep 5, 2023
| @@ -440,7 +441,7 @@ public void execute() { | |||
| continue; | |||
| double drainMinute = pd.drainRate; | |||
| double drainSeconds = drainMinute / 60; | |||
| double drainTicks = (drainSeconds * 0.6); | |||
| double drainTicks = (drainSeconds * GameConstants.GAME_ENGINE_PROCESSING_CYCLE_RATE / 1000D); | |||
There was a problem hiding this comment.
Can we use Misc.getTicks(drainSeconds) here?
| @@ -173,22 +173,6 @@ public static HitDamage getHitDamage(Mobile entity, Mobile victim, CombatType ty | |||
| damage *= damageMultiplier; | |||
| } | |||
|
|
|||
| // Do ranged effects with the calculated damage.. | |||
There was a problem hiding this comment.
Great job on moving this to DarkBowCombatMethod! 🗡️
| * @param cast the entity casting this spell | ||
| * @return the accuracy multiplier | ||
| */ | ||
| public double getAccuracyMultiplier(Mobile cast) { |
There was a problem hiding this comment.
Great job, we can extend this in future to use the OSRSBoxed data that DrHenny & Advo have been plugging in
| @@ -30,11 +31,11 @@ public class Misc { | |||
| * @return | |||
| */ | |||
| public static int getTicks(int seconds) { | |||
| return (int) (seconds / 0.6); | |||
| return (int) (seconds / GameConstants.GAME_ENGINE_PROCESSING_CYCLE_RATE / 1000D); | |||
There was a problem hiding this comment.
Good shit, this is much better using the constant
tobywisener
approved these changes
Sep 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This does a bunch of things. Mainly numerous bug fixes/making more accurate to OSRS, and adding several new special attacks:
For the new special attacks I have added most of the animations/graphics, but some I'm not sure of/weren't matching with what rs has. The attacks all work regardless.
Note there's various empty whitespace removals that Intellij just automatically removed whenever I changed a file because some spacing was weird. Ideally these should be removed anyways so I left them.