commit 34345487

Poul Sander · 2020-11-03 18:54
34345487107051eb786ebbdd6513761dcb46e037 patch · browse files
parent 4b0bb7a65c0850f0e991a28450dd3a3b1fc62d22

Add trash can icon

Changed files

A	data/sprites/kenny.sprite
M	data/textures/AUTH before
A	data/textures/kenny/license.txt
A	data/textures/kenny/sheet_white1x.png
M	src/saland/Game.cpp before

diff --git a/data/sprites/kenny.sprite b/data/sprites/kenny.sprite new file mode 100644 index 0000000..da1580f --- /dev/null +++ b/data/sprites/kenny.sprite

@@ -0,0 +1,12 @@

+ "icon_trash_can" : {

+ "texture" : "kenny/sheet_white1x",

+ "topx" : 100,

+ "topy" : 200,

+ "height" : 50,

+ "width" : 50,

+ "number_of_frames" : 1,

+ "originx" : 25,

+ "originy" : 25

+ }

diff --git a/data/textures/AUTH b/data/textures/AUTH index 20fe3a8..e91a8d3 100644 --- a/data/textures/AUTH +++ b/data/textures/AUTH

@@ -1,10 +1,9 @@

-effects/

-shot_fireball.png MSavioti (https://opengameart.org/content/firebal-32x32) (CC0 license)

-textures/

+effects/shot_fireball.png MSavioti (https://opengameart.org/content/firebal-32x32) (CC0 license)

food.png "[LPC] Foods" by bluecarrot16, Daniel Eddeland (daneeklu), Joshua Taylor, Richard Kettering (Jetrel), thekingphoenix, RedVoxel, and Molly "Cougarmint" Willits. See food.png.txt. (CC-BY-SA 3.0/GPL3)

gui_back_white.png Derived from UI pack by Kenney Vleugels (www.kenney.nl) (CC0 license)

gui_back_yellow.png Derived from UI pack by Kenney Vleugels (www.kenney.nl) (CC0 license)

menu_marked.png Derived from UI pack by Kenney Vleugels (www.kenney.nl) (CC0 license)

menu_unmarked.png Derived from UI pack by Kenney Vleugels (www.kenney.nl) (CC0 license)

+kenny/* Kenney Vleugels (www.kenney.nl) (CC0 license)

diff --git a/data/textures/kenny/license.txt b/data/textures/kenny/license.txt new file mode 100644 index 0000000..4914a6d --- /dev/null +++ b/data/textures/kenny/license.txt

@@ -0,0 +1,14 @@

+###############################################################################

+ Game icon pack by Kenney Vleugels (www.kenney.nl)

+ ------------------------------

+ License (CC0)

+ http://creativecommons.org/publicdomain/zero/1.0/

+ You may use these graphics in personal and commercial projects.

+ Credit (Kenney or www.kenney.nl) would be nice but is not mandatory.

+###############################################################################

\ No newline at end of file

diff --git a/data/textures/kenny/sheet_white1x.png b/data/textures/kenny/sheet_white1x.png new file mode 100644 index 0000000..c5723de

Binary files /dev/null and b/data/textures/kenny/sheet_white1x.png differ

diff --git a/src/saland/Game.cpp b/src/saland/Game.cpp index c887803..6bbe06d 100644 --- a/src/saland/Game.cpp +++ b/src/saland/Game.cpp

@@ -260,7 +260,7 @@ Game::Game() {

slot3.tile = 188;

slot3.type = SpellCursorType::tile;

Spell& slot9 = data->slot_spell.at(9);

- slot9.icon = "";

+ slot9.icon = "icon_trash_can";

slot9.name = "spell_clear_block";

slot9.type = SpellCursorType::tile;

}