From f53689eeb04d00f5697403e1730d472d398aa75e Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 14:13:31 +0000 Subject: Add new file --- graphics/items/equipment/weapons/legendwand.png | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 graphics/items/equipment/weapons/legendwand.png diff --git a/graphics/items/equipment/weapons/legendwand.png b/graphics/items/equipment/weapons/legendwand.png new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3-60-g2f50 From 1cd5f990d801837a871a331b647a4aea46c23114 Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 14:20:27 +0000 Subject: Delete legendwand.png --- graphics/items/equipment/weapons/legendwand.png | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 graphics/items/equipment/weapons/legendwand.png diff --git a/graphics/items/equipment/weapons/legendwand.png b/graphics/items/equipment/weapons/legendwand.png deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3-60-g2f50 From 88f6d43e4de8f7ae3bddfc71bdd8ff79c6252aa6 Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 14:21:00 +0000 Subject: Upload legendwand.png for lvl 100 wand --- graphics/items/equipment/weapons/legendwand.png | Bin 0 -> 279 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 graphics/items/equipment/weapons/legendwand.png diff --git a/graphics/items/equipment/weapons/legendwand.png b/graphics/items/equipment/weapons/legendwand.png new file mode 100644 index 00000000..bd395647 Binary files /dev/null and b/graphics/items/equipment/weapons/legendwand.png differ -- cgit v1.2.3-60-g2f50 From 72cf958585e895ce13112f2e8b8732eeca4b1dde Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 14:27:02 +0000 Subject: Update ART_LICENSE for legendwand.png/Donald --- ART_LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ART_LICENSE b/ART_LICENSE index cf36aef5..f3660fc6 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -1,2 +1,3 @@ path/to/the/licensed/work.something (Author) (License) (Contributors/Authors/Co-Authors/Sources/etc.) - + + /graphics/items/equipment/weapons/legendwand.png CC0 Donald \ No newline at end of file -- cgit v1.2.3-60-g2f50 From 8d2043fbf918fb40f927faef06944721dc8b2bb0 Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 14:29:13 +0000 Subject: Update items.xml to change item id: 7004 image from woodenstaff.png to legendwand.png --- items.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items.xml b/items.xml index 036a8fdc..dec9fa82 100644 --- a/items.xml +++ b/items.xml @@ -7601,7 +7601,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml. equipment/weapons/weapon-staff.xml Date: Thu, 18 Jun 2020 14:37:59 +0000 Subject: Upload legend-wand.png for sprite use. REMINDER- add XML, Update License --- graphics/sprites/equipment/weapons/legend-wand.png | Bin 0 -> 9769 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 graphics/sprites/equipment/weapons/legend-wand.png diff --git a/graphics/sprites/equipment/weapons/legend-wand.png b/graphics/sprites/equipment/weapons/legend-wand.png new file mode 100644 index 00000000..69da512c Binary files /dev/null and b/graphics/sprites/equipment/weapons/legend-wand.png differ -- cgit v1.2.3-60-g2f50 From 141fadcab7dc286d241ddebb85515c531d5220ad Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 14:39:39 +0000 Subject: Add new file legend-wand.png XML added --- graphics/sprites/equipment/weapons/legendwand.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 graphics/sprites/equipment/weapons/legendwand.xml diff --git a/graphics/sprites/equipment/weapons/legendwand.xml b/graphics/sprites/equipment/weapons/legendwand.xml new file mode 100644 index 00000000..415f401c --- /dev/null +++ b/graphics/sprites/equipment/weapons/legendwand.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file -- cgit v1.2.3-60-g2f50 From 1711c56ab57becf7281e479d572fb6c28ea67a94 Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 14:42:04 +0000 Subject: Update items.xml update item id 7004 to use legendwand.xml for sprite --- items.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items.xml b/items.xml index dec9fa82..48ef1739 100644 --- a/items.xml +++ b/items.xml @@ -7610,7 +7610,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml. type="equip-2hand" attack-action="attack" weight="158"> - equipment/weapons/weapon-staff.xml + equipment/weapons/legendwand.xml Date: Thu, 18 Jun 2020 14:43:15 +0000 Subject: Update ART_LICENSE for legend-wand.png --- ART_LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ART_LICENSE b/ART_LICENSE index f3660fc6..0a30d1ec 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -1,3 +1,4 @@ path/to/the/licensed/work.something (Author) (License) (Contributors/Authors/Co-Authors/Sources/etc.) - /graphics/items/equipment/weapons/legendwand.png CC0 Donald \ No newline at end of file + /graphics/items/equipment/weapons/legendwand.png CC0 Donald + /graphics/sprites/equipment/weapons/legend-wand.png CC0 Donald \ No newline at end of file -- cgit v1.2.3-60-g2f50 From 43e1acd07185fc83f19b8a124f26a4dbdfc7ac67 Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 14:55:10 +0000 Subject: Update LICENSE lines 505 and 506 --- LICENSE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LICENSE b/LICENSE index 83f2fe57..24db43e8 100644 --- a/LICENSE +++ b/LICENSE @@ -502,6 +502,8 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/items/equipment/weapons/woodenstaff.png (?) (GPLv2) (tmw.org) graphics/items/equipment/weapons/woodensword.png (Len) (CC BY-SA 3.0) (Reid) graphics/items/equipment/weapons/zambacutou.png (?) (GPLv2) (tmw-br) + graphics/items/equipment/weapons/legendwand.png (CC0) (Donald) + graphics/sprites/equipment/weapons/legend-wand.png (CC0) (Donald) graphics/items/equipment/weapons/placeholder_revolver.png (TODO: DELETE ME)(GPL 2.0) (basse/InfraRed/FreedroidRPG) graphics/items/equipment/weapons/placeholder_gatling.png (TODO: DELETE ME) (GPL 2.0) (basse/InfraRed/FreedroidRPG) -- cgit v1.2.3-60-g2f50 From 566014ed1aff78f870dd7a687d19c2eba840a138 Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 15:14:55 +0000 Subject: Update LICENSE moved sprite to proper section, change license from cc0 to (CC BY-SA 3.0), added author name after both --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 24db43e8..c12f4458 100644 --- a/LICENSE +++ b/LICENSE @@ -502,8 +502,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/items/equipment/weapons/woodenstaff.png (?) (GPLv2) (tmw.org) graphics/items/equipment/weapons/woodensword.png (Len) (CC BY-SA 3.0) (Reid) graphics/items/equipment/weapons/zambacutou.png (?) (GPLv2) (tmw-br) - graphics/items/equipment/weapons/legendwand.png (CC0) (Donald) - graphics/sprites/equipment/weapons/legend-wand.png (CC0) (Donald) + graphics/items/equipment/weapons/legendwand.png (Donald) (CC BY-SA 3.0) (-) graphics/items/equipment/weapons/placeholder_revolver.png (TODO: DELETE ME)(GPL 2.0) (basse/InfraRed/FreedroidRPG) graphics/items/equipment/weapons/placeholder_gatling.png (TODO: DELETE ME) (GPL 2.0) (basse/InfraRed/FreedroidRPG) @@ -1581,6 +1580,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/sprites/equipment/weapons/weapon-staff-red.png (?) (GPLv2) (TMW-BR) graphics/sprites/equipment/weapons/woodenbow.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/equipment/weapons/woodensword.png (Alige, Reid) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/weapons/legend-wand.png (Donald) (CC BY-SA 3.0) (-) ### Hairstyles graphics/sprites/hairstyles/hairstyle01.png (Reid) (CC BY-SA 3.0) (-) -- cgit v1.2.3-60-g2f50 From 0628682dc729fa655e080a9cce67ec5eb3179030 Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 15:24:18 +0000 Subject: Update ART_LICENSE removed changed-Try pipeline again --- ART_LICENSE | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ART_LICENSE b/ART_LICENSE index 0a30d1ec..f5f73579 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -1,4 +1 @@ - path/to/the/licensed/work.something (Author) (License) (Contributors/Authors/Co-Authors/Sources/etc.) - - /graphics/items/equipment/weapons/legendwand.png CC0 Donald - /graphics/sprites/equipment/weapons/legend-wand.png CC0 Donald \ No newline at end of file + path/to/the/licensed/work.something (Author) (License) (Contributors/Authors/Co-Authors/Sources/etc.) \ No newline at end of file -- cgit v1.2.3-60-g2f50 From 6865694a6d0668dddc49f63cdeb1ecd39d6ba3bd Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 15:50:29 +0000 Subject: Update LICENSE TABULATIONS --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index c12f4458..8c9d1ccf 100644 --- a/LICENSE +++ b/LICENSE @@ -1580,7 +1580,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/sprites/equipment/weapons/weapon-staff-red.png (?) (GPLv2) (TMW-BR) graphics/sprites/equipment/weapons/woodenbow.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/equipment/weapons/woodensword.png (Alige, Reid) (CC BY-SA 3.0) (-) - graphics/sprites/equipment/weapons/legend-wand.png (Donald) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/weapons/legend-wand.png (Donald) (CC BY-SA 3.0) (-) ### Hairstyles graphics/sprites/hairstyles/hairstyle01.png (Reid) (CC BY-SA 3.0) (-) -- cgit v1.2.3-60-g2f50 From 8779ecb57a419fb82dc53a8603e36afaaf87cefa Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 15:51:42 +0000 Subject: Update LICENSE tabulations 2 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 8c9d1ccf..2673e363 100644 --- a/LICENSE +++ b/LICENSE @@ -1580,7 +1580,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/sprites/equipment/weapons/weapon-staff-red.png (?) (GPLv2) (TMW-BR) graphics/sprites/equipment/weapons/woodenbow.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/equipment/weapons/woodensword.png (Alige, Reid) (CC BY-SA 3.0) (-) - graphics/sprites/equipment/weapons/legend-wand.png (Donald) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/weapons/legend-wand.png (Donald) (CC BY-SA 3.0) (-) ### Hairstyles graphics/sprites/hairstyles/hairstyle01.png (Reid) (CC BY-SA 3.0) (-) -- cgit v1.2.3-60-g2f50 From 4488686980c0fc2d8342161c18572e18326569b8 Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 16:06:17 +0000 Subject: Delete legendwand.xml --- graphics/sprites/equipment/weapons/legendwand.xml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 graphics/sprites/equipment/weapons/legendwand.xml diff --git a/graphics/sprites/equipment/weapons/legendwand.xml b/graphics/sprites/equipment/weapons/legendwand.xml deleted file mode 100644 index 415f401c..00000000 --- a/graphics/sprites/equipment/weapons/legendwand.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file -- cgit v1.2.3-60-g2f50 From 08da6e156f08979c623a1a823aad4a0bf87b966c Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 16:07:01 +0000 Subject: Add new file rename, check format DONE --- graphics/sprites/equipment/weapons/legend-wand.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 graphics/sprites/equipment/weapons/legend-wand.xml diff --git a/graphics/sprites/equipment/weapons/legend-wand.xml b/graphics/sprites/equipment/weapons/legend-wand.xml new file mode 100644 index 00000000..a0c22d19 --- /dev/null +++ b/graphics/sprites/equipment/weapons/legend-wand.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file -- cgit v1.2.3-60-g2f50 From 522706bdae0fe28b3329ebaac666681c7d46a35b Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 18 Jun 2020 16:10:03 +0000 Subject: Update items.xml edit item 7004 legendary wand to reflect sprite filename change --- items.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items.xml b/items.xml index 48ef1739..35b8c120 100644 --- a/items.xml +++ b/items.xml @@ -7610,7 +7610,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml. type="equip-2hand" attack-action="attack" weight="158"> - equipment/weapons/legendwand.xml + equipment/weapons/legend-wand.xml