27571 Commits

Author SHA1 Message Date
Celtic Minstrel
d2734973ed Add a command-line option that makes deprecated Lua stuff evaporate 2021-02-16 20:40:18 -05:00
Celtic Minstrel
a019edb26c
Fix cave map generator producing passages along the map border
Maps are 0-indexed even in Lua (so that 1 ends up as the lowest passable coordinate), so subtract 1 here

Closes #5407
2021-02-16 13:46:01 -05:00
Elvish_Hunter
2a83e78a3c wmllint: don't try to collect WML tags inside Lua code
Fixes #5509
2021-02-16 16:18:53 +01:00
Celtic Minstrel
a0ee38a49a
Use to-be-closed variables to scope WML variables in tag definitions (#5536) 2021-02-15 21:11:56 -05:00
Celtic Minstrel
438b661494 Avoid map borders in cave generator
Addresses #5407
2021-02-15 18:35:54 -05:00
doofus-01
aef55dcc9e
UtBS Sc8 terrain graphics - Merge pull request #5547
UtBS - new terrain-graphics rules for flood water
2021-02-15 15:05:30 -08:00
Celtic Minstrel
7e699ca398 Fix a deprecate_api bug 2021-02-15 16:28:14 -05:00
Celtic Minstrel
c52b71bffd Add a deprecated declaration for unpack so that any older add-on code that uses it still works 2021-02-15 14:26:59 -05:00
doofus-01
d435ec3d0b campaigns - Add flood water to UtBS S8 2021-02-15 10:26:36 -08:00
Pentarctagon
7349ac65e0
lua unpack -> table.unpack
lua 5.4 apparently fully did away with the former.

Fixes #5546
2021-02-15 12:11:48 -06:00
doofus-01
625c41b93b terrain-graphics - small changes related to water transitions 2021-02-15 09:35:53 -08:00
Charles Dang
e28d0399b4 Updated schema for [campaign] background 2021-02-15 16:45:19 +11:00
nemaara
f179fdb35f TRoW: use background 2021-02-14 22:24:11 -05:00
nemaara
565fae7c5b NR: use background 2021-02-14 22:16:16 -05:00
nemaara
157ed152e7 Liberty: use background 2021-02-14 22:13:19 -05:00
nemaara
b6be6c8243 AToTB: use background instead of image 2021-02-14 22:06:06 -05:00
nemaara
3d08a2a0db DiD: use background instead of image 2021-02-14 21:54:33 -05:00
nemaara
e238f6e9e0 TRoW: rebalance pass 2021-02-14 21:38:49 -05:00
Iris Morelle
e12f08f58d UtBS: Revert incomplete gender swap in scenario 9
No need to break UMC for the sake of historical accuracy.
2021-02-14 23:30:54 -03:00
Iris Morelle
e03ebed407 website: New Year copyright update
[ci skip]
2021-02-13 23:08:03 -03:00
Pentarctagon
093db78cc7 Add the Plan Unit Advance modification to mainline. 2021-02-13 19:16:37 -06:00
Pentarctagon
53f9dbb51a Remove the Delay Advancements modification.
While implementationally it's very simple, the feedback so far (minimal as it may be) has been negative due to the side effects on existing gameplay mechanics:
* Delaying advancement until the next time it's the advancing unit's side's turn gives enemies a much larger window to kill the unit to prevent it from leveling up.
* The majority of units don't have multiple advancement options, so delaying their advancement as well isn't helpful.

Additionally, leaving this in for 1.16 would mean that it would not be possible to remove it in 1.17 or later without breaking any replays that did use it.
2021-02-13 19:16:37 -06:00
doofus-01
888edc85db
Units - minor fixes to Dunefolk - Merge pull request #5522
- Fix some sprite graphics configurations
 - Give mounted dunefolk the mounted undead variation
2021-02-13 12:54:25 -08:00
doofus-01
57d3539bfe units - make horse-based dunefolk have mounted undead variation 2021-02-13 10:05:16 -08:00
Steve Cotton
4a43d00522 Show a two-color tennis ball orb for the disengaged state (#5155)
As the disengaged state is part-way between the "partial" and "moved" states,
the orb has parts in each color. On the minimap these units are shown in the
partial color (which is also the color that would be used before this change).

This will match the mounted Quenoth units' "disengage" skill, when they
can still move but can't attack. It should also trigger for some UMC abilities
that get extra moves after a character attacks.

During testing, I found that TSG allows some of the bandits to attack on the
first turn of the bandit branch. There's no gameplay change there, but the orbs
make it much clearer that some units can still attack.

I think there are already too many preferences for orbs, so reused the existing
settings for the colors. A new "show disengaged orb" preference is added, which
when disabled shows the old partial orb instead.

Update the orb and ellipse sections of doc/manual/.

Notes about how I created the new orb image:

* create a color range to_ellipse_red with rgb=FF0000,FF0000,000000,FF0000
* wesnoth --render-image 'misc/orb.png~RC(magenta>to_ellipse_red)' images/misc/orb-ellipse-red.png
* open the orb.png and orb-ellipse-red.png images as layers in Gimp, add a layer mask to both of them
* use the layer mask to get each pixel from exactly one of the layers
2021-02-13 18:28:33 +01:00
Charles Dang
6bb854408c
Merge pull request #5521 from MrTitainin/patch-1
Fixed unstore_unit lua code (issue #5519)
2021-02-14 01:42:50 +11:00
MrTitainin
8db66e8551
Fixed lua [teleport] code
And changed [unstore_unit] to use table.unpack for shorter code
2021-02-11 19:45:21 +01:00
Andrey Bienkowski
09be367357 wmllint: Stop looking for wml tags inside [lua]
wmllint should not search for wml tags and keys inside [lua].
I caught it trying to add a _ in 23_Test_of_the_Clans inside a lua tag.
2021-02-11 18:10:39 +01:00
Steve Cotton
1d90f704b4 DM S19: Change one more "un-life" to "unlife" 2021-02-10 10:27:41 +01:00
Andrey Bienkowski
5d344526b0
Fix several typos in wml (#5525)
* Fix month typo and add months to dictionary

* typo s/cuttle fish/cuttlefish/

The phrase "cuttle fish" is not in wiktionary.org. The unit id used in WML is left as-is ("Cuttle Fish").

* typo s/carvans/caravans/

* add spelling ol’; fix typo s/ol/ol’/

* fix typo s/alloting/allotting/

* Typo? s/movepoints/movement points/

* Typo s/critized/criticized/

* Typo: s/un-life/unlife/

* DW: typo: s/veterens/veterans/

* SoF: typo: s/fulfil/fulfill/

* SoF typo: s/Thursagen/Thursagan/

* SotA typo: s/permanantly/permanently/

* SotA: possible typo s/Rastaban/Ras-Tabahn/

* THoT: typo s/Aiglondor/Aiglondur/

* Use a typographic-style quotation mark

* Undo month name change

* Change spelling un-life -> unlife
2021-02-10 10:23:12 +01:00
nemaara
3737a6d8b0
Merge pull request #5502 from hexagonrecursion/nr13
NR S13: make all player sides have turns in sequence
2021-02-08 23:02:43 -05:00
Steve Cotton
76036bba28 Editor help: make the named areas topic visible, make "to load ..." translatable
This corrects a pair of editing errors, thanks to Celerini for reporting them.

(cherry picked from commit e272e4824f8e369c9487dd69920919fe3d9b3f11)
2021-02-08 23:41:43 +01:00
Andrey Bienkowski
80d0783677 NR S13a: reduce Hamel's gold 2021-02-08 12:13:42 +03:00
Andrey Bienkowski
7754f3159b NR S13a: Change Hamel's side from AI to human 2021-02-07 15:53:28 +03:00
Eric Gallager
6ad4ee9b7b
Legend of Wesmere: update Cliffs of Thoria difficulty (#5497)
LoW S10: reduce difficulty
2021-02-07 04:50:35 -05:00
doofus-01
d3f94aaaa6 unit animations - fix wrong-facing glitch for units with animated torch flame overlay - also allow for ne facing standing animations 2021-02-06 15:11:53 -08:00
MrTitainin
add999b9d5
Fixed unstore_unit lua code (issue #5519)
x,y were both binding to whole table instead of their expected values
2021-02-06 16:10:59 +01:00
Michal Žejdl
3c41e55c5b change User to Custom to unify the help with the game 2021-02-03 19:12:07 -06:00
Andrey Bienkowski
6f237b7ac0 wc: markcheck off due to campaign-specific attrs
World_Conquest has a bunch of campaign-specific tags and attributes. This was causing wmllint to produce spurious errors (see below).
I suppressed the errors with markcheck off

"data/campaigns/World_Conquest/resources/data/training.cfg", line 305: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 519: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 533: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 549: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 565: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 580: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 596: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 620: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 652: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 681: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 692: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 702: info should not have a translation mark
"data/campaigns/World_Conquest/resources/data/training.cfg", line 727: info should not have a translation mark
2021-02-02 17:54:19 +01:00
Andrey Bienkowski
5cb1790669 Cleanup wmllint: display on/off
https://github.com/wesnoth/wesnoth/pull/5481 removed the check that made
wmllint: display on and wmllint: display off necessary.
This PR removes now redundant wmllint comments.

find ./data/ -name '*.cfg' -exec sed -ri '/^ *# *wmllint *:? *display *(on|off) *$/d; s/ *# *wmllint *:? *display *(on|off) *$//' '{}' ';'
2021-02-02 18:36:28 +03:00
Andrey Bienkowski
5826262023 wmllint: Only parse terrain strings if maptype==map 2021-02-02 15:41:34 +01:00
Andrey Bienkowski
5735a16abf wmllint: Ignore notes when checking for shroud and fog
The following line was causing a wmllint error because it contains _s:

Irs, book_start Icr^Ii, Irs

"../../data/campaigns/Descent_Into_Darkness/maps/07c_A_Small_Favor3.map", line 10: warning, fog or shroud in map file
2021-02-02 15:41:34 +01:00
Andrey Bienkowski
bbf3840f82 wmllint: cleanup two useless lines
As far as I can tell this lines do nothing.
1. `file_handle = None` is NOT how to close a file in python
2. The file handle is already closed due to `with open() as file_handle:`
2021-02-02 15:18:06 +01:00
Andrey Bienkowski
2296a17e5d wmllint: remove check for nonstandard word-wrap style
> I'm not convinced this test is doing anything useful. I really doubt this ever caught an error. I'd rather remove it.

@soliton- in https://github.com/wesnoth/wesnoth/pull/5479#issuecomment-763696081
2021-02-02 15:15:56 +01:00
Andrey Bienkowski
7a25c7f7d6 wmllint: remove outdated comment
This poor orphaned comment was left behind by 659f5d1894e400f60a1471816529512a5b23a2f4
2021-02-02 15:15:56 +01:00
nemaara
2540991364
HttT S14: fix no gryphon rider recruit bug 2021-01-31 20:53:42 -05:00
Andrey Bienkowski
63c71a010a
Move [color_range] id=darkblue to core (#5504)
Move [color_range] id=darkblue to core
2021-01-31 15:13:16 -06:00
Andrey Bienkowski
5032bed2b2 wmllint: remove commented out code 2021-01-31 15:09:11 -06:00
doofus-01
842725bcc1
orcish grunt sprite animations (#5506)
* units - orc grunt die anims (north and south)

* units - face-graft for orcish grunt defend frames
2021-01-31 11:28:28 -08:00
Eric Gallager
efefcd2284
Tweak Eastern Invasion difficulty (#5496)
EI: small tweaks
2021-01-26 03:49:58 -05:00