summaryrefslogtreecommitdiff
path: root/src/resources/itemdb.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-2/+9
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-2/+5
Conflicts: Many files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-38/+102
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-11Only check for name and descriptions in items with positive ID's in theIra Rice1-2/+5
ItemDB. This helps reduce the junk logging for the player and hair sprites. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-0/+4
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-0/+4
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-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-7/+2
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-7/+2
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer1-1/+1
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-1/+1
Conflicts: CMakeLists.txt configure.ac data/help/header.txt packaging/windows/setup.nsi po/POTFILES.in src/being.cpp src/being.h src/game.cpp src/gui/color.cpp src/gui/color.h src/gui/equipmentwindow.h src/gui/popupmenu.cpp src/gui/recorder.cpp src/gui/setup_colors.h src/gui/setup_keyboard.cpp src/gui/setup_keyboard.h src/gui/skill.cpp src/gui/speechbubble.cpp src/gui/speechbubble.h src/gui/table.cpp src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/main.cpp src/main.h src/map.cpp src/resources/colordb.cpp src/resources/colordb.h src/resources/emotedb.cpp src/resources/emotedb.h src/text.cpp src/text.h src/tmw.rc src/winver.h
2009-02-11Don't make log statements translatableBjørn Lindeijer1-8/+8
The log is mainly used to aid the developers, hence shouldn't be translated to the user's local language. Also introduces unnecessary work for all translators.
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-02-10Don't make log statements translatableBjørn Lindeijer1-7/+7
The log is mainly used to aid the developers, hence shouldn't be translated to the user's local language. Also introduces unnecessary work for all translators.
2009-02-07Some more include cleanups.Ira Rice1-2/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Added coloring of item names by type. TODO: Allow this to beIra Rice1-2/+2
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-28Removed manual trimmings in exchange for using trim.h instead.Ira Rice1-8/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Modified item popups to show the weight of the item as well. TODO:Ira Rice1-3/+3
modify itemdb to pull the item weight information from the server instead of the client, so as to always have the server and client in sync. Signed-off-by: Ira Rice <irarice@gmail.com>
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 the ability to parse multiple item links, as well as removingIra Rice1-0/+8
extra spaces before or after the [] tags. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Made link searching case insensitive.Ira Rice1-1/+8
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Added linking to item's just using [Item Name] in chatDavid Athay1-0/+32
2009-01-17Added a few XML files for "translation". Idea obtained from IchigoBlack,Ira Rice1-1/+1
where these "translation" strings can be used to tell the client to use a separate XML file than the English one, so that item descriptions, monster names, etc. which are obtained from updates can be translated as well. Ex. instead of pointing to items.xml for Spanish, tell the client to translate that string to items.es.xml, or for monsters.xml, tell it to point to monsters.zh.xml for Chinese. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Style cleanups throughout most of the code. Splitting function type fromIra Rice1-8/+8
the function names should no longer be around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-14Added linking to item's just using [Item Name] in chatDavid Athay1-0/+31
2009-01-06Added support for internationalizationIra Rice1-2/+3
Merged from the mainline client. Originally implemented by Guillaume Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91. Conflicts: INSTALL configure.ac src/Makefile.am src/gui/buy.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/login.cpp src/gui/menuwindow.cpp src/gui/minimap.cpp src/gui/ok_dialog.cpp src/gui/popupmenu.cpp src/gui/register.cpp src/gui/sell.cpp src/gui/setup.cpp src/gui/setup_video.cpp Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch1-4/+4
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2008-12-07Removed unnecessary weight check in itemdb loaderLloyd Bryant1-3/+3
(cherry picked from Aethyra commit e3fef730b69e4edc328e6105ea48b9774631563d)
2008-11-25Miscellaneous TMW change commits. Missed these changes before because of Ira Rice1-1/+1
a confusion on git.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-3/+1
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-11-02This correctly fixes the attack problem. Apparently, I didn't realize a bit ↵Ira Rice1-2/+2
ago that the item type was being used to determine which attack animation to use, since a comment lied about it not being used.
2008-10-25attack range fixes, highlight monsters in range (by Chuck Miller)Roderic Morris1-0/+2
2008-10-12Added in a new tileset, as well as some new artwork, changed the update Ira Rice1-4/+4
handler to store updates in a subfolder based on port (so that if one server domain hosts multiple update folders, that it doesn't have to redownload an update should an update have the same name as the other server, as well as a different checksum), and made the inventory window display the units of measurement (for all of those people that wanted to know exactly what those units were supposed to be).
2008-10-12This commit contains three things: one, after looking over how TMW was Ira Rice1-7/+7
handling the effects through the level up system, I determined that it wasn't bad, so I pulled it from TMW's SVN. Two, I edited the web page css so that it better matches the forum. And three, I patched text wrapping so that it'll fix up its display size based on all previous lines, except for the last line. That fix will come later, but for now, it'll be seen as a special case. While you'd like to think that just resending the string and starting the function over again would fix it, you'd be wrong. So it won't be patched until I think of a better way to handle that case.
2008-10-10Some old uncommitted cleanup.Bjørn Lindeijer1-2/+2
2008-10-01Fixed female sprites not showing all equipment.Ira Rice1-1/+1
2008-09-25Merged the Tametomo branch into trunk.Ira Rice1-4/+2
2008-09-04Introduced another template to make deleting all values in a container easier.Bjørn Lindeijer1-2/+1
Inspired by qDeleteAll() from Qt.
2008-07-19removed unnecessary (weight) check in itemdb loaderLloyd Bryant1-3/+3
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-06-12Merged revisions 3738 via svnmerge from Bjørn Lindeijer1-2/+2
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-05-21Merged revisions 4013,4027,4043,4174,4250,4254 via svnmerge from Philipp Sehmisch1-19/+3
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r4013 | crush_tmw | 2008-04-01 01:18:19 +0200 (Di, 01 Apr 2008) | 1 line Implemented NPC XML database which maps NPC IDs to one or more animation files and thus enables animated NPCs. ........ r4027 | crush_tmw | 2008-04-02 01:34:14 +0200 (Mi, 02 Apr 2008) | 1 line misspelled filename ........ r4043 | b_lindeijer | 2008-04-07 10:37:23 +0200 (Mo, 07 Apr 2008) | 3 lines Added XML::Document class which simplifies parsing an XML document and automatically cleans it up again. ........ r4174 | b_lindeijer | 2008-04-23 14:57:45 +0200 (Mi, 23 Apr 2008) | 2 lines Fixed svn:keywords properties and added header to guild.h. ........ r4250 | crush_tmw | 2008-05-19 18:18:38 +0200 (Mo, 19 Mai 2008) | 1 line Added the possibility to add particle effects to NPCs in npcs.xml. ........ r4254 | crush_tmw | 2008-05-20 15:58:26 +0200 (Di, 20 Mai 2008) | 1 line fixed some filename confusion messup in the last commit. ........ NOTE: This was my first commit using svnmerge. Please check if I did everything correctly.
2008-04-07Added XML::Document class which simplifies parsing an XML document andBjørn Lindeijer1-19/+3
automatically cleans it up again.
2008-02-22 Handling gender with an enum everywhere.Philipp Sehmisch1-4/+4
2008-01-28Added weapon skill system and leveling system.Philipp Sehmisch1-4/+2
2008-01-19Fixed interpretation of weapon types in items.xml.Philipp Sehmisch1-1/+1
2008-01-10Item types and weapon types are now identified by name instead of numbers in ↵Philipp Sehmisch1-2/+38
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-2/+2
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 ........
2007-11-20Merged revisions 3629-3630 via svnmerge from Bjørn Lindeijer1-2/+2
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk (but kept looks in Being class, since eAthena works that way) ........ r3629 | gmelquio | 2007-10-18 21:00:38 +0200 (Thu, 18 Oct 2007) | 1 line Removed player looks from generic beings. Prevented client termination on missing sprites. Merged weapon-type and attack-type fields for items. ........ r3630 | gmelquio | 2007-10-18 21:30:57 +0200 (Thu, 18 Oct 2007) | 1 line Fixed changelog message. ........
2007-11-15Moved item icon from ItemInfo class to the Item class, so that it can be loadedBjørn Lindeijer1-2/+2
on demand. Results in faster startup time and reduced memory usage.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-11 16:12:09 +0000