summaryrefslogtreecommitdiff
path: root/npc/re/merchants/shops.txt
AgeCommit message (Collapse)AuthorFilesLines
2018-07-26Remove conf dir.Andrei Karas1-1057/+0
2016-11-20Replaced some unsupported symbols in AegisNames (step 2)Haru1-4/+4
This removes the remaining unsupported symbols (despite they being official names) in AegisNames: The apostrophe (`'`) sign is suppressed. The full replacement rules (cumulative with the step 1 commit) are thus: - Any apostrophe is suppressed. - Any non-`[A-Za-z0-9_]` character is replaced with an underscore (`_`). - If the replaced symbol is at a word boundary (beginning or end of the string, or next to another underscore), it is suppressed instead. - If the replacement causes an AegisName conflict, underscores are appended appropriately. Signed-off-by: Haru <haru@dotalux.com>
2016-11-20Propageted the AegisName fix to scripts and pre-re databaseHaru1-25/+25
This commit just propagates the AegisName changes to the pre-re database and to the (re) scripts. Two issues are fixed as a side-effect: - The ghost_palace script was referring the non-existing constant(s): Thanatos_Two-Handed_Staff == (Thanatos_Two) - (Handed_Staff) == 0. Paired with the script engine's inability to differentiate between constants and player variables, that produced a very subtle issue. - The item RAG203 is sold by a NPC (Rebellion Weapon Vending). Due to a pair of swapped AegisName constants (RAG203 and RAG203_), the slotted version was sold by the NPC instead of hte non-slotted one (the issue was actually fixed in the previous commit, although the description of the fix is here - these two commits are only split for legibility purposes but they're to be considered indivisible). Signed-off-by: Haru <haru@dotalux.com>
2016-02-22Alberta NPC UpdatesJedzkie1-1/+65
- Separate Tool Dealer and Pet Groomer selling items in Renewal and PRE-Renewal - Change the selling bullets of Trading Merchant in Renewal and PRE-Renewal
2016-02-22Izlude NPC UpdateJedzkie1-4/+16
- Change the selling items of Pet Groomer and Tool Dealer in RENEWAL - Added PRE-RENEWAL Pet Groomer and Tool Dealer in PRE-RE folder - Change the coordinates of Magazine Seller Kenny and Bullet Trader Tony. - Change the coordinates of Trading Merchant.
2016-02-22Payon NPC UpdateJedzkie1-1/+88
- Change the coordinate of Taekwon Job Changer 'Phoenix' from payon to payon_in01 - Change the facing position of Repairman - Change the selling items of Tool Dealer and Pet Groomer in RENEWAL - Add PRE-RENEWAL Tool Dealer and Pet Groomer. - Change the coordinates of some warps - Change the coordinate of Guide in payon - Change the coordinate of Helm of Angel and Deviruchi Cap quest npc
2016-02-21Geffen NPC UpdatesJedzkie1-2/+68
- Change the selling items of Pet Groomer and Tool Dealer in RENEWAL - Added PRE-RENEWAL Pet Groomer and Tool Dealer in PRE-RE folder - Change the NPC Sprite of Repairman
2016-01-03Update morroc trader npc's to match kRO's morroc trader npc's.Jedzkie1-1/+191
Update some coordinates of the npc's in morroc. Added Marrol Battle Recruiter and Mr. Smile npc in morroc town.
2016-01-03Update Prontera trader npc's to match kRO's trader npc's.Jedzkie1-1/+128
2015-12-15Standardized header in scripts (part 6)Haru1-62/+55
- Now including GPL-compliant license/copyright info - Restored some missing copyrights - Merchants scripts folders Signed-off-by: Haru <haru@dotalux.com>
2015-11-18Another follow up.Jedzkie1-17/+17
2015-11-18Follow up.Jedzkie1-0/+2
2015-11-18Converted some dealers to new trader format.Jedzkie1-41/+414
2015-06-25Fix Izlude In Shops Location and DirectionDastgir1-2/+2
Signed-off-by: Haru <haru@dotalux.com>
2015-06-25Added Ninja ShopDastgir1-0/+21
Signed-off-by: Haru <haru@dotalux.com>
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka1-48/+48
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru1-14/+25
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-05-28Woohooo! Some more cleaning up!Mysteries1-1/+1
- Follow up to 80510a0 { Corrected name placeholders } - Vas cleanup on name placeholders - Small change in /doc/permissions.txt
2013-03-20-Updated shops.txt & quests_moscovia.txt, credits to EuphyStreusel1-0/+15
2013-03-06Updated dewata to match the official scripts.lemongrass31101-2/+13
This commit includes a optional SQL upgrade file, that will reset all the dewata quests and the related variables, that your users have done. Thanks to Euphy for helping me and additionally thanks to Flaid for taking his time to test our conversion. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17178 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-18-Updated map_cache.datStreusel1-3/+6
-Updated Izlude -Added Fly Wing to Lunatic & Poring -Added new Quests (Thanks Flaid) --Expanded MAX_QUEST_DB for the newly added quests Signed-off-by: Streusel
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries1-3/+1
2012-12-28* Added a point to 'npcskill' documentation.euphyy1-1/+7
* Added Malangdo Tool Dealer. * Fixed quest log sample, which never worked to begin with -- thanks clydelion! * Fixed potential error with clones in custom Hunting Missions script (bugreport:7055). * Follow-up r16990, forgot to commit the EXP fix. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17055 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-24> Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:euphyy1-7/+28
* Separated Renewal Alberta features with checkre() and new files, follow-up r16125 (bugreport:7041). * Moved remaining Renewal shops out of pre-Renewal file, follow-up r16138 / r16104 (bugreport:7042). * Moved Renewal refining features to a separate file, and made some changes, follow-up r16126 (bugreport:7043). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17042 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-08- Updated and adapted El Dicastes NPC from official script. Credits to Muad_Dib!j-tkay1-1/+8
- Standardized header. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17009 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10* Added a missing shop item, bugreport:6878 (re\merchants\shops.txt)euphyy1-5/+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-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh1-345/+14
-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-08- First try to commit something into this whole new Mess Ind created ^^masao871-5/+6
* Added the Izlude Town Map Update some of you may already know from me from the download section. Moving all NPC's and Warps around to match the new Izlude Town Map. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16384 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-08Okie ladies and gentleman if this commit breaks anything it's jman's and ↵shennetsind1-0/+380
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
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-01-03 19:45:07 +0000