324 Commits

Author SHA1 Message Date
Sader Fawall
31bd28df44 hotfix sleep error Geffen Magic Tournament (#2815) 2018-01-18 19:35:36 +01:00
sader fawall
cfb8b42d84 Fix Bifrost Tower (#2644) 2017-11-26 19:02:40 +01:00
Jey
cd08915530 Follow up to ea88ea50546fd140bda875056f83a60b6b0bef96
* Fixes wrong syntax in GeffenMagicTournament due
* Fixes #2598
2017-11-13 09:58:57 +01:00
sader fawall
c6fe9e9cde Update warper NPC (#2542)
* Adds several dungeons and fields
* Adds options for WOE TE Castles and dungeons
* Adds option to disable satan morroc and re-enable old morroc maps
* Adds option to warp only on the first level (of dungeons/fields)
* Adds Lasagna Town
* Adds castles Kafragarten and Gloria
* Adds several instances
* Adds Dimensional Rift and Para Market
2017-11-10 19:42:56 +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
Maz-V
c76f3675a2 Global_Function: Added "F_GetPlatinumSkills" (#2545)
* Added global function F_GetPlatinumSkills.
* Adjusted the Job Master and Platinum Skills NPCs to use this function.
Thanks to @mazvi!
2017-10-30 10:57:57 -04:00
Maz-V
10d405706b Platinum Skill: skill MC_CARTDECORATE (#2521)
* Added MC_CARTDECORATE for Merchant Class
* Added PACKETVER check
Thanks to @mazvi and @anacondaqq!
2017-10-25 10:38:31 -04:00
Maz-V
7991f47a01 Adds jobmaster option disable Baby Novice only (#2514) 2017-10-16 09:54:03 +02:00
Lemongrass3110
b196b46bd5 Follow up to f42c2ff
Fixes some missing randoms

Thanks to @aleos89
2017-10-15 02:19:58 +02:00
Lemongrass3110
f42c2ff211 Moved some remaining constants into src (#2501)
* Moved all npc view constants into src

Source side the constants will use Gravity's naming standard(JT_*)
NPC side still supports the old names without JT_

* Moved all effect constants into src

Added check for effect validation to atcommand effect and all script commands using them
Removed the unused and broken function unit_changeviewsize from unit.c
Replaced a lot of hardcoded effect ids with their respective constants
Cleaned up the effect documentations

* Moved all hat effect constants into src

Added check for effect validation to script command hateffect
2017-10-14 18:13:51 +02:00
Jeybla
2676d05394 Jobmaster update (#2369)
* Major changes due to readability and some corrections
* Adds the option to disable Rebirth Classes
* Adds the possibility to give players job related 
  Equipment (mostly weapons) on job change
* Adds more level requirement settings
* Adds BabyExpanded and BabySummoner Jobs
* Thanks to @Braniff, @mazvi, @Mikegyver, @Lemongrass3110, @Akkarinage, @Stolao and @secretdataz!
2017-10-06 17:40:39 +02:00
Aleos
4539d557e2 Added script command sc_end_class (#2368)
* Added a new script command sc_end_class to remove status changes from any learned skills.
* Adjusted the custom Reset NPC to make use of this behavior.
Thanks to @sader1992!

* Follow up to f93680b
* Adjusted documentation.

* Follow up to f93680b
* Removed the check from script command resetskill.
* Added a new script command sc_end_class.

* Fixed a compile error
* Corrected the define of the script command.
* Adjusted some documentation.
* Reverted some formatting from the original commit.
Thanks to @sader1992 and @Lemongrass3110!
2017-08-25 13:26:22 -04:00
Atemo
9d6b3d06a9 Fixed readparam when 2nd parameter is a variable
Related issue #2276
2017-08-04 15:45:57 +02:00
Atemo
809754379b Added 'warp2' NPC
Unlike 'warp', 'warp2' NPC will also be triggered by hidden player.
Thanks @secretdataz and @Lemongrass3110 !

* Replace script using OnTouch:([\r\n\t]+)warp by warp2

* Removed sprite id from warp duplicates in Bangungot instance

* Fixed a bug where warp/warp2 parsing is too greedy
2017-05-09 23:45:34 +02:00
Atemo
73b798bf12 Removed extra semi-colon 2017-04-06 14:40:36 +02:00
Atemo
0b5687db13 Fixed a typo in GeffenMagicTournament.txt issue #2002
Thanks to @srhmike
2017-03-27 18:35:42 +02:00
aleos
0c20c596e0 Expanded script command setbattleflag
* Fixes #1945.
* Adds an optional flag to reload the monster database for specific map flags that are EXP/drop related.
* This resolves having to add atcommand reloadmobdb after setting the battle configs.
* Adjusted atcommand setbattleflag to also have the optional parameter.
* The reload should only have to be called on the final setbattleflag use.
2017-02-11 20:55:35 -05:00
Atemo
c6470ff4ff Clean-up permanent monster spawn: (#1831)
* Clean-up permanent monster spawn:
- <delay1>,<delay2>,<event> are actually optionnal field
- <event> value 0 and 1 are meaningless (actually event name with length < 4 are skipped)

* Exported monster AI constants

* Updated docs for monster size constants (already exported)
Notes:
- the default size for monster script cmd was small not medium
- monster script cmd now display a warning for size above SZ_BIG (previously SZ_ALL)

* - Fixed an issue to make <xs> and <ys> optionnals
- Updated npcs scripts

* Leftover in the docs for permanent monster spawn

* Corrected english docs. Credit to @aleos89
Added additionnal warning for xs / ys negative input. Credit @Lemongrass3110 

Thanks to @cydh for the idea
2017-01-22 19:03:08 +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
Locien
be1c0ee1e6 Geffen Magic Tournament instance - Semi-official implementation
Big thanks to @RagnarokNova for creating this script with the help of
@tokeiburu, Diablo and others. I simply converted it to be compliant
with rAthena master standard. Hope you guys enjoy it and report any bugs
:)

To clarify on the semi-official part: This script was made from scratch
by playing on iRO and may have inconsistencies with the official
version. If you want to use this on your server you must enable it
yourself by uncommenting the entry in scripts_athena.conf.
2016-12-30 18:45:49 +01:00
Cydh Ramdh
342443bf61 Added new mapflag hidemobhpbar (#1537)
* Added new mapflag `hidemobhpbar` to hides monster's HP bar on a map.
* Added maps for this mapflag, credits to @Atemo and @Lemongrass3110 

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-12-04 10:52:14 +07: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
aleos89
481a730ebc Adjusted some script syntax
* Follow up to d017e24.
Thanks to @Tokeiburu!
2016-10-28 17:33:30 -04:00
Atemo
2387316294 Merge pull request #1499 from Jeybla/GodlikeMixerUpdate
Updated Custom Godlike Mixing NPC
2016-08-17 05:19:52 +02:00
Jey
14654b8916 Custom GL Mixer: Adds Muspellium and Essence of Rune 2016-08-17 05:09:52 +02:00
Jey
5353c44dd7 Removed 20x Oridecon from Sleipnir 2016-08-17 04:58:26 +02:00
Jey
5d5287126a Updated Custom Godlike Mixing NPC 2016-08-15 21:48:19 +02:00
Lemongrass3110
a87d86cb11 Fixed getinventorylist documentation
Fixes #1497.
Thanks to @Darkelfen for reporting it.

Additionally exported the EQP_* constants into the script engine.
Replaced some hardcoded equip positions with their respective constants.
2016-08-14 00:26:22 +02:00
Lemongrass3110
d017e24cd2 Adjusted some scripts to the new syntax
Follow up to fd48238
Thanks to @Everade and @Jeybla for reporting this problem in #1468
2016-08-05 00:28:23 +02:00
Lemongrass3110
b6adc1d4ff Replaced specialeffect2 calls without constants 2016-07-29 19:34:30 +02: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
Atemo
14d93ff996 Fixed a mistake with dispbottom in hunting_missions.txt 2016-06-18 17:15:25 +02:00
Atemo
6546566a4a Fix a typo in hunting_missions.txt follow up 673a93c5e4fbf081d276ca2a76090dcebd779325 2016-06-17 18:46:26 +02:00
Atemo
673a93c5e4 Fix issue #1225
If party enable warning / debug and error show up.
2016-06-17 15:34:46 +02:00
Stolao
a0dd3a175a Changed revision numbering 2016-05-24 07:46:23 -07:00
Stolao
65419729f9 updated resetnpc 2016-05-23 05:10:34 -07: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
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
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
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
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
aleos89
0696125b82 Script Engine Upgrade
* Upgraded the script engine variables to no longer be limited.
* Increased array limit from 127 to 2 billion.
* Improvement in overall speed and storage size.
* All variable types now support arrays.
- Merge from HerculesWS/Hercules@82b583b. Thanks to those who worked on it.
2015-06-11 10:44:13 -04:00
aleos89
730311e009 Script Command Adjustments and Additions
* Fixes #158 - Implemented 'getvar' script command to avoid blindly attaching players and messing up their NPC progress.
* Fixes #449 - Fixed 'unitskilluseid' and 'unitskillusepos' not casting skills that require stat info when the NPC's status wasn't loaded.
* Implemented 'getunittype' script command to return the object type of the given GID.
* Adjusted 'unitwalk' to support an Event Label which is executed when the object reaches the target.
* Added 'unitwalkto' when giving a target GID rather than coordinates. Also supports Event Labels.
- Thanks to @cydh.
2015-06-09 11:10:05 -04:00
Radian
d93fdb5bec Fixed Warp
Fixed Warp coordinates on rachel sanctuary level 3.
2015-02-23 13:39:45 -08:00
aleos89
d3625e5c10 Cleaned up merge issues. 2015-02-21 15:43:58 -05: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