From f5e64c2f7d905b816fca80ad93d034aabe084e7c Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Fri, 31 Dec 2010 02:01:59 +0100 Subject: changing 031-2 to make it look nicer --- maps/031-2.tmx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/maps/031-2.tmx b/maps/031-2.tmx index b9a799aa..07d21c3e 100644 --- a/maps/031-2.tmx +++ b/maps/031-2.tmx @@ -21,19 +21,24 @@ H4sIAAAAAAAAA+3TsQ6CMBSF4SZKIjoyEGWUmCgjoILv/1A4eYaSNB1smFrIP3y5zb3LOUMnY8wEAAAAAAA2JZO9HCSXo5xkZ/fzPXbOkKe85C1nuUglhZR23hLIGXKV2s67PKTx9nUCOUNaxyCjfLx9m0DOJT066e27N+vt8U/snPSgRwzuf+687O4tds4lvglkAAAAAABgDX7hnrJxECcAAA== + + + H4sIAAAAAAAAA+3OsQ1AUBhG0bf/QJgAE2AEIyh9rY48yd+ck9z+tgYAAAAA753VAz+5qgd4GNKYpuqRTnNa0lo90mlLezqqRwAAAAA+ugEzez5aECcAAA== + + - H4sIAAAAAAAAA+3PwQ2CQABE0eWuVoD234taAVABWAGQMB144LBZ8l7y7zOlAAAAAFDLuyvlk75d7SXnDNk/pqnxH3P2L+nX+I81+7e0N/7jCm7pnh61h5zUp2d61R4CAAAA8McBqc4JOxAnAAA= + H4sIAAAAAAAAA+3PwQ2CQABE0eUuVqD03wtYAXrxClagJowVmOBhs+a95N9nSgEAAACglrErZUqXrvaS/e7ZPqdrujX842PJ/jU9Gv/xzP5Xejf+4x8cUp+OtYf86JTOaag9BAAAAOCLDYFoKWkQJwAA - H4sIAAAAAAAAA+3OwQ2CQBRF0VEawL6kA+gAG8BYAaEVNkAFQAVKD5bg0pfAyh3ODH9zT3Lzk8ksnnMAAAAAAACI6aoy6xEB5KpQb+shnkp1Ux/rIRGl6mI9IoDKesAfOtWrQd23t/a03ofNpF2S83pHNalZ1T9/mmMneXmql1qshwAAAAAAgMN8AdM+ux8QJwAA + H4sIAAAAAAAAA+3OwQ2CQBCG0UUbwL60A+gAG9BYgbEVa2QSOcGF6K5zeS/5M9k9faUAAAAA0NI5dsmOqGCIjdkRFUyxa3ZEY33slB1RwS074Ef35b67z32klex3PGz/nqv36y8lAAAAAN+ZAZvHhDwQJwAA - + - H4sIAAAAAAAAA+3RwQZAIRRF0av//+jmeZR6HJcVaxAN9tGoqgEAAAAAh2pz7+LrpJte+9cdHTadnnTn7Y71TbrzZku658//6LytWy8AAACkTGpaw4YQJwAA + H4sIAAAAAAAAA+3RsQoAIQxEweD/f/T1qcQT1sAEprN4i6uqFgAAAABsqgcabu3ol2762993TNi0e+nO0x39TbrzZEu65+Z/TN42rRcAAABSPoDEU8sQJwAA @@ -41,7 +46,7 @@ H4sIAAAAAAAAA+3BAQ0AAADCoPdPbQ43oAAAAAAAAAAAAODfAC7KO00QJwAA - + -- cgit v1.2.3-70-g09d2 From a12577bb8dcddee7c68db859a27a15409edb93f6 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Fri, 31 Dec 2010 02:17:33 +0100 Subject: 031-2: adding fireplace particle effect to the fireplace --- maps/031-2.tmx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/maps/031-2.tmx b/maps/031-2.tmx index 07d21c3e..936afe7e 100644 --- a/maps/031-2.tmx +++ b/maps/031-2.tmx @@ -36,7 +36,7 @@ H4sIAAAAAAAAA+3OwQ2CQBCG0UUbwL60A+gAG9BYgbEVa2QSOcGF6K5zeS/5M9k9faUAAAAA0NI5dsmOqGCIjdkRFUyxa3ZEY33slB1RwS074Ef35b67z32klex3PGz/nqv36y8lAAAAAN+ZAZvHhDwQJwAA - + H4sIAAAAAAAAA+3RsQoAIQxEweD/f/T1qcQT1sAEprN4i6uqFgAAAABsqgcabu3ol2762993TNi0e+nO0x39TbrzZEu65+Z/TN42rRcAAABSPoDEU8sQJwAA @@ -46,7 +46,7 @@ H4sIAAAAAAAAA+3BAQ0AAADCoPdPbQ43oAAAAAAAAAAAAODfAC7KO00QJwAA - + @@ -55,5 +55,6 @@ + -- cgit v1.2.3-70-g09d2 From 961ce4679dab78cf8e8bbbeb8b5aa408f65e9f33 Mon Sep 17 00:00:00 2001 From: Chuck Miller Date: Thu, 30 Dec 2010 23:08:07 -0500 Subject: Convert some images to 8-bit SFML plasma needs 8-bit png images --- graphics/sprites/hairstyle1.png | Bin 733 -> 1893 bytes graphics/tiles/collision.png | Bin 234 -> 258 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/sprites/hairstyle1.png b/graphics/sprites/hairstyle1.png index 6bb2657e..8c16d68e 100644 Binary files a/graphics/sprites/hairstyle1.png and b/graphics/sprites/hairstyle1.png differ diff --git a/graphics/tiles/collision.png b/graphics/tiles/collision.png index 9640aa80..d0e9c7d0 100644 Binary files a/graphics/tiles/collision.png and b/graphics/tiles/collision.png differ -- cgit v1.2.3-70-g09d2 From 3b0d48e5be7032c480bd424c95d79419b8b43825 Mon Sep 17 00:00:00 2001 From: Wombat Date: Mon, 3 Jan 2011 09:28:34 -0500 Subject: new raw log icon, nivalis quest items/equipment added wizard hat, yeti mask, animal bones, frozen yeti tear, ice cube, yeti claw graphics...new raw log icon --- graphics/items/equipment/head/wizard-hat.png | Bin 0 -> 538 bytes graphics/items/equipment/head/yeti-mask.png | Bin 0 -> 1542 bytes graphics/items/generic-animal-bones.png | Bin 0 -> 1528 bytes graphics/items/generic-frozen-yeti-tear.png | Bin 0 -> 492 bytes graphics/items/generic-ice-cube.png | Bin 0 -> 3373 bytes graphics/items/generic-rawlog.png | Bin 873 -> 1719 bytes graphics/items/generic-yeti-claw.png | Bin 0 -> 645 bytes graphics/sprites/equipment/head/wizard-hat.png | Bin 0 -> 1136 bytes graphics/sprites/equipment/head/wizard-hat.xml | 142 +++++++++++++++++++++ graphics/sprites/equipment/head/yeti-mask.png | Bin 0 -> 7441 bytes graphics/sprites/equipment/head/yeti-mask.xml | 142 +++++++++++++++++++++ items.xml | 166 ++++++++++++++++++++++++- 12 files changed, 449 insertions(+), 1 deletion(-) create mode 100644 graphics/items/equipment/head/wizard-hat.png create mode 100644 graphics/items/equipment/head/yeti-mask.png create mode 100644 graphics/items/generic-animal-bones.png create mode 100644 graphics/items/generic-frozen-yeti-tear.png create mode 100644 graphics/items/generic-ice-cube.png create mode 100644 graphics/items/generic-yeti-claw.png create mode 100644 graphics/sprites/equipment/head/wizard-hat.png create mode 100644 graphics/sprites/equipment/head/wizard-hat.xml create mode 100644 graphics/sprites/equipment/head/yeti-mask.png create mode 100644 graphics/sprites/equipment/head/yeti-mask.xml diff --git a/graphics/items/equipment/head/wizard-hat.png b/graphics/items/equipment/head/wizard-hat.png new file mode 100644 index 00000000..ab9a49b8 Binary files /dev/null and b/graphics/items/equipment/head/wizard-hat.png differ diff --git a/graphics/items/equipment/head/yeti-mask.png b/graphics/items/equipment/head/yeti-mask.png new file mode 100644 index 00000000..53c5bb15 Binary files /dev/null and b/graphics/items/equipment/head/yeti-mask.png differ diff --git a/graphics/items/generic-animal-bones.png b/graphics/items/generic-animal-bones.png new file mode 100644 index 00000000..7f8bdf11 Binary files /dev/null and b/graphics/items/generic-animal-bones.png differ diff --git a/graphics/items/generic-frozen-yeti-tear.png b/graphics/items/generic-frozen-yeti-tear.png new file mode 100644 index 00000000..af1e6de8 Binary files /dev/null and b/graphics/items/generic-frozen-yeti-tear.png differ diff --git a/graphics/items/generic-ice-cube.png b/graphics/items/generic-ice-cube.png new file mode 100644 index 00000000..7277aea4 Binary files /dev/null and b/graphics/items/generic-ice-cube.png differ diff --git a/graphics/items/generic-rawlog.png b/graphics/items/generic-rawlog.png index 95ab5511..038d5a5f 100644 Binary files a/graphics/items/generic-rawlog.png and b/graphics/items/generic-rawlog.png differ diff --git a/graphics/items/generic-yeti-claw.png b/graphics/items/generic-yeti-claw.png new file mode 100644 index 00000000..361e7d3c Binary files /dev/null and b/graphics/items/generic-yeti-claw.png differ diff --git a/graphics/sprites/equipment/head/wizard-hat.png b/graphics/sprites/equipment/head/wizard-hat.png new file mode 100644 index 00000000..3b4be79e Binary files /dev/null and b/graphics/sprites/equipment/head/wizard-hat.png differ diff --git a/graphics/sprites/equipment/head/wizard-hat.xml b/graphics/sprites/equipment/head/wizard-hat.xml new file mode 100644 index 00000000..3f06f733 --- /dev/null +++ b/graphics/sprites/equipment/head/wizard-hat.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/equipment/head/yeti-mask.png b/graphics/sprites/equipment/head/yeti-mask.png new file mode 100644 index 00000000..1eab7ce5 Binary files /dev/null and b/graphics/sprites/equipment/head/yeti-mask.png differ diff --git a/graphics/sprites/equipment/head/yeti-mask.xml b/graphics/sprites/equipment/head/yeti-mask.xml new file mode 100644 index 00000000..4a502713 --- /dev/null +++ b/graphics/sprites/equipment/head/yeti-mask.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/items.xml b/items.xml index 78e982d0..4528b521 100644 --- a/items.xml +++ b/items.xml @@ -2638,7 +2638,7 @@ effect="+3% Defense" type="equip-head" weight="30" - defense="5" + defense="3" max-per-slot="1"> head-guyfawkes.xml @@ -4893,6 +4893,116 @@ max-per-slot="1"> equipment/head/rabbit-ears.xml|#104010,208020,30c030 + + equipment/head/wizard-hat.xml|#580000,a40000,c02020,ff6060 + + + equipment/head/wizard-hat.xml|#115511,22aa22,99dd99 + + + equipment/head/wizard-hat.xml|#222255,6666ff + + + equipment/head/wizard-hat.xml|#846211,dab333,fffb93,ffffff + + + equipment/head/wizard-hat.xml|#16486e,498ec5,e4f2fc + + + equipment/head/wizard-hat.xml|#56002f,930050,fe70bd,feb7de,ffffff + + + equipment/head/wizard-hat.xml|#111111,222222,333333,444444,555555,aaaaaa + + + equipment/head/wizard-hat.xml|#80280f,b04810,ef681f,ffb830 + + + equipment/head/wizard-hat.xml|#4f0a76,8010c0,d699f7 + + + equipment/head/wizard-hat.xml|#104010,208020,30c030 + + + + + + + equipment/head/yeti-mask.xml + + + equipment/head/wizard-hat.xml + Date: Mon, 3 Jan 2011 15:50:02 +0100 Subject: changing item descriptions of dark green rabbit ears and wizard hat from pure white to dark green --- items.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/items.xml b/items.xml index 4528b521..73058bdb 100644 --- a/items.xml +++ b/items.xml @@ -4885,7 +4885,7 @@