summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE3
-rw-r--r--graphics/skills/guild/guildextension.pngbin0 -> 2228 bytes
-rw-r--r--maps/042-2.tmx3
-rw-r--r--skills.xml2
4 files changed, 6 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 948fa168..42ebd2b6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1160,6 +1160,9 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/skills/none.png (The Battle For Wesnoth) (GPL v3) (?)
graphics/skills/first_aid.png (pauliuw?) (GPL v2+CC0) (Open Game Art)
+### Guild
+ graphics/skills/guild/guildextension.png (Jesusalva) (CC-BY-SA 3.0) (Crush, Micksha)
+
### Other
graphics/skills/other/parum.png (?) (GPLv2) (Enchilado)
graphics/skills/other/kalmurk.png (Saulc) (CC BY-SA 3.0) (-)
diff --git a/graphics/skills/guild/guildextension.png b/graphics/skills/guild/guildextension.png
new file mode 100644
index 00000000..51885d26
--- /dev/null
+++ b/graphics/skills/guild/guildextension.png
Binary files differ
diff --git a/maps/042-2.tmx b/maps/042-2.tmx
index 3dbd67b6..b47155d7 100644
--- a/maps/042-2.tmx
+++ b/maps/042-2.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="80" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="7">
+<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="80" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="7">
<properties>
<property name="license" value="CC-BY-SA 3.0"/>
<property name="manaplus version" value="2"/>
@@ -758,6 +758,7 @@
<property name="dest_map" value="042-3"/>
<property name="dest_x" value="58"/>
<property name="dest_y" value="139"/>
+ <property name="npc_id" value="SCRIPT"/>
</properties>
</object>
<object id="3" name="Margin" type="Fixme" x="0" y="0" width="640" height="640"/>
diff --git a/skills.xml b/skills.xml
index 03b698a2..dd26def4 100644
--- a/skills.xml
+++ b/skills.xml
@@ -724,7 +724,7 @@ Copyright (C) 2018 TMW2 -->
<skill
id="10004"
name="Guild Size"
- icon="graphics/skills/none.png"
+ icon="graphics/skills/guild/guildextension.png"
description="Increases max member on guild."
/>
<skill