Add Custom Skill

Author: andrikpowell

prboom2/src/dsda/configuration.c

@@ -37,6 +37,7 @@
 #include "dsda/exhud.h"
 #include "dsda/features.h"
 #include "dsda/input.h"
+#include "dsda/skill_info.h"
 #include "dsda/stretch.h"
 #include "dsda/utility.h"
 
@@ -1007,6 +1008,70 @@ dsda_config_t dsda_config[dsda_config_count] = {
     "dsda_coop_spawns", dsda_config_coop_spawns,
     CONF_BOOL(0), NULL, NOT_STRICT, dsda_AlterGameFlags
   },
+  [dsda_config_skill_spawn_filter] = {
+    "dsda_skill_spawn_filter", dsda_config_skill_spawn_filter,
+    dsda_config_int, 0, 2, { 1 }, &cskill_spawn_filter
+  },
+  [dsda_config_skill_coop_spawns] = {
+    "dsda_skill_coop_spawns", dsda_config_skill_coop_spawns,
+    CONF_BOOL(0), &cskill_coop_spawns
+  },
+  [dsda_config_skill_ammo_factor] = {
+    "dsda_skill_ammo_factor", dsda_config_skill_ammo_factor,
+    dsda_config_int, 0, 4, { 1 }, &cskill_ammo_factor
+  },
+  [dsda_config_skill_damage_factor] = {
+    "dsda_skill_damage_factor", dsda_config_skill_damage_factor,
+    dsda_config_int, 0, 4, { 1 }, &cskill_damage_factor
+  },
+  [dsda_config_skill_armor_factor] = {
+    "dsda_skill_armor_factor", dsda_config_skill_armor_factor,
+    dsda_config_int, 0, 4, { 1 }, &cskill_armor_factor
+  },
+  [dsda_config_skill_health_factor] = {
+    "dsda_skill_health_factor", dsda_config_skill_health_factor,
+    dsda_config_int, 0, 4, { 1 }, &cskill_health_factor
+  },
+  [dsda_config_skill_monster_health_factor] = {
+    "dsda_skill_monster_health_factor", dsda_config_skill_monster_health_factor,
+    dsda_config_int, 0, 4, { 1 }, &cskill_monster_hp_factor
+  },
+  [dsda_config_skill_friend_health_factor] = {
+    "dsda_skill_friend_health_factor", dsda_config_skill_friend_health_factor,
+    dsda_config_int, 0, 4, { 1 }, &cskill_friend_hp_factor
+  },
+  [dsda_config_skill_respawn_monsters] = {
+    "dsda_skill_respawn_monsters", dsda_config_skill_respawn_monsters,
+    CONF_BOOL(0), &cskill_respawn
+  },
+  [dsda_config_skill_respawn_time] = {
+    "dsda_skill_respawn_time", dsda_config_skill_respawn_time,
+    dsda_config_int, 1, 32, { 12 }, &cskill_respawn_time
+  },
+  [dsda_config_skill_no_monsters] = {
+    "dsda_skill_no_monsters", dsda_config_skill_no_monsters,
+    CONF_BOOL(0), &cskill_no_monsters
+  },
+  [dsda_config_skill_fast_monsters] = {
+    "dsda_skill_fast_monsters", dsda_config_skill_fast_monsters,
+    CONF_BOOL(0), &cskill_fast_monsters
+  },
+  [dsda_config_skill_aggressive_monsters] = {
+    "dsda_skill_aggressive_monsters", dsda_config_skill_aggressive_monsters,
+    CONF_BOOL(0), &cskill_aggressive
+  },
+  [dsda_config_skill_easy_brain] = {
+    "dsda_skill_easy_brain", dsda_config_skill_easy_brain,
+    CONF_BOOL(0), &cskill_easy_brain
+  },
+  [dsda_config_skill_auto_use_health] = {
+    "dsda_skill_auto_use_health", dsda_config_skill_auto_use_health,
+    CONF_BOOL(0), &cskill_auto_use_hp
+  },
+  [dsda_config_skill_no_pain] = {
+    "dsda_skill_no_pain", dsda_config_skill_no_pain,
+    CONF_BOOL(0), &cskill_no_pain
+  },
   [dsda_config_parallel_sfx_limit] = {
     "dsda_parallel_sfx_limit", dsda_config_parallel_sfx_limit,
     dsda_config_int, 0, 32, { 0 }, NULL, NOT_STRICT, dsda_InitParallelSFXFilter

prboom2/src/dsda/configuration.h

@@ -221,6 +221,22 @@ typedef enum {
   dsda_config_fast_monsters,
   dsda_config_no_monsters,
   dsda_config_coop_spawns,
+  dsda_config_skill_spawn_filter,
+  dsda_config_skill_coop_spawns,
+  dsda_config_skill_ammo_factor,
+  dsda_config_skill_damage_factor,
+  dsda_config_skill_armor_factor,
+  dsda_config_skill_health_factor,
+  dsda_config_skill_monster_health_factor,
+  dsda_config_skill_friend_health_factor,
+  dsda_config_skill_respawn_monsters,
+  dsda_config_skill_respawn_time,
+  dsda_config_skill_no_monsters,
+  dsda_config_skill_fast_monsters,
+  dsda_config_skill_aggressive_monsters,
+  dsda_config_skill_easy_brain,
+  dsda_config_skill_auto_use_health,
+  dsda_config_skill_no_pain,
   dsda_config_parallel_sfx_limit,
   dsda_config_parallel_sfx_window,
   dsda_config_movement_toggle_sfx,

prboom2/src/dsda/demo.c

@@ -39,6 +39,7 @@
 #include "dsda/map_format.h"
 #include "dsda/preferences.h"
 #include "dsda/settings.h"
+#include "dsda/skill_info.h"
 #include "dsda/split_tracker.h"
 #include "dsda/utility.h"
 
@@ -280,6 +281,12 @@ void dsda_InitDemoRecording(void) {
   if (dsda_Flag(dsda_arg_pistol_start))
     I_Error("The -pistolstart option is not allowed when recording a demo!");
 
+  if (customskill && dsda_Flag(dsda_arg_skill))
+  {
+    if (dsda_Arg(dsda_arg_skill)->value.v_int > num_og_skills)
+      I_Error("Custom Skill is not allowed when recording a demo!\n");
+  }
+
   demorecording = true;
 
   // Key settings revert when starting a new attempt

prboom2/src/dsda/global.c

@@ -138,6 +138,7 @@ const char* g_skyflatname;
 dboolean hexen = false;
 dboolean heretic = false;
 dboolean raven = false;
+dboolean customskill = false;
 
 static void dsda_InitDoom(void) {
   int i;

prboom2/src/dsda/global.h

@@ -104,6 +104,7 @@ extern int g_mf_shadow;
 extern const char* g_skyflatname;
 
 extern dboolean heretic;
+extern dboolean customskill;
 
 void dsda_InitGlobal(void);
 

prboom2/src/dsda/skill_info.c

@@ -127,6 +127,7 @@ const skill_info_t hexen_skill_infos[5] = {
 };
 
 int num_skills;
+int num_og_skills;
 skill_info_t* skill_infos;
 
 static void dsda_CopyFactor(fixed_t* dest, const char* source) {
@@ -139,7 +140,7 @@ static void dsda_CopyFactor(fixed_t* dest, const char* source) {
     *dest = dsda_StringToFixed(source) + 1;
 }
 
-void dsda_CopySkillInfo(int i, const doom_mapinfo_skill_t* info) {
+static void dsda_CopySkillInfo(int i, const doom_mapinfo_skill_t* info) {
   memset(&skill_infos[i], 0, sizeof(skill_infos[i]));
 
   dsda_CopyFactor(&skill_infos[i].ammo_factor, info->ammo_factor);
@@ -171,11 +172,18 @@ void dsda_CopySkillInfo(int i, const doom_mapinfo_skill_t* info) {
 void dsda_InitSkills(void) {
   int i = 0;
   int j;
+  int original_skills;
   dboolean clear_skills;
 
+  // Check for new skills
+  dsda_CheckCustomSkill();
+
   clear_skills = (doom_mapinfo.num_skills && doom_mapinfo.skills_cleared);
 
-  num_skills = (clear_skills ? 0 : 5) + doom_mapinfo.num_skills;
+  num_skills = (clear_skills ? 0 : 5) + (int)doom_mapinfo.num_skills + customskill;
+  num_og_skills = num_skills - customskill;
+
+  original_skills = 5;
 
   skill_infos = Z_Calloc(num_skills, sizeof(*skill_infos));
 
@@ -186,7 +194,7 @@ void dsda_InitSkills(void) {
                            heretic ? heretic_skill_infos :
                                      doom_skill_infos;
 
-    for (i = 0; i < 5; ++i)
+    for (i = 0; i < original_skills; ++i)
       skill_infos[i] = original_skill_infos[i];
   }
 
@@ -221,6 +229,87 @@ void dsda_InitSkills(void) {
   }
 }
 
+/////////////////////////////////////////
+//
+// Add Custom Skill Properties
+//
+//
+
+// Custom Skill variables
+int cskill_spawn_filter;
+int cskill_ammo_factor;
+int cskill_damage_factor;
+int cskill_armor_factor;
+int cskill_health_factor;
+int cskill_monster_hp_factor;
+int cskill_friend_hp_factor;
+int cskill_respawn;
+int cskill_respawn_time;
+int cskill_coop_spawns;
+int cskill_no_monsters;
+int cskill_fast_monsters;
+int cskill_aggressive;
+int cskill_no_pain;
+int cskill_easy_brain;
+int cskill_auto_use_hp;
+
+static int dsda_GetCustomSpawnFilter(int config) {
+  switch (config)
+  {
+    case 0: return 1; // if "easy",   skill 1
+    case 1: return 3; // if "medium", skill 3
+    case 2: return 4; // if "hard",   skill 4
+    default: return false;
+  }
+}
+
+static int dsda_GetCustomFactor(int config) {
+  switch (config)
+  {
+    case 0: return FRACUNIT / 2;      // Half
+    case 1: return FRACUNIT;          // Default
+    case 2: return FRACUNIT * 3 / 2;  // 1.5x - Raven games use this
+    case 3: return FRACUNIT * 2;      // Double
+    case 4: return FRACUNIT * 4;      // Quad
+    default: return false;
+  }
+}
+
+void dsda_UpdateCustomSkill(int custom_skill_num) {
+  // Add label for skill cheat
+  skill_infos[custom_skill_num].name = "Custom Skill";
+
+  // Reset custom skill properties
+  skill_infos[custom_skill_num].flags = 0;
+  skill_infos[custom_skill_num].respawn_time = 0;
+
+  // Get spawn filter value
+  skill_infos[custom_skill_num].spawn_filter = dsda_GetCustomSpawnFilter(cskill_spawn_filter);;
+
+  // Get multiplier factors
+  skill_infos[custom_skill_num].ammo_factor             = dsda_GetCustomFactor(cskill_ammo_factor);
+  skill_infos[custom_skill_num].damage_factor           = dsda_GetCustomFactor(cskill_damage_factor);
+  skill_infos[custom_skill_num].armor_factor            = dsda_GetCustomFactor(cskill_armor_factor);
+  skill_infos[custom_skill_num].health_factor           = dsda_GetCustomFactor(cskill_health_factor);
+  skill_infos[custom_skill_num].monster_health_factor   = dsda_GetCustomFactor(cskill_monster_hp_factor);
+  skill_infos[custom_skill_num].friend_health_factor    = dsda_GetCustomFactor(cskill_friend_hp_factor);
+
+  // Get respawn time (if respawn is enabled)
+  if (cskill_respawn) skill_infos[custom_skill_num].respawn_time = cskill_respawn_time;
+
+  // Add remaining flags
+  if (cskill_coop_spawns)            skill_infos[custom_skill_num].flags |= SI_SPAWN_MULTI;
+  if (cskill_no_monsters)            skill_infos[custom_skill_num].flags |= SI_NO_MONSTERS;
+  if (cskill_fast_monsters)          skill_infos[custom_skill_num].flags |= SI_FAST_MONSTERS;
+  if (cskill_aggressive)             skill_infos[custom_skill_num].flags |= SI_INSTANT_REACTION;
+  if (cskill_no_pain)                skill_infos[custom_skill_num].flags |= SI_NO_PAIN;
+  if (cskill_easy_brain && !raven)   skill_infos[custom_skill_num].flags |= SI_EASY_BOSS_BRAIN;
+  if (cskill_auto_use_hp && raven)   skill_infos[custom_skill_num].flags |= SI_AUTO_USE_HEALTH;
+
+  // Update the skill
+  dsda_UpdateGameSkill(custom_skill_num);
+}
+
 // At startup, set-up temp game modifier configs based off args / persistent cfgs
 // Only set once, as modifiers can break away from args
 //
@@ -315,3 +404,13 @@ void dsda_AlterGameFlags(void)
 
   dsda_RefreshGameSkill();
 }
+
+void dsda_CheckCustomSkill(void) {
+  //if (started_demo)
+    //return;
+
+  if (!allow_incompatibility || netgame)
+    return;
+
+  customskill = true;
+}

prboom2/src/dsda/skill_info.h

@@ -33,6 +33,24 @@
 #define SI_AUTO_USE_HEALTH  0x0400
 #define SI_NO_MONSTERS      0x1000
 
+// Custom Skill variables
+extern int cskill_spawn_filter;
+extern int cskill_ammo_factor;
+extern int cskill_damage_factor;
+extern int cskill_armor_factor;
+extern int cskill_health_factor;
+extern int cskill_monster_hp_factor;
+extern int cskill_friend_hp_factor;
+extern int cskill_respawn;
+extern int cskill_respawn_time;
+extern int cskill_coop_spawns;
+extern int cskill_no_monsters;
+extern int cskill_fast_monsters;
+extern int cskill_aggressive;
+extern int cskill_no_pain;
+extern int cskill_easy_brain;
+extern int cskill_auto_use_hp;
+
 typedef uint16_t skill_info_flags_t;
 
 typedef struct {
@@ -56,10 +74,14 @@ extern skill_info_t skill_info;
 extern skill_info_t *skill_infos;
 
 extern int num_skills;
+extern int num_og_skills;
 
 void dsda_InitSkills(void);
 void dsda_RefreshGameSkill(void);
 void dsda_UpdateGameSkill(int skill);
+void dsda_UpdateCustomSkill(int custom_skill);
+void dsda_CheckCustomSkill(void);
+
 void dsda_AlterGameFlags(void);
 void dsda_InitGameModifiers(void);
 void dsda_ResetGameModifiers(void);

prboom2/src/dsda/wad_stats.c

@@ -268,19 +268,23 @@ void dsda_WadStatsExitMap(int missed_monsters) {
   int skill;
   int nightmare_skill;
   int best_normal_skill;
+  int extra_skill;
   int nomo_flag;
+  int skip_stats;
 
   if (!current_map_stats || demoplayback)
     return;
 
-  nightmare_skill = num_skills;
-  best_normal_skill = num_skills - 1;   
+  skill = gameskill + 1;
+  nightmare_skill = num_og_skills;
+  best_normal_skill = num_og_skills - 1;
+  extra_skill = skill > num_og_skills;
 
   // Get conditions for recording wad stats
   nomo_flag = skill_info.flags & SI_NO_MONSTERS;
+  skip_stats = extra_skill || nomo_flag;
 
-  if (!nomo_flag) {
-    skill = gameskill + 1;
+  if (!skip_stats) {
     if (skill > current_map_stats->best_skill) {
       if (current_map_stats->best_skill < best_normal_skill) {
         current_map_stats->best_time = -1;