Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Added: New PvpClan "Marauder" based on fame "black_kami"

Browse source 
--HG--
branch : develop
This commit is contained in:
ulukyn 2018-06-07 17:01:51 +02:00
parent f80e36ebd6
commit f0757edb36
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/ryzom/common/src/game_share/pvp_clan.cpp
View file

@ -37,6 +37,7 @@ namespace PVP_CLAN
NL_STRING_CONVERSION_TABLE_ENTRY(Matis) NL_STRING_CONVERSION_TABLE_ENTRY(Matis)
NL_STRING_CONVERSION_TABLE_ENTRY(Tryker) NL_STRING_CONVERSION_TABLE_ENTRY(Tryker)
NL_STRING_CONVERSION_TABLE_ENTRY(Zorai) NL_STRING_CONVERSION_TABLE_ENTRY(Zorai)
NL_STRING_CONVERSION_TABLE_ENTRY(Marauder)
NL_END_STRING_CONVERSION_TABLE(TPVPClan, PVPClanConversion, Unknown) NL_END_STRING_CONVERSION_TABLE(TPVPClan, PVPClanConversion, Unknown)
TPVPClan fromString(const std::string & str) TPVPClan fromString(const std::string & str)
@ -69,6 +70,7 @@ namespace PVP_CLAN
factionIndexes[Matis] = CStaticFames::getInstance().getFactionIndex("matis"); factionIndexes[Matis] = CStaticFames::getInstance().getFactionIndex("matis");
factionIndexes[Tryker] = CStaticFames::getInstance().getFactionIndex("tryker"); factionIndexes[Tryker] = CStaticFames::getInstance().getFactionIndex("tryker");
factionIndexes[Zorai] = CStaticFames::getInstance().getFactionIndex("zorai"); factionIndexes[Zorai] = CStaticFames::getInstance().getFactionIndex("zorai");
factionIndexes[Marauder] = CStaticFames::getInstance().getFactionIndex("black_kami");
for (uint i = BeginClans; i <= EndClans; i++) for (uint i = BeginClans; i <= EndClans; i++)
nlassert( factionIndexes[i] != CStaticFames::INVALID_FACTION_INDEX ); nlassert( factionIndexes[i] != CStaticFames::INVALID_FACTION_INDEX );
@ -84,7 +86,7 @@ namespace PVP_CLAN
{ {
// These names are in order of the enum TPVPClan // These names are in order of the enum TPVPClan
// The first two clans, "None" and "Neutral", don't count. Subtract 2 from the lookup. // 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) for (int looper = BeginClans; looper <= EndClans; looper += 1)
{ {
@ -111,6 +113,7 @@ namespace PVP_CLAN
factionSheetIds[Matis] = "matis.faction"; factionSheetIds[Matis] = "matis.faction";
factionSheetIds[Tryker] = "tryker.faction"; factionSheetIds[Tryker] = "tryker.faction";
factionSheetIds[Zorai] = "zorai.faction"; factionSheetIds[Zorai] = "zorai.faction";
factionSheetIds[Marauder] = "marauder.faction";
for (uint i = BeginClans; i <= EndClans; i++) for (uint i = BeginClans; i <= EndClans; i++)
nlassert( factionSheetIds[i] != NLMISC::CSheetId::Unknown ); nlassert( factionSheetIds[i] != NLMISC::CSheetId::Unknown );

4
code/ryzom/common/src/game_share/pvp_clan.h
View file

@ -44,7 +44,9 @@ namespace PVP_CLAN
Zorai, Zorai,
EndCivs = Zorai, // end of civs EndCivs = Zorai, // end of civs
EndClans = Zorai, // end of clans
Marauder,
EndClans = Marauder, // end of clans
Unknown, Unknown,
NbClans = Unknown, NbClans = Unknown,