From 1f984976298155aa60169e04d30dba4eb09f73b1 Mon Sep 17 00:00:00 2001 From: Reid Date: Wed, 23 May 2012 23:14:58 +0200 Subject: Correct some problem caused by the merge. --- graphics/sprites/npcs/xml/alige.xml | 35 +++++++++++ graphics/sprites/npcs/xml/animated_hammock1.xml | 21 +++++++ graphics/sprites/npcs/xml/animated_hammock2.xml | 21 +++++++ graphics/sprites/npcs/xml/billybons.xml | 16 +++++ graphics/sprites/npcs/xml/elmo1.xml | 16 +++++ graphics/sprites/npcs/xml/gugli.xml | 41 +++++++++++++ graphics/sprites/npcs/xml/hammock.xml | 14 +++++ graphics/sprites/npcs/xml/julia.xml | 16 +++++ graphics/sprites/npcs/xml/magic_arpan.xml | 24 ++++++++ graphics/sprites/npcs/xml/nard.xml | 16 +++++ graphics/sprites/npcs/xml/npc.xml | 14 +++++ graphics/sprites/npcs/xml/piousrocket.xml | 29 +++++++++ graphics/sprites/npcs/xml/rattosailor.xml | 16 +++++ graphics/sprites/npcs/xml/sailors.xml | 11 ++++ graphics/sprites/npcs/xml/sapartan.xml | 16 +++++ graphics/sprites/npcs/xml/silvio.xml | 18 ++++++ graphics/sprites/npcs/xml/sleepingorc.xml | 14 +++++ graphics/sprites/npcs/xml/smallnpc.xml | 14 +++++ graphics/sprites/npcs/xml/tarlan.xml | 78 +++++++++++++++++++++++++ 19 files changed, 430 insertions(+) create mode 100644 graphics/sprites/npcs/xml/alige.xml create mode 100644 graphics/sprites/npcs/xml/animated_hammock1.xml create mode 100644 graphics/sprites/npcs/xml/animated_hammock2.xml create mode 100644 graphics/sprites/npcs/xml/billybons.xml create mode 100644 graphics/sprites/npcs/xml/elmo1.xml create mode 100644 graphics/sprites/npcs/xml/gugli.xml create mode 100644 graphics/sprites/npcs/xml/hammock.xml create mode 100644 graphics/sprites/npcs/xml/julia.xml create mode 100644 graphics/sprites/npcs/xml/magic_arpan.xml create mode 100644 graphics/sprites/npcs/xml/nard.xml create mode 100644 graphics/sprites/npcs/xml/npc.xml create mode 100644 graphics/sprites/npcs/xml/piousrocket.xml create mode 100644 graphics/sprites/npcs/xml/rattosailor.xml create mode 100644 graphics/sprites/npcs/xml/sailors.xml create mode 100644 graphics/sprites/npcs/xml/sapartan.xml create mode 100644 graphics/sprites/npcs/xml/silvio.xml create mode 100644 graphics/sprites/npcs/xml/sleepingorc.xml create mode 100644 graphics/sprites/npcs/xml/smallnpc.xml create mode 100644 graphics/sprites/npcs/xml/tarlan.xml (limited to 'graphics/sprites/npcs/xml') diff --git a/graphics/sprites/npcs/xml/alige.xml b/graphics/sprites/npcs/xml/alige.xml new file mode 100644 index 00000000..ca101e2c --- /dev/null +++ b/graphics/sprites/npcs/xml/alige.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/npcs/xml/animated_hammock1.xml b/graphics/sprites/npcs/xml/animated_hammock1.xml new file mode 100644 index 00000000..7d6a24b4 --- /dev/null +++ b/graphics/sprites/npcs/xml/animated_hammock1.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/graphics/sprites/npcs/xml/animated_hammock2.xml b/graphics/sprites/npcs/xml/animated_hammock2.xml new file mode 100644 index 00000000..1853d7cc --- /dev/null +++ b/graphics/sprites/npcs/xml/animated_hammock2.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/graphics/sprites/npcs/xml/billybons.xml b/graphics/sprites/npcs/xml/billybons.xml new file mode 100644 index 00000000..90757589 --- /dev/null +++ b/graphics/sprites/npcs/xml/billybons.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/graphics/sprites/npcs/xml/elmo1.xml b/graphics/sprites/npcs/xml/elmo1.xml new file mode 100644 index 00000000..89e31c90 --- /dev/null +++ b/graphics/sprites/npcs/xml/elmo1.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/graphics/sprites/npcs/xml/gugli.xml b/graphics/sprites/npcs/xml/gugli.xml new file mode 100644 index 00000000..37e0eadc --- /dev/null +++ b/graphics/sprites/npcs/xml/gugli.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/graphics/sprites/npcs/xml/hammock.xml b/graphics/sprites/npcs/xml/hammock.xml new file mode 100644 index 00000000..a2065688 --- /dev/null +++ b/graphics/sprites/npcs/xml/hammock.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/graphics/sprites/npcs/xml/julia.xml b/graphics/sprites/npcs/xml/julia.xml new file mode 100644 index 00000000..0937934f --- /dev/null +++ b/graphics/sprites/npcs/xml/julia.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/graphics/sprites/npcs/xml/magic_arpan.xml b/graphics/sprites/npcs/xml/magic_arpan.xml new file mode 100644 index 00000000..dd695d65 --- /dev/null +++ b/graphics/sprites/npcs/xml/magic_arpan.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/npcs/xml/nard.xml b/graphics/sprites/npcs/xml/nard.xml new file mode 100644 index 00000000..7bf901b4 --- /dev/null +++ b/graphics/sprites/npcs/xml/nard.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/graphics/sprites/npcs/xml/npc.xml b/graphics/sprites/npcs/xml/npc.xml new file mode 100644 index 00000000..347d0ec0 --- /dev/null +++ b/graphics/sprites/npcs/xml/npc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/graphics/sprites/npcs/xml/piousrocket.xml b/graphics/sprites/npcs/xml/piousrocket.xml new file mode 100644 index 00000000..cde4eb57 --- /dev/null +++ b/graphics/sprites/npcs/xml/piousrocket.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/npcs/xml/rattosailor.xml b/graphics/sprites/npcs/xml/rattosailor.xml new file mode 100644 index 00000000..0ab0dc83 --- /dev/null +++ b/graphics/sprites/npcs/xml/rattosailor.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/graphics/sprites/npcs/xml/sailors.xml b/graphics/sprites/npcs/xml/sailors.xml new file mode 100644 index 00000000..6e0fb6bb --- /dev/null +++ b/graphics/sprites/npcs/xml/sailors.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/graphics/sprites/npcs/xml/sapartan.xml b/graphics/sprites/npcs/xml/sapartan.xml new file mode 100644 index 00000000..8f74b08a --- /dev/null +++ b/graphics/sprites/npcs/xml/sapartan.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/graphics/sprites/npcs/xml/silvio.xml b/graphics/sprites/npcs/xml/silvio.xml new file mode 100644 index 00000000..7d6a7212 --- /dev/null +++ b/graphics/sprites/npcs/xml/silvio.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/npcs/xml/sleepingorc.xml b/graphics/sprites/npcs/xml/sleepingorc.xml new file mode 100644 index 00000000..cf361a3b --- /dev/null +++ b/graphics/sprites/npcs/xml/sleepingorc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/graphics/sprites/npcs/xml/smallnpc.xml b/graphics/sprites/npcs/xml/smallnpc.xml new file mode 100644 index 00000000..c2b1565f --- /dev/null +++ b/graphics/sprites/npcs/xml/smallnpc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/graphics/sprites/npcs/xml/tarlan.xml b/graphics/sprites/npcs/xml/tarlan.xml new file mode 100644 index 00000000..54dc4fe8 --- /dev/null +++ b/graphics/sprites/npcs/xml/tarlan.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3-60-g2f50