Merged with Aethyra master as of 2009-01-27

Conflicts:
	Almost everywhere.

24 files changed, 56 insertions, 21 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index d5e9e88e..35b9d4e2 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,5 +1,6 @@
 SET(DATA_DIR ${PKG_DATADIR}/data)
 
+ADD_SUBDIRECTORY(fonts)
 ADD_SUBDIRECTORY(graphics)
 ADD_SUBDIRECTORY(help)
 ADD_SUBDIRECTORY(icons)
diff --git a/data/fonts/CMakeLists.txt b/data/fonts/CMakeLists.txt
index dc22e031..d5b6ed85 100644
--- a/data/fonts/CMakeLists.txt
+++ b/data/fonts/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET (FILES
     dejavusans.ttf
+    dejavusans-bold.ttf
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/fonts)
-
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
index 331f6c8b..5aa02999 100644
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -1,5 +1,8 @@
 fontsdir = $(pkgdatadir)/data/fonts
 
-fonts_DATA = dejavusans.ttf
+fonts_DATA =				\
+	dejavusans.ttf			\
+	dejavusans-bold.ttf
 
-EXTRA_DIST = $(fonts_DATA)
+EXTRA_DIST =				\
+	$(fonts_DATA)
diff --git a/data/fonts/dejavusans-bold.ttf b/data/fonts/dejavusans-bold.ttf
new file mode 100644
index 00000000..ebefb0ca
--- /dev/null
+++ b/data/fonts/dejavusans-bold.ttf
diff --git a/data/fonts/dejavusans.ttf b/data/fonts/dejavusans.ttf
index 627cef46..6253857c 100644
--- a/data/fonts/dejavusans.ttf
+++ b/data/fonts/dejavusans.ttf
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 3d617696..6351d5ba 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -8,7 +8,8 @@ SET (FILES
     checkbox.png
     close_button.png
     deepbox.png
-    fixedfont.png
+    default.png
+    gui.xml
     hits_blue.png
     hits_red.png
     hits_yellow.png
@@ -20,16 +21,13 @@ SET (FILES
     hscroll_right_pressed.png
     item_shortcut_bgr.png
     mouse.png
-    menuitemD.png
-    menuitemF.png
-    menuitemN.png
-    menuitemP.png
     radioin.png
     radioout.png
     resize.png
-    rpgfont_wider.png
     selection.png
     slider.png
+    speech_bubble.png
+    speech_bubble.xml
     tab.png
     tabselected.png
     target-cursor-blue-l.png
@@ -38,7 +36,6 @@ SET (FILES
     target-cursor-red-l.png
     target-cursor-red-m.png
     target-cursor-red-s.png
-    thickborder.png
     unknown-item.png
     vscroll_blue.png
     vscroll_down_default.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 33abf521..eb4c7365 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -11,8 +11,8 @@ gui_DATA =				\
 	checkbox.png			\
 	close_button.png		\
 	deepbox.png			\
-	emotions.png			\
-	fixedfont.png			\
+	default.png			\
+	gui.xml				\
 	hits_blue.png			\
 	hits_red.png			\
 	hits_yellow.png			\
@@ -24,16 +24,13 @@ gui_DATA =				\
 	hscroll_right_pressed.png	\
 	item_shortcut_bgr.png		\
 	mouse.png			\
-	menuitemD.png			\
-	menuitemF.png			\
-	menuitemN.png			\
-	menuitemP.png			\
 	radioin.png			\
 	radioout.png			\
 	resize.png			\
-	rpgfont_wider.png		\
 	selection.png			\
 	slider.png			\
+	speech_bubble.png		\
+	speechbubble.xml		\
 	tab.png				\
 	tabselected.png			\
 	target-cursor-blue-l.png	\
@@ -42,7 +39,6 @@ gui_DATA =				\
 	target-cursor-red-l.png		\
 	target-cursor-red-m.png		\
 	target-cursor-red-s.png		\
-	thickborder.png			\
 	unknown-item.png		\
 	vscroll_blue.png		\
 	vscroll_down_default.png	\
diff --git a/data/graphics/gui/default.png b/data/graphics/gui/default.png
new file mode 100644
index 00000000..29353df8
--- /dev/null
+++ b/data/graphics/gui/default.png
diff --git a/data/graphics/gui/emotions.png b/data/graphics/gui/emotions.png
deleted file mode 100644
index 146f2d24..00000000
--- a/data/graphics/gui/emotions.png
+++ /dev/null
diff --git a/data/graphics/gui/fixedfont.png b/data/graphics/gui/fixedfont.png
deleted file mode 100644
index 10319291..00000000
--- a/data/graphics/gui/fixedfont.png
+++ /dev/null
diff --git a/data/graphics/gui/gui.xml b/data/graphics/gui/gui.xml
new file mode 100644
index 00000000..fe62528e
--- /dev/null
+++ b/data/graphics/gui/gui.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="default.png">
+    <widget type="Window">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
+		<part type="top-edge" xpos="4" ypos="0" width="3" height="4" />
+		<part type="top-right-corner" xpos="7" ypos="0" width="4" height="4" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="4" height="10" />
+		<part type="bg-quad" xpos="11" ypos="0" width="32" height="32" />
+		<part type="right-edge" xpos="7" ypos="4" width="4" height="10" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="15" width="4" height="4" />
+		<part type="bottom-edge" xpos="4" ypos="15" width="3" height="4" />
+		<part type="bottom-right-corner" xpos="7" ypos="15" width="4" height="4" />
+	</widget>
+</skinset>
\ No newline at end of file
diff --git a/data/graphics/gui/hits_blue.png b/data/graphics/gui/hits_blue.png
index 59458485..cfb04ab8 100644
--- a/data/graphics/gui/hits_blue.png
+++ b/data/graphics/gui/hits_blue.png
diff --git a/data/graphics/gui/hits_red.png b/data/graphics/gui/hits_red.png
index da765dc4..150f1c1e 100644
--- a/data/graphics/gui/hits_red.png
+++ b/data/graphics/gui/hits_red.png
diff --git a/data/graphics/gui/hits_yellow.png b/data/graphics/gui/hits_yellow.png
index d77b7c05..6975dfd5 100644
--- a/data/graphics/gui/hits_yellow.png
+++ b/data/graphics/gui/hits_yellow.png
diff --git a/data/graphics/gui/menuitemD.png b/data/graphics/gui/menuitemD.png
deleted file mode 100644
index a9fe2222..00000000
--- a/data/graphics/gui/menuitemD.png
+++ /dev/null
diff --git a/data/graphics/gui/menuitemF.png b/data/graphics/gui/menuitemF.png
deleted file mode 100644
index 84142a16..00000000
--- a/data/graphics/gui/menuitemF.png
+++ /dev/null
diff --git a/data/graphics/gui/menuitemN.png b/data/graphics/gui/menuitemN.png
deleted file mode 100644
index bf25dd61..00000000
--- a/data/graphics/gui/menuitemN.png
+++ /dev/null
diff --git a/data/graphics/gui/menuitemP.png b/data/graphics/gui/menuitemP.png
deleted file mode 100644
index 060d5a34..00000000
--- a/data/graphics/gui/menuitemP.png
+++ /dev/null
diff --git a/data/graphics/gui/rpgfont_wider.png b/data/graphics/gui/rpgfont_wider.png
deleted file mode 100644
index 55ccbbd6..00000000
--- a/data/graphics/gui/rpgfont_wider.png
+++ /dev/null
diff --git a/data/graphics/gui/speech_bubble.png b/data/graphics/gui/speech_bubble.png
new file mode 100644
index 00000000..3e678099
--- /dev/null
+++ b/data/graphics/gui/speech_bubble.png
diff --git a/data/graphics/gui/speechbubble.xml b/data/graphics/gui/speechbubble.xml
new file mode 100644
index 00000000..1b11ea85
--- /dev/null
+++ b/data/graphics/gui/speechbubble.xml
@@ -0,0 +1,18 @@
+<skinset name="SpeechBubble" image="speech_bubble.png">
+    <widget type="Window">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="14" height="14" />
+		<part type="top-edge" xpos="15" ypos="0" width="1" height="14" />
+		<part type="top-right-corner" xpos="17" ypos="0" width="17" height="14" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="15" width="14" height="1" />
+		<part type="bg-quad" xpos="34" ypos="0" width="32" height="32" />
+		<part type="right-edge" xpos="17" ypos="15" width="17" height="1" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="17" width="14" height="17" />
+		<part type="bottom-edge" xpos="15" ypos="17" width="1" height="17" />
+		<part type="bottom-right-corner" xpos="17" ypos="17" width="17" height="17" />
+	</widget>
+</skinset>
\ No newline at end of file
diff --git a/data/graphics/gui/thickborder.png b/data/graphics/gui/thickborder.png
deleted file mode 100644
index da72c92f..00000000
--- a/data/graphics/gui/thickborder.png
+++ /dev/null
diff --git a/data/help/commands.txt b/data/help/commands.txt
index 2c6e8299..c4795050 100644
--- a/data/help/commands.txt
+++ b/data/help/commands.txt
@@ -29,9 +29,7 @@
      ##2H##P                  hide all non-sticky windows
      ##2Z##P                  pick up item
      ##2Enter##P              focus chat window / send message
-     ##2Shift##P              hold it when attacking to lock target for auto
-                        attack
- 
+
 
 ##2MOUSE:
 
@@ -55,6 +53,8 @@
 
  /whisper "<name>" <message>
 
+ For further help type /help in the chat console.
+
 
 ##2IGNORING COMMUNICATION
 
diff --git a/data/help/skills.txt b/data/help/skills.txt
index 84d5bc5a..3a075ee0 100644
--- a/data/help/skills.txt
+++ b/data/help/skills.txt
@@ -11,5 +11,7 @@
      ##2Level 1:##P enables the ability to trade with others
      ##2Level 2:##P enables the ability to express emotions
      ##2Level 3:##P enables character to sit
+     ##2Level 5:##P enables a char to join a party.
+     ##2Level 7:##P enables a char to create a party
      Other levels are still not implemented.
  
\ No newline at end of file