summaryrefslogtreecommitdiff
path: root/npc/merchants/inn.txt
AgeCommit message (Collapse)AuthorFilesLines
2015-12-15Standardized header in scripts (part 6)Haru1-61/+62
- Now including GPL-compliant license/copyright info - Restored some missing copyrights - Merchants scripts folders Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Removed trailing whitespace (scripts)Haru1-3/+3
Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke1-3/+3
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."Haru1-3/+3
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 Locke1-3/+3
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka1-12/+12
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru1-13/+13
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries1-4/+2
2012-12-27> Follow-up r17048:euphyy1-3/+3
- Renamed 'useskilltopc' to 'npcskill'; - Removed cast time from NPC objects, code by mkbu95 (suspected official behavior); - Documented 'npcskill'; - Replaced all instances in scripts. * Fixed max level bypass, code by malufett (bugreport:5800). * Updated Malangdo spawns to official. * Some standardization of npc/quests/first_class/. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17049 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh1-0/+238
-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 ↵shennetsind1-279/+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
2011-12-24- Replaced all occurrences of "eAthena" to "rAthena" stringmercurial1231-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-09* Implemented remaining Brasilis NPCs.L0ne_W0lf1-26/+22
* 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
2010-05-21Added some Brasilis basic NPCs.L0ne_W0lf1-1/+47
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14299 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-05- Updates to several npc files to match AEGIS standards.Kisuka1-58/+55
- 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-06-21- Added moscovia quest 'Koshei the Immortal'.Kisuka1-31/+2
- Added 2009rwc maps & mosk_que to map indexing/conf. - Removed duplicate Moscovia Inn NPC (bugreport:3188). - Removed pointless specialeffects from speed items (bugreport:3208). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13903 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-21- Moscovia NPCs. (All the generic, kafra, and guide NPCs.)Kisuka1-27/+23
(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
2008-12-26Happy boxing day, eAthena! Here have a massive update.L0ne_W0lf1-2/+4
* 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-08-12Added updated client effects list.ultramage1-1/+1
Corrected some doc/npc typos. Reindented some mob AI code. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13074 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-08Removed unofficial inn maid from Alberta.L0ne_W0lf1-10/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13053 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-13* Updated moscovia.txt inn.txt mosk_dun.txt shops.txt from jALupus1-1/+35
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12823 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
2008-02-01Updated Lighthalzen Town NPCs and Speed Potion quest.L0ne_W0lf1-0/+50
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12155 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-13added fix missing from r12065ultramage1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12067 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-11* Added Veins town NPCs, mail box, and second guide.L0ne_W0lf1-5/+4
- Updated warps for Veins. Outstanding warps are quest related. * Minor updates to other warp files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12056 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-02* Added Indian RO "Children Week" Event. Thanks $ephirotsamuray221-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11853 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-02* Rescripted Headgear Quests 1 (Comodo) to Aegis 10.3 Standards.samuray221-2/+3
- Corrected a little Typo error in the "Inn". (bugreport:536) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11849 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-18Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up ↵L0ne_W0lf1-13/+14
the warnings it produced. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11516 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-25* Added Veins Cool Event Corp. Rep. and Inn master.L0ne_W0lf1-2/+40
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11303 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-01updated file versionsLupus1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10941 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-13* Updated "Name" fields for 11.2 headgears.L0ne_W0lf1-0/+9
* Updated NPCs for Al De Baran - Added Inn NPC for Al De Baran * Fixed problems with Hahoe/Lion/Bride masks quests. * Added Zairik's fix for the wizard quest. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10879 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-06* Updated Juno and Comodo NPCs.L0ne_W0lf1-5/+6
- Updated Monster Museum NPCs as well. - Updated doomed swords quest, moved unrelated NPCs to proper files. - Added the end of the Comodo and Juno doomed swords quests. * Fixed "[Kafra Employee]" being shown twice at one instance. * Fixed the Geffen Inn NPC. * Updated the NPC names for the Geffen Kafra. * Updated the PVP script to official. Includes Event mode. - Added warps for the PVP Cross room. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10858 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-27* Rev 10815 Updated NPC for Payon.L0ne_W0lf1-4/+5
- Added in the comeplete fortune teller. - Rewrote the Arrow quiver and Gemstone trader NPCs. Moved the Gemstone trader intot he '/merchants' folder. - Updated the information for the Payon Inn accordingly. * Removed an NPC from the Lighthalzen quests. Should fix the "NPC not removed." message when reloading scripts. .Removed because I couldn't find this NPC anywhere it he official file. * Fixed a few over-looked names in the Kafra teleport function. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10815 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-14* Updated cities: Morroc, Jawaii, and IzludeL0ne_W0lf1-11/+13
- Moved an NPC out of Prontera because of the Jawaii update. * Updated Wedding script to official. (Moved previous to custom.) - Updated the Divorce NPC to Official as well. * Changed some dialog in the Kafra Functions. * Updated the Message boards to iRO standards. * Added the Mail box NPCs even though the mail system is not implemented. * Near total rewrite of the shops.txt file. Lots of corrections and such. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10766 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-10* Updated (and added) item_trade entries. (Converted from Aegis.)L0ne_W0lf1-16/+18
* Updated several Prontera NPCs. - Updated Prontera town NPCs, and Prontera Library. - Updated the Prontera Milk Merchant. - Updated the inn dialogs slightly, and corrected information for Prontera. - Added Gaebolg Family Curse quest. - Commented out old Clothes_dyer npc. * Updated Rachel's guide's while loop to be a bit nicer looking. * Added the ability to redeem lottery tickets before max donation is met. * Changed conflicting warps to the "Adoption" room in the church. * Fixed a bug in Kiel Hyre warps and quest. * Updated Dandelion Request quest for Gaebolg compatibility. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10736 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-28Corrected typos/inconsistencies in npc headersultramage1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10638 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-29More eof eols (followup to r10401); skipping /npc/custom and /npc/samplesultramage1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10402 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-15removed all .GAT from all the scripts and testedLupus1-30/+30
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10018 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-05- Massive EOL normalization & 'svn:eol-style native' flag setting for all ↵FlavioJS1-138/+138
txt/conf/h/c files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-09fixed Lighthalzen, Swaltzwalt Quest Part 1, added Hugel-Bingo warps, added ↵Lupus1-1/+9
Airship mobs, fixed Hunte job quest typos, added pet shop into Light git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9182 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-20fixed typos, added missing NEXT;, optimized Niflheim. Clear nif vars garbageLupus1-10/+9
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8819 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-14* Added (finally) the official Inn Maid of Rachel. Save and warp points are ↵eaac1-5/+3
official aswell, thanks to RockmanEXE [erKURITA] * Added (finally) the Garrison quest npc. Item requirements are the official ones, but the quest... well you know. Thanks to RockmanEXE [erKURITA] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8265 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-27* Added Rachel NPCs:eaac1-2/+11
~ Added Official warps of Rachel. About 50% of them. Will get the rest soon. [erKURITA] ~ Added the Tool/Armor/Weapon dealer, aswell as a Vegetable Gardener. [erKURITA] ~ Added the guards + guide locations. Also added the Zondaman location. [erKURITA] ~ Added Rachel Inn npc. [erKURITA] \- Special thanks to RockmanEXE for all the info above. * eAAC update to the vending machine, disguiser and quest warper. [erKURITA] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7349 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-16* Commited Silent's Fix to the duplicate NPCsPlaytester1-2/+3
- needs testing - can't be fully fixed because of length limitation of names git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7200 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-17Now the Inns are like on official serversPlaytester1-50/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6631 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-10Updated history in inn.txtPlaytester1-1/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6547 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-10Fixed Inn dialoguesPlaytester1-21/+18
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6545 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-09Inn now costs 5k at every levelPlaytester1-5/+5
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6526 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29AS OF SVN REV. 5901, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES ↵Valaris1-0/+172
GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EVERYTHING ELSE GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5094 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29Clearing trunk.Valaris1-172/+0
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5091 54d463be-8e91-2dee-dedb-b68131a5f0ec
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-27 11:34:58 +0000