105 Commits

Author SHA1 Message Date
iraciz
fad58cd3c1
add cutins for Friendship Quest (#5004) 2020-06-08 23:52:59 +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
JohnnyPlayy
081b7cd388 Lighthalzen Quest NPC ID Fix (#4392)
* Changed NPC view ID to constants.
2019-10-12 12:15:01 -04:00
Aleos
995fb2a0a1
Corrected NPC view constant verification (#4398)
* Fixes #4397.
* Corrected NPC view constant verification stopping at the first digit found resulting in invalid results.
Thanks to @Lemongrass3110!
2019-10-09 12:05:08 -04:00
Atemo
3a8814ac4e
Fixed Regenschirm Guard Laboratory Permit issue (#3056)
Thanks to @juanfus !
2018-04-16 17:01:01 +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
Lemongrass3110
2043c95e66 Refactored hardcoded npc event names (#1767)
While refactoring those events the following other changes were made:

Introducing OnInstanceDestroy event. This event can be used to hook script code right in front of the instance destruction. This can be useful if you have any stored references to an instance id for example.

The script command cmdothernpc will now check if the target event exists and report failures. Therefore it now returns true or false.

All agit(FE,SE,TE) start and end commands from atcommand and script commands have been merged in their respective guild function which now returns a bool value of true for successful actions and false if it did not succeed(if the specific WoE was [not] running).

All global triggered events with mapserver status output now call the same function and therefore have the same mapserver output(including their respective event name of course).

Renamed a few events in the script configuration to match the other names

Added constants for months and weekdays

Additionally added constants for gettime types to make it easier to read.

Replaced all existing usages I found with their proper new syntax or better fitting functions.
2017-01-10 22:58:04 +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
d017e24cd2 Adjusted some scripts to the new syntax
Follow up to fd48238
Thanks to @Everade and @Jeybla for reporting this problem in #1468
2016-08-05 00:28:23 +02:00
Atemo
56a744014b Fixed some quest log issues.
#871
#872
#873
Fixed #875
2016-01-06 03:42:19 +01:00
Brian
0161467f97 Fixed #431 2015-05-11 10:41:39 -07: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
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
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
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
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
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
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
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
8b9f66f562 * Added a point to 'npcskill' documentation.
* Added Malangdo Tool Dealer.
* Fixed quest log sample, which never worked to begin with -- thanks clydelion!
* Fixed potential error with clones in custom Hunting Missions script (bugreport:7055).
* Follow-up r16990, forgot to commit the EXP fix.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17055 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-28 04:10:17 +00:00
euphyy
2adc9cdf28 * Follow-up r16726, more standardization on docs.
* Replaced and added dividers in many script files with one standard divider.
* Other misc. cleaning...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16727 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-01 00:37:36 +00:00
daegaladh
178bfb2839 Fixed a bunch of bugs and typos, and made some little optimizations in various quests.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16604 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-08 04:19:17 +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
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
brianluau
3aede46965 - Removed trailing tabs, and fixed some spacing.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15524 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30 16:02: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
brianluau
74a8163524 - Added 'nopenalty' mapflag to mosk_ship. (bugreport:3109)
- Fixed some strange dialog in President Quest. (bugreport:1755)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15109 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-14 18:21:29 +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
f0d5c981e1 * Merged changes from trunk [14827:14894/trunk].
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14895 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-10 06:17:06 +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
Kisuka
1b38a1964b * Merged changes from trunk [14688:14739/trunk].
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14740 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-09 12:50:24 +00:00
L0ne_W0lf
85a4250060 * Added quest log support for the following quests.
- Factory Quest, Murder Quest, Cursed Spirit Quest, Juno Remedy Quest, Airship Ticket Quest, How the Airship Works, Ice Necklace Quest, Siblings Quest, Thor Volcano Base Quest, Muff's Loan, Broken Diamond, and the Z-Gang Quest


git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14490 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-23 00:42:25 +00:00
Gepard
ce00ef6973 * Official Lighthalzen Gangster Alert script.
* Fixed typo in Amatsu Dungeon Entrance Quest.
* Removed duplicate nomemo mapflag entries.
- added changelog entries for my previous commit


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14362 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-07-07 22:04:39 +00:00
brianluau
7dcad16f3c - Fixed some emotions triggering on the wrong npc. (bugreport:4303)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14346 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-18 05:05:33 +00:00
Kisuka
21b9d65513 Bug Fixes:
- Check if user has zeny. (bugreport:2498)
- Fixed typo. (bugreport:2473)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13389 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-11-29 18:36:09 +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
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
L0ne_W0lf
4456bc6b6a Corrected some issues with the lighthalzen biolab quest. (bugreport:1798)
Reverted r13227. Biolabs quest no longer uses temp character variables.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13228 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-21 19:13:53 +00:00
samuray22
b5c3c986a6 * Deleted Unnecesary Next; in Hunter Job Quest. (bugreports:1665,2239,2179)
* Fixed a bug with the Bio Lab Quest when you relog. (bugreport:1798)
* Corrected some Issues with the Waiting Room in Hunter Job Quest. (bugreport:1890)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13227 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-21 17:34:34 +00:00
ultramage
7444eb572c Random assortment of various small corrections and tweaks.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12894 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-29 06:00:05 +00:00
L0ne_W0lf
7f3f3683d9 Corrected variable used in Lighthalzen quest.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12388 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-17 17:51:33 +00:00
L0ne_W0lf
68c7440203 Updated Lighthalzen dungeon and friendship quests.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12263 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-28 21:48:26 +00:00
L0ne_W0lf
1e2c57d2c3 Updated Lighthalzen Town NPCs and Speed Potion quest.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12155 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-01 00:07:20 +00:00
SinSloth
3f5bbce439 * Added Rekenber Job quest which was missing for some unknown reason.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11597 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-28 17:15:55 +00:00