summaryrefslogtreecommitdiff
path: root/npc/cities/amatsu.txt
AgeCommit message (Collapse)AuthorFilesLines
2014-11-02Replaced 'set' with direct assignment where applicable (common folder)Haru1-4/+4
Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke1-1/+1
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-1/+1
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-1/+1
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 ↵Kisuka1-12/+12
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru1-11/+11
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-1/+1
2013-01-29Updated placeholders.Mysteries1-3/+1
2012-12-24> Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:euphyy1-5/+9
* 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-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh1-0/+602
-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-602/+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-05-17- Updated some Alberta NPC Locations to match with the new Map. Also updated ↵masao871-2/+2
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
2011-12-24- Replaced all occurrences of "eAthena" to "rAthena" stringmercurial1231-4/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-05* Updated Kunlun NPCs and warps.L0ne_W0lf1-1/+4
- Didn't update the Kunlun 'Power' npcs - Updated Lutie and Comodo warps. * Fixed some slight inconsistencies with the some script headers. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12014 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-11Updated Amatsu NPCs, Quests, and Warps.L0ne_W0lf1-778/+450
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11887 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-31* Fixed north prontera kafra having an empty warp listultramage1-1/+1
* Removed junk &#1038;A text from the 2004 headgears * Changed deprecated Job_Alchem to Job_Alchemist (see r10904) * Fixed a typo in a geffen city npc (Job_Merhcant) * Fixed a typo in the Jobmaster custom script (Job_Gunsliger) * Fixed one old eAAC Quest Warper bug (warp to nonwalkable coords) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10940 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-10NPC typo fixes, eol style definitons, newline at end of fileultramage1-2/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10738 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-04revised 1/3 of cities scriptsLupus1-37/+26
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10456 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-29Gave each file an empty last line, to make svn happierultramage1-1/+1
Added svn:eol-style native where missing Removed remaining .gats git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10401 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-22Some generic typo fixes (src and npc)ultramage1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10054 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-15removed all .GAT from all the scripts and testedLupus1-31/+31
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-938/+938
txt/conf/h/c files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-20- Removed security check since source level patch is applied. Reverted ↵Lance1-3/+0
select(), created prompt(). modified Changelog-Trunk.txt modified npc/airports/airships.txt modified npc/cities/amatsu.txt modified npc/cities/gonryun.txt modified npc/cities/hugel.txt modified npc/cities/lighthalzen.txt modified npc/cities/niflheim.txt modified npc/cities/valkyrie.txt modified npc/custom/eAAC_Scripts/disguiser.txt modified npc/custom/eAAC_Scripts/quest_warper.txt modified npc/custom/jobs/jobmaster.txt modified npc/events/idul_fitri.txt modified npc/jobs/1-1e/gunslinger.txt modified npc/jobs/1-1e/ninja.txt modified npc/jobs/novice/novice.txt modified npc/merchants/kunai_maker.txt modified npc/merchants/novice_exchange.txt modified npc/merchants/refine.txt modified npc/other/comodo_gambling.txt modified npc/other/dts_warper.txt modified npc/other/marriage.txt modified npc/other/powernpc.txt modified npc/quests/Lvl4_weapon_quest.txt modified npc/quests/gunslinger_quests.txt modified npc/quests/quests_ein.txt modified npc/quests/quests_umbala.txt modified npc/sample/monster_controller.cpp modified src/map/script.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9267 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-19Updated scripts with select().. THERE ARE TONS OF THEM!! Will somebody give ↵Lance1-0/+3
me a hand or something? :B git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9259 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-04 * Added missing NPC name in text and next;'s in npc/quests/bongunsword.txt,evera1-14/+16
- npc/cities/amatsu.txt, and npc/merchants/socket_enchant.txt. (Thanks $ephiroth) [Evera] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8603 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-21split quests from cities/amatsu.txt to quests/quests_amatsu.txtevera1-769/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7789 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-16* Commited Silent's Fix to the duplicate NPCsPlaytester1-18/+19
- 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-06-13Implemented a missing npc in Amatsu and the momotaro event.MasterOfMuppets1-1/+207
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7114 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-12Implemented Amatsu guides and changed/removed some Amatsu warps.MasterOfMuppets1-94/+109
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7097 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-02* Added kunai_maker.txt to make elemental kunais. [erKURITA]eaac1-0/+7
* Added new npcs @ que_ng.gat ninja map portion. [erKURITA] * Added new shops @ que_ng.gat ninja map portion. [erKURITA] * Commented wrong shops @ amatsu.txt. [erKURITA] * Added que_ng.gat ninja map portion's warp. [erKURITA] * Modified and corrected the gunslinger quest. [erKURITA] * Changed the prices of the ninja stones according to kRO. [erKURITA] All the kRO related info is thanks to RockmanEXE git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6448 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-03-27constant-fied!Vicious1-7/+7
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5763 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29AS OF SVN REV. 5901, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES ↵Valaris1-0/+1475
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-1479/+0
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5091 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-14Fixed some file typesamber1-1478/+1478
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@172 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-04git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@2 ↵(no author)1-0/+1479
54d463be-8e91-2dee-dedb-b68131a5f0ec