71 Commits

Author SHA1 Message Date
Daegaladh
d1e5127728
Fixed getcharid error in Continental Guard quest (#4970) 2020-05-18 18:52:08 +02:00
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
Atemo
34971e57fa
Wounded Morroc cooldown (#4207)
* Fixed an issue with a cooldown after killing Wounded Morroc
* Fixed #4205 

Thanks to @Tokeiburu !
2019-06-11 15:44:12 +02:00
Atemo
756ef38bc9
Fix for issue #3701 (#3702)
Thanks to @teededung for reporting it
Fixed #3701
2018-11-30 15:53:07 +01:00
zackdreaver
91667a9a11 Update Renewal and Pre-renewal Morocc NPCs (#2977)
Fixes #3392 

Thanks to @zackdreaver, @AzarthMZintos and @Lemongrass3110
2018-08-17 10:27:26 +02:00
Atemo
7a8ac46421
Banquet for Heroes ep 16.1 (#3234)
Banquet for Heroes ep16.1 - walkthrough conversion
* Added main quests of ep16.1 and the quests entries
*** Walther's daily quest will be enabled after quest_db refactor
* Added instances Ritual of Blessing and Room of Consciousness
* Added monsters spawn and entries on prt_prison, prt_cas and prt_q maps
* Prontera castle map changed in this ep
- Moved some NPCs from prt_castle to prt_cas
- Added warps on prt_cas
- Succession of the Prince quest is removed in ep16.1

Thanks to @admkakaroto, https://www.divine-pride.net/ 
@yoonjunho72, @teededung, @ecdarreola, @spinzaku and to all the contributors !
2018-07-13 15:49:33 +02: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
Jeybla
9e6b02ae59 Fixes a getcharid error message. (#2106)
* In quests/quests_morroc.txt Continental Guard.
2017-04-29 19:20:25 +02: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
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
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
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
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
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
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
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
ef338e07c2 * Optimized "3rd Item Seller" script (re\merchants\3rd_trader.txt)
* Optimized Eden Quest lv. 71-85 (re\quests\eden\)
* Deleted a duplicate NPC, bugreport:6564 (re\quests\quests_dicastes.txt)
* Other small fixes

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16715 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-27 20:37:19 +00:00
brianluau
b0bd614417 - Fixed a close in The Crow of the Fate quest. (bugreport:6571)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16714 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-27 19:32:31 +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
euphyy
766c527f0c * Optimized "Elemental Stone Trader" (merchants\elemental_trader.txt)
* Optimized "Armor Enchanter" (merchants\enchan_arm.txt)
* Optimized "Manuk Merchant" (merchants\manuk.txt)
* Fixed an incorrect variable in "Thanatos Tower" script, as per bugreport:6073 (quests\thana_quest.txt)
* Reverted quests_morocc edit, encoding error? - bugreport:6067 (quests\quests_morocc.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16325 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-20 21:21:00 +00:00
euphyy
63cb8093e1 * Reverted a few garbled characters that may have been causing errors (quests\quests_morocc.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16324 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-20 05:11:33 +00:00
euphyy
778f76eee5 * Optimized "Guild Battle NPC" (other\guildpvp.txt)
* Cleanup of "Gonryun Power Arena" script (other\powernpc.txt)
* Condensed "Seal Status" script a little bit (other\sealstatus.txt)
* Other general cleaning... :3

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16323 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-20 02:06:41 +00:00
brianluau
4dda26754e - Changed more duplicates so the source is a floating/mapless npc. (bugreport:1335)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15798 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-26 18:57:18 +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
calciumkid
27dd205f45 bugreport:4100 fix
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15182 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-20 10:18:03 +00:00
L0ne_W0lf
479efa216d Updated most active NPCs that give EXP to renewal standards.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14920 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-21 20:57:57 +00:00
ai4rei
96a6a43e85 * Merged changes from trunk [14742:14782/trunk].
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14783 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-09 09:09:35 +00:00
L0ne_W0lf
f0c8ddc1bc * More Orc Instance updates, and some new 13.1 quests. :x
- Disabled an exploit related to the orc hero spawn.
- Corrected the variable type for party leader name.
- Commented out the assassin pub NPCs in quests_morroc.
- Cat Hand Agents no longer ignore you with 300+ points.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14211 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-12-21 01:48:46 +00:00
L0ne_W0lf
1b8628e876 * Changed attribute_recover to no, being hit by the same element should not recover HP.
* Added monster_noteleport to Okolnir quest maps. Will fix the tarot card issue.

- Fixed Brynhild dialog in the Asprika quests. (bugreport:3085)
- Removed "Disabled" tag from Volcano base quest. (bugreport:3342)
- Attempted to fix the sign quest dancing portion. (bugreport:3382)
- Fixed Guardian in schg_cas03 using invalid coords. (bugreport:3462)
- Fixed Turbo Track records using wrong variable type. (bugreport:3484)
- Fixed the checkweights in the Crow of Fate quest. (bugreport:3500)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14013 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-18 22:33:33 +00:00
L0ne_W0lf
44d933c0e1 *More episode 12.1 updates, mainly to morroc quests.
- Updated Satan Morroc to allow people who have finished it to return to the previous map.
- Added quest log commands for Resurrection of Satan Morocc.
- Added the two remaining episode 12.1 quests.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14001 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-12 06:20:41 +00:00
brianluau
eebb014937 - Fixed a typo in r13915, causing SC_values 247+ to be off by one.
- Reverted the Continental Guard change from r13911 (that's how it is on official).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13917 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-28 17:06:14 +00:00
brianluau
4ed47c3153 - Moved the anthell warp agent to the new entrance. (bugreport:2801)
- Added missing 'F_GldTreasSw' function for Novice Castles. (bugreport:3292)
- Removed OnTouch trigger area from Continental Guard NPCs.
- Corrected the observatory warp portal. (bugreport:3293)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13911 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-26 20:39:22 +00:00
L0ne_W0lf
76397f8bc7 * Another round of bug fixes to various scripts.
- Added Satan Morroc spawn and corrected shadow spawn timers. (bugreport:2690)
- Fixed Group of Evil NPC not reactivating  when it should. (bugreport:2696)
- Fixed the Zeny check when summoning guardians in agits. (bugreport:2712)
- Added zeny check to Jawaii bartender (hung the script.) (bugreport:2747)
- Corrected a mapwarp assosiated with the z-gang quest. (bugreport:2757)
- Fixed warps in ice dungeon 3 being usable all the time. (bugreport:2776)
- Corrected impossible condition if in Keil Hyre quest. (bugreport:2789)
- Corrected leftover aegis variables in several scripts. (bugreport:2794)
- Removed duplicate line from nameless quest. (bugreport:2795)
* Implemented official behaviour/Cost for investing in economy and defence
- Eco/Def will be modified on the turn of the day instead of immediately.
- Cost has been updated to official values. Investing twice now costs 4 times the first investment.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13559 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-03 04:11:22 +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
Kisuka
18841adcc2 Some bug fixes. (bugreport:2558, bugreport:2588, bugreport:2583, bugreport:2587)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13416 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-27 16:53:31 +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
f78f7d20f6 * Continues replacing of specialeffect/2 numerics with constants.
* Corrected an If to continue the President's Quest. (bugreport:2276)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13241 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-27 12:41:13 +00:00
L0ne_W0lf
3d4883f590 Updated several ancient headgear quests.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13163 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31 22:17:21 +00:00
L0ne_W0lf
88243637cc Assassins will now get their request item. (bugreport:1220)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12431 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-25 02:17:19 +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
L0ne_W0lf
5550180be2 * Updated NPC headers to fix errors caused by rev. 11603.
- Note: non-standard loaded scripts need to be checked for errors/duplicates.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11605 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-28 23:36:53 +00:00
L0ne_W0lf
1607b50c59 Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up the warnings it produced.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11516 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-18 22:04:47 +00:00
SinSloth
48b79eda11 * Made some changes due to recent fixes in the Sign Quest.
* Dandelion's Request event now resets properly after it has been completed by a player.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11079 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-28 22:16:01 +00:00
Lupus
2af265d1b1 replaced some item names with item IDs, also fixed a bug in skill quest (some items weren't deleted)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10992 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-13 09:13:21 +00:00
SinSloth
45824e44b5 * Fixed a small bug with the Sign Quest XP rewards.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10967 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-09 09:52:17 +00:00