summaryrefslogtreecommitdiff
path: root/npc/re/merchants
AgeCommit message (Collapse)AuthorFilesLines
2017-03-04Fix issue #1524Emistry Haoyan1-1/+1
- double chance should only available for Enrich ores.
2016-11-20Replaced some unsupported symbols in AegisNames (step 2)Haru4-12/+12
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 databaseHaru2-26/+26
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-09-02change *strcharinfo to use constantsAsheraf2-7/+7
2016-08-29*strnpcinfo now uses constantsAsheraf1-1/+1
- 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-06-25Corrected various translation/text encoding issuesHaru1-66/+65
- The generated translation file now loads cleanly without encoding conversion errors 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 UpdateJedzkie3-18/+22
- 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-17Script Standardization: changed select format in RE folderDastgir20-118/+118
2016-01-03Update morroc trader npc's to match kRO's morroc trader npc's.Jedzkie2-3/+193
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-31Replace -1,{ with FAKE_NPC,{AnnieRuru7-10/+10
replace using Notepad++
2015-12-18ItemID to Constant: re FolderDastgir14-99/+99
2015-12-15Standardized header in scripts (part 6)Haru24-413/+863
- 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-09-25More aggressive whitespace cleanup. Follow up to 51329e6Haru4-47/+23
Signed-off-by: Haru <haru@dotalux.com>
2015-08-10Minor script cleanup (part 2)Haru1-1/+1
- Replaced leftover sprite IDs with constants - Corrected some NPC facing directions (in modulo 8) - Follow-up to 7b50fce0f62961b0228e6919562efcfe33e7fbca
2015-07-20Follow Up ebde1c70Dastgir1-4/+13
2015-07-13Added Shadow item RefinerDastgir1-0/+146
2015-07-12Implemented Kagerou/Oboro Gear Enchants.Dastgir1-0/+556
Reference: rathena/rathena@9b5798dc395cd77e1ac35228c95603f43aa9e94c Signed-off-by: Haru <haru@dotalux.com>
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>
2015-06-25Added duplicates of Riding Creature MasterDastgir1-0/+6
Reference: rathena/rathena@5040b2ac6b61b90346ef698beccdcef26fa1863e Signed-off-by: Haru <haru@dotalux.com>
2015-05-29FollowUp 87beda5Dastgir1-1/+1
2015-05-29Fixes Merchant Naphara Name and a typo in getitemDastgir1-3/+3
2015-04-10Corrected Craftsman Ki Location, Report #8614Dastgir1-1/+1
2015-03-03Added Ninja Weapon and Armor Craftman NPC'sDastgir1-0/+351
2015-01-28Fixes Invalid questprogress condition on Eclage Quests. Fixes Slot Expert ↵Dastgir1-2/+2
rate of success. Bug Report#8511
2015-01-11Follow Up e99cbacdastgirpojee1-2/+2
2015-01-11Added Complete Eclage NPCs,Quests and Instancesdastgirpojee1-253/+296
2014-11-02Replaced 'set' with direct assignment where applicable (re folder)Haru16-891/+899
Signed-off-by: Haru <haru@dotalux.com>
2014-10-30Deprecated checkriding and setriding commandsHaru1-12/+8
Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru <haru@dotalux.com>
2014-10-30Deprecated checkdragon and setdragon commandsHaru1-6/+6
Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru <haru@dotalux.com>
2014-10-30Deprecated checkmadogear and setmadogear commandsHaru1-3/+3
Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru <haru@dotalux.com>
2014-10-24Renamed ismounting, setmounting, @mount2Haru1-8/+4
To avoid ambiguity: - The script command ismounting is now hascashmount - The script command setmounting is now setcashmount - The at-command @mount2 is now @cashmount Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Removed trailing whitespace (scripts)Haru1-1/+1
Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Fixed several files with a missing EOL at EOFHaru1-1/+1
- All text files should end with an EOL. Period. - See http://robots.thoughtbot.com/no-newline-at-end-of-file for info on how to configure the most common text editors to do it automatically for you. Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke14-24/+24
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."Haru14-24/+24
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 Locke14-24/+24
2013-11-04Implemented correct refine success rates above +10Haru1-7/+7
- Refine rates above +10 are updated with the official values obtained from Aegis. Note: There are no safe refines above +10 anymore. - Corrected the above +10 refine NPC to decrease the refine level by 3 in case of failure, according to what observed in Aegis. - Special thanks to malufett, Ind. Signed-off-by: Haru <haru@dotalux.com>
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka21-170/+170
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru21-381/+1141
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-10-11Moscovia Quest Update / Catalog Magician Moveshennetsind1-0/+108
Partial Merge of 198dc48 / 48d36c2 Changelog: - npc/merchants/buying_shops.txt -- 1.1a Moved Catalog Magician to Renewal path. [Euphy] - npc/quests/quests_moscovia.txt -- 2.0b Bug fixes. [Lemongrass] -- 2.1 Fixed incorrect use of 'close'. [Joseph] -- 2.2 Updated RE/Pre-RE EXP. [Euphy] - npc/re/merchants/catalog.txt -- 1.1 Updated dialogue. [Euphy] Closes #149 Signed-off-by: shennetsind <ind@henn.et>
2013-09-16Corrected line endings and BOM issues with several filesHaru2-2/+2
- Ensured final end-of-line character in every file. - Corrected cases of mixed line endings (mostly CR and CRLF within the same file.) - Removed extra BOM from some scripts, since it causes a parsing error. Signed-off-by: Haru <haru@dotalux.com>
2013-07-04Merged/Updated/Added scripts from rAthena.j-tkay6-858/+1308
- Fixed Bug #7400 Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-01-10 21:47:14 +0000