Skip to content

Commit

Permalink
Add mcc_actor_type to actor_variant to support MCC scoring (#60)
Browse files Browse the repository at this point in the history
  • Loading branch information
ShellyHerself authored May 21, 2020
2 parents 4dbaef4 + 883f3dc commit 005f63b
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions reclaimer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
47 changes: 47 additions & 0 deletions reclaimer/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"):
Expand Down
4 changes: 3 additions & 1 deletion reclaimer/hek/defs/actv.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 005f63b

Please sign in to comment.