summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE1
-rw-r--r--graphics/items/equipment/weapons/revolver.pngbin679 -> 715 bytes
-rw-r--r--graphics/sprites/equipment/weapons/gun.pngbin0 -> 2207 bytes
-rw-r--r--graphics/sprites/equipment/weapons/gun.xml9
-rw-r--r--items.xml2
-rw-r--r--monsters.xml14
6 files changed, 25 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 39eca3e2..2cff843d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1495,6 +1495,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/sprites/equipment/weapons/backsword.png (Alige, Reid) (CC BY-SA 3.0) (-)
graphics/sprites/equipment/weapons/bow.png (Reid) (CC BY-SA 3.0) (-)
graphics/sprites/equipment/weapons/bugslayer.png (Alige, Reid) (CC BY-SA 3.0) (-)
+ graphics/sprites/equipment/weapons/gun.png (Skipy) (GPLv2) (jesusalva)
graphics/sprites/equipment/weapons/heavyaxe.png (?) (GPLv2) (TMW-Br, LoF)
graphics/sprites/equipment/weapons/jackal.png (?) (GPLv2) (TMW-Br)
graphics/sprites/equipment/weapons/kanabo.png (?) (GPLv2) (TMW-Br, LoF)
diff --git a/graphics/items/equipment/weapons/revolver.png b/graphics/items/equipment/weapons/revolver.png
index 1d147335..c88ae05a 100644
--- a/graphics/items/equipment/weapons/revolver.png
+++ b/graphics/items/equipment/weapons/revolver.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/gun.png b/graphics/sprites/equipment/weapons/gun.png
new file mode 100644
index 00000000..70bc5b44
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/gun.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/gun.xml b/graphics/sprites/equipment/weapons/gun.xml
new file mode 100644
index 00000000..a3aaff27
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/gun.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<sprite>
+ <imageset name="weapon"
+ src="graphics/sprites/equipment/weapons/gun.png"
+ width="64"
+ height="64"/>
+
+ <include file="equipment/weapons/kanabo.xml"/>
+</sprite>
diff --git a/items.xml b/items.xml
index 83b01eea..68929970 100644
--- a/items.xml
+++ b/items.xml
@@ -7427,7 +7427,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
type="equip-1hand"
attack-action="attack_bow"
weight="7000">
- <sprite>equipment/weapons/bow.xml</sprite>
+ <sprite>equipment/weapons/gun.xml</sprite>
<sound event="hit">weapons/gunstaff/shot.ogg</sound>
<sound event="miss">weapons/gunstaff/shot.ogg</sound>
</item>
diff --git a/monsters.xml b/monsters.xml
index ec2545fe..e2e11177 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1354,4 +1354,18 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or s
<sound event="miss">monsters/flower/miss.ogg</sound>
<sound event="die">system/warp.ogg</sound>
</monster>
+ <monster id="1502" name="Cursed Archer">
+ <sprite>races/ukar-male.xml</sprite>
+ <sprite>hairstyles/hairstyle03.xml|#000002,020004,0d0d13,181c20,2b302d,616b64,c7ccbf</sprite>
+ <sprite>equipment/head/deserthelmet.xml</sprite>
+ <sprite>equipment/chest/warlordplate-male.xml</sprite>
+ <sprite>equipment/legs/terranitepants-male.xml</sprite>
+ <sprite>equipment/feet/warlordboots-male.xml</sprite>
+ <sprite>equipment/hands/cottongloves-male.xml|#3c3c3c,302525,4d4d4d,4a3430,686868,69453a,919191,96664c,b6b6b6,bf8d67,dfdfdf,e6c19c</sprite>
+ <sprite>equipment/weapons/woodenbow.xml</sprite>
+ <sound event="hit">monsters/frostiana/hit1.ogg</sound>
+ <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
+ <sound event="miss">monsters/flower/miss.ogg</sound>
+ <sound event="die">system/warp.ogg</sound>
+ </monster>
</monsters>