From 883f3dcf6e7d9010856f0d4e46223fdebb245f11 Mon Sep 17 00:00:00 2001
From: gbMichelle <gbmichelle.dev@gmail.com>
Date: Thu, 21 May 2020 18:07:59 +0200
Subject: [PATCH] Add mcc_actor_type to actor_variant to support MCC scoring

---
 CHANGELOG.MD               |  4 ++++
 reclaimer/__init__.py      |  4 ++--
 reclaimer/enums.py         | 47 ++++++++++++++++++++++++++++++++++++++
 reclaimer/hek/defs/actv.py |  4 +++-
 4 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index ba47ce34..c59bbad7 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.9.3]
+### Changed
+ - Add actor type to actor_variant to support MCC scoring.
+
 ## [2.9.2]
 ### Changed
  - Make GbxModel markers local when extracting. (Does not affect Xbox Models)
diff --git a/reclaimer/__init__.py b/reclaimer/__init__.py
index 055f66da..0f783f9e 100644
--- a/reclaimer/__init__.py
+++ b/reclaimer/__init__.py
@@ -12,8 +12,8 @@
 # ##############
 __author__ = "Sigmmma"
 #           YYYY.MM.DD
-__date__ = "2020.05.21"
-__version__ = (2, 9, 2)
+__date__ = "2020.05.22"
+__version__ = (2, 9, 3)
 __website__ = "https://github.com/Sigmmma/reclaimer"
 __all__ = (
     "animation", "bitmaps", "h2", "h3", "halo_script", "hek", "meta", "misc",
diff --git a/reclaimer/enums.py b/reclaimer/enums.py
index a45b89fc..eda27995 100644
--- a/reclaimer/enums.py
+++ b/reclaimer/enums.py
@@ -1227,6 +1227,53 @@ def TEST_PRINT_HSC_BUILT_IN_FUNCTIONS():
     'throw-overheated', 'overheating', 'overheating-again',
     'enter', 'exit-empty', 'exit-full', 'o-h-exit', 'o-h-s-enter'
     )
+mcc_actor_types = ( # Used to determine score for killing different actor types.
+    "brute",
+    "grunt",
+    "jackal",
+    "skirmisher",
+    "marine",
+    "spartan",
+    "drone",
+    "hunter",
+    "flood infection",
+    "flood carrier",
+    "flood combat",
+    "flood pure",
+    "sentinel",
+    "elite",
+    "huragok",
+    "mule",
+    "turret",
+    "mongoose",
+    "warthog",
+    "scorpion",
+    "hornet",
+    "pelican",
+    "revenant",
+    "seraph",
+    "shade",
+    "watchtower",
+    "ghost",
+    "chopper",
+    "prowler",
+    "wraith",
+    "banshee",
+    "phantom",
+    "scarab",
+    "guntower",
+    "spirit",
+    "broadsword",
+    "mammoth",
+    "lich",
+    "mantis",
+    "wasp",
+    "phaeton",
+    "watcher",
+    "knight",
+    "crawler"
+    )
+
 unit_damage_animation_names = []
 for typ in ("s-ping", "h-ping", "s-kill", "h-kill"):
     for side in ("front", "left", "right", "back"):
diff --git a/reclaimer/hek/defs/actv.py b/reclaimer/hek/defs/actv.py
index 3638ced7..08f4beee 100644
--- a/reclaimer/hek/defs/actv.py
+++ b/reclaimer/hek/defs/actv.py
@@ -31,10 +31,12 @@
     dependency("actor_definition", "actr"),
     dependency("unit", valid_units),
     dependency("major_variant", "actv"),
+    SEnum16("mcc_actor_type", TOOLTIP="Used to determine score in MCC", *mcc_actor_types),
+
 
     #Movement switching
     Struct("movement_switching",
-        Pad(24),
+        Pad(22),
         SEnum16("movement_type",
             "always_run",
             "always_crouch",