Commit graph

11471 commits

Author SHA1 Message Date
gfgtdf
78c2f2e954 DM: S20: Fix waittime at scenario start
Don't animate unit advancements during a prestart event.

It woudl be better it u:advance() would automaticialyl not waste time animating advancements that can't be seen (during prestart events) but for this scenario this is already an improvement

(cherry picked from commit e549b03412)
2024-12-12 10:53:22 +11:00
Thewodoros
9f1bea517c Fix the attack_end event in Liberty S5
The event has to use side 3 because side 2 is idle. Also remove the dollar sign because IF_VAR doesn't work with it.

(cherry picked from commit ae5b2f0da6)
2024-10-31 10:27:22 +11:00
Elvish_Hunter
0e693b8077 Add sprite for the Cold Dagger item to UtBS (#9189)
* Add sprite for cold dagger item

* UtBS 04: use cold dagger sprite

* Update copyrights.csv for the cold dagger sprite
2024-08-13 22:54:02 +02:00
Gunter Labes
fa1b943bac
Fix filter attribute name 2024-08-11 15:24:21 +02:00
Steve Cotton
9984f63f92 HttT S17 Don't erase castles from other leaders
The random map generator can generate starting locations so close that
ERASE_CASTLE removed not just the intended castle, but also the keep
of the nearby leader. To avoid that, create the castles after deciding
which leaders to remove.

The ERASE_CASTLE macro is obsolete; even for logic that erases
castles,  using location_id makes the code simple enough that a macro
isn't useful. However, as this change is being applied to 1.18, I'm
only adding a comment about it.
2024-08-10 18:10:56 +02:00
Wedge009
e6dd32b8e8 SotA S2: Avoid destroying unit potentially already occupying target hex. (Closes #9150)
(cherry picked from commit 12606e2fc5)
2024-08-07 09:01:36 +10:00
Oleksii
85324ae26c DM: S18 recall fix (#9118)
* DM S18 recall fix

* Update 18_The_Portal_of_Doom.cfg

* Update sides.cfg

(cherry picked from commit b372f9e9ae)
2024-07-23 15:41:28 +10:00
Dalas121
20e1989615 EI S12: fix Dra-Nak having inconsistent traits and portrait (#9113)
In EI S11, the player encounters an orcish warlord named Dra-Nak. If not killed in S11, he continues pursuing the player in S12, but the current S12 gives him different traits and a different portrait. This PR fixes the issue.
2024-07-19 20:32:18 -05:00
Dalas121
e8493cd807 EI S17b: fix buggy dynamic recruit list macro (#9105)
EI's S17b has a gold refund mechanic, allowing enemies to build up large gold reserves in certain situations.

When gold gets high, enemies are supposed to start recruiting higher-level units so they can spend it faster. The former implementation had some inconsistent issues; this should restore the intended behavior.
2024-07-19 20:32:18 -05:00
Dalas121
e940d62ba9 EI S04c: only award achievement if all prisoners escape (#9108)
EI's S04c has an achievement for rescuing all 6 prisoners. This achievement currently triggers even if prisoners die before escaping the scenario.
2024-07-19 20:32:18 -05:00
Dalas121
62df15b6c8 EI S99: prevent prisoner income if prisons are captured (#9112)
In EI's S99, you gain gold from defeating and capturing hostile drakes.  The drakes are physically moved to prison cells in the middle of the map.

Previously, the player could continue capturing drakes even if the prison cells were captured by enemies. This made it a strong strategy to abandon the center and turtle up in a corner of the map. Additionally, the prison cells stayed locked with prisoners inside.

This PR fixes this issue. This also adds 2 new strings; I'm planning to backport to 1.18.2, as this is arguably a bugfix.
2024-07-19 20:32:17 -05:00
Dalas121
2e2db9b4d1 EI S11, S99: prevent backdoor entrance into prison cells (#9114)
EI's S11 and S99 have prison cells, one of which has an unintended backdoor entrance via an unwalkable deep water river. Flying units are involved in these scenarios, and can possibly fly into the cells through this unintended backdoor.

This PR changes the map hexes from unwalkable to impassable.
2024-07-19 20:32:17 -05:00
Wedge009
cf7ceb6f24 SoF: Align masked dwarf portrait to the right, consistent with S9. Resolves #9008.
(cherry picked from commit c67d130507)
2024-07-06 11:45:18 +10:00
Steve Cotton
06c0caf910 HttT S17 Don't create lava near the Sceptre
The lava is supposed to stay away from the Sceptre itself.
However, 60d114b changed from using sceptre_x,sceptre_y to using
a location_id, and missed updating these macros.
2024-07-05 12:18:23 +02:00
Dalas121
2a54d4aaf1 Revert "EI S06b: revert string change for 1.18.1 freeze"
This reverts commit 6408559b02.
2024-06-10 19:17:22 -05:00
Dalas121
d1dd992d08 EI S10: add message about Owaec being able to recruit (#8987)
Owaec has a crown but little other indicator that he's a leader, and this scenario requires him to be used to recruit. Make it more obvious to the player.
2024-06-10 19:15:41 -05:00
Dalas121
c2a59869cf EI items: add [filter_second] to Sentinel Shield and set delay=0 (#8984)
Delay=0 fixes an annoying animation issue, as the default is delay=500.
2024-06-09 21:12:25 -05:00
Dalas121
08358a38db EI S13: fix gaoler rebuild breaking "free prisoner" events (#8980)
Formerly, EI S13 uses various Deathblades' max-moves status instead of [filter_second] for some reason. This breaks when deathblades get rebuild, which in the bug report was caused by the sentinel shield. Use [filter_second] instead.
2024-06-09 21:12:24 -05:00
Dalas121
6cc8b2e1e1 EI S11: drop equippable items when imprisoned (#8982)
This is thematic, and also prevents cheese with shield+dacyn and baneblade+gate
2024-06-09 21:12:24 -05:00
Dalas121
cfc85d63e2 EI S10, S11, S12: Dacyn difficulty tweaks (#8976)
Resolves #8969

In EI S10, Dacyn picks up a cursed amulet and his HP drops to 1. In EI S11, Dacyn remains on very low HP, and is surrounded by orcs. There's a convenient ford hex he can hide on and be protected, but several players did not notice this hex and complained about difficulty.

In S10, this commit also drops his XP to 0. 1) showing that the amulet interferes with his MoL-ing, and 2) preventing the player from deliberately AMLA-ing Dacyn in the next scenario (partially a difficulty issue, but mostly it's bad to punish blind playthroughs / reward foreknowledge).

In S11, this commit adds a gold pile on Easy/Normal hinting towards the hex, while on Easy Dacyn's HP is fully restored. Hard is unaffected.

In S12, this commit restores Dacyn's HP on Easy (since it would be odd if he had full HP S11 but low HP S12).
2024-06-09 21:12:24 -05:00
Dalas121
f880bbaec8 EI S09: fix Grug telling Gweddry he can recruit the wild ogres after having already done so (#8981) 2024-06-09 21:12:24 -05:00
Dalas121
1a3ed67ec2 EI S10: reduce difficulty on Easy/Normal (#8956)
https://www.reddit.com/r/wesnoth/comments/1d6a3e7/eastern_invasion_is_much_better_but_still_bad/

EI's S10 is overly hard on Normal, and especially on Easy (which is intended to be a very accessible difficulty). This PR increases the available gold and adds several villages, which aid in both defense and upkeep. This PR also drastically reduces the number of orcs on lower difficulties.

We also move Owaec to his keep to help imply his ability to recruit, and remove the related just-added [note] string to avoid violating 1.18.1 string freeze.
2024-06-09 10:54:30 -05:00
Dalas121
6408559b02
EI S06b: revert string change for 1.18.1 freeze
EI S06b objective strings were changed to be less misleading and more transparent. Revert this change, and re-implement after 1.18.1 releases and the string freeze is no longer in effect
2024-06-06 20:35:16 -05:00
newfrenchy83
b990c4c10b
Use type_adv_tree in some filters to support addons adding advancements to existing unit types (#8904)
Cherry-pick of 9dd2d5d94b
2024-06-05 11:50:46 +02:00
Steve Cotton
b1458835cc Fix the whitespace error 2024-06-02 15:15:29 +02:00
Dalas121
961a8d7835 EI: use "bonus objective" instead of "optional objective" (#8947)
"optional" may imply that the scenario will be completed once this objective is finished, which is not accurate for these scenarios.
2024-06-01 17:58:16 -05:00
Dalas121
ef4cf3d0ac EI S06b: clarify bonus objectives
https://forums.wesnoth.org/viewtopic.php?p=690528#p690528

Old verbiage suggested that the scenario would be won as soon as you moved any unit next to Yannic, and didn't give any indication that he'd need to be protected.
2024-06-01 17:57:57 -05:00
Dalas121
f4a1d25d3f EI S04b: add objective note regarding herb distribution.
S04b's alternative objective involves collecting herbs that semi-randomly spawn around the map, hidden under fog. Herbs spawn in all directions, but the map layout and scenario design can lead players to expect herbs to all be in the east. This objective note clarifies herb placement.

https://forums.wesnoth.org/viewtopic.php?t=57915
2024-05-24 20:21:28 -05:00
Dalas121
d5203c100d EI S06b: weaken eastern leader guards on lower difficulty
To complete EI's S06b, the player must fight through a necromancer and his bodyguards. Prior to this commit, the necromancer's bodyguards did not vary by difficulty, making Easy disproportionately difficult.

Other leaders do not need to be fought directly to win. In addition, this is an optional mission labeled as more difficult. Therefore, I haven't adjusted other leaders' guards' difficulty scaling.

https://forums.wesnoth.org/viewtopic.php?t=57915
2024-05-24 20:20:46 -05:00
Dalas121
d84ee4ae2d EI S17b: fix Mal-Ravanal pausing to capture villages
Many turns into EI S17b, a pre-existing lich changes sides and transforms into Mal-Ravanal.

Before this commit, this process would un-capture any villages previously captured by that side, causing Mal-Ravanal to waste turns retaking them.
2024-05-24 20:20:18 -05:00
Jonathan-Kelly
12aca1caa0 WoF S11: fix easy win AI exploit (#8774)
Fixes #8759
2024-05-25 09:36:14 +10:00
Jonathan-Kelly
437e6f4820 WoF: fix Lua type error with cast to number (#8773)
Lua was getting this variable without being told it is a number rather than a string. On some systems it is interpreted as a string which breaks this monster spawner code and throws Lua error messages onto the player's screen.
2024-05-25 09:35:55 +10:00
Dalas121
16db8c6dba EI: remove random traits from S16 townsfolk (#8896)
Units with traits may sometimes have quick and may sometimes not have quick. This causes civilians to randomly block certain castle hexes that the player can use to recruit.

Remove traits to prevent this random blocking. Increase MP 4->5 to prevent 2 castle hexes from always being blocked.
2024-05-22 18:27:35 -05:00
Dalas121
292dfd426a EI S09: add label to gold pile
EI's S09 has a small pile of gold some distance off the main path, visible through the shroud.

Without a label, players may over-commit units/upkeep to getting the gold without realizing it's only a small amount, and possibly worth skipping.
2024-05-22 18:27:16 -05:00
Earth-Cake
99d5190b79 liberty generals name achievement fix for dawn 2024-05-21 23:21:59 -05:00
Dalas121
1f3982d0f9 EI: Prevent Dacyn from using the Plague Staff (#8892)
Fixes #8885
2024-05-21 11:15:08 -05:00
Wedge009
98808019d0 Tutorial S2: Only trigger comment about the 'Dumbo' orc if it is still alive after the attack.
Addresses final point in #5544.

(cherry picked from commit ef13ea4565)
2024-05-21 14:53:40 +10:00
Dalas121
21ea192584 EI S04b: Prevent aswaldan herbs from stacking (#8859)
In "Ill Humors", 2 spawn regions for aswaldan herbs overlap, which can result in both spawning on the same hex without any special visual indicator.

Credit to PointMeAtTheDawn.
2024-05-07 17:53:42 -05:00
Dalas121
f927bb344a EI: s10 fix owaec being able to enter the sanctuary (#8850)
Fixes #8843
2024-05-05 09:19:13 -05:00
Earth-Cake
48cee23179 EI - changed undead variants from 'spider' to 'ant' (#8849) 2024-05-05 08:16:24 -05:00
Steve Cotton
8c83da78e2 EI: Add po hints about the plague staff 2024-05-03 17:05:01 +02:00
Tahsin Jahin Khalid
ebe5149dbc HttT S16: fix li'sar missing her unrenamable=yes (#8782)
* S16: fix li'sar missing her unrenamable=yes

* S16: add one more instance of unrenamable=yes
2024-04-27 12:59:29 +06:00
Jonathan-Kelly
320aa7bf88 SoF S7: fewer and slower enemy outriders
This is to counteract the swifter and deadlier Elvish Outrider after the 1.18 core unit balance changes.

(cherry picked from commit b3802f44ea)
2024-04-26 19:21:08 +02:00
newfrenchy83
fc87104995
Fix EI: Plague Staff Doesn't Gain Arcane Damage When Equipped After Holy Amulet
Fix #8745 by using ability instead of weapon special.
2024-04-24 12:51:45 +02:00
Dalas121
b91e5e2343 EI S12: prevent ogres from saying the final goodbye in "Evacuation" (#8761)
(cherry picked from commit 3dadec9cac)
2024-04-16 10:20:41 +10:00
Dalas121
f884868f2a EI: remove duplicate AMLAs (#8723)
Under some circumstances, units in EI could have their custom AMLAs listed multiple times in the advancement dialog.
2024-04-09 18:54:03 -05:00
Dalas121
f2c1ca464e EI: preserve XP when Dacyn receives scripted advancements (#8716)
* EI: retain experience when Dacyn advances to twilight mage
* EI: retain experience when Dacyn advances to fallen mage
2024-04-09 18:46:38 -05:00
Dalas121
b501342d3e EI: reduce Barrow/Pyre Wight vulnerability to arcane (#8715)
* Update Undead_Horse_Barrow_Wight.cfg arcane resist
* Update Undead_Horse_Pyre_Wight.cfg arcane resist
2024-04-09 18:25:05 -05:00
newfrenchy83
233295c35b
EI: Barrow Wight resistance against mixed damage type weapons
The Barrow Wight has the Shroud ability: "When defending, this unit has 50%
Fire and Arcane resistance." However, if the attack's original damage type
isn't Fire or Arcane, the Shroud ability fails to trigger. The Barrow Wight
takes massive Arcane damage (50% weakness) when defending against such attacks.

Because this is the stable branch, the API can't fix the root cause, which is
that ability filters don't consider the weapon's alternative damage type. This
adds tests to verify that the API still works as before, but changes the items
in EI that give units alternative damage types.
2024-04-04 14:15:14 +02:00
Wedge009
49d586a537 Revert "EI - show custom traits in help menu (#8652)"
This reverts commit 04d29f4e3b.
2024-04-03 16:12:45 +11:00