648 Commits

Author SHA1 Message Date
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
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