159 Commits

Author SHA1 Message Date
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
fb2d484d14 * Follow-up r16291: Standardized "Valentine's Day 2012" script (events\valentinesday_2012.txt)
* Added entry to scripts_athena.conf, with slight re-ordering of the event list

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16293 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-13 20:49:48 +00:00
euphyy
c0fb1a9630 * Added Dewata and El Dicastes town (\cities\) and quest (\quests\) NPCs.
* db\quest_db.txt updated with Dewata and El Dicastes quests.
* Fixed minor bug with Arch Bishop check in Thanatos Tower (bugreport:5942)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16234 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-06 00:34:10 +00:00
masao87
7cee7996e8 - Added Instructor Ur to Eden Quest Quests. bugreport:5742
- Added Mission Boards 86-90 and 91-99 to Eden Group. bugreport:5742
- Updated quest_db.txt to match the new Quests in the new Eden Group Quests.
* Special thanks to Chilly for providing the base of the scripts! <3
- Updated Rune Knight Job change Quest for the last time to finally work as official as possible.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16213 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-02 01:55:34 +00:00
masao87
cbd577d069 - Added BaseClass explanation to script_commands.txt .
- Some updates to the custom folder / the old eAAC Scripts which are now in there.
- Fixed custom/warper.txt prontera location to not collide with Ash Vacuum warper. bugreport:5857
- Fixed Platinum Skill Quests properly checking for BaseClass now. bugreport:5853
- Fixed some typos in Ranger Job change Quest & Eden Paradise. bugreport:5858
- Fixed a typo in scripts_athena.conf . bugreport:5852

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16165 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-29 12:08:59 +00:00
masao87
3f554a4b93 - Added missing repeatable EXP Quests. bugreport:4450
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16162 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-28 14:59:02 +00:00
masao87
1cf866c740 - Added Pile Bunker Quest. bugreport:5397
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16112 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-14 12:40:15 +00:00
masao87
e31be3cd2c - Added Magic Book Quest for Warlocks.
- Followup r16102
* Correctly fixed bugreport:5030 now.
* Restorded scripts_custom.conf since mine accidently got commited with my last commit.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16103 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12 16:07:52 +00:00
masao87
16e1bb4ab5 - Added Falcon Flute Trader NPC.
- Added Falcon Flute to db/pre-re/item_db.txt, db/re/item_db.txt and item_db.sql.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16095 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-10 23:59:28 +00:00
masao87
4b1e9d1d55 - Added Bossnia Event.
- Added new Town cleaners.
- Added mobs to sec_pri02 .

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15673 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-10 19:22:27 +00:00
gepard1984
202909582c Updated Airship NPCs to official.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15636 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-28 20:11:46 +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
xantara
2d6b145508 ` Added (Cash) Headgear Dyer (cashheadgear_dye.txt)
-- Aegis Conversion

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15493 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-18 22:28:27 +00:00
script-Z3R0
7ee1dd0052 Added cupet.txt (Cute Pet Manager) - Aegis Convert - Commented Out in scripts_athena.conf
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15440 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-13 17:33:14 +00:00
script-z3r0
d011bfae8a Added Rare Diamond Merchant, converted from AEGIS script
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15422 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11 20:46:47 +00:00
masao87
8e4c5a3366 - Fixed NPC Position in 2006_headgears.txt
- Added new Headgear Quests and Cute Ribbon Dyer.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15344 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-01 18:05:40 +00:00
masao87
ad5a13c3e5 - Added first Version of Mechanic Job change Quest and 3rd_trader which sells 3rd Job related Items.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15220 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-23 01:55:20 +00:00
L0ne_W0lf
0031e22f16 * Raised MAX_MERCENARY_CLASS to 44 for new mercenaries.
* Raised max_lv to allow values up to 150 in battle.conf.
* Raised MAX_SKILL_TREE 77 in prep for 3rd class skill trees.
* Upped max_lv and max_aura to 150, and max_aspd to 193.
* Added Brasilis database updates from trunk r14928.
* Added scripts and NPC Brasilis updates from trunk r14928.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14931 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-10 20:46:27 +00:00
L0ne_W0lf
8a67d57b75 Added Renewal Guides, and made the filenames uniform.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14922 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-26 15:32:21 +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
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
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
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
L0ne_W0lf
aa9990ec16 * instance_npcname will now error if the NPC being looked up is not found, care of ramsey.
* delitem/2 will now send the close button when failing to find all neccecary items to delete.
- Still do to, items should not be deleted as-found, and should be deleted once counted
and in the event of delitem failure, nothing should be consumed. This is a design flaw
in eathena, and should be fixed as soon as possible.
* Implemented the Endless Tower instance.
* Updated announces and dialogs in KVM.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14395 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-26 22:47:28 +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
a9a0d68dca * Documented Battleground commands with as much information as I've got.
* Another rather large overhaul of the battlegrounds.
- in bg_common.txt, stripped out several more NPCs, split them off.
- Most of the NPCs in bg_common.txt are now official Aegis versions.
- Completely rewrote Tierra Gorge for the most part, from ground up.
- Moved old Tierra Valley battlegrounds to /custom/battleground.
- Added Tierra scripts, Flavius, and bg_common to scripts_athena.
- Tierra, KvM, and bg_common scripts are now enabled by default.
- To use custom Flavius, you must enable /flavius/flavius_enter.txt
- * TIERRA GORGE AND KVM BOTH REQUIRE TESTING *


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14373 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-11 18:17:26 +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
ca752c96b1 * Reduced Robo_Eye bonus from 3 -> 2 (bugreport:4288)
* Disabled the Peco Peco repeatable quest, see comment in conf as to why.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14340 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-12 03:41:56 +00:00
L0ne_W0lf
db53228f1d * Implemented repeatable EXP quests (with kill count and item gathering options) removed iRO_Exp.txt.
* Fixed missing slot on Power_of_Thor. (bugreport:4168)
* Fixed size for HELL_APOCALIPS and ZUKADAM. (bugreport:4293)
* Fixed mob modes on ANCIENT_TREE and RYNCHO. (bugreport:4294)
* Fixed HP and INT bonuses on the Kronos staff. (bugreport:4297)
* Fixed equip location and more on the Ruber sword. (bugreport:4298)
* Fixed typo in the Icecream_Hat giving the wrong skill. (bugreport:4299)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14339 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-12 03:13:11 +00:00
L0ne_W0lf
387bcdf5ae * Implemented the Manuk and Splendide item status effects, thanks to Epoque.
* Implemented Manuk and Splendide consumable items.
* Added Splendide and Manuk merchants.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14327 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-01 23:01:54 +00:00
L0ne_W0lf
a61a077dd6 * Shop update, and added Wanderer pet food maker NPC.
- Added Trading merchants, (ninja& gunslinger) to Izlude and Alberta.
- Made Brasilis shop names unique, and uncommented.
- Changed the whip sold in comodo weapon shop. (1956 ->1960)
- Added Fire and Silver arrow to Einbroch tool dealer.
- Re-added Bill of Birds to Morroc Item Collectors.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14315 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-30 18:14:44 +00:00
L0ne_W0lf
f48c41a1c1 Added some Brasilis basic NPCs.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14299 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-21 01:30:36 +00:00
L0ne_W0lf
7475720d25 - Corrected a minor issue in sealed shrine, lock out should work now.* Added some 13.2 content, and more 13.1 content.
- Added "Otherworld language" quest.
- Added Cat Hand Trading NPCs for 13.2 maps.
- Added warps for Splendide and Manuk (town and field.)
- Added basic town NPCs for Manuk and Splendide.
- Added the guild dungeon SE events, though the pierre boxes do nothing.
- Corrected a minor issue in sealed shrine, lock out should work now.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14257 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-03-03 19:59:24 +00:00
L0ne_W0lf
9d52d4f79f Minor update to the Orc Instance mob stats, very incomplete still.
Implemented the first version of Orc's Memory.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14194 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-12-11 04:01:23 +00:00
L0ne_W0lf
6915231e13 Implemented official armor enchanting NPC.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14192 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-12-08 02:39:43 +00:00
L0ne_W0lf
6f91dfe451 Implemented the first version of Sealed Shrine.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14189 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-12-05 03:17:52 +00:00
Kisuka
2b884672af - Added 2008 & 2009 iRO Halloween Events (Happy Halloween eAthena).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14112 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-10-31 07:10:45 +00:00
Gepard
b0789a837a Updated Socket Enchant: all items moved to proper NPCs, added slotted Hat of Sun God. (bugreport:2871)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14107 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-10-28 00:23:40 +00:00
L0ne_W0lf
5acd2aca91 * Added Ravies sisters, people can now turn in the "Valkyrie Gift" items.
* Updated Crystal 6 through 9 monsters for Valkyie Gift event.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14080 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-10-03 01:51:02 +00:00
L0ne_W0lf
1f71d586ce * Added some, and enabled existing episode 13.1 content.
* Updated some stats and implemented Luciola Vespa AI use.
* Tweaked the skills for them, still custom though.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14052 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-10 05:29:07 +00:00
Kisuka
4d718f3bfd - Updates to several npc files to match AEGIS standards.
- Added Cash Hair Stylist (disabled by default).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14040 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-05 03:51:49 +00:00
Kisuka
505e1b03e7 - Fixes for 'Koshei the Immortal' quest.
- Added some iRO event scripts (christmas & memorial day).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13905 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-22 00:19:08 +00:00
L0ne_W0lf
54410b989d Falicious Okolnir update - Brynhild creation quest. Basic unoptimized version.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13781 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-16 02:06:15 +00:00
Kisuka
7c28a47642 * Moscovia Update!
- Added Moscovia quests.
- Uncommented mosk_dun & added field spawns.
- Updated moscovia & mosk_dun warps.
- Removed most the npcs from cities/moscovia.txt (they are part of the quests).
- Added some more moscovia quest items to item_trade.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13605 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-19 19:57:49 +00:00
Kisuka
3944f69f1d - Added iRO Valentine's Day 2009 Event.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13524 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-02-12 17:43:13 +00:00
Kisuka
de3008f248 - Moscovia NPCs. (All the generic, kafra, and guide NPCs.)
(Moscovia quest npcs still have horrible english, so that's why they aren't being committed yet.)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13466 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-21 02:35:38 +00:00
Kisuka
8432d2ebda Changes from Chapter 11:
- Rates and Items in some item givers changed.
- Ice Cream Maker disabled.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13428 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-01 02:52:50 +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