summaryrefslogtreecommitdiff
path: root/npc/other/pvp.txt
AgeCommit message (Collapse)AuthorFilesLines
2016-09-02change *strcharinfo to use constantsAsheraf1-1/+1
2016-08-29*strnpcinfo now uses constantsAsheraf1-7/+7
- NPC_NAME for the whole npc name including hidden part - NPC_NAME_VISIBLE for the visible part of the npc name - NPC_NAME_HIDDEN for the hidden part of the npc name - NPC_NAME_UNIQUE for the npc unique name - NPC_MAP for npc map
2016-01-17Script Standardization: changed select format in other folderDastgir1-9/+9
2015-12-31Replace -1,{ with FAKE_NPC,{AnnieRuru1-4/+4
replace using Notepad++
2015-12-18ItemID to Constant: other FolderDastgir1-5/+5
2015-12-15Standardized header in scripts (part 14)Haru1-29/+42
- Now including GPL-compliant license/copyright info - Restored some missing copyrights - Other scripts folders Signed-off-by: Haru <haru@dotalux.com>
2015-09-25More aggressive whitespace cleanup. Follow up to 51329e6Haru1-2/+0
Signed-off-by: Haru <haru@dotalux.com>
2015-05-08Replaced checkre() calls with constantsHaru1-1/+1
Signed-off-by: Haru <haru@dotalux.com>
2014-11-02Replaced 'set' with direct assignment where applicable (common folder)Haru1-8/+8
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-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru1-7/+7
- Consolidated case in variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka1-22/+22
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru1-246/+237
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-08* Updated Renewal 'Mjolnir' item (bugreport:6646)euphyy1-2/+2
* 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-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-04Fixed and cleaned Izlude Arena and some other scripts.daegaladh1-1/+1
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:)daegaladh1-0/+466
-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-540/+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-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 Descriptionsog21-14/+2
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
2011-12-24- Replaced all occurrences of "eAthena" to "rAthena" stringmercurial1231-3/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15251 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
2011-02-06- Changed some duplicates so they use a floating NPC as their original. ↵L0ne_W0lf1-9/+19
(bugreport:1395) - Fixed the NPC looking for missing label in the Cursed Spirit quest. (bugreport:4654) - Applied Uno's fix for the cooldown condition in Endless Tower. (bugreport:4677) - Removed level requirement for the Viens Stone gathering quest. (bugreport:4678) - Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707) It's worth noting how much I hate the system for restricting skills per zone. - Fixed Cat Hand warp service warping players to all warp options. (bugreport:4709) - Fixed floor 75 warp in endless tower disabling the wrong warp. (bugreport:4711) - Added a condition for Chungwolmang to only delete items if a certain ID is specified. (bugreport:4719) - Corrected a mobcount specifying the wrong NPC in the Moscovia Ship quest. (bugreport:4736) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14697 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-18Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up ↵L0ne_W0lf1-15/+16
the warnings it produced. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11516 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-06* Updated Juno and Comodo NPCs.L0ne_W0lf1-349/+487
- 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-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-04-05typos: recieve -> receiveultramage1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10163 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-15removed all .GAT from all the scripts and testedLupus1-50/+50
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-414/+414
txt/conf/h/c files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-04Many small scripts fixes - tabs, parenthesis, typoLupus1-4/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9137 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29AS OF SVN REV. 5901, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES ↵Valaris1-0/+414
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-414/+0
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5091 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-12-22git-svn-id: ↵ajarn1-1/+1
https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@720 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-12-22git-svn-id: ↵ajarn1-12/+6
https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@715 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-14Fixed some file typesamber1-420/+420
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@172 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-07added \n between , and {Lupus1-5/+10
in the header 8) now it loads git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@48 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-07Optimized pvp.txt a little bit more. Corrected some typos in item db. ↵kobra_k881-437/+128
Items 1143 and 1719 need to be re-checked. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@46 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-06Fixed small bug with save pointsshadoweathena1-7/+288
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@37 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-04git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@2 ↵(no author)1-0/+443
54d463be-8e91-2dee-dedb-b68131a5f0ec