summaryrefslogtreecommitdiff
path: root/npc/cities
AgeCommit message (Collapse)AuthorFilesLines
2014-05-13Removed trailing whitespace (scripts)Haru10-18/+18
Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke19-45/+45
Cleaned up Zeny manipulation in scripts. - It is now finally safe to re-commit. - Removed some unwanted parts of the original commit, that broke the character set in some scripts. [Haru] - Corrected spacing in some edited lines. [Haru]
2013-11-28Revert "Cleaned up Zeny manipulation in scripts."Haru19-45/+45
Reverted due to a serious regression. I'll commit this again once I fixed the issue in the script engine. Sorry for the inconvenience. This reverts commit 4faa0ec9df7067cee3eb1c1953fccc6c2f842179. Signed-off-by: Haru <haru@dotalux.com>
2013-11-25Cleaned up Zeny manipulation in scripts.Taylor Locke19-45/+45
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru3-8/+8
- Consolidated case in variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-11-09Consolidated commands called in scripts to their lowercase versionHaru1-1/+1
- Added a note about variables and command scripts case sensitivity. Even though the engine still accepts variable, function and command names in a case insensitive way, it is discouraged to rely on such behavior. Please update your custom scripts as soon as possible. Signed-off-by: Haru <haru@dotalux.com>
2013-11-08Added support for monster spritename constantsHaru1-1/+1
- Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40 - Replaced numeric IDs in NPC definitions and setnpcdisplay calls with the appropriate constants - Made possible thanks to Ind Signed-off-by: Haru <haru@dotalux.com>
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka26-636/+636
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru26-554/+601
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-07-04Merged/Updated/Added scripts from rAthena.j-tkay1-3/+3
- Fixed Bug #7400 Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-06-13Hercules Renewal Phase : Renewalmalufett1-2/+2
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-02-13-Removed leftover 'case 1:' causing errorStreusel1-6/+5
2013-02-11Merge github.com:HerculesWS/HerculesStreusel1-145/+134
2013-02-11Update npc/cities/alberta.txtGuilherme1-145/+134
2013-02-09-Version update for previously committed filesStreusel1-1/+2
2013-02-09-Updated HeadersStreusel1-2/+2
-Fixed Issue ID #6834 warps --tu_swordsman.txt warp to New Izlude uses custom coordinates as renewal coordinates were not available
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries26-103/+62
2013-01-29Updated placeholders.Mysteries4-12/+4
2013-01-13* Updated WOE Controller script to v1.5, which overhauls the rewards system ↵euphyy2-66/+22
(with many new features). * Fixed another Renewal Izlude coordinate (bugreport:7169). * Fixed a mail bug, since r16574. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17096 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-24> Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:euphyy5-19/+39
* Separated Renewal Alberta features with checkre() and new files, follow-up r16125 (bugreport:7041). * Moved remaining Renewal shops out of pre-Renewal file, follow-up r16138 / r16104 (bugreport:7042). * Moved Renewal refining features to a separate file, and made some changes, follow-up r16126 (bugreport:7043). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17042 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-01* Updated Arch Bishop, Guillotine Cross, Mechanic, and Royal Guard job ↵euphyy2-4/+12
quests to their latest versions. * Fixed Izlude RE warps (bugreport:6884, bugreport:6285). * Fixed experience reward in Cursed Spirit quest (bugreport:6288). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16990 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-10* Optimized Splendide coin merchant and merged it to a template with Manuk's ↵euphyy1-7/+6
(merchants\coin_exchange.txt) * Fixed and enabled a Manuk NPC (cities\manuk.txt) * Other small changes and fixes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16773 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-07- Fixed bugreport:6588, grammatical errors here and there. (other/pvp.txt & ↵j-tkay1-2/+2
cities/morocc.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16756 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-05* Follow-up r16742, revised quest sample (doc\sample\npc_test_quest.txt) and ↵euphyy3-6/+0
whisper system documentation (doc\whisper_sys.txt) * Follow-up r16745, fixed a few typos in atcommand documentation (doc\atcommands.txt) * Minor cleaning - spacing, tabulation, comments, dividers git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16746 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-10* Follow-up r16618, fixed SQL entry as well (sql-files/mob_db_re.sql)euphyy3-3/+3
* Follow-up r16616, forgot the pre-re/re split files... (npc/(pre-)re/kafras/) * Merged changes in eAthena 15164 and 15165 (doc/packet_struct_notation.txt) * Removed unreadable characters in various files git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16619 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01- Follow up to r16545: fixed unreadable character at the beginning of ↵brianluau1-2/+2
jawaii.txt and fixed duplicate npc names. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16549 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh26-0/+21258
-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders. -NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences. -For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates. -All pre-renewal files has been reverted back to their pre-renewal behavior. TODO: -Correct pre-re quest rewards. -Check for pre-re/re differences in mapflags. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16545 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-08Okie ladies and gentleman if this commit breaks anything it's jman's and ↵shennetsind29-23263/+0
maki's fault, yes, blame them. Fixing pre-re / re npc support, moving /config/ folder to src root so other servers may also make use of the #define renewal dir and other stuff. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16382 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10- Added svn:eol-style=native property on some recently added text files.brianluau2-1846/+1846
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16258 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-06Follow-up to r16234: New city fileseuphyy2-0/+1846
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16235 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-25- Reduced 300+ copy-paste lines to 1 duplicated npc in eden_common.txt ↵brianluau1-1/+1
(suggestion bugreport:5795) - Replaced more unconverted 'inputstr' in several npc scripts, and changed to scope variables. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16149 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17- Updated some Alberta NPC Locations to match with the new Map. Also updated ↵masao876-12/+12
the coordinates in the Alberta Guide NPC. bugreport:5273 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16125 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-28- Removed duplicate Bismarc NPC in Hugel, since r10973. (bugreport:5271)brianluau1-19/+0
Bismarc#BLS is located in /npc/jobs/2-1/blacksmith.txt git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15815 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30- Removed more trailing tabs.brianluau6-7/+7
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15527 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30- Removed trailing tabs, and fixed some spacing.brianluau3-3/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15524 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-28Fixed issue in niflheim quest where the script set a variable not related to ↵jmanfffreak1-1/+1
the quest at all (bugreport:4104). Added check in Knight job change test to prevent repeating the quest (bugreport:4099). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15292 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-24- Replaced all occurrences of "eAthena" to "rAthena" stringmercurial12327-73/+73
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-12- Changed Sweet_Potato --> Potato to avoid confusion with the taming item. ↵brianluau1-4/+3
(bugreport:2150) - Changed duplicates in /npc/custom/ so the source is a floating/mapless npc. (bugreport:1335) - Fixed some bad English in Biological Weapon Quest. (bugreport:1745) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15075 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-19- Fixed some script typos (bugreport:4861, bugreport:5028).brianluau1-1/+1
- Fixed a typo in Blacksmith Quest (fixes issue 5012). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14936 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-09* Implemented remaining Brasilis NPCs.L0ne_W0lf1-38/+109
* Added remaining database modifications for Brasilis. - Added the skills for the Brasilis monsters. - Added remaining entries for Bathroom Ghost quest. - Added stats for the Suspicious Hydra monsters. - Corrected the capture rate for Suspicious Hydra. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14928 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-08* Added missing Hair Dressers and Hair Dyer to Lighthalzen.L0ne_W0lf3-3/+168
- Hair Dresser will change hair styles ranging between 20 to 27 - Assistant Beautician changes to a random style and colour between 1-23. * Updated the Cursed Spirit quest, and added some more town NPCs. * Added more town NPCs to Splendide and Manuk. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14780 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-03Updated some more cash shop boxes to use rentitem instead of getitem.L0ne_W0lf2-3/+10
Added mercenary skills for Mimic, Disguise, Alice, Doppelganger, and Egnigem. Removed duplicate NPCs in Lighthalzen and Morroc. (bugreport:4555) Corrected typo (Sit -> Suit) in enhcant_arm NPC. (bugreport:4586) Corrected a typo in the christmas_2008 event. (bugreport:4600) Changed which White Lady spawns in endless tower. (bugreport:4601) Also added Quest Log Entries to Endless Tower, please test. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14552 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-07-03Fixed KvM announcements showing during WoE:SE (bugreport:4335).Gepard1-1/+18
Added missing Lighthalzen NPC (bugreport:4319). Fixed checkweights in Manuk & Splendide shops. Fixed some condition checks in Moscovia quests. Fixed some typos in Sealed Shrine and Manuk quests dialogues. Added missing global var check in Yggdrasil Dungeon Floor 2 puzzle. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14360 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-22* Added support for NPC names in the 'specialeffect' script command, go go ↵L0ne_W0lf2-20/+8
copy/paste! * Updated several NPCs to use the updated specialeffect command, updated more NPCs to use the updated emotion command. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14353 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-18Applied patch from Dani to change NPC emotion events to use the updated ↵L0ne_W0lf2-14/+5
emotion command. (bugreport:4318) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14347 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-18- Fixed some emotions triggering on the wrong npc. (bugreport:4303)brianluau1-10/+10
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14346 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-21- Fixed issue with Brute Sailor not taking zeny (bugreport:4244).Kisuka1-1/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14303 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-21Added more misc NPCs to Splendide and Manuk city files.L0ne_W0lf2-4/+835
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14300 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-21Added some Brasilis basic NPCs.L0ne_W0lf1-0/+88
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14299 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-03-13* More bug fixing! Lots of little things, really.L0ne_W0lf1-1/+5
- Corrected some condition errors in quests_veins. (bugreport:4088) - Corrected specialeffects so they play on the right NPC. (bugreport:4090) - Corrected an item ID in the reward NPC in monster races. (bugreport:4092) - Corrected NPCs overlapping with quests in msg_boards (bugreport:4093) - Corrected some of the given errors in the 2007_relay quest. (bugreport:4094) - Corrected hideonnpc to disablenpc in ice dungeon 4 warps. (bugreport:4102) - Commented out duplicate library curator in prontera city. (bugreport:4105) - Corrected cutins not being removed on NPC end in sealed shrine. (bugreport:4117) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14262 54d463be-8e91-2dee-dedb-b68131a5f0ec
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 16:58:32 +0000