Mercurial > malikania
changeset 161:be0d90706ded
Server: replace dodge with force stats, closes #762 @10m
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sat, 17 Mar 2018 14:13:19 +0100 |
parents | bbb506feb55f |
children | b65a86a84fcb |
files | libdb-sqlite/malikania/server/db/sqlite_character_dao.cpp libdb-sqlite/malikania/server/db/sqlite_database.cpp libserver/malikania/server/db/character.hpp tests/libserver/db/account/main.cpp |
diffstat | 4 files changed, 36 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/libdb-sqlite/malikania/server/db/sqlite_character_dao.cpp Mon Mar 05 21:04:14 2018 +0100 +++ b/libdb-sqlite/malikania/server/db/sqlite_character_dao.cpp Sat Mar 17 14:13:19 2018 +0100 @@ -35,15 +35,15 @@ ch.get_levels()[character::hp] = to_int(stmt, 4); ch.get_factors()[character::hp] = to_int(stmt, 5); ch.get_experience()[character::hp] = to_int(stmt, 6); - ch.get_levels()[character::defense] = to_int(stmt, 7); - ch.get_factors()[character::defense] = to_int(stmt, 8); - ch.get_experience()[character::defense] = to_int(stmt, 9); - ch.get_levels()[character::agility] = to_int(stmt, 10); - ch.get_factors()[character::agility] = to_int(stmt, 11); - ch.get_experience()[character::agility] = to_int(stmt, 12); - ch.get_levels()[character:: dodge] = to_int(stmt, 13); - ch.get_factors()[character:: dodge] = to_int(stmt, 14); - ch.get_experience()[character:: dodge] = to_int(stmt, 15); + ch.get_levels()[character::force] = to_int(stmt, 7); + ch.get_factors()[character::force] = to_int(stmt, 8); + ch.get_experience()[character::force] = to_int(stmt, 9); + ch.get_levels()[character::defense] = to_int(stmt, 10); + ch.get_factors()[character::defense] = to_int(stmt, 11); + ch.get_experience()[character::defense] = to_int(stmt, 12); + ch.get_levels()[character::agility] = to_int(stmt, 13); + ch.get_factors()[character::agility] = to_int(stmt, 14); + ch.get_experience()[character::agility] = to_int(stmt, 15); ch.get_levels()[character::luck] = to_int(stmt, 16); ch.get_factors()[character::luck] = to_int(stmt, 17); ch.get_experience()[character::luck] = to_int(stmt, 18); @@ -57,18 +57,18 @@ const auto sql = str(format( "UPDATE character" " SET hp_%1$ = ?" + " , force_%1% = ?" " , defense_%1% = ?" " , agility_%1$ = ?" - " , dodge_%1% = ?" " , luck_%1% = ?" " WHERE id = ?") % key ); exec(db_.instance(), sql, { array[character::hp], + array[character::force], array[character::defense], array[character::agility], - array[character::dodge], array[character::luck], ch.get_id() }); @@ -99,15 +99,15 @@ " hp_level," " hp_factor," " hp_experience," + " force_level," + " force_factor," + " force_experience," " defense_level," " defense_factor," " defense_experience," " agility_level," " agility_factor," " agility_experience," - " dodge_level," - " dodge_factor," - " dodge_experience," " luck_level," " luck_factor," " luck_experience" @@ -121,15 +121,15 @@ ch.get_levels()[character::hp], ch.get_factors()[character::hp], ch.get_experience()[character::hp], + ch.get_levels()[character::force], + ch.get_factors()[character::force], + ch.get_experience()[character::force], ch.get_levels()[character::defense], ch.get_factors()[character::defense], ch.get_experience()[character::defense], ch.get_levels()[character::agility], ch.get_factors()[character::agility], ch.get_experience()[character::agility], - ch.get_levels()[character::dodge], - ch.get_factors()[character::dodge], - ch.get_experience()[character::dodge], ch.get_levels()[character::luck], ch.get_factors()[character::luck], ch.get_experience()[character::luck]
--- a/libdb-sqlite/malikania/server/db/sqlite_database.cpp Mon Mar 05 21:04:14 2018 +0100 +++ b/libdb-sqlite/malikania/server/db/sqlite_database.cpp Sat Mar 17 14:13:19 2018 +0100 @@ -46,15 +46,15 @@ " hp_level INTEGER," " hp_factor INTEGER," " hp_experience INTEGER," + " force_level INTEGER," + " force_factor INTEGER," + " force_experience INTEGER," " defense_level INTEGER," " defense_factor INTEGER," " defense_experience INTEGER," " agility_level INTEGER," " agility_factor INTEGER," " agility_experience INTEGER," - " dodge_level INTEGER," - " dodge_factor INTEGER," - " dodge_experience INTEGER," " luck_level INTEGER," " luck_factor INTEGER," " luck_experience INTEGER,"
--- a/libserver/malikania/server/db/character.hpp Mon Mar 05 21:04:14 2018 +0100 +++ b/libserver/malikania/server/db/character.hpp Sat Mar 17 14:13:19 2018 +0100 @@ -50,10 +50,10 @@ */ enum stat { hp = 0, //!< hp index + force, //!< force index defense, //!< defense index agility, //!< agility index - dodge, //!< dodge index - luck, //!< luck index + luck //!< luck index }; private:
--- a/tests/libserver/db/account/main.cpp Mon Mar 05 21:04:14 2018 +0100 +++ b/tests/libserver/db/account/main.cpp Sat Mar 17 14:13:19 2018 +0100 @@ -193,19 +193,19 @@ BOOST_TEST(erekin->get_nickname() == "erekin"); BOOST_TEST(erekin->get_classname() == "blackmage"); BOOST_TEST(erekin->get_levels()[character::hp] == 10U); - BOOST_TEST(erekin->get_levels()[character::defense] == 7U); - BOOST_TEST(erekin->get_levels()[character::agility] == 12U); - BOOST_TEST(erekin->get_levels()[character::dodge] == 9U); + BOOST_TEST(erekin->get_levels()[character::force] == 7U); + BOOST_TEST(erekin->get_levels()[character::defense] == 12U); + BOOST_TEST(erekin->get_levels()[character::agility] == 9U); BOOST_TEST(erekin->get_levels()[character::luck] == 8U); BOOST_TEST(erekin->get_factors()[character::hp] == 20U); + BOOST_TEST(erekin->get_factors()[character::force] == 20U); BOOST_TEST(erekin->get_factors()[character::defense] == 20U); BOOST_TEST(erekin->get_factors()[character::agility] == 20U); - BOOST_TEST(erekin->get_factors()[character::dodge] == 20U); BOOST_TEST(erekin->get_factors()[character::luck] == 20U); BOOST_TEST(erekin->get_experience()[character::hp] == 1000U); - BOOST_TEST(erekin->get_experience()[character::defense] == 2000U); - BOOST_TEST(erekin->get_experience()[character::agility] == 3000U); - BOOST_TEST(erekin->get_experience()[character::dodge] == 4000U); + BOOST_TEST(erekin->get_experience()[character::force] == 2000U); + BOOST_TEST(erekin->get_experience()[character::defense] == 3000U); + BOOST_TEST(erekin->get_experience()[character::agility] == 4000U); BOOST_TEST(erekin->get_experience()[character::luck] == 5000U); const auto luna = std::find_if(characters.begin(), characters.end(), [] (const auto& c) { @@ -215,19 +215,19 @@ BOOST_TEST(luna->get_nickname() == "luna"); BOOST_TEST(luna->get_classname() == "fairy"); BOOST_TEST(luna->get_levels()[character::hp] == 12U); - BOOST_TEST(luna->get_levels()[character::defense] == 6U); - BOOST_TEST(luna->get_levels()[character::agility] == 12U); - BOOST_TEST(luna->get_levels()[character::dodge] == 9U); + BOOST_TEST(luna->get_levels()[character::force] == 6U); + BOOST_TEST(luna->get_levels()[character::defense] == 12U); + BOOST_TEST(luna->get_levels()[character::agility] == 9U); BOOST_TEST(luna->get_levels()[character::luck] == 8U); BOOST_TEST(luna->get_factors()[character::hp] == 20U); + BOOST_TEST(luna->get_factors()[character::force] == 20U); BOOST_TEST(luna->get_factors()[character::defense] == 20U); BOOST_TEST(luna->get_factors()[character::agility] == 20U); - BOOST_TEST(luna->get_factors()[character::dodge] == 20U); BOOST_TEST(luna->get_factors()[character::luck] == 20U); BOOST_TEST(luna->get_experience()[character::hp] == 2000U); - BOOST_TEST(luna->get_experience()[character::defense] == 3000U); - BOOST_TEST(luna->get_experience()[character::agility] == 4000U); - BOOST_TEST(luna->get_experience()[character::dodge] == 5000U); + BOOST_TEST(luna->get_experience()[character::force] == 3000U); + BOOST_TEST(luna->get_experience()[character::defense] == 4000U); + BOOST_TEST(luna->get_experience()[character::agility] == 5000U); BOOST_TEST(luna->get_experience()[character::luck] == 6000U); }