28207 Commits

Author SHA1 Message Date
Tahsin Jahin Khalid
655dead2e0 [WC] run wmlindent on the WC factions directory 2021-10-29 16:36:52 +06:00
Tahsin Jahin Khalid
10a4de1647 [WC] adjusted empire faction pairs to reduce its weirdness 2021-10-29 16:34:54 +06:00
Tahsin Jahin Khalid
67fdcce6c9 [WC] included the aristocrats faction in WC era 2021-10-29 16:31:36 +06:00
Tahsin Jahin Khalid
fd7887d6a1 added the aristocrats faction 2021-10-29 16:30:55 +06:00
Celtic Minstrel
73983c7032 Lua: Fix nil-safety issues in location_set
Fixes #6231

(cherry picked from commit 1f32466782e9f6089825b26631002e4000b5f73e)
2021-10-29 11:56:43 +11:00
doofus-01
e2810bf96f SoF - S6 - fix #6146 and related side-storing issue causing auto-defeat (#6181)
(cherry picked from commit 57078c4eb7d38a8c606776571bf9781c974a554d)
2021-10-29 11:20:57 +11:00
doofus-01
bb05c1a9af 1.16 - terrain graphics variations and transitions (#6078)
* some tent variations

* dead great tree variations

* Stone tile (Irs) to water/swamp transition, and raise Irs transition layers over swamp water and underground paths

* change when muted-blue waterfalls are applied

(cherry picked from commit 06b7efd77cab54797f12543823382a6fb9a5d377)
2021-10-29 11:19:25 +11:00
doofus-01
3a78da72d3 1.16 sprint - naga stuff (#6076)
* various small image fixes

* naga zephyr defense anim

* naga high guard defense animation adjustment

(cherry picked from commit ca91280807bd5680b6b814d55d32968535407310)
2021-10-29 11:19:07 +11:00
doofus-01
9fb60ba160 1.16 Chasm terrain graphics updates (#6066)
* muted-blues waterfall for swamp-chasm transition

* touchups to snow-chasm transition images

(cherry picked from commit b34b8a9dcdc68f131cd3e8e809f0c74a98b93656)
2021-10-29 11:18:49 +11:00
doofus-01
615207c2ce 2p_Aethermaw - fix sprit decorations above fog
(cherry picked from commit 8042db88e917d3d58492cb4257d70ce5e4ddecda)
2021-10-29 11:18:35 +11:00
doofus-01
a4a5b60c14 Naga Sicarius sprite (#6056)
* update naga sicarius sprite, including attack/defense animations

(cherry picked from commit 9a36ff4d8c27d6747ea172944b20bb4462ad10c0)
2021-10-29 11:17:54 +11:00
doofus-01
61570bf5ab ran woptipng on the forest terrain images
(cherry picked from commit 5643f97c3b79feeec3389a4fd615e499d62038ef)
2021-10-29 11:17:30 +11:00
doofus-01
0ff21793f3 lower isolated pine trees within image
(cherry picked from commit c658e3ed5ae666178080a4216f2bec96121aa3a8)
2021-10-29 11:17:30 +11:00
doofus-01
6b492a8d5c naga sprite animations (#6027)
* revised naga ophidian sprite, and added defense and attack animations

* ran woptipng

(cherry picked from commit 2ed26f609cba7c649c74fe9d5bcfa9fe1f5ec87b)
2021-10-29 11:16:08 +11:00
doofus-01
42ed29eeba August 8th animations (#6012)
* fix the naga dirkfang chakri sound timing

* naga ringcaster defense and attack animations

* ran woptipng.py

(cherry picked from commit 799d652e48ee1f23c26d1c35cb39dd95f21474cf)
2021-10-29 11:15:24 +11:00
doofus-01
a933bd92ed 1.16 animation update 7/24 (#5980)
* naga shield guard mace attack anim, shield attack/def anims

* naga high guard defense anim

* naga guard - adjust some animation timings, and base frame

(cherry picked from commit f8c0f3c60da04d9b1b07b485c43e5689c44e059c)
2021-10-29 11:14:36 +11:00
doofus-01
17fd96b27e 1.16 - Troll defense animations (#5964)
* two-frame defense anim for troll warrior, grunt, rocklobber

* ran woptipng.py on the trolls directory

(cherry picked from commit ec44c3be73202da11ee17fc9bfcfe3691c7ee235)
2021-10-29 11:13:55 +11:00
doofus-01
bc4a615060 various animations (#5903)
* jinn attack animations

* fix some horse frames

(cherry picked from commit 4d414fa9c9fee9a19d06017c4f66e57ca47ff7bb)
2021-10-29 11:12:47 +11:00
Severin Glöckner
5ab0260577 WC2: unlock era
So it can be tested as well. Fix for PvP part in 6d29cd7
2021-10-27 08:52:32 +02:00
Severin Glöckner
ea1c1e65bf Campaign to load WC 4p 2021-10-27 08:28:51 +02:00
Severin Glöckner
66cd8a0e4f Scenario files for WC 4p 2021-10-27 08:28:41 +02:00
Severin Glöckner
7721e8af3a WC2: support 10th side on field 2021-10-27 08:27:16 +02:00
Severin Glöckner
ee42883f14 WC2: persist color in corner case when using the workaround
This happens if player 4 and another one choose the same color.
(They shouldn't do that to begin with, but they could)

In this case the workaround is also triggered and side 4 gets a new color.
That's fine.
Previously that would have caused side 4's color to change in each scenario,
thus it's now persisted as well.

The workaround is for the case a player chooss choose the same coklor as side 4.
2021-10-27 08:05:04 +02:00
Severin Glöckner
429be66b2e WC2: Add possibility to allow scenario downgrading later on
In difference to other files, this one cannot be changed later on during 1.16.
Because it is a Lua event, it is loaded on client side.

By defining the variable wc2_highest_player_side behaviour could still be switched during 1.16.

For the code to work, the scenarios must also be loaded.
Currently, only one of the three is loaded, the other scenario ids won't exist.
To load them, the code in WC_II_scenario.cfg would need to be changed on the hosting side to:

#ifdef CAMPAIGN_WC_3P
{WC2_SCENARIO_NEW scenario "WC_II_3p" {WC_II_CAMPAIGN_NAME_3P} 3}
{WC2_SCENARIO_NEW scenario "WC_II_2p" {WC_II_CAMPAIGN_NAME_2P} 2}
{WC2_SCENARIO_NEW scenario "WC_II_1p" {WC_II_CAMPAIGN_NAME_1P} 1}
#endif
2021-10-27 08:05:04 +02:00
Severin Glöckner
0f67ab905b WC2: Fix using the same variable for 2 things
Can't use wc2_player_count as condition after it is decreased.
2021-10-27 08:05:04 +02:00
Severin Glöckner
ecdeb7f656 WC2: Downgrade scenario from 4p to 3p
~ Part 2 ~

The player who lost his leader probably does not want to play anymore.
When the level is won, transition to the 3p version.
This could actually be done for all scenarios,
until reaching the 1p.
2021-10-27 08:05:04 +02:00
Severin Glöckner
d15bdced41 Update changelog, version number etc. for WC2 2021-10-27 08:05:04 +02:00
Severin Glöckner
dbc8632cc0 Unlock WC2 era for future scenario 2021-10-27 08:05:04 +02:00
Severin Glöckner
7609071a0f Allow one leader to die with > 3 players
~ Part 1 ~

That by itself is not yet useful, as the unit will be dead,
and have no recruits in the next level.

As of string freeze. add only an image and no message.
2021-10-27 08:05:04 +02:00
Severin Glöckner
2183cd5b8f Make "wc2_fix_colors" work with 4 player sides
This is the only place, where it mattered, that there is no reserved empty side for side 4.
For the dual role of side 4 being either an AI or a player side, it uses a workaround.
2021-10-27 08:05:04 +02:00
Severin Glöckner
4b454053c2 WC2: make carryover compatible with > 3 sides
wml.variables.wc2_player_count is set in a prestart event
this function is used in a recruit event
Thus we can rely on it being set
2021-10-27 08:05:03 +02:00
Severin Glöckner
8d89950249 WC2 Plot: make it independent of player sides 2021-10-27 08:05:03 +02:00
Severin Glöckner
29cc34d00f WC2 recall costs
It's fine to give this object also to remaining enemies.
(It's only unneccessary, as they are deleted afterwards.)
Though when side 4 is a human side it is useful.
2021-10-27 08:05:03 +02:00
Severin Glöckner
a2a7f19052 WC2: bonus points
In 1.14 it was 1 bonus point per player.
In the function 3 bonus points are hardcoded.
Reason is that wc2_player_count is not known in the first scenario.
Change to give 1 bonus per player in later scenarios, and assume 3 players for the first one.
2021-10-27 08:05:03 +02:00
Severin Glöckner
6f23d03482 WC2: Add placed units to the help 2021-10-27 08:05:03 +02:00
Severin Glöckner
36039702fe WC2: make era usable for PvP
still disabled though
2021-10-27 08:05:03 +02:00
Severin Glöckner
d12cf7d68c WC2: fix typo 2021-10-27 08:05:03 +02:00
kabachuha
e02e933f41 SoF 2p5: add forgoten defeat condition on Alanin's death 2021-10-27 01:34:12 +03:00
Iris Morelle
76b83e623d
gui2/addon_manager: Move Search to the top right on small resolutions 2021-10-26 18:29:34 -03:00
Iris Morelle
58f5bc3bbb
tutorial: Use Delfador's mentoring portrait for the menu 2021-10-26 16:49:15 -03:00
Charles Dang
8fe95f2876 GUI2: increased listbox header toggle heights
Removed borders in the campaign dialog usage to compensate.
2021-10-26 02:14:29 -04:00
Steve Cotton
77cb1de312 SotA S02: fix the missing hint lines 2021-10-25 08:39:20 +02:00
Steve Cotton
d1bd5991cf
SotA S02: Add l10n hints about temple label and bats (#6224)
The lines about bats were converted to typographic quotes in 3fcba6aa, so this
could be cherry-picked to the 1.16 branch along with that (but shouldn't be
cherry-picked without it).
2021-10-25 04:56:49 +02:00
Nils Kneuper
b9dac981c5 updated Finnish translation credits 2021-10-23 12:17:32 +02:00
Pentarctagon
b07135af7c
Fixup 1.16 trailer credits. 2021-10-22 23:40:16 -05:00
Pentarctagon
90aa62b9d8
Add 1.16 trailer to credits. 2021-10-22 22:28:13 -05:00
Wedge009
3ff8afa160 Minor correction.
Was written 13 years ago. While 'the many' could be acceptable as well, there is no precedent for its use elsewhere in this dialogue. Plus the prior sentence just says 'some'.

[ci skip]
2021-10-23 10:16:47 +11:00
newfrenchy83
b68e858526
Have the names of the abilities used as weapons show in the attack dialog window when apply_to=opponent (#6110)
If a weapon with apply_to=opponent is used, this name will appear in the opponent attack affected.
2021-10-20 16:27:01 -05:00
Descacharrado
a292afe183
AToTB S01 and S02 mercenary spawn overhaul (#6186)
* Fix for #6183
2021-10-19 22:52:56 +02:00
Wedge009
96756a7583 Minor correction.
[ci skip]
2021-10-18 16:58:29 +11:00