293 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
7bd7f81dae * Corrected and optimized 12 guide NPCs (/guides/)
* Fixed a small typo in Warlock quest, bugreport:6164 (jobs\3-1\warlock.txt)
* Fixed a couple of job constant typos in "Nameless Island Quests" (quests\quests_nameless.txt)
* Removed non-RE changelogs from RE scripts

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16376 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-04 15:26:16 +00:00
euphyy
766c527f0c * Optimized "Elemental Stone Trader" (merchants\elemental_trader.txt)
* Optimized "Armor Enchanter" (merchants\enchan_arm.txt)
* Optimized "Manuk Merchant" (merchants\manuk.txt)
* Fixed an incorrect variable in "Thanatos Tower" script, as per bugreport:6073 (quests\thana_quest.txt)
* Reverted quests_morocc edit, encoding error? - bugreport:6067 (quests\quests_morocc.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16325 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-20 21:21:00 +00:00
euphyy
778f76eee5 * Optimized "Guild Battle NPC" (other\guildpvp.txt)
* Cleanup of "Gonryun Power Arena" script (other\powernpc.txt)
* Condensed "Seal Status" script a little bit (other\sealstatus.txt)
* Other general cleaning... :3

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16323 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-20 02:06:41 +00:00
euphyy
80745eea3a * Fixed problems with third classes/new mounts in official "Renters" script, as per bugreport:6046 and bugreport:5924 (merchants\renters.txt)
* Small bug in El Dicastes quests fixed (quests\quests_dicastes.txt)
* Fixed two warps in the custom warper (custom\warper.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16319 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-19 15:08:03 +00:00
brianluau
ccdc1a396c - Added svn:eol-style=native property on some recently added text files.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16258 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 06:34:50 +00:00
kenpachi2k11
8ac22b2526 Moved a few merchants and mob spawns to separate files to prevent error message when running server in pre-RE mode and with TXT databases. (bugreport:5846)
Fixed Tao Gunka Cards (#4302) renewal effect. (bugreport:5866)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16247 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-09 18:48:50 +00:00
euphyy
df30c977cd * Platinum Skills NPC now works for all Upper types (bugreport:5903) (custom\platinum_skills.txt)
* Revamped the official clothes dyer (merchants\clothes_dyer.txt)
* Optimized custom Berzebub Card quest (custom\quests\berzebub.txt)
* Warper bug on ma_fild02 fixed (bugreport:5908) (custom\warper.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16216 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-03 03:36:02 +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
brianluau
d960aa3bee - Follow up to r16164 and r16193: used SVN Copy/Move so SVN History is preserved.
- Added svn:eol-style=native property for some recently added text files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16194 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-01 03:40:58 +00:00
masao87
aa162958b4 - Added an security check for each player which is entering an instance to make sure that the cool down time can't be bypassed which would lead to abuses of the according instance dungeons. bugreport:5768
- Some minor additions to the Magic Gear renter NPC.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16158 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-27 23:53:46 +00:00
masao87
1568380815 - Fixed typo in the new refining NPC Bestry. bugreport:5836
- Enabled Gryphon renter NPC and added Magic Gear Master NPC (Mado Gear renter). bugreport:5754

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16156 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-27 12:50:46 +00:00
masao87
fe82161d32 - Some minor improvements in the instance Scripts.
- Some minor improvements in the Eden Group NPC's.
- Fixed typo in Wanderer Pet Food NPC. bugreport:5823

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16151 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-26 14:30:12 +00:00
masao87
c0a3c94ce5 - Added probably all 3rd Class related Shops. bugreport:5781 bugreport:5782 bugreport:5783
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16138 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-21 19:41:49 +00:00
masao87
df766d8374 - Added +11 and above refiner NPC.
- Added NPC to refine Oridecons / Eluniums to Cardium / Bradium.
- Added downrefitem script command and updated script_commands.txt with it.
- Updated refine_db.txt with probably custom values for +11 to +20 values. Source : http://ratemyserver.net/index.php?page=misc_table_refine
- Some little script improvements to Suhnbi. (Enriched Elunium / Oridecon Upgrader.)
* Further improvements for the refinement system and refinement NPC's will come within the next few days.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16126 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 20:39:42 +00:00
masao87
2b95b5bfef - Added 2 new Shops to Comodo. bugreport:5732
- Added check for Baby Warlock to Magic Book Quest. bugreport:5527

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16104 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12 16:49:16 +00:00
masao87
cfa8d5c68e - Updated town.txt to allow Mailbox access in all the newer cities. bugreport:4457
- Removed easter.txt event and the corresponding mobs in mob_db2.txt  and mob_db2.sql since they collide with Satan Morroc minions Mob ID's. bugreport:1240
- Updated Magical Amplify Power cast time to only be affected by item bonuses. bugreport:2777
- Added missing Economy check in agit_main and some missing close; also fixed bugreport:5030
- Added Credits for Ziu in Falcon Flute NPC.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16102 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12 14:28:16 +00:00
masao87
069b16546f - Added Baby Hunter and Baby Ranger check. bugreport:5728
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16097 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-11 11:29:01 +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
tr0n93
a048dc4bd2 Added missing Cooking Items for Material Seller. (bugreport:5334)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15794 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-26 10:07:09 +00:00
masao87
3f33f566f0 - Fixed a little leftover in socket_enchant2.txt .
- Added warp to iz_dun05 bugreport:5395 .
- Fixed a little typo in clif.c .
- Moved "int clif_status_load_single" from clif.c to clif.h .

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15665 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-07 23:50:38 +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
brianluau
d65b8b0f8a - Fixed some typos in Socket Enchant NPC. (bugreport:5263)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15517 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-24 21:57:20 +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
brianluau
30b6766d2c - Set svn:eol-style=native property for recently added text files.
- Removed trailing spaces/tabs.
- Changed duplicate() to use a floating source npc.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15430 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11 22:15:23 +00:00
script-z3r0
64c9226a4c Added Version History
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15429 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11 22:01:06 +00:00
script-z3r0
bd1963c50a removed a double space: emotion e_loud to emotion e_loud
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15428 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11 21:54:31 +00:00
script-z3r0
240f8d1652 Changed emotion # - const.txt definition | I swear to god I hate you all
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15427 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11 21:50:04 +00:00
script-z3r0
80bef677fc Removed Comments due to Haters
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15426 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11 21:45:55 +00:00
script-z3r0
0ffe599848 Fixed Missing ; Line 272
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15425 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11 21:26:36 +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
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
masao87
aa1124a2a7 - Updated const.txt. bugreport:5177
- Fixed Rental NPC. bugreport:5178

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15351 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-02 00:56:15 +00:00
masao87
6c44405fdf - Bunch of Typo fixes from my previous Commits.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15348 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-01 20:18:21 +00:00
masao87
bdfc01a474 - Added Genetic Book Seller to Alchemist Shop.
- Updated Gunslinger Ammo & Boxes Sales NPC positions.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15347 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-01 20:01:52 +00:00
xantara
7bba350eb2 ` Updated Refiners and Repairers
- Updated several NPC names and locations.
- Added WoE map Refiners.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15282 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-26 08:14:48 +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
mercurial123
7bd1a9bfb4 - Rebranded NPC Information
- Optimized Poison Herb Salesman since an optimized version already exist. (Tested and Approved)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15221 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-23 03:49:47 +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
L0neW0lf.eAthena
3710eab821 * Added Rune Knight job quest, and mount rental NPC.
* Added Rune Knight skill updates, and supporting information for r14983.
* Updated Emperium to be plant-mode.
* Updated item database with RE stats.
* Added new constants to const.txt.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14984 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-10-26 19:50:33 +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
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
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
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
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
Gepard
8ae23f01e2 Fixed KvM announcements showing during WoE:SE (bugreport:4335).
Added missing Lighthalzen NPC (bugreport:4319).
Fixed checkweights in Manuk & Splendide shops.
Fixed some condition checks in Moscovia quests.
Fixed some typos in Sealed Shrine and Manuk quests dialogues.
Added missing global var check in Yggdrasil Dungeon Floor 2 puzzle.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14360 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-07-03 11:29:29 +00:00
L0ne_W0lf
631a1b45b5 * Corrected Brasilis Fruit Merchant. (bugreport:4278)
* Implemented some new items, most 13.2 equipment.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14331 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-05 17:27:44 +00:00