damimani/N3OW
1
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
common/decisions/dlc_decisions/ep3_decisions.txt
View file

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

16
events/dlc/ep3/ep3_decisions_events.txt
View file

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

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

Binary file not shown.

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

Binary file not shown.

BIN
gfx/map/terrain/masks/central_mountain_mask.png (Stored with Git LFS)
View file

Binary file not shown.

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

Binary file not shown.

BIN
gfx/map/terrain/masks/hills_01_rocks_mask.png (Stored with Git LFS)
View file

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
gfx/map/terrain/masks_gen/gen_central_base_mask.png (Stored with Git LFS)
View file

Binary file not shown.

BIN
gfx/map/terrain/masks_gen/gen_central_hills_mask.png (Stored with Git LFS)
View file

Binary file not shown.

BIN
gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png (Stored with Git LFS)
View file

Binary file not shown.

BIN
gfx/map/terrain/masks_gen/gen_central_lowlands_03_mask.png (Stored with Git LFS)
View file

Binary file not shown.

BIN
gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png (Stored with Git LFS)
View file

Binary file not shown.

BIN
gfx/map/terrain/masks_gen/gen_central_mountain_mask.png (Stored with Git LFS)
View file

Binary file not shown.

BIN
gfx/map/terrain/masks_gen/gen_drylands_mountain_mask.png (Stored with Git LFS)
View file

Binary file not shown.

BIN
gfx/map/terrain/masks_gen/gen_northern_hills_mask.png (Stored with Git LFS)
View file

Binary file not shown.

4
gfx/map/terrain/materials.settings
View file

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