From bbfe5ecb9075e8acc620089fb1b290a21e6e200f Mon Sep 17 00:00:00 2001 From: Mr_DarkBladeS <48252701+MysticalFaceLesS@users.noreply.github.com> Date: Wed, 11 Sep 2024 22:18:35 +0300 Subject: [PATCH] HotFix: Factions list --- code/__DEFINES/factions.dm | 74 ++++++++++++++-------------- code/__DEFINES/~mod_celadon/names.dm | 26 ++++++++++ code/__HELPERS/names.dm | 50 ------------------- 3 files changed, 64 insertions(+), 86 deletions(-) diff --git a/code/__DEFINES/factions.dm b/code/__DEFINES/factions.dm index 67ce47e166fc..f35c50727fb8 100644 --- a/code/__DEFINES/factions.dm +++ b/code/__DEFINES/factions.dm @@ -4,41 +4,43 @@ #define FACTION_ANTAG_FRONTIERSMEN "Frontiersmen" //Player Factions -#define FACTION_PLAYER_SYNDICATE "playerSyndicate" -#define FACTION_PLAYER_NANOTRASEN "playerNanotrasen" -#define FACTION_PLAYER_FRONTIERSMEN "playerFrontiersmen" -#define FACTION_PLAYER_MINUTEMAN "playerMinuteman" -#define FACTION_PLAYER_SOLGOV "playerSolgov" -#define FACTION_PLAYER_INTEQ "playerInteq" -#define FACTION_PLAYER_ROUMAIN "playerRoumain" -#define FACTION_PLAYER_GEZENA "playerGezena" +// [CELADON-REMOVE] - PREFIXES - (Перемещено в code/__DEFINES/~mod_celadon/prefixes.dm) +// #define FACTION_PLAYER_SYNDICATE "playerSyndicate" +// #define FACTION_PLAYER_NANOTRASEN "playerNanotrasen" +// #define FACTION_PLAYER_FRONTIERSMEN "playerFrontiersmen" +// #define FACTION_PLAYER_MINUTEMAN "playerMinuteman" +// #define FACTION_PLAYER_SOLGOV "playerSolgov" +// #define FACTION_PLAYER_INTEQ "playerInteq" +// #define FACTION_PLAYER_ROUMAIN "playerRoumain" +// #define FACTION_PLAYER_GEZENA "playerGezena" -#define FACTION_SYNDICATE "Syndicate" - #define FACTION_NGR "New Gorlex Republic" - #define FACTION_CYBERSUN "CyberSun" - #define FACTION_SUNS "Student-Union of Naturalistic Sciences" -#define FACTION_SOLGOV "SolGov" -#define FACTION_SRM "Saint-Roumain Militia" -#define FACTION_INTEQ "Inteq Risk Management Group" -#define FACTION_CLIP "CLIP Minutemen" -#define FACTION_NT "Nanotrasen" - #define FACTION_NS_LOGI "N+S Logistics" - #define FACTION_VIGILITAS "Vigilitas Interstellar" -#define FACTION_FRONTIER "Frontiersmen Fleet" -#define FACTION_PGF "Pan-Gezenan Federation" -#define FACTION_INDEPENDENT "Independent" +// #define FACTION_SYNDICATE "Syndicate" +// #define FACTION_NGR "New Gorlex Republic" +// #define FACTION_CYBERSUN "CyberSun" +// #define FACTION_SUNS "Student-Union of Naturalistic Sciences" +// #define FACTION_SOLGOV "SolGov" +// #define FACTION_SRM "Saint-Roumain Militia" +// #define FACTION_INTEQ "Inteq Risk Management Group" +// #define FACTION_CLIP "CLIP Minutemen" +// #define FACTION_NT "Nanotrasen" +// #define FACTION_NS_LOGI "N+S Logistics" +// #define FACTION_VIGILITAS "Vigilitas Interstellar" +// #define FACTION_FRONTIER "Frontiersmen Fleet" +// #define FACTION_PGF "Pan-Gezenan Federation" +// #define FACTION_INDEPENDENT "Independent" -#define PREFIX_SYNDICATE list("SEV", "SSV") - #define PREFIX_NGR list("NGRV") - #define PREFIX_CYBERSUN list("CSSV") - #define PREFIX_SUNS list("SUNS") -#define PREFIX_SOLGOV list("SCSV") -#define PREFIX_SRM list("SRSV") -#define PREFIX_INTEQ list("IRMV") -#define PREFIX_CLIP list("CMSV", "CMGSV") -#define PREFIX_NT list("NTSV") - #define PREFIX_NS_LOGI list("NSSV") - #define PREFIX_VIGILITAS list("VISV") -#define PREFIX_FRONTIER list("FFV") -#define PREFIX_PGF list("PGF", "PGFMC", "PGFN") -#define PREFIX_INDEPENDENT list("SV", "IMV", "ISV") +// #define PREFIX_SYNDICATE list("SEV", "SSV") +// #define PREFIX_NGR list("NGRV") +// #define PREFIX_CYBERSUN list("CSSV") +// #define PREFIX_SUNS list("SUNS") +// #define PREFIX_SOLGOV list("SCSV") +// #define PREFIX_SRM list("SRSV") +// #define PREFIX_INTEQ list("IRMV") +// #define PREFIX_CLIP list("CMSV", "CMGSV") +// #define PREFIX_NT list("NTSV") +// #define PREFIX_NS_LOGI list("NSSV") +// #define PREFIX_VIGILITAS list("VISV") +// #define PREFIX_FRONTIER list("FFV") +// #define PREFIX_PGF list("PGF", "PGFMC", "PGFN") +// #define PREFIX_INDEPENDENT list("SV", "IMV", "ISV") +// [CELADON-REMOVE] diff --git a/code/__DEFINES/~mod_celadon/names.dm b/code/__DEFINES/~mod_celadon/names.dm index 46de08829497..d0d862e6dc45 100644 --- a/code/__DEFINES/~mod_celadon/names.dm +++ b/code/__DEFINES/~mod_celadon/names.dm @@ -8,6 +8,26 @@ #define FACTION_EVENT "Event" #define FACTION_PIRATES "Pirates" +#define FACTION_NGR "New Gorlex Republic" +#define FACTION_CYBERSUN "CyberSun" +#define FACTION_SUNS "Student-Union of Naturalistic Sciences" +#define FACTION_SRM "Saint-Roumain Militia" +#define FACTION_CLIP "CLIP Minutemen" +#define FACTION_NS_LOGI "N+S Logistics" +#define FACTION_VIGILITAS "Vigilitas Interstellar" +#define FACTION_FRONTIER "Frontiersmen Fleet" +#define FACTION_PGF "Pan-Gezenan Federation" + +#define FACTION_PLAYER_SYNDICATE "playerSyndicate" +#define FACTION_PLAYER_NANOTRASEN "playerNanotrasen" +#define FACTION_PLAYER_FRONTIERSMEN "playerFrontiersmen" +#define FACTION_PLAYER_MINUTEMAN "playerMinuteman" +#define FACTION_PLAYER_SOLGOV "playerSolgov" +#define FACTION_PLAYER_INTEQ "playerInteq" +#define FACTION_PLAYER_ROUMAIN "playerRoumain" +#define FACTION_PLAYER_GEZENA "playerGezena" + +#define PREFIX_SRM list("SRSV") #define PREFIX_SYNDICATE list("SEV", "SSV", "SMMV", "PCAC", "SSASV", "SSSV", "SOSSV", "TSSV", "SABSV", "BSSV", "ASSV", "MSSV", "LSSV", "DSSV") #define PREFIX_SOLGOV list("SFSV", "BSFSV", "ASFSV", "SSFSV", "MDSFSV", "LSFSV", "MSFSV", "SPSFSV") #define PREFIX_INTEQ list("IRMV", "IQMSSV", "BIQSV", "LIQSV", "SPIQSV") @@ -17,6 +37,12 @@ #define PREFIX_PIRATES list("PIRATE") #define PREFIX_EVENT list("CLO") +#define PREFIX_NGR list("NGRV") +#define PREFIX_CYBERSUN list("CSSV") +#define PREFIX_SUNS list("SUNS") +#define PREFIX_CLIP list("CMSV", "CMGSV") +#define PREFIX_PGF list("PGF", "PGFMC", "PGFN") + GLOBAL_LIST_INIT(ship_faction_to_prefixes, list( FACTION_SYNDICATE = PREFIX_SYNDICATE, FACTION_SOLGOV = PREFIX_SOLGOV, diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 392488c4d095..65551e448d17 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -234,56 +234,6 @@ GLOBAL_DATUM(syndicate_code_response_regex, /regex) else . += ", " -// [CELADON-REMOVE] - PREFIXES - (Перемещено в code/__DEFINES/~mod_celadon/prefixes.dm) -// #define FACTION_SYNDICATE "Syndicate" -// #define FACTION_NGR "New Gorlex Republic" -// #define FACTION_CYBERSUN "CyberSun" -// #define FACTION_SUNS "Student-Union of Naturalistic Sciences" -// #define FACTION_SOLGOV "SolGov" -// #define FACTION_SRM "Saint-Roumain Militia" -// #define FACTION_INTEQ "Inteq Risk Management Group" -// #define FACTION_CLIP "CLIP Minutemen" -// #define FACTION_NT "Nanotrasen" -// #define FACTION_NS_LOGI "N+S Logistics" -// #define FACTION_VIGILITAS "Vigilitas Interstellar" -// #define FACTION_FRONTIER "Frontiersmen Fleet" -// #define FACTION_PGF "Pan-Gezenan Federation" -// #define FACTION_INDEPENDENT "Independent" - -// #define PREFIX_SYNDICATE list("SEV", "SSV") -// #define PREFIX_NGR list("NGRV") -// #define PREFIX_CYBERSUN list("CSSV") -// #define PREFIX_SUNS list("SUNS") -// #define PREFIX_SOLGOV list("SCSV") -// #define PREFIX_SRM list("SRSV") -// #define PREFIX_INTEQ list("IRMV") -// #define PREFIX_CLIP list("CMSV", "CMGSV") -// #define PREFIX_NT list("NTSV") -// #define PREFIX_NS_LOGI list("NSSV") -// #define PREFIX_VIGILITAS list("VISV") -// #define PREFIX_FRONTIER list("FFV") -// #define PREFIX_PGF list("PGF", "PGFMC", "PGFN") -// #define PREFIX_INDEPENDENT list("SV", "IMV", "ISV") - -/// List of all ship factions to their prefixes. -// GLOBAL_LIST_INIT(ship_faction_to_prefixes, list( -// FACTION_SYNDICATE = PREFIX_SYNDICATE, -// FACTION_NGR = PREFIX_NGR, -// FACTION_CYBERSUN = PREFIX_CYBERSUN, -// FACTION_SUNS = PREFIX_SUNS, -// FACTION_SOLGOV = PREFIX_SOLGOV, -// FACTION_SRM = PREFIX_SRM, -// FACTION_INTEQ = PREFIX_INTEQ, -// FACTION_CLIP = PREFIX_CLIP, -// FACTION_NT = PREFIX_NT, -// FACTION_NS_LOGI = PREFIX_NS_LOGI, -// FACTION_VIGILITAS = PREFIX_VIGILITAS, -// FACTION_FRONTIER = PREFIX_FRONTIER, -// FACTION_PGF = PREFIX_PGF, -// FACTION_INDEPENDENT = PREFIX_INDEPENDENT -// )) -// [CELADON-REMOVE] - /proc/ship_prefix_to_faction(prefix) for(var/faction in GLOB.ship_faction_to_prefixes) if(prefix in GLOB.ship_faction_to_prefixes[faction])