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

Limit expedition amount #27

Open
wants to merge 2 commits into
base: main
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
96 changes: 48 additions & 48 deletions common/activities/activity_types/expedition.txt
Original file line number Diff line number Diff line change
Expand Up @@ -199,67 +199,67 @@ activity_expedition = {
AND = {
exists = barony
OR = {
barony = title:b_bellinzona # fortress_tomb_of_the_dead_emperor
barony = title:b_napoli # Volcanic forge
barony = title:b_gnezdovo # Ancient elf city ruins_of_valfuria
barony = title:b_rohan # spire citadel
barony = title:b_zweibrucken # proving fields

barony = title:b_ranariki #Rock Carvings of Tanum
barony = title:b_rounala
barony = title:b_torgar
barony = title:b_tommerup
barony = title:b_vaestraaros
barony = title:b_liinmaa
barony = title:b_stokkseyri
is_expedition_location_valid = { LOCATION = b_bellinzona } # fortress_tomb_of_the_dead_emperor
is_expedition_location_valid = { LOCATION = b_napoli } # Volcanic forge
is_expedition_location_valid = { LOCATION = b_gnezdovo } # Ancient elf city ruins_of_valfuria
is_expedition_location_valid = { LOCATION = b_rohan } # spire citadel
is_expedition_location_valid = { LOCATION = b_zweibrucken } # proving fields

is_expedition_location_valid = { LOCATION = b_ranariki } #Rock Carvings of Tanum
is_expedition_location_valid = { LOCATION = b_rounala }
is_expedition_location_valid = { LOCATION = b_torgar }
is_expedition_location_valid = { LOCATION = b_tommerup }
is_expedition_location_valid = { LOCATION = b_vaestraaros }
is_expedition_location_valid = { LOCATION = b_liinmaa }
is_expedition_location_valid = { LOCATION = b_stokkseyri }

barony = title:b_drogheda
barony = title:b_ennis
barony = title:b_salisbury
barony = title:b_kirriemuir
is_expedition_location_valid = { LOCATION = b_drogheda }
is_expedition_location_valid = { LOCATION = b_ennis }
is_expedition_location_valid = { LOCATION = b_salisbury }
is_expedition_location_valid = { LOCATION = b_kirriemuir }

barony = title:b_santander
barony = title:b_lamego
barony = title:b_almansa
barony = title:b_arles
is_expedition_location_valid = { LOCATION = b_santander }
is_expedition_location_valid = { LOCATION = b_lamego }
is_expedition_location_valid = { LOCATION = b_almansa }
is_expedition_location_valid = { LOCATION = b_arles }

barony = title:b_oskol
is_expedition_location_valid = { LOCATION = b_oskol }

barony = title:b_alexandria
is_expedition_location_valid = { LOCATION = b_alexandria }

barony = title:b_malta
barony = title:b_athens
barony = title:b_jarabulus
is_expedition_location_valid = { LOCATION = b_malta }
is_expedition_location_valid = { LOCATION = b_athens }
is_expedition_location_valid = { LOCATION = b_jarabulus }

barony = title:b_at-tib
barony = title:b_sarsar
barony = title:b_sirhan
is_expedition_location_valid = { LOCATION = b_at-tib }
is_expedition_location_valid = { LOCATION = b_sarsar }
is_expedition_location_valid = { LOCATION = b_sirhan }

barony = title:b_erandol
barony = title:b_madurai
barony = title:b_bokainagar
is_expedition_location_valid = { LOCATION = b_erandol }
is_expedition_location_valid = { LOCATION = b_madurai }
is_expedition_location_valid = { LOCATION = b_bokainagar }

barony = title:b_hamadat_tinghert
barony = title:b_mara
barony = title:b_tabu
is_expedition_location_valid = { LOCATION = b_hamadat_tinghert }
is_expedition_location_valid = { LOCATION = b_mara }
is_expedition_location_valid = { LOCATION = b_tabu }

barony = title:b_chaka
barony = title:b_tekar
is_expedition_location_valid = { LOCATION = b_chaka }
is_expedition_location_valid = { LOCATION = b_tekar }

barony = title:b_suq-socotra # horn of africa
barony = title:b_south_jaz_murian
is_expedition_location_valid = { LOCATION = b_suq-socotra } # horn of africa
is_expedition_location_valid = { LOCATION = b_south_jaz_murian }

barony = title:b_luch # portal
barony = title:b_asmaak # North forest
barony = title:b_chuya # North forest
barony = title:b_arkhangelsk # North forest
is_expedition_location_valid = { LOCATION = b_luch } # portal
is_expedition_location_valid = { LOCATION = b_asmaak } # North forest
is_expedition_location_valid = { LOCATION = b_chuya } # North forest
is_expedition_location_valid = { LOCATION = b_arkhangelsk } # North forest

barony = title:b_biia # steppe
barony = title:b_fort_aleksandrovkiy # steppe maybe: https://en.wikipedia.org/wiki/Alexandrov_Kremlin
is_expedition_location_valid = { LOCATION = b_biia } # steppe
is_expedition_location_valid = { LOCATION = b_fort_aleksandrovkiy } # steppe maybe: https://en.wikipedia.org/wiki/Alexandrov_Kremlin

barony = title:b_laposbanya # central/east europe
barony = title:b_melnik
barony = title:b_aqmescit
is_expedition_location_valid = { LOCATION = b_laposbanya } # central/east europe
is_expedition_location_valid = { LOCATION = b_melnik }
is_expedition_location_valid = { LOCATION = b_aqmescit }
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions common/scripted_triggers/expedition_triggers.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
is_expedition_location_valid = {
barony = title:$LOCATION$

title:$LOCATION$ = {
trigger_if = {
limit = {
exists = var:expeditions_completed_here
}
var:expeditions_completed_here <= 5
}
}
}