summaryrefslogtreecommitdiff
path: root/npc/merchants
AgeCommit message (Collapse)AuthorFilesLines
2019-05-05Implement Refinery UIIbrahim Zidan3-13/+38
Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>
2017-11-12Add type constants for the getiteminfo()/setiteminfo() buildinsHaru2-7/+6
Replacements are as follows: 0 => ITEMINFO_BUYPRICE 1 => ITEMINFO_SELLPRICE 2 => ITEMINFO_TYPE 3 => ITEMINFO_MAXCHANCE 4 => ITEMINFO_SEX 5 => ITEMINFO_LOC 6 => ITEMINFO_WEIGHT 7 => ITEMINFO_ATK 8 => ITEMINFO_DEF 9 => ITEMINFO_RANGE 10 => ITEMINFO_SLOTS 11 (Subtype, for weapons and ammunitions) => ITEMINFO_SUBTYPE 11 (ViewSprite, for other item types) => ITEMINFO_VIEWSPRITE (NOT AVAILABLE YET) 12 => ITEMINFO_ELV 13 => ITEMINFO_WLV 14 => ITEMINFO_VIEWID 15 => ITEMINFO_MATK (NOT AVAILABLE YET - this was documented but never implemented) Calls to getiteminfo() and setiteminfo() have been replaced with the newly introduced constants. Other constants (such as W_ weapon subtypes) in related code have been replaced as well, to improve code readability. This fixes an issue in the Eden Tutorial script "Tutorial Goal", where ITEMINFO_ATK was accidentally used instead of ITEMINFO_WEIGHT. Note: calls to getiteminfo or setiteminfo with numeric type arguments in third party scripts must be replaced with the respective constants. The use of numeric literals is no longer recommended, and those values may change in the future without notice. See the getiteminfo documentation for details. Signed-off-by: Haru <haru@dotalux.com>
2017-09-12Fix several typos and grammar mistakesHaru3-6/+6
Signed-off-by: Haru <haru@dotalux.com>
2017-06-03remove specialeffect2 from npcsgumi1-2/+2
2017-05-22Update npc/<re/>merchants/advanced_refiner.txt.smokexyz1-2/+2
2017-05-21Refine rate correction from kRO.smokexyz1-2/+2
Normal Ores: http://ro.gnjoy.com/news/probability/View.asp?category=4&seq=1941553&curpage=1 Enriched Ores: http://ro.gnjoy.com/news/probability/View.asp?category=4&seq=1941565&curpage=1 Event Normal Ores: http://ro.gnjoy.com/news/probability/View.asp?category=4&seq=1941558&curpage=1 Event Enriched Ores: http://ro.gnjoy.com/news/probability/View.asp?category=4&seq=1941567&curpage=1
2017-03-08Removed the usage of deprecated command goto from npc scripts (except custom ↵AtlantisRO1-3/+3
folder). Signed-off-by: Ragno <ragno@atlantis-ro.net>
2016-11-20Replaced some unsupported symbols in AegisNames (step 2)Haru1-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-09-02change *strcharinfo to use constantsAsheraf2-2/+2
2016-08-29*strnpcinfo now uses constantsAsheraf1-3/+3
- 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-02-29Replaced the SEX_FEMALE/SEX_MALE constants to scripts, where appropriateEmistry4-52/+52
2016-02-22Alberta NPC UpdatesJedzkie1-51/+1
- 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-22Payon NPC UpdateJedzkie2-74/+3
- 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 UpdatesJedzkie2-44/+5
- 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-02-07Merge pull request #1110 from dastgir/22-ScriptClean-Phase2Haru27-126/+126
Script CleanUp Phase 2
2016-01-17Script Standardization: changed select format in merchants folderDastgir27-126/+126
2016-01-16Remove VAR_ constantsAnnieRuru2-10/+10
- there are 2 same constants for setlook script command, remove the wrong one - VAR_ constant added by lone_wolf is invalid https://github.com/HerculesWS/Hercules/commit/f4278f36db32f35e535a0ea8feb1cf83ca95019e, so use the LOOK_ constant
2016-01-03Update morroc trader npc's to match kRO's morroc trader npc's.Jedzkie1-60/+1
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-62/+1
2015-12-31Replace -1,{ with FAKE_NPC,{AnnieRuru5-7/+7
replace using Notepad++
2015-12-22NPC Update:Jedzkie2-24/+30
- Add RENEWAL Checks for Material Seller. - in Renewal the selling prize of Medicine Bowl of Guild Dealer is 250z. Closes #982 as merged Signed-off-by: Haru <haru@dotalux.com>
2015-12-18ItemID to Constant: kafras/merchants FolderDastgir18-139/+139
2015-12-15Standardized header in scripts (part 6)Haru30-797/+1187
- Now including GPL-compliant license/copyright info - Restored some missing copyrights - Merchants scripts folders Signed-off-by: Haru <haru@dotalux.com>
2015-09-25More aggressive whitespace cleanup. Follow up to 51329e6Haru2-2/+2
Signed-off-by: Haru <haru@dotalux.com>
2015-06-25Updated Buying Shops scriptDastgir1-1/+11
Signed-off-by: Haru <haru@dotalux.com>
2015-05-08Replaced checkre() calls with constantsHaru2-4/+3
Signed-off-by: Haru <haru@dotalux.com>
2015-03-03Updated socket_enchant2.txt to contain ninja itemDastgir1-1/+2
2015-03-03Updated ninja shopDastgir1-0/+8
2015-01-11Added check for Renewal items in Shop, Fixed #8484Dastgir1-2/+4
2014-12-30Merge pull request #325 from happyme9/mastermalufett1-0/+2
Added 'Explosive_Kunai' and 'Makibishi' to 'Boonji' NPC
2014-11-02Replaced 'set' with direct assignment where applicable (common folder)Haru20-259/+259
Signed-off-by: Haru <haru@dotalux.com>
2014-10-31Follow-up to c6f102e (fixed a typo)Haru1-1/+1
Special thanks to kyeme Signed-off-by: Haru <haru@dotalux.com>
2014-10-30Deprecated checkriding and setriding commandsHaru1-6/+6
Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru <haru@dotalux.com>
2014-10-24Renamed ismounting, setmounting, @mount2Haru1-4/+2
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-08-21Added Kagerou ToolsHappy1-0/+2
Added Explosive_Kunai and Makibishi to Boonji NPC
2014-05-13Removed trailing whitespace (scripts)Haru9-21/+21
Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Fixed several files with a missing EOL at EOFHaru3-3/+3
- 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-12-24Christmas Patch - 2013-12-23 Supportshennetsind1-182/+2058
Info: http://hercules.ws/board/topic/3614-christmas-patch-gifto/ Signed-off-by: shennetsind <ind@henn.et>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke19-57/+57
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."Haru19-57/+57
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 Locke19-57/+57
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru1-2/+2
- Consolidated case in remaining variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru5-19/+19
- 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 ↵Kisuka30-294/+294
npcs to use this.
2013-10-24Follow up 418dd821c91ae19723a7b7b531e64b9c4565d555shennetsind1-1/+1
Minor Hercules divergence. Thanks to Haruna, Michieru. Signed-off-by: shennetsind <ind@henn.et>
2013-10-24Update to last rAthena npc.Michieru29-677/+559
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-10-11Moscovia Quest Update / Catalog Magician Moveshennetsind1-99/+5
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 filesHaru7-8/+8
- 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-tkay2-21/+6
- Fixed Bug #7400 Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-05-28Woohooo! Some more cleaning up!Mysteries1-2/+2
- Follow up to 80510a0 { Corrected name placeholders } - Vas cleanup on name placeholders - Small change in /doc/permissions.txt
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-20 06:54:05 +0000