288 Commits

Author SHA1 Message Date
kenpachi2k11
9f9dd5f6a6 Updated locations for colored Butterfly Wings (14582-14585) to official.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15955 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-24 19:42:07 +00:00
og2
075af3d29e Changed PvPNarrator and GateKeeper to Floating NPC (bugreport:5512) Thanks to Daegaladh.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15805 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-27 22:14:31 +00:00
og2
e56ee37184 ~ Updated a few Descriptions
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15803 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-27 03:26:13 +00:00
og2
3e0f2eb8e7 - Updated Narrators/GateKeepers, etc.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15800 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-27 01:51:39 +00:00
brianluau
4dda26754e - Changed more duplicates so the source is a floating/mapless npc. (bugreport:1335)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15798 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-26 18:57:18 +00:00
og2
1d01830661 Fixed char being stuck with breaks (bugreport:5374)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15681 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-12 23:59:16 +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
gepard1984
e5386ce866 Added missing svn:eol-style property (follow-up to r15514).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15515 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-24 16:54:58 +00:00
og2
18b21d63e1 * Updated Mail.
* Fixed Waitroom MaxLevel from poring_war (bugreport:5262).
* Added card_trader.
* Added card_trader to scripts_athena (disabled by default).
* Added MidCamp Warper/Ash-Vacuum from quest_13_1 (gogoash).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15514 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-24 16:50:59 +00:00
og2
a1c87268c7 *Corrected the bing#n1 issue according to aegis script (bugreport:5050).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15457 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-14 18:19:18 +00:00
og2
d9b76e68d2 *Fixed the "bing#n1" issue (bugreport:5050).
*Fixed variables typos.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15439 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-13 01:16:04 +00:00
masao87
5e8e565f56 - Fixed little mistake from previous commit.
- List of Bugs fixed:

bugreport:1569
bugreport:867
bugreport:2344
bugreport:3583
bugreport:3025
bugreport:3616
bugreport:3935
bugreport:4015
bugreport:4097

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15353 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-02 19:49:24 +00:00
masao87
b2324030b6 - Lot's of Bugreport fixes and stuff.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15352 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-02 19:37:08 +00:00
masao87
959fe48a57 - bugreport:2719 , bugreport:1963 , bugreport:2878 .
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15350 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-02 00:16:20 +00:00
calciumkid
0d42615837 poring_war.txt fixes as per bugreport:4848
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15341 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-01 00:53:06 +00:00
jmanfffreak
ec59ffaa6a Added a check in the Hugel Bingo NPC to check if the player actually has 1000 zeny to play (bugreport:4091).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15293 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-28 16:51:47 +00:00
brianluau
f8c4e952a3 - Standardized script headers, starting with /npc/custom/
http://rathena.org/wiki/Script_header

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15262 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-25 06:54:26 +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
jmanfffreak
ffc09fcfdb Corrected multiple dialog issues in okolnir quests {bugreport:3092)
Clarified waiting room dialogs for Hugel Bingo (bugreport:1432)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15146 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-17 04:28:00 +00:00
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