Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Union rework #1236

Merged
merged 31 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9c73fb2
Unions Wave-1
sumankun Oct 17, 2023
6d35de0
wave 1.1
sumankun Oct 18, 2023
9825a1a
game rule - unified color for unions
sumankun Oct 18, 2023
d4ba488
wave 2 - universal decisions
sumankun Oct 24, 2023
ce4e1b1
Wave 3 - four new unions
sumankun Oct 27, 2023
311cec6
Wave 4 - union elections
sumankun Oct 31, 2023
2bde484
various fixes
sumankun Oct 31, 2023
971eacc
nonleader can call union in defensive only
sumankun Oct 31, 2023
9415a1f
marriage doesnt consider union allies
sumankun Oct 31, 2023
d39b626
icons in window
sumankun Oct 31, 2023
23ada3b
minor kobold update
Grekopithikos Oct 31, 2023
f56ecef
two buds for Nazrim
Grekopithikos Oct 31, 2023
b54fc62
Wave 5 - (de)centralization of union
sumankun Nov 2, 2023
1ef1320
Merge branch 'master' into union-rework
sumankun Nov 2, 2023
b4eb579
centralization fix
sumankun Nov 2, 2023
ed3a049
horde, kaldorei, diplorange
sumankun Nov 2, 2023
ca71121
wtf no troggs
Grekopithikos Nov 2, 2023
dd86754
wrong dds format in error.log
sumankun Nov 2, 2023
185fa7f
fix
sumankun Nov 2, 2023
9817127
fix(stop axis immediate disbanding)
sumankun Nov 2, 2023
fb9674d
fix
sumankun Nov 2, 2023
e8cb722
bluegill
Grekopithikos Nov 2, 2023
f6355f5
Merge branch 'union-rework' of https://github.com/Warcraft-GoA-Develo…
Grekopithikos Nov 2, 2023
5cad873
ogre names
Grekopithikos Nov 5, 2023
6f52ad2
Update 000_wc_game_rules.txt
Grekopithikos Nov 5, 2023
83af0bd
Update 000_wc_game_rules.txt
Grekopithikos Nov 5, 2023
451f91b
Revert "Update 000_wc_game_rules.txt"
sumankun Nov 5, 2023
0713dfd
Revert "Update 000_wc_game_rules.txt"
sumankun Nov 5, 2023
93ab67b
error.log
sumankun Nov 5, 2023
e218698
second war joining fixes
sumankun Nov 5, 2023
fede911
new selection
sumankun Nov 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions common/character_interactions/00_alliance.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,34 @@
}

scope:actor = {
trigger_if = {
limit = {
is_in_same_union_trigger = { TARGET = scope:recipient }
any_in_global_list = {
variable = all_unions
var:this_union = scope:actor.var:this_union
save_temporary_scope_as = my_union
}
scope:my_union.var:centralization_value > -75
scope:target = { primary_attacker = prev }
}
trigger_if = {
limit = {
scope:my_union.var:centralization_value >= 75
NOT = { scope:my_union.story_owner = scope:actor }
}
custom_tooltip = {
text = can_call_leader_in_offensive
scope:my_union.story_owner = scope:recipient
}
}
trigger_else = {
custom_tooltip = {
text = union_leader_trigger_attacker_war
leads_any_this_union_trigger = yes
}
}
}
trigger_if = {
limit = {
scope:target = {
Expand Down
4 changes: 2 additions & 2 deletions common/character_interactions/wc_debug_interactions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ break_union_interaction = {

is_shown = {
debug_only = yes
scope:recipient = { is_in_any_pol_faction_trigger = yes }
scope:recipient = { is_in_any_this_union_trigger = yes }
}

on_accept = {
scope:recipient = {
break_any_union_effect = yes
break_union_effect = yes
}
}
auto_accept = yes
Expand Down
30 changes: 15 additions & 15 deletions common/character_interactions/wc_pol_faction_interactions.txt
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
invite_to_pol_faction_interaction = {
invite_to_this_union_interaction = {
category = interaction_category_diplomacy
ai_min_reply_days = 4
ai_max_reply_days = 9

send_name = invite_to_pol_faction_interaction
send_name = invite_to_this_union_interaction

interface_priority = 60
desc = invite_to_pol_faction_interaction_desc
desc = invite_to_this_union_interaction_desc
icon = alliance

greeting = positive
notification_text = invite_to_pol_faction_interaction_notification
notification_text = invite_to_this_union_interaction_notification

is_shown = {
scope:recipient = {
NOT = { this = scope:actor }
scope:actor = {
is_ruler = yes

can_be_in_faction_of_trigger = { target = scope:actor }

is_in_any_pol_faction_trigger = no
leads_any_this_union_trigger = yes
}
scope:actor = {
scope:recipient = {
NOT = { this = scope:actor }
is_ruler = yes

can_be_in_union_of_trigger = { target = scope:actor }

leads_any_pol_faction_trigger = yes
is_in_any_this_union_trigger = no
}
}

Expand All @@ -33,13 +33,13 @@
is_landed = yes
is_imprisoned = no

has_pol_faction_cooldown_trigger = no
has_this_union_cooldown_trigger = no
}
scope:actor = {
is_landed = yes
is_imprisoned = no

is_at_war = no
#is_at_war = no
}
scope:recipient = {
is_busy_in_events_localised = yes
Expand Down Expand Up @@ -83,7 +83,7 @@
send_options_exclusive = no

on_accept = {
invite_to_pol_faction_effect = yes
invite_to_this_union_effect = yes
}

on_decline = {
Expand All @@ -109,7 +109,7 @@
ai_accept = {
base = -20
negotiate_alliance_modifiers = yes
invite_to_pol_faction_modifiers = yes
invite_to_this_union_modifiers = yes
}

ai_potential = {
Expand Down
2 changes: 1 addition & 1 deletion common/culture/name_lists/wc_gorian.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
Grosh Gurn Ko'ragh Kolbin Kor'gall Kor'gresh Korgaah Kovork Kreeg Krol Kromcrush Krosh Lantresor Lo Lump
Magronos Mal'druk Mizzle Mogor Mojo Mol'dar Molok Muckrake Mug'thol Mugdorg Ollaramm Ollazgorm Orloch
Oroam Orodaruld Orogurdan Oroma Orrus Rhahk'Zor Ronagarstan Ronamar Rongorm Ronllak Sadaragg Sargam Ogron Omgorn Ommok
Roggam Slip'kik Targ Tectus Tharg Tho'grun Thugrim Trogm Turok Unkor Vul Zilb Zorbo Zzarc
Roggam Slip'kik Targ Tectus Tharg Thog Tho'grun Thugrim Trogm Turok Unkor Vul Zilb Zorbo Zzarc
}
female_names = {
Vaxar Ogg'ora Mai Zoth Mizzle Draza Trogma Kovork Gro'ach Grog'ak Grosh Gurn Ko'ragh Kolbine Kor'gall
Expand Down
2 changes: 1 addition & 1 deletion common/culture/name_lists/wc_hyenaic.txt
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@
Chaucer Chutzpa Clover Crusher Daredevil Dazzler Dirtpaw Eater Evert Ewok Falcon Fangore Fedfennel Fenruner Fighter
Flopper Furr Gimp Gnarlhide Gnawbone Grime Groll Grrrr Gruff Grumpy Grums Hogger Hunter Invader Jackal Knickerbocker Knockout
Kudu Lashlash Lobos Lunatic Madbeast Maduro Maggot Maicoh Marauder Metis Miblon Misery Mongrel Moonruner Morder Mosshide Mutt
Myth Orsoly Osborn Otso Piggy Pippin Primitive Rhino Ribchaser Rider Ro'Bark Robber Rohh Scorchheart Scythetooth Sergeant
Myth Orsoly Osborn Otso Piggy Pippin Primitive Rhino Ribchaser Rider Ro'Bark Robber Rohh Sagepaw Scorchheart Scythetooth Sergeant
Shorty Shredder Snagglespear Snarlmane Snarltooth Spyestr Strongstride Suppressors Swiftbite Tag Thorburn Thug Thunder
Toothy Terrifying Urs Vengen Vuk Yowler Zeeb Grik Drerk Marrg Rarg Gyrrg Urgizz Arguc Grarrg Rric Meirg Kreirk Throbal Mohna
Sryzaa Gnyrgu Dunko Trehneil Daigrron Krixem Dazlom Mogvo Grozzyrr Gror Gul Baal Thriat Thum Sagrom Rogrim
Expand Down
15 changes: 8 additions & 7 deletions common/culture/name_lists/wc_murine.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
}

male_names = {
Feeboz Sleeby Bezid Biang Biddik Box Bragdiag Brikkurg Bruzind Chink Choh Chredrak Chreekkind Chreldrerc Chrerung Chrigmaang Chring Chrukkarg Chrurkunk Chudod Chunderk Clis Closz
Clud Clumkond Clunszid Clus Cres Crezi Crink Crirg Crirgrig Crog Crutruc Degveeg Deitzer Derzing Digger Disz Drac Dras Draugdric Drezid Dric Drorreeng Druzung Duk
Dukdrorg Dux Ekgred Eldrain Emgrek Flintdagger Gaih Gamgurk Gemcud Gengiarc Gerdris Ghresz Ghric
Ghrikhreel Ghrirg Ghruddec Ghruddirc Gibblesnik Giddek Goldtooth
Gomzrung Greenk Griderc Grizlak Ikisk Ikzink Kaac Kadrunk Kaik Kangisk Karid Khal Khem Khiggaurc Khin Khisz Khizzeng Khurdees Kic Knatvig Kneezzong Kondec Krabbirc
Kred Krozarc Narg Ogvah Qen Qharoc Qherk Qhir Qhukzeisk Qrigbraun Qrirc Qrizon Qroc Qrubbox Ruklar
Feeboz Sleeby Bezid Biang Biddik Box Bragdiag Brikkurg Bruzind
Chink Choh Chredrak Chreekkind Chreldrerc Chrerung Chrigmaang Chring Chrukkarg Chrurkunk Chudod Chunderk Clis Closz Clud Clumkond Clunszid Clus Cres Crezi Crink Crirg Crirgrig Crog Crutruc
Degveeg Deitzer Derzing Digger Disz Drac Dras Draugdric Drezid Dric Drorreeng Druzung Duk Dukdrorg Dux
Ekgred Eldrain Emgrek Flintdagger Gaih Gamgurk Gemcud Gengiarc Gerdris Ghresz Ghric
Ghrikhreel Ghrirg Ghruddec Ghruddirc Gibblesnik Giddek Goldtooth Gomzrung Greenk Griderc Grizlak
Ikisk Ikzink Kaac Kadrunk Kaik Kangisk Karid Khal Khem Khiggaurc Khin Khisz Khizzeng Khurdees Kic Knatvig Kneezzong Kondec Krabbirc Kred Krozarc Kubb
Narg Nazrim Ogvah Qen Qharoc Qherk Qhir Qhukzeisk Qrigbraun Qrirc Qrizon Qroc Qrubbox Ruklar
Shrak Shrudind Shrund Shubid Shuk Skarc Skidded Snemcho Snivvle
Snizrin Snizzeing Strigbruk Szokgrees Szongac Szuk Thruddia Triask Trirdrod Trorraank Trud Trurink Uggix Unging Utzesz Vaakvaak Ved Viah Vrag Vrakkak Vred Vrir
Vrireex Vrisk Vrond Vrurg Xaank Xidgarc Xirk Xogdresk Xorg Xukkaurk Zeg Zerkrik Ziamgal Zikorg Zimchi Znort Zozzank Zrec
Expand All @@ -24,7 +25,7 @@
Aithring Bahs Bekzih Bez Bharihs Bharkhan Bhragoz Bhrarla Bhrekseng Bhrikka Bhrudan Bina Buy Chaizde Chel Cherro Chikneih
Chong Chreetti Chunshe Clazzu Cluggvihs Crin Cyahl Cyez Cyurral Dhas Dhurszi Dildjeh Ding Dus Eddoh Emcheihl Gahs Gaing
Gas Gerdjehs Gheal Gilbla Iggo Itteng Itzais Kadjo Khey Khin Khremchez Khribea Kilgee Klihs Knaray Knarde Knithung Kodei
Oriax Scagen Scemgeang Sciy Shaahn Sheh Shibuhs Shnatti Shneakka Shnealgil Shnirru Shnis Shnoy Shraan Shres Shrey Shrige
Oriax Nazrin Scagen Scemgeang Sciy Shaahn Sheh Shibuhs Shnatti Shneakka Shnealgil Shnirru Shnis Shnoy Shraan Shres Shrey Shrige
Shtikke Shtudju Slaagga Snahs Snamgluhl Snes Snirdje Snoddey Snux Strandaa Strarru Strihn Strikgi Szaakge Szeahl Szeir Szez
Szin Sziy Szuzzo Tarsza Tattu Thebbi Theing Therla Thiy Threalkha Threinshi Threlgaang Thrergex Throz Vebbu Vez Vrardjen
Vreay Vrehn Vrekzis Vrigreim Vrul Zaaken Zeida Zeirgeen Zimchaas Zrul Zrumsrol
Expand Down
8 changes: 4 additions & 4 deletions common/culture/name_lists/wc_uldumanic.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,13 @@ name_list_drogbar = {
}

male_names = {
Amgrol Amprol Arbrogg Armazkul Armol Blelgol Blevofrun Blorgarbugg Bubgrol Clalmugg Clolufrogg Clomgrub Dlalurbul Dlizgrugg Ezarol Ezgrul Gelprogg Halgogg Hudrugg
Inbrugg Jankrogg Jiruzkol Kagamprub Kerbul Koggrugg Komprolg Lemprogg Lilbrugg Lozgrugg Lumgrob Mamgrugg Mamrul Mardul Nozgozkugg Torurgrugg Ukrun Ulabgrob Urmogg
Amgrol Amprol Arbrogg Armazkul Armol Blelgol Blevofrun Blorgarbugg Brawler Bubgrol Clalmugg Clolufrogg Clomgrub Dlalurbul Dlizgrugg Ezarol Ezgrul Galgosh Gelprogg Gnasher Grawmug Halgogg Hudrugg
Inbrugg Jankrogg Jiruzkol Kagamprub Kerbul Koggrugg Komprolg Lemprogg Lilbrugg Lozgrugg Lumgrob Magosh Mamgrugg Mamrul Mardul Nozgozkugg Torurgrugg Ukrun Ulabgrob Urmogg
Urogg Zirgogg
}
female_names = {
Amgrol Amprol Arbrogg Armazkul Armol Blelgol Blevofrun Blorgarbugg Bubgrol Clalmugg Clolufrogg Clomgrub Dlalurbul Dlizgrugg Ezarol Ezgrul Gelprogg Halgogg Hudrugg
Inbrugg Jankrogg Jiruzkol Kagamprub Kerbul Koggrugg Komprolg Lemprogg Lilbrugg Lozgrugg Lumgrob Mamgrugg Mamrul Mardul Nozgozkugg Torurgrugg Ukrun Ulabgrob Urmogg
Amgrol Amprol Arbrogg Armazkul Armol Blelgol Blevofrun Blorgarbugg Brawler Bubgrol Clalmugg Clolufrogg Clomgrub Dlalurbul Dlizgrugg Ezarol Ezgrul Galgosh Gelprogg Gnasher Grawmug Halgogg Hudrugg
Inbrugg Jankrogg Jiruzkol Kagamprub Kerbul Koggrugg Komprolg Lemprogg Lilbrugg Lozgrugg Lumgrob Magosh Mamgrugg Mamrul Mardul Nozgozkugg Torurgrugg Ukrun Ulabgrob Urmogg
Urogg Zirgogg
}
dynasty_of_location_prefix = ""
Expand Down
12 changes: 6 additions & 6 deletions common/customizable_localization/00_FR_custom_loc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7474,27 +7474,27 @@ FR_LLa_Union = {

text = {
trigger = {
exists = var:gui_pol_faction_name
exists = var:gui_this_union_name

var:gui_pol_faction_name = flag:alliance
var:gui_this_union_name = flag:alliance
}
localization_key = CustomLoc_FR_l
}

text = {
trigger = {
exists = var:gui_pol_faction_name
exists = var:gui_this_union_name

var:gui_pol_faction_name = flag:horde
var:gui_this_union_name = flag:horde
}
localization_key = CustomLoc_FR_la
}

text = {
trigger = {
exists = var:gui_pol_faction_name
exists = var:gui_this_union_name

var:gui_pol_faction_name = flag:custom
var:gui_this_union_name = flag:custom
}
localization_key = "CV_FR_CUSTOM_UNDEFINED_UNION"
}
Expand Down
Loading
Loading