summaryrefslogtreecommitdiff
path: root/npc/merchants/socket_enchant.txt
AgeCommit message (Collapse)AuthorFilesLines
2016-01-17Script Standardization: changed select format in merchants folderDastgir1-12/+12
2015-12-31Replace -1,{ with FAKE_NPC,{AnnieRuru1-2/+2
replace using Notepad++
2015-12-18ItemID to Constant: kafras/merchants FolderDastgir1-1/+1
2015-12-15Standardized header in scripts (part 6)Haru1-27/+42
- Now including GPL-compliant license/copyright info - Restored some missing copyrights - Merchants scripts folders 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-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru1-1/+1
- 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-8/+8
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru1-5/+3
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-02-25* Part one of fixing bugreport:6527. This does not yet change functionality.euphyy1-1/+5
-- Added 'disable_items' to all applicable scripts. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17160 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries1-3/+1
2012-09-10* Optimized Splendide coin merchant and merged it to a template with Manuk's ↵euphyy1-1/+1
(merchants\coin_exchange.txt) * Fixed and enabled a Manuk NPC (cities\manuk.txt) * Other small changes and fixes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16773 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh1-0/+362
-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-362/+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-01-24- Fixed some typos in Socket Enchant NPC. (bugreport:5263)brianluau1-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15517 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-02-06- Changed some duplicates so they use a floating NPC as their original. ↵L0ne_W0lf1-9/+12
(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
2010-04-17- Fixed some typos in quest_db.txt (bugreport:4186)brianluau1-1/+1
- Fixed a typo in socket_enchant.txt (bugreport:4188) - Added missing `quest` table to the convert_engine sql files. (r12559,r13960,r13963) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14284 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-10-28Updated Socket Enchant: all items moved to proper NPCs, added slotted Hat of ↵Gepard1-240/+165
Sun God. (bugreport:2871) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14107 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-07-17- Fixed a bug/typo in Valorous Assassin's Damascus's bonus.Kisuka1-8/+11
- Added missing Gae Bolg & Dragon Slayer to socket enchanter. (bugreport:3386) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13951 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-03- Switched the slot enchanter's checks so they come AFTER the final 'next' ↵brianluau1-5/+5
pause. (bugreport:2664) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13721 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-20* Rev. 13458 Looooots of bugfixes provided by various people! [L0ne_W0lf]L0ne_W0lf1-12/+13
- Fixed Seal quest checking for oridecon hammer. Again. (Bugreport:2363) - Fixed some requirements for the socket NPC. (famiong) (Bugreport:2572) - Fixed a global variable-collision in Z-Gang quest. (Bugreport:2616) - Fixed issue with Zhed saying things he shouldn't (Bugreport:2627) - Fixed OnMyMobDwead in Nameless quest issue. (Bugreport:2628) - Fixed Kyle Hyre script halting on delitem. (Bugreport:2633) - Added missing part of Peace for Arunafelts (Gepard) (Bugreport:2639) - Added missing Kafra npc to Comodo. (Daegaladh) (Bugreport:2662) - Fixed a minor error in Einbroch Tower NPC. (magegahell) (Bugreport:2669) - Fixed exp reward in Peace for Arunafeltz. (Gepard) (Bugreport:2676) - Fixed exp reward in Meg. God Seal quest. (Daegaladh) (Bugreport:2677) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13458 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-27* Continues replacing of specialeffect/2 numerics with constants.samuray221-4/+5
* 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-07-25* Corrected Luna Bow Bonuses. (bugreport:1919)L0ne_W0lf1-7/+8
* Swapped dis/enable for hideon/off in wedding script. * Corrected Slotting NPCs triggering on touch. (bugreport:1916) * Added a missing close in juperos quest. (bugreport:1918) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12993 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-08* Removed double tabs from mapflag/warp/script/function/duplicate declarations.FlavioJS1-5/+5
(avoid script errors in a future commit) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11871 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-10-12Fixed some bugs in the Socket Enchant NPCPlaytester1-6/+6
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11423 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-11* Added secret bonus of slotted Skull RingPlaytester1-2/+2
* Fixed two prices of Socket Enchant NPC git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11413 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-10Fixed some minor typosPlaytester1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11403 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-10Updated Socket Enchant NPCPlaytester1-9/+41
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11393 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-10Working on updating Socket EnchanterPlaytester1-1/+5
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11392 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-01Fixed certain typos in src/npc/doc filesultramage1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11102 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-05* Fixed a wrong item ID in Socket Enchant NPC.SinSloth1-2/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10951 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-11Fixed a bug in the socket enchanterPlaytester1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10875 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-07* Fixed a bug and some typos to Socket Enchant NPC.SinSloth1-7/+14
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10709 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-22Tweaked some recent npcs (untested)ultramage1-294/+161
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10608 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-22* Updated Socket Enchant NPC to official.SinSloth1-822/+493
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10604 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-05More official socket enchant success ratesPlaytester1-14/+14
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10481 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-4/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10018 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-13* Reduced the chance to socket enchant a C rank item to 40%Playtester1-2/+2
- info comes from kRO monthly and jRO players - this is based on "better too low than too high" git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9996 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-01git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9942 ↵Lupus1-2/+3
54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-05- Massive EOL normalization & 'svn:eol-style native' flag setting for all ↵FlavioJS1-843/+843
txt/conf/h/c files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-10-25final clone maps -> original maps change. also fixed novice grounds map in ↵Lupus1-3/+3
char.c. fixed socked_enchant npc git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9064 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-04 * Added missing NPC name in text and next;'s in npc/quests/bongunsword.txt,evera1-1/+13
- 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-09-01Tried to remove all duplicates (in default NPCs)toms1-4/+5
( hope nothing is broken ;) ) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8581 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-26Added official effects to the Socket Enchant NPCPlaytester1-0/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8492 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-05Fixed the Socket Enchanter thinking some items are Class CPlaytester1-6/+6
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8146 54d463be-8e91-2dee-dedb-b68131a5f0ec