From a37c0142881c78f3232db3fa1c007c671a428d66 Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 12 Jul 2019 02:23:37 +0000 Subject: Large head model male by Saulc, USE IT ONLY for large hats! --- Sprites/model/usable/largeheadmodel-male.png | Bin 0 -> 4126 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/model/usable/largeheadmodel-male.png diff --git a/Sprites/model/usable/largeheadmodel-male.png b/Sprites/model/usable/largeheadmodel-male.png new file mode 100644 index 00000000..4007cc59 Binary files /dev/null and b/Sprites/model/usable/largeheadmodel-male.png differ -- cgit v1.2.3-70-g09d2 From c942d13d164cebdc9e0fa673319bbe449cdd4d4f Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 12 Jul 2019 02:29:27 +0000 Subject: lawncandy atempt by mishana CC-BY SA 3.0 --- Icon/usable/food/lawncandy.png | Bin 0 -> 2249 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/usable/food/lawncandy.png diff --git a/Icon/usable/food/lawncandy.png b/Icon/usable/food/lawncandy.png new file mode 100644 index 00000000..afd9ed07 Binary files /dev/null and b/Icon/usable/food/lawncandy.png differ -- cgit v1.2.3-70-g09d2 From 57b27ff6339c3fb6ec550610c329eb2b87db0e5b Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 12 Jul 2019 02:31:26 +0000 Subject: bandana_black by Axzell CC-BY SA 3.0 (must look at original licence credits) --- Sprites/Equipment/head/bandana_black.png | Bin 0 -> 1773 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/bandana_black.png diff --git a/Sprites/Equipment/head/bandana_black.png b/Sprites/Equipment/head/bandana_black.png new file mode 100644 index 00000000..82ce2f2d Binary files /dev/null and b/Sprites/Equipment/head/bandana_black.png differ -- cgit v1.2.3-70-g09d2 From 285bf045e8a56b505e3894ea75f2b67bf4bba343 Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 12 Jul 2019 02:31:43 +0000 Subject: bandana_blue by Axzell CC-BY SA 3.0 (must look at original licence credits) --- Sprites/Equipment/head/bandana_blue.png | Bin 0 -> 1730 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/bandana_blue.png diff --git a/Sprites/Equipment/head/bandana_blue.png b/Sprites/Equipment/head/bandana_blue.png new file mode 100644 index 00000000..f73cf20c Binary files /dev/null and b/Sprites/Equipment/head/bandana_blue.png differ -- cgit v1.2.3-70-g09d2 From a9e682826f6a22228e3e28ba081a657413d12caf Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 12 Jul 2019 02:32:02 +0000 Subject: bandana_gold by Axzell CC-BY SA 3.0 (must look at original licence credits) --- Sprites/Equipment/head/bandana_gold.png | Bin 0 -> 1818 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/bandana_gold.png diff --git a/Sprites/Equipment/head/bandana_gold.png b/Sprites/Equipment/head/bandana_gold.png new file mode 100644 index 00000000..a41d5a1e Binary files /dev/null and b/Sprites/Equipment/head/bandana_gold.png differ -- cgit v1.2.3-70-g09d2 From 75b35212490ad6231146fc7b86c9b7581964c2c4 Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 12 Jul 2019 02:32:18 +0000 Subject: bandana_green by Axzell CC-BY SA 3.0 (must look at original licence credits) --- Sprites/Equipment/head/bandana_green.png | Bin 0 -> 1817 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/bandana_green.png diff --git a/Sprites/Equipment/head/bandana_green.png b/Sprites/Equipment/head/bandana_green.png new file mode 100644 index 00000000..7f468882 Binary files /dev/null and b/Sprites/Equipment/head/bandana_green.png differ -- cgit v1.2.3-70-g09d2 From 1f9c7178a513ead4f311a13739c82c697b79074e Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 12 Jul 2019 02:35:09 +0000 Subject: glitter_fro by Axzell and his bro CC-BY SA 3.0 --- Sprites/Equipment/head/Glitter_Fro.png | Bin 0 -> 20001 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/Glitter_Fro.png diff --git a/Sprites/Equipment/head/Glitter_Fro.png b/Sprites/Equipment/head/Glitter_Fro.png new file mode 100644 index 00000000..d7d9c87f Binary files /dev/null and b/Sprites/Equipment/head/Glitter_Fro.png differ -- cgit v1.2.3-70-g09d2 From e88f2b4e5911c55f71183bda80b54c30634b1164 Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 12 Jul 2019 02:35:46 +0000 Subject: glitter_man by Axzell CC-BY SA 3.0 --- Sprites/Equipment/head/pirate_Lords_Hat_2017_new_2.png | Bin 0 -> 3194 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/pirate_Lords_Hat_2017_new_2.png diff --git a/Sprites/Equipment/head/pirate_Lords_Hat_2017_new_2.png b/Sprites/Equipment/head/pirate_Lords_Hat_2017_new_2.png new file mode 100644 index 00000000..57546d27 Binary files /dev/null and b/Sprites/Equipment/head/pirate_Lords_Hat_2017_new_2.png differ -- cgit v1.2.3-70-g09d2 From 6517daf92ce1567c258b8c3cb19b179ddc3c0206 Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 12 Jul 2019 02:39:01 +0000 Subject: info --- Sprites/Hairstyles/for pookie/readme.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Sprites/Hairstyles/for pookie/readme.md diff --git a/Sprites/Hairstyles/for pookie/readme.md b/Sprites/Hairstyles/for pookie/readme.md new file mode 100644 index 00000000..2a144c87 --- /dev/null +++ b/Sprites/Hairstyles/for pookie/readme.md @@ -0,0 +1,2 @@ +info: tawhat +license: contact saulc \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 5d264098cd135f60a5207476175714a9dc6a1537 Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 12 Jul 2019 02:40:40 +0000 Subject: forum banana --- Sprites/Npcs/3431mon_banana.png | Bin 0 -> 3996 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/3431mon_banana.png diff --git a/Sprites/Npcs/3431mon_banana.png b/Sprites/Npcs/3431mon_banana.png new file mode 100644 index 00000000..c2c589b7 Binary files /dev/null and b/Sprites/Npcs/3431mon_banana.png differ -- cgit v1.2.3-70-g09d2 From 8f4aa0d84d5328b99bdabc13097bea779de6ef90 Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 12 Jul 2019 08:52:04 +0000 Subject: [Update various license] Plz @jesusalva take a look at: where darkness.xcf come from ? br/lof/you? What is the license of art from magerage set? --- ART_LICENSE | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/ART_LICENSE b/ART_LICENSE index 1fdcea93..26df15b7 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -509,19 +509,44 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors Tilesets/xcf/signs_x2.xcf (?) (CC BY-SA 3.0) (Saulc) Tilesets/xcf/woodland_sand.xcf (?) (GPLv2) (TMW.org, Saulc) # WIP -## CCO Magerage +## CC0 - magerage - Miloslav Číž + WIP/CC0 - magerage - Miloslav Číž/object_button_1.png + WIP/CC0 - magerage - Miloslav Číž/object_button_2.png + WIP/CC0 - magerage - Miloslav Číž/object_lever_1.png + WIP/CC0 - magerage - Miloslav Číž/object_lever_2.png + WIP/CC0 - magerage - Miloslav Číž/object_lever_3.png + WIP/CC0 - magerage - Miloslav Číž/object_lever_4.png + WIP/CC0 - magerage - Miloslav Číž/object_lever_5.png + WIP/CC0 - magerage - Miloslav Číž/object_statue.png + WIP/CC0 - magerage - Miloslav Číž/object_teleport_input.png + WIP/CC0 - magerage - Miloslav Číž/object_teleport_output.png + WIP/CC0 - magerage - Miloslav Číž/switch.png + ## equipment ### chest + WIP/equipment/chest/atmwgc.png (tmw forum) + WIP/equipment/chest/awesomeBD.png (tmw forum) + WIP/equipment/chest/labcoat_20130603.png (bcs86) + WIP/equipment/chest/labcoat_female.png (Nard) (GPLv2) (-) ### feet + WIP/equipment/feet/progress.png ### head + WIP/equipment/head/RastHat.png (MAF-Ours) (CC BY-SA 3.0) (Saulc) + WIP/equipment/head/Samurai_helmet.png (MAF-Ours) (CC BY-SA 3.0) (Saulc) + WIP/equipment/head/indianset.png (MAF-Ours) (CC BY-SA 3.0) (-) ### weapon - + WIP/equipment/equipment/Brown Sword.png (Psychodelic) (GPLv2) (-) + WIP/equipment/equipment/Dark Red Sword.png (Psychodelic) (GPLv2) (-) + WIP/equipment/equipment/Red Speed Sword.png (Psychodelic) (GPLv2) (-) + WIP/equipment/equipment/hammer.png (meway) (GPLv2) (-) # Wallpaper Wallpaper/halloweenloginwallpaper_1024x768.png Wallpaper/login_wallpaper.xcf Wallpaper/login_wallpaper_niver.png Wallpaper/login_wallpaper_xmas.png + # graphics + graphics/darkness.xcf Every Francesco Miglietta under CC-BY-SA 3.0 mean HAL9000 -------------------------------------------------------------------------- -- cgit v1.2.3-70-g09d2 From 409832284ccaa4e1b0d0a4bbdf679de8550e91be Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 07:58:51 +0000 Subject: Deleted Npc/008-1/_import.txt --- Npc/008-1/_import.txt | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 Npc/008-1/_import.txt diff --git a/Npc/008-1/_import.txt b/Npc/008-1/_import.txt deleted file mode 100644 index b7797bf0..00000000 --- a/Npc/008-1/_import.txt +++ /dev/null @@ -1,8 +0,0 @@ -// Map 008-1: Hurnscald -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-1/_mobs.txt", -"npc/008-1/_warps.txt", -"npc/008-1/confused-tree.txt", -"npc/008-1/doors.txt", -"npc/008-1/mapflags.txt", -"npc/008-1/wateranimation.txt", -- cgit v1.2.3-70-g09d2 From 73734310927011eda8ac5271870f097de42c09e5 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 08:00:43 +0000 Subject: [skip ci] clean ART_LICENSE --- ART_LICENSE | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/ART_LICENSE b/ART_LICENSE index 26df15b7..9acc4d6a 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -257,24 +257,6 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors # Music -# NPC -## 008-1 -## 008-2-0 -## 008-2-1 -## 008-2-10 -## 008-2-11 -## 008-2-12 -## 008-2-13 -## 008-2-14 -## 008-2-2 -## 008-2-3 -## 008-2-4 -## 008-2-5 -## 008-2-6 -## 008-2-7 -## 008-2-8 -## 008-2-9 - # Rules ## Cave_indoor ## cave -- cgit v1.2.3-70-g09d2 From 3876ade831d9101efaab23f197cb36b32e6660a4 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 08:15:30 +0000 Subject: add onehanded icon license scratch --- ART_LICENSE | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ART_LICENSE b/ART_LICENSE index 9acc4d6a..20793828 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -243,6 +243,21 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors Icon/weapons/bow/curvedbow.png (David E. Gervais) (CC BY-SA 3.0) (-) Icon/weapons/bow/hunterbow.png (David E. Gervais) (CC BY-SA 3.0) (-) ### onehanded + Icon/weapons/onehanded/apprenticesword.png + Icon/weapons/onehanded/archangelsword.png + Icon/weapons/onehanded/assassinblade.png + Icon/weapons/onehanded/axe-hatchet.png + Icon/weapons/onehanded/barbarianaxe.png + Icon/weapons/onehanded/brassknuckles.png + Icon/weapons/onehanded/convictstone.png + Icon/weapons/onehanded/goldSword.png + Icon/weapons/onehanded/kitana3.png + Icon/weapons/onehanded/kitana_4.png + Icon/weapons/onehanded/raidersickle.png + Icon/weapons/onehanded/raidersword.png + Icon/weapons/onehanded/sheeth_on_side.png + Icon/weapons/onehanded/weapon-dagger-bronzesword-4.png + Icon/weapons/onehanded/with_sheeth.png ### tool ### twohanded ### xcf -- cgit v1.2.3-70-g09d2 From 897528e6338cf24617a81c0f1118d4275305fb11 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 08:19:28 +0000 Subject: remove caps --- Icon/weapons/tool/Pick.png | Bin 323 -> 0 bytes Icon/weapons/tool/pick.png | Bin 0 -> 323 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/weapons/tool/Pick.png create mode 100644 Icon/weapons/tool/pick.png diff --git a/Icon/weapons/tool/Pick.png b/Icon/weapons/tool/Pick.png deleted file mode 100644 index f3ecf605..00000000 Binary files a/Icon/weapons/tool/Pick.png and /dev/null differ diff --git a/Icon/weapons/tool/pick.png b/Icon/weapons/tool/pick.png new file mode 100644 index 00000000..f3ecf605 Binary files /dev/null and b/Icon/weapons/tool/pick.png differ -- cgit v1.2.3-70-g09d2 From bba735f590ff455b45ba312f9ce25b9e4a6230ff Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 08:24:33 +0000 Subject: add all tool icon licenses --- ART_LICENSE | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ART_LICENSE b/ART_LICENSE index 20793828..9b9d2def 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -259,6 +259,13 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors Icon/weapons/onehanded/weapon-dagger-bronzesword-4.png Icon/weapons/onehanded/with_sheeth.png ### tool + Icon/weapons/tool/doublehammer.png (David E. Gervais) (CC BY-SA 3.0) (-) + Icon/weapons/tool/fathammer.png (David E. Gervais) (CC BY-SA 3.0) (-) + Icon/weapons/tool/gianthammer.png (David E. Gervais) (CC BY-SA 3.0) (-) + Icon/weapons/tool/goldentrianglehammer.png (David E. Gervais) (CC BY-SA 3.0) (-) + Icon/weapons/tool/pick.png (David E. Gervais) (CC BY-SA 3.0) (-) + Icon/weapons/tool/steelpick.png (David E. Gervais) (CC BY-SA 3.0) (-) + Icon/weapons/tool/trianglehammer.png (David E. Gervais) (CC BY-SA 3.0) (-) ### twohanded ### xcf Icon/weapons/xcf/minerknife.xcf (Saulc) (CC BY-SA 3.0) (-) -- cgit v1.2.3-70-g09d2 From 30a073753481c314b41c722c8922df88cde9e9f4 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 09:06:56 +0000 Subject: Update ART_LICENSE Icon/weapons/twohanded/ and Icon/weapons/xcf --- ART_LICENSE | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ART_LICENSE b/ART_LICENSE index 9b9d2def..5155ec00 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -267,7 +267,15 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors Icon/weapons/tool/steelpick.png (David E. Gervais) (CC BY-SA 3.0) (-) Icon/weapons/tool/trianglehammer.png (David E. Gervais) (CC BY-SA 3.0) (-) ### twohanded + Icon/weapons/twohanded/basicspear.png (TMW BR) NEED FIX + Icon/weapons/twohanded/butterflynet.png (TMW BR) NEED FIX + Icon/weapons/twohanded/guntmwicon.png (skipy) (GPL v2) (-) + Icon/weapons/twohanded/heavypike.png (TMW BR) NEED FIX + Icon/weapons/twohanded/weapon-polearm-bardiche.png (TMW BR) NEED FIX + Icon/weapons/twohanded/weapon-polearm-dualspear.png (TMW BR) NEED FIX + Icon/weapons/twohanded/weapon-polearm-halberd.png (TMW BR) NEED FIX ### xcf + Icon/weapons/xcfknife.xcf (Saulc) (CC BY-SA 3.0) (-) Icon/weapons/xcf/minerknife.xcf (Saulc) (CC BY-SA 3.0) (-) # Lang -- cgit v1.2.3-70-g09d2 From a1dd3dd9e41b49d37c8d81d7573092eedda5e908 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 11:09:11 +0000 Subject: Caps letters removed --- Icon/weapons/Golden Sword.xcf | Bin 2152 -> 0 bytes Icon/weapons/Golden Sword2.png | Bin 1367 -> 0 bytes Icon/weapons/Knight's Sword.gif | Bin 216 -> 0 bytes Icon/weapons/goldensword.xcf | Bin 0 -> 2152 bytes Icon/weapons/goldensword2.png | Bin 0 -> 1367 bytes Icon/weapons/knightssword.gif | Bin 0 -> 216 bytes 6 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/weapons/Golden Sword.xcf delete mode 100644 Icon/weapons/Golden Sword2.png delete mode 100644 Icon/weapons/Knight's Sword.gif create mode 100644 Icon/weapons/goldensword.xcf create mode 100644 Icon/weapons/goldensword2.png create mode 100644 Icon/weapons/knightssword.gif diff --git a/Icon/weapons/Golden Sword.xcf b/Icon/weapons/Golden Sword.xcf deleted file mode 100644 index 1b95d662..00000000 Binary files a/Icon/weapons/Golden Sword.xcf and /dev/null differ diff --git a/Icon/weapons/Golden Sword2.png b/Icon/weapons/Golden Sword2.png deleted file mode 100644 index a81da9ec..00000000 Binary files a/Icon/weapons/Golden Sword2.png and /dev/null differ diff --git a/Icon/weapons/Knight's Sword.gif b/Icon/weapons/Knight's Sword.gif deleted file mode 100644 index 4beab79b..00000000 Binary files a/Icon/weapons/Knight's Sword.gif and /dev/null differ diff --git a/Icon/weapons/goldensword.xcf b/Icon/weapons/goldensword.xcf new file mode 100644 index 00000000..1b95d662 Binary files /dev/null and b/Icon/weapons/goldensword.xcf differ diff --git a/Icon/weapons/goldensword2.png b/Icon/weapons/goldensword2.png new file mode 100644 index 00000000..a81da9ec Binary files /dev/null and b/Icon/weapons/goldensword2.png differ diff --git a/Icon/weapons/knightssword.gif b/Icon/weapons/knightssword.gif new file mode 100644 index 00000000..4beab79b Binary files /dev/null and b/Icon/weapons/knightssword.gif differ -- cgit v1.2.3-70-g09d2 From 2969c706144030ea6afe01488b0e2481dbccaada Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 11:26:50 +0000 Subject: add all gumi maps license --- ART_LICENSE | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/ART_LICENSE b/ART_LICENSE index 5155ec00..68a4dfc3 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -278,10 +278,25 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors Icon/weapons/xcfknife.xcf (Saulc) (CC BY-SA 3.0) (-) Icon/weapons/xcf/minerknife.xcf (Saulc) (CC BY-SA 3.0) (-) -# Lang - # Maps ## GumiHurns + Maps/GumiHurns/008-1.png (gumi) (CC BY-SA 3.0) (-) + Maps/GumiHurns/008-1.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-0.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-1.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-10.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-11.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-12.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-13.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-14.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-2.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-3.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-4.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-5.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-6.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-7.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-8.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) + Maps/GumiHurns/008-2-9.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) # Minimaps -- cgit v1.2.3-70-g09d2 From 63e5cbac2b29822a707c5192e73063f6fedf4d9f Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 11:38:12 +0000 Subject: add Nivalis and complete tonori canyon license --- ART_LICENSE | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ART_LICENSE b/ART_LICENSE index 68a4dfc3..722ec124 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -297,6 +297,13 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors Maps/GumiHurns/008-2-7.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) Maps/GumiHurns/008-2-8.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) Maps/GumiHurns/008-2-9.tmx (gumi) (CC BY-SA 3.0) (TMW Legacy) +## Nivalis + Maps/Nivalis/ice passage - Monster King Hideout.tmx (LOF FIX) + Maps/Nivalis/ice passage - north area.tmx (LOF FIX) + Maps/Nivalis/ice passage.tmx (LOF FIX) + Maps/Nivalis/nivalis.tmx (Jesusalva) (GPL v2) (TMW) +## Tonori Canyon + Maps/Tonori Canyon/desert_labyrynth_private.rar (Saulc) (CC BY-SA 3.0) (-) # Minimaps -- cgit v1.2.3-70-g09d2 From 1075daadbacbc5df265468ea9e97c4da4e73b7a9 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 15:27:59 +0000 Subject: Delete chest-snakeplate-female.xml --- .../Equipment/chests/chest-snakeplate-female.xml | 103 --------------------- 1 file changed, 103 deletions(-) delete mode 100644 Sprites/Equipment/chests/chest-snakeplate-female.xml diff --git a/Sprites/Equipment/chests/chest-snakeplate-female.xml b/Sprites/Equipment/chests/chest-snakeplate-female.xml deleted file mode 100644 index 21ee5cbb..00000000 --- a/Sprites/Equipment/chests/chest-snakeplate-female.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3-70-g09d2 From 9fd7aaa01a0c51098d96b3dff61a31661f27ecfc Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 15:28:05 +0000 Subject: Delete chest-snakeplate-male.xml --- Sprites/Equipment/chests/chest-snakeplate-male.xml | 103 --------------------- 1 file changed, 103 deletions(-) delete mode 100644 Sprites/Equipment/chests/chest-snakeplate-male.xml diff --git a/Sprites/Equipment/chests/chest-snakeplate-male.xml b/Sprites/Equipment/chests/chest-snakeplate-male.xml deleted file mode 100644 index b387617d..00000000 --- a/Sprites/Equipment/chests/chest-snakeplate-male.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3-70-g09d2 From 4fd74d4f77633573c0b63d343691ee6ce382ec76 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 16:28:55 +0000 Subject: deleted evol website interface --- Interface/Evol website/Button_layers.xcf | Bin 236550 -> 0 bytes Interface/Evol website/Buttons.xcf | Bin 104247 -> 0 bytes Interface/Evol website/Download_button.xcf | Bin 343236 -> 0 bytes Interface/Evol website/Site_cpt.psd | 1 - 4 files changed, 1 deletion(-) delete mode 100644 Interface/Evol website/Button_layers.xcf delete mode 100644 Interface/Evol website/Buttons.xcf delete mode 100644 Interface/Evol website/Download_button.xcf delete mode 100644 Interface/Evol website/Site_cpt.psd diff --git a/Interface/Evol website/Button_layers.xcf b/Interface/Evol website/Button_layers.xcf deleted file mode 100644 index ca2a3983..00000000 Binary files a/Interface/Evol website/Button_layers.xcf and /dev/null differ diff --git a/Interface/Evol website/Buttons.xcf b/Interface/Evol website/Buttons.xcf deleted file mode 100644 index c3489e59..00000000 Binary files a/Interface/Evol website/Buttons.xcf and /dev/null differ diff --git a/Interface/Evol website/Download_button.xcf b/Interface/Evol website/Download_button.xcf deleted file mode 100644 index 1b72d8d5..00000000 Binary files a/Interface/Evol website/Download_button.xcf and /dev/null differ diff --git a/Interface/Evol website/Site_cpt.psd b/Interface/Evol website/Site_cpt.psd deleted file mode 100644 index a0b56826..00000000 --- a/Interface/Evol website/Site_cpt.psd +++ /dev/null @@ -1 +0,0 @@ -https://gitlab.com/evol/evol-media/blob/master/Web/Site_cpt.psd \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 66a1f25b0e84a35da341c551630e3910063361ed Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 16:29:33 +0000 Subject: Delete .gitkeep --- Interface/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Interface/.gitkeep diff --git a/Interface/.gitkeep b/Interface/.gitkeep deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3-70-g09d2 From 1b191ec81e5a7f786e6185ae3194badf19b5e835 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 16:35:40 +0000 Subject: Deleted all Gumi NPC --- Npc/008-1/_mobs.txt | 15 - Npc/008-1/_warps.txt | 13 - Npc/008-1/confused-tree.txt | 957 ------------------------------------------- Npc/008-1/doors.txt | 6 - Npc/008-1/mapflags.txt | 1 - Npc/008-1/wateranimation.txt | 9 - Npc/008-2-0/_import.txt | 5 - Npc/008-2-0/_savepoints.txt | 11 - Npc/008-2-0/_warps.txt | 4 - Npc/008-2-0/mapflags.txt | 1 - Npc/008-2-1/_import.txt | 5 - Npc/008-2-1/_savepoints.txt | 11 - Npc/008-2-1/_warps.txt | 4 - Npc/008-2-1/mapflags.txt | 1 - Npc/008-2-10/_import.txt | 4 - Npc/008-2-10/_warps.txt | 4 - Npc/008-2-10/mapflags.txt | 1 - Npc/008-2-11/_import.txt | 5 - Npc/008-2-11/_savepoints.txt | 20 - Npc/008-2-11/_warps.txt | 3 - Npc/008-2-11/mapflags.txt | 1 - Npc/008-2-12/_import.txt | 4 - Npc/008-2-12/_warps.txt | 4 - Npc/008-2-12/mapflags.txt | 1 - Npc/008-2-13/_import.txt | 5 - Npc/008-2-13/_savepoints.txt | 38 -- Npc/008-2-13/_warps.txt | 4 - Npc/008-2-13/mapflags.txt | 1 - Npc/008-2-14/_import.txt | 5 - Npc/008-2-14/_savepoints.txt | 11 - Npc/008-2-14/_warps.txt | 3 - Npc/008-2-14/mapflags.txt | 1 - Npc/008-2-2/_import.txt | 4 - Npc/008-2-2/_warps.txt | 6 - Npc/008-2-2/mapflags.txt | 1 - Npc/008-2-3/_import.txt | 4 - Npc/008-2-3/_warps.txt | 3 - Npc/008-2-3/mapflags.txt | 1 - Npc/008-2-4/_import.txt | 5 - Npc/008-2-4/_savepoints.txt | 11 - Npc/008-2-4/_warps.txt | 3 - Npc/008-2-4/mapflags.txt | 1 - Npc/008-2-5/_import.txt | 4 - Npc/008-2-5/_warps.txt | 3 - Npc/008-2-5/mapflags.txt | 1 - Npc/008-2-6/_import.txt | 4 - Npc/008-2-6/_warps.txt | 3 - Npc/008-2-6/mapflags.txt | 1 - Npc/008-2-7/_import.txt | 5 - Npc/008-2-7/_savepoints.txt | 11 - Npc/008-2-7/_warps.txt | 3 - Npc/008-2-7/mapflags.txt | 1 - Npc/008-2-8/_import.txt | 4 - Npc/008-2-8/_warps.txt | 3 - Npc/008-2-8/mapflags.txt | 1 - Npc/008-2-9/_import.txt | 5 - Npc/008-2-9/_savepoints.txt | 11 - Npc/008-2-9/_warps.txt | 3 - Npc/008-2-9/mapflags.txt | 1 - 59 files changed, 1261 deletions(-) delete mode 100644 Npc/008-1/_mobs.txt delete mode 100644 Npc/008-1/_warps.txt delete mode 100644 Npc/008-1/confused-tree.txt delete mode 100644 Npc/008-1/doors.txt delete mode 100644 Npc/008-1/mapflags.txt delete mode 100644 Npc/008-1/wateranimation.txt delete mode 100644 Npc/008-2-0/_import.txt delete mode 100644 Npc/008-2-0/_savepoints.txt delete mode 100644 Npc/008-2-0/_warps.txt delete mode 100644 Npc/008-2-0/mapflags.txt delete mode 100644 Npc/008-2-1/_import.txt delete mode 100644 Npc/008-2-1/_savepoints.txt delete mode 100644 Npc/008-2-1/_warps.txt delete mode 100644 Npc/008-2-1/mapflags.txt delete mode 100644 Npc/008-2-10/_import.txt delete mode 100644 Npc/008-2-10/_warps.txt delete mode 100644 Npc/008-2-10/mapflags.txt delete mode 100644 Npc/008-2-11/_import.txt delete mode 100644 Npc/008-2-11/_savepoints.txt delete mode 100644 Npc/008-2-11/_warps.txt delete mode 100644 Npc/008-2-11/mapflags.txt delete mode 100644 Npc/008-2-12/_import.txt delete mode 100644 Npc/008-2-12/_warps.txt delete mode 100644 Npc/008-2-12/mapflags.txt delete mode 100644 Npc/008-2-13/_import.txt delete mode 100644 Npc/008-2-13/_savepoints.txt delete mode 100644 Npc/008-2-13/_warps.txt delete mode 100644 Npc/008-2-13/mapflags.txt delete mode 100644 Npc/008-2-14/_import.txt delete mode 100644 Npc/008-2-14/_savepoints.txt delete mode 100644 Npc/008-2-14/_warps.txt delete mode 100644 Npc/008-2-14/mapflags.txt delete mode 100644 Npc/008-2-2/_import.txt delete mode 100644 Npc/008-2-2/_warps.txt delete mode 100644 Npc/008-2-2/mapflags.txt delete mode 100644 Npc/008-2-3/_import.txt delete mode 100644 Npc/008-2-3/_warps.txt delete mode 100644 Npc/008-2-3/mapflags.txt delete mode 100644 Npc/008-2-4/_import.txt delete mode 100644 Npc/008-2-4/_savepoints.txt delete mode 100644 Npc/008-2-4/_warps.txt delete mode 100644 Npc/008-2-4/mapflags.txt delete mode 100644 Npc/008-2-5/_import.txt delete mode 100644 Npc/008-2-5/_warps.txt delete mode 100644 Npc/008-2-5/mapflags.txt delete mode 100644 Npc/008-2-6/_import.txt delete mode 100644 Npc/008-2-6/_warps.txt delete mode 100644 Npc/008-2-6/mapflags.txt delete mode 100644 Npc/008-2-7/_import.txt delete mode 100644 Npc/008-2-7/_savepoints.txt delete mode 100644 Npc/008-2-7/_warps.txt delete mode 100644 Npc/008-2-7/mapflags.txt delete mode 100644 Npc/008-2-8/_import.txt delete mode 100644 Npc/008-2-8/_warps.txt delete mode 100644 Npc/008-2-8/mapflags.txt delete mode 100644 Npc/008-2-9/_import.txt delete mode 100644 Npc/008-2-9/_savepoints.txt delete mode 100644 Npc/008-2-9/_warps.txt delete mode 100644 Npc/008-2-9/mapflags.txt diff --git a/Npc/008-1/_mobs.txt b/Npc/008-1/_mobs.txt deleted file mode 100644 index e8835c09..00000000 --- a/Npc/008-1/_mobs.txt +++ /dev/null @@ -1,15 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-1: Hurnscald mobs -008-1,99,39,0,0 monster Manana Tree 1017,1,420000,240000 -008-1,100,42,0,0 monster Manana Tree 1017,1,420000,240000 -008-1,102,40,0,0 monster Manana Tree 1017,1,420000,240000 -008-1,105,41,0,0 monster Manana Tree 1017,1,420000,240000 -008-1,101,44,0,0 monster Manana Tree 1017,1,420000,240000 -008-1,104,43,0,0 monster Manana Tree 1017,1,420000,240000 -008-1,109,40,0,0 monster Manana Tree 1017,1,420000,240000 -008-1,108,42,0,0 monster Manana Tree 1017,1,420000,240000 -008-1,106,44,0,0 monster Manana Tree 1017,1,420000,240000 -008-1,109,44,0,0 monster Manana Tree 1017,1,420000,240000 -008-1,111,42,0,0 monster Manana Tree 1017,1,420000,240000 -008-1,112,44,0,0 monster Manana Tree 1017,1,420000,240000 -008-1,112,39,0,0 monster Manana Tree 1017,1,420000,240000 diff --git a/Npc/008-1/_warps.txt b/Npc/008-1/_warps.txt deleted file mode 100644 index 44b0db66..00000000 --- a/Npc/008-1/_warps.txt +++ /dev/null @@ -1,13 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-1: Hurnscald warps -008-1,105,76,0 warp #008-1_105_76 0,0,008-2-0,26,23 -008-1,102,79,0 warp #008-1_102_79 0,0,008-2-0,23,34 -008-1,88,71,0 warp #008-1_88_71 0,0,008-2-1,33,42 -008-1,90,66,0 warp #008-1_90_66 0,0,008-2-1,38,27 -008-1,65,55,0 warp #008-1_65_55 0,0,008-2-2,28,33 -008-1,89,58,0 warp #008-1_89_58 0,0,008-2-6,27,32 -008-1,101,55,0 warp #008-1_101_55 0,0,008-2-7,36,28 -008-1,121,71,0 warp #008-1_121_71 1,0,008-2-8,36,38 -008-1,72,68,0 warp #008-1_72_68 0,0,008-2-9,30,34 -008-1,102,69,0 warp #008-1_102_69 0,0,008-2-10,37,33 -008-1,110,56,0 warp #008-1_110_56 0,0,008-2-12,30,31 diff --git a/Npc/008-1/confused-tree.txt b/Npc/008-1/confused-tree.txt deleted file mode 100644 index 22d415e4..00000000 --- a/Npc/008-1/confused-tree.txt +++ /dev/null @@ -1,957 +0,0 @@ -// Evol scripts. -// Author: -// gumi -// Based on CrazyTree, originally made by: -// gumi -// pclouds -// veryape -// wushin -// Description: -// emulated confused tree prototype - -// ~t lowercase hot word regex - -008-1,84,63,0 script Confused Tree NPC_CONFUSED_TREE,14,14,{ - - function tree_panel { - if (!is_staff() && #Tree_Trusted == false) - { - narrator(l("You see a tree.")); - if (getq(HurnscaldQuests_Inspector) == 2) - { - select( - l("Have you seen anything strange lately?"), - l("Do you know anything about the recent robberies?")); - - narrator(S_FIRST_BLANK_LINE, - l("..."), - l("It doesn't reply.")); - } - close; - } - - function clear_db { - clear(); - mes(l("##BWARNING:##b you are about to permanently empty the quote database.")); - next(); - mes(l("Do you want to continue?")); - - select( - l("Abort!"), - l("Empty the quote DB")); - - if (@menu == 2) - { - .@sentence$ = "I am an idiot"; - mes(l("Please write the following sentence:")); - mes(""); - mesf(" ##B%s.", .@sentence$); - input(.@confirm$); - - if (!startswith(strtoupper(.@confirm$), strtoupper(.@sentence$))) { - mes(l("Invalid!")); - close; - } - - query_sql("TRUNCATE TABLE tree_quotes;"); - mes(l("Database erased.")); - next(); - } - - return; - } - - function list_commands { - clear(); - mes(l("To grab a quote:")); - mes(col(" ~grab ##Bplayer name##b", 7)); - next(); - mes(l("To get a quote:")); - mes(col(" ~quote anyone", 7)); - mes(col(" ~quote ##Bplayer name##b", 7)); - mes(col(" ~quote ##B#number##b", 7)); - next(); - mes(l("To remove a quote:")); - mes(col(" ~remove quote ##B#number##b", 7)); - mes(col(" ~remove last quote", 7)); - next(); - mes(l("Last seen:")); - mes(col(" ~seen ##Bplayer name##b", 7)); - next(); - mes(l("To ignore a player:")); - mes(col(" ~ignore ##Bplayer name##b", 7)); - next(); - mes(l("To unignore a player:")); - mes(col(" ~unignore ##Bplayer name##b", 7)); - next(); - - if (is_admin()) - { - mes(l("To trust a player:")); - mes(col(" ~trust ##Bplayer name##b", 7)); - next(); - mes(l("To de-trust a player:")); - mes(col(" ~untrust ##Bplayer name##b", 7)); - next(); - } - return; - } - - do - { - clear(); - setnpcdialogtitle(l("Tree Control Panel")); - mes(l("Oh noes! You found my secret backdoor!")); - next(); - mes(l("Please select an option:")); - - select( - l("List the commands"), - rif(is_admin(), l("Empty the quote DB")), - l("Dance for me")); - - switch (@menu) - { - case 1: list_commands(); break; - case 2: clear_db(); break; - default: speech(l("Too lazy.")); close; - } - - } while (true); - - end; - } - - // utility functions below - - function check_is_ignored { - .@val = htget(.ignore_ht, strcharinfo(PC_NAME), 0); - - if (.@val > gettimetick(2)) - { - ++.ignored_times; - end; - } - - else if (.@val > 0) - { - htput(.ignore_ht, strcharinfo(PC_NAME), 0); // remove expired entries - } - - return; - } - - function special_name { - .@name$ = strcharinfo(PC_NAME); - .@low$ = strtolower(.@name$); - - if (rand(.sname_rate) == 0) - { - for (.@i = 0; .@i < .alias; .@i += 2) - { - if (.@low$ ~= .alias$[.@i]) - { - explode(.@aliases$, .alias$[.@i+1], "`"); - .@name$ = .@aliases$[rand(getarraysize(.@aliases$))]; - break; - } - } - } - - return .@name$; - } - - function face { - if (gettimetick(2) - .last_emote < .emote_rate) - { - ++.ignored_times; - return; - } - - .last_emote = gettimetick(2); - return emotion(getarg(0, E_SURPRISE)); - } - - function rp { - // used for queries - return replacestr(getarg(0,""), "~t", strtolower("(?:" + .name$ + "|" + .hotwords$ + ")")); - } - - function format_reply { - // used for replies - .@str$ = getarg(0, ""); - - // search for {{mustaches}} - while (.@str$ ~= "{{([^}]+)}}") - { - .@sub$ = replacestr($@regexmatch$[1], " ", ""); // remove whitespaces - .@sub$ = strtolower(.@sub$); // always lowercase the var name - .@capitalize = .@titlecase = .@allcaps = false; - - if (charat(.@sub$, 0) == "^") - { - .@capitalize = true; - .@sub$ = substr(.@sub$, 1, getstrlen(.@sub$) - 1); // strip first char - } - - else if (charat(.@sub$, 0) == "+") - { - .@titlecase = true; - .@sub$ = substr(.@sub$, 1, getstrlen(.@sub$) - 1); // strip first char - } - - else if (charat(.@sub$, 0) == "!") - { - .@allcaps = true; - .@sub$ = substr(.@sub$, 1, getstrlen(.@sub$) - 1); // strip first char - } - - explode(.@sub2$, .@sub$, ","); - .@sub$ = .@sub2$[rand(getarraysize(.@sub2$))]; // allow to have multiple variables - - .@rep$ = getd(sprintf(".D_%s$[%i]", .@sub$, rand(getd(".D_" + .@sub$)))); // get he value - - if (.@capitalize) .@rep$ = capitalize(.@rep$); - else if (.@titlecase) .@rep$ = titlecase(.@rep$); - else if (.@allcaps) .@rep$ = strtoupper(.@rep$); - - .@str$ = replacestr(.@str$, $@regexmatch$[0], .@rep$); // remove the mustache, replace by value - } - - // search for emotes - if (.@str$ ~= "%%([^ ])") - { - // only handling a few of them - switch (ord($@regexmatch$[1])) - { - case 73: face(any(E_WINK, E_ANGEL)); break; - case 83: face(any(E_SAD, E_CRYING)); break; - case 85: face(E_SURPRISE); break; - case 93: face(any(E_HEARTEYE, E_HEART)); break; - case 94: face(E_DISGUST); break; - case 99: face(E_DEAD); break; - case 105: face(E_CRYING); break; - case 106: - case 91: face(any(E_SPEECH, E_BLAH)); break; - case 107: face(E_INSULTBUBBLE); break; - default: .@unhandled = true; - } - - if (.@unhandled != true) - { - if (.@str$ == $@regexmatch$[0]) end; // don't send handled, emote-only messages - .@str$ = replacestr(.@str$, " "+ $@regexmatch$[0], ""); // otherwise strip the emote - } - } - - // built-in variables - .@str$ = replacestr(.@str$, "~n", .name$); // npc name - .@str$ = replacestr(.@str$, "~p", special_name()); // player name or special name - .@str$ = replacestr(.@str$, "~P", strcharinfo(PC_NAME)); // unaltered player name - - return rp(.@str$); - } - - function strip_colors { - .@str$ = replacestr(getarg(0, ""), "##0", ""); - .@str$ = replacestr(.@str$, "##1", ""); - .@str$ = replacestr(.@str$, "##2", ""); - .@str$ = replacestr(.@str$, "##3", ""); - .@str$ = replacestr(.@str$, "##4", ""); - .@str$ = replacestr(.@str$, "##5", ""); - .@str$ = replacestr(.@str$, "##6", ""); - .@str$ = replacestr(.@str$, "##7", ""); - .@str$ = replacestr(.@str$, "##8", ""); - .@str$ = replacestr(.@str$, "##9", ""); - return replacestr(.@str$, "##a", ""); - } - - function strip_formatting { - .@str$ = strip_colors(getarg(0, "")); - .@str$ = replacestr(.@str$, "##B", ""); - return replacestr(.@str$, "##b", ""); - } - - function delayed_reply { - ++.answered_times; - @tree_reply$ = getarg(0, ""); - addtimer(.delay_reply, .name$ + "::OnDoReply"); - return; - } - - function reply { - .@reply$ = format_reply(getarg(0, "")); - getmapxy(.@pc_map$, .@pc_x, .@pc_y, UNITTYPE_PC); // get char location - - if (((.@reply$ == .last_reply$ && gettimetick(2) - .last_reply < .repeat_rate) - || gettimetick(2) - .last_reply < .talk_rate - || (gettimetick(2) - .blocked < .block_time && is_staff() == false) - || .@pc_map$ != .map$ - || distance(.x, .y, .@pc_x, .@pc_y) > .distance - || .@reply$ == "") - && is_gm() == false) - { - ++.ignored_times; - return; - } - - .last_reply = gettimetick(2); - .last_reply$= .@reply$; - - delayed_reply(.@reply$); - return; - } - - function seen_me { - if (playerattached() > 0 && htexists(.seen_ht)) - { - htput(.seen_ht, strcharinfo(PC_NAME), gettimetick(2)); - } - return; - } - - function have_you_seen { - .@player$ = getarg(0, ""); - .@player = getcharid(CHAR_ID_ACCOUNT, .@player$); - - if (.@player > 0) - { - // nested if, because they don't short-circuit - if (checkoption(Option_Invisible, .@player) == false) { - delayed_reply(sprintf("Player `%s` is currently online.", .@player$)); - end; - } - } - - .@time = htget(.seen_ht, .@player$, 0); - - if (.@time < 1) - delayed_reply(sprintf("I haven't seen player `%s` today.", .@player$)); - - else - delayed_reply(sprintf("Player `%s` was last seen %s.", .@player$, FuzzyTime(.@time))); - - end; - } - - function special_drops { - .@drop$ = .drops$[rand(.drops)]; - .@name$ = strcharinfo(PC_NAME); - .@low$ = strtolower(.@name$); - - if (rand(.sdrop_rate) == 0) - { - for (.@i = 0; .@i < .sdrops; .@i += 2) - { - if (.@low$ ~= .sdrops$[.@i]) - { - explode(.@d$, .sdrops$[.@i+1], "`"); - .@drop$ = .@d$[rand(getarraysize(.@d$))]; - break; - } - } - } - - return .@drop$; - } - - function roll_dice { - .@dices = max(min(getarg(0, 1), 8), 1); // 1..8 - .@sides = max((getarg(1, 6) < 1 ? 6 : getarg(1, 6)), 1); // 1..MAX_INT - - .@result$ = sprintf("*rolls the dice%s: %d", - rif(.@dices > 1, "s"), rand(1, .@sides)); // first dice - - for (.@d = 1; .@d < .@dices; ++.@d) - { - .@result$ += ", " + rand(1, .@sides); - } - - return .@result$ + ".*"; - } - - function flip_coin { - .@coins = getarg(0, 1); - - .@result$ = sprintf("*flips the coin%s: %s", - rif(.@coins > 1, "s"), (rand(2) == 1 ? "heads" : "tails")); // first coin - - for (.@c = 1; .@c < .@coins; ++.@c) - { - .@result$ += ", " + (rand(2) == 1 ? "heads" : "tails"); - } - - return .@result$ + ".*"; - } - - function roulette { - if (.roulette == 1) - { - npctalk("*pulls the trigger: *##BBANG##b*.*"); - delayed_reply("*reloads and spins the chambers.*"); - .roulette = rand(1, 7); // the Nagant_M1895 has 7 chambers - - // now the fun part - nude(); - percentheal(-100, 0); - } - - else - { - delayed_reply("*pulls the trigger: *click*.*"); - .roulette = (.roulette == 7 ? 1 : .roulette + 1); - } - - end; - } - - function monologue_player { - return sprintf("Your current monologue is at least %d line%s long.", - @monologue, rif(@monologue != 1, "s")); - } - - function who_player { - return sprintf("You seem to be ##B~P##b [%i:%i].", - getcharid(CHAR_ID_ACCOUNT), getcharid(CHAR_ID_CHAR)); - } - - function make_quote_table { - // Do not modify this - query_sql("CREATE TABLE IF NOT EXISTS `tree_quotes` (" - " `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT," - " `char_id` INT(11) UNSIGNED NOT NULL DEFAULT '0'," - " `grabber` INT(11) UNSIGNED NOT NULL DEFAULT '0'," - " `timestamp` INT(10) UNSIGNED NOT NULL DEFAULT '0'," - " `message` VARCHAR(150) NOT NULL DEFAULT ''," - " PRIMARY KEY (`id`)," - " KEY `char_id` (`char_id`)," - " KEY `grabber` (`grabber`)" - ") ENGINE=MyISAM;"); - - .last_query = gettimetick(2); - return; - } - - function grab_quote { - .@name$ = getarg(0, ""); - - if (gettimetick(2) - .last_query < (is_staff() ? .qpoll_rate : .qpoll_rate2)) - { - ++.ignored_times; - end; - } - - if (.@name$ == strcharinfo(PC_NAME)) - { - delayed_reply("##BError: You may not grab yourself."); - end; - } - - explode(.@tmp$[0], htget(.msg_ht, .@name$, ""), ":"); // get last message, if any - htput(.msg_ht, .@name$, ""); // ensure you can't grab twice the same message - - .@char_id = atoi(.@tmp$[0]); // grab the char id part - - if (.@char_id < 1) - { - delayed_reply(sprintf("##BError: I couldn't find anything to grab from player `%s`.", .@name$)); - end; - } - - .@msg$ = implode(.@tmp$, ":"); // put it back together - .@start = getstrlen(.@tmp$[0]) + getstrlen(.@tmp$[1]) + 2; // char:time:msg <= we just want the msg part - .@msg$ = escape_sql(strip_formatting(substr(.@msg$, .@start, getstrlen(.@msg$) - 1))); // sanitize - - if (.@msg$ == "") - { - delayed_reply("##BError: Message is empty or malformed. It cannot be grabbed."); - end; - } - - else if (.@msg$ ~= "^[!#~@]?(?:grab)?shield(?:ed)?(?:[:.!]? .*)?$") - { - delayed_reply("##BError: Message is shielded."); - end; - } - - query_sql(sprintf("INSERT INTO tree_quotes (char_id,grabber,timestamp,message) VALUES (%i,%i,%i,'%s');", - .@char_id, getcharid(CHAR_ID_CHAR), gettimetick(2), .@msg$)); - - query_sql("SELECT MAX(id) FROM tree_quotes;", .q_last_id); // get the last quote id - - .last_query = gettimetick(2); - - delayed_reply(sprintf("Success: Quote grabbed. (#%i)", .q_last_id)); - end; - } - - function remove_quote { - .@tmp = getarg(0, 0); - - if (gettimetick(2) - .last_query < (is_staff() ? .qpoll_rate : .qpoll_rate2)) - { - ++.ignored_times; - end; - } - - query_sql(sprintf("SELECT id FROM tree_quotes WHERE id = %i ORDER BY id DESC LIMIT 1;", .@tmp), .@id); // check if it exists - - if (.@id < 1) - { - delayed_reply(sprintf("##BError: I couldn't find quote #%i in the database.", .@tmp)); - end; - } - - query_sql(sprintf("DELETE FROM tree_quotes WHERE id = %i ORDER BY id DESC LIMIT 1;", .@id)); - - .last_query = gettimetick(2); - - delayed_reply(sprintf("Success: Quote removed. (#%i)", .@id)); - end; - } - - function cite_quote { - .@id = getarg(0,0); - - if (gettimetick(2) - .last_query < (is_staff() ? .qpoll_rate : .qpoll_rate2)) - { - ++.ignored_times; - end; - } - - query_sql(sprintf("SELECT t.id, c.name AS grabee, d.name AS grabber, t.timestamp, t.message " - "FROM `tree_quotes` t " - "JOIN `char` c ON t.char_id = c.char_id " - "JOIN `char` d ON t.grabber = d.char_id " - "WHERE t.id=%i ORDER BY t.id DESC LIMIT 1;", - .@id), - .@nid[0], .@grabee$[0], .@grabber$[0], .@time[0], .@msg$[0]); - - .last_query = gettimetick(2); - - if (.@nid[0] < 1) - { - delayed_reply(sprintf("##BError: I couldn't find quote #%i in the database.", .@id)); - end; - } - - delayed_reply(sprintf("<%s> ##B%s##b ##a— grabbed by %s %s.", - .@grabee$[0], .@msg$[0], .@grabber$[0], FuzzyTime(.@time[0],0,1))); - end; - } - - function random_quote { - .@name$ = escape_sql(getarg(0, "")); - - if (gettimetick(2) - .last_query < (is_staff() ? .qpoll_rate : .qpoll_rate2)) - { - ++.ignored_times; - end; - } - - query_sql("SELECT t.id, c.name AS grabee, d.name AS grabber, t.timestamp, t.message " - "FROM `char` c " - "JOIN `tree_quotes` t ON t.char_id = c.char_id " - "JOIN `char` d ON d.char_id = t.grabber " + - rif(.@name$ != "", sprintf("WHERE c.name='%s' ", .@name$)) + - "ORDER BY RAND() LIMIT 1;", - .@nid[0], .@grabee$[0], .@grabber$[0], .@time[0], .@msg$[0]); - - .last_query = gettimetick(2); - - if (.@nid[0] < 1) - { - if (.@name$ != "") - delayed_reply(sprintf("##BError: I couldn't find any quote from `%s` in the database.", getarg(0, ""))); - else - delayed_reply("##BError: The quote database is empty."); - end; - } - - delayed_reply(sprintf("<%s> ##B%s##b ##a— grabbed by %s %s. (#%i)", - .@grabee$[0], .@msg$[0], .@grabber$[0], FuzzyTime(.@time[0],0,1), .@nid[0])); - end; - } - - function trigger_hotword { - .@o$ = getarg(0, ""); // original lowercase - .@m$ = replacestr(.@o$, "*", ""); // original lowercase clean - - - if (.@m$ ~= "(?:^| )tell(?: (?:me|him|her|us|them))? a(?:n ?other| lame| bad| boring)? joke") - reply(.jokes$[rand(.jokes)]); - - else if (.@m$ ~= "(?:^| )heal me(?:$|[^a-z])") - reply(.healing$[rand(.healing)]); - // XXX: maybe actually heal the player once in a while - - else if (.@m$ ~= "(?:^| )(?:what|who) are you") - reply(.whoami$[rand(.whoami)]); - - else if (.@m$ ~= rp("(?:^| )(?:hi+|hello|heya?|hiya|good (?:morning|afternoon))[^a-z]* .*~t|~t.* (?:hi+|hello|heya?|hiya)")) - { - .blocked = 0; - reply(.greetings$[rand(.greetings)]); - } - - else if (.@o$ ~= rp("(?:^[*]| )(?:kicks?|shakes?) .*~t")) - reply(special_drops()); - - else if (.@o$ ~= rp("(?:^[*]| )(?:cuts?|nukes?|kills?|chops? down|saws?|hews?|murders?) .*~t")) - reply(.kill$[rand(.kill)]); - - else if (.@o$ ~= rp("(?:^[*]| )pokes? .*~t")) - reply(.poke$[rand(.poke)]); - - else if (.@o$ ~= rp("(?:^[*]| )(?:waters?|pees?|licks?) .*~t")) - reply(.disgusting$[rand(.disgusting)]); - - else if (compare(.@m$, " answer ") && .@m$ ~= "(?:life|universe|everything)(?:$|[^a-z])") - reply(.answer$[rand(.answer)]); - - else if (.@o$ ~= rp("(?:^[*]| )(?:burns?|incinerates?|ignites?) .*~t")) - reply(.burning$[rand(.burning)]); - // XXX: maybe here send a fire particle effect - - else if (.@m$ ~= rp("(?:^| )die ~t")) - reply(.die$[rand(.die)]); - - else if (.@o$ ~= rp("(?:^[*]| )bites? .*~t|(?:^[*]| )drops? .* on ~t")) - reply(.silly$[rand(.silly)]); - - else if (.@m$ ~= rp("(?:^| )(?:loves?|hugs?|kiss(es)?) .*~t|~t.* love(?:$|[^a-z])")) - reply(.love$[rand(.love)]); - - else if (.@m$ ~= rp("(?:^| )dance .*~t|~t.* dance(?:$|[^a-z])")) - reply(.dance$[rand(.dance)]); - - else if (.@m$ ~= rp("(?:^| )hates? .*~t")) - reply(.hate$[rand(.hate)]); - - else if (.@o$ ~= rp("(?:^[*]| )(?:eats?|shoots?|plucks?|tortures?|slaps?|slaps?|poisons?|breaks?|stabs?|throws?|punch(?:es)?) .*~t")) - reply(.pain$[rand(.pain)]); - - else if (.@o$ ~= rp("(?:^[*]| )(?:climbs?|rides?|mounts?) .*~t")) - reply(.climb$[rand(.climb)]); - - else if (.@m$ ~= "(?:^| )(?:see y(?:a|ou)|good night|(?:bye)?bye+)(?:$|[^a-z])") - reply(.bye$[rand(.bye)]); - - else if (.@m$ ~= rp("(?:^| )bad ~t")) - reply(.bad$[rand(.bad)]); - - else if (.@m$ ~= "(?:^| )(?:how old are you|uptime)(?:$|[^a-z])") - reply("%%B Server uptime: " + FuzzyTime(.uptime, 1) + "."); - - else if (.@m$ ~= "(?:^| )how chatty are you(?:$|[^a-z])") - reply("%%B Answered " + .answered_times + " times, ignored " + .ignored_times + " times."); - - else if (.@m$ ~= "(?:^| )what.* version(?:$|[^a-z])") - reply("%%B ~n, version " + .version + "."); // XXX: maybe return Hercules version and serverdata commit instead - - else if (.@m$ ~= "(?:^| )(?:(?:8|eight)[ -]?ball|(?:should|would|will|do|does) (?:i|you|he|she|it|we|they))(?:$|[^a-z])") - reply(.eightball$[rand(.eightball)]); - - else if (.@m$ ~= "(?:^| )roll(?: a| the)? dice(?:$|[^a-z])") - reply(roll_dice(1, 6)); - - else if (.@m$ ~= "(?:^| )roll(?: a)? ([1-8])d((?:[1-9][0-9]{0,10})?)(?:$|[^0-9a-z])") - reply(roll_dice(atoi($@regexmatch$[1]), atoi($@regexmatch$[2]))); - - else if (.@m$ ~= "(?:^| )roll ([1-8]) dices?(?:$|[^a-z])") - reply(roll_dice(atoi($@regexmatch$[1]), 6)); - - else if (.@m$ ~= "(?:^| )(?:flip|toss)(?: a| the)? coin(?:$|[^a-z])") - reply(flip_coin(1)); - - else if (.@m$ ~= "(?:^| )(?:flip|toss) ([1-8]) coins?(?:$|[^a-z])") - reply(flip_coin(atoi($@regexmatch$[1]))); - - else if (.@m$ ~= "(?:^| )(?:press|pull)(?: the)? trigger(?:$|[^a-z])") - roulette(); - - else if (.@m$ ~= "(?:^| )(?:how long|what) is(?: my)? monologue(?:$|[^a-z])") - reply(monologue_player()); - - else if (.@m$ ~= "(?:^| )who am i(?:$|[^a-z])") - reply(who_player()); - - else if (.@m$ ~= "(?:^| )shut up(?:$|[^a-z])") - { - reply(.shut_up$[rand(.shut_up)]); - .blocked = gettimetick(2); - } - - else if (rand(.dunno_rate) == 0) - reply(.no_idea$[rand(.no_idea)]); - - else - ++.ignored_times; - - end; - } - - function trigger_hiall { - if (rand(.hiall_rate) == 0) - reply(.greetings$[rand(.greetings)]); - - else - ++.ignored_times; - - end; - } - -OnClick: - tree_panel(); - bye; - - -OnTalkNearby: - .@no_nick$ = strip(strip_formatting(substr($@p0$, getstrlen(strcharinfo(PC_NAME)) + 3, getstrlen($@p0$) - 1))); // not very obvious stuff - .@no_nick_lower$ = strtolower(.@no_nick$); // FIXME: hercules doesn't have a way to do case insensitive regex yet - .@no_nick_clean$ = replacestr(.@no_nick_lower$, "*", ""); - - htput(.msg_ht, strcharinfo(PC_NAME), getcharid(CHAR_ID_CHAR) + ":" + gettimetick(2) + ":" + .@no_nick$); // log last message, for quotegrabs - .lastsender = getcharid(CHAR_ID_CHAR); // for monologue - - .last_activity = gettimetick(2); // for the auto-janitor - - if ((is_staff() || #Tree_Trusted) && charat(.@no_nick$, 0) == .symbol$) - { - if (.@no_nick$ ~= "^.grab \"?([^#:@\"]{4,23})\"?$") - reply(grab_quote($@regexmatch$[1])); - - else if (.@no_nick$ ~= "^.(?:ungrab|remove|delete)(?: quote)? #([0-9]+)$") - reply(remove_quote(atoi($@regexmatch$[1]))); - - else if (.@no_nick$ ~= "^.(?:ungrab|remove|delete)(?: last(?: quote)?)?$") - reply(remove_quote(.q_last_id)); - - else if (.@no_nick$ ~= "^.(?:quote|cite) #([0-9]+)$") - reply(cite_quote(atoi($@regexmatch$[1]))); - - else if (.@no_nick$ ~= "^.(?:(?:random )?quote|cite)(?: anyone| someone| random)?$") - reply(random_quote()); - - else if (.@no_nick$ ~= "^.(?:quote|cite) \"?([^#:@\"]{4,23})\"?$") - reply(random_quote($@regexmatch$[1])); - - else if (.@no_nick$ ~= "^.seen \"?([^#:@\"]{4,23})\"?$") - reply(have_you_seen($@regexmatch$[1])); - - // to allow trusted testers to reboot without knowing the exit code - else if (debug && .@no_nick$ ~= "^.re(?:boot|load|start)(?:(?: the)? server)?$") - { - announce("The server is rebooting. This may take a couple minutes.", bc_all); - sleep2(1000); - atcommand("@serverexit 104"); - } - - // exit, pull all, clean, build, reboot - else if (debug && .@no_nick$ ~= "^.re-?build(?:(?: the)? server)?$") - { - announce("The server is rebuilding. This will take several minutes.", bc_all); - sleep2(1000); - atcommand("@serverexit 108"); - } - - else if (.@no_nick$ ~= "^.(?:add )?ignored? \"?([^#:@\"]{4,23})\"?$") - { - .@chr = getcharid(CHAR_ID_ACCOUNT, $@regexmatch$[1]); - if (.@chr < 1) - { - reply("##BError: Player not found or not online."); - end; - } - htput(.ignore_ht, strcharinfo(PC_NAME, .@chr), gettimetick(2) + 3600); - reply(sprintf("Success: Player `%s` is now ignored for 1 hour.", - strcharinfo(PC_NAME, .@chr))); - } - - else if (.@no_nick$ ~= "^.(?:un|de-?|remove )ignored? \"?([^#:@\"]{4,23})\"?$") - { - .@chr = getcharid(CHAR_ID_ACCOUNT, $@regexmatch$[1]); - if (.@chr < 1) - { - reply("##BError: Player not found or not online."); - end; - } - htput(.ignore_ht, strcharinfo(PC_NAME, .@chr), 0); - reply(sprintf("Success: Player `%s` is no longer ignored.", - strcharinfo(PC_NAME, .@chr))); - } - - else if (is_admin() && .@no_nick$ ~= "^.(?:add )?trust(?:ed)? \"?([^#:@\"]{4,23})\"?$") - { - .@chr = getcharid(CHAR_ID_ACCOUNT, $@regexmatch$[1]); - if (.@chr < 1) - { - reply("##BError: Player not found or not online."); - end; - } - set(getvariableofpc(#Tree_Trusted, .@chr), true); - reply(sprintf("Success: Player `%s` can now use restricted commands.", - strcharinfo(PC_NAME, .@chr))); - } - - else if (is_admin() && .@no_nick$ ~= "^.(?:un|de-?|remove )trust(?:ed)? \"?([^#:@\"]{4,23})\"?$") - { - .@chr = getcharid(CHAR_ID_ACCOUNT, $@regexmatch$[1]); - if (.@chr < 1) - { - reply("##BError: Player not found or not online."); - end; - } - set(getvariableofpc(#Tree_Trusted, .@chr), false); - reply(sprintf("Success: Player `%s` can no longer use restricted commands.", - strcharinfo(PC_NAME, .@chr))); - } - - else - reply("##BError: Command not found or invalid syntax."); - } - - else if (.@no_nick_lower$ ~= rp("^(~t[^a-z ]* .*|(?:.* (?:~t[^a-z ]* .*|~t[^ a-z]*)))$")) - { - check_is_ignored(); - trigger_hotword($@regexmatch$[1]); - } - - else if (.@no_nick_clean$ ~= "^(hi(ya)?|hello|heya?) (all|friends|every(one|body))") - { - check_is_ignored(); - trigger_hiall(); - } - - else - { - if (.lastsender == getcharid(CHAR_ID_CHAR)) - @monologue++; - - else - @monologue = 1; - } - - // TODO: eliza mode, whisper eliza mode - end; - -OnTouch: - if (rand(.touch_rate) == 0) { - face(); - } - end; - -OnDoReply: - if (@tree_reply$ != "") { - npctalk(@tree_reply$); - @tree_reply$ = ""; - } - end; - -OnPCLogoutEvent: - seen_me(); - end; - -OnTimer3600000: - // scheduled janitor - .@now = gettimetick(2); - initnpctimer(); // schedule next - - if (.last_activity > (.@now - 3600)) { - end; // last activity is too recent - } - - // cleanup routine below - .lastsender = 0; - .last_activity = 0; - .last_reply = 0; - .last_emote = 0; - .last_query = 0; - .blocked = 0; - .enable_janitor = 0; - - htclear(.msg_ht); // empty the message table (quotegrabs) - htclear(.ignore_ht); // empty the ignore table - - .@it = htiterator(.seen_ht); // allocate new iterator - for (.@key$ = htinextkey(.@it); hticheck(.@it); .@key$ = htinextkey(.@it)) { - if (.@key$ == "") { - continue; - } - - if (htget(.seen_ht, .@key$, 0) < (.@now - 86400)) { - htput(.seen_ht, .@key$, 0); // remove from hash table if older than 24h - } - } - htidelete(.@it); // free the iterator - - face(); // do an emote (because why not) - end; - - -OnDay0320: - .dir = DOWNLEFT; - end; - - -OnDay0621: - .dir = LEFT; - end; - - -OnDay0922: - .dir = UPLEFT; - end; - - -OnDay1221: - .dir = DOWN; - end; - - -OnInit: - // config below - .hotwords$ = "tree"; // what hot words the npc should listen to, besides its own name (regex) - .distance = 14; // the npc will only listen to player within X tiles - .sex = G_OTHER; // gender of the npc - .dir = season_direction(); // sprite direction according to the season - .talk_rate = 1; // min number of seconds to wait between replies - .repeat_rate = 1; // min number of seconds to wait before sending the same message twice in a row - .block_time = 600; // how long to stay quiet after someone says shut up, in seconds - .emote_rate = 3; // min number of seconds to wait between emotes - .sdrop_rate = 8; // 1 in X chances to get a special drop - .sname_rate = 8; // 1 in X chances to get a special name - .dunno_rate = 2; // 1 in X chances to get a reply when the command is not found - .hiall_rate = 2; // 1 in X chances to reply to a "hi everyone" - .touch_rate = 4; // 1 in X chances to trigger the OnTouch action - .qpoll_rate = 1; // min number of seconds to wait before calling the sql db again for GMs - .qpoll_rate2 = 5; // min number of seconds to wait before calling the sql db again for non-GMs (currently unused) - .delay_reply = 250; // number of ms to wait to reply - .enable_janitor = true; // automatically free memory when idle - .symbol$ = "~"; // symbol for GM-only commands - - // register some arrays - callfunc("TREE_dictionaries"); - - // do random stuff - make_quote_table(); - face(); - - // boring stuff below - .version = 21; // increase this when you make a change - .uptime = gettimetick(2); - .alwaysVisible = true; // the NPC doesn't de-spawn when moving away - .pid = 1; // regex pattern id - .msg_ht = htnew(); // hashtable id for message history - .seen_ht = htnew(); // hashtable id for seen log - .ignore_ht = htnew(); // hashtable id for ignored players - .roulette = rand(1, 7); // spin the chambers - defpattern(.pid, "^(.*)$", "OnTalkNearby"); - activatepset(.pid); - if (.enable_janitor) { - initnpctimer(); - } -} - -// Duplicates below -//000-1,42,63,0 duplicate(Confused Tree) Confused Palm Tree NPC_NO_SPRITE,14,14 diff --git a/Npc/008-1/doors.txt b/Npc/008-1/doors.txt deleted file mode 100644 index de8ed1d8..00000000 --- a/Npc/008-1/doors.txt +++ /dev/null @@ -1,6 +0,0 @@ -008-1,104,27,0 script CottageDoor NPC_WARP,0,0,{ - end; - -OnTouch: - dispbottom(l("Locked.")); -} diff --git a/Npc/008-1/mapflags.txt b/Npc/008-1/mapflags.txt deleted file mode 100644 index f2680964..00000000 --- a/Npc/008-1/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-1 mapflag town diff --git a/Npc/008-1/wateranimation.txt b/Npc/008-1/wateranimation.txt deleted file mode 100644 index 8b66f637..00000000 --- a/Npc/008-1/wateranimation.txt +++ /dev/null @@ -1,9 +0,0 @@ -// Evol scripts. -// Author: -// gumi -// Reid -// Description: -// Water animations, splash, fishes, etc... - -008-1,139,32,0 duplicate(#water_animation0) #water_animation16 NPC_WATER_SPLASH -008-1,140,40,0 duplicate(#water_animation0) #water_animation17 NPC_WATER_SPLASH diff --git a/Npc/008-2-0/_import.txt b/Npc/008-2-0/_import.txt deleted file mode 100644 index f2ecc3b8..00000000 --- a/Npc/008-2-0/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map 008-2-0: Chez Celestia -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-0/_savepoints.txt", -"npc/008-2-0/_warps.txt", -"npc/008-2-0/mapflags.txt", diff --git a/Npc/008-2-0/_savepoints.txt b/Npc/008-2-0/_savepoints.txt deleted file mode 100644 index d9055b64..00000000 --- a/Npc/008-2-0/_savepoints.txt +++ /dev/null @@ -1,11 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-0: Chez Celestia saves -008-2-0,37,27,0 script #save_008-2-0_37_27 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/Npc/008-2-0/_warps.txt b/Npc/008-2-0/_warps.txt deleted file mode 100644 index 72a8ab12..00000000 --- a/Npc/008-2-0/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-0: Chez Celestia warps -008-2-0,26,22,0 warp #008-2-0_26_22 0,0,008-1,105,75 -008-2-0,22,34,0 warp #008-2-0_22_34 0,0,008-1,101,79 diff --git a/Npc/008-2-0/mapflags.txt b/Npc/008-2-0/mapflags.txt deleted file mode 100644 index 93df75f4..00000000 --- a/Npc/008-2-0/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-0 mapflag town diff --git a/Npc/008-2-1/_import.txt b/Npc/008-2-1/_import.txt deleted file mode 100644 index 1e5137a7..00000000 --- a/Npc/008-2-1/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map 008-2-1: Merchant Guild -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-1/_savepoints.txt", -"npc/008-2-1/_warps.txt", -"npc/008-2-1/mapflags.txt", diff --git a/Npc/008-2-1/_savepoints.txt b/Npc/008-2-1/_savepoints.txt deleted file mode 100644 index 66730940..00000000 --- a/Npc/008-2-1/_savepoints.txt +++ /dev/null @@ -1,11 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-1: Merchant Guild saves -008-2-1,42,27,0 script #save_008-2-1_42_27 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/Npc/008-2-1/_warps.txt b/Npc/008-2-1/_warps.txt deleted file mode 100644 index e47cbf73..00000000 --- a/Npc/008-2-1/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-1: Merchant Guild warps -008-2-1,37,27,0 warp #008-2-1_37_27 0,0,008-1,89,66 -008-2-1,33,43,0 warp #008-2-1_33_43 0,0,008-1,88,72 diff --git a/Npc/008-2-1/mapflags.txt b/Npc/008-2-1/mapflags.txt deleted file mode 100644 index 78899489..00000000 --- a/Npc/008-2-1/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-1 mapflag town diff --git a/Npc/008-2-10/_import.txt b/Npc/008-2-10/_import.txt deleted file mode 100644 index 994726eb..00000000 --- a/Npc/008-2-10/_import.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Map 008-2-10: Hurnscald City Hall -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-10/_warps.txt", -"npc/008-2-10/mapflags.txt", diff --git a/Npc/008-2-10/_warps.txt b/Npc/008-2-10/_warps.txt deleted file mode 100644 index 25390f95..00000000 --- a/Npc/008-2-10/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-10: Hurnscald City Hall warps -008-2-10,37,34,0 warp #008-2-10_37_34 0,0,008-1,102,70 -008-2-10,37,25,0 warp #008-2-10_37_25 1,0,008-2-11,36,27 diff --git a/Npc/008-2-10/mapflags.txt b/Npc/008-2-10/mapflags.txt deleted file mode 100644 index 7635bed5..00000000 --- a/Npc/008-2-10/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-10 mapflag town diff --git a/Npc/008-2-11/_import.txt b/Npc/008-2-11/_import.txt deleted file mode 100644 index 84ad9ceb..00000000 --- a/Npc/008-2-11/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map 008-2-11: Hurnscald City Hall -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-11/_savepoints.txt", -"npc/008-2-11/_warps.txt", -"npc/008-2-11/mapflags.txt", diff --git a/Npc/008-2-11/_savepoints.txt b/Npc/008-2-11/_savepoints.txt deleted file mode 100644 index c3cf65fc..00000000 --- a/Npc/008-2-11/_savepoints.txt +++ /dev/null @@ -1,20 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-11: Hurnscald City Hall saves -008-2-11,25,27,0 script #save_008-2-11_25_27 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} -008-2-11,45,27,0 script #save_008-2-11_45_27 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/Npc/008-2-11/_warps.txt b/Npc/008-2-11/_warps.txt deleted file mode 100644 index 6c8c4732..00000000 --- a/Npc/008-2-11/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-11: Hurnscald City Hall warps -008-2-11,37,28,0 warp #008-2-11_37_28 1,0,008-2-10,36,26 diff --git a/Npc/008-2-11/mapflags.txt b/Npc/008-2-11/mapflags.txt deleted file mode 100644 index 3e084fc0..00000000 --- a/Npc/008-2-11/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-11 mapflag town diff --git a/Npc/008-2-12/_import.txt b/Npc/008-2-12/_import.txt deleted file mode 100644 index 88a854e4..00000000 --- a/Npc/008-2-12/_import.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Map 008-2-12: Hurnscald Clinic -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-12/_warps.txt", -"npc/008-2-12/mapflags.txt", diff --git a/Npc/008-2-12/_warps.txt b/Npc/008-2-12/_warps.txt deleted file mode 100644 index e44e7154..00000000 --- a/Npc/008-2-12/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-12: Hurnscald Clinic warps -008-2-12,30,32,0 warp #008-2-12_30_32 0,0,008-1,110,57 -008-2-12,36,27,0 warp #008-2-12_36_27 1,0,008-2-13,35,31 diff --git a/Npc/008-2-12/mapflags.txt b/Npc/008-2-12/mapflags.txt deleted file mode 100644 index b52526a7..00000000 --- a/Npc/008-2-12/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-12 mapflag town diff --git a/Npc/008-2-13/_import.txt b/Npc/008-2-13/_import.txt deleted file mode 100644 index a4b0330e..00000000 --- a/Npc/008-2-13/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map 008-2-13: Hurnscald Clinic -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-13/_savepoints.txt", -"npc/008-2-13/_warps.txt", -"npc/008-2-13/mapflags.txt", diff --git a/Npc/008-2-13/_savepoints.txt b/Npc/008-2-13/_savepoints.txt deleted file mode 100644 index 5c8fc22d..00000000 --- a/Npc/008-2-13/_savepoints.txt +++ /dev/null @@ -1,38 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-13: Hurnscald Clinic saves -008-2-13,29,27,0 script #save_008-2-13_29_27 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} -008-2-13,32,27,0 script #save_008-2-13_32_27 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} -008-2-13,29,31,0 script #save_008-2-13_29_31 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} -008-2-13,32,31,0 script #save_008-2-13_32_31 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/Npc/008-2-13/_warps.txt b/Npc/008-2-13/_warps.txt deleted file mode 100644 index f9681284..00000000 --- a/Npc/008-2-13/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-13: Hurnscald Clinic warps -008-2-13,36,32,0 warp #008-2-13_36_32 1,0,008-2-12,35,28 -008-2-13,25,26,0 warp #008-2-13_25_26 1,0,008-2-14,24,30 diff --git a/Npc/008-2-13/mapflags.txt b/Npc/008-2-13/mapflags.txt deleted file mode 100644 index be0ed6a2..00000000 --- a/Npc/008-2-13/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-13 mapflag town diff --git a/Npc/008-2-14/_import.txt b/Npc/008-2-14/_import.txt deleted file mode 100644 index 29a984e8..00000000 --- a/Npc/008-2-14/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map 008-2-14: Hurnscald Clinic -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-14/_savepoints.txt", -"npc/008-2-14/_warps.txt", -"npc/008-2-14/mapflags.txt", diff --git a/Npc/008-2-14/_savepoints.txt b/Npc/008-2-14/_savepoints.txt deleted file mode 100644 index cbb6fd12..00000000 --- a/Npc/008-2-14/_savepoints.txt +++ /dev/null @@ -1,11 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-14: Hurnscald Clinic saves -008-2-14,31,27,0 script #save_008-2-14_31_27 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/Npc/008-2-14/_warps.txt b/Npc/008-2-14/_warps.txt deleted file mode 100644 index 241626bb..00000000 --- a/Npc/008-2-14/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-14: Hurnscald Clinic warps -008-2-14,25,31,0 warp #008-2-14_25_31 1,0,008-2-13,24,27 diff --git a/Npc/008-2-14/mapflags.txt b/Npc/008-2-14/mapflags.txt deleted file mode 100644 index 4f5bd95c..00000000 --- a/Npc/008-2-14/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-14 mapflag town diff --git a/Npc/008-2-2/_import.txt b/Npc/008-2-2/_import.txt deleted file mode 100644 index 5a896da0..00000000 --- a/Npc/008-2-2/_import.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Map 008-2-2: The Rusty Pick -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-2/_warps.txt", -"npc/008-2-2/mapflags.txt", diff --git a/Npc/008-2-2/_warps.txt b/Npc/008-2-2/_warps.txt deleted file mode 100644 index 8410ef2b..00000000 --- a/Npc/008-2-2/_warps.txt +++ /dev/null @@ -1,6 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-2: The Rusty Pick warps -008-2-2,28,34,0 warp #008-2-2_28_34 0,0,008-1,65,56 -008-2-2,52,25,0 warp #008-2-2_52_25 1,0,008-2-3,66,28 -008-2-2,24,29,0 warp #008-2-2_24_29 0,0,008-2-4,43,28 -008-2-2,52,32,0 warp #008-2-2_52_32 0,0,008-2-5,24,25 diff --git a/Npc/008-2-2/mapflags.txt b/Npc/008-2-2/mapflags.txt deleted file mode 100644 index 8f90e197..00000000 --- a/Npc/008-2-2/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-2 mapflag town diff --git a/Npc/008-2-3/_import.txt b/Npc/008-2-3/_import.txt deleted file mode 100644 index ed172cc7..00000000 --- a/Npc/008-2-3/_import.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Map 008-2-3: The Rusty Pick -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-3/_warps.txt", -"npc/008-2-3/mapflags.txt", diff --git a/Npc/008-2-3/_warps.txt b/Npc/008-2-3/_warps.txt deleted file mode 100644 index 957ed686..00000000 --- a/Npc/008-2-3/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-3: The Rusty Pick warps -008-2-3,67,29,0 warp #008-2-3_67_29 1,0,008-2-2,51,26 diff --git a/Npc/008-2-3/mapflags.txt b/Npc/008-2-3/mapflags.txt deleted file mode 100644 index 947a2df3..00000000 --- a/Npc/008-2-3/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-3 mapflag town diff --git a/Npc/008-2-4/_import.txt b/Npc/008-2-4/_import.txt deleted file mode 100644 index 8ab4d742..00000000 --- a/Npc/008-2-4/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map 008-2-4: The Rusty Pick -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-4/_savepoints.txt", -"npc/008-2-4/_warps.txt", -"npc/008-2-4/mapflags.txt", diff --git a/Npc/008-2-4/_savepoints.txt b/Npc/008-2-4/_savepoints.txt deleted file mode 100644 index 103787d1..00000000 --- a/Npc/008-2-4/_savepoints.txt +++ /dev/null @@ -1,11 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-4: The Rusty Pick saves -008-2-4,25,27,0 script #save_008-2-4_25_27 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/Npc/008-2-4/_warps.txt b/Npc/008-2-4/_warps.txt deleted file mode 100644 index 2d8336f7..00000000 --- a/Npc/008-2-4/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-4: The Rusty Pick warps -008-2-4,44,28,0 warp #008-2-4_44_28 0,0,008-2-2,25,29 diff --git a/Npc/008-2-4/mapflags.txt b/Npc/008-2-4/mapflags.txt deleted file mode 100644 index cd86a1e4..00000000 --- a/Npc/008-2-4/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-4 mapflag town diff --git a/Npc/008-2-5/_import.txt b/Npc/008-2-5/_import.txt deleted file mode 100644 index 74e70e1c..00000000 --- a/Npc/008-2-5/_import.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Map 008-2-5: The Rusty Pick -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-5/_warps.txt", -"npc/008-2-5/mapflags.txt", diff --git a/Npc/008-2-5/_warps.txt b/Npc/008-2-5/_warps.txt deleted file mode 100644 index 21b7f527..00000000 --- a/Npc/008-2-5/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-5: The Rusty Pick warps -008-2-5,24,24,0 warp #008-2-5_24_24 0,0,008-2-2,52,31 diff --git a/Npc/008-2-5/mapflags.txt b/Npc/008-2-5/mapflags.txt deleted file mode 100644 index 435dd353..00000000 --- a/Npc/008-2-5/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-5 mapflag town diff --git a/Npc/008-2-6/_import.txt b/Npc/008-2-6/_import.txt deleted file mode 100644 index 4630df43..00000000 --- a/Npc/008-2-6/_import.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Map 008-2-6: Two Guys One Bed -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-6/_warps.txt", -"npc/008-2-6/mapflags.txt", diff --git a/Npc/008-2-6/_warps.txt b/Npc/008-2-6/_warps.txt deleted file mode 100644 index 98944d50..00000000 --- a/Npc/008-2-6/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-6: Two Guys One Bed warps -008-2-6,27,33,0 warp #008-2-6_27_33 0,0,008-1,89,59 diff --git a/Npc/008-2-6/mapflags.txt b/Npc/008-2-6/mapflags.txt deleted file mode 100644 index c07673a4..00000000 --- a/Npc/008-2-6/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-6 mapflag town diff --git a/Npc/008-2-7/_import.txt b/Npc/008-2-7/_import.txt deleted file mode 100644 index 263e5dcf..00000000 --- a/Npc/008-2-7/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map 008-2-7: Hurnscald Apothecary -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-7/_savepoints.txt", -"npc/008-2-7/_warps.txt", -"npc/008-2-7/mapflags.txt", diff --git a/Npc/008-2-7/_savepoints.txt b/Npc/008-2-7/_savepoints.txt deleted file mode 100644 index f3faa80f..00000000 --- a/Npc/008-2-7/_savepoints.txt +++ /dev/null @@ -1,11 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-7: Hurnscald Apothecary saves -008-2-7,25,27,0 script #save_008-2-7_25_27 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/Npc/008-2-7/_warps.txt b/Npc/008-2-7/_warps.txt deleted file mode 100644 index 3eb8538a..00000000 --- a/Npc/008-2-7/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-7: Hurnscald Apothecary warps -008-2-7,36,29,0 warp #008-2-7_36_29 0,0,008-1,101,56 diff --git a/Npc/008-2-7/mapflags.txt b/Npc/008-2-7/mapflags.txt deleted file mode 100644 index caeb89e9..00000000 --- a/Npc/008-2-7/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-7 mapflag town diff --git a/Npc/008-2-8/_import.txt b/Npc/008-2-8/_import.txt deleted file mode 100644 index d3346591..00000000 --- a/Npc/008-2-8/_import.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Map 008-2-8: Hurnscald Forge -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-8/_warps.txt", -"npc/008-2-8/mapflags.txt", diff --git a/Npc/008-2-8/_warps.txt b/Npc/008-2-8/_warps.txt deleted file mode 100644 index 7e791e85..00000000 --- a/Npc/008-2-8/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-8: Hurnscald Forge warps -008-2-8,37,39,0 warp #008-2-8_37_39 1,0,008-1,120,72 diff --git a/Npc/008-2-8/mapflags.txt b/Npc/008-2-8/mapflags.txt deleted file mode 100644 index 2bdbedb9..00000000 --- a/Npc/008-2-8/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-8 mapflag town diff --git a/Npc/008-2-9/_import.txt b/Npc/008-2-9/_import.txt deleted file mode 100644 index aade14bd..00000000 --- a/Npc/008-2-9/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map 008-2-9: Jack's Abode -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/008-2-9/_savepoints.txt", -"npc/008-2-9/_warps.txt", -"npc/008-2-9/mapflags.txt", diff --git a/Npc/008-2-9/_savepoints.txt b/Npc/008-2-9/_savepoints.txt deleted file mode 100644 index e2aae529..00000000 --- a/Npc/008-2-9/_savepoints.txt +++ /dev/null @@ -1,11 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-9: Jack's Abode saves -008-2-9,26,31,0 script #save_008-2-9_26_31 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/Npc/008-2-9/_warps.txt b/Npc/008-2-9/_warps.txt deleted file mode 100644 index 7021feae..00000000 --- a/Npc/008-2-9/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 008-2-9: Jack's Abode warps -008-2-9,30,35,0 warp #008-2-9_30_35 0,0,008-1,72,69 diff --git a/Npc/008-2-9/mapflags.txt b/Npc/008-2-9/mapflags.txt deleted file mode 100644 index e637ae03..00000000 --- a/Npc/008-2-9/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -008-2-9 mapflag town -- cgit v1.2.3-70-g09d2 From 01ecfb2ecd721e72eba14385fb57da30ddf4641c Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 16:37:43 +0000 Subject: move flag directory --- Icon/badges/flag/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/badges/flag/.gitkeep diff --git a/Icon/badges/flag/.gitkeep b/Icon/badges/flag/.gitkeep new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3-70-g09d2 From 719be3dc4d3bebcd25e251f84b8158b106fbbbd8 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 16:38:24 +0000 Subject: Add ready directory --- Icon/badges/flag/ready/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/badges/flag/ready/.gitkeep diff --git a/Icon/badges/flag/ready/.gitkeep b/Icon/badges/flag/ready/.gitkeep new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3-70-g09d2 From b140931a1091cd5312c8a601cf90cb144326dc25 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 16:39:47 +0000 Subject: Add new xcf directory --- Icon/badges/flag/xcf/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/badges/flag/xcf/.gitkeep diff --git a/Icon/badges/flag/xcf/.gitkeep b/Icon/badges/flag/xcf/.gitkeep new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3-70-g09d2 From 828829330188d5a4266516e534443f28f2a236e0 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 16:41:32 +0000 Subject: MOVED Add english flag XCF. Delete unused file. Jesusaves authored 1 year ago 1618b64c --- Icon/badges/flag/xcf/en.xcf | Bin 0 -> 4251 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/badges/flag/xcf/en.xcf diff --git a/Icon/badges/flag/xcf/en.xcf b/Icon/badges/flag/xcf/en.xcf new file mode 100644 index 00000000..ee842be0 Binary files /dev/null and b/Icon/badges/flag/xcf/en.xcf differ -- cgit v1.2.3-70-g09d2 From d81b122829eda84ed3a758ff3b6578b464fe0f0b Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 16:41:43 +0000 Subject: Delete .gitkeep --- Icon/badges/flag/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/badges/flag/.gitkeep diff --git a/Icon/badges/flag/.gitkeep b/Icon/badges/flag/.gitkeep deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3-70-g09d2 From 56d7a6a3f5dcea6ea57502246d33017346ea1fd6 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 16:42:20 +0000 Subject: moved Add volapuk flag (from Freeciv), we might create an international flag later. Jesusaves authored 1 year ago --- Icon/badges/flag/ready/volapuk.png | Bin 0 -> 1069 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/badges/flag/ready/volapuk.png diff --git a/Icon/badges/flag/ready/volapuk.png b/Icon/badges/flag/ready/volapuk.png new file mode 100644 index 00000000..64b412d3 Binary files /dev/null and b/Icon/badges/flag/ready/volapuk.png differ -- cgit v1.2.3-70-g09d2 From d8c5536ccf9a2e55b97ef08c01c4be8445323f8d Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 16:42:32 +0000 Subject: Delete .gitkeep --- Icon/badges/flag/ready/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/badges/flag/ready/.gitkeep diff --git a/Icon/badges/flag/ready/.gitkeep b/Icon/badges/flag/ready/.gitkeep deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3-70-g09d2 From 05db1921cf92b1130cc883f49824c0180b7a6df8 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 16:42:47 +0000 Subject: Delete .gitkeep --- Icon/badges/flag/xcf/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/badges/flag/xcf/.gitkeep diff --git a/Icon/badges/flag/xcf/.gitkeep b/Icon/badges/flag/xcf/.gitkeep deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3-70-g09d2 From 6bcaa5c1e900bdce997cb4f6aa50db28f554e35c Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 16 Jul 2019 16:44:52 +0000 Subject: DELETED Lang folder --- Lang/en.xcf | Bin 4251 -> 0 bytes Lang/volapuk.png | Bin 1069 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Lang/en.xcf delete mode 100644 Lang/volapuk.png diff --git a/Lang/en.xcf b/Lang/en.xcf deleted file mode 100644 index ee842be0..00000000 Binary files a/Lang/en.xcf and /dev/null differ diff --git a/Lang/volapuk.png b/Lang/volapuk.png deleted file mode 100644 index 64b412d3..00000000 Binary files a/Lang/volapuk.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From d4288ab6703414ac4bacec28dd6b16cbd3fec060 Mon Sep 17 00:00:00 2001 From: Maria Date: Tue, 16 Jul 2019 17:18:14 +0000 Subject: TMW-BR v2 --- ...Sprites_Equipment_chests_chest-snakeplate-female.png | Bin 0 -> 20415 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/chests/ready/Sprites_Equipment_chests_chest-snakeplate-female.png diff --git a/Sprites/Equipment/chests/ready/Sprites_Equipment_chests_chest-snakeplate-female.png b/Sprites/Equipment/chests/ready/Sprites_Equipment_chests_chest-snakeplate-female.png new file mode 100644 index 00000000..23ed6488 Binary files /dev/null and b/Sprites/Equipment/chests/ready/Sprites_Equipment_chests_chest-snakeplate-female.png differ -- cgit v1.2.3-70-g09d2 From ef546680cec892a7c099097853c8bef4eac30e16 Mon Sep 17 00:00:00 2001 From: Maria Date: Tue, 16 Jul 2019 17:19:15 +0000 Subject: TMW-BR v2 --- ...prites_Equipment_chests_chest-snakeplate-female.xcf | Bin 0 -> 275089 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/chests/xcf/Sprites_Equipment_chests_chest-snakeplate-female.xcf diff --git a/Sprites/Equipment/chests/xcf/Sprites_Equipment_chests_chest-snakeplate-female.xcf b/Sprites/Equipment/chests/xcf/Sprites_Equipment_chests_chest-snakeplate-female.xcf new file mode 100644 index 00000000..15380938 Binary files /dev/null and b/Sprites/Equipment/chests/xcf/Sprites_Equipment_chests_chest-snakeplate-female.xcf differ -- cgit v1.2.3-70-g09d2 From f6d9ca0782e5b5e35b82b11612c64199e9c96709 Mon Sep 17 00:00:00 2001 From: Maria Date: Tue, 16 Jul 2019 18:03:30 +0000 Subject: Sprites_Equipment_chests_chest-snakeplate-male TMW-BR v2 --- .../Sprites_Equipment_chests_chest-snakeplate-male.png | Bin 0 -> 25217 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/chests/ready/Sprites_Equipment_chests_chest-snakeplate-male.png diff --git a/Sprites/Equipment/chests/ready/Sprites_Equipment_chests_chest-snakeplate-male.png b/Sprites/Equipment/chests/ready/Sprites_Equipment_chests_chest-snakeplate-male.png new file mode 100644 index 00000000..8ff9b9a6 Binary files /dev/null and b/Sprites/Equipment/chests/ready/Sprites_Equipment_chests_chest-snakeplate-male.png differ -- cgit v1.2.3-70-g09d2 From 29c76d67d24cfbd03687f90f7b0e2764c99d4b16 Mon Sep 17 00:00:00 2001 From: Maria Date: Tue, 16 Jul 2019 18:05:38 +0000 Subject: Sprites_Equipment_chests_chest-snakeplate-male TMW-BR v2 --- .../Sprites_Equipment_chests_chest-snakeplate-male.xcf | Bin 0 -> 276942 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/chests/xcf/Sprites_Equipment_chests_chest-snakeplate-male.xcf diff --git a/Sprites/Equipment/chests/xcf/Sprites_Equipment_chests_chest-snakeplate-male.xcf b/Sprites/Equipment/chests/xcf/Sprites_Equipment_chests_chest-snakeplate-male.xcf new file mode 100644 index 00000000..04e513d7 Binary files /dev/null and b/Sprites/Equipment/chests/xcf/Sprites_Equipment_chests_chest-snakeplate-male.xcf differ -- cgit v1.2.3-70-g09d2 -- cgit v1.2.3-70-g09d2 From 0c3f3cd192dd0e74cb0e16dc9894a4c4eb377b37 Mon Sep 17 00:00:00 2001 From: Saulc Date: Wed, 17 Jul 2019 08:27:56 +0000 Subject: Add all Rules draft in license file --- ART_LICENSE | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/ART_LICENSE b/ART_LICENSE index 722ec124..50f7a316 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -310,10 +310,60 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors # Music # Rules -## Cave_indoor + Rules/rule_cave.tmx +## castle_indoor + Rules/castle_indoor/rule_castle_001.tmx + Rules/castle_indoor/rule_castle_002.tmx + Rules/castle_indoor/rule_castle_003.tmx + Rules/castle_indoor/rule_castle_009.tmx + Rules/castle_indoor/rule_castle_010.tmx ## cave + Rules/cave/rule_cave_001.tmx + Rules/cave/rule_cave_002.tmx + Rules/cave/rule_cave_003.tmx + Rules/cave/rule_cave_004.tmx + Rules/cave/rule_cave_005.tmx + Rules/cave/rule_cave_006.tmx + Rules/cave/rule_cave_007.tmx + Rules/cave/rule_cave_008.tmx + Rules/cave/rule_cave_009.tmx + Rules/cave/rule_cave_010.tmx + Rules/cave/rule_cave_050.tmx + Rules/cave/rule_cave_100.tmx +## desertcliffs + Rules/desertcliffs/rule_cave_001.tmx + Rules/desertcliffs/rule_cave_002.tmx + Rules/desertcliffs/rule_cave_003.tmx + Rules/desertcliffs/rule_cave_004.tmx + Rules/desertcliffs/rule_cave_005.tmx + Rules/desertcliffs/rule_cave_006.tmx + Rules/desertcliffs/rule_cave_007.tmx + Rules/desertcliffs/rule_cave_008.tmx + Rules/desertcliffs/rule_cave_03.tmx + Rules/desertcliffs/rule_cave_50.tmx + Rules/desertcliffs/rule_cave_100.tmx ## icecave -##tilesets + Rules/icecave/rule_icecave_001.tmx + Rules/icecave/rule_icecave_002.tmx + Rules/icecave/rule_icecave_003.tmx + Rules/icecave/rule_icecave_004.tmx + Rules/icecave/rule_icecave_005.tmx + Rules/icecave/rule_icecave_006.tmx + Rules/icecave/rule_icecave_007.tmx + Rules/icecave/rule_icecave_008.tmx + Rules/icecave/rule_icecave_009.tmx + Rules/icecave/rule_icecave_010.tmx + Rules/icecave/rule_icecave_020.tmx + Rules/icecave/rule_icecave_100.tmx +##tilesets + Rules/tilesets/set_castle_indoor.png + Rules/tilesets/set_cave.png + Rules/tilesets/set_desertcliff.png + Rules/tilesets/set_hlw.png + Rules/tilesets/set_icecave.png + Rules/tilesets/set_icemountain.png + Rules/tilesets/set_rules.png + Rules/tilesets/set_woodland.png #SFX SFX/big_punch.wav (Socapex) (CC BY-SA 3.0) (https://opengameart.org/content/punches-hits-swords-and-squishes) -- cgit v1.2.3-70-g09d2 From a1ae89450d7e395feae0ac15e314ea2ff4a4d96c Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 07:23:39 +0000 Subject: Delete Aurora Glasses.png we already have them in v2 --- Icon/LoF/Aurora Glasses.png | Bin 1379 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/LoF/Aurora Glasses.png diff --git a/Icon/LoF/Aurora Glasses.png b/Icon/LoF/Aurora Glasses.png deleted file mode 100644 index baabda2a..00000000 Binary files a/Icon/LoF/Aurora Glasses.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From ac87cfb1961e8711e9ca0507ffc8becf703fb8f7 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 07:25:07 +0000 Subject: Delete poka dot afro2.png we already have it in v2 --- Icon/LoF/poka dot afro2.png | Bin 2816 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/LoF/poka dot afro2.png diff --git a/Icon/LoF/poka dot afro2.png b/Icon/LoF/poka dot afro2.png deleted file mode 100644 index 5084a364..00000000 Binary files a/Icon/LoF/poka dot afro2.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From d8301a1cfe24863823ca5a6b718d9a319df51030 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 07:26:01 +0000 Subject: Delete justice set.png we already have it in npc maker --- Icon/LoF/justice set.png | Bin 1527 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/LoF/justice set.png diff --git a/Icon/LoF/justice set.png b/Icon/LoF/justice set.png deleted file mode 100644 index 4cb34b49..00000000 Binary files a/Icon/LoF/justice set.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From aff54422f9ada4821ba1e1cd1721909eff113e5f Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 07:26:34 +0000 Subject: Delete goldscorpion2.png we will won't use this version --- Icon/LoF/goldscorpion2.png | Bin 11232 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/LoF/goldscorpion2.png diff --git a/Icon/LoF/goldscorpion2.png b/Icon/LoF/goldscorpion2.png deleted file mode 100644 index 60ed7de8..00000000 Binary files a/Icon/LoF/goldscorpion2.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 9e0bb03b32bb6d9c704100627f808aa5d702ee2f Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 07:49:44 +0000 Subject: Delete glitter man.png duplicate --- Icon/LoF/glitter man.png | Bin 3333 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/LoF/glitter man.png diff --git a/Icon/LoF/glitter man.png b/Icon/LoF/glitter man.png deleted file mode 100644 index 9dd65699..00000000 Binary files a/Icon/LoF/glitter man.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 7cce3db2c3abbe67736264e7f82e26398e746641 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 07:56:19 +0000 Subject: Delete Glitter Fro.png duplicate --- Icon/LoF/Glitter Fro.png | Bin 20001 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/LoF/Glitter Fro.png diff --git a/Icon/LoF/Glitter Fro.png b/Icon/LoF/Glitter Fro.png deleted file mode 100644 index d7d9c87f..00000000 Binary files a/Icon/LoF/Glitter Fro.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 4e174c5efc18de131f6f36e8ceacec6338e2f77f Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 07:59:05 +0000 Subject: Delete witch-doctor-mask.png duplicate --- Icon/LoF/Hello/witch-doctor-mask.png | Bin 5443 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/LoF/Hello/witch-doctor-mask.png diff --git a/Icon/LoF/Hello/witch-doctor-mask.png b/Icon/LoF/Hello/witch-doctor-mask.png deleted file mode 100644 index e1d2857d..00000000 Binary files a/Icon/LoF/Hello/witch-doctor-mask.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From b526f471606481dbedd4bf7bf131761a2f5c7ece Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 08:00:32 +0000 Subject: Delete Red(hair sprites).png useless --- Icon/LoF/Hello/Party Hat/Red(hair sprites).png | Bin 17516 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/LoF/Hello/Party Hat/Red(hair sprites).png diff --git a/Icon/LoF/Hello/Party Hat/Red(hair sprites).png b/Icon/LoF/Hello/Party Hat/Red(hair sprites).png deleted file mode 100644 index 86577777..00000000 Binary files a/Icon/LoF/Hello/Party Hat/Red(hair sprites).png and /dev/null differ -- cgit v1.2.3-70-g09d2 From b89d4734d18954fb13797b894c620af2adbba475 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 08:01:57 +0000 Subject: Delete angel-wings.xml --- Sprites/Equipment/accessories/angel-wings.xml | 102 -------------------------- 1 file changed, 102 deletions(-) delete mode 100644 Sprites/Equipment/accessories/angel-wings.xml diff --git a/Sprites/Equipment/accessories/angel-wings.xml b/Sprites/Equipment/accessories/angel-wings.xml deleted file mode 100644 index 8a10d837..00000000 --- a/Sprites/Equipment/accessories/angel-wings.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3-70-g09d2 From 71d3d03773a4e6e5af94d753b55bb3489160f106 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 08:03:31 +0000 Subject: Delete chest-snakeplate-female.png done by mishana --- Sprites/Equipment/chests/chest-snakeplate-female.png | Bin 37786 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Equipment/chests/chest-snakeplate-female.png diff --git a/Sprites/Equipment/chests/chest-snakeplate-female.png b/Sprites/Equipment/chests/chest-snakeplate-female.png deleted file mode 100644 index a2bcc82f..00000000 Binary files a/Sprites/Equipment/chests/chest-snakeplate-female.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 1f4eb418fe23fa2dca99e50d1f5a17423ff719f6 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 08:03:35 +0000 Subject: Delete chest-snakeplate-male.png done by mishana --- Sprites/Equipment/chests/chest-snakeplate-male.png | Bin 27589 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Equipment/chests/chest-snakeplate-male.png diff --git a/Sprites/Equipment/chests/chest-snakeplate-male.png b/Sprites/Equipment/chests/chest-snakeplate-male.png deleted file mode 100644 index 1598725e..00000000 Binary files a/Sprites/Equipment/chests/chest-snakeplate-male.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 4329f90e0d30ae021ac00bad2bd16b152bada72b Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 08:07:34 +0000 Subject: Delete glitter_fro.png duplicate --- Sprites/Equipment/head/glitter_fro.png | Bin 20001 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Equipment/head/glitter_fro.png diff --git a/Sprites/Equipment/head/glitter_fro.png b/Sprites/Equipment/head/glitter_fro.png deleted file mode 100644 index d7d9c87f..00000000 Binary files a/Sprites/Equipment/head/glitter_fro.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 5a4f91b54f6bc5a887377c9eea18f14099570138 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 08:08:22 +0000 Subject: Delete antlerhat.png already ingame --- Sprites/Equipment/head/ready/antlerhat.png | Bin 799 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Equipment/head/ready/antlerhat.png diff --git a/Sprites/Equipment/head/ready/antlerhat.png b/Sprites/Equipment/head/ready/antlerhat.png deleted file mode 100644 index 0b092dc8..00000000 Binary files a/Sprites/Equipment/head/ready/antlerhat.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From f7bb13151f8f9dd951482fc60ca5eba12a0b0f7a Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 08:13:44 +0000 Subject: equipment that needs a redraw to feet with TMW2 sprite standards --- Drafts/sprite_tmw2.txt | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 Drafts/sprite_tmw2.txt diff --git a/Drafts/sprite_tmw2.txt b/Drafts/sprite_tmw2.txt new file mode 100644 index 00000000..c4795989 --- /dev/null +++ b/Drafts/sprite_tmw2.txt @@ -0,0 +1,61 @@ +Chrome miners hat.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/Chrome%20%20miners%20hat.png +the iron mask.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/the%20iron%20mask.png +sage enhanced final rendition.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/sage%20enhanced%20final%20rendition.png +deep Minors Helm comp.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/deep%20Minors%20Helm%20comp.png +deathhood.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/deathhood.png +coool2.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/coool2.png +Spot Shroom Hat1.png 869 Bytes +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/Spot%20Shroom%20Hat1.png +Savior Helm.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/Savior%20Helm.png +Sage Rulers Helm template final.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/Sage%20Rulers%20Helm%20template%20final.png +Pirate Lords Hat.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/Pirate%20Lords%20Hat.png +Pinkie Knights Helm View.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/Pinkie%20Knights%20Helm%20View.png +Lucky clover Hat.png 5.13 KB +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/Lucky%20clover%20Hat.png +Copolver sparten helm.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/Copolver%20sparten%20helm.png +Broken Copolver Helm.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/Broken%20Copolver%20Helm.png +Bounty Hunter Helm.png 2. +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/Bounty%20Hunter%20Helm.png +monster-haunted.png +https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/Hello/monster-haunted.png +angel-wings.png +https://gitlab.com/TMW2/Art/blob/master/Sprites/Equipment/accessories/angel-wings.png +longboots.png +https://gitlab.com/TMW2/Art/blob/master/Sprites/Equipment/feet/longboots.png +warlordboots.png +https://gitlab.com/TMW2/Art/blob/master/Sprites/Equipment/feet/warlordboots.png +warlockboots.png +https://gitlab.com/TMW2/Art/blob/master/Sprites/Equipment/feet/warlockboots.png +bigBowlerHat.png 1.22 KB +https://gitlab.com/TMW2/Art/blob/master/Sprites/Equipment/head/bigBowlerHat.png +1Grieves_working__1_.png +https://gitlab.com/TMW2/Art/blob/master/Sprites/Equipment/legs/1Grieves_working__1_.png +SaviorGrieves.png +https://gitlab.com/TMW2/Art/blob/master/Sprites/Equipment/legs/SaviorGrieves.png +WarlordGrieves.png +https://gitlab.com/TMW2/Art/blob/master/Sprites/Equipment/legs/WarlordGrieves.png +calca-baloeiro-male.png 31.9 KB +https://gitlab.com/TMW2/Art/blob/master/Sprites/Equipment/legs/calca-baloeiro-male.png + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 6a92990a09d366c1946bfbd767841990ef16fe83 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 18 Jul 2019 14:17:32 +0000 Subject: Upload New File --- Drafts/kn_craft.xlsx | Bin 0 -> 12339 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Drafts/kn_craft.xlsx diff --git a/Drafts/kn_craft.xlsx b/Drafts/kn_craft.xlsx new file mode 100644 index 00000000..af5dfd9e Binary files /dev/null and b/Drafts/kn_craft.xlsx differ -- cgit v1.2.3-70-g09d2 From f6cfbdc05778ddb036ac1994d1e30db06e716a9e Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 18 Jul 2019 14:24:34 +0000 Subject: Delete manaplus_improvments.md - moved to wiki (Dev/ folder) --- Drafts/manaplus_improvments.md | 54 ------------------------------------------ 1 file changed, 54 deletions(-) delete mode 100644 Drafts/manaplus_improvments.md diff --git a/Drafts/manaplus_improvments.md b/Drafts/manaplus_improvments.md deleted file mode 100644 index f1cf1d07..00000000 --- a/Drafts/manaplus_improvments.md +++ /dev/null @@ -1,54 +0,0 @@ -# ManaPlus Improvments [DRAFT] - -> This is a Draft, which means that the document is not done yet and as such shouldn't be took for granted. But that doesn't mean that the points are less important. - - -## Problems - -### Syncing Problems - -- General mob and player position desync (The bug that we try to fight with the "Resync" command) -- Mob corpses (mobs that a dead but to m+ they still live) - -### Mob render distance -Mobs aren't allways rendered at the screen edges (big window) - -### Controls on mobile are horrible -We have the touch buttons, but that doesn't changes the fact that the desktop-version interface doesn't work on mobile - especialy the menu and interface is not fun on a phone. -See the reviews on googleplaystore: -https://play.google.com/store/apps/details?id=org.evolonline.beta.manaplus&showAllReviews=true - -> **LawnCables opinion**: We don't need as much options and customisation options on mobile (I want to say we should find good defaults and hide the settings that make not much sense on mobile, such as keyboard bindings) - -### Controller support could use some upgrades - -- Better out of the box experience (with xbox360 controller) - -- Display talk button symbol over the npc that will get triggered so that the user knows when he can press it - -%TODO add improvment wishes here% - -### Misc Bugs: - -- sitting with s doesn't allways work instantanious (network lag?) -- Item info of bank items isn't shown (tmw2 death acorns - name of person that droped it) -- Support for full unicode text rendering (as example emojis with emoji fonts are displayed as tofu, not only important for emojis also important for signs that only recently were added to unicode) - -## (kinda Mandatory) New features - -### Renderer -> Real Lighting System -Light and light sources -Probably also shadows? - -## Documentation (that lacks or LawnCable didn't found): -- Modding/Plugins (with examples) - - -## Utopical ideas (Ideas that lack the link to reality) - -### Level Streaming -No different maps and warping anymore -> one big map (maybe saved in chunks, that not the whole map has to be loaded in memory, though that might not be that big of a deal) - -- would need some things that mobs from outside can't enter cities -- we need another system for exp-save-zones (villages) -- we would still need 'instanciateable' levels for some quests (namely singleplayerquests) (example: hassan-> kill scorpion) \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 935147068a582bb75d89047cbd85ec413448faeb Mon Sep 17 00:00:00 2001 From: Maria Date: Sun, 21 Jul 2019 18:42:16 +0000 Subject: Icon_LoF_Chrome miners hat LOF GPLv2 --- .../Equipment/head/xcf/Icon_LoF_Chrome__miners_hat.xcf | Bin 0 -> 21942 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/xcf/Icon_LoF_Chrome__miners_hat.xcf diff --git a/Sprites/Equipment/head/xcf/Icon_LoF_Chrome__miners_hat.xcf b/Sprites/Equipment/head/xcf/Icon_LoF_Chrome__miners_hat.xcf new file mode 100644 index 00000000..d6c52971 Binary files /dev/null and b/Sprites/Equipment/head/xcf/Icon_LoF_Chrome__miners_hat.xcf differ -- cgit v1.2.3-70-g09d2 From 5c17a02d5b56f226b5172b0af3a75c2b5b00ad6a Mon Sep 17 00:00:00 2001 From: Maria Date: Sun, 21 Jul 2019 18:43:53 +0000 Subject: Icon_LoF_Chrome miners hat LOF GPLv2 --- .../Equipment/head/ready/Icon_LoF_Chrome__miners_hat.png | Bin 0 -> 2800 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/ready/Icon_LoF_Chrome__miners_hat.png diff --git a/Sprites/Equipment/head/ready/Icon_LoF_Chrome__miners_hat.png b/Sprites/Equipment/head/ready/Icon_LoF_Chrome__miners_hat.png new file mode 100644 index 00000000..ad28a7f4 Binary files /dev/null and b/Sprites/Equipment/head/ready/Icon_LoF_Chrome__miners_hat.png differ -- cgit v1.2.3-70-g09d2 From e7a6971959e81ed1a436a467537b0355ee7e1b3f Mon Sep 17 00:00:00 2001 From: Saulc Date: Sun, 21 Jul 2019 18:52:43 +0000 Subject: Delete Chrome miners hat.png done by @mishana :) --- Icon/LoF/Chrome miners hat.png | Bin 1755 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/LoF/Chrome miners hat.png diff --git a/Icon/LoF/Chrome miners hat.png b/Icon/LoF/Chrome miners hat.png deleted file mode 100644 index 8781fad6..00000000 Binary files a/Icon/LoF/Chrome miners hat.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From eae50086ea62af76f282b0b201b3336b7e8fdf9d Mon Sep 17 00:00:00 2001 From: Saulc Date: Sun, 21 Jul 2019 19:16:30 +0000 Subject: Update sprite_tmw2.txt --- Drafts/sprite_tmw2.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Drafts/sprite_tmw2.txt b/Drafts/sprite_tmw2.txt index c4795989..37f5c42b 100644 --- a/Drafts/sprite_tmw2.txt +++ b/Drafts/sprite_tmw2.txt @@ -1,5 +1,3 @@ -Chrome miners hat.png -https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/Chrome%20%20miners%20hat.png the iron mask.png https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/the%20iron%20mask.png sage enhanced final rendition.png -- cgit v1.2.3-70-g09d2 From c4ad5b97a68651ea2c26440cf7723d638ca0d3a3 Mon Sep 17 00:00:00 2001 From: Maria Date: Sun, 21 Jul 2019 19:36:43 +0000 Subject: iron mask LOF GPLV2 --- Sprites/Equipment/head/xcf/Icon_LoF_the_iron_mask.xcf | Bin 0 -> 16655 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/xcf/Icon_LoF_the_iron_mask.xcf diff --git a/Sprites/Equipment/head/xcf/Icon_LoF_the_iron_mask.xcf b/Sprites/Equipment/head/xcf/Icon_LoF_the_iron_mask.xcf new file mode 100644 index 00000000..c9ad7776 Binary files /dev/null and b/Sprites/Equipment/head/xcf/Icon_LoF_the_iron_mask.xcf differ -- cgit v1.2.3-70-g09d2 From 0a114afae65484a63fe368be65cf2a6eaf96d29b Mon Sep 17 00:00:00 2001 From: Saulc Date: Sun, 21 Jul 2019 19:38:33 +0000 Subject: Delete the iron mask.png done by @mishana --- Icon/LoF/the iron mask.png | Bin 2401 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/LoF/the iron mask.png diff --git a/Icon/LoF/the iron mask.png b/Icon/LoF/the iron mask.png deleted file mode 100644 index 769227f0..00000000 Binary files a/Icon/LoF/the iron mask.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 441fabe63be1c06fdd6b867ce126ba4cb4bd7f5d Mon Sep 17 00:00:00 2001 From: Maria Date: Sun, 21 Jul 2019 19:40:23 +0000 Subject: iron mask LOF GPLV2 --- Sprites/Equipment/head/ready/Icon_LoF_the_iron_mask.png | Bin 0 -> 4804 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/ready/Icon_LoF_the_iron_mask.png diff --git a/Sprites/Equipment/head/ready/Icon_LoF_the_iron_mask.png b/Sprites/Equipment/head/ready/Icon_LoF_the_iron_mask.png new file mode 100644 index 00000000..3ceea82e Binary files /dev/null and b/Sprites/Equipment/head/ready/Icon_LoF_the_iron_mask.png differ -- cgit v1.2.3-70-g09d2 From 5ae4a741c74437a2ae7c357f0e419a84b4718da8 Mon Sep 17 00:00:00 2001 From: Saulc Date: Sun, 21 Jul 2019 20:29:40 +0000 Subject: Delete sage enhanced final rendition.png --- Icon/LoF/sage enhanced final rendition.png | Bin 4256 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/LoF/sage enhanced final rendition.png diff --git a/Icon/LoF/sage enhanced final rendition.png b/Icon/LoF/sage enhanced final rendition.png deleted file mode 100644 index 73043c96..00000000 Binary files a/Icon/LoF/sage enhanced final rendition.png and /dev/null differ -- cgit v1.2.3-70-g09d2 -- cgit v1.2.3-70-g09d2 From 20cac41d00fcdecbadbdd16b6ecf7fbdd79d67e9 Mon Sep 17 00:00:00 2001 From: Saulc Date: Sun, 21 Jul 2019 20:30:22 +0000 Subject: Update sprite_tmw2.txt --- Drafts/sprite_tmw2.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Drafts/sprite_tmw2.txt b/Drafts/sprite_tmw2.txt index 37f5c42b..8ecfeacf 100644 --- a/Drafts/sprite_tmw2.txt +++ b/Drafts/sprite_tmw2.txt @@ -1,7 +1,6 @@ the iron mask.png https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/the%20iron%20mask.png -sage enhanced final rendition.png -https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/sage%20enhanced%20final%20rendition.png + deep Minors Helm comp.png https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/deep%20Minors%20Helm%20comp.png deathhood.png -- cgit v1.2.3-70-g09d2 From 237db46499c96ca2fc359fc168f56381bf064cba Mon Sep 17 00:00:00 2001 From: Maria Date: Sun, 21 Jul 2019 20:41:04 +0000 Subject: sagehelmet GPLv2 by LOF --- .../ready/Icon_LoF_sage_enhanced_final_rendition.png | Bin 0 -> 9438 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/ready/Icon_LoF_sage_enhanced_final_rendition.png diff --git a/Sprites/Equipment/head/ready/Icon_LoF_sage_enhanced_final_rendition.png b/Sprites/Equipment/head/ready/Icon_LoF_sage_enhanced_final_rendition.png new file mode 100644 index 00000000..6ad0660c Binary files /dev/null and b/Sprites/Equipment/head/ready/Icon_LoF_sage_enhanced_final_rendition.png differ -- cgit v1.2.3-70-g09d2 From 7bf6b0e343946a5e28584892bb9c93598bc83958 Mon Sep 17 00:00:00 2001 From: Maria Date: Sun, 21 Jul 2019 20:42:12 +0000 Subject: sagehelmet GPLv2 by LOF --- .../head/xcf/Icon_LoF_sage_enhanced_final_rendition.xcf | Bin 0 -> 17116 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/xcf/Icon_LoF_sage_enhanced_final_rendition.xcf diff --git a/Sprites/Equipment/head/xcf/Icon_LoF_sage_enhanced_final_rendition.xcf b/Sprites/Equipment/head/xcf/Icon_LoF_sage_enhanced_final_rendition.xcf new file mode 100644 index 00000000..b439d0d2 Binary files /dev/null and b/Sprites/Equipment/head/xcf/Icon_LoF_sage_enhanced_final_rendition.xcf differ -- cgit v1.2.3-70-g09d2 From 9ff0643dce4249262171dd0fd4b0f560e1125cf3 Mon Sep 17 00:00:00 2001 From: Saulc Date: Sun, 21 Jul 2019 21:56:50 +0000 Subject: Delete deep Minors Helm comp.png done by @mishana --- Icon/LoF/deep Minors Helm comp.png | Bin 2066 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/LoF/deep Minors Helm comp.png diff --git a/Icon/LoF/deep Minors Helm comp.png b/Icon/LoF/deep Minors Helm comp.png deleted file mode 100644 index 6d487597..00000000 Binary files a/Icon/LoF/deep Minors Helm comp.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 5a137fa74a36138518e3f2ea173cf5d38a3fab31 Mon Sep 17 00:00:00 2001 From: Maria Date: Sun, 21 Jul 2019 21:58:27 +0000 Subject: Minors Helm LOF GPLv2 --- .../head/ready/Icon_LoF_deep_Minors_Helm_comp.png | Bin 0 -> 9139 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/ready/Icon_LoF_deep_Minors_Helm_comp.png diff --git a/Sprites/Equipment/head/ready/Icon_LoF_deep_Minors_Helm_comp.png b/Sprites/Equipment/head/ready/Icon_LoF_deep_Minors_Helm_comp.png new file mode 100644 index 00000000..b695650b Binary files /dev/null and b/Sprites/Equipment/head/ready/Icon_LoF_deep_Minors_Helm_comp.png differ -- cgit v1.2.3-70-g09d2 From ccf4af0caaa78c4ddf3900aa6deb14cca5650a17 Mon Sep 17 00:00:00 2001 From: Maria Date: Sun, 21 Jul 2019 21:58:56 +0000 Subject: Minors Helm LOF GPLv2 --- .../head/xcf/Icon_LoF_deep_Minors_Helm_comp.xcf | Bin 0 -> 17126 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/xcf/Icon_LoF_deep_Minors_Helm_comp.xcf diff --git a/Sprites/Equipment/head/xcf/Icon_LoF_deep_Minors_Helm_comp.xcf b/Sprites/Equipment/head/xcf/Icon_LoF_deep_Minors_Helm_comp.xcf new file mode 100644 index 00000000..561156ea Binary files /dev/null and b/Sprites/Equipment/head/xcf/Icon_LoF_deep_Minors_Helm_comp.xcf differ -- cgit v1.2.3-70-g09d2 From 0618476c129dffeb80d05acea538e7ec6d81b5d6 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:06:43 +0000 Subject: Update sprite_tmw2.txt --- Drafts/sprite_tmw2.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Drafts/sprite_tmw2.txt b/Drafts/sprite_tmw2.txt index 8ecfeacf..e0eeaee2 100644 --- a/Drafts/sprite_tmw2.txt +++ b/Drafts/sprite_tmw2.txt @@ -1,5 +1,3 @@ -the iron mask.png -https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/the%20iron%20mask.png deep Minors Helm comp.png https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/deep%20Minors%20Helm%20comp.png -- cgit v1.2.3-70-g09d2 From 5fc5a7be9a25bb0d43b1d6ad79bb9aae88bfa778 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:06:56 +0000 Subject: Update sprite_tmw2.txt --- Drafts/sprite_tmw2.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/Drafts/sprite_tmw2.txt b/Drafts/sprite_tmw2.txt index e0eeaee2..abd5ab4a 100644 --- a/Drafts/sprite_tmw2.txt +++ b/Drafts/sprite_tmw2.txt @@ -1,6 +1,3 @@ - -deep Minors Helm comp.png -https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/deep%20Minors%20Helm%20comp.png deathhood.png https://gitlab.com/TMW2/Art/blob/master/Icon/LoF/deathhood.png coool2.png -- cgit v1.2.3-70-g09d2 From ce36f00d3a491ff46374b2c29a91bae0795f692b Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:11:22 +0000 Subject: Add new emotes directory --- Icon/emotes/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/emotes/.gitkeep diff --git a/Icon/emotes/.gitkeep b/Icon/emotes/.gitkeep new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3-70-g09d2 From 2864d15c7bdf7b678f126ddbef2562e033e7eea9 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:25:30 +0000 Subject: Delete generic-globo-bneve.png duplicate --- Icon/generic/analysis/br/generic-globo-bneve.png | Bin 2954 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/br/generic-globo-bneve.png diff --git a/Icon/generic/analysis/br/generic-globo-bneve.png b/Icon/generic/analysis/br/generic-globo-bneve.png deleted file mode 100644 index 6ec60923..00000000 Binary files a/Icon/generic/analysis/br/generic-globo-bneve.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 58ee20bcdcca70c1426a7ac8613d9352f63ca755 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:25:36 +0000 Subject: Delete generic-globo-noel.png duplicate --- Icon/generic/analysis/br/generic-globo-noel.png | Bin 3022 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/br/generic-globo-noel.png diff --git a/Icon/generic/analysis/br/generic-globo-noel.png b/Icon/generic/analysis/br/generic-globo-noel.png deleted file mode 100644 index d9294978..00000000 Binary files a/Icon/generic/analysis/br/generic-globo-noel.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 496db0155b9813f9fa2098ff67b632de5e661d0b Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:25:43 +0000 Subject: Delete generic-herb.png duplicate --- Icon/generic/analysis/br/generic-herb.png | Bin 1427 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/br/generic-herb.png diff --git a/Icon/generic/analysis/br/generic-herb.png b/Icon/generic/analysis/br/generic-herb.png deleted file mode 100644 index 0a832180..00000000 Binary files a/Icon/generic/analysis/br/generic-herb.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 1eb20d7ad238ba733d136f42a9770918eb023df4 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:27:35 +0000 Subject: Delete reinboo-stick.png already ingame --- Icon/generic/analysis/org/reinboo-stick.png | Bin 510 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/org/reinboo-stick.png diff --git a/Icon/generic/analysis/org/reinboo-stick.png b/Icon/generic/analysis/org/reinboo-stick.png deleted file mode 100644 index 3650581b..00000000 Binary files a/Icon/generic/analysis/org/reinboo-stick.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 35eaf53abcea6426831568fa15555a86aacc95d7 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:28:17 +0000 Subject: Delete armor-feet-bota-natalina-vermelha.png duplicate --- .../analysis/armor-feet-bota-natalina-vermelha.png | Bin 469 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/armor-feet-bota-natalina-vermelha.png diff --git a/Icon/generic/analysis/armor-feet-bota-natalina-vermelha.png b/Icon/generic/analysis/armor-feet-bota-natalina-vermelha.png deleted file mode 100644 index 8e89b1b7..00000000 Binary files a/Icon/generic/analysis/armor-feet-bota-natalina-vermelha.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From fad1b67d124c9ee2ce2eadb0601dba52ebece208 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:28:21 +0000 Subject: Delete armor-hands-luva-natalina-vermelha.png duplicate --- .../analysis/armor-hands-luva-natalina-vermelha.png | Bin 1479 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/armor-hands-luva-natalina-vermelha.png diff --git a/Icon/generic/analysis/armor-hands-luva-natalina-vermelha.png b/Icon/generic/analysis/armor-hands-luva-natalina-vermelha.png deleted file mode 100644 index 2a50d6cb..00000000 Binary files a/Icon/generic/analysis/armor-hands-luva-natalina-vermelha.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 78a95b5dd8fca198316bdef82c3abe2aa9f1ee31 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:28:25 +0000 Subject: Delete boxofchocolates.png duplicate --- Icon/generic/analysis/boxofchocolates.png | Bin 1716 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/boxofchocolates.png diff --git a/Icon/generic/analysis/boxofchocolates.png b/Icon/generic/analysis/boxofchocolates.png deleted file mode 100644 index 60cec5eb..00000000 Binary files a/Icon/generic/analysis/boxofchocolates.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 175361b41caf9e1dd4e4f7600bd638036fa3d433 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:28:28 +0000 Subject: Delete christmasbulb.png duplicate --- Icon/generic/analysis/christmasbulb.png | Bin 570 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/christmasbulb.png diff --git a/Icon/generic/analysis/christmasbulb.png b/Icon/generic/analysis/christmasbulb.png deleted file mode 100644 index ce50e567..00000000 Binary files a/Icon/generic/analysis/christmasbulb.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From e8aa41d2c68936ff43b6384a55dd2dcdd99ee304 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:28:31 +0000 Subject: Delete easterbasket.png duplicate --- Icon/generic/analysis/easterbasket.png | Bin 915 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/easterbasket.png diff --git a/Icon/generic/analysis/easterbasket.png b/Icon/generic/analysis/easterbasket.png deleted file mode 100644 index 2863189c..00000000 Binary files a/Icon/generic/analysis/easterbasket.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From a57e67efcb851330f6c492bf591224d6cc4df512 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:28:35 +0000 Subject: Delete emerald.png duplicate --- Icon/generic/analysis/emerald.png | Bin 1156 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 Icon/generic/analysis/emerald.png diff --git a/Icon/generic/analysis/emerald.png b/Icon/generic/analysis/emerald.png deleted file mode 100755 index 0520005b..00000000 Binary files a/Icon/generic/analysis/emerald.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From fc38b89894e619e8e34387ee47a4b58bb6ae855e Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:28:38 +0000 Subject: Delete generic-cachecol.png duplicate --- Icon/generic/analysis/generic-cachecol.png | Bin 1106 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/generic-cachecol.png diff --git a/Icon/generic/analysis/generic-cachecol.png b/Icon/generic/analysis/generic-cachecol.png deleted file mode 100644 index e1daf735..00000000 Binary files a/Icon/generic/analysis/generic-cachecol.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 6ca702c609e81b069471cca564eb60b169e1c38f Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:28:41 +0000 Subject: Delete generic-globo-bneve.png duplicate --- Icon/generic/analysis/generic-globo-bneve.png | Bin 2954 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/generic-globo-bneve.png diff --git a/Icon/generic/analysis/generic-globo-bneve.png b/Icon/generic/analysis/generic-globo-bneve.png deleted file mode 100644 index 6ec60923..00000000 Binary files a/Icon/generic/analysis/generic-globo-bneve.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From ccc2cdaa645c7eccad0a3eaaaf3422d1503497a4 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:28:46 +0000 Subject: Delete generic-globo-noel.png duplicate --- Icon/generic/analysis/generic-globo-noel.png | Bin 3022 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/generic-globo-noel.png diff --git a/Icon/generic/analysis/generic-globo-noel.png b/Icon/generic/analysis/generic-globo-noel.png deleted file mode 100644 index d9294978..00000000 Binary files a/Icon/generic/analysis/generic-globo-noel.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From f6e02d72769dcd544f32a933121090801c41bb24 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:28:49 +0000 Subject: Delete generic-greenpresentbox.png duplicate --- Icon/generic/analysis/generic-greenpresentbox.png | Bin 855 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/generic-greenpresentbox.png diff --git a/Icon/generic/analysis/generic-greenpresentbox.png b/Icon/generic/analysis/generic-greenpresentbox.png deleted file mode 100644 index fe2a81c4..00000000 Binary files a/Icon/generic/analysis/generic-greenpresentbox.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 98692f6dab701a35517d84aad7a4ceff2f69eea0 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:28:55 +0000 Subject: Delete generic-herb.png duplicate --- Icon/generic/analysis/generic-herb.png | Bin 1427 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/generic-herb.png diff --git a/Icon/generic/analysis/generic-herb.png b/Icon/generic/analysis/generic-herb.png deleted file mode 100644 index 0a832180..00000000 Binary files a/Icon/generic/analysis/generic-herb.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From fde1d1ebdbe3ebf1cd032f09dc7e399e948fb7d7 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:29:00 +0000 Subject: Delete generic-naftalina.png duplicate --- Icon/generic/analysis/generic-naftalina.png | Bin 1385 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/generic-naftalina.png diff --git a/Icon/generic/analysis/generic-naftalina.png b/Icon/generic/analysis/generic-naftalina.png deleted file mode 100644 index 0c3de3d4..00000000 Binary files a/Icon/generic/analysis/generic-naftalina.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From e1eb1ccb39c6a42bedfec86eaa618b246521d19d Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:29:03 +0000 Subject: Delete generic-pagina-branca.png duplicate --- Icon/generic/analysis/generic-pagina-branca.png | Bin 1631 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/generic-pagina-branca.png diff --git a/Icon/generic/analysis/generic-pagina-branca.png b/Icon/generic/analysis/generic-pagina-branca.png deleted file mode 100644 index 22cfde43..00000000 Binary files a/Icon/generic/analysis/generic-pagina-branca.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From e8937211c3eab16b116322e39df6993d3e0cfa05 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 07:29:07 +0000 Subject: Delete santacookie.png duplicate --- Icon/generic/analysis/santacookie.png | Bin 390 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/generic/analysis/santacookie.png diff --git a/Icon/generic/analysis/santacookie.png b/Icon/generic/analysis/santacookie.png deleted file mode 100644 index 1f1e0eef..00000000 Binary files a/Icon/generic/analysis/santacookie.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 7304e61d1da3e0d3bcab50e2f800723d620f9a25 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 08:39:18 +0000 Subject: Delete superpaperhat.png --- Sprites/Equipment/head/superpaperhat.png | Bin 2285 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Equipment/head/superpaperhat.png diff --git a/Sprites/Equipment/head/superpaperhat.png b/Sprites/Equipment/head/superpaperhat.png deleted file mode 100644 index 7ca152bd..00000000 Binary files a/Sprites/Equipment/head/superpaperhat.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 8d900e7fd12d48dc20c1430d37fc9a96ab303f5d Mon Sep 17 00:00:00 2001 From: Maria Date: Mon, 22 Jul 2019 08:47:05 +0000 Subject: Replace Icon_LoF_deep_Minors_Helm_comp.png --- .../head/ready/Icon_LoF_deep_Minors_Helm_comp.png | Bin 9139 -> 6109 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Sprites/Equipment/head/ready/Icon_LoF_deep_Minors_Helm_comp.png b/Sprites/Equipment/head/ready/Icon_LoF_deep_Minors_Helm_comp.png index b695650b..e4ddf699 100644 Binary files a/Sprites/Equipment/head/ready/Icon_LoF_deep_Minors_Helm_comp.png and b/Sprites/Equipment/head/ready/Icon_LoF_deep_Minors_Helm_comp.png differ -- cgit v1.2.3-70-g09d2 From 9bb1369f85faec3cc43305cb113fdfc40adc0114 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 22 Jul 2019 14:57:05 +0000 Subject: GLOBAL file listing hats for classes --- Drafts/hats.xlsx | Bin 0 -> 26752 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Drafts/hats.xlsx diff --git a/Drafts/hats.xlsx b/Drafts/hats.xlsx new file mode 100644 index 00000000..1881dc10 Binary files /dev/null and b/Drafts/hats.xlsx differ -- cgit v1.2.3-70-g09d2 From e507039fd605deae1a79bf944a50baf76db318b3 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 23 Jul 2019 15:33:55 +0000 Subject: Replace hats.xlsx --- Drafts/hats.xlsx | Bin 26752 -> 33635 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Drafts/hats.xlsx b/Drafts/hats.xlsx index 1881dc10..475e89db 100644 Binary files a/Drafts/hats.xlsx and b/Drafts/hats.xlsx differ -- cgit v1.2.3-70-g09d2 From d6cc2424d16113b97de52497f27244464ede4d08 Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:37:58 +0000 Subject: Upload New File --- Sprites/Npcs/xcf/perching_piou.xcf | Bin 0 -> 41830 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/xcf/perching_piou.xcf diff --git a/Sprites/Npcs/xcf/perching_piou.xcf b/Sprites/Npcs/xcf/perching_piou.xcf new file mode 100644 index 00000000..11e03599 Binary files /dev/null and b/Sprites/Npcs/xcf/perching_piou.xcf differ -- cgit v1.2.3-70-g09d2 From 0ff7d788f49ea7d1661c0608036dd3f3ce1e7779 Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:38:16 +0000 Subject: Upload New File --- Sprites/Npcs/xcf/piou_singing.xcf | Bin 0 -> 31075 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/xcf/piou_singing.xcf diff --git a/Sprites/Npcs/xcf/piou_singing.xcf b/Sprites/Npcs/xcf/piou_singing.xcf new file mode 100644 index 00000000..f7d88c74 Binary files /dev/null and b/Sprites/Npcs/xcf/piou_singing.xcf differ -- cgit v1.2.3-70-g09d2 From 3945bf57e91100a95141a0b30981a57cf37ba661 Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:38:36 +0000 Subject: Upload New File --- Sprites/Npcs/xcf/sleeping_piou.xcf | Bin 0 -> 35365 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/xcf/sleeping_piou.xcf diff --git a/Sprites/Npcs/xcf/sleeping_piou.xcf b/Sprites/Npcs/xcf/sleeping_piou.xcf new file mode 100644 index 00000000..c0fbbe4f Binary files /dev/null and b/Sprites/Npcs/xcf/sleeping_piou.xcf differ -- cgit v1.2.3-70-g09d2 -- cgit v1.2.3-70-g09d2 From 9ee5533400b5e6c119ba09716d25985096478cd2 Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:41:30 +0000 Subject: Delete sleeping_piou.xcf --- Sprites/Npcs/xcf/sleeping_piou.xcf | Bin 35365 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Npcs/xcf/sleeping_piou.xcf diff --git a/Sprites/Npcs/xcf/sleeping_piou.xcf b/Sprites/Npcs/xcf/sleeping_piou.xcf deleted file mode 100644 index c0fbbe4f..00000000 Binary files a/Sprites/Npcs/xcf/sleeping_piou.xcf and /dev/null differ -- cgit v1.2.3-70-g09d2 From bd258bebc8c1b6f565319a0da71e6adc409d75f7 Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:41:41 +0000 Subject: Delete piou_singing.xcf --- Sprites/Npcs/xcf/piou_singing.xcf | Bin 31075 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Npcs/xcf/piou_singing.xcf diff --git a/Sprites/Npcs/xcf/piou_singing.xcf b/Sprites/Npcs/xcf/piou_singing.xcf deleted file mode 100644 index f7d88c74..00000000 Binary files a/Sprites/Npcs/xcf/piou_singing.xcf and /dev/null differ -- cgit v1.2.3-70-g09d2 From 6cf0e2231e98bda918012f680d3ad6a699156c89 Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:41:51 +0000 Subject: Delete perching_piou.xcf --- Sprites/Npcs/xcf/perching_piou.xcf | Bin 41830 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Npcs/xcf/perching_piou.xcf diff --git a/Sprites/Npcs/xcf/perching_piou.xcf b/Sprites/Npcs/xcf/perching_piou.xcf deleted file mode 100644 index 11e03599..00000000 Binary files a/Sprites/Npcs/xcf/perching_piou.xcf and /dev/null differ -- cgit v1.2.3-70-g09d2 From 6b0fc3200756c11c5d96d44467787d61b8c4fe88 Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:42:20 +0000 Subject: by seeds CC BY-SA 3.0 --- Sprites/Npcs/xcf/perching_piou.xcf | Bin 0 -> 41830 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/xcf/perching_piou.xcf diff --git a/Sprites/Npcs/xcf/perching_piou.xcf b/Sprites/Npcs/xcf/perching_piou.xcf new file mode 100644 index 00000000..11e03599 Binary files /dev/null and b/Sprites/Npcs/xcf/perching_piou.xcf differ -- cgit v1.2.3-70-g09d2 From 03072a0620f9e61a5ccc7f17c99bdd125b9d2adf Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:42:42 +0000 Subject: by seeds CC BY-SA 3.0 --- Sprites/Npcs/xcf/piou_singing.xcf | Bin 0 -> 31075 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/xcf/piou_singing.xcf diff --git a/Sprites/Npcs/xcf/piou_singing.xcf b/Sprites/Npcs/xcf/piou_singing.xcf new file mode 100644 index 00000000..f7d88c74 Binary files /dev/null and b/Sprites/Npcs/xcf/piou_singing.xcf differ -- cgit v1.2.3-70-g09d2 From 902e59b6c19c3a4c540c09b5bb9d92957c128cd9 Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:43:04 +0000 Subject: by seeds CC BY-SA 3.0 --- Sprites/Npcs/xcf/sleeping_piou.xcf | Bin 0 -> 35365 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/xcf/sleeping_piou.xcf diff --git a/Sprites/Npcs/xcf/sleeping_piou.xcf b/Sprites/Npcs/xcf/sleeping_piou.xcf new file mode 100644 index 00000000..c0fbbe4f Binary files /dev/null and b/Sprites/Npcs/xcf/sleeping_piou.xcf differ -- cgit v1.2.3-70-g09d2 From b72da7d7ff7661c64ed660c592330321b0dd3b05 Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:44:22 +0000 Subject: by seeds CC BY-SA 3.0 --- Sprites/Npcs/perching_piou_spritesheet.png | Bin 0 -> 2419 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/perching_piou_spritesheet.png diff --git a/Sprites/Npcs/perching_piou_spritesheet.png b/Sprites/Npcs/perching_piou_spritesheet.png new file mode 100644 index 00000000..6797bcc4 Binary files /dev/null and b/Sprites/Npcs/perching_piou_spritesheet.png differ -- cgit v1.2.3-70-g09d2 From 3624e78294fec380661680477015a8fe69723c67 Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:44:59 +0000 Subject: by seeds CC BY-SA 3.0 --- Sprites/Npcs/singing_piou_spritesheet.png | Bin 0 -> 1918 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/singing_piou_spritesheet.png diff --git a/Sprites/Npcs/singing_piou_spritesheet.png b/Sprites/Npcs/singing_piou_spritesheet.png new file mode 100644 index 00000000..1c299ec7 Binary files /dev/null and b/Sprites/Npcs/singing_piou_spritesheet.png differ -- cgit v1.2.3-70-g09d2 From ff48a4da589bf497aa4ac5dac80c9232a6ded321 Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:45:27 +0000 Subject: by seeds CC BY-SA 3.0 --- Sprites/Npcs/sleeping_piou_spritesheet.png | Bin 0 -> 1777 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/sleeping_piou_spritesheet.png diff --git a/Sprites/Npcs/sleeping_piou_spritesheet.png b/Sprites/Npcs/sleeping_piou_spritesheet.png new file mode 100644 index 00000000..f1407fb5 Binary files /dev/null and b/Sprites/Npcs/sleeping_piou_spritesheet.png differ -- cgit v1.2.3-70-g09d2 From c8b3347da4b72eae54ee3e654b3b35a537d8fc71 Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:47:03 +0000 Subject: Update ART_LICENSE --- ART_LICENSE | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ART_LICENSE b/ART_LICENSE index 50f7a316..ce5dd6cc 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -497,6 +497,12 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors sprite/npcs/scary_pirate.png (Lien) (GPLv2) (-) sprite/npcs/skullkidhatmieu.png (Lien) (GPLv2) (-) sprite/npcs/muestra.png (kalaez) + sprite/npcs/perching_piou_spritesheet.png (seeds) (CC BY-SA 3.0) (-) + sprite/npcs/sleeping_piou_spritesheet.png (seeds) (CC BY-SA 3.0) (-) + sprite/npcs/singing_piou_spritesheet.png (seeds) (CC BY-SA 3.0) (-) + sprite/npcs/xcf/perching_piou.xcf (seeds) (CC BY-SA 3.0) (-) + sprite/npcs/xcf/sleeping_piou.xcf (seeds) (CC BY-SA 3.0) (-) + sprite/npcs/xcf/piou_singing.xcf (seeds) (CC BY-SA 3.0) (-) ### 64x64 Sprites/Npcs/64x64/Bucket_of_Milk.png (Nami) (CC BY-SA 3.0) (Pookie) -- cgit v1.2.3-70-g09d2 From 0723ce0fc38ce3085a2f2814b6f7125721fea9de Mon Sep 17 00:00:00 2001 From: seeds Date: Tue, 23 Jul 2019 17:48:45 +0000 Subject: Update ART_LICENSE --- ART_LICENSE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ART_LICENSE b/ART_LICENSE index ce5dd6cc..ce3d7202 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -500,9 +500,6 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors sprite/npcs/perching_piou_spritesheet.png (seeds) (CC BY-SA 3.0) (-) sprite/npcs/sleeping_piou_spritesheet.png (seeds) (CC BY-SA 3.0) (-) sprite/npcs/singing_piou_spritesheet.png (seeds) (CC BY-SA 3.0) (-) - sprite/npcs/xcf/perching_piou.xcf (seeds) (CC BY-SA 3.0) (-) - sprite/npcs/xcf/sleeping_piou.xcf (seeds) (CC BY-SA 3.0) (-) - sprite/npcs/xcf/piou_singing.xcf (seeds) (CC BY-SA 3.0) (-) ### 64x64 Sprites/Npcs/64x64/Bucket_of_Milk.png (Nami) (CC BY-SA 3.0) (Pookie) @@ -555,6 +552,9 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors Sprites/Npcs/xcf/switch.xcf Sprites/Npcs/xcf/tamer.xcf Sprites/Npcs/xcf/woodywife-carla.xcf (Saulc) (CC BY-SA 3.0) (-) + Sprites/Npcs/xcf/perching_piou.xcf (seeds) (CC BY-SA 3.0) (-) + Sprites/Npcs/xcf/sleeping_piou.xcf (seeds) (CC BY-SA 3.0) (-) + Sprites/Npcs/xcf/piou_singing.xcf (seeds) (CC BY-SA 3.0) (-) ## model ### usable -- cgit v1.2.3-70-g09d2 From 5c8d229fdf45a725d120765c348c9ee6b15509ee Mon Sep 17 00:00:00 2001 From: Saulc Date: Wed, 24 Jul 2019 00:16:24 +0000 Subject: Replace hats.xlsx WIP --- Drafts/hats.xlsx | Bin 33635 -> 49485 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Drafts/hats.xlsx b/Drafts/hats.xlsx index 475e89db..32b5511d 100644 Binary files a/Drafts/hats.xlsx and b/Drafts/hats.xlsx differ -- cgit v1.2.3-70-g09d2 From 440a971b7dc7389b25537c062f961a457af67fca Mon Sep 17 00:00:00 2001 From: Saulc Date: Wed, 24 Jul 2019 14:20:18 +0000 Subject: UPDATE WIP hats --- Drafts/hats.xlsx | Bin 49485 -> 54288 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Drafts/hats.xlsx b/Drafts/hats.xlsx index 32b5511d..17084181 100644 Binary files a/Drafts/hats.xlsx and b/Drafts/hats.xlsx differ -- cgit v1.2.3-70-g09d2 From 646e9c8814736220cd13474684d82684c8caea1f Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 25 Jul 2019 11:19:08 +0000 Subject: Delete .gitkeep --- Icon/hands/ready/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Icon/hands/ready/.gitkeep diff --git a/Icon/hands/ready/.gitkeep b/Icon/hands/ready/.gitkeep deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3-70-g09d2 From 6e278b78975a3022aef57e0eedb73dadc6057fc3 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 25 Jul 2019 13:58:21 +0000 Subject: Delete silkheadband.png already in clientdata --- Sprites/Equipment/head/ready/silkheadband.png | Bin 2631 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Equipment/head/ready/silkheadband.png diff --git a/Sprites/Equipment/head/ready/silkheadband.png b/Sprites/Equipment/head/ready/silkheadband.png deleted file mode 100644 index 5e00613f..00000000 Binary files a/Sprites/Equipment/head/ready/silkheadband.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From f378708016e4e234751b89b08d4520db9ab9c571 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 25 Jul 2019 13:59:15 +0000 Subject: Delete underworldmask.png already in clientdata --- Sprites/Equipment/head/ready/underworldmask.png | Bin 2493 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Equipment/head/ready/underworldmask.png diff --git a/Sprites/Equipment/head/ready/underworldmask.png b/Sprites/Equipment/head/ready/underworldmask.png deleted file mode 100644 index a490fadc..00000000 Binary files a/Sprites/Equipment/head/ready/underworldmask.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 2528eb63fcf7b2e1bd65d935db782a6f69a7d931 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 25 Jul 2019 14:00:10 +0000 Subject: Delete witchhat.png already in clientdata --- Sprites/Equipment/head/ready/witchhat.png | Bin 1135 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Equipment/head/ready/witchhat.png diff --git a/Sprites/Equipment/head/ready/witchhat.png b/Sprites/Equipment/head/ready/witchhat.png deleted file mode 100644 index cd7013e7..00000000 Binary files a/Sprites/Equipment/head/ready/witchhat.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 26365318e53cdfddd635ccc3ce1c6761dc380837 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 25 Jul 2019 14:00:57 +0000 Subject: Delete wizardhat.png already in clientdata --- Sprites/Equipment/head/ready/wizardhat.png | Bin 1470 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Equipment/head/ready/wizardhat.png diff --git a/Sprites/Equipment/head/ready/wizardhat.png b/Sprites/Equipment/head/ready/wizardhat.png deleted file mode 100644 index eaa06179..00000000 Binary files a/Sprites/Equipment/head/ready/wizardhat.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 9ad8f3f265387e342009046ba404b2c737497b68 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 25 Jul 2019 15:13:17 +0000 Subject: Replace hats.xlsx --- Drafts/hats.xlsx | Bin 54288 -> 59800 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Drafts/hats.xlsx b/Drafts/hats.xlsx index 17084181..f8bce154 100644 Binary files a/Drafts/hats.xlsx and b/Drafts/hats.xlsx differ -- cgit v1.2.3-70-g09d2 From c2031b42daa7e34eb0f9c2d73e15d51158b3a382 Mon Sep 17 00:00:00 2001 From: seeds Date: Mon, 29 Jul 2019 15:21:05 +0000 Subject: Add new directory --- Items/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Items/.gitkeep diff --git a/Items/.gitkeep b/Items/.gitkeep new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3-70-g09d2 From 3b122661904183c3ed1d3d8a5321a2caa6c140aa Mon Sep 17 00:00:00 2001 From: seeds Date: Mon, 29 Jul 2019 15:21:53 +0000 Subject: by seeds CC BY-SA 3.0 --- Items/pinkiepelt6.png | Bin 0 -> 737 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Items/pinkiepelt6.png diff --git a/Items/pinkiepelt6.png b/Items/pinkiepelt6.png new file mode 100644 index 00000000..202e6b6e Binary files /dev/null and b/Items/pinkiepelt6.png differ -- cgit v1.2.3-70-g09d2 From fb0fdd3c36bad9b61a5aa3c28a4b63af9cc95da3 Mon Sep 17 00:00:00 2001 From: seeds Date: Mon, 29 Jul 2019 15:26:46 +0000 Subject: Update ART_LICENSE --- ART_LICENSE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ART_LICENSE b/ART_LICENSE index ce3d7202..69f7e144 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -69,6 +69,8 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors ##2018 ### 05 +# Items + Items/pinkiepelt6.png (CC BY-SA 3.0) (-) # Icon ## Arrows -- cgit v1.2.3-70-g09d2 From 977440d2b1c1ef31fb55ecd7d24170f99d836fde Mon Sep 17 00:00:00 2001 From: seeds Date: Mon, 29 Jul 2019 15:27:22 +0000 Subject: Update ART_LICENSE --- ART_LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ART_LICENSE b/ART_LICENSE index 69f7e144..572552c0 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -70,7 +70,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors ### 05 # Items - Items/pinkiepelt6.png (CC BY-SA 3.0) (-) + Items/pinkiepelt6.png (seeds) (CC BY-SA 3.0) (-) # Icon ## Arrows -- cgit v1.2.3-70-g09d2 From e5fa2c8ccd9ddae6767ec67b07e5389b8a862c73 Mon Sep 17 00:00:00 2001 From: seeds Date: Fri, 2 Aug 2019 21:57:40 +0000 Subject: by seeds CC BY-SA 3.0 --- Items/MTG_card2.png | Bin 0 -> 2627 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Items/MTG_card2.png diff --git a/Items/MTG_card2.png b/Items/MTG_card2.png new file mode 100644 index 00000000..a18cc54e Binary files /dev/null and b/Items/MTG_card2.png differ -- cgit v1.2.3-70-g09d2 From 0516f81ea751593717df07851306abf07eb3d7be Mon Sep 17 00:00:00 2001 From: seeds Date: Fri, 2 Aug 2019 21:58:04 +0000 Subject: by seeds CC BY-SA 3.0 --- Items/MTG_deckbox.png | Bin 0 -> 443 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Items/MTG_deckbox.png diff --git a/Items/MTG_deckbox.png b/Items/MTG_deckbox.png new file mode 100644 index 00000000..99a040da Binary files /dev/null and b/Items/MTG_deckbox.png differ -- cgit v1.2.3-70-g09d2 From e188655a94409053206fd988d1256f49cb5a6199 Mon Sep 17 00:00:00 2001 From: seeds Date: Fri, 2 Aug 2019 21:59:26 +0000 Subject: Update ART_LICENSE --- ART_LICENSE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ART_LICENSE b/ART_LICENSE index 572552c0..8583c30e 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -71,6 +71,8 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors # Items Items/pinkiepelt6.png (seeds) (CC BY-SA 3.0) (-) + Items/MTG_card2.png (by seeds) (CC BY-SA 3.0) (-) + Items/MTG_deckbox (by seeds) (CC BY-SA 3.0) (-) # Icon ## Arrows -- cgit v1.2.3-70-g09d2 From 880b7f574b1cf495f8f0862aa73502c6d4d76fbf Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 19 Aug 2019 15:20:58 +0000 Subject: Add moonshroom hat xcf handle by me --- Sprites/Equipment/head/xcf/moonshroomhat.xcf | Bin 0 -> 88150 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/xcf/moonshroomhat.xcf diff --git a/Sprites/Equipment/head/xcf/moonshroomhat.xcf b/Sprites/Equipment/head/xcf/moonshroomhat.xcf new file mode 100644 index 00000000..79e17de6 Binary files /dev/null and b/Sprites/Equipment/head/xcf/moonshroomhat.xcf differ -- cgit v1.2.3-70-g09d2 From a5dad6c8dfb89307249d9372c3740ae55acc93ce Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 20 Aug 2019 07:39:17 +0000 Subject: Delete head-wreath.png already ingame --- Sprites/Equipment/head/ready/head-wreath.png | Bin 830 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Equipment/head/ready/head-wreath.png diff --git a/Sprites/Equipment/head/ready/head-wreath.png b/Sprites/Equipment/head/ready/head-wreath.png deleted file mode 100644 index 63b53319..00000000 Binary files a/Sprites/Equipment/head/ready/head-wreath.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From c9a02795e263a1344a9db796efc57b9e080076a6 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 20 Aug 2019 07:41:20 +0000 Subject: Delete pumpkinhelmet.png Already ingame --- Sprites/Equipment/head/ready/pumpkinhelmet.png | Bin 2136 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Equipment/head/ready/pumpkinhelmet.png diff --git a/Sprites/Equipment/head/ready/pumpkinhelmet.png b/Sprites/Equipment/head/ready/pumpkinhelmet.png deleted file mode 100644 index adced031..00000000 Binary files a/Sprites/Equipment/head/ready/pumpkinhelmet.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From cdd16c6cbff8c04ac2ad8b1f5cded5710dd53f37 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 22 Aug 2019 07:29:44 +0000 Subject: Delete 3481.png --- Sprites/Npcs/3481.png | Bin 2606 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Npcs/3481.png diff --git a/Sprites/Npcs/3481.png b/Sprites/Npcs/3481.png deleted file mode 100644 index 966bf003..00000000 Binary files a/Sprites/Npcs/3481.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 4d0d7a5dbc0dabae0e648021759281a1e7560ce1 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 22 Aug 2019 07:29:49 +0000 Subject: Delete 4001.jpg --- Sprites/Npcs/4001.jpg | Bin 10998 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Npcs/4001.jpg diff --git a/Sprites/Npcs/4001.jpg b/Sprites/Npcs/4001.jpg deleted file mode 100644 index a8f31bad..00000000 Binary files a/Sprites/Npcs/4001.jpg and /dev/null differ -- cgit v1.2.3-70-g09d2 From 3566705ab3a5d93ecb3699a2ea54414408780740 Mon Sep 17 00:00:00 2001 From: Saulc Date: Thu, 22 Aug 2019 07:42:06 +0000 Subject: Delete scarecrow.png done by @pookie --- Sprites/Npcs/scarecrow.png | Bin 2940 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sprites/Npcs/scarecrow.png diff --git a/Sprites/Npcs/scarecrow.png b/Sprites/Npcs/scarecrow.png deleted file mode 100644 index ed6b5460..00000000 Binary files a/Sprites/Npcs/scarecrow.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From bf00a5a87e65dd5fd578135cfffead93eb0d0a0f Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 23 Aug 2019 08:36:24 +0000 Subject: add monsters.xml --- monsters.xml | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 monsters.xml diff --git a/monsters.xml b/monsters.xml new file mode 100644 index 00000000..ffb2a287 --- /dev/null +++ b/monsters.xml @@ -0,0 +1,79 @@ + + + + + + monsters/exempl.xml + monsters/bat/batdie.ogg + monsters/bat/bathit.ogg + + +// + + + monsters/skeleton.xml|#aca379 + equipment/chest/robe.xml|#ea0000,333333 + equipment/head/phylactery.xml + equipment/head/evileyes.xml + equipment/hands/magefire.xml + + + + + + + monsters/skeleton.xml|#ffe8bf + monsters/accessories/hairstyle08.xml|#ffe8bf + + + + + + monsters/skeleton.xml|#ffe8bf + equipment/legs/chaps.xml + equipment/chest/warlordplate.xml + equipment/head/warlordhelm.xml + + + + + + + monsters/wisp.xml|#77ffdd,77ddff + graphics/particles/polter.particle.xml + + + + + + + monsters/bee.xml + monsters/accessories/generic-shadow-small-circle.xml + + + + + + + monsters/goblin-ice.xml + monsters/fire-goblin/fire-goblin-hit1.ogg + monsters/fire-goblin/fire-goblin-hit2.ogg + monsters/fire-goblin/fire-goblin-miss1.ogg + + +© 2019 GitHub, Inc. + + + \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 13622a2ef0be4af5f28975126166f1f17117345a Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 23 Aug 2019 08:38:34 +0000 Subject: add brunch of monsters we will add later --- monsters.xml | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/monsters.xml b/monsters.xml index ffb2a287..92c49c59 100644 --- a/monsters.xml +++ b/monsters.xml @@ -73,7 +73,108 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or spawn. monsters/fire-goblin/fire-goblin-miss1.ogg -© 2019 GitHub, Inc. + + + + monsters/butterfly.xml|#660000,FF3300,FFCC99,FFCCCC + monsters/accessories/generic-shadow-small-circle.xml + + + + + + + monsters/archant.xml + monsters/scorpion/scorpion-hit1.ogg + monsters/scorpion/scorpion-hit2.ogg + monsters/scorpion/scorpion-hit3.ogg + monsters/scorpion/scorpion-hit4.ogg + monsters/scorpion/scorpion-miss1.ogg + + + + + + + monsters/reaper.xml + monsters/accessories/reaper-shadow.xml + graphics/particles/monster-reaper.particle.xml + monsters/reaper/reaper-hurt.ogg + + + + + + + monsters/spinning-scythe.xml + monsters/accessories/scythe-shadow.xml + + + + + + + monsters/element-ball.xml|#5e929d,a2d8e3,ffffff + + + + + + + monsters/wraith.xml + + + + + + + monsters/skeleton.xml|#994040,772020,440808,000000 + graphics/particles/necroblast.particle.xml + + + + + + + monsters/skeleton.xml|#ffe8bf + equipment/legs/chaps.xml + equipment/chest/vnecksweater.xml|#0d1430,21337c,4363e5 + equipment/head/bowler-hat.xml + + + + + + + monsters/serqet.xml + + + + + + + monsters/ball-lightning.xml + monsters/accessories/ball-lightning-shadow.xml + graphics/particles/monster-ball-lightning-blue.particle.xml + + + + + + monsters/vampire-bat.xml + monsters/bat/bat-dying1.ogg + monsters/bat/bat-hit1.ogg + + + + + + + monsters/skeleton.xml|#aca379 + equipment/chest/robe.xml|#333333 + equipment/head/phylactery.xml + + \ No newline at end of file -- cgit v1.2.3-70-g09d2 From b694e1895cbe2bf2386041c868abe2f140a996a3 Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 23 Aug 2019 08:50:23 +0000 Subject: add more monsters.xml --- monsters.xml | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/monsters.xml b/monsters.xml index 92c49c59..76d1d934 100644 --- a/monsters.xml +++ b/monsters.xml @@ -175,6 +175,140 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or spawn. equipment/chest/robe.xml|#333333 equipment/head/phylactery.xml + + + + + + monsters/ball-lightning.xml + monsters/accessories/ball-lightning-shadow.xml + graphics/particles/monster-ball-lightning-red.particle.xml + + + + + + + monsters/spider.xml|#1a160f,93774a,d2c3aa,ffffff;#a00000 + monsters/scorpion/scorpion-hit1.ogg + monsters/scorpion/scorpion-hit2.ogg + monsters/scorpion/scorpion-hit3.ogg + monsters/scorpion/scorpion-hit4.ogg + monsters/scorpion/scorpion-miss1.ogg + + + + + + + monsters/larvespa.xml|#211b0e,5c3e20,a68d42;#667C26 + + + + + + + monsters/skull-ice.xml + + + + + + + monsters/snake.xml|#664d28,a6673a,86D6DB,ffffff + graphics/particles/monster-soulsnake.particle.xml + + + + + + + monsters/snowflower.xml + + + + + + + monsters/sleeping-bandit.xml + equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + + + + + + + model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5 + hairstyles/hairstyle11-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#8c6625,dab425,ffffff + equipment/feet/assassin-boots.xml + equipment/legs/shorts.xml|#121212,343434 + equipment/chest/sorcerer-robe.xml|#121212,343434;#8F47D6 + equipment/head/wizard-hat.xml|#070707,121212,663399 + graphics/particles/monster-luvia.particle.xml + + + + + + + + monsters/skeleton.xml|#D9BFFF + equipment/chest/tanktop.xml|#333333,555555,444444 + equipment/legs/shorts.xml|#333333,555555,444444 + monsters/accessories/hairstyle05.xml|#333333 + graphics/particles/monster-souleater.particle.xml + + + + + + + monsters/spirit-demonic.xml|#444444,9933ff + + + + + + + monsters/skeleton.xml|#ffe8bf + monsters/accessories/hairstyle08.xml|#ffe8bf + equipment/legs/skirt.xml|#3f221d,754d23,f5cea4 + equipment/chest/shorttanktop.xml|#3f221d,754d23,f5cea4 + equipment/head/heart-glasses.xml + + + + + + + monsters/scorpion.xml|#211b0e,5c3e20,a68d42,ffffff + monsters/scorpion/scorpion-hit1.ogg + monsters/scorpion/scorpion-hit2.ogg + monsters/scorpion/scorpion-hit3.ogg + monsters/scorpion/scorpion-hit4.ogg + monsters/scorpion/scorpion-miss1.ogg + + + + + + + + monsters/element-ball.xml|#6d4e2f,98612c,c38a53,ffffff + graphics/particles/monster-leaf.particle.xml + + + + + + + monsters/cave-maggot-giant.xml|#565051,ffffff + monsters/maggot/maggot-hit1.ogg + monsters/maggot/maggot-hit2.ogg + monsters/maggot/maggot-miss1.ogg + monsters/maggot/maggot-dying1.ogg + + \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 46acfe01f1f4cf29c4fc15f0d49609860cb136e6 Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 23 Aug 2019 08:56:44 +0000 Subject: add a huge group of monster xml --- monsters.xml | 244 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 244 insertions(+) diff --git a/monsters.xml b/monsters.xml index 76d1d934..fef7e5a2 100644 --- a/monsters.xml +++ b/monsters.xml @@ -308,7 +308,251 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or spawn. monsters/maggot/maggot-miss1.ogg monsters/maggot/maggot-dying1.ogg + + + + + monsters/reaper.xml + monsters/accessories/reaper-shadow.xml + graphics/particles/monster-reaper.particle.xml + monsters/reaper/reaper-hurt.ogg + + + + + + + monsters/skeleton.xml|#ffe8bf + equipment/legs/chaps.xml + equipment/chest/vnecksweater.xml|#580000,A40000,C02020,ff6060 + equipment/head/tophat.xml + + + + + + monsters/vespa.xml|#1a160f,93774a;#DEBFBF,BBA2A2 + + + + + + + monsters/mouboo-demonic.xml + monsters/accessories/mouboo-demonic-antlers.xml + graphics/particles/monster-mouboo-demonic.particle.xml + + + + + + + monsters/demon.xml|#444444,979797 + equipment/feet/warlordboots.xml|#333333,878787 + equipment/hands/generic.xml|#242424,626262 + equipment/chest/demonwarlordplate.xml|#444444,979797 + equipment/head/bull.xml + equipment/weapons/dagger.xml|#1c1b00,1b1a31,5b5660,827e85,9596e0 + graphics/particles/monster-witchguard.particle.xml + + + + + + + monsters/squirrel.xml|#736443 + monsters/squirrel/squirrel-hurt1.ogg + monsters/squirrel/squirrel-hurt2.ogg + monsters/squirrel/squirrel-die1.ogg + monsters/squirrel/squirrel-die2.ogg + + + + + + + monsters/nutcracker.xml + monsters/accessories/hairstyle07.xml|#333333 + monsters/accessories/nutcrackerhat.xml + + + + + + + + monsters/slime-mother.xml|#4ca1a0,ffffff + monsters/accessories/slime-covered-bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;#4Ca16e,ffffff + monsters/slime/slime-hit1.ogg + + + + + + + + + monsters/skeleton.xml|#ffe8bf + monsters/accessories/hairstyle08.xml + equipment/head/witch-hat.xml + equipment/chest/sorcerer-robe.xml|#111111,222222,333333,444444,555555,aaaaaa;#EFEFEF + equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d + + + + + + + + monsters/skeleton.xml|#ffe8bf + monsters/accessories/hairstyle08.xml + equipment/head/witch-hat.xml + equipment/chest/sorcerer-robe.xml|#111111,222222,333333,444444,555555,aaaaaa;#EFEFEF + equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d + + + + + + + + + model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5 + hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000 + equipment/chest/sorcerer-robe.xml|#5178a0,1a294c;#d5b02c + equipment/legs/pants.xml|#5178a0,1a294c + equipment/head/piratehat.xml + equipment/hands/generic.xml + equipment/feet/boots.xml|#212121,444444 + + + + + + + monsters/slime-mother.xml|#72982c,ffffff + monsters/accessories/slime-covered-bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;#72982c,ffffff + monsters/slime/slime-hit1.ogg + + + + + + + + + model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5 + hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000 + equipment/chest/assassin.xml + equipment/legs/assassin.xml + equipment/head/eyepatch.xml + equipment/feet/assassin-boots.xml + equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + + + + + + + + model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5 + hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000 + equipment/chest/vnecksweater.xml + equipment/legs/pants.xml|#212121,555555 + equipment/head/bandana.xml|#212121,555555 + equipment/feet/boots.xml|#212121,555555 + equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + + + + + + + monsters/skeleton.xml|#ffe8bf + monsters/accessories/hairstyle08.xml|#ffe8bf + equipment/legs/skirt.xml|#3f221d,754d23,f5cea4 + equipment/chest/shorttanktop.xml|#3f221d,754d23,f5cea4 + equipment/head/heart-glasses.xml + + + + + + monsters/psi-brain.xml + monsters/psi-bubble.xml + + + + + + + monsters/spirit-demonic.xml|#444444,9933ff + + + + + + monsters/demon.xml|#444444,979797 + equipment/feet/warlordboots.xml|#333333,878787 + equipment/hands/generic.xml|#242424,626262 + equipment/chest/demonwarlordplate.xml|#ea0000,979797 + equipment/head/bull.xml + equipment/weapons/dagger.xml|#181619,1c1b00,1b1a31,54438a,5b5660,827e85,9596e0 + graphics/particles/monster-witchguard.particle.xml + + + + + + + monsters/lizard.xml|#923F7C,6E5A8C,C1B5B6 + monsters/wolvern/wolvern-hit1.ogg + + + + + + + monsters/SUSAN.xml|R:#ff00e4 + graphics/particles/heartnecklace.particle.xml + monsters/maggot/maggot-hit1.ogg + monsters/maggot/maggot-hit2.ogg + monsters/maggot/maggot-miss1.ogg + monsters/maggot/maggot-dying1.ogg + + + + + + + monsters/lovely-maggot.xml|S:#524b51,8463a0,6f706f,af006d + monsters/maggot/maggot-hit1.ogg + monsters/maggot/maggot-hit2.ogg + monsters/maggot/maggot-miss1.ogg + monsters/maggot/maggot-dying1.ogg + + + + + + + monsters/ball-lightning.xml + monsters/accessories/ball-lightning-shadow.xml + graphics/particles/monster-ball-lightning.particle.xml + + + + + + + model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5 + hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000 + equipment/head/sailor-hat.xml + equipment/feet/boots.xml + equipment/chest/tanktop.xml + equipment/legs/pants.xml + \ No newline at end of file -- cgit v1.2.3-70-g09d2 From eaecca888125c7dddd50aea3aa38b1d5ede8cf1c Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 23 Aug 2019 09:01:22 +0000 Subject: last monsters missing --- monsters.xml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/monsters.xml b/monsters.xml index fef7e5a2..36695c9b 100644 --- a/monsters.xml +++ b/monsters.xml @@ -554,5 +554,23 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or spawn. equipment/chest/tanktop.xml equipment/legs/pants.xml + + + + monsters/skeleton_inv.xml|#497ac3,2053a0,164995,154387 + monsters/wight.xml|#164489,1f529f,619aea + graphics/particles/chillfog.particle.xml + + + + + + + + monsters/skeleton.xml|#ffe8bf + equipment/legs/chaps.xml + equipment/chest/warlordplate.xml + equipment/head/bull.xml + - \ No newline at end of file + -- cgit v1.2.3-70-g09d2 From 79ad772f175a8db38800b4b27dfdd8fa81c57bd2 Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 23 Aug 2019 14:17:34 +0000 Subject: Update monsters.xml --- monsters.xml | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/monsters.xml b/monsters.xml index 36695c9b..8a4d86b3 100644 --- a/monsters.xml +++ b/monsters.xml @@ -574,3 +574,79 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or spawn. + + + + + monsters/wisp.xml|#aadd44,ffff66 + graphics/particles/wisp.particle.xml + + + + + + + monsters/snail.xml|#FDC689;#E0A6E3;#E0A6E3;#F06EAA;#C69C6D;#A9FF02 + graphics/particles/monster-snail-trail.particle.xml + monsters/slime/slime-hit1.ogg + + + + + + + monsters/wisp.xml|#ff77dd,dd77ff + graphics/particles/spectre.particle.xml + + + + + + + + monsters/skeleton.xml|#ffe8bf + + + + + + + + monsters/zombie.xml + monsters/zombie/zombie-move1.ogg + monsters/zombie/zombie-move2.ogg + monsters/zombie/zombie-hit1.ogg + monsters/zombie/zombie-hit2.ogg + monsters/zombie/zombie-miss1.ogg + monsters/zombie/zombie-dying1.ogg + + + + + + + monsters/lizard.xml|#673132,923F42,CD5961,E163A4,ffffff + monsters/fire-goblin/fire-goblin-hit1.ogg + monsters/fire-goblin/fire-goblin-hit2.ogg + monsters/fire-goblin/fire-goblin-miss1.ogg + + + + + + + + monsters/flower.xml|#ee748d,ffd8ce;#f6ffbd;#23285f + monsters/flower/flower-hit1.ogg + monsters/flower/flower-hit2.ogg + monsters/flower/flower-miss1.ogg + + + + + + + monsters/skull-poison.xml + + + -- cgit v1.2.3-70-g09d2 From 508b18104d9a978c59d69f867c85d30952a8e46f Mon Sep 17 00:00:00 2001 From: seeds Date: Sun, 25 Aug 2019 20:25:56 +0000 Subject: by seeds (CC BY-SA 3.0) Maggot (extra layer has christmas antlers) --- Sprites/Monsters/swamp_maggot.xcf | Bin 0 -> 91801 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Monsters/swamp_maggot.xcf diff --git a/Sprites/Monsters/swamp_maggot.xcf b/Sprites/Monsters/swamp_maggot.xcf new file mode 100644 index 00000000..9b6c7db2 Binary files /dev/null and b/Sprites/Monsters/swamp_maggot.xcf differ -- cgit v1.2.3-70-g09d2 From 5c79cdd5e5ea20cb6b445d39d13f8b09d700c21f Mon Sep 17 00:00:00 2001 From: seeds Date: Sun, 25 Aug 2019 20:26:52 +0000 Subject: by seeds (CC BY-SA) Dark frostiana (purple) WNS --- Sprites/Monsters/dark_frostiana.xcf | Bin 0 -> 22153 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Monsters/dark_frostiana.xcf diff --git a/Sprites/Monsters/dark_frostiana.xcf b/Sprites/Monsters/dark_frostiana.xcf new file mode 100644 index 00000000..7e198cec Binary files /dev/null and b/Sprites/Monsters/dark_frostiana.xcf differ -- cgit v1.2.3-70-g09d2 From 9528cb4ff3432cbc33fd49c706e884061e956ea9 Mon Sep 17 00:00:00 2001 From: seeds Date: Sun, 25 Aug 2019 20:28:50 +0000 Subject: by seeds (CC BY-SA 3.0) Swamp trees WNS --- Tilesets/swamp_tree_x2x3.png | Bin 0 -> 69148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Tilesets/swamp_tree_x2x3.png diff --git a/Tilesets/swamp_tree_x2x3.png b/Tilesets/swamp_tree_x2x3.png new file mode 100644 index 00000000..b0af6884 Binary files /dev/null and b/Tilesets/swamp_tree_x2x3.png differ -- cgit v1.2.3-70-g09d2 From ad3a98be3c7d3fa0b188fe6beb88ac855c56d5c9 Mon Sep 17 00:00:00 2001 From: seeds Date: Sun, 25 Aug 2019 20:36:31 +0000 Subject: Update ART_LICENSE --- ART_LICENSE | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ART_LICENSE b/ART_LICENSE index 8583c30e..3e4fe71c 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -483,6 +483,9 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors Sprites/Monsters/xcf/pumpkandy.xcf (Saulc) (CC BY-SA 3.0) (TMW.org) Sprites/Monsters/xcf/terranite.xcf (Kr0n05931) (GPLv2) (mishana, Saulc) Sprites/monsters/xcf/yetifly.xcf (Saulc) (GPLv2) (Bcs86, Hkurn, Skipy) + Sprites/monsters/xcf/swamp_maggot.xcf (seeds) (CC BY-SA 3.0) (-) + Sprites/monsters/xcf/dark_frostiana.xcf (seeds) (CC BY-SA 3.0) (-) + ## NPCs sprite/npcs/00bnr.png (Lien) (GPLv2) (-) sprite/npcs/00hinnack.png (Lien) (GPLv2) (-) @@ -602,6 +605,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors Tilesets/xcf/dyeable_arena.xcf (?) (GPLv2) (Saulc) Tilesets/xcf/signs_x2.xcf (?) (CC BY-SA 3.0) (Saulc) Tilesets/xcf/woodland_sand.xcf (?) (GPLv2) (TMW.org, Saulc) + Tilesets/xcf/swamp_trees_x2x3 (seeds) (CC BY-SA 3.0) (-) # WIP ## CC0 - magerage - Miloslav Číž WIP/CC0 - magerage - Miloslav Číž/object_button_1.png -- cgit v1.2.3-70-g09d2 From 98beb2d2cda1fb28f8b38cfd39ed64ea3a64c9f2 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:14:18 +0000 Subject: Tartaruga from TMW BR --- Sprites/Monsters/tartaruga-espinhosa.png | Bin 0 -> 16039 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Monsters/tartaruga-espinhosa.png diff --git a/Sprites/Monsters/tartaruga-espinhosa.png b/Sprites/Monsters/tartaruga-espinhosa.png new file mode 100644 index 00000000..e7c9e12f Binary files /dev/null and b/Sprites/Monsters/tartaruga-espinhosa.png differ -- cgit v1.2.3-70-g09d2 From 947453d988596863bfe38099946eca0ef9568c99 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:14:34 +0000 Subject: Tartaruga xml from TMW BR --- Sprites/Monsters/tartaruga-espinhosa.xml | 98 ++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 Sprites/Monsters/tartaruga-espinhosa.xml diff --git a/Sprites/Monsters/tartaruga-espinhosa.xml b/Sprites/Monsters/tartaruga-espinhosa.xml new file mode 100644 index 00000000..d9828a40 --- /dev/null +++ b/Sprites/Monsters/tartaruga-espinhosa.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From f98f3516ecb2c24069cdabdd3a2bd00dfae28b50 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:15:15 +0000 Subject: NPC's from TMW BR --- Sprites/Npcs/npcs-br.png | Bin 0 -> 60660 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/npcs-br.png diff --git a/Sprites/Npcs/npcs-br.png b/Sprites/Npcs/npcs-br.png new file mode 100644 index 00000000..50acc460 Binary files /dev/null and b/Sprites/Npcs/npcs-br.png differ -- cgit v1.2.3-70-g09d2 From 8ce0bb1cb2934d77a80b3e7c8c039cefe7f9bd92 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:15:29 +0000 Subject: NPC's from TMW BR --- Sprites/Npcs/npcs-br2.png | Bin 0 -> 137260 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/npcs-br2.png diff --git a/Sprites/Npcs/npcs-br2.png b/Sprites/Npcs/npcs-br2.png new file mode 100644 index 00000000..5207e8dd Binary files /dev/null and b/Sprites/Npcs/npcs-br2.png differ -- cgit v1.2.3-70-g09d2 From 5072133658952312ddd6e39ead098a82c9006f24 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:16:14 +0000 Subject: Spider queen2 from TMW BR --- Sprites/Monsters/monstro-aranha-rainha2.png | Bin 0 -> 108868 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Monsters/monstro-aranha-rainha2.png diff --git a/Sprites/Monsters/monstro-aranha-rainha2.png b/Sprites/Monsters/monstro-aranha-rainha2.png new file mode 100644 index 00000000..04d0de7f Binary files /dev/null and b/Sprites/Monsters/monstro-aranha-rainha2.png differ -- cgit v1.2.3-70-g09d2 From 922d7775d3fd575fbb0522cc5f3d14a2e14c7e23 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:16:31 +0000 Subject: Spider queen2 xml from TMW BR --- Sprites/Monsters/monstro-aranha-rainha2.xml | 74 +++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 Sprites/Monsters/monstro-aranha-rainha2.xml diff --git a/Sprites/Monsters/monstro-aranha-rainha2.xml b/Sprites/Monsters/monstro-aranha-rainha2.xml new file mode 100644 index 00000000..d7f9de4c --- /dev/null +++ b/Sprites/Monsters/monstro-aranha-rainha2.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 5fcd86dfd2087178d5db1138a2e580f6d8df0ebf Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:17:00 +0000 Subject: Spider queen from TMW BR --- Sprites/Monsters/monstro-aranha-rainha.png | Bin 0 -> 164777 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Monsters/monstro-aranha-rainha.png diff --git a/Sprites/Monsters/monstro-aranha-rainha.png b/Sprites/Monsters/monstro-aranha-rainha.png new file mode 100644 index 00000000..a044e311 Binary files /dev/null and b/Sprites/Monsters/monstro-aranha-rainha.png differ -- cgit v1.2.3-70-g09d2 From e1db30d5a9e57b6e53f6219acded997b0ce8f13c Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:18:04 +0000 Subject: Spider queen xml from TMW BR --- Sprites/Monsters/monstro-aranha-rainha.xml | 74 ++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 Sprites/Monsters/monstro-aranha-rainha.xml diff --git a/Sprites/Monsters/monstro-aranha-rainha.xml b/Sprites/Monsters/monstro-aranha-rainha.xml new file mode 100644 index 00000000..09eb55b7 --- /dev/null +++ b/Sprites/Monsters/monstro-aranha-rainha.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 49911ce04b771f35428d65c2cbd42aa89add0f85 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:18:38 +0000 Subject: Spider from TMW BR --- Sprites/Monsters/monstro-aranha.png | Bin 0 -> 12783 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Monsters/monstro-aranha.png diff --git a/Sprites/Monsters/monstro-aranha.png b/Sprites/Monsters/monstro-aranha.png new file mode 100644 index 00000000..fe994757 Binary files /dev/null and b/Sprites/Monsters/monstro-aranha.png differ -- cgit v1.2.3-70-g09d2 From 768294dfe10721569bda312cd0e8b7dcc4312e68 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:18:55 +0000 Subject: Spider xml from TMW BR --- Sprites/Monsters/monstro-aranha.xml | 74 +++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 Sprites/Monsters/monstro-aranha.xml diff --git a/Sprites/Monsters/monstro-aranha.xml b/Sprites/Monsters/monstro-aranha.xml new file mode 100644 index 00000000..17ae9c6e --- /dev/null +++ b/Sprites/Monsters/monstro-aranha.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From aaf76d381db69f26285eeaa4af998f5b4ade93ed Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:19:37 +0000 Subject: Micheal Lantern from TMW BR --- Sprites/Npcs/lanterna-jack.png | Bin 0 -> 16384 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/lanterna-jack.png diff --git a/Sprites/Npcs/lanterna-jack.png b/Sprites/Npcs/lanterna-jack.png new file mode 100644 index 00000000..e4fd3356 Binary files /dev/null and b/Sprites/Npcs/lanterna-jack.png differ -- cgit v1.2.3-70-g09d2 From 1d051f0cbd6f8ba35701bdb8ce1c220a6f846e7d Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:19:53 +0000 Subject: Micheal Lantern xml from TMW BR --- Sprites/Npcs/lanterna-jack.xml | 92 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 Sprites/Npcs/lanterna-jack.xml diff --git a/Sprites/Npcs/lanterna-jack.xml b/Sprites/Npcs/lanterna-jack.xml new file mode 100644 index 00000000..2d11a472 --- /dev/null +++ b/Sprites/Npcs/lanterna-jack.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 53f9ff2574692dcb951641b4af443d10666e6880 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:20:52 +0000 Subject: Probably a duplicate --- Sprites/Equipment/head/head-mask-aguia.png | Bin 0 -> 4614 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/head-mask-aguia.png diff --git a/Sprites/Equipment/head/head-mask-aguia.png b/Sprites/Equipment/head/head-mask-aguia.png new file mode 100644 index 00000000..5a0cd49b Binary files /dev/null and b/Sprites/Equipment/head/head-mask-aguia.png differ -- cgit v1.2.3-70-g09d2 From a405fc78a5fadda4d9541c97f9e58eb9cad2108f Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:22:14 +0000 Subject: Add new book icon directory --- Icon/usable/book/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/usable/book/.gitkeep diff --git a/Icon/usable/book/.gitkeep b/Icon/usable/book/.gitkeep new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3-70-g09d2 From 7a291d286309338503c9bab5cc5e506c20668abe Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:22:37 +0000 Subject: White Magic Page from TMW BR --- Icon/usable/book/generic-pagina-branca.png | Bin 0 -> 1631 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/usable/book/generic-pagina-branca.png diff --git a/Icon/usable/book/generic-pagina-branca.png b/Icon/usable/book/generic-pagina-branca.png new file mode 100644 index 00000000..22cfde43 Binary files /dev/null and b/Icon/usable/book/generic-pagina-branca.png differ -- cgit v1.2.3-70-g09d2 From 3e23ae7a6bc2c5a2d41e3615d6989179adf1e588 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:22:51 +0000 Subject: Magic Page from TMW BR --- Icon/usable/book/generic-pagina-dourada.png | Bin 0 -> 1554 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/usable/book/generic-pagina-dourada.png diff --git a/Icon/usable/book/generic-pagina-dourada.png b/Icon/usable/book/generic-pagina-dourada.png new file mode 100644 index 00000000..04c818d7 Binary files /dev/null and b/Icon/usable/book/generic-pagina-dourada.png differ -- cgit v1.2.3-70-g09d2 From d1b673ba60e097dd9cefbf51274f7d25943b9ac8 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:23:08 +0000 Subject: Dark Magic Page from TMW BR --- Icon/usable/book/generic-pagina-negra.png | Bin 0 -> 1795 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/usable/book/generic-pagina-negra.png diff --git a/Icon/usable/book/generic-pagina-negra.png b/Icon/usable/book/generic-pagina-negra.png new file mode 100644 index 00000000..718460a1 Binary files /dev/null and b/Icon/usable/book/generic-pagina-negra.png differ -- cgit v1.2.3-70-g09d2 From 0c157deb79e26968c3b1f31219a146bd2487cc8c Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 12:23:25 +0000 Subject: Red Magic Page from TMW BR --- Icon/usable/book/generic-pagina-vermelha.png | Bin 0 -> 1317 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/usable/book/generic-pagina-vermelha.png diff --git a/Icon/usable/book/generic-pagina-vermelha.png b/Icon/usable/book/generic-pagina-vermelha.png new file mode 100644 index 00000000..481c11e7 Binary files /dev/null and b/Icon/usable/book/generic-pagina-vermelha.png differ -- cgit v1.2.3-70-g09d2 From a6b65c10d75ec34c26ada2c5c152d32f4c9961d9 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 14:09:43 +0000 Subject: Compass 1 from TMW BR --- Icon/usable/generic-bussola.png | Bin 0 -> 1303 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/usable/generic-bussola.png diff --git a/Icon/usable/generic-bussola.png b/Icon/usable/generic-bussola.png new file mode 100644 index 00000000..3a7aa3ca Binary files /dev/null and b/Icon/usable/generic-bussola.png differ -- cgit v1.2.3-70-g09d2 From 5635909ddb06a60b81231eec868ae347cef5f73f Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 14:09:59 +0000 Subject: Compass 2 from TMW BR --- Icon/usable/generic-bussola-ventos.png | Bin 0 -> 836 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/usable/generic-bussola-ventos.png diff --git a/Icon/usable/generic-bussola-ventos.png b/Icon/usable/generic-bussola-ventos.png new file mode 100644 index 00000000..ab02895a Binary files /dev/null and b/Icon/usable/generic-bussola-ventos.png differ -- cgit v1.2.3-70-g09d2 From b18f220925d0c99aacc052e2f328c4650683c564 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 14:11:32 +0000 Subject: basket from TMW BR --- Icon/generic/generic-cesta-macas.png | Bin 0 -> 1960 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/generic/generic-cesta-macas.png diff --git a/Icon/generic/generic-cesta-macas.png b/Icon/generic/generic-cesta-macas.png new file mode 100644 index 00000000..50141544 Binary files /dev/null and b/Icon/generic/generic-cesta-macas.png differ -- cgit v1.2.3-70-g09d2 From 132513c95bf1166ea56fbbaaf7545fb763e873b4 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 14:11:51 +0000 Subject: Dyable crystal --- Icon/generic/generic-crystal.png | Bin 0 -> 553 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Icon/generic/generic-crystal.png diff --git a/Icon/generic/generic-crystal.png b/Icon/generic/generic-crystal.png new file mode 100644 index 00000000..83918b83 Binary files /dev/null and b/Icon/generic/generic-crystal.png differ -- cgit v1.2.3-70-g09d2 From 17dd02d928996d91e0ec64697217a4811cf8bc40 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 14:12:46 +0000 Subject: swamp monster from BR lol JESUS SHOULD BE MAD AT ME --- Sprites/Monsters/espectro-sombrio.png | Bin 0 -> 49656 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Monsters/espectro-sombrio.png diff --git a/Sprites/Monsters/espectro-sombrio.png b/Sprites/Monsters/espectro-sombrio.png new file mode 100644 index 00000000..9c89973d Binary files /dev/null and b/Sprites/Monsters/espectro-sombrio.png differ -- cgit v1.2.3-70-g09d2 From 3faa31932dfd54c8cc8d061cdc15c79f8d976128 Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 14:13:08 +0000 Subject: MONSTER xml --- Sprites/Monsters/espectro-sombrio.xml | 152 ++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 Sprites/Monsters/espectro-sombrio.xml diff --git a/Sprites/Monsters/espectro-sombrio.xml b/Sprites/Monsters/espectro-sombrio.xml new file mode 100644 index 00000000..6598327d --- /dev/null +++ b/Sprites/Monsters/espectro-sombrio.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From a0db6c93a9d0c6c77b2f5472fa8a1bb9425c498d Mon Sep 17 00:00:00 2001 From: Saulc Date: Mon, 26 Aug 2019 14:13:56 +0000 Subject: Maybe we will use it more as an sfx @jesusalva ? --- Sprites/Monsters/efeito-onda.png | Bin 0 -> 4522 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Monsters/efeito-onda.png diff --git a/Sprites/Monsters/efeito-onda.png b/Sprites/Monsters/efeito-onda.png new file mode 100644 index 00000000..f4d7b277 Binary files /dev/null and b/Sprites/Monsters/efeito-onda.png differ -- cgit v1.2.3-70-g09d2 From 8692e9ab435b8eab990d84bfccadd1c593cf7996 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 27 Aug 2019 07:17:44 +0000 Subject: Banhista from TMW BR --- Sprites/Npcs/banhista.png | Bin 0 -> 3270 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/banhista.png diff --git a/Sprites/Npcs/banhista.png b/Sprites/Npcs/banhista.png new file mode 100644 index 00000000..7d5bb463 Binary files /dev/null and b/Sprites/Npcs/banhista.png differ -- cgit v1.2.3-70-g09d2 From bccb50f5fa5e896d7cf5616f19a99b98f745c583 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 27 Aug 2019 07:18:06 +0000 Subject: Bruxa from TMW BR --- Sprites/Npcs/bruxa.png | Bin 0 -> 10797 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/bruxa.png diff --git a/Sprites/Npcs/bruxa.png b/Sprites/Npcs/bruxa.png new file mode 100644 index 00000000..76ee5d16 Binary files /dev/null and b/Sprites/Npcs/bruxa.png differ -- cgit v1.2.3-70-g09d2 From 84f83caae5285b8d63ad50bd95b4db3fa699f047 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 27 Aug 2019 07:18:20 +0000 Subject: Bruxa xml from TMW BR --- Sprites/Npcs/bruxa.xml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Sprites/Npcs/bruxa.xml diff --git a/Sprites/Npcs/bruxa.xml b/Sprites/Npcs/bruxa.xml new file mode 100644 index 00000000..f5706c8d --- /dev/null +++ b/Sprites/Npcs/bruxa.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From f9ba98e758448ec37a766dd654e157131440345f Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 27 Aug 2019 07:18:52 +0000 Subject: Bruxa2 from TMW BR --- Sprites/Npcs/bruxa-livro.png | Bin 0 -> 6790 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/bruxa-livro.png diff --git a/Sprites/Npcs/bruxa-livro.png b/Sprites/Npcs/bruxa-livro.png new file mode 100644 index 00000000..bd910d9a Binary files /dev/null and b/Sprites/Npcs/bruxa-livro.png differ -- cgit v1.2.3-70-g09d2 From 6f671b04080259d334c47cc35e65dd5d5a9ad353 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 27 Aug 2019 07:19:08 +0000 Subject: Bruxa2 from TMW BR --- Sprites/Npcs/bruxa-levitando.xml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Sprites/Npcs/bruxa-levitando.xml diff --git a/Sprites/Npcs/bruxa-levitando.xml b/Sprites/Npcs/bruxa-levitando.xml new file mode 100644 index 00000000..fce94e63 --- /dev/null +++ b/Sprites/Npcs/bruxa-levitando.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From d753c2a202f2f2c722294119a92c77569621b02e Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 27 Aug 2019 07:28:26 +0000 Subject: Bruxa from TMW BR --- Sprites/Npcs/bruxa-livro.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 Sprites/Npcs/bruxa-livro.xml diff --git a/Sprites/Npcs/bruxa-livro.xml b/Sprites/Npcs/bruxa-livro.xml new file mode 100644 index 00000000..a4d9df6f --- /dev/null +++ b/Sprites/Npcs/bruxa-livro.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 472e2b8012eae961b4525ec76103b6339981255d Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 27 Aug 2019 07:28:56 +0000 Subject: Bruxa3 from TMW BR --- Sprites/Npcs/bruxa-vassoura.png | Bin 0 -> 16039 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Npcs/bruxa-vassoura.png diff --git a/Sprites/Npcs/bruxa-vassoura.png b/Sprites/Npcs/bruxa-vassoura.png new file mode 100644 index 00000000..09c8015a Binary files /dev/null and b/Sprites/Npcs/bruxa-vassoura.png differ -- cgit v1.2.3-70-g09d2 From 2c0c46d68abeec1f570b84063455c9d8ece67088 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 27 Aug 2019 07:29:17 +0000 Subject: Bruxa3 from TMW BR --- Sprites/Npcs/bruxa-vassoura.xml | 97 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 Sprites/Npcs/bruxa-vassoura.xml diff --git a/Sprites/Npcs/bruxa-vassoura.xml b/Sprites/Npcs/bruxa-vassoura.xml new file mode 100644 index 00000000..c3c48342 --- /dev/null +++ b/Sprites/Npcs/bruxa-vassoura.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 62a8b04b925628c01a059ec3ec8e363e181fdda6 Mon Sep 17 00:00:00 2001 From: Saulc Date: Tue, 27 Aug 2019 09:24:06 +0000 Subject: bomb --- Sprites/Equipment/head/hitomb-lord.png | Bin 0 -> 16615 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sprites/Equipment/head/hitomb-lord.png diff --git a/Sprites/Equipment/head/hitomb-lord.png b/Sprites/Equipment/head/hitomb-lord.png new file mode 100644 index 00000000..94ccaeef Binary files /dev/null and b/Sprites/Equipment/head/hitomb-lord.png differ -- cgit v1.2.3-70-g09d2