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

Sej summer crusade(WIP) #1892

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions common/landed_titles/wc_titular_titles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1413,8 +1413,8 @@ k_cenarion_circle = {
# Title types

# Character titles/names
title = "cenarion_circle_rank_4_male"
title_female = "cenarion_circle_rank_4_female"
title = "cenarion_circle_rank_5_male"
title_female = "cenarion_circle_rank_5_female"
short_name = yes
dynasty_title_names = no # Will not be named "Seljuk", etc.

Expand All @@ -1439,8 +1439,8 @@ k_cenarion_circle_fake = {
# Title types

# Character titles/names
title = "cenarion_circle_rank_4_male"
title_female = "cenarion_circle_rank_4_female"
title = "cenarion_circle_rank_5_male"
title_female = "cenarion_circle_rank_5_female"
short_name = yes
dynasty_title_names = no # Will not be named "Seljuk", etc.

Expand Down
17 changes: 17 additions & 0 deletions common/landed_titles/z_holy_sites.txt
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,23 @@ c_nordrassil = {
holy_site = arcane_religion
}

# thunder_king
c_tolnariv = {
holy_site = thunder_king
}
c_lei_shen = {
holy_site = thunder_king
}
c_xuen = {
holy_site = thunder_king
}
c_lushat_lan = {
holy_site = thunder_king
}
c_mogushan = {
holy_site = thunder_king
}

### shamanism_group ###
### primitive_group ###
# orcish_shamanism
Expand Down
6 changes: 0 additions & 6 deletions common/scripted_triggers/wc_scripted_triggers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -691,12 +691,6 @@ can_have_court_physician_trigger = {
}
# SETTLEMENT OR ANY BUILDING INSIDE OF IT CAN'T BE DESTORYED IF IT'S NOT TRUE
settlement_can_be_destroyed_trigger = {
custom_tooltip = {
text = not_importrant_place_tooltip
NOT = {
title = b_ahnqiraj
}
}
custom_tooltip = {
text = unique_building_does_not_block_tooltip
NOT = {
Expand Down
15 changes: 12 additions & 3 deletions decisions/wc_society_decisions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -701,15 +701,24 @@ society_decisions = {
OR = {
AND = {
has_character_modifier = follower_of_nzoth
offmap_nzoth = { has_policy = old_god_working }
OR = {
offmap_nzoth = { has_policy = old_god_working }
offmap_nzoth = { has_policy = old_god_black_empire }
}
}
AND = {
has_character_modifier = follower_of_cthun
offmap_cthun = { has_policy = old_god_working }
OR = {
offmap_cthun = { has_policy = old_god_working }
offmap_cthun = { has_policy = old_god_black_empire }
}
}
AND = {
has_character_modifier = follower_of_yogg_saron
offmap_yoggsaron = { has_policy = old_god_working }
OR = {
offmap_yoggsaron = { has_policy = old_god_working }
offmap_yoggsaron = { has_policy = old_god_black_empire }
}
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions decisions/wc_test_decisions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,7 @@ decisions = {
has_character_flag = debug_mode_flag
}
allow = {
society_associated_with_public_religion_trigger = no
always = yes
must_have_ruled_too_long_penalty_trigger = yes
}
effect = {
unknown_impregnate_cuckoo_this_effect = yes
Expand Down
3 changes: 3 additions & 0 deletions events/wc_class_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2792,6 +2792,9 @@ character_event = {
option = {
name = CHANGED_MY_MIND

clr_character_flag = summon_void_creature_ongoing_flag
clr_character_flag = summon_void_creature_cooldown_flag

ai_chance = {
factor = 0
}
Expand Down
7 changes: 7 additions & 0 deletions events/wc_dark_cult_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1595,6 +1595,13 @@ narrative_event = {

if = {
limit = { NOT = { has_global_flag = twilights_hammer_kalimdor } }
d_ulduar = {
any_de_jure_vassal_title = {
location = {
remove_province_modifier = ulduar_closed_down
}
}
}
if = {
limit = {
ai = no
Expand Down
44 changes: 6 additions & 38 deletions events/wc_immortal_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,7 @@ character_event = {
only_playable = yes

trigger = {
OR = {
must_have_ruled_too_long_penalty_trigger = yes
FROMFROM = {
must_have_ruled_too_long_penalty_trigger = no
}
}
must_have_ruled_too_long_penalty_trigger = yes
}

immediate = {
Expand All @@ -48,14 +43,6 @@ character_event = {

character_event = { id = WCIMM.20 years = 50 }
}
if = {
limit = {
FROMFROM = {
must_have_ruled_too_long_penalty_trigger = no
}
}
FROMFROM = { character_event = { id = WCIMM.30 } }
}
}
}
#Ruled too long
Expand All @@ -71,10 +58,15 @@ character_event = {
is_playable = yes

has_character_flag = ruled_too_long_timer_flag
must_have_ruled_too_long_penalty_trigger = yes
}

fail_trigger_effect = {
clr_character_flag = ruled_too_long_timer_flag
remove_character_modifiers = {
modifier = ruled_too_long_modifier
amount = 30
}
}

immediate = {
Expand All @@ -86,28 +78,4 @@ character_event = {

add_character_modifier = { name = ruled_too_long_modifier duration = -1 stacking = yes }
}
}
# Clears ruled too long modifier when becomes unplayable
character_event = {
id = WCIMM.30

is_triggered_only = yes
hide_window = yes

trigger = {
has_character_flag = ruled_too_long_timer_flag
}

immediate = {
log = "WCIMM.30 fired for [Root.GetBestName]"

clr_character_flag = ruled_too_long_timer_flag

remove_character_modifiers = {
modifier = ruled_too_long_modifier
amount = 30
}

clear_delayed_event = { id = WCIMM.20 }
}
}
1 change: 0 additions & 1 deletion events/wc_undead_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ province_event = {
prestige = 1000
piety = 250
set_graphical_culture = nerzhul
add_artifact = scepter_of_sargeras

c_icecrown = {
location = { convert_to_target_undead_province_effect = yes }
Expand Down
2 changes: 1 addition & 1 deletion events/wc_void_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1421,7 +1421,7 @@ character_event = {
is_mage_class_trigger = yes
}
modifier = {
factor = 5
factor = 2
holds_living_old_god_prison_trigger = yes
}
}
Expand Down
Binary file modified gfx/interface/decision_icons/open_ulduar.dds
Binary file not shown.
Binary file not shown.
98 changes: 0 additions & 98 deletions interface/sad_decision_icons.gfx

This file was deleted.

66 changes: 0 additions & 66 deletions interface/sad_event_pictures.gfx

This file was deleted.

Loading