From bd23018cf564fe220a1530f407f04ad359d5cc09 Mon Sep 17 00:00:00 2001 From: Jesusalva Jesusalva Date: Sun, 16 Apr 2023 01:38:58 +0000 Subject: The Return of Blanc --- graphics/sprites/monsters/montblanc.png | Bin 0 -> 258910 bytes graphics/sprites/monsters/montblanc.xml | 14 ++++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 graphics/sprites/monsters/montblanc.png create mode 100644 graphics/sprites/monsters/montblanc.xml (limited to 'graphics/sprites') diff --git a/graphics/sprites/monsters/montblanc.png b/graphics/sprites/monsters/montblanc.png new file mode 100644 index 00000000..7a2ba0bb Binary files /dev/null and b/graphics/sprites/monsters/montblanc.png differ diff --git a/graphics/sprites/monsters/montblanc.xml b/graphics/sprites/monsters/montblanc.xml new file mode 100644 index 00000000..737324b6 --- /dev/null +++ b/graphics/sprites/monsters/montblanc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 80814137e13e2254555171449f0ed5d1e03e5da5 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Mon, 17 Apr 2023 23:17:55 +0000 Subject: SC_COOLDOWN_UPMARMU --- graphics/sprites/icons/spell-cooldown-upmarmu.png | Bin 0 -> 4851 bytes graphics/sprites/icons/spell-cooldown-upmarmu.xml | 9 ++++++++ license.md | 26 +++++++++++++++++++++- status-effects.xml | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 graphics/sprites/icons/spell-cooldown-upmarmu.png create mode 100644 graphics/sprites/icons/spell-cooldown-upmarmu.xml (limited to 'graphics/sprites') diff --git a/graphics/sprites/icons/spell-cooldown-upmarmu.png b/graphics/sprites/icons/spell-cooldown-upmarmu.png new file mode 100644 index 00000000..231e9599 Binary files /dev/null and b/graphics/sprites/icons/spell-cooldown-upmarmu.png differ diff --git a/graphics/sprites/icons/spell-cooldown-upmarmu.xml b/graphics/sprites/icons/spell-cooldown-upmarmu.xml new file mode 100644 index 00000000..a294ef98 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-upmarmu.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/license.md b/license.md index ef76d32c..d4dcf242 100644 --- a/license.md +++ b/license.md @@ -152,6 +152,7 @@ File | Artists | Licenses `graphics/items/equipment/charms/towel.png` | Bjorn | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/charms/manapearl.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 `graphics/items/equipment/charms/assassin-amulet.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/items/equipment/charms/darktalisman.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 #### Chest File | Artists | Licenses @@ -619,7 +620,10 @@ File | Artists | Licenses `graphics/particles/star-small.png` | Crush | GPLv2, CC BY-SA 3.0 `graphics/particles/waterfall-a.png` | Modanung | GPLv2, CC BY-SA 3.0 `graphics/particles/manapearl_4x4.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 - +`graphics/particles/snowflake-7x7.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/particles/snowflake-9x9.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/particles/hex-facet-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/particles/hex-facet-outline-50.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 ### Skills File | Artists | Licenses @@ -662,6 +666,21 @@ File | Artists | Licenses `graphics/sprites/icons/slow-poison.png` | Freeyorp101 | GPLv2, CC BY-SA 3.0 `graphics/sprites/icons/spell-haste.png` | Graingert | GPLv2 `graphics/sprites/icons/spell-protection-generic.png` | Freeyorp101 | GPLv2, CC BY-SA 3.0 +`graphics/sprites/icons/weight-big.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/weight-small.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-mg.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-mt.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-ench.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-koy.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-ar.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-ar-outline.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-r.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-r-outline.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-upmarmu.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-attack-generic-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/feather-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/hidden-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/invisible-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 #### Actor Models File | Artists | Licenses @@ -689,6 +708,7 @@ File | Artists | Licenses `graphics/sprites/equipment/weapons/wand-deathshand.png` | :grey_question:, Wombat, Wushin | GPLv2 `graphics/sprites/equipment/weapons/wand.png` | :grey_question:, Wushin | GPLv2 `graphics/sprites/equipment/weapons/beheader.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/equipment/weapons/sandcutter.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 `graphics/sprites/equipment/weapons/gun.png` | Skipy, Jesusalva | GPLv2 #### Chest @@ -919,6 +939,9 @@ File | Artists | Licenses `graphics/sprites/monsters/goblin-fire.png` | :grey_question:, Neoriceisgood | GPLv2 `graphics/sprites/monsters/goblin-ice.png` | :grey_question:, Neoriceisgood | GPLv2 `graphics/sprites/monsters/golem.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/golem-red.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/golem-blackcrystal.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/golem-crystal.png` | Hocus, HoraK-FDF | MIT, GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/larvespa.png` | Arikel | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/lizard.png` | Len, Pateame | GPLv2 `graphics/sprites/monsters/logmonster.png` | FotherJ | GPLv2, CC BY-SA 3.0 @@ -952,6 +975,7 @@ File | Artists | Licenses `graphics/sprites/monsters/snake.png` | :grey_question:, Neoriceisgood | GPLv2 `graphics/sprites/monsters/snowflower.png` | Salmondine | GPLv2 `graphics/sprites/monsters/spider.png` | FotherJ | GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/spider-crystal.png` | FotherJ, HoraK-FDF | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/spinning-scythe.png` | Nmaligec, Skipy | GPLv2 `graphics/sprites/monsters/spirit-demonic.png` | :grey_question:, Neoriceisgood, V0id | GPLv2 `graphics/sprites/monsters/squirrel.png` | FotherJ, Wombat | GPLv2, CC BY-SA 3.0 diff --git a/status-effects.xml b/status-effects.xml index cd08d2a7..a3c8c1c4 100644 --- a/status-effects.xml +++ b/status-effects.xml @@ -25,4 +25,5 @@ + -- cgit v1.2.3-70-g09d2 From aef5a308463414c4fa2317c7a2af7ffef73195a6 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 18 Apr 2023 01:10:34 -0300 Subject: This should do the trick --- graphics/sprites/monsters/floyd.png | Bin 185517 -> 196591 bytes graphics/sprites/monsters/golem-blackcrystal.png | Bin 1662811 -> 1671011 bytes graphics/sprites/monsters/golem-crystal.png | Bin 877115 -> 880134 bytes monsters.xml | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) (limited to 'graphics/sprites') diff --git a/graphics/sprites/monsters/floyd.png b/graphics/sprites/monsters/floyd.png index 9e8b787c..225b50e4 100644 Binary files a/graphics/sprites/monsters/floyd.png and b/graphics/sprites/monsters/floyd.png differ diff --git a/graphics/sprites/monsters/golem-blackcrystal.png b/graphics/sprites/monsters/golem-blackcrystal.png index be28544e..dd51c46e 100644 Binary files a/graphics/sprites/monsters/golem-blackcrystal.png and b/graphics/sprites/monsters/golem-blackcrystal.png differ diff --git a/graphics/sprites/monsters/golem-crystal.png b/graphics/sprites/monsters/golem-crystal.png index c564f850..c4aebd1e 100644 Binary files a/graphics/sprites/monsters/golem-crystal.png and b/graphics/sprites/monsters/golem-crystal.png differ diff --git a/monsters.xml b/monsters.xml index e718c51d..fcfd70a5 100644 --- a/monsters.xml +++ b/monsters.xml @@ -1584,7 +1584,7 @@ - model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5 + model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5 hairstyles/hairstyle27.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5 equipment/chest/leather.xml|W:#2a2117,2f2112,493219,61411e,724c22,a97e4f equipment/legs/pants.xml|W:#2a2117,2f2112,493219,61411e,724c22,a97e4f -- cgit v1.2.3-70-g09d2 From 6741c094ccdf8e8585296dbf5e59ec17c9db8120 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 21 Apr 2023 23:39:02 -0300 Subject: [skip ci] fix missing file from Evolved (required by sync bridge) --- graphics/sprites/monsters/pet-cat.png | Bin 0 -> 4768 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 graphics/sprites/monsters/pet-cat.png (limited to 'graphics/sprites') diff --git a/graphics/sprites/monsters/pet-cat.png b/graphics/sprites/monsters/pet-cat.png new file mode 100644 index 00000000..8c366c6e Binary files /dev/null and b/graphics/sprites/monsters/pet-cat.png differ -- cgit v1.2.3-70-g09d2 From 2274999364514b05d74b49a7806df98cb18dc35c Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 27 Apr 2023 23:38:49 -0300 Subject: Shipwreck + Rum --- graphics/items/use/food/rum.png | Bin 0 -> 824 bytes graphics/sprites/monsters/montblanc.xml | 3 ++- graphics/sprites/npcs/blanc.png | Bin 0 -> 258505 bytes graphics/sprites/npcs/blanc.xml | 9 +++++++++ items.xml | 9 +++++++++ npcs.xml | 3 +++ 6 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 graphics/items/use/food/rum.png create mode 100644 graphics/sprites/npcs/blanc.png create mode 100644 graphics/sprites/npcs/blanc.xml (limited to 'graphics/sprites') diff --git a/graphics/items/use/food/rum.png b/graphics/items/use/food/rum.png new file mode 100644 index 00000000..c6087107 Binary files /dev/null and b/graphics/items/use/food/rum.png differ diff --git a/graphics/sprites/monsters/montblanc.xml b/graphics/sprites/monsters/montblanc.xml index 737324b6..bdcc615a 100644 --- a/graphics/sprites/monsters/montblanc.xml +++ b/graphics/sprites/monsters/montblanc.xml @@ -1,12 +1,13 @@ + - + diff --git a/graphics/sprites/npcs/blanc.png b/graphics/sprites/npcs/blanc.png new file mode 100644 index 00000000..1d294db4 Binary files /dev/null and b/graphics/sprites/npcs/blanc.png differ diff --git a/graphics/sprites/npcs/blanc.xml b/graphics/sprites/npcs/blanc.xml new file mode 100644 index 00000000..34080d47 --- /dev/null +++ b/graphics/sprites/npcs/blanc.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/items.xml b/items.xml index 1c82c815..d58c4b9f 100644 --- a/items.xml +++ b/items.xml @@ -223,4 +223,13 @@ type="generic" weight="40" /> + + diff --git a/npcs.xml b/npcs.xml index 3e1c206c..0ac0e914 100644 --- a/npcs.xml +++ b/npcs.xml @@ -6,6 +6,9 @@ npcs/griffen-meway-gpl.xml + + + npcs/blanc.xml npcs/2006__npcs.xml -- cgit v1.2.3-70-g09d2