363 Commits

Author SHA1 Message Date
Atemo
aed00e0b33 Fix issue #1361
Pintados Festival never ends.
2016-06-13 15:42:14 +02:00
Atemo
a667fc0efb Fixed PLAYTIME issue in guillotine_cross.txt #1346 2016-06-11 01:07:28 +02:00
Jittapan Pluemsumran
b8898cd7f0
Updated Old Glast Heim instance
* Adds official quest entries for the instance.
* Modify behavior of item-giving NPCs.
Fixes #701. Fixes #1343.
Thanks to @exneval, @spinzaku and @tmav94.
2016-06-07 22:59:47 +07:00
Atemo
6485dba326 Updated quest_db.txt for Wolfchev Laboratory.
Corrected syntax in WolfchevLaboratory.txt (dialog never triggered).
2016-05-28 20:44:06 +02:00
aleos89
161a4c01c9 Small adjustments for the instance system
* Follow up to 32c829d.
* Added a missing break on guild type instance creation.
- Thanks to @Canoe!
* Added instance name back to script command instance_enter.
- This will present the proper error message when trying to enter another instance.
2016-05-26 09:06:49 -04:00
Aleos
32c829debe Merge pull request #1264 from rathena/feature/instance_expansion
Expanded the instance system to support new modes
* New modes include: No player attached, single player, and guild.
* Modified the instance_db to allow instance idle time to be adjustable.
* Removed Map1 from the instance_db as the EnterMap is always the same value.
* Adjusted the stored maps of instances to dynamic arrays to conserve memory.
- Max amount of possible maps increased to 255.
* Instances will now be destroyed even if the owner cannot be found.
* Corrected the return value when entering an instance when a character, party, or guild does not have an instance.
* Expanded script command instance_create to take in an owner ID and an optional mode.
* Added a new script command instance_check_guild (works the same as instance_check_party).
* Corrected a few script commands to properly stop the script engine on failures for instance script commands.
* Removed the instance name lookup for when entering an instance as instance_id is now passed.
- Adjusted script command instance_enter to no longer require the instance name.
* Cleaned up script command instance_warpall.
* Adjusted script command instance_announce to check when instance ID is 0 rather than -1 since instance IDs are stored as unsigned now.
* Refactored all instance_id to unsigned short.
* Updated documentation to reflect changes.
2016-05-25 14:55:50 -04:00
Jittapan Pluemsumran
6f0ed156f4
Fixed #1114
Made Rhydo rune undispellable.
Correct variable type in Old Glast Heim script.
Thanks to @nehpetskie
2016-05-25 19:18:07 +07:00
aleos89
c591586f2b Adjusted instance script's instance_enter to new format
* Follow up to c97be60.
* No longer requires instance name.
2016-05-23 14:20:55 -04:00
aleos89
9c89b0e06e Revert "Adjusted instance scripts to new format"
This reverts commit 8f7d2208a972d2bee603364a6069bf1e8127e59d.
2016-05-23 12:56:11 -04:00
aleos89
8f7d2208a9 Adjusted instance scripts to new format
* Follow up to c97be60.
* Adjusted script command instance_create to include owner ID.
2016-05-14 12:01:22 -04:00
Atemo
7d6be7e21e Add F_getpositionname to return the EQI_* name 2016-04-18 15:50:28 +02:00
Atemo
05a1b61bed Correct script part 2016-04-16 16:45:33 +02:00
Lemongrass3110
7046cf8fc5 Fixed two npcs which used hardcoded EQI_ values
Follow up to 2bf64c9
2016-04-16 11:14:36 +02:00
Aleos
59eef4c73b Merge pull request #1092 from secretdataz/patch-1
Added support for Summoner Basic Skill to Kafra (fixes #1117)
* Added two new global NPC functions F_CanOpenStorage and F_CanChangeJob to remove redundancy.
Thanks to @secretdataz!
2016-03-31 09:10:30 -04:00
Atemo
a63604d92a Merge pull request #978 from rathena/command_update
Removed the displayed name in from of the message displayed by npctal…
2016-03-30 00:37:11 +02:00
Jittapan Pluemsumran
bd6539a9ba Follow up to c23688c
Unify all checks into one function.
Suggested by @Cydh.
2016-03-26 10:52:30 +07:00
Atemo
a2941b7c4d Fixed issue #949 (requirement inversion)
and corrected variable typo in alchemist.txt

Signed-off-by: Atemo <capucrath@gmail.com>
2016-03-26 00:53:27 +01:00
Jittapan Pluemsumran
c23688cea4 Clean up basic skill checks 2016-03-23 21:11:57 +07:00
Atemo
15d27a4ad9 Corrected the announce of the party name when entering MalangdoCulvert instance
Updated dialog to offical for Eden 140
2016-03-17 03:38:14 +01:00
AtlantisRO
c5cd672cd8 Fixes to Typo Errors. 2016-03-12 10:41:18 -07:00
Lemongrass3110
614a010f59 Fixed two missing color markers
Fixes #1017
2016-03-06 16:08:43 +01:00
Atemo
7e66be5932 Replace strnpcinfo(1) by the current npc name and fix some mistake
Signed-off-by: Atemo <capucrath@gmail.com>
2016-02-29 19:45:45 +01:00
Atemo
321b1d22e8 Removed the displayed name in from of the message displayed by npctalk and unittalk scripts commands (so we can append whatever we want to).
Signed-off-by: Atemo <capucrath@gmail.com>
2016-02-23 22:12:18 +01:00
Atemo
a27a545332 Fixed dialog 2016-02-23 21:58:30 +01:00
Atemo
cc645c7e00 Fixed issue #966
Thanks @Tokeiburu
2016-02-17 03:14:17 +01:00
Atemo
befc6123be Fixes some bug in npc/cities folder and corrected syntax
Corrected some npc view
2016-02-11 02:06:10 +01:00
aleos89
0a77835029 Unit Controller Updates
* Added missing UMOB_CANMOVETICK option.
* Restructured script command getunittype return values to match the order of script command getmapxy to allow for more universal usage.
* Created constants for script commands getmapxy and getunittype.
* Updated NPCs using script command getmapxy to use the new constant values.
* Updated Battleground NPCs to use constant value for script command setunitdata.
2016-02-04 10:47:16 -05:00
Atemo
6a62aab6d4 Merged Hercules@de7a8c0eaaeeb0994f58c8b419e5d2523c7df5a7, Eden quest were giving wrong equipments.
Merged Hercules@c7c956f71e63c9dd477c59d778c25690c6267b83 and fixed another bug in Collect Poison Spores case
2016-01-12 23:02:08 +01:00
Atemo
56a744014b Fixed some quest log issues.
#871
#872
#873
Fixed #875
2016-01-06 03:42:19 +01:00
Cydh Ramdh
70eb71d0ef Updated idRO cash_trader NPC
* Fixed typo on shop list.
* 'Re-grab' the item list.
* Added 'missing' location.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-12-16 08:40:17 +07:00
Atemo
d6343fba9e Fixed issue #840 2015-12-15 02:19:49 +01:00
Atemo
0af2a80d06 Fixed some typo and change classchange to setnpcdisplay in novice adacemie #800 2015-12-11 00:44:39 +01:00
Atemo
3a45dd97f9 Another clean-up 2015-12-09 23:09:17 +01:00
Cydh Ramdh
f5beee1744 Follow up 36d85277b4f048f8baa57e88e9dc1effd644d993, Thank @dastgir.
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-12-06 12:40:56 +07:00
Cydh Ramdh
36d85277b4 * Cleanup redundant usage of getarg() in scripts
* `npc:enchan_mal.txt`

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-12-06 12:03:12 +07:00
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