2717 Commits

Author SHA1 Message Date
j-tkay
4d67a38da6 Fixed bug #8110:
- Fixed an issue where Castle Manager couldn't be fired accordingly.

http://rathena.org/board/tracker/issue-8110-overly-attached-kafra-employee/

Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-10-09 00:37:09 +08: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
e5d9fc8fa5 * Script updates.
- Updated dialogue for advanced and Renewal refiners.
- Added an extra check in the main refiner scripts to prevent empty menus from appearing.
- Renamed Renewal NPCs to "Vestri" and "Austri".
- Slightly updated dialogue for the Catalog Magician script.

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-03 12:53:39 -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
Toshiro90
8bd41ee949 * Fixed several for-loops in Falicious Okolnir whose variables weren't incremented correctly, causing too many monster spawns or invalid checkitem() calls. 2013-09-02 02:18:47 +02:00
Euphy
397e1e5132 * Fixed some compiler warnings from recent commits. (credits: Lighta, Cydh)
* Umbala Spirit doesn't have a slot. (bugreport:8039)

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-31 13:18:10 -04: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
454781a24d * Fixed a WOE:SE issue with 2nd Guardian Stone respawn. (tid:86918)
* A couple of other tiny fixes.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-30 18:02:48 -04:00
Euphy
1c7c002e46 * Follow-up cd9a776: documentation edits.
Signed-off-by: Euphy <euphy@rathena.org>
2013-08-30 17:03:08 -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
Cahyadi Ramadhan Togihon
cd9a776f23 *Added Skill Damage Adjustment!
- Disabled by default on src/config/core.h. Uncomment '#define ADJUST_SKILL_DAMAGE' to enable this skill damage adjustment
- Added skill_damage_db.txt (thank Lilith for 'Manage Skill Damage')
- Added new mapflag: 'skill_damage'. Please read 'doc/mapflags.txt' for more details
*Fixed bugreport:8029 (thank exneval for testing and reporting) (Akinari)
*Follow-up 647f99f (Akinari)
*Follow-up 15074d8: optimized item_isNoEquip check parts
*and some mirror changes
2013-08-30 02:55:11 +07:00
Euphy
4a4fab0298 * Database updates:
- Updated Renewal item_combo_db with new item entries.
- Updated Renewal item_noequip with Vellum gears/siege items.
- Some small updates to Renewal item_db.

* Other changes:
- Added some towns to various Renewal mapflag files.
- Fixed two typos in Nameless Island quest. (bugreport:8021)
- Fixed an error with the '+=' operator on string variables. When attempting to concatenate and assign to a previously empty string with +=, it'd throw a memory manager error. (Hercules 1afeabf)

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-28 14:34:16 -04:00
Euphy
fe95610ba8 * Added an integer overflow check on literal values in the script parser. (Hercules 8351881, 86602bb, 3d19c2d, 184ad8a)
- When attempting to use a value greater than INT_MAX or smaller than INT_MIN (about +/- 2 billions), a warning message will be shown and the values capped to INT_MAX or INT_MIN.
- Corrected some scripts that were attempting to use such values.
- Fixed some possible issues when using literal negative values in scripts.
* Added a note to @job documentation.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-27 13:46:02 -04:00
Euphy
558b5a175d * Updated Airship Ticket Quest with some missing parts and bug fixes.
* Two follow-ups to bf68cce.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-27 04:18:17 -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
ff86b75d26 * Standardization of new Upgrade Weapon Enchants script. (follow-up 5debd8c)
* Fixed some bugs related to Nidhoggur's Nest. (bugreport:7990)
* Follow-up ba6b57b:
- Added 'is_clientver' command to Navigation system function.
- Documented @item change.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-17 22:56:40 -04:00
unknown
5debd8c5c8 Added Upgrade Weapon Enchants 2013-08-17 17:03:45 -04:00
Euphy
3125f09aae * Fixed Arch Bishop job quest. (bugreport:7111)
* Added two item checks in Mora quests as a safety measure. (credits: TTest)

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-14 17:36:04 -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
a1adc15147 * Script/DB updates.
- Implemented Bangungot Hospital 2F instance.
- Added mob_skill_db entries for new mobs - Hall of Abyss, Port Malaya, Eclage, Nightmare Pyramids. (credits: Lemongrass)
- Fixed ATK2 column for new mobs. (bugreport:7888)

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-13 02:22:50 -04:00
Euphy
e4e8566b19 * Port Malaya updates.
- Added "Nurse in Port Malaya" quest.
- Added "Pintados Festival" quest.
- Updated all quest_db entries with correct delays and mobs.
- Corrected placeholder VIP checks: when VIP is disabled, the VIP reward is always given.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-11 21:07:19 -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
32b8d2e713 * Implemented Bakonawa Extermination quest.
* Misc. cleaning.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-07 02:47:45 -04:00
Deadly Silence
7beb7edc77 Minor bug fixes
[npc/cities/geffen.txt]
- fixed bug with Psychic Advisor (bugreport:7928)

[npc/quests/seals/megingard_seal.txt]
- fixed small bug with Librarian where he would spam the NPC dialogue
  because of a misplaced "next"

[npc/re/merchants/enchan_mora.txt]
- fixed bug with wrong enchants (bugreport:7930)
2013-08-06 23:46:24 +02: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
26036efcb7 * Implemented official kRO Novice Training Grounds (RE) script. (fixes bugreport:7923 and bugreport:7759)
- Added Job Test NPC, "Job Guide Lark".
- iRO's custom features are removed (Eden Teleporter and custom mob spawns).
- NPCs and warps are now duplicated on all new_*_* maps (reason unknown).
- Note: The script will be replaced with Cryptura Academy once the scripts are translated.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-06 02:32:56 -04:00
Euphy
11860e2e1f * Script updates:
- Added warpers and duplicates for Izlude (izlude_[a-d]) and Prontera Field 8 (prt_fild08[a-d]) maps.
- Updated Eden Group warpers and added new duplicates.
- Changed "Kelitula Academy" to "Cryptura Academy".
- Added a missing OnMyMobDead label in Buwaya Cave instance. (bugreport:7929)
- Added version information to Airport script headers.

* Mob spawn organization:
- Split "City Cleaners" into Pre-Renewal and Renewal directories.
- Restored Thief Bug (Pre-Renewal) vs. Thief Bug Egg (Renewal) spawns.
- Created "Town" spawn files, holding all city spawns not in "City Cleaners" files.
- Added Prontera Training Dummies and Alberta Ship Mouses.
- Moved Jawaii spawns from "fields/" into "towns.txt".
- Moved Brasilis spawns from its own directory into "towns.txt".

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-05 19:42:00 -04:00
Euphy
20153af6e0 * Script updates:
- Added new Renewal warpers for Satan Morroc maps.
- Updated "Succession of the Prince" quest with some new cases, and fixed checkquests.
- Updated portions of Ecology quest in 13.1 quests with new checks and cases.
- Added some missing 'disable_items' commands to 2004 Headgear quests.

* Other changes:
- Changed some strnpcinfo(1) -> strnpcinfo(0) in 13.2 quests. (bugreport:7853)
- Moved Rune Knight Kafra into main Kafras file.
- Revised documentation for 'addrid'. (follow-up 6572a9f)
- 'instance_id()' no longer throws an error upon failure.
- Fixed Desert Twilight/Sandstorm combo. (bugreport:7897, credits: Playtester)

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-27 16:36:00 -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
f0927dcb85 Merge branch 'master' of https://github.com/rathena/rathena 2013-07-24 18:41:20 -04:00
Euphy
6bed814550 * Implemented new Guides with Navigation. (source: Muad_Dib)
- If your client does not support them (anything below 2011-10-10), disable the feature in npc/re/guides/navigation.txt.

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-24 18:37:36 -04:00
Deadly Silence
489dda35cc Merge branch 'master' of https://github.com/rathena/rathena 2013-07-24 23:27:42 +02:00
Deadly Silence
695e832846 [Port Malaya]
- added missing quest parameters (monsters to kill, timers, etc.)
- added quests (Cautios Village, Get Rid of the Jejeling, Jejeling and
  Jejellopy, Marie's Child, etc.)
2013-07-24 23:19:25 +02: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
914dbdafe2 * Implemented Old Glast Heim instance by Ziu/Heris; all scripts and mobs are custom.
* Added official Port Malaya Jeepney warp scripts.
* Fixed some minor bugs in Mora Enchants. (credits: TTest)
* Fixed a wrong quest_db entry. (bugreport:7865)

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-22 22:15:55 -04:00
j-tkay
7a057f7f4a Updated ep13_start and dialog to match official script.
Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-07-21 01:20:25 +08: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
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
Euphy
3beb7833f9 * Fixed Guardian Stone respawns in WOE SE. (bugreport:7849)
* Fixed job checks in Falcon Flute Trader script. (bugreport:7839)
* Fixed Guillotine Katar slots. (bugreport:7838)
* Fixed @itembound type 4 not working.
* Bossnia changes:
- Monsters should not be spawned with 'boss_monster' according to official scripts; removed 'notomb' mapflags accordingly (partial revert of r17404).
- Merged file into events/bossnia.txt, since the spawns and warps should be disabled by default.

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-17 23:16:15 -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
j-tkay
4fa10ad2d1 Follow-up r17168:
- Added missing 'OnMyMobDead' labels.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17411 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-07-10 09:33:19 +00: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