summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE4
-rw-r--r--graphics/sprites/npcs/sprite/barbaracry.pngbin0 -> 2091 bytes
-rw-r--r--graphics/sprites/npcs/sprite/injuriedgirl.pngbin0 -> 2562 bytes
-rw-r--r--graphics/sprites/npcs/sprite/injuriedguard.png (renamed from graphics/sprites/npcs/sprite/injuredguard.png)bin5338 -> 5338 bytes
-rw-r--r--graphics/sprites/npcs/xml/barbaracry.xml16
-rw-r--r--graphics/sprites/npcs/xml/injuriedgirl.xml16
-rw-r--r--graphics/sprites/npcs/xml/injuriedguard.xml2
-rw-r--r--npcs.xml10
8 files changed, 46 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 25252c58..f66bd2c7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1654,6 +1654,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/sprites/npcs/sprite/artisindoor-wood.png (IvanMorve, Reid) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/bacchus.png (Reid) (CC BY-SA 3.0) (Enchilado)
graphics/sprites/npcs/sprite/bait.png (Reid) (CC BY-SA 3.0) (-)
+ graphics/sprites/npcs/sprite/barbaracry.png (Saulc) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/barbarians.png (ChefChelios, Nami) (GPLv2), (CC BY-SA 3.0) (LoF)
graphics/sprites/npcs/sprite/beuss.png (Reid) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/billybons.png (Reid) (CC BY-SA 3.0) (-)
@@ -1677,7 +1678,8 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/sprites/npcs/sprite/harbour.png (EJlol, Reid) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/hammock.png (IvanMorve) (CC BY-SA 3.0) (Reid)
graphics/sprites/npcs/sprite/hammock-animated.png (IvanMorve) (CC BY-SA 3.0) (Reid)
- graphics/sprites/npcs/sprite/injuredguard.png (Saulc) (CC BY-SA 3.0) (-)
+ graphics/sprites/npcs/sprite/injuriedgirl.png (Saulc) (CC BY-SA 3.0) (-)
+ graphics/sprites/npcs/sprite/injuriedguard.png (Saulc) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/interactive.png (Hal9000, Modanung, Reid) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/ice_cage.png (Skipy) (GPLv2) (Jesusalva)
graphics/sprites/npcs/sprite/jenna.png (Reid) (CC BY-SA 3.0) (-)
diff --git a/graphics/sprites/npcs/sprite/barbaracry.png b/graphics/sprites/npcs/sprite/barbaracry.png
new file mode 100644
index 00000000..641d65c3
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/barbaracry.png
Binary files differ
diff --git a/graphics/sprites/npcs/sprite/injuriedgirl.png b/graphics/sprites/npcs/sprite/injuriedgirl.png
new file mode 100644
index 00000000..a9cd2082
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/injuriedgirl.png
Binary files differ
diff --git a/graphics/sprites/npcs/sprite/injuredguard.png b/graphics/sprites/npcs/sprite/injuriedguard.png
index dbe7c502..dbe7c502 100644
--- a/graphics/sprites/npcs/sprite/injuredguard.png
+++ b/graphics/sprites/npcs/sprite/injuriedguard.png
Binary files differ
diff --git a/graphics/sprites/npcs/xml/barbaracry.xml b/graphics/sprites/npcs/xml/barbaracry.xml
new file mode 100644
index 00000000..d7b0f84a
--- /dev/null
+++ b/graphics/sprites/npcs/xml/barbaracry.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Saulc, Jesusalva
+Copyright (C) 2019 TMW2-->
+
+<sprite>
+ <imageset name="base"
+ src="graphics/sprites/npcs/sprite/barbaracry.png"
+ width="40"
+ height="60"/>
+
+ <action name="stand" imageset="base">
+ <animation direction="default">
+ <frame index="0"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/injuriedgirl.xml b/graphics/sprites/npcs/xml/injuriedgirl.xml
new file mode 100644
index 00000000..45206a2e
--- /dev/null
+++ b/graphics/sprites/npcs/xml/injuriedgirl.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Saulc, Jesusalva
+Copyright (C) 2019 TMW2-->
+
+<sprite>
+ <imageset name="base"
+ src="graphics/sprites/npcs/sprite/injuriedgirl.png"
+ width="64"
+ height="64"/>
+
+ <action name="stand" imageset="base">
+ <animation direction="default">
+ <frame index="0"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/injuriedguard.xml b/graphics/sprites/npcs/xml/injuriedguard.xml
index 47dbdc2b..a294effb 100644
--- a/graphics/sprites/npcs/xml/injuriedguard.xml
+++ b/graphics/sprites/npcs/xml/injuriedguard.xml
@@ -4,7 +4,7 @@ Copyright (C) 2018-2019 TMW2: Moubootaur Legends -->
<sprite>
<imageset name="npc"
- src="graphics/sprites/npcs/sprite/injuredguard.png"
+ src="graphics/sprites/npcs/sprite/injuriedguard.png"
width="96"
height="32"/>
diff --git a/npcs.xml b/npcs.xml
index c188b081..162743b5 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -617,6 +617,16 @@ IDs 900-999 = Special
<!-- Ice Cage (for cleaning up) -->
<sprite variant="0">npcs/xml/icecage.xml</sprite>
</npc>
+
+ <npc id="254">
+ <!-- Barbara, Injuried Girl -->
+ <sprite>npcs/xml/injuriedgirl.xml</sprite>
+ </npc>
+
+ <npc id="255">
+ <!-- Barbara Crying -->
+ <sprite>npcs/xml/barbaracry.xml</sprite>
+ </npc>
<!-- NPCs from TMW-BR (that's why the jump) -->
<npc id="300"><sprite variant="0">npcs/xml/npcs-br.xml</sprite></npc> <!-- Invisible -->