1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged "Enhanced IMP Creation" (by Sandro)

Browse Source 
- For code changes search for // SANDRO
- Tooltips can now be toggled on/off in the options screen instead of "Random IMP Personality" option
- Updated Version Number for new Release Build (2949)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2949 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-06-04 10:44:23 +00:00
parent e983a0ccc6
commit 7445ba2051
40 changed files with 3638 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/IMP Skill Trait.cpp
+11 -8
View File
@@ -19,6 +19,8 @@
#include "CharProfile.h"
#include "soldier profile type.h"
#include "IMP Compile Character.h"
#include "GameSettings.h" // added by SANDRO
#include "IMP Color Choosing.h" // added by SANDRO
#endif
@@ -84,8 +86,6 @@ INT32 giIMPSkillTraitAnswerButtonImage[ IMP_SKILL_TRAITS__NUMBER_SKILLS ];
INT32 giIMPSkillTraitFinsihButton;
INT32 giIMPSkillTraitFinsihButtonImage;
//BOOLEAN gfSkillTraitButtonChanged=FALSE;
#define IST__NUM_SELECTABLE_TRAITS 2
@@ -256,7 +256,7 @@ void AddImpSkillTraitButtons()
SetButtonCursor( giIMPSkillTraitAnswerButton[iCnt], CURSOR_WWW);
//Get rid of playing the button sound, it will be handled here
ButtonList[ giIMPSkillTraitAnswerButton[ iCnt ] ]->ubSoundSchemeID = 0;
//ButtonList[ giIMPSkillTraitAnswerButton[ iCnt ] ]->ubSoundSchemeID = 0; // - This would disable the sounds totally resulted to play no sound - SANDRO
//Determine the next x location
if( iCnt < IMP_SKILL_TRAIT__SKILL_TRAIT_TO_START_RIGHT_COL )
@@ -569,7 +569,8 @@ INT8 DoesPlayerHaveExtraAttibutePointsToDistributeBasedOnSkillSelection()
//if there NONE selected
if( bNumSkills == 0 )
{
bExtraPoints = 10;
// Externilized bonus for not taking skills - SANDRO
bExtraPoints = 2 * (gGameExternalOptions.iBonusPointsPerSkillNotTaken);
}
//if there is 1 trait selected
@@ -577,10 +578,11 @@ INT8 DoesPlayerHaveExtraAttibutePointsToDistributeBasedOnSkillSelection()
{
//if the trait is not the ones you cant be expert in )
if( gfSkillTraitQuestions[ IMP_SKILL_TRAITS__ELECTRONICS ] ||
gfSkillTraitQuestions[ IMP_SKILL_TRAITS__AMBIDEXTROUS ] ||
gfSkillTraitQuestions[ IMP_SKILL_TRAITS__CAMO ] )
gfSkillTraitQuestions[ IMP_SKILL_TRAITS__AMBIDEXTROUS ] ) // Actually camo skill can be achived at expert level, although it does nothing now - SANDRO
// || gfSkillTraitQuestions[ IMP_SKILL_TRAITS__CAMO ] )
{
bExtraPoints = 5;
// Externilized bonus for not taking skills - SANDRO
bExtraPoints = gGameExternalOptions.iBonusPointsPerSkillNotTaken;
}
else
{
@@ -601,7 +603,8 @@ INT8 DoesPlayerHaveExtraAttibutePointsToDistributeBasedOnSkillSelection()
BOOLEAN ShouldTraitBeSkipped( UINT32 uiTrait )
{
if( uiTrait == IMP_SKILL_TRAITS__MARTIAL_ARTS && !fCharacterIsMale )
// added a check to not offer martial arts to big mercs - SANDRO
if( uiTrait == IMP_SKILL_TRAITS__MARTIAL_ARTS && (!fCharacterIsMale || bBigBodySelected()) )
return( TRUE );
else
return( FALSE );