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.

Sign up for GitHub

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

Jump to bottom

Update to last rA npc. #534

Closed
wants to merge 4 commits into from
Closed

Update to last rA npc. #534

wants to merge 4 commits into from

Conversation

dastgirp
Copy link
Member

@dastgirp dastgirp commented Jun 4, 2015

This PR would include all new rA npc merges.
This PR would also include some bug fixes which I observed and some from Bug Report..

DO NOT MERGE YET. WIP.

@dastgirp dastgirp added the component:scripts Affecting the scripts and NPCs label Jun 4, 2015
@dastgirp dastgirp self-assigned this Jun 4, 2015
@EPuncker
Copy link
Contributor

EPuncker commented Jun 5, 2015

oh man, finally.

@MishimaHaruna MishimaHaruna added this to the Upstream merges milestone Jun 7, 2015
@dastgirp
Copy link
Member Author

@MishimaHaruna
If you want you can review it, I will follow up other changes in new PR,

@MishimaHaruna MishimaHaruna force-pushed the rA-Herc branch 14 times, most recently from b072576 to 3ab984b Compare June 25, 2015 14:58
@MishimaHaruna
Copy link
Member

Reviewed/cleaned up/merged the following commits:

  • 02b2171 Added missing 'end' in some scripts
  • ea408ff Fix Issue in Dual Race.
  • 7086fd4 Fix QuestID's for LostChild and Muff's Loan
  • 4580df1 Fixed Several Bugs(Old GlastHeim)
  • 9f45c59 Updated Buying Shops script
  • 25e4b0c Added new NPC constants
  • f841432 Fix Izlude In Shops Location and Direction
  • 1bb2493 Added Ninja Shop
  • 0b31cf5 Updated eden_iro.txt
  • 93e1ba7 Removed some extra semi-colon
  • 024d680 Added duplicates of Riding Creature Master
  • 94266c9 Removed Blank Messages
  • 19d6148 JobChanger Updated
  • 08b30d8 Added and Optimized Halloween 2013
  • 8126f24 Added Renewal quest items to Ayothaya Dungeon Entrance quest.
  • b44a271 Updated Blacksmith job quest with some extra conditions.
  • c0accec Fixed an issue in 'Message Delivery' quest blocking level 100+ characters.
  • 873eb39 Added WoE Teleport Scroll, and fixes its typo
  • 0d71a64 Fixes Still cutin.
  • 1ba6128 monk_in should not have nosave.
  • 9c5659c Updated RockPaperScissors

The rest still needs more work. I'll leave the PR open for more commits

@MishimaHaruna MishimaHaruna force-pushed the rA-Herc branch 2 times, most recently from 3d9ae39 to ce7a854 Compare July 2, 2015 12:54
@dastgirp @MishimaHaruna
Added 2013 Christmas Event
ce39818 
Signed-off-by: Haru <haru@dotalux.com>
@dastgirp @MishimaHaruna
Implemented 2012 Headgears Quest
146247c 
Based on the rAthena version, improved and cleaned up.

Signed-off-by: Haru <haru@dotalux.com>
@dastgirp @MishimaHaruna
Implemented Kagerou/Oboro Gear Enchants.
af40c64 
Reference: rathena/rathena@9b5798d

Signed-off-by: Haru <haru@dotalux.com>
@dastgirp @MishimaHaruna
Implemented GD_ITEMEMERGENCYCALL Skill, used by 3 items. [WIP]
1d219e2
@MishimaHaruna
Copy link
Member

Merged:

  • ce39818 Added 2013 Christmas Event
  • 146247c Implemented 2012 Headgears Quest
  • af40c64 Implemented Kagerou/Oboro Gear Enchants.

The GD_ITEMEMERGENCYCALL commit needs more work.

@dastgirp dastgirp added the codereview:needsedits Some edits have been requested before the pull request can be accepted label Aug 10, 2015
@MishimaHaruna
Copy link
Member

What shall we do about this? GD_ITEMEMERGENCYCALL isn't acceptable in its current form

@dastgirp
Copy link
Member Author

Give tlme time of few days, and I will be back at this PR

@MishimaHaruna MishimaHaruna added the status:inprogress Issue is being worked on / the pull request is still a WIP label Jan 5, 2016
@Jedzkie
Copy link
Contributor

Jedzkie commented Feb 29, 2016

@dastgir, any news on this?

@dastgirp dastgirp closed this Mar 29, 2016
@MishimaHaruna MishimaHaruna removed the status:inprogress Issue is being worked on / the pull request is still a WIP label Mar 29, 2016
@Likeeit Likeeit mentioned this pull request Mar 4, 2017
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dastgirp dastgirp

Labels
codereview:needsedits Some edits have been requested before the pull request can be accepted component:scripts Affecting the scripts and NPCs
Projects
None yet
Milestone
Upstream merges
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dastgirp @EPuncker @MishimaHaruna @Jedzkie