899 Commits

Author SHA1 Message Date
Atemo
36f337ea41 Corrected :
-	variable typo in quests_nameless.txt
-	Suspicious Man#1 NPC localization and Xtrigger/Ytrigger in quests_nameless.txt
-	redundant message in eden_quests.txt

Merged :
-	warp eclage Hercules 64dfaf2c8c8be7ff288ea88a64eddfeae1e364a4
-	Deadman NPC localization in quest_disguiseloliruri.txt Hercules 450b0a3aeb6b472805c470712a0e6ebd9d04eb2a
-	NPC name in eclage Hercules 87beda59c824e9be6db6f86c02983ed2a44c4016 and daf5312ee4d1de6dd43b23f719e94427aeb33e5d

Signed-off-by: Atemo <capucrath@gmail.com>
2015-06-06 20:36:02 +02:00
Capuche
8083ff987d Reverted c6ba813994eaaae0a98416f5be7ff65d0e8e13b5 Issue #437
Fixed a bug in Einbrech "Oridecon/Mineral Quest" Hercules be3b4f77c15f890c99dc3034f9a93c051eb6ca17

Signed-off-by: Capuche <capucrath@gmail.com>
2015-05-29 14:57:57 +02:00
Brian
0161467f97 Fixed #431 2015-05-11 10:41:39 -07:00
Capuche
dd3e7e1710 Corrected typo in adven_boards.txt thanks grammatic@aleos89
Update lvl4_weapon_quest.txt, Hercules 169b3faae19e23a303a094fe26e181a8c1b1c6c7
Fix delitem bug in Ep13.1 quest. Hercules 9d1853aebd3ff34ed7869a3b1188943624078b8e
Corrected Tree Roots Location Hercules ca9cd51e683d39c8a7f099a46747ff166d632230

Signed-off-by: Capuche <capucrath@gmail.com>
2015-04-06 23:24:12 +02: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
Capuche
cc1e89012f Follow up abc78e51f7de938c881d45720da67e3fef3450a5
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-11 23:11:47 +01:00
Lemongrass3110
abc78e51f7 Fixed friendship quest questlog
Added a check if the quest was already added to the questlog.
Additionally removed some AEGIS logic that was converted without thinking.

Fixes #241
2015-02-10 23:50:26 +01:00
Capuche
0bebbe6c05 Typo in lv4_weapon_quest (Hercules 3d47fdff7ddae8e5f028425c653dccc4ecfcfed5)
Fixes Biolab Enchant (Hercules 265ec7e012d3414e5fc4b3360c0795b4697663f6)
Fixed Eclage Quests (Hercules 1b0eacd770b128b02d3300b7efe05da136bbed3d and 7d93099232dcf3c74349a99d9fa891927f2351d6)
2015-02-08 00:14:26 +01: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
b735103505 Follow-up to 9cf01b2.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-10-29 12:05:04 -04: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
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
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
Euphy
17bace0ae6 Script bug fixes.
- Added Renewal location for "Knight De Thomas" NPC (previously inaccessible), and upgraded the script to the latest version.
- Fixed Pre-Renewal Merchant Quest questlog commands. (bugreport:9218)
http://rathena.org/board/tracker/issue-9218-merchant-quest-add-error-quest-add-1010/
- Corrected a handful of 'rand(1)' statements.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-16 19:10:19 -04:00
Capuche
77549f76ab Updated to match official version & clean-up in quests_airship.txt
Signed-off-by: Capuche <capucrath@gmail.com>
2014-08-03 02:54:02 +02:00
Capuche
caa80ecfc7 Clean-up in quests/first_class folder
Signed-off-by: Capuche <capucrath@gmail.com>
2014-08-01 16:20:24 +02:00
Capuche
5dc6b749e1 Bug fixes in quests/quests_moscovia.txt
-- Added questlog support on The Moving Island, Help Mikhail, Banish Winter quests
-- fixed bugreport 8532

Signed-off-by: Capuche <capucrath@gmail.com>
2014-07-22 03:30:21 +02: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
Euphy
e2fe7383e7 Minor bug fixes.
- Fixed incorrect item IDs in Port Malaya quests. (bugreport:8810)
http://rathena.org/board/tracker/issue-8810-quest-malaya/
- Updated Ship Captain Hat bonuses. (bugreport:8725)
http://rathena.org/board/tracker/issue-8725-item-bugs/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-21 00:21:38 -04:00
Euphy
c8d792488f Questlog fixes.
- Lost Child (bugreport:8791)
http://rathena.org/board/tracker/issue-8791-lost-child-quest/
- Muff's Loan (bugreport:8787)
http://rathena.org/board/tracker/issue-8787-muffs-loan/
- Peace For Arunafeltz (bugreport:8790, needs confirmation)
http://rathena.org/board/tracker/issue-8790-peace-for-arunafeltz/

Added base entries for new pets; bonuses are currently not properly implemented. (bugreport:8777)
http://rathena.org/board/tracker/issue-8777-pet-missing-tikbalang-database-entry/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-17 18:24:19 -04:00
Euphy
ad13f26fc2 'consumeitem' no longer requires npc_id to run. (bugreport:8563, credits: AnnieRuru)
Second part of the bug report is not yet fixed.
http://rathena.org/board/tracker/issue-8563-consumeitem-doesnt-work-if-the-npc-id-is-0-example-bonus-script/

Replaced a few 'consumeitem' commands in scripts that were broken.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-28 03:00:48 -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
aleos89
27cbc7ff24 Merge pull request #40 from Lemongrass3110/master
Added autotrade persistence support.
- Players who are autotrading during a crash/shut down will be restored on start up.
- Live vendor data is stored in SQL.
- Credits to Ind and Lemongrass.
2014-01-23 07:49:18 -08:00
Euphy
e6bd3625c6 Implemented Kagerou/Oboro Equipment Quests.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-22 12:25:07 -05:00
Euphy
5d08795837 Implemented 2012 Headgear Quests.
Credits to @cydh for helping out with the quest bonus.
Follow-up 1a9b54: added missing SQL item_db entries.

Clarified description of "delayed consumption" item type (11) in item_db documentation. (tid:91187, thanks Annie!)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-21 16:01:57 -05:00
Lemongrass3110
b7fd4dd274 Unneeded semicolons removed
Removed duplicate slashes
2014-01-14 23:38:12 +01: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
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
Euphy
1d64b8f9e1 Script/database bug fixes.
* Fixed an issue in "Message Delivery" quest blocking level 100+ characters. (bugreport:8373)
http://rathena.org/board/tracker/issue-8373-message-delivery/
* Added Renewal quest items to Ayothaya Dungeon Entrance quest. (bugreport:8375)
http://rathena.org/board/tracker/issue-8375-ayothaya-dungeon-entrance-quest/
* Temporarily moved the Renewal location of "Strange Machine" in the "Muff's Loan" quest; confirmation needed. (bugreport:8370)
http://rathena.org/board/tracker/issue-8370-muffs-loan/
* Updated Blacksmith job quest with some extra conditions. (fixes bugreport:8347)
http://rathena.org/board/tracker/issue-8347-about-blacksmith-job-quest/
* Changed all 'bAtk' bonuses to 'bBaseAtk', a continuation of r17149. (fixes bugreport:8372)
http://rathena.org/board/tracker/issue-8372-daehyon-card-is-not-working/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-12-28 22:47:32 -05:00
Rekiem
a872bd2fb4 Update bard_quest.txt 2013-12-14 20:32:47 -05:00
Euphy
100bd4a28a * Split item_delay.txt into pre-re/re paths.
* Fixed a typo in "Father Bamph" NPC. (bugreport:8163)
http://rathena.org/board/tracker/issue-8163-father-bamph/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-10-19 10:46:22 -04: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
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
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
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
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
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