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

hotfix 0.4.1 #1293

Merged
merged 32 commits into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ead97dd
error.log
sumankun Dec 23, 2023
1d58e0e
fixed union concept
sumankun Dec 23, 2023
a87a6c7
shortened bookmark desc for MP
sumankun Dec 23, 2023
823b74f
fixed kalimdor events localization
sumankun Dec 23, 2023
7f4b1d5
fixed undead children
sumankun Dec 23, 2023
2df8361
gifted the gift of Naaru
sumankun Dec 23, 2023
794b770
remove double union for person, if some bug happens
sumankun Dec 23, 2023
377e81d
Fix Theramore Loc
sumankun Dec 23, 2023
b3facb2
hid more stuff for static races
sumankun Dec 23, 2023
205d8fa
first theramorean kingdom gets coa and flag
sumankun Dec 24, 2023
d727060
fix disinherited Arthas opinion
sumankun Dec 24, 2023
77a7115
Update wc_theramore_events.txt
sumankun Dec 24, 2023
7877341
ai dont span loan decision
sumankun Dec 24, 2023
0330897
fixed repeating dark portal event
sumankun Dec 25, 2023
7c29546
missic loc in ruler designer
sumankun Dec 25, 2023
52af596
fix an error spam for republic players
edmund-h Dec 25, 2023
e366ae7
error.log
sumankun Dec 25, 2023
2706f1b
vanilla loc error
sumankun Dec 25, 2023
b305a3d
unlock some interaction for union members
sumankun Dec 25, 2023
72fbf77
fix(maybe) of too big unions
sumankun Dec 25, 2023
c9edc73
perks affect (de)centralization
sumankun Dec 25, 2023
1182a02
Update 00_k_gurubashi.txt
Grekopithikos Dec 25, 2023
61ee22c
alternate universe game rule
sumankun Dec 25, 2023
16b80c5
wrong faith icons dds format, error.log
sumankun Dec 25, 2023
38ecf20
Update wccc_apothecary_religion.dds
sumankun Dec 25, 2023
34df111
less chaos for cultures
sumankun Dec 25, 2023
484f636
error.log
sumankun Dec 25, 2023
72f1aa8
mod version
sumankun Dec 25, 2023
d4d98de
remove wars for theramore expeditioners
sumankun Dec 25, 2023
b55b067
only 9 kingdoms can be renamed to Theramore auto
sumankun Dec 25, 2023
5b2b3f1
github continuous integration error
sumankun Dec 25, 2023
98d55c6
error.log clan setup
sumankun Dec 25, 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
24 changes: 0 additions & 24 deletions .github/workflows/ci.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Warcraft-Guardians-of-Azeroth-2.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name="Warcraft: Guardians of Azeroth Reforged (Release Alpha)"
version="0.4"
version="0.4.1"
picture="thumbnail.png"
tags={
"Total Conversion"
Expand Down
35 changes: 22 additions & 13 deletions common/casus_belli_types/wc_migration_war.txt
Original file line number Diff line number Diff line change
Expand Up @@ -131,21 +131,30 @@
change = scope:change
}
}
if = {
limit = {
scope:attacker = {
has_variable_list = theramorean_comrades
any_in_list = {
hidden_effect = {
scope:attacker = {
if = {
limit = {
has_variable_list = theramorean_comrades
}
every_in_list = {
variable = theramorean_comrades
is_alive = no
limit = { is_alive = no }
prev = { remove_list_variable = { name = theramorean_comrades target = prev } }
}
#end own wars, leave wars as allies
every_in_list = {
variable = theramorean_comrades
limit = { is_at_war = yes }
every_character_war = {
limit = { is_war_leader = prev }
end_war = white_peace
}
every_character_war = {
limit = { NOT = { is_war_leader = prev } }
remove_participant = prev
}
}
}
}
scope:attacker = {
every_in_list = {
variable = theramorean_comrades
limit = { is_alive = no }
prev = { remove_list_variable = { name = theramorean_comrades target = prev } }
}
}
}
Expand Down
22 changes: 22 additions & 0 deletions common/character_interactions/00_alliance.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@
popup_on_receive = yes
pause_on_receive = yes
icon = alliance
use_diplomatic_range = {
trigger_if = {
limit = {
scope:actor = { has_variable = this_union }
scope:recipient ?= { has_variable = this_union }
}
NOT = {
scope:actor.var:this_union = scope:recipient.var:this_union
}
}
}

greeting = positive
notification_text = CALL_ALLY_NOTIFICATION
Expand Down Expand Up @@ -2188,6 +2199,17 @@ join_war_interaction = {
popup_on_receive = yes
desc = join_war_interaction_desc
icon = alliance
use_diplomatic_range = {
trigger_if = {
limit = {
scope:actor = { has_variable = this_union }
scope:recipient ?= { has_variable = this_union }
}
NOT = {
scope:actor.var:this_union = scope:recipient.var:this_union
}
}
}

greeting = positive
notification_text = join_war_interaction_notification
Expand Down
11 changes: 11 additions & 0 deletions common/character_interactions/00_gift.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ gift_interaction = {
common_interaction = yes
interface_priority = 60
desc = gift_interaction_desc
use_diplomatic_range = {
trigger_if = {
limit = {
scope:actor = { has_variable = this_union }
scope:recipient ?= { has_variable = this_union }
}
NOT = {
scope:actor.var:this_union = scope:recipient.var:this_union
}
}
}

greeting = positive
notification_text = SEND_GIFT_PROPOSAL
Expand Down
4 changes: 4 additions & 0 deletions common/character_interactions/wc_pol_faction_interactions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
interface_priority = 60
desc = invite_to_this_union_interaction_desc
icon = alliance

use_diplomatic_range = {
current_date < 608.1.1
}

greeting = positive
notification_text = invite_to_this_union_interaction_notification
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,15 +209,15 @@

text = {
trigger = {
house = { has_house_unity_stage = harmonious }
house ?= { has_house_unity_stage = harmonious }
this = house.house_head
}
localization_key = rich_presence_house_unity_harmonious
}

text = {
trigger = {
house = { has_house_unity_stage = antagonistic }
house ?= { has_house_unity_stage = antagonistic }
this = house.house_head
}
localization_key = rich_presence_house_unity_antagonistic
Expand Down
8 changes: 7 additions & 1 deletion common/decisions/wc_goblin_loan_decisions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@

is_shown = {
is_landed = yes
highest_held_title_tier >= tier_county
trigger_if = {
limit = { is_ai = no }
highest_held_title_tier >= tier_county
}
trigger_else = {
highest_held_title_tier >= tier_duchy
}
exists = title:k_goblin_bankers.holder
NOR = {
exists = var:loan_amount_owed_goblins
Expand Down
19 changes: 19 additions & 0 deletions common/game_rules/000_wc_game_rules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,25 @@ wc_interracial_marriage_modifier = {
}
}

random_ruler_placement = {

categories = {
warcraft_category game_modes historicity
}

default = random_ruler_placement_off

random_ruler_placement_off = {
}

random_ruler_placement_on = {
}

#random_ruler_placement_on_conversion = {
# flag = blocks_achievements
#}
}

wc_lore_characters_generate_families = {

categories = {
Expand Down
21 changes: 0 additions & 21 deletions common/game_rules/00_game_rules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -646,27 +646,6 @@ randomized_faiths = {
}
}

random_ruler_placement = {

categories = {
game_modes
}

default = random_ruler_placement_off

random_ruler_placement_off = {

}

random_ruler_placement_on = {
flag = blocks_achievements
}

random_ruler_placement_on_conversion = {
flag = blocks_achievements
}
}

ai_embarkation_cost = {

categories = {
Expand Down
32 changes: 24 additions & 8 deletions common/on_action/game_start.txt
Original file line number Diff line number Diff line change
Expand Up @@ -218,19 +218,41 @@ on_game_start = {
}
}
}
# Unions, we have problems through history because of variables
union_members_on_game_start_effect = yes

every_ruler = {
limit = { NOT = { has_trait = race } }
copy_race_effect = { CHARACTER = this }
trigger_race_giving_no_gene_effect = yes
}
### GAME RULE: Alternate universe
if = {
limit = { has_game_rule = random_ruler_placement_on }
game_rule_random_ruler_placement_effect = yes
every_independent_ruler = {
limit = { highest_held_title_tier = tier_empire is_landed = yes }
every_vassal = {
limit = { highest_held_title_tier = tier_kingdom NOT = { faith = prev.faith } vassal_contract_has_modifiable_obligations = yes }
vassal_contract_set_obligation_level = {
type = religious_rights
level = 1
}
}
}
}
}
}

# Like on_game_start, except it is called once the host (or player, in single player) exits the lobby. Good for anything where you need to know who the players are, or what the game rules are
on_game_start_after_lobby = {
effect = {
# Unions, we have problems through history because of variables
if = {
limit = { has_game_rule = random_ruler_placement_off }
union_members_on_game_start_effect = yes
}
else = {
union_members_on_game_start_alternate_universe_effect = yes
}
# Warcraft
every_living_character = {
trigger_on_game_start_effect = yes
Expand Down Expand Up @@ -293,12 +315,6 @@ on_game_start_after_lobby = {
game_rule_accepted_same_sex_relations_effect = yes
}

### GAME RULE: RANDOM RULER PLACEMENT
if = {
limit = { NOT = { has_game_rule = random_ruler_placement_off } }
game_rule_random_ruler_placement_effect = yes
}

### GAME RULE: RANDOMIZE FAITH
if = {
limit = { has_game_rule = randomized_faiths_on }
Expand Down
2 changes: 1 addition & 1 deletion common/on_action/wc_agp_on_actions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on_game_start_after_lobby_agp = {
id = agp_event.1
}
}
title:e_kaldorei = {
character:340003.primary_title = {
add_title_law = agp_theocracy_elective_succession_law
}
#every_religion_global = {
Expand Down
29 changes: 29 additions & 0 deletions common/on_action/wc_theramore_task_on_actions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,35 @@ on_title_gain_custom_te = {
trigger = { has_game_rule = wc_theramore_mechanic_on }

effect = {
if = {
limit = {
has_culture = culture:theramore
scope:title = { tier >= tier_kingdom }
NOT = { has_global_variable = theramore_kingdom_created }
}
set_global_variable = theramore_kingdom_created
#So if jaina inherits kul tiras it wont be renamed, and theramore cant get unique kingdom anymore if this happens because of global var
scope:title = {
if = {
limit = {
OR = {
this = title:k_dustwallow
this = title:k_eldarath
this = title:k_azuremyst
this = title:k_bosaresh
this = title:k_lei_dao
this = title:k_pearlfin
this = title:k_south_islands
this = title:k_borean_tundra
this = title:k_utgarde
}
}
set_coa = d_theramore
set_title_name = d_theramore
set_color_from_title = title:b_theramore
}
}
}
if = {
limit = {
scope:title = { has_variable = azeroth_settlers }
Expand Down
32 changes: 30 additions & 2 deletions common/script_values/wc_pol_faction_values.txt
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ centralization_influencce_value = {
has_trait = education_diplomacy
}
add = {
value = 0.5
value = 0.4
desc = reason_education_diplomacy
}
}
Expand All @@ -395,7 +395,7 @@ centralization_influencce_value = {
has_trait = education_martial
}
add = {
value = -0.5
value = -0.4
desc = reason_education_martial
}
}
Expand All @@ -406,6 +406,20 @@ centralization_influencce_value = {
desc = reason_trait_content
}
}
if = {
limit = { has_trait = diplomat }
add = {
value = -1
desc = reason_trait_diplomat
}
}
if = {
limit = { has_trait = scholar }
add = {
value = -0.6
desc = reason_trait_scholar
}
}
if = {
limit = { has_trait = fickle }
add = {
Expand Down Expand Up @@ -448,6 +462,13 @@ centralization_influencce_value = {
desc = reason_trait_ambitious
}
}
if = {
limit = { OR = { has_trait = augustus has_trait = august } }
add = {
value = 1
desc = reason_trait_august
}
}
if = {
limit = { has_trait = just }
add = {
Expand Down Expand Up @@ -483,6 +504,13 @@ centralization_influencce_value = {
desc = reason_trait_paranoid
}
}
if = {
limit = { has_trait = torturer }
add = {
value = 0.6
desc = reason_trait_torturer
}
}
if = {
limit = {
is_alive = yes
Expand Down
Loading