2159 Commits

Author SHA1 Message Date
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
a49d7f6afd * Added missing Hair Dressers and Hair Dyer to Lighthalzen.
- Hair Dresser will change hair styles ranging between 20 to 27
- Assistant Beautician changes to a random style and colour between 1-23.
* Updated the Cursed Spirit quest, and added some more town NPCs.
* Added more town NPCs to Splendide and Manuk.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14780 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-08 19:03:24 +00:00
L0ne_W0lf
4d91919c09 Added two new quests, Alberta Boy and Secret Note of Bazett.
Implemented 13.2 update to Report to the New World quest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14775 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-06 21:46:28 +00:00
L0ne_W0lf
f32d321c7a * If you're going to take credit for someone elses work (irony) make sure it's not my work.
- Corrected credits in the Eden Quest files.
- Removed showevent use in the eden_common file.
- Removed the duplicates in the eden_common file.
- Removed the korean comments in the eden_quests.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14769 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-06 15:04:41 +00:00
Kisuka
f5acf265dd - Eden Group Quests and Services added.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14768 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-06 13:38:07 +00:00
Kisuka
bf12d754cc - Completed L0ne's 2007 request for 'waitingroom' to support required zeny and level.
- Updated NPC files which required the waitingroom update.
- Added Poring War script.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14765 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-05 06:00:20 +00:00
Kisuka
24f991b74b - Correct warps for The Sign Quest.
- Correct weight for Sealed Scroll.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14758 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-22 22:07:53 +00:00
Kisuka
8da1877917 - Renewal changes to The Sign Quest.
- Correct warps for The Sign Quest.
- Correct weight for Sealed Scroll.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14757 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-22 22:07:31 +00:00
Kisuka
1d22347126 - AEGIS Conversion of Mob Spawns.
- Added 3rd class blanks / skeletons.
- Added Brasilis and Dicastes mob spawns (disabled until episode is added).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14755 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-22 09:45:13 +00:00
Gepard
f268ce1577 * Fixed and commented out old Anthell entrance warps (bugreport:3589).
- Moved entrance to cmd_fild08 to match mapcache updates.
* Fixed an issue in Resurrection of Satan Morroc (Continental Guard Quest) when player dying/logging out during conversation could prevent summoning of Satan Morroc until server reboot (bugreport:3437).


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14753 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-20 23:18:07 +00:00
ai4rei
d94a5ff6d0 * Fixed battleground kvm02 and kvm03 scripts referring to NPCs in the custom battleground kvm (bugreport:4812, since r14369).
- Fixed kvm02 printing different amount of points, than it actually gives.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14750 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-20 20:10:33 +00:00
Gepard
c8bff5a3be * Endless Tower fixes:
- Added missing end's to prevent accidental disabling of warps between floors. (bugreport:4623)
- Added missing end's to prevent infinite mobspawn (bugreport:4540)
- Commented out remaining GM-only NPCs.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14747 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-17 16:04:34 +00:00
ai4rei
953d40de4c * Fixed some missing/wrong bits in merge from trunk (follow up to r14740).
- Fixed added files not being svn-copied (thus lacking svn history).
- Applied missing property changes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14741 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-09 19:00: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
Kisuka
54f90425dd - Some fixes to the Novice Training Grounds.
- Added Renewal 1-1 Job Change.
- Updated monster spawns to Renewal.
- Disabled Umbala dungeon mob spawns (Since it was removed).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14736 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-08 09:58:56 +00:00
Kisuka
49c387187b - Removed 'New Novice Grounds' from trunk since it's renewal only.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14735 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-08 07:41:37 +00:00
brianluau
82048a049b - Updated SQL item/mob databases to latest. (thanks Peter)
- Updated item/mob txt-to-sql converter scripts to append a blank line at EOF.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14727 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-01 00:37:13 +00:00
Kisuka
6a32bd6c31 - Added Buying Shop NPCs
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14722 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-21 06:57:22 +00:00
Kisuka
261a46ae4e - Added Buying Shop NPCs
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14721 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-21 06:57:12 +00:00
brianluau
5c70e95c79 - Set svn:mime-type properties on readme files so they can be browsed directly from the SVN.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14712 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-19 03:25:29 +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
Kisuka
6c34417328 - Added Renewal Novice Training Grounds.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14710 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-19 00:06:53 +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
ai4rei
d41e850975 * Merged changes from trunk [14636:14686/trunk].
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14687 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-30 00:25:44 +00:00
ai4rei
9799eb3699 * Various fixes for scripts that are disabled by default.
- Fixed name collision in Baphomet Jr. taming item quest (custom) with 'Little Boy' in cities/lutie.txt
- Fixed name collision in THQS_Quests (custom) with 'Little Girl' in cities/lutie.txt
- Fixed outdated reference to npc_dynamic_shop sample (follow up to r14277).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14676 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-16 14:05:21 +00:00
brianluau
6db17907b0 - Removed extra slashes in item_db.txt (bugreport:4686)
- Removed punctuation from Time2Str script function.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14655 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-08 08:55:02 +00:00
ai4rei
2b6f273e92 * Merged changes from trunk [14496:14630/trunk].
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14632 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-26 22:36:41 +00:00
ai4rei
e560ba458b * Revised argument declaration of all script commands according to the actual functions' argument usage.
- Fixed many script commands with fixed amount of optional parameters to no longer accept any amount of arguments (faulty declaration).
- Corrected use of dummy parameter for guildopenstorage in scripts.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14573 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-10 22:29:12 +00:00
L0ne_W0lf
d68eeba638 Corrected incorrect bonuses relating to bAddMonsterDropItem/Group. (burgerport:4569)
Updated the IG_Ore, IG_Food, IG_Recovery and IG_Jewel item groups to official items/rates.
As a result bAddMonsterDropItemGroup now uses the highest rate in group as it's base rate.
Updated instances with more proper English, care of Resplendent.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14555 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-03 16:14:07 +00:00
L0ne_W0lf
e4ae836f44 Updated some more cash shop boxes to use rentitem instead of getitem.
Added mercenary skills for Mimic, Disguise, Alice, Doppelganger, and Egnigem.
Removed duplicate NPCs in Lighthalzen and Morroc. (bugreport:4555)
Corrected typo (Sit -> Suit) in enhcant_arm NPC. (bugreport:4586)
Corrected a typo in the christmas_2008 event. (bugreport:4600)
Changed which White Lady spawns in endless tower. (bugreport:4601)
Also added Quest Log Entries to Endless Tower, please test.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14552 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-03 02:24:34 +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
6f62ea2499 * 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/trunk@14490 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-23 00:42:25 +00:00
L0ne_W0lf
0c14edaeb0 * Updating spawns as a precursor for Eden group quests.
* Updated spawns for Juno fields to Renewal.
* Updated spawns for Umbala fields to Renewal.
* Updated spawns for Comodo fields to Renewal
* Updated spawns for Mjolnir fields to Renewal.
* Updated spawns for Payon fields to Renewal.
* Updated spawns for Morroc fields to Renewal.
* Commented out repeatable EXP quests.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14462 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-14 20:07:55 +00:00
brianluau
f61f849488 - Fixed a typo in abra_db.txt (bugreport:4548)
- Fixed a weight check in Level 4 Weapon Quest. (bugreport:4533)
- Removed a duplicate if() in battle.c, follow up to r14381. (bugreport:4549)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14461 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-13 18:23:35 +00:00
brianluau
a7ef583dcb - Fixed a typo in abra_db.txt (bugreport:4548)
- Fixed a weight check in Level 4 Weapon Quest. (bugreport:4533)
- Removed a duplicate if() in battle.c, follow up to r14381. (bugreport:4549)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14461 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-13 18:23:35 +00:00
L0ne_W0lf
c3322bda41 * Just a couple Bug fixes. :P
- Added a missing close in quests_13_2.txt. (bugreport:4520)
- Corrected 'IProntera' typo in quests_prontera.txt (bugreport:4522)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14448 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-05 02:02:53 +00:00
L0ne_W0lf
3a3e2cde66 * Just a couple Bug fixes. :P
- Added a missing close in quests_13_2.txt. (bugreport:4520)
- Corrected 'IProntera' typo in quests_prontera.txt (bugreport:4522)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14448 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-05 02:02:53 +00:00
L0ne_W0lf
83bc339cef * Updated stats for monsters that spawn on Geffen Fields.
* Packet_db now uses packet_db_ver set to default
* Updated spawns for Geffen fields to Rewnewal.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14435 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-28 15:42:15 +00:00
Gepard
123a803ccb * Removed unused 'indoors' mapflag (follow-up to r3729).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14434 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-21 00:38:57 +00:00
Gepard
fa5f2d25ee * Removed unused 'indoors' mapflag (follow-up to r3729).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14434 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-21 00:38:57 +00:00
L0ne_W0lf
355bb58f5c * Updated stats for monsters that spawn on Prontera Fields.
* Updated spawns for Prontera fields to Rewnewal.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14433 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-20 04:19:42 +00:00
Inkfish
cc758e9c60 Fixed a typo in quests_13_1
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14431 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-13 10:27:19 +00:00
Inkfish
1e060a7ade Fixed a typo in quests_13_1
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14430 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-13 10:26:04 +00:00
L0ne_W0lf
80df86d7f7 * Wot's dis? Missed a warp in morroc field! THIS WILL NOT DO.
- ...corrected the versions in the file headers as well. :P


git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14423 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 03:59:15 +00:00
L0ne_W0lf
a9de18e42d * Renewal Update to warp portals, and deleted disabled_warps.txt.
- Only disabled warps, some coordinates might have slipped past me.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14421 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 03:51:07 +00:00
brianluau
8f05766ab1 - Added instance, GVG, and BG maps to nopvp.txt (bugreport:4396)
and changed /conf/mapflag/nopvp.txt to be loaded first.
- Removed a duplicate line in item_misc.txt (bugreport:4453)
- Updated script paths to custom BG scripts, follow up to r14374. (bugreport:4443)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14411 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-02 18:33:10 +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
4ebd58b32d * Some more Endless tower bugfixes.
- Fixed some copy/paste errors (1@orc -> 1@tower)
- No longer resets entrance time when re-entering.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14407 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-09-13 14:31:36 +00:00
L0ne_W0lf
a41b86bfdc * Implemented Icescope's fix for devotion, reflect damage is no longer absorbed by the devoter. (bugreport:3189)
* As a folow up to r14301, increased MAX_REG_NUM to 256, to prevent possible data loss.
* Touched up the endless tower script slightly.
- Added ends to several NPCs which would allow you to restart timers.
- Added some missing stopnpctimers to npcs. (bugreport:4418)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14400 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-09-06 19:15:17 +00:00
L0ne_W0lf
7fb5455c0a Removed a disablenpc from #102FShadowDust1. (bugreport:4415)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14397 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-28 17:06:14 +00:00