Skip to content

Commit

Permalink
New Achievements #1
Browse files Browse the repository at this point in the history
  • Loading branch information
@wolfetplayer
wolfetplayer committed Jun 2, 2024
1 parent 2acc6a8 commit b4b0fb8
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 0 deletions.
8 changes: 8 additions & 0 deletions code/game/ai_cast_script.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,10 @@ qboolean AICast_ScriptAction_Achievement_WARBELL3( cast_state_t *cs, char *param
qboolean AICast_ScriptAction_Achievement_WARBELL4( cast_state_t *cs, char *params );
qboolean AICast_ScriptAction_Achievement_WARBELL5( cast_state_t *cs, char *params );

// Malta Update Achievements
qboolean AICast_ScriptAction_Achievement_MALTA_NIGHTMARE( cast_state_t *cs, char *params );
qboolean AICast_ScriptAction_Achievement_MALTA_LEAP( cast_state_t *cs, char *params );
qboolean AICast_ScriptAction_Achievement_MALTA_OSA( cast_state_t *cs, char *params );


qboolean AICast_ScriptAction_EndGame( cast_state_t *cs, char *params ); //----(SA) added
Expand Down Expand Up @@ -457,6 +461,10 @@ cast_script_stack_action_t scriptActions[] =
{"achievement_blavWarbell", AICast_ScriptAction_Achievement_WARBELL3},
{"achievement_olaricWarbell", AICast_ScriptAction_Achievement_WARBELL4},
{"achievement_heinrichWarbell", AICast_ScriptAction_Achievement_WARBELL5},
// Malta Update Achievements
{"achievement_malta_nightmare", AICast_ScriptAction_Achievement_MALTA_NIGHTMARE},
{"achievement_malta_leap", AICast_ScriptAction_Achievement_MALTA_LEAP},
{"achievement_malta_osa", AICast_ScriptAction_Achievement_MALTA_OSA},
// achievements end
{"endgame", AICast_ScriptAction_EndGame}, //----(SA) added
{"teleport", AICast_ScriptAction_Teleport}, //----(SA) added
Expand Down
40 changes: 40 additions & 0 deletions code/game/ai_cast_script_actions.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4940,6 +4940,46 @@ qboolean AICast_ScriptAction_Achievement_WARBELL5( cast_state_t *cs, char *param
return qtrue;
}

/*
==================
AICast_ScriptAction_Achievement_MALTA_NIGHTMARE
==================
*/
qboolean AICast_ScriptAction_Achievement_MALTA_NIGHTMARE( cast_state_t *cs, char *params ) {
if ( !g_cheats.integer )
{
steamSetAchievement("ACH_MALTA_NIGHTMARE");
}
return qtrue;
}

/*
==================
AICast_ScriptAction_Achievement_MALTA_LEAP
==================
*/
qboolean AICast_ScriptAction_Achievement_MALTA_LEAP( cast_state_t *cs, char *params ) {
if ( !g_cheats.integer )
{
steamSetAchievement("ACH_MALTA_LEAP");
}
return qtrue;
}

/*
==================
AICast_ScriptAction_Achievement_MALTA_OSA
==================
*/
qboolean AICast_ScriptAction_Achievement_MALTA_OSA( cast_state_t *cs, char *params ) {
if ( !g_cheats.integer )
{
steamSetAchievement("ACH_MALTA_OSA");
}
return qtrue;
}



/*
==================
Expand Down
6 changes: 6 additions & 0 deletions code/game/g_func_decs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1435,6 +1435,12 @@ extern qboolean AICast_ScriptAction_Achievement_WARBELL2( cast_state_t *cs, char
extern qboolean AICast_ScriptAction_Achievement_WARBELL3( cast_state_t *cs, char *params );
extern qboolean AICast_ScriptAction_Achievement_WARBELL4( cast_state_t *cs, char *params );
extern qboolean AICast_ScriptAction_Achievement_WARBELL5( cast_state_t *cs, char *params );
// Malta update achievements
extern qboolean AICast_ScriptAction_Achievement_MALTA_NIGHTMARE( cast_state_t *cs, char *params );
extern qboolean AICast_ScriptAction_Achievement_MALTA_LEAP( cast_state_t *cs, char *params );
extern qboolean AICast_ScriptAction_Achievement_MALTA_OSA( cast_state_t *cs, char *params );


// end achievements
extern qboolean AICast_ScriptAction_EndGame ( cast_state_t * cs , char * params ) ;
extern qboolean AICast_ScriptAction_Teleport ( cast_state_t * cs , char * params ) ;
Expand Down
4 changes: 4 additions & 0 deletions code/game/g_func_decs.h.orig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ extern qboolean AICast_ScriptAction_Achievement_WARBELL2( cast_state_t *cs, char
extern qboolean AICast_ScriptAction_Achievement_WARBELL3( cast_state_t *cs, char *params );
extern qboolean AICast_ScriptAction_Achievement_WARBELL4( cast_state_t *cs, char *params );
extern qboolean AICast_ScriptAction_Achievement_WARBELL5( cast_state_t *cs, char *params );
// Malta update achievements
extern qboolean AICast_ScriptAction_Achievement_MALTA_NIGHTMARE( cast_state_t *cs, char *params );
extern qboolean AICast_ScriptAction_Achievement_MALTA_LEAP( cast_state_t *cs, char *params );
extern qboolean AICast_ScriptAction_Achievement_MALTA_OSA( cast_state_t *cs, char *params );
// end achievements
extern qboolean AICast_ScriptAction_EndGame ( cast_state_t * cs , char * params ) ;
extern qboolean AICast_ScriptAction_Teleport ( cast_state_t * cs , char * params ) ;
Expand Down
4 changes: 4 additions & 0 deletions code/game/g_funcs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1432,6 +1432,10 @@ If you have questions concerning this license or the applicable additional terms
{"AICast_ScriptAction_Achievement_WARBELL3", (byte *)AICast_ScriptAction_Achievement_WARBELL3},
{"AICast_ScriptAction_Achievement_WARBELL4", (byte *)AICast_ScriptAction_Achievement_WARBELL4},
{"AICast_ScriptAction_Achievement_WARBELL5", (byte *)AICast_ScriptAction_Achievement_WARBELL5},
// Malta Update achievements
{"AICast_ScriptAction_Achievement_MALTA_NIGHTMARE", (byte *)AICast_ScriptAction_Achievement_MALTA_NIGHTMARE},
{"AICast_ScriptAction_Achievement_MALTA_LEAP", (byte *)AICast_ScriptAction_Achievement_MALTA_LEAP},
{"AICast_ScriptAction_Achievement_MALTA_OSA", (byte *)AICast_ScriptAction_Achievement_MALTA_OSA},
// end achievements
{"AICast_ScriptAction_EndGame", (byte *)AICast_ScriptAction_EndGame},
{"AICast_ScriptAction_Teleport", (byte *)AICast_ScriptAction_Teleport},
Expand Down
4 changes: 4 additions & 0 deletions code/game/g_funcs.h.orig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ If you have questions concerning this license or the applicable additional terms
{"AICast_ScriptAction_Achievement_WARBELL3", (byte *)AICast_ScriptAction_Achievement_WARBELL3},
{"AICast_ScriptAction_Achievement_WARBELL4", (byte *)AICast_ScriptAction_Achievement_WARBELL4},
{"AICast_ScriptAction_Achievement_WARBELL5", (byte *)AICast_ScriptAction_Achievement_WARBELL5},
// Malta Update achievements
{"AICast_ScriptAction_Achievement_MALTA_NIGHTMARE", (byte *)AICast_ScriptAction_Achievement_MALTA_NIGHTMARE},
{"AICast_ScriptAction_Achievement_MALTA_LEAP", (byte *)AICast_ScriptAction_Achievement_MALTA_LEAP},
{"AICast_ScriptAction_Achievement_MALTA_OSA", (byte *)AICast_ScriptAction_Achievement_MALTA_OSA},
// end achievements
{"AICast_ScriptAction_EndGame", (byte *)AICast_ScriptAction_EndGame},
{"AICast_ScriptAction_Teleport", (byte *)AICast_ScriptAction_Teleport},
Expand Down
8 changes: 8 additions & 0 deletions code/game/g_items.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,14 @@ int Pickup_Weapon( gentity_t *ent, gentity_t *other ) {
}
}

if (( weapon == WP_REVOLVER ) && strstr (level.scriptAI, "Escape #2"))
{
if ( !g_cheats.integer )
{
steamSetAchievement("ACH_AGENT1");
}
}

// check for special colt->akimbo add (if you've got a colt already, add the second now)
if ( weapon == WP_COLT ) {
if ( COM_BitCheck( other->client->ps.weapons, WP_COLT ) ) {
Expand Down

0 comments on commit b4b0fb8

Please sign in to comment.