Initial Mapbase commit (squashed from mapbase-beta)

This commit is contained in:
Blixibon
2019-08-31 19:28:20 +00:00
parent 0d8dceea43
commit 3d464bc051
816 changed files with 105527 additions and 957 deletions

View File

@@ -157,6 +157,10 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_RELOAD_LOW );
ADD_ACTIVITY_TO_SR( ACT_ARM );
ADD_ACTIVITY_TO_SR( ACT_DISARM );
#ifdef COMPANION_HOLSTER_WORKAROUND
ADD_ACTIVITY_TO_SR( ACT_ARM_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_DISARM_RIFLE );
#endif
ADD_ACTIVITY_TO_SR( ACT_DROP_WEAPON );
ADD_ACTIVITY_TO_SR( ACT_DROP_WEAPON_SHOTGUN );
ADD_ACTIVITY_TO_SR( ACT_PICKUP_GROUND );
@@ -396,6 +400,11 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_SMG2_TOAUTO );
ADD_ACTIVITY_TO_SR( ACT_SMG2_TOBURST );
#ifdef SHARED_COMBINE_ACTIVITIES
ADD_ACTIVITY_TO_SR( ACT_COMBINE_THROW_GRENADE );
ADD_ACTIVITY_TO_SR( ACT_COMBINE_AR2_ALTFIRE );
#endif
// Physcannon special activities
ADD_ACTIVITY_TO_SR( ACT_PHYSCANNON_UPGRADE );
@@ -447,6 +456,10 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_IDLE_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_IDLE_SMG1 );
ADD_ACTIVITY_TO_SR( ACT_IDLE_ANGRY_SMG1 );
#if AR2_ACTIVITY_FIX == 1
ADD_ACTIVITY_TO_SR( ACT_IDLE_AR2 );
ADD_ACTIVITY_TO_SR( ACT_IDLE_ANGRY_AR2 );
#endif
ADD_ACTIVITY_TO_SR( ACT_IDLE_PISTOL );
ADD_ACTIVITY_TO_SR( ACT_IDLE_ANGRY_PISTOL );
ADD_ACTIVITY_TO_SR( ACT_IDLE_ANGRY_SHOTGUN );
@@ -465,10 +478,26 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_WALK_RIFLE_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_RIFLE_STIMULATED );
#if AR2_ACTIVITY_FIX == 1
ADD_ACTIVITY_TO_SR( ACT_IDLE_AR2_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_AR2_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AR2_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AR2_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AR2_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AR2_STIMULATED );
#endif
ADD_ACTIVITY_TO_SR( ACT_IDLE_AIM_RIFLE_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_RIFLE_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_RIFLE_STIMULATED );
#if AR2_ACTIVITY_FIX == 1
ADD_ACTIVITY_TO_SR( ACT_IDLE_AIM_AR2_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_AR2_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_AR2_STIMULATED );
#endif
ADD_ACTIVITY_TO_SR( ACT_IDLE_SHOTGUN_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_SHOTGUN_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_SHOTGUN_AGITATED );
@@ -518,6 +547,13 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_STEALTH_PISTOL );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_STEALTH_PISTOL );
#if AR2_ACTIVITY_FIX == 1
ADD_ACTIVITY_TO_SR( ACT_WALK_AR2 );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_AR2 );
ADD_ACTIVITY_TO_SR( ACT_RUN_AR2 );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_AR2 );
#endif
ADD_ACTIVITY_TO_SR( ACT_RELOAD_PISTOL );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_PISTOL_LOW );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_SMG1 );