[wesnoth-commits] [wesnoth/wesnoth] 4a43d0: Show a two-color tennis ball orb for the disengage...

Steve Cotton noreply at github.com
Sat Feb 13 17:28:51 UTC 2021


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 4a43d005226d329751e74e3ba6834d633db8623b
      https://github.com/wesnoth/wesnoth/commit/4a43d005226d329751e74e3ba6834d633db8623b
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2021-02-13 (Sat, 13 Feb 2021)

  Changed paths:
    M changelog.md
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    M data/core/help.cfg
    A data/core/images/help/orb-disengaged.png
    M data/game_config.cfg
    M data/gui/window/select_orb_colors.cfg
    M data/schema/core/config.cfg
    A doc/manual/images/orb-disengaged.png
    M doc/manual/manual.txt
    A images/misc/orb-two-color.png
    M src/display_context.cpp
    M src/display_context.hpp
    M src/game_config.cpp
    M src/game_config.hpp
    M src/gui/dialogs/select_orb_colors.cpp
    M src/gui/dialogs/select_orb_colors.hpp
    M src/preferences/general.cpp
    M src/preferences/general.hpp
    M src/units/drawer.cpp
    M src/units/orb_status.cpp
    M src/units/orb_status.hpp

  Log Message:
  -----------
  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





More information about the Commits mailing list