From f0757edb36fe1c03bc68cf3ba1e39bdd09dc3090 Mon Sep 17 00:00:00 2001 From: ulukyn Date: Thu, 7 Jun 2018 17:01:51 +0200 Subject: [PATCH] Added: New PvpClan "Marauder" based on fame "black_kami" --HG-- branch : develop --- code/ryzom/common/src/game_share/pvp_clan.cpp | 5 ++++- code/ryzom/common/src/game_share/pvp_clan.h | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/ryzom/common/src/game_share/pvp_clan.cpp b/code/ryzom/common/src/game_share/pvp_clan.cpp index d6b4f6a0a..f030b73f5 100644 --- a/code/ryzom/common/src/game_share/pvp_clan.cpp +++ b/code/ryzom/common/src/game_share/pvp_clan.cpp @@ -37,6 +37,7 @@ namespace PVP_CLAN NL_STRING_CONVERSION_TABLE_ENTRY(Matis) NL_STRING_CONVERSION_TABLE_ENTRY(Tryker) NL_STRING_CONVERSION_TABLE_ENTRY(Zorai) + NL_STRING_CONVERSION_TABLE_ENTRY(Marauder) NL_END_STRING_CONVERSION_TABLE(TPVPClan, PVPClanConversion, Unknown) TPVPClan fromString(const std::string & str) @@ -69,6 +70,7 @@ namespace PVP_CLAN factionIndexes[Matis] = CStaticFames::getInstance().getFactionIndex("matis"); factionIndexes[Tryker] = CStaticFames::getInstance().getFactionIndex("tryker"); factionIndexes[Zorai] = CStaticFames::getInstance().getFactionIndex("zorai"); + factionIndexes[Marauder] = CStaticFames::getInstance().getFactionIndex("black_kami"); for (uint i = BeginClans; i <= EndClans; i++) nlassert( factionIndexes[i] != CStaticFames::INVALID_FACTION_INDEX ); @@ -84,7 +86,7 @@ namespace PVP_CLAN { // These names are in order of the enum TPVPClan // The first two clans, "None" and "Neutral", don't count. Subtract 2 from the lookup. - std::string FactionNames[] = { "kami","karavan","fyros","matis","tryker","zorai" }; + std::string FactionNames[] = { "kami","karavan","fyros","matis","tryker","zorai","marauder" }; for (int looper = BeginClans; looper <= EndClans; looper += 1) { @@ -111,6 +113,7 @@ namespace PVP_CLAN factionSheetIds[Matis] = "matis.faction"; factionSheetIds[Tryker] = "tryker.faction"; factionSheetIds[Zorai] = "zorai.faction"; + factionSheetIds[Marauder] = "marauder.faction"; for (uint i = BeginClans; i <= EndClans; i++) nlassert( factionSheetIds[i] != NLMISC::CSheetId::Unknown ); diff --git a/code/ryzom/common/src/game_share/pvp_clan.h b/code/ryzom/common/src/game_share/pvp_clan.h index 717c5c138..14352828b 100644 --- a/code/ryzom/common/src/game_share/pvp_clan.h +++ b/code/ryzom/common/src/game_share/pvp_clan.h @@ -44,7 +44,9 @@ namespace PVP_CLAN Zorai, EndCivs = Zorai, // end of civs - EndClans = Zorai, // end of clans + + Marauder, + EndClans = Marauder, // end of clans Unknown, NbClans = Unknown,