-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
Horror toy factory #1813
Merged
Merged
Horror toy factory #1813
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
Todo: Misc - Implement a command or ajust the src to block interaction of player when still talking to npc with delay : move / use skills / attack? / talk to npc - Implement NPC_MAXPAIN, NPC_MAXPAIN_ATK and NPC_HELLBURNING skills - Convert merchants outside the instance item_db.txt - review items script of items dropped by mobs mob_db.txt - double check mode
- Remove the temporary fix for instance_enter message (fixed in another pull)
- Corrected some equippable job in item_db.txt
Conflicts: src/map/status.h
secretdataz
reviewed
Dec 20, 2016
@@ -1042,6 +1042,9 @@ | |||
698,0,20000,0,0,0,0,-1 | |||
//========================================== | |||
|
|||
//===== New Monster Skills (12.1) ========== |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm sorry >_>
should be ep 15.?? instead
secretdataz
added
the
status:code-review
Pull Request that requires reviewing from other developers before being pushed to master
label
Dec 20, 2016
# Conflicts: # db/re/item_db.txt
… into horror_toy_factory
- Celine NPC_WIDESOULDRAIN and NPC_MAXPAIN are not cancelable
# Conflicts: # db/re/instance_db.txt # src/map/script_constants.h # src/map/status.h
Corrected some mobs datas
aleos89
removed
the
status:code-review
Pull Request that requires reviewing from other developers before being pushed to master
label
Apr 10, 2017
81 tasks
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.
TODO: