Compat SPE - Changes to #11188 #11205
Conversation
https://github.com/acemod/ACE3/blob/1e404cf85b2af8ad575c5f053fe0205e9ffa2470/addons/repair/functions/fnc_isEngineer.sqf This function is public api, this here should be too
This reverts commit ed96e36.
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
- removed the collar-collar-sleeve variants - added 1x Sleeves only U_SPE_CSK_base,U_SPE_CSK_roll could work as sleeves only as well but uniform has colors (dirt, wear?)
| class ACEWARDROBE(base); | ||
| class ACEWARDROBE(base_U_sleeves_up); | ||
| class ACEWARDROBE(base_U_sleeves_down); | ||
| class ACEWARDROBE(base_U_gloves_on); | ||
| class ACEWARDROBE(base_U_gloves_off); | ||
| class ACEWARDROBE(base_H_goggles_on); | ||
| class ACEWARDROBE(base_H_goggles_off); | ||
| class ACEWARDROBE(base_U_tie_on); | ||
| class ACEWARDROBE(base_U_tie_off); | ||
| class ACEWARDROBE(base_U_kneepads_on); | ||
| class ACEWARDROBE(base_U_kneepads_off); |
There was a problem hiding this comment.
Used macros wherever possible.
| // Helmet with normal strap and folded Strap | ||
| // Normal, Folded | ||
| // FR | ||
| BASE_PAIR(H_SPE_FR_Adrian,H_SPE_FR_Adrian_ns); |
There was a problem hiding this comment.
Removed helmet, as the decals were too different.
| BASE_PAIR(H_SPE_GER_Helmet_M40_lw_net_camo,H_SPE_GER_Helmet_M40_ns_lw_net_camo); | ||
| BASE_PAIR(H_SPE_GER_Helmet_M40_lw_camo,H_SPE_GER_Helmet_M40_ns_lw_camo); | ||
|
|
||
| BASE_PAIR(H_SPE_GER_HelmetCamo3,H_SPE_GER_HelmetCamo3_OS); |
There was a problem hiding this comment.
Removed several helmets, as the camouflage patterns are too different.
|
|
||
|
|
||
| // Headphones Up, Headphones Down | ||
| BASE_PAIR(H_SPE_GER_SPGPrivateCap,H_SPE_GER_SPGPrivateCap2); |
There was a problem hiding this comment.
TODO: Add more base actions to wardrobe for headphones on/off variants.
| components[] = { QUOTE(G_SPE_Dust_Goggles) }; | ||
| }; | ||
|
|
||
| BASE_PAIR(H_SPE_GER_HelmetUtility,H_SPE_GER_HelmetUtility_OS); |
There was a problem hiding this comment.
Added missing helmet.
| }; | ||
|
|
||
| // Common base class for uniforms with ties on/off variants | ||
| class GVAR(base_U_tie_on): GVAR(base) { |
There was a problem hiding this comment.
Used names more in line with existing (instead of 'with tie' went for 'tie on').
|
|
||
| // CfgWardrobe Macros | ||
| #define ACEWARDROBE(var) TRIPLES(ace,wardrobe,var) | ||
| #define ACEWARDROBE_CSTRING(var) QUOTE(TRIPLES($STR,DOUBLES(ace,wardrobe),var)) |
There was a problem hiding this comment.
Add macro for strings, so it can be used in any mod.
| directionalActionName = ACEWARDROBE_CSTRING(foliageAdd);\ | ||
| };\ | ||
| };\ | ||
| };\ | ||
| class HelmetScrim: ACEWARDROBE(base) {\ | ||
| class modifiableTo {\ | ||
| class HelmetBase {\ | ||
| directionalActionName = ACEWARDROBE_CSTRING(foliageRemove);\ |
There was a problem hiding this comment.
Localized interaction names.
There was a problem hiding this comment.
Sorted stringtable.
|
@johnb432 Is there anything else you need me to look at specificially? |
@OverlordZorn please take a look at the changes I've made to your PR. I can't select your branch to merge into, otherwise I would have.