summaryrefslogtreecommitdiff
path: root/src/resources/itemdb.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-07-27Merge of two gettext stringsKess Vargavind1-1/+1
As reported by swimmy on the forums
2009-05-24Merge branch '0.0.29'Bjørn Lindeijer1-3/+8
2009-05-24Fixed item links that aren't written in lowercaseBjørn Lindeijer1-3/+8
In commit 2a9f8e05312c210ec204e09861f47c3d017706eb I meant to move the normalizing of item names into the database, but the commit failed to include this change.
2009-05-23Merge branch '0.0.29'Bjørn Lindeijer1-13/+13
Conflicts: src/gui/widgets/chattab.cpp
2009-05-23Fixed a few strings for better translationKess Vargavind1-1/+1
Just a few notes that would help us translators immensly: * Please do not split one sentence into several strings * Please try to refrain from inserting extra spaces into the strings (cherry picked from commit 9712489ef67f95d6a5fa1fc3102bb7c4ee6a1f59)
2009-05-23Fixed the empty item link crash differentlyBjørn Lindeijer1-13/+13
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-05-21Fixed a few strings for better translationKess Vargavind1-1/+1
Just a few notes that would help us translators immensly: * Please do not split one sentence into several strings * Please try to refrain from inserting extra spaces into the strings
2009-05-19Fixed targeting and warn on attack-range not being found in itemdb.David Athay1-0/+4
Tried to make the client continue attacking (it does not need to send attack packets, but just continue playing attack animation and sounds). Now logs a warning when a weapon is found without an attack-range (I keep finding weapons with an attack-range of 0 which makes it hard to target monsters).
2009-05-11Fixed the memory issues with the pointers to item stat modifiersBjørn Lindeijer1-5/+5
It was a list of pointers to Stat instances that had long been popped off the stack and deleted.
2009-05-08Don't complain in the logger about not having an image attribute forTametomo1-1/+1
negative items, since these aren't inventory items. Signed-off-by: Tametomo <irarice@gmail.com> Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2009-05-03Moved strprintf into stringutils.{h,cpp}Bjørn Lindeijer1-1/+0
2009-04-16Merge branch '0.0.29'Bjørn Lindeijer1-3/+3
2009-04-16Some more cleanupsBjørn Lindeijer1-3/+3
Nothing in particular worth mentioning.
2009-04-16Remove last support #ifdef in the resource codeJared Adams1-5/+19
2009-04-09Actually use ItemType instead of shortBjørn Lindeijer1-2/+1
Plus some random cleanups.
2009-03-30Merge weapon typesJared Adams1-4/+0
2009-03-30Merge item types to remove more #ifdefsJared Adams1-4/+0
2009-03-27Fixed include structure in resource/ directoryBjørn Lindeijer1-10/+12
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-27Fixed duplicate check for item namesBjørn Lindeijer1-4/+4
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.