summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Synchronise defaults between configuration file and source.Freeyorp2010-10-174-13/+13
| | | | Reviewed-by: Bertram
* Hopefully fix the logging rotation this time.Yohann Ferreira2010-10-143-25/+89
| | | | | | | Added an extension to the ResMan::exist() function in order to get file existence even not in search path. Reviewed-by: CodyMartin.
* Added the new log options in the manaserv.xml.example file.Yohann Ferreira2010-09-291-0/+14
| | | | Trivial fix.
* Add log file rotation support based on ExceptionFault's work.Yohann Ferreira2010-09-295-19/+212
| | | | | | | | | This patch adds options to enable log rotations base on files size and or change of date. Note: Zip support will be added in a second commit. Reviewed-by: CodyMartin, Thorbjorn.
* SQLite: Do a proper upgrade of the mana_characters tableThorbjørn Lindeijer2010-09-271-11/+80
| | | | | | | | | | | | We can't leave the obsolete columns around since they are marked as NOT NULL, so insertion to the table fails if no values are provided for them. With SQLite, our only option is to create the table and copy the data over, which is what the update script now does. The script was modified so that it is fine to run it again on a database that was already updated to version 11 before.
* Added options to disable the server log to standard output to the minimum.Yohann Ferreira2010-09-222-19/+26
| | | | | | | | Also made some small cleanups. Resolves: Mana-Mantis #241 Reviewed-by: Jaxad0127.
* Centralized the servers' exit values.Yohann Ferreira2010-09-226-42/+79
| | | | | | | | Also made random code format clean-ups. Resolves: Mana-Mantis #217 Reviewed-by: Jaxad0127.
* Converted CRLF to LF in attributes.xmlThorbjørn Lindeijer2010-09-181-82/+82
| | | | Somebody needs to check his core.autocrlf setting.
* Small fixes.Freeyorp2010-09-194-16/+11
| | | | | | | | | | | | | | | There is no longer any need to send attribute change information for character or correction point changes to the account server. This is now handled elsewhere in a dedicated function. The account server was already doing this but the game server hadn't been updated. This wasn't causing any major problems since this data was being sent at the end of the packet. Update documentation for the functions accordingly. Also adjust a misplaced opening curly brace in attribute calculation which could cause modifiers to be applied wrongly in certain cases. Reviewed-by: Kage
* Changed maxSkillCap to game_maxSkillCap as I forgot in last commit.Yohann Ferreira2010-09-161-42/+54
| | | | | | Also made some random code format cleaups. Trivial fix.
* Upgraded the attributes.xml example to something actually usable.Yohann Ferreira2010-09-161-38/+82
|
* Fixed characters not being returned at character selection when using MySQL.Yohann Ferreira2010-09-152-12/+12
| | | | | | | | | | | | | | The table mana_char_equips wasn't created due to an SQL error, this led the account server to not return the player's characters. Seen in the logs: [19:40:41] [ERR] (DALStorage::getCharacter #1) SQL query failure: Table 'bertram.mana_char_equips' doesn't exist [19:40:41] [ERR] Failed to get character 11 for account 1. Resolves: Manasource mantices: 189, 230. Reviewed-by: Thorbjorn.
* Reordered the manaserv.xml.example file and made related code cleanups.Yohann Ferreira2010-09-1510-81/+188
| | | | Reviewed-by: Thorbjorn.
* Added an example attributes.xmlThorbjørn Lindeijer2010-09-121-0/+38
| | | | | Copied from bertram-experimental-mana-data and updated to new element names.
* Added script to update SQLite database to version 11Thorbjørn Lindeijer2010-09-121-0/+39
| | | | | | Will not drop the attribute columns since this is not supported by SQLite. I'm just leaving them around for now and see if it causes any problems.
* Fixed removal of hardcoded attributes in the MySQL update scriptThorbjørn Lindeijer2010-09-121-7/+7
| | | | It was trying to remove them from the wrong table.
* Documented all the currently available options in manaserv.xml.example.Yohann Ferreira2010-09-091-7/+33
| | | | Reviewed-by: CodyMartin.
* Centralized stringToBool conversion.Yohann Ferreira2010-09-0814-123/+163
| | | | | | | Also moved the trim() function into the utils namespace where it belongs more, and made some random code cleanups. Reviewed-by: Thorbjorn.
* Added config options to set stats and log files and paths.Yohann Ferreira2010-09-073-32/+52
| | | | | | | Also turned the absence of an inter-server password into a fatal error while documenting it in the manaserv.xml example file. Reviewed-by: Jaxad0127.
* Added <points> tag handling in attributes.xml.Yohann Ferreira2010-09-063-53/+95
| | | | Reviewed-by: Freeyorp, Thorbjorn.
* Added a --config manaserv.xml file path options to both servers.Yohann Ferreira2010-08-312-48/+140
| | | | | | | Now, it's possible to set a different config filename and path on the command line. Reviewed-by: Jaxad, Kage.
* Change primary and secondary tags in attributes.xml from stats and stat to ↵Freeyorp2010-08-302-4/+4
| | | | attributes and attribute respectively.
* Added @mute chat command.Philipp Sehmisch2010-08-305-4/+70
| | | | | | | | The @mute command stops another character from talking in the public chat for a specified amount of seconds. It doesn't survive a reconnect of the client, but I don't think that this is necessary because a mute by a GM is usually intended as a slap on the wrist with more severe consequences to follow (like @ban).
* Merge branch 'testing'Freeyorp2010-08-2959-1926/+3487
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/account-server/storage.cpp src/game-server/being.cpp src/game-server/being.hpp src/game-server/character.cpp src/game-server/character.hpp src/game-server/gamehandler.cpp src/game-server/inventory.cpp src/scripting/lua.cpp src/sql/mysql/createTables.sql src/sql/sqlite/createTables.sql
| * Change references from database version 10 to version 11 to reflect changes ↵Freeyorp2010-08-184-4/+4
| | | | | | | | made to mainline
| * Set the database ID of a new character immediately after creating it.Freeyorp2010-08-141-3/+3
| | | | | | | | (Ooops.)
| * Merge branch 'master' of gitorious.org:mana/manaservYohann Ferreira2010-08-042-0/+21
| |\
| * | Add sanity checks for hp when hp or max hp change.Freeyorp2010-08-031-0/+6
| | | | | | | | | | | | Reviewed-by: Bertram.
| * | Allow default values for attributes at character creation time.Freeyorp2010-08-033-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: The game-server also needs to keep track of this for when new attributes or attributes not in the default scope need to be created. Also hopefully fix attribute calculation order for derived attributes. Still hardcoded for now. Reviewed-by: Bertram.
| * | Changed the stat file name to attributes.xml.Yohann Ferreira2010-08-025-14/+20
| | | | | | | | | | | | | | | | | | I also made it required to start properly since it's now the case. Reviewed-by: Jaxad0127.
| * | Fixed a little mistake done in Monster::setAttribute.Yohann Ferreira2010-07-301-4/+4
| | | | | | | | | | | | | | | | | | It was using at() for setting. Also I changed the unsigned int to int as the default returned was -1 in the MonsterManager::reload() function.
| * | Made the game-server compile again with CMake.Yohann Ferreira2010-07-301-0/+8
| | |
| * | Merge branch 'master' of gitorious.org:mana/manaservYohann Ferreira2010-07-306-22/+173
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/game-server/itemmanager.cpp
| * | | Add in stubs for scripted item effectsFreeyorp2010-07-103-0/+41
| | | |
| * | | New attribute system and major changes to many low-level areas.Freeyorp2010-07-1056-1929/+3397
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attribute system: Structure is no longer completely hardcoded. Attributes and structure is defined by new xml file (defaulting to stats.xml) Structure defines non-base modifications to an attribute, to be used by modifiers from items, effects, etc. Calculating the base value for core attributes is still done in C++ (and for such fundamental elements the only reason I can think of to do it any other way is perhaps being able to quickly change scripts without a compile could be useful for testing, but such things are a low priority anyway) Item structure: Modifiers are now through triggers rather than single events. This also removes hardcoded types - an item could be both able to be equipped and be able to be activated. Item activation no longer consumes by default, this must be specified by the property <consumes /> inside the trigger. Currently only attribute modifications, autoattacks, and consumes are defined as effects, but stubs for others do exist. Autoattacks are currently non-functional, and this should be rectified with some urgency. Auto Attacks: AutoAttacks are now separate entities, though not fully complete, nor fully integrated with all beings yet. Integration with the Character class is urgent, integration with other Being children less so. When fully integrated this will allow for multiple autoattacks, through equipping multiple items with this as an equip effect or even through other means if needed. Equipment structure: As ItemClass types are no longer hardcoded, so too are equip types. An item have multiple ways to be equipped across multiple equipment slots with any number in each slot. Character maximums are global but configurable. Miscellaneous: Speed, money, and weight are now attributes. Some managers have been changed into classes such that their associated classes can have them as friends, to avoid (ab)use of public accessors. The serialise procedure should also be set as a friend of Character (both in the account- and game- server) as well; having public accessors returning iterators is simply ridiculous. Some start for such cleanups have been made, but this is not the primary focus here. Significant work will need to be done before this is resolved completely, but the start is there. BuySell::registerPlayerItems() has been completely disabled temporarily. The previous function iterated through equipment, yet in the context I think it is intended to fill items? I have been unable to update this function to fit the modifications made to the Inventory/Equipment/Possessions, as I am unsure what exactly what it should be doing. ItemClass::mSpriteId was previously unused, so had been removed, but I notice that it was used when transmitting equipment to nearby clients. Experimentation showed that this value was never set to anything other than 0, and so has been left out of the ItemManager rewrite. I am not entirely sure what is happening here, but it should be worth looking into at a later time, as I am not sure how equipment appearences would be sent otherwise.
* | | | Some coding style tweaksThorbjørn Lindeijer2010-08-223-20/+16
| | | |
* | | | Pass a script name to Lua for proper reporting of error locationsThorbjørn Lindeijer2010-08-225-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | Now the Lua file name shows up in the error message and stack traceback, or the map file and object name in case of a script embedded in a map file.
* | | | Rename some stuff to conform to naming conventionsThorbjørn Lindeijer2010-08-226-33/+31
| | | |
* | | | Print out a backtrace when a Lua error is raisedThorbjørn Lindeijer2010-08-222-20/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The backtrace is printed by using debug.traceback as error handler when calling Lua functions. At the moment it still looks pretty ugly since Lua is not aware of the file names of the scripts (to be fixed). Reviewed-by: Jared Adams
* | | | Print out the actual error message in case of a syntax errorThorbjørn Lindeijer2010-08-221-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Should help to locate the problem. Reviewed-by: Jared Adams
* | | | Another small simplificationThorbjørn Lindeijer2010-08-221-7/+1
| | | |
* | | | Avoid collision with type 'int' in SQL queryThorbjørn Lindeijer2010-08-221-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Was causing the account server to crash when using MySQL backend. Mantis-issue: 188 Reviewed-by: Yohann Ferreira
* | | | Added an empty mana-status-effect.xml to the exampleThorbjørn Lindeijer2010-08-221-0/+3
| | | | | | | | | | | | | | | | Avoids an error message.
* | | | Changed the location of configuration, logs and statsThorbjørn Lindeijer2010-08-226-104/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of searching for the configuration file in ~/.manaserv.xml, the file is now expected to be in the working directory of the server. The logs and statistics will also be written there. This should make it easier to run differently configured servers on the same machine, and should also be a bit more straight-forward to setup. Reviewed-by: Yohann Ferreira
* | | | Fixed version in database table creation filesThorbjørn Lindeijer2010-08-212-2/+2
| | | | | | | | | | | | | | | | Forgotten in commit 81db92232e50d47a318c94bc34fb63b67493559a
* | | | Perform more detailed argument checking in Lua functionsThorbjørn Lindeijer2010-08-211-154/+101
| | | | | | | | | | | | | | | | | | | | | | | | Based on helper functions in the auxiliary library. Reviewed-by: Yohann Ferreira
* | | | Add enet files to codeblocksStefan Dombrowski2010-08-173-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of compiler warnings generated by enet, warnings are switched of for: * unknown #pragmas, which are for MSVC compiler * enumeration with missing case Reviewed-by: Bertram
* | | | Add static libraries to .gitignoreBernd Wachter2010-08-151-0/+3
| | | |
* | | | Add included enet to CMakeBernd Wachter2010-08-153-3/+65
| | | |
* | | | Add enet filesBernd Wachter2010-08-1522-0/+5862
| | | |