Merge branch 'next-version-dev' of https://forgejo.damimani-alex.org/damimani/N3OW into next-version-dev

This commit is contained in:
Heidesommer 2026-08-31 16:53:08 -04:00
commit aaec5ce9da
18 changed files with 43 additions and 34 deletions

View file

@ -2364,6 +2364,8 @@ commission_icon_decision = {
has_dlc_feature = roads_to_power
is_landed_or_landless_administrative = yes
OR = {
religion = religion:eastern_orthodox_religion
religion = religion:oriental_orthodox_religion
faith = faith:orthodox
faiths_are_in_orthodox_christianity_group = { FAITH_1 = faith:orthodox FAITH_2 = root.faith }
}

View file

@ -518,7 +518,7 @@ ep3_decisions_event.0003 = {
left_portrait = {
character = scope:actor
triggered_animation = {
trigger = { OR = { religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } }
trigger = { OR = { religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion religion = religion:oriental_orthodox_religion } }
animation = scepter # anim uses crucifix scepter
}
animation = war_over_tie
@ -3281,7 +3281,7 @@ ep3_decisions_event.3201 = {
right_portrait = {
character = root
triggered_animation = {
trigger = { OR = { religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } }
trigger = { OR = { religion = religion:oriental_orthodox_religion religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } }
animation = acknowledging # anim uses crucifix scepter
}
animation = war_over_tie
@ -3561,6 +3561,10 @@ scripted_trigger ask_help_valid_for_crusades_trigger = {
exists = var:variable_ghw_unlocked
NOT = { exists = var:variable_first_ghw_cooldown }
}
religion:oriental_orthodox_religion = {
exists = var:variable_ghw_unlocked
NOT = { exists = var:variable_first_ghw_cooldown }
}
}
scope:pope = {
is_imprisoned = no
@ -4939,7 +4943,7 @@ ep3_decisions_event.4030 = {
left_portrait = {
character = root
triggered_animation = {
trigger = { OR = { religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } }
trigger = { OR = { religion = religion:oriental_orthodox_religion religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } }
animation = acknowledging # anim uses crucifix scepter
}
animation = war_over_tie
@ -5028,7 +5032,7 @@ ep3_decisions_event.4050 = {
animation = obsequious_bow
}
triggered_animation = {
trigger = { OR = { religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } }
trigger = { OR = { religion = religion:oriental_orthodox_religion religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } }
animation = scepter # anim uses crucifix scepter
}
animation = war_over_tie
@ -5154,7 +5158,7 @@ ep3_decisions_event.4060 = {
left_portrait = {
character = root
triggered_animation = {
trigger = { OR = { religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } }
trigger = { OR = { religion = religion:oriental_orthodox_religion religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } }
animation = scepter # anim uses crucifix scepter
}
animation = war_over_tie
@ -5291,7 +5295,7 @@ ep3_decisions_event.4065 = {
sender = {
character = scope:actor
triggered_animation = {
trigger = { OR = { religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } }
trigger = { OR = { religion = religion:oriental_orthodox_religion religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } }
animation = scepter # anim uses crucifix scepter
}
animation = war_over_tie

BIN
gfx/map/terrain/detail_index.tga (Stored with Git LFS)

Binary file not shown.

BIN
gfx/map/terrain/detail_intensity.tga (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
gfx/map/terrain/masks/hills_01_mask.png (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
gfx/map/terrain/masks/snow_mask.png (Stored with Git LFS)

Binary file not shown.

BIN
gfx/map/terrain/masks/tells_wet_02_mask.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -1028,11 +1028,11 @@
id = "tells_dry_02"
}
{
name = "tells_wet_03"
name = "tells_wet_02"
diffuse = "tells_wet_diffuse.dds"
normal = "tells_wet_normal.dds"
material = "tells_wet_properties.dds"
mask = "masks/tells_wet_03_mask.png"
mask = "masks/tells_wet_02_mask.png"
id = "tells_wet_02"
}
}