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

UtBS S05 Enforce encounter with the Cloaked Figure #6644

Merged
merged 3 commits into from
May 9, 2022
Merged

UtBS S05 Enforce encounter with the Cloaked Figure #6644

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
1ddd7f4
Enforce encounter with the Cloaked Figure
Descacharrado Apr 27, 2022
844e3ac
Revert "Avoid counting encounters with 'Cloaked Figure'."
Descacharrado Apr 30, 2022
ddcecb3
Merge branch 'master' into UtBS_S05_enforce_figure
Descacharrado May 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Sceptre of Fire
* S9: Allow Grypon Riders to complete the scenario (issue #6332)
* Under the Burning Suns
* S5: Enforce encounter with the Cloaked Figure (issue #6364)
* S8: Spawned units will now be unable to be blocked into walls (PR #6677)
### Editor
* Added some missing terrain groupings (issue #6643)
Expand Down
20 changes: 20 additions & 0 deletions data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@
# initialize starting variable
# create elf units
# create AI=guardian starting units
# initiate assassin trigger variable

#fires lighting central cavern
{ANIMATED_CAMPFIRE 31 32}
Expand Down Expand Up @@ -457,6 +458,8 @@
[/unit]
[/then]
[/if]

{VARIABLE assassin_triggered no}
[/event]

# starting events
Expand Down Expand Up @@ -2057,6 +2060,7 @@
[event]
name=call_assassin

first_time_only=yes
[store_locations]
[filter]
id=Kaleh
Expand All @@ -2065,6 +2069,8 @@
variable=dark_assassin_location
[/store_locations]

{VARIABLE assassin_triggered yes}

[unit]
type=Dark Assassin Cloaked
id=Cloaked Figure
Expand Down Expand Up @@ -2343,6 +2349,20 @@
animate=no
[/kill]

[if]
[variable]
name=assassin_triggered
equals=yes
[/variable]
[else]
[fire_event]
name=call_assassin
[/fire_event]
[/else]
[/if]

{CLEAR_VARIABLE assassin_triggered}

[switch]
variable=ally_race

Expand Down
4 changes: 2 additions & 2 deletions data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2422,7 +2422,7 @@
[/message]
[/event]

# Event 13: Encounter Cloaked Figure for (potentially) a third time
# Event 13: Encounter Cloaked Figure for a third time

[event]
name=moveto
Expand Down Expand Up @@ -2462,7 +2462,7 @@

[message]
speaker=Kaleh
message= _ "In Eloh’s name, not you again. Must I fight you another time?"
message= _ "In Eloh’s name, not you again. Must I fight you a third time?"
[/message]

[message]
Expand Down