Commit Graph

84820 Commits

Author SHA1 Message Date
Gothyoba
328aba1d85
Capitalize Unit Names in their Descriptions (#9892)
* Capitalize Unit Names in their Descriptions

* Uncapitalize stalwart in unit description

* Uncapitalize stalwart in masked unit description
2025-02-12 23:05:09 +11:00
Subhraman Sarkar
c5c7674cf5 units dialog (recruit): remove optional from error messages map 2025-02-12 15:09:16 +05:30
Subhraman Sarkar
2c6d5751c1 menu events (recruit): don't add empty error message to map 2025-02-12 14:52:03 +05:30
Gunter Labes
52c5a457e0
Fix building with xcode
No viable conversion from returned value of type 'basic_string<char, char_traits<char>, allocator<char>>' to function return type 'utils::optional<t_string>'
2025-02-12 09:15:34 +01:00
Subhraman Sarkar
730763f3bb units dialog and menu events: fix faulty recruit/recall logic (#9891) 2025-02-12 11:57:27 +05:30
Dalas121
818dcfb018
TDG: use improved saurian sprites by Refumee 2025-02-11 20:38:24 -06:00
newfrenchy83
4c06248c61 fix rect.cpp compilation
when i try to compile std::round not know
2025-02-11 14:37:53 -05:00
Gothyoba
89ef3ad2ac Capitalize both parts of Pirate Galleon in Unit Description
According to the typography style guide, both parts of unit names should be capitalized.
2025-02-10 15:26:12 -05:00
Charles Dang
458e12c83e Pango/Text: remove remnants of texture cache
Caching was removed in cf5cc8ec3f
2025-02-10 12:21:15 -05:00
Subhraman Sarkar
353e900151 titlescreen: fix tip source definition
was changed on Celes theme earlier, but not in Parchment (default)
2025-02-10 22:37:43 +05:30
Thewodoros
c029f6ee48
EI S09: fix minor bugs, code improvements (#9854)
* Remove STARTING_VILLAGES

There are no villages close enough anyway.

* Fix revealing villages

Use the coordinates of the ogre village instead of what probably were
two removed villages.

* Remove capture of non-existent village

There is no village at 32,13. The nearest one is at 36,11, and it is too
far for Mortic too reach in one turn, so they don't even try.

* Simplify human-meets-ogre event

Instead of repeatedly running FIND_NEARBY, use already assigned unit and
second_unit variables.

* Simplify ogre-meets-ogre event

Use already assigned "unit" variable and find another unit adjacent to
it.

* Fix bugs in Grug-meeets-ogre event

There were two bugs. First, calling FIND_NEARBY with $found_unit as an
argument causes a clash with its internal variable and leads to the
wrong (not nearest) unit being selected. Second, the last message used
$unit instead of $found_unit, which made Grug say this line instead of
the wild ogre.

* Use $this_item instead of $unit in foreach

To avoid clashes with $unit automatically assigned in other events.

* Fix clearing variables

Remove clearing variables that are not actually used, clean those which
are used. Remove elixir_drinker variable from the macro as we use the
trait instead.

* Use $x1, $y1 instead of $unit fields

Makes the code a bit shorter.

* Simplify drake sighted event

Replace FIND_NEARBY with simple condition.

* Rename variables

our_id to our_unit_id, their_id to their_unit_id
2025-02-11 03:58:38 +11:00
Gothyoba
f024347f86
THoT: Update Masked Dwarf Stats (#9844)
* Update Dwarvish Masked Fighter

* Update Dwarvish Masked Steelclad

* Update Dwarvish Masked Lord

* Update Dwarvish Masked Guardsman

* Update Dwarvish Masked Stalwart

* Update Dwarvish Masked Sentinel

* Update Dwarvish_Masked Thunderer

* Update Dwarvish Masked Thunderguard.cfg

* Update Dwarvish Masked Dragonguard

* Update Dwarvish Masked Berserker

* Extend Dwarvish Masked Steelcad Description

* Wrong unit

* Extend  masked steelclad description
2025-02-11 03:55:30 +11:00
Charles Dang
344d950e13 Rect: round the result of point_at
I'm not sure I want to keep this API, honestly, but this is the more proper behavior. Before I added precise_subrect, it partially fixed the precision issues I had with the new unit bar rendering.
2025-02-10 11:36:16 -05:00
Charles Dang
eb82ba7914 Font: remove some of the sdl ttf compat API 2025-02-10 11:35:05 -05:00
Charles Dang
0522df87eb Display: clean up use of deprecated API 2025-02-10 11:33:09 -05:00
Tahsin Jahin Khalid
7b61deaa5d
SotBE: S12: make loyalists AI smarter (#9849)
* SotBE: S12: make loyalists AI smarter

* SotBE S12: run wmlindent

to make it stop pestering me

* SotBE: add missing macro define

Just a temp define until the rework can be released

---------

Co-authored-by: Tahsin Jahin Khalid <5283677+knyghtmare@users.noreply.github.com>
2025-02-10 14:50:00 +06:00
Charles Dang
50f37266c5 Merge branch 'master' of github.com:wesnoth/wesnoth 2025-02-10 00:28:44 -05:00
Charles Dang
c64853bc76 Pango/Text: clean up some unnecessary state 2025-02-10 00:28:34 -05:00
Earth-Cake
3f2d8a8931 fix apostrophes 2025-02-10 16:28:29 +11:00
Earth-Cake
7baf7b6d54 remove unnecessary impassable terrain from 05a_01_The_Pursuit (closes #8586)
I don't see the point of these impassable tiles, especially the ones that are in the middle of the map blocking one tile
2025-02-10 16:28:29 +11:00
Earth-Cake
21ade40e3e make Elenia refer to Tallin as "lord" consistently + avoid using his title twice in the same sentence (closes #8501) 2025-02-10 16:28:29 +11:00
Earth-Cake
cb55e9fb01 filter whether Camerin is alive and alter dialogue accordingly (closes #8499) 2025-02-10 16:28:29 +11:00
Earth-Cake
f204fa2cc0 fix bad dialogue when opening gates and filter for Tallin (closes #8493) 2025-02-10 16:28:29 +11:00
Charles Dang
fcbbabd646 GUI2/Main Menu: handle tip formatting in definition (fixes #9662) 2025-02-09 23:58:25 -05:00
Charles Dang
96f8e7604f GUI2/Canvas: accept the standard values for the family/face attribute
Ie, "script", "monospace", etc, instead of a specific font name.
2025-02-09 23:57:06 -05:00
Charles Dang
85f47f0a7e GUI2/Main Menu: make it easier to restore the tips panel
Resolves #9852
2025-02-09 19:47:41 -05:00
Gothyoba
3774da4d79 Fix achievement and scenario name inconsistency in TSG 2025-02-09 17:38:10 -05:00
Gothyoba
60af0f53ce
Green Isle Encyclopedia Tweaks (#9866)
* Tweaks to encyclopedia Green Isle section

* Tweak Oldwood description

* Tweaks based on Wedge’s suggestions

* Remove somewhat
2025-02-10 06:17:59 +11:00
Gothyoba
a4079d9deb
Add Dalas and Thewodoros to campaign maintenance section of EI (#9863) 2025-02-09 14:15:49 -05:00
Gothyoba
b0e7ca8f5d Change zookeeper to former maintainer of HttT
No contributions to HttT since 2018
2025-02-09 14:14:02 -05:00
Gothyoba
c8f83ced34 Change Fabi/Fendrin to former maintainer of LoW
No contributions since 2016
2025-02-09 14:13:49 -05:00
Gothyoba
38810f001c Change zookeeper to former maintainer of TRoW
No contributions to TRoW since 2018
2025-02-09 14:13:34 -05:00
Gothyoba
e97375e49e
TRoW S13: Fix Drake Dialogue Inconsistency (#9862)
* TRoW S13: Fix Drake Dialogue Inconsistency

Fixes #8263

Now uses Morogor dialect. Casters is an ancient word for human mentioned here: https://github.com/wesnoth/wesnoth/blob/master/data/campaigns/Winds_of_Fate/story/Morogor_Dialect.txt

* Implement Wedge's suggestions

* Fix missing id

* Replace casters with prey
2025-02-10 06:09:32 +11:00
Gunter Labes
0dd96c3e69
Put weather behind campaign define 2025-02-09 19:51:55 +01:00
Gunter Labes
4e84288941
Re-add accidentally removed translation mark 2025-02-09 18:18:55 +01:00
Gunter Labes
fe4c437abb
Update outdated comment 2025-02-09 18:16:10 +01:00
Nils Kneuper
6698791974 updated Italian translation 2025-02-09 17:54:26 +01:00
Tahsin Jahin Khalid
4a7eac3ad9
SotBE: add snow weather sfx to selected scenarios (#9832)
* sotbe: add snow weather sfx to selected scenarios

* SotBE: remove snow weather

the rationale is that the map is not fully snowed in...the snow is around to be 30% at most. So not needed.

---------

Co-authored-by: Tahsin Jahin Khalid <5283677+knyghtmare@users.noreply.github.com>
2025-02-09 21:33:54 +06:00
Dalas121
6b18d3b666
TDG: Improve Translatability (#9804)
An attempt to improve the translatability of TDG, following lessons learned from #9797
2025-02-09 09:31:17 -06:00
Gunter Labes
01fb39417e
Remove duplicates 2025-02-09 16:07:19 +01:00
Gunter Labes
5b8bb4f482
Fix wesnoth-revision target dependency changed in 553cacd88e 2025-02-09 16:07:19 +01:00
Dalas121
6765db5431
DM -> TDG translations cleanup (#9779)
Various minor changes to tools to better-support the addition of TDG.
2025-02-09 07:48:36 -06:00
Subhraman Sarkar
969027b99e Update Android dockerfile 2025-02-08 15:54:31 +05:30
Tahsin Jahin Khalid
218a737511
SotBE: update credits (#9867)
Co-authored-by: Tahsin Jahin Khalid <5283677+knyghtmare@users.noreply.github.com>
2025-02-08 15:23:32 +06:00
Nils Kneuper
32a3d95b91 updated Czech translation 2025-02-08 00:39:33 +01:00
Nils Kneuper
cb62e32c42 updated Spanish translation 2025-02-08 00:38:18 +01:00
Gothyoba
8ba6e06ea0 Consistently capitalize Lord in THoT S2 Text 2025-02-08 09:42:28 +11:00
Gothyoba
5152e25c2d THoT S4 Map: Aesthetic Revision 2025-02-08 09:38:06 +11:00
Gothyoba
2e8d304371
Improve Wose Shaman Description (#9793)
* Improve Wose Shaman Description

* Furthe Wose Shaman Description Improvements

* Rewrite Wose Shaman description

I tried incorporating some ideas from Dashomew into my own description

* Incorporate some of Dalas's description
2025-02-08 09:18:47 +11:00
Gothyoba
7f39b7a632
Add Wose Sapling Description (#9792)
* Add Wose Sapling Description

Fixes #7685

This issue I crated has been lying around for a very long time, so I thought I'd try my best to fix it.

* Reduce repetition slightly in Wose Sapling Description

* Incorporate Dala
2025-02-08 09:17:10 +11:00