Multi-hit refactor and Parental Bond #1676
Conversation
Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.
|
There's conflicts that need to be solved 👀 |
|
Conflicts resolved and tabs replaced! |
The "x was hit with recoil!" message was appearing when the target was immune due to protection or an ability - this should fix that and handle any other cases where 0 damage is dealt.
Make these effects endure one hit of a multi strike move, not all of them.
|
More conflicts to solve 👀 |
Done! There are some problems with Thief's move effect, so I'll need to fix those too (haven't figured out what the cause is yet). |
Bug Bite's effect should only occur on the final strike of Parental Bond (which can also be the first strike if it KO's the target).
There was a problem hiding this comment.
Parental Bond notes
Cases:
- Causes most damaging moves used by the Pokémon to become two-strike moves with the second strike having its damage halved
- Unless it is a set-damage move (such as Seismic Toss and Dragon Rage), which deal the full amount of damage for both strikes
- Check Gen 6 damage multiplier.
- It does not affect multi-strike moves
- If a move could hit multiple targets (including allies), such as Earthquake and Rock Slide, it will not strike twice
- If a move could hit multiple Pokémon but only hits one due to missing the other Pokémon, it will only strike once.
- however, if it can only hit a single Pokémon, such as in a Single Battle it will strike twice.
- Since Parental Bond turns moves into two-hit multi-strike moves
- each strike has a separate chance to be a critical hit
- items that trigger upon strike or contact such as Rocky Helmet occur for each strike
- Abilities that trigger upon strike or contact such as Cursed Body occur for each strike
- there is only one accuracy check, so either both strikes hit or both strikes miss.
- Any attack which has a secondary effect has the same secondary effect on both strikes (such as Power-Up Punch);
- except Secret Power's secondary effect that can only occur after the final strike.
- each strike has an independent chance of activating that effect.
- Even if the Pokémon's Ability is changed to Mummy after the first strike, it will continue to make a second strike regardless.
- Pay Day scatters coins after the first strike only.
- Incinerate destroys applicable held items after each strike.
- If a move has recoil damage, the recoil will be based on the damage dealt by both strikes, but will be taken after the final strike.
- Struggle will inflict recoil damage equal to half the user's maximum HP (after the final strike)
- Moves that switch the user out strike twice, then force a Pokémon to switch out after both strikes are conducted.
- Thief, Covet, Bug Bite, and Pluck do not steal or eat the target's held item until after the final strike, so if the target could use its item after the first strike (e.g. due to low HP), it will use it before the attacker can steal or eat it.
- Smelling Salts, Wake-Up Slap, and Knock Off do not cure the target's status condition or remove its held item (respectively) until after the final strike, so both strikes get the increased power.
- Fire-type moves, Scald, and Steam Eruption thaw a frozen target after the final strike (so a frozen target cannot be thawed and then burned by the same move).
- Smack Down and Thousand Arrows only cause the target to fall to the ground after the final strike.
- If Meloetta has Parental Bond and uses Relic Song, it will change Forme only once, after the final strike.
- Burn Up does not remove the user's Fire type until after the second strike (so both strikes receive same-type attack bonus).
- If Present heals the target it will only strike once, but if it damages the target it will strike twice (the second strike will always damage the target).
- The damage dealt by Psywave is generated separately for each strike, and the second strike's damage is not halved.
- Each strike of Super Fang halves the target's HP (effectively quartering it if HP is not changed between strikes).
- Counter, Mirror Coat, Metal Burst deal the full amount of damage for both strikes.
- The first strike of Assurance counts as previously taking damage for the second strike, giving it increased power.
- Fury Cutter and Echoed Voice only consider uses of the move rather than hits, so the second strike's power is not boosted by the first strike.
- Natural Gift strikes twice.
- Spit Up strikes twice.
- Moves that require recharging after use strike twice, but the user only needs to recharge for one turn.
- One-hit knockout moves only strike once.
- Fling only strikes once.
- Self-Destruct and Explosion only strike once.
- Final Gambit only strikes once.
- Uproar only strikes once.
- Rollout and Ice Ball only strike once.
- Other consecutively executed moves, such as Outrage, can strike twice.
- Moves with a charging turn (such as Fly and Solar Beam) only strike once, even if the Pokémon becomes fully charged in one turn (such as with a Power Herb).
- Endeavor also only strikes once, even if the user or target's HP is changed after it strikes (such as by Iron Barbs or the Sitrus Berry).
- Confusion damage only occurs once.
- Spirit Shackle and Anchor Shot only trap the target after the final strike.
Failed tests
-
If using a move that can hit multiple targets when only one target is in range, it will strike twice.
-
Spiky Shield and King's Shield only damage and decrease Attack (respectively) once if they protect a Pokémon from a contact move used by a Pokémon with Parental Bond.
-
Moves that switch the target out strike twice, then force a Pokémon to switch out after both strikes are conducted.
-
Parental Bond does not affect Z-Moves.
Suggested improvements:
- Using constants for parentalBondOn (PARENTAL_BOND_1ST_HIT, PARENTAL_BOND_2ND_HIT, PARENTAL_BOND_OFF). Rename parentalBondOn to
parentalBondState. - Adding a function to get the random 2-5 multi-hit count.
- use
ifdefinstead ofif
- use
- Self-destruct and Explosion don't need the forbidden flag, as the user faints before a second hit, likely canceling the second strike. Should we fix this so that they do hit twice and they need the flag? 👀
- And if we do, we'll need to add Misty Explosion to the ban list.
Not tested, requires unimplemented feature:
- Grass Pledge, Fire Pledge, and Water Pledge strike twice, even when used as a combination move.
- Parental Bond does not affect Max Moves.
To be fixed in a later PR:
- Bide deals the full amount of damage for both strikes.
Beat Up Notes:
- There's a noticable delay between hits, in both pre and post Gen5 configs.
https://user-images.githubusercontent.com/2904965/197350698-434ff4c6-a1c7-4f5d-9986-541e677b49ca.mp4
Suggestion:
- B_UPDATED_MOVE_DATA for Beat Up should be replaced by B_BEAT_UP_DMG.
- Dragon Tail and Circle Throw strike twice and then switch the target - Z moves are unaffected by Parental Bond - Renamed parentalBondOn to parentalBondState - Added constants for possible values of parentalBondState - Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP
- Parental Bond spread moves should now strike twice whenever there is a single target, even if the target is the user's ally. - Random chance to hit 2-5 times is now set in SetRandomMultiHitCounter().
Probably not needed, but just in case!
|
@AsparagusEduardo I've fixed the following:
I left Explosion in the ban list just in case something wacky gets done to it in future; this way it will always work properly with Parental Bond. IMO it's also nice to have all the unaffected moves documented in the code. Oddly I'm not seeing the Beat Up delay in the gen 5+ version, though it should be there for gen 3 and 4 as the vanilla version waits ages for the "mon's attack!" string on each hit. I think Beat Up is worth a separate config because it's essentially a whole new move effect with very different mechanics, rather than a simple data change like most updated moves get. Could move it to other move settings if that fits better? |
I can definitely see it on Parental Bond, but not on other multihit moves: |
- Various style fixes - Add BATTLE_ALIVE_EXCEPT_ATTACKER case to CountAliveMonsInBattle
|
Suggested changes done! |
Yeah, that was my bad wording. I meant to say PB moves were also affected. |
I forgot to say that I agree with this. |
This is more of a mechanical change like gen 8's change to Teleport, so it should go in the same block of settings.
|
I've moved |
|
I will take a look at look at the delay issue later today. After that and the other changes I requested now, we should be good to go :D |
Rename constants, remove white space, improve B_BEAT_UP description. * Rename B_BEAT_UP_DMG to B_BEAT_UP * Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG * Remove trailing whitespace * Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE
|
Changes done! |
|
So far I've noticed that the delay is happening on double battles when there's only the mon with PB and the target. |
|
Found a fix to the delay. It seems to be happening every time if (stringId)
+ {
PrepareStringBattle(stringId, gBattlerAttacker);
+ gBattlescriptCurrInstr++;
+ }
+ else
+ gBattlescriptCurrInstr += 2; //Skips the following waitmessage, as there's nothing to print.
- gBattlescriptCurrInstr++; |
Port multi-hit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi-hit moves except Dragon Darts and Scale Shot.
Description
This PR does the following:
The following Parental Bond-affected edge cases are accounted for:
Some things aren't handled yet:
Notes for testing:
I've had to rearrange the order that some move end effects happen, and while it seems fine in my testing so far, it's a major change and will need thorough testing.
Gifs:
Recharge moves and fixed damage moves:
Recoil after both hits (Double-Edge changed to fighting type for testing):
Target smacked down after both hits:
Spread moves hit once if there are two targets, twice otherwise:
Status is cured after both hits for Smelling Salts etc.:
Knock Off removes items after both hits:
Burn Up removes Fire typing after both hits:
Addresses the following issues:
#351
#1102
#1107
#1402
Discord contact info
Buffel Saft#2205