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.

Sign up for GitHub

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

Jump to bottom

Event pictures fixes #175

Merged
merged 3 commits into from
Aug 12, 2018
Merged

Event pictures fixes #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d1b06c
Event pictures fixes
IhateTrains Aug 10, 2018
3a729b1
More event pictures fixes
IhateTrains Aug 10, 2018
55c41b2
More event pictures fixes
IhateTrains Aug 12, 2018
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
2 changes: 1 addition & 1 deletion AncientReligions/events/ACR_britannic_events.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ character_event = {
id = britannic.7
desc = britannic.7.desc
picture = GFX_evt_pope_feast
border = GFX_evt_normal_frame_religion
border = GFX_event_normal_frame_religion

is_triggered_only = yes

Expand Down
4 changes: 2 additions & 2 deletions AncientReligions/events/ACR_celtic_flavor_events.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ character_event = {
character_event = {
id = celtic.208
desc = celtic.208.desc
picture = GFX_evt_whispering_in_ear
picture = GFX_evt_Whispering_in_ear
border = GFX_event_normal_frame_religion

min_age = 16
Expand Down Expand Up @@ -509,7 +509,7 @@ narrative_event = {
id = celtic.256
title = celtic.256.title
desc = celtic.256.desc
picture = GFX_event_y_mab_darogan
picture = GFX_evt_y_mab_darogan

major = yes
#show_ROOT = yes
Expand Down
4 changes: 2 additions & 2 deletions AncientReligions/events/ACR_hellenic_revival_events.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ character_event = {
character_event = {
id = hellenic.25
desc = hellenic.25.desc
picture = GFX_evt_hagia_sophia
picture = GFX_evt_hagia_sofia
border = GFX_event_normal_frame_religion

is_triggered_only = yes
Expand Down Expand Up @@ -1836,7 +1836,7 @@ narrative_event = {
character_event = {
id = hellenic.105
desc = hellenic.105.desc
picture = GFX_evt_whispering_in_ear
picture = GFX_evt_Whispering_in_ear
border = GFX_event_normal_frame_religion

min_age = 16
Expand Down
4 changes: 2 additions & 2 deletions AncientReligions/events/ACR_holy_orders.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ character_event = {
character_event = {
id = ancrel.9101
desc = ancrel.9101.desc
picture = GFX_EVT_warrior_banners
picture = GFX_evt_warrior_banners
border = GFX_event_normal_frame_religion

is_triggered_only = yes
Expand Down Expand Up @@ -348,7 +348,7 @@ letter_event = {
province_event = {
id = ancrel.9108
desc = ancrel.9108.desc
picture = GFX_EVT_castle_construction
picture = GFX_evt_castle_construction
border = GFX_event_normal_frame_religion

is_triggered_only = yes
Expand Down
2 changes: 1 addition & 1 deletion AncientReligions/events/ACR_other_event.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ character_event = {
character_event = {
id = ancrel.9024
desc = ancrel.9024.desc
picture = GFX_EVT_warrior_banners
picture = GFX_evt_warrior_banners

is_triggered_only = yes

Expand Down
2 changes: 1 addition & 1 deletion AncientReligions/events/ACR_promethean_events.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3550,7 +3550,7 @@ character_event = {
character_event = {
id = promethean.484
desc = promethean.484.desc
picture = GFX_evt_juggler #placeholder
picture = GFX_evt_jugglers #placeholder

trigger = {
has_character_modifier = holding_unbinding_festival
Expand Down
10 changes: 5 additions & 5 deletions AncientReligions/events/ACR_red_dragon_events.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ narrative_event = {
character_event = {
id = celtic.1320
desc = celtic.1320.desc
picture = GFX_EVT_warrior_banners
picture = GFX_evt_warrior_banners
border = GFX_event_normal_frame_religion

only_men = yes
Expand Down Expand Up @@ -259,7 +259,7 @@ character_event = {
character_event = {
id = celtic.1321
desc = celtic.1321.desc
picture = GFX_EVT_warrior_banners
picture = GFX_evt_warrior_banners
border = GFX_event_normal_frame_religion

is_triggered_only = yes
Expand Down Expand Up @@ -298,7 +298,7 @@ character_event = {
character_event = {
id = celtic.1322
desc = celtic.1322.desc
picture = GFX_EVT_warrior_banners
picture = GFX_evt_warrior_banners
border = GFX_event_normal_frame_religion

is_triggered_only = yes
Expand All @@ -324,7 +324,7 @@ character_event = {
character_event = {
id = celtic.1323
desc = celtic.1323.desc
picture = GFX_EVT_warrior_banners
picture = GFX_evt_warrior_banners
border = GFX_event_normal_frame_religion

is_triggered_only = yes
Expand Down Expand Up @@ -506,7 +506,7 @@ letter_event = {
province_event = {
id = celtic.1328
desc = celtic.1328.desc
picture = GFX_EVT_castle_construction
picture = GFX_evt_castle_construction
border = GFX_event_normal_frame_religion

is_triggered_only = yes
Expand Down
Binary file added AncientReligions/gfx/event_pictures/ACR/anubis.tga
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions AncientReligions/interface/ACR_druidic.gfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,11 @@ spriteTypes = {
texturefile = "gfx\\event_pictures\ACR\priests_in_forest.tga"
allwaystransparent = yes
}
spriteType = {
name = "GFX_evt_Ruler_listening_to_supplicant"
texturefile = "gfx\\event_pictures\\Ruler_listening_to_supplicant.tga"
allwaystransparent = yes
}

# Decision icons
spriteType = {
Expand Down
5 changes: 5 additions & 0 deletions AncientReligions/interface/ACR_egyptian.gfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,9 @@ spriteTypes = {
texturefile = "gfx\\event_pictures\ACR\maiden_egypt_pagan.tga"
allwaystransparent = yes
}
spriteType = {
name = "GFX_evt_anubis"
texturefile = "gfx\\event_pictures\ACR\anubis.tga"
allwaystransparent = yes
}
}
6 changes: 5 additions & 1 deletion AncientReligions/interface/ACR_hellenic.gfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ spriteTypes = {
}
spriteType = {
name = "GFX_hold_unbinding_festival"
texturefile = "gfx\\interface\decision_icon_hold_summer_fair.dds"
texturefile = "gfx\\interface\decision_icon_summerfair.dds"
}
spriteType = {
name = "GFX_rebuild_first_academy"
Expand Down Expand Up @@ -230,4 +230,8 @@ spriteTypes = {
name = "GFX_evt_artemis_moon"
texturefile = "gfx\\event_pictures\ACR\artemis_moon.tga"
}
spriteType = {
name = "GFX_evt_couple_by_firelight"
texturefile = "gfx\\event_pictures\ACR\couple_by_firelight.tga"
}
}