522 Commits

Author SHA1 Message Date
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
shennetsind
c530f9869b Fixed bugreport:5658 Instance NPCs will now be cleared properly. Super-Special Thanks to Pig321
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16153 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-26 21:49:36 +00:00
brianluau
5b89fe9c06 - Added a warning when NPC shops sell items for 0z (FREE!)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16147 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-25 03:46:10 +00:00
shennetsind
d098c01bd2 NPC Loaded by @loadnpc will now trigger their OnInit labels as they're loaded.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16130 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-19 23:15:28 +00:00
shennetsind
df2f149052 Fixed bugreport:5757 Added missing Sorcerer Insignias, Credits to brAthena
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16115 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 06:01:15 +00:00
shennetsind
2f177fa207 A minor memory improvement, and some curly brace love.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16008 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-29 17:54:32 +00:00
shennetsind
622ce6fd0f Yet another performance improvement: Shut Down processing is now about to 7 times faster.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16006 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-29 16:33:55 +00:00
shennetsind
444142de89 Follow up r16004 >_<" some not-supposed-to-be-comitted debug messages slipped in.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16005 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-29 15:51:28 +00:00
shennetsind
535e0712a9 reasonably-sized performance improvement: @reloadscript is about to 3 times faster.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16004 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-29 15:47:57 +00:00
epoque11
02e4daf67d - Updated the script engine to make use of the DBMap* structure for storing variables (for Ind <3)
- Fixed missing new-lines at the end of various files causing warnings

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15997 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-28 21:50:55 +00:00
greenboxal2
4f4f19caf6 Fixed memory leak on MvP tomb system, killer name now uses static buffer. (bugreport:5615)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15954 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-24 16:27:04 +00:00
greenboxal2
1ccea559bf Added mvp tomb system.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15908 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-21 14:00:23 +00:00
greenboxal2
02adb19ade Fixed bugreport:5586 SC_CAMOUFLAGE can be removed by using RA_CAMOUFLAGE again, also portals won't warp players under this status.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15902 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-21 08:46:26 +00:00
shennetsind
8be0fbff1f Minor performance improvement. server no longer wastes processing time creating the awfully long spawn packet when there is nobody in the map it is being spawned in (for mobs & npcs). this also makes server boot faster.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15856 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-11 11:21:48 +00:00
shennetsind
6f1bcbd4a0 minor improvement on NPC parse processing
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15853 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-11 07:49:25 +00:00
gepard1984
b610cb1a7c - Script label db now utilizes DBMap's ability to store integer-type data (follow-up to r15682).
- Some minor code cleanups.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15734 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-19 23:35:42 +00:00
gepard1984
691872fdc7 Enhanced DBMap implementation to allow storing integer type data in addition to void pointers.
- Added enum for data: `int`, `unsigned int` and `void*`
 - Replaced generic `void*` data with `DBData` struct to hold `int`, `unsigned int` or `void*` (member of `DBNode`)
 - Added `db_i2data`, `db_ui2data` and `db_ptr2data` functions to cast from `int`/`uint`/`void*` to `DBData` (used in `DBMap::put()`)
 - Added `db_data2i`, `db_data2ui` and `db_data2ptr` functions to get `int`/`uint`/`void*` from `DBData`
 - Enabled statistics for new functions in `db_stats` struct
 - `DBCreateData` functions (used in `DBMap::ensure()`) now return `DBData` instead of `void*`
 - `DBApply` functions (used in `DBMap::foreach()` and `DBMap::destroy()`) now take `DBData*` as a parameter instead of `void*`
 - `DBMatcher` functions (used in `DBMap::getall()`) now take `DBData` as a parameter instead of `void*`
 - `DBReleaser` functions now take `DBData` as parameter instead of `void*`
 - Default releasers release data if it is `void*` (`DB_DATA_PTR`) type
 - `DBIterator` functions: `first()`, `last()`, `next()` and `prev()` now return `DBData*` instead of `void*`
 - `DBIterator::remove()` now returns `int` (1 if node was found and removed, 0 otherwise) instead of `void*` and takes an extra `DBData*` parameter for the data of removed entry
 - `DBMap::get()` and `DBMap::ensure()` now return `DBData*` instead of `void*`
 - `DBMap::remove()` and `DBMap::put()` now return `int` (1 if node already existed, 0 otherwise) instead of `void*` and take an extra `DBData*` parameter for the data of removed entry
 - `DBMap::put()` now takes `DBData` as parameter instead of `void*`
 - `DBMap::getall()` now puts data into `DBData**` buffer instead of `void**` buffer
 - Updated macros:
   - (`i`/`ui`/`str`)`db_get` and (`i`/`ui`/`str`)`db_ensure` were wrapped with `db_data2ptr` to extract data from `DBData*` that is now returned by `DBMap::get()`
   - added (`i`/`ui`/`str`)`db_iget` and (`i`/`ui`/`str`)`db_uiget` that get `DBData` from `DBMap` and extract `int`/`unsigned int` from it (with `db_data2i`/`db_data2ui`)
   - `db_put`, `idb_put`, `uidb_put` and `strdb_put` data params were wrapped with `db_ptr2data` to match new signature of `DBMap::put()` (`DBData` instead of `void*`)
   - added (`i`/`ui`/`str`)`db_iput` and (`i`/`ui`/`str`)`db_uiput` that put `int`/`unsigned int` into `DBMap` (first wrapping it with `DBData`)
   - added `NULL` in place of extra parameter for removed data in `db_remove` macros
   - `dbi_first`, `dbi_last`, `dbi_next` and `dbi_prev` were wrapped with `db_data2ptr` to extract data from `DBData*` that is now returned by these `DBIterator` functions
 - Updated `DBMap` documentation, and fixed a dozen of typos in it.
 - Updated rest of rA code to reflect `DBMap` changes (mostly required signature changes of `DBCreateData` and `DBApply` functions).
 - Fixed a bug where `DBMap::put()` would return data of a deleted entry.
 - Removed some unnecessary pointer casts.
 - Increased `showmsg.c` static buffer size to fit entire DBMap stats report.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15682 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-13 14:46:28 +00:00
gepard1984
8817eaa885 Code cleanup: replaced DBIterator function calls with macros where possible.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15668 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-09 14:31:15 +00:00
gepard1984
412c51b4bd Minor NPC code cleanup: timer labels.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15648 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-02 00:43:28 +00:00
gepard1984
1e31877e30 Some NPC code cleanup (event labels).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15640 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-29 23:53:22 +00:00
shennetsind
6ea41835de Fixed bug with official npc idle timer thing, bugreport:5343
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15598 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-17 18:03:41 +00:00
gepard1984
334d5959be Removed deprecated memory manager macros (follow-up to r14916).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15581 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-14 15:29:00 +00:00
gepard1984
eb551436fd * Added display name to warps created with @addwarp, so their name is visible in @mapinfo 2 (bugreport:1491).
* `@mapinfo 2` now also displays unique NPC name if it's different than display name.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15534 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-31 23:12:20 +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
shennetsind
ec7aac5625 Fix to progressbar exploit, bugreport:5199
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15442 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-14 06:27:30 +00:00
shennetsind
c827a4e13b Fixed problem with OnTouch on NPC ID 139, blame on r14993, bugreport:5206
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15441 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-14 05:40:02 +00:00