116 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
26f5eadf1c * Fixed an incorrect item check (bugreport:6184)
* Disabled two Dewata warp portals clashing with quest scripts (bugreport:6185, bugreport:5944)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16380 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-06 20:55:43 +00:00
brianluau
29749ceaa8 - Replaced more -> rAthena (follow up to r15251).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16195 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-01 04:06:10 +00:00
masao87
49459d342e - Guild folder update.
* Partially rewrote all castle files and updated all Castle flags, NPC's and warp coordinations to latest available official file.
* Renamed agit_template to agit_main and also updated it to latest available official file.
* Removed the Treasure Room Protection from agit_template and separated it into another file which will now be known as trs_rp.txt
- trs_rp.txt will allow that only the Guildleader can be in the Treasure Room, if you want to disable this protection just set an // in scripts_guild.conf before npc: npc/guild/trs_rp.txt .
- Moved payon castle map warps from warps/cities/payon.txt to warps/guild/guildcastles.txt .

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15923 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-22 14:48:03 +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
brianluau
a48f5d68d0 - Added svn:eol-style=native property to some recently added text files.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15413 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-09 18:46:57 +00:00
Chilly0123
7ceabb2bc1 *Fixed bug in 13.1 quest which caused quest log to remain after completion.
*Added warps up to Episode 14.2.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15400 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-06 09:20:37 +00:00
jmanfffreak
a74e18b25b Added warp from brasilis to bra_fild01 per official data (bugreport:5169)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15291 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-28 16:26:22 +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
protimus
77518c04d9 Fixed brasilis warps according to official.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15191 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-21 03:19:32 +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
L0ne_W0lf
7758f21bdb Added the warps for Brasilis, not sure how they got missed :x
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14304 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-22 14:11:36 +00:00
L0ne_W0lf
ec29baaa99 * Some bug fixing! Hoorah for me not feeling lazy!
- Fixed some issues related to the guild relay quests. (bugreport:3934)
- Disabled the warp back to moc_fild22b from mid_camp. (bugreport:3985)
- Loop in sealed shrine should disable all thorches. (bugreport:4044)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14258 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-03-03 21:28:22 +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
19bf39a780 * A few minor bugs fixed. :3
- Fixed npc in okolnir quest using non-existant event. (Bugreport:3085)
- Translated non-translated lines in Okolnir quest.
- Fixed Asprika quest giving Brynhild requirement message.
- Added missing warps for The Sign quest. (Bugreport:3295)
- Corrected time check for Sir Jore in the Sign Quest.
* Updated warps for 13.1 maps.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13940 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-07-08 03:26:31 +00:00
brianluau
4ed47c3153 - Moved the anthell warp agent to the new entrance. (bugreport:2801)
- Added missing 'F_GldTreasSw' function for Novice Castles. (bugreport:3292)
- Removed OnTouch trigger area from Continental Guard NPCs.
- Corrected the observatory warp portal. (bugreport:3293)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13911 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-26 20:39:22 +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
L0ne_W0lf
d6abaf694d * Rev. 13458 Looooots of bugfixes provided by various people! [L0ne_W0lf]
- Fixed Seal quest checking for oridecon hammer. Again. (Bugreport:2363)
- Fixed some requirements for the socket NPC. (famiong) (Bugreport:2572)
- Fixed a global variable-collision in Z-Gang quest. (Bugreport:2616)
- Fixed issue with Zhed saying things he shouldn't (Bugreport:2627)
- Fixed OnMyMobDwead in Nameless quest issue. (Bugreport:2628)
- Fixed Kyle Hyre script halting on delitem. (Bugreport:2633)
- Added missing part of Peace for Arunafelts (Gepard) (Bugreport:2639)
- Added missing Kafra npc to Comodo. (Daegaladh) (Bugreport:2662)
- Fixed a minor error in Einbroch Tower NPC. (magegahell) (Bugreport:2669)
- Fixed exp reward in Peace for Arunafeltz. (Gepard) (Bugreport:2676)
- Fixed exp reward in Meg. God Seal quest. (Daegaladh) (Bugreport:2677)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13458 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-20 03:44:40 +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
zephyrus
8f9c363466 - Removed duplicated warps.
- Implementing new iWall system in WOE SE.
- Removed unnecessary dialogs in Advanced Refiner.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13220 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-19 17:51:33 +00:00
L0ne_W0lf
065a617084 * Added Nameless Island Dungeon quest. Please report bugs.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12939 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-12 00:42:29 +00:00
shadow
449d1121b6 Fixed a small bug on mid_camp warps by brianlew, bugreport:1824
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12934 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-10 16:03:22 +00:00
Lupus
8a8825e736 * Updated moscovia.txt inn.txt mosk_dun.txt shops.txt from jA
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12823 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-13 15:00:53 +00:00
L0ne_W0lf
d9ee8d19c8 Added warps points for episode 13.1 maps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12740 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-05-28 17:32:25 +00:00
L0ne_W0lf
c8d4cc6a2d Updated Umbala npcs, quests, and warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12403 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-20 18:48:27 +00:00
L0ne_W0lf
edd19c4e08 * Several small fixes to scripts, and updates.
- Updated City warps for Lighthalzen, and dugneon warps.
- Updated castle warps for Schwaltzvalt Castles Map.
- "The Sign" quest is now enabled by default. (bugreport:1011)
- Added Dimensional Gorge map spawns (According to RO Future Wiki)
- Updated Lighthalzen boss spawning mechanisim to official.
- Fixed a small error in the novice potion exchanger.
- Resolves the following: bugreport:879 bugreport:973 bugreport:983 bugreport:1013 bugreport:1021 bugreport:1024 bugreport:1026

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12227 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-22 06:16:21 +00:00
ultramage
c53f4f1955 Some random cleaning
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12141 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-26 09:44:10 +00:00
zephyrus
f8732d9c1a - Typo.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12132 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-23 17:04:06 +00:00
L0ne_W0lf
9b9332759d * Added Veins town NPCs, mail box, and second guide.
- Updated warps for Veins. Outstanding warps are quest related.
* Minor updates to other warp files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12056 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-11 18:46:26 +00:00
L0ne_W0lf
be6df0dc11 * Updated Kunlun NPCs and warps.
- Didn't update the Kunlun 'Power' npcs
- Updated Lutie and Comodo warps.
* Fixed some slight inconsistencies with the some script headers.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12014 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-05 21:32:34 +00:00
L0ne_W0lf
f53f2a4d05 Updated Louyang NPCs, quests, and warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11921 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-16 22:51:19 +00:00
L0ne_W0lf
1d4d4feee2 Updated Ayothaya NPCs, Quests, and Warps.
- Should also fix bugreport:586 (Footprint2 error)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11903 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-14 00:38:41 +00:00
L0ne_W0lf
3c65f35146 Updated Amatsu NPCs, Quests, and Warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11887 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-11 18:38:55 +00:00
FlavioJS
b3fe52fa6b * Removed double tabs from mapflag/warp/script/function/duplicate declarations.
(avoid script errors in a future commit)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11871 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-08 17:14:57 +00:00
samuray22
c89ad7bb99 * Corrected some broken warp points. (bugreport:497)
* Corrected a bug on Sample Dynamic Shop. (bugreport:421)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11829 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-27 23:37:50 +00:00
L0ne_W0lf
57250cbf9d Updated trigger area of Payon's West exit/entrance.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11810 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-26 21:50:02 +00:00
L0ne_W0lf
966634766b * Rev. 11742 Renamed several dungeon warp scripts to match their map names, split up a couple files as well.
* Moved Ninja and Gunslinger warps to the proper file.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11742 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-17 03:37:39 +00:00
samuray22
faa1661082 * Update some missing warps in Veins City.
-All credit go to $ephiroth.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11618 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-30 13:18:48 +00:00
L0ne_W0lf
af1e3083ac git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11545 54d463be-8e91-2dee-dedb-b68131a5f0ec 2007-10-22 16:35:51 +00:00
L0ne_W0lf
1607b50c59 Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up the warnings it produced.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11516 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-18 22:04:47 +00:00
Playtester
15dfbb1484 Moved the Nameless Island warp npc to warps/cities/nameless.txt
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11183 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-12 09:47:18 +00:00
samuray22
c241cdf08c * Fixed warps "Private House", from Moscovia.
- Thanks to $ephiroth for the fix.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10925 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-29 21:48:41 +00:00
SinSloth
6949e02358 * Added Louyang Revolution quest.
- Moved some city NPCs and warps to proper quest file.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10775 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-16 12:23:34 +00:00
SinSloth
2c86752e59 * Added all Hugel-related quests. Thanks to MasterOfMuppets for scripting most of them.
- Updated some Hugel, Lighthalzen, Einbroch and Airship NPCs regarding those new quests.
- Moved a lot of Hugel NPCs to proper quest file.
* Added Odin Temple Excavation quest.
- Updated Hugel warps and Odin Temple Sailor according to the quest.
* Added Heart Fragment quest.
* Updated Ayothaya's Ring quest to official. Credits to MasterOfMuppets.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10772 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-15 16:01:40 +00:00
ultramage
0dc548c5f7 npc header consistency update
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10759 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-14 08:29:20 +00:00
ultramage
0826609dbd NPC typo fixes, eol style definitons, newline at end of file
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10738 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-10 08:45:19 +00:00
Lupus
3d7189d2b4 updated mosk warps
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10724 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-08 11:54:23 +00:00
Lupus
76c74f6e1f updated mosk warps, mapflags
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10719 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-08 04:39:07 +00:00