summaryrefslogtreecommitdiff
path: root/src/resources/iteminfo.h
AgeCommit message (Collapse)AuthorFilesLines
2012-01-26Updated copyrights to 2012Thorbjørn Lindeijer1-1/+1
2011-06-02Arbitrary code cleanupsThorbjørn Lindeijer1-4/+8
Just some stuff that piles up while "looking" at the code, which eventually gets annoying to ignore while staging real changes. * Replaced a few NULL occurrences with 0 * Rely on default parameter for std::vector::resize. * Replaced a few "" with std::string() * Prefer .empty() to == "" * Removed a few comparisons with NULL * Don't check pointers before deleting them * Removed a bunch of redundant semicolons * Made some global variables static (local to their compilation unit) * Prefer prefix ++/-- operators to postfix versions when possible * Corrected location of a comment
2011-04-30Added customizable on-hit effects for characters.Yohann Ferreira1-7/+21
This patch adds support for the following two parameters in weapon items: hit-effect-id: Effect triggered on the victim on normal hit. critical-hit-effect-id: Triggered on the victim on critical hit. (Specified in effects.xml) The patch also permits the use of custom defaults set in paths.xml by setting the following keys: (Paths are relative to the 'particles' key value, here.) hitEffectId: defaulted to effect id 26. criticalHitEffectId: defaulted to effect id 28. Resolves: Mana-mantis #337. Reviewed-by: bcs86
2011-04-29Remove default assignment of an attack action to non-weaponsStefan Dombrowski1-2/+0
This avoids log warnings for missing weapon range. Reviewed-by: thorbjorn, bcs86
2011-04-26Made the client use a unique kind of movement code.Yohann Ferreira1-1/+3
This is fixng many issues and (hopefully) will make the movement rendering much smoother. Merge branch 'master' of gitorious.org:~bertram/mana/mana-movement-code-merge Conflicts: src/being.cpp src/net/manaserv/beinghandler.cpp Resolves: TMW-Mantis #946. Reviewed-by: Thorbjorn.
2011-04-09Removed a lot of useless "documentation"Thorbjørn Lindeijer1-13/+4
I have to admit I contributed a large part of these. Sorry for that. Less empty space, more attention to the code. Acked-by: Jared Adams
2011-03-17Simplified the get/setAttackRange() functions as requested.Yohann Ferreira1-1/+3
The attack range is still hardcoded for Manaserv as long as generic equipment handling hasn't been implemented.
2011-03-16Fixed the attack range handling for both servers.Yohann Ferreira1-1/+1
The attack range is always the default for manaserv, as proper equipment handling is to be added. Anyway, now the proper attack range is handled in tmwAthena and is always set a proper minimum for both protocols.
2011-01-24Refactored the item loading in a more extensible and per protocol way.Yohann Ferreira1-40/+102
This will greatly help into upgrading the need of each protocol separately. This is the first step to a new item and equipment system for manaserv. A subclassing of the EquipmentWindow will be done in the next commit, as requested by Thorbjorn. Reviewed-by: Thorbjorn.
2011-01-13Removed the unused and undefined setWeaponType() function.Yohann Ferreira1-2/+0
Trivial.
2010-08-26Merged testing branch into master.Yohann Ferreira1-46/+26
2010-07-29Changed the items loading to handle a new 'attack-action' parameter.Yohann Ferreira1-24/+10
The old behaviour was to load the weapon-type value and do many unnecessary checks and transformation on it: The weapon-type was transformed using hard-coded values into an integer enum value. The exact same thing was done on the opposite side in the animation files before comparing the two. As both data were string values, I simplified all of it by using the value taken in items.xml to call the corresponding action. This now also permit to set up new attack animation in items.xml and in the playerset.xml without having the need to modify the client code. Last but not least, the weapon-type value was used by both the skills and the actions and avoided the possibility to set up a definite action for a weapon-type. Note: The weapon-type parameter will become deprecated for the server in favor of a 'skill' parameter to reflect more it's actual use. This patch is the first step to fix Manasource issue: #157.
2010-07-28Changed mAttackType to mWeaponAttackType were appropriate.Yohann Ferreira1-5/+5
To avoid misunderstanding between the actual attackType and this one. (Trivial fix.)
2010-05-17Remove Monster, Player, and NPC classesJared Adams1-1/+1
Instead of having these three subclasses with minor differences, this commit merges them back into Being. In the future, we can make Beings that are talkable to some, attackable by others, etc. This also puts back support for monster equipment. Also changes remaining references to Being::Type and the constants to refer to ActorSprite::Type. Reviewed-by: Freeyorp
2010-05-06Add support for floor item spritesJared Adams1-5/+5
This commit adds a sprite hierarchy (Sprite->ImageSprite,AnimatedSprite,CompundSprite; CompoundSprite,Actor->ActorSprite;ActorSprite->Being,FloorItem) to collect common functionailty into new base classes which will make other Mantis tickets easier to do. Also allows monsters to use particle effects. Reviewed-by: Bertram
2010-04-16Add race support for eAthenaJared Adams1-13/+15
The job/class field is used to select the race. If the given race isn't defined, it falls back on the first race (so servers can use jobs/classes without races). Also rename job to subtype for Being and subclasses, and begin support for changing monster and NPC subtypes on the fly (particle effects still need to be reset when they change). Reviewed-by: Bertram
2010-02-22Modify copyright headersFreeyorp1-1/+2
2010-02-20License header update for The Mana ClientThorbjørn Lindeijer1-4/+3
2010-02-10Adds missile-particle attribute to items and monster attacksChuck Miller1-0/+8
To use simply add something like: missile-particle="graphics/particles/arrow.particle.xml" to the item's or monster's xml entry This will only work on equipped weapons, and on specified monster attacks. This patch also fixes a memory leak with target particles
2010-02-07Updated Copyright year to 2010!Bertram1-1/+1
Also added the update copyright tool from the Wormux Team. ( And not forgetting credit's due. :P )
2010-01-17Fix equiping charm itemsChuck Miller1-1/+2
2010-01-12Standardize header orderJared Adams1-2/+2
Also remove some extra new lines and fix eAthena's PartyTab define guards.
2009-08-13Clean up Being and it's derivativesJared Adams1-1/+1
Move stuff only needed for Players into Player (like slots and sprite limits). Move name handling into Being (no need for three copies of this code). Clean up terminology (including Map terminology). Remove hair-related variables.
2009-05-23Fixed the empty item link crash differentlyBjørn Lindeijer1-3/+4
The crash was due to an assertion which shouldn't have been there, so I removed the assertion instead. I've also made sure the unknown item has its id initialized to 0, so that it can be used to check against instead of the item name. Normalization of item names was moved within the item database.
2009-04-09Actually use ItemType instead of shortBjørn Lindeijer1-3/+3
Plus some random cleanups.
2009-03-30Merge weapon typesJared Adams1-2/+0
2009-03-30Merge item types to remove more #ifdefsJared Adams1-11/+0
2009-03-27Fixed include structure in resource/ directoryBjørn Lindeijer1-6/+4
There is also a new rule that trivial constructors and destructors should no longer be trivially "documented", since this just takes up space with no gain.
2009-03-25A host of code style fixesBjørn Lindeijer1-8/+8
Mostly putting & and * in the right place and making some getters const.
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-10/+16
Conflicts: A lot of files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-0/+91
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-8/+14
Conflicts: src/being.cpp src/being.h src/floor_item.cpp src/floor_item.h src/flooritemmanager.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/popupmenu.cpp src/net/beinghandler.cpp src/npc.cpp
2009-03-02Added particle attacks back on to the players. However, instead of beingIra Rice1-8/+14
constant, particle attacks are now weapon specific, so that different weapons can have different attacks. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-2/+3
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Added coloring of item names by type. TODO: Allow this to beIra Rice1-7/+5
customizable through the color interface so that if someone is colorblind to a certain color and it doesn't show up well, they can change it (or even people who just don't like the default color). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-2/+2
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-20Added linking to item's just using [Item Name] in chatDavid Athay1-0/+7
2009-01-14Added linking to item's just using [Item Name] in chatDavid Athay1-0/+7
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch1-2/+4
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-2/+0
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer1-2/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-10-31Merged revisions 4071,4093,4100,4363 via svnmerge from Bjørn Lindeijer1-1/+1
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4071 | the_enemy | 2008-04-11 16:12:30 +0200 (Fri, 11 Apr 2008) | 3 lines Players now need to click on the monster sprites rather than the tile. Players will now move to the target before attacking it. ........ r4093 | the_enemy | 2008-04-15 18:10:32 +0200 (Tue, 15 Apr 2008) | 1 line Fixed clicking near player. ........ r4100 | peaveydk | 2008-04-16 13:59:36 +0200 (Wed, 16 Apr 2008) | 1 line Cancel walking to a clicked monster if the target is lost while getting to it (killed or otherwise removed). ........ r4363 | crush_tmw | 2008-06-24 14:42:04 +0200 (Tue, 24 Jun 2008) | 1 line corrected date in changelog ........
2008-10-25attack range fixes, highlight monsters in range (by Chuck Miller)Roderic Morris1-0/+37
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-06-12Merged revisions 3738 via svnmerge from Bjørn Lindeijer1-18/+4
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3738 | b_lindeijer | 2007-11-16 00:44:01 +0100 (Fri, 16 Nov 2007) | 3 lines Moved item icon from ItemInfo class to the Item class, so that it can be loaded on demand. Results in faster startup time and reduced memory usage. ........
2008-02-22 Handling gender with an enum everywhere.Philipp Sehmisch1-2/+4
2008-01-28Added weapon skill system and leveling system.Philipp Sehmisch1-13/+10
2008-01-10Item types and weapon types are now identified by name instead of numbers in ↵Philipp Sehmisch1-1/+42
the items.xml. Removed entries for eAthena compatiblity from items.xml (the database isn't eAthena compatible anymore), added item type and weapon-type properties to all items. All healing items now have a healing effect.
2007-11-20Merged revisions 3692 via svnmerge from Bjørn Lindeijer1-1/+1
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3692 | gmelquio | 2007-10-27 11:03:13 +0200 (Sat, 27 Oct 2007) | 1 line Made it compile with GCC 4.3 ........