417 Commits

Author SHA1 Message Date
lemongrass3110
6e9ce692b3 Fixed not working cutins. bugreport:6466
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17265 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-16 21:33:06 +00:00
akinari1087
984218e0e5 Platinum skills are no longer saved as permanent granted skills - Fixes bugreport:7466
->Updated the docs with more information on flag 4 skills
Please remember to run the SQL upgrade file to fix your skill tables

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17256 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-13 17:08:16 +00:00
brianluau
d1b19ed790 - Fixed a typo in r17209. (bugreport:7420)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17215 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-03-26 18:00:56 +00:00
euphyy
ba798de7ab * Follow-up r17205, added new mercenary skills and scrolls.
* Updated item_db and some related functions.
* Updated item_trade table.
* Fixed two item scripts with bMagicAtkEle. (bugreport:7385)
* Fixed minor issue in guild storage sample script. (bugreport:7406)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17209 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-03-25 04:17:45 +00:00
euphyy
30bfcfe8e0 * Updated WOE Controller script to v1.5, which overhauls the rewards system (with many new features).
* Fixed another Renewal Izlude coordinate (bugreport:7169).
* Fixed a mail bug, since r16574.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17096 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-13 01:37:40 +00:00
j-tkay
b69f0ad825 - Fixed bugreport:6993, invalid item id in mercenary script. (other/mercenary_rent.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17016 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-11 18:38:42 +00:00
euphyy
5b18fc292b * Added a missing shop item, bugreport:6878 (re\merchants\shops.txt)
* Fixed a few incorrect labels in Poring War script, bugreport:6794 (other\poring_war.txt)
* Follow-up r16900, added svn:eol-style=native property.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16903 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10 17:29:54 +00:00
euphyy
05b65b91b3 * Updated Renewal 'Mjolnir' item (bugreport:6646)
* Updated slots on RWC 2008 Dragon Helms (bugreport:6645)
* Other minor changes...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16765 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-08 19:58:00 +00:00
j-tkay
7700b560fe - Fixed bugreport:6588, grammatical errors here and there. (other/pvp.txt & cities/morocc.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16756 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-07 05:06:24 +00:00
euphyy
31d2fe26b3 * Follow-up r16742, revised quest sample (doc\sample\npc_test_quest.txt) and whisper system documentation (doc\whisper_sys.txt)
* Follow-up r16745, fixed a few typos in atcommand documentation (doc\atcommands.txt)
* Minor cleaning - spacing, tabulation, comments, dividers

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16746 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-05 02:42:20 +00:00
euphyy
2adc9cdf28 * Follow-up r16726, more standardization on docs.
* Replaced and added dividers in many script files with one standard divider.
* Other misc. cleaning...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16727 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-01 00:37:36 +00:00
euphyy
ef338e07c2 * Optimized "3rd Item Seller" script (re\merchants\3rd_trader.txt)
* Optimized Eden Quest lv. 71-85 (re\quests\eden\)
* Deleted a duplicate NPC, bugreport:6564 (re\quests\quests_dicastes.txt)
* Other small fixes

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16715 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-27 20:37:19 +00:00
euphyy
13642716af * Fixed a typo in guild scripts, bugreport:6517 (guild\gefg_cas02.txt)
* Misc. standardization...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16672 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-20 20:16:42 +00:00
euphyy
bcfd5cf6d5 * Fixed cutin errors in Fortune script, bugreport:6466 (other\fortune.txt)
* Fixed item #5503, bugreport:6440

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16630 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-13 14:41:57 +00:00
j-tkay
f73fa23269 - Optimized and fixed Medal Distributor (Dual Race) disappears accordingly. (other/monster_race.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16626 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-12 19:39:03 +00:00
euphyy
fb0a39fe3e * Optimized Eden Quest lv. 11-25 (re\quests\eden\)
* Fixed bugreport:6427 with new Alchemist quest (jobs\2-2\alchemist.txt)
* Other misc changes/fixes...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16615 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-10 04:55:08 +00:00
brianluau
eccf002de1 - Added svn:eol-style=native property on some recently added text files.
- Renamed upgrade_svn16517.sql to the correct SVN revision it was added in (r16518).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16614 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-09 18:01:21 +00:00
j-tkay
7b6268fb52 - Merged other/turbotrack into one template. (other/Turbo_Track.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16597 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-07 19:47:14 +00:00
euphyy
b2c806a597 * Moved RE coordinates of Bullet/Magazine Dealers in Izlude, bugreport:6410
* Added "favorite" column to main.sql file, bugreport:6425 (sql-files\main.sql)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16595 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-07 18:47:08 +00:00
daegaladh
44908c7f32 Fixed and cleaned Izlude Arena and some other scripts.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16574 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-04 10:13:48 +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
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
70eb508450 * Massive cleaning of "The Sign Quest" script, ~90kb reduction (quests\The_Sign_Quest.txt)
* Removed OnInit label of "Card Trader" NPC, since it most likely won't be used (other\card_trader.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16377 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-05 01:55:47 +00:00
euphyy
741c59a409 * Neuralizer is no longer consumed upon failure (bugreport:6040)
* Some cleaning of the Sorcerer job change quest (jobs\3-2\sorcerer.txt)
* Cleaning of "Bunny Band Quest" script (quests\bunnyband.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16367 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-02 18:09:25 +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
3b8d196c31 * Massive compression of "Card Trader" script, from 123kb to 7kb! (other\card_trader.txt)
* Some optimization of Ash-Vacuum quests (quests\quests_13_1.txt)
* "Sphinx Mask Quest" script optimized (custom\quests\sphinx_mask.txt)
* Moved "Caral" NPC from non-existent moc_fild04 to cmd_fild08, as per bugreport:5959 (custom\quests\thq\THQS_Quests.txt)
* Fixed Job_Archbishop/Job_Archbishop_T typos in job change script, but other issues in bugreport:5938 not addressed (jobs\3-1\archbishop.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16254 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 01:37:17 +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
d588c58958 - Added new towns to the custom warper. bugreport:5878
- Fixed a bug in the monster_race.txt where you would get stuck in the dialog window. bugreport:5861
- Fixed a bug in 71-88 eden group mission npc's where you would get stuck in the dialog window. bugreport:5875

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16180 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-31 12:29:32 +00:00
masao87
13944887fb - Fixed wrong areawarp coordinations in all arena rooms. bugreport:3494
- Added check if the player invoking one of the Izlude Arena NPC's in sec_pri02 is actually a GM. bugreport:3494
- Some other random stuff in arena files. bugreport:3494
- Follow up r15278 , all EF_WIND effects should now work properly. bugreport:5369

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16152 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-26 16:32:23 +00:00
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