summaryrefslogtreecommitdiff
path: root/npc
AgeCommit message (Collapse)AuthorFilesLines
2017-11-18Merge pull request #1902 from MishimaHaruna/getiteminfo-fixHaru12-95/+169
getiteminfo() / setiteminfo() fixes
2017-11-18Merge pull request #1862 from AtlantisRO/standardizationHaru1-1168/+1092
Applied standardization to EndlessTower script
2017-11-12Rewrite F_GetArmorType to reflect the fact that ITEMINFO_LOC returns a bitmaskHaru1-27/+72
The function now handles multi-slot headgears and other uncommon cases better. Signed-off-by: Haru <haru@dotalux.com>
2017-11-12Add F_GetAmmoType global function, counterpart to F_GetWeaponType for ↵Haru1-0/+25
ammunitions Both functions have now been updated to only check the subtype if the item type is correct (IT_AMMO for F_GetAmmoType, IT_WEAPON for F_GetWeaponType) Signed-off-by: Haru <haru@dotalux.com>
2017-11-12Add type constants for the getiteminfo()/setiteminfo() buildinsHaru12-93/+97
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-11-12Merge pull request #1836 from Emistry/script_F_GetArmorTypeHaru1-3/+16
Update F_GetArmorType()
2017-11-05Merge pull request #1873 from AtlantisRO/Standardization-SealedShrine.txtAsheraf1-948/+931
Applied standardization to SealedShrine script
2017-11-05Merge pull request #1872 from AtlantisRO/Standardization-OrcsMemory.txtAsheraf1-377/+349
Applied standardization to OrcsMemory script
2017-10-29Merge pull request #1884 from AtlantisRO/Standardization-saras_memory.txtAsheraf1-515/+514
Applied standardization to saras_memory script
2017-10-29Merge pull request #1879 from AtlantisRO/Standardization-ghost_palace.txtAsheraf1-194/+213
Applied standardization to ghost_palace script
2017-10-26Changes to npc\instances\re\saras_memory.txt script to fit Hercules' Standards.AtlantisRO1-515/+514
- Added mesf and sprintf commands where needed. - Added _$() and _() macros where needed. - Added curly brackets, paragraph breaks, parentheses and spaces to fit Hercules' Standards. - Changed numeric arguments for constants. Signed-off-by: Ragno <ragno@atlantis-ro.net>
2017-10-22Changes to npc\instances\re\octopus_cave.txt script to fit Hercules' Standards.AtlantisRO1-142/+148
- Added mesf and sprintf commands where needed. - Added _$() and _() macros where needed. - Added curly brackets, paragraph breaks, parentheses and spaces to fit Hercules' Standards. - Changed numeric arguments for constants. Signed-off-by: Ragno <ragno@atlantis-ro.net>
2017-10-22Changes to npc\instances\re\ghost_palace.txt script to fit Hercules' Standards.AtlantisRO1-194/+213
- Added mesf and sprintf commands where needed. - Added _$() and _() macros where needed. - Added curly brackets, paragraph breaks, parentheses and spaces to fit Hercules' Standards. - Changed numeric arguments for constants. Signed-off-by: Ragno <ragno@atlantis-ro.net>
2017-10-22Changes to npc\instances\SealedShrine.txt script to fit Hercules' Standards.AtlantisRO1-948/+931
- Added mesf and sprintf commands where needed. - Added _$() and _() macros where needed. - Added curly brackets, paragraph breaks, parentheses and spaces to fit Hercules' Standards. - Changed numeric arguments for constants. Signed-off-by: Ragno <ragno@atlantis-ro.net>
2017-10-22Changes to npc\instances\OrcsMemory.txt script to fit Hercules' Standards.AtlantisRO1-377/+349
- Added mesf and sprintf commands where needed. - Added _$() and _() macros where needed. - Added curly brackets, paragraph breaks, parentheses and spaces to fit Hercules' Standards. - Changed numeric arguments for constants. Signed-off-by: Ragno <ragno@atlantis-ro.net>
2017-10-22Changes to npc\instances\EndlessTower.txt script to fit Hercules' Standards.AtlantisRO1-1067/+1067
- Added mesf and sprintf commands where needed. - Added _$() and _() macros where needed. - Added curly brackets, paragraph breaks, parentheses and spaces to fit Hercules' Standards. - Changed numeric arguments for constants. Signed-off-by: Ragno <ragno@atlantis-ro.net>
2017-10-22Minor improvements to npc\instances\EndlessTower.txt.AtlantisRO1-105/+29
- Added var .@str$ in a select() menu for HULD compatibility. - Sincronized (2) messages to fit official behaviour. - Changed function F_Tower_Warp to use arrays instead of a large switch. Signed-off-by: Ragno <ragno@atlantis-ro.net>
2017-10-18Open Storage for DoramMiniack1-5/+14
Change in functions_kafras to show a different text between normal characters and Doram characters. Credits to RagEmu.
2017-09-12Fix several typos and grammar mistakesHaru31-259/+249
Signed-off-by: Haru <haru@dotalux.com>
2017-09-03Update F_GetArmorType()Emistry Haoyan1-3/+16
- update missing equip types.
2017-09-03Fix errors in the Diamond seller script that were making the NPC check for ↵Mathy1-6/+5
weight incorrectly.
2017-08-07Update Airship Quests (#1614)Asheraf1-2480/+2947
* Update airship quest * airship quest coding style fixes
2017-07-11Add tests for getdatatypeHaru1-2/+21
Signed-off-by: Haru <haru@dotalux.com>
2017-06-03add missing constants to specialeffect callsgumi14-27/+27
2017-06-03convert specialeffect calls with strings to use GIDgumi28-254/+254
2017-06-03remove misceffect from npcsgumi11-27/+27
2017-06-03remove specialeffect2 from npcsgumi112-619/+619
2017-06-03Merge pull request #1684 from Smokexyz/refine-updateHaru3-82/+93
Enriched refine chance correction
2017-06-03Add tests for the exponentiation operatorHaru1-0/+13
Signed-off-by: Haru <haru@dotalux.com>
2017-05-28remove the pow buildin from existing scriptsgumi2-6/+6
2017-05-22Update npc/<re/>merchants/advanced_refiner.txt.smokexyz2-4/+4
2017-05-21Updated npc/re/merchants/shadow_refiner.txt to version 2.0Smokexyz1-78/+89
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-05-12Optimize Uwe Kleine NPC, fix typos and an unintended fallthrough in quests_einskyleo1-2102/+618
Uwe Kleine NPC had a lot of repetition, solved by using functions. There was a case where you'd select the option "About Cooking" which only displays text when ein_cook % 2 == 1 and ein_cook < 10, for any other case it would fallthrough to the next option. Wrong grammar and typos have been corrected as well, some of them outside of the Uwe Kleine NPC.
2017-04-25Merge pull request #1689 from Jedzkie/2-GiantFlyWingHaru1-4/+8
Implemented official Giant Fly Wing Effect
2017-04-23Merge pull request #1548 from AtlantisRO/goto_removalRidley25-1342/+1336
Removed the usage of deprecated command goto from npc scripts (except custom folder)
2017-04-23Implemented official Giant Fly Wing EffectJedzkie1-4/+8
Update the *warpparty script commmand, credits to Dastgir Coding-style fixes & whitespace adjustments in warpparty part in script.c
2017-04-05remove wrong warp in wizard job questAsheraf1-1/+0
2017-03-16Fix wrong order of dialogue at Crusader Jobchange Quest. (#1637)skyleo1-14/+22
Fix wrong order of dialogue at Crusader Jobchange Quest.
2017-03-14Merge pull request #1627 from AtlantisRO/guild_investmentRidley7-179/+451
Fixes #1625. Fixes checks on Guild Dungeon Investment and separates Guild Dungeon mapflags for pre-renewal and renewal
2017-03-13Merge pull request #1628 from AtlantisRO/instance_mapflagsRidley24-372/+35
Fixes #1626. Adds missed mapflags on instances.
2017-03-13Fixes #1625. Fixes checks on Guild Dungeon Investment and separates Guild ↵AtlantisRO7-179/+451
Dungeon mapflags for pre-renwal and renewal. Signed-off-by: Ragno <ragno@atlantis-ro.net>
2017-03-13Fixes #1626. Adds missed mapflags on instances.AtlantisRO24-372/+35
- Mapflags are moved into map_zone_db, this will make easier and more intuitive in the future to add mapflags to new instances and avoid miss any mapflag. - Zone mapflags for renewal instances are moved into renewal folder. Signed-off-by: Ragno <ragno@atlantis-ro.net>
2017-03-12Merge pull request #1611 from AtlantisRO/ins_nyd_fixRidley1-0/+4
Fixes #1293. Attaches [Yggdrasil Gatekeeper] NPC to make him capable of read instance variables.
2017-03-08Removed the usage of deprecated command goto from npc scripts (except custom ↵AtlantisRO25-1342/+1336
folder). Signed-off-by: Ragno <ragno@atlantis-ro.net>
2017-03-07Fixes #1293. Attaches [Yggdrasil Gatekeeper] NPC to make him capable of read ↵AtlantisRO1-0/+4
instance variables. Signed-off-by: Ragno <ragno@atlantis-ro.net>
2017-03-04Follow-up 1b708585b7c2ce3f093a2b352fd5a37ad0cef79a add the variable to clear ↵Asheraf1-0/+2
function
2017-03-04Merge pull request #1608 from Asheraf/signRidley1-5/+5
Change variable type on the sign quest
2017-03-04Merge pull request #1607 from Emistry/script_F_SexMesRidley1-10/+0
Update Global Function - Remove F_SexMes
2017-03-04Change variable type on the sign questAsheraf1-5/+5
credit rathena/rathena@800f22b77bb63c2305d05956de8fbe5db0327ded