114 Commits

Author SHA1 Message Date
Daegaladh
354c632732
Fixed place names and other typos (#4475)
* Fixed common misspelled names from iRO and other typos.
2019-12-15 20:55:19 +01:00
syracuase
8530a7b1fe Job Level check for Blacksmith and Alchemist (#2819)
* Job Level check for Blacksmith and Alchemist
2018-01-21 14:51:38 +01:00
Lemongrass3110
16780638be
Fixed a few name typos with Niflheim (#2782)
Thanks to @Daegaladh for his input
2018-01-09 23:36:20 +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
Atemo
a9faab82cb Fixed incorrect OnTouch label in Crow of Destiny Quest (issue #1840) and in Guild dungeon 2 event. Thanks @Tokeiburu 2016-12-29 23:00:37 +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
Atemo
d62f422e3d Corrected OnTouch/OnTouch_ in NPC script (#1548)
Some leftover from aegis convertion..

Skipped pre-re folder, I don't have old data.
2016-09-07 21:35:14 +02:00
Atemo
85f44a587d Removed useless lines 2016-06-22 15:50:40 +02: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
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
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
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
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
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
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
4589a4d135 * Updated Eden Quests 71-85 to its latest version. (translation: Muad_Dib)
* Updated all 1st class training quests, mostly experience changes. (credits: Muad_Dib, partial revert of r17210)
* Added Pre-Renewal support to 1st class training quests. (bugreport:7808)
* Corrected level 10 AL_HEAL lines in 'npcskill' to use MVP heal.
* Corrected EXP checks in 'checkre' to use RENEWAL_EXP instead of RENEWAL.
* Fixed Hunter skill quest not accepting Rangers.
* Fixed a bug in Hall of Abyss. (bugreport:7815)
* Fix unable to move when cloaking in levels less than 3. (credits: Akinari, bugreport:7810)
* Idle timer now resets on continuous attacks, i.e. /noctrl or ctrl+click. (Hercules 19f0fcd)
* Idle timer is now initialized upon login, fixing a bug with the 'checkidle' command. (credits: Akinari)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17409 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-07-10 05:11:53 +00:00
euphyy
87c832625c * Added more Port Malaya NPCs, adapted from Masao's conversion.
* Optimized Sage skills quest and cleaned Rogue skills quest.
* Small edit to mapflag documentation - thanks, Lighta!
* Code by Zopokx:
-- Optimized Eden Quests 56-70 (adapted).
-- Moved "Dollshoi" and "Ponka-Hontas" NPCs (Morroc and Payon Solutions) out of Pre-Renewal directory to npc/quests/mage_solution.txt.
-- Added support for Baby Novices in Novice Skills quest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17335 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-05-27 05:54:54 +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
5edd3e023a * Added official Homunculus S mutation quest (previous file renamed).
* Added 'checkhomcall' & 'morphembryo' commands and updated 'hommutate' command, as required by the Hom-S quest. (code by Aleos/lighta)
* Modified 'gethominfo' to work for Homunculi in 'rest' state, also needed for the Hom-S quest to run properly.
* Updated spawns for Scaraba Hole (dic_dun) and Dewata (dew_fild, dew_dun).
* Minor update to some item scripts.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17220 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-03-28 17:09:04 +00:00
euphyy
f54be649cd > Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:
* Separated Renewal Alberta features with checkre() and new files, follow-up r16125 (bugreport:7041).
* Moved remaining Renewal shops out of pre-Renewal file, follow-up r16138 / r16104 (bugreport:7042).
* Moved Renewal refining features to a separate file, and made some changes, follow-up r16126 (bugreport:7043).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17042 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-24 17:30:14 +00:00
j-tkay
57f320c8dd - Merged Falicious Okolnir Quest in quests/okolnir into one template. (quests/okolnir.txt)
- Removed an unofficial event. (events/quiz_qt.txt)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16569 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-03 17:59:44 +00:00
euphyy
1decd584a8 * Optimized Brasilis quests (re\quests\quests_brasilis.txt)
* Follow-up r16538, removed one more check - thanks Vali! (quests\skills\archer_skills.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16553 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01 23:44:04 +00:00
daegaladh
f49b3d6f55 Full npc folder reorganization. (I hope I didn't break anything D:)
-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders.
-NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences.
-For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates.
-All pre-renewal files has been reverted back to their pre-renewal behavior.

TODO:
-Correct pre-re quest rewards.
-Check for pre-re/re differences in mapflags.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16545 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01 04:29:56 +00:00
shennetsind
086af74531 Okie ladies and gentleman if this commit breaks anything it's jman's and maki's fault, yes, blame them.
Fixing pre-re / re npc support, moving /config/ folder to src root so other servers may also make use of the #define renewal dir and other stuff.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16382 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-08 19:30:07 +00:00
masao87
cbd577d069 - Added BaseClass explanation to script_commands.txt .
- Some updates to the custom folder / the old eAAC Scripts which are now in there.
- Fixed custom/warper.txt prontera location to not collide with Ash Vacuum warper. bugreport:5857
- Fixed Platinum Skill Quests properly checking for BaseClass now. bugreport:5853
- Fixed some typos in Ranger Job change Quest & Eden Paradise. bugreport:5858
- Fixed a typo in scripts_athena.conf . bugreport:5852

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16165 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-29 12:08:59 +00:00
masao87
c61f99302b - Updated some Alberta NPC Locations to match with the new Map. Also updated the coordinates in the Alberta Guide NPC. bugreport:5273
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16125 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 14:05:14 +00:00
masao87
b04cf80fda - Some more 1st Class Platinum Skill NPC optimizations.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15958 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-24 20:30:24 +00:00
masao87
a358c64671 - Follow up r15949 .
* Removed some unneeded perm. char. variables.
* And i meant [bugreport:5607] got fixed NOT [bugreport:5606] since Brian already fixed that Bugreport.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15950 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-23 14:33:25 +00:00
masao87
46a800ad3b - Updated 1st class platinum skill NPC's.
- Fixed [bugreport:5606] .

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15949 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-23 14:14:20 +00:00
brianluau
00367cd7b7 - Removed more trailing tabs.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15527 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30 20:17:55 +00:00
mercurial123
0f47604f2d - Replaced all occurrences of "eAthena" to "rAthena" string
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-24 21:30:42 +00:00
Kisuka
d230c68360 - Fixed typo on rogue_skills.txt (bugreport:4768)
- Fixed issue on icecream.txt (bugreport:4752)
- Added missing prize on comodo_gambling.txt (bugreport:4748)
- Rescripted the iRO event scripts.
- Updated the Read Me.
- Added 2009 Novice Training Grounds.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14711 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-19 00:09:56 +00:00
L0ne_W0lf
6e837a5214 * Added bard/dancer songs and duets to the nodispell list. (bugreport:4411)
* Applied Ai4rei's patch for the skill WE_CALLPARTNER (bugreport:4437)
* Lots of updates to monster stats/drops, all fairly minor.
* Updated the price and weight of a handful of etc items.
* Removed drops for quest-spawned Satan Morroc. (bugreport:4425)
* Changed weight on novice consumable items to 0 (bugreport:4442)
* Updated Sage quest skill quest with the file curtosy of 5511.
* Fixed the Pink Crystal being named Blue Crystal in Flavius.
* Touched up the archer tutorial, and phantasmic arrow quests.
* Fixed Turbo Track records for 8 and 16 normal saving as expert. (bugreport:4433)
* Corrected the positions for the arug castle 04 exterior flags. (bugreport:4436)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14409 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-09-18 17:15:37 +00:00
L0ne_W0lf
e7e55d4e06 * Added support for NPC names in the 'specialeffect' script command, go go copy/paste!
* Updated several NPCs to use the updated specialeffect command, updated more NPCs to use the updated emotion command.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14353 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-22 22:09:11 +00:00
brianluau
905293afc6 - Re-added Hardrock Mammoth's MD_BOSS mode that was lost in r14052.
- Fixed a typo ("too much too much") in Alchemist Quest.
- Updated SQL item/mob databases to latest. (thanks Peter)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14074 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-24 01:48:17 +00:00
Kisuka
cffe6395ef - Added missing 10.3 dialog to tu_archer.
- Removed 'Arpesto' and added to hunter_skills with its script (Official Phantasmic Arrow Quest).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13906 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-22 03:14:16 +00:00
brianluau
4a457f37fc - Fixed a typo in Refined Bloody Roar rental box. (bugreport:3124)
- Fixed some spelling in the battle grounds script. (bugreport:3113)
- Fixed a variable check in a Novice Skill quest. (bugreport:1985)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13831 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-31 01:47:42 +00:00
brianluau
a11e789e0a - Fixed some typos in the script command documentation. (bugreport:2547)
- Fixed a misleading message in the custom Job Changer. (bugreport:682)
- Updated some NPC's facing directions. (bugreport:3030)
- Added missing newline in some ShowWarning(). (bugreport:2940)
- Fixed SC_BOSSMAPINFO time being off by 1 minutes (bugreport:3035)
Now, the seconds are rounded up to the next whole minute.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13713 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-02 20:23:30 +00:00
Kisuka
c3859196e0 Fixed "junk symbols". (bugreport:2723)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13500 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-30 11:22:59 +00:00
L0ne_W0lf
8ac8481d25 Happy boxing day, eAthena! Here have a massive update.
* Implemented the first round of episode 12.1 change which include:
- Many Morroc NPCs have been moved to Morroc Ruins.
- The addition of new of NPCs to the ruins of Morroc.
- Several warp points leading around Morroc altered.
- The implementation of the continental Guard Quest.
- The removal of the 'Dandelion's Request" quest.
- This update contains several changes, as Morroc and several fields no longer exist in one sense of the word. AS such, many NPCs have been moved, there may be quests that no longer function because of NPCs on inaccessable maps.
* Commented out maps no longer accessable with 12.1 in maps_athena.conf
* Updated mob_skill_db episode 12.1 skills to official.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13415 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-26 06:58:19 +00:00
samuray22
03e543b35a * Changed An nonexistent variable in Refine NPC. (bugreport:2340)
* Fixed a Exploit in Thief Quest Skill. (bugreport:2332)
* Fixed donpcevent to doevent. (bugreport:2311)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13288 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-10-12 17:30:44 +00:00
L0ne_W0lf
0a11f3157f Replacing specialeffect/2 numerics with constants in quests.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13237 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-25 22:36:22 +00:00
Yommy
f48fda465f fixed bug reports bugreport::2029 bugreport::2023 bugreport::1923
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13060 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-09 23:01:10 +00:00
shadow
a98253bcc4 Converted skill commands integers to strings. Follow up on r12814
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12819 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-13 10:13:14 +00:00
Lupus
f7cb030349 Fixed more +name+ garbage to +strcharinfo(0)+
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12756 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-04 06:00:48 +00:00
L0ne_W0lf
4c18933e03 * Fixed variable issue with Milk Trader NPC. (bugreport:1523)
* Fixed typos in the acolyte nad mage skill quests. (bugreport:1531)
* Fixed issue with a removing a Keil Hyre cutin. (bugreport:1593) 
* Corrected a few oversights in the WoESE scripts.
* Added dummy "OnMyMobDead" label to a Niflheim NPC.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12718 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-05-20 12:53:54 +00:00
L0ne_W0lf
a554d00483 Implemented several "checkweights" in other NPCs.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12258 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-28 05:59:53 +00:00
zephyrus
6da0007d11 - Fixed a bug in Redemption and Close Cofine scripts.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12224 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-21 03:00:03 +00:00
samuray22
39d2d8fba7 * Corrected a bad duplicate name in Kafra Bank (Custom). (bugeport:921)
* Corrected a lot of ";;" Typo errors.
-Some of this are in the bugreport:919
* Corrected a Cutin Problem in Cooking Quest and a Delitem. (bugreport:911)
* Corrected some typo error with "rouge". (bugreport:909)
* Moved Custom Event folder to Custom Folder.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12177 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-05 17:54:03 +00:00