Commit graph

11471 commits

Author SHA1 Message Date
Tahsin Jahin Khalid
c79e742c62 WoF S3: fixed a typo
"recieve" --> "receive"
2022-01-20 00:45:41 +06:00
Tahsin Jahin Khalid
fff1fc5266 world conquest: fix for hp glitch when picking up items 2022-01-18 20:35:15 +06:00
Severin Schoepke
1dd8c60fc8 Fix typo: "with heavy loses" -> "with heavy losses" 2022-01-17 10:05:35 +11:00
Descacharrado
68453aa18f Fixed the possibility of a missplaces dialogue when a bridge was broken 2022-01-17 09:52:53 +11:00
Descacharrado
939a1b1a70
DM S14 Smooth undead appearance and add dialogue (#6429) 2022-01-17 09:48:40 +11:00
Descacharrado
3fad3f7cd9
UtBS S08 Kromph and Dust Devil able to trigger Eloh's event (#6428) 2022-01-17 09:44:44 +11:00
Elvish_Hunter
28012997d2 Removed no longer necessary {CLEAR_VARIABLE heal_amount} lines 2022-01-16 17:23:09 +01:00
Jonathan-Kelly
6acb7ec7bd
Winds of Fate (Drake campaign): add to mainline (#5831) 2022-01-16 04:06:12 -05:00
Descacharrado
040550f0a6 Solve OOS by moving code to synced event 2022-01-12 14:55:15 +01:00
Discontinuum
dc917e2404
Fix Winged Sceptre bug in WC
It only worsened defenses instead of only improving
2022-01-11 06:18:58 +04:00
Wedge009
1f662a7acd Spelling correction.
[ci skip]
2022-01-10 17:29:51 +11:00
Descacharrado
48c7ba7c28
UtBS S04 - enhance goblin leader trigger "how can he move that fast?" (#6427)
* enhance fast moving trigger
2022-01-10 17:16:28 +11:00
Tahsin Jahin Khalid
88897e0152 world conquest: correct era name and include Dunefolk in wocopedia description
Dunefolk were re-added and then later included in 3 new faction pairings for the master branch.
2022-01-09 04:59:54 +06:00
Wedge009
d1f3a195a2 Remove non-standard spacing and replace hyphen with em dash as per typography standards.
[ci skip]
2022-01-03 13:20:54 +11:00
Wedge009
b775ba81b8 Remove non-standard spacing.
[ci skip]
2022-01-03 13:08:01 +11:00
Wedge009
5a1dbc3d34 Remove non-standard spacing.
[ci skip]
2022-01-03 13:04:16 +11:00
Wedge009
807e48c33f Spelling correction.
[ci skip]
2022-01-03 12:40:36 +11:00
Steve Cotton
deb55fd1e9 NR S05a_01 Spelling correction for "our retreat is cut off" 2021-12-28 09:46:33 +01:00
Tahsin Jahin Khalid
c21dfcaeb4 world conquest: replace attack icon of ice-bow to something appropriate
It was rather humorous seeing a _cold_ ranged attack having the attack icon of lightning
2021-12-17 02:31:35 +06:00
Descacharrado
d4158a5869
UtBS S06b Look at the blown charges and make sure no units get stuck (#6369)
* Look at the blown charges and make sure no units get stuck
2021-12-09 09:56:58 +11:00
Descacharrado
74fa3d6127
UtBS S06b Fixed weird scout AI behaviour (#6368)
* Fixed weird ai behaviour
2021-12-09 09:55:21 +11:00
Wedge009
deee08fd5a
UtBS S9: Turn rebels into loyal units (#6371)
* Turn rebels into loyal units instead of just having zero upkeep costs for the scenario.

Resolves #6365.
2021-12-08 15:08:23 +11:00
newfrenchy83
eebc0dca81
fix Did advancement (#6359)
* fix Did advancement https://github.com/wesnoth/wesnoth/issues/6351

* move [modify_unit_type] in [campaign]

* revert a304bc105d
2021-12-08 15:02:10 +11:00
Wedge009
594f0cd293
UtBS S9: Avoid 'punishing' the player for saving the rebels (#6362)
* Avoid 'punishing' the player for avoiding bloodshed by giving rebels zero upkeep costs for the scenario upon reuniting with Kaleh's side.

Resolves #6229.

Co-authored-by: Descacharrado <Luis_koopa@hotmail.com>
2021-12-07 22:55:31 +11:00
Wedge009
ada454b20a Avoid counting encounters with 'Cloaked Figure'.
Resolves #6355.

The 'Cloaked Figure' that hounds Kaleh and friends can be encountered up to three times:
* S4 - guaranteed as his appearance is triggered by Kaleh entering the cave which is a scenario requirement.
* S5 - appearance is at a random turn during the battle between the dwarves and the trolls.
* S8 - final appearance is triggered when moving through the narrow passage.

It is possible to miss the encounter in S5 due to the randomised turn mechanic. Thus, it can be confusing when Kaleh says 'third time'.
This is just a quick work-around - another option may be to make the appearance in S5 more deterministic.

[ci skip]
2021-12-07 22:54:30 +11:00
Wedge009
378301722b Ensure humans are removed from display during their 'die' event. 2021-12-06 12:59:31 +11:00
Descacharrado
472e756599
UtBS S02 Added a ring icon for the immune unit (#6344)
* Added a ring icon for the immune unit
2021-12-06 12:59:10 +11:00
Descacharrado
2f37558f15
TRoW S19: Don't let units spawn on chasm 2021-12-05 17:48:01 -05:00
nemaara
cf18e8d4e0 DiD S3: fix whitespace 2021-12-04 19:15:05 -05:00
Descacharrado
e81cef3a08
Eastern Invasion and Liberty Bone Knight attack image (#6297)
* Added attack images for the Bone Knight's trample and Nightblade's kick
2021-12-05 09:35:06 +11:00
nemaara
2ab40cb192 TSG: revise storytext (fix #6132) 2021-12-04 15:09:16 -05:00
nemaara
1974405fc0 DiD S3: add some more flavor text 2021-12-04 15:05:12 -05:00
nemaara
a304bc105d DiD: don't remove loyal trait from Darken Volk (fix #6351) 2021-12-04 14:44:42 -05:00
Descacharrado
22e5a0adb7
UtBS Hide Dark Assassin's race until uncloacked (#6302) 2021-12-04 14:35:23 -05:00
Descacharrado
d0ee13455c
UtBS S06b: Improve Grog spawn 2021-12-04 14:32:41 -05:00
Wedge009
a4c4ad1268 Change capitalisation and update po hint as per post-merge discussion from #6198.
Committed on behalf of @Descacharrado.

[ci skip]
2021-12-04 08:47:19 +11:00
Descacharrado
ca6cafb88f Changed and documented the change of XP bar color to blue 2021-12-03 20:05:17 +11:00
Wedge009
fcc64cef59 Maintain consistency with existing backwards-compatibility for race=elf.
Also, CHECK_EXPLORER macro is redundant with race restriction in [filter].
2021-12-03 20:04:56 +11:00
Wedge009
a2a13c547e Restrict who remarks about the dark underground tunnels.
* Enforce Quenoth race to exclude Elyssa - it sounds strange for her to complain about the dark tunnels and then boast about her fireballs.
* Exclude Kaleh otherwise he can complain about the darkness and then tell himself 'we have no choice'.

Potentially could exclude Zhul as well, but it sounds fine if she complains about the darkness and then reminds Kaleh about the elves' disadvantage.
2021-12-03 20:04:56 +11:00
Descacharrado
d9ea4105a6
UtBS S02 Ogre now dissappears before Nym starts moving or talking (#6343)
* Ogre now dissappears before Nym starts moving/talks

* Changed the adjacency filter to fit the changes to the event

* Updated comment with a proper explanation of what occurs
2021-12-02 19:41:32 +11:00
Wedge009
4248738a38 Minor correction.
[ci skip]
2021-12-01 11:33:56 +11:00
Wedge009
a5f7d969aa Phrasing.
[ci skip]
2021-11-30 17:36:07 +11:00
Wedge009
f2203a48da Minor correction.
The statue Ras-Tabahn refers to is on the 'left' (west) from the player's perspective. However, the party is heading south, and still facing south, when this line is spoken.
Thus, the line really should say to 'our right'. Additionally, there is an animation of the statue being broken straight afterwards so it should be pretty unambiguous as to what is being referred to.

[ci skip]
2021-11-30 08:54:09 +11:00
Pentarctagon
370d03ccb7 Fix luacheck warnings and add to CI.
Note the `exclude_files` in .luacheckrc should be deleted once the eventual Ubuntu 22.04 base image has an updated luacheck that supports lua 5.4.
2021-11-28 14:26:02 -06:00
Pentarctagon
254716e41e Expand lua whitespace check. 2021-11-28 14:26:02 -06:00
Wedge009
aa6b45ee9f Ardonna should only call her own bats 'my pet'.
It's possible, however unlikely, for none of Ardonna's bats to have died before killing the hostile bats in 'Following the Shadow'.
In such a case, when the 'You can now raise bat corpses!' event triggers, Ardonna will still refer to the enemy bat as her 'pet' so add this condition to avoid it.
2021-11-27 12:39:22 +11:00
Wedge009
c1bca269cb Capitalise 'Sceptre of Fire'.
[ci skip]
2021-11-24 13:53:18 +11:00
Wedge009
10e99924b5 Capitalise references to the Academy of Magic on Isle of Alduin, for consistency.
Resolves #6310.

[ci skip]
2021-11-23 14:08:02 +11:00
Wedge009
dcb127ffee Avoid unnecessary wording.
[ci skip]
2021-11-23 13:08:58 +11:00
Wedge009
5cda4f8089 Correct scenario count for SoF.
Looks like scenario '2p5' introduced in #4609 wasn't included in the scenario count.

[ci skip]
2021-11-22 19:35:27 +11:00