268 Commits

Author SHA1 Message Date
brianluau
90c355108c - Merged /branches/renewal/conf (partial)
- Merged /branches/renewal/db (only mob_db.txt and mob_skill_db.txt)
- Merged /branches/renewal/npc (full)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15060 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-11 19:24:13 +00:00
calciumkid
f358398d3e Fix of npc/other/pvp.txt variable calls. bugreport:5094
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15022 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-08 09:41:37 +00:00
brianluau
9aa3a700a7 - Removed .gat from map names.
- Removed trailing tabs in some warp portal files.
- Removed `loginlog` table from convert_engine SQL scripts, because it's in the log database.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14987 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-10-31 23:19:36 +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
c827ab3008 Updated dialog in monster_race.txt
Minor dialog updates to Nidhoggr's Nest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14912 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-18 17:16:46 +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
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
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
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
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
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
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
brianluau
6b106aeb56 - Fixed some small typos.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14382 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-18 23:32:03 +00:00
L0ne_W0lf
dc0977ed37 * Quest log kill count now updated properly. (Added from topic 253813)
* More battleground editing, and some bug fixes.
- * ALL BATTLEGROUNDS ARE NOW ACTIVE BY DEFAULT. PLEASE CONTINUE TESTING *
- Rewrote the Badge Exchange NPC in bg_common.txt, is official now.
- Other changes to the bg_common folder, including disabled GM NPC.
- Completely rewrote Flavius for the most part, from ground up.
- Moved old Flavius battlegrounds to /custom/battleground folder.
- Restored original bg_common, and KVM to /custom/battleground
- Fixed wall bugs in Tierra Gorge, and added an oninit to the timers.
- Other minor tweaks to both Tierra Gorge and KVM scripts.
- Fixed the pseudo-cooldown on KVM not working properly, I hope.
- Added global time2str function which will be used later in Endless tower.
* Applied Epoque's mapflag clean up, which removes flags from scripts.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14374 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-14 16:06:23 +00:00
L0ne_W0lf
9bb87169be * A rather large overhaul of the battlegrounds.
- in bg_common.txt, stripped out KvM npcs, fixed coordinates.
- Needs to be tested, none of the BG files are on by default.
- Created subfolder battleground/KvM/ which now holds KVM files.
- Added kvm_enter.txt, which warps players to the waiting rooms.
- Added kvm_item_pay.txt, which holds the point redemption NPC.
- Made the KvM battlegrounds work closer to official, needs work.
* Corrected variable typos in the acolyte arena. (bugreport:4374)
* Corrected donpcevent typo in the party arena. (bugreport:4374)
* Added two global functions which will return equip data as strings.
- F_GetWeaponType: returns the type of weapon by 'look', (ie "Dagger")
- F_GetArmorType: returns the kind of armor via 'equip loc'. (ie "Armor")
* Fixed duplicate documentation for getitemslot. (bugreport:4362)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14369 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-03 18:27:00 +00:00
L0ne_W0lf
900680b81e Added the acolyte-specific arena to the Izlude arena.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14366 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-07-30 01:07:21 +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
L0ne_W0lf
7af6738f52 Added a pc_isdead check to warpparty. Only warp and mapwarp (moveto, warpallpcinthemap, and warpwaitingpc aegis script equivilents) should revive players when placing them on new maps.
Updated F_CashPartyCall to use warpparty. Renamed original function to F_CashPartyCall2 and commented out.
Fixed an error in the monster race npcs calling a nonexistant OnEnable.
Renamed 'Tabb' in the 13.1 Draco egg daily quest to 'Taab'.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14313 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-29 17:37:57 +00:00
L0ne_W0lf
3922f5300e * Some bug fixing :x Nothing to new today folks! Stay tuned.
- Fixed input checks in the 'Ring of Wise King' quest. (bugreport:4147)
- Fixed some of the erros reported in the Oolnir scripts. (bugreport:4220)
- Added Azoi's giant flywing update to not warp dead players. (bugreport:4242)
- Fixed confusing inconsistancy in the nyd_dun mob spawn file. (bugreport:4246)
- Fixed the Manuk field 2 monsters spawning on Manul field 1. (bugreport:4248)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14305 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-25 03:09:22 +00:00
L0ne_W0lf
821713a26e * More bug fixing! Lots of little things, really.
- Corrected some condition errors in quests_veins. (bugreport:4088)
- Corrected specialeffects so they play on the right NPC. (bugreport:4090)
- Corrected an item ID in the reward NPC in monster races. (bugreport:4092)
- Corrected NPCs overlapping with quests in msg_boards (bugreport:4093)
- Corrected some of the given errors in the 2007_relay quest. (bugreport:4094)
- Corrected hideonnpc to disablenpc in ice dungeon 4 warps. (bugreport:4102)
- Commented out duplicate library curator in prontera city. (bugreport:4105)
- Corrected cutins not being removed on NPC end in sealed shrine. (bugreport:4117)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14262 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-03-13 05:12:15 +00:00
L0ne_W0lf
38617b38fd Updated the Enlarge Weight Limit NPC. It is now a conversion of an aegis script, with iRO dialog.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14224 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-01-22 23:07:37 +00:00
brianluau
ebc71ca92f - Added a missing space in help.txt (bugreport:3632)
- Removed duplicate lines in item_trade.txt (bugreport:3630)
- Fixed typos in Turbo Track waitingrooms. (bugreport:3628)
- Removed a duplicate comment line from r14003 that caused a warning.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14081 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-10-04 19:58:23 +00:00
brianluau
34398c1fd7 - Delete their Gym Pass before giving them the skill. (bugreport:3592)
- Fixed 2 typos and a cutin that didn't go away in Kiel Quest. (bugreport:3597)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14063 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-17 04:59:48 +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
brianluau
2a499f4eda - Added missing 'break' in Fortune Teller. (bugreport:3448)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13985 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-01 06:56:54 +00:00
Inkfish
e7f237e2c0 Fixed "OnMobDeath" doesn't work sometime in Izlude Party Arena.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13953 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-07-18 08:23:51 +00:00
L0ne_W0lf
0143414445 * Completely rescripted the DTS warp service based on the aegis 11.3 file.
- Updated F_ClearGarbage to erase obsolete DTS player variables.
- Moved Cool Corp. Staff NPCs to Lighthalzen (cities/lighthalzen.txt.)
- Now everyone can enjoy the global broadcast "every-hour-nag" to vote!
- Note: Upon loading ALL prior DTS global variables are erased.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13764 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-12 21:52:11 +00:00
Playtester
dea692f95a * Various script updates
- Removed the Acorn repeatable quest (got removed on iRO)
- Re-enabled Umbala bungee jumping (bugreport:2978)
- Fixed a reward in monster race (bugreport:2990)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13682 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-20 18:49:51 +00:00
akrus
a45031021f Fixed several mistakes in Turbo Track scripts (bugreport:2829)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13580 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-12 09:50:54 +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
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
Paradox924X
336cf799b3 Could someone please explain to me why that last commit didn't do jack shit? =.=;;
Anyways, *now* its fixed.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13329 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-10-28 01:08:03 +00:00
Paradox924X
85b0e78eff Replaced 96 instances of "S_BonusREward" with "S_BonusReward" as it should be in monster_race.txt.
Someone failed at making delicious copypasta. :(

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13328 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-10-28 01:03:51 +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
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
6ef5c37fd3 * Continues replacing of specialeffect/2 numerics with constants.
- A lot of files still remain, but they don't have the proper effect names in commented in beside the ID. ;P
	

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13238 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-25 22:41:48 +00:00
L0ne_W0lf
0f690b3505 Corrected Sealstatus checking global vars instead of character.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13224 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-21 09:56:06 +00:00
L0ne_W0lf
8fc9735a1f * Fixed DZeroX's fix! (Missing ;'s)
* Added Guild PVP NPC, and seal progress NPC.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13222 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-20 19:13:08 +00:00
L0ne_W0lf
2b12bb4d62 Corrected a typo in monster races. (bugreport:2147)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13209 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-14 12:56:28 +00:00
L0ne_W0lf
d60db9cfcf * Just fixing some reported script bug.
- Fixed coordinate in level 60 arena. (bugreport:1663)
- Fixed errors in the Keil Hyre quest. (bugreport:2129)
- Fixed guild look ups in Arug_cas02. (bugreport:2134)
- Corrected treasure spawn in schg_cas03. (bugreport:2142)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13152 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-29 11:17:04 +00:00
L0ne_W0lf
f307b56ef2 Updated the dungeon teleport scroll menu.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13068 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-10 23:04:16 +00:00
L0ne_W0lf
30b8c64a10 * Rather massive item database update.
- Added a lot of items, though some are not implemented.
- Updated a lot of the current prices for many items
- All items now use the "Buy" column for price.
* Added new skills to the skill database. (commented out)
* Updated item trade database with new items.
* Updated Cashshop functions.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13066 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-10 19:20:11 +00:00
Yommy
98a152d4d3 copy paste error in monster race (bugreport:2035)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13065 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-10 18:29:09 +00:00
Yommy
c46226e3d1 fixed bug reports (bugreport:1556 bugreport:1913 bugreport:1839)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13061 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-10 00:10:49 +00:00
akrus
2685842871 sleepy... some more typo fixes (bugreport:1983 + bugreport:2008)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13049 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-06 01:52:14 +00:00
L0ne_W0lf
3e64e0bf24 Implemnted Hugel Monster Races.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13037 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-03 14:50:14 +00:00
L0ne_W0lf
e787f3ca89 * Corrected Luna Bow Bonuses. (bugreport:1919)
* Swapped dis/enable for hideon/off in wedding script.
* Corrected Slotting NPCs triggering on touch. (bugreport:1916) 
* Added a missing close in juperos quest. (bugreport:1918)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12993 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-25 15:22:54 +00:00