562 Commits

Author SHA1 Message Date
Cydh Ramdh
6ad4ed13d1 * Added script command showscript "<message>"{,<GID>}; by using clif_showscript.
* Removed hardcoded message that displayed clif_showscript for `transform` script, replaced its usage for item script by using `showscript`.
* Changed unittalk usage on `F_Cat_Hard_Biscuit` and `F_Rice_Weevil_Bug` function in quests_malangdo.txt.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-06-19 00:37:48 +07:00
Atemo
36f337ea41 Corrected :
-	variable typo in quests_nameless.txt
-	Suspicious Man#1 NPC localization and Xtrigger/Ytrigger in quests_nameless.txt
-	redundant message in eden_quests.txt

Merged :
-	warp eclage Hercules 64dfaf2c8c8be7ff288ea88a64eddfeae1e364a4
-	Deadman NPC localization in quest_disguiseloliruri.txt Hercules 450b0a3aeb6b472805c470712a0e6ebd9d04eb2a
-	NPC name in eclage Hercules 87beda59c824e9be6db6f86c02983ed2a44c4016 and daf5312ee4d1de6dd43b23f719e94427aeb33e5d

Signed-off-by: Atemo <capucrath@gmail.com>
2015-06-06 20:36:02 +02:00
Capuche
dd3e7e1710 Corrected typo in adven_boards.txt thanks grammatic@aleos89
Update lvl4_weapon_quest.txt, Hercules 169b3faae19e23a303a094fe26e181a8c1b1c6c7
Fix delitem bug in Ep13.1 quest. Hercules 9d1853aebd3ff34ed7869a3b1188943624078b8e
Corrected Tree Roots Location Hercules ca9cd51e683d39c8a7f099a46747ff166d632230

Signed-off-by: Capuche <capucrath@gmail.com>
2015-04-06 23:24:12 +02:00
nanakiwurtz
2fec0a881a Reverted npc/re/guides_alberta.txt to original state 2015-04-07 00:32:21 +07:00
nanakiwurtz
5eede89b49 Minor Typo 2015-04-07 00:26:21 +07:00
nanakiwurtz
36462526a9 Eden Mace and Eden Staff swapped
* Thanks to @Desground

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-04-04 09:53:39 +07:00
Atemo
a2a4d62434 Merge pull request #354 from musashi076/patch-1
Corrected Tiucknuc mob name into Tiyanak in /npc/re/quest/quest_malaya.txt
2015-03-30 17:27:45 +02:00
Capuche
1e8aa4bdc4 Added adven_boards.txt dungeon signposts
Signed-off-by: Capuche <capucrath@gmail.com>
2015-03-28 00:31:36 +01:00
nanakiwurtz
5ce3c68393 Champion Mobs natural spawn area added
* Follow up to fffb0adc66

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-03-22 03:41:20 +07:00
musashi076
82767650d1 Corrected Tiucknuc mob name into Tiyanak
To avoid confusion in Tiyanak Mob Hunt.
2015-03-20 13:41:52 +08:00
aleos89
d3625e5c10 Cleaned up merge issues. 2015-02-21 15:43:58 -05:00
Capuche
001e6967d4 Fixed some variables issues and cleaned Instructor Boya and Michael
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-19 01:09:30 +01:00
Capuche
6552a184f6 Follow up 7e997bf267e937d314ec594650284fa7f82358cd fixed a mistake 2015-02-16 18:59:00 +01:00
Capuche
7e997bf267 Updated Blacksmith Thorn and Weapons Expert NPC
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-16 01:31:18 +01:00
Cydh Ramdh
9d3d34205f Skill DB clean ups
* Changed skill_db array to better memory allocation.
* Reduced MAX_SKILL_LEVEL from 100 to 10 (part of Hercules 0f4a50d135), also has changes on skill_get checks for skill level that more than 10.
* Reduced MAX_SKILL from 5020 to 1200 (actually only 1109 skills are used).
* Added macros for checking Homunculus, Guild, Mercenary, & Elemental skill ranges.
* Added skill check & index validation when player logged in and when @reloadskilldb.
* Corrected `enum e_skill_flag` order for SKILL_FLAG_REPLACED_LV_0's sake.
* Merged 'addtoskill' script command just as alias of 'skill' script command.
* Fixed #277
* Changed 'skill' script command flag to constant value

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>

NOTE:
* Decreased memory usage by map-server reduced up to 50 MB.
* Decreased memory for each player because of mmo_charstatus::skill[] only has 1200 array, before is 5020.
* Please use skill_get_index() for accessing sd->status.skill[] or skill_db[], don't reckless use skill_id as array index.
* Please import upgrade_20150211_skillset.sql

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-12 15:50:50 +07:00
Capuche
90d9da18e1 Updated instructor Ur's quests
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-08 00:57:01 +01:00
Capuche
0bebbe6c05 Typo in lv4_weapon_quest (Hercules 3d47fdff7ddae8e5f028425c653dccc4ecfcfed5)
Fixes Biolab Enchant (Hercules 265ec7e012d3414e5fc4b3360c0795b4697663f6)
Fixed Eclage Quests (Hercules 1b0eacd770b128b02d3300b7efe05da136bbed3d and 7d93099232dcf3c74349a99d9fa891927f2351d6)
2015-02-08 00:14:26 +01:00
Lemongrass3110
bffabe9c75 3rd Job Quest compatibility fix
The job quests now (all) support servers where the 2nd classes can be over baselevel 99.
Most of them were correct anyway, because they check for BaseLevel > 98 and JobLevel > 49.
2015-01-25 23:04:25 +01:00
Capuche
b72162f095 Follow up f2621eec605fee7135e424dd3d466635988b2600
Signed-off-by: Capuche <capucrath@gmail.com>
2015-01-20 15:37:25 +01:00
Emistry
e134c76859 Issue #232
https://github.com/rathena/rathena/issues/232

Just like @Cydh said:
somehow, += for a string in iteration is fail. /hmm
temp fix is .@foo$ = .@foo$+"bar";
2015-01-17 15:14:28 +08:00
Cydh Ramdh
c7dcca3b6e Follow up 48d8389d27af8400e1048d2c626e259686357865
* No UTF-8 BOM for npc/re/quests/quests_eclage.txt

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-16 12:49:52 +07:00
Euphy
df6fb01739 Small fixes in Eclage scripts and code style changes.
- Fixed some minor bugs.
- Added GM NPC function.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2015-01-15 13:01:12 -05:00
Capuche
89d436f53f Follow up 48d8389d27af8400e1048d2c626e259686357865 2015-01-15 15:00:59 +01:00
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