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

add "Disguise" menu to tactical skill menu (alt + rightclick)

Browse Source 
add "Fill canteens" action to tactical skill menu, under "various" 

adapted from Seven's +AI

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
rftr
2022-03-29 06:02:44 +00:00
parent 4689369f83
commit 75d98aecfd
13 changed files with 317 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+60 -1
View File
@@ -18292,6 +18292,18 @@ BOOLEAN SOLDIERTYPE::CanUseSkill( INT8 iSkill, BOOLEAN fAPCheck, INT32 sGridNo )
}
break;
case SKILLS_DISGUISE_APPLY_DISGUISE:
case SKILLS_DISGUISE_REMOVE_CLOTHES:
if (IS_MERC_BODY_TYPE(this) && !(usSoldierFlagMask & (SOLDIER_COVERT_CIV | SOLDIER_COVERT_SOLDIER)))
canuse = TRUE;
break;
case SKILLS_DISGUISE_REMOVE_DISGUISE:
case SKILLS_DISGUISE_TEST_DISGUISE:
if (IS_MERC_BODY_TYPE(this) && usSoldierFlagMask & (SOLDIER_COVERT_CIV | SOLDIER_COVERT_SOLDIER))
canuse = TRUE;
break;
case SKILLS_SPOTTER:
if ( (!fAPCheck || EnoughPoints( this, APBPConstants[AP_SPOTTER], 0, FALSE )) && CanSpot( ) )
canuse = TRUE;
@@ -18314,6 +18326,11 @@ BOOLEAN SOLDIERTYPE::CanUseSkill( INT8 iSkill, BOOLEAN fAPCheck, INT32 sGridNo )
canuse = TRUE;
break;
case SKILLS_FILL_CANTEENS:
if ( !((guiCurrentScreen != GAME_SCREEN && guiCurrentScreen != MSG_BOX_SCREEN) || (gTacticalStatus.uiFlags & INCOMBAT) || gTacticalStatus.fEnemyInSector || gusSelectedSoldier == NOBODY) )
canuse = TRUE;
break;
default:
break;
}
@@ -18410,6 +18427,23 @@ BOOLEAN SOLDIERTYPE::UseSkill( UINT8 iSkill, INT32 usMapPos, UINT32 ID )
return TRUE;
break;
case SKILLS_DISGUISE_APPLY_DISGUISE:
this->Disguise();
this->SpySelfTest();
return TRUE;
case SKILLS_DISGUISE_REMOVE_DISGUISE:
this->LooseDisguise();
return TRUE;
case SKILLS_DISGUISE_TEST_DISGUISE:
this->SpySelfTest();
return TRUE;
case SKILLS_DISGUISE_REMOVE_CLOTHES:
this->Strip();
return TRUE;
case SKILLS_SPOTTER:
return BecomeSpotter( usMapPos );
break;
@@ -18443,6 +18477,10 @@ BOOLEAN SOLDIERTYPE::UseSkill( UINT8 iSkill, INT32 usMapPos, UINT32 ID )
return TRUE;
break;
case SKILLS_FILL_CANTEENS:
SectorFillCanteens();
break;
default:
break;
}
@@ -18574,6 +18612,18 @@ STR16 SOLDIERTYPE::PrintSkillDesc( INT8 iSkill, INT32 sGridNo )
break;
case SKILLS_DISGUISE_APPLY_DISGUISE:
case SKILLS_DISGUISE_REMOVE_CLOTHES:
swprintf( atStr, pTraitSkillsDenialStrings[TEXT_SKILL_DENIAL_NOT_DISGUISED] );
wcscat( skilldescarray, atStr );
break;
case SKILLS_DISGUISE_REMOVE_DISGUISE:
case SKILLS_DISGUISE_TEST_DISGUISE:
swprintf( atStr, pTraitSkillsDenialStrings[TEXT_SKILL_DENIAL_DISGUISE_CIV_OR_MIL] );
wcscat( skilldescarray, atStr );
break;
case SKILLS_SPOTTER:
swprintf( atStr, pTraitSkillsDenialStrings[TEXT_SKILL_DENIAL_X_AP], APBPConstants[AP_SPOTTER] );
wcscat( skilldescarray, atStr );
@@ -18608,6 +18658,15 @@ STR16 SOLDIERTYPE::PrintSkillDesc( INT8 iSkill, INT32 sGridNo )
break;
case SKILLS_FILL_CANTEENS:
swprintf( atStr, pTraitSkillsDenialStrings[TEXT_SKILL_DENIAL_NOT_IN_COMBAT] );
wcscat( skilldescarray, atStr );
swprintf( atStr, pTraitSkillsDenialStrings[TEXT_SKILL_DENIAL_FRIENDLY_SECTOR] );
wcscat( skilldescarray, atStr );
break;
default:
break;
}
@@ -24361,7 +24420,7 @@ BOOLEAN HAS_SKILL_TRAIT( SOLDIERTYPE * pSoldier, UINT8 uiSkillTraitNumber )
return FALSE;
// Flugente: compatibility with skills
if ( uiSkillTraitNumber == INTEL || uiSkillTraitNumber == VARIOUSSKILLS )
if ( uiSkillTraitNumber == INTEL || uiSkillTraitNumber == DISGUISE || uiSkillTraitNumber == VARIOUSSKILLS )
return TRUE;
// sevenfm: add Autobandage option to skills menu