Skip to content

Commit 039e4f9

Browse files
WALLOFJUSTICEWALLOFJUSTICE
authored
Merge pull request #845 from WALLOFJUSTICE/dev-23-q3-2
* merge dev
2 parents 67cb416 + eb956cb commit 039e4f9

File tree

13 files changed

+351
-149
lines changed

13 files changed

+351
-149
lines changed

‎src/entity.cpp

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10359,7 +10359,17 @@ void Entity::attack(int pose, int charge, Entity* target)
1035910359
{
1036010360
increaseSkill = false;
1036110361
}
10362-
players[this->skill[2]]->mechanics.enemyRaisedBlockingAgainst[hit.entity->getUID()]++;
10362+
if ( myStats->shield && itemCategory(myStats->shield) != ARMOR )
10363+
{
10364+
if ( myStats->getProficiency(PRO_SHIELD) >= SKILL_LEVEL_SKILLED )
10365+
{
10366+
increaseSkill = false;
10367+
}
10368+
}
10369+
if ( increaseSkill )
10370+
{
10371+
players[this->skill[2]]->mechanics.enemyRaisedBlockingAgainst[hit.entity->getUID()]++;
10372+
}
1036310373
}
1036410374
if ( increaseSkill )
1036510375
{
@@ -11022,7 +11032,17 @@ void Entity::attack(int pose, int charge, Entity* target)
1102211032
{
1102311033
skillIncrease = false;
1102411034
}
11025-
players[hit.entity->skill[2]]->mechanics.enemyRaisedBlockingAgainst[this->getUID()]++;
11035+
if ( hitstats->shield && itemCategory(hitstats->shield) != ARMOR )
11036+
{
11037+
if ( hitstats->getProficiency(PRO_SHIELD) >= SKILL_LEVEL_SKILLED )
11038+
{
11039+
skillIncrease = false;
11040+
}
11041+
}
11042+
if ( skillIncrease )
11043+
{
11044+
players[hit.entity->skill[2]]->mechanics.enemyRaisedBlockingAgainst[this->getUID()]++;
11045+
}
1102611046
}
1102711047
if ( skillIncrease )
1102811048
{

‎src/eos.cpp

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3166,7 +3166,7 @@ void EOSFuncs::ingestStat(int stat_num, int value)
31663166

31673167
static void EOS_CALL OnIngestGlobalStatComplete(const EOS_Stats_IngestStatCompleteCallbackInfo* data)
31683168
{
3169-
assert(data != NULL);
3169+
/*assert(data != NULL);
31703170
if (data->ResultCode == EOS_EResult::EOS_Success)
31713171
{
31723172
EOSFuncs::logInfo("Successfully stored global stats");
@@ -3184,12 +3184,12 @@ static void EOS_CALL OnIngestGlobalStatComplete(const EOS_Stats_IngestStatComple
31843184
{
31853185
EOSFuncs::logError("OnIngestGlobalStatComplete: Callback failure: %d", static_cast<int>(data->ResultCode));
31863186
}
3187-
EOS.StatGlobalManager.bDataQueued = true;
3187+
EOS.StatGlobalManager.bDataQueued = true;*/
31883188
}
31893189

31903190
void EOSFuncs::queueGlobalStatUpdate(int stat_num, int value)
31913191
{
3192-
if (stat_num <= STEAM_GSTAT_INVALID || stat_num >= NUM_GLOBAL_STEAM_STATISTICS)
3192+
/*if (stat_num <= STEAM_GSTAT_INVALID || stat_num >= NUM_GLOBAL_STEAM_STATISTICS)
31933193
{
31943194
return;
31953195
}
@@ -3198,7 +3198,7 @@ void EOSFuncs::queueGlobalStatUpdate(int stat_num, int value)
31983198
return;
31993199
}
32003200
g_SteamGlobalStats[stat_num].m_iValue += value;
3201-
StatGlobalManager.bDataQueued = true;
3201+
StatGlobalManager.bDataQueued = true;*/
32023202
}
32033203

32043204
void EOSFuncs::StatGlobal_t::updateQueuedStats()
@@ -3218,55 +3218,55 @@ void EOSFuncs::StatGlobal_t::updateQueuedStats()
32183218

32193219
void EOSFuncs::ingestGlobalStats()
32203220
{
3221-
if (StatGlobalManager.bIsDisabled)
3222-
{
3223-
return;
3224-
}
3225-
if (!ServerPlatformHandle)
3226-
{
3227-
return;
3228-
}
3221+
//if (StatGlobalManager.bIsDisabled)
3222+
//{
3223+
// return;
3224+
//}
3225+
//if (!ServerPlatformHandle)
3226+
//{
3227+
// return;
3228+
//}
32293229

3230-
Uint32 numStats = 0;
3231-
std::vector<std::string> StatNames;
3232-
for (Uint32 i = 0; i < NUM_GLOBAL_STEAM_STATISTICS; ++i)
3233-
{
3234-
if (g_SteamGlobalStats[i].m_iValue > 0)
3235-
{
3236-
StatNames.push_back(g_SteamGlobalStats[i].m_pchStatName);
3237-
++numStats;
3238-
}
3239-
}
3230+
//Uint32 numStats = 0;
3231+
//std::vector<std::string> StatNames;
3232+
//for (Uint32 i = 0; i < NUM_GLOBAL_STEAM_STATISTICS; ++i)
3233+
//{
3234+
// if (g_SteamGlobalStats[i].m_iValue > 0)
3235+
// {
3236+
// StatNames.push_back(g_SteamGlobalStats[i].m_pchStatName);
3237+
// ++numStats;
3238+
// }
3239+
//}
32403240

3241-
if (numStats == 0)
3242-
{
3243-
return;
3244-
}
3241+
//if (numStats == 0)
3242+
//{
3243+
// return;
3244+
//}
32453245

3246-
EOS_Stats_IngestData* StatsToIngest = new EOS_Stats_IngestData[numStats];
3247-
Uint32 currentIndex = 0;
3248-
for (Uint32 i = 0; i < NUM_GLOBAL_STEAM_STATISTICS && currentIndex < StatNames.size(); ++i)
3249-
{
3250-
if (g_SteamGlobalStats[i].m_iValue > 0)
3251-
{
3252-
StatsToIngest[currentIndex].ApiVersion = EOS_STATS_INGESTDATA_API_LATEST;
3253-
StatsToIngest[currentIndex].StatName = StatNames[currentIndex].c_str();
3254-
StatsToIngest[currentIndex].IngestAmount = g_SteamGlobalStats[i].m_iValue;
3255-
//logInfo("Updated %s | %d", StatsToIngest[currentIndex].StatName, StatsToIngest[currentIndex].IngestAmount);
3256-
++currentIndex;
3257-
}
3258-
}
3246+
//EOS_Stats_IngestData* StatsToIngest = new EOS_Stats_IngestData[numStats];
3247+
//Uint32 currentIndex = 0;
3248+
//for (Uint32 i = 0; i < NUM_GLOBAL_STEAM_STATISTICS && currentIndex < StatNames.size(); ++i)
3249+
//{
3250+
// if (g_SteamGlobalStats[i].m_iValue > 0)
3251+
// {
3252+
// StatsToIngest[currentIndex].ApiVersion = EOS_STATS_INGESTDATA_API_LATEST;
3253+
// StatsToIngest[currentIndex].StatName = StatNames[currentIndex].c_str();
3254+
// StatsToIngest[currentIndex].IngestAmount = g_SteamGlobalStats[i].m_iValue;
3255+
// //logInfo("Updated %s | %d", StatsToIngest[currentIndex].StatName, StatsToIngest[currentIndex].IngestAmount);
3256+
// ++currentIndex;
3257+
// }
3258+
//}
32593259

3260-
EOS_Stats_IngestStatOptions Options{};
3261-
Options.ApiVersion = EOS_STATS_INGESTSTAT_API_LATEST;
3262-
Options.Stats = StatsToIngest;
3263-
Options.StatsCount = numStats;
3264-
Options.LocalUserId = StatGlobalManager.getProductUserIdHandle();
3265-
Options.TargetUserId = StatGlobalManager.getProductUserIdHandle();
3260+
//EOS_Stats_IngestStatOptions Options{};
3261+
//Options.ApiVersion = EOS_STATS_INGESTSTAT_API_LATEST;
3262+
//Options.Stats = StatsToIngest;
3263+
//Options.StatsCount = numStats;
3264+
//Options.LocalUserId = StatGlobalManager.getProductUserIdHandle();
3265+
//Options.TargetUserId = StatGlobalManager.getProductUserIdHandle();
32663266

3267-
EOS_Stats_IngestStat(EOS_Platform_GetStatsInterface(ServerPlatformHandle), &Options, nullptr, OnIngestGlobalStatComplete);
3267+
//EOS_Stats_IngestStat(EOS_Platform_GetStatsInterface(ServerPlatformHandle), &Options, nullptr, OnIngestGlobalStatComplete);
32683268

3269-
delete[] StatsToIngest;
3269+
//delete[] StatsToIngest;
32703270
}
32713271

32723272
void EOS_CALL EOSFuncs::OnQueryAllStatsCallback(const EOS_Stats_OnQueryStatsCompleteCallbackInfo* data)
@@ -4063,34 +4063,34 @@ void EOSFuncs::StatGlobal_t::init()
40634063

40644064
void EOSFuncs::StatGlobal_t::queryGlobalStatUser()
40654065
{
4066-
init();
4066+
//init();
40674067

4068-
// Query Player Stats
4069-
EOS_Stats_QueryStatsOptions StatsQueryOptions{};
4070-
StatsQueryOptions.ApiVersion = EOS_STATS_QUERYSTATS_API_LATEST;
4071-
StatsQueryOptions.LocalUserId = getProductUserIdHandle();
4072-
StatsQueryOptions.TargetUserId = getProductUserIdHandle();
4068+
//// Query Player Stats
4069+
//EOS_Stats_QueryStatsOptions StatsQueryOptions{};
4070+
//StatsQueryOptions.ApiVersion = EOS_STATS_QUERYSTATS_API_LATEST;
4071+
//StatsQueryOptions.LocalUserId = getProductUserIdHandle();
4072+
//StatsQueryOptions.TargetUserId = getProductUserIdHandle();
40734073

4074-
// Optional params
4075-
StatsQueryOptions.StartTime = EOS_STATS_TIME_UNDEFINED;
4076-
StatsQueryOptions.EndTime = EOS_STATS_TIME_UNDEFINED;
4074+
//// Optional params
4075+
//StatsQueryOptions.StartTime = EOS_STATS_TIME_UNDEFINED;
4076+
//StatsQueryOptions.EndTime = EOS_STATS_TIME_UNDEFINED;
40774077

4078-
StatsQueryOptions.StatNamesCount = NUM_GLOBAL_STEAM_STATISTICS;
4079-
StatsQueryOptions.StatNames = new const char* [NUM_GLOBAL_STEAM_STATISTICS];
4078+
//StatsQueryOptions.StatNamesCount = NUM_GLOBAL_STEAM_STATISTICS;
4079+
//StatsQueryOptions.StatNames = new const char* [NUM_GLOBAL_STEAM_STATISTICS];
40804080

4081-
for (int i = 0; i < NUM_GLOBAL_STEAM_STATISTICS; ++i)
4082-
{
4083-
StatsQueryOptions.StatNames[i] = g_SteamGlobalStats[i].m_pchStatName;
4084-
}
4081+
//for (int i = 0; i < NUM_GLOBAL_STEAM_STATISTICS; ++i)
4082+
//{
4083+
// StatsQueryOptions.StatNames[i] = g_SteamGlobalStats[i].m_pchStatName;
4084+
//}
40854085

4086-
if (EOS.ServerPlatformHandle)
4087-
{
4088-
return;
4089-
}
4086+
//if (EOS.ServerPlatformHandle)
4087+
//{
4088+
// return;
4089+
//}
40904090

4091-
EOS_Stats_QueryStats(EOS_Platform_GetStatsInterface(EOS.ServerPlatformHandle),
4092-
&StatsQueryOptions, nullptr, OnQueryGlobalStatsCallback);
4093-
delete[] StatsQueryOptions.StatNames;
4091+
//EOS_Stats_QueryStats(EOS_Platform_GetStatsInterface(EOS.ServerPlatformHandle),
4092+
// &StatsQueryOptions, nullptr, OnQueryGlobalStatsCallback);
4093+
//delete[] StatsQueryOptions.StatNames;
40944094
}
40954095

40964096
#endif //USE_EOS

‎src/init_game.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ void initGameDatafiles(bool moddedReload)
111111
CompendiumEntries.readModelLimbsFromFile("monster");
112112
CompendiumEntries.readModelLimbsFromFile("world");
113113
CompendiumEntries.readModelLimbsFromFile("codex");
114+
MainMenu::MainMenuBanners_t::readFromFile();
114115
}
115116

116117
void initGameDatafilesAsync(bool moddedReload)

‎src/magic/magic.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1968,6 +1968,7 @@ Entity* spellEffectPolymorph(Entity* target, Entity* parent, bool fromMagicSpell
19681968
summonedStats->RANDOM_GOLD = 0;
19691969
summonedStats->MISC_FLAGS[STAT_FLAG_MONSTER_DISABLE_HC_SCALING] = 1;
19701970
summonedStats->leader_uid = targetStats->leader_uid;
1971+
summonedStats->monsterIsCharmed = targetStats->monsterIsCharmed;
19711972
if ( summonedStats->leader_uid != 0 && summonedStats->type != SHADOW )
19721973
{
19731974
Entity* leader = uidToEntity(summonedStats->leader_uid);

‎src/main.cpp

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -301,76 +301,6 @@ SteamStat_t g_SteamStats[NUM_STEAM_STATISTICS] =
301301
{ 58, STEAM_STAT_INT, "STAT_SMASH_MELEE" }
302302
};
303303

304-
SteamStat_t g_SteamGlobalStats[NUM_GLOBAL_STEAM_STATISTICS] =
305-
{
306-
{ 1, STEAM_STAT_INT, "STAT_GLOBAL_GAMES_STARTED" },
307-
{ 2, STEAM_STAT_INT, "STAT_GLOBAL_GAMES_WON" },
308-
{ 3, STEAM_STAT_INT, "STAT_GLOBAL_BOULDER_DEATHS" },
309-
{ 4, STEAM_STAT_INT, "STAT_GLOBAL_HERX_SLAIN" },
310-
{ 5, STEAM_STAT_INT, "STAT_GLOBAL_BAPHOMET_SLAIN" },
311-
{ 6, STEAM_STAT_INT, "STAT_GLOBAL_TWINSICE_SLAIN" },
312-
{ 7, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_HUMAN" },
313-
{ 8, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_RAT" },
314-
{ 9, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_GOBLIN" },
315-
{ 10, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_SLIME" },
316-
{ 11, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_TROLL" },
317-
{ 12, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_SPIDER" },
318-
{ 13, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_GHOUL" },
319-
{ 14, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_SKELETON" },
320-
{ 15, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_SCORPION" },
321-
{ 16, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_IMP" },
322-
{ 17, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_GNOME" },
323-
{ 18, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_DEMON" },
324-
{ 19, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_SUCCUBUS" },
325-
{ 20, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_LICH" },
326-
{ 21, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_MINOTAUR" },
327-
{ 22, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_DEVIL" },
328-
{ 23, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_SHOPKEEPER" },
329-
{ 24, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_KOBOLD" },
330-
{ 25, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_SCARAB" },
331-
{ 26, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_CRYSTALGOLEM" },
332-
{ 27, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_INCUBUS" },
333-
{ 28, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_VAMPIRE" },
334-
{ 29, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_SHADOW" },
335-
{ 30, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_COCKATRICE" },
336-
{ 31, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_INSECTOID" },
337-
{ 32, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_GOATMAN" },
338-
{ 33, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_AUTOMATON" },
339-
{ 34, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_LICHICE" },
340-
{ 35, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_LICHFIRE" },
341-
{ 36, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_SENTRYBOT" },
342-
{ 37, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_SPELLBOT" },
343-
{ 38, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_GYROBOT" },
344-
{ 39, STEAM_STAT_INT, "STAT_GLOBAL_DEATHS_DUMMYBOT" },
345-
{ 40, STEAM_STAT_INT, "STAT_GLOBAL_TWINSFIRE_SLAIN" },
346-
{ 41, STEAM_STAT_INT, "STAT_GLOBAL_SHOPKEEPERS_SLAIN" },
347-
{ 42, STEAM_STAT_INT, "STAT_GLOBAL_MINOTAURS_SLAIN" },
348-
{ 43, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL_ENTERED" },
349-
{ 44, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL1_COMPLETED" },
350-
{ 45, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL2_COMPLETED" },
351-
{ 46, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL3_COMPLETED" },
352-
{ 47, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL4_COMPLETED" },
353-
{ 48, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL5_COMPLETED" },
354-
{ 49, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL6_COMPLETED" },
355-
{ 50, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL7_COMPLETED" },
356-
{ 51, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL8_COMPLETED" },
357-
{ 52, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL9_COMPLETED" },
358-
{ 53, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL10_COMPLETED" },
359-
{ 54, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL1_ATTEMPTS" },
360-
{ 55, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL2_ATTEMPTS" },
361-
{ 56, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL3_ATTEMPTS" },
362-
{ 57, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL4_ATTEMPTS" },
363-
{ 58, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL5_ATTEMPTS" },
364-
{ 59, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL6_ATTEMPTS" },
365-
{ 60, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL7_ATTEMPTS" },
366-
{ 61, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL8_ATTEMPTS" },
367-
{ 62, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL9_ATTEMPTS" },
368-
{ 63, STEAM_STAT_INT, "STAT_GLOBAL_TUTORIAL10_ATTEMPTS" },
369-
{ 64, STEAM_STAT_INT, "STAT_GLOBAL_DISABLE" },
370-
{ 65, STEAM_STAT_INT, "STAT_GLOBAL_PROMO" },
371-
{ 66, STEAM_STAT_INT, "STAT_GLOBAL_PROMO_INTERACT" }
372-
};
373-
374304
#ifdef STEAMWORKS
375305
bool directConnect = false;
376306
CSteamLeaderboards* g_SteamLeaderboards = NULL;

‎src/main.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -892,8 +892,6 @@ void GO_SwapBuffers(SDL_Window* screen);
892892

893893
static const int NUM_STEAM_STATISTICS = 58;
894894
extern SteamStat_t g_SteamStats[NUM_STEAM_STATISTICS];
895-
static const int NUM_GLOBAL_STEAM_STATISTICS = 66;
896-
extern SteamStat_t g_SteamGlobalStats[NUM_GLOBAL_STEAM_STATISTICS];
897895

898896
#ifdef STEAMWORKS
899897
#include <steam/steam_api.h>

‎src/menu.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9354,7 +9354,13 @@ void doNewGame(bool makeHighscore) {
93549354
if ( gameModeManager.getMode() == GameModeManager_t::GAME_MODE_DEFAULT && !loadingsavegame )
93559355
{
93569356
steamStatisticUpdate(STEAM_STAT_GAMES_STARTED, STEAM_STAT_INT, 1);
9357-
achievementObserver.updateGlobalStat(STEAM_GSTAT_GAMES_STARTED);
9357+
#ifdef USE_PLAYFAB
9358+
if ( !loadingsavegame )
9359+
{
9360+
playfabUser.gameBegin();
9361+
}
9362+
#endif
9363+
//achievementObserver.updateGlobalStat(STEAM_GSTAT_GAMES_STARTED);
93589364
}
93599365

93609366
// delete game data clutter

0 commit comments

Comments
 (0)