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

This commit is contained in:
edwardtheelbowhigh 2026-10-08 01:22:29 +01:00
commit b80384591a
166 changed files with 13085 additions and 101048 deletions

View file

@ -447,17 +447,6 @@ c_alampur = {
color1 = "yellow"
color2 = "white"
}
c_aland = {
pattern = "pattern_solid.dds"
color1 = "blue"
color2 = "yellow"
colored_emblem = {
texture = "ce_stag.dds"
color1 = "yellow"
color2 = "yellow"
color3 = "black"
}
}
c_alcacer_do_sal = {
pattern = "pattern_solid.dds"
color1 = "white"
@ -17554,31 +17543,6 @@ d_dalir = {
}
}
d_savo = {
pattern = "pattern_solid.dds"
color1 = "black"
color2 = "white"
colored_emblem = {
texture = "ce_bow.dds"
color1 = "yellow"
color2 = "white"
instance = { position = { 0.50 0.48 } rotation = 40 scale = { 1.0 1.0 } }
}
}
d_pohjanmaa = {
pattern = "pattern_solid.dds"
color1 = "yellow"
color2 = "black"
colored_emblem = {
texture = "ce_bear_head.dds"
color1 = "black"
color2 = "red"
color3 = "white"
instance = { position = { 0.5 0.48 } scale = { 0.9 0.9 } }
}
}
d_karelia = {
pattern = "pattern_solid.dds"
color1 = "red"
@ -28660,56 +28624,6 @@ k_poland = {
}
}
# New temp CE
# k_frisia = {
# pattern="pattern_tricolor_horizontal_01.dds"
# color1=red
# color2=white
# color3=blue_light
# colored_emblem={
# color1=yellow
# color2=rgb { 141 21 4 }
# texture="ce_lion_rampant_crown.dds"
# instance={
# scale={ 0.700000 0.700000 }
# depth=1.010000
# }
# }
# colored_emblem={
# color1=yellow
# color2=white
# texture="ce_sword_simple.dds"
# instance={
# position={ 0.410000 0.190000 }
# scale={ 0.430000 0.400000 }
# rotation=36
# }
# }
# }
# Finland
k_finland = {
pattern="pattern_horizontal_split_01.dds"
color1=white
color2=white
color3=red
colored_emblem={
color1=white
texture="ce_block_02.dds"
instance={
depth=1.010000
}
}
colored_emblem={
color1=white
color2=blue_light
texture="NEOW_ce_cross_nordic.dds"
}
}
# Proper CE
k_jerusalem = {
pattern = "pattern_solid.dds"

View file

@ -6769,94 +6769,6 @@ c_vanemane={
}
d_finland={
pattern="pattern_solid.dds"
color1=red
color2=white
color3=red
colored_emblem={
color1=yellow
color2=white
color3=white
texture="ce_lion_rampant_crown_sword.dds"
instance={
position={ 0.500000 0.520000 }
scale={ 0.890000 0.890000 }
depth=9.010000
}
}
colored_emblem={
color1=white
texture="ce_cinquefoil_01.dds"
instance={
position={ 0.750000 0.590000 }
scale={ 0.100000 0.100000 }
}
instance={
position={ 0.540000 0.750000 }
scale={ 0.100000 0.100000 }
depth=1.010000
}
instance={
position={ 0.680000 0.340000 }
scale={ 0.090000 0.090000 }
depth=2.010000
}
instance={
position={ 0.390000 0.620000 }
scale={ 0.090000 0.090000 }
depth=3.010000
}
instance={
position={ 0.200000 0.620000 }
scale={ 0.090000 0.090000 }
depth=4.010000
}
instance={
position={ 0.200000 0.390000 }
scale={ 0.090000 0.090000 }
depth=5.010000
}
instance={
position={ 0.750000 0.150000 }
scale={ 0.090000 0.090000 }
depth=6.010000
}
instance={
position={ 0.390000 0.140000 }
scale={ 0.090000 0.090000 }
depth=7.010000
}
}
colored_emblem={
color1=white
color2=white
color3=white
texture="ce_cinquefoil_01.dds"
instance={
position={ 0.200000 0.140000 }
scale={ 0.090000 0.090000 }
depth=8.010000
}
}
}
d_lubusz={
pattern="pattern_solid.dds"
color1=red

View file

@ -321,7 +321,9 @@ c_kittila={
instance={position={0.5 0.95} scale={1.35 1.35}}
}
colored_emblem={
color1=yellow
color1=black
color2=red
color3=white
texture="NEOW_ce_wolverine.dds"
instance={position={0.5 0.68} scale={0.88 0.88}}
}
@ -582,7 +584,6 @@ c_akkel={
}
}
c_skolt={
custom=yes
pattern="pattern_solid.dds"
color1=white
color2=black
@ -613,3 +614,300 @@ c_skolt={
instance={position={0.5 0.333} scale={0.666 0.666}}
}
}
k_finland = {
pattern="pattern_horizontal_split_01.dds"
color1=white
color2=white
colored_emblem={
color1=white
texture="ce_block_02.dds"
}
colored_emblem={
color1=white
color2=blue_light
texture="NEOW_ce_cross_nordic.dds"
}
}
d_finland={
pattern="pattern_solid.dds"
color1=red
color2=white
color3=red
colored_emblem={
color1=yellow
color2=white
color3=white
texture="ce_lion_rampant_crown_sword.dds"
instance={position={0.5 0.52} scale={0.89 0.89} depth=9}
}
colored_emblem={
color1=white
texture="ce_cinquefoil_01.dds"
instance={position={0.75 0.59} scale={0.1 0.1}}
instance={position={0.54 0.75} scale={0.1 0.1} depth=1}
instance={position={0.68 0.34} scale={0.09 0.09} depth=2}
instance={position={0.39 0.62} scale={0.09 0.09} depth=3}
instance={position={0.2 0.62} scale={0.09 0.09} depth=4}
instance={position={0.2 0.39} scale={0.09 0.09} depth=5}
instance={position={0.75 0.15} scale={0.09 0.09} depth=6}
instance={position={0.39 0.14} scale={0.09 0.09} depth=7}
}
colored_emblem={
color1=white
color2=white
color3=white
texture="ce_cinquefoil_01.dds"
instance={position={0.2 0.14} scale={0.09 0.09} depth=8}
}
}
c_nyland={
pattern="pattern_solid.dds"
color1=blue
color2=white
colored_emblem={
color1=white
color2=white
texture="ce_waves_03.dds"
instance={position={0.5 0.25} scale={1 0.75} rotation=315}
instance={position={0.5 0.75} scale={1 0.75} rotation=315}
}
colored_emblem={
color1=yellow
texture="ce_norse_longship.dds"
instance={scale={0.55 0.55}}
}
}
c_finland={
pattern="pattern_solid.dds"
color1=blue
color2=yellow
colored_emblem={
color1=yellow
texture="ce_letter_m.dds"
instance={scale={0.6 0.6}}
}
colored_emblem={
color1=white
texture="ce_fleur.dds"
instance={position={0.5 0.17} scale={0.25 0.25}}
instance={position={0.5 0.87} scale={0.25 0.25}}
instance={position={0.17 0.5} scale={0.25 0.25}}
instance={position={0.83 0.5} scale={0.25 0.25}}
}
}
c_aland={
pattern="pattern_solid.dds"
color1=blue
color2=yellow
colored_emblem={
texture="ce_stag.dds"
color1=yellow
color2=yellow
color3=black
}
}
c_satakunta={
pattern="pattern_horizontal_split_01.dds"
color1=blue
color2=yellow
colored_emblem={
color1=yellow
color2=grey
texture="ce_sword_simple.dds"
instance={position={0.34 0.345} scale={0.51 0.51} rotation=22}
}
colored_emblem={
color1=black
color2=red
color3=red
texture="ce_bear_rampant.dds"
instance={scale={0.85 0.85} position={0.5 0.6}}
}
colored_emblem={
color1=white
texture="ce_star_07.dds"
instance={position={0.225 0.165} scale={0.2 0.2}}
instance={position={0.775 0.165} scale={0.2 0.2}}
}
}
c_pirkanmaa={
pattern="pattern_solid.dds"
color1=red
color2=yellow
colored_emblem={
color1=yellow
color2=red
texture="NEOW_ce_urdy.dds"
}
}
c_kantahame={
pattern="pattern_solid.dds"
color1=red
color2=yellow
colored_emblem={
color1=yellow
color2=yellow
color3=red
texture="NEOW_ce_lynx.dds"
instance={position={0.5 0.475} scale={0.75 0.75}}
}
colored_emblem={
color1=white
color2=white
color3=grey
texture="ce_flower.dds"
instance={position={0.5 0.65} scale={0.15 0.15}}
instance={position={0.3 0.85} scale={0.15 0.15}}
instance={position={0.5 0.85} scale={0.15 0.15}}
instance={position={0.7 0.85} scale={0.15 0.15}}
}
colored_emblem={
color1=white
texture="ce_star_06.dds"
instance={position={0.2 0.14} scale={0.175 0.175}}
instance={position={0.5 0.14} scale={0.175 0.175}}
instance={position={0.8 0.14} scale={0.175 0.175}}
}
}
c_paijathame={
pattern="pattern_solid.dds"
color1=blue
color2=yellow
colored_emblem={
color1=yellow
color2=yellow
color3=yellow
texture="NEOW_ce_mermaid.dds"
instance={position={0.5 0.57} scale={0.89 0.89}}
}
colored_emblem={
color1=yellow
color2=yellow
color3=blue
texture="NEOW_ce_lark.dds"
instance={position={0.265 0.185} scale={0.245 0.245}}
}
}
c_jyvaskyla={
pattern="pattern_solid.dds"
color1=white
color2=yellow
color3=black
colored_emblem={
color1=black
color2=red
color3=white
texture="NEOW_ce_capercaillie.dds"
}
}
d_savo={
pattern="pattern_solid.dds"
color1=black
color2=yellow
colored_emblem={
color1=yellow
color2=white
texture="ce_bow.dds"
instance={rotation=45 position={0.5 0.45}}
}
}
c_kuopio={
pattern="pattern_solid.dds"
color1=black
color2=yellow
colored_emblem={
color1=yellow
color2=white
texture="ce_bow.dds"
instance={rotation=45 position={0.5 0.45}}
}
}
c_mikkeli={
pattern="pattern_solid.dds"
color1=black
color2=yellow
colored_emblem={
color1=yellow
color2=white
texture="ce_bow.dds"
instance={ position={0.45 0.45} rotation=135}
}
}
d_pohjanmaa={
pattern="pattern_solid.dds"
color1=blue
color2=white
colored_emblem={
color1=white
color2=black
color3=blue
texture="NEOW_ce_ermine_passant.dds"
instance={position={0.3 0.215} scale={0.6 0.6}}
instance={position={0.7 0.215} scale={0.6 0.6}}
instance={position={0.3 0.465} scale={0.6 0.6}}
instance={position={0.7 0.465} scale={0.6 0.6}}
instance={position={0.3 0.725} scale={0.6 0.6}}
instance={position={0.7 0.725} scale={0.6 0.6}}
}
}
c_oulu={
pattern="pattern_solid.dds"
color1=blue
color2=white
colored_emblem={
color1=white
color2=black
color3=blue
texture="NEOW_ce_ermine_passant.dds"
instance={position={0.3 0.215} scale={0.6 0.6}}
instance={position={0.7 0.215} scale={0.6 0.6}}
instance={position={0.3 0.465} scale={0.6 0.6}}
instance={position={0.7 0.465} scale={0.6 0.6}}
instance={position={0.3 0.725} scale={0.6 0.6}}
instance={position={0.7 0.725} scale={0.6 0.6}}
}
}
c_seinajoki={
pattern="pattern_solid.dds"
color1=blue
color2=white
colored_emblem={
color1=white
color2=black
color3=blue
texture="NEOW_ce_ermine_passant.dds"
instance={position={0.5 0.235} scale={0.75 0.75}}
instance={position={0.5 0.53} scale={0.75 0.75}}
instance={position={0.5 0.75} scale={0.75 0.75}}
}
}
c_vaasa={
pattern="pattern_horizontal_split_02.dds"
color1=red
color2=yellow
colored_emblem={
color1=red
color2=red
color3=yellow
texture="NEOW_ce_ermine_passant.dds"
instance={position={0.3 0.115} scale={0.35 0.35}}
instance={position={0.3 0.25} scale={0.35 0.35}}
instance={position={0.7 0.115} scale={0.35 0.35}}
instance={position={0.7 0.25} scale={0.35 0.35}}
}
colored_emblem={
color1=yellow
color2=yellow
texture="ce_grain.dds"
instance={position={0.5 0.65} scale={0.7 0.7}}
}
}
c_kainuu={
pattern="pattern_solid.dds"
color1=yellow
color2=green
colored_emblem={
color1=green
texture="NEOW_ce_kainuu_pattern.dds"
}
}