summaryrefslogtreecommitdiff
path: root/npc/quests/quests_morocc.txt
AgeCommit message (Collapse)AuthorFilesLines
2013-12-07Fixed several incorrect script labels and eventsHaru1-1/+1
Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke1-7/+7
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-7/+7
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-7/+7
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka1-104/+104
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru1-102/+242
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-1/+1
- Fixed Bug #7400 Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries1-3/+1
2012-08-27* Optimized "3rd Item Seller" script (re\merchants\3rd_trader.txt)euphyy1-2/+2
* Optimized Eden Quest lv. 71-85 (re\quests\eden\) * Deleted a duplicate NPC, bugreport:6564 (re\quests\quests_dicastes.txt) * Other small fixes git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16715 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-27- Fixed a close in The Crow of the Fate quest. (bugreport:6571)brianluau1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16714 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh1-0/+7741
-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-7741/+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-20* Optimized "Elemental Stone Trader" (merchants\elemental_trader.txt)euphyy1-4/+4
* Optimized "Armor Enchanter" (merchants\enchan_arm.txt) * Optimized "Manuk Merchant" (merchants\manuk.txt) * Fixed an incorrect variable in "Thanatos Tower" script, as per bugreport:6073 (quests\thana_quest.txt) * Reverted quests_morocc edit, encoding error? - bugreport:6067 (quests\quests_morocc.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16325 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-20* Reverted a few garbled characters that may have been causing errors ↵euphyy1-2/+2
(quests\quests_morocc.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16324 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-20* Optimized "Guild Battle NPC" (other\guildpvp.txt)euphyy1-2/+2
* Cleanup of "Gonryun Power Arena" script (other\powernpc.txt) * Condensed "Seal Status" script a little bit (other\sealstatus.txt) * Other general cleaning... :3 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16323 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-26- Changed more duplicates so the source is a floating/mapless npc. ↵brianluau1-2/+3
(bugreport:1335) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15798 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
2011-12-20bugreport:4100 fixcalciumkid1-1/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15182 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-21Updated most active NPCs that give EXP to renewal standards.L0ne_W0lf1-10/+10
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14920 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-09* Merged changes from trunk [14742:14782/trunk].ai4rei1-3/+7
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14783 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-12-21* More Orc Instance updates, and some new 13.1 quests. :xL0ne_W0lf1-3/+6
- Disabled an exploit related to the orc hero spawn. - Corrected the variable type for party leader name. - Commented out the assassin pub NPCs in quests_morroc. - Cat Hand Agents no longer ignore you with 300+ points. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14211 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-18* Changed attribute_recover to no, being hit by the same element should not ↵L0ne_W0lf1-4/+5
recover HP. * Added monster_noteleport to Okolnir quest maps. Will fix the tarot card issue. - Fixed Brynhild dialog in the Asprika quests. (bugreport:3085) - Removed "Disabled" tag from Volcano base quest. (bugreport:3342) - Attempted to fix the sign quest dancing portion. (bugreport:3382) - Fixed Guardian in schg_cas03 using invalid coords. (bugreport:3462) - Fixed Turbo Track records using wrong variable type. (bugreport:3484) - Fixed the checkweights in the Crow of Fate quest. (bugreport:3500) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14013 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-12*More episode 12.1 updates, mainly to morroc quests.L0ne_W0lf1-39/+5792
- Updated Satan Morroc to allow people who have finished it to return to the previous map. - Added quest log commands for Resurrection of Satan Morocc. - Added the two remaining episode 12.1 quests. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14001 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-28- Fixed a typo in r13915, causing SC_values 247+ to be off by one.brianluau1-15/+14
- Reverted the Continental Guard change from r13911 (that's how it is on official). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13917 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-26- Moved the anthell warp agent to the new entrance. (bugreport:2801)brianluau1-14/+15
- Added missing 'F_GldTreasSw' function for Novice Castles. (bugreport:3292) - Removed OnTouch trigger area from Continental Guard NPCs. - Corrected the observatory warp portal. (bugreport:3293) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13911 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-03* Another round of bug fixes to various scripts.L0ne_W0lf1-3/+3
- 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-30Fixed "junk symbols". (bugreport:2723)Kisuka1-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13500 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-27Some bug fixes. (bugreport:2558, bugreport:2588, bugreport:2583, bugreport:2587)Kisuka1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13416 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-26Happy boxing day, eAthena! Here have a massive update.L0ne_W0lf1-9921/+1388
* 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-29/+30
* 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-08-31Updated several ancient headgear quests.L0ne_W0lf1-74/+77
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13163 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-25Assassins will now get their request item. (bugreport:1220)L0ne_W0lf1-1/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12431 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-05* Corrected a bad duplicate name in Kafra Bank (Custom). (bugeport:921)samuray221-3/+4
* Corrected a lot of ";;" Typo errors. -Some of this are in the bugreport:919 * Corrected a Cutin Problem in Cooking Quest and a Delitem. (bugreport:911) * Corrected some typo error with "rouge". (bugreport:909) * Moved Custom Event folder to Custom Folder. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12177 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-18Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up ↵L0ne_W0lf1-7/+8
the warnings it produced. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11516 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-28* Made some changes due to recent fixes in the Sign Quest.SinSloth1-8/+9
* Dandelion's Request event now resets properly after it has been completed by a player. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11079 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-13replaced some item names with item IDs, also fixed a bug in skill quest ↵Lupus1-9/+9
(some items weren't deleted) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10992 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-09* Fixed a small bug with the Sign Quest XP rewards.SinSloth1-3/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10967 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-04* Fixed a nasty bug in Dandelion's Request.SinSloth1-5/+7
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10944 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-31* Fixed north prontera kafra having an empty warp listultramage1-5/+5
* 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-07-23* Fixed a little bug in "Dandelion Quest" with "Job_Alchemist" changed to ↵samuray221-5/+7
"Job_Alchem". -Thanks to Nobuo git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10903 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-21* Fixed a small bug in Dandelion's Request.SinSloth1-2/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10797 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-18* Updated Dialogs from "Pretend Murdered Quest".samuray221-38/+36
* Updated Dialogs from "Stop Post Quest". git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10781 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-14added GM lvl check as in other invansion questsLupus1-62/+54
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10757 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-12* Updated dialogs from Binoculars Quest.samuray221-45/+57
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10748 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-10NPC typo fixes, eol style definitons, newline at end of fileultramage1-1/+0
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10738 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-10* Updated (and added) item_trade entries. (Converted from Aegis.)L0ne_W0lf1-5/+5
* 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-06-06* Added Dandelion's Request / Morroc Invasion quest.SinSloth1-1/+10372
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10704 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-3/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10018 54d463be-8e91-2dee-dedb-b68131a5f0ec
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-04 01:01:44 +0000