-
Notifications
You must be signed in to change notification settings - Fork 241
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The Big Ol' Trait Organization (#2982)
* The Big Ol' Trait Organization * cleanups, gonna try to comment out unused traits later * alright lessgo * weh * fix script error * Wow, somehow I got this done. * I'l prolly port the rest later, this is enough for now i think * remove txt file i was using to help comment out unused traits * get rid of MAD_WIZARD_TRAIT * wew thats a bug! * improve VV modify traits by A LOT * some formatting/alignment
- Loading branch information
Showing
36 changed files
with
2,017 additions
and
956 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| #define SIGNAL_ADDTRAIT(trait_ref) "addtrait [trait_ref]" | ||
| #define SIGNAL_REMOVETRAIT(trait_ref) "removetrait [trait_ref]" | ||
|
|
||
| // trait accessor defines | ||
| #define ADD_TRAIT(target, trait, source) \ | ||
| do { \ | ||
| var/list/_L; \ | ||
| if (!target._status_traits) { \ | ||
| target._status_traits = list(); \ | ||
| _L = target._status_traits; \ | ||
| _L[trait] = list(source); \ | ||
| SEND_SIGNAL(target, SIGNAL_ADDTRAIT(trait), trait); \ | ||
| } else { \ | ||
| _L = target._status_traits; \ | ||
| if (_L[trait]) { \ | ||
| _L[trait] |= list(source); \ | ||
| } else { \ | ||
| _L[trait] = list(source); \ | ||
| SEND_SIGNAL(target, SIGNAL_ADDTRAIT(trait), trait); \ | ||
| } \ | ||
| } \ | ||
| } while (0) | ||
| #define REMOVE_TRAIT(target, trait, sources) \ | ||
| do { \ | ||
| var/list/_L = target._status_traits; \ | ||
| var/list/_S; \ | ||
| if (sources && !islist(sources)) { \ | ||
| _S = list(sources); \ | ||
| } else { \ | ||
| _S = sources\ | ||
| }; \ | ||
| if (_L?[trait]) { \ | ||
| for (var/_T in _L[trait]) { \ | ||
| if ((!_S && (_T != ROUNDSTART_TRAIT)) || (_T in _S)) { \ | ||
| _L[trait] -= _T \ | ||
| } \ | ||
| };\ | ||
| if (!length(_L[trait])) { \ | ||
| _L -= trait; \ | ||
| SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(trait), trait); \ | ||
| }; \ | ||
| if (!length(_L)) { \ | ||
| target._status_traits = null \ | ||
| }; \ | ||
| } \ | ||
| } while (0) | ||
| #define REMOVE_TRAIT_NOT_FROM(target, trait, sources) \ | ||
| do { \ | ||
| var/list/_traits_list = target._status_traits; \ | ||
| var/list/_sources_list; \ | ||
| if (sources && !islist(sources)) { \ | ||
| _sources_list = list(sources); \ | ||
| } else { \ | ||
| _sources_list = sources\ | ||
| }; \ | ||
| if (_traits_list?[trait]) { \ | ||
| for (var/_trait_source in _traits_list[trait]) { \ | ||
| if (!(_trait_source in _sources_list)) { \ | ||
| _traits_list[trait] -= _trait_source \ | ||
| } \ | ||
| };\ | ||
| if (!length(_traits_list[trait])) { \ | ||
| _traits_list -= trait; \ | ||
| SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(trait), trait); \ | ||
| }; \ | ||
| if (!length(_traits_list)) { \ | ||
| target._status_traits = null \ | ||
| }; \ | ||
| } \ | ||
| } while (0) | ||
| #define REMOVE_TRAITS_NOT_IN(target, sources) \ | ||
| do { \ | ||
| var/list/_L = target._status_traits; \ | ||
| var/list/_S = sources; \ | ||
| if (_L) { \ | ||
| for (var/_T in _L) { \ | ||
| _L[_T] &= _S;\ | ||
| if (!length(_L[_T])) { \ | ||
| _L -= _T; \ | ||
| SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(_T), _T); \ | ||
| }; \ | ||
| };\ | ||
| if (!length(_L)) { \ | ||
| target._status_traits = null\ | ||
| };\ | ||
| }\ | ||
| } while (0) | ||
|
|
||
| #define REMOVE_TRAITS_IN(target, sources) \ | ||
| do { \ | ||
| var/list/_L = target._status_traits; \ | ||
| var/list/_S = sources; \ | ||
| if (sources && !islist(sources)) { \ | ||
| _S = list(sources); \ | ||
| } else { \ | ||
| _S = sources\ | ||
| }; \ | ||
| if (_L) { \ | ||
| for (var/_T in _L) { \ | ||
| _L[_T] -= _S;\ | ||
| if (!length(_L[_T])) { \ | ||
| _L -= _T; \ | ||
| SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(_T)); \ | ||
| }; \ | ||
| };\ | ||
| if (!length(_L)) { \ | ||
| target._status_traits = null\ | ||
| };\ | ||
| }\ | ||
| } while (0) | ||
|
|
||
| #define HAS_TRAIT(target, trait) (target._status_traits?[trait] ? TRUE : FALSE) | ||
| #define HAS_TRAIT_FROM(target, trait, source) (HAS_TRAIT(target, trait) && (source in target._status_traits[trait])) | ||
| #define HAS_TRAIT_FROM_ONLY(target, trait, source) (HAS_TRAIT(target, trait) && (source in target._status_traits[trait]) && (length(target._status_traits[trait]) == 1)) | ||
| #define HAS_TRAIT_NOT_FROM(target, trait, source) (HAS_TRAIT(target, trait) && (length(target._status_traits[trait] - source) > 0)) | ||
| /// Returns a list of trait sources for this trait. Only useful for wacko cases and internal futzing | ||
| /// You should not be using this | ||
| #define GET_TRAIT_SOURCES(target, trait) (target._status_traits?[trait] || list()) | ||
| /// Returns the amount of sources for a trait. useful if you don't want to have a "thing counter" stuck around all the time | ||
| #define COUNT_TRAIT_SOURCES(target, trait) length(GET_TRAIT_SOURCES(target, trait)) | ||
| /// A simple helper for checking traits in a mob's mind | ||
| #define HAS_MIND_TRAIT(target, trait) (HAS_TRAIT(target, trait) || (target.mind ? HAS_TRAIT(target.mind, trait) : FALSE)) |
Oops, something went wrong.