763 Commits

Author SHA1 Message Date
glighta
c0e5e26264 -Remove duplication of msg_txt() handlers in char::inter and map::atcommand, transfert it to common::msg_conf
-Add a msg_table for login server to be able to have his own configured message, (not in source)
-Split msg_athena.conf file into msg_conf/login_msg.conf, msg_conf/map_msg.conf and msg_conf/char_msg.conf, thus allowing more flexibility wich all table and not have to wory about range and offset for shared index... => that was too annoying and same ram requirement..
--nb you still can do import to override those files
-Add msg-config argv options for char and login serv
--Fix bugreport:5440 as exemple of new possibility (for char)
--Changed auth_fail_login hardcoded logged message to configured with msg_txt, as exemple2 (for login)
-Rever athena-start unwanted commit change on r17152

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17153 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-22 02:04:42 +00:00
euphyy
fa88107a9e * Some optimization of 13-1 quests.
* Updated SQL databases from r17134, r17149.

> Hercules merges:
* 2f72676, 06883a7:
Renewal item_db updates, mostly new headgears and costumes.

* b38c660:
Fixed Trick Dead not being removed on job change.

* 55134e8:
Modified @mi exclusion criteria so that it requires a monster to not have a fixed spawn point as well as no base/job exp. It was excluding things such as red/blue/whatever plant from search results.

* bf76055:
#autotrade now relogs the target, not the caster.

* c6882c7, 412efb9:
Updated Renewal Izlude warps.
Moved various Izlude NPCs to Renewal coordinates.

* 064dad8:
Fixed bug where Kagerou and Oboro could hit their Zanzoe.
Follow-up on bugreport:4832, Ankle Snare now works properly in GvG.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17151 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-22 01:28:46 +00:00
lemongrass3110
0ec8a5b6c5 Fixes homunculus level up crashing the map server. bugreport:7106
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17147 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-20 18:08:17 +00:00
euphyy
058a7b4f4e > Hercules merges:
* 7e72f0c, 3bba651:
Improvements all over the place.

* 327a46d:
Arrullo no longer crashes the server when used by monsters.

* 1093763:
Fixed official behiavior of WZ_SIGHTBLASTER dealing with HW_MAGICPOWER.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17139 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-18 23:54:33 +00:00
euphyy
f3e4ef5067 * Updated "Calyon" NPC in El Dicastes quests, fixing an incorrect condition.
> Hercules merges:
* 2bc8562, 126225b:
Skills granted through scripts are now permanent, until this date they were not relog persistent. (bugreport:5018)
Note that you will need to execute /sql-files/upgrades/upgrade_svn17136.sql for this change.

* b8379d2:
@skillid now supports partial search.

* d7ce0c1:
Character's online states are now updated as soon as they attempt a char select, instead of at the end of the procedure. This improves reliability with 3rd party software e.g. control panels. (bugreport:7269)

* d828000:
Login and Char servers will now exit when failing to bind to the port (as map server has always done).

* 003ed2c:
Moved "Honeymoon Helper" and "Odgnalam" NPCs to official RE coordinates.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17136 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-17 21:13:33 +00:00
trojal
56adc76382 * Added quotes parsing to @set (bugreport:7171)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17099 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-14 14:05:39 +00:00
markzd
cebcf7a332 - Fixed an warning of type casting. (bugreport:7081)
- Removed an unecessary type cast before atoi.
- Fixed Ray of Genesis Attack Formula. (bugreport:7053)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17074 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-03 09:12:36 +00:00
glighta
25c1cf6691 -Follow up r17065
--removing useless check on skill_id
--fix few broken atcommand due to failed sscanf
-Change skill_amotion_leniency as pointed out on tid:76492 so amotion delay wont be twice by default, (also increase intervall if you do want higher acd)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17072 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-02 09:40:01 +00:00
glighta
0cdba10793 -Harmonize skillid, skill_num, skillnum, skill, to skill_id and same for skill_lv
-Optimise type from int to int16 in order to reduce ram consumtion.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17065 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-30 16:00:24 +00:00
momacabu
0b758eca8b * Implemented @breakguild (tid:75159) and @hommutate (tid:74651).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17038 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-23 20:23:03 +00:00
momacabu
e0dea40cce * Removed @adopt as it was not working properly (bugreport:6384);
* Introduced @refreshall, it will @refresh all players in-game.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17035 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-23 18:00:59 +00:00
momacabu
509e03fa58 Community Contribution Time!
* Fixed bugreport:6303: official servers now always reshuffle the dice emoticon. To disable change the configuration to 'no'. Thanks to Vianna for providing the information!
* Fixed bugreport:7026: creating a guild and exiting in a short amount of time wouldn't save the guild properly. Thank you clydelion!
* Fixed bugreport:7030: removed warning introduced by r16987. Thanks Mr. Brian and Sir BuildBot for pointing!
* Fixed bugreport:7031: if a player crashed during warp it would cause OnTouch_ to not trigger anymore. Thanks to flaviojs (eA-r15185) for the fix and Napster for pointing out!
* Fixed bugreport:7032: Clementia and Canto Candidus give an additional of +1 str/agi/dex each 10 job levels (from caster). Thanks solvent!

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17034 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-22 19:41:32 +00:00
markzd
7e433f00ff * Follow up: r16011
1. Fixed a behavior which didn't unlock target when it was out of range. (bugrepor:7022)
  2. Removed a redundant variable assignment.
* Follow up: r17029
  1. Fixed @clearcart which was not deleting and updating the client properly.
  
- Special thanks to clydelion, on the fixes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17033 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-20 17:32:49 +00:00
euphyy
b11c97a776 * Follow-up r17030: documented and added bMagicAtkEle to item_combo_db (bugreport:6943).
* Follow-up r17029: moved 'clearinventory' alias to atcommand_athena.conf.
* Custom Quest Shop updated to v1.5, which replaces categories with shop IDs.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17031 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-20 02:18:26 +00:00
momacabu
b9e0b20eeb Implemented @clearstorage, @cleargstorage, @clearcart, @clearinventory (alias for @itemreset) as suggested in tid:70764.
For further details read the documentation in doc/atcommands.txt

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17029 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-19 21:01:03 +00:00
glighta
b23cd26e57 - Re-committed r16987 (pid:161281).
-Re-commiting part is now ended

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17003 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-05 14:24:00 +00:00
momacabu
fd49ef5cf2 - Re-committed r16986 (pid:161281).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17002 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-05 14:21:13 +00:00
rud0lp20
144bb14efc - Re-committed r16981/trunk/src/ and follow up r16988/trunk/src/ (pid:161281).
-Fix previous recommit since r16995

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16999 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-05 14:13:26 +00:00
momacabu
4a9da0c578 - Re-committed r16973/trunk/src/ (tid:74924).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16995 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-05 05:41:00 +00:00
momacabu
fa9879ca5d - Re-committed r16971/trunk/src/ (tid:74924).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16994 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-05 05:25:16 +00:00
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
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
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
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
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
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
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
glighta
805aedeff0 -Apply EvilPuncker path from tid:71756
-Fix and upd logzeny enumeration type bugreport:6897
-Upd @zeny to send a message when succed bugreport:6886
-Upd ChaosPanic to affect all bugreport:6893
-Upd bloodylust cooldown and disable endure effect bugreport:6547

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16940 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-22 01:13:28 +00:00
glighta
b4b7d621ee Following r16914
-fix @zeny for negative amout bugreport:6886, bugreport:6895 bugreport:6888
-fix @cash,@points command display result
-enforce bound chk for both

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16924 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-14 02:26:00 +00:00
glighta
f98f9a56ab Following r16914
-Upd pre-re db (insignia, homon-s, bloodylust, chaospanic)
-fix @zeny for negative amout bugreport:6886

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16923 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-13 01:03:28 +00:00
momacabu
57006f7756 - Fixed bugreport:6887, a variable was not initialized;
- Make @addwarp <npc name> parameter mandatory as per requests;
- Changed SCB_ALL to SCB_BASE on SC_INTRAVISION case, it should be enough.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16922 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-13 00:27:40 +00:00
momacabu
069793e804 Modified @addwarp to accept a new optional parameter <npc name>. If <npc name> is specified, then the warp created will have that name.
Otherwise it will use a name chosen by the emulator.
If there is already another warp with that name the generic name will be used instead.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16919 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-12 02:46:28 +00:00
shennetsind
f0035207bb Follow up r16916: enforced status recalc when intravision ends to ensure it is properly overridden.
Follow up r16914: removed unused var

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16917 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-12 00:53:03 +00:00
glighta
752776e4cc -Add Homon-S skills, 1st implementation (all done except Eleanors)
--Upd Skill conf to set land-limit for homonculus by default (ground skill limit)
--Mv MH_HEILIGE_STANGE and MH_ANGRIFFS_MODUS skill from Eleanor to Bayeri

-Enforce all zeny transaction to use pc_payzeny and pc_getzeny handlers, (auto log and clif)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16914 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-12 00:06:25 +00:00
momacabu
f28c2a56f5 - Modified *monster and *areamonster script commands to allow size and ai parameters.
-- Event parameter now no longer works as size & ai replacement.
-- If not defined, it'll assume the default size (0 = medium) and default ai (0 = none).
- Changed all hardcoded AI states to recently created enum.

Please test, if you find any bugs, report on our Bug Tracker.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16904 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10 19:44:12 +00:00
shennetsind
e242d2b5a9 Performance Improvement; Server shut down, instance clear up, and @cleanmap are now all faster. Instead of wasting time doing a dbmap lookup (of a data it already possessed!) on each floor item being deleted, it'll use the data to clean the item.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16901 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10 17:15:37 +00:00
momacabu
aae7d1d129 - Removed backup.pl (for TXT servers) and vs9-to-vs8.php (outdated versions);
- Merged @killmonster2 with @killmonster tid:73632;
- Fixed bugreport:6764, auction code was misplaced;
- Follow up to r16753 (bugreport:6523), fixed bugreport:6673, using Gravitational Field with Safety Wall would keep the character immobilized. Blame myself, thankyou Lunar for the fix;
- Fixed bugreport:6514, @slaveclone wouldn't be targeted by monster. Thanks to zippy;
- Fixed bugreport:6837, some code was duplicated;
- Fixed bugreport:6768, removed some leftovers from TXT removal;
- Fixed bugreport:6868, Unequipping a weapon with Incantation Samurai card will not kill you if you have less than 999 hp and are on a non-pvp map;
- Fixed wrong bit field on ai field in mob_data structure. Credits to Ind.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16881 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-09 00:26:36 +00:00
brianluau
7b80d7bcdd - Fixed a typo in @mapflag example, since r15009.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16875 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-08 21:54:18 +00:00
glighta
e41effbc4b -Fix bugreport:6547 (bloodylust) upd bloodylust effect to berserk
-Fix bugreport:6208, bugreport:6805 (chaos panic) fix range effect
-Partial Fix bugreport:5275 (toxin now won't interupt unbreackable castskill)
-Folllow up r16847 fix UNT_ZEPHYR get some unwanted bonus, fix Insignia unit range

-Add UF_RANGEDSINGLEUNIT unit propriety thx to 3ceam, workaround to fix ranged unit without timer.
-Prevent WM_SOUND_OF_DESTRUCTION, SC_MANHOLE, WM_LULLABY_DEEPSLEEP being cast in non pvp map
-Fix SC_MAGICMUSHROOM shouldn't force skill if sit
-Replace some hardcoded mobid by enum
-add some mob_is definition for quicker search (gvg and treasure)
-Remove some duplicate check for status_heal (if berserk already done in status heal)
-Upd few documentation

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16855 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-01 01:40:29 +00:00
rud0lp20
156446bf33 Fixed Level/Drop modifier based on level difference and created a db as suggested in pid:137564. (bugreport:6585)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16842 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-10-30 07:30:36 +00:00
glighta
7a6a529548 -Add some src basic documentation.
-Change some remaining -1 for status ending timer.
-Move some hardcoded msg in msg_athena
-Small optimisation on battle_attr_fix

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16835 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-10-29 06:33:43 +00:00
euphyy
fc688d4916 * Fixed applicable job on Ebone Armor (bugreport:6705)
* Follow-up r16790 / r16791, formatting and strncmp -> strcmp (src\map\atcommand.c)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16792 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-22 18:32:55 +00:00
spre123
81670d02ba Oops I goofed Forgot to resave the File Left out arguements for mora. [Spre]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16791 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-22 18:20:17 +00:00
spre123
918ba34f84 Fixed @go, where mora and morocc had conflicts, @mora was sending you to morocc. Also Added the spelling of "Morroc", Thereby Sending you to morocc in the event you mistype it. [Spre]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16790 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-22 18:08:18 +00:00
brianluau
3cc0cfd6ba - Partial revert of r16782. (bugreport:6704)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16783 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-16 15:57:08 +00:00
daegaladh
ba8bb6ff0a Removed stupid alternative city names from @go command and added real ones, also fixed a couple typos.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16782 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-16 14:06:25 +00:00
shennetsind
c728a34884 Fixed @raise/@raisemap incorrect behavior which would heal everyone in the server/map despite being dead or not, Thanks to Joseph for reporting
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16762 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-08 18:06:38 +00:00
shennetsind
14bdbdcaf6 Fixed bugreport:6557 players unable to use char commands will no longer get the 'charcommand failed' message, instead it'll show as a normal chat message
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16759 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-08 17:51:14 +00:00
shennetsind
0beeb8ebf6 Added new group permission as discussed with other developers "disable_commands_when_dead"
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16751 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-06 20:10:58 +00:00