198 Commits

Author SHA1 Message Date
Lemongrass3110
16780638be
Fixed a few name typos with Niflheim (#2782)
Thanks to @Daegaladh for his input
2018-01-09 23:36:20 +01:00
Atemo
0360137abe
Initial release of Phantasmagorika Quests (Walkthrough conversion). (#2215)
Initial release of Phantasmagorika Quests containing

* Phantasmagorika Quests ep 15.1 and 15.2
* Central Lab instance
* The Last Room instance
* News monsters around verus (credits divine-pride.net)

Thanks to @rofasindo @Valorro @jenkijo @ecdarreola @Jeybla !
Special thanks to Divine Pride !
2018-01-06 21:18:02 +01:00
Jittapan Pluemsumran
c04c2e7ef1 Updated Old Glast Heim instance (#1554)
** Updated Old Glast Heim instance
* Changed hardcoded sprite ID for NPCs in Old Glast Heim to constant
* Cleaned up Old Glast Heim NPC dialogues

* Merged OGH merchants from idathena (credits @exneval)

* Updated Old Glast Heim mobs
* Updated stats and skills for all Old Glast Heim mobs.

* Added Modified Boots (Temporal Boots for Oboro/Kagerou, Rebellion) entries.
* Added Gigant Snake Skin + Modified Boots item combo

Thanks to @secretdataz @aleos89 @srhmike @ecdarreola Heris, @zackdreaver @exneval and the reviewers
Special thanks to Divine-Pride.net!
2018-01-05 16:38:38 +01:00
Atemo
ead1ed9100 Fixed typo in Weapons Expert BK (issue #2619) follow up 08338e0a64 (diff-2b9b79c7ee5796ba7f5073001e69aa06)
Thanks to @mazvi !
2017-11-21 14:40:08 +01:00
Atemo
ea88ea5054
Emoticons constant name (#2527)
This PR change the emoticons constant name to match emoticonlist from client side.
Note: the previous emoticons names are now deprecated.

Additionnally emotion and unitemote scripts commands are being merged together to the new format
-> emotion <emotion number>{,<target>};
Where target use the target Game ID (GID) of the unit (npc, pet, character etc..).

* unitemote is now deprecated.
* Additionnally fixed incorrect variable in quests_brasilis.txt

Thanks to @aleos89 and @Lemongrass3110 !
2017-11-10 18:35:21 +01:00
keitenai
fcc4936b23 Fixed script dialogue's NPC name to its proper order. (#2320)
Fixed script dialogue's NPC name to its proper order.

Credit @keitenai
2017-08-13 14:35:51 +02:00
Atemo
115c1b9f5f Fixed a typo in quests_eclage.txt issue #2311 2017-08-05 13:42:39 +02:00
Lemongrass3110
d0ca637ddd Fixed vip_status command (#2184)
Fixed different return types for the same function call
Also introduced constants for better function usage.

Fixes #2183
Thanks to @anacondaqq
2017-06-20 19:22:46 +02:00
Atemo
73b798bf12 Removed extra semi-colon 2017-04-06 14:40:36 +02:00
Atemo
08338e0a64 Summoner Eden Group Equip Quest Implementation
Edit from PR https://github.com/rathena/rathena/pull/1152
Credit @MysticFurur0RE
2017-03-22 21:43:08 +01:00
Atemo
17a273864a Added missing quest ID in quest_db.txt (issue #2012)
Partial fix of issue #2002, Incorrect use of 'close' command in quests_eclage.txt
2017-03-20 15:30:46 +01:00
Atemo
4270ef876d Fixed #1981 Clearchus Mercenary Npc
- Delete / give the quest when the time limit has been reached
2017-02-24 12:42:09 +01:00
Atemo
7e2dedc828 Corrected areamonster from aegis conversion 2017-01-25 20:04:41 +01:00
Lemongrass3110
2043c95e66 Refactored hardcoded npc event names (#1767)
While refactoring those events the following other changes were made:

Introducing OnInstanceDestroy event. This event can be used to hook script code right in front of the instance destruction. This can be useful if you have any stored references to an instance id for example.

The script command cmdothernpc will now check if the target event exists and report failures. Therefore it now returns true or false.

All agit(FE,SE,TE) start and end commands from atcommand and script commands have been merged in their respective guild function which now returns a bool value of true for successful actions and false if it did not succeed(if the specific WoE was [not] running).

All global triggered events with mapserver status output now call the same function and therefore have the same mapserver output(including their respective event name of course).

Renamed a few events in the script configuration to match the other names

Added constants for months and weekdays

Additionally added constants for gettime types to make it easier to read.

Replaced all existing usages I found with their proper new syntax or better fitting functions.
2017-01-10 22:58:04 +01:00
Lemongrass3110
9040613fa6 Added missing empty newlines to a lot of files 2016-11-23 13:54:45 +01:00
Lemongrass3110
9b1b7b1a2b Replaced hardcoded genders with constants (#1730)
* Replaced hardcoded gender codes in source

Introduced a new constant for the account based gender and replaced all hardcoded gender references to code 99 with it.

* Replaced hardcoded gender codes in npcs

Exported the gender constants into the script engine and replaced all usages with references to the constants instead of expecting a value behind them.

* Corrected a typo

Thanks to Machiezmo from Discord.

* Fixed an inverted gender logic

Thanks to @secretdataz
2016-11-22 21:20:03 +01:00
Lemongrass3110
644e294699 Merge branch 'master' into woe_te-restrictions
# Conflicts:
#	npc/re/mapflag/nobranch.txt
#	npc/re/mapflag/nomemo.txt
#	npc/re/mapflag/noteleport.txt
#	npc/re/scripts_athena.conf
#	src/map/atcommand.c
#	src/map/map.h
#	src/map/script.c
#	src/map/script_constants.h
2016-09-29 08:13:31 +02:00
Cydh Ramdh
7d72a70c5c Follow up 61a57668ed30b30b2eb43798e97d5f82e3610cde
* Missing semicolon

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-09-15 09:38:19 +07:00
Lemongrass3110
61a57668ed Nightmare Glastheim (#1541)
Originally released by @Ridley8819 on HerculesWS/Hercules@114767c

Additions:
Added drops for Baphomet and Chimera
Removed duplicated champion monsters

@aleos89 cleaned up NPC dialogue and some of the grammar.
2016-09-14 08:19:14 +02:00
Jittapan Pluemsumran
8d60ed2205
Adjusted Nightmare Clock Tower warper to use scope variable instead of temporary char variable 2016-09-09 08:46:31 +07:00
Jittapan Pluemsumran
d074cf67a7
Revert "Corrected Mora Daily Quest Job EXP formula"
This reverts commit 3607efd5c692faa783e85cc56aa69b3a209da7d9.
2016-09-08 13:18:52 +07:00
Atemo
d62f422e3d Corrected OnTouch/OnTouch_ in NPC script (#1548)
Some leftover from aegis convertion..

Skipped pre-re folder, I don't have old data.
2016-09-07 21:35:14 +02:00
Lemongrass3110
a7be32f754 Nightmare clocktower (#1518)
* Nightmare clocktower

This is a merge from HerculesWS/Hercules@88c5a47 originally done by @Ridley8819.
All the credits belong to him.

@aleos89 cleaned up some of the grammar and removed duplicate texts.
@secretdataz added the missing mapflags.
@Atemo adjusted Cursed Book item script
2016-09-04 22:41:47 +02:00
Jittapan Pluemsumran
fb85ce207d
Fixed a bug in Theore's Request quest that allows the player to bypass some steps.
Closes #1533. Thanks to @Indigo000
2016-09-03 22:35:58 +07:00
Jittapan Pluemsumran
3607efd5c6
Corrected Mora Daily Quest Job EXP formula 2016-09-03 15:18:17 +07:00
Atemo
2995ba0908 Mapflag:
- added monster_noteleport in TE castle (need official info)
Missions:
- corrected playtime check value
God quest TE:
- Changed $@2012_tegod_kafra -> $2012_tegod_kafra ; $@2012_tegod_gloria -> $2012_tegod_gloria as it should be
- Corrected lowest economy set to 1
- Minor debug and standardise script
WOE main script:
- Added a condition for mobs spawn (case guildbreak)
2016-09-02 01:36:16 +02:00
Atemo
58c0920e5d Applied new npctalk syntax to the existing scripts 2016-08-31 19:12:12 +02:00
Atemo
55b30623fc Fix a small typo 2016-08-31 19:02:09 +02:00
Cydh Ramdh
0df1ba0a20 TE Updates
* Implemented `job_noenter_map.txt` for TE maps.
* Added job list that cannot enter TE Castles and Guild Dungeons.
* Replaced `getpermissionwoete` with `jobcanentermap`.
* Added missing quest `7516`.
* Fixed typo in TE Mission NPC.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-08-31 14:42:49 +07:00
Cydh Ramdh
fa16e30593 TE updates:
* Change God Item final broadcast from `mapannounce` to `announce`.
* Fixed variable typo in `#tequest_master_prt01` NPC. `$@2012_tegod_kafra` to `$@2012_tegod_gloria`
* Missing `OnMyMobDead` label in `#tequest_master_prt01` NPC.
* Corrected the castle Economy and Defense lowest level is 1, not 0.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-08-30 19:36:13 +07:00
Cydh Ramdh
8805e7e1d8 Merge branch 'master' into woe_te-restrictions 2016-08-27 07:04:41 +07:00
Jittapan Pluemsumran
2f9d44c3b1
Changed Job_SuperNovice to Job_Super_Novice in scripts to match source-side constant. 2016-07-08 14:32:10 +07:00
Atemo
85f44a587d Removed useless lines 2016-06-22 15:50:40 +02:00
AtlantisRO
cfe7e3efc6 Added use of F_HasEdenGroupMark function. 2016-06-21 03:44:31 -06:00
AtlantisRO
3a526c7ca0 Added support to Para_Team_Mark_ in Eden Group. 2016-06-20 21:28:20 -06:00
Atemo
aed00e0b33 Fix issue #1361
Pintados Festival never ends.
2016-06-13 15:42:14 +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
Jittapan Pluemsumran
bd6539a9ba Follow up to c23688c
Unify all checks into one function.
Suggested by @Cydh.
2016-03-26 10:52:30 +07: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
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
db53e580af Typo update 2016-02-29 20:06:24 +01:00
Atemo
883b5cc919 Little update 2016-02-24 04:45:47 +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
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
d6343fba9e Fixed issue #840 2015-12-15 02:19:49 +01:00