Make contest opponents an enum

I'm sure that at least 2 people eventually might consider editing them, this makes it easier.
This commit is contained in:
Jaizu
2023-02-03 15:49:22 +01:00
committed by GitHub
parent 62aed217fe
commit 717ba22ea1
+98 -96
View File
@@ -2,102 +2,104 @@
#include "global.h" #include "global.h"
#include "contest.h" #include "contest.h"
#define CONTEST_OPPONENT_JIMMY 0 enum {
#define CONTEST_OPPONENT_EDITH 1 CONTEST_OPPONENT_JIMMY,
#define CONTEST_OPPONENT_EVAN 2 CONTEST_OPPONENT_EDITH,
#define CONTEST_OPPONENT_KELSEY 3 CONTEST_OPPONENT_EVAN,
#define CONTEST_OPPONENT_MADISON 4 CONTEST_OPPONENT_KELSEY,
#define CONTEST_OPPONENT_RAYMOND 5 CONTEST_OPPONENT_MADISON,
#define CONTEST_OPPONENT_GRANT 6 CONTEST_OPPONENT_RAYMOND,
#define CONTEST_OPPONENT_PAIGE 7 CONTEST_OPPONENT_GRANT,
#define CONTEST_OPPONENT_ALEC 8 CONTEST_OPPONENT_PAIGE,
#define CONTEST_OPPONENT_SYDNEY 9 CONTEST_OPPONENT_ALEC,
#define CONTEST_OPPONENT_MORRIS 10 CONTEST_OPPONENT_SYDNEY,
#define CONTEST_OPPONENT_MARIAH 11 CONTEST_OPPONENT_MORRIS,
#define CONTEST_OPPONENT_RUSSELL 12 CONTEST_OPPONENT_MARIAH,
#define CONTEST_OPPONENT_MELANIE 13 CONTEST_OPPONENT_RUSSELL,
#define CONTEST_OPPONENT_CHANCE 14 CONTEST_OPPONENT_MELANIE,
#define CONTEST_OPPONENT_AGATHA 15 CONTEST_OPPONENT_CHANCE,
#define CONTEST_OPPONENT_BEAU 16 CONTEST_OPPONENT_AGATHA,
#define CONTEST_OPPONENT_KAY 17 CONTEST_OPPONENT_BEAU,
#define CONTEST_OPPONENT_CALE 18 CONTEST_OPPONENT_KAY,
#define CONTEST_OPPONENT_CAITLIN 19 CONTEST_OPPONENT_CALE,
#define CONTEST_OPPONENT_COLBY 20 CONTEST_OPPONENT_CAITLIN,
#define CONTEST_OPPONENT_KYLIE 21 CONTEST_OPPONENT_COLBY,
#define CONTEST_OPPONENT_LIAM 22 CONTEST_OPPONENT_KYLIE,
#define CONTEST_OPPONENT_MILO 23 CONTEST_OPPONENT_LIAM,
#define CONTEST_OPPONENT_KARINA 24 CONTEST_OPPONENT_MILO,
#define CONTEST_OPPONENT_BOBBY 25 CONTEST_OPPONENT_KARINA,
#define CONTEST_OPPONENT_CLAIRE 26 CONTEST_OPPONENT_BOBBY,
#define CONTEST_OPPONENT_WILLIE 27 CONTEST_OPPONENT_CLAIRE,
#define CONTEST_OPPONENT_CASSIDY 28 CONTEST_OPPONENT_WILLIE,
#define CONTEST_OPPONENT_MORGAN 29 CONTEST_OPPONENT_CASSIDY,
#define CONTEST_OPPONENT_SUMMER 30 CONTEST_OPPONENT_MORGAN,
#define CONTEST_OPPONENT_MILES 31 CONTEST_OPPONENT_SUMMER,
#define CONTEST_OPPONENT_AUDREY 32 CONTEST_OPPONENT_MILES,
#define CONTEST_OPPONENT_AVERY 33 CONTEST_OPPONENT_AUDREY,
#define CONTEST_OPPONENT_ARIANA 34 CONTEST_OPPONENT_AVERY,
#define CONTEST_OPPONENT_ASHTON 35 CONTEST_OPPONENT_ARIANA,
#define CONTEST_OPPONENT_SANDRA 36 CONTEST_OPPONENT_ASHTON,
#define CONTEST_OPPONENT_CARSON 37 CONTEST_OPPONENT_SANDRA,
#define CONTEST_OPPONENT_KATRINA 38 CONTEST_OPPONENT_CARSON,
#define CONTEST_OPPONENT_LUKE 39 CONTEST_OPPONENT_KATRINA,
#define CONTEST_OPPONENT_RAUL 40 CONTEST_OPPONENT_LUKE,
#define CONTEST_OPPONENT_JADA 41 CONTEST_OPPONENT_RAUL,
#define CONTEST_OPPONENT_ZEEK 42 CONTEST_OPPONENT_JADA,
#define CONTEST_OPPONENT_DIEGO 43 CONTEST_OPPONENT_ZEEK,
#define CONTEST_OPPONENT_ALIYAH 44 CONTEST_OPPONENT_DIEGO,
#define CONTEST_OPPONENT_NATALIA 45 CONTEST_OPPONENT_ALIYAH,
#define CONTEST_OPPONENT_DEVIN 46 CONTEST_OPPONENT_NATALIA,
#define CONTEST_OPPONENT_TYLOR 47 CONTEST_OPPONENT_DEVIN,
#define CONTEST_OPPONENT_RONNIE 48 CONTEST_OPPONENT_TYLOR,
#define CONTEST_OPPONENT_CLAUDIA 49 CONTEST_OPPONENT_RONNIE,
#define CONTEST_OPPONENT_ELIAS 50 CONTEST_OPPONENT_CLAUDIA,
#define CONTEST_OPPONENT_JADE 51 CONTEST_OPPONENT_ELIAS,
#define CONTEST_OPPONENT_FRANCIS 52 CONTEST_OPPONENT_JADE,
#define CONTEST_OPPONENT_ALISHA 53 CONTEST_OPPONENT_FRANCIS,
#define CONTEST_OPPONENT_SAUL 54 CONTEST_OPPONENT_ALISHA,
#define CONTEST_OPPONENT_FELICIA 55 CONTEST_OPPONENT_SAUL,
#define CONTEST_OPPONENT_EMILIO 56 CONTEST_OPPONENT_FELICIA,
#define CONTEST_OPPONENT_KARLA 57 CONTEST_OPPONENT_EMILIO,
#define CONTEST_OPPONENT_DARRYL 58 CONTEST_OPPONENT_KARLA,
#define CONTEST_OPPONENT_SELENA 59 CONTEST_OPPONENT_DARRYL,
#define CONTEST_OPPONENT_NOEL 60 CONTEST_OPPONENT_SELENA,
#define CONTEST_OPPONENT_LACEY 61 CONTEST_OPPONENT_NOEL,
#define CONTEST_OPPONENT_CORBIN 62 CONTEST_OPPONENT_LACEY,
#define CONTEST_OPPONENT_GRACIE 63 CONTEST_OPPONENT_CORBIN,
#define CONTEST_OPPONENT_COLTIN 64 CONTEST_OPPONENT_GRACIE,
#define CONTEST_OPPONENT_ELLIE 65 CONTEST_OPPONENT_COLTIN,
#define CONTEST_OPPONENT_MARCUS 66 CONTEST_OPPONENT_ELLIE,
#define CONTEST_OPPONENT_KIARA 67 CONTEST_OPPONENT_MARCUS,
#define CONTEST_OPPONENT_BRYCE 68 CONTEST_OPPONENT_KIARA,
#define CONTEST_OPPONENT_JAMIE 69 CONTEST_OPPONENT_BRYCE,
#define CONTEST_OPPONENT_JORGE 70 CONTEST_OPPONENT_JAMIE,
#define CONTEST_OPPONENT_DEVON 71 CONTEST_OPPONENT_JORGE,
#define CONTEST_OPPONENT_JUSTINA 72 CONTEST_OPPONENT_DEVON,
#define CONTEST_OPPONENT_RALPH 73 CONTEST_OPPONENT_JUSTINA,
#define CONTEST_OPPONENT_ROSA 74 CONTEST_OPPONENT_RALPH,
#define CONTEST_OPPONENT_KEATON 75 CONTEST_OPPONENT_ROSA,
#define CONTEST_OPPONENT_MAYRA 76 CONTEST_OPPONENT_KEATON,
#define CONTEST_OPPONENT_LAMAR 77 CONTEST_OPPONENT_MAYRA,
#define CONTEST_OPPONENT_AUBREY 78 CONTEST_OPPONENT_LAMAR,
#define CONTEST_OPPONENT_NIGEL 79 CONTEST_OPPONENT_AUBREY,
#define CONTEST_OPPONENT_CAMILLE 80 CONTEST_OPPONENT_NIGEL,
#define CONTEST_OPPONENT_DEON 81 CONTEST_OPPONENT_CAMILLE,
#define CONTEST_OPPONENT_JANELLE 82 CONTEST_OPPONENT_DEON,
#define CONTEST_OPPONENT_HEATH 83 CONTEST_OPPONENT_JANELLE,
#define CONTEST_OPPONENT_SASHA 84 CONTEST_OPPONENT_HEATH,
#define CONTEST_OPPONENT_FRANKIE 85 CONTEST_OPPONENT_SASHA,
#define CONTEST_OPPONENT_HELEN 86 CONTEST_OPPONENT_FRANKIE,
#define CONTEST_OPPONENT_CAMILE 87 CONTEST_OPPONENT_HELEN,
#define CONTEST_OPPONENT_MARTIN 88 CONTEST_OPPONENT_CAMILE,
#define CONTEST_OPPONENT_SERGIO 89 CONTEST_OPPONENT_MARTIN,
#define CONTEST_OPPONENT_KAILEY 90 CONTEST_OPPONENT_SERGIO,
#define CONTEST_OPPONENT_PERLA 91 CONTEST_OPPONENT_KAILEY,
#define CONTEST_OPPONENT_CLARA 92 CONTEST_OPPONENT_PERLA,
#define CONTEST_OPPONENT_JAKOB 93 CONTEST_OPPONENT_CLARA,
#define CONTEST_OPPONENT_TREY 94 CONTEST_OPPONENT_JAKOB,
#define CONTEST_OPPONENT_LANE 95 CONTEST_OPPONENT_TREY,
CONTEST_OPPONENT_LANE
};
// All contest opponents have a common set of AI flags (which contains all of the actually // All contest opponents have a common set of AI flags (which contains all of the actually
// useful AI scripts, as well as some dummys) and a random combination of 2-3 dummy flags. // useful AI scripts, as well as some dummys) and a random combination of 2-3 dummy flags.