11102 Commits

Author SHA1 Message Date
brianluau
a2bdc47daf - Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).
[16969:16991/trunk/src/] will be re-committed in the next 24 hours.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16992 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-05 02:53:33 +00:00
euphyy
ad54188296 * Updated Sorcerer and Wanderer job quests to their latest versions (fixes bugreport:6966).
* Follow-up r16955: fixed an item_db mistake (bugreport:6967).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16991 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-02 06:37:51 +00:00
euphyy
5c0f8fa61a * Updated Arch Bishop, Guillotine Cross, Mechanic, and Royal Guard job quests to their latest versions.
* Fixed Izlude RE warps (bugreport:6884, bugreport:6285).
* Fixed experience reward in Cursed Spirit quest (bugreport:6288).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16990 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-01 22:45:51 +00:00
j-tkay
4d85fe4059 - Fixed Acolyte Tutorial/Quest: A wrong placed curly bracket. Thanks to clydelion! (npc/quests/first_class/tu_acolyte.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16989 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-30 16:48:37 +00:00
rud0lp20
c300d95241 Follow up r16981:
- Where it causes nullpo_info warnings or even map crash(bugreport:6954)
   - Fixed wrong display of info using HW_MAGICPOWER in pre-re/skill_cast_db.txt(bugreport:5663)
Synced 'skill_cast_db.txt'(new skills only) of RE with PRE RE

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16988 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-30 16:41:54 +00:00
glighta
14ecbcf666 -Fix old warnings. 1st step to get ride of -wno flag in configure.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16987 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-30 04:13:46 +00:00
momacabu
2821d94d7b - Minor tweak in @jobchange, it will now read msg_athena.conf job names;
- Fixed warning in cleanmap command (follow up to r16971).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16986 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-30 00:30:13 +00:00
momacabu
0e8c431c82 - Upon character deletion remove received mails and elemental.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16985 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-29 22:58:14 +00:00
markzd
8d166e597a * Fixed bugreport:6942 where bSkillCooldown was not applying to skills.
* Fixed some grammar typos in pc.c

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16984 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-29 22:38:26 +00:00
rud0lp20
1c686036db Follow up r16981 wrong column for duration2(fixed for bugreport:6848)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16983 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-29 17:57:29 +00:00
thatakkarin
e49bf6b138 * Removed Non-English sample files from doc/sample/ (bugreport:6750)
- sample/npc_test_ev.txt was originally used to demonstrate nifty event related commands.
 - sample/npc_test_arena.txt is rather defunct as there are fully working scripts within npc/ that demonstrate the same functionality.
 - sample/npc_test_str.txt explains how StRing != striNG. This is documented in doc/script_commands.txt
* Slight update to CMakeLists.txt for README.txt 

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16982 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-29 16:20:40 +00:00
rud0lp20
4129e5eb1c Fixed bugreport:5689 recoded/reimplement RE Matk formula(including RE Heal)
Fixed bugreport:5745 WL_RECOGNIZED us now functional.
Fixed bugreport:5663 where HW_MAGICPOWER shows glitch in status window.
Fixed bugreport:6759 where items granting matk bonus didn't work.
Follow up r16980 small performance enhancement...:)
Done some TODO in skill_cast_db.txt

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16981 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-29 16:03:55 +00:00
markzd
02613ae097 * Minor fix and description when removing debuffs by status_change_clear_buffs.
Follow up: r16979
* Reverted r16930. (bugreport: 6939)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16980 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-29 15:19:56 +00:00
markzd
d20b06eeec * Fixed (assistant/slave)summons/clone, where they dissappeared when going up to a nobranch mapflag map. (bugreport:6925)
* Minor fix to to Nosiege, follow up (r16969)
* Fixed RK_Refresh where it was not removing/protecting from the right debuffs.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16979 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-29 08:26:44 +00:00
euphyy
a0b84ee722 * Added missing bindatcmd documentation (tid:74882).
* Follow-up r16976: spell check and other minor changes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16978 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-29 01:34:17 +00:00
thatakkarin
60b1b0bc97 * Follow up to r16975 - removed reference to ${CMAKE_CURRENT_SOURCE_DIR}/readme.html in CMakeLists.txt (Why was it referenced there :o )
* Modified ShowInfo in map/map.c to reflect change.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16977 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-29 01:23:53 +00:00
thatakkarin
4618d0c970 * Removed readme html files and replaced with README.txt after looking at the poll on tid:71432 - there was nothing in the ~600kb that couldn't be summed up in ~8kb. The poll suggested no one really used them, so they're not staying.
* Changed readme file to .txt for easy viewing on both *nix and Windows OS's.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16976 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-29 01:04:29 +00:00
brianluau
69f238542f - Follow up to r16971: don't overwrite /conf/import/ if files already exist
(because that probably means they edited them!)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16975 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-28 06:59:35 +00:00
momacabu
7fd73dbee1 - Fixed bugreport:6304, where mail titles could be bypassed thus having no length.
- Applied old patch by Daegaladh on bugreport:6044 for mercenaries and elementals mimic master's speed.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16974 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-28 00:22:59 +00:00
momacabu
875c7f5b8a - Don't recall the player if it is on the same place as the recaller;
- Fixed part 2 of bugreport:4337, homunculus experience received now share with party members.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16973 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-27 22:39:58 +00:00
euphyy
f60980596d * Follow-up r16971, documentation for map-cleaning commands.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16972 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-27 22:32:03 +00:00
momacabu
fbd6003be0 Applied suggestion in tid:74775. Added script command cleanmap and cleanarea script commands. Also modified @cleanmap to properly clean the entire map and added @cleanarea to clean an specified area. A documentation will be done in shortly.
Automagically copy files from import-tmpl to import folder on Windows after building the project (only works with rAthena-10 and rAthena-12) (tid:74635).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16971 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-27 21:53:07 +00:00
euphyy
e5e852cb54 * Applied Renewal mob mode changes (bugreport:6150).
* Small documentation changes (incl. bugreport:6937).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16970 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-27 21:21:45 +00:00
glighta
de6556ebb1 -Fix bugreport:6930 heal -Hp,0; percentheal -100,0; causing crashmap
-Upd bugreport:6751 with MarkZD followup patch 

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16969 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-26 00:52:01 +00:00
greenboxal2
a7c32653f7 Applied AStyle code formating as discussed on tid:74602.
Removed /SAFESEH option from MSVC11 projects.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16968 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-25 21:20:43 +00:00
thatakkarin
a1589988eb * Misc spelling fixes
* Added @lkami to list of current @kami variations in doc/atcommands.txt

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16967 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-25 20:42:27 +00:00
euphyy
e5253aa7c6 * Added the "Catalog Magician" NPC to merchants/buying_shops.txt, thanks to Muad_Dib!
* Changed all commands in atcommands.txt to their defined names, not aliases, and added two more common aliases.
* Documented 'makerune' in script_commands.txt.
* Documented '@accinfo' in atcommands.txt.
* Follow-up r16965, database update for rune crafting formula.
* Updated Magic Mushroom DB according to 3CeAM revision 703.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16966 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-25 01:08:33 +00:00
glighta
5761fd1603 -Upd RK_RUNEMASTERY cooking percent, linked with upd of makerune args as requested
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16965 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-25 00:41:50 +00:00
glighta
e54c630ce3 -Add tool/check-doc to verify if all script/atcommand are being documented. thx to Trojal
-Upd SC_ASH, make skill fail at 50% rate

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16964 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-24 20:41:16 +00:00
euphyy
6361cb555f * Permanent monster spawn documentation is finally up-to-date (partly follow-up r16962).
* Added missing documentation for boss_monster, and fixed a waitingroom example (bugreport:6800).
* Added a small detail to pcblockmove documentation (bugreport:6894).
* Added an array example to getd() documentation (tid:63002).
* Follow-up r16961, standardization of documentation.
* Deleted incorrect UseSkillToPC comments in scripts. This command will hopefully be added in the future.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16963 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-24 20:39:13 +00:00
momacabu
a2767e60af Fixed behavior in permanent mob spawns allowing new optional parameters: level, size and AI.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16962 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-24 20:21:46 +00:00
arcshiru
c3093ec12d Added documentation for getcharip
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16961 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-24 15:00:41 +00:00
glighta
7711b41dc0 -Fix geoipreading cache for Windows, bugreport:6923
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16960 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-24 13:29:13 +00:00
glighta
b147d57559 -Fix bugreport:6751 allow noseige to be casted while under status.
-Upd athena-start, save pid to not kill all other process with same name (annoying when multiple server)
-Harmonize setmapflag and @mapflag, flag value is always an int, and could be superior to 1 for some mapflag
-Fix bugreport:6923 for Windows
-Upd @zeny to remove rest of zeny if not enough money as requested

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16959 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-24 08:50:59 +00:00
cookiecrumbs
dd921e44ec Follow up to r16957 to fix an error with getcharip.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16958 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-24 07:04:38 +00:00
cookiecrumbs
68c19e8a0f Implemented script command getcharip (tid:69646)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16957 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-24 04:02:20 +00:00
momacabu
8e718efb12 Implemented @warp modification (tid:74181), it check if a map exists regardless of case-sensitivity. Also fixes bugreport:5719.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16956 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-24 03:12:35 +00:00
euphyy
7fc959438d * Removed duplicate isequipped() entries from item_db already written in item_combo_db (bugreport:6924).
* Moved a few remaining isequipped() entries to item_combo_db.
* Follow-up r16940: applied change to SQL and pre-re files, and renamed Size constants to Size_ for consistency.
* Follow-up r16947: fixed mob modes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16955 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 18:30:42 +00:00
momacabu
87696fb2f1 Partial fix for bugreport:4337.
A new field was added to homun_skill_tree.txt containing the minimum level of intimacy to unlock a skill. 
This is used in some skills where the homunculus has to reach a amount of 910 of intimacy. The default value is 0 and it should only affect evolved homunculus.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16954 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 18:15:21 +00:00
momacabu
1c7e4e1e0f Fixed bugreport:2307, if you get an mail attachment with the char-server offline it wouldn't be saved to your inventory and therefore the item would be lost.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16953 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 15:59:06 +00:00
glighta
0743650416 -Apply mkdu95 fix for bugreport:5145 preventing clone if player dead, (for slave and evil clone)
-Fix old fread, fgets warnings, displaying a msg errors when failed now
-Cleaning checkweight debug showinfo


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16952 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 05:53:29 +00:00
momacabu
f21454e1db - Fixed dumb warning (follow up to r16950) -_-
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16951 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 04:34:12 +00:00
momacabu
96c2cf57d3 - There will now be a warning regarding to map name length limitation (part of bugreport:1688).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16950 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 04:19:16 +00:00
momacabu
151ef27c58 Follow up to r16946, where not all npc interactions (input, menu) where properly terminated.
*Buddha of mine I also horrendously misplaced the code.*

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16949 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 03:37:38 +00:00
momacabu
78c79827dc - Temporary fix for bugreport:1023, where various 'next' buttons would pop --for now let's display everything in one single "page";
- Fixed something related to bugreport:1900 (but not only); added a new flag to status_change_clear to include some status as SC_WEIGHT50, SC_PUSH_CART, which shouldn't be removed by sc_end script command.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16948 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 03:28:54 +00:00
euphyy
7630c7eb61 * Added Guillotine Cross job quest, again thanks to Muad_Dib! (bugreport:5834)
* Follow-up r16941: added documentation.
* Updated WOE Controller script to v1.4, which modifies LoadEvent mapflag settings for easier cross-compatibility and standardizes script format.
* Minor tweaks here and there.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16947 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 03:22:28 +00:00
momacabu
1fae8bcda4 Fixed bugreport:2313 where a player interacting with a NPC would still be queued when died and therefore causing problems with further NPC interactions.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16946 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 01:10:36 +00:00
cookiecrumbs
0fc1353ab1 Added params for bCritical, and bASPD for usage in NPC scripts per Euphy's request.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16945 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-22 21:38:27 +00:00
j-tkay
8e37713f8d - Fixed bugreport:6922, Sura Job Change Quest: Removed disablenpc which causes players stucked in waitingroom. (npc/re/jobs/3-2/sura.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16944 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-22 20:21:18 +00:00
brianluau
ec75513871 - Fixed missing 'close' in priest.txt (bugreport:6921)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16943 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-22 16:45:51 +00:00