678 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
Atemo
e6f3bf2035 Added some mapflag and removed phen card & co. since map_flag_gvg already block bNoCastCancel in unit.c (and the other effect of the items sholdn't be removed) 2016-04-04 20:58:08 +02:00
Atemo
3a558ff83b Rename canParticipateSiegeTE into getpermissionwoete 2016-04-04 20:35:58 +02:00
Atemo
b3d150c3a5 Merge branch 'master' into woe_te-restrictions 2016-04-04 20:22:25 +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
Atemo
bb66035048 Removed duplicate of canParticipateSiegeTE
Added some mapflag
Corrected typo in god quest
2016-03-12 16:27:47 +01:00
Lemongrass3110
614a010f59 Fixed two missing color markers
Fixes #1017
2016-03-06 16:08:43 +01:00
Atemo
38aaba07ca Corrected typo
Thanks @aleos89
2016-03-01 01:56:57 +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
Cydh Ramdh
ccf52095a3 Follow up 26dcf345fe753dc43568bb118b6a22e2c93bc7bc
* Added necessary mapflags.
* Corrected documentation.
* Fixed some typos.
* Thanks to @Atemo

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-02-28 18:17:49 +07:00
Atemo
c094314b66 Merge branch 'woe_te' into woe_te-restrictions
Signed-off-by: Atemo <capucrath@gmail.com>
2016-02-24 16:44:36 +01:00
Atemo
883b5cc919 Little update 2016-02-24 04:45:47 +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
Cydh Ramdh
26dcf345fe Added WOE:TE Restrictions
* Added mapflag `gvg_te`, `gvg_te_castle`, this is will be activated during WOE:TE sessions. These changes are needed because of:
  * If `gvgon` is used, TE castles become `gvg`, it makes the restriction failure. Items that are supposed to only can be used/equipped in TE Castles, also affected in 'normal' GVG/WOE maps.
  * These flags used form `item_noequip`, `skill_nocast`, and `status_disabled` flag 16. (If just assume TE Castles are Restricted Zone 8, the failure will occurs as point 1 above).
* Added Restricted Zone 8 for TE Guild Dungeons, to prevent marriage skills can be casted there.
* Added command `gvgon3` to set GVG for WOE:TE Castles.
* Added command `canParticipateSiegeTE` is 'hardcoded' function to check player's job that can participate in WOE:TE.
  * Current usages in `GD_EMERGENCYCALL` and replace the in-script function.
* Changed default config `allow_consume_restricted_item` to 'no'. All restricted usable/consumable/healing items are always failed to be used.
* Changed the GVG items/skills restriction check. "Item cannot be equipped in GVG maps" are supposed to ignore the agit flag statuses, as long as the map is GVG flagged, items/skills are always restricted and otherwise.
* Moved previous entries of `skill_nocast` flag 16 as hardcode (for now).

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-02-20 09:33:07 +07: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
Atemo
adc8c46b4f Follow up de44eb1938f5d469b3c4ab500e4e3abf611dcd33 2016-02-05 15:52:04 +01:00
Atemo
9373c697b5 Added some source part. Thanks @aleos89 / @Cydh
Some debug thanks @Cydh
2016-02-05 15:48:26 +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
de44eb1938 Added God items script TE Hervor and Jormungand.
Todo:
    Review the unittalk part (only the message should be displayed)
      - unittalk display the npc hidden name
      - npctalk display the visible name and don't have parameter to call another npc
2016-02-04 03:27:05 +01:00
Atemo
eec366f3ad Clean a redundant/ugly part 2016-02-03 02:48:43 +01:00
Atemo
14f09ca2bb Added unversioned files 2016-02-01 20:47:29 +01:00
Atemo
06db9fe81f TODO:
Check for maprespawnguildid parameter value (should remove monster?) Manager_TE npc in main_TE.txt
	Change in the folder:
		agitcheck -> agitcheck3
		OnAgitStart -> OnAgitStart3
		OnAgitInit -> OnAgitInit3
		OnAgitEnd -> OnAgitEnd3
	Add:
		OnAgitStart3
		OnAgitInit3
		OnAgitEnd3
		mob into mob_db.txt
		item_db restricted
	Convert:
		CheckSiegeTime 3 -> agitcheck3
		OpenHour_SiegeMode 3 3600 (seems to return 1 if woe start in less than 3600 secs)
		IsAllianceGuild
		ResetBuffLowLevelSiege
	Maybe move:
		te_merchant in merchant folder
		CanEnterwoeTE function into global function
	Search:
		hour start/end woe TE
		CanParticipatewoeTE function should include rebellion?
2016-02-01 20:44:16 +01: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