summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE5
-rw-r--r--graphics/items/equipment/weapons/placeholder.pngbin755 -> 0 bytes
-rw-r--r--graphics/items/equipment/weapons/placeholder_gatling.pngbin0 -> 1165 bytes
-rw-r--r--graphics/items/equipment/weapons/placeholder_revolver.pngbin0 -> 704 bytes
-rw-r--r--graphics/items/equipment/weapons/placeholder_rifle.pngbin0 -> 1081 bytes
-rw-r--r--graphics/items/equipment/weapons/placeholder_shotgun.pngbin0 -> 817 bytes
-rw-r--r--items.xml10
7 files changed, 9 insertions, 6 deletions
diff --git a/LICENSE b/LICENSE
index 11c620b6..04494484 100644
--- a/LICENSE
+++ b/LICENSE
@@ -99,7 +99,10 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/items/equipment/ammo/tolchiarrow.png (Saulc) (CC BY-SA 3.0) (-)
graphics/items/equipment/ammo/trainingarrow.png (Reid) (CC BY-SA 3.0) (-)
- graphics/items/equipment/ammo/placeholder.png (TODO: DELETE ME) (GPL 2.0) (FreedroidRPG)
+ graphics/items/equipment/ammo/placeholder_revolver.png (TODO: DELETE ME)(GPL 2.0) (basse/InfraRed/FreedroidRPG)
+ graphics/items/equipment/ammo/placeholder_gatling.png (TODO: DELETE ME) (GPL 2.0) (basse/InfraRed/FreedroidRPG)
+ graphics/items/equipment/ammo/placeholder_rifle.png (TODO: DELETE ME) (GPL 2.0) (basse/InfraRed/FreedroidRPG)
+ graphics/items/equipment/ammo/placeholder_shotgun.png (TODO: DELETE ME) (GPL 2.0) (basse/InfraRed/FreedroidRPG)
#### Amulet
graphics/items/equipment/amulet/angelamulet.png (Saulc) (GPLv2) (TMW-Br)
diff --git a/graphics/items/equipment/weapons/placeholder.png b/graphics/items/equipment/weapons/placeholder.png
deleted file mode 100644
index d3dd95a3..00000000
--- a/graphics/items/equipment/weapons/placeholder.png
+++ /dev/null
Binary files differ
diff --git a/graphics/items/equipment/weapons/placeholder_gatling.png b/graphics/items/equipment/weapons/placeholder_gatling.png
new file mode 100644
index 00000000..174fe2fc
--- /dev/null
+++ b/graphics/items/equipment/weapons/placeholder_gatling.png
Binary files differ
diff --git a/graphics/items/equipment/weapons/placeholder_revolver.png b/graphics/items/equipment/weapons/placeholder_revolver.png
new file mode 100644
index 00000000..0f4e712c
--- /dev/null
+++ b/graphics/items/equipment/weapons/placeholder_revolver.png
Binary files differ
diff --git a/graphics/items/equipment/weapons/placeholder_rifle.png b/graphics/items/equipment/weapons/placeholder_rifle.png
new file mode 100644
index 00000000..e58d15e1
--- /dev/null
+++ b/graphics/items/equipment/weapons/placeholder_rifle.png
Binary files differ
diff --git a/graphics/items/equipment/weapons/placeholder_shotgun.png b/graphics/items/equipment/weapons/placeholder_shotgun.png
new file mode 100644
index 00000000..209aeb86
--- /dev/null
+++ b/graphics/items/equipment/weapons/placeholder_shotgun.png
Binary files differ
diff --git a/items.xml b/items.xml
index e9a3b787..339044ff 100644
--- a/items.xml
+++ b/items.xml
@@ -6344,7 +6344,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
<!-- guns. TODO: Sprite, attack animation, particles -->
<item id="6010"
- image="equipment/weapons/placeholder.png"
+ image="equipment/weapons/placeholder_rifle.png"
name="Pyn Rifle"
description="When a single big hole in your enemies' chests is all you need."
effect="Critical +40%"
@@ -6362,7 +6362,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
<sprite>equipment/weapons/woodenbow.xml</sprite>
</item>
<item id="6020"
- image="equipment/weapons/placeholder.png"
+ image="equipment/weapons/placeholder_gatling.png"
name="Pyn Gatling Gun"
description="That things shoot so fast! It is so fun shooting with it! Oh... Ran out of ammo already? %%a"
effect="Acc. -10%, Critical -100%, Dex attack bonus 0%"
@@ -6380,7 +6380,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
<sprite>equipment/weapons/woodenbow.xml</sprite>
</item>
<item id="6030"
- image="equipment/weapons/placeholder.png"
+ image="equipment/weapons/placeholder_shotgun.png"
name="Pyn Shotgun"
description="Developed on Saulc's Palace, that thing causes splash damage."
effect="Acc. -30% / Dodge -25% / AoE Damage"
@@ -6398,7 +6398,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
<sprite>equipment/weapons/woodenbow.xml</sprite>
</item>
<item id="6040"
- image="equipment/weapons/placeholder.png"
+ image="equipment/weapons/placeholder_revolver.png"
name="Pyn Revolver"
description="You better raise your dexterity, or you won't hit anything with it."
effect="Acc. -40% / Critical -60% / Shields Allowed"
@@ -6416,7 +6416,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
<sprite>equipment/weapons/woodenbow.xml</sprite>
</item>
<item id="6050"
- image="equipment/weapons/placeholder.png"
+ image="equipment/weapons/placeholder_rifle.png"
name="Dustynator 2000"
description="The best weapon on the market! I'm not trying to scam you, I swear"
effect="Acc. +20%, No Criticals"