Project

General

Profile

Feature #606 » 0066-Add-support-for-second-alternative-sound-tag-for-gov.patch

S3_2 - Marko Lindqvist, 05/13/2024 12:45 AM

View differences:

client/packhand.c
}
if (gov_change) {
audio_play_sound(pgov->sound_str, pgov->sound_alt, NULL);
audio_play_sound(pgov->sound_str, pgov->sound_alt, pgov->sound_alt2);
}
}
......
sz_strlcpy(gov->graphic_alt, p->graphic_alt);
sz_strlcpy(gov->sound_str, p->sound_str);
sz_strlcpy(gov->sound_alt, p->sound_alt);
sz_strlcpy(gov->sound_alt2, p->sound_alt2);
PACKET_STRVEC_EXTRACT(gov->helptext, p->helptext);
common/government.h
char graphic_alt[MAX_LEN_NAME];
char sound_str[MAX_LEN_NAME];
char sound_alt[MAX_LEN_NAME];
char sound_alt2[MAX_LEN_NAME];
struct requirement_vector reqs;
struct ruler_title_hash *ruler_titles;
int changed_to_times;
common/networking/packets.def
STRING graphic_alt[MAX_LEN_NAME];
STRING sound_str[MAX_LEN_NAME];
STRING sound_alt[MAX_LEN_NAME];
STRING sound_alt2[MAX_LEN_NAME];
STRVEC helptext[MAX_LEN_PACKET];
end
data/alien/governments.ruleset
; sound = Sound tag for the audio to play when palyer switch
; to government.
; sound_alt = Alternative sound tag, in case primary one is not found.
; sound_alt2 = Second alternative sound tag, in case neither primary tag
; nor the first alt tag is found.
; ai_better = AI will not consider this government for use if the
; government listed here is available
; ruler_male_title = The default male ruler title for the government type.
......
graphic_alt = "-"
sound = "g_anarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Usurper %s")
ruler_female_title = _("?female:Usurper %s")
......
graphic_alt = "-"
sound = "g_despotism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Leader %s")
ruler_female_title = _("?female:Leader %s")
......
graphic_alt = "-"
sound = "g_communism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Comrade %s")
ruler_female_title = _("?female:Comrade %s")
......
graphic_alt = "-"
sound = "g_democracy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("President %s")
ruler_female_title = _("?female:President %s")
......
graphic_alt = "gov.monarchy"
sound = "g_dual_communism"
sound_alt = "g_monarchy"
sound_alt2 = "-"
ruler_male_title = _("Comrade %s")
ruler_female_title = _("?female:Comrade %s")
......
graphic_alt = "gov.republic"
sound = "g_dual_democracy"
sound_alt = "g_republic"
sound_alt2 = "-"
ruler_male_title = _("President %s")
ruler_female_title = _("?female:President %s")
data/civ1/governments.ruleset
; sound = Sound tag for the audio to play when palyer switch
; to government.
; sound_alt = Alternative sound tag, in case primary one is not found.
; sound_alt2 = Second alternative sound tag, in case neither primary tag
; nor the first alt tag is found.
; ai_better = AI will not consider this government for use if the
; government listed here is available
; ruler_male_title = The default male ruler title for the government type.
......
graphic_alt = "-"
sound = "g_anarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Warlord %s")
ruler_female_title = _("Warlady %s")
......
graphic_alt = "-"
sound = "g_despotism"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Monarchy"
ruler_male_title = _("Chief %s")
......
graphic_alt = "-"
sound = "g_monarchy"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Communism"
ruler_male_title = _("King %s")
......
graphic_alt = "-"
sound = "g_communism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Comrade %s")
ruler_female_title = _("?female:Comrade %s")
......
graphic_alt = "-"
sound = "g_republic"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Consul %s")
ruler_female_title = _("?female:Consul %s")
......
graphic_alt = "-"
sound = "g_democracy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("President %s")
ruler_female_title = _("?female:President %s")
data/civ2/governments.ruleset
; sound = Sound tag for the audio to play when palyer switch
; to government.
; sound_alt = Alternative sound tag, in case primary one is not found.
; sound_alt2 = Second alternative sound tag, in case neither primary tag
; nor the first alt tag is found.
; ai_better = AI will not consider this government for use if the
; government listed here is available
; ruler_male_title = The default male ruler title for the government type.
......
graphic_alt = "-"
sound = "g_anarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Warlord %s")
ruler_female_title = _("Warlady %s")
......
graphic_alt = "-"
sound = "g_despotism"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Monarchy"
ruler_male_title = _("Chief %s")
......
graphic_alt = "-"
sound = "g_monarchy"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Communism"
ruler_male_title = _("King %s")
......
graphic_alt = "-"
sound = "g_communism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Comrade %s")
ruler_female_title = _("?female:Comrade %s")
......
graphic_alt = "-"
sound = "g_fundamentalism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("High Priest %s")
ruler_female_title = _("High Priestess %s")
......
graphic_alt = "-"
sound = "g_republic"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Consul %s")
ruler_female_title = _("?female:Consul %s")
......
graphic_alt = "-"
sound = "g_democracy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("President %s")
ruler_female_title = _("?female:President %s")
data/civ2civ3/governments.ruleset
; sound = Sound tag for the audio to play when palyer switch
; to government.
; sound_alt = Alternative sound tag, in case primary one is not found.
; sound_alt2 = Second alternative sound tag, in case neither primary tag
; nor the first alt tag is found.
; ai_better = AI will not consider this government for use if the
; government listed here is available
; ruler_male_title = The default male ruler title for the government type.
......
graphic_alt = "-"
sound = "g_anarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Warlord %s")
ruler_female_title = _("Warlady %s")
......
graphic_alt = "s.tax_luxury"
sound = "g_tribal"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Republic"
ruler_male_title = _("Warlord %s")
......
graphic_alt = "-"
sound = "g_despotism"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Monarchy"
ruler_male_title = _("Chief %s")
......
graphic_alt = "-"
sound = "g_monarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("King %s")
ruler_female_title = _("Queen %s")
......
graphic_alt = "-"
sound = "g_communism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Comrade %s")
ruler_female_title = _("?female:Comrade %s")
......
graphic_alt = "-"
sound = "g_fundamentalism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("High Priest %s")
ruler_female_title = _("High Priestess %s")
......
graphic_alt = "s.tax_gold"
sound = "g_federation"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Consul %s")
ruler_female_title = _("?female:Consul %s")
......
graphic_alt = "-"
sound = "g_republic"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("President %s")
ruler_female_title = _("?female:President %s")
......
graphic_alt = "-"
sound = "g_democracy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Prime Minister %s")
ruler_female_title = _("?female:Prime Minister %s")
data/classic/governments.ruleset
; sound = Sound tag for the audio to play when palyer switch
; to government.
; sound_alt = Alternative sound tag, in case primary one is not found.
; sound_alt2 = Second alternative sound tag, in case neither primary tag
; nor the first alt tag is found.
; ai_better = AI will not consider this government for use if the
; government listed here is available
; ruler_male_title = The default male ruler title for the government type.
......
graphic_alt = "-"
sound = "g_anarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Warlord %s")
ruler_female_title = _("Warlady %s")
......
graphic_alt = "-"
sound = "g_despotism"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Monarchy"
ruler_male_title = _("Chief %s")
......
graphic_alt = "-"
sound = "g_monarchy"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Communism"
ruler_male_title = _("King %s")
......
graphic_alt = "-"
sound = "g_communism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Comrade %s")
ruler_female_title = _("?female:Comrade %s")
......
graphic_alt = "-"
sound = "g_republic"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("President %s")
ruler_female_title = _("?female:President %s")
......
graphic_alt = "-"
sound = "g_democracy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Prime Minister %s")
ruler_female_title = _("?female:Prime Minister %s")
data/goldkeep/governments.ruleset
; sound = Sound tag for the audio to play when palyer switch
; to government.
; sound_alt = Alternative sound tag, in case primary one is not found.
; sound_alt2 = Second alternative sound tag, in case neither primary tag
; nor the first alt tag is found.
; ai_better = AI will not consider this government for use if the
; government listed here is available
; ruler_male_title = The default male ruler title for the government type.
......
graphic_alt = "-"
sound = "g_anarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Warlord %s")
ruler_female_title = _("Warlady %s")
......
graphic_alt = "-"
sound = "g_despotism"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Monarchy"
ruler_male_title = _("Chief %s")
......
graphic_alt = "-"
sound = "g_monarchy"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Communism"
ruler_male_title = _("King %s")
......
graphic_alt = "-"
sound = "g_communism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Comrade %s")
ruler_female_title = _("?female:Comrade %s")
......
graphic_alt = "-"
sound = "g_republic"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("President %s")
ruler_female_title = _("?female:President %s")
......
graphic_alt = "-"
sound = "g_democracy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Prime Minister %s")
ruler_female_title = _("?female:Prime Minister %s")
data/granularity/governments.ruleset
; sound = Sound tag for the audio to play when palyer switch
; to government.
; sound_alt = Alternative sound tag, in case primary one is not found.
; sound_alt2 = Second alternative sound tag, in case neither primary tag
; nor the first alt tag is found.
; ai_better = AI will not consider this government for use if the
; government listed here is available
; ruler_male_title = The default male ruler title for the government type.
......
graphic_alt = "-"
sound = "g_anarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Usurper %s")
ruler_female_title = _("?female:Usurper %s")
......
graphic_alt = "-"
sound = "g_tribal"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Warlord %s")
ruler_female_title = _("Warlady %s")
data/multiplayer/governments.ruleset
; sound = Sound tag for the audio to play when palyer switch
; to government.
; sound_alt = Alternative sound tag, in case primary one is not found.
; sound_alt2 = Second alternative sound tag, in case neither primary tag
; nor the first alt tag is found.
; ai_better = AI will not consider this government for use if the
; government listed here is available
; ruler_male_title = The default male ruler title for the government type.
......
graphic_alt = "-"
sound = "g_anarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Warlord %s")
ruler_female_title = _("Warlady %s")
......
graphic_alt = "-"
sound = "g_despotism"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Monarchy"
ruler_male_title = _("Chief %s")
......
graphic_alt = "-"
sound = "g_monarchy"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Communism"
ruler_male_title = _("King %s")
......
graphic_alt = "-"
sound = "g_communism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Comrade %s")
ruler_female_title = _("?female:Comrade %s")
......
graphic_alt = "-"
sound = "g_republic"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("President %s")
ruler_female_title = _("?female:President %s")
......
graphic_alt = "-"
sound = "g_democracy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Prime Minister %s")
ruler_female_title = _("?female:Prime Minister %s")
......
graphic_alt = "-"
sound = "g_fundamentalism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("High Priest %s")
ruler_female_title = _("High Priestess %s")
data/ruledit/comments-3.2.txt
; sound = Sound tag for the audio to play when palyer switch\n\
; to government.\n\
; sound_alt = Alternative sound tag, in case primary one is not found.\n\
; sound_alt2 = Second alternative sound tag, in case neither primary tag\n\
; nor the first alt tag is found.\n\
; ai_better = AI will not consider this government for use if the\n\
; government listed here is available\n\
; ruler_male_title = The default male ruler title for the government type.\n\
data/sandbox/governments.ruleset
; sound = Sound tag for the audio to play when palyer switch
; to government.
; sound_alt = Alternative sound tag, in case primary one is not found.
; sound_alt2 = Second alternative sound tag, in case neither primary tag
; nor the first alt tag is found.
; ai_better = AI will not consider this government for use if the
; government listed here is available
; ruler_male_title = The default male ruler title for the government type.
......
graphic_alt = "-"
sound = "g_anarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Warlord %s")
ruler_female_title = _("Warlady %s")
......
graphic_alt = "s.tax_luxury"
sound = "g_tribal"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Republic"
ruler_male_title = _("Warlord %s")
......
graphic_alt = "-"
sound = "g_despotism"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Monarchy"
ruler_male_title = _("Chief %s")
......
graphic_alt = "-"
sound = "g_monarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("King %s")
ruler_female_title = _("Queen %s")
......
graphic_alt = "-"
sound = "g_communism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Comrade %s")
ruler_female_title = _("?female:Comrade %s")
......
graphic_alt = "-"
sound = "g_fundamentalism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("High Priest %s")
ruler_female_title = _("High Priestess %s")
......
graphic_alt = "s.tax_gold"
sound = "g_federation"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Consul %s")
ruler_female_title = _("?female:Consul %s")
......
graphic_alt = "-"
sound = "g_republic"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("President %s")
ruler_female_title = _("?female:President %s")
......
graphic_alt = "-"
sound = "g_democracy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Prime Minister %s")
ruler_female_title = _("?female:Prime Minister %s")
data/stub/governments.ruleset
; sound = Sound tag for the audio to play when palyer switch
; to government.
; sound_alt = Alternative sound tag, in case primary one is not found.
; sound_alt2 = Second alternative sound tag, in case neither primary tag
; nor the first alt tag is found.
; ai_better = AI will not consider this government for use if the
; government listed here is available
; ruler_male_title = The default male ruler title for the government type.
......
graphic_alt = "-"
sound = "g_anarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Usurper %s")
ruler_female_title = _("?female:Usurper %s")
......
graphic_alt = "-"
sound = "g_despotism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Leader %s")
ruler_female_title = _("Leader %s")
data/webperimental/governments.ruleset
; sound = Sound tag for the audio to play when palyer switch
; to government.
; sound_alt = Alternative sound tag, in case primary one is not found.
; sound_alt2 = Second alternative sound tag, in case neither primary tag
; nor the first alt tag is found.
; ai_better = AI will not consider this government for use if the
; government listed here is available
; ruler_male_title = The default male ruler title for the government type.
......
graphic_alt = "-"
sound = "g_anarchy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Warlord %s")
ruler_female_title = _("Warlady %s")
......
graphic_alt = "-"
sound = "g_despotism"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Monarchy"
ruler_male_title = _("Chief %s")
......
graphic_alt = "-"
sound = "g_monarchy"
sound_alt = "-"
sound_alt2 = "-"
ai_better = "Communism"
ruler_male_title = _("King %s")
......
graphic_alt = "-"
sound = "g_communism"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Comrade %s")
ruler_female_title = _("?female:Comrade %s")
......
graphic_alt = "-"
sound = "g_republic"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("President %s")
ruler_female_title = _("?female:President %s")
......
graphic_alt = "-"
sound = "g_democracy"
sound_alt = "-"
sound_alt2 = "-"
ruler_male_title = _("Prime Minister %s")
ruler_female_title = _("?female:Prime Minister %s")
server/ruleset.c
secfile_lookup_str_default(file, "-", "%s.sound", sec_name));
sz_strlcpy(g->sound_alt,
secfile_lookup_str_default(file, "-", "%s.sound_alt", sec_name));
sz_strlcpy(g->sound_alt2,
secfile_lookup_str_default(file, "-", "%s.sound_alt2", sec_name));
g->helptext = lookup_strvec(file, sec_name, "helptext");
} governments_iterate_end;
......
sz_strlcpy(gov.graphic_alt, g->graphic_alt);
sz_strlcpy(gov.sound_str, g->sound_str);
sz_strlcpy(gov.sound_alt, g->sound_alt);
sz_strlcpy(gov.sound_alt2, g->sound_alt2);
PACKET_STRVEC_COMPUTE(gov.helptext, g->helptext);
lsend_packet_ruleset_government(dest, &gov);
(2-2/2)