summaryrefslogtreecommitdiff
path: root/npc
AgeCommit message (Collapse)AuthorFilesLines
2013-10-07RE El Dicastes Quest Updateshennetsind1-147/+178
Changelog: 2.1 Added reset option to "Kareka". [Euphy] 2.2 Added Izlude duplicates. [Euphy] 2.3 Added GM management NPCs. [Euphy] Closes #146 Signed-off-by: shennetsind <ind@henn.et>
2013-10-07Updated tu_acolyte.txtshennetsind1-57/+110
File Changelog: 1.7 Fixed exp, texts, and requirements in pre-renewal [Daegaladh] 1.8 Updated to match the official script. [Euphy] 1.9 Added GM management function. [Euphy] Closes #176 Signed-off-by: shennetsind <ind@henn.et>
2013-10-07Fixed pre-re NPC Errorshennetsind1-42/+0
Mage solution npcs were present twice, in npc/quests and in /npc/pre-re/jobs/1-1/mage I've removed the mage ones are there is no difference between the re and non-re one, warning is gone. Signed-off-by: shennetsind <ind@henn.et>
2013-09-16Corrected line endings and BOM issues with several filesHaru112-113/+113
- Ensured final end-of-line character in every file. - Corrected cases of mixed line endings (mostly CR and CRLF within the same file.) - Removed extra BOM from some scripts, since it causes a parsing error. Signed-off-by: Haru <haru@dotalux.com>
2013-08-29Quest's added.Wolf2-0/+44
http://hercules.ws/board/tracker/issue-7214-moroccpayon-solution-npcs-missing/?gopid=20262#entry20262
2013-08-29Corrected an integer overflow in npc/custom/etc/marriage.txtHaru1-1/+1
Thanks to Euphy for bringing this to my attention. Signed-off-by: Haru <haru@dotalux.com>
2013-08-28Update warper.txtWolf1-2/+2
Bug Fix - http://hercules.ws/board/tracker/issue-7671-warper-npc-bug-for-pre-re/?gopid=20248#entry20248 * For a end, the script will terminate, but returns nothing, because there's nothing else to be returned, as with a close, the script closes and ends the above function.
2013-08-26Added an integer overflow check on literal values in the script parserHaru3-14/+14
- When attempting to use a value greater than INT_MAX or smaller than INT_MIN (about +/- 2 billions), an error message will be shown and script execution will be aborted. - Corrected some scripts that were attempting to use such values. - Fixed some possible issues when using literal negative values in scripts. Thanks to Ind for his help on this issue (figuring it out and fixing it) Signed-off-by: Haru <haru@dotalux.com>
2013-07-31Fixed Bug #7486j-tkay1-8/+20
- Fixed 'close' issues that causes players to stuck. Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-07-29BG Queue Fixesshennetsind1-3/+2
Cleared 3 out of 5, #69 Support for the cancel button, for pre-game position to return afterwards and fix to the queue position problem after first game. Signed-off-by: shennetsind <ind@henn.et>
2013-07-28Fixed bug #7510j-tkay1-2/+2
- Enabled Dewata warps. http://hercules.ws/board/tracker/issue-7510-dewata-legend-quest-incomplete/ Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-07-11Some fixes regarding Sentences, and AlignmentMysteries1-0/+17
Also, Fixed Bug#7504 - http://hercules.ws/board/tracker/issue-7504-missing-monsters/?gopid=1929 1#entry19291 ~Merged from rAthena
2013-07-05DB Queue Debug Updateshennetsind1-34/+24
Some documentation update on battlegrounds.conf Fixed Hercules Queue Option constants, they're 1-2-3 not 0-1-2. Some Bugfixes to the test script, special thanks to ossi0110 http://hercules.ws/board/topic/1302-bg-queue-debug Signed-off-by: shennetsind <ind@henn.et>
2013-07-05Follow up 28a9fec0916db3d92629ae6e6cd62b5777b09e73j-tkay2-2/+2
- Fixed Bug #7469 - Fixed Bug #7468 Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-07-04Follow up 28a9fec0916db3d92629ae6e6cd62b5777b09e73j-tkay1-1/+1
- Corrected the file path for ticket_refiner.txt. Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-07-04Merge branch 'master' of https://github.com/HerculesWS/Herculesj-tkay1-0/+723
2013-07-04Merged/Updated/Added scripts from rAthena.j-tkay43-1806/+9713
- Fixed Bug #7400 Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-06-30Follow up 918b1123963ac2f91a4d074b092ceef1db71b4e8shennetsind1-4/+1
Just dropping a couple debug messages that shouldn't have gone live into the test script Signed-off-by: shennetsind <ind@henn.et>
2013-06-28BG Queue Testingshennetsind1-0/+726
http://hercules.ws/board/topic/1302-bg-queue-debug/ Signed-off-by: shennetsind <ind@henn.et>
2013-06-25Implemented notomb MapflagCairoLee2-1/+19
2013-06-22Port Malay MVP Armors [by DeadlySilence]Euphy1-0/+507
2013-06-22Port Malaya Jeepneys [by DeadlySilence]Euphy1-1/+247
2013-06-20Merged conflicts.Euphy1-4/+0
2013-06-20Merge remote-tracking branch 'upstream/master'Euphy4-11/+15
Conflicts: conf/plugins.conf db/pre-re/skill_tree.txt db/re/skill_tree.txt db/sc_config.txt npc/mobs/citycleaners.txt src/map/atcommand.c src/map/battle.c src/map/clif.c src/map/map.c src/map/packets.h src/map/pc.c src/map/script.c src/map/skill.c src/map/status.c src/map/storage.c src/map/trade.h Merged master.
2013-06-20Follow-up.Euphy1-1/+1
2013-06-20Follow-up.Euphy1-0/+1
2013-06-20Implemented Eden Tutorial.Euphy1-0/+1561
2013-06-19Update citycleaners.txtjaBote1-1/+1
Changed a High Orc spawn (incorrect) to a Thief Bug Egg spawn (correct) in map job3_war01. Thanks to @Euphyy, who noticed it.
2013-06-17Fixed BugReport: 7388Mysteries3-11/+11
http://hercules.ws/board/tracker/issue-7388-renamed-gld-dun-for-gld-re/? gopid=18608#entry18608 Simple fix and adjusted placeholders for Hercules.
2013-06-15Hercules Renewal Phase : Renewalmalufett10-49/+51
Rename SC names to eagis standard. Implement SC Configuration.(see db/sc_config.txt) Skill updates and fixes. Some code optimization. Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2013-06-15Fixed some spacings, typos, and sentencesMysteries1-44/+44
Thanks rAthena!
2013-06-15Update scripts.confStreusel1-1/+2
2013-06-15Merge pull request #44 from euphyy/masterMasao875-52/+1887
Implemented Hall of Abyss.
2013-06-15Implemented Hall of Abyss.Euphy5-52/+1887
2013-06-13Hercules Renewal Phase : Renewalmalufett10-49/+51
Rename SC names to eagis standard. Implement SC Configuration.(see db/sc_config.txt) Skill updates and fixes. Some code optimization. Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2013-06-08Fixed some spacings, typos, and sentencesMysteries1-44/+44
Thanks rAthena!
2013-06-06Merge pull request #37 from euphyy/masterj-tkay1-0/+1193
Implemented Hazy Forest.
2013-06-03Implemented Hazy Forest.Euphy1-0/+1193
2013-06-02Update scripts.confStreusel1-1/+2
2013-06-01Implemented Mora Enchants.Euphy1-0/+2356
2013-05-31Update payg_cas04.txtStreusel1-16/+17
Fixed Bug #7304 Part 2 Thanks to Xgear for spotting this.
2013-05-31Update payg_cas02.txtStreusel1-16/+17
Fixed Bug #7304 Part 1 Thanks to Xgear for spotting this.
2013-05-31Update izlude.txtStreusel1-2/+2
Fixed Bug #7305 Disabled Captain Carew duplicate for now since it doesn't exist anymore as we've reverted the new novice ground update, until we get more information and add start_point_re. http://hercules.ws/board/tracker/issue-7305-captain-carew/
2013-05-31Follow up 20bdc01fa687b174a732be4483ddea4982d67ce9shennetsind1-2/+1
Debug leftover. Signed-off-by: shennetsind <ind@henn.et>
2013-05-30Merge pull request #30 from Zopokx/mastershennetsind4-1071/+404
Fixed some scripts
2013-05-30Mora / NPC Updatesshennetsind6-22/+5701
* Implemented all Mora quests (excluding instance-related quests and Mora Enchants). * Updated Mora town NPCs, Quiver Maker, and guides. * Updated Bifrost spawns and warps. All Credits to Euphy for sending those to us, Thank you~! Signed-off-by: shennetsind <ind@henn.et>
2013-05-30Memory Slasher - May 30 Patchshennetsind237-864/+7084
http://hercules.ws/board/topic/928-memory-slasher-may-30-patch/ Signed-off-by: shennetsind <ind@henn.et>
2013-05-30Memory Slasher - May 30 Patchshennetsind4-347/+346
http://hercules.ws/board/topic/928-memory-slasher-may-30-patch/ Signed-off-by: shennetsind <ind@henn.et>
2013-05-30Reverted Novice Ground to 953aabf5a650d4eef506c1e620d81405f56863b6.j-tkay3-84/+2046
Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-05-29- remove malaya.txt from npc/scripts.confCairoLee1-1/+0