summaryrefslogtreecommitdiff
path: root/npc/cities/morocc.txt
AgeCommit message (Collapse)AuthorFilesLines
2020-07-29Remove unused dirsAndrei Karas1-789/+0
2020-01-13Update copyright headers for year 2020Haru1-8/+8
Signed-off-by: Haru <haru@dotalux.com>
2018-11-13Remove type argument from buildin_getnpcid.EyesOfAHawk1-1/+1
2017-06-03convert specialeffect calls with strings to use GIDgumi1-1/+1
2016-01-16Script Standardization: changed select format in cities folderDastgir1-8/+8
2015-12-15Standardized header in scripts (part 10)Haru1-31/+41
- Now including GPL-compliant license/copyright info - Restored some missing copyrights - City scripts folders Signed-off-by: Haru <haru@dotalux.com>
2015-09-25More aggressive whitespace cleanup. Follow up to 51329e6Haru1-1/+0
Signed-off-by: Haru <haru@dotalux.com>
2014-11-02Replaced 'set' with direct assignment where applicable (common folder)Haru1-1/+1
Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke1-2/+2
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-2/+2
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-2/+2
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka1-34/+34
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru1-8/+8
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-3/+1
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-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh1-0/+782
-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-782/+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
2010-12-03Updated some more cash shop boxes to use rentitem instead of getitem.L0ne_W0lf1-1/+4
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-06-22* Added support for NPC names in the 'specialeffect' script command, go go ↵L0ne_W0lf1-5/+1
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
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
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-04-03fixed broken dialoguesLupus1-3/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12466 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-28* Updated NPC headers to fix errors caused by rev. 11603.L0ne_W0lf1-2/+3
- Note: non-standard loaded scripts need to be checked for errors/duplicates. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11605 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-24Removed duplicate Morroc city npc (bugreport:277)L0ne_W0lf1-31/+7
Fix to the knight job quest. (bad areawarp destination) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11568 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-07* Updated header for Morroc City.L0ne_W0lf1-4/+5
* Finished updating Geffen awhile back, and forgot to commit it. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10863 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-14* Updated cities: Morroc, Jawaii, and IzludeL0ne_W0lf1-270/+538
- 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-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-22/+22
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-470/+470
txt/conf/h/c files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-16* Commited Silent's Fix to the duplicate NPCsPlaytester1-3/+4
- 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-31many quests variables are shrinked in 1 variable bits. UPDATE ALL YOUR OLD ↵Lupus1-3/+4
scripts! git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6884 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-01Fixed an NPC in Morroc who still said the Dragon Fly is NorthPlaytester1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6427 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-03-27constant-fied!Vicious1-11/+11
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/+468
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-410/+0
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5091 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-12-22git-svn-id: ↵ajarn1-2/+1
https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@715 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-14Fixed some file typesamber1-411/+411
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@172 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-07Implemented the rest of the triggers for the Doomed Swords quest and the ↵kobra_k881-146/+0
Jack Frost quest. Commented out some duplicate shops. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@45 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-04git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@2 ↵(no author)1-0/+557
54d463be-8e91-2dee-dedb-b68131a5f0ec