678 Commits

Author SHA1 Message Date
Atemo
1f47604f57 Fixed issue #800 2015-12-02 21:31:11 +01:00
Atemo
24ecdadf48 Merge branch 'master' into academie 2015-12-02 00:40:42 +01:00
Atemo
5695dc57e2 Update & fix.
- Updated script_commands.txt
- Fixed typo in bio4_reward.txt
- Fixed getexp command giving 1 exp with 0 value
2015-11-29 16:57:04 +01:00
Atemo
c3125026d2 Merge branch 'master' into academie 2015-11-29 16:03:09 +01:00
Lemongrass3110
1f26ad5599 Follow up to 644341a
NPC is now getting loaded on renewal.
2015-11-29 12:37:47 +01:00
Lemongrass3110
644341a0d1 Merge pull request #775 from rathena/Bio4Reward
Moved the NPCs from WolfchevLaboratory.txt (Issue #774)
2015-11-29 12:35:02 +01:00
Atemo
c3e56b9c1b Update 2015-11-26 23:11:22 +01:00
Atemo
d46cf4b35e Corrected Tutorial Instructor dialog 2015-11-24 19:34:08 +01:00
Atemo
88e522060a Moved the NPCs from WolfchevLaboratory.txt (Issue #774) 2015-11-24 17:12:25 +01:00
Atemo
cc8edaaac6 Merged novice academie from Hercules 21564acf13
-> All Credit to Kisuka for this big work.

Added news commands to alter questinfo conditions :
- setquestinfo_level : Add level range criteria for quest info with quest id 'quest_id'.
- setquestinfo_req : Add quest requirement for quest info with quest id 'quest_id'.
   -> Player have / doesn't have the required quest.
- setquestinfo_job : To add additionnal job criteria.
-> Credit to Cydh !
2015-11-16 00:34:00 +01:00
Atemo
63b076ef96 Fixed issue #614 blame 1f147f207d0f323cd6dcfe6f8fc36ea99fdd5fa7
Fixed typo in re/mobs/academy
2015-09-02 22:34:49 +02:00
Cydh Ramdh
006f6d46de * Follow up b4bdaebeebafcdb5a9d79cfff40dd93ce9be6a09, duplicate names.
* Added idRO Cashshop special sale.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-08-24 20:51:09 +07:00
Atemo
219a047ea7 Fixed issue #570:
- Sorcerer#Bio4Reward should check Top gear since the only enchantable Headgear (Ancient Gold Ornament) is top
2015-08-11 22:17:34 +02:00
Atemo
7e275b7652 Fixed in kagerou_oboro.txt, the .@val should be reset at the beginning of the loop.
Thanks @cydh
2015-08-05 22:34:17 +02:00
Atemo
031c522c8a - Fixed F_CashSiegeTele typo in item_db.
- Moved VIP_Third_Class function from other/CashShop_Functions into other/re/CashShop_Functions (only used in re folder).
- Fixed a mistake in quests/quests_nameless.txt blame me  36f337ea41a876ef471bfbb78128e35fa0d9aa56
- re/quest/quests_eclage clean-up and bug fix

Signed-off-by: Atemo <capucrath@gmail.com>
2015-08-04 15:16:56 +02:00
Cydh Ramdh
c005ebc3ff Misc update: Added (idRO) Cash Trader location at Pharos Beacon.
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-07-27 20:25:12 +07:00
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