377 Commits

Author SHA1 Message Date
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
Emistry
9fa7a5fd50 Issue #283
Enable same items to be added to different category.
2015-02-12 08:59:16 +08:00
Radian
dba0ab07f1 Custom Job Master Fixed
Thanks @Cydh !
2015-02-03 15:24:17 -08:00
Peter Derouen
01baeec58c Rename THQS_ChatingNPC.txt to THQS_ChattingNPC.txt
Typo.
2014-12-02 18:33:25 -08:00
Emistry
69f08f7028 Wrong info in NPC message. 2014-11-22 01:04:02 +08:00
Euphy
9cf01b2812 Misc fixes.
- Updated turn-in requirements for Tripatriate Union's Feud. (incl. bugreport:9339)
http://rathena.org/board/tracker/issue-9339-the-tripartite-unions-feud/
- Moved "Voyage log" NPC coordinates. (bugreport:9225)
http://rathena.org/board/tracker/issue-9225-turtle-island-quest-voyage-log/
- Updated "Immuned Shield" (2168) item script. (bugreport:9319)
http://rathena.org/board/tracker/issue-9319-immuned-shield-is-using-the-pre-renewal-effect/
- Added Wolfchev's Laboratory warp to custom warper.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-10-29 12:01:00 -04:00
Euphy
3c24f458ce Hunting Missions script update.
- Added check for deleted characters. (credits: @AnnieRuru)
- Modernized script syntax and improved readability.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-09-01 13:33:39 -04:00
Euphy
30b4d578a7 Some script cleaning.
- Replaced lots of numerics with constants.
- Added spacing to make some scripts more readable.

Fixed a mistake in 14fddd3.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-23 15:17:59 -04:00
Euphy
3b2762ca3c Enable NPC logging through 'logmes' by default.
- Commented some unnecessary log messages.

Bug fixes:
- M_DOPPELGANGER had too much HP. (Hercules 9cd3ec0)
- Huuma_Swirling_Petal should not have an element. (bugreport:9073)
http://rathena.org/board/tracker/issue-9073-huuma-swirling-petal/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-22 16:06:32 -04:00
Euphy
14fddd3790 Added script checks against swapping items using third-party hacks.
- Follow-up to 416f6d7, as further protection against item exploits.

Contains a few other fixes.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-22 15:36:23 -04:00
Capuche
0cdc85cd4d Quick fix in cluckers.txt
The players could talk to clucker without dying.

Signed-off-by: Capuche <capucrath@gmail.com>
2014-07-17 21:52:00 +02:00
Euphy
5e261ba415 Minor cleanup of riding script commands.
- The 'checkriding()' function no longer checks for wargs and dragons, ONLY Pecos, Grand Pecos, and Gryphons (as documented). (bugreport:9024)
http://rathena.org/board/tracker/issue-9024-about-renters-from-rathenanpcremerchants/
- Replaced 'checkoption()' warg checks with 'checkwug()'.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-06-10 22:58:09 -04:00
Capuche
45a7abcf4e - Updated docs about strmobinfo.
- Fixed an exploit in jobmaster.txt
2014-05-30 20:46:23 +02:00
Euphy
de46393592 Improved 'client_hash_check' config. (Hercules e4a1ca2)
- Added option to disable hash check by GM group_id (specify 'disabled' as hash for a certain group_id to let them log in with any client, even if 'client_hash_check' is enabled.
- Updated and reworded related documentation for the feature.

Improvements on script command 'axtoi'; added 'strtol'. (Hercules 1cf7c1e)
- Added script command 'strtol' (conforming to the ISO C90 function).
- Modified script command 'axtoi' to internally use 'strtol' instead of an unnecessary separate implementation.

Cleaned up many sections of script documentation, and modernized syntax in examples.
Added documentation for 'rentitem2' and 'makeitem2'. (follow-up 339c0a8)

Added 'true' (1) and 'false' (2) as script constants.

'freeloop' argument is now optional, and will only return the value of freeloop if no argument is given. (tid:92470)
http://rathena.org/board/topic/92470-freeloop-optional-argument/

Added a missing mapflag to custom 'devil_square' script. (bugreport:8611)
http://rathena.org/board/tracker/issue-8611-devil-square-bug/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-08 15:32:28 -05:00
Euphy
0724d1ebab Minor updates.
* Added Cryptura Academy monster spawns, commented until the scripts are implemented. Does not include monsters from job quests.
* Fixed two label errors in Wizard job quest. (bugreport:8590)
http://rathena.org/board/tracker/issue-8590-wizard-job-quest-label-error/
* Updated AUTHORS file. (credits to AnnieRuru and Keyworld for providing some missing names)
* Uncommented a mapflag in custom 'mvp_ladder' script. (credits: AnnieRuru)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-04 21:35:36 -05:00
Euphy
163a98cbc4 Major custom folder update!
These scripts have been chosen for being unique and useful, yet structurally simple. In this way, they can serve as usable reference material for future user scripts.

Contents:
* Battleground: bg_emp (Emperium breaker), bg_pvp (PVP match)
* Event: mvp_ladder (kill every MVP to win), devil_square (3-round monster summoning event)
* Utility: card_seller (sells all monster cards), mvp_room (private MVP summoning room), autopot (automatically use potions when hit)
Credits to AnnieRuru for offering up her scripts and modifying them for use.

Other changes:
* Moved previous custom battleground scripts into 'battleground/unofficial/'.
* Moved custom holiday event scripts into 'event/holiday/'.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-02 17:35:28 -05:00
Euphy
90b187ff3e Changed all "Compatible With" fields to "rAthena Project".
Edited a handful separately, as appropriate.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-12 16:24:38 -05:00
Euphy
645e110a77 A few follow-ups.
- Follow-up to pull request #36: some cleanup of the file.
- Follow-up to 3f8dd48: updated Pre-Renewal file.

Added Rebellion class to custom Job Master script. (credits: Elias)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-12 15:24:22 -05:00
Euphy
834f3baa05 Follow-up to Global_Function updates (97687ca).
* Added format string to "F_InsertPlural" for added flexibility.
* Added more checks to "F_GetPlural" for better handling of multi-word arguments (e.g. items).
* Updated some more scripts with new functions.

Some misc. cleanup of constants in scripts.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-04 13:42:16 -05:00
Euphy
97687ca10c Global_Function updates.
* Added the following functions:
  - "F_GetPlural" (returns plural of noun) / "F_InsertPlural" (returns plural if arg != 1)  [credits: EnglishClub for formation rules]
  - "F_InsertArticle" (returns 'a' or 'an' preceding word)
  - "F_InsertComma" (formats number with commas)
  - "F_GetNumSuffix" (formats number with '-st', '-nd', '-rd', or '-th' suffix)
* Added and removed new functions where necessary. (incomplete)
* Added new types to "F_GetArmorType" function, and weapons will now pass to "F_GetWeaponType".
* Reformatted comments.

Other changes:
* Removed some garbage text from scripts.
* Slight edits to custom warper script.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-03 20:13:44 -05:00
Euphy
cd3cb9fa95 * Follow-up to pull request #8 and #10.
* Fixed a missing 'delitem' in Port Malaya quests. (bugreport:8168)
http://rathena.org/board/tracker/issue-8168-secret-in-the-woods-port-malaya-quest/
* Fixed an official quest time message mistake in El Dicastes quests. (bugreport:8167)
http://rathena.org/board/tracker/issue-8167-bouy-from-dicastes/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-10-20 12:15:10 -04:00
Akinari1087
a7588d79ed Quick follow-up to 01677cf33. Fix a veriable in penal_servitude. 2013-10-19 14:46:18 -07:00
Atemo
86c552d3b4 Update rpsroulette.txt 2013-09-09 01:05:59 +02:00
Atemo
db55442a0f Update penal_servitude.txt 2013-09-09 00:53:43 +02:00
Capuche
bf6e025592 Bugs fix and some changes in custom/etc files. 2013-09-08 04:44:40 +02:00
Euphy
f6f1bcaeb9 * Updated FRN and RUS map_msg translations. (credits: Capuche, Jarek)
* Added some maps to the custom warper.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-30 21:46:45 -04:00
Euphy
0fe7006883 * Added jRO Eclage mob spawns. (credits: refis, Auriga)
* Fixed an overflow in custom wedding script. (bugreport:8032)

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-30 15:26:44 -04:00
Euphy
bf68ccefa3 * Script style standardization.
- Standardized cases on constants (Zeny, Sex, BaseLevel, etc.).
- Replaced numerics with constants.
- Standardized parts of script headers.
- Changed some script styles to K&R.
- Added some official script file names as comments.
- Replaced most 'misceffect' commands with 'specialeffect'.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-27 03:28:41 -04:00
Euphy
d32e3c89ae * Renewal Izlude updates:
- Updated warp scripts and removed disabled warps.
- Implemented Renewal Hypnotist, which resets stats and skills; moved old file to Pre-Renewal path.
- Moved and added Bullet Dealer and Magazine Dealer duplicates. (bugreport:6410)
- Moved Dorian (quests_nameless) NPC to Pre-Renewal/Renewal paths and shifted Cuskoal (izlude) RE NPC.
- Corrected some coordinates and NPC facing directions.

* Updated all 3rd_trader scripts:
- Players can now purchase multiple items at once.
- Added many new Point Merchants.
- Moved Poison Herb Merchant in Morroc out of a wall (temp. fix).

* Other script updates:
- Added Eden Group Kafra (storage only).
- Added some missing announcements in Endless Tower.
- Added exit warp scripts to three 2nd job quests (Renewal only).
- Added official Morroc coordinates in Warlock job quest. (follow-up r17224)
- Minor updates to Comodo Gambling script.
- Fixed a Zeny bug in Payon town script, and changed some 'close' commands to 'end'. (bugreport:7893)
- Renamed npc/pre-re/kafras/kafras_izl.txt to .../kafras.txt.

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-25 02:32:30 -04:00
Euphy
c2bdd52865 * Kareka now offers to reset enchantments on Light of El Dicastes. (bugreport:7890)
* Fixed Malangdo rentals lasting for 1 day instead of 1 hour. (bugreport:7889)
* Added Old Glast Heim location to custom warper.
* @mobinfo now displays slots for MVP drops.
* Fixed a label execution in Dancer job quest.

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-23 15:21:32 -04:00
Euphy
be2428b832 * In Pre-Renewal, players can use items and self-targetting skills while talking to NPCs. (continuation of bugreport:6527)
* Fixed an issue in Malangdo quests. (bugreport:7863)
* Fixed two incorrect event calls in Assassin job change quest.

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-18 23:32:25 -04:00
euphyy
4a8db1afe6 * Added 'Eff_Burning' status, used in Banaspaty Card; fixed 'Eff_Fear'. (bugreport:7461, Hercules 5de6aab)
* Updates to SC_BURNING and SC_FREEZING durations. (Hercules 0395610)
* Minor fixes to Eden Quests 41-55.
* Fixed incorrect documentation for 'instance_id()'.
* Added Malaya instances to custom Warper.
* 'getmonsterinfo' no longer outputs an error when the supplied mob doesn't exist. (bugreport:7792)
* Follow-up r17410, fixed a typo in a label name.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17416 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-07-11 18:40:40 +00:00
euphyy
f488861298 * Implemented Buwaya Cave instance.
* Implemented Bakonawa Lake instance.
* Monsters can now spawn on unwalkable cells, as required by the new instances. (credits: Akinari)
* Implemented 2012 RWC Enchants script, disabled by default.
* Reverted change to Mora Enchants from r17387, as the additional items are only present on iRO. (credits: Ziu)
* Fixed some errors from recent updates.
* Applied eol-style:native property to newly added files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17397 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-07-01 00:16:43 +00:00
euphyy
78eb7d3793 * Added documentation for the instance system rewrite and modified some return values. (follow-up r17386)
* Gathered remaining dialogues for Pyramids Nightmare script. (follow-up r17382)
* Added missing items to "Guardian of Power" NPC from Mora Enchants.
* Updated Hunting Missions script to v1.3a, which adds some mission reset options.
* Added newline at end of files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17387 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-26 20:36:30 +00:00
euphyy
9d78d319d6 * Implemented Pyramids Nightmare Mode scripts and database entries.
* Fixed a typo in custom Warper.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17382 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-23 01:30:55 +00:00
euphyy
cc701c83bb * Implemented Eclage town NPCs from iRO.
* Implemented Eclage guides.
* Implemented Eclage coin traders (equipment NPCs and herb seller).
* Implemented Eclage skills. (3CeAM 705)
* Added Eclage quest_db entries (missing times).
* Added placeholder NPCs for Eclage quests -- most quests are not functional.
* Moved custom Warper and Healer coordinates for Eclage.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17373 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-18 01:13:19 +00:00
euphyy
dda3f76534 * Updated custom Warper to v1.4, which adds menus for the new Guild Dungeons.
* Cleaned up spelling and extra spaces in documentation. (credits: Akkarin)
* Sending whisper to a player from an admin account (group 99) will also display the message as a self-announce to the player. (Hercules 8568f17)
* Reins of Mount (12622) can now be used when sitting and will ignore delay when it fails. (Hercules 2316772)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17370 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-17 19:29:50 +00:00
euphyy
9288d3e20b * Documented some GM client commands.
* Custom Quest Shop updated to v1.6a, which adds support for previewing costumes and robes.
* Updated THA map_msg translation. (credits: Boneskung)
* Changed remaining @npcoff references to @unloadnpc.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17366 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-15 04:02:12 +00:00
euphyy
54f41e69bc * Updated "Fish Tails" NPC in El Dicastes quests and some adjusting of official coordinates (Hercules).
* Updated custom Warper to v1.3, which adds full support for both Pre-Renewal and Renewal.
* Shifted some coordinates in custom Warper and Healer scripts to more closely match @go.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17331 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-05-21 23:05:53 +00:00
euphyy
f967a8de53 * Implemented Mora town NPCs from iRO.
* Implemented Mora guides.
* Implemented Mora official warp scripts.
* Added Mora Points NPC and removed a wrong shop item.
* Added placeholder NPCs for Mora quests -- no quests are currently functional.
* Rewrote documentation for 'recovery' command. (follow-up r17321)
* Updated RUS, SPN, IDN map_msg translations. (credits: Jarek, Leeg, Cydh)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17325 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-05-10 00:10:45 +00:00
akinari1087
01b8e76e23 Added Ranger Camouflage official behavior
Updated Basilica to finally act more official - Related to bugreport:171
Small restructure of disabling skill checks - Fixes bugreport:7411 and bugreport:7577
Updated 3rd class weight limit bonuses to official (thanks Baalberith) - Fixes bugreport:7019
Some skill tree cleanup as ALL_INCCARRY and ALL_BUYING_STORE aren't necessary anymore
Fixed Hanbok and Reins of Mount issue in newer clients (aleos) - Fixes bugreport:12622
Some small fixes to the MVP Arena script (aleos) - Fixes bugreport:7592
Fixed standard channels being removed (lighta) - Fixes bugreport:7590
Fixed some compiler warnings (lighta) - Fixes bugreport:7589
Attempt to fix disappearing carts on reboot (lighta) - Concerning bugreport:7591

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17292 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-25 03:27:40 +00:00
euphyy
3f514b442d * Switched some 'close' commands to 'end' in custom scripts. (follow-up r17280)
* Deleted some code in Global_Functions that really shouldn't have been there. (blame: r15262)
* Other documentation changes and cleaning...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17282 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-22 05:00:27 +00:00
euphyy
7d0ea0c5c0 * Fixed an incorrect loop in El Dicastes quests (bugreport:7343).
* Follow-up r17188, temporarily restored OPTION_MOUNTING to fix compiling errors and fixed a few other issues (bugreport:7342).
* Updated Hunting Missions script to v1.3, which adds a blacklist for rare monsters.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17190 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-03-11 22:04:56 +00:00
euphyy
491759b578 * Initial implementation of Malangdo Enchants script.
* Quick fix for 'close' command freezing players, a better solution may be implemented in the future (bugreport:7307).
* Added missing boss immunity to Masquerade skills (bugreport:7314).
* Minor Renewal item database update.
* Minor dialogue update on cities/malangdo.txt.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17167 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-03-03 06:39:51 +00:00
euphyy
6e72489049 * Part two of fixing bugreport:6527. Players can now change equipment when talking with NPCs by default. This behavior can be switched off in conf/battle/items.conf. (Hercules ad792f4)
* Minor update to Renewal item database.
* Follow-up r17158, added a missing label in Octopus Cave instance (bugreport:7303).

> Hercules merges:
* b9c79ce:
Fixed NJ_SUITON not working properly with Kagerou/Oboro.

* dbf69e8:
Updated quest_db with more Port Malaya entries.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17163 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-27 01:49:09 +00:00
euphyy
3a330a455a * Part one of fixing bugreport:6527. This does not yet change functionality.
-- Added 'disable_items' to all applicable scripts.
-- Added preliminary source modifications. (Hercules 137cc43)
* Raised max stat for third jobs to 125 (follow-up r17133, bugreport:7295).
* Fixed logical issue with r17151. (Hercules 5c667cc)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17160 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-25 03:04:33 +00:00
euphyy
994b566002 * Follow-up r17126, documented checkidle() function.
* More clearly defined variables in eA Job System documentation (bugreport:7259).
* Added missing 'stopnpctimer' in custom Cluckers script (bugreport:7260).
* Restricted skill_trap_type config to GvG only (Hercules 4c9bfed, follow-up r17109, bugreport:4832).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17127 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-10 04:50:53 +00:00
euphyy
30bfcfe8e0 * Updated WOE Controller script to v1.5, which overhauls the rewards system (with many new features).
* Fixed another Renewal Izlude coordinate (bugreport:7169).
* Fixed a mail bug, since r16574.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17096 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-13 01:37:40 +00:00