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

Giratina Questline #3280

Merged
merged 39 commits into from
Nov 15, 2022
Merged

Conversation

HyruleTeam64
Copy link
Contributor

@HyruleTeam64 HyruleTeam64 commented Oct 30, 2022

Adds a questline for Giratina, focused around finding an entrance to the Distortion World. It is intended to be completed in late Sinnoh.
Also adds the Griseous Orb Held Item. It can be dropped by Giratina Altered and gives it a 50% attack bonus. Giratina Altered can evolve into Giratina Origin by reaching level 70 with the Griseous Orb equipped.

@Farboo171
Copy link
Contributor

A few comments from the devs, relayed here:

  • The overall structure of the quest looks good!

  • The method for obtaining Giratina-A and O at the end is somewhat inconsistent with the general approach to Legendary quests we're shooting for. Rewarding an already-existing alt form is the main inconsistency

  • It would be more in line with other quests if you kept Giratina-A as the boss for Distortion World, replaced the reward stage with a Griseous Orb reward, and made Giratina-O a held item evolution of Giratina-A

  • Rather than the TemporaryBattleRequirement('Giratina') quest start requirement, completion of the "A New World" questline is probably more appropriate.

Do these seem like changes you could make?

@Ultima1990
Copy link
Contributor

Rather than the TemporaryBattleRequirement('Giratina') quest start requirement, completion of the "A New World" questline is probably more appropriate.

Keep in mind that for this to work, the new Giratina-A tempbattle has to become part of the "A New World" questline. Which it currently isn't.
Also you'd probably still want the tempbattle requirement anyway, since that way you can guarantee that the player has Giratina-A before starting "Zero's Ambition". Including those playing without the dex challenge. Cuz that just makes sense, you know? You should have a Giratina before you go looking for a way to transform your Giratina.

@HyruleTeam64
Copy link
Contributor Author

It would be more in line with other quests if you kept Giratina-A as the boss for Distortion World, replaced the reward stage with a Griseous Orb reward, and made Giratina-O a held item evolution of Giratina-A

I'm not sure if I have understood this correctly, should I keep the Giratina temporary battle after A New World and have it give the Orb instead of Giratina-A or remove the battle and give the Griseous Orb during the Giratina quest?

Rather than the TemporaryBattleRequirement('Giratina') quest start requirement, completion of the "A New World" questline is probably more appropriate

I used that requirement because, if players who have beaten Sinnoh completed the quest without beating Giratina, there would be two Distortion Worlds in the map. If I remove the temporary battle requirement, I don't think the A New World one would be required, since you need to have completed the quest in order to beat Cynthia.

I'll change the PR into a draft in order to make all the necessary changes.

@HyruleTeam64 HyruleTeam64 marked this pull request as draft October 30, 2022 18:40
@Farboo171
Copy link
Contributor

Keeping the Giratina-A temporary battle is ok. Now that I read the quest steps more closely, I'd say move the Orb to be a reward for beating Zero. You can make the last steps:

  1. Beat Zero, which gives you an Orb
  2. Catch Giratina-A, who is the boss of Distortion World
  3. Evolve Giratina-O using the Orb

As Ultima brought up, the Giratina temporary battle should be part of a quest line. I think adding it to the beginning of this quest would work fine if you don't want to muck around in already finished quests.

@Qwertypop04
Copy link
Collaborator

The Giratina O temp battle really needs to be part of "A New World" or to not exist at all. It would be necessary for progression, where this quest would presumably be a quest board questline, and it would be somewhat confusing to have it not be part of A New World when it's required to go to Sunnyshore

@HyruleTeam64
Copy link
Contributor Author

The Giratina O temp battle really needs to be part of "A New World" or to not exist at all. It would be necessary for progression, where this quest would presumably be a quest board questline, and it would be somewhat confusing to have it not be part of A New World when it's required to go to Sunnyshore

I initially added it outside of A New World so players who have completed A New World but haven't caught Giratina-A could still get it. But if we are doing Giratina-O as a held item evolution, I don't think the Giratina temp battle should exist, since players could still catch Giratina-A as a boss in the Distortion World.

@Qwertypop04
Copy link
Collaborator

Qwertypop04 commented Oct 30, 2022

I initially added it outside of A New World so players who have completed A New World but haven't caught Giratina-A could still get it. But if we are doing Giratina-O as a held item evolution, I don't think the Giratina temp battle should exist, since players could still catch Giratina-A as a boss in the Distortion World.

That makes sense. At this point it has no essential purpose, other than flavour and canon, so including it or not works

@HyruleTeam64
Copy link
Contributor Author

You can make the last steps:

Beat Zero, which gives you an Orb
Catch Giratina-A, who is the boss of Distortion World
Evolve Giratina-O using the Orb

I think that would be the best way to do it. Giratina-O should probably be a Questline restricted evolution in order to prevent players who already have Giratina from wasting the Orb before catching the Pokemon for the quest.

@Qwertypop04
Copy link
Collaborator

I think that would be the best way to do it. Giratina-O should probably be a Questline restricted evolution in order to prevent players who already have Giratina from wasting the Orb before catching the Pokemon for the quest.

Given that the goal of the player during the questline, isn't to obtain Giratina (Origin), but to return to the Distortion World, I don't think that obtaining Giratina-O actually needs to be something required to complete the quest. Maybe it would make sense to have the quest finish upon catching Giratina-A? Then we wouldn't have to give the Griseous Orb for free (could have it be dungeon loot or a drop from Giratina-A?).

@HyruleTeam64 HyruleTeam64 changed the title Giratina Origin Questline Giratina Questline Oct 30, 2022
@HyruleTeam64 HyruleTeam64 marked this pull request as draft November 8, 2022 15:47
@HyruleTeam64 HyruleTeam64 marked this pull request as draft November 8, 2022 15:47
@HyruleTeam64 HyruleTeam64 marked this pull request as ready for review November 8, 2022 16:45
Aegyo
Aegyo previously requested changes Nov 9, 2022
Copy link
Collaborator

@Aegyo Aegyo left a comment

Choose a reason for hiding this comment

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

Mostly just looked over the text for any issues, haven't run the code.

Did you check if adding that bulletin board in the middle causes any problems for old saves?

src/scripts/quests/QuestLineHelper.ts Outdated Show resolved Hide resolved
src/scripts/towns/TownList.ts Outdated Show resolved Hide resolved
HyruleTeam64 and others added 2 commits November 9, 2022 16:28
Co-authored-by: Jessica Chen <jessica.scoltock@protonmail.com>
Co-authored-by: Jessica Chen <jessica.scoltock@protonmail.com>
@HyruleTeam64
Copy link
Contributor Author

Did you check if adding that bulletin board in the middle causes any problems for old saves?

It didn't cause any problems when I tested it, but I may have missed something.

@Aegyo
Copy link
Collaborator

Aegyo commented Nov 11, 2022

You've got a conflict here because of items moving into modules

@HyruleTeam64
Copy link
Contributor Author

I've fixed the conflict, thanks for letting me know.

@CorgiOnNeptune
Copy link
Contributor

Commented for two small typos.

HyruleTeam64 and others added 7 commits November 12, 2022 09:36
Co-authored-by: Justin <104700780+CorgiOnNeptune@users.noreply.github.com>
Co-authored-by: Justin <104700780+CorgiOnNeptune@users.noreply.github.com>
Copy link
Contributor

@Jaaslet Jaaslet left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks for the PR

@Jaaslet Jaaslet dismissed Aegyo’s stale review November 15, 2022 21:08

I have rereviewed it

@Jaaslet Jaaslet merged commit 51d1c56 into pokeclicker:develop Nov 15, 2022
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

7 participants