339 Commits

Author SHA1 Message Date
Skormie
e8d0d35324 Eclage update with minor error fix. r2 2015-01-14 10:54:03 -05:00
Skormie
03249a0430 Eclage update with minor error fix and added optimizations. 2015-01-13 20:38:54 -05:00
Skormie
a4cac34dc6 Eclage update with minor error fix. 2015-01-13 18:19:32 -05:00
Capuche
d1a1029316 Added Eden quests 100-140.
Thanks to Euphy.

Signed-off-by: Capuche <capucrath@gmail.com>
2015-01-12 01:08:44 +01:00
nanakiwurtz
9f3c81c65f Merge pull request #162 from rathena/item_db
/npc/re/merchants/coin_exchange.txt item update
2014-12-17 17:59:17 +07:00
nanakiwurtz
229d15db87 /npc/re/merchants/coin_exchange.txt item update
-- Added Costume Hahoe Mask (19554). Thanks to rayn
2014-12-17 17:45:27 +07:00
Cydh Ramdh
7295bdc925 Merge pull request #143 from rathena/feature/separated_item_guid
Corrected `guid` implementation of item package in 51074a0. See http://rathena.org/board/topic/99743-item-guid/
2014-12-16 20:26:16 +07:00
Luciar
57d4e6718d Sura Job Quest Fix Bug #97
Updates Sura Job Quest by adjusting how some events are triggered
2014-12-04 00:04:30 -04:00
Cydh Ramdh
5ce80555a7 Corrected guid implementation of item package in 51074a0
* GUID
  - `guid` field in official PackageItem.lua supposed to make item will be separated even item is stackable item.
  - Currently `guid` usage is using item Unique ID that generated when item with GUID flag is appear from package.
  - Some item containers in official PackageItem.lua are also separated, not stacked when player obtain it. Example when using atcommand "@item Xmas_Bless". For current implementation, the items are flagged in item_flag.txt (db folder) with flag 4.
  - `isNamed` field in item group is replaced by `GUID` and move the `isNamed` as new additional field. See doc/item_group.txt or db/re/item_package.txt.
* NPC:
  - Enabled npc/re/other/item_merge.txt and it's now usable.
* Script Command:
  - Added `mergeitem` to merge separated items in player's inventory. See doc/script_commands.txt.
* Misc:
  - Changed how to broadcast the item that obtained from package with flag `isAnnounced` to intif_broadcast, so it will be announced to all connected map-servers.
  - Added some items that flagged as 'item group container' in db/re/item_flag.txt

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-11-30 13:52:52 +07:00
Capuche
0edb5c7ff8 Fixed dialog in quests/eden/eden_quests.txt
Thanks to Phenex

Signed-off-by: Capuche <capucrath@gmail.com>
2014-11-15 18:52:45 +01:00
Euphy
1d2160758c Fixed Ticket Refiner refining above ticket level.
http://rathena.org/board/topic/98997-safe-refine-ticket-refiner/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-11-07 18:33:32 -05:00
Capuche
5cfd3bd537 Corrected Ancient Gold Decoration description (bugreport 9154)
Signed-off-by: Capuche <capucrath@gmail.com>
2014-10-20 22:25:14 +02:00
Euphy
403c22bc4b Documentation cleaning.
- Formatting and grammar edits on recently added docs.
- Added missing NPC header and script conf include from ea8ccfc.
- Moved ER model files to a separate folder ('doc/model/').

Fixed a typo in Wolfchev instance. (bugreport:9263)
http://rathena.org/board/tracker/issue-9263-wolfchevlaboratory-script-error/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-31 12:09:38 -04:00
Euphy
30b4d578a7 Some script cleaning.
- Replaced lots of numerics with constants.
- Added spacing to make some scripts more readable.

Fixed a mistake in 14fddd3.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-23 15:17:59 -04:00
Euphy
14fddd3790 Added script checks against swapping items using third-party hacks.
- Follow-up to 416f6d7, as further protection against item exploits.

Contains a few other fixes.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-22 15:36:23 -04:00
Euphy
880903bdab Updated Renewal Izlude Magazine & Bullet dealer locations.
- Coordinates taken from a recent iRO update.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-17 15:13:24 -04:00
Euphy
17bace0ae6 Script bug fixes.
- Added Renewal location for "Knight De Thomas" NPC (previously inaccessible), and upgraded the script to the latest version.
- Fixed Pre-Renewal Merchant Quest questlog commands. (bugreport:9218)
http://rathena.org/board/tracker/issue-9218-merchant-quest-add-error-quest-add-1010/
- Corrected a handful of 'rand(1)' statements.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-16 19:10:19 -04:00
Capuche
ec485afe4c Bug fixes and clean-up :
-- Miscs follow up af266777402e07428388e80db35544fbb9bcbe8e
-- Another clean-up in comodo_gambling.txt (thx @SkittleNugget)
-- Replaced occurrence of PcName and clean-up in tu_magician01.txt

Signed-off-by: Capuche <capucrath@gmail.com>
2014-07-13 21:48:09 +02:00
Capuche
af26677740 Bugfix and clean-up
- Added NPC const
- Added checkdragon() in F_CashReset
- Clean-up books.txt, fortune.txt, card_trader.txt, 3rd_trader.txt, stone_change.txt, quests_brasilis.txt
- Minor fix about Weight in comodo_gambling.txt
- Change to F_GM_NPC function in Mercenary Guild Switch follow up bdab851129ceee57a38ccc9d819b42011ef19fb7
- added Mercenary Switch in gm_npcs.txt list
- change to common green maiden in 2010 Headgear Quests

Signed-off-by: Capuche <capucrath@gmail.com>
2014-07-04 02:14:30 +02:00
Capuche
bdab851129 - Added mercenary guild switch npc from aegis
- Fixed a bug to rent a mercenary in izlude duplicate (it gave a wrong mercenary)
- added a missing delitem in cupet.txt (forgot to delete the 2nd item)
- change the rand part in Mysterious Documents npc in magic_books.txt to match aegis
- little clean up in quests/ninja_quests.txt
- replace the npc id to the constant in theses files

Signed-off-by: Capuche <capucrath@gmail.com>
2014-06-30 17:07:05 +02:00
Euphy
5e261ba415 Minor cleanup of riding script commands.
- The 'checkriding()' function no longer checks for wargs and dragons, ONLY Pecos, Grand Pecos, and Gryphons (as documented). (bugreport:9024)
http://rathena.org/board/tracker/issue-9024-about-renters-from-rathenanpcremerchants/
- Replaced 'checkoption()' warg checks with 'checkwug()'.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-06-10 22:58:09 -04:00
Euphy
2688d78e6a Added a few missing 'changequest' commands to Alchemist job quest. (Hercules 4b4e573)
Minor cleanup in Wolfchev's Laboratory script.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-05-18 08:36:12 -04:00
Euphy
dd9719de62 Implemented Wolfchev's Laboratory instance. (credits: Hercules 1a477c4)
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-05-13 15:34:56 -04:00
Euphy
484d3cc710 Job database updates. (Hercules 5a5a327)
- Updated Job Stat Bonus tables.
- Updated Renewal Star Gladiator EXP table.
- Small changes to Renewal Stat Point table.

A few item database updates/fixes. (incl. Hercules 0604877)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-04-25 18:16:59 -04:00
Euphy
684c336d49 Item-related bug fixes and other miscellaneous fixes.
Item fixes:
- Fixed Tikbalang Card and Lichtern * Card itemscripts. (bugreport:8834)
http://rathena.org/board/tracker/issue-8834-lichtern-cards-tikbalang-card/
- Added Rudo Card itemscript. (bugreport:8833)
http://rathena.org/board/tracker/issue-8833-rudo-card/
- Fixed itemscript for Wild Rider Card. (bugreport(8898)
http://rathena.org/board/tracker/issue-8898-wild-rider-card/
- Added some constants in item database. (part of bugreport:8831)
http://rathena.org/board/tracker/issue-8831-gioia-card/
- Updated a few other Renewal items.

Other fixes:
- Updated Malaya and Biolab 4 spawns. (Hercules 03949b9)
- Added additional .gitignore entries. (Hercules)
- Added a missing 'noteleport' mapflag for spl_in02. (bugreport:8925)
http://rathena.org/board/tracker/issue-8925-spl-in02-can-use-teleport/
- Fixed a leftover in atcommand documentation. (bugreport:8770)
http://rathena.org/board/tracker/issue-8770-dropall-atcommands-docs/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-04-25 12:31:32 -04:00
Akkarinage
810f79e781 Updated Hugel Field Renewal warps
Removed warps that shouldn't exist (bugreport:8868)
2014-04-04 13:13:37 +01:00
Euphy
e1903cb97a Fixed some equip location itemscripts. (bugreport:8821)
http://rathena.org/board/tracker/issue-8821-general-daehyon-card/

Added official names as comments in many newer scripts.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-26 01:47:37 -04:00
Euphy
e2fe7383e7 Minor bug fixes.
- Fixed incorrect item IDs in Port Malaya quests. (bugreport:8810)
http://rathena.org/board/tracker/issue-8810-quest-malaya/
- Updated Ship Captain Hat bonuses. (bugreport:8725)
http://rathena.org/board/tracker/issue-8725-item-bugs/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-21 00:21:38 -04:00
Euphy
4889699376 Bug fixes.
- Fixed guild names for payg_cas02 and payg_cas04. (bugreport:8763)
http://rathena.org/board/tracker/issue-8763-castle-db-wrong-castle-names/
- Fixed OnTouch issues in Old Glast Heim instance. (bugreport:8738)
http://rathena.org/board/tracker/issue-8738-oldglastheim/
- Fixed a minor documentation issue with 'pcblockmove'. (bugreport:8706)
http://rathena.org/board/tracker/issue-8706-pcblockmove-description-incorrect/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-13 15:47:02 -04:00
Euphy
cad0a57865 Replaced 'getserverdef' command with 'script_hardcoded_constants' function in source. These constants can now be directly accessed in scripts. (Hercules 950e3eb)
- Relocated 'Option_*' constants from 'db/const.txt' to source; added OPTION_COSTUME compound. (Hercules a5728fd)
- Added MAX_CHAT_USERS define. (Hercules 950e3eb)
- Follow-up ca9642a: applied 'Loc' changes to Pre-Renewal database.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-01 15:42:49 -05:00
Euphy
944e7d041f Minor bug fixes.
- Changed 'bIgnoreDefRate' to 'bIgnoreDefRaceRate' in Pre-Renewal item database. (bugreport:8674)
http://rathena.org/board/tracker/issue-8674-item-bonus-error-or-not/
- Added missing 'bFixedCastrate' bonus for item 1832. (bugreport:8422)
http://rathena.org/board/tracker/issue-8422-vellum-claw-not-giving-insta-cast-on-10/
- Clarified 'getgmlevel()' and 'getgroupid()' functions in script documentation. (bugreport:8586, pull #46)
http://rathena.org/board/tracker/issue-8586-script-commandstxt-doc-getgroupid/
- Added Buying Store tables to source documentation.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-18 19:09:37 -05:00
Euphy
c7e020ad18 Added pRO/twRO "Card Exchange" NPC.
Information: http://richkidherbert.blogspot.com/2013/08/card-exchanger.html

Fixed incorrect position and view for item 18771. (bugreport:8657)
http://rathena.org/board/tracker/issue-8657-item-18771-enchanced-opera-phantom-mask-is-incorrect/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-16 01:40:29 -05:00
Euphy
a2d095f5c4 Item database update.
- Added/edited itemscripts for some new items.
- Corrected the persistence of many Hit- and Flee-increasing consumables, as they should dispel upon death. (incl. bugreport:8626)
http://rathena.org/board/tracker/issue-8626-accuracy-30-scroll-effect-when-death/

Hercules merges:
- Added optional 'count' parameter to script command 'successrefitem'. (9d1f80e)
- Atcommand bindings are now case-insensitive, like normal atcommands. (92be98c)
- Consumables without expire time no longer stack with rental items. (afcb4bc, bugreport:8458)
http://rathena.org/board/tracker/issue-8458-rent-item-bug/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-10 16:13:53 -05:00
Euphy
0724d1ebab Minor updates.
* Added Cryptura Academy monster spawns, commented until the scripts are implemented. Does not include monsters from job quests.
* Fixed two label errors in Wizard job quest. (bugreport:8590)
http://rathena.org/board/tracker/issue-8590-wizard-job-quest-label-error/
* Updated AUTHORS file. (credits to AnnieRuru and Keyworld for providing some missing names)
* Uncommented a mapflag in custom 'mvp_ladder' script. (credits: AnnieRuru)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-04 21:35:36 -05:00
Cydh Ramdh
b4bdaebeeb * Replaced INF2_NO_AUTOSHADOWSPELL with INF2_AUTOSHADOWSPELL following AEGIS standard, reverted c9cf222.
* Fixed bugreport:8596 http://rathena.org/board/tracker/issue-8596-compile-warnings-with-fresh-svn/
* Removed temporary array while parsing shop NPC, makes remove the limit 100 items each NPC
* Added idRO cash trader according to Chinese New Year event

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-02-04 12:32:38 +07:00
Euphy
007b88f2bb Added "Merry Badger" NPC to iRO Eden, and other tweaks. (credits: @SkittleNugget, pull #44)
Follow-up 957f495: 'preg_match' will still be compiled for users with PCRE disabled. (tid:92024)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-31 03:11:18 -05:00
Euphy
21122d7a87 Some bug fixes.
* Ninja Cutter (13074) is not refineable, causing KG/OB quest to halt. (bugreport:8542)
http://rathena.org/board/tracker/issue-8542-ninja-cutter-cannot-be-refined/
* Treasure Chest (2335) in Bakonawa's Lake instance drops incorrect spirit piece. (bugreport:8294)
http://rathena.org/board/tracker/issue-8294-treasure/
* Slightly edited coordinates of two RE Izlude traders.
* Follow-up 3813aaa: fixed a typo on item 22669.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-24 21:44:36 -05:00
Euphy
189a46d7d0 Implemented 2010 Headgear Quests.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-22 17:59:11 -05:00
Euphy
364c7edb90 Added official names as comments in many newer scripts.
Signed-off-by: Euphy <euphy@rathena.org>
2014-01-22 15:59:21 -05:00
Euphy
e6bd3625c6 Implemented Kagerou/Oboro Equipment Quests.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-22 12:25:07 -05:00
Rekiem
5899bef2ce Update cash_trader-idRO.txt
change einbeich to einbech.
2014-01-21 21:13:14 -05:00
Euphy
5d08795837 Implemented 2012 Headgear Quests.
Credits to @cydh for helping out with the quest bonus.
Follow-up 1a9b54: added missing SQL item_db entries.

Clarified description of "delayed consumption" item type (11) in item_db documentation. (tid:91187, thanks Annie!)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-21 16:01:57 -05:00
Euphy
8c24dc899b Follow-up 4226a23: added a missing trader.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-18 12:32:41 -05:00
Euphy
4226a23683 Updated Renewal Ninja shops. (incl. bugreport:8507)
http://rathena.org/board/tracker/issue-8507-ninja-merchant/

Fixed an NPC name length. (bugreport:8512)
http://rathena.org/board/tracker/issue-8512-riding-creature-master-shows-warning-in-console/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-18 11:48:43 -05:00
Cydh Ramdh
5a7d4a58e6 Follow up d35ac5a, 18b3e15
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-18 11:58:00 +07:00
Euphy
2ec01da4d6 Added Mail Annex Station scripts to iRO Eden.
Corrected a few lines in KG/OB Gear Enchants. (follow-up 9b5798d)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-15 17:26:58 -05:00
Euphy
9b5798dc39 Implemented Kagerou/Oboro Gear Enchants.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-15 16:25:58 -05:00
Euphy
d569d288bd Added 'strcmp' script command.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-13 19:07:01 -05:00
Euphy
b92b6be5b5 Merge pull request #39 from Rekiem/patch-6
Added Rebellion Machine shops to npc/re/merchants/shops.txt.
2014-01-13 16:02:25 -08:00
Euphy
18b3e15ed6 Merge pull request #38 from Rekiem/patch-5
Update npc/re/renters.txt with Riding Creature duplicates.
2014-01-13 16:01:18 -08:00