14 Commits

Author SHA1 Message Date
Capuche
af26677740 Bugfix and clean-up
- Added NPC const
- Added checkdragon() in F_CashReset
- Clean-up books.txt, fortune.txt, card_trader.txt, 3rd_trader.txt, stone_change.txt, quests_brasilis.txt
- Minor fix about Weight in comodo_gambling.txt
- Change to F_GM_NPC function in Mercenary Guild Switch follow up bdab851129ceee57a38ccc9d819b42011ef19fb7
- added Mercenary Switch in gm_npcs.txt list
- change to common green maiden in 2010 Headgear Quests

Signed-off-by: Capuche <capucrath@gmail.com>
2014-07-04 02:14:30 +02:00
Capuche
bdab851129 - Added mercenary guild switch npc from aegis
- Fixed a bug to rent a mercenary in izlude duplicate (it gave a wrong mercenary)
- added a missing delitem in cupet.txt (forgot to delete the 2nd item)
- change the rand part in Mysterious Documents npc in magic_books.txt to match aegis
- little clean up in quests/ninja_quests.txt
- replace the npc id to the constant in theses files

Signed-off-by: Capuche <capucrath@gmail.com>
2014-06-30 17:07:05 +02: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
17d000640d * Added 'breakequip' script command. (tid:86732)
* Fixed return value for delequip. (since r17469/8bd0985)
* Fixed a bug with Mercenary Rentals. (credits: TTest)

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-04 15:07:26 -04:00
j-tkay
b69f0ad825 - Fixed bugreport:6993, invalid item id in mercenary script. (other/mercenary_rent.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17016 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-11 18:38:42 +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
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
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
L0ne_W0lf
25e986bc8a - Changed some duplicates so they use a floating NPC as their original. (bugreport:1395)
- Fixed the NPC looking for missing label in the Cursed Spirit quest. (bugreport:4654)
- Applied Uno's fix for the cooldown condition in Endless Tower. (bugreport:4677)
- Removed level requirement for the Viens Stone gathering quest. (bugreport:4678)
- Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707)
  It's worth noting how much I hate the system for restricting skills per zone.
- Fixed Cat Hand warp service warping players to all warp options. (bugreport:4709)
- Fixed floor 75 warp in endless tower disabling the wrong warp. (bugreport:4711)
- Added a condition for Chungwolmang to only delete items if a certain ID is specified. (bugreport:4719)
- Corrected a mobcount specifying the wrong NPC in the Moscovia Ship quest. (bugreport:4736)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14697 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-06 22:10:54 +00:00
L0ne_W0lf
8f4832ca4c - Removed redundent input from mercenary vendor. (bugreport:2427)
- Corrected Wolfheiden and Mithril magic cape skill levels. (bugreport:2431)
- Corrected 12.1 monsters using penuma on target not self. (bugreport:2435)
- Fixed delitem causing the sign quest to fault. (bugreport:2444)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13376 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-11-18 18:14:18 +00:00
L0ne_W0lf
139fc00c19 Added Mercenary System related NPCs.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13250 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-30 21:59:23 +00:00