summaryrefslogtreecommitdiff
path: root/npc/cities
AgeCommit message (Collapse)AuthorFilesLines
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
2010-03-03- Corrected a minor issue in sealed shrine, lock out should work now.* Added ↵L0ne_W0lf2-0/+455
some 13.2 content, and more 13.1 content. - Added "Otherworld language" quest. - Added Cat Hand Trading NPCs for 13.2 maps. - Added warps for Splendide and Manuk (town and field.) - Added basic town NPCs for Manuk and Splendide. - Added the guild dungeon SE events, though the pierre boxes do nothing. - Corrected a minor issue in sealed shrine, lock out should work now. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14257 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-08- Clarified documentation for 'addtimer'.brianluau1-1/+1
- Fixed a typo in a gonryun NPC (Wi -> Wu). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14047 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-05- Updates to several npc files to match AEGIS standards.Kisuka4-1360/+1340
- Added Cash Hair Stylist (disabled by default). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14040 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-10- Fixed typo in payon.txt (bugreport:3461)Kisuka1-1/+1
- Fixed multiple bugs/issues in quests_moscovia.txt (bugreport:3471) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13997 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-07-27- Added svn:eol-style native for some conf/css/html/pl/sql/txt files.brianluau1-135/+135
- Added svn:executable property for several batch/shell scripts. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13972 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-10* Implemented rewrite of the quest "The Sign".L0ne_W0lf1-17/+0
- Attempts to save player progress when quest npcs are talked too. This is Untested. - Talking to any quest related NPC will remove all out-dated quest vars. * Fixed incorrect sprite ID used in some Niflheim quest npcs. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13878 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-12* Completely rescripted the DTS warp service based on the aegis 11.3 file.L0ne_W0lf1-2/+142
- Updated F_ClearGarbage to erase obsolete DTS player variables. - Moved Cool Corp. Staff NPCs to Lighthalzen (cities/lighthalzen.txt.) - Now everyone can enjoy the global broadcast "every-hour-nag" to vote! - Note: Upon loading ALL prior DTS global variables are erased. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13764 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-04- Added a missing zeny check in the Jawaii Bartender. (bugreport:2897)brianluau1-4/+2
- Added a missing 'close' in the Mage quest Bookshelf. (bugreport:2873) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13727 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-28* A few quest updates due to bugreportsPlaytester1-1/+1
- added a missing close in the Kiel Hyre Quest (bugreport:2885) - added L0ne_W0lf's Cool Event Corp script + a few fixes to it (bugreport:3019) - fixed a small typo in rachel.txt (bugreport:3029) Also I really have to ask the developers again to document all the changes they do on item bonuses! git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13704 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-23* Fixed wrong coordinates of the Prontera Bartender (bugreport:3000)Playtester1-1/+1
* Fixed a chat window not being closeable in the Training Grounds (bugreport:3009) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13691 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-20* Various script updatesPlaytester1-5/+4
- Removed the Acorn repeatable quest (got removed on iRO) - Re-enabled Umbala bungee jumping (bugreport:2978) - Fixed a reward in monster race (bugreport:2990) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13682 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-19* Moscovia Update!Kisuka1-257/+5
- Added Moscovia quests. - Uncommented mosk_dun & added field spawns. - Updated moscovia & mosk_dun warps. - Removed most the npcs from cities/moscovia.txt (they are part of the quests). - Added some more moscovia quest items to item_trade. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13605 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-03* Another round of bug fixes to various scripts.L0ne_W0lf3-8/+13
- Added Satan Morroc spawn and corrected shadow spawn timers. (bugreport:2690) - Fixed Group of Evil NPC not reactivating when it should. (bugreport:2696) - Fixed the Zeny check when summoning guardians in agits. (bugreport:2712) - Added zeny check to Jawaii bartender (hung the script.) (bugreport:2747) - Corrected a mapwarp assosiated with the z-gang quest. (bugreport:2757) - Fixed warps in ice dungeon 3 being usable all the time. (bugreport:2776) - Corrected impossible condition if in Keil Hyre quest. (bugreport:2789) - Corrected leftover aegis variables in several scripts. (bugreport:2794) - Removed duplicate line from nameless quest. (bugreport:2795) * Implemented official behaviour/Cost for investing in economy and defence - Eco/Def will be modified on the turn of the day instead of immediately. - Cost has been updated to official values. Investing twice now costs 4 times the first investment. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13559 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-26- Fixed typo on Sprint Set item (bugreport:2679)Kisuka1-8/+8
- Fixed typo on Poison Bottle Box item (bugreport:2715) - Fixed Kafra coordinates for moc_ruins kafra (bugreport:2714) - Added items 14228 - 14241 (bugreport:2716) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13496 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-25- Added 'Acorn Dealer' NPC to Moscovia (forgot to add it).Kisuka1-0/+61
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13489 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-21- Moscovia NPCs. (All the generic, kafra, and guide NPCs.)Kisuka1-0/+327
(Moscovia quest npcs still have horrible english, so that's why they aren't being committed yet.) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13466 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-20* Rev. 13458 Looooots of bugfixes provided by various people! [L0ne_W0lf]L0ne_W0lf2-3/+26
- Fixed Seal quest checking for oridecon hammer. Again. (Bugreport:2363) - Fixed some requirements for the socket NPC. (famiong) (Bugreport:2572) - Fixed a global variable-collision in Z-Gang quest. (Bugreport:2616) - Fixed issue with Zhed saying things he shouldn't (Bugreport:2627) - Fixed OnMyMobDwead in Nameless quest issue. (Bugreport:2628) - Fixed Kyle Hyre script halting on delitem. (Bugreport:2633) - Added missing part of Peace for Arunafelts (Gepard) (Bugreport:2639) - Added missing Kafra npc to Comodo. (Daegaladh) (Bugreport:2662) - Fixed a minor error in Einbroch Tower NPC. (magegahell) (Bugreport:2669) - Fixed exp reward in Peace for Arunafeltz. (Gepard) (Bugreport:2676) - Fixed exp reward in Meg. God Seal quest. (Daegaladh) (Bugreport:2677) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13458 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-26Happy boxing day, eAthena! Here have a massive update.L0ne_W0lf1-455/+521
* Implemented the first round of episode 12.1 change which include: - Many Morroc NPCs have been moved to Morroc Ruins. - The addition of new of NPCs to the ruins of Morroc. - Several warp points leading around Morroc altered. - The implementation of the continental Guard Quest. - The removal of the 'Dandelion's Request" quest. - This update contains several changes, as Morroc and several fields no longer exist in one sense of the word. AS such, many NPCs have been moved, there may be quests that no longer function because of NPCs on inaccessable maps. * Commented out maps no longer accessable with 12.1 in maps_athena.conf * Updated mob_skill_db episode 12.1 skills to official. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13415 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-27* Continues replacing of specialeffect/2 numerics with constants.samuray221-3/+4
* Corrected an If to continue the President's Quest. (bugreport:2276) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13241 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-25* Continues replacing of specialeffect/2 numerics with constants.L0ne_W0lf3-8/+11
- A lot of files still remain, but they don't have the proper effect names in commented in beside the ID. ;P git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13238 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-21* Large update to Einbroch. Requires testing.L0ne_W0lf2-1657/+1527
- Added missing somewhat-global einbroch quest. - Full update to Uwe Kleine quest. Needs testing. - Updated the structure of the other quests. - Updated the structure of several NPCs. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13229 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-19* Fixed bugs in some items. (bugrepot:2059)L0ne_W0lf1-31/+2
* Added stats for some mobs, and fixed some others. * Rather large update to the Keil Hyre quest. - Update does not add any of the changes made by iRO. - Many updates, see script or tracker for details. * Fixed condition check in turtle island warper. (bugreport:1943) * Removed the duplicate NPC "Mudie" from Hugel City. (bugreport:2079) * Corrected Umbala Dismantle/create Essence NPC. (bugreport:2089) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13091 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-12git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12945 ↵shadow1-14/+0
54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-04Added a missing "case 1:" (bugreport: 1794)Paradox924X1-0/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12907 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-07Another fix to Lucius (trivial) on /cities/lighthalzen.txt. (bugreport:1125)shadow1-2/+3
Fixed Inn Employee#Ahlma warping to same destination as save point, bugreport: 191. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12777 54d463be-8e91-2dee-dedb-b68131a5f0ec
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-17 19:28:01 +0000