summaryrefslogtreecommitdiff
path: root/npc/other
AgeCommit message (Collapse)AuthorFilesLines
2013-02-19-Moved Arena to main folder so it can be used by pre-re and reStreusel8-0/+8951
Signed-off-by: Streusel
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries24-63/+24
2013-01-29Updated placeholders.Mysteries5-15/+5
2013-01-13* Updated WOE Controller script to v1.5, which overhauls the rewards system ↵euphyy1-9/+12
(with many new features). * Fixed another Renewal Izlude coordinate (bugreport:7169). * Fixed a mail bug, since r16574. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17096 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-11- Fixed bugreport:6993, invalid item id in mercenary script. ↵j-tkay1-707/+212
(other/mercenary_rent.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17016 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10* Added a missing shop item, bugreport:6878 (re\merchants\shops.txt)euphyy1-4/+5
* Fixed a few incorrect labels in Poring War script, bugreport:6794 (other\poring_war.txt) * Follow-up r16900, added svn:eol-style=native property. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16903 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-08* Updated Renewal 'Mjolnir' item (bugreport:6646)euphyy2-4/+5
* Updated slots on RWC 2008 Dragon Helms (bugreport:6645) * Other minor changes... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16765 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-07- Fixed bugreport:6588, grammatical errors here and there. (other/pvp.txt & ↵j-tkay1-66/+60
cities/morocc.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16756 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-05* Follow-up r16742, revised quest sample (doc\sample\npc_test_quest.txt) and ↵euphyy1-3/+0
whisper system documentation (doc\whisper_sys.txt) * Follow-up r16745, fixed a few typos in atcommand documentation (doc\atcommands.txt) * Minor cleaning - spacing, tabulation, comments, dividers git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16746 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-01* Follow-up r16726, more standardization on docs.euphyy3-41/+38
* Replaced and added dividers in many script files with one standard divider. * Other misc. cleaning... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16727 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-27* Optimized "3rd Item Seller" script (re\merchants\3rd_trader.txt)euphyy2-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-20* Fixed a typo in guild scripts, bugreport:6517 (guild\gefg_cas02.txt)euphyy1-21/+17
* Misc. standardization... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16672 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-13* Fixed cutin errors in Fortune script, bugreport:6466 (other\fortune.txt)euphyy1-454/+453
* Fixed item #5503, bugreport:6440 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16630 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-12- Optimized and fixed Medal Distributor (Dual Race) disappears accordingly. ↵j-tkay1-6850/+1098
(other/monster_race.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16626 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-10* Optimized Eden Quest lv. 11-25 (re\quests\eden\)euphyy1-0/+0
* Fixed bugreport:6427 with new Alchemist quest (jobs\2-2\alchemist.txt) * Other misc changes/fixes... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16615 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-09- Added svn:eol-style=native property on some recently added text files.brianluau1-4723/+4723
- Renamed upgrade_svn16517.sql to the correct SVN revision it was added in (r16518). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16614 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-07- Merged other/turbotrack into one template. (other/Turbo_Track.txt)j-tkay9-11006/+4723
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16597 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-07* Moved RE coordinates of Bullet/Magazine Dealers in Izlude, bugreport:6410euphyy1-2/+2
* Added "favorite" column to main.sql file, bugreport:6425 (sql-files\main.sql) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16595 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-04Fixed and cleaned Izlude Arena and some other scripts.daegaladh3-29/+15
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16574 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh31-0/+36119
-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 ↵shennetsind39-49421/+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-07-05* Massive cleaning of "The Sign Quest" script, ~90kb reduction ↵euphyy1-43/+44
(quests\The_Sign_Quest.txt) * Removed OnInit label of "Card Trader" NPC, since it most likely won't be used (other\card_trader.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16377 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-02* Neuralizer is no longer consumed upon failure (bugreport:6040)euphyy1-9/+6
* Some cleaning of the Sorcerer job change quest (jobs\3-2\sorcerer.txt) * Cleaning of "Bunny Band Quest" script (quests\bunnyband.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16367 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-20* Optimized "Guild Battle NPC" (other\guildpvp.txt)euphyy4-422/+138
* 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-06-10* Massive compression of "Card Trader" script, from 123kb to 7kb! ↵euphyy1-4141/+144
(other\card_trader.txt) * Some optimization of Ash-Vacuum quests (quests\quests_13_1.txt) * "Sphinx Mask Quest" script optimized (custom\quests\sphinx_mask.txt) * Moved "Caral" NPC from non-existent moc_fild04 to cmd_fild08, as per bugreport:5959 (custom\quests\thq\THQS_Quests.txt) * Fixed Job_Archbishop/Job_Archbishop_T typos in job change script, but other issues in bugreport:5938 not addressed (jobs\3-1\archbishop.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16254 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-01- Replaced more -> rAthena (follow up to r15251).brianluau1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16195 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-31- Added new towns to the custom warper. bugreport:5878masao871-1/+1
- Fixed a bug in the monster_race.txt where you would get stuck in the dialog window. bugreport:5861 - Fixed a bug in 71-88 eden group mission npc's where you would get stuck in the dialog window. bugreport:5875 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16180 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-26- Fixed wrong areawarp coordinations in all arena rooms. bugreport:3494masao876-11/+17
- Added check if the player invoking one of the Izlude Arena NPC's in sec_pri02 is actually a GM. bugreport:3494 - Some other random stuff in arena files. bugreport:3494 - Follow up r15278 , all EF_WIND effects should now work properly. bugreport:5369 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16152 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-24Updated locations for colored Butterfly Wings (14582-14585) to official.kenpachi2k111-28/+28
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15955 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-27Changed PvPNarrator and GateKeeper to Floating NPC (bugreport:5512) Thanks ↵og21-12/+17
to Daegaladh. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15805 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-27~ Updated a few Descriptionsog212-119/+62
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15803 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-27- Updated Narrators/GateKeepers, etc.og21-347/+331
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15800 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-26- Changed more duplicates so the source is a floating/mapless npc. ↵brianluau1-1/+0
(bugreport:1335) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15798 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-12Fixed char being stuck with breaks (bugreport:5374)og21-16/+7
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15681 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30- Removed more trailing tabs.brianluau9-83/+83
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.brianluau12-328/+328
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15524 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-24Added missing `svn:eol-style` property (follow-up to r15514).gepard19841-4203/+4203
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15515 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-24* Updated Mail. og23-28/+4230
* Fixed Waitroom MaxLevel from poring_war (bugreport:5262). * Added card_trader. * Added card_trader to scripts_athena (disabled by default). * Added MidCamp Warper/Ash-Vacuum from quest_13_1 (gogoash). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15514 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-14*Corrected the bing#n1 issue according to aegis script (bugreport:5050).og21-45/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15457 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-13*Fixed the "bing#n1" issue (bugreport:5050).og27-15/+67
*Fixed variables typos. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15439 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-02- Fixed little mistake from previous commit.masao871-8/+8
- List of Bugs fixed: bugreport:1569 bugreport:867 bugreport:2344 bugreport:3583 bugreport:3025 bugreport:3616 bugreport:3935 bugreport:4015 bugreport:4097 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15353 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-02- Lot's of Bugreport fixes and stuff.masao875-265/+160
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15352 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-02- bugreport:2719 , bugreport:1963 , bugreport:2878 .masao871-0/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15350 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-01poring_war.txt fixes as per bugreport:4848calciumkid1-9/+10
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15341 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-28Added a check in the Hugel Bingo NPC to check if the player actually has ↵jmanfffreak1-0/+5
1000 zeny to play (bugreport:4091). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15293 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-25- Standardized script headers, starting with /npc/custom/brianluau1-3/+10
http://rathena.org/wiki/Script_header git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15262 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-24- Replaced all occurrences of "eAthena" to "rAthena" stringmercurial12338-535/+535
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-17Corrected multiple dialog issues in okolnir quests {bugreport:3092)jmanfffreak1-1/+1
Clarified waiting room dialogs for Hugel Bingo (bugreport:1432) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15146 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-11- Merged /branches/renewal/conf (partial)brianluau3-93/+51
- Merged /branches/renewal/db (only mob_db.txt and mob_skill_db.txt) - Merged /branches/renewal/npc (full) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15060 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-08Fix of npc/other/pvp.txt variable calls. bugreport:5094calciumkid1-10/+10
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15022 54d463be-8e91-2dee-dedb-b68131a5f0ec