42 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
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
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
Atemo
56a744014b Fixed some quest log issues.
#871
#872
#873
Fixed #875
2016-01-06 03:42:19 +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
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
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
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
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
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
a43212a2f4 - Reduced 300+ copy-paste lines to 1 duplicated npc in eden_common.txt (suggestion bugreport:5795)
- Replaced more unconverted 'inputstr' in several npc scripts, and changed to scope variables.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16149 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-25 15:45:31 +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
brianluau
d90c239808 - Changed Sweet_Potato --> Potato to avoid confusion with the taming item. (bugreport:2150)
- Changed duplicates in /npc/custom/ so the source is a floating/mapless npc. (bugreport:1335)
- Fixed some bad English in Biological Weapon Quest. (bugreport:1745)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15075 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-12 14:52:31 +00:00
ai4rei
6a6aa10721 * Merged changes from trunk [14895:14966/trunk].
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14967 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-10-07 21:35:12 +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
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
L0ne_W0lf
f9f50d8c09 * Fixed Flavius only needing 1 person on either side to start.
* Updated the level 4 weapon quest to aegis conversion.
* Corrected a variable typo in the dts_warper script.
* Fixed a script hang in Hugel Temple Excavation quest.
* Fixed Cat Hand Agent checks, and mysterious rock#31.
* Corrected the two hour time limit for Sealed Shrine.
* Corrected a few other minor issues in Sealed Shrine.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14376 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-16 17:09:33 +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
L0ne_W0lf
84cf9ff2c9 Applied patch from Dani to change NPC emotion events to use the updated emotion command. (bugreport:4318)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14347 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-18 16:19:48 +00:00
brianluau
35785a3e20 - Fixed 2 minor typos. (bugreport:3155)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13835 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-01 22:49:08 +00:00
Kisuka
d95ad1e02a - Small fix to zeny check in airships.txt (bugreport:2763)
- Fixed a typo in thana_quest.txt (bugreport:2783)
- Added missing dialog to Biological Weapon Quest. (bugreport:2778)
- Optimized and fixed getequipname() in card_remover.txt (bugreport:2156)
- Added missing npc name in Lvl4_weapon_quest.txt (bugreport:2764)
- Updated item scripts for 12294 to 12297. (bugreport:2766)
- Updated item 1483 (Ivory Lance). (bugreport:2753)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13537 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-02-18 23:57:29 +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
akrus
eaa85e10a3 typo fixed ;)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12990 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-25 02:05:33 +00:00
shadow
d94dc685e1 git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12945 54d463be-8e91-2dee-dedb-b68131a5f0ec 2008-07-12 04:08:33 +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
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
L0ne_W0lf
edd19c4e08 * Several small fixes to scripts, and updates.
- Updated City warps for Lighthalzen, and dugneon warps.
- Updated castle warps for Schwaltzvalt Castles Map.
- "The Sign" quest is now enabled by default. (bugreport:1011)
- Added Dimensional Gorge map spawns (According to RO Future Wiki)
- Updated Lighthalzen boss spawning mechanisim to official.
- Fixed a small error in the novice potion exchanger.
- Resolves the following: bugreport:879 bugreport:973 bugreport:983 bugreport:1013 bugreport:1021 bugreport:1024 bugreport:1026

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12227 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-22 06:16:21 +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
SinSloth
ea5a2947bd * Small fixes to Hugel and Lighthalzen quests.
- 'gettimetick' checking in Schwartzvalt Trilogy now looks for both positive and negative values.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11528 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-20 17:40:30 +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
b67f4855d1 * Updated experience rewards in a lot of quests to match upcoming rate adjustments changes.
- Please use 'getexp' command when rewarding experience in any lore-related quest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11165 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-10 13:15:55 +00:00
samuray22
023cbf5dab * Rev. 10895 Added a Missing "close;" in "Bomb Maker" from "quests_hugel".
-Thanks to Elfange.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10895 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-22 18:29:10 +00:00
samuray22
d21f32aa73 * Rev. 10893 Correct some typos error like "next;ing".
-Thank to theultradamage

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10893 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-22 18:12:12 +00:00
SinSloth
2c86752e59 * Added all Hugel-related quests. Thanks to MasterOfMuppets for scripting most of them.
- Updated some Hugel, Lighthalzen, Einbroch and Airship NPCs regarding those new quests.
- Moved a lot of Hugel NPCs to proper quest file.
* Added Odin Temple Excavation quest.
- Updated Hugel warps and Odin Temple Sailor according to the quest.
* Added Heart Fragment quest.
* Updated Ayothaya's Ring quest to official. Credits to MasterOfMuppets.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10772 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-15 16:01:40 +00:00
SinSloth
e7d768edff * Added first part of Hugel quests. Credits go to MasterOfMuppets.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10750 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-12 17:46:12 +00:00