139 Commits

Author SHA1 Message Date
daegaladh
52a4de498e Fixed some bugs on jobs and merchants scripts.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16559 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-02 12:17:06 +00:00
daegaladh
5a3aa84e4c Follow up r16551. Translated korean words that was causing issues in the file encoding.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16552 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01 12:57:24 +00:00
daegaladh
af50ebcbe7 Follow up r16545. Fixed unreadable character at the beginning of swordman.txt. (bugreport:6386)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16551 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01 12:39:50 +00:00
euphyy
9fda63949a * Follow-up r16549, fixed the pre-re files as well (cities\jawaii.txt, quests\quests_lighthalzen.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16550 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01 05:36:11 +00:00
daegaladh
6a72153c12 Follow up r16545. Fixed some mistakes I made.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16548 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01 05:06:59 +00:00
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
euphyy
a8793a1637 * Fixed job level issues on remaining first class Platinum Skill quests, incl. bugreport:6374 (quests\skills\)
* Some optimization of Ranger job quest (re\jobs\3-1\ranger.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16538 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-30 23:59:10 +00:00
j-tkay
a6822e864b Fixed Thief Platinum Skills Quest where job level requirement for Assassin and Rogue is not needed. bugreport:6373
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16537 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-30 15:26:49 +00:00
brianluau
a70cabd131 - Added svn:eol-style=native property on some recently added text files.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16534 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-30 07:32:24 +00:00
masao87
c7e670e26f - Reverted all changes done to the job change quest files.
* Decided it'd be better to commit it all together when updating, fixing and optimization is done all at once.
Sorry guys and girls for the trouble! Big shame on me :-/ :(

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16533 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-30 00:22:47 +00:00
euphyy
a0bc17bd04 * Fixed checks in "Gemstone Trader" script, and cleaned a little, bugreport:6370 (merchants\gemstone.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16532 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-30 00:01:38 +00:00
masao87
4f02b8352f - Added Baby job change support for the remaining 2-2 job change quests. bugreport:5789
- Fixed bugreport:6371

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16531 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-29 23:42:57 +00:00
masao87
6e1dda68d4 - Fixed some errors in pre-re Wizard Quest, no idea how they got in there. bugreport:6354
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16525 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-28 20:06:01 +00:00
masao87
10ad4b1bc5 - Follow up r16521
* Forgot to apply some changes from my Test folder to the rAthena folder.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16522 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-28 17:22:58 +00:00
masao87
b675aa8990 Part 1 - 3 of the big job folder Update:
- Updated all 1-1 and 2-1 job change files to latest available official file.
* 2-2 and advanced / reborn and the other job change scripts will follow with Part 2.
* NPC optimizations will follow in Part 3.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16521 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-28 17:09:58 +00:00
euphyy
cde78b4fc4 * Updated Super Novice Expansion quest to match the official one, thanks to Gennosuke (the original script is edited a lot, though)
* Updated "Pile Bunker" quest to official, also thanks to Gennosuke
* Follow-up r16485, removed bind limit from documentation

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16505 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-26 16:37:30 +00:00
daegaladh
55d091fb0e Follow up r16459, enabled Warlock quest Bradium Golem and Naga on pre-re mob_db and moved the spawns to the warlock quest script. (bugreport:6290)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16463 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-21 14:09:55 +00:00
euphyy
52bf32a816 * Created standardized headers with explanations in /conf/mapflag/, deleted "fireworks" file (deprecated, 1 commented entry)
* Updated Wiki links and fixed grammar in /src/config/

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16462 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-21 05:30:14 +00:00
daegaladh
c1990d8893 Fixed an old bug in waitingroom where NPCs weren't appearing into their chatrooms.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16461 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-21 04:08:44 +00:00
jtynne
c54c4e1e34 Per bug report #006289, fixed incorrect spawn IDs for monsters in the Splendide fields (both pre-RE and RE).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16459 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-20 20:27:41 +00:00
jtynne
bee4c16e10 Fixed small typo in previous commit.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16458 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-20 20:20:59 +00:00
jtynne
97aa3e9431 Added missing Umbala Dungeon mob reference in conf files for pre-RE servers.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16457 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-20 20:14:31 +00:00
jtynne
56c4b7ab56 - Added missing Umbala Dungeon spawns for pre-RE servers.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16456 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-20 20:02:21 +00:00
euphyy
e780ab2f51 * Condensed the documentation on the "Import" folder, it should be more reader-friendly now (conf\readme.txt)
* Deleted doc\pccommand_list.txt, it's outdated and its contents are already (better) explained in doc\script_commands.txt
* Other misc cleaning...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16453 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-19 18:46:56 +00:00
daegaladh
e804ae16ef Follow up r16430, reverted all the pre-re guides to their pre-renewal version. Disabled a couple of renewal quests from pre-renewal.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16451 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-19 13:34:00 +00:00
euphyy
ec79a1b50d * Some cleaning of "Novice Training Grounds" script (npc\jobs\novice\novice.txt)
* Cleaned up "PvP NPCs" script a little bit (npc\other\pvp.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16438 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-18 02:30:53 +00:00
euphyy
a413425884 * Added a Super Novice Expansion quest with custom dialogue. Will be updated once we get the official script.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16437 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-17 15:05:13 +00:00
daegaladh
eebd052f72 Fixed a couple of typos and other mistakes.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16436 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-17 14:12:57 +00:00
euphyy
31605dd8d2 * Follow-up r16430, moved all the RE entries in the .conf files behind the pre-RE entries
* Re-added a missing .conf entry, bugreport:6256
* Edited "WoE Time Explanation" documentation (doc\woe_time_explanation.txt)
* Added Warg documentation to checkoption/setoption, thanks to QQfoolsorellina tid:120670 (doc\script_commands.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16435 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-17 13:58:18 +00:00
daegaladh
1c6f14039c Follow up r16431, fixed a couple of mistakes I made.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16433 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-16 20:44:20 +00:00
daegaladh
4850d5c030 Forgot to remove the scripts in last commit, sorry.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16431 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-16 15:35:50 +00:00
daegaladh
fca0631002 Disabled and removed all renewal-only scripts from pre-re folder. You still can enable them in pre-renewal scripts conf files, but scripts are read from the re folder. Follow up r16387.
Splitted some renewal-only NPCs from renters.txt into another file.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16430 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-16 15:32:00 +00:00
euphyy
c33ff9591a * More optimization of 13.1 quests (quests\quests_13_1.txt)
* Follow-up r16421, missed deleting another line, bugreport:6235

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16425 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-14 05:48:26 +00:00
euphyy
75f0852925 * Optimization of Hugel's "Monster Race" script, 4000+ lines removed (other\monster_race.txt)
* Deleted "Wandering Poets" custom script (custom\etc\wandering_poets.txt)
* Deleted "Iron Cane" custom quest (custom\quests\ironcane.txt)
* Deleted custom Poring Track script, what did this even do...? (custom\etc\p_track.txt)
* Moved custom wedding script into /etc/

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16405 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-12 00:44:42 +00:00
masao87
32d72d3196 - Follow up r16401
* Fixed a little typo in the Eden Group Teleport Officer NPC Name.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16402 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-11 20:49:39 +00:00
masao87
f2730d6026 - Added some missing Eden Group Teleport Officers. bugreport:6160
- Some Kafra location and dialog updates. bugreport:6160
- Added missing Sorcerer Point Shop NPC's. bugreport:6160
- Fixed Bulletin Board Locations in Payon Archer Village. bugreport:6160
* Special thanks to Baneado who provided the locations.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16401 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-11 20:38:22 +00:00
euphyy
9f7070421e * Optimized 13.2 quests, enjoy another 120kb of free space :P (npc/quests/quests_13_2.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16398 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-11 15:02:20 +00:00
euphyy
b4a0f33eba * More optimization of Ash-Vacuum quests (npc/quests/quests_13_1.txt)
* Fixed a minor typo, bugreport:6191

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16387 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-10 16:12: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