368 Commits

Author SHA1 Message Date
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
Capuche
1e8aa4bdc4 Added adven_boards.txt dungeon signposts
Signed-off-by: Capuche <capucrath@gmail.com>
2015-03-28 00:31:36 +01: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
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
Aleos
0e533fa7ab Revert "Skill DB clean ups" 2015-02-10 09:33:00 -05:00
Cydh Ramdh
72617ac98b 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.

Summary:
* 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.

NOTE:
* Please import upgrade_20150131_skillset.sql

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-31 19:45:52 +07:00
Euphy
df6fb01739 Small fixes in Eclage scripts and code style changes.
- Fixed some minor bugs.
- Added GM NPC function.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2015-01-15 13:01:12 -05:00
Euphy
8c3bc4fda4 Changed some hardcoded script values to MAX_LEVEL. (fixes #161)
Fixes various bugs with higher level players not gaining experience.

Also properly fixed Renewal EXP reward in Turbo Track script (incorrectly fixed in be95412).

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-12-31 01:05:33 -05: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
ec485afe4c Bug fixes and clean-up :
-- Miscs follow up af266777402e07428388e80db35544fbb9bcbe8e
-- Another clean-up in comodo_gambling.txt (thx @SkittleNugget)
-- Replaced occurrence of PcName and clean-up in tu_magician01.txt

Signed-off-by: Capuche <capucrath@gmail.com>
2014-07-13 21:48:09 +02:00
Capuche
af26677740 Bugfix and clean-up
- Added NPC const
- Added checkdragon() in F_CashReset
- Clean-up books.txt, fortune.txt, card_trader.txt, 3rd_trader.txt, stone_change.txt, quests_brasilis.txt
- Minor fix about Weight in comodo_gambling.txt
- Change to F_GM_NPC function in Mercenary Guild Switch follow up bdab851129ceee57a38ccc9d819b42011ef19fb7
- added Mercenary Switch in gm_npcs.txt list
- change to common green maiden in 2010 Headgear Quests

Signed-off-by: Capuche <capucrath@gmail.com>
2014-07-04 02:14:30 +02:00
Capuche
bdab851129 - Added mercenary guild switch npc from aegis
- Fixed a bug to rent a mercenary in izlude duplicate (it gave a wrong mercenary)
- added a missing delitem in cupet.txt (forgot to delete the 2nd item)
- change the rand part in Mysterious Documents npc in magic_books.txt to match aegis
- little clean up in quests/ninja_quests.txt
- replace the npc id to the constant in theses files

Signed-off-by: Capuche <capucrath@gmail.com>
2014-06-30 17:07:05 +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
be1fd7b1fa - Fixed an issue in dual race (bugreport 8636).
- Optimizated.
2014-05-30 20:48:19 +02:00
Euphy
cad0a57865 Replaced 'getserverdef' command with 'script_hardcoded_constants' function in source. These constants can now be directly accessed in scripts. (Hercules 950e3eb)
- Relocated 'Option_*' constants from 'db/const.txt' to source; added OPTION_COSTUME compound. (Hercules a5728fd)
- Added MAX_CHAT_USERS define. (Hercules 950e3eb)
- Follow-up ca9642a: applied 'Loc' changes to Pre-Renewal database.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-01 15:42:49 -05:00
Euphy
957f49563a Added 'preg_match' script command to match regular expressions.
The command is only available if the PCRE library is installed.

Updated indefinite articles in Global_Functions with regex. (credits: Kaivosukeltaja/php-indefinite-article/863f1d5)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-29 16:33:27 -05:00
Euphy
3813aaaadb Added 2013 iRO/kRO Christmas Event.
Updated item database with many new costumes.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-24 15:19:27 -05:00
Euphy
364c7edb90 Added official names as comments in many newer scripts.
Signed-off-by: Euphy <euphy@rathena.org>
2014-01-22 15:59:21 -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
b2d96cbc7f Implemented Kagerou/Oboro job change quest.
Uses official script structure, with iRO dialogue taken from M45T3Ryu/KO-Proyect@d78f847.

Added Kagerou/Oboro support to other Ninja-related files.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-11 22:37:36 -05:00
Euphy
45c2a3a839 Follow-up to Global_Functino updates (834f3ba).
"F_GetPlural" now works for most item/mob cases, but still does not detect inputs that are already pluralized.
- For formats "... of|in|on ..." (ex. Piece of Cake), preceding word will be pluralized (ex. Pieces).
- Added some additional checks to prevent common errors.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-05 18:19:40 -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
357f1fd16c Minor bug fixes.
* Added itemscript for WoE Weapon Supply Box (12675). (bugreport:8421)
http://rathena.org/board/tracker/issue-8421-woe-weapon-supply-box12675-missing-item-script/
* Fixed two block comment errors. (bugreport:8409)
http://rathena.org/board/tracker/issue-8409-script-error-on-item-db-re-line-6123/
* Follow-ups to 97687ca.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-03 20:53:43 -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
nanakiwurtz
f62100ae70 Fixed some minor typo
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-21 15:49:10 +07:00
Euphy
d2ee0dd55f * Implemented VIP system in many official scripts.
- VIP players gain two more badges after Battleground matches.
- VIP players pay ten times less for transportation to Brasilis and Dewata.
- VIP players get free buffs and mercenary rentals in the Eden Group Headquarters. (iRO only, disabled)
- Non-VIP players must use a Reset Stone to begin the third job quests.
- Non-VIP players must have a Marriage Covenant to get married.
- Non-VIP players pay double for Kafra and Cool Event Corp. Teleport Services.
- Non-VIP players pay considerably more for refining equipment.
- Non-VIP players gain less quest reward items in Port Malaya quests.
- Non-VIP players gain less EXP rewards in Brasilis quests.
- Non-VIP players cannot access all towns in Acolyte Warpers script. (iRO only, disabled)
- A Reset Stone is required for Bossnia entry.
Note that official servers run different VIP/premium systems; the changes above are based on euRO, unless otherwise stated.

* Other script changes:
- Adding Marriage Covenant item in marriage script.
- Fixed some EXP values in Brasilis quests.
- Minor updates to Kafra functions.
- Turned Cool Event Corp. scripts into a basic function.
- Turned Battleground badge rewards into basic functions.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-11-18 23:54:17 -05:00
Euphy
7cb4145691 * Cleaned up some unnecessary global ($) and temporary character (@) variables in scripts.
* Removed unnecessary labels, particularly those in warp scripts.
* Some optimization of the Hugel Bingo script.
* Fixed a mob_db error. (bugreport:8051)
* Fixed incorrect/incomplete random Glast Heim warp.
* Removed useless 'getJobName' function from GlobalFunctions.txt.

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-06 19:37:14 -04:00
Euphy
c610f5b15c * Added some iRO Eden Group NPCs. (credits: -SkittleNugget-)
- This consists of a few traders, warpers, cashshop-related scripts, and duplicates from various locations.
- There are a lot of placeholders and some entirely missing scripts; these may be added later, but we don't intend to implement all of iRO's custom features.
- Some of the item sprites may be unviewable without iRO's data.grf.

* Minor database updates:
- Corrected all *_C (rental) equipment entries; to be updated later on with VIP bonuses.
- Fixed some bHpDrainRate item_db entries. (incl. bugreport:8049)
- Fixed a mob_skill_db entry. (bugreport:8050)

* Other changes:
- Renamed 'F_RandMes' to 'F_Rand', to clear up any confusion. (follow-up 66a2bfd)
- Small changes in Armor Enchanter script (thanks to Emistry for pointing it out :p).

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-06 00:22:41 -04:00
Brian
d7742937a8 - Updated F_RandMes with getargcount().
Follow up to 66a2bfd7c24bb617d27cc0a3e8db903cb000f3de
2013-09-05 13:07:54 -07:00
nanakiwurtz
f44ae34734 Updated to the new 'F_RandMes' command.
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-09-05 14:12:42 +07:00
Euphy
17d000640d * Added 'breakequip' script command. (tid:86732)
* Fixed return value for delequip. (since r17469/8bd0985)
* Fixed a bug with Mercenary Rentals. (credits: TTest)

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-04 15:07:26 -04:00
Euphy
02d67498b1 * Script updates.
- Added Renewal features to PVP script and removed duplicate warps.
- Added "Acolyte Warpers" script (Keiki and Isalei), disabled since it may be an event script.
- Added "Mergician" NPC, but it currently doesn't function and is disabled.
- Moved "Stone Change" script from merchants/ to other/.
- Follow-up 8acde7e: further bug fixes.

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-02 00:18:49 -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
1083475207 * Some follow-ups to 5ab4d5e:
- Added Renewal changes to "God Seal Status" signpost and moved from "npc/other/sealstatus.txt" to "npc/quests/seals/seal_status.txt".
- Applied item_db changes to Pre-Renewal and SQL databases.
* Fixed issue in Cursed Spirit quest where an OnTouch NPC wouldn't activate.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-26 11:34:18 -04:00
Euphy
5ab4d5ea90 * Script updates:
- Updated Nameless Island quests and added questlog support in quests_nameless and quests_prontera. (fixes bugreport:7992)
- Updated "God Item Creation" scripts to their latest versions: seals roll at 25/50 instead of 50/100 in Renewal.
- Updated Soul Linker job quest with new checks.
- Fixed an untranslated Manuk NPC.
- Some follow-ups to previous commits.

* GM Management System:
- Enabled all official GM Management NPCs and wrote a function to control their usage.
- Implemented some missing GM Management NPCs (still incomplete).

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-25 20:56:46 -04:00
Euphy
cbdbda1f0e * Script updates.
- Added Malangdo Card Separation NPC "Richard", who refines weapons and shields.
- Added new "Job Repair" script, which fixes potential errors with job data (RE).
- Marriage script changes:
-- Permanent global variables are now temporary.
-- Added GM NPCs (The King of Midgart, Divorce Staff, Remarry Staff), commented. (bugreport:6795)
- Added some missing [Official Conversion] comments.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-14 02:19:57 -04:00
Euphy
0202126185 * Script updates.
- Added questlog support for Amatsu, Ayothaya, Hugel, Louyang, Lighthalzen, Niflheim, and Rachel quests.
- Updated Turbo Track with Renewal mounts; file split due to an NPC rename.
- Added missing cutins to Rekenber Job Quest.
- Added new "Stone Change" script (RE).
- Added Renewal coordinates to Juno's Airship Representative.
- Added Renewal sprites for Juno Soldiers (8W_SOLDIER -> 4_M_EIN_SOLDIER).
- Added Renewal Izlude Bulletin Board, but disabled unless valid coordinates are found.
- Minor updates to Malangdo Enchants dialogue.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-13 18:24:01 -04:00
Euphy
13b281b31e * Izlude Arena updates.
- Added new Izlude coordinates and warps. (follow-up 400d0f0)
- Replaced many permanent global variables with mobcount() command.
- Removed some unnecessary global variables and OnInit labels.
- Commented all invalid label executions.
- Brought scripts up to standard with scripting conventions (label naming, spacing, etc.).
- Moved all warps from scripts into warps/ folder.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-07 23:05:07 -04:00
Euphy
400d0f0319 * Restored Izlude Arena into root directory - it should never have been disabled in Renewal. (blame: r16382)
- Note: Renewal updates will follow.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-06 02:58:43 -04:00
Euphy
0fba5cb4a1 * Updated Magic Gear rental script and added many new locations.
* Split Geneticist Manuals shop (Renewal only) from main Alchemist shop script, and updated dialogue.
* Moved Izlude Bulletin Board and Signs to Pre-Renewal path.
* Updated Warlock book quest NPC name, and fixed a bug for Baby classes.
* Fixed unittalk displaying messages twice for players. (bugreport:7903)

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-26 01:48:33 -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
be95412ae2 * Updated Renewal EXP and re-added Pre-Renewal EXP support to lots of scripts. (blame: r15060, fixes bugreport:6288, completes r16545 update)
- Local quests: Alberta, Ayothaya, Einbroch/Einbech, Hugel, Lighthalzen, Louyang, Morroc, Moscovia, Nameless Island, Prontera, Rachel, Veins, Episode 13.1, Episode 13.2
- Other quests: Airship, Eye of Hellion, Kiel Hyre, Wandering Minstrel, Juperos, Brisingamen Seal, Megingard Seal, The Sign, Party Relay
- Mini-games: Hugel Monster Races, Turbo Track
* Deleted some useless 'break' commands and replaced some 'menu' commands in scripts.
* Documented the <NAVI> and <URL> tags. (Hercules 7e58225)
* Added documentation for "OnTouchNPC" in the special labels section.

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-20 02:48:46 -04:00
euphyy
fdd0fd1d72 * Standardized label names and converted all labels to Pascal case. (temp. fix for bugreport:6988)
* Many fixes to Izlude Arena scripts.
* Other misc. standardization.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-07-10 07:25:44 +00:00
j-tkay
5aa72eaee3 Fixed bugreport:7699
- Incorrect use of 'close' command.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17348 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-05 11:16:50 +00:00
euphyy
8e810c050c * Some more updates to the channel system, including documentation for new atcommands.
* Updated IDN map_msg translation. (credits: Cydh)
* Reverted changes to fortune.txt in r17297.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17299 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-26 20:31:02 +00:00
glighta
8d605f89c3 - Follow up r17296
-- capped CAMOUFLAGE effect, (defs should be lower then 0, atk bonus max 300, fix cri bonus  (base is 1000 not 100))
-- fix bugreport:7601 and add new mapflad for clif_maptypeproperty2 (nomineeffect, nolockon, noitemconsumption, nousecart, nosumstarmiracle) still investgating full effect
-- harmonize script_ref source


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17297 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-26 14:38:54 +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