summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed typo in script docsErik Schilling2013-04-271-1/+1
|
* Fixed crash when checking whether a character is already onlineThorbjørn Lindeijer2013-04-251-3/+2
| | | | | | Not every connected game client has a character in the world. The code was checking this, but since commit aa04597c5f8bb806996 the pointer was being used before being checked.
* Simplified BeingComponent::updateDirectionThorbjørn Lindeijer2013-04-252-74/+7
| | | | Same as in the client.
* Forgot to rename npc_message in some docsThorbjørn Lindeijer2013-04-151-11/+11
|
* Fixed small script documentation errorThorbjørn Lindeijer2013-04-151-1/+1
|
* Fixed error messageThorbjørn Lindeijer2013-04-151-1/+1
| | | | Thanks to Ablu for noticing.
* Used static_assert for static assertionThorbjørn Lindeijer2013-04-151-1/+2
| | | | | | | | | Yay for C++11! static_assert is available since GCC 4.3. Fixed warning when compiling with GCC 4.8: src/utils/mathutils.cpp:53:18: warning: typedef ‘float_must_be_32_bits’ locally defined but not used [-Wunused-local-typedefs]
* Dropped the & from the Lua function tablesThorbjørn Lindeijer2013-04-151-149/+149
| | | | It's not actually necessary.
* Moved functions to entity members where appropriateThorbjørn Lindeijer2013-04-154-472/+596
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some functions were skipped for now because they may need a new name or change of behavior. Changes: chr_warp entity:warp chr_get_inventory entity:inventory chr_inv_change entity:inv_change chr_inv_count entity:inv_count chr_get_equipment entity:equipment chr_equip_slot entity:equip_slot chr_equip_item entity:equip_item chr_unequip_slot entity:unequip_slot chr_unequip_item entity:unequip_item chr_get_level entity:level chr_get_exp entity:xp chr_give_exp entity:give_xp chr_get_rights entity:rights chr_set_hair_style entity:set_hair_style chr_get_hair_style entity:hair_style chr_set_hair_color entity:set_hair_color chr_get_hair_color entity:hair_color chr_get_kill_count entity:kill_count chr_give_special entity:give_special chr_has_special entity:has_special chr_take_special entity:take_special chr_set_special_recharge_speed entity:set_special_recharge_speed chr_get_special_recharge_speed entity:special_recharge_speed chr_set_special_mana entity:set_special_mana chr_get_special_mana entity:special_mana chr_kick entity:kick exp_for_level xp_for_level monster_get_id entity:monster_id monster_change_anger entity:change_anger monster_drop_anger entity:drop_anger monster_get_angerlist entity:angerlist being_apply_status entity:apply_status being_remove_status entity:remove_status being_has_status entity:has_status being_set_status_time entity:set_status_time being_get_status_time entity:status_time being_get_gender entity:gender being_set_gender entity:set_gender being_type entity:type being_walk entity:walk being_say entity:say being_damage entity:damage being_heal entity:heal being_get_name entity:name being_get_action entity:action being_set_action entity:set_action being_get_direction entity:direction being_set_direction entity:set_direction being_apply_attribute_modifier entity:apply_attribute_modifier being_remove_attribute_modifier entity:remove_attribute_modifier being_set_base_attribute entity:set_base_attribute being_get_modified_attribute entity:modified_attribute being_get_base_attribute entity:base_attribute being_set_walkmask entity:set_walkmask being_get_walkmask entity:walkmask being_get_mapid entity:mapid chat_message entity:message being_register entity:register chr_shake_screen entity:shake_screen chr_create_text_particle entity:show_text_particle - entity:position posX entity:x posY entity:y monster_get_name monsterclass:name item_get_name itemclass:name
* Simplified some script function namesThorbjørn Lindeijer2013-04-141-39/+38
| | | | | | | | npc_message -> say npc_choice -> ask npc_ask_integer -> ask_number npc_ask_string -> ask_string npc_trade -> trade
* Removed NPC and character parameters from NPC functionsThorbjørn Lindeijer2013-04-143-64/+71
| | | | | | | | These functions can only be used in the context of a character talking to an NPC, so these parameters can be deduced from that context rather than passing them explicitly all the time. Simplifies NPC scripting.
* Use a full user data for Entity referencesThorbjørn Lindeijer2013-04-146-95/+64
| | | | | Only moved a single script function to a member for now, will do others in a separate commit.
* Don't try to kill the connection of a deleted characterThorbjørn Lindeijer2013-04-131-1/+1
| | | | | | | | The point is to do this on the new character and to allow the client to continue playing with the existing character instance (when it represents the same character in the DB). Somehow was changed in commit aa04597c5f8.
* Actually use transactions for mysql updatesErik Schilling2013-04-132-4/+4
| | | | BEGIN; END; does not work similar to sqlite here.
* Fixed uninitialised variable warning in valgrindErik Schilling2013-04-121-0/+1
|
* Fixed too long lua documentationErik Schilling2013-04-121-21/+46
|
* Removed static member definitions that are no longer neededThorbjørn Lindeijer2013-04-126-11/+1
| | | | | | | | | The requirement for having these definitions was relaxed in the C++11 standard. In short, they are not needed anymore for static const integral types. Details: http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#454
* Removed CharacterData member from CharacterComponentThorbjørn Lindeijer2013-04-123-9/+3
| | | | It is only needed temporarily while serializing and deserializing.
* Moved Actor into an ComponentErik Schilling2013-04-1233-408/+429
| | | | This was the final step to remove the hierachy with Entity on the top.
* Converted Being into a ComponentErik Schilling2013-04-1149-872/+1051
| | | | | | I did not really care too much about staying consistent with the use of static_casts to Actors since they are only temporary anyway until Actor is a component too.
* Converted the Character class into a componentErik Schilling2013-04-1142-760/+1178
| | | | | A CharacterData was created as a proxy class in order to allow using the old serialization method.
* Renamed Character -> CharacterData in the accountserverErik Schilling2013-04-1114-68/+70
|
* Fixed @kill killing yourselfErik Schilling2013-04-101-1/+1
|
* Fixed undefined #defines in mingw and c++0xErik Schilling2013-04-072-0/+7
| | | | | It looks like mingw does not define all the stuff in c++0x it does without.
* Moved the Monster class to a ComponentErik Schilling2013-04-0314-123/+160
| | | | | | | Things done: - Allowed to create new Attributes outside of the protected scope of Being - Moved Monster to MonsterComponent - Some minor cleanup in the Attribute setting code of monsters
* Fixed multiple warnings and errors that blocked c++0xErik Schilling2013-04-0218-53/+74
| | | | | This allows the server to compile with c++0x (and enables it). This also includes some coding style / readabillity fixes.
* Removed old commandhandler approachErik Schilling2013-04-022-440/+0
| | | | It was forgotten to remove when the new approach was added
* Moved fighting code into a componentErik Schilling2013-04-0222-374/+647
| | | | | | | | | | | | | | | | | | | | | | | | | All damage dealing is now handeled via CombatComponent. Monsters use a derived MonsterCombatComponent since they can have a damage mutation and have a seperate script callback. The wirering with Being is still not optional since most of the stuff does not exist as components. Things done: - Seperated the fighting code from Being and only let Characters and Monsters add the Component (less overhead for npcs) - Added a getter for Attribute values to prevent searching it all the time in non Being members - Fixed the type if the damage mutation to double (no idea why it was int) I did not want to copy it over incorrectly - Removed the addAttack/removeAttack overrides in Character and made the knuckleAttack being added based on newly added signals Future TODOS: - Remove depedency on Being as soon all needed dependencies are available as components of Entity - Move the monster script callback into the general combatcomponent and make it usuable for characters too
* Moved documentation out of class definitionThorbjørn Lindeijer2013-03-252-68/+97
| | | | | | | | | | | | | | | Inline documentation is in general needlessly verbose and only makes it harder to read the actual class API. This change moves this kind of documentation to the function implementation for the 'Entity' class. For inline methods, the implementation is moved outside of the class using the 'inline' keyword. This provides a good place to put the documentation, but it also further cleans up the class definition. The class definition now gives a much better overview over its API. And if needed, details can be looked up at the function implementations. Reviewed-by: Erik Schilling
* Changed NPC to an NpcComponent added to a BeingThorbjørn Lindeijer2013-03-2514-172/+178
|
* Changed Effect to a component of ActorThorbjørn Lindeijer2013-03-259-53/+61
| | | | Reviewed-by: Yohann Ferreira
* Changed Item to a component of ActorThorbjørn Lindeijer2013-03-2515-84/+129
| | | | | | | | | | | | | | | Items also have positions, so the ItemComponent only makes sense as part of an Actor. Later on it will probably be part of an entity that also has an ActorComponent. Since it was annoying to update all the places where items were created, I've introduced a function for this. The component types are now prefixed with "CT_" because I wanted to introduce an 'Item' namespace which would otherwise be conflicting. The component types enum isn't used much in the code so it can look a bit ugly. Reviewed-by: Yohann Ferreira
* Changed SpawnArea and TriggerArea to components of EntityThorbjørn Lindeijer2013-03-2512-61/+198
| | | | | | Well, first visible change is that everything just gets longer to read. Reviewed-by: Yohann Ferreira
* Removed mentioning of retired structThorbjørn Lindeijer2013-02-241-2/+0
| | | | MonsterTargetEventDispatch was used before switching to libsigc++.
* Added Debug class for more convenient debugging outputThorbjørn Lindeijer2013-02-241-0/+34
| | | | | Inspired by the QDebug class and qDebug() function from Qt. Actually it might be nice if the LOG macro would also use this.
* Fixed default value of the servernameErik Schilling2013-02-242-2/+3
| | | | | Since the name was used to log things and the default now is "" also added logging of the address and port too.
* Added possibility to reserve mapsErik Schilling2013-02-248-31/+139
| | | | | | | | | | | | If you set net_gameServerName you can now reserve maps in the maps.xml. There you have to add the servername - property to the <map> tag. Then the map will only be activated by that server. Also changed the activate sequence that the account server now tells the game server what maps to activate (previously the server requested all maps and the account server said yes or no). TODO: Fix general inter server map switching.
* Made the scripts being able to installErik Schilling2013-02-241-3/+7
| | | | | | | The game server will now look for the scripts in this order: - serverPath - config value - current working directory - the PKG_DATADIR #define
* Documented all lua binds directly in the sourceErik Schilling2013-02-241-1341/+2201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a comment to each lua binding. In the future a script should parse those and generate the docs from them. This should prevent outdated docs and duplicate effort to keep code and docs synced. In C++ categories can be defined in this way: /** LUA_CATEGORY long description of the category (shortname) * further text * goes into * the next lines */ The shortname is only used to bind other comments to the category. In lua the category would look like this: --- LUA_CATEGORY long description of the category (shortname) -- further text -- goes into -- the next lines A comment that describes a bind then can look like this: /** LUA some_function (shortnameofcategory) * some_function(string name) * some_function(int id) ** * Description */ Or in Lua: --- LUA some_function (shortnameofcategory) -- some_function(string name) -- some_function(int id) --- -- Description Autoupdates script follows soon
* Removed loading of script files using the statusmanagerErik Schilling2013-02-211-17/+1
| | | | | They are now required via the main.lua. Also made Harmony giving you the plague in order to allow testing.
* Introduced Script::ContextErik Schilling2013-02-2116-87/+99
| | | | | | | | This should allow to finally call functions to lua without having to care about working around situations where a lua call causes a c++ call which needs to call to lua again. Tested against the source of tales repository data.
* Monsters no longer load their script filesErik Schilling2013-02-173-40/+0
| | | | | | | | | | | Before monsters loaded their script file on *each* spawn. This is rather wrong since the script state keeps growing for each monster. However all of this was unnessecary since the main.lua can simply require the script file. If you do not want to spam the main.lua (or any other file) with all the requires: I guess we can add script binds to iterate over all monsters and add some custom properties to the monsters.xml (See Mana-Mantis #356)
* Moved attribute (re)calculation to the scriptsErik Schilling2013-02-047-176/+96
| | | | | | | | | | | | | | | | | | | | | | This introduces two callbacks: - on_update_derived_attribute -> Called to recalculate other derived attributes. - on_recalculate_base_attribute -> Called to recalculate a base attribute (only called for characters. However the function passed as callback can be useful for recalculating the derived attributes as well) Monsters no longer block recalculation of attributes except HP and Speed. I saw no sense to keep this. Fixed constant value in libmana-constants.lua Dropped bool type of the recalculation functions. It would be difficult to keep it while pushing all to the script engine and it was unused anyway. All in all this adds a LOT more flexibillity to projects since they can now adapt all attributes in the way they want.
* Random cleanup of attribute codeErik Schilling2013-02-043-19/+28
| | | | Did this during trying to understand the code
* Modifications to allow crosscompiling with mingwErik Schilling2013-02-037-4/+23
| | | | Reviewed-by: bjorn.
* Silenced to Wreorder warnings.Yohann Ferreira2013-02-012-3/+3
|
* Added emote support.Yohann Ferreira2013-02-0111-2/+196
|
* Silenced some eclipse warningsErik Schilling2013-01-298-5/+21
|
* Fixed setting current map for npc update functionErik Schilling2013-01-151-0/+2
|
* Small simplification in Monster::diedThorbjørn Lindeijer2013-01-101-4/+4
|
generated by cgit (git 2.34.1) at 2024-06-08 18:13:59 +0000