548 Commits

Author SHA1 Message Date
aleos
ae5e899822 * Small cleanup in friend_auto_add config to now note auto-deletion.
* Updated the Secure NPC Timeout feature to work as it does on official servers and enabled by default. (bugreport:1721) (Hercules e671397)
* Fixed disable_items not working when the close button appears in NPC dialog while keeping close/close2/end backwards compatibility. (bugreport:7307 / bugreport:7469)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17280 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-22 02:08:11 +00:00
lemongrass3110
8066c5c790 Hercules merges:
-- 8ec2353: Fix bad login values. bugreport:86
-- c653a70: Added a warning for out of bounds coordinates. bugreport:419
-- 08ad9b1: Fixed bleeding not giving exp. bugreport:5811
-- 370bfb7: Updated renewal critical damage. bugreport:4464
-- 1e21ff7: Fixed @hide not getting saved on relog. bugreport:7102		

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17266 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-16 23:11:51 +00:00
glighta
bba1db77e0 -Releasing Multilanguage support tid:80352 hx to Lilith and all other contributors
No other langage is enable by default, change LANG_ENABLE in msg_conf.h
-- Add 2 new atcommand :
@langtype to switch over langages
@reloadmsgconf to reload the db
Langage choosen is account wide, not reseted by default on relog.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-12 03:50:16 +00:00
glighta
b43102152f -add enum for return value of pc_additem
-revert r17142 sd.guild assignment

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17248 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-11 13:28:30 +00:00
lemongrass3110
48431ee9db New NPC range now working.
Sorry guys, back in my days it was as easy as this, but I did not test it. So now tested and working. :)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17246 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-10 15:02:11 +00:00
lemongrass3110
386f0ae36e Cashshop support
Since our neighbors were a little earlier with releasing the cash shop system, here is our version of it.
It supports TXT and SQL databases and even features kafra point support.
Don't forget to run your SQL updates, since this feature needs another log table for your own security. ;)

Follow up to r17240 finalizing pincode feature. Should be stable now - no beta anymore. Fixes bugreport:7505

Fixed guild creation bug bugreport:7502

Implemented the new NPC range tid:81303

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17242 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-10 02:09:34 +00:00
glighta
29970729cf -Fix chat system not deleting all chan on logout. tid:80999
-Upd @mapinfo to count number of vendors in map
-Upd getrandgroupitem to check if valid itemit returned.
-Cleanup and KR style

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17232 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-07 08:24:15 +00:00
euphyy
643861ba17 > Implemented Channel System to replace @main. See tid:80999 for full details. (Hercules 7ec1e8f, 1e87c09)
* Adds @join and @channel commands to manipulate chat channels. (see doc/atcommands.txt)
* Speak in a #channel by sending a whisper to #channel or binding your global chat to the channel (@channel bindto <#channel_name>).
* Automatically join local map channels (#map) and guild ally channels (#ally), with mapflag 'nomapchannelautojoin' to disable the channel for a map (optional).
* Allow users to create private channels if 'allow_user_channel_creation' is true.
* Set default channels, text colors, and other settings in conf/channels.conf.
> Other changes:
* Improved overall guild processing/lookup by creating a cached guild state.
* Fixed a bug where equipping a garment would override costume garment.
* Removed clif_message and merged it with clif_disp_overhead, since both use the same packet.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17228 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-03 22:52:25 +00:00
euphyy
e59e1d99d3 * Fixed an error in pincode system (follow-up r17183).
* Revised/added 'npc_isnear' to check if an NPC is nearby when opening chat rooms or using vending. (Hercules bc63ef1)
* Misc. fixes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17187 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-03-10 05:25:54 +00:00
euphyy
3a330a455a * Part one of fixing bugreport:6527. This does not yet change functionality.
-- Added 'disable_items' to all applicable scripts.
-- Added preliminary source modifications. (Hercules 137cc43)
* Raised max stat for third jobs to 125 (follow-up r17133, bugreport:7295).
* Fixed logical issue with r17151. (Hercules 5c667cc)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17160 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-25 03:04:33 +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
ediejohnny
1293086061 One more fix at "bindatcmd" command. Related to bug:7240.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17121 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-04 21:57:52 +00:00
euphyy
84d500ea2c > Hercules merges:
* 5b37805:
Items are no longer unequipped when a card within them is blacklisted (e.g. item_unequip.txt), instead the card's effect is nullified.

* cc8e005:
item_noequip overhaul.
Items are no longer unequipped when disabled by item_noequip.txt, instead their effects are nullified -- however cards in them, unless also disabled, wont have its effect nullified.
Consumables will be consumed even while disabled, unless you modify the new config item_restricted_consumption_type.

* 7192b10:
SECURE_NPCTIMEOUT should be fully functional now, fixed remaining known issues. (bugreport:5343)

* 63145d6:
Where casting MO_EXTREMITY to untargetable targets causes the caster to move in fixed location/coordinate.

* 17f2e6a:
Fixed clif.c::clif_parse_NpcSelectMenu.  SECURE_NPCTIMEOUT is always defined; the check is wrong.

* 125b758:
Added New Char-Server Rename Packet.

* d6d49c4:
Updated Safety Wall Renewal behavior, when taking damage higher than the health of the safety wall, excess damage will no longer be passed to the player.
Fixes bugreport:6243, bugreport:6697.

* 7626b14:
Fixed wrong 'if' condition in checking CELL_CHKNOPASS for the OFFICIAL_WALKPATH where clear path is considered to be limited to 14 cells it should only be with obstacles. (follow-up r17091, bugreport:7239)

* 0dbbe22:
Fixed magical reflection behavior, user reflecting now visually casts the skill back at the caster, instead of caster casting it on itself.

* 4671a39:
Monsters in stone curse pre-stone state no longer are able to attack.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17119 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-04 00:08:19 +00:00
euphyy
d030e8cfd4 > Hercules merges:
* 620b36d:
Fixing a typo on skill_trap_type description.

* 13317f0:
Spider web no longer triggers on players on non-pvp maps. (bugreport:7234)
(also fixed tab align on switch and a logical thing on skill_additional_effect)

* fc2e159:
@follow will not stop immeadily when turned off, instead of waiting for the current walk path to be complete. (bugreport:6918)

* 638e2b5:
Replaced strncpy with safestrncpy where I found would be beneficial. (bugreport:3080)

* 74ed3ed:
Players in chatrooms can now equip/unequip gear, can talk to NPCS, and can't use consumable items. (bugreport:6097)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17114 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-31 22:32:19 +00:00
euphyy
b2a3bdd1c9 > Guild fixes:
* Added a check to prevent double Emperium spawns in WOE SE castles (since r16571).
* Added guild disbanding events for WOE SE castles (since r12531).
* Fixed an incorrect parameter in WOE FE guild disbanding event (since r12673).

> Other:
* Fixed .@atcmd_numparameters, code by Zephyr (bugreport:7198).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17106 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-27 06:37:20 +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
06ebeaf3e8 * Fixed bugreport:7052, npcs with monster sprite now work.
* Follow up to r17052, now it properly resets the x and y coordinate for every npc and checks it after the map. 

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17053 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-27 22:00:14 +00:00
momacabu
6d4f54625b * Also checks for righty coordinates before actually loading the npc. Improves fix for bugreport:419.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17052 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-27 20:24:44 +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
momacabu
97018a0b98 Follow up to r17013, exit loop if found a warp near the player.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17023 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-15 02:09:42 +00:00
momacabu
872c6bf810 Fixed bugreport:6483. NPCs with OnTouch in the same area of a Warp won't block player from being warped.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17013 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-09 22:14:19 +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
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
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
shennetsind
0c992d9e23 Minor performance improvement; created guild flag cache to replace the inefficient npcdb lookup, in perspective:
Before: whenever a guild emblem was changed it'd loop through all npcs looking for flags belongin to that guild
Now: whenever a guild emblem is changed it'll loop through a very small list which contains all guild flags, and from there it'll update the flags accordingly.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16935 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-20 08:31:41 +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
glighta
33b2b02c5a -Upd mob_count to read a 10 modib list to chk if present or not
-Add UNLIMITED_HUMMING implementation, now increase sp requirement and make cast unbreakable
-Upd Group dance overlaping A and B, previous chk wasn't ending other properly (if fail was skipping other)
-Upd OdinPower effect

-Fix Cursed-Circle, shoudn't be able to cast near Emp,Stones bugreport:6457
-Fix Cursed-Circle wasn't remove when caster was being warped

-Small docs upd

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16918 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-12 01:54:56 +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
momacabu
1450a8527d - Fixed bugreport:6816, bugreport:6818, bugreport:6843, buying a Pet Egg is now working. Special thanks to Ind;
- Fixed a bug where pet egg was not deleted properly after clearing the floor.
- Adjusted comment from msg_athena.conf, these IDs are being used!

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16897 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10 05:06:39 +00:00
shennetsind
3c6c2d20fb Minor improvement on npc_event_do_clock, moved it so that its only assigned when its actually used
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16895 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10 03:47:27 +00:00
brianluau
70edb63177 - Added LOOK_*** script constants, same names as from map.h
- Changed atcommand "@changelook" to changelook script command in custom quest_shop.txt

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16862 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-05 18:25:15 +00:00
brianluau
f9807c537b - Fixed OnSellItem not setting all the "@sold_card%d" arrays. (bugreport:6847)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16860 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-05 07:12:44 +00:00
euphyy
9fcdb56b2e * Follow-up r16835: Some cleanup.
* Updated Hunting Missions script to v1.2b, which adds experience multipliers to config (custom\quests\hunting_missions.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16839 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-10-29 07:35:02 +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
greenboxal2
8e001cacff Fixed bugreport:6665 NPC timer will not stop anymore after running all timer events.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16769 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-10 11:29:49 +00:00
shennetsind
779d97c1cb Hello! few things.
1) fixed bugreport:6603 - delayed clearunit now makes use of the ERS which is quite convenient for it speeds up due to the previous amount of mallocs that function would spend.
2) added extra debug information to the ERS system (before on any of its warnings we'd go OH MY GOD WHICH ONE OF THEM DID IT!!!), now upon allocation you give it a const, human-readable, name.
3) added support for options in the ERS system to save multiple/redudant processing in battle_delayed_damage and clif_clearunit_delayed and perhaps also in the future.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16736 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-02 23:02:35 +00:00
shennetsind
390e6cdf92 Follow up r16733 also the remaining fix for bugreport:6572, making onagitinit be run on reload to refresh the flag's emblems
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16734 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-02 17:51:29 +00:00
greenboxal2
69298d5191 Fixed error in npc_path_data reference counting resulting in the script never getting really unloaded.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16706 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-26 01:19:52 +00:00
shennetsind
9aa4228cf6 Fixed bugreport:6550 @unloadnpcfile now refreshes the hardcoded npc event array (onpckillevent onpcdieevent etc) so that any unloaded references are properly removed.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16697 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-24 15:07:19 +00:00
shennetsind
1beef8ba89 Major cleanup all over the place, made possible by mkbu95's scan-build report he provided us with.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16687 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-22 20:33:06 +00:00
shennetsind
3adadbdca1 Follow up r16656 improved unloadnpcfile stuff performance-wise, making npcs from the same file share the filepath reference rather than each having its own copy.
Special Ultra Super Thanks to Trojal <3

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16657 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-17 20:59:50 +00:00
shennetsind
40b3dfe73b Added 2 (3) new atcommands:
* @unloadnpcfile <file path>
** e.g. "@unloadnpcfile npc/cities/alberta.txt" unloads all npcs created by the npc/cities/alberta.txt file.
* @addperm/@rmvperm <permission_name>
** e.g. "@addperm skill_unconditional" / "#rmvperm "player" skill_unconditional"

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16656 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-17 19:41:29 +00:00
shennetsind
dc62ddd164 Follow up r16471 improved overall feature performance by making the bind list a pointer array, this also allows the system to have a unlimited amount of atcommand bind instances. also fixed a memory leak that'd be caused when npc_do_atcmd_event fails (e.g. when target npc is manually reloaded)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16485 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-23 19:26:50 +00:00
cookiecrumbs
0fd45ac13e Added the ability to bind atcommands to NPC events (ex: NPCNAME::OnEvent); original version by ToastOfDoom however heavily modified by I enabling command level at the invoking/character (@/#) level and fixes to prevent console errors as well as fixes aimed to ensure compatibility with rAthena.
Updated the script_commands.txt documentation with the following script commands: bindatcmd, unbindatcmd and useatcmd.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16471 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-22 05:15:32 +00:00
shennetsind
199c5acb6f nothing noteworthy, really.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16397 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-11 14:37:50 +00:00
shennetsind
ea0fba8394 Fixed bugreport:5839 mapflag conflicts were displaying wrong message
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16184 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-31 18:42:26 +00:00
shennetsind
cde1d9c0a4 Fixed bugreport:5804 Instances no longer leave "broken" timers behind. Instances also will destroy themselves upon @reloadscript since they break at that.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16183 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-31 17:46:20 +00:00
brianluau
9fc7b8d629 - Follow up to r16147: check the price in the shop file, instead of id->value_buy. Thanks EvilPuncker!
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16154 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-26 23:53:26 +00:00