Fix use of barbarians-outdoor-fixme tileset

2 files changed, 5 insertions, 9 deletions

diff --git a/maps/033-1.tmx b/maps/033-1.tmx
index 92dba135..cdbc8af6 100644
--- a/maps/033-1.tmx
+++ b/maps/033-1.tmx
@@ -10,8 +10,8 @@
  <tileset firstgid="275" source="../tilesets/Snow_tree_x3.tsx"/>
  <tileset firstgid="279" source="../tilesets/Snow_village2.tsx"/>
  <tileset firstgid="535" source="../tilesets/Snow_ground.tsx"/>
- <tileset firstgid="612" source="../tilesets/barbarians-outdoor-fixme.tsx"/>
- <tileset firstgid="624" source="../tilesets/barbarians-yurt_x4.tsx"/>
+ <tileset firstgid="612" source="../tilesets/barbarians-outdoor.tsx"/>
+ <tileset firstgid="615" source="../tilesets/barbarians-yurt_x4.tsx"/>
  <layer name="Ground" width="138" height="128">
   <data encoding="csv">
 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,
@@ -175,8 +175,8 @@
 0,0,0,0,0,0,134,164,164,164,135,0,0,0,0,0,0,150,133,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,179,168,163,135,148,148,195,163,135,0,0,0,134,165,149,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,134,164,164,164,164,135,148,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,197,0,195,179,179,180,180,180,180,181,
 0,0,0,0,0,134,165,184,180,180,163,164,135,0,0,0,0,0,150,133,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,196,179,163,135,148,148,179,163,135,0,0,149,181,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,180,218,219,220,147,148,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,181,0,0,0,195,179,180,180,180,180,181,
 0,0,0,0,0,149,181,196,196,196,179,180,163,164,135,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,179,163,135,148,195,179,163,135,0,149,197,149,0,0,0,0,0,0,0,0,87,88,88,88,89,0,0,0,0,0,0,0,0,0,149,181,196,234,235,236,147,0,131,151,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,181,0,0,0,0,195,196,196,196,196,197,
-0,0,0,0,0,149,197,0,0,0,195,196,179,180,147,0,0,0,0,150,133,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,179,147,148,148,195,179,163,164,165,0,149,0,0,0,0,0,0,0,0,103,616,617,0,105,0,0,0,0,0,147,0,0,134,165,197,0,0,0,0,147,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,181,133,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,149,0,0,0,0,0,0,195,196,147,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,163,164,135,148,195,179,183,181,0,149,0,0,0,0,0,0,0,87,43,622,623,9,121,0,0,0,0,0,147,0,134,165,181,0,0,0,0,0,163,135,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,165,181,149,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,149,197,0,0,0,195,196,179,180,147,0,0,0,0,150,133,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,179,147,148,148,195,179,163,164,165,0,149,0,0,0,0,0,0,0,0,103,0,0,0,105,0,0,0,0,0,147,0,0,134,165,197,0,0,0,0,147,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,181,133,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,149,0,0,0,0,0,0,195,196,147,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,163,164,135,148,195,179,183,181,0,149,0,0,0,0,0,0,0,87,43,614,0,9,121,0,0,0,0,0,147,0,134,165,181,0,0,0,0,0,163,135,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,165,181,149,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,149,0,0,0,0,0,0,0,131,151,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,168,163,135,148,195,196,197,0,0,0,0,0,0,0,0,0,119,120,120,120,121,0,0,0,0,0,0,163,164,165,181,197,0,0,0,0,0,179,147,163,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,180,181,181,149,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,150,132,133,0,0,0,131,132,151,0,0,0,0,134,164,165,0,0,0,0,0,0,0,134,164,164,135,0,0,134,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,196,179,163,164,135,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,168,181,197,0,0,0,0,0,0,195,147,179,163,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,180,181,197,149,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,150,132,132,132,151,0,0,0,0,134,164,165,180,181,0,0,0,0,0,0,0,149,180,180,163,164,164,165,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,179,180,147,0,131,132,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,196,197,0,0,0,0,0,0,0,0,147,195,179,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,180,181,0,149,0,0,0,0,0,0,0,0,0,
@@ -304,7 +304,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,277,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,275,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,275,0,0,0,0,0,0,0,0,276,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,275,0,0,0,0,275,0,0,0,275,0,275,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,275,0,0,0,0,0,0,0,0,276,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,616,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,275,0,0,0,0,275,0,0,0,275,0,275,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,277,0,0,0,0,0,0,0,0,0,0,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,275,0,0,0,0,0,0,0,275,0,0,275,0,0,0,0,0,0,0,0,0,0,0,276,0,275,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,275,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,275,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/tilesets/barbarians-outdoor-fixme.tsx b/tilesets/barbarians-outdoor-fixme.tsx
deleted file mode 100644
index 32f25928..00000000
--- a/tilesets/barbarians-outdoor-fixme.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="barbarians-outdoor-fixme" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/barbarians-outdoor.png" width="192" height="64"/>
-</tileset>