immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1579 from colobot/dev-plus-research 

Add unlocking Phazer research after completing missions chapter 9 and fix missing research icons
fix-squashed-planets
Emxx52 2023-05-07 16:56:18 +02:00 committed by GitHub
parent 06bf44da38 6e7dee74cf
commit 71e3e78644
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data

@ -1 +1 @@
Subproject commit 9e27e420d8b3c0619f148fa2c7b254b51338c5d1
Subproject commit bb7ad7f6ea161eb5a1998f529aea12aff3231668

8
src/level/robotmain.cpp
View File

@ -3777,6 +3777,14 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
m_build |= m_playerProfile->GetFreeGameBuildUnlock();
}
if (~m_researchDone[0] & RESEARCH_PHAZER && (m_levelCategory == LevelCategory::FreeGame || m_levelCategory == LevelCategory::GamePlus) && m_playerProfile->GetLevelPassed(LevelCategory::Missions, 9, 0))
{
m_build |= BUILD_RESEARCH;
m_researchEnable |= RESEARCH_PHAZER;
}
m_researchEnable |= m_researchDone[0];
if (!resetObject)
{
m_short->SetMode(false); // vehicles?