--- a/.hgtags Sat Oct 08 16:45:52 2011 +0200
+++ b/.hgtags Sat Oct 08 16:54:56 2011 +0200
@@ -42,3 +42,7 @@
0000000000000000000000000000000000000000 0.9.9
fee68e3a303998fdfcc69f74775dc84a36f587fb 0.9.9.1
0000000000000000000000000000000000000000 0.9.9.1
+718f98a9df122d73f3ba9add4d1654865199de31 Hedgewars-iOS-1.3
+cba92708277b6d0aeabfff2b878845b7d848bdcd Hedgewars-iOS-1.3.1
+74bc72746bec68806344f4ba7be0d1bc6e05d380 0.9.16-release
+652a199d4f38f5becbec0839f5a1f63294dd89bf Hedgewars-iOS-1.3.2
--- a/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -41,8 +41,8 @@
#versioning
set(CPACK_PACKAGE_VERSION_MAJOR 0)
set(CPACK_PACKAGE_VERSION_MINOR 9)
-set(CPACK_PACKAGE_VERSION_PATCH 16${version_suffix})
-set(HEDGEWARS_PROTO_VER 38)
+set(CPACK_PACKAGE_VERSION_PATCH 17${version_suffix})
+set(HEDGEWARS_PROTO_VER 40)
set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
@@ -132,17 +132,17 @@
endif(APPLE)
-#this snippet sets "Release" mode by default
+#build Debug only when explicitally set
if (NOT CMAKE_BUILD_TYPE)
- set (CMAKE_BUILD_TYPE RELEASE CACHE STRING "Choose the type of build, options are: None Debug Release." FORCE)
+ set (CMAKE_BUILD_TYPE RELEASE CACHE STRING "Choose the type of build, options are: Debug Release." FORCE)
endif (NOT CMAKE_BUILD_TYPE)
-if(CMAKE_BUILD_TYPE MATCHES RELEASE OR CMAKE_BUILD_TYPE MATCHES "Release")
+if(CMAKE_BUILD_TYPE MATCHES DEBUG OR CMAKE_BUILD_TYPE MATCHES "Debug" OR CMAKE_BUILD_TYPE MATCHES "debug")
+ message(STATUS "Building Debug")
+ set(Optz false)
+else()
message(STATUS "Building Release")
set(Optz true)
-else()
- message(STATUS "Building Debug")
- set(Optz false)
endif()
@@ -262,10 +262,10 @@
"config\\\\.inc$"
"hwengine\\\\.desktop$"
"CMakeCache\\\\.txt$"
- "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libopenalbridge"
- "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libfreetype"
- "^${CMAKE_CURRENT_SOURCE_DIR}/misc/liblua"
- "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libtremor"
+# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libopenalbridge"
+# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libfreetype"
+# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/liblua"
+# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libtremor"
"^${CMAKE_CURRENT_SOURCE_DIR}/project_files/HedgewarsMobile/"
"^${CMAKE_CURRENT_SOURCE_DIR}/bin/[a-z]"
"^${CMAKE_CURRENT_SOURCE_DIR}/tools/templates"
--- a/CREDITS Sat Oct 08 16:45:52 2011 +0200
+++ b/CREDITS Sat Oct 08 16:54:56 2011 +0200
@@ -48,4 +48,16 @@
==========
- Stephen Alexander <ArmagonNo1@gmail.com>
+==========
+= SOUNDS
+==========
+- Mine impact sound from http://www.freesound.org/people/adcbicycle/sounds/13947/
+- Hammer sound from http://www.freesound.org/people/Syna-Max/sounds/43586/
+- Sinegun firing sound remixed from
+ http://beta.freesound.org/people/aust_paul/sounds/30935/
+ http://www.freesound.org/people/Edgar/sounds/162/
+ http://www.freesound.org/people/Ionizing/sounds/22033/
+ http://www.freesound.org/people/Jovica/sounds/38317/
+
+
ALL OTHER CONTENT IS PROPERTY OF Andrey Korotaev <unC0Rr@gmail.com> UNLESS OTHERWISE SPECIFIED
\ No newline at end of file
--- a/ChangeLog.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/ChangeLog.txt Sat Oct 08 16:54:56 2011 +0200
@@ -1,20 +1,34 @@
+ features
* bugfixes
-0.9.15 -> ???:
- + New modes: The Specialists, Space Invasion
+0.9.15 -> 0.9.16:
+ + In-game chat now supports backspace-repeat and Escape to close the text input area
+ + Team status bars shrunk/made translucent if they take up a significant portion of the screen
+ + Background music change on sudden death mode
+ + Stereoscopic rendering
+ Installing content (anything under Data/ - maps, sounds, and any such stuff) to user profile allows custom adding/overriding of any Data/ content
+ + Screen for downloadable content
+ + Allow up to 8 teams in a game
+ + New gameplay modes/styles: Racer, The Specialists, Tumbler, Space Invasion, Balanced Random Weapon
+ + New single player missions: Bamboo Thicket, That Sinking Feeling, Newton and the Tree
+ + New Weapon/Utility: Land Spray Gun
+ + New Utility: Time Box
+ + New Game mode: Tag team
+ + New Game option for map bottom border
+ + New Theme: Golf
+ + Many new hats
+ Sudden Death art
- + New Weapon/Utility: Land Spray Gun
- + New Game mode: Tag team
+ Get away time modifier (in %)
- + Allow up to 8 teams in a game
+ Shoppa scheme by default resets ammo
+ Shots are on a tenth of a second delay instead of a 1 and a quarter second delay (fast deagle/portal fire)
+ Defective mines explode if they take enough damage
+ Rope head can attach to hogs/crates/barrels again (rope still passes through them)
+ Control of grenade bounce
+ Drill Strike bombs don't explode when leaving ground, but after a (customizable!) timer
+ + Hammer impacts mines/barrels
+ + Seduction is an Area-of-Effect attack now
+ + Significantly altered flame behavior and damage.
+ + 'Throwing' weapons into hogs (e.g. grenade) no longer does max damage.
+ Ukranian localization of Default voice. support for localized voices
+ Theme cleanup, including the new theme config file change
+ Improvements in scoring and tracking damage
@@ -22,23 +36,32 @@
+ Mudball does not end turn
+ Indicator for height of plane when using napalm
+ Land smoothing (looks less pixelated on generation and damage)
- + Improved lua script support (e.g. possibility to change hats)
+ + Improved lua script support (e.g. set per-hog ammo, place girders, spawn fake crates, switch hogs, change hats)
+ + The names of the ShoppaKingTournament winners are now written on the Trophies in the ShoppaKing and TrophyRace maps!
+ + Allow window resizes during game
+ + Improved fullscreen capabilities
+ + Additional/new sounds (mine impact, sine gun, etc)
+ + Victory/flawless victory sounds
+ * Voices don't overlap (was needed more due to faster game actions due to shortened delays)
* Prevent portaling to impossible locations better
* Snow accumulates more smoothly
* Rope should be less sticky now
+ * Rope shouldn't be able to get Hogs stuck on walls anymore
* Fix for last portal shot always being yellow
* More accurate napalm strike drop location
- * AI fixes
+ * AI fixes (heh, yeah right)
* Fixed locales, such as korean
* Code refactoring
* Various bug/leak fixes
Frontend/Menu and Netgame:
- + Drawing straight lines in drawn map mode
+ + Drawing straight lines in drawn map mode (hold down the control key when clicking, then move mouse to end point and release).
+ + Undo clear in drawn map mode
+ Autokick ignored players joining your room
+ Improved nick sorting in lobby and rooms. (not case-sensitive, letters first, friend @ top, ignored @ bottom)
+ Display player count in lobby
+ Lobby: Player names of online players can be clicked in chat directly so that you don't have to find them in the player list
+ + Room names can be changed by the room admin without recreating the room
* Fix invisible icons in popup menus
* Various fixes and adjustments
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/AbstractPage.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,101 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "AbstractPage.h"
+
+AbstractPage::AbstractPage(QWidget* parent)
+{
+ Q_UNUSED(parent);
+
+ font14 = new QFont("MS Shell Dlg", 14);
+}
+
+void AbstractPage::initPage()
+{
+ QGridLayout * pageLayout = new QGridLayout(this);
+
+ // stretch grid space for body and footer
+ pageLayout->setColumnStretch(0,0);
+ pageLayout->setColumnStretch(1,1);
+ pageLayout->setRowStretch(0,1);
+ pageLayout->setRowStretch(1,0);
+
+ // add back/exit button
+ btnBack = formattedButton(":/res/Exit.png", true);
+ pageLayout->addWidget(btnBack, 1, 0, 1, 1, Qt::AlignLeft | Qt::AlignBottom);
+
+ // add body layout as defined by the subclass
+ pageLayout->addLayout(bodyLayoutDefinition(), 0, 0, 1, 2);
+
+ // add footer layout
+ QLayout * fld = footerLayoutDefinition();
+ if (fld != NULL)
+ pageLayout->addLayout(fld, 1, 1);
+
+ // connect signals
+ connect(btnBack, SIGNAL(clicked()), this, SIGNAL(goBack()));
+ connectSignals();
+}
+
+QPushButton * AbstractPage::formattedButton(const QString & btname, bool hasIcon)
+{
+ QPushButton * btn = new QPushButton(this);
+
+ if (hasIcon)
+ {
+ const QIcon& lp=QIcon(btname);
+ QSize sz = lp.actualSize(QSize(65535, 65535));
+ btn->setIcon(lp);
+ btn->setFixedSize(sz);
+ btn->setIconSize(sz);
+ btn->setFlat(true);
+ btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ }
+ else
+ {
+ btn->setFont(*font14);
+ btn->setText(btname);
+ }
+ return btn;
+}
+
+QPushButton * AbstractPage::addButton(const QString & btname, QGridLayout* grid, int wy, int wx, bool hasIcon)
+{
+ QPushButton * btn = formattedButton(btname, hasIcon);
+ grid->addWidget(btn, wy, wx);
+ return btn;
+}
+
+QPushButton * AbstractPage::addButton(const QString & btname, QGridLayout* grid, int wy, int wx, int rowSpan, int columnSpan, bool hasIcon)
+{
+ QPushButton * btn = formattedButton(btname, hasIcon);
+ grid->addWidget(btn, wy, wx, rowSpan, columnSpan);
+ return btn;
+}
+
+QPushButton * AbstractPage::addButton(const QString & btname, QBoxLayout* box, int where, bool hasIcon)
+{
+ QPushButton * btn = formattedButton(btname, hasIcon);
+ box->addWidget(btn, where);
+ return btn;
+}
+
+void AbstractPage::setBackButtonVisible(bool visible)
+{
+ btnBack->setVisible(visible);
+}
--- a/QTfrontend/AbstractPage.h Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/AbstractPage.h Sat Oct 08 16:54:56 2011 +0200
@@ -45,78 +45,51 @@
class QAbstractItemModel;
class QSettings;
class QSlider;
+class QGridlayout;
class AbstractPage : public QWidget
{
Q_OBJECT
- public:
+ signals:
+ void goBack();
- protected:
- AbstractPage(QWidget* parent = 0) {
- Q_UNUSED(parent);
-
- font14 = new QFont("MS Shell Dlg", 14);
- //setFocusPolicy(Qt::StrongFocus);
- }
- virtual ~AbstractPage() {};
+ protected:
+ // constructor and virtual destructor
+ AbstractPage(QWidget * parent = 0);
- QPushButton* addButton(QString btname, QGridLayout* grid, int wy, int wx, bool iconed = false) {
- QPushButton* butt = new QPushButton(this);
- if (!iconed) {
- butt->setFont(*font14);
- butt->setText(btname);
- //butt->setStyleSheet("background-color: #0d0544");
- } else {
- const QIcon& lp=QIcon(btname);
- QSize sz = lp.actualSize(QSize(65535, 65535));
- butt->setIcon(lp);
- butt->setFixedSize(sz);
- butt->setIconSize(sz);
- butt->setFlat(true);
- butt->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- }
- grid->addWidget(butt, wy, wx);
- return butt;
- };
+ // call this in the constructor of your subclass
+ void initPage();
+
+ // the following methods are used during page construction
+
+ // you MUST implement this method in your subclass
+ // only define layout, not behavior in here
+ virtual QLayout * bodyLayoutDefinition() = 0;
+
+ // you CAN implement this method in your subclass
+ virtual QLayout * footerLayoutDefinition() { return NULL; };
- QPushButton* addButton(QString btname, QGridLayout* grid, int wy, int wx, int rowSpan, int columnSpan, bool iconed = false) {
- QPushButton* butt = new QPushButton(this);
- if (!iconed) {
- butt->setFont(*font14);
- butt->setText(btname);
- } else {
- const QIcon& lp=QIcon(btname);
- QSize sz = lp.actualSize(QSize(65535, 65535));
- butt->setIcon(lp);
- butt->setFixedSize(sz);
- butt->setIconSize(sz);
- butt->setFlat(true);
- butt->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- }
- grid->addWidget(butt, wy, wx, rowSpan, columnSpan);
- return butt;
- };
+ // you CAN but most likely want to implement this method in your subclass
+ // keep in mind not to expose twidgets as public!
+ // instead define a signal with a meaningful name and connect the widget
+ // signals to your page signals
+ virtual void connectSignals() {};
+
+ virtual ~AbstractPage() {};
- QPushButton* addButton(QString btname, QBoxLayout* box, int where, bool iconed = false) {
- QPushButton* butt = new QPushButton(this);
- if (!iconed) {
- butt->setFont(*font14);
- butt->setText(btname);
- } else {
- const QIcon& lp=QIcon(btname);
- QSize sz = lp.actualSize(QSize(65535, 65535));
- butt->setIcon(lp);
- butt->setFixedSize(sz);
- butt->setIconSize(sz);
- butt->setFlat(true);
- butt->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- }
- box->addWidget(butt, where);
- return butt;
- };
+ QPushButton * formattedButton(const QString & btname, bool hasIcon = false);
+ QPushButton * addButton(const QString & btname, QGridLayout * grid, int wy, int wx, bool hasIcon = false);
+ QPushButton * addButton(const QString & btname, QGridLayout * grid, int wy, int wx, int rowSpan, int columnSpan, bool hasIcon = false);
+ QPushButton * addButton(const QString & btname, QBoxLayout * box, int where, bool hasIcon = false);
- QFont * font14;
+ void setBackButtonVisible(bool visible = true);
+
+ QFont * font14;
+
+ private:
+
+ QPushButton * btnBack;
};
#endif
--- a/QTfrontend/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,6 @@
# Configure for Qt4
set(QT_MIN_VERSION "4.5.0")
+include(CheckLibraryExists)
set(QT_USE_QTCORE TRUE)
set(QT_USE_QTGUI TRUE)
@@ -12,11 +13,28 @@
find_package(Qt4 REQUIRED)
include(${QT_USE_FILE})
+# Check if we need zlib
+check_library_exists(${QT_QTCORE_LIBRARY} inflateInit2_ ${QT_LIBRARY_DIR} QT_PROVIDES_ZLIB_FUNCTIONS)
+
+if(NOT QT_PROVIDES_ZLIB_FUNCTIONS)
+ find_package(ZLIB REQUIRED)
+
+ set(HW_LINK_LIBS ${ZLIB_LIBRARIES} ${HW_LINK_LIBS})
+endif()
+
+
# Configure for SDL
find_package(SDL REQUIRED)
find_package(SDL_mixer REQUIRED)
include_directories(.)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/model)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/net)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/dialog)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/page)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/widget)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util)
include_directories(${SDL_INCLUDE_DIR})
include_directories(${SDLMIXER_INCLUDE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/misc/quazip)
@@ -46,76 +64,30 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hwconsts.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/hwconsts.cpp)
+file(GLOB NetCpp net/*.cpp)
+file(GLOB ModelCpp model/*.cpp)
+file(GLOB_RECURSE UIcpp ui/*.cpp)
+file(GLOB UtilCpp util/*.cpp)
+
set(hwfr_src
- HWApplication.cpp
+ ${ModelCpp}
+ ${NetCpp}
+ ${UIcpp}
+ ${UtilCpp}
+ AbstractPage.cpp
+ achievements.cpp
+ binds.cpp
+ drawmapscene.cpp
game.cpp
+ gameuiconfig.cpp
+ HWApplication.cpp
+ hwform.cpp
main.cpp
- hwform.cpp
+ mapContainer.cpp
+ SDLs.cpp
team.cpp
- namegen.cpp
- teamselect.cpp
- teamselhelper.cpp
- frameTeam.cpp
- vertScrollArea.cpp
- gameuiconfig.cpp
ui_hwform.cpp
- gamecfgwidget.cpp
- pagemain.cpp
- pageeditteam.cpp
- pagemultiplayer.cpp
- pageoptions.cpp
- pagenet.cpp
- pagenetserver.cpp
- pagenetgame.cpp
- pageinfo.cpp
- pagedata.cpp
- pagesingleplayer.cpp
- pagetraining.cpp
- pagecampaign.cpp
- pageselectweapon.cpp
- pageingame.cpp
- pageroomslist.cpp
- pageconnecting.cpp
- pagescheme.cpp
- pagegamestats.cpp
- pageplayrecord.cpp
- pageadmin.cpp
- pagenettype.cpp
- pagedrawmap.cpp
- SquareLabel.cpp
- hats.cpp
- hedgehogerWidget.cpp
- hwmap.cpp
- mapContainer.cpp
- tcpBase.cpp
- about.cpp
- proto.cpp
- fpsedit.cpp
- netserver.cpp
- newnetclient.cpp
- netudpserver.cpp
- netudpwidget.cpp
- netregister.cpp
- netserverslist.cpp
- chatwidget.cpp
- binds.cpp
- SDLs.cpp
${CMAKE_CURRENT_BINARY_DIR}/hwconsts.cpp
- selectWeapon.cpp
- itemNum.cpp
- input_ip.cpp
- igbox.cpp
- weaponItem.cpp
- misc.cpp
- ammoSchemeModel.cpp
- togglebutton.cpp
- bgwidget.cpp
- achievements.cpp
- qaspectratiolayout.cpp
- drawmapwidget.cpp
- drawmapscene.cpp
- themesmodel.cpp
- databrowser.cpp
)
#xfire integration
@@ -134,77 +106,35 @@
set(hwfr_src ${hwfr_src} hedgewars.rc)
endif(MINGW)
+file(GLOB ModelHdr model/*.h)
+file(GLOB NetHdr net/*.h)
+file(GLOB_RECURSE UIhdr ui/*.h)
+file(GLOB UtilHdr util/*.h)
+
+
set(hwfr_moc_hdrs
- HWApplication.h
- game.h
- hats.h
- hwform.h
- teamselect.h
- teamselhelper.h
- frameTeam.h
- vertScrollArea.h
- gameuiconfig.h
- gamecfgwidget.h
+ ${ModelHdr}
+ ${NetHdr}
+ ${UIhdr}
AbstractPage.h
- pagenet.h
- pagemultiplayer.h
- pagenetserver.h
- pageingame.h
- pagetraining.h
- pageeditteam.h
- pageoptions.h
- pagemain.h
- pageinfo.h
- pagedata.h
- pagesingleplayer.h
- pagenettype.h
- pageconnecting.h
- pagedrawmap.h
- pagecampaign.h
- pagenetgame.h
- pageroomslist.h
- pagegamestats.h
- pageadmin.h
- pagescheme.h
- pageselectweapon.h
- pageplayrecord.h
- SquareLabel.h
- hedgehogerWidget.h
- hwmap.h
+ drawmapscene.h
+ game.h
+ gameuiconfig.h
+ HWApplication.h
+ hwform.h
mapContainer.h
- tcpBase.h
- about.h
- proto.h
- fpsedit.h
- netserver.h
- newnetclient.h
- netudpserver.h
- netudpwidget.h
- netregister.h
- netserverslist.h
- chatwidget.h
SDLs.h
- selectWeapon.h
- itemNum.h
- input_ip.h
- igbox.h
- weaponItem.h
- misc.h
- ammoSchemeModel.h
- togglebutton.h
- bgwidget.h
- qaspectratiolayout.h
- drawmapwidget.h
- drawmapscene.h
- themesmodel.h
- databrowser.h
)
set(hwfr_hdrs
+ ${UtilHdr}
+ team.h
+ achievements.h
binds.h
ui_hwform.h
KB.h
hwconsts.h
+ sdlkeys.h
)
set(hwfr_rez hedgewars.qrc)
@@ -216,7 +146,7 @@
if(APPLE)
set(hwfr_src ${hwfr_src} InstallController.cpp CocoaInitializer.mm M3Panel.mm M3InstallController.m NSWorkspace_RBAdditions.m)
- set(HW_LINK_LIBS IOKit)
+ set(HW_LINK_LIBS IOKit ${HW_LINK_LIBS})
if(NOT NOAUTOUPDATE)
find_package(Sparkle)
@@ -260,7 +190,7 @@
endif()
-target_link_libraries(hedgewars ${HW_LINK_LIBS})
+target_link_libraries(hedgewars ${HW_LINK_LIBS})
install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/hedgewars${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir})
--- a/QTfrontend/SquareLabel.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QPaintEvent>
-#include <QPainter>
-#include "SquareLabel.h"
-#include "hwform.h"
-
-SquareLabel::SquareLabel(QWidget * parent) :
- QWidget(parent)
-{
- if(frontendEffects) setAttribute(Qt::WA_PaintOnScreen, true);
-}
-
-void SquareLabel::paintEvent(QPaintEvent * event)
-{
- Q_UNUSED(event);
-
- QPainter painter(this);
- int pixsize;
- if (width() > height()) {
- pixsize = height();
- painter.translate((width() - pixsize) / 2, 0);
- } else {
- pixsize = width();
- painter.translate(0, (height() - pixsize) / 2);
- }
- painter.drawPixmap(0, 0, pixsize, pixsize, pixmap.scaled(pixsize, pixsize, Qt::KeepAspectRatio));
-}
-
-void SquareLabel::setPixmap(const QPixmap & pixmap)
-{
- this->pixmap = pixmap;
- repaint();
-}
--- a/QTfrontend/SquareLabel.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _SQUARELABEL_H
-#define _SQUARELABEL_H
-
-#include <QWidget>
-#include <QPixmap>
-
-class SquareLabel : public QWidget
-{
- Q_OBJECT
-
-public:
- SquareLabel(QWidget * parent = 0);
-
- void setPixmap(const QPixmap & pixmap);
-protected:
- virtual void paintEvent(QPaintEvent * event);
-
-private:
- QPixmap pixmap;
-
-};
-
-#endif // _SQUARELABEL_H
--- a/QTfrontend/about.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QLabel>
-#include <QTextBrowser>
-#include "about.h"
-#include "hwconsts.h"
-
-About::About(QWidget * parent) :
- QWidget(parent)
-{
- QGridLayout *mainLayout = new QGridLayout(this);
-
- QLabel *imageLabel = new QLabel;
- QImage image(":/res/Hedgehog.png");
- imageLabel->setPixmap(QPixmap::fromImage(image));
- imageLabel->setScaledContents(true);
- imageLabel->setMinimumWidth(2.8);
- imageLabel->setMaximumWidth(280);
- imageLabel->setMinimumHeight(30);
- imageLabel->setMaximumHeight(300);
-
- mainLayout->addWidget(imageLabel, 0, 0, 2, 1);
-
- QLabel *lbl1 = new QLabel(this);
- lbl1->setOpenExternalLinks(true);
- lbl1->setText(
- "<style type=\"text/css\">"
- "a { color: #ffcc00; }"
-// "a:hover { color: yellow; }"
- "</style>"
- "<div align=\"center\"><h1>Hedgewars</h1>"
- "<h3>" + QLabel::tr("Version") + " " + *cVersionString + "</h3>"
- "<p><a href=\"http://www.hedgewars.org/\">http://www.hedgewars.org/</a></p><br>" +
- QLabel::tr("This program is distributed under the GNU General Public License") +
- "</div>"
- );
- lbl1->setWordWrap(true);
- mainLayout->addWidget(lbl1, 0, 1);
-
- QTextBrowser *lbl2 = new QTextBrowser(this);
-
- lbl2->setOpenExternalLinks(true);
- lbl2->setText(
- "<style type=\"text/css\">"
- "a { color: #ffcc00; }"
-// "a:hover { color: yellow; }"
- "</style>" +
- QString("<h2>") +
- QLabel::tr("Developers:") +
- "</h2><p>"
- "Engine, frontend, net server: Andrey Korotaev <<a href=\"mailto:unC0Rr@gmail.com\">unC0Rr@gmail.com</a>><br>"
- "Many frontend improvements: Igor Ulyanov <<a href=\"mailto:disinbox@gmail.com\">disinbox@gmail.com</a>><br>"
- "Many engine and frontend improvements: Derek Pomery <<a href=\"mailto:nemo@m8y.org\">nemo@m8y.org</a>><br>"
- "Drill rocket, Ballgun, RC Plane weapons: Martin Boze <<a href=\"mailto:afffect@gmail.com\">afffect@gmail.com</a>><br>"
- "Mine number and time game settings: David A. Cuadrado <<a href=\"mailto:krawek@gmail.com\">krawek@gmail.com</a>><br>"
- "Frontend improvements: Martin Minarik <<a href=\"mailto:ttsmj@pokec.sk\">ttsmj@pokec.sk</a>><br>"
- "Frontend improvements: Kristian Lehmann <<a href=\"mailto:email@thexception.net\">email@thexception.net</a>><br>"
- "Mac OS X/iPhone port, OpenGL-ES conversion: Vittorio Giovara <<a href=\"mailto:vittorio.giovara@gmail.com\">vittorio.giovara@gmail.com</a>><br>"
- "Gamepad and Lua integration: Mario Liebisch <<a href=\"mailto:mario.liebisch@gmail.com\">mario.liebisch@gmail.com</a>><br>"
- "Many engine improvements and graphics: Carlos Vives <<a href=\"mailto:mail@carlosvives.es\">mail@carlosvives.es</a>><br>"
- "Few engine and frontend improvements: Richard Karolyi <<a href=\"mailto:sheepluva@ercatec.net\">sheepluva@ercatec.net</a>><br>"
- "Maze maps: Henning Kühn <<a href=\"mailto:prg@cooco.de\">prg@cooco.de</a>><br>"
- "Engine and frontend improvements: Henrik Rostedt <<a href=\"mailto:henrik.rostedt@gmail.com\">henrik.rostedt@gmail.com</a>><br>"
- "Lua game modes and missions: John Lambert <<a href=\"mailto:redgrinner@gmail.com\">redgrinner@gmail.com</a>><br>"
- "Frontend improvements: Mayur Pawashe <<a href=\"mailto:zorgiepoo@gmail.com\">zorgiepoo@gmail.com</a>><br>"
- "Android port: Richard Deurwaarder <<a href=\"mailto:xeli@xelification.com\">xeli@xelification.com</a>><br>"
- "</p><h2>" +
-
- QLabel::tr("Art:") + "</h2>"
- + QString::fromUtf8(
- "<p>John Dum <<a href=\"mailto:fizzy@gmail.com\">fizzy@gmail.com</a>>"
- "<br>"
- "Joshua Frese <<a href=\"mailto:joshfrese@gmail.com\">joshfrese@gmail.com</a>>"
- "<br>"
- "Stanko Tadić <<a href=\"mailto:stanko@mfhinc.net\">stanko@mfhinc.net</a>>"
- "<br>"
- "Julien Koesten <<a href=\"mailto:julienkoesten@aol.com\">julienkoesten@aol.com</a>>"
- "<br>"
- "Joshua O'Sullivan <<a href=\"mailto:coheedftw@hotmail.co.uk\">coheedftw@hotmail.co.uk</a>>"
- "<br>"
- "Nils Lück <<a href=\"mailto:nils.luck.design@gmail.com\">nils.luck.design@gmail.com</a>>"
- "<br>"
- "Guillaume Englert <<a href=\"mailto:genglert@hybird.org\">genglert@hybird.org</a>>"
- "<br>"
- "Hats: Trey Perry <<a href=\"mailto:tx.perry.j@gmail.com\">tx.perry.j@gmail.com</a>>"
- "</p><h2>") +
- QLabel::tr("Sounds:") + "</h2>"
- "Hedgehogs voice: Stephen Alexander <<a href=\"mailto:ArmagonNo1@gmail.com\">ArmagonNo1@gmail.com</a>>"
- "<br>"
- "John Dum <<a href=\"mailto:fizzy@gmail.com\">fizzy@gmail.com</a>>"
- "<br>"
- "Jonatan Nilsson <<a href=\"mailto:jonatanfan@gmail.com\">jonatanfan@gmail.com</a>>"
- "<br>"
- "Daniel Martin <<a href=\"mailto:elhombresinremedio@gmail.com\">elhombresinremedio@gmail.com</a>>"
- "</p><h2>" +
-
- QLabel::tr("Translations:") + "</h2><p>"
- + QString::fromUtf8(
- "Brazilian Portuguese: Romulo Fernandes Machado <<a href=\"mailto:abra185@gmail.com\">abra185@gmail.com</a>><br>"
- "Bulgarian: Svetoslav Stefanov<br>"
- "Czech: Petr ŘezáÄek <<a href=\"mailto:rezacek@gmail.com\">rezacek@gmail.com</a>><br>"
- "Chinese: Jie Luo <<a href=\"mailto:lililjlj@gmail.com\">lililjlj@gmail.com</a>><br>"
- "English: Andrey Korotaev <<a href=\"mailto:unC0Rr@gmail.com\">unC0Rr@gmail.com</a>><br>"
- "Finnish: Nina Kuisma <<a href=\"mailto:ninnnu@gmail.com\">ninnnu@gmail.com</a>><br>"
- "French: Antoine Turmel <<a href=\"mailto:geekshadow@gmail.com\">geekshadow@gmail.com</a>><br>"
- "German: Peter Hüwe <<a href=\"mailto:PeterHuewe@gmx.de\">PeterHuewe@gmx.de</a>>, Mario Liebisch <<a href=\"mailto:mario.liebisch@gmail.com\">mario.liebisch@gmail.com</a>><br>"
- "Greek: <<a href=\"mailto:talos_kriti@yahoo.gr\">talos_kriti@yahoo.gr</a>>"
- "Italian: Luca Bonora <<a href=\"mailto:bonora.luca@gmail.com\">bonora.luca@gmail.com</a>><br>"
- "Japanese: ADAM Etienne <<a href=\"mailto:etienne.adam@gmail.com\">etienne.adam@gmail.com</a>><br>"
- "Korean: Anthony Bellew <<a href=\"mailto:webmaster@anthonybellew.com\">webmaster@anthonybellew.com</a>><br>"
- "Lithuanian: Lukas Urbonas <<a href=\"mailto:lukasu08@gmail.com\">lukasu08@gmail.com</a>><br>"
- "Polish: Maciej Mroziński <<a href=\"mailto:mynick2@o2.pl\">mynick2@o2.pl</a>>, Wojciech Latkowski <<a href=\"mailto:magik17l@gmail.com\">magik17l@gmail.com</a>>, Piotr Mitana, Maciej Górny<br>"
- "Portuguese: Fábio Canário <<a href=\"mailto:inufabie@gmail.com\">inufabie@gmail.com</a>><br>"
- "Russian: Andrey Korotaev <<a href=\"mailto:unC0Rr@gmail.com\">unC0Rr@gmail.com</a>><br>"
- "Slovak: Jose Riha<br>"
- "Spanish: Carlos Vives <<a href=\"mailto:mail@carlosvives.es\">mail@carlosvives.es</a>><br>"
- "Swedish: Niklas Grahn <<a href=\"mailto:raewolusjoon@yaoo.com\">raewolusjoon@yaoo.com</a>>, Henrik Rostedt <<a href=\"mailto:henrik.rostedt@gmail.com\">henrik.rostedt@gmail.com</a>><br>"
- "Ukrainian: Eugene V. Lyubimkin <<a href=\"mailto:jackyf.devel@gmail.com\">jackyf.devel@gmail.com</a>>, Igor Paliychuk <<a href=\"mailto:mansonigor@gmail.com\">mansonigor@gmail.com</a>>, Eugene Sakara <<a href=\"mailto:eresid@gmail.com\">eresid@gmail.com</a>>"
- "</p><h2>") +
-
- QLabel::tr("Special thanks:") + "</h2><p>"
- "Aleksey Andreev <<a href=\"mailto:blaknayabr@gmail.com\">blaknayabr@gmail.com</a>><br>"
- "Aleksander Rudalev <<a href=\"mailto:alexv@pomorsu.ru\">alexv@pomorsu.ru</a>><br>"
- "Natasha Korotaeva <<a href=\"mailto:layout@pisem.net\">layout@pisem.net</a>><br>"
- "Adam Higerd (aka ahigerd at FreeNode)"
- "</p>"
- );
- mainLayout->addWidget(lbl2, 1, 1);
-}
--- a/QTfrontend/about.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _ABOUT_H
-#define _ABOUT_H
-
-#include <QWidget>
-
-
-class About : public QWidget
-{
- Q_OBJECT
-
-public:
- About(QWidget * parent = 0);
-};
-
-#endif // _ABOUT_H
--- a/QTfrontend/ammoSchemeModel.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,786 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2005-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QDebug>
-#include <QModelIndex>
-
-#include "ammoSchemeModel.h"
-#include "hwconsts.h"
-
-QList<QVariant> defaultScheme = QList<QVariant>()
- << QVariant("Default") // name 0
- << QVariant(false) // fortsmode 1
- << QVariant(false) // team divide 2
- << QVariant(false) // solid land 3
- << QVariant(false) // border 4
- << QVariant(false) // low gravity 5
- << QVariant(false) // laser sight 6
- << QVariant(false) // invulnerable 7
- << QVariant(false) // reset health 8
- << QVariant(false) // vampiric 9
- << QVariant(false) // karma 10
- << QVariant(false) // artillery 11
- << QVariant(true) // random order 12
- << QVariant(false) // king 13
- << QVariant(false) // place hog 14
- << QVariant(false) // shared ammo 15
- << QVariant(false) // disable girders 16
- << QVariant(false) // disable land objects 17
- << QVariant(false) // AI survival 18
- << QVariant(false) // inf. attack 19
- << QVariant(false) // reset weps 20
- << QVariant(false) // per hog ammo 21
- << QVariant(false) // no wind 22
- << QVariant(false) // more wind 23
- << QVariant(false) // tag team 24
- << QVariant(false) // bottom border 25
- << QVariant(100) // damage modfier 26
- << QVariant(45) // turn time 27
- << QVariant(100) // init health 28
- << QVariant(15) // sudden death 29
- << QVariant(5) // case prob 30
- << QVariant(3) // mines time 31
- << QVariant(4) // mines number 32
- << QVariant(0) // mine dud pct 33
- << QVariant(2) // explosives 34
- << QVariant(35) // health case pct 35
- << QVariant(25) // health case amt 36
- << QVariant(47) // water rise amt 37
- << QVariant(5) // health dec amt 38
- << QVariant(100) // rope modfier 39
- << QVariant(100) // get away time 40
- ;
-
-AmmoSchemeModel::AmmoSchemeModel(QObject* parent, const QString & fileName) :
- QAbstractTableModel(parent),
- fileConfig(fileName, QSettings::IniFormat)
-{
- predefSchemesNames = QStringList()
- << "Default"
- << "Pro Mode"
- << "Shoppa"
- << "Clean Slate"
- << "Minefield"
- << "Barrel Mayhem"
- << "Tunnel Hogs"
- << "Fort Mode"
- << "Timeless"
- << "Thinking with Portals"
- << "King Mode"
- ;
-
- numberOfDefaultSchemes = predefSchemesNames.size();
-
- spNames = QStringList()
- << "name" // 0
- << "fortsmode" // 1
- << "divteams" // 2
- << "solidland" // 3
- << "border" // 4
- << "lowgrav" // 5
- << "laser" // 6
- << "invulnerability" // 7
- << "resethealth" // 8
- << "vampiric" // 9
- << "karma" // 10
- << "artillery" // 11
- << "randomorder" // 12
- << "king" // 13
- << "placehog" // 14
- << "sharedammo" // 15
- << "disablegirders" // 16
- << "disablelandobjects" // 17
- << "aisurvival" // 18
- << "infattack" // 19
- << "resetweps" // 20
- << "perhogammo" // 21
- << "disablewind" // 22
- << "morewind" // 23
- << "tagteam" // 24
- << "bottomborder" // 25
- << "damagefactor" // 26
- << "turntime" // 27
- << "health" // 28
- << "suddendeath" // 29
- << "caseprobability" // 30
- << "minestime" // 31
- << "minesnum" // 32
- << "minedudpct" // 33
- << "explosives" // 34
- << "healthprobability" // 35
- << "healthcaseamount" // 36
- << "waterrise" // 37
- << "healthdecrease" // 38
- << "ropepct" // 39
- << "getawaytime" // 40
- ;
-
- QList<QVariant> proMode;
- proMode
- << predefSchemesNames[1] // name 0
- << QVariant(false) // fortsmode 1
- << QVariant(false) // team divide 2
- << QVariant(false) // solid land 3
- << QVariant(false) // border 4
- << QVariant(false) // low gravity 5
- << QVariant(false) // laser sight 6
- << QVariant(false) // invulnerable 7
- << QVariant(false) // reset health 8
- << QVariant(false) // vampiric 9
- << QVariant(false) // karma 10
- << QVariant(false) // artillery 11
- << QVariant(true) // random order 12
- << QVariant(false) // king 13
- << QVariant(false) // place hog 14
- << QVariant(true) // shared ammo 15
- << QVariant(false) // disable girders 16
- << QVariant(false) // disable land objects 17
- << QVariant(false) // AI survival 18
- << QVariant(false) // inf. attack 19
- << QVariant(false) // reset weps 20
- << QVariant(false) // per hog ammo 21
- << QVariant(false) // no wind 22
- << QVariant(false) // more wind 23
- << QVariant(false) // tag team 24
- << QVariant(false) // bottom border 25
- << QVariant(100) // damage modfier 26
- << QVariant(15) // turn time 27
- << QVariant(100) // init health 28
- << QVariant(15) // sudden death 29
- << QVariant(0) // case prob 30
- << QVariant(3) // mines time 31
- << QVariant(0) // mines number 32
- << QVariant(0) // mine dud pct 33
- << QVariant(2) // explosives 34
- << QVariant(35) // health case pct 35
- << QVariant(25) // health case amt 36
- << QVariant(47) // water rise amt 37
- << QVariant(5) // health dec amt 38
- << QVariant(100) // rope modfier 39
- << QVariant(100) // get away time 40
- ;
-
- QList<QVariant> shoppa;
- shoppa
- << predefSchemesNames[2] // name 0
- << QVariant(false) // fortsmode 1
- << QVariant(false) // team divide 2
- << QVariant(true) // solid land 3
- << QVariant(true) // border 4
- << QVariant(false) // low gravity 5
- << QVariant(false) // laser sight 6
- << QVariant(false) // invulnerable 7
- << QVariant(false) // reset health 8
- << QVariant(false) // vampiric 9
- << QVariant(false) // karma 10
- << QVariant(false) // artillery 11
- << QVariant(true) // random order 12
- << QVariant(false) // king 13
- << QVariant(false) // place hog 14
- << QVariant(true) // shared ammo 15
- << QVariant(true) // disable girders 16
- << QVariant(false) // disable land objects 17
- << QVariant(false) // AI survival 18
- << QVariant(false) // inf. attack 19
- << QVariant(true) // reset weps 20
- << QVariant(false) // per hog ammo 21
- << QVariant(false) // no wind 22
- << QVariant(false) // more wind 23
- << QVariant(false) // tag team 24
- << QVariant(false) // bottom border 25
- << QVariant(100) // damage modfier 26
- << QVariant(30) // turn time 27
- << QVariant(100) // init health 28
- << QVariant(50) // sudden death 29
- << QVariant(1) // case prob 30
- << QVariant(3) // mines time 31
- << QVariant(0) // mines number 32
- << QVariant(0) // mine dud pct 33
- << QVariant(0) // explosives 34
- << QVariant(0) // health case pct 35
- << QVariant(25) // health case amt 36
- << QVariant(47) // water rise amt 37
- << QVariant(5) // health dec amt 38
- << QVariant(100) // rope modfier 39
- << QVariant(100) // get away time 40
- ;
-
- QList<QVariant> cleanslate;
- cleanslate
- << predefSchemesNames[3] // name 0
- << QVariant(false) // fortsmode 1
- << QVariant(false) // team divide 2
- << QVariant(false) // solid land 3
- << QVariant(false) // border 4
- << QVariant(false) // low gravity 5
- << QVariant(false) // laser sight 6
- << QVariant(false) // invulnerable 7
- << QVariant(true) // reset health 8
- << QVariant(false) // vampiric 9
- << QVariant(false) // karma 10
- << QVariant(false) // artillery 11
- << QVariant(true) // random order 12
- << QVariant(false) // king 13
- << QVariant(false) // place hog 14
- << QVariant(false) // shared ammo 15
- << QVariant(false) // disable girders 16
- << QVariant(false) // disable land objects 17
- << QVariant(false) // AI survival 18
- << QVariant(true) // inf. attack 19
- << QVariant(true) // reset weps 20
- << QVariant(false) // per hog ammo 21
- << QVariant(false) // no wind 22
- << QVariant(false) // more wind 23
- << QVariant(false) // tag team 24
- << QVariant(false) // bottom border 25
- << QVariant(100) // damage modfier 26
- << QVariant(45) // turn time 27
- << QVariant(100) // init health 28
- << QVariant(15) // sudden death 29
- << QVariant(5) // case prob 30
- << QVariant(3) // mines time 31
- << QVariant(4) // mines number 32
- << QVariant(0) // mine dud pct 33
- << QVariant(2) // explosives 34
- << QVariant(35) // health case pct 35
- << QVariant(25) // health case amt 36
- << QVariant(47) // water rise amt 37
- << QVariant(5) // health dec amt 38
- << QVariant(100) // rope modfier 39
- << QVariant(100) // get away time 40
- ;
-
- QList<QVariant> minefield;
- minefield
- << predefSchemesNames[4] // name 0
- << QVariant(false) // fortsmode 1
- << QVariant(false) // team divide 2
- << QVariant(false) // solid land 3
- << QVariant(false) // border 4
- << QVariant(false) // low gravity 5
- << QVariant(false) // laser sight 6
- << QVariant(false) // invulnerable 7
- << QVariant(false) // reset health 8
- << QVariant(false) // vampiric 9
- << QVariant(false) // karma 10
- << QVariant(false) // artillery 11
- << QVariant(true) // random order 12
- << QVariant(false) // king 13
- << QVariant(false) // place hog 14
- << QVariant(true) // shared ammo 15
- << QVariant(true) // disable girders 16
- << QVariant(false) // disable land objects 17
- << QVariant(false) // AI survival 18
- << QVariant(false) // inf. attack 19
- << QVariant(false) // reset weps 20
- << QVariant(false) // per hog ammo 21
- << QVariant(false) // no wind 22
- << QVariant(false) // more wind 23
- << QVariant(false) // tag team 24
- << QVariant(false) // bottom border 25
- << QVariant(100) // damage modfier 26
- << QVariant(30) // turn time 27
- << QVariant(50) // init health 28
- << QVariant(15) // sudden death 29
- << QVariant(0) // case prob 30
- << QVariant(0) // mines time 31
- << QVariant(80) // mines number 32
- << QVariant(0) // mine dud pct 33
- << QVariant(0) // explosives 34
- << QVariant(35) // health case pct 35
- << QVariant(25) // health case amt 36
- << QVariant(47) // water rise amt 37
- << QVariant(5) // health dec amt 38
- << QVariant(100) // rope modfier 39
- << QVariant(100) // get away time 40
- ;
-
- QList<QVariant> barrelmayhem;
- barrelmayhem
- << predefSchemesNames[5] // name 0
- << QVariant(false) // fortsmode 1
- << QVariant(false) // team divide 2
- << QVariant(false) // solid land 3
- << QVariant(false) // border 4
- << QVariant(false) // low gravity 5
- << QVariant(false) // laser sight 6
- << QVariant(false) // invulnerable 7
- << QVariant(false) // reset health 8
- << QVariant(false) // vampiric 9
- << QVariant(false) // karma 10
- << QVariant(false) // artillery 11
- << QVariant(true) // random order 12
- << QVariant(false) // king 13
- << QVariant(false) // place hog 14
- << QVariant(true) // shared ammo 15
- << QVariant(false) // disable girders 16
- << QVariant(false) // disable land objects 17
- << QVariant(false) // AI survival 18
- << QVariant(false) // inf. attack 19
- << QVariant(false) // reset weps 20
- << QVariant(false) // per hog ammo 21
- << QVariant(false) // no wind 22
- << QVariant(false) // more wind 23
- << QVariant(false) // tag team 24
- << QVariant(false) // bottom border 25
- << QVariant(100) // damage modfier 26
- << QVariant(30) // turn time 27
- << QVariant(100) // init health 28
- << QVariant(15) // sudden death 29
- << QVariant(0) // case prob 30
- << QVariant(0) // mines time 31
- << QVariant(0) // mines number 32
- << QVariant(0) // mine dud pct 33
- << QVariant(80) // explosives 34
- << QVariant(35) // health case pct 35
- << QVariant(25) // health case amt 36
- << QVariant(47) // water rise amt 37
- << QVariant(5) // health dec amt 38
- << QVariant(100) // rope modfier 39
- << QVariant(100) // get away time 40
- ;
-
- QList<QVariant> tunnelhogs;
- tunnelhogs
- << predefSchemesNames[6] // name 0
- << QVariant(false) // fortsmode 1
- << QVariant(false) // team divide 2
- << QVariant(false) // solid land 3
- << QVariant(true) // border 4
- << QVariant(false) // low gravity 5
- << QVariant(false) // laser sight 6
- << QVariant(false) // invulnerable 7
- << QVariant(false) // reset health 8
- << QVariant(false) // vampiric 9
- << QVariant(false) // karma 10
- << QVariant(false) // artillery 11
- << QVariant(true) // random order 12
- << QVariant(false) // king 13
- << QVariant(false) // place hog 14
- << QVariant(true) // shared ammo 15
- << QVariant(true) // disable girders 16
- << QVariant(true) // disable land objects 17
- << QVariant(false) // AI survival 18
- << QVariant(false) // inf. attack 19
- << QVariant(false) // reset weps 20
- << QVariant(false) // per hog ammo 21
- << QVariant(false) // no wind 22
- << QVariant(false) // more wind 23
- << QVariant(false) // tag team 24
- << QVariant(false) // bottom border 25
- << QVariant(100) // damage modfier 26
- << QVariant(30) // turn time 27
- << QVariant(100) // init health 28
- << QVariant(15) // sudden death 29
- << QVariant(5) // case prob 30
- << QVariant(3) // mines time 31
- << QVariant(10) // mines number 32
- << QVariant(10) // mine dud pct 33
- << QVariant(10) // explosives 34
- << QVariant(35) // health case pct 35
- << QVariant(25) // health case amt 36
- << QVariant(47) // water rise amt 37
- << QVariant(5) // health dec amt 38
- << QVariant(100) // rope modfier 39
- << QVariant(100) // get away time 40
- ;
-
- QList<QVariant> forts;
- forts
- << predefSchemesNames[7] // name 0
- << QVariant(true) // fortsmode 1
- << QVariant(true) // team divide 2
- << QVariant(false) // solid land 3
- << QVariant(false) // border 4
- << QVariant(true) // low gravity 5
- << QVariant(false) // laser sight 6
- << QVariant(false) // invulnerable 7
- << QVariant(false) // reset health 8
- << QVariant(false) // vampiric 9
- << QVariant(false) // karma 10
- << QVariant(false) // artillery 11
- << QVariant(true) // random order 12
- << QVariant(false) // king 13
- << QVariant(false) // place hog 14
- << QVariant(false) // shared ammo 15
- << QVariant(false) // disable girders 16
- << QVariant(false) // disable land objects 17
- << QVariant(false) // AI survival 18
- << QVariant(false) // inf. attack 19
- << QVariant(false) // reset weps 20
- << QVariant(false) // per hog ammo 21
- << QVariant(false) // no wind 22
- << QVariant(false) // more wind 23
- << QVariant(false) // tag team 24
- << QVariant(false) // bottom border 25
- << QVariant(100) // damage modfier 26
- << QVariant(45) // turn time 27
- << QVariant(100) // init health 28
- << QVariant(15) // sudden death 29
- << QVariant(5) // case prob 30
- << QVariant(3) // mines time 31
- << QVariant(0) // mines number 32
- << QVariant(0) // mine dud pct 33
- << QVariant(0) // explosives 34
- << QVariant(35) // health case pct 35
- << QVariant(25) // health case amt 36
- << QVariant(47) // water rise amt 37
- << QVariant(5) // health dec amt 38
- << QVariant(100) // rope modfier 39
- << QVariant(100) // get away time 40
- ;
-
- QList<QVariant> timeless;
- timeless
- << predefSchemesNames[8] // name 0
- << QVariant(false) // fortsmode 1
- << QVariant(false) // team divide 2
- << QVariant(false) // solid land 3
- << QVariant(false) // border 4
- << QVariant(false) // low gravity 5
- << QVariant(false) // laser sight 6
- << QVariant(false) // invulnerable 7
- << QVariant(false) // reset health 8
- << QVariant(false) // vampiric 9
- << QVariant(false) // karma 10
- << QVariant(false) // artillery 11
- << QVariant(true) // random order 12
- << QVariant(false) // king 13
- << QVariant(false) // place hog 14
- << QVariant(false) // shared ammo 15
- << QVariant(false) // disable girders 16
- << QVariant(false) // disable land objects 17
- << QVariant(false) // AI survival 18
- << QVariant(false) // inf. attack 19
- << QVariant(false) // reset weps 20
- << QVariant(true) // per hog ammo 21
- << QVariant(false) // no wind 22
- << QVariant(false) // more wind 23
- << QVariant(false) // tag team 24
- << QVariant(false) // bottom border 25
- << QVariant(100) // damage modfier 26
- << QVariant(9999) // turn time 27
- << QVariant(100) // init health 28
- << QVariant(15) // sudden death 29
- << QVariant(5) // case prob 30
- << QVariant(3) // mines time 31
- << QVariant(5) // mines number 32
- << QVariant(10) // mine dud pct 33
- << QVariant(2) // explosives 34
- << QVariant(35) // health case pct 35
- << QVariant(30) // health case amt 36
- << QVariant(0) // water rise amt 37
- << QVariant(0) // health dec amt 38
- << QVariant(100) // rope modfier 39
- << QVariant(100) // get away time 40
- ;
-
- QList<QVariant> thinkingportals;
- thinkingportals
- << predefSchemesNames[9] // name 0
- << QVariant(false) // fortsmode 1
- << QVariant(false) // team divide 2
- << QVariant(false) // solid land 3
- << QVariant(false) // border 4
- << QVariant(false) // low gravity 5
- << QVariant(false) // laser sight 6
- << QVariant(false) // invulnerable 7
- << QVariant(false) // reset health 8
- << QVariant(false) // vampiric 9
- << QVariant(false) // karma 10
- << QVariant(true) // artillery 11
- << QVariant(true) // random order 12
- << QVariant(false) // king 13
- << QVariant(false) // place hog 14
- << QVariant(false) // shared ammo 15
- << QVariant(false) // disable girders 16
- << QVariant(false) // disable land objects 17
- << QVariant(false) // AI survival 18
- << QVariant(false) // inf. attack 19
- << QVariant(false) // reset weps 20
- << QVariant(false) // per hog ammo 21
- << QVariant(false) // no wind 22
- << QVariant(false) // more wind 23
- << QVariant(false) // tag team 24
- << QVariant(false) // bottom border 25
- << QVariant(100) // damage modfier 26
- << QVariant(45) // turn time 27
- << QVariant(100) // init health 28
- << QVariant(15) // sudden death 29
- << QVariant(2) // case prob 30
- << QVariant(3) // mines time 31
- << QVariant(5) // mines number 32
- << QVariant(0) // mine dud pct 33
- << QVariant(5) // explosives 34
- << QVariant(25) // health case pct 35
- << QVariant(25) // health case amt 36
- << QVariant(47) // water rise amt 37
- << QVariant(5) // health dec amt 38
- << QVariant(100) // rope modfier 39
- << QVariant(100) // get away time 40
- ;
-
- QList<QVariant> kingmode;
- kingmode
- << predefSchemesNames[10] // name 0
- << QVariant(false) // fortsmode 1
- << QVariant(false) // team divide 2
- << QVariant(false) // solid land 3
- << QVariant(false) // border 4
- << QVariant(false) // low gravity 5
- << QVariant(false) // laser sight 6
- << QVariant(false) // invulnerable 7
- << QVariant(false) // reset health 8
- << QVariant(false) // vampiric 9
- << QVariant(false) // karma 10
- << QVariant(false) // artillery 11
- << QVariant(true) // random order 12
- << QVariant(true) // king 13
- << QVariant(false) // place hog 14
- << QVariant(false) // shared ammo 15
- << QVariant(false) // disable girders 16
- << QVariant(false) // disable land objects 17
- << QVariant(false) // AI survival 18
- << QVariant(false) // inf. attack 19
- << QVariant(false) // reset weps 20
- << QVariant(false) // per hog ammo 21
- << QVariant(false) // no wind 22
- << QVariant(false) // more wind 23
- << QVariant(false) // tag team 24
- << QVariant(false) // bottom border 25
- << QVariant(100) // damage modfier 26
- << QVariant(45) // turn time 27
- << QVariant(100) // init health 28
- << QVariant(15) // sudden death 29
- << QVariant(5) // case prob 30
- << QVariant(3) // mines time 31
- << QVariant(4) // mines number 32
- << QVariant(0) // mine dud pct 33
- << QVariant(2) // explosives 34
- << QVariant(35) // health case pct 35
- << QVariant(25) // health case amt 36
- << QVariant(47) // water rise amt 37
- << QVariant(5) // health dec amt 38
- << QVariant(100) // rope modfier 39
- << QVariant(100) // get away time 40
- ;
-
-
- schemes.append(defaultScheme);
- schemes.append(proMode);
- schemes.append(shoppa);
- schemes.append(cleanslate);
- schemes.append(minefield);
- schemes.append(barrelmayhem);
- schemes.append(tunnelhogs);
- schemes.append(forts);
- schemes.append(timeless);
- schemes.append(thinkingportals);
- schemes.append(kingmode);
-
-
- int size = fileConfig.beginReadArray("schemes");
- for (int i = 0; i < size; ++i) {
- fileConfig.setArrayIndex(i);
-
- if (!predefSchemesNames.contains(fileConfig.value(spNames[0]).toString()))
- {
- QList<QVariant> scheme;
-
- for (int k = 0; k < spNames.size(); ++k)
- scheme << fileConfig.value(spNames[k], defaultScheme[k]);
-
- schemes.append(scheme);
- }
- }
- fileConfig.endArray();
-}
-
-QVariant AmmoSchemeModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
- Q_UNUSED(section);
- Q_UNUSED(orientation);
- Q_UNUSED(role);
-
- return QVariant();
-}
-
-int AmmoSchemeModel::rowCount(const QModelIndex &parent) const
-{
- if (parent.isValid())
- return 0;
- else
- return schemes.size();
-}
-
-int AmmoSchemeModel::columnCount(const QModelIndex & parent) const
-{
- if (parent.isValid())
- return 0;
- else
- return defaultScheme.size();
-}
-
-Qt::ItemFlags AmmoSchemeModel::flags(const QModelIndex & index) const
-{
- Q_UNUSED(index);
-
- return
- Qt::ItemIsEnabled
- | Qt::ItemIsSelectable
- | Qt::ItemIsEditable;
-}
-
-bool AmmoSchemeModel::setData(const QModelIndex & index, const QVariant & value, int role)
-{
- if (!index.isValid() || index.row() < numberOfDefaultSchemes
- || index.row() >= schemes.size()
- || index.column() >= defaultScheme.size()
- || role != Qt::EditRole)
- return false;
-
- schemes[index.row()][index.column()] = value;
-
- emit dataChanged(index, index);
- return true;
-}
-
-bool AmmoSchemeModel::insertRows(int row, int count, const QModelIndex & parent)
-{
- Q_UNUSED(count);
-
- beginInsertRows(parent, schemes.size(), schemes.size());
-
- if (row == -1)
- {
- QList<QVariant> newScheme = defaultScheme;
- newScheme[0] = QVariant(tr("new"));
- schemes.insert(schemes.size(), newScheme);
- }
- else
- {
- QList<QVariant> newScheme = schemes[row];
- newScheme[0] = QVariant(tr("copy of") + " " + newScheme[0].toString());
- schemes.insert(schemes.size(), newScheme);
- }
-
- endInsertRows();
-
- return true;
-}
-
-bool AmmoSchemeModel::removeRows(int row, int count, const QModelIndex & parent)
-{
- if(count != 1
- || row < numberOfDefaultSchemes
- || row >= schemes.size())
- return false;
-
- beginRemoveRows(parent, row, row);
-
- schemes.removeAt(row);
-
- endRemoveRows();
-
- return true;
-}
-
-QVariant AmmoSchemeModel::data(const QModelIndex &index, int role) const
-{
- if (!index.isValid() || index.row() < 0
- || index.row() >= schemes.size()
- || index.column() >= defaultScheme.size()
- || (role != Qt::EditRole && role != Qt::DisplayRole)
- )
- return QVariant();
-
- return schemes[index.row()][index.column()];
-}
-
-void AmmoSchemeModel::Save()
-{
- fileConfig.beginWriteArray("schemes", schemes.size() - numberOfDefaultSchemes);
-
- for (int i = 0; i < schemes.size() - numberOfDefaultSchemes; ++i) {
- fileConfig.setArrayIndex(i);
-
- QList<QVariant> scheme = schemes[i + numberOfDefaultSchemes];
-
- for (int k = 0; k < scheme.size(); ++k)
- fileConfig.setValue(spNames[k], scheme[k]);
- }
- fileConfig.endArray();
-}
-
-
-NetAmmoSchemeModel::NetAmmoSchemeModel(QObject * parent) :
- QAbstractTableModel(parent)
-{
- netScheme = defaultScheme;
-}
-
-QVariant NetAmmoSchemeModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
- Q_UNUSED(section);
- Q_UNUSED(orientation);
- Q_UNUSED(role);
-
- return QVariant();
-}
-
-int NetAmmoSchemeModel::rowCount(const QModelIndex & parent) const
-{
- if (parent.isValid())
- return 0;
- else
- return 1;
-}
-
-int NetAmmoSchemeModel::columnCount(const QModelIndex & parent) const
-{
- if (parent.isValid())
- return 0;
- else
- return defaultScheme.size();
-}
-
-QVariant NetAmmoSchemeModel::data(const QModelIndex &index, int role) const
-{
- if (!index.isValid() || index.row() < 0
- || index.row() > 1
- || index.column() >= defaultScheme.size()
- || (role != Qt::EditRole && role != Qt::DisplayRole)
- )
- return QVariant();
-
- return netScheme[index.column()];
-}
-
-void NetAmmoSchemeModel::setNetSchemeConfig(QStringList & cfg)
-{
- if(cfg.size() != netScheme.size())
- {
- qWarning("Incorrect scheme cfg size");
- return;
- }
-
- for(int i = 0; i < cfg.size(); ++i)
- netScheme[i] = QVariant(cfg[i]);
-
- reset();
-}
--- a/QTfrontend/ammoSchemeModel.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2005-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _AMMO_SCHEME_MODEL_INCLUDED
-#define _AMMO_SCHEME_MODEL_INCLUDED
-
-#include <QSettings>
-#include <QAbstractTableModel>
-#include <QStringList>
-#include <QList>
-
-class AmmoSchemeModel : public QAbstractTableModel
-{
- Q_OBJECT
-
-public:
- AmmoSchemeModel(QObject * parent, const QString & fileName);
-
- QVariant headerData(int section, Qt::Orientation orientation, int role) const;
- int rowCount(const QModelIndex & parent) const;
- int columnCount(const QModelIndex & parent) const;
- Qt::ItemFlags flags(const QModelIndex & index) const;
- bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole);
- bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex());
- bool removeRows(int row, int count, const QModelIndex & parent = QModelIndex());
- QVariant data(const QModelIndex &index, int role) const;
-
- int numberOfDefaultSchemes;
- QStringList predefSchemesNames;
- QStringList spNames;
-
-public slots:
- void Save();
-
-signals:
- void dataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight);
-
-protected:
- QList< QList<QVariant> > schemes;
-
-private:
- QSettings fileConfig;
-};
-
-class NetAmmoSchemeModel : public QAbstractTableModel
-{
- Q_OBJECT
-
-public:
- NetAmmoSchemeModel(QObject * parent);
-
- QVariant headerData(int section, Qt::Orientation orientation, int role) const;
- int rowCount(const QModelIndex & parent) const;
- int columnCount(const QModelIndex & parent) const;
- QVariant data(const QModelIndex &index, int role) const;
-
-public slots:
- void setNetSchemeConfig(QStringList & cfg);
-
-private:
- QList<QVariant> netScheme;
-};
-
-#endif // _AMMO_SCHEME_MODEL_INCLUDED
--- a/QTfrontend/bgwidget.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2009 Kristian Lehmann <email@thexception.net>
- * Copyright (c) 2009-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "bgwidget.h"
-
-SpritePosition::SpritePosition(QWidget * parent, int sh)
-{
- wParent = parent;
- iSpriteHeight = sh;
- reset();
-}
-
-SpritePosition::~SpritePosition()
-{
-}
-
-void SpritePosition::move()
-{
- fX += fXMov;
- fY += fYMov;
- iAngle += 4;
- if (iAngle >= 360) iAngle = 0;
- if (fY > wParent->height()) reset();
-}
-
-void SpritePosition::reset()
-{
- fY = -1 * iSpriteHeight;
- fX = (qrand() % ((int)(wParent->width() * 1.5))) - wParent->width()/2;
- fYMov = ((qrand() % 400)+300) / 100.0f;
- fXMov = fYMov * 0.2f+((qrand()%100)/100.0f * 0.6f); //so between 0.2 and 0.6, or 0.5 +/- 0.3
- iAngle = qrand() % 360;
-}
-
-QPoint SpritePosition::pos()
-{
- return QPoint((int)fX,(int)fY);
-}
-
-int SpritePosition::getAngle()
-{
- return iAngle;
-}
-
-void SpritePosition::init()
-{
- fY = qrand() % (wParent->height() + 1);
- fX = qrand() % (wParent->width() + 1);
-}
-
-BGWidget::BGWidget(QWidget * parent) : QWidget(parent)
-{
- setAttribute(Qt::WA_NoSystemBackground, true);
- sprite.load(":/res/Star.png");
-
- setAutoFillBackground(false);
-
- for (int i = 0; i < SPRITE_MAX; i++) spritePositions[i] = new SpritePosition(this, sprite.height());
-
- for (int i = 0; i < 360; i++)
- {
- rotatedSprites[i] = new QImage(sprite.width(), sprite.height(), QImage::Format_ARGB32);
- rotatedSprites[i]->fill(0);
-
- QPoint translate(sprite.width()/2, sprite.height()/2);
-
- QPainter p;
- p.begin(rotatedSprites[i]);
- // p.setRenderHint(QPainter::Antialiasing);
- p.setRenderHint(QPainter::SmoothPixmapTransform);
- p.translate(translate.x(), translate.y());
- p.rotate(i);
- p.translate(-1*translate.x(), -1*translate.y());
- p.drawImage(0, 0, sprite);
- }
-
- timerAnimation = new QTimer();
- connect(timerAnimation, SIGNAL(timeout()), this, SLOT(animate()));
- timerAnimation->setInterval(ANIMATION_INTERVAL);
-}
-
-BGWidget::~BGWidget()
-{
- for (int i = 0; i < SPRITE_MAX; i++) delete spritePositions[i];
- for (int i = 0; i < 360; i++) delete rotatedSprites[i];
- delete timerAnimation;
-}
-
-void BGWidget::paintEvent(QPaintEvent *event)
-{
- Q_UNUSED(event);
-
- QPainter p;
- p.begin(this);
- //p.setRenderHint(QPainter::Antialiasing);
- for (int i = 0; i < SPRITE_MAX; i++)
- {
- QPoint point = spritePositions[i]->pos();
- p.drawImage(point.x(), point.y(), *rotatedSprites[spritePositions[i]->getAngle()]);
- }
- p.end();
-}
-
-void BGWidget::animate()
-{
- for (int i = 0; i < SPRITE_MAX; i++)
- {
- // bottom edge of star *seems* clipped, but in fact, if I switch to just plain old repaint()/update() it is still clipped - artifact of transform? As for 5, is arbitrary number. 4 was noticeably clipping, 5 seemed same as update() - I assume extra room is due to rotation and value really should be calculated proportional to width/height
- update(spritePositions[i]->pos().x(),spritePositions[i]->pos().y(), sprite.width()+5, sprite.height()+5);
- spritePositions[i]->move();
- }
-}
-
-void BGWidget::startAnimation()
-{
- timerAnimation->start();
-}
-
-void BGWidget::stopAnimation()
-{
- timerAnimation->stop();
-}
-
-void BGWidget::init()
-{
- for (int i = 0; i < SPRITE_MAX; i++) spritePositions[i]->init();
-}
--- a/QTfrontend/bgwidget.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2009 Kristian Lehmann <email@thexception.net>
- * Copyright (c) 2009-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef BGWIDGET_H
-#define BGWIDGET_H
-
-#include <QWidget>
-//#include <QGLWidget>
-#include <QPainter>
-#include <QTimer>
-#include <QPaintEvent>
-#include <QTime>
-#include <QPoint>
-
-#define SPRITE_MAX 12
-
-#define ANIMATION_INTERVAL 40
-
-class SpritePosition
-{
-public:
- SpritePosition(QWidget * parent, int sh);
- ~SpritePosition();
-private:
- float fX;
- float fY;
- float fXMov;
- float fYMov;
- int iAngle;
- QWidget * wParent;
- int iSpriteHeight;
-public:
- void move();
- void reset();
- QPoint pos();
- int getAngle();
- void init();
-};
-
-class BGWidget : public QWidget
-{
- Q_OBJECT
-public:
- BGWidget(QWidget * parent);
- ~BGWidget();
- void startAnimation();
- void stopAnimation();
- void init();
-private:
- QImage sprite;
- QTimer * timerAnimation;
- SpritePosition * spritePositions[SPRITE_MAX];
- QImage * rotatedSprites[360];
-protected:
- void paintEvent(QPaintEvent * event);
-private slots:
- void animate();
-};
-
-#endif // BGWIDGET_H
--- a/QTfrontend/binds.cpp Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/binds.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -62,9 +62,7 @@
{"confirm", "y", QT_TRANSLATE_NOOP("binds", "confirmation"), NULL, NULL},
{"+voldown", "9", QT_TRANSLATE_NOOP("binds", "volume down"), NULL, QT_TRANSLATE_NOOP("binds (descriptions)", "Modify the game's volume while playing:")},
{"+volup", "0", QT_TRANSLATE_NOOP("binds", "volume up"), NULL, NULL},
-#ifndef _WIN32
{"fullscr", "f12", QT_TRANSLATE_NOOP("binds", "change mode"), NULL, QT_TRANSLATE_NOOP("binds (descriptions)", "Toggle fullscreen mode:")},
-#endif
{"capture", "c", QT_TRANSLATE_NOOP("binds", "capture"), NULL, QT_TRANSLATE_NOOP("binds (descriptions)", "Take a screenshot:")},
{"rotmask", "delete", QT_TRANSLATE_NOOP("binds", "hedgehogs\ninfo"), NULL, QT_TRANSLATE_NOOP("binds (descriptions)", "Toggle labels above hedgehogs:")}
};
--- a/QTfrontend/binds.h Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/binds.h Sat Oct 08 16:54:56 2011 +0200
@@ -21,11 +21,7 @@
#include <QString>
-#ifdef _WIN32
-#define BINDS_NUMBER 43
-#else
#define BINDS_NUMBER 44
-#endif
struct BindAction
{
--- a/QTfrontend/chatwidget.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,573 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QDesktopServices>
-#include <QTextBrowser>
-#include <QLineEdit>
-#include <QAction>
-#include <QTextDocument>
-#include <QDir>
-#include <QSettings>
-#include <QFile>
-#include <QTextStream>
-#include <QMenu>
-#include <QCursor>
-#include <QScrollBar>
-#include <QItemSelectionModel>
-
-#include "hwconsts.h"
-#include "SDLs.h"
-#include "gameuiconfig.h"
-#include "chatwidget.h"
-
-ListWidgetNickItem::ListWidgetNickItem(const QString& nick, bool isFriend, bool isIgnored) : QListWidgetItem(nick)
-{
- this->aFriend = isFriend;
- this->isIgnored = isIgnored;
-}
-
-void ListWidgetNickItem::setFriend(bool isFriend)
-{
- this->aFriend = isFriend;
-}
-
-void ListWidgetNickItem::setIgnored(bool isIgnored)
-{
- this->isIgnored = isIgnored;
-}
-
-bool ListWidgetNickItem::isFriend()
-{
- return aFriend;
-}
-
-bool ListWidgetNickItem::ignored()
-{
- return isIgnored;
-}
-
-bool ListWidgetNickItem::operator< (const QListWidgetItem & other) const
-{
- // case in-sensitive comparison of the associated strings
- // chars that are no letters are sorted at the end of the list
-
- ListWidgetNickItem otherNick = const_cast<ListWidgetNickItem &>(dynamic_cast<const ListWidgetNickItem &>(other));
-
- // ignored always down
- if (isIgnored != otherNick.ignored())
- return !isIgnored;
-
- // friends always up
- if (aFriend != otherNick.isFriend())
- return aFriend;
-
- QString txt1 = text().toLower();
- QString txt2 = other.text().toLower();
-
- bool firstIsShorter = (txt1.size() < txt2.size());
- int len = firstIsShorter?txt1.size():txt2.size();
-
- for (int i = 0; i < len; i++)
- {
- if (txt1[i] == txt2[i])
- continue;
- if (txt1[i].isLetter() != txt2[i].isLetter())
- return txt1[i].isLetter();
- return (txt1[i] < txt2[i]);
- }
-
- return firstIsShorter;
-}
-
-const char* HWChatWidget::STYLE =
-"\
-a { color:#c8c8ff; }\
-.nick { text-decoration: none; }\
-.UserChat .nick { color:#ffec20; }\
-.FriendChat { color: #08e008; }\
-.FriendChat .nick { color: #20ff20; }\
-.UserJoin { color: #c0c0c0; }\
-.UserJoin .nick { color: #d0d0d0; }\
-.FriendJoin { color: #c0e0c0; }\
-.FriendJoin .nick { color: #d0f0d0; }\
-.UserAction { color: #ff80ff; }\
-.UserAction .nick { color: #ffa0ff; }\
-.FriendAction { color: #ff00ff; }\
-.FriendAction .nick { color: #ff30ff; }\
-";
-
-HWChatWidget::HWChatWidget(QWidget* parent, QSettings * gameSettings, SDLInteraction * sdli, bool notify) :
- QWidget(parent),
- mainLayout(this)
-{
- this->gameSettings = gameSettings;
- this->sdli = sdli;
- this->notify = notify;
- if(notify && gameSettings->value("frontend/sound", true).toBool()) {
- QFile tmpfile;
- sdli->SDLMusicInit();
- for(int i=0;i<4;i++) {
- tmpfile.setFileName(cfgdir->absolutePath() + "/Data/Sounds/voices/Classic/Hello.ogg");
- if (tmpfile.exists()) sound[i] = Mix_LoadWAV(QFileInfo(tmpfile).absoluteFilePath().toLocal8Bit().constData());
- else sound[i] = Mix_LoadWAV(QString(datadir->absolutePath() +
- "/Sounds/voices/Classic/Hello.ogg").toLocal8Bit().constData());
- }
- }
-
- mainLayout.setSpacing(1);
- mainLayout.setMargin(1);
- mainLayout.setSizeConstraint(QLayout::SetMinimumSize);
- mainLayout.setColumnStretch(0, 76);
- mainLayout.setColumnStretch(1, 24);
-
- chatEditLine = new QLineEdit(this);
- chatEditLine->setMaxLength(300);
- connect(chatEditLine, SIGNAL(returnPressed()), this, SLOT(returnPressed()));
-
- mainLayout.addWidget(chatEditLine, 2, 0);
-
- chatText = new QTextBrowser(this);
- chatText->document()->setDefaultStyleSheet(STYLE);
- chatText->setMinimumHeight(20);
- chatText->setMinimumWidth(10);
- chatText->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- chatText->setOpenLinks(false);
- connect(chatText, SIGNAL(anchorClicked(const QUrl&)),
- this, SLOT(linkClicked(const QUrl&)));
- mainLayout.addWidget(chatText, 0, 0, 2, 1);
-
- chatNicks = new QListWidget(this);
- chatNicks->setMinimumHeight(10);
- chatNicks->setMinimumWidth(10);
- chatNicks->setSortingEnabled(true);
- chatNicks->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- chatNicks->setContextMenuPolicy(Qt::ActionsContextMenu);
- connect(chatNicks, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
- this, SLOT(chatNickDoubleClicked(QListWidgetItem *)));
- connect(chatNicks, SIGNAL(currentRowChanged(int)),
- this, SLOT(chatNickSelected(int)));
-
- mainLayout.addWidget(chatNicks, 0, 1, 3, 1);
-
- acInfo = new QAction(QAction::tr("Info"), chatNicks);
- acInfo->setIcon(QIcon(":/res/info.png"));
- connect(acInfo, SIGNAL(triggered(bool)), this, SLOT(onInfo()));
- acKick = new QAction(QAction::tr("Kick"), chatNicks);
- acKick->setIcon(QIcon(":/res/kick.png"));
- connect(acKick, SIGNAL(triggered(bool)), this, SLOT(onKick()));
- acBan = new QAction(QAction::tr("Ban"), chatNicks);
- acBan->setIcon(QIcon(":/res/ban.png"));
- connect(acBan, SIGNAL(triggered(bool)), this, SLOT(onBan()));
- acFollow = new QAction(QAction::tr("Follow"), chatNicks);
- acFollow->setIcon(QIcon(":/res/follow.png"));
- connect(acFollow, SIGNAL(triggered(bool)), this, SLOT(onFollow()));
- acIgnore = new QAction(QAction::tr("Ignore"), chatNicks);
- acIgnore->setIcon(QIcon(":/res/ignore.png"));
- connect(acIgnore, SIGNAL(triggered(bool)), this, SLOT(onIgnore()));
- acFriend = new QAction(QAction::tr("Add friend"), chatNicks);
- acFriend->setIcon(QIcon(":/res/addfriend.png"));
- connect(acFriend, SIGNAL(triggered(bool)), this, SLOT(onFriend()));
-
- chatNicks->insertAction(0, acFriend);
- chatNicks->insertAction(0, acInfo);
- chatNicks->insertAction(0, acIgnore);
-
- showReady = false;
- setShowFollow(true);
-}
-
-void HWChatWidget::linkClicked(const QUrl & link)
-{
- if (link.scheme() == "http")
- QDesktopServices::openUrl(link);
- if (link.scheme() == "hwnick")
- {
- // decode nick
- const QString& nick = QString::fromUtf8(QByteArray::fromBase64(link.encodedQuery()));
- QList<QListWidgetItem *> items = chatNicks->findItems(nick, Qt::MatchExactly);
- if (items.size() < 1)
- return;
- QMenu * popup = new QMenu();
- // selecting an item will automatically scroll there, so let's save old position
- QScrollBar * scrollBar = chatNicks->verticalScrollBar();
- int oldScrollPos = scrollBar->sliderPosition();
- // select the nick which we want to see the actions for
- chatNicks->setCurrentItem(items[0], QItemSelectionModel::Clear);
- // selecting an item will automatically scroll there, so let's save old position
- scrollBar->setSliderPosition(oldScrollPos);
- // load actions
- popup->addActions(chatNicks->actions());
- // display menu popup at mouse cursor position
- popup->popup(QCursor::pos());
- }
-}
-
-void HWChatWidget::setShowFollow(bool enabled)
-{
- if (enabled) {
- if (!(chatNicks->actions().contains(acFollow)))
- chatNicks->insertAction(acFriend, acFollow);
- }
- else {
- if (chatNicks->actions().contains(acFollow))
- chatNicks->removeAction(acFollow);
- }
-}
-
-void HWChatWidget::loadList(QStringList & list, const QString & file)
-{
- list.clear();
- QFile txt(cfgdir->absolutePath() + "/" + file);
- if(!txt.open(QIODevice::ReadOnly))
- return;
- QTextStream stream(&txt);
- stream.setCodec("UTF-8");
-
- while(!stream.atEnd())
- {
- QString str = stream.readLine();
- if(str.startsWith(";") || str.length() == 0)
- continue;
- list << str.trimmed();
- }
- //readd once we require newer Qt than 4.4
- //list.removeDuplicates();
- txt.close();
-}
-
-void HWChatWidget::saveList(QStringList & list, const QString & file)
-{
- QFile txt(cfgdir->absolutePath() + "/" + file);
- if(!txt.open(QIODevice::WriteOnly | QIODevice::Truncate))
- return;
- QTextStream stream(&txt);
- stream.setCodec("UTF-8");
-
- stream << "; this list is used by Hedgewars - do not edit it unless you know what you're doing!" << endl;
- for(int i = 0; i < list.size(); i++)
- stream << list[i] << endl;
- txt.close();
-}
-
-void HWChatWidget::updateNickItem(QListWidgetItem *nickItem)
-{
- QString nick = nickItem->text();
- ListWidgetNickItem * item = dynamic_cast<ListWidgetNickItem*>(nickItem);
-
- item->setFriend(friendsList.contains(nick, Qt::CaseInsensitive));
- item->setIgnored(ignoreList.contains(nick, Qt::CaseInsensitive));
-
- if(item->ignored())
- {
- item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_ignore_on.png" : ":/res/chat_ignore_off.png") : ":/res/chat_ignore.png"));
- item->setForeground(Qt::gray);
- }
- else if(item->isFriend())
- {
- item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_friend_on.png" : ":/res/chat_friend_off.png") : ":/res/chat_friend.png"));
- item->setForeground(Qt::green);
- }
- else
- {
- item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_default_on.png" : ":/res/chat_default_off.png") : ":/res/chat_default.png"));
- item->setForeground(QBrush(QColor(0xff, 0xcc, 0x00)));
- }
-}
-
-void HWChatWidget::updateNickItems()
-{
- for(int i = 0; i < chatNicks->count(); i++)
- updateNickItem(chatNicks->item(i));
-
- chatNicks->sortItems();
-}
-
-void HWChatWidget::loadLists(const QString & nick)
-{
- loadList(ignoreList, nick.toLower() + "_ignore.txt");
- loadList(friendsList, nick.toLower() + "_friends.txt");
- updateNickItems();
-}
-
-void HWChatWidget::saveLists(const QString & nick)
-{
- saveList(ignoreList, nick.toLower() + "_ignore.txt");
- saveList(friendsList, nick.toLower() + "_friends.txt");
-}
-
-void HWChatWidget::returnPressed()
-{
- emit chatLine(chatEditLine->text());
- chatEditLine->clear();
-}
-
-
-void HWChatWidget::onChatString(const QString& str)
-{
- onChatString("", str);
-}
-
-const QRegExp HWChatWidget::URLREGEXP = QRegExp("(http://)?(www\\.)?(hedgewars\\.org(/[^ ]*)?)");
-
-void HWChatWidget::onChatString(const QString& nick, const QString& str)
-{
- bool isFriend = false;
-
- if (!nick.isEmpty()) {
- // don't show chat lines that are from ignored nicks
- if (ignoreList.contains(nick, Qt::CaseInsensitive))
- return;
- // friends will get special treatment, of course
- isFriend = friendsList.contains(nick, Qt::CaseInsensitive);
- }
-
- if (chatStrings.size() > 250)
- chatStrings.removeFirst();
-
- QString formattedStr = Qt::escape(str.mid(1));
- // make hedgewars.org urls actual links
- formattedStr = formattedStr.replace(URLREGEXP, "<a href=\"http://\\3\">\\3</a>");
-
- // "link" nick, but before that encode it in base64 to make sure it can't intefere with html/url syntax
- // the nick is put as querystring as putting it as host would convert it to it's lower case variant
- if(!nick.isEmpty())
- formattedStr.replace("|nick|",QString("<a href=\"hwnick://?%1\" class=\"nick\">%2</a>").arg(QString(nick.toUtf8().toBase64())).arg(nick));
-
- QString cssClass("UserChat");
-
- // check first character for color code and set color properly
- switch (str[0].toAscii()) {
- case 3:
- cssClass = (isFriend ? "FriendJoin" : "UserJoin");
- break;
- case 2:
- cssClass = (isFriend ? "FriendAction" : "UserAction");
- break;
- default:
- if (isFriend)
- cssClass = "FriendChat";
- }
-
- formattedStr = QString("<span class=\"%2\">%1</span>").arg(formattedStr).arg(cssClass);
-
- chatStrings.append(formattedStr);
-
- chatText->setHtml(chatStrings.join("<br>"));
-
- chatText->moveCursor(QTextCursor::End);
-}
-
-void HWChatWidget::onServerMessage(const QString& str)
-{
- if (chatStrings.size() > 250)
- chatStrings.removeFirst();
-
- chatStrings.append("<hr>" + str + "<hr>");
-
- chatText->setHtml(chatStrings.join("<br>"));
-
- chatText->moveCursor(QTextCursor::End);
-}
-
-void HWChatWidget::nickAdded(const QString& nick, bool notifyNick)
-{
- QListWidgetItem * item = new ListWidgetNickItem(nick, friendsList.contains(nick, Qt::CaseInsensitive), ignoreList.contains(nick, Qt::CaseInsensitive));
- updateNickItem(item);
- chatNicks->addItem(item);
-
- emit nickCountUpdate(chatNicks->count());
-
- if(notifyNick && notify && gameSettings->value("frontend/sound", true).toBool()) {
- Mix_PlayChannel(-1, sound[rand()%4], 0);
- }
-}
-
-void HWChatWidget::nickRemoved(const QString& nick)
-{
- foreach(QListWidgetItem * item, chatNicks->findItems(nick, Qt::MatchExactly))
- chatNicks->takeItem(chatNicks->row(item));
-
- emit nickCountUpdate(chatNicks->count());
-}
-
-void HWChatWidget::clear()
-{
- chatText->clear();
- chatStrings.clear();
- chatNicks->clear();
-}
-
-void HWChatWidget::onKick()
-{
- QListWidgetItem * curritem = chatNicks->currentItem();
- if (curritem)
- emit kick(curritem->text());
-}
-
-void HWChatWidget::onBan()
-{
- QListWidgetItem * curritem = chatNicks->currentItem();
- if (curritem)
- emit ban(curritem->text());
-}
-
-void HWChatWidget::onInfo()
-{
- QListWidgetItem * curritem = chatNicks->currentItem();
- if (curritem)
- emit info(curritem->text());
-}
-
-void HWChatWidget::onFollow()
-{
- QListWidgetItem * curritem = chatNicks->currentItem();
- if (curritem)
- emit follow(curritem->text());
-}
-
-void HWChatWidget::onIgnore()
-{
- QListWidgetItem * curritem = chatNicks->currentItem();
- if(!curritem)
- return;
-
- if(ignoreList.contains(curritem->text(), Qt::CaseInsensitive)) // already on list - remove him
- {
- ignoreList.removeAll(curritem->text().toLower());
- onChatString(HWChatWidget::tr("%1 *** %2 has been removed from your ignore list").arg('\x03').arg(curritem->text()));
- }
- else // not on list - add
- {
- // don't consider ignored people friends
- if(friendsList.contains(curritem->text(), Qt::CaseInsensitive))
- emit onFriend();
-
- // scroll down on first ignore added so that people see where that nick went to
- if (ignoreList.isEmpty())
- chatNicks->scrollToBottom();
-
- ignoreList << curritem->text().toLower();
- onChatString(HWChatWidget::tr("%1 *** %2 has been added to your ignore list").arg('\x03').arg(curritem->text()));
- }
- updateNickItem(curritem); // update icon/sort order/etc
- chatNicks->sortItems();
- chatNickSelected(0); // update context menu
-}
-
-void HWChatWidget::onFriend()
-{
- QListWidgetItem * curritem = chatNicks->currentItem();
- if(!curritem)
- return;
-
- if(friendsList.contains(curritem->text(), Qt::CaseInsensitive)) // already on list - remove him
- {
- friendsList.removeAll(curritem->text().toLower());
- onChatString(HWChatWidget::tr("%1 *** %2 has been removed from your friends list").arg('\x03').arg(curritem->text()));
- }
- else // not on list - add
- {
- // don't ignore the new friend
- if(ignoreList.contains(curritem->text(), Qt::CaseInsensitive))
- emit onIgnore();
-
- // scroll up on first friend added so that people see where that nick went to
- if (friendsList.isEmpty())
- chatNicks->scrollToTop();
-
- friendsList << curritem->text().toLower();
- onChatString(HWChatWidget::tr("%1 *** %2 has been added to your friends list").arg('\x03').arg(curritem->text()));
- }
- updateNickItem(curritem); // update icon/sort order/etc
- chatNicks->sortItems();
- chatNickSelected(0); // update context menu
-}
-
-void HWChatWidget::chatNickDoubleClicked(QListWidgetItem * item)
-{
- Q_UNUSED(item);
-
- QList<QAction *> actions = chatNicks->actions();
- actions.first()->activate(QAction::Trigger);
-}
-
-void HWChatWidget::chatNickSelected(int index)
-{
- Q_UNUSED(index);
-
- QListWidgetItem* item = chatNicks->currentItem();
- if (!item)
- return;
-
- // update context menu labels according to possible action
- if(ignoreList.contains(item->text(), Qt::CaseInsensitive))
- {
- acIgnore->setText(QAction::tr("Unignore"));
- acIgnore->setIcon(QIcon(":/res/unignore.png"));
- }
- else
- {
- acIgnore->setText(QAction::tr("Ignore"));
- acIgnore->setIcon(QIcon(":/res/ignore.png"));
- }
-
- if(friendsList.contains(item->text(), Qt::CaseInsensitive))
- {
- acFriend->setText(QAction::tr("Remove friend"));
- acFriend->setIcon(QIcon(":/res/remfriend.png"));
- }
- else
- {
- acFriend->setText(QAction::tr("Add friend"));
- acFriend->setIcon(QIcon(":/res/addfriend.png"));
- }
-}
-
-void HWChatWidget::setShowReady(bool s)
-{
- showReady = s;
-}
-
-void HWChatWidget::setReadyStatus(const QString & nick, bool isReady)
-{
- QList<QListWidgetItem *> items = chatNicks->findItems(nick, Qt::MatchExactly);
- if (items.size() != 1)
- {
- qWarning("Bug: cannot find user in chat");
- return;
- }
-
- items[0]->setData(Qt::UserRole, isReady); // bulb status
- updateNickItem(items[0]);
-
- // ensure we're still showing the status bulbs
- showReady = true;
-}
-
-void HWChatWidget::adminAccess(bool b)
-{
- chatNicks->removeAction(acKick);
- chatNicks->removeAction(acBan);
-
- if(b)
- {
- chatNicks->insertAction(0, acKick);
-// chatNicks->insertAction(0, acBan);
- }
-}
--- a/QTfrontend/chatwidget.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _CHAT_WIDGET_INCLUDED
-#define _CHAT_WIDGET_INCLUDED
-
-#include <QWidget>
-#include <QListWidget>
-#include <QString>
-#include <QGridLayout>
-#include <QRegExp>
-
-#include "SDLs.h"
-
-class ListWidgetNickItem;
-class QTextBrowser;
-class QLineEdit;
-class QListWidget;
-class QSettings;
-class SDLInteraction;
-
-// this class is for custom nick sorting
-class ListWidgetNickItem : public QListWidgetItem
-{
-public:
- ListWidgetNickItem(const QString& nick, bool isFriend, bool isIgnored);
- bool operator<(const QListWidgetItem & other) const;
- void setFriend(bool isFriend);
- void setIgnored(bool isIgnored);
- bool isFriend();
- bool ignored();
-
-private:
- bool aFriend;
- bool isIgnored;
-};
-
-class HWChatWidget : public QWidget
-{
- Q_OBJECT
-
- public:
- HWChatWidget(QWidget* parent, QSettings * gameSettings, SDLInteraction * sdli, bool notify);
- void loadLists(const QString & nick);
- void saveLists(const QString & nick);
- void setShowReady(bool s);
- void setShowFollow(bool enabled);
- static const char* STYLE;
- QStringList ignoreList, friendsList;
-
-private:
- void loadList(QStringList & list, const QString & file);
- void saveList(QStringList & list, const QString & file);
- void updateNickItem(QListWidgetItem *item);
- void updateNickItems();
- static const QRegExp URLREGEXP;
-
- public slots:
- void onChatString(const QString& str);
- void onChatString(const QString& nick, const QString& str);
- void onServerMessage(const QString& str);
- void nickAdded(const QString& nick, bool notifyNick);
- void nickRemoved(const QString& nick);
- void clear();
- void setReadyStatus(const QString & nick, bool isReady);
- void adminAccess(bool);
-
- signals:
- void chatLine(const QString& str);
- void kick(const QString & str);
- void ban(const QString & str);
- void info(const QString & str);
- void follow(const QString &);
- void nickCountUpdate(int cnt);
-
- private:
- QGridLayout mainLayout;
- QTextBrowser* chatText;
- QStringList chatStrings;
- QListWidget* chatNicks;
- QLineEdit* chatEditLine;
- QAction * acInfo;
- QAction * acKick;
- QAction * acBan;
- QAction * acFollow;
- QAction * acIgnore;
- QAction * acFriend;
- QSettings * gameSettings;
- SDLInteraction * sdli;
- Mix_Chunk *sound[4];
- bool notify;
- bool showReady;
-
- private slots:
- void returnPressed();
- void onBan();
- void onKick();
- void onInfo();
- void onFollow();
- void onIgnore();
- void onFriend();
- void chatNickDoubleClicked(QListWidgetItem * item);
- void chatNickSelected(int index);
- void linkClicked(const QUrl & link);
-};
-
-#endif // _CHAT_WIDGET_INCLUDED
--- a/QTfrontend/databrowser.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QDebug>
-#include <QUrl>
-
-#include "databrowser.h"
-
-const QNetworkRequest::Attribute typeAttribute = (QNetworkRequest::Attribute)(QNetworkRequest::User + 1);
-const QNetworkRequest::Attribute urlAttribute = (QNetworkRequest::Attribute)(QNetworkRequest::User + 2);
-
-DataBrowser::DataBrowser(QWidget *parent) :
- QTextBrowser(parent)
-{
-
- manager = new QNetworkAccessManager(this);
-}
-
-QVariant DataBrowser::loadResource(int type, const QUrl & name)
-{
- if(type == QTextDocument::ImageResource || type == QTextDocument::StyleSheetResource)
- {
- if(resources.contains(name.toString()))
- {
- return resources.take(name.toString());
- }
- else
- if(!requestedResources.contains(name.toString()))
- {
- qDebug() << "Requesting resource" << name.toString();
- requestedResources.insert(name.toString());
-
- QNetworkRequest newRequest(QUrl("http://www.hedgewars.org" + name.toString()));
- newRequest.setAttribute(typeAttribute, type);
- newRequest.setAttribute(urlAttribute, name);
-
- QNetworkReply *reply = manager->get(newRequest);
- connect(reply, SIGNAL(finished()), this, SLOT(resourceDownloaded()));
- }
- }
-
- return QVariant();
-}
-
-void DataBrowser::resourceDownloaded()
-{
- QNetworkReply * reply = qobject_cast<QNetworkReply *>(sender());
-
- if(reply)
- {
- int type = reply->request().attribute(typeAttribute).toInt();
- QUrl url = reply->request().attribute(urlAttribute).toUrl();
- resources.insert(url.toString(), reply->readAll());
- document()->addResource(type, reply->request().url(), QVariant());
- update();
- }
-}
--- a/QTfrontend/databrowser.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#ifndef DATABROWSER_H
-#define DATABROWSER_H
-
-#include <QTextBrowser>
-#include <QSet>
-
-class QNetworkAccessManager;
-
-class DataBrowser : public QTextBrowser
-{
- Q_OBJECT
-public:
- explicit DataBrowser(QWidget *parent = 0);
-
-signals:
-
-public slots:
-
-private:
- QNetworkAccessManager *manager;
-
- // hash and set of QString instead of QUrl to support Qt versions
- // older than 4.7 (those have no support for qHash(const QUrl &))
- QHash<QString, QByteArray> resources;
- QSet<QString> requestedResources;
-
- QVariant loadResource(int type, const QUrl & name);
-
-private slots:
- void resourceDownloaded();
-};
-
-#endif // DATABROWSER_H
--- a/QTfrontend/drawmapscene.cpp Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/drawmapscene.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -108,11 +108,32 @@
emit pathChanged();
}
+ else if(oldItems.size())
+ {
+ while(oldItems.size())
+ addItem(oldItems.takeFirst());
+ paths = oldPaths;
+
+ emit pathChanged();
+ }
}
void DrawMapScene::clearMap()
{
- clear();
+ // don't clear if already cleared
+ if(!items().size())
+ return;
+
+ oldItems.clear();
+
+ // do this since clear() would _destroy_ all items
+ while(items().size()) {
+ oldItems.push_front(items().first());
+ removeItem(items().first());
+ }
+
+ oldPaths = paths;
+
paths.clear();
emit pathChanged();
@@ -146,6 +167,8 @@
void DrawMapScene::decode(QByteArray data)
{
+ oldItems.clear();
+ oldPaths.clear();
clear();
paths.clear();
--- a/QTfrontend/drawmapscene.h Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/drawmapscene.h Sat Oct 08 16:54:56 2011 +0200
@@ -48,6 +48,8 @@
QBrush m_brush;
QGraphicsPathItem * m_currPath;
Paths paths;
+ Paths oldPaths;
+ QList<QGraphicsItem *> oldItems;
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * mouseEvent);
virtual void mousePressEvent(QGraphicsSceneMouseEvent * mouseEvent);
--- a/QTfrontend/drawmapwidget.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QFile>
-#include <QMessageBox>
-#include <QEvent>
-
-#include "drawmapwidget.h"
-
-DrawMapWidget::DrawMapWidget(QWidget *parent) :
- QWidget(parent),
- ui(new Ui::DrawMapWidget)
-{
- ui->setupUi(this);
-
- m_scene = 0;
-}
-
-DrawMapWidget::~DrawMapWidget()
-{
- delete ui;
-}
-
-void DrawMapWidget::changeEvent(QEvent *e)
-{
- QWidget::changeEvent(e);
- switch (e->type()) {
- case QEvent::LanguageChange:
- ui->retranslateUi(this);
- break;
- default:
- break;
- }
-}
-
-void DrawMapWidget::setScene(DrawMapScene * scene)
-{
- ui->graphicsView->setScene(scene);
- m_scene = scene;
-}
-
-void DrawMapWidget::resizeEvent(QResizeEvent * event)
-{
- Q_UNUSED(event);
-
- if(ui->graphicsView && ui->graphicsView->scene())
- ui->graphicsView->fitInView(ui->graphicsView->scene()->sceneRect(), Qt::KeepAspectRatio);
-}
-
-void DrawMapWidget::showEvent(QShowEvent * event)
-{
- Q_UNUSED(event);
-
- resizeEvent(0);
-}
-
-void DrawMapWidget::undo()
-{
- if(m_scene) m_scene->undo();
-}
-
-void DrawMapWidget::clear()
-{
- if(m_scene) m_scene->clearMap();
-}
-
-void DrawMapWidget::save(const QString & fileName)
-{
- if(m_scene)
- {
- QFile file(fileName);
-
- if(!file.open(QIODevice::WriteOnly))
- QMessageBox::warning(this, tr("File error"), tr("Cannot open file '%1' for writing").arg(fileName));
- else
- file.write(qCompress(m_scene->encode()).toBase64());
- }
-}
-
-void DrawMapWidget::load(const QString & fileName)
-{
- if(m_scene)
- {
- QFile f(fileName);
-
- if(!f.open(QIODevice::ReadOnly))
- QMessageBox::warning(this, tr("File error"), tr("Cannot read file '%1'").arg(fileName));
- else
- m_scene->decode(qUncompress(QByteArray::fromBase64(f.readAll())));
- }
-}
--- a/QTfrontend/drawmapwidget.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef DRAWMAPWIDGET_H
-#define DRAWMAPWIDGET_H
-
-#include <QWidget>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QGraphicsView>
-
-#include "qaspectratiolayout.h"
-#include "drawmapscene.h"
-
-namespace Ui {
- class Ui_DrawMapWidget
- {
- public:
- QGraphicsView *graphicsView;
-
- void setupUi(QWidget *drawMapWidget)
- {
- QAspectRatioLayout * arLayout = new QAspectRatioLayout(drawMapWidget);
- arLayout->setMargin(0);
-
- graphicsView = new QGraphicsView(drawMapWidget);
- arLayout->addWidget(graphicsView);
-
- retranslateUi(drawMapWidget);
-
- QMetaObject::connectSlotsByName(drawMapWidget);
- } // setupUi
-
- void retranslateUi(QWidget *drawMapWidget)
- {
- Q_UNUSED(drawMapWidget);
- } // retranslateUi
-
- };
-
- class DrawMapWidget: public Ui_DrawMapWidget {};
-}
-
-class DrawMapWidget : public QWidget
-{
- Q_OBJECT
-
-public:
- explicit DrawMapWidget(QWidget *parent = 0);
- ~DrawMapWidget();
-
- void setScene(DrawMapScene * scene);
-
-public slots:
- void undo();
- void clear();
- void save(const QString & fileName);
- void load(const QString & fileName);
-
-protected:
- void changeEvent(QEvent *e);
- virtual void resizeEvent(QResizeEvent * event);
- virtual void showEvent(QShowEvent * event);
-
-private:
- Ui::DrawMapWidget *ui;
-
- DrawMapScene * m_scene;
-};
-
-#endif // DRAWMAPWIDGET_H
--- a/QTfrontend/fpsedit.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "fpsedit.h"
-
-FPSEdit::FPSEdit(QWidget * parent) :
- QSpinBox(parent)
-{
- setRange(1, 34);
- setValue(27);
-}
-
-QString FPSEdit::textFromValue(int value) const
-{
- return QString::number(1000 / (35 - value));
-}
--- a/QTfrontend/fpsedit.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _FPSEDIT_H
-#define _FPSEDIT_H
-
-#include <QSpinBox>
-
-class FPSEdit : public QSpinBox
-{
- Q_OBJECT
-
-public:
- FPSEdit(QWidget * parent = 0);
-
-protected:
- QString textFromValue (int value) const;
-};
-
-#endif // _FPSEDIT_H
--- a/QTfrontend/frameTeam.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QResizeEvent>
-#include <QCoreApplication>
-#include <QPalette>
-
-#include "frameTeam.h"
-#include "teamselhelper.h"
-#include "hwconsts.h"
-
-FrameTeams::FrameTeams(QWidget* parent) :
- QFrame(parent), maxHedgehogsPerGame(48), overallHedgehogs(0), mainLayout(this), nonInteractive(false)
-{
- QPalette newPalette = palette();
- newPalette.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
- setPalette(newPalette);
- setAutoFillBackground(true);
-
- mainLayout.setSpacing(1);
- mainLayout.setContentsMargins(4, 4, 4, 4);
-
- int i = 0;
- while(colors[i] != 0)
- availableColors.push_back(QColor(colors[i++]));
-
- resetColors();
-}
-
-void FrameTeams::setInteractivity(bool interactive)
-{
- nonInteractive = !interactive;
- for(tmapTeamToWidget::iterator it=teamToWidget.begin(); it!=teamToWidget.end(); ++it) {
- TeamShowWidget* pts = dynamic_cast<TeamShowWidget*>(it.value());
- if(!pts) throw;
- pts->setInteractivity(interactive);
- }
-}
-
-void FrameTeams::resetColors()
-{
- currentColor=availableColors.end() - 1; // ensure next color is the first one
-}
-
-QColor FrameTeams::getNextColor() const
-{
- QList<QColor>::ConstIterator nextColor=currentColor;
- ++nextColor;
- if (nextColor==availableColors.end()) nextColor=availableColors.begin();
- return *nextColor;
-}
-
-void FrameTeams::addTeam(HWTeam team, bool willPlay)
-{
- TeamShowWidget* pTeamShowWidget = new TeamShowWidget(team, willPlay, this);
- if(nonInteractive) pTeamShowWidget->setInteractivity(false);
-// int hght=teamToWidget.empty() ? 0 : teamToWidget.begin()->second->size().height();
- mainLayout.addWidget(pTeamShowWidget);
- teamToWidget.insert(team, pTeamShowWidget);
- QResizeEvent* pevent=new QResizeEvent(parentWidget()->size(), parentWidget()->size());
- QCoreApplication::postEvent(parentWidget(), pevent);
-}
-
-void FrameTeams::removeTeam(HWTeam team)
-{
- tmapTeamToWidget::iterator it=teamToWidget.find(team);
- if(it==teamToWidget.end()) return;
- mainLayout.removeWidget(it.value());
- it.value()->deleteLater();
- teamToWidget.erase(it);
-}
-
-void FrameTeams::resetTeams()
-{
- for(tmapTeamToWidget::iterator it=teamToWidget.begin(); it!=teamToWidget.end(); ) {
- mainLayout.removeWidget(it.value());
- it.value()->deleteLater();
- teamToWidget.erase(it++);
- }
-}
-
-void FrameTeams::setHHNum(const HWTeam& team)
-{
- TeamShowWidget* pTeamShowWidget = dynamic_cast<TeamShowWidget*>(getTeamWidget(team));
- if(!pTeamShowWidget) return;
- pTeamShowWidget->setHHNum(team.numHedgehogs);
-}
-
-void FrameTeams::setTeamColor(const HWTeam& team)
-{
- TeamShowWidget* pTeamShowWidget = dynamic_cast<TeamShowWidget*>(getTeamWidget(team));
- if(!pTeamShowWidget) return;
- pTeamShowWidget->changeTeamColor(team.teamColor);
-}
-
-QWidget* FrameTeams::getTeamWidget(HWTeam team)
-{
-//qDebug() << "FrameTeams::getTeamWidget getNetID() = " << team.getNetID();
- tmapTeamToWidget::iterator it=teamToWidget.find(team);
- QWidget* ret = it!=teamToWidget.end() ? it.value() : 0;
- return ret;
-}
-
-bool FrameTeams::isFullTeams() const
-{
- return overallHedgehogs==maxHedgehogsPerGame;
-}
-
-void FrameTeams::emitTeamColorChanged(const HWTeam& team)
-{
- emit teamColorChanged(team);
-}
--- a/QTfrontend/frameTeam.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _FRAME_TEAM_INCLUDED
-#define _FRAME_TEAM_INCLUDED
-
-#include <QFrame>
-#include <QList>
-#include <QColor>
-
-#include "teamselect.h"
-
-class FrameTeams : public QFrame
-{
- Q_OBJECT
-
- friend class CHedgehogerWidget;
- friend class TeamShowWidget;
-
- public:
- FrameTeams(QWidget* parent=0);
- QWidget* getTeamWidget(HWTeam team);
- bool isFullTeams() const;
- void resetColors();
- void resetTeams();
- void setHHNum(const HWTeam& team);
- void setTeamColor(const HWTeam& team);
- void setInteractivity(bool interactive);
- QColor getNextColor() const;
-
- signals:
- void teamColorChanged(const HWTeam&);
-
- public slots:
- void addTeam(HWTeam team, bool willPlay);
- void removeTeam(HWTeam team);
-
- private:
- const int maxHedgehogsPerGame;
- int overallHedgehogs;
- QList<QColor> availableColors;
- QList<QColor>::Iterator currentColor;
-
- void emitTeamColorChanged(const HWTeam& team);
-
- QVBoxLayout mainLayout;
- typedef QMap<HWTeam, QWidget*> tmapTeamToWidget;
- tmapTeamToWidget teamToWidget;
- bool nonInteractive;
-};
-
-#endif // _FRAME_TAM_INCLUDED
--- a/QTfrontend/game.cpp Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/game.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -53,8 +53,13 @@
void HWGame::onClientDisconnect()
{
switch (gameType) {
- case gtDemo:
- if (gameState == gsInterrupted || gameState == gsHalted) emit HaveRecord(false, demo);
+ case gtSave:
+ if (gameState == gsInterrupted || gameState == gsHalted)
+ emit HaveRecord(false, demo);
+ else if (gameState == gsFinished)
+ emit HaveRecord(true, demo);
+ break;
+ case gtDemo:
break;
case gtNet:
emit HaveRecord(true, demo);
@@ -94,7 +99,7 @@
HWProto::addStringToBuffer(buf, QString("eammreinf %1").arg(ammostr.mid(3 * cAmmoNumber, cAmmoNumber)));
if(!gamecfg->schemeData(21).toBool()) HWProto::addStringToBuffer(buf, QString("eammstore"));
HWProto::addStringListToBuffer(buf,
- team.TeamGameConfig(gamecfg->getInitHealth()));
+ team.teamGameConfig(gamecfg->getInitHealth()));
;
}
}
@@ -115,27 +120,23 @@
.arg((themesModel->rowCount() > 0) ? themesModel->index(rand() % themesModel->rowCount()).data().toString() : "steel"));
HWProto::addStringToBuffer(teamscfg, "eseed " + QUuid::createUuid().toString());
- HWNamegen namegen;
-
- HWTeam * team1;
- team1 = new HWTeam;
- team1->difficulty = 0;
- team1->teamColor = QColor(colors[0]);
- team1->numHedgehogs = 4;
- namegen.TeamRandomNames(team1,TRUE);
+ HWTeam team1;
+ team1.setDifficulty(0);
+ team1.setColor(QColor(colors[0]));
+ team1.setNumHedgehogs(4);
+ HWNamegen::teamRandomNames(team1,true);
HWProto::addStringListToBuffer(teamscfg,
- team1->TeamGameConfig(100));
+ team1.teamGameConfig(100));
- HWTeam * team2;
- team2 = new HWTeam;
- team2->difficulty = 4;
- team2->teamColor = QColor(colors[1]);
- team2->numHedgehogs = 4;
- do
- namegen.TeamRandomNames(team2,TRUE);
- while(!team2->TeamName.compare(team1->TeamName) || !team2->Hedgehogs[0].Hat.compare(team1->Hedgehogs[0].Hat));
+ HWTeam team2;
+ team2.setDifficulty(4);
+ team2.setColor(QColor(colors[1]));
+ team2.setNumHedgehogs(4);
+ do
+ HWNamegen::teamRandomNames(team2,true);
+ while(!team2.name().compare(team1.name()) || !team2.hedgehog(0).Hat.compare(team1.hedgehog(0).Hat));
HWProto::addStringListToBuffer(teamscfg,
- team2->TeamGameConfig(100));
+ team2.teamGameConfig(100));
HWProto::addStringToBuffer(teamscfg, QString("eammloadt %1").arg(cDefaultAmmoStore->mid(0, cAmmoNumber)));
HWProto::addStringToBuffer(teamscfg, QString("eammprob %1").arg(cDefaultAmmoStore->mid(cAmmoNumber, cAmmoNumber)));
@@ -188,6 +189,7 @@
SendQuickConfig();
break;
}
+ case gtSave:
case gtDemo: break;
case gtNet: {
SendNetConfig();
@@ -321,9 +323,9 @@
TeamCount++;
}
-void HWGame::PlayDemo(const QString & demofilename)
+void HWGame::PlayDemo(const QString & demofilename, bool isSave)
{
- gameType = gtDemo;
+ gameType = isSave ? gtSave : gtDemo;
QFile demofile(demofilename);
if (!demofile.open(QIODevice::ReadOnly))
{
@@ -394,7 +396,7 @@
{
QByteArray buf;
foreach(HWTeam team, m_pTeamSelWidget->getPlayingTeams())
- HWProto::addStringToBuffer(buf, QString("eteamgone %1").arg(team.TeamName));
+ HWProto::addStringToBuffer(buf, QString("eteamgone %1").arg(team.name()));
RawSendIPC(buf);
}
}
--- a/QTfrontend/game.h Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/game.h Sat Oct 08 16:54:56 2011 +0200
@@ -48,7 +48,7 @@
HWGame(GameUIConfig * config, GameCFGWidget * gamecfg, QString ammo, TeamSelWidget* pTeamSelWidget = 0);
virtual ~HWGame();
void AddTeam(const QString & team);
- void PlayDemo(const QString & demofilename);
+ void PlayDemo(const QString & demofilename, bool isSave);
void StartLocal();
void StartQuick();
void StartNet();
@@ -84,6 +84,7 @@
gtNet = 4,
gtTraining = 5,
gtCampaign = 6,
+ gtSave = 7,
};
char msgbuf[MAXMSGCHARS];
QString teams[5];
--- a/QTfrontend/gamecfgwidget.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,575 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QResizeEvent>
-#include <QGroupBox>
-#include <QCheckBox>
-#include <QGridLayout>
-#include <QSpinBox>
-#include <QLabel>
-#include <QMessageBox>
-#include <QTableView>
-#include <QPushButton>
-
-#include "gamecfgwidget.h"
-#include "igbox.h"
-#include "hwconsts.h"
-#include "ammoSchemeModel.h"
-#include "proto.h"
-
-GameCFGWidget::GameCFGWidget(QWidget* parent) :
- QGroupBox(parent)
- , mainLayout(this)
- , seedRegexp("\\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\\}")
-{
- mainLayout.setMargin(0);
-// mainLayout.setSizeConstraint(QLayout::SetMinimumSize);
-
- pMapContainer = new HWMapContainer(this);
- mainLayout.addWidget(pMapContainer, 0, 0);
-
- IconedGroupBox *GBoxOptions = new IconedGroupBox(this);
- GBoxOptions->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
- mainLayout.addWidget(GBoxOptions, 1, 0);
-
- QGridLayout *GBoxOptionsLayout = new QGridLayout(GBoxOptions);
-
- QLabel *titleLabel = new QLabel(QLabel::tr("Game Options"), GBoxOptions);
- titleLabel->setMargin(7); // TODO: make the text larger/richer!!!!
- GBoxOptionsLayout->addWidget(titleLabel, 0, 0, 1, 0, Qt::AlignHCenter);
- GBoxOptionsLayout->addWidget(new QLabel(QLabel::tr("Style"), GBoxOptions), 1, 0);
-
- Scripts = new QComboBox(GBoxOptions);
- GBoxOptionsLayout->addWidget(Scripts, 1, 1);
-
- Scripts->addItem("Normal");
- Scripts->insertSeparator(1);
-
- for (int i = 0; i < scriptList->size(); ++i) {
- QString script = (*scriptList)[i].remove(".lua", Qt::CaseInsensitive);
- QList<QVariant> scriptInfo;
- scriptInfo.push_back(script);
- QFile scriptCfgFile;
- scriptCfgFile.setFileName(QString("%1/Data/Scripts/Multiplayer/%2.cfg").arg(cfgdir->absolutePath()).arg(script));
- if (!scriptCfgFile.exists()) scriptCfgFile.setFileName(QString("%1/Scripts/Multiplayer/%2.cfg").arg(datadir->absolutePath()).arg(script));
- if (scriptCfgFile.exists() && scriptCfgFile.open(QFile::ReadOnly)) {
- QString scheme;
- QString weapons;
- QTextStream input(&scriptCfgFile);
- input >> scheme;
- input >> weapons;
- if (scheme.isEmpty())
- scheme = "locked";
- scheme.replace("_", " ");
- if (weapons.isEmpty())
- weapons = "locked";
- weapons.replace("_", " ");
- scriptInfo.push_back(scheme);
- scriptInfo.push_back(weapons);
- scriptCfgFile.close();
- }
- else
- {
- scriptInfo.push_back("locked");
- scriptInfo.push_back("locked");
- }
- Scripts->addItem(script.replace("_", " "), scriptInfo);
- }
-
- connect(Scripts, SIGNAL(currentIndexChanged(int)), this, SLOT(scriptChanged(int)));
-
- QWidget *SchemeWidget = new QWidget(GBoxOptions);
- GBoxOptionsLayout->addWidget(SchemeWidget, 2, 0, 1, 2);
-
- QGridLayout *SchemeWidgetLayout = new QGridLayout(SchemeWidget);
- SchemeWidgetLayout->setMargin(0);
-
- GameSchemes = new QComboBox(SchemeWidget);
- SchemeWidgetLayout->addWidget(GameSchemes, 0, 2);
- connect(GameSchemes, SIGNAL(currentIndexChanged(int)), this, SLOT(schemeChanged(int)));
-
- SchemeWidgetLayout->addWidget(new QLabel(QLabel::tr("Scheme"), SchemeWidget), 0, 0);
-
- QPixmap pmEdit(":/res/edit.png");
-
- QPushButton * goToSchemePage = new QPushButton(SchemeWidget);
- goToSchemePage->setToolTip(tr("Edit schemes"));
- goToSchemePage->setIconSize(pmEdit.size());
- goToSchemePage->setIcon(pmEdit);
- goToSchemePage->setMaximumWidth(pmEdit.width() + 6);
- SchemeWidgetLayout->addWidget(goToSchemePage, 0, 3);
- connect(goToSchemePage, SIGNAL(clicked()), this, SLOT(jumpToSchemes()));
-
- SchemeWidgetLayout->addWidget(new QLabel(QLabel::tr("Weapons"), SchemeWidget), 1, 0);
-
- WeaponsName = new QComboBox(SchemeWidget);
- SchemeWidgetLayout->addWidget(WeaponsName, 1, 2);
-
- connect(WeaponsName, SIGNAL(currentIndexChanged(int)), this, SLOT(ammoChanged(int)));
-
- QPushButton * goToWeaponPage = new QPushButton(SchemeWidget);
- goToWeaponPage->setToolTip(tr("Edit weapons"));
- goToWeaponPage->setIconSize(pmEdit.size());
- goToWeaponPage->setIcon(pmEdit);
- goToWeaponPage->setMaximumWidth(pmEdit.width() + 6);
- SchemeWidgetLayout->addWidget(goToWeaponPage, 1, 3);
- connect(goToWeaponPage, SIGNAL(clicked()), this, SLOT(jumpToWeapons()));
-
- bindEntries = new QCheckBox(SchemeWidget);
- bindEntries->setToolTip(tr("When this option is enabled selecting a game scheme will auto-select a weapon"));
- bindEntries->setChecked(true);
- bindEntries->setMaximumWidth(42);
- bindEntries->setStyleSheet( "QCheckBox::indicator:checked { image: url(\":/res/lock.png\"); }"
- "QCheckBox::indicator:unchecked { image: url(\":/res/unlock.png\"); }" );
- SchemeWidgetLayout->addWidget(bindEntries, 0, 1, 0, 1, Qt::AlignVCenter);
-
- connect(pMapContainer, SIGNAL(seedChanged(const QString &)), this, SLOT(seedChanged(const QString &)));
- connect(pMapContainer, SIGNAL(mapChanged(const QString &)), this, SLOT(mapChanged(const QString &)));
- connect(pMapContainer, SIGNAL(mapgenChanged(MapGenerator)), this, SLOT(mapgenChanged(MapGenerator)));
- connect(pMapContainer, SIGNAL(mazeSizeChanged(int)), this, SLOT(maze_sizeChanged(int)));
- connect(pMapContainer, SIGNAL(themeChanged(const QString &)), this, SLOT(themeChanged(const QString &)));
- connect(pMapContainer, SIGNAL(newTemplateFilter(int)), this, SLOT(templateFilterChanged(int)));
- connect(pMapContainer, SIGNAL(drawMapRequested()), this, SIGNAL(goToDrawMap()));
- connect(pMapContainer, SIGNAL(drawnMapChanged(const QByteArray &)), this, SLOT(onDrawnMapChanged(const QByteArray &)));
-}
-
-void GameCFGWidget::jumpToSchemes()
-{
- emit goToSchemes(GameSchemes->currentIndex());
-}
-
-void GameCFGWidget::jumpToWeapons()
-{
- emit goToWeapons(WeaponsName->currentIndex());
-}
-
-QVariant GameCFGWidget::schemeData(int column) const
-{
- return GameSchemes->model()->data(GameSchemes->model()->index(GameSchemes->currentIndex(), column));
-}
-
-quint32 GameCFGWidget::getGameFlags() const
-{
- quint32 result = 0;
-
- if (schemeData(1).toBool())
- result |= 0x00001000; // fort
- if (schemeData(2).toBool())
- result |= 0x00000010; // divide teams
- if (schemeData(3).toBool())
- result |= 0x00000004; // solid land
- if (schemeData(4).toBool())
- result |= 0x00000008; // border
- if (schemeData(5).toBool())
- result |= 0x00000020; // low gravity
- if (schemeData(6).toBool())
- result |= 0x00000040; // laser sight
- if (schemeData(7).toBool())
- result |= 0x00000080; // invulnerable
- if (schemeData(8).toBool())
- result |= 0x00000100; // mines
- if (schemeData(9).toBool())
- result |= 0x00000200; // vampirism
- if (schemeData(10).toBool())
- result |= 0x00000400; // karma
- if (schemeData(11).toBool())
- result |= 0x00000800; // artillery
- if (schemeData(12).toBool())
- result |= 0x00002000; // random
- if (schemeData(13).toBool())
- result |= 0x00004000; // king
- if (schemeData(14).toBool())
- result |= 0x00008000; // place hogs
- if (schemeData(15).toBool())
- result |= 0x00010000; // shared ammo
- if (schemeData(16).toBool())
- result |= 0x00020000; // disable girders
- if (schemeData(17).toBool())
- result |= 0x00040000; // disable land obj
- if (schemeData(18).toBool())
- result |= 0x00080000; // ai survival
- if (schemeData(19).toBool())
- result |= 0x00100000; // infinite attacks
- if (schemeData(20).toBool())
- result |= 0x00200000; // reset weaps
- if (schemeData(21).toBool())
- result |= 0x00400000; // per hog ammo
- if (schemeData(22).toBool())
- result |= 0x00800000; // no wind
- if (schemeData(23).toBool())
- result |= 0x01000000; // more wind
- if (schemeData(24).toBool())
- result |= 0x02000000; // tag team
- if (schemeData(25).toBool())
- result |= 0x04000000; // bottom border
-
- return result;
-}
-
-quint32 GameCFGWidget::getInitHealth() const
-{
- return schemeData(28).toInt();
-}
-
-QByteArray GameCFGWidget::getFullConfig() const
-{
- QList<QByteArray> bcfg;
- int mapgen = pMapContainer->get_mapgen();
-
- QString currentMap = pMapContainer->getCurrentMap();
- if (currentMap.size() > 0)
- {
- bcfg << QString("emap " + currentMap).toUtf8();
- if(pMapContainer->getCurrentIsMission())
- bcfg << QString("escript Maps/%1/map.lua").arg(currentMap).toUtf8();
- }
- bcfg << QString("etheme " + pMapContainer->getCurrentTheme()).toUtf8();
-
- if (Scripts->currentIndex() > 0)
- {
- bcfg << QString("escript Scripts/Multiplayer/%1.lua").arg(Scripts->itemData(Scripts->currentIndex()).toList()[0].toString()).toUtf8();
- }
-
- bcfg << QString("eseed " + pMapContainer->getCurrentSeed()).toUtf8();
- bcfg << QString("e$gmflags %1").arg(getGameFlags()).toUtf8();
- bcfg << QString("e$damagepct %1").arg(schemeData(26).toInt()).toUtf8();
- bcfg << QString("e$turntime %1").arg(schemeData(27).toInt() * 1000).toUtf8();
- bcfg << QString("e$sd_turns %1").arg(schemeData(29).toInt()).toUtf8();
- bcfg << QString("e$casefreq %1").arg(schemeData(30).toInt()).toUtf8();
- bcfg << QString("e$minestime %1").arg(schemeData(31).toInt() * 1000).toUtf8();
- bcfg << QString("e$minesnum %1").arg(schemeData(32).toInt()).toUtf8();
- bcfg << QString("e$minedudpct %1").arg(schemeData(33).toInt()).toUtf8();
- bcfg << QString("e$explosives %1").arg(schemeData(34).toInt()).toUtf8();
- bcfg << QString("e$healthprob %1").arg(schemeData(35).toInt()).toUtf8();
- bcfg << QString("e$hcaseamount %1").arg(schemeData(36).toInt()).toUtf8();
- bcfg << QString("e$waterrise %1").arg(schemeData(37).toInt()).toUtf8();
- bcfg << QString("e$healthdec %1").arg(schemeData(38).toInt()).toUtf8();
- bcfg << QString("e$ropepct %1").arg(schemeData(39).toInt()).toUtf8();
- bcfg << QString("e$getawaytime %1").arg(schemeData(40).toInt()).toUtf8();
- bcfg << QString("e$template_filter %1").arg(pMapContainer->getTemplateFilter()).toUtf8();
- bcfg << QString("e$mapgen %1").arg(mapgen).toUtf8();
-
- switch (mapgen)
- {
- case MAPGEN_MAZE:
- bcfg << QString("e$maze_size %1").arg(pMapContainer->getMazeSize()).toUtf8();
- break;
-
- case MAPGEN_DRAWN:
- {
- QByteArray data = pMapContainer->getDrawnMapData();
- while(data.size() > 0)
- {
- QByteArray tmp = data;
- tmp.truncate(200);
- tmp.prepend("edraw ");
- bcfg << tmp;
- data.remove(0, 200);
- }
- break;
- }
- default: ;
- }
-
- QByteArray result;
-
- foreach(QByteArray ba, bcfg)
- HWProto::addByteArrayToBuffer(result, ba);
-
- return result;
-}
-
-void GameCFGWidget::setNetAmmo(const QString& name, const QString& ammo)
-{
- bool illegal = ammo.size() != cDefaultAmmoStore->size();
- if (illegal)
- QMessageBox::critical(this, tr("Error"), tr("Illegal ammo scheme"));
-
- int pos = WeaponsName->findText(name);
- if ((pos == -1) || illegal) { // prevent from overriding schemes with bad ones
- WeaponsName->addItem(name, ammo);
- WeaponsName->setCurrentIndex(WeaponsName->count() - 1);
- } else {
- WeaponsName->setItemData(pos, ammo);
- WeaponsName->setCurrentIndex(pos);
- }
-}
-
-void GameCFGWidget::fullNetConfig()
-{
- ammoChanged(WeaponsName->currentIndex());
-
- seedChanged(pMapContainer->getCurrentSeed());
- templateFilterChanged(pMapContainer->getTemplateFilter());
- themeChanged(pMapContainer->getCurrentTheme());
-
- schemeChanged(GameSchemes->currentIndex());
- scriptChanged(Scripts->currentIndex());
-
- mapgenChanged(pMapContainer->get_mapgen());
- maze_sizeChanged(pMapContainer->getMazeSize());
-
- // map must be the last
- QString map = pMapContainer->getCurrentMap();
- if (map.size())
- mapChanged(map);
-}
-
-void GameCFGWidget::setParam(const QString & param, const QStringList & slValue)
-{
- if (slValue.size() == 1)
- {
- QString value = slValue[0];
- if (param == "MAP") {
- pMapContainer->setMap(value);
- return;
- }
- if (param == "SEED") {
- pMapContainer->setSeed(value);
- if (!seedRegexp.exactMatch(value)) {
- pMapContainer->seedEdit->setVisible(true);
- }
- return;
- }
- if (param == "THEME") {
- pMapContainer->setTheme(value);
- return;
- }
- if (param == "TEMPLATE") {
- pMapContainer->setTemplateFilter(value.toUInt());
- return;
- }
- if (param == "MAPGEN") {
- pMapContainer->setMapgen((MapGenerator)value.toUInt());
- return;
- }
- if (param == "MAZE_SIZE") {
- pMapContainer->setMazeSize(value.toUInt());
- return;
- }
- if (param == "SCRIPT") {
- Scripts->setCurrentIndex(Scripts->findText(value));
- return;
- }
- if (param == "DRAWNMAP") {
- pMapContainer->setDrawnMapData(qUncompress(QByteArray::fromBase64(slValue[0].toLatin1())));
- return;
- }
- }
-
- if (slValue.size() == 2)
- {
- if (param == "AMMO") {
- setNetAmmo(slValue[0], slValue[1]);
- return;
- }
- }
-
- if (slValue.size() == 5)
- {
- if (param == "FULLMAPCONFIG")
- {
- QString seed = slValue[3];
- if (!seedRegexp.exactMatch(seed))
- pMapContainer->seedEdit->setVisible(true);
-
- pMapContainer->setAllMapParameters(
- slValue[0],
- (MapGenerator)slValue[1].toUInt(),
- slValue[2].toUInt(),
- seed,
- slValue[4].toUInt()
- );
- return;
- }
- }
-
- qWarning("Got bad config param from net");
-}
-
-void GameCFGWidget::ammoChanged(int index)
-{
- if (index >= 0) {
- emit paramChanged(
- "AMMO",
- QStringList() << WeaponsName->itemText(index) << WeaponsName->itemData(index).toString()
- );
- }
-}
-
-void GameCFGWidget::mapChanged(const QString & value)
-{
- if(isEnabled() && pMapContainer->getCurrentIsMission())
- {
- Scripts->setEnabled(false);
- Scripts->setCurrentIndex(0);
-
- if (pMapContainer->getCurrentScheme() == "locked")
- {
- GameSchemes->setEnabled(false);
- GameSchemes->setCurrentIndex(GameSchemes->findText("Default"));
- }
- else
- {
- GameSchemes->setEnabled(true);
- int num = GameSchemes->findText(pMapContainer->getCurrentScheme());
- if (num != -1)
- GameSchemes->setCurrentIndex(num);
- else
- GameSchemes->setCurrentIndex(GameSchemes->findText("Default"));
- }
-
- if (pMapContainer->getCurrentWeapons() == "locked")
- {
- WeaponsName->setEnabled(false);
- WeaponsName->setCurrentIndex(WeaponsName->findText("Default"));
- }
- else
- {
- WeaponsName->setEnabled(true);
- int num = WeaponsName->findText(pMapContainer->getCurrentWeapons());
- if (num != -1)
- WeaponsName->setCurrentIndex(num);
- else
- WeaponsName->setCurrentIndex(WeaponsName->findText("Default"));
- }
-
- if (pMapContainer->getCurrentScheme() != "locked" && pMapContainer->getCurrentWeapons() != "locked")
- bindEntries->setEnabled(true);
- else
- bindEntries->setEnabled(false);
- }
- else
- {
- Scripts->setEnabled(true);
- GameSchemes->setEnabled(true);
- WeaponsName->setEnabled(true);
- bindEntries->setEnabled(true);
- }
- emit paramChanged("MAP", QStringList(value));
-}
-
-void GameCFGWidget::templateFilterChanged(int value)
-{
- emit paramChanged("TEMPLATE", QStringList(QString::number(value)));
-}
-
-void GameCFGWidget::seedChanged(const QString & value)
-{
- emit paramChanged("SEED", QStringList(value));
-}
-
-void GameCFGWidget::themeChanged(const QString & value)
-{
- emit paramChanged("THEME", QStringList(value));
-}
-
-void GameCFGWidget::schemeChanged(int index)
-{
- QStringList sl;
-
- int size = GameSchemes->model()->columnCount();
- for(int i = 0; i < size; ++i)
- sl << schemeData(i).toString();
-
- emit paramChanged("SCHEME", sl);
-
- if (isEnabled() && bindEntries->isEnabled() && bindEntries->isChecked()) {
- QString schemeName = GameSchemes->itemText(index);
- for (int i = 0; i < WeaponsName->count(); i++) {
- QString weapName = WeaponsName->itemText(i);
- int res = QString::compare(weapName, schemeName, Qt::CaseSensitive);
- if (0 == res) {
- WeaponsName->setCurrentIndex(i);
- emit ammoChanged(i);
- break;
- }
- }
- }
-}
-
-void GameCFGWidget::scriptChanged(int index)
-{
- if(isEnabled() && index > 0)
- {
- QString scheme = Scripts->itemData(Scripts->currentIndex()).toList()[1].toString();
- QString weapons = Scripts->itemData(Scripts->currentIndex()).toList()[2].toString();
-
- if (scheme == "locked")
- {
- GameSchemes->setEnabled(false);
- GameSchemes->setCurrentIndex(GameSchemes->findText("Default"));
- }
- else
- {
- GameSchemes->setEnabled(true);
- int num = GameSchemes->findText(scheme);
- if (num != -1)
- GameSchemes->setCurrentIndex(num);
- else
- GameSchemes->setCurrentIndex(GameSchemes->findText("Default"));
- }
-
- if (weapons == "locked")
- {
- WeaponsName->setEnabled(false);
- WeaponsName->setCurrentIndex(WeaponsName->findText("Default"));
- }
- else
- {
- WeaponsName->setEnabled(true);
- int num = WeaponsName->findText(weapons);
- if (num != -1)
- WeaponsName->setCurrentIndex(num);
- else
- WeaponsName->setCurrentIndex(WeaponsName->findText("Default"));
- }
-
- if (scheme != "locked" && weapons != "locked")
- bindEntries->setEnabled(true);
- else
- bindEntries->setEnabled(false);
- }
- else
- {
- GameSchemes->setEnabled(true);
- WeaponsName->setEnabled(true);
- bindEntries->setEnabled(true);
- }
- emit paramChanged("SCRIPT", QStringList(Scripts->itemText(index)));
-}
-
-void GameCFGWidget::mapgenChanged(MapGenerator m)
-{
- emit paramChanged("MAPGEN", QStringList(QString::number(m)));
-}
-
-void GameCFGWidget::maze_sizeChanged(int s)
-{
- emit paramChanged("MAZE_SIZE", QStringList(QString::number(s)));
-}
-
-void GameCFGWidget::resendSchemeData()
-{
- schemeChanged(GameSchemes->currentIndex());
-}
-
-void GameCFGWidget::onDrawnMapChanged(const QByteArray & data)
-{
- emit paramChanged("DRAWNMAP", QStringList(qCompress(data, 9).toBase64()));
-}
--- a/QTfrontend/gamecfgwidget.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef GAMECONFIGWIDGET_H
-#define GAMECONFIGWIDGET_H
-
-#include <QWidget>
-#include <QStringList>
-#include <QGroupBox>
-#include <QSpinBox>
-#include <QRegExp>
-
-#include "mapContainer.h"
-
-class QCheckBox;
-class QVBoxLayout;
-class QLabel;
-class QTableView;
-
-class GameCFGWidget : public QGroupBox
-{
- Q_OBJECT
-
-public:
- GameCFGWidget(QWidget* parent);
- quint32 getGameFlags() const;
- quint32 getInitHealth() const;
- QByteArray getFullConfig() const;
- QComboBox * Scripts;
- QComboBox * GameSchemes;
- QComboBox * WeaponsName;
- HWMapContainer* pMapContainer;
- QTableView * tv;
- QVariant schemeData(int column) const;
-
-public slots:
- void setParam(const QString & param, const QStringList & value);
- void fullNetConfig();
- void resendSchemeData();
-
-signals:
- void paramChanged(const QString & param, const QStringList & value);
- void goToSchemes(int);
- void goToWeapons(int);
- void goToDrawMap();
-
-private slots:
- void ammoChanged(int index);
- void mapChanged(const QString &);
- void templateFilterChanged(int);
- void seedChanged(const QString &);
- void themeChanged(const QString &);
- void schemeChanged(int);
- void scriptChanged(int);
- void jumpToSchemes();
- void jumpToWeapons();
- void mapgenChanged(MapGenerator m);
- void maze_sizeChanged(int s);
- void onDrawnMapChanged(const QByteArray & data);
-
-private:
- QGridLayout mainLayout;
- QCheckBox * bindEntries;
- QString curNetAmmoName;
- QString curNetAmmo;
- QRegExp seedRegexp;
-
- void setNetAmmo(const QString& name, const QString& ammo);
-
-};
-
-#endif // GAMECONFIGWIDGET_H
--- a/QTfrontend/hats.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QDir>
-#include <QPixmap>
-#include <QPainter>
-#include "hwconsts.h"
-#include "hwform.h"
-#include "hats.h"
-
-HatsModel::HatsModel(QObject* parent) :
- QAbstractListModel(parent)
-{
- QFile hhfile;
- hhfile.setFileName(cfgdir->absolutePath() + "/Data/Graphics/Hedgehog/Idle.png");
- if (!hhfile.exists()) hhfile.setFileName(datadir->absolutePath() + "/Graphics/Hedgehog/Idle.png");
- QPixmap hhpix = QPixmap(QFileInfo(hhfile).absoluteFilePath()).copy(0, 0, 32, 32);
-
- QDir tmpdir;
- tmpdir.cd(cfgdir->absolutePath());
- tmpdir.cd("Data");
- tmpdir.cd("Graphics");
- tmpdir.cd("Hats");
-
- tmpdir.setFilter(QDir::Files);
-
- QStringList userhatsList = tmpdir.entryList(QStringList("*.png"));
- for (QStringList::Iterator it = userhatsList.begin(); it != userhatsList.end(); ++it )
- {
- QString str = QString(*it).replace(QRegExp("^(.*)\\.png"), "\\1");
- QPixmap pix(cfgdir->absolutePath() + "/Data/Graphics/Hats/" + str + ".png");
-
- QPixmap tmppix(32, 37);
- tmppix.fill(QColor(Qt::transparent));
-
- QPainter painter(&tmppix);
- painter.drawPixmap(QPoint(0, 5), hhpix);
- painter.drawPixmap(QPoint(0, 0), pix.copy(0, 0, 32, 32));
- if(pix.width() > 32)
- painter.drawPixmap(QPoint(0, 0), pix.copy(32, 0, 32, 32));
- painter.end();
-
- hats.append(qMakePair(str, QIcon(tmppix)));
- }
-
- tmpdir.cd(datadir->absolutePath());
- tmpdir.cd("Graphics");
- tmpdir.cd("Hats");
-
- QStringList hatsList = tmpdir.entryList(QStringList("*.png"));
- for (QStringList::Iterator it = hatsList.begin(); it != hatsList.end(); ++it )
- {
- if (userhatsList.contains(*it,Qt::CaseInsensitive)) continue;
- QString str = (*it).replace(QRegExp("^(.*)\\.png"), "\\1");
- QPixmap pix(datadir->absolutePath() + "/Graphics/Hats/" + str + ".png");
-
- QPixmap tmppix(32, 37);
- tmppix.fill(QColor(Qt::transparent));
-
- QPainter painter(&tmppix);
- painter.drawPixmap(QPoint(0, 5), hhpix);
- painter.drawPixmap(QPoint(0, 0), pix.copy(0, 0, 32, 32));
- if(pix.width() > 32)
- painter.drawPixmap(QPoint(0, 0), pix.copy(32, 0, 32, 32));
- painter.end();
-
- hats.append(qMakePair(str, QIcon(tmppix)));
- }
- // Reserved hats
- tmpdir.cd("Reserved");
- hatsList = tmpdir.entryList(QStringList(playerHash+"*.png"));
- for (QStringList::Iterator it = hatsList.begin(); it != hatsList.end(); ++it )
- {
- QString str = (*it).replace(QRegExp("^(.*)\\.png"), "\\1");
- QPixmap pix(datadir->absolutePath() + "/Graphics/Hats/Reserved/" + str + ".png");
-
- QPixmap tmppix(32, 37);
- tmppix.fill(QColor(Qt::transparent));
-
- QPainter painter(&tmppix);
- painter.drawPixmap(QPoint(0, 5), hhpix);
- painter.drawPixmap(QPoint(0, 0), pix.copy(0, 0, 32, 32));
- painter.end();
-
- hats.append(qMakePair("Reserved "+str.remove(0,32), QIcon(tmppix)));
- }
-}
-
-QVariant HatsModel::headerData(int section,
- Qt::Orientation orientation, int role) const
-{
- Q_UNUSED(section);
- Q_UNUSED(orientation);
- Q_UNUSED(role);
-
- return QVariant();
-}
-
-int HatsModel::rowCount(const QModelIndex &parent) const
-{
- if (parent.isValid())
- return 0;
- else
- return hats.size();
-}
-
-/*int HatsModel::columnCount(const QModelIndex & parent) const
-{
- if (parent.isValid())
- return 0;
- else
- return 2;
-}
-*/
-QVariant HatsModel::data(const QModelIndex &index,
- int role) const
-{
- if (!index.isValid() || index.row() < 0
- || index.row() >= hats.size()
- || (role != Qt::DisplayRole && role != Qt::DecorationRole))
- return QVariant();
-
- if (role == Qt::DisplayRole)
- return hats.at(index.row()).first;
- else // role == Qt::DecorationRole
- return hats.at(index.row()).second;
-}
--- a/QTfrontend/hats.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _HATS_INCLUDED
-#define _HATS_INCLUDED
-
-#include <QAbstractListModel>
-#include <QStringList>
-#include <QVector>
-#include <QPair>
-#include <QIcon>
-
-class HatsModel : public QAbstractListModel
-{
- Q_OBJECT
-
-public:
- HatsModel(QObject *parent = 0);
-
- QVariant headerData(int section, Qt::Orientation orientation, int role) const;
- int rowCount(const QModelIndex & parent) const;
- //int columnCount(const QModelIndex & parent) const;
-
- QVariant data(const QModelIndex &index, int role) const;
-protected:
- QVector<QPair<QString, QIcon> > hats;
-};
-
-#endif // _HATS_INCLUDED
--- a/QTfrontend/hedgehogerWidget.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2008 Ulyanov Igor <iulyanov@gmail.com>
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "hedgehogerWidget.h"
-
-#include "frameTeam.h"
-
-CHedgehogerWidget::CHedgehogerWidget(const QImage& im, const QImage& img, QWidget * parent) :
- ItemNum(im, img, parent, 1)
-{
- // TODO: maxHedgehogsPerGame doesn't reset properly and won't match map limits for now
- /*if(parent) {
- pOurFrameTeams = dynamic_cast<FrameTeams*>(parent->parentWidget());
- }
- if(pOurFrameTeams->overallHedgehogs + 4 > pOurFrameTeams->maxHedgehogsPerGame) {
- numItems = pOurFrameTeams->maxHedgehogsPerGame - pOurFrameTeams->overallHedgehogs;
- } else numItems = 4;
- pOurFrameTeams->overallHedgehogs += numItems;*/
-}
-
-void CHedgehogerWidget::incItems()
-{
- //if (pOurFrameTeams->overallHedgehogs < pOurFrameTeams->maxHedgehogsPerGame) {
- numItems++;
- //pOurFrameTeams->overallHedgehogs++;
- emit hedgehogsNumChanged();
- //}
-}
-
-void CHedgehogerWidget::decItems()
-{
- numItems--;
- //pOurFrameTeams->overallHedgehogs--;
- emit hedgehogsNumChanged();
-}
-
-CHedgehogerWidget::~CHedgehogerWidget()
-{
- // TODO: not called?
- //pOurFrameTeams->overallHedgehogs-=numItems;
-}
-
-void CHedgehogerWidget::setNonInteractive()
-{
- nonInteractive=true;
-}
-
-void CHedgehogerWidget::setHHNum(unsigned int num)
-{
- /*unsigned int diff = num - numItems;
- numItems += diff;
- pOurFrameTeams->overallHedgehogs += diff;*/
- numItems = num;
- repaint();
-}
-
-unsigned char CHedgehogerWidget::getHedgehogsNum() const
-{
- return numItems;
-}
--- a/QTfrontend/hedgehogerWidget.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2007 Ulyanov Igor <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _HEDGEHOGER_WIDGET
-#define _HEDGEHOGER_WIDGET
-
-#include "itemNum.h"
-
-class FrameTeams;
-
-class CHedgehogerWidget : public ItemNum
-{
- Q_OBJECT
-
- public:
- CHedgehogerWidget(const QImage& im, const QImage& img, QWidget * parent);
- virtual ~CHedgehogerWidget();
- unsigned char getHedgehogsNum() const;
- void setHHNum (unsigned int num);
- void setNonInteractive();
-
- signals:
- void hedgehogsNumChanged();
-
- protected:
- virtual void incItems();
- virtual void decItems();
-
- private:
- CHedgehogerWidget();
- FrameTeams* pOurFrameTeams;
-};
-
-#endif // _HEDGEHOGER_WIDGET
--- a/QTfrontend/hedgewars.qrc Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/hedgewars.qrc Sat Oct 08 16:54:56 2011 +0200
@@ -45,6 +45,7 @@
<file>res/unchecked.png</file>
<file>res/graphicsicon.png</file>
<file>res/miscicon.png</file>
+ <file>res/Load.png</file>
<file>res/Save.png</file>
<file>res/Record.png</file>
<file>res/weaponsicon.png</file>
@@ -57,31 +58,31 @@
<file>res/PlaySound.png</file>
<file>res/hh_small.png</file>
<file>res/btnDisabled.png</file>
- <file>res/btnForts.png</file>
- <file>res/btnBorder.png</file>
- <file>res/btnInvulnerable.png</file>
- <file>res/btnLaserSight.png</file>
- <file>res/btnLowGravity.png</file>
- <file>res/btnResetHealth.png</file>
- <file>res/btnTeamsDivide.png</file>
- <file>res/btnSolid.png</file>
- <file>res/btnVampiric.png</file>
- <file>res/btnKarma.png</file>
- <file>res/btnArtillery.png</file>
- <file>res/btnRandomOrder.png</file>
- <file>res/btnKing.png</file>
- <file>res/btnPlaceHog.png</file>
- <file>res/btnSharedAmmo.png</file>
- <file>res/btnDisableGirders.png</file>
- <file>res/btnDisableLandObjects.png</file>
- <file>res/btnAISurvival.png</file>
- <file>res/btnInfAttack.png</file>
- <file>res/btnResetWeps.png</file>
- <file>res/btnPerHogAmmo.png</file>
- <file>res/btnNoWind.png</file>
- <file>res/btnMoreWind.png</file>
- <file>res/btnTagTeam.png</file>
- <file>res/btnBottomBorder.png</file>
+ <file>res/btnForts@2x.png</file>
+ <file>res/btnBorder@2x.png</file>
+ <file>res/btnInvulnerable@2x.png</file>
+ <file>res/btnLaserSight@2x.png</file>
+ <file>res/btnLowGravity@2x.png</file>
+ <file>res/btnResetHealth@2x.png</file>
+ <file>res/btnTeamsDivide@2x.png</file>
+ <file>res/btnSolid@2x.png</file>
+ <file>res/btnVampiric@2x.png</file>
+ <file>res/btnKarma@2x.png</file>
+ <file>res/btnArtillery@2x.png</file>
+ <file>res/btnRandomOrder@2x.png</file>
+ <file>res/btnKing@2x.png</file>
+ <file>res/btnPlaceHog@2x.png</file>
+ <file>res/btnSharedAmmo@2x.png</file>
+ <file>res/btnDisableGirders@2x.png</file>
+ <file>res/btnDisableLandObjects@2x.png</file>
+ <file>res/btnAISurvival@2x.png</file>
+ <file>res/btnInfAttack@2x.png</file>
+ <file>res/btnResetWeps@2x.png</file>
+ <file>res/btnPerHogAmmo@2x.png</file>
+ <file>res/btnNoWind@2x.png</file>
+ <file>res/btnMoreWind@2x.png</file>
+ <file>res/btnTagTeam@2x.png</file>
+ <file>res/btnBottomBorder@2x.png</file>
<file>res/iconBox.png</file>
<file>res/iconHealth.png</file>
<file>res/iconSuddenDeath.png</file>
--- a/QTfrontend/hwconsts.h Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/hwconsts.h Sat Oct 08 16:54:56 2011 +0200
@@ -58,6 +58,8 @@
extern bool isDevBuild;
#endif
+#define HEDGEHOGS_PER_TEAM 8
+
#define AMMOLINE_DEFAULT_QT "939192942219912103223511100120100000021111010101111101"
#define AMMOLINE_DEFAULT_PROB "040504054160065554655446477657666666615551010111541101"
#define AMMOLINE_DEFAULT_DELAY "000000000000020550000004000700400000000022000000060000"
--- a/QTfrontend/hwform.cpp Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/hwform.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+#include <QDir>
#include <QFile>
#include <QTextStream>
#include <QMessageBox>
@@ -43,7 +44,6 @@
#include "hwform.h"
#include "game.h"
#include "team.h"
-#include "namegen.h"
#include "teamselect.h"
#include "selectWeapon.h"
#include "gameuiconfig.h"
@@ -93,7 +93,7 @@
bool frontendEffects = true;
QString playerHash;
-HWForm::HWForm(QWidget *parent)
+HWForm::HWForm(QWidget *parent, QString styleSheet)
: QMainWindow(parent), pnetserver(0), pRegisterServer(0), editedTeam(0), hwnet(0)
{
#ifdef USE_XFIRE
@@ -104,6 +104,7 @@
frontendEffects = gameSettings->value("frontend/effects", true).toBool();
playerHash = QString(QCryptographicHash::hash(gameSettings->value("net/nick","").toString().toLatin1(), QCryptographicHash::Md5).toHex());
+ this->setStyleSheet(styleSheet);
ui.setupUi(this);
setMinimumSize(760, 580);
//setFocusPolicy(Qt::StrongFocus);
@@ -113,7 +114,6 @@
config = new GameUIConfig(this, cfgdir->absolutePath() + "/hedgewars.ini");
- namegen = new HWNamegen();
#ifdef __APPLE__
panel = new M3Panel;
@@ -138,6 +138,12 @@
UpdateCampaignPage(0);
UpdateWeapons();
+ // connect all goBack signals
+ int nPages = ui.Pages->count();
+
+ for (int i = 0; i < nPages; i++)
+ connect(ui.Pages->widget(i), SIGNAL(goBack()), this, SLOT(GoBack()));
+
pageSwitchMapper = new QSignalMapper(this);
connect(pageSwitchMapper, SIGNAL(mapped(int)), this, SLOT(GoToPage(int)));
@@ -159,19 +165,11 @@
connect(ui.pageMain->BtnDataDownload, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
pageSwitchMapper->setMapping(ui.pageMain->BtnDataDownload, ID_PAGE_DATADOWNLOAD);
- connect(ui.pageMain->BtnExit, SIGNAL(pressed()), this, SLOT(btnExitPressed()));
- connect(ui.pageMain->BtnExit, SIGNAL(clicked()), this, SLOT(btnExitClicked()));
-
- connect(ui.pageInfo->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
- connect(ui.pageDataDownload->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
+ //connect(ui.pageMain->BtnExit, SIGNAL(pressed()), this, SLOT(btnExitPressed()));
+ //connect(ui.pageMain->BtnExit, SIGNAL(clicked()), this, SLOT(btnExitClicked()));
- connect(ui.pageEditTeam->BtnTeamSave, SIGNAL(clicked()), this, SLOT(TeamSave()));
- connect(ui.pageEditTeam->BtnTeamDiscard, SIGNAL(clicked()), this, SLOT(TeamDiscard()));
+ connect(ui.pageEditTeam, SIGNAL(teamEdited()), this, SLOT(AfterTeamEdit()));
- connect(ui.pageEditTeam->signalMapper, SIGNAL(mapped(const int &)), this, SLOT(RandomName(const int &)));
- connect(ui.pageEditTeam->randTeamButton, SIGNAL(clicked()), this, SLOT(RandomNames()));
-
- connect(ui.pageMultiplayer->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
connect(ui.pageMultiplayer->BtnStartMPGame, SIGNAL(clicked()), this, SLOT(StartMPGame()));
connect(ui.pageMultiplayer->teamsSelect, SIGNAL(setEnabledGameStart(bool)),
ui.pageMultiplayer->BtnStartMPGame, SLOT(setEnabled(bool)));
@@ -180,18 +178,16 @@
connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToWeapons(int)), this, SLOT(GoToSelectWeaponSet(int)));
connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToDrawMap()), pageSwitchMapper, SLOT(map()));
pageSwitchMapper->setMapping(ui.pageMultiplayer->gameCFG, ID_PAGE_DRAWMAP);
-
- connect(ui.pagePlayDemo->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
+
connect(ui.pagePlayDemo->BtnPlayDemo, SIGNAL(clicked()), this, SLOT(PlayDemo()));
connect(ui.pagePlayDemo->DemosList, SIGNAL(doubleClicked (const QModelIndex &)), this, SLOT(PlayDemo()));
- connect(ui.pageOptions->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
- connect(ui.pageOptions->BtnNewTeam, SIGNAL(clicked()), this, SLOT(NewTeam()));
- connect(ui.pageOptions->BtnEditTeam, SIGNAL(clicked()), this, SLOT(EditTeam()));
- connect(ui.pageOptions->BtnDeleteTeam, SIGNAL(clicked()), this, SLOT(DeleteTeam()));
- connect(ui.pageOptions->BtnSaveOptions, SIGNAL(clicked()), config, SLOT(SaveOptions()));
- connect(ui.pageOptions->BtnSaveOptions, SIGNAL(clicked()), this, SLOT(GoBack()));
+ connect(ui.pageOptions, SIGNAL(newTeamRequested()), this, SLOT(NewTeam()));
+ connect(ui.pageOptions, SIGNAL(editTeamRequested(const QString&)), this, SLOT(EditTeam(const QString&)));
+ connect(ui.pageOptions, SIGNAL(deleteTeamRequested(const QString&)), this, SLOT(DeleteTeam(const QString&)));
+ connect(ui.pageOptions->btnSave, SIGNAL(clicked()), config, SLOT(SaveOptions()));
+ connect(ui.pageOptions->btnSave, SIGNAL(clicked()), this, SLOT(GoBack()));
connect(ui.pageOptions->BtnAssociateFiles, SIGNAL(clicked()), this, SLOT(AssociateFiles()));
connect(ui.pageOptions->WeaponEdit, SIGNAL(clicked()), this, SLOT(GoToSelectWeapon()));
@@ -202,17 +198,14 @@
connect(ui.pageOptions->SchemeDelete, SIGNAL(clicked()), this, SLOT(DeleteScheme()));
connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsChanged()), this, SLOT(UpdateWeapons()));
- connect(ui.pageNet->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
connect(ui.pageNet->BtnSpecifyServer, SIGNAL(clicked()), this, SLOT(NetConnect()));
connect(ui.pageNet->BtnNetSvrStart, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
pageSwitchMapper->setMapping(ui.pageNet->BtnNetSvrStart, ID_PAGE_NETSERVER);
connect(ui.pageNet, SIGNAL(connectClicked(const QString &, quint16)), this, SLOT(NetConnectServer(const QString &, quint16)));
- connect(ui.pageNetServer->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
connect(ui.pageNetServer->BtnStart, SIGNAL(clicked()), this, SLOT(NetStartServer()));
- connect(ui.pageNetGame->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(setEnabledGameStart(bool)),
ui.pageNetGame->BtnStart, SLOT(setEnabled(bool)));
connect(ui.pageNetGame, SIGNAL(SetupClicked()), this, SLOT(IntermediateSetup()));
@@ -221,14 +214,11 @@
connect(ui.pageNetGame->pGameCFG, SIGNAL(goToDrawMap()), pageSwitchMapper, SLOT(map()));
pageSwitchMapper->setMapping(ui.pageNetGame->pGameCFG, ID_PAGE_DRAWMAP);
- connect(ui.pageRoomsList->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
connect(ui.pageRoomsList->BtnAdmin, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
pageSwitchMapper->setMapping(ui.pageRoomsList->BtnAdmin, ID_PAGE_ADMIN);
connect(ui.pageInfo->BtnSnapshots, SIGNAL(clicked()), this, SLOT(OpenSnapshotFolder()));
- connect(ui.pageInfo->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
- connect(ui.pageGameStats->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
connect(ui.pageGameStats, SIGNAL(saveDemoRequested()), this, SLOT(saveDemoWithCustomName()));
connect(ui.pageSinglePlayer->BtnSimpleGamePage, SIGNAL(clicked()), this, SLOT(SimpleGame()));
@@ -243,16 +233,12 @@
connect(ui.pageSinglePlayer->BtnLoad, SIGNAL(clicked()), this, SLOT(GoToSaves()));
connect(ui.pageSinglePlayer->BtnDemos, SIGNAL(clicked()), this, SLOT(GoToDemos()));
- connect(ui.pageSinglePlayer->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
- connect(ui.pageTraining->BtnStartTrain, SIGNAL(clicked()), this, SLOT(StartTraining()));
- connect(ui.pageTraining->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
+ connect(ui.pageTraining, SIGNAL(startMission(const QString&)), this, SLOT(startTraining(const QString&)));
connect(ui.pageCampaign->BtnStartCampaign, SIGNAL(clicked()), this, SLOT(StartCampaign()));
- connect(ui.pageCampaign->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
connect(ui.pageCampaign->CBTeam, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPage(int)));
- connect(ui.pageSelectWeapon->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
connect(ui.pageSelectWeapon->BtnDelete, SIGNAL(clicked()),
ui.pageSelectWeapon->pWeapons, SLOT(deleteWeaponsName())); // executed first
@@ -261,16 +247,10 @@
//connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsDeleted()),
// this, SLOT(GoBack())); // executed third
- connect(ui.pageScheme->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
- connect(ui.pageAdmin->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
-
- connect(ui.pageNetType->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
connect(ui.pageNetType->BtnLAN, SIGNAL(clicked()), this, SLOT(GoToNet()));
connect(ui.pageNetType->BtnOfficialServer, SIGNAL(clicked()), this, SLOT(NetConnectOfficialServer()));
- connect(ui.pageDrawMap->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
-
connect(ui.pageConnecting, SIGNAL(cancelConnection()), this, SLOT(GoBack()));
@@ -295,26 +275,27 @@
#ifdef USE_XFIRE
void HWForm::updateXfire(void)
{
- if(hwnet)
+ if(hwnet && (hwnet->clientState() != HWNewNet::Disconnected))
{
xfire_setvalue(XFIRE_SERVER, !hwnet->getHost().compare("netserver.hedgewars.org:46631") ? "Official server" : hwnet->getHost().toAscii());
- switch(hwnet->getClientState())
+ switch(hwnet->clientState())
{
- case 1: // Connecting
+ case HWNewNet::Connecting: // Connecting
+ case HWNewNet::Connected:
xfire_setvalue(XFIRE_STATUS, "Connecting");
xfire_setvalue(XFIRE_NICKNAME, "-");
xfire_setvalue(XFIRE_ROOM, "-");
- case 2: // In lobby
+ case HWNewNet::InLobby: // In lobby
xfire_setvalue(XFIRE_STATUS, "Online");
xfire_setvalue(XFIRE_NICKNAME, hwnet->getNick().toAscii());
xfire_setvalue(XFIRE_ROOM, "In game lobby");
break;
- case 3: // In room
+ case HWNewNet::InRoom: // In room
xfire_setvalue(XFIRE_STATUS, "Online");
xfire_setvalue(XFIRE_NICKNAME, hwnet->getNick().toAscii());
xfire_setvalue(XFIRE_ROOM, (hwnet->getRoom() + " (waiting for players)").toAscii());
break;
- case 5: // In game
+ case HWNewNet::InGame: // In game
xfire_setvalue(XFIRE_STATUS, "Online");
xfire_setvalue(XFIRE_NICKNAME, hwnet->getNick().toAscii());
xfire_setvalue(XFIRE_ROOM, (hwnet->getRoom() + " (playing or spectating)").toAscii());
@@ -398,7 +379,7 @@
if(teamslist.empty()) {
HWTeam defaultTeam(tr("DefaultTeam"));
- defaultTeam.SaveToFile();
+ defaultTeam.saveToFile();
teamslist.push_back(tr("DefaultTeam"));
}
@@ -490,11 +471,7 @@
if (id == ID_PAGE_MULTIPLAYER || id == ID_PAGE_NETGAME) {
QStringList tmNames = config->GetTeamsList();
TeamSelWidget* curTeamSelWidget;
- ui.pageOptions->BtnNewTeam->setVisible(false);
- ui.pageOptions->BtnEditTeam->setVisible(false);
- ui.pageOptions->BtnDeleteTeam->setVisible(false);
- ui.pageOptions->CBTeamName->setVisible(false);
- ui.pageOptions->LblNoEditTeam->setVisible(true);
+ ui.pageOptions->setTeamOptionsEnabled(false);
if (id == ID_PAGE_MULTIPLAYER) {
curTeamSelWidget = ui.pageMultiplayer->teamsSelect;
@@ -505,7 +482,7 @@
QList<HWTeam> teamsList;
for (QStringList::iterator it = tmNames.begin(); it != tmNames.end(); it++) {
HWTeam team(*it);
- team.LoadFromFile();
+ team.loadFromFile();
teamsList.push_back(team);
}
@@ -525,11 +502,7 @@
}
if (id == ID_PAGE_MAIN) {
- ui.pageOptions->BtnNewTeam->setVisible(true);
- ui.pageOptions->BtnEditTeam->setVisible(true);
- ui.pageOptions->BtnDeleteTeam->setVisible(true);
- ui.pageOptions->CBTeamName->setVisible(true);
- ui.pageOptions->LblNoEditTeam->setVisible(false);
+ ui.pageOptions->setTeamOptionsEnabled(true);
}
// load and save ignore/friends lists
@@ -560,8 +533,11 @@
void HWForm::GoBack()
{
+ int curid = ui.Pages->currentIndex();
+ if (curid == ID_PAGE_MAIN)
+ exit();
+
int id = PagesStack.isEmpty() ? ID_PAGE_MAIN : PagesStack.pop();
- int curid = ui.Pages->currentIndex();
ui.Pages->setCurrentIndex(id);
OnPageShown(id, curid);
@@ -577,7 +553,7 @@
GoBack();
if (curid == ID_PAGE_ROOMSLIST || curid == ID_PAGE_CONNECTING) NetDisconnect();
- if (curid == ID_PAGE_NETGAME && hwnet) hwnet->partRoom();
+ if (curid == ID_PAGE_NETGAME && hwnet && hwnet->isInRoom()) hwnet->partRoom();
// need to work on this, can cause invalid state for admin quit trying to prevent bad state message on kick
//if (curid == ID_PAGE_NETGAME && (!game || game->gameState != gsStarted)) hwnet->partRoom();
@@ -596,14 +572,15 @@
eggTimer.start();
}
-void HWForm::btnExitClicked()
+void HWForm::exit()
{
- if (eggTimer.elapsed() < 3000){
+// if (eggTimer.elapsed() < 3000){
#ifdef __APPLE__
panel->showInstallController();
#endif
close();
- }
+// TODO reactivate egg
+/* }
else
{
QPushButton * btn = findChild<QPushButton *>("imageButt");
@@ -611,7 +588,7 @@
{
btn->setIcon(QIcon(":/res/bonus.png"));
}
- }
+ } */
}
void HWForm::IntermediateSetup()
@@ -628,7 +605,7 @@
QStringList tmnames;
foreach(HWTeam team, curTeamSelWidget->getNotPlayingTeams())
- tmnames += team.TeamName;
+ tmnames += team.name();
//UpdateTeamsLists(&tmnames); // FIXME: still need more work if teamname is updated while configuring
UpdateTeamsLists();
@@ -638,61 +615,30 @@
void HWForm::NewTeam()
{
- editedTeam = new HWTeam("unnamed");
- editedTeam->SetToPage(this);
- GoToPage(ID_PAGE_SETUP_TEAM);
-}
-
-void HWForm::EditTeam()
-{
- editedTeam = new HWTeam(ui.pageOptions->CBTeamName->currentText());
- editedTeam->LoadFromFile();
- editedTeam->SetToPage(this);
+ ui.pageEditTeam->createTeam(QLineEdit::tr("unnamed"), playerHash);
+ UpdateTeamsLists();
GoToPage(ID_PAGE_SETUP_TEAM);
}
-void HWForm::DeleteTeam()
+void HWForm::EditTeam(const QString & teamName)
{
- QMessageBox reallyDelete(QMessageBox::Question, QMessageBox::tr("Teams"), QMessageBox::tr("Really delete this team?"), QMessageBox::Ok | QMessageBox::Cancel);
-
- if (reallyDelete.exec() == QMessageBox::Ok) {
- editedTeam = new HWTeam(ui.pageOptions->CBTeamName->currentText());
- editedTeam->DeleteFile();
-
- // Remove from lists
- ui.pageOptions->CBTeamName->removeItem(ui.pageOptions->CBTeamName->currentIndex());
- }
+ ui.pageEditTeam->editTeam(teamName, playerHash);
+ GoToPage(ID_PAGE_SETUP_TEAM);
}
-void HWForm::RandomNames()
-{
- editedTeam->GetFromPage(this);
- namegen->TeamRandomNames(editedTeam, true);
- editedTeam->SetToPage(this);
-}
-
-void HWForm::RandomName(const int &i)
+void HWForm::AfterTeamEdit()
{
- editedTeam->GetFromPage(this);
- namegen->TeamRandomName(editedTeam,i);
- editedTeam->SetToPage(this);
-}
-
-void HWForm::TeamSave()
-{
- editedTeam->GetFromPage(this);
- editedTeam->SaveToFile();
- delete editedTeam;
- editedTeam=0;
UpdateTeamsLists();
GoBack();
}
-void HWForm::TeamDiscard()
+
+void HWForm::DeleteTeam(const QString & teamName)
{
- delete editedTeam;
- editedTeam=0;
- GoBack();
+ ui.pageEditTeam->deleteTeam(teamName);
+ QMessageBox reallyDelete(QMessageBox::Question, QMessageBox::tr("Teams"), QMessageBox::tr("Really delete this team?"), QMessageBox::Ok | QMessageBox::Cancel);
+
+ UpdateTeamsLists();
}
void HWForm::DeleteScheme()
@@ -730,7 +676,7 @@
return;
}
CreateGame(0, 0, 0);
- game->PlayDemo(curritem->data(Qt::UserRole).toString());
+ game->PlayDemo(curritem->data(Qt::UserRole).toString(), ui.pagePlayDemo->isSave());
}
void HWForm::PlayDemoQuick(const QString & demofilename)
@@ -739,7 +685,7 @@
GoBack(); //needed to cleanly disconnect from netgame
GoToPage(ID_PAGE_MAIN);
CreateGame(0, 0, 0);
- game->PlayDemo(demofilename);
+ game->PlayDemo(demofilename, false);
}
void HWForm::NetConnectServer(const QString & host, quint16 port)
@@ -752,7 +698,82 @@
NetConnectServer("netserver.hedgewars.org", 46631);
}
-void HWForm::_NetConnect(const QString & hostName, quint16 port, const QString & nick)
+void HWForm::NetPassword(const QString & nick)
+{
+ bool ok = false;
+ int passLength = config->value("net/passwordlength", 0).toInt();
+ QString hash = config->value("net/passwordhash", "").toString();
+
+ // If the password is blank, ask the user to enter one in
+ if (passLength == 0)
+ {
+ QString password = QInputDialog::getText(this, tr("Password"), tr("Your nickname %1 is\nregistered on Hedgewars.org\nPlease provide your password below\nor pick another nickname in game config:").arg(nick), QLineEdit::Password, passLength==0?NULL:QString(passLength,'\0'), &ok);
+
+ if (!ok) {
+ ForcedDisconnect(tr("No password supplied."));
+ return;
+ }
+
+ hash = QCryptographicHash::hash(password.toLatin1(), QCryptographicHash::Md5).toHex();
+ config->setValue("net/passwordhash", hash);
+ config->setValue("net/passwordlength", password.size());
+ config->setNetPasswordLength(password.size());
+ }
+
+ hwnet->SendPasswordHash(hash);
+}
+
+void HWForm::NetNickTaken(const QString & nick)
+{
+ bool ok = false;
+ QString newNick = QInputDialog::getText(this, tr("Nickname"), tr("Some one already uses\n your nickname %1\non the server.\nPlease pick another nickname:").arg(nick), QLineEdit::Normal, nick, &ok);
+
+ if (!ok || newNick.isEmpty()) {
+ ForcedDisconnect(tr("No nickname supplied."));
+ return;
+ }
+
+ hwnet->NewNick(newNick);
+ config->setValue("net/nick", newNick);
+ config->updNetNick();
+}
+
+void HWForm::NetAuthFailed()
+{
+ // Set the password blank if case the user tries to join and enter his password again
+ config->setValue("net/passwordlength", 0);
+ config->setNetPasswordLength(0);
+}
+
+void HWForm::NetTeamAccepted(const QString & team)
+{
+ ui.pageNetGame->pNetTeamsWidget->changeTeamStatus(team);
+}
+
+void HWForm::NetError(const QString & errmsg)
+{
+ switch (ui.Pages->currentIndex())
+ {
+ case ID_PAGE_INGAME:
+ ShowErrorMessage(errmsg);
+ // no break
+ case ID_PAGE_NETGAME:
+ ui.pageNetGame->pChatWidget->addLine("Error",errmsg);
+ break;
+ default:
+ ui.pageRoomsList->chatWidget->addLine("Error",errmsg);
+ }
+}
+
+void HWForm::NetWarning(const QString & wrnmsg)
+{
+ if (ui.Pages->currentIndex() == ID_PAGE_NETGAME || ui.Pages->currentIndex() == ID_PAGE_INGAME)
+ ui.pageNetGame->pChatWidget->addLine("Warning",wrnmsg);
+ else
+ ui.pageRoomsList->chatWidget->addLine("Warning",wrnmsg);
+}
+
+void HWForm::_NetConnect(const QString & hostName, quint16 port, QString nick)
{
if(hwnet) {
hwnet->Disconnect();
@@ -762,17 +783,22 @@
ui.pageRoomsList->chatWidget->clear();
- hwnet = new HWNewNet(config, ui.pageNetGame->pGameCFG, ui.pageNetGame->pNetTeamsWidget);
+ hwnet = new HWNewNet();
GoToPage(ID_PAGE_CONNECTING);
- connect(hwnet, SIGNAL(showMessage(const QString &)), this, SLOT(ShowErrorMessage(const QString &)), Qt::QueuedConnection);
-
connect(hwnet, SIGNAL(AskForRunGame()), this, SLOT(CreateNetGame()));
- connect(hwnet, SIGNAL(Connected()), this, SLOT(NetConnected()));
+ connect(hwnet, SIGNAL(connected()), this, SLOT(NetConnected()));
+ connect(hwnet, SIGNAL(Error(const QString&)), this, SLOT(NetError(const QString&)));
+ connect(hwnet, SIGNAL(Warning(const QString&)), this, SLOT(NetWarning(const QString&)));
connect(hwnet, SIGNAL(EnteredGame()), this, SLOT(NetGameEnter()));
- connect(hwnet, SIGNAL(LeftRoom()), this, SLOT(NetLeftRoom()));
+ connect(hwnet, SIGNAL(LeftRoom(const QString&)), this, SLOT(NetLeftRoom(const QString&)));
connect(hwnet, SIGNAL(AddNetTeam(const HWTeam&)), this, SLOT(AddNetTeam(const HWTeam&)));
+ connect(hwnet, SIGNAL(RemoveNetTeam(const HWTeam&)), this, SLOT(RemoveNetTeam(const HWTeam&)));
+ connect(hwnet, SIGNAL(TeamAccepted(const QString&)), this, SLOT(NetTeamAccepted(const QString&)));
+ connect(hwnet, SIGNAL(AskForPassword(const QString&)), this, SLOT(NetPassword(const QString&)));
+ connect(hwnet, SIGNAL(NickTaken(const QString&)), this, SLOT(NetNickTaken(const QString&)));
+ connect(hwnet, SIGNAL(AuthFailed()), this, SLOT(NetAuthFailed()));
//connect(ui.pageNetGame->BtnBack, SIGNAL(clicked()), hwnet, SLOT(partRoom()));
// rooms list page stuff
@@ -875,11 +901,25 @@
connect(ui.pageAdmin, SIGNAL(setServerMessageOld(const QString&)), hwnet, SLOT(setServerMessageOld(const QString &)));
connect(ui.pageAdmin, SIGNAL(setProtocol(int)), hwnet, SLOT(setLatestProtocolVar(int)));
connect(ui.pageAdmin, SIGNAL(askServerVars()), hwnet, SLOT(askServerVars()));
- connect(ui.pageAdmin->pbClearAccountsCache, SIGNAL(clicked()), hwnet, SLOT(clearAccountsCache()));
+ connect(ui.pageAdmin, SIGNAL(clearAccountsCache()), hwnet, SLOT(clearAccountsCache()));
// disconnect
- connect(hwnet, SIGNAL(Disconnected()), this, SLOT(ForcedDisconnect()), Qt::QueuedConnection);
+ connect(hwnet, SIGNAL(disconnected(const QString&)), this, SLOT(ForcedDisconnect(const QString&)), Qt::QueuedConnection);
+
+// config stuff
+ connect(hwnet, SIGNAL(paramChanged(const QString &, const QStringList &)), ui.pageNetGame->pGameCFG, SLOT(setParam(const QString &, const QStringList &)));
+ connect(ui.pageNetGame->pGameCFG, SIGNAL(paramChanged(const QString &, const QStringList &)), hwnet, SLOT(onParamChanged(const QString &, const QStringList &)));
+ connect(hwnet, SIGNAL(configAsked()), ui.pageNetGame->pGameCFG, SLOT(fullNetConfig()));
+ while (nick.isEmpty()) {
+ nick = QInputDialog::getText(this,
+ QObject::tr("Nickname"),
+ QObject::tr("Please enter your nickname"),
+ QLineEdit::Normal,
+ QDir::home().dirName());
+ config->setValue("net/nick",nick);
+ config->updNetNick();
+ }
hwnet->Connect(hostName, port, nick);
}
@@ -927,11 +967,6 @@
void HWForm::NetDisconnect()
{
- if(hwnet) {
- hwnet->Disconnect();
- delete hwnet;
- hwnet = 0;
- }
if(pnetserver) {
if (pRegisterServer)
{
@@ -945,15 +980,12 @@
}
}
-void HWForm::ForcedDisconnect()
+void HWForm::ForcedDisconnect(const QString & reason)
{
if(pnetserver) return; // we have server - let it care of all things
if (hwnet) {
- HWNewNet * tmp = hwnet;
- hwnet = 0;
- tmp->deleteLater();
QMessageBox::warning(this, QMessageBox::tr("Network"),
- QMessageBox::tr("Connection to server is lost"));
+ QMessageBox::tr("Connection to server is lost") + (reason.isEmpty()?"":("\n\n" + HWNewNet::tr("Quit reason: ") + '"' + reason +'"')));
}
if (ui.Pages->currentIndex() != ID_PAGE_NET) GoBack();
@@ -975,6 +1007,11 @@
ui.pageNetGame->pNetTeamsWidget->addTeam(team);
}
+void HWForm::RemoveNetTeam(const HWTeam& team)
+{
+ ui.pageNetGame->pNetTeamsWidget->removeNetTeam(team);
+}
+
void HWForm::StartMPGame()
{
QString ammo;
@@ -1089,11 +1126,11 @@
demofile.close();
}
-void HWForm::StartTraining()
+void HWForm::startTraining(const QString & scriptName)
{
CreateGame(0, 0, 0);
- game->StartTraining(ui.pageTraining->CBSelect->itemData(ui.pageTraining->CBSelect->currentIndex()).toString());
+ game->StartTraining(scriptName);
}
void HWForm::StartCampaign()
@@ -1140,6 +1177,9 @@
void HWForm::NetGameChangeStatus(bool isMaster)
{
+ ui.pageNetGame->pGameCFG->setEnabled(isMaster);
+ ui.pageNetGame->pNetTeamsWidget->setInteractivity(isMaster);
+
if (isMaster)
NetGameMaster();
else
@@ -1200,10 +1240,14 @@
ui.pageNetGame->pGameCFG->GameSchemes->setCurrentIndex(0);
}
-void HWForm::NetLeftRoom()
+void HWForm::NetLeftRoom(const QString & reason)
{
if (ui.Pages->currentIndex() == ID_PAGE_NETGAME || ui.Pages->currentIndex() == ID_PAGE_INGAME)
+ {
GoBack();
+ if (!reason.isEmpty())
+ ui.pageRoomsList->chatWidget->addLine("Notice",reason);
+ }
else
qWarning("Left room while not in room");
}
@@ -1231,7 +1275,8 @@
tmpdir.setFilter(QDir::Files);
QStringList userentries = tmpdir.entryList(QStringList("*#*.lua"));
//entries.sort();
- for(int i = 0; (i < userentries.count()) && (i <= team.CampaignProgress); i++)
+ unsigned int n = userentries.count();
+ for(unsigned int i = 0; (i < n) && (i <= team.campaignProgress()); i++)
ui.pageCampaign->CBSelect->addItem(QString(userentries[i]).replace(QRegExp("^(\\d+)#(.+)\\.lua"), QComboBox::tr("Mission") + " \\1: \\2").replace("_", " "), QString(userentries[i]).replace(QRegExp("^(.*)\\.lua"), "\\1"));
tmpdir.cd(datadir->absolutePath());
@@ -1239,7 +1284,8 @@
tmpdir.setFilter(QDir::Files);
QStringList entries = tmpdir.entryList(QStringList("*#*.lua"));
//entries.sort();
- for(int i = 0; (i < entries.count()) && (i <= team.CampaignProgress); i++) {
+ n = entries.count();
+ for(unsigned int i = 0; (i < n) && (i <= team.campaignProgress()); i++) {
if (userentries.contains(entries[i])) continue;
ui.pageCampaign->CBSelect->addItem(QString(entries[i]).replace(QRegExp("^(\\d+)#(.+)\\.lua"), QComboBox::tr("Mission") + " \\1: \\2").replace("_", " "), QString(entries[i]).replace(QRegExp("^(.*)\\.lua"), "\\1"));
}
--- a/QTfrontend/hwform.h Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/hwform.h Sat Oct 08 16:54:56 2011 +0200
@@ -52,13 +52,14 @@
Q_OBJECT
public:
- HWForm(QWidget *parent = 0);
+ HWForm(QWidget *parent = 0, QString styleSheet = "");
Ui_HWForm ui;
SDLInteraction sdli;
GameUIConfig * config;
QSettings * gameSettings; // Same file GameUIConfig points to but without the baggage. Needs sync() calls if you want to get GameUIConfig changes though
void updateXfire();
void PlayDemoQuick(const QString & demofilename);
+ void exit();
private slots:
void GoToSaves();
@@ -76,20 +77,16 @@
QString getDemoArguments();
void AssociateFiles();
void btnExitPressed();
- void btnExitClicked();
void IntermediateSetup();
void NewTeam();
- void EditTeam();
- void DeleteTeam();
- void RandomNames();
- void RandomName(const int &i);
- void TeamSave();
- void TeamDiscard();
+ void EditTeam(const QString & teamName);
+ void AfterTeamEdit();
+ void DeleteTeam(const QString & teamName);
void DeleteScheme();
void DeleteWeaponSet();
void SimpleGame();
void PlayDemo();
- void StartTraining();
+ void startTraining(const QString&);
void StartCampaign();
void NetConnect();
void NetConnectServer(const QString & host, quint16 port);
@@ -97,11 +94,18 @@
void NetStartServer();
void NetDisconnect();
void NetConnected();
+ void NetError(const QString & errmsg);
+ void NetWarning(const QString & wrnmsg);
void NetGameEnter();
+ void NetPassword(const QString & nick);
+ void NetNickTaken(const QString & nick);
+ void NetAuthFailed();
+ void NetTeamAccepted(const QString& team);
void AddNetTeam(const HWTeam& team);
+ void RemoveNetTeam(const HWTeam& team);
void StartMPGame();
void GameStateChanged(GameState gameState);
- void ForcedDisconnect();
+ void ForcedDisconnect(const QString & reason);
void ShowErrorMessage(const QString &);
void GetRecord(bool isDemo, const QByteArray & record);
void CreateNetGame();
@@ -115,13 +119,13 @@
void NetGameSlave();
void AsyncNetServerStart();
- void NetLeftRoom();
+ void NetLeftRoom(const QString & reason);
void selectFirstNetScheme();
void saveDemoWithCustomName();
private:
- void _NetConnect(const QString & hostName, quint16 port, const QString & nick);
+ void _NetConnect(const QString & hostName, quint16 port, QString nick);
void UpdateTeamsLists(const QStringList* editable_teams=0);
void CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo);
void closeEvent(QCloseEvent *event);
--- a/QTfrontend/hwmap.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2007 Ulyanov Igor <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "hwconsts.h"
-#include "hwmap.h"
-
-HWMap::HWMap() :
- TCPBase(false)
-{
-}
-
-HWMap::~HWMap()
-{
-}
-
-void HWMap::getImage(const QString & seed, int filter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData)
-{
- m_seed = seed;
- templateFilter = filter;
- m_mapgen = mapgen;
- m_maze_size = maze_size;
- if(mapgen == MAPGEN_DRAWN) m_drawMapData = drawMapData;
- Start();
-}
-
-QStringList HWMap::getArguments()
-{
- QStringList arguments;
- arguments << cfgdir->absolutePath();
- arguments << QString("%1").arg(ipc_port);
- arguments << "landpreview";
- return arguments;
-}
-
-void HWMap::onClientDisconnect()
-{
- if (readbuffer.size() == 128 * 32 + 1)
- {
- quint8 *buf = (quint8*) readbuffer.constData();
- QImage im(buf, 256, 128, QImage::Format_Mono);
- im.setNumColors(2);
- emit HHLimitReceived(buf[128 * 32]);
- emit ImageReceived(im);
- }
-}
-
-void HWMap::SendToClientFirst()
-{
- SendIPC(QString("eseed %1").arg(m_seed).toUtf8());
- SendIPC(QString("e$template_filter %1").arg(templateFilter).toUtf8());
- SendIPC(QString("e$mapgen %1").arg(m_mapgen).toUtf8());
-
- switch (m_mapgen)
- {
- case MAPGEN_MAZE:
- SendIPC(QString("e$maze_size %1").arg(m_maze_size).toUtf8());
- break;
-
- case MAPGEN_DRAWN:
- {
- QByteArray data = m_drawMapData;
- while(data.size() > 0)
- {
- QByteArray tmp = data;
- tmp.truncate(200);
- SendIPC("edraw " + tmp);
- data.remove(0, 200);
- }
- break;
- }
- default: ;
- }
-
- SendIPC("!");
-}
--- a/QTfrontend/hwmap.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _HWMAP_INCLUDED
-#define _HWMAP_INCLUDED
-
-#include <QByteArray>
-#include <QString>
-#include <QImage>
-
-#include "tcpBase.h"
-
-enum MapGenerator
-{
- MAPGEN_REGULAR,
- MAPGEN_MAZE,
- MAPGEN_DRAWN,
- MAPGEN_MAP
-};
-
-class HWMap : public TCPBase
-{
- Q_OBJECT
-
- public:
- HWMap();
- virtual ~HWMap();
- void getImage(const QString & seed, int templateFilter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData);
-
- protected:
- virtual QStringList getArguments();
- virtual void onClientDisconnect();
- virtual void SendToClientFirst();
-
- signals:
- void ImageReceived(const QImage newImage);
- void HHLimitReceived(int hhLimit);
-
- private:
- QString m_seed;
- int templateFilter;
- MapGenerator m_mapgen;
- int m_maze_size;
- QByteArray m_drawMapData;
-
- private slots:
-};
-
-#endif // _HWMAP_INCLUDED
--- a/QTfrontend/igbox.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QPainter>
-#include <QPoint>
-#include <QStylePainter>
-#include <QStyleOptionGroupBox>
-
-#include "igbox.h"
-
-IconedGroupBox::IconedGroupBox(QWidget * parent)
- : QGroupBox(parent)
-{
-// Has issues with border-radius on children
-// setAttribute(Qt::WA_PaintOnScreen, true);
- titleLeftPadding = 49;
- contentTopPadding = 15;
-}
-
-void IconedGroupBox::setIcon(const QIcon & icon)
-{
- if (this->icon.isNull())
- setStyleSheet(QString(
- "IconedGroupBox{"
- "margin-top: 46px;"
- "margin-left: 12px;"
- "padding: %1px 2px 5px 2px;"
- "}"
- "IconedGroupBox::title{"
- "subcontrol-origin: margin;"
- "subcontrol-position: top left;"
- "padding-left: %2px;"
- "padding-top: %1px;"
- "text-align: left;"
- "}"
- ).arg(contentTopPadding).arg(titleLeftPadding)
- );
-
- this->icon = icon;
- repaint();
-}
-
-void IconedGroupBox::paintEvent(QPaintEvent * event)
-{
- Q_UNUSED(event);
-
- QStylePainter painter(this);
-
- QStyleOptionGroupBox option;
- initStyleOption(&option);
- painter.drawComplexControl(QStyle::CC_GroupBox, option);
-
- icon.paint(&painter, QRect(QPoint(0, 0), icon.actualSize(size())));
-}
-
-void IconedGroupBox::setTitleTextPadding(int px)
-{
- titleLeftPadding = px;
-}
-
-void IconedGroupBox::setContentTopPadding(int px)
-{
- contentTopPadding = px;
-}
--- a/QTfrontend/igbox.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _IGBOX_H
-#define _IGBOX_H
-
-#include <QGroupBox>
-#include <QIcon>
-
-class IconedGroupBox : public QGroupBox
-{
- Q_OBJECT
-
-public:
- IconedGroupBox(QWidget * parent = 0);
-
- void setIcon(const QIcon & icon);
- void setTitleTextPadding(int px);
- void setContentTopPadding(int px);
-protected:
- virtual void paintEvent(QPaintEvent * event);
-
-private:
- QIcon icon;
- int titleLeftPadding;
- int contentTopPadding;
-};
-
-#endif // _IGBOX_H
--- a/QTfrontend/input_ip.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QLineEdit>
-#include <QSpinBox>
-#include <QPushButton>
-#include <QGridLayout>
-#include <QLabel>
-
-#include "input_ip.h"
-
-HWHostPortDialog::HWHostPortDialog(QWidget* parent) : QDialog(parent)
-{
- QGridLayout * layout = new QGridLayout(this);
-
- QLabel * lbHost = new QLabel(this);
- lbHost->setText(QLabel::tr("Host:"));
- layout->addWidget(lbHost, 0, 0);
-
- QLabel * lbPort = new QLabel(this);
- lbPort->setText(QLabel::tr("Port:"));
- layout->addWidget(lbPort, 1, 0);
-
- leHost = new QLineEdit(this);
- layout->addWidget(leHost, 0, 1, 1, 2);
-
- sbPort = new QSpinBox(this);
- sbPort->setMinimum(0);
- sbPort->setMaximum(65535);
- layout->addWidget(sbPort, 1, 1, 1, 2);
-
- pbDefault = new QPushButton(this);
- pbDefault->setText(QPushButton::tr("default"));
- layout->addWidget(pbDefault, 1, 3);
-
- pbOK = new QPushButton(this);
- pbOK->setText(QPushButton::tr("OK"));
- pbOK->setDefault(true);
- layout->addWidget(pbOK, 3, 1);
-
- pbCancel = new QPushButton(this);
- pbCancel->setText(QPushButton::tr("Cancel"));
- layout->addWidget(pbCancel, 3, 2);
-
- connect(pbOK, SIGNAL(clicked()), this, SLOT(accept()));
- connect(pbCancel, SIGNAL(clicked()), this, SLOT(reject()));
- connect(pbDefault, SIGNAL(clicked()), this, SLOT(setDefaultPort()));
-}
-
-void HWHostPortDialog::setDefaultPort()
-{
- sbPort->setValue(46631);
-}
--- a/QTfrontend/input_ip.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-
-#ifndef INPUT_IP_H
-#define INPUT_IP_H
-
-#include <QDialog>
-#include <QHostAddress>
-
-class QLineEdit;
-class QSpinBox;
-class QPushButton;
-
-class HWHostPortDialog : public QDialog
-{
- Q_OBJECT
-public:
- HWHostPortDialog(QWidget* parent = 0);
-
- QLineEdit* leHost;
- QSpinBox* sbPort;
-
-private:
- QPushButton* pbOK;
- QPushButton* pbCancel;
- QPushButton * pbDefault;
-
-private slots:
- void setDefaultPort();
-};
-
-
-#endif // INPUT_IP_H
--- a/QTfrontend/itemNum.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Igor Ulyanov <iulyanov@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "itemNum.h"
-#include "hwform.h"
-
-#include <QMouseEvent>
-#include <QPainter>
-
-ItemNum::ItemNum(const QImage& im, const QImage& img, QWidget * parent, unsigned char min, unsigned char max) :
- QFrame(parent), m_im(im), m_img(img), infinityState(false), nonInteractive(false), minItems(min), maxItems(max),
- numItems(min+2 >= max ? min : min+2)
-{
- enabled = true;
- if(frontendEffects) setAttribute(Qt::WA_PaintOnScreen, true);
-}
-
-ItemNum::~ItemNum()
-{
-}
-
-void ItemNum::mousePressEvent ( QMouseEvent * event )
-{
- if(nonInteractive) return;
- if(event->button()==Qt::LeftButton && enabled) {
- event->accept();
- if((infinityState && numItems <= maxItems) || (!infinityState && numItems < maxItems)) {
- incItems();
- } else {
- numItems = minItems+1;
- // appears there's an emit in there
- decItems();
- }
- } else if (event->button()==Qt::RightButton && enabled) {
- event->accept();
- if(numItems > minItems) {
- decItems();
- } else {
- numItems = maxItems+(infinityState?0:-1);
- incItems();
- }
- } else {
- event->ignore();
- return;
- }
- repaint();
-}
-
-QSize ItemNum::sizeHint () const
-{
- return QSize((maxItems+1)*12, 32);
-}
-
-void ItemNum::paintEvent(QPaintEvent* event)
-{
- Q_UNUSED(event);
-
- QPainter painter(this);
-
- if (numItems==maxItems+1) {
- QRect target(0, 0, 100, 32);
- if (enabled) {
- painter.drawImage(target, QImage(":/res/infinity.png"));
- } else {
- painter.drawImage(target, QImage(":/res/infinitygrey.png"));
- }
- } else {
- for(int i=0; i<numItems; i++) {
- QRect target(11 * i, i % 2, 25, 35);
- if (enabled) {
- painter.drawImage(target, m_im);
- } else {
- painter.drawImage(target, m_img);
- }
- }
- }
-}
-
-unsigned char ItemNum::getItemsNum() const
-{
- return numItems;
-}
-
-void ItemNum::setItemsNum(const unsigned char num)
-{
- numItems=num;
- repaint();
-}
-
-void ItemNum::setInfinityState(bool value)
-{
- infinityState=value;
-}
-
-void ItemNum::setEnabled(bool value)
-{
- enabled=value;
- repaint();
-}
--- a/QTfrontend/itemNum.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Igor Ulyanov <iulyanov@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QFrame>
-#include <QImage>
-
-#ifndef _ITEM_NUM_INCLUDED
-#define _ITEM_NUM_INCLUDED
-
-class ItemNum : public QFrame
-{
- Q_OBJECT
-
- public:
- void setInfinityState(bool value);
- void setEnabled(bool value);
- unsigned char getItemsNum() const;
- void setItemsNum(const unsigned char num);
-
- private:
- QImage m_im;
- QImage m_img;
- bool infinityState;
- bool enabled;
-
- protected:
- ItemNum(const QImage& im, const QImage& img, QWidget * parent, unsigned char min=2, unsigned char max=8);
- virtual QSize sizeHint () const;
- virtual ~ItemNum()=0;
-
- bool nonInteractive;
- unsigned char minItems;
- unsigned char maxItems;
- unsigned char numItems;
-
- // from QWidget
- virtual void mousePressEvent ( QMouseEvent * event );
- virtual void paintEvent(QPaintEvent* event);
-
- // to be implemented in child
- virtual void incItems()=0;
- virtual void decItems()=0;
-};
-
-#endif // _ITEM_NUM_INCLUDED
--- a/QTfrontend/main.cpp Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/main.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -96,8 +96,8 @@
Q_INIT_RESOURCE(hedgewars);
- qApp->setStyleSheet
- (QString(
+ QString styleSheetFromHell =
+ QString(
"HWForm,QDialog{"
"background-image: url(\":/res/Background.png\");"
"background-position: bottom center;"
@@ -251,6 +251,8 @@
"subcontrol-origin: margin;"
"subcontrol-position: top left;"
"text-align: left;"
+ "left: 15px;"
+ "top: -4px;"
"}"
"QCheckBox::indicator:checked{"
@@ -315,8 +317,7 @@
"background-color: #ffcc00;"
"width: 8px;"
"}"
- )
- );
+ );
bindir->cd("bin"); // workaround over NSIS installer
@@ -484,7 +485,7 @@
CocoaInitializer initializer;
#endif
- app.form = new HWForm();
+ app.form = new HWForm(NULL,styleSheetFromHell);
app.form->show();
return app.exec();
--- a/QTfrontend/mapContainer.cpp Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/mapContainer.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -114,6 +114,8 @@
QString scheme;
QString weapons;
QList<QVariant> mapInfo;
+ bool isMission = mapLuaFile.exists();
+
QTextStream input(&mapCfgFile);
input >> theme;
input >> limit;
@@ -125,16 +127,22 @@
mapInfo.push_back(limit);
else
mapInfo.push_back(18);
- mapInfo.push_back(mapLuaFile.exists());
+
+
+ mapInfo.push_back(isMission);
+
if (scheme.isEmpty())
scheme = "locked";
scheme.replace("_", " ");
+
if (weapons.isEmpty())
weapons = "locked";
weapons.replace("_", " ");
+
mapInfo.push_back(scheme);
mapInfo.push_back(weapons);
- if(mapLuaFile.exists())
+
+ if(isMission)
{
chooseMap->insertItem(missionindex++,
// FIXME - need real icons. Disabling until then
@@ -509,14 +517,14 @@
{
int i = MAPGEN_MAP + 3 + numMissions + rand() % (chooseMap->count() - MAPGEN_MAP - 3 - numMissions);
chooseMap->setCurrentIndex(i);
- updatePreview();
+ mapChanged(i);
}
void HWMapContainer::setRandomMission()
{
int i = MAPGEN_MAP + 2 + rand() % numMissions;
chooseMap->setCurrentIndex(i);
- updatePreview();
+ mapChanged(i);
}
void HWMapContainer::setRandomSeed()
--- a/QTfrontend/misc.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2005-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "misc.h"
--- a/QTfrontend/misc.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2005-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _MISC_H
-#define _MISC_H
-
-
-#include <QObject>
-#include <QSpinBox>
-
-class FreqSpinBox : public QSpinBox
-{
- Q_OBJECT
-
-public:
- FreqSpinBox(QWidget* parent) : QSpinBox(parent)
- {
-
- }
-
- QString textFromValue(int value) const
- {
- if (!value)
- return tr("Never");
- else
- return tr("Every %1 turn", "", value).arg(value);
- }
-};
-
-
-#endif // _MISC_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/model/ammoSchemeModel.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,786 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2005-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QDebug>
+#include <QModelIndex>
+
+#include "ammoSchemeModel.h"
+#include "hwconsts.h"
+
+QList<QVariant> defaultScheme = QList<QVariant>()
+ << QVariant("Default") // name 0
+ << QVariant(false) // fortsmode 1
+ << QVariant(false) // team divide 2
+ << QVariant(false) // solid land 3
+ << QVariant(false) // border 4
+ << QVariant(false) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(false) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(false) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(false) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(false) // shared ammo 15
+ << QVariant(false) // disable girders 16
+ << QVariant(false) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(false) // inf. attack 19
+ << QVariant(false) // reset weps 20
+ << QVariant(false) // per hog ammo 21
+ << QVariant(false) // no wind 22
+ << QVariant(false) // more wind 23
+ << QVariant(false) // tag team 24
+ << QVariant(false) // bottom border 25
+ << QVariant(100) // damage modfier 26
+ << QVariant(45) // turn time 27
+ << QVariant(100) // init health 28
+ << QVariant(15) // sudden death 29
+ << QVariant(5) // case prob 30
+ << QVariant(3) // mines time 31
+ << QVariant(4) // mines number 32
+ << QVariant(0) // mine dud pct 33
+ << QVariant(2) // explosives 34
+ << QVariant(35) // health case pct 35
+ << QVariant(25) // health case amt 36
+ << QVariant(47) // water rise amt 37
+ << QVariant(5) // health dec amt 38
+ << QVariant(100) // rope modfier 39
+ << QVariant(100) // get away time 40
+ ;
+
+AmmoSchemeModel::AmmoSchemeModel(QObject* parent, const QString & fileName) :
+ QAbstractTableModel(parent),
+ fileConfig(fileName, QSettings::IniFormat)
+{
+ predefSchemesNames = QStringList()
+ << "Default"
+ << "Pro Mode"
+ << "Shoppa"
+ << "Clean Slate"
+ << "Minefield"
+ << "Barrel Mayhem"
+ << "Tunnel Hogs"
+ << "Fort Mode"
+ << "Timeless"
+ << "Thinking with Portals"
+ << "King Mode"
+ ;
+
+ numberOfDefaultSchemes = predefSchemesNames.size();
+
+ spNames = QStringList()
+ << "name" // 0
+ << "fortsmode" // 1
+ << "divteams" // 2
+ << "solidland" // 3
+ << "border" // 4
+ << "lowgrav" // 5
+ << "laser" // 6
+ << "invulnerability" // 7
+ << "resethealth" // 8
+ << "vampiric" // 9
+ << "karma" // 10
+ << "artillery" // 11
+ << "randomorder" // 12
+ << "king" // 13
+ << "placehog" // 14
+ << "sharedammo" // 15
+ << "disablegirders" // 16
+ << "disablelandobjects" // 17
+ << "aisurvival" // 18
+ << "infattack" // 19
+ << "resetweps" // 20
+ << "perhogammo" // 21
+ << "disablewind" // 22
+ << "morewind" // 23
+ << "tagteam" // 24
+ << "bottomborder" // 25
+ << "damagefactor" // 26
+ << "turntime" // 27
+ << "health" // 28
+ << "suddendeath" // 29
+ << "caseprobability" // 30
+ << "minestime" // 31
+ << "minesnum" // 32
+ << "minedudpct" // 33
+ << "explosives" // 34
+ << "healthprobability" // 35
+ << "healthcaseamount" // 36
+ << "waterrise" // 37
+ << "healthdecrease" // 38
+ << "ropepct" // 39
+ << "getawaytime" // 40
+ ;
+
+ QList<QVariant> proMode;
+ proMode
+ << predefSchemesNames[1] // name 0
+ << QVariant(false) // fortsmode 1
+ << QVariant(false) // team divide 2
+ << QVariant(false) // solid land 3
+ << QVariant(false) // border 4
+ << QVariant(false) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(false) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(false) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(false) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(true) // shared ammo 15
+ << QVariant(false) // disable girders 16
+ << QVariant(false) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(false) // inf. attack 19
+ << QVariant(false) // reset weps 20
+ << QVariant(false) // per hog ammo 21
+ << QVariant(false) // no wind 22
+ << QVariant(false) // more wind 23
+ << QVariant(false) // tag team 24
+ << QVariant(false) // bottom border 25
+ << QVariant(100) // damage modfier 26
+ << QVariant(15) // turn time 27
+ << QVariant(100) // init health 28
+ << QVariant(15) // sudden death 29
+ << QVariant(0) // case prob 30
+ << QVariant(3) // mines time 31
+ << QVariant(0) // mines number 32
+ << QVariant(0) // mine dud pct 33
+ << QVariant(2) // explosives 34
+ << QVariant(35) // health case pct 35
+ << QVariant(25) // health case amt 36
+ << QVariant(47) // water rise amt 37
+ << QVariant(5) // health dec amt 38
+ << QVariant(100) // rope modfier 39
+ << QVariant(100) // get away time 40
+ ;
+
+ QList<QVariant> shoppa;
+ shoppa
+ << predefSchemesNames[2] // name 0
+ << QVariant(false) // fortsmode 1
+ << QVariant(false) // team divide 2
+ << QVariant(true) // solid land 3
+ << QVariant(true) // border 4
+ << QVariant(false) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(false) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(false) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(false) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(true) // shared ammo 15
+ << QVariant(true) // disable girders 16
+ << QVariant(false) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(false) // inf. attack 19
+ << QVariant(true) // reset weps 20
+ << QVariant(false) // per hog ammo 21
+ << QVariant(false) // no wind 22
+ << QVariant(false) // more wind 23
+ << QVariant(false) // tag team 24
+ << QVariant(false) // bottom border 25
+ << QVariant(100) // damage modfier 26
+ << QVariant(30) // turn time 27
+ << QVariant(100) // init health 28
+ << QVariant(50) // sudden death 29
+ << QVariant(1) // case prob 30
+ << QVariant(3) // mines time 31
+ << QVariant(0) // mines number 32
+ << QVariant(0) // mine dud pct 33
+ << QVariant(0) // explosives 34
+ << QVariant(0) // health case pct 35
+ << QVariant(25) // health case amt 36
+ << QVariant(47) // water rise amt 37
+ << QVariant(5) // health dec amt 38
+ << QVariant(100) // rope modfier 39
+ << QVariant(100) // get away time 40
+ ;
+
+ QList<QVariant> cleanslate;
+ cleanslate
+ << predefSchemesNames[3] // name 0
+ << QVariant(false) // fortsmode 1
+ << QVariant(false) // team divide 2
+ << QVariant(false) // solid land 3
+ << QVariant(false) // border 4
+ << QVariant(false) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(true) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(false) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(false) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(false) // shared ammo 15
+ << QVariant(false) // disable girders 16
+ << QVariant(false) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(true) // inf. attack 19
+ << QVariant(true) // reset weps 20
+ << QVariant(false) // per hog ammo 21
+ << QVariant(false) // no wind 22
+ << QVariant(false) // more wind 23
+ << QVariant(false) // tag team 24
+ << QVariant(false) // bottom border 25
+ << QVariant(100) // damage modfier 26
+ << QVariant(45) // turn time 27
+ << QVariant(100) // init health 28
+ << QVariant(15) // sudden death 29
+ << QVariant(5) // case prob 30
+ << QVariant(3) // mines time 31
+ << QVariant(4) // mines number 32
+ << QVariant(0) // mine dud pct 33
+ << QVariant(2) // explosives 34
+ << QVariant(35) // health case pct 35
+ << QVariant(25) // health case amt 36
+ << QVariant(47) // water rise amt 37
+ << QVariant(5) // health dec amt 38
+ << QVariant(100) // rope modfier 39
+ << QVariant(100) // get away time 40
+ ;
+
+ QList<QVariant> minefield;
+ minefield
+ << predefSchemesNames[4] // name 0
+ << QVariant(false) // fortsmode 1
+ << QVariant(false) // team divide 2
+ << QVariant(false) // solid land 3
+ << QVariant(false) // border 4
+ << QVariant(false) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(false) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(false) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(false) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(true) // shared ammo 15
+ << QVariant(true) // disable girders 16
+ << QVariant(false) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(false) // inf. attack 19
+ << QVariant(false) // reset weps 20
+ << QVariant(false) // per hog ammo 21
+ << QVariant(false) // no wind 22
+ << QVariant(false) // more wind 23
+ << QVariant(false) // tag team 24
+ << QVariant(false) // bottom border 25
+ << QVariant(100) // damage modfier 26
+ << QVariant(30) // turn time 27
+ << QVariant(50) // init health 28
+ << QVariant(15) // sudden death 29
+ << QVariant(0) // case prob 30
+ << QVariant(0) // mines time 31
+ << QVariant(80) // mines number 32
+ << QVariant(0) // mine dud pct 33
+ << QVariant(0) // explosives 34
+ << QVariant(35) // health case pct 35
+ << QVariant(25) // health case amt 36
+ << QVariant(47) // water rise amt 37
+ << QVariant(5) // health dec amt 38
+ << QVariant(100) // rope modfier 39
+ << QVariant(100) // get away time 40
+ ;
+
+ QList<QVariant> barrelmayhem;
+ barrelmayhem
+ << predefSchemesNames[5] // name 0
+ << QVariant(false) // fortsmode 1
+ << QVariant(false) // team divide 2
+ << QVariant(false) // solid land 3
+ << QVariant(false) // border 4
+ << QVariant(false) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(false) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(false) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(false) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(true) // shared ammo 15
+ << QVariant(false) // disable girders 16
+ << QVariant(false) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(false) // inf. attack 19
+ << QVariant(false) // reset weps 20
+ << QVariant(false) // per hog ammo 21
+ << QVariant(false) // no wind 22
+ << QVariant(false) // more wind 23
+ << QVariant(false) // tag team 24
+ << QVariant(false) // bottom border 25
+ << QVariant(100) // damage modfier 26
+ << QVariant(30) // turn time 27
+ << QVariant(100) // init health 28
+ << QVariant(15) // sudden death 29
+ << QVariant(0) // case prob 30
+ << QVariant(0) // mines time 31
+ << QVariant(0) // mines number 32
+ << QVariant(0) // mine dud pct 33
+ << QVariant(80) // explosives 34
+ << QVariant(35) // health case pct 35
+ << QVariant(25) // health case amt 36
+ << QVariant(47) // water rise amt 37
+ << QVariant(5) // health dec amt 38
+ << QVariant(100) // rope modfier 39
+ << QVariant(100) // get away time 40
+ ;
+
+ QList<QVariant> tunnelhogs;
+ tunnelhogs
+ << predefSchemesNames[6] // name 0
+ << QVariant(false) // fortsmode 1
+ << QVariant(false) // team divide 2
+ << QVariant(false) // solid land 3
+ << QVariant(true) // border 4
+ << QVariant(false) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(false) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(false) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(false) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(true) // shared ammo 15
+ << QVariant(true) // disable girders 16
+ << QVariant(true) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(false) // inf. attack 19
+ << QVariant(false) // reset weps 20
+ << QVariant(false) // per hog ammo 21
+ << QVariant(false) // no wind 22
+ << QVariant(false) // more wind 23
+ << QVariant(false) // tag team 24
+ << QVariant(false) // bottom border 25
+ << QVariant(100) // damage modfier 26
+ << QVariant(30) // turn time 27
+ << QVariant(100) // init health 28
+ << QVariant(15) // sudden death 29
+ << QVariant(5) // case prob 30
+ << QVariant(3) // mines time 31
+ << QVariant(10) // mines number 32
+ << QVariant(10) // mine dud pct 33
+ << QVariant(10) // explosives 34
+ << QVariant(35) // health case pct 35
+ << QVariant(25) // health case amt 36
+ << QVariant(47) // water rise amt 37
+ << QVariant(5) // health dec amt 38
+ << QVariant(100) // rope modfier 39
+ << QVariant(100) // get away time 40
+ ;
+
+ QList<QVariant> forts;
+ forts
+ << predefSchemesNames[7] // name 0
+ << QVariant(true) // fortsmode 1
+ << QVariant(true) // team divide 2
+ << QVariant(false) // solid land 3
+ << QVariant(false) // border 4
+ << QVariant(true) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(false) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(false) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(false) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(false) // shared ammo 15
+ << QVariant(false) // disable girders 16
+ << QVariant(false) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(false) // inf. attack 19
+ << QVariant(false) // reset weps 20
+ << QVariant(false) // per hog ammo 21
+ << QVariant(false) // no wind 22
+ << QVariant(false) // more wind 23
+ << QVariant(false) // tag team 24
+ << QVariant(false) // bottom border 25
+ << QVariant(100) // damage modfier 26
+ << QVariant(45) // turn time 27
+ << QVariant(100) // init health 28
+ << QVariant(15) // sudden death 29
+ << QVariant(5) // case prob 30
+ << QVariant(3) // mines time 31
+ << QVariant(0) // mines number 32
+ << QVariant(0) // mine dud pct 33
+ << QVariant(0) // explosives 34
+ << QVariant(35) // health case pct 35
+ << QVariant(25) // health case amt 36
+ << QVariant(47) // water rise amt 37
+ << QVariant(5) // health dec amt 38
+ << QVariant(100) // rope modfier 39
+ << QVariant(100) // get away time 40
+ ;
+
+ QList<QVariant> timeless;
+ timeless
+ << predefSchemesNames[8] // name 0
+ << QVariant(false) // fortsmode 1
+ << QVariant(false) // team divide 2
+ << QVariant(false) // solid land 3
+ << QVariant(false) // border 4
+ << QVariant(false) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(false) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(false) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(false) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(false) // shared ammo 15
+ << QVariant(false) // disable girders 16
+ << QVariant(false) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(false) // inf. attack 19
+ << QVariant(false) // reset weps 20
+ << QVariant(true) // per hog ammo 21
+ << QVariant(false) // no wind 22
+ << QVariant(false) // more wind 23
+ << QVariant(false) // tag team 24
+ << QVariant(false) // bottom border 25
+ << QVariant(100) // damage modfier 26
+ << QVariant(9999) // turn time 27
+ << QVariant(100) // init health 28
+ << QVariant(15) // sudden death 29
+ << QVariant(5) // case prob 30
+ << QVariant(3) // mines time 31
+ << QVariant(5) // mines number 32
+ << QVariant(10) // mine dud pct 33
+ << QVariant(2) // explosives 34
+ << QVariant(35) // health case pct 35
+ << QVariant(30) // health case amt 36
+ << QVariant(0) // water rise amt 37
+ << QVariant(0) // health dec amt 38
+ << QVariant(100) // rope modfier 39
+ << QVariant(100) // get away time 40
+ ;
+
+ QList<QVariant> thinkingportals;
+ thinkingportals
+ << predefSchemesNames[9] // name 0
+ << QVariant(false) // fortsmode 1
+ << QVariant(false) // team divide 2
+ << QVariant(false) // solid land 3
+ << QVariant(false) // border 4
+ << QVariant(false) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(false) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(true) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(false) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(false) // shared ammo 15
+ << QVariant(false) // disable girders 16
+ << QVariant(false) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(false) // inf. attack 19
+ << QVariant(false) // reset weps 20
+ << QVariant(false) // per hog ammo 21
+ << QVariant(false) // no wind 22
+ << QVariant(false) // more wind 23
+ << QVariant(false) // tag team 24
+ << QVariant(false) // bottom border 25
+ << QVariant(100) // damage modfier 26
+ << QVariant(45) // turn time 27
+ << QVariant(100) // init health 28
+ << QVariant(15) // sudden death 29
+ << QVariant(2) // case prob 30
+ << QVariant(3) // mines time 31
+ << QVariant(5) // mines number 32
+ << QVariant(0) // mine dud pct 33
+ << QVariant(5) // explosives 34
+ << QVariant(25) // health case pct 35
+ << QVariant(25) // health case amt 36
+ << QVariant(47) // water rise amt 37
+ << QVariant(5) // health dec amt 38
+ << QVariant(100) // rope modfier 39
+ << QVariant(100) // get away time 40
+ ;
+
+ QList<QVariant> kingmode;
+ kingmode
+ << predefSchemesNames[10] // name 0
+ << QVariant(false) // fortsmode 1
+ << QVariant(false) // team divide 2
+ << QVariant(false) // solid land 3
+ << QVariant(false) // border 4
+ << QVariant(false) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(false) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(false) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(true) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(false) // shared ammo 15
+ << QVariant(false) // disable girders 16
+ << QVariant(false) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(false) // inf. attack 19
+ << QVariant(false) // reset weps 20
+ << QVariant(false) // per hog ammo 21
+ << QVariant(false) // no wind 22
+ << QVariant(false) // more wind 23
+ << QVariant(false) // tag team 24
+ << QVariant(false) // bottom border 25
+ << QVariant(100) // damage modfier 26
+ << QVariant(45) // turn time 27
+ << QVariant(100) // init health 28
+ << QVariant(15) // sudden death 29
+ << QVariant(5) // case prob 30
+ << QVariant(3) // mines time 31
+ << QVariant(4) // mines number 32
+ << QVariant(0) // mine dud pct 33
+ << QVariant(2) // explosives 34
+ << QVariant(35) // health case pct 35
+ << QVariant(25) // health case amt 36
+ << QVariant(47) // water rise amt 37
+ << QVariant(5) // health dec amt 38
+ << QVariant(100) // rope modfier 39
+ << QVariant(100) // get away time 40
+ ;
+
+
+ schemes.append(defaultScheme);
+ schemes.append(proMode);
+ schemes.append(shoppa);
+ schemes.append(cleanslate);
+ schemes.append(minefield);
+ schemes.append(barrelmayhem);
+ schemes.append(tunnelhogs);
+ schemes.append(forts);
+ schemes.append(timeless);
+ schemes.append(thinkingportals);
+ schemes.append(kingmode);
+
+
+ int size = fileConfig.beginReadArray("schemes");
+ for (int i = 0; i < size; ++i) {
+ fileConfig.setArrayIndex(i);
+
+ if (!predefSchemesNames.contains(fileConfig.value(spNames[0]).toString()))
+ {
+ QList<QVariant> scheme;
+
+ for (int k = 0; k < spNames.size(); ++k)
+ scheme << fileConfig.value(spNames[k], defaultScheme[k]);
+
+ schemes.append(scheme);
+ }
+ }
+ fileConfig.endArray();
+}
+
+QVariant AmmoSchemeModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+ Q_UNUSED(section);
+ Q_UNUSED(orientation);
+ Q_UNUSED(role);
+
+ return QVariant();
+}
+
+int AmmoSchemeModel::rowCount(const QModelIndex &parent) const
+{
+ if (parent.isValid())
+ return 0;
+ else
+ return schemes.size();
+}
+
+int AmmoSchemeModel::columnCount(const QModelIndex & parent) const
+{
+ if (parent.isValid())
+ return 0;
+ else
+ return defaultScheme.size();
+}
+
+Qt::ItemFlags AmmoSchemeModel::flags(const QModelIndex & index) const
+{
+ Q_UNUSED(index);
+
+ return
+ Qt::ItemIsEnabled
+ | Qt::ItemIsSelectable
+ | Qt::ItemIsEditable;
+}
+
+bool AmmoSchemeModel::setData(const QModelIndex & index, const QVariant & value, int role)
+{
+ if (!index.isValid() || index.row() < numberOfDefaultSchemes
+ || index.row() >= schemes.size()
+ || index.column() >= defaultScheme.size()
+ || role != Qt::EditRole)
+ return false;
+
+ schemes[index.row()][index.column()] = value;
+
+ emit dataChanged(index, index);
+ return true;
+}
+
+bool AmmoSchemeModel::insertRows(int row, int count, const QModelIndex & parent)
+{
+ Q_UNUSED(count);
+
+ beginInsertRows(parent, schemes.size(), schemes.size());
+
+ if (row == -1)
+ {
+ QList<QVariant> newScheme = defaultScheme;
+ newScheme[0] = QVariant(tr("new"));
+ schemes.insert(schemes.size(), newScheme);
+ }
+ else
+ {
+ QList<QVariant> newScheme = schemes[row];
+ newScheme[0] = QVariant(tr("copy of") + " " + newScheme[0].toString());
+ schemes.insert(schemes.size(), newScheme);
+ }
+
+ endInsertRows();
+
+ return true;
+}
+
+bool AmmoSchemeModel::removeRows(int row, int count, const QModelIndex & parent)
+{
+ if(count != 1
+ || row < numberOfDefaultSchemes
+ || row >= schemes.size())
+ return false;
+
+ beginRemoveRows(parent, row, row);
+
+ schemes.removeAt(row);
+
+ endRemoveRows();
+
+ return true;
+}
+
+QVariant AmmoSchemeModel::data(const QModelIndex &index, int role) const
+{
+ if (!index.isValid() || index.row() < 0
+ || index.row() >= schemes.size()
+ || index.column() >= defaultScheme.size()
+ || (role != Qt::EditRole && role != Qt::DisplayRole)
+ )
+ return QVariant();
+
+ return schemes[index.row()][index.column()];
+}
+
+void AmmoSchemeModel::Save()
+{
+ fileConfig.beginWriteArray("schemes", schemes.size() - numberOfDefaultSchemes);
+
+ for (int i = 0; i < schemes.size() - numberOfDefaultSchemes; ++i) {
+ fileConfig.setArrayIndex(i);
+
+ QList<QVariant> scheme = schemes[i + numberOfDefaultSchemes];
+
+ for (int k = 0; k < scheme.size(); ++k)
+ fileConfig.setValue(spNames[k], scheme[k]);
+ }
+ fileConfig.endArray();
+}
+
+
+NetAmmoSchemeModel::NetAmmoSchemeModel(QObject * parent) :
+ QAbstractTableModel(parent)
+{
+ netScheme = defaultScheme;
+}
+
+QVariant NetAmmoSchemeModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+ Q_UNUSED(section);
+ Q_UNUSED(orientation);
+ Q_UNUSED(role);
+
+ return QVariant();
+}
+
+int NetAmmoSchemeModel::rowCount(const QModelIndex & parent) const
+{
+ if (parent.isValid())
+ return 0;
+ else
+ return 1;
+}
+
+int NetAmmoSchemeModel::columnCount(const QModelIndex & parent) const
+{
+ if (parent.isValid())
+ return 0;
+ else
+ return defaultScheme.size();
+}
+
+QVariant NetAmmoSchemeModel::data(const QModelIndex &index, int role) const
+{
+ if (!index.isValid() || index.row() < 0
+ || index.row() > 1
+ || index.column() >= defaultScheme.size()
+ || (role != Qt::EditRole && role != Qt::DisplayRole)
+ )
+ return QVariant();
+
+ return netScheme[index.column()];
+}
+
+void NetAmmoSchemeModel::setNetSchemeConfig(QStringList & cfg)
+{
+ if(cfg.size() != netScheme.size())
+ {
+ qWarning("Incorrect scheme cfg size");
+ return;
+ }
+
+ for(int i = 0; i < cfg.size(); ++i)
+ netScheme[i] = QVariant(cfg[i]);
+
+ reset();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/model/ammoSchemeModel.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,79 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2005-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _AMMO_SCHEME_MODEL_INCLUDED
+#define _AMMO_SCHEME_MODEL_INCLUDED
+
+#include <QSettings>
+#include <QAbstractTableModel>
+#include <QStringList>
+#include <QList>
+
+class AmmoSchemeModel : public QAbstractTableModel
+{
+ Q_OBJECT
+
+public:
+ AmmoSchemeModel(QObject * parent, const QString & fileName);
+
+ QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+ int rowCount(const QModelIndex & parent) const;
+ int columnCount(const QModelIndex & parent) const;
+ Qt::ItemFlags flags(const QModelIndex & index) const;
+ bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole);
+ bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex());
+ bool removeRows(int row, int count, const QModelIndex & parent = QModelIndex());
+ QVariant data(const QModelIndex &index, int role) const;
+
+ int numberOfDefaultSchemes;
+ QStringList predefSchemesNames;
+ QStringList spNames;
+
+public slots:
+ void Save();
+
+signals:
+ void dataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight);
+
+protected:
+ QList< QList<QVariant> > schemes;
+
+private:
+ QSettings fileConfig;
+};
+
+class NetAmmoSchemeModel : public QAbstractTableModel
+{
+ Q_OBJECT
+
+public:
+ NetAmmoSchemeModel(QObject * parent);
+
+ QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+ int rowCount(const QModelIndex & parent) const;
+ int columnCount(const QModelIndex & parent) const;
+ QVariant data(const QModelIndex &index, int role) const;
+
+public slots:
+ void setNetSchemeConfig(QStringList & cfg);
+
+private:
+ QList<QVariant> netScheme;
+};
+
+#endif // _AMMO_SCHEME_MODEL_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/model/hats.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,142 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QDir>
+#include <QPixmap>
+#include <QPainter>
+#include "hwconsts.h"
+#include "hwform.h"
+#include "hats.h"
+
+HatsModel::HatsModel(QObject* parent) :
+ QAbstractListModel(parent)
+{
+ QFile hhfile;
+ hhfile.setFileName(cfgdir->absolutePath() + "/Data/Graphics/Hedgehog/Idle.png");
+ if (!hhfile.exists()) hhfile.setFileName(datadir->absolutePath() + "/Graphics/Hedgehog/Idle.png");
+ QPixmap hhpix = QPixmap(QFileInfo(hhfile).absoluteFilePath()).copy(0, 0, 32, 32);
+
+ QDir tmpdir;
+ tmpdir.cd(cfgdir->absolutePath());
+ tmpdir.cd("Data");
+ tmpdir.cd("Graphics");
+ tmpdir.cd("Hats");
+
+ tmpdir.setFilter(QDir::Files);
+
+ QStringList userhatsList = tmpdir.entryList(QStringList("*.png"));
+ for (QStringList::Iterator it = userhatsList.begin(); it != userhatsList.end(); ++it )
+ {
+ QString str = QString(*it).replace(QRegExp("^(.*)\\.png"), "\\1");
+ QPixmap pix(cfgdir->absolutePath() + "/Data/Graphics/Hats/" + str + ".png");
+
+ QPixmap tmppix(32, 37);
+ tmppix.fill(QColor(Qt::transparent));
+
+ QPainter painter(&tmppix);
+ painter.drawPixmap(QPoint(0, 5), hhpix);
+ painter.drawPixmap(QPoint(0, 0), pix.copy(0, 0, 32, 32));
+ if(pix.width() > 32)
+ painter.drawPixmap(QPoint(0, 0), pix.copy(32, 0, 32, 32));
+ painter.end();
+
+ hats.append(qMakePair(str, QIcon(tmppix)));
+ }
+
+ tmpdir.cd(datadir->absolutePath());
+ tmpdir.cd("Graphics");
+ tmpdir.cd("Hats");
+
+ QStringList hatsList = tmpdir.entryList(QStringList("*.png"));
+ for (QStringList::Iterator it = hatsList.begin(); it != hatsList.end(); ++it )
+ {
+ if (userhatsList.contains(*it,Qt::CaseInsensitive)) continue;
+ QString str = (*it).replace(QRegExp("^(.*)\\.png"), "\\1");
+ QPixmap pix(datadir->absolutePath() + "/Graphics/Hats/" + str + ".png");
+
+ QPixmap tmppix(32, 37);
+ tmppix.fill(QColor(Qt::transparent));
+
+ QPainter painter(&tmppix);
+ painter.drawPixmap(QPoint(0, 5), hhpix);
+ painter.drawPixmap(QPoint(0, 0), pix.copy(0, 0, 32, 32));
+ if(pix.width() > 32)
+ painter.drawPixmap(QPoint(0, 0), pix.copy(32, 0, 32, 32));
+ painter.end();
+
+ hats.append(qMakePair(str, QIcon(tmppix)));
+ }
+ // Reserved hats
+ tmpdir.cd("Reserved");
+ hatsList = tmpdir.entryList(QStringList(playerHash+"*.png"));
+ for (QStringList::Iterator it = hatsList.begin(); it != hatsList.end(); ++it )
+ {
+ QString str = (*it).replace(QRegExp("^(.*)\\.png"), "\\1");
+ QPixmap pix(datadir->absolutePath() + "/Graphics/Hats/Reserved/" + str + ".png");
+
+ QPixmap tmppix(32, 37);
+ tmppix.fill(QColor(Qt::transparent));
+
+ QPainter painter(&tmppix);
+ painter.drawPixmap(QPoint(0, 5), hhpix);
+ painter.drawPixmap(QPoint(0, 0), pix.copy(0, 0, 32, 32));
+ painter.end();
+
+ hats.append(qMakePair("Reserved "+str.remove(0,32), QIcon(tmppix)));
+ }
+}
+
+QVariant HatsModel::headerData(int section,
+ Qt::Orientation orientation, int role) const
+{
+ Q_UNUSED(section);
+ Q_UNUSED(orientation);
+ Q_UNUSED(role);
+
+ return QVariant();
+}
+
+int HatsModel::rowCount(const QModelIndex &parent) const
+{
+ if (parent.isValid())
+ return 0;
+ else
+ return hats.size();
+}
+
+/*int HatsModel::columnCount(const QModelIndex & parent) const
+{
+ if (parent.isValid())
+ return 0;
+ else
+ return 2;
+}
+*/
+QVariant HatsModel::data(const QModelIndex &index,
+ int role) const
+{
+ if (!index.isValid() || index.row() < 0
+ || index.row() >= hats.size()
+ || (role != Qt::DisplayRole && role != Qt::DecorationRole))
+ return QVariant();
+
+ if (role == Qt::DisplayRole)
+ return hats.at(index.row()).first;
+ else // role == Qt::DecorationRole
+ return hats.at(index.row()).second;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/model/hats.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,44 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _HATS_INCLUDED
+#define _HATS_INCLUDED
+
+#include <QAbstractListModel>
+#include <QStringList>
+#include <QVector>
+#include <QPair>
+#include <QIcon>
+
+class HatsModel : public QAbstractListModel
+{
+ Q_OBJECT
+
+public:
+ HatsModel(QObject *parent = 0);
+
+ QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+ int rowCount(const QModelIndex & parent) const;
+ //int columnCount(const QModelIndex & parent) const;
+
+ QVariant data(const QModelIndex &index, int role) const;
+protected:
+ QVector<QPair<QString, QIcon> > hats;
+};
+
+#endif // _HATS_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/model/netserverslist.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,68 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QUdpSocket>
+#include <QListWidget>
+
+#include "netserverslist.h"
+
+HWNetServersModel::HWNetServersModel(QObject* parent) :
+ QAbstractTableModel(parent)
+{
+
+}
+
+void HWNetServersModel::updateList()
+{
+
+}
+
+QVariant HWNetServersModel::headerData(int section,
+ Qt::Orientation orientation, int role) const
+{
+ if (role != Qt::DisplayRole)
+ return QVariant();
+
+ if (orientation == Qt::Horizontal)
+ {
+ switch (section)
+ {
+ case 0: return tr("Title");
+ case 1: return tr("IP");
+ case 2: return tr("Port");
+ default: return QVariant();
+ }
+ } else
+ return QString("%1").arg(section + 1);
+}
+
+int HWNetServersModel::rowCount(const QModelIndex &parent) const
+{
+ if (parent.isValid())
+ return 0;
+ else
+ return games.size();
+}
+
+int HWNetServersModel::columnCount(const QModelIndex & parent) const
+{
+ if (parent.isValid())
+ return 0;
+ else
+ return 3;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/model/netserverslist.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,43 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _NET_SERVERSLIST_INCLUDED
+#define _NET_SERVERSLIST_INCLUDED
+
+#include <QAbstractTableModel>
+#include <QStringList>
+
+class HWNetServersModel : public QAbstractTableModel
+{
+ Q_OBJECT
+
+public:
+ HWNetServersModel(QObject *parent = 0);
+
+ QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+ int rowCount(const QModelIndex & parent) const;
+ int columnCount(const QModelIndex & parent) const;
+
+public slots:
+ virtual void updateList();
+
+protected:
+ QList<QStringList> games;
+};
+
+#endif // _NET_SERVERSLIST_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/model/themesmodel.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,49 @@
+
+#include "themesmodel.h"
+
+ThemesModel::ThemesModel(QStringList themes, QObject *parent) :
+ QAbstractListModel(parent)
+{
+#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
+ m_data.reserve(themes.size());
+#endif
+
+ foreach(QString theme, themes)
+ {
+ m_data.append(QHash<int, QVariant>());
+ m_data.last().insert(Qt::DisplayRole, theme);
+ }
+}
+
+int ThemesModel::rowCount(const QModelIndex &parent) const
+{
+ if(parent.isValid())
+ return 0;
+ else
+ return m_data.size();
+}
+
+QVariant ThemesModel::data(const QModelIndex &index, int role) const
+{
+ if(index.column() > 0 || index.row() >= m_data.size())
+ return QVariant();
+ else
+ return m_data.at(index.row()).value(role);
+}
+
+bool ThemesModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+ if(index.column() > 0 || index.row() >= m_data.size())
+ return false;
+ else
+ {
+ m_data[index.row()].insert(role, value);
+
+ return true;
+ }
+
+}
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/model/themesmodel.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,28 @@
+#ifndef THEMESMODEL_H
+#define THEMESMODEL_H
+
+#include <QAbstractListModel>
+#include <QStringList>
+#include <QHash>
+
+class ThemesModel : public QAbstractListModel
+{
+ Q_OBJECT
+public:
+ explicit ThemesModel(QStringList themes, QObject *parent = 0);
+
+ int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ QVariant data(const QModelIndex &index, int role) const;
+ bool setData(const QModelIndex &index, const QVariant &value,
+ int role = Qt::EditRole);
+
+signals:
+
+public slots:
+
+private:
+
+ QList<QHash<int, QVariant> > m_data;
+};
+
+#endif // THEMESMODEL_H
--- a/QTfrontend/namegen.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2009 Martin Minarik <ttsmj@pokec.sk>
- * Copyright (c) 2009-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QFile>
-#include <QTextStream>
-#include <QStringList>
-#include <QLineEdit>
-#include "namegen.h"
-#include "hwform.h"
-#include "hwconsts.h"
-
-
-HWNamegen::HWNamegen() :
- TypesAvliable(false)
-{
-
- TypesLoad();
-}
-
-HWNamegen::~HWNamegen()
-{
-}
-
-
-
-void HWNamegen::TeamRandomName(HWTeam*& team, const int HedgehogNumber)
-{
- RandomNameByHat(team, HedgehogNumber);
-}
-
-void HWNamegen::TeamRandomNames(HWTeam*& team, const bool changeteamname)
-{
- if ((TypesHatnames.size() > 0) && TypesAvliable){
-
- int kind = (rand()%(TypesHatnames.size()));
-
- if (changeteamname){
- if (TypesTeamnames[kind].size() > 0){
- team->TeamName = TypesTeamnames[kind][rand()%(TypesTeamnames[kind].size())];
- }
- team->Grave = GetRandomGrave();
- team->Fort = GetRandomFort();
- team->Voicepack = "Default";
- }
-
- //give each hedgehog a random name:
- //TODO: load the dictionary only once! (right now it's loaded once for each hedgehog)
- for(int i = 0; i < 8; i++)
- {
- if ((TypesHatnames[kind].size()) > 0){
- team->Hedgehogs[i].Hat = TypesHatnames[kind][rand()%(TypesHatnames[kind].size())];
- }
- RandomNameByHat(team,i);
- }
-
- }
-
-}
-
-
-void HWNamegen::RandomNameByHat(HWTeam*& team, const int HedgehogNumber)
-{
- QStringList Dictionaries;
- HatCfgLoad(team->Hedgehogs[HedgehogNumber].Hat,Dictionaries);
-
- QStringList Dictionary;
- DictLoad(Dictionaries[rand()%(Dictionaries.size())],Dictionary);
-
- team->Hedgehogs[HedgehogNumber].Name = Dictionary[rand()%(Dictionary.size())];
-}
-
-void HWNamegen::DictLoad(const QString filename, QStringList &list)
-{
- list.clear();
-
- QFile file;
- file.setFileName(QString("%1/Data/Names/%2.txt").arg(cfgdir->absolutePath()).arg(filename));
- if (!file.exists()) file.setFileName(QString("%1/Names/%2.txt").arg(datadir->absolutePath()).arg(filename));
- if (file.open(QIODevice::ReadOnly | QIODevice::Text))
- {
-
- QTextStream in(&file);
- while (!in.atEnd()) {
- QString line = in.readLine();
- if(line != QString(""))
- {list.append(line);}
- }
- }
-
- if (list.size()==0)
- list.append(filename);
-
-}
-
-
-void HWNamegen::HatCfgLoad(const QString hatname, QStringList &list)
-{
- list.clear();
-
- QFile file;
- file.setFileName(QString("%1/Data/Names/%2.cfg").arg(cfgdir->absolutePath()).arg(hatname));
- if (!file.exists()) file.setFileName(QString("%1/Names/%2.cfg").arg(datadir->absolutePath()).arg(hatname));
- if (file.open(QIODevice::ReadOnly | QIODevice::Text))
- {
-
- QTextStream in(&file);
- while (!in.atEnd()) {
- QString line = in.readLine();
- if(line != QString(""))
- {list.append(line);}
- }
- }
-
- if (list.size()==0)
- list.append(QString("generic"));
-
-}
-
-
-void HWNamegen::TypesLoad()
-{
- QFile file;
- file.setFileName(QString("%1/Data/Names/types.ini").arg(cfgdir->absolutePath()));
- if (!file.exists()) file.setFileName(QString("%1/Names/types.ini").arg(datadir->absolutePath()));
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
- {TypesAvliable = FALSE; return;}
-
- int counter = 0; //counter starts with 0 (teamnames mode)
- TypesTeamnames.append(QStringList());
- TypesHatnames.append(QStringList());
-
- QTextStream in(&file);
- while (!in.atEnd()) {
- QString line = in.readLine();
- if (line == QString("#####")){
- counter++; //toggle mode (teamnames || hats)
- if ((counter%2) == 0){
- TypesTeamnames.append(QStringList());
- TypesHatnames.append(QStringList());
- }
- } else if ((line == QString("*****")) || (line == QString("*END*"))){
- TypesAvliable = TRUE; return; // bye bye
- } else {
- if ((counter%2) == 0){ // even => teamnames mode
- TypesTeamnames[(counter/2)].append(line);
- } else { // odd => hats mode
- TypesHatnames[((counter-1)/2)].append(line);
- }
- }
-// Types.append(line);
- }
- TypesAvliable = TRUE;
- return;
-}
-
-
-
-QString HWNamegen::GetRandomGrave()
-{
- QStringList Graves;
-
- //list all available Graves
- QDir tmpdir;
- tmpdir.cd(cfgdir->absolutePath());
- tmpdir.cd("Data/Graphics/Graves");
- tmpdir.setFilter(QDir::Files);
- Graves.append(tmpdir.entryList(QStringList("*.png")).replaceInStrings(QRegExp("^(.*)\\.png"), "\\1"));
-
- tmpdir.cd(datadir->absolutePath());
- tmpdir.cd("Graphics/Graves");
- tmpdir.setFilter(QDir::Files);
- QStringList tmpList = tmpdir.entryList(QStringList("*.png")).replaceInStrings(QRegExp("^(.*)\\.png"), "\\1");
- for (QStringList::Iterator it = tmpList.begin(); it != tmpList.end(); ++it)
- if (!Graves.contains(*it,Qt::CaseInsensitive)) Graves.append(*it);
-
- if(Graves.size()==0)
- {
- //do some serious error handling
- return "Error";
- }
-
- //pick a random grave
- return Graves[rand()%(Graves.size())];
-}
-
-QString HWNamegen::GetRandomFort()
-{
- QStringList Forts;
-
- //list all available Forts
- QDir tmpdir;
- tmpdir.cd(datadir->absolutePath());
- tmpdir.cd("Forts");
- tmpdir.setFilter(QDir::Files);
- Forts.append(tmpdir.entryList(QStringList("*L.png")).replaceInStrings(QRegExp("^(.*)L\\.png"), "\\1"));
-
- if(Forts.size()==0)
- {
- //do some serious error handling
- return "Error";
- }
-
- //pick a random fort
- return Forts[rand()%(Forts.size())];
-}
--- a/QTfrontend/namegen.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2009 Martin Minarik <ttsmj@pokec.sk>
- * Copyright (c) 2009-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef NAMEGEN_H
-#define NAMEGEN_H
-
-#include <QString>
-
-class HWForm;
-class HWTeam;
-
-class HWNamegen
-{
-public:
- HWNamegen();
- ~HWNamegen();
-
- void TeamRandomName(HWTeam*& team, const int HedgehogNumber);
- void TeamRandomNames(HWTeam*& team, const bool changeteamname);
- void RandomNameByHat(HWTeam*& team, const int HedgehogNumber);
-
-private:
-
- QList<QStringList> TypesTeamnames;
- QList<QStringList> TypesHatnames;
- bool TypesAvliable;
- void TypesLoad();
- void DictLoad(const QString filename, QStringList &list);
- void HatCfgLoad(const QString hatname, QStringList &list);
-
- QString GetRandomGrave();
- QString GetRandomFort();
-};
-
-
-
-#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/hwmap.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,91 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2007 Ulyanov Igor <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "hwconsts.h"
+#include "hwmap.h"
+
+HWMap::HWMap() :
+ TCPBase(false)
+{
+}
+
+HWMap::~HWMap()
+{
+}
+
+void HWMap::getImage(const QString & seed, int filter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData)
+{
+ m_seed = seed;
+ templateFilter = filter;
+ m_mapgen = mapgen;
+ m_maze_size = maze_size;
+ if(mapgen == MAPGEN_DRAWN) m_drawMapData = drawMapData;
+ Start();
+}
+
+QStringList HWMap::getArguments()
+{
+ QStringList arguments;
+ arguments << cfgdir->absolutePath();
+ arguments << QString("%1").arg(ipc_port);
+ arguments << "landpreview";
+ return arguments;
+}
+
+void HWMap::onClientDisconnect()
+{
+ if (readbuffer.size() == 128 * 32 + 1)
+ {
+ quint8 *buf = (quint8*) readbuffer.constData();
+ QImage im(buf, 256, 128, QImage::Format_Mono);
+ im.setNumColors(2);
+ emit HHLimitReceived(buf[128 * 32]);
+ emit ImageReceived(im);
+ }
+}
+
+void HWMap::SendToClientFirst()
+{
+ SendIPC(QString("eseed %1").arg(m_seed).toUtf8());
+ SendIPC(QString("e$template_filter %1").arg(templateFilter).toUtf8());
+ SendIPC(QString("e$mapgen %1").arg(m_mapgen).toUtf8());
+
+ switch (m_mapgen)
+ {
+ case MAPGEN_MAZE:
+ SendIPC(QString("e$maze_size %1").arg(m_maze_size).toUtf8());
+ break;
+
+ case MAPGEN_DRAWN:
+ {
+ QByteArray data = m_drawMapData;
+ while(data.size() > 0)
+ {
+ QByteArray tmp = data;
+ tmp.truncate(200);
+ SendIPC("edraw " + tmp);
+ data.remove(0, 200);
+ }
+ break;
+ }
+ default: ;
+ }
+
+ SendIPC("!");
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/hwmap.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,65 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _HWMAP_INCLUDED
+#define _HWMAP_INCLUDED
+
+#include <QByteArray>
+#include <QString>
+#include <QImage>
+
+#include "tcpBase.h"
+
+enum MapGenerator
+{
+ MAPGEN_REGULAR,
+ MAPGEN_MAZE,
+ MAPGEN_DRAWN,
+ MAPGEN_MAP
+};
+
+class HWMap : public TCPBase
+{
+ Q_OBJECT
+
+ public:
+ HWMap();
+ virtual ~HWMap();
+ void getImage(const QString & seed, int templateFilter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData);
+
+ protected:
+ virtual QStringList getArguments();
+ virtual void onClientDisconnect();
+ virtual void SendToClientFirst();
+
+ signals:
+ void ImageReceived(const QImage newImage);
+ void HHLimitReceived(int hhLimit);
+
+ private:
+ QString m_seed;
+ int templateFilter;
+ MapGenerator m_mapgen;
+ int m_maze_size;
+ QByteArray m_drawMapData;
+
+ private slots:
+};
+
+#endif // _HWMAP_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/netregister.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,31 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "netregister.h"
+
+HWNetRegisterServer::HWNetRegisterServer(QObject *parent, const QString & descr, quint16 port) :
+ QObject(parent)
+{
+ Q_UNUSED(descr);
+ Q_UNUSED(port);
+}
+
+void HWNetRegisterServer::unregister()
+{
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/netregister.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,35 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _NET_REGISTER_INCLUDED
+#define _NET_REGISTER_INCLUDED
+
+#include <QObject>
+
+class HWNetRegisterServer : public QObject
+{
+ Q_OBJECT
+
+public:
+ HWNetRegisterServer(QObject *parent, const QString & descr, quint16 port);
+
+public slots:
+ virtual void unregister();
+};
+
+#endif // _NET_REGISTER_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/netserver.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,52 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QMessageBox>
+
+#include "hwconsts.h"
+#include "netserver.h"
+
+HWNetServer::~HWNetServer()
+{
+ StopServer();
+}
+
+bool HWNetServer::StartServer(quint16 port)
+{
+ ds_port = port;
+
+ QStringList params;
+ params << QString("--port=%1").arg(port);
+ params << "--dedicated=False";
+
+ process.start(bindir->absolutePath() + "/hedgewars-server", params);
+
+ return process.waitForStarted(5000);
+}
+
+void HWNetServer::StopServer()
+{
+ process.close();
+}
+
+
+quint16 HWNetServer::getRunningPort() const
+{
+ return ds_port;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/netserver.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,42 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _NETSERVER_INCLUDED
+#define _NETSERVER_INCLUDED
+
+#include <QObject>
+#include <QProcess>
+
+class HWNetServer : public QObject
+{
+ Q_OBJECT
+
+public:
+ ~HWNetServer();
+ bool StartServer(quint16 port);
+ void StopServer();
+ QString getRunningHostName() const;
+ quint16 getRunningPort() const;
+
+private:
+ quint16 ds_port;
+ QProcess process;
+};
+
+#endif // _NETSERVER_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/netudpserver.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,51 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2007-2008 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QUdpSocket>
+
+#include "netudpserver.h"
+
+HWNetUdpServer::HWNetUdpServer(QObject *parent, const QString & descr, quint16 port) :
+ HWNetRegisterServer(parent, descr, port),
+ m_descr(descr)
+{
+ pUdpSocket = new QUdpSocket(this);
+ pUdpSocket->bind(46631);
+ connect(pUdpSocket, SIGNAL(readyRead()), this, SLOT(onClientRead()));
+}
+
+void HWNetUdpServer::onClientRead()
+{
+ while (pUdpSocket->hasPendingDatagrams()) {
+ QByteArray datagram;
+ datagram.resize(pUdpSocket->pendingDatagramSize());
+ QHostAddress clientAddr;
+ quint16 clientPort;
+ pUdpSocket->readDatagram(datagram.data(), datagram.size(), &clientAddr, &clientPort);
+ if(datagram.startsWith("hedgewars client")) {
+ // send answer to client
+ pUdpSocket->writeDatagram(QString("hedgewars server\n%1").arg(m_descr).toUtf8(), clientAddr, clientPort);
+ }
+ }
+}
+
+void HWNetUdpServer::unregister()
+{
+ deleteLater();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/netudpserver.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,46 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2007-2008 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _NET_UDPSERVER_INCLUDED
+#define _NET_UDPSERVER_INCLUDED
+
+#include <QObject>
+#include "netregister.h"
+
+class QUdpSocket;
+
+class HWNetUdpServer : public HWNetRegisterServer
+{
+ Q_OBJECT
+
+ public:
+ HWNetUdpServer(QObject *parent, const QString & descr, quint16 port);
+
+ public slots:
+ void unregister();
+
+ private slots:
+ void onClientRead();
+
+ private:
+ QUdpSocket* pUdpSocket;
+ QString m_descr;
+};
+
+#endif // _NET_UDPSERVER_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/netudpwidget.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,72 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QUdpSocket>
+
+#include "netudpwidget.h"
+
+HWNetUdpModel::HWNetUdpModel(QObject* parent) :
+ HWNetServersModel(parent)
+{
+ pUdpSocket = new QUdpSocket(this);
+
+ pUdpSocket->bind();
+ connect(pUdpSocket, SIGNAL(readyRead()), this, SLOT(onClientRead()));
+}
+
+void HWNetUdpModel::updateList()
+{
+ games.clear();
+
+ reset();
+
+ pUdpSocket->writeDatagram("hedgewars client", QHostAddress::Broadcast, 46631);
+}
+
+void HWNetUdpModel::onClientRead()
+{
+ while (pUdpSocket->hasPendingDatagrams()) {
+ QByteArray datagram;
+ datagram.resize(pUdpSocket->pendingDatagramSize());
+ QHostAddress clientAddr;
+ quint16 clientPort;
+
+ pUdpSocket->readDatagram(datagram.data(), datagram.size(), &clientAddr, &clientPort);
+
+ QString packet = QString::fromUtf8(datagram.data());
+ if(packet.startsWith("hedgewars server")) {
+ QStringList sl;
+ sl << packet.remove(0, 17) << clientAddr.toString() << "46631";
+ games.append(sl);
+ }
+ }
+
+ reset();
+}
+
+QVariant HWNetUdpModel::data(const QModelIndex &index,
+ int role) const
+{
+ if (!index.isValid() || index.row() < 0
+ || index.row() >= games.size()
+ || role != Qt::DisplayRole)
+ return QVariant();
+
+ return games[index.row()][index.column()];
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/netudpwidget.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,46 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _NET_UDPWIDGET_INCLUDED
+#define _NET_UDPWIDGET_INCLUDED
+
+#include "netserverslist.h"
+
+class QUdpSocket;
+
+class HWNetUdpModel : public HWNetServersModel
+{
+ Q_OBJECT
+
+public:
+ HWNetUdpModel(QObject *parent = 0);
+
+ QVariant data(const QModelIndex &index, int role) const;
+
+public slots:
+ void updateList();
+
+private slots:
+ void onClientRead();
+
+private:
+ QUdpSocket* pUdpSocket;
+};
+
+#endif // _NET_UDPWIDGET_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/newnetclient.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,786 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QDebug>
+#include <QInputDialog>
+#include <QCryptographicHash>
+
+#include "hwconsts.h"
+#include "newnetclient.h"
+#include "proto.h"
+#include "game.h"
+
+char delimeter='\n';
+
+HWNewNet::HWNewNet() :
+ isChief(false),
+ m_game_connected(false),
+ loginStep(0),
+ netClientState(Disconnected)
+{
+// socket stuff
+ connect(&NetSocket, SIGNAL(readyRead()), this, SLOT(ClientRead()));
+ connect(&NetSocket, SIGNAL(connected()), this, SLOT(OnConnect()));
+ connect(&NetSocket, SIGNAL(disconnected()), this, SLOT(OnDisconnect()));
+ connect(&NetSocket, SIGNAL(error(QAbstractSocket::SocketError)), this,
+ SLOT(displayError(QAbstractSocket::SocketError)));
+}
+
+HWNewNet::~HWNewNet()
+{
+ if (m_game_connected)
+ {
+ RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("User quit"));
+ emit disconnected(tr("User quit"));
+ }
+ NetSocket.flush();
+}
+
+void HWNewNet::Connect(const QString & hostName, quint16 port, const QString & nick)
+{
+ netClientState = Connecting;
+ mynick = nick;
+ myhost = hostName + QString(":%1").arg(port);
+ NetSocket.connectToHost(hostName, port);
+}
+
+void HWNewNet::Disconnect()
+{
+ if (m_game_connected)
+ RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("User quit"));
+ m_game_connected = false;
+
+ NetSocket.disconnectFromHost();
+}
+
+void HWNewNet::CreateRoom(const QString & room)
+{
+ if(netClientState != InLobby)
+ {
+ qWarning("Illegal try to create room!");
+ return;
+ }
+
+ myroom = room;
+
+ RawSendNet(QString("CREATE_ROOM%1%2").arg(delimeter).arg(room));
+ isChief = true;
+}
+
+void HWNewNet::JoinRoom(const QString & room)
+{
+ if(netClientState != InLobby)
+ {
+ qWarning("Illegal try to join room!");
+ return;
+ }
+
+ myroom = room;
+
+ RawSendNet(QString("JOIN_ROOM%1%2").arg(delimeter).arg(room));
+ isChief = false;
+}
+
+void HWNewNet::AddTeam(const HWTeam & team)
+{
+ QString cmd = QString("ADD_TEAM") + delimeter +
+ team.name() + delimeter +
+ team.color().name() + delimeter +
+ team.grave() + delimeter +
+ team.fort() + delimeter +
+ team.voicepack() + delimeter +
+ team.flag() + delimeter +
+ QString::number(team.difficulty());
+
+ for(int i = 0; i < HEDGEHOGS_PER_TEAM; ++i)
+ {
+ cmd.append(delimeter);
+ cmd.append(team.hedgehog(i).Name);
+ cmd.append(delimeter);
+ cmd.append(team.hedgehog(i).Hat);
+ }
+ RawSendNet(cmd);
+}
+
+void HWNewNet::RemoveTeam(const HWTeam & team)
+{
+ RawSendNet(QString("REMOVE_TEAM") + delimeter + team.name());
+}
+
+void HWNewNet::NewNick(const QString & nick)
+{
+ RawSendNet(QString("NICK%1%2").arg(delimeter).arg(nick));
+}
+
+void HWNewNet::ToggleReady()
+{
+ RawSendNet(QString("TOGGLE_READY"));
+}
+
+void HWNewNet::SendNet(const QByteArray & buf)
+{
+ QString msg = QString(buf.toBase64());
+
+ RawSendNet(QString("EM%1%2").arg(delimeter).arg(msg));
+}
+
+void HWNewNet::RawSendNet(const QString & str)
+{
+ RawSendNet(str.toUtf8());
+}
+
+void HWNewNet::RawSendNet(const QByteArray & buf)
+{
+ qDebug() << "Client: " << QString(buf).split("\n");
+ NetSocket.write(buf);
+ NetSocket.write("\n\n", 2);
+}
+
+void HWNewNet::ClientRead()
+{
+ while (NetSocket.canReadLine()) {
+ QString s = QString::fromUtf8(NetSocket.readLine());
+ if (s.endsWith('\n')) s.chop(1);
+
+ if (s.size() == 0) {
+ ParseCmd(cmdbuf);
+ cmdbuf.clear();
+ } else
+ cmdbuf << s;
+ }
+}
+
+void HWNewNet::OnConnect()
+{
+ netClientState = Connected;
+}
+
+void HWNewNet::OnDisconnect()
+{
+ netClientState = Disconnected;
+ if(m_game_connected) emit disconnected("");
+ m_game_connected = false;
+}
+
+void HWNewNet::displayError(QAbstractSocket::SocketError socketError)
+{
+ m_game_connected = false;
+
+ switch (socketError) {
+ case QAbstractSocket::RemoteHostClosedError:
+ break;
+ case QAbstractSocket::HostNotFoundError:
+ emit disconnected(tr("The host was not found. Please check the host name and port settings."));
+ break;
+ case QAbstractSocket::ConnectionRefusedError:
+ emit disconnected(tr("Connection refused"));
+ break;
+ default:
+ emit disconnected(NetSocket.errorString());
+ }
+}
+
+void HWNewNet::SendPasswordHash(const QString & hash)
+{
+ RawSendNet(QString("PASSWORD%1%2").arg(delimeter).arg(hash));
+}
+
+void HWNewNet::ParseCmd(const QStringList & lst)
+{
+ qDebug() << "Server: " << lst;
+
+ if(!lst.size())
+ {
+ qWarning("Net client: Bad message");
+ return;
+ }
+
+ if (lst[0] == "NICK")
+ {
+ mynick = lst[1];
+ return ;
+ }
+
+ if (lst[0] == "PROTO")
+ return ;
+
+ if (lst[0] == "ERROR") {
+ if (lst.size() == 2)
+ emit Error(lst[1]);
+ else
+ emit Error("Unknown error");
+ return;
+ }
+
+ if (lst[0] == "WARNING") {
+ if (lst.size() == 2)
+ emit Warning(lst[1]);
+ else
+ emit Warning("Unknown warning");
+ return;
+ }
+
+ if (lst[0] == "CONNECTED") {
+ if(lst.size() < 3 || lst[2].toInt() < cMinServerVersion)
+ {
+ // TODO: Warn user, disconnect
+ qWarning() << "Server too old";
+ }
+
+ RawSendNet(QString("NICK%1%2").arg(delimeter).arg(mynick));
+ RawSendNet(QString("PROTO%1%2").arg(delimeter).arg(*cProtoVer));
+ netClientState = Connected;
+ m_game_connected = true;
+ emit adminAccess(false);
+ return;
+ }
+
+ if (lst[0] == "PING") {
+ if (lst.size() > 1)
+ RawSendNet(QString("PONG%1%2").arg(delimeter).arg(lst[1]));
+ else
+ RawSendNet(QString("PONG"));
+ return;
+ }
+
+ if (lst[0] == "ROOMS") {
+ QStringList tmp = lst;
+ tmp.removeFirst();
+ emit roomsList(tmp);
+ return;
+ }
+
+ if (lst[0] == "SERVER_MESSAGE") {
+ if(lst.size() < 2)
+ {
+ qWarning("Net: Empty SERVERMESSAGE message");
+ return;
+ }
+ emit serverMessage(lst[1]);
+ return;
+ }
+
+ if (lst[0] == "CHAT") {
+ if(lst.size() < 3)
+ {
+ qWarning("Net: Empty CHAT message");
+ return;
+ }
+ if (netClientState == InLobby)
+ emit chatStringLobby(lst[1], HWProto::formatChatMsgForFrontend(lst[2]));
+ else
+ emit chatStringFromNet(HWProto::formatChatMsg(lst[1], lst[2]));
+ return;
+ }
+
+ if (lst[0] == "INFO") {
+ if(lst.size() < 5)
+ {
+ qWarning("Net: Malformed INFO message");
+ return;
+ }
+ QStringList tmp = lst;
+ tmp.removeFirst();
+ if (netClientState == InLobby)
+ emit chatStringLobby(tmp.join("\n").prepend('\x01'));
+ else
+ emit chatStringFromNet(tmp.join("\n").prepend('\x01'));
+ return;
+ }
+
+ if (lst[0] == "SERVER_VARS") {
+ QStringList tmp = lst;
+ tmp.removeFirst();
+ while (tmp.size() >= 2)
+ {
+ if(tmp[0] == "MOTD_NEW") emit serverMessageNew(tmp[1]);
+ else if(tmp[0] == "MOTD_OLD") emit serverMessageOld(tmp[1]);
+ else if(tmp[0] == "LATEST_PROTO") emit latestProtocolVar(tmp[1].toInt());
+
+ tmp.removeFirst();
+ tmp.removeFirst();
+ }
+ return;
+ }
+
+ if (lst[0] == "CLIENT_FLAGS")
+ {
+ if(lst.size() < 3 || lst[1].size() < 2)
+ {
+ qWarning("Net: Malformed CLIENT_FLAGS message");
+ return;
+ }
+
+ QString flags = lst[1];
+ bool setFlag = flags[0] == '+';
+
+ while(flags.size() > 1)
+ {
+ flags.remove(0, 1);
+ char c = flags[0].toAscii();
+
+ switch(c)
+ {
+ case 'r':
+ {
+ for(int i = 2; i < lst.size(); ++i)
+ {
+ if (lst[i] == mynick)
+ emit setMyReadyStatus(setFlag);
+ emit setReadyStatus(lst[i], setFlag);
+ }
+ }
+ }
+ }
+
+ return;
+ }
+
+ if (lst[0] == "ADD_TEAM") {
+ if(lst.size() != 24)
+ {
+ qWarning("Net: Bad ADDTEAM message");
+ return;
+ }
+ QStringList tmp = lst;
+ tmp.removeFirst();
+ emit AddNetTeam(tmp);
+ return;
+ }
+
+ if (lst[0] == "REMOVE_TEAM") {
+ if(lst.size() != 2)
+ {
+ qWarning("Net: Bad REMOVETEAM message");
+ return;
+ }
+ emit RemoveNetTeam(HWTeam(lst[1]));
+ return;
+ }
+
+ if(lst[0] == "ROOMABANDONED") {
+ netClientState = InLobby;
+ emit LeftRoom(tr("Room destroyed"));
+ return;
+ }
+
+ if(lst[0] == "KICKED") {
+ netClientState = InLobby;
+ emit LeftRoom(tr("You got kicked"));
+ return;
+ }
+
+ if(lst[0] == "JOINED") {
+ if(lst.size() < 2)
+ {
+ qWarning("Net: Bad JOINED message");
+ return;
+ }
+
+ for(int i = 1; i < lst.size(); ++i)
+ {
+ if (lst[i] == mynick)
+ {
+ netClientState = InRoom;
+ emit EnteredGame();
+ emit roomMaster(isChief);
+ if (isChief)
+ emit configAsked();
+ }
+
+ emit nickAdded(lst[i], isChief && (lst[i] != mynick));
+ emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
+ }
+ return;
+ }
+
+ if(lst[0] == "LOBBY:JOINED") {
+ if(lst.size() < 2)
+ {
+ qWarning("Net: Bad JOINED message");
+ return;
+ }
+
+ for(int i = 1; i < lst.size(); ++i)
+ {
+ if (lst[i] == mynick)
+ {
+ netClientState = InLobby;
+ RawSendNet(QString("LIST"));
+ emit connected();
+ }
+
+ emit nickAddedLobby(lst[i], false);
+ emit chatStringLobby(lst[i], tr("%1 *** %2 has joined").arg('\x03').arg("|nick|"));
+ }
+ return;
+ }
+
+ if(lst[0] == "LEFT") {
+ if(lst.size() < 2)
+ {
+ qWarning("Net: Bad LEFT message");
+ return;
+ }
+ emit nickRemoved(lst[1]);
+ if (lst.size() < 3)
+ emit chatStringFromNet(tr("%1 *** %2 has left").arg('\x03').arg(lst[1]));
+ else
+ emit chatStringFromNet(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1], lst[2]));
+ return;
+ }
+
+ if(lst[0] == "ROOM") {
+ if(lst.size() < 2)
+ {
+ qWarning("Net: Bad ROOM message");
+ return;
+ }
+ RawSendNet(QString("LIST"));
+ return;
+ }
+
+ if(lst[0] == "LOBBY:LEFT") {
+ if(lst.size() < 2)
+ {
+ qWarning("Net: Bad LOBBY:LEFT message");
+ return;
+ }
+ emit nickRemovedLobby(lst[1]);
+ if (lst.size() < 3)
+ emit chatStringLobby(tr("%1 *** %2 has left").arg('\x03').arg(lst[1]));
+ else
+ emit chatStringLobby(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1], lst[2]));
+ return;
+ }
+
+ if (lst[0] == "RUN_GAME") {
+ netClientState = InGame;
+ emit AskForRunGame();
+ return;
+ }
+
+ if (lst[0] == "ASKPASSWORD") {
+ emit AskForPassword(mynick);
+ return;
+ }
+
+ if (lst[0] == "NOTICE") {
+ if(lst.size() < 2)
+ {
+ qWarning("Net: Bad NOTICE message");
+ return;
+ }
+
+ bool ok;
+ int n = lst[1].toInt(&ok);
+ if(!ok)
+ {
+ qWarning("Net: Bad NOTICE message");
+ return;
+ }
+
+ handleNotice(n);
+
+ return;
+ }
+
+ if (lst[0] == "TEAM_ACCEPTED") {
+ if (lst.size() != 2)
+ {
+ qWarning("Net: Bad TEAM_ACCEPTED message");
+ return;
+ }
+ emit TeamAccepted(lst[1]);
+ return;
+ }
+
+
+ if (lst[0] == "CFG") {
+ if(lst.size() < 3)
+ {
+ qWarning("Net: Bad CFG message");
+ return;
+ }
+ QStringList tmp = lst;
+ tmp.removeFirst();
+ tmp.removeFirst();
+ if (lst[1] == "SCHEME")
+ emit netSchemeConfig(tmp);
+ else
+ emit paramChanged(lst[1], tmp);
+ return;
+ }
+
+ if (lst[0] == "HH_NUM") {
+ if (lst.size() != 3)
+ {
+ qWarning("Net: Bad TEAM_ACCEPTED message");
+ return;
+ }
+ HWTeam tmptm(lst[1]);
+ tmptm.setNumHedgehogs(lst[2].toUInt());
+ emit hhnumChanged(tmptm);
+ return;
+ }
+
+ if (lst[0] == "TEAM_COLOR") {
+ if (lst.size() != 3)
+ {
+ qWarning("Net: Bad TEAM_COLOR message");
+ return;
+ }
+ HWTeam tmptm(lst[1]);
+ tmptm.setColor(QColor(lst[2]));
+ emit teamColorChanged(tmptm);
+ return;
+ }
+
+ if (lst[0] == "EM") {
+ if(lst.size() < 2)
+ {
+ qWarning("Net: Bad EM message");
+ return;
+ }
+ for(int i = 1; i < lst.size(); ++i)
+ {
+ QByteArray em = QByteArray::fromBase64(lst[i].toAscii());
+ emit FromNet(em);
+ }
+ return;
+ }
+
+ if (lst[0] == "BYE") {
+ if (lst.size() < 2)
+ {
+ qWarning("Net: Bad BYE message");
+ return;
+ }
+ if (lst[1] == "Authentication failed")
+ {
+ emit AuthFailed();
+ }
+ m_game_connected = false;
+ Disconnect();
+ emit disconnected(lst[1]);
+ return;
+ }
+
+
+ if (lst[0] == "ADMIN_ACCESS") {
+ emit adminAccess(true);
+ return;
+ }
+
+ if (lst[0] == "ROOM_CONTROL_ACCESS") {
+ if (lst.size() < 2)
+ {
+ qWarning("Net: Bad ROOM_CONTROL_ACCESS message");
+ return;
+ }
+ isChief = (lst[1] != "0");
+ emit roomMaster(isChief);
+ return;
+ }
+
+ qWarning() << "Net: Unknown message:" << lst;
+}
+
+void HWNewNet::onHedgehogsNumChanged(const HWTeam& team)
+{
+ if (isChief)
+ RawSendNet(QString("HH_NUM%1%2%1%3")
+ .arg(delimeter)
+ .arg(team.name())
+ .arg(team.numHedgehogs()));
+}
+
+void HWNewNet::onTeamColorChanged(const HWTeam& team)
+{
+ if (isChief)
+ RawSendNet(QString("TEAM_COLOR%1%2%1%3")
+ .arg(delimeter)
+ .arg(team.name())
+ .arg(team.color().name()));
+}
+
+void HWNewNet::onParamChanged(const QString & param, const QStringList & value)
+{
+ if (isChief)
+ RawSendNet(
+ QString("CFG%1%2%1%3")
+ .arg(delimeter)
+ .arg(param)
+ .arg(value.join(QString(delimeter)))
+ );
+}
+
+void HWNewNet::chatLineToNet(const QString& str)
+{
+ if(str != "") {
+ RawSendNet(QString("CHAT") + delimeter + str);
+ emit(chatStringFromMe(HWProto::formatChatMsg(mynick, str)));
+ }
+}
+
+void HWNewNet::chatLineToLobby(const QString& str)
+{
+ if(str != "") {
+ RawSendNet(QString("CHAT") + delimeter + str);
+ emit(chatStringFromMeLobby(HWProto::formatChatMsg(mynick, str)));
+ }
+}
+
+void HWNewNet::SendTeamMessage(const QString& str)
+{
+ RawSendNet(QString("TEAMCHAT") + delimeter + str);
+}
+
+void HWNewNet::askRoomsList()
+{
+ if(netClientState != InLobby)
+ {
+ qWarning("Illegal try to get rooms list!");
+ return;
+ }
+ RawSendNet(QString("LIST"));
+}
+
+HWNewNet::ClientState HWNewNet::clientState()
+{
+ return netClientState;
+}
+
+QString HWNewNet::getNick()
+{
+ return mynick;
+}
+
+QString HWNewNet::getRoom()
+{
+ return myroom;
+}
+
+QString HWNewNet::getHost()
+{
+ return myhost;
+}
+
+bool HWNewNet::isRoomChief()
+{
+ return isChief;
+}
+
+void HWNewNet::gameFinished(bool correctly)
+{
+ if (netClientState == InGame) netClientState = InRoom;
+ RawSendNet(QString("ROUNDFINISHED%1%2").arg(delimeter).arg(correctly ? "1" : "0"));
+}
+
+void HWNewNet::banPlayer(const QString & nick)
+{
+ RawSendNet(QString("BAN%1%2").arg(delimeter).arg(nick));
+}
+
+void HWNewNet::kickPlayer(const QString & nick)
+{
+ RawSendNet(QString("KICK%1%2").arg(delimeter).arg(nick));
+}
+
+void HWNewNet::infoPlayer(const QString & nick)
+{
+ RawSendNet(QString("INFO%1%2").arg(delimeter).arg(nick));
+}
+
+void HWNewNet::followPlayer(const QString & nick)
+{
+ if (!isInRoom()) {
+ RawSendNet(QString("FOLLOW%1%2").arg(delimeter).arg(nick));
+ isChief = false;
+ }
+}
+
+void HWNewNet::startGame()
+{
+ RawSendNet(QString("START_GAME"));
+}
+
+void HWNewNet::updateRoomName(const QString & name)
+{
+ RawSendNet(QString("ROOM_NAME%1%2").arg(delimeter).arg(name));
+}
+
+
+void HWNewNet::toggleRestrictJoins()
+{
+ RawSendNet(QString("TOGGLE_RESTRICT_JOINS"));
+}
+
+void HWNewNet::toggleRestrictTeamAdds()
+{
+ RawSendNet(QString("TOGGLE_RESTRICT_TEAMS"));
+}
+
+void HWNewNet::clearAccountsCache()
+{
+ RawSendNet(QString("CLEAR_ACCOUNTS_CACHE"));
+}
+
+void HWNewNet::partRoom()
+{
+ netClientState = InLobby;
+ RawSendNet(QString("PART"));
+}
+
+bool HWNewNet::isInRoom()
+{
+ return netClientState >= InRoom;
+}
+
+void HWNewNet::setServerMessageNew(const QString & msg)
+{
+ RawSendNet(QString("SET_SERVER_VAR%1MOTD_NEW%1%2").arg(delimeter).arg(msg));
+}
+
+void HWNewNet::setServerMessageOld(const QString & msg)
+{
+ RawSendNet(QString("SET_SERVER_VAR%1MOTD_OLD%1%2").arg(delimeter).arg(msg));
+}
+
+void HWNewNet::setLatestProtocolVar(int proto)
+{
+ RawSendNet(QString("SET_SERVER_VAR%1LATEST_PROTO%1%2").arg(delimeter).arg(proto));
+}
+
+void HWNewNet::askServerVars()
+{
+ RawSendNet(QString("GET_SERVER_VAR"));
+}
+
+void HWNewNet::handleNotice(int n)
+{
+ switch(n)
+ {
+ case 0:
+ {
+ emit NickTaken(mynick);
+ break;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/newnetclient.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,177 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _NEW_NETCLIENT_INCLUDED
+#define _NEW_NETCLIENT_INCLUDED
+
+#include <QObject>
+#include <QString>
+#include <QTcpSocket>
+#include <QMap>
+
+#include "team.h"
+#include "game.h" // for GameState
+
+class GameUIConfig;
+class GameCFGWidget;
+class TeamSelWidget;
+
+extern char delimeter;
+
+class HWNewNet : public QObject
+{
+ Q_OBJECT
+
+ public:
+ enum ClientState { Disconnected, Connecting, Connected, InLobby, InRoom, InGame };
+
+ HWNewNet();
+ ~HWNewNet();
+ void Connect(const QString & hostName, quint16 port, const QString & nick);
+ void Disconnect();
+ void SendPasswordHash(const QString & hash);
+ void NewNick(const QString & nick);
+ bool isRoomChief();
+ bool isInRoom();
+ ClientState clientState();
+ QString getNick();
+ QString getRoom();
+ QString getHost();
+
+ private:
+ bool isChief;
+ QString mynick;
+ QString myroom;
+ QString myhost;
+ QTcpSocket NetSocket;
+ QString seed;
+ bool m_game_connected;
+
+ template <typename T>
+ void SendCfgStrNet(T a) {
+ QByteArray strmsg;
+ strmsg.append(a);
+ quint8 sz = strmsg.size();
+ QByteArray enginemsg = QByteArray((char *)&sz, 1) + strmsg;
+ QString _msg = delimeter + QString(enginemsg.toBase64());
+ RawSendNet(_msg);
+ }
+
+ template <typename T>
+ void SendCfgStrLoc(T a) {
+ QByteArray strmsg;
+ strmsg.append(QString(a).toUtf8());
+ quint8 sz = strmsg.size();
+ QByteArray enginemsg = QByteArray((char *)&sz, 1) + strmsg;
+ emit FromNet(enginemsg);
+ }
+
+ QStringList cmdbuf;
+
+ void RawSendNet(const QString & buf);
+ void RawSendNet(const QByteArray & buf);
+ void ParseCmd(const QStringList & lst);
+ void handleNotice(int n);
+
+ int loginStep;
+ ClientState netClientState;
+
+ signals:
+ void AskForRunGame();
+ void connected();
+ void disconnected(const QString & reason);
+ void Error(const QString & errmsg);
+ void Warning(const QString & wrnmsg);
+ void AskForPassword(const QString & nick);
+ void NickTaken(const QString & nick);
+ void AuthFailed();
+ void EnteredGame();
+ void LeftRoom(const QString & reason);
+ void nickAdded(const QString& nick, bool notifyNick);
+ void nickRemoved(const QString& nick);
+ void nickAddedLobby(const QString& nick, bool notifyNick);
+ void nickRemovedLobby(const QString& nick);
+ void FromNet(const QByteArray & buf);
+ void adminAccess(bool);
+ void roomMaster(bool);
+
+ void netSchemeConfig(QStringList &);
+ void paramChanged(const QString & param, const QStringList & value);
+ void configAsked();
+
+ void TeamAccepted(const QString&);
+ void AddNetTeam(const HWTeam&);
+ void RemoveNetTeam(const HWTeam&);
+ void hhnumChanged(const HWTeam&);
+ void teamColorChanged(const HWTeam&);
+ void chatStringLobby(const QString&);
+ void chatStringLobby(const QString&, const QString&);
+ void chatStringFromNet(const QString&);
+ void chatStringFromMe(const QString&);
+ void chatStringFromMeLobby(const QString&);
+
+ void roomsList(const QStringList&);
+ void serverMessage(const QString &);
+ void serverMessageNew(const QString &);
+ void serverMessageOld(const QString &);
+ void latestProtocolVar(int);
+
+ void setReadyStatus(const QString & nick, bool isReady);
+ void setMyReadyStatus(bool isReady);
+
+ public slots:
+ void ToggleReady();
+ void chatLineToNet(const QString& str);
+ void chatLineToLobby(const QString& str);
+ void SendTeamMessage(const QString& str);
+ void SendNet(const QByteArray & buf);
+ void AddTeam(const HWTeam & team);
+ void RemoveTeam(const HWTeam& team);
+ void onHedgehogsNumChanged(const HWTeam& team);
+ void onTeamColorChanged(const HWTeam& team);
+ void onParamChanged(const QString & param, const QStringList & value);
+
+ void setServerMessageNew(const QString &);
+ void setServerMessageOld(const QString &);
+ void setLatestProtocolVar(int proto);
+ void askServerVars();
+
+ void JoinRoom(const QString & room);
+ void CreateRoom(const QString & room);
+ void updateRoomName(const QString &);
+ void askRoomsList();
+ void gameFinished(bool correcly);
+ void banPlayer(const QString &);
+ void kickPlayer(const QString &);
+ void infoPlayer(const QString &);
+ void followPlayer(const QString &);
+ void startGame();
+ void toggleRestrictJoins();
+ void toggleRestrictTeamAdds();
+ void partRoom();
+ void clearAccountsCache();
+
+ private slots:
+ void ClientRead();
+ void OnConnect();
+ void OnDisconnect();
+ void displayError(QAbstractSocket::SocketError socketError);
+};
+
+#endif // _NEW_NETCLIENT_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/proto.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,59 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "proto.h"
+
+HWProto::HWProto()
+{
+
+}
+
+QByteArray & HWProto::addByteArrayToBuffer(QByteArray & buf, const QByteArray & msg)
+{
+ QByteArray bmsg = msg;
+ bmsg = bmsg.left(250);
+ quint8 sz = bmsg.size();
+ buf.append(QByteArray((char *)&sz, 1));
+ buf.append(bmsg);
+ return buf;
+}
+
+QByteArray & HWProto::addStringToBuffer(QByteArray & buf, const QString & string)
+{
+ return addByteArrayToBuffer(buf, string.toUtf8());
+}
+
+QByteArray & HWProto::addStringListToBuffer(QByteArray & buf, const QStringList & strList)
+{
+ for (int i = 0; i < strList.size(); i++)
+ addStringToBuffer(buf, strList[i]);
+ return buf;
+}
+
+QString HWProto::formatChatMsgForFrontend(const QString & msg)
+{
+ return formatChatMsg("|nick|", msg);
+}
+
+QString HWProto::formatChatMsg(const QString & nick, const QString & msg)
+{
+ if(msg.left(4) == "/me ")
+ return QString("\x02* %1 %2").arg(nick).arg(msg.mid(4));
+ else
+ return QString("\x01%1: %2").arg(nick).arg(msg);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/proto.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,40 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _PROTO_H
+#define _PROTO_H
+
+#include <QByteArray>
+#include <QString>
+#include <QStringList>
+
+
+class HWProto : public QObject
+{
+ Q_OBJECT
+
+public:
+ HWProto();
+ static QByteArray & addStringToBuffer(QByteArray & buf, const QString & string);
+ static QByteArray & addByteArrayToBuffer(QByteArray & buf, const QByteArray & msg);
+ static QByteArray & addStringListToBuffer(QByteArray & buf, const QStringList & strList);
+ static QString formatChatMsg(const QString & nick, const QString & msg);
+ static QString formatChatMsgForFrontend(const QString & msg);
+};
+
+#endif // _PROTO_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/tcpBase.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,166 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "tcpBase.h"
+
+#include <QMessageBox>
+#include <QList>
+
+#include <QImage>
+
+#include "hwconsts.h"
+
+QList<TCPBase*> srvsList;
+QPointer<QTcpServer> TCPBase::IPCServer(0);
+
+TCPBase::~TCPBase()
+{
+}
+
+TCPBase::TCPBase(bool demoMode) :
+ m_isDemoMode(demoMode),
+ IPCSocket(0)
+{
+ if(!IPCServer) {
+ IPCServer = new QTcpServer(0);
+ IPCServer->setMaxPendingConnections(1);
+ if (!IPCServer->listen(QHostAddress::LocalHost)) {
+ QMessageBox::critical(0, tr("Error"),
+ tr("Unable to start the server: %1.")
+ .arg(IPCServer->errorString()));
+ exit(0); // FIXME - should be graceful exit here
+ }
+ }
+ ipc_port=IPCServer->serverPort();
+}
+
+void TCPBase::NewConnection()
+{
+ if(IPCSocket) {
+ // connection should be already finished
+ return;
+ }
+ disconnect(IPCServer, SIGNAL(newConnection()), this, SLOT(NewConnection()));
+ IPCSocket = IPCServer->nextPendingConnection();
+ if(!IPCSocket) return;
+ connect(IPCSocket, SIGNAL(disconnected()), this, SLOT(ClientDisconnect()));
+ connect(IPCSocket, SIGNAL(readyRead()), this, SLOT(ClientRead()));
+ SendToClientFirst();
+}
+
+void TCPBase::RealStart()
+{
+ connect(IPCServer, SIGNAL(newConnection()), this, SLOT(NewConnection()));
+ IPCSocket = 0;
+
+ QProcess * process;
+ process = new QProcess;
+ connect(process, SIGNAL(error(QProcess::ProcessError)), this, SLOT(StartProcessError(QProcess::ProcessError)));
+ QStringList arguments=getArguments();
+
+ // redirect everything written on stdout/stderr
+ if(isDevBuild)
+ process->setProcessChannelMode(QProcess::ForwardedChannels);
+ process->start(bindir->absolutePath() + "/hwengine", arguments);
+}
+
+void TCPBase::ClientDisconnect()
+{
+ disconnect(IPCSocket, SIGNAL(readyRead()), this, SLOT(ClientRead()));
+ onClientDisconnect();
+
+ if(srvsList.size()==1) srvsList.pop_front();
+ emit isReadyNow();
+ IPCSocket->deleteLater();
+ deleteLater();
+}
+
+void TCPBase::ClientRead()
+{
+ QByteArray readed=IPCSocket->readAll();
+ if(readed.isEmpty()) return;
+ readbuffer.append(readed);
+ onClientRead();
+}
+
+void TCPBase::StartProcessError(QProcess::ProcessError error)
+{
+ QMessageBox::critical(0, tr("Error"),
+ tr("Unable to run engine: %1 (")
+ .arg(error) + bindir->absolutePath() + "/hwengine)");
+}
+
+void TCPBase::tcpServerReady()
+{
+ disconnect(srvsList.takeFirst(), SIGNAL(isReadyNow()), this, SLOT(tcpServerReady()));
+
+ RealStart();
+}
+
+void TCPBase::Start()
+{
+ if(srvsList.isEmpty()) {
+ srvsList.push_back(this);
+ } else {
+ connect(srvsList.back(), SIGNAL(isReadyNow()), this, SLOT(tcpServerReady()));
+ srvsList.push_back(this);
+ return;
+ }
+
+ RealStart();
+}
+
+void TCPBase::onClientRead()
+{
+}
+
+void TCPBase::onClientDisconnect()
+{
+}
+
+void TCPBase::SendToClientFirst()
+{
+}
+
+void TCPBase::SendIPC(const QByteArray & buf)
+{
+ if (buf.size() > MAXMSGCHARS) return;
+ quint8 len = buf.size();
+ RawSendIPC(QByteArray::fromRawData((char *)&len, 1) + buf);
+}
+
+void TCPBase::RawSendIPC(const QByteArray & buf)
+{
+ if (!IPCSocket)
+ {
+ toSendBuf += buf;
+ } else
+ {
+ if (toSendBuf.size() > 0)
+ {
+ IPCSocket->write(toSendBuf);
+ if(m_isDemoMode) demo.append(toSendBuf);
+ toSendBuf.clear();
+ }
+ if(!buf.isEmpty()) {
+ IPCSocket->write(buf);
+ if(m_isDemoMode) demo.append(buf);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/net/tcpBase.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,81 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _TCPBASE_INCLUDED
+#define _TCPBASE_INCLUDED
+
+#include <QObject>
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QByteArray>
+#include <QString>
+#include <QDir>
+#include <QProcess>
+#include <QPointer>
+
+#include <QImage>
+
+#define MAXMSGCHARS 255
+
+class TCPBase : public QObject
+{
+ Q_OBJECT
+
+ public:
+ TCPBase(bool demoMode);
+ virtual ~TCPBase();
+
+ signals:
+ void isReadyNow();
+
+ protected:
+ quint16 ipc_port;
+
+ void Start();
+
+ QByteArray readbuffer;
+
+ QByteArray toSendBuf;
+ QByteArray demo;
+
+ void SendIPC(const QByteArray & buf);
+ void RawSendIPC(const QByteArray & buf);
+
+ virtual QStringList getArguments()=0;
+ virtual void onClientRead();
+ virtual void onClientDisconnect();
+ virtual void SendToClientFirst();
+
+ private:
+ static QPointer<QTcpServer> IPCServer;
+
+ bool m_isDemoMode;
+ void RealStart();
+ QPointer<QTcpSocket> IPCSocket;
+
+ private slots:
+ void NewConnection();
+ void ClientDisconnect();
+ void ClientRead();
+ void StartProcessError(QProcess::ProcessError error);
+
+ void tcpServerReady();
+};
+
+#endif // _TCPBASE_INCLUDED
--- a/QTfrontend/netregister.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "netregister.h"
-
-HWNetRegisterServer::HWNetRegisterServer(QObject *parent, const QString & descr, quint16 port) :
- QObject(parent)
-{
- Q_UNUSED(descr);
- Q_UNUSED(port);
-}
-
-void HWNetRegisterServer::unregister()
-{
-
-}
--- a/QTfrontend/netregister.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _NET_REGISTER_INCLUDED
-#define _NET_REGISTER_INCLUDED
-
-#include <QObject>
-
-class HWNetRegisterServer : public QObject
-{
- Q_OBJECT
-
-public:
- HWNetRegisterServer(QObject *parent, const QString & descr, quint16 port);
-
-public slots:
- virtual void unregister();
-};
-
-#endif // _NET_REGISTER_INCLUDED
--- a/QTfrontend/netserver.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QMessageBox>
-
-#include "hwconsts.h"
-#include "netserver.h"
-
-HWNetServer::~HWNetServer()
-{
- StopServer();
-}
-
-bool HWNetServer::StartServer(quint16 port)
-{
- ds_port = port;
-
- QStringList params;
- params << QString("--port=%1").arg(port);
- params << "--dedicated=False";
-
- process.start(bindir->absolutePath() + "/hedgewars-server", params);
-
- return process.waitForStarted(5000);
-}
-
-void HWNetServer::StopServer()
-{
- process.close();
-}
-
-
-quint16 HWNetServer::getRunningPort() const
-{
- return ds_port;
-}
--- a/QTfrontend/netserver.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _NETSERVER_INCLUDED
-#define _NETSERVER_INCLUDED
-
-#include <QObject>
-#include <QProcess>
-
-class HWNetServer : public QObject
-{
- Q_OBJECT
-
-public:
- ~HWNetServer();
- bool StartServer(quint16 port);
- void StopServer();
- QString getRunningHostName() const;
- quint16 getRunningPort() const;
-
-private:
- quint16 ds_port;
- QProcess process;
-};
-
-#endif // _NETSERVER_INCLUDED
--- a/QTfrontend/netserverslist.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QUdpSocket>
-#include <QListWidget>
-
-#include "netserverslist.h"
-
-HWNetServersModel::HWNetServersModel(QObject* parent) :
- QAbstractTableModel(parent)
-{
-
-}
-
-void HWNetServersModel::updateList()
-{
-
-}
-
-QVariant HWNetServersModel::headerData(int section,
- Qt::Orientation orientation, int role) const
-{
- if (role != Qt::DisplayRole)
- return QVariant();
-
- if (orientation == Qt::Horizontal)
- {
- switch (section)
- {
- case 0: return tr("Title");
- case 1: return tr("IP");
- case 2: return tr("Port");
- default: return QVariant();
- }
- } else
- return QString("%1").arg(section + 1);
-}
-
-int HWNetServersModel::rowCount(const QModelIndex &parent) const
-{
- if (parent.isValid())
- return 0;
- else
- return games.size();
-}
-
-int HWNetServersModel::columnCount(const QModelIndex & parent) const
-{
- if (parent.isValid())
- return 0;
- else
- return 3;
-}
--- a/QTfrontend/netserverslist.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _NET_SERVERSLIST_INCLUDED
-#define _NET_SERVERSLIST_INCLUDED
-
-#include <QAbstractTableModel>
-#include <QStringList>
-
-class HWNetServersModel : public QAbstractTableModel
-{
- Q_OBJECT
-
-public:
- HWNetServersModel(QObject *parent = 0);
-
- QVariant headerData(int section, Qt::Orientation orientation, int role) const;
- int rowCount(const QModelIndex & parent) const;
- int columnCount(const QModelIndex & parent) const;
-
-public slots:
- virtual void updateList();
-
-protected:
- QList<QStringList> games;
-};
-
-#endif // _NET_SERVERSLIST_INCLUDED
--- a/QTfrontend/netudpserver.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2007-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QUdpSocket>
-
-#include "netudpserver.h"
-
-HWNetUdpServer::HWNetUdpServer(QObject *parent, const QString & descr, quint16 port) :
- HWNetRegisterServer(parent, descr, port),
- m_descr(descr)
-{
- pUdpSocket = new QUdpSocket(this);
- pUdpSocket->bind(46631);
- connect(pUdpSocket, SIGNAL(readyRead()), this, SLOT(onClientRead()));
-}
-
-void HWNetUdpServer::onClientRead()
-{
- while (pUdpSocket->hasPendingDatagrams()) {
- QByteArray datagram;
- datagram.resize(pUdpSocket->pendingDatagramSize());
- QHostAddress clientAddr;
- quint16 clientPort;
- pUdpSocket->readDatagram(datagram.data(), datagram.size(), &clientAddr, &clientPort);
- if(datagram.startsWith("hedgewars client")) {
- // send answer to client
- pUdpSocket->writeDatagram(QString("hedgewars server\n%1").arg(m_descr).toUtf8(), clientAddr, clientPort);
- }
- }
-}
-
-void HWNetUdpServer::unregister()
-{
- deleteLater();
-}
--- a/QTfrontend/netudpserver.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2007-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _NET_UDPSERVER_INCLUDED
-#define _NET_UDPSERVER_INCLUDED
-
-#include <QObject>
-#include "netregister.h"
-
-class QUdpSocket;
-
-class HWNetUdpServer : public HWNetRegisterServer
-{
- Q_OBJECT
-
- public:
- HWNetUdpServer(QObject *parent, const QString & descr, quint16 port);
-
- public slots:
- void unregister();
-
- private slots:
- void onClientRead();
-
- private:
- QUdpSocket* pUdpSocket;
- QString m_descr;
-};
-
-#endif // _NET_UDPSERVER_INCLUDED
--- a/QTfrontend/netudpwidget.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QUdpSocket>
-
-#include "netudpwidget.h"
-
-HWNetUdpModel::HWNetUdpModel(QObject* parent) :
- HWNetServersModel(parent)
-{
- pUdpSocket = new QUdpSocket(this);
-
- pUdpSocket->bind();
- connect(pUdpSocket, SIGNAL(readyRead()), this, SLOT(onClientRead()));
-}
-
-void HWNetUdpModel::updateList()
-{
- games.clear();
-
- reset();
-
- pUdpSocket->writeDatagram("hedgewars client", QHostAddress::Broadcast, 46631);
-}
-
-void HWNetUdpModel::onClientRead()
-{
- while (pUdpSocket->hasPendingDatagrams()) {
- QByteArray datagram;
- datagram.resize(pUdpSocket->pendingDatagramSize());
- QHostAddress clientAddr;
- quint16 clientPort;
-
- pUdpSocket->readDatagram(datagram.data(), datagram.size(), &clientAddr, &clientPort);
-
- QString packet = QString::fromUtf8(datagram.data());
- if(packet.startsWith("hedgewars server")) {
- QStringList sl;
- sl << packet.remove(0, 17) << clientAddr.toString() << "46631";
- games.append(sl);
- }
- }
-
- reset();
-}
-
-QVariant HWNetUdpModel::data(const QModelIndex &index,
- int role) const
-{
- if (!index.isValid() || index.row() < 0
- || index.row() >= games.size()
- || role != Qt::DisplayRole)
- return QVariant();
-
- return games[index.row()][index.column()];
-}
--- a/QTfrontend/netudpwidget.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _NET_UDPWIDGET_INCLUDED
-#define _NET_UDPWIDGET_INCLUDED
-
-#include "netserverslist.h"
-
-class QUdpSocket;
-
-class HWNetUdpModel : public HWNetServersModel
-{
- Q_OBJECT
-
-public:
- HWNetUdpModel(QObject *parent = 0);
-
- QVariant data(const QModelIndex &index, int role) const;
-
-public slots:
- void updateList();
-
-private slots:
- void onClientRead();
-
-private:
- QUdpSocket* pUdpSocket;
-};
-
-#endif // _NET_UDPWIDGET_INCLUDED
--- a/QTfrontend/newnetclient.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,851 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QDebug>
-#include <QInputDialog>
-#include <QCryptographicHash>
-
-#include "hwconsts.h"
-#include "newnetclient.h"
-#include "proto.h"
-#include "gameuiconfig.h"
-#include "game.h"
-#include "gamecfgwidget.h"
-#include "teamselect.h"
-#include "misc.h"
-/* only to get the ignoreList from the chat widget */
-#include "hwform.h"
-#include "pageroomslist.h"
-#include "chatwidget.h"
-
-char delimeter='\n';
-
-HWNewNet::HWNewNet(GameUIConfig * config, GameCFGWidget* pGameCFGWidget, TeamSelWidget* pTeamSelWidget) :
- config(config),
- m_pGameCFGWidget(pGameCFGWidget),
- m_pTeamSelWidget(pTeamSelWidget),
- isChief(false),
- m_game_connected(false),
- loginStep(0),
- netClientState(0)
-{
-// socket stuff
- connect(&NetSocket, SIGNAL(readyRead()), this, SLOT(ClientRead()));
- connect(&NetSocket, SIGNAL(connected()), this, SLOT(OnConnect()));
- connect(&NetSocket, SIGNAL(disconnected()), this, SLOT(OnDisconnect()));
- connect(&NetSocket, SIGNAL(error(QAbstractSocket::SocketError)), this,
- SLOT(displayError(QAbstractSocket::SocketError)));
-
-// config stuff
- connect(this, SIGNAL(paramChanged(const QString &, const QStringList &)), pGameCFGWidget, SLOT(setParam(const QString &, const QStringList &)));
- connect(pGameCFGWidget, SIGNAL(paramChanged(const QString &, const QStringList &)), this, SLOT(onParamChanged(const QString &, const QStringList &)));
- connect(this, SIGNAL(configAsked()), pGameCFGWidget, SLOT(fullNetConfig()));
-}
-
-HWNewNet::~HWNewNet()
-{
- if (m_game_connected)
- {
- RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("User quit"));
- emit Disconnected();
- }
- NetSocket.flush();
-}
-
-void HWNewNet::Connect(const QString & hostName, quint16 port, const QString & nick)
-{
- mynick = nick;
- while (mynick.isEmpty()) {
- mynick = QInputDialog::getText(m_pGameCFGWidget,
- QObject::tr("Nickname"),
- QObject::tr("Please enter your nickname"),
- QLineEdit::Normal,
- QDir::home().dirName());
- config->setValue("net/nick",mynick);
- config->updNetNick();
- }
- myhost = hostName + QString(":%1").arg(port);
- NetSocket.connectToHost(hostName, port);
-}
-
-void HWNewNet::Disconnect()
-{
- if (m_game_connected)
- RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("User quit"));
- m_game_connected = false;
-
- NetSocket.disconnectFromHost();
-}
-
-void HWNewNet::CreateRoom(const QString & room)
-{
- if(netClientState != 2)
- {
- qWarning("Illegal try to create room!");
- return;
- }
-
- myroom = room;
-
- RawSendNet(QString("CREATE_ROOM%1%2").arg(delimeter).arg(room));
- isChief = true;
-}
-
-void HWNewNet::JoinRoom(const QString & room)
-{
- if(netClientState != 2)
- {
- qWarning("Illegal try to join room!");
- return;
- }
-
- myroom = room;
-
- RawSendNet(QString("JOIN_ROOM%1%2").arg(delimeter).arg(room));
- isChief = false;
-}
-
-void HWNewNet::AddTeam(const HWTeam & team)
-{
- QString cmd = QString("ADD_TEAM") + delimeter +
- team.TeamName + delimeter +
- team.teamColor.name() + delimeter +
- team.Grave + delimeter +
- team.Fort + delimeter +
- team.Voicepack + delimeter +
- team.Flag + delimeter +
- QString::number(team.difficulty);
-
- for(int i = 0; i < 8; ++i)
- {
- cmd.append(delimeter);
- cmd.append(team.Hedgehogs[i].Name);
- cmd.append(delimeter);
- cmd.append(team.Hedgehogs[i].Hat);
- }
- RawSendNet(cmd);
-}
-
-void HWNewNet::RemoveTeam(const HWTeam & team)
-{
- RawSendNet(QString("REMOVE_TEAM") + delimeter + team.TeamName);
-}
-
-void HWNewNet::ToggleReady()
-{
- RawSendNet(QString("TOGGLE_READY"));
-}
-
-void HWNewNet::SendNet(const QByteArray & buf)
-{
- QString msg = QString(buf.toBase64());
-
- RawSendNet(QString("EM%1%2").arg(delimeter).arg(msg));
-}
-
-void HWNewNet::RawSendNet(const QString & str)
-{
- RawSendNet(str.toUtf8());
-}
-
-void HWNewNet::RawSendNet(const QByteArray & buf)
-{
- qDebug() << "Client: " << QString(buf).split("\n");
- NetSocket.write(buf);
- NetSocket.write("\n\n", 2);
-}
-
-void HWNewNet::ClientRead()
-{
- while (NetSocket.canReadLine()) {
- QString s = QString::fromUtf8(NetSocket.readLine());
- if (s.endsWith('\n')) s.chop(1);
-
- if (s.size() == 0) {
- ParseCmd(cmdbuf);
- cmdbuf.clear();
- } else
- cmdbuf << s;
- }
-}
-
-void HWNewNet::OnConnect()
-{
-}
-
-void HWNewNet::OnDisconnect()
-{
- if(m_game_connected) emit Disconnected();
- m_game_connected = false;
-}
-
-void HWNewNet::displayError(QAbstractSocket::SocketError socketError)
-{
- emit Disconnected();
- m_game_connected = false;
-
- switch (socketError) {
- case QAbstractSocket::RemoteHostClosedError:
- break;
- case QAbstractSocket::HostNotFoundError:
- emit showMessage(tr("The host was not found. Please check the host name and port settings."));
- break;
- case QAbstractSocket::ConnectionRefusedError:
- emit showMessage(tr("Connection refused"));
- break;
- default:
- emit showMessage(NetSocket.errorString());
- }
-}
-
-void HWNewNet::ParseCmd(const QStringList & lst)
-{
- qDebug() << "Server: " << lst;
-
- if(!lst.size())
- {
- qWarning("Net client: Bad message");
- return;
- }
-
- if (lst[0] == "NICK")
- {
- mynick = lst[1];
- return ;
- }
-
- if (lst[0] == "PROTO")
- return ;
-
- if (lst[0] == "ERROR") {
- if (lst.size() == 2)
- emit showMessage("Error: " + lst[1]);
- else
- emit showMessage("Unknown error");
- return;
- }
-
- if (lst[0] == "WARNING") {
- if (lst.size() == 2)
- emit showMessage("Warning: " + lst[1]);
- else
- emit showMessage("Unknown warning");
- return;
- }
-
- if (lst[0] == "CONNECTED") {
- if(lst.size() < 3 || lst[2].toInt() < cMinServerVersion)
- {
- // TODO: Warn user, disconnect
- qWarning() << "Server too old";
- }
-
- RawSendNet(QString("NICK%1%2").arg(delimeter).arg(mynick));
- RawSendNet(QString("PROTO%1%2").arg(delimeter).arg(*cProtoVer));
- netClientState = 1;
- m_game_connected = true;
- emit adminAccess(false);
- return;
- }
-
- if (lst[0] == "PING") {
- if (lst.size() > 1)
- RawSendNet(QString("PONG%1%2").arg(delimeter).arg(lst[1]));
- else
- RawSendNet(QString("PONG"));
- return;
- }
-
- if (lst[0] == "ROOMS") {
- QStringList tmp = lst;
- tmp.removeFirst();
- emit roomsList(tmp);
- return;
- }
-
- if (lst[0] == "SERVER_MESSAGE") {
- if(lst.size() < 2)
- {
- qWarning("Net: Empty SERVERMESSAGE message");
- return;
- }
- emit serverMessage(lst[1]);
- return;
- }
-
- if (lst[0] == "CHAT") {
- if(lst.size() < 3)
- {
- qWarning("Net: Empty CHAT message");
- return;
- }
- if (netClientState == 2)
- emit chatStringLobby(lst[1], HWProto::formatChatMsgForFrontend(lst[2]));
- else
- emit chatStringFromNet(HWProto::formatChatMsg(lst[1], lst[2]));
- return;
- }
-
- if (lst[0] == "INFO") {
- if(lst.size() < 5)
- {
- qWarning("Net: Malformed INFO message");
- return;
- }
- QStringList tmp = lst;
- tmp.removeFirst();
- if (netClientState == 2)
- emit chatStringLobby(tmp.join("\n").prepend('\x01'));
- else
- emit chatStringFromNet(tmp.join("\n").prepend('\x01'));
- return;
- }
-
- if (lst[0] == "SERVER_VARS") {
- QStringList tmp = lst;
- tmp.removeFirst();
- while (tmp.size() >= 2)
- {
- if(tmp[0] == "MOTD_NEW") emit serverMessageNew(tmp[1]);
- else if(tmp[0] == "MOTD_OLD") emit serverMessageOld(tmp[1]);
- else if(tmp[0] == "LATEST_PROTO") emit latestProtocolVar(tmp[1].toInt());
-
- tmp.removeFirst();
- tmp.removeFirst();
- }
- return;
- }
-
- if (lst[0] == "CLIENT_FLAGS")
- {
- if(lst.size() < 3 || lst[1].size() < 2)
- {
- qWarning("Net: Malformed CLIENT_FLAGS message");
- return;
- }
-
- QString flags = lst[1];
- bool setFlag = flags[0] == '+';
-
- while(flags.size() > 1)
- {
- flags.remove(0, 1);
- char c = flags[0].toAscii();
-
- switch(c)
- {
- case 'r':
- {
- for(int i = 2; i < lst.size(); ++i)
- {
- if (lst[i] == mynick)
- emit setMyReadyStatus(setFlag);
- emit setReadyStatus(lst[i], setFlag);
- }
- }
- }
- }
-
- return;
- }
-
- if (lst[0] == "ADD_TEAM") {
- if(lst.size() != 24)
- {
- qWarning("Net: Bad ADDTEAM message");
- return;
- }
- QStringList tmp = lst;
- tmp.removeFirst();
- emit AddNetTeam(tmp);
- return;
- }
-
- if (lst[0] == "REMOVE_TEAM") {
- if(lst.size() != 2)
- {
- qWarning("Net: Bad REMOVETEAM message");
- return;
- }
- m_pTeamSelWidget->removeNetTeam(HWTeam(lst[1]));
- return;
- }
-
- if(lst[0] == "ROOMABANDONED") {
- netClientState = 2;
- emit showMessage(HWNewNet::tr("Room destroyed"));
- emit LeftRoom();
- return;
- }
-
- if(lst[0] == "KICKED") {
- netClientState = 2;
- emit showMessage(HWNewNet::tr("You got kicked"));
- emit LeftRoom();
- return;
- }
-
- if(lst[0] == "JOINED") {
- if(lst.size() < 2)
- {
- qWarning("Net: Bad JOINED message");
- return;
- }
-
- for(int i = 1; i < lst.size(); ++i)
- {
- if (lst[i] == mynick)
- {
- netClientState = 3;
- emit EnteredGame();
- emit roomMaster(isChief);
- if (isChief)
- emit configAsked();
- }
- if (lst[i] != mynick && isChief && config->Form->ui.pageRoomsList->chatWidget->ignoreList.contains(lst[i], Qt::CaseInsensitive) && !config->Form->ui.pageRoomsList->chatWidget->friendsList.contains(lst[i], Qt::CaseInsensitive))
- {
- kickPlayer(lst[i]);
- }
- else
- {
- emit nickAdded(lst[i], isChief && (lst[i] != mynick));
- emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
- }
- }
- return;
- }
-
- if(lst[0] == "LOBBY:JOINED") {
- if(lst.size() < 2)
- {
- qWarning("Net: Bad JOINED message");
- return;
- }
-
- for(int i = 1; i < lst.size(); ++i)
- {
- if (lst[i] == mynick)
- {
- netClientState = 2;
- RawSendNet(QString("LIST"));
- emit Connected();
- }
-
- emit nickAddedLobby(lst[i], false);
- emit chatStringLobby(lst[i], tr("%1 *** %2 has joined").arg('\x03').arg("|nick|"));
- }
- return;
- }
-
- if(lst[0] == "LEFT") {
- if(lst.size() < 2)
- {
- qWarning("Net: Bad LEFT message");
- return;
- }
- emit nickRemoved(lst[1]);
- if (lst.size() < 3)
- emit chatStringFromNet(tr("%1 *** %2 has left").arg('\x03').arg(lst[1]));
- else
- emit chatStringFromNet(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1], lst[2]));
- return;
- }
-
- if(lst[0] == "ROOM") {
- if(lst.size() < 2)
- {
- qWarning("Net: Bad ROOM message");
- return;
- }
- RawSendNet(QString("LIST"));
- return;
- }
-
- if(lst[0] == "LOBBY:LEFT") {
- if(lst.size() < 2)
- {
- qWarning("Net: Bad LOBBY:LEFT message");
- return;
- }
- emit nickRemovedLobby(lst[1]);
- if (lst.size() < 3)
- emit chatStringLobby(tr("%1 *** %2 has left").arg('\x03').arg(lst[1]));
- else
- emit chatStringLobby(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1], lst[2]));
- return;
- }
-
- if (lst[0] == "RUN_GAME") {
- netClientState = 5;
- emit AskForRunGame();
- return;
- }
-
- if (lst[0] == "BYE") {
- if (lst[1] == "Authentication failed")
- {
- // Set the password blank if case the user tries to join and enter his password again
- config->setValue("net/passwordlength", 0);
- config->setNetPasswordLength(0);
- }
- // return early so the user won't get an unknown error message dialog (the user already gets a server connection is lost one)
- return;
- }
-
- if (lst[0] == "ASKPASSWORD") {
- bool ok = false;
- int passLength = config->value("net/passwordlength", 0).toInt();
- QString hash = config->value("net/passwordhash", "").toString();
-
- // If the password is blank, ask the user to enter one in
- if (passLength == 0)
- {
- QString password = QInputDialog::getText(m_pGameCFGWidget, tr("Password"), tr("Your nickname %1 is\nregistered on Hedgewars.org\nPlease provide your password below\nor pick another nickname in game config:").arg(mynick), QLineEdit::Password, passLength==0?NULL:QString(passLength,'\0'), &ok);
-
- if (!ok) {
- Disconnect();
- emit Disconnected();
- return;
- }
-
- hash = QCryptographicHash::hash(password.toLatin1(), QCryptographicHash::Md5).toHex();
- config->setValue("net/passwordhash", hash);
- config->setValue("net/passwordlength", password.size());
- config->setNetPasswordLength(password.size());
- }
-
- RawSendNet(QString("PASSWORD%1%2").arg(delimeter).arg(hash));
- return;
- }
-
- if (lst[0] == "NOTICE") {
- if(lst.size() < 2)
- {
- qWarning("Net: Bad NOTICE message");
- return;
- }
-
- bool ok;
- int n = lst[1].toInt(&ok);
- if(!ok)
- {
- qWarning("Net: Bad NOTICE message");
- return;
- }
-
- handleNotice(n);
-
- return;
- }
-
- if (lst[0] == "TEAM_ACCEPTED") {
- if (lst.size() != 2)
- {
- qWarning("Net: Bad TEAM_ACCEPTED message");
- return;
- }
- m_pTeamSelWidget->changeTeamStatus(lst[1]);
- return;
- }
-
-
- if (lst[0] == "CFG") {
- if(lst.size() < 3)
- {
- qWarning("Net: Bad CFG message");
- return;
- }
- QStringList tmp = lst;
- tmp.removeFirst();
- tmp.removeFirst();
- if (lst[1] == "SCHEME")
- emit netSchemeConfig(tmp);
- else
- emit paramChanged(lst[1], tmp);
- return;
- }
-
- if (lst[0] == "HH_NUM") {
- if (lst.size() != 3)
- {
- qWarning("Net: Bad TEAM_ACCEPTED message");
- return;
- }
- HWTeam tmptm(lst[1]);
- tmptm.numHedgehogs = lst[2].toUInt();
- emit hhnumChanged(tmptm);
- return;
- }
-
- if (lst[0] == "TEAM_COLOR") {
- if (lst.size() != 3)
- {
- qWarning("Net: Bad TEAM_COLOR message");
- return;
- }
- HWTeam tmptm(lst[1]);
- tmptm.teamColor = QColor(lst[2]);
- emit teamColorChanged(tmptm);
- return;
- }
-
- if (lst[0] == "EM") {
- if(lst.size() < 2)
- {
- qWarning("Net: Bad EM message");
- return;
- }
- for(int i = 1; i < lst.size(); ++i)
- {
- QByteArray em = QByteArray::fromBase64(lst[i].toAscii());
- emit FromNet(em);
- }
- return;
- }
-
- if (lst[0] == "BYE") {
- if (lst.size() < 2)
- {
- qWarning("Net: Bad BYE message");
- return;
- }
- emit showMessage(HWNewNet::tr("Quit reason: ") + lst[1]);
- return;
- }
-
-
- if (lst[0] == "ADMIN_ACCESS") {
- emit adminAccess(true);
- return;
- }
-
- if (lst[0] == "ROOM_CONTROL_ACCESS") {
- if (lst.size() < 2)
- {
- qWarning("Net: Bad BYE message");
- return;
- }
- bool b = lst[1] != "0";
- m_pGameCFGWidget->setEnabled(b);
- m_pTeamSelWidget->setInteractivity(b);
- isChief = b;
- emit roomMaster(isChief);
-
- return;
- }
-
- qWarning() << "Net: Unknown message:" << lst;
-}
-
-void HWNewNet::onHedgehogsNumChanged(const HWTeam& team)
-{
- if (isChief)
- RawSendNet(QString("HH_NUM%1%2%1%3")
- .arg(delimeter)
- .arg(team.TeamName)
- .arg(team.numHedgehogs));
-}
-
-void HWNewNet::onTeamColorChanged(const HWTeam& team)
-{
- if (isChief)
- RawSendNet(QString("TEAM_COLOR%1%2%1%3")
- .arg(delimeter)
- .arg(team.TeamName)
- .arg(team.teamColor.name()));
-}
-
-void HWNewNet::onParamChanged(const QString & param, const QStringList & value)
-{
- if (isChief)
- RawSendNet(
- QString("CFG%1%2%1%3")
- .arg(delimeter)
- .arg(param)
- .arg(value.join(QString(delimeter)))
- );
-}
-
-void HWNewNet::chatLineToNet(const QString& str)
-{
- if(str != "") {
- RawSendNet(QString("CHAT") + delimeter + str);
- emit(chatStringFromMe(HWProto::formatChatMsg(mynick, str)));
- }
-}
-
-void HWNewNet::chatLineToLobby(const QString& str)
-{
- if(str != "") {
- RawSendNet(QString("CHAT") + delimeter + str);
- emit(chatStringFromMeLobby(HWProto::formatChatMsg(mynick, str)));
- }
-}
-
-void HWNewNet::SendTeamMessage(const QString& str)
-{
- RawSendNet(QString("TEAMCHAT") + delimeter + str);
-}
-
-void HWNewNet::askRoomsList()
-{
- if(netClientState != 2)
- {
- qWarning("Illegal try to get rooms list!");
- return;
- }
- RawSendNet(QString("LIST"));
-}
-
-int HWNewNet::getClientState()
-{
- return netClientState;
-}
-
-QString HWNewNet::getNick()
-{
- return mynick;
-}
-
-QString HWNewNet::getRoom()
-{
- return myroom;
-}
-
-QString HWNewNet::getHost()
-{
- return myhost;
-}
-
-bool HWNewNet::isRoomChief()
-{
- return isChief;
-}
-
-void HWNewNet::gameFinished(bool correctly)
-{
- if (netClientState == 5) netClientState = 3;
- RawSendNet(QString("ROUNDFINISHED%1%2").arg(delimeter).arg(correctly ? "1" : "0"));
-}
-
-void HWNewNet::banPlayer(const QString & nick)
-{
- RawSendNet(QString("BAN%1%2").arg(delimeter).arg(nick));
-}
-
-void HWNewNet::kickPlayer(const QString & nick)
-{
- RawSendNet(QString("KICK%1%2").arg(delimeter).arg(nick));
-}
-
-void HWNewNet::infoPlayer(const QString & nick)
-{
- RawSendNet(QString("INFO%1%2").arg(delimeter).arg(nick));
-}
-
-void HWNewNet::followPlayer(const QString & nick)
-{
- if (!isInRoom()) {
- RawSendNet(QString("FOLLOW%1%2").arg(delimeter).arg(nick));
- isChief = false;
- }
-}
-
-void HWNewNet::startGame()
-{
- RawSendNet(QString("START_GAME"));
-}
-
-void HWNewNet::updateRoomName(const QString & name)
-{
- RawSendNet(QString("ROOM_NAME%1%2").arg(delimeter).arg(name));
-}
-
-
-void HWNewNet::toggleRestrictJoins()
-{
- RawSendNet(QString("TOGGLE_RESTRICT_JOINS"));
-}
-
-void HWNewNet::toggleRestrictTeamAdds()
-{
- RawSendNet(QString("TOGGLE_RESTRICT_TEAMS"));
-}
-
-void HWNewNet::clearAccountsCache()
-{
- RawSendNet(QString("CLEAR_ACCOUNTS_CACHE"));
-}
-
-void HWNewNet::partRoom()
-{
- netClientState = 2;
- RawSendNet(QString("PART"));
-}
-
-bool HWNewNet::isInRoom()
-{
- return netClientState > 2;
-}
-
-void HWNewNet::setServerMessageNew(const QString & msg)
-{
- RawSendNet(QString("SET_SERVER_VAR%1MOTD_NEW%1%2").arg(delimeter).arg(msg));
-}
-
-void HWNewNet::setServerMessageOld(const QString & msg)
-{
- RawSendNet(QString("SET_SERVER_VAR%1MOTD_OLD%1%2").arg(delimeter).arg(msg));
-}
-
-void HWNewNet::setLatestProtocolVar(int proto)
-{
- RawSendNet(QString("SET_SERVER_VAR%1LATEST_PROTO%1%2").arg(delimeter).arg(proto));
-}
-
-void HWNewNet::askServerVars()
-{
- RawSendNet(QString("GET_SERVER_VAR"));
-}
-
-void HWNewNet::handleNotice(int n)
-{
- switch(n)
- {
- case 0:
- {
- bool ok = false;
- QString newNick = QInputDialog::getText(0, tr("Nickname"), tr("Some one already uses\n your nickname %1\non the server.\nPlease pick another nickname:").arg(mynick), QLineEdit::Normal, mynick, &ok);
-
- if (!ok || newNick.isEmpty()) {
- Disconnect();
- emit Disconnected();
- return;
- }
-
- config->setValue("net/nick", newNick);
- config->updNetNick();
- mynick = newNick;
-
- RawSendNet(QString("NICK%1%2").arg(delimeter).arg(newNick));
-
- break;
- }
- }
-}
--- a/QTfrontend/newnetclient.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _NEW_NETCLIENT_INCLUDED
-#define _NEW_NETCLIENT_INCLUDED
-
-#include <QObject>
-#include <QString>
-#include <QTcpSocket>
-#include <QMap>
-
-#include "team.h"
-#include "game.h" // for GameState
-
-class GameUIConfig;
-class GameCFGWidget;
-class TeamSelWidget;
-
-extern char delimeter;
-
-class HWNewNet : public QObject
-{
- Q_OBJECT
-
- public:
- HWNewNet(GameUIConfig * config, GameCFGWidget* pGameCFGWidget, TeamSelWidget* pTeamSelWidget);
- ~HWNewNet();
- void Connect(const QString & hostName, quint16 port, const QString & nick);
- void Disconnect();
- bool isRoomChief();
- bool isInRoom();
- int getClientState();
- QString getNick();
- QString getRoom();
- QString getHost();
-
- private:
- GameUIConfig* config;
- GameCFGWidget* m_pGameCFGWidget;
- TeamSelWidget* m_pTeamSelWidget;
-
- bool isChief;
- QString mynick;
- QString myroom;
- QString myhost;
- QTcpSocket NetSocket;
- QString seed;
- bool m_game_connected;
-
- template <typename T>
- void SendCfgStrNet(T a) {
- QByteArray strmsg;
- strmsg.append(a);
- quint8 sz = strmsg.size();
- QByteArray enginemsg = QByteArray((char *)&sz, 1) + strmsg;
- QString _msg = delimeter + QString(enginemsg.toBase64());
- RawSendNet(_msg);
- }
-
- template <typename T>
- void SendCfgStrLoc(T a) {
- QByteArray strmsg;
- strmsg.append(QString(a).toUtf8());
- quint8 sz = strmsg.size();
- QByteArray enginemsg = QByteArray((char *)&sz, 1) + strmsg;
- emit FromNet(enginemsg);
- }
-
- QStringList cmdbuf;
-
- void RawSendNet(const QString & buf);
- void RawSendNet(const QByteArray & buf);
- void ParseCmd(const QStringList & lst);
- void handleNotice(int n);
-
- int loginStep;
- int netClientState;
-
- signals:
- void AskForRunGame();
- void Connected();
- void Disconnected();
- void EnteredGame();
- void LeftRoom();
- void nickAdded(const QString& nick, bool notifyNick);
- void nickRemoved(const QString& nick);
- void nickAddedLobby(const QString& nick, bool notifyNick);
- void nickRemovedLobby(const QString& nick);
- void FromNet(const QByteArray & buf);
- void adminAccess(bool);
- void roomMaster(bool);
-
- void netSchemeConfig(QStringList &);
- void paramChanged(const QString & param, const QStringList & value);
- void configAsked();
-
- void AddNetTeam(const HWTeam&);
- void hhnumChanged(const HWTeam&);
- void teamColorChanged(const HWTeam&);
- void chatStringLobby(const QString&);
- void chatStringLobby(const QString&, const QString&);
- void chatStringFromNet(const QString&);
- void chatStringFromMe(const QString&);
- void chatStringFromMeLobby(const QString&);
-
- void roomsList(const QStringList&);
- void serverMessage(const QString &);
- void serverMessageNew(const QString &);
- void serverMessageOld(const QString &);
- void latestProtocolVar(int);
-
- void setReadyStatus(const QString & nick, bool isReady);
- void setMyReadyStatus(bool isReady);
- void showMessage(const QString &);
-
- public slots:
- void ToggleReady();
- void chatLineToNet(const QString& str);
- void chatLineToLobby(const QString& str);
- void SendTeamMessage(const QString& str);
- void SendNet(const QByteArray & buf);
- void AddTeam(const HWTeam & team);
- void RemoveTeam(const HWTeam& team);
- void onHedgehogsNumChanged(const HWTeam& team);
- void onTeamColorChanged(const HWTeam& team);
- void onParamChanged(const QString & param, const QStringList & value);
-
- void setServerMessageNew(const QString &);
- void setServerMessageOld(const QString &);
- void setLatestProtocolVar(int proto);
- void askServerVars();
-
- void JoinRoom(const QString & room);
- void CreateRoom(const QString & room);
- void updateRoomName(const QString &);
- void askRoomsList();
- void gameFinished(bool correcly);
- void banPlayer(const QString &);
- void kickPlayer(const QString &);
- void infoPlayer(const QString &);
- void followPlayer(const QString &);
- void startGame();
- void toggleRestrictJoins();
- void toggleRestrictTeamAdds();
- void partRoom();
- void clearAccountsCache();
-
- private slots:
- void ClientRead();
- void OnConnect();
- void OnDisconnect();
- void displayError(QAbstractSocket::SocketError socketError);
-};
-
-#endif // _NEW_NETCLIENT_INCLUDED
--- a/QTfrontend/pageadmin.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QSpinBox>
-#include <QPushButton>
-#include <QTextBrowser>
-
-#include "pageadmin.h"
-#include "chatwidget.h"
-
-PageAdmin::PageAdmin(QWidget* parent) :
- AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
-
- // 0
- pbAsk = addButton(tr("Fetch data"), pageLayout, 0, 0, 1, 3);
- connect(pbAsk, SIGNAL(clicked()), this, SIGNAL(askServerVars()));
-
- // 1
- QLabel * lblSMN = new QLabel(this);
- lblSMN->setText(tr("Server message for latest version:"));
- pageLayout->addWidget(lblSMN, 1, 0);
-
- leServerMessageNew = new QLineEdit(this);
- pageLayout->addWidget(leServerMessageNew, 1, 1);
-
- // 2
- QLabel * lblSMO = new QLabel(this);
- lblSMO->setText(tr("Server message for previous versions:"));
- pageLayout->addWidget(lblSMO, 2, 0);
-
- leServerMessageOld = new QLineEdit(this);
- pageLayout->addWidget(leServerMessageOld, 2, 1);
-
- // 3
- QLabel * lblP = new QLabel(this);
- lblP->setText(tr("Latest version protocol number:"));
- pageLayout->addWidget(lblP, 3, 0);
-
- sbProtocol = new QSpinBox(this);
- pageLayout->addWidget(sbProtocol, 3, 1);
-
- // 4
- QLabel * lblPreview = new QLabel(this);
- lblPreview->setText(tr("MOTD preview:"));
- pageLayout->addWidget(lblPreview, 4, 0);
-
- tb = new QTextBrowser(this);
- tb->setOpenExternalLinks(true);
- tb->document()->setDefaultStyleSheet(HWChatWidget::STYLE);
- pageLayout->addWidget(tb, 4, 1, 1, 2);
- connect(leServerMessageNew, SIGNAL(textEdited(const QString &)), tb, SLOT(setHtml(const QString &)));
- connect(leServerMessageOld, SIGNAL(textEdited(const QString &)), tb, SLOT(setHtml(const QString &)));
-
- // 5
- pbClearAccountsCache = addButton(tr("Clear Accounts Cache"), pageLayout, 5, 0);
-
- // 6
- pbSetSM = addButton(tr("Set data"), pageLayout, 6, 0, 1, 3);
-
- // 7
- BtnBack = addButton(":/res/Exit.png", pageLayout, 7, 0, true);
-
- connect(pbSetSM, SIGNAL(clicked()), this, SLOT(smChanged()));
-}
-
-void PageAdmin::smChanged()
-{
- emit setServerMessageNew(leServerMessageNew->text());
- emit setServerMessageOld(leServerMessageOld->text());
- emit setProtocol(sbProtocol->value());
-}
-
-void PageAdmin::serverMessageNew(const QString & str)
-{
- leServerMessageNew->setText(str);
-}
-
-void PageAdmin::serverMessageOld(const QString & str)
-{
- leServerMessageOld->setText(str);
-}
-void PageAdmin::protocol(int proto)
-{
- sbProtocol->setValue(proto);
-}
--- a/QTfrontend/pageadmin.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_ADMIN_H
-#define PAGE_ADMIN_H
-
-#include "AbstractPage.h"
-
-class PageAdmin : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageAdmin(QWidget* parent = 0);
-
- QPushButton * BtnBack;
- QPushButton * pbClearAccountsCache;
-
-private:
- QLineEdit * leServerMessageNew;
- QLineEdit * leServerMessageOld;
- QPushButton * pbSetSM;
- QPushButton * pbAsk;
- QSpinBox * sbProtocol;
- QTextBrowser * tb;
-
-private slots:
- void smChanged();
-
-public slots:
- void serverMessageNew(const QString & str);
- void serverMessageOld(const QString & str);
- void protocol(int proto);
-
-signals:
- void setServerMessageNew(const QString & str);
- void setServerMessageOld(const QString & str);
- void setProtocol(int proto);
- void askServerVars();
-};
-
-#endif
--- a/QTfrontend/pagecampaign.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QComboBox>
-
-#include "pagecampaign.h"
-
-PageCampaign::PageCampaign(QWidget* parent) : AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
- pageLayout->setColumnStretch(0, 1);
- pageLayout->setColumnStretch(1, 2);
- pageLayout->setColumnStretch(2, 1);
- pageLayout->setRowStretch(0, 1);
- pageLayout->setRowStretch(3, 1);
-
- CBSelect = new QComboBox(this);
- CBTeam = new QComboBox(this);
-
- pageLayout->addWidget(CBTeam, 1, 1);
- pageLayout->addWidget(CBSelect, 2, 1);
-
- BtnStartCampaign = new QPushButton(this);
- BtnStartCampaign->setFont(*font14);
- BtnStartCampaign->setText(QPushButton::tr("Go!"));
- pageLayout->addWidget(BtnStartCampaign, 2, 2);
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 4, 0, true);
-}
--- a/QTfrontend/pagecampaign.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_CAMPAIGN_H
-#define PAGE_CAMPAIGN_H
-
-#include "AbstractPage.h"
-
-class PageCampaign : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageCampaign(QWidget* parent = 0);
-
- QPushButton *BtnStartCampaign;
- QPushButton *BtnBack;
- QComboBox *CBSelect;
- QComboBox *CBTeam;
-};
-
-#endif
--- a/QTfrontend/pageconnecting.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QLabel>
-
-#include "pageconnecting.h"
-
-PageConnecting::PageConnecting(QWidget* parent) :
- AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
-
- QLabel * lblConnecting = new QLabel(this);
- lblConnecting->setText(tr("Connecting..."));
- pageLayout->addWidget(lblConnecting);
-
- QPushButton * pbCancel = new QPushButton(this);
- pbCancel->setText(tr("Cancel"));
- pageLayout->addWidget(pbCancel);
- connect(pbCancel, SIGNAL(clicked()), this, SIGNAL(cancelConnection()));
-}
--- a/QTfrontend/pageconnecting.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_CONNECTING_H
-#define PAGE_CONNECTING_H
-
-#include "AbstractPage.h"
-
-class PageConnecting : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageConnecting(QWidget* parent = 0);
-
-signals:
- void cancelConnection();
-};
-
-#endif
--- a/QTfrontend/pagedata.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QFileInfo>
-#include <QFileDialog>
-#include <QDebug>
-#include <QProgressBar>
-#include <QBuffer>
-
-#include "pagedata.h"
-#include "databrowser.h"
-#include "hwconsts.h"
-
-#include "quazip.h"
-#include "quazipfile.h"
-
-PageDataDownload::PageDataDownload(QWidget* parent) : AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
- pageLayout->setColumnStretch(0, 1);
- pageLayout->setColumnStretch(1, 1);
- pageLayout->setColumnStretch(2, 1);
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 2, 0, true);
-
- web = new DataBrowser(this);
- connect(web, SIGNAL(anchorClicked(QUrl)), this, SLOT(request(const QUrl&)));
- web->setOpenLinks(false);
- pageLayout->addWidget(web, 0, 0, 1, 3);
-
- progressBarsLayout = new QVBoxLayout();
- pageLayout->addLayout(progressBarsLayout, 1, 0, 1, 3);
-
- fetchList();
-}
-
-void PageDataDownload::request(const QUrl &url)
-{
- QUrl finalUrl;
- if(url.host().isEmpty())
- finalUrl = QUrl("http://www.hedgewars.org" + url.path());
- else
- finalUrl = url;
-
- if(url.path().endsWith(".zip"))
- {
- qWarning() << "Download Request" << url.toString();
- QString fileName = QFileInfo(url.toString()).fileName();
-
- QNetworkRequest newRequest(finalUrl);
- newRequest.setAttribute(QNetworkRequest::User, fileName);
-
- QNetworkAccessManager *manager = new QNetworkAccessManager(this);
- QNetworkReply *reply = manager->get(newRequest);
- connect(reply, SIGNAL(finished()), this, SLOT(fileDownloaded()));
- connect(reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(downloadProgress(qint64, qint64)));
-
- QProgressBar *progressBar = new QProgressBar(this);
- progressBarsLayout->addWidget(progressBar);
- progressBars.insert(reply, progressBar);
- } else
- {
- qWarning() << "Page Request" << url.toString();
-
- QNetworkRequest newRequest(finalUrl);
-
- QNetworkAccessManager *manager = new QNetworkAccessManager(this);
- QNetworkReply *reply = manager->get(newRequest);
- connect(reply, SIGNAL(finished()), this, SLOT(pageDownloaded()));
- }
-}
-
-
-void PageDataDownload::pageDownloaded()
-{
- QNetworkReply * reply = qobject_cast<QNetworkReply *>(sender());
-
- if(reply)
- {
- QString html = QString::fromUtf8(reply->readAll());
- int begin = html.indexOf("<!-- BEGIN -->");
- int end = html.indexOf("<!-- END -->");
- if(begin != -1 && begin < end)
- {
- html.truncate(end);
- html.remove(0, begin);
- }
- web->setHtml(html);
- }
-}
-
-void PageDataDownload::fileDownloaded()
-{
- QNetworkReply * reply = qobject_cast<QNetworkReply *>(sender());
-
- if(reply)
- {
- QByteArray fileContents = reply->readAll();
- QProgressBar *progressBar = progressBars.value(reply, 0);
-
- if(progressBar)
- {
- progressBars.remove(reply);
- progressBar->deleteLater();
- }
-
- extractDataPack(&fileContents);
- }
-}
-
-void PageDataDownload::downloadProgress(qint64 bytesRecieved, qint64 bytesTotal)
-{
- QNetworkReply * reply = qobject_cast<QNetworkReply *>(sender());
-
- if(reply)
- {
- QProgressBar *progressBar = progressBars.value(reply, 0);
-
- if(progressBar)
- {
- progressBar->setValue(bytesRecieved);
- progressBar->setMaximum(bytesTotal);
- }
- }
-}
-
-void PageDataDownload::fetchList()
-{
- request(QUrl("http://hedgewars.org/content.html"));
-}
-
-bool PageDataDownload::extractDataPack(QByteArray * buf)
-{
- QBuffer buffer;
- buffer.setBuffer(buf);
-
- QuaZip zip;
- zip.setIoDevice(&buffer);
- if(!zip.open(QuaZip::mdUnzip))
- {
- qWarning("testRead(): zip.open(): %d", zip.getZipError());
- return false;
- }
-
- QuaZipFile file(&zip);
-
- QDir extractDir(*cfgdir);
- extractDir.cd("Data");
-
- for(bool more = zip.goToFirstFile(); more; more = zip.goToNextFile())
- {
- if(!file.open(QIODevice::ReadOnly))
- {
- qWarning("file.open(): %d", file.getZipError());
- return false;
- }
-
-
- QString fileName = file.getActualFileName();
- QString filePath = extractDir.filePath(fileName);
- if (fileName.endsWith("/"))
- {
- QFileInfo fi(filePath);
- QDir().mkpath(fi.filePath());
- } else
- {
- qDebug() << "Extracting" << filePath;
- QFile out(filePath);
- if(!out.open(QFile::WriteOnly))
- {
- qWarning() << "out.open():" << out.errorString();
- return false;
- }
-
- out.write(file.readAll());
-
- out.close();
-
- if(file.getZipError() != UNZ_OK) {
- qWarning("file.getFileName(): %d", file.getZipError());
- return false;
- }
-
- if(!file.atEnd()) {
- qWarning("read all but not EOF");
- return false;
- }
- }
-
- file.close();
-
- if(file.getZipError()!=UNZ_OK) {
- qWarning("file.close(): %d", file.getZipError());
- return false;
- }
- }
-
- zip.close();
-
- return true;
-}
--- a/QTfrontend/pagedata.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_DATA_H
-#define PAGE_DATA_H
-
-#include <QUrl>
-#include "AbstractPage.h"
-
-class DataBrowser;
-class QProgressBar;
-class QNetworkReply;
-class QVBoxLayout;
-
-class PageDataDownload : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageDataDownload(QWidget* parent = 0);
-
- QPushButton *BtnBack;
-
-public slots:
- void fetchList();
-
-private:
- DataBrowser *web;
- QHash<QNetworkReply*, QProgressBar *> progressBars;
- QVBoxLayout *progressBarsLayout;
-
- bool extractDataPack(QByteArray * buf);
-
-private slots:
- void request(const QUrl &url);
-
- void pageDownloaded();
- void fileDownloaded();
- void downloadProgress(qint64, qint64);
-};
-
-#endif
--- a/QTfrontend/pagedrawmap.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QFileDialog>
-
-#include "pagedrawmap.h"
-#include "drawmapwidget.h"
-
-PageDrawMap::PageDrawMap(QWidget* parent) : AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
-
- QPushButton * pbUndo = addButton(tr("Undo"), pageLayout, 0, 0);
- QPushButton * pbClear = addButton(tr("Clear"), pageLayout, 1, 0);
- QPushButton * pbLoad = addButton(tr("Load"), pageLayout, 2, 0);
- QPushButton * pbSave = addButton(tr("Save"), pageLayout, 3, 0);
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 5, 0, true);
-
- drawMapWidget = new DrawMapWidget(this);
- pageLayout->addWidget(drawMapWidget, 0, 1, 5, 1);
-
- connect(pbUndo, SIGNAL(clicked()), drawMapWidget, SLOT(undo()));
- connect(pbClear, SIGNAL(clicked()), drawMapWidget, SLOT(clear()));
- connect(pbLoad, SIGNAL(clicked()), this, SLOT(load()));
- connect(pbSave, SIGNAL(clicked()), this, SLOT(save()));
-}
-
-void PageDrawMap::load()
-{
- QString fileName = QFileDialog::getOpenFileName(this, tr("Load drawn map"), ".", tr("Drawn Maps (*.hwmap);;All files (*.*)"));
-
- if(!fileName.isEmpty())
- drawMapWidget->load(fileName);
-}
-
-void PageDrawMap::save()
-{
- QString fileName = QFileDialog::getSaveFileName(this, tr("Save drawn map"), ".", tr("Drawn Maps (*.hwmap);;All files (*.*)"));
-
- if(!fileName.isEmpty())
- drawMapWidget->save(fileName);
-}
--- a/QTfrontend/pagedrawmap.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_DRAWMAP_H
-#define PAGE_DRAWMAP_H
-
-#include "AbstractPage.h"
-
-class DrawMapWidget;
-
-class PageDrawMap : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageDrawMap(QWidget* parent = 0);
-
- QPushButton * BtnBack;
-
- DrawMapWidget * drawMapWidget;
-
-private slots:
- void load();
- void save();
-};
-
-#endif
-
--- a/QTfrontend/pageeditteam.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,375 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QComboBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QTabWidget>
-#include <QGroupBox>
-#include <QToolBox>
-
-#include "pageeditteam.h"
-#include "sdlkeys.h"
-#include "hwconsts.h"
-#include "SquareLabel.h"
-#include "hats.h"
-#include "HWApplication.h"
-
-PageEditTeam::PageEditTeam(QWidget* parent, SDLInteraction * sdli) :
- AbstractPage(parent)
-{
- mySdli = sdli;
- QGridLayout * pageLayout = new QGridLayout(this);
- QTabWidget * tbw = new QTabWidget(this);
- QWidget * page1 = new QWidget(this);
- QWidget * page2 = new QWidget(this);
- tbw->addTab(page1, tr("General"));
- tbw->addTab(page2, tr("Advanced"));
- pageLayout->addWidget(tbw, 0, 0, 1, 3);
- BtnTeamDiscard = addButton(":/res/Exit.png", pageLayout, 1, 0, true);
- BtnTeamSave = addButton(":/res/Save.png", pageLayout, 1, 2, true);;
- BtnTeamSave->setStyleSheet("QPushButton{margin: 12px 0px 12px 0px;}");
- BtnTeamDiscard->setFixedHeight(BtnTeamSave->height());
- BtnTeamDiscard->setStyleSheet("QPushButton{margin-top: 31px;}");
-
- QHBoxLayout * page1Layout = new QHBoxLayout(page1);
- page1Layout->setAlignment(Qt::AlignTop);
- QGridLayout * page2Layout = new QGridLayout(page2);
-
-// ====== Page 1 ======
- QVBoxLayout * vbox1 = new QVBoxLayout();
- QVBoxLayout * vbox2 = new QVBoxLayout();
- page1Layout->addLayout(vbox1);
- page1Layout->addLayout(vbox2);
-
- GBoxHedgehogs = new QGroupBox(this);
- GBoxHedgehogs->setTitle(QGroupBox::tr("Team Members"));
- GBoxHedgehogs->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- QGridLayout * GBHLayout = new QGridLayout(GBoxHedgehogs);
-
- signalMapper = new QSignalMapper(this);
-
- HatsModel * hatsModel = new HatsModel(GBoxHedgehogs);
- for(int i = 0; i < 8; i++)
- {
- HHHats[i] = new QComboBox(GBoxHedgehogs);
- HHHats[i]->setModel(hatsModel);
- HHHats[i]->setIconSize(QSize(32, 37));
- //HHHats[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
- //HHHats[i]->setModelColumn(1);
- //HHHats[i]->setMinimumWidth(132);
- GBHLayout->addWidget(HHHats[i], i, 0);
-
- HHNameEdit[i] = new QLineEdit(GBoxHedgehogs);
- HHNameEdit[i]->setMaxLength(64);
- HHNameEdit[i]->setMinimumWidth(120);
- GBHLayout->addWidget(HHNameEdit[i], i, 1);
-
- randButton[i] = addButton(":/res/dice.png", GBHLayout, i, 3, true);
-
- connect(randButton[i], SIGNAL(clicked()), signalMapper, SLOT(map()));
- signalMapper->setMapping(randButton[i], i);
-
- }
-
- randTeamButton = addButton(QPushButton::tr("Random Team"), GBHLayout, 9, false);
-
- vbox1->addWidget(GBoxHedgehogs);
-
-
- GBoxTeam = new QGroupBox(this);
- GBoxTeam->setTitle(QGroupBox::tr("Team Settings"));
- GBoxTeam->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- QGridLayout * GBTLayout = new QGridLayout(GBoxTeam);
- QLabel * tmpLabel = new QLabel(GBoxTeam);
- tmpLabel->setText(QLabel::tr("Name"));
- GBTLayout->addWidget(tmpLabel, 0, 0);
- tmpLabel = new QLabel(GBoxTeam);
- tmpLabel->setText(QLabel::tr("Type"));
- GBTLayout->addWidget(tmpLabel, 1, 0);
- tmpLabel = new QLabel(GBoxTeam);
- tmpLabel->setText(QLabel::tr("Grave"));
- GBTLayout->addWidget(tmpLabel, 2, 0);
- tmpLabel = new QLabel(GBoxTeam);
- tmpLabel->setText(QLabel::tr("Flag"));
- GBTLayout->addWidget(tmpLabel, 3, 0);
- tmpLabel = new QLabel(GBoxTeam);
- tmpLabel->setText(QLabel::tr("Voice"));
- GBTLayout->addWidget(tmpLabel, 4, 0);
-
-
- TeamNameEdit = new QLineEdit(GBoxTeam);
- TeamNameEdit->setMaxLength(64);
- GBTLayout->addWidget(TeamNameEdit, 0, 1);
- vbox2->addWidget(GBoxTeam);
-
- CBTeamLvl = new QComboBox(GBoxTeam);
- CBTeamLvl->setIconSize(QSize(48, 48));
- CBTeamLvl->addItem(QIcon(":/res/botlevels/0.png"), QComboBox::tr("Human"));
- for(int i = 5; i > 0; i--)
- CBTeamLvl->addItem(
- QIcon(QString(":/res/botlevels/%1.png").arg(6 - i)),
- QString("%1 %2").arg(QComboBox::tr("Level")).arg(i)
- );
- GBTLayout->addWidget(CBTeamLvl, 1, 1);
-
- CBGrave = new QComboBox(GBoxTeam);
- CBGrave->setMaxCount(65535);
- CBGrave->setIconSize(QSize(32, 32));
- GBTLayout->addWidget(CBGrave, 2, 1);
-
- CBFlag = new QComboBox(GBoxTeam);
- CBFlag->setMaxCount(65535);
- CBFlag->setIconSize(QSize(22, 15));
- GBTLayout->addWidget(CBFlag, 3, 1);
-
- {
- QHBoxLayout * hbox = new QHBoxLayout();
- CBVoicepack = new QComboBox(GBoxTeam);
- {
- QDir tmpdir;
- QStringList list;
- tmpdir.cd(cfgdir->absolutePath());
- if (tmpdir.cd("Data/Sounds/voices"))
- {
- list = tmpdir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
- CBVoicepack->addItems(list);
- }
-
- tmpdir.cd(datadir->absolutePath());
- tmpdir.cd("Sounds/voices");
- QStringList tmplist = tmpdir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
- QStringList tmplist2;
- for (QStringList::Iterator it = tmplist.begin(); it != tmplist.end(); ++it)
- if (!list.contains(*it,Qt::CaseInsensitive)) tmplist2.append(*it);
-
- CBVoicepack->addItems(tmplist2);
- }
- hbox->addWidget(CBVoicepack, 100);
- BtnTestSound = addButton(":/res/PlaySound.png", hbox, 1, true);
- hbox->setStretchFactor(BtnTestSound, 1);
- connect(BtnTestSound, SIGNAL(clicked()), this, SLOT(testSound()));
- GBTLayout->addLayout(hbox, 4, 1);
- }
-
- GBoxFort = new QGroupBox(this);
- GBoxFort->setTitle(QGroupBox::tr("Fort"));
- QGridLayout * GBFLayout = new QGridLayout(GBoxFort);
- CBFort = new QComboBox(GBoxFort);
- CBFort->setMaxCount(65535);
- GBFLayout->addWidget(CBFort, 0, 0);
- FortPreview = new SquareLabel(GBoxFort);
- FortPreview->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- FortPreview->setMinimumSize(128, 128);
- FortPreview->setPixmap(QPixmap());
- // perhaps due to handling its own paintevents, SquareLabel doesn't play nice with the stars
- //FortPreview->setAttribute(Qt::WA_PaintOnScreen, true);
- GBFLayout->addWidget(FortPreview, 1, 0);
- vbox2->addWidget(GBoxFort);
-
- QDir tmpdir;
- QStringList userforts;
- tmpdir.cd(cfgdir->absolutePath());
- if (tmpdir.cd("Data/Forts"))
- {
- tmpdir.setFilter(QDir::Files);
- userforts = tmpdir.entryList(QStringList("*L.png")).replaceInStrings(QRegExp("^(.*)L\\.png"), "\\1");
- CBFort->addItems(userforts);
- }
-
- tmpdir.cd("../Graphics/Graves");
- QStringList userlist = tmpdir.entryList(QStringList("*.png"));
- for (QStringList::Iterator it = userlist.begin(); it != userlist.end(); ++it )
- {
- QPixmap pix(cfgdir->absolutePath() + "/Data/Graphics/Graves/" + *it);
- QIcon icon(pix.copy(0, 0, 32, 32));
- CBGrave->addItem(icon, QString(*it).replace(QRegExp("^(.*)\\.png"), "\\1"));
- }
-
- tmpdir.cd(datadir->absolutePath());
- tmpdir.cd("Forts");
- tmpdir.setFilter(QDir::Files);
-
- QStringList tmplist = tmpdir.entryList(QStringList("*L.png")).replaceInStrings(QRegExp("^(.*)L\\.png"), "\\1");
- QStringList dataforts;
- for (QStringList::Iterator it = tmplist.begin(); it != tmplist.end(); ++it)
- if (!userforts.contains(*it,Qt::CaseInsensitive)) dataforts.append(*it);
-
- CBFort->addItems(dataforts);
- connect(CBFort, SIGNAL(currentIndexChanged(const QString &)), this, SLOT(CBFort_activated(const QString &)));
-
- tmpdir.cd("../Graphics/Graves");
- QStringList datalist = tmpdir.entryList(QStringList("*.png"));
- for (QStringList::Iterator it = datalist.begin(); it != datalist.end(); ++it )
- {
- if (userlist.contains(*it,Qt::CaseInsensitive)) continue;
- QPixmap pix(datadir->absolutePath() + "/Graphics/Graves/" + *it);
- QIcon icon(pix.copy(0, 0, 32, 32));
- CBGrave->addItem(icon, (*it).replace(QRegExp("^(.*)\\.png"), "\\1"));
- }
-
- // add the default flag
- CBFlag->addItem(QIcon(QPixmap(datadir->absolutePath() + "/Graphics/Flags/hedgewars.png").copy(0, 0, 22, 15)), "Hedgewars", "hedgewars");
- CBFlag->insertSeparator(CBFlag->count());
-
- tmpdir.cd(cfgdir->absolutePath());
- tmpdir.cd("Data/Graphics/Flags");
- userlist = tmpdir.entryList(QStringList("*.png"));
-
- // add all country flags
- for (QStringList::Iterator it = userlist.begin(); it != userlist.end(); ++it )
- {
- QPixmap pix(cfgdir->absolutePath() + "/Data/Graphics/Flags/" + *it);
- QIcon icon(pix.copy(0, 0, 22, 15));
- if(it->compare("cpu.png") && it->compare("hedgewars.png") && (it->indexOf("cm_") == -1)) // skip cpu and hedgewars flags as well as all community flags
- {
- QString flag = QString(*it).replace(QRegExp("^(.*)\\.png"), "\\1");
- CBFlag->addItem(icon, QString(flag).replace("_", " "), flag);
- }
- }
-
- CBFlag->insertSeparator(CBFlag->count());
-
- // add all community flags
- for (QStringList::Iterator it = userlist.begin(); it != userlist.end(); ++it )
- {
- QPixmap pix(cfgdir->absolutePath() + "/Data/Graphics/Flags/" + *it);
- QIcon icon(pix.copy(0, 0, 22, 15));
- if(it->indexOf("cm_") > -1) // skip non community flags this time
- {
- QString flag = QString(*it).replace(QRegExp("^(.*)\\.png"), "\\1");
- CBFlag->addItem(icon, QString(flag).replace("cm_", QComboBox::tr("Community") + ": "), flag);
- }
- }
-
- CBFlag->insertSeparator(CBFlag->count());
-
- tmpdir.cd(datadir->absolutePath());
- tmpdir.cd("Graphics/Flags");
- datalist = tmpdir.entryList(QStringList("*.png"));
-
- // add all country flags
- for (QStringList::Iterator it = datalist.begin(); it != datalist.end(); ++it )
- {
- if (userlist.contains(*it,Qt::CaseInsensitive)) continue;
- QPixmap pix(datadir->absolutePath() + "/Graphics/Flags/" + *it);
- QIcon icon(pix.copy(0, 0, 22, 15));
- if(it->compare("cpu.png") && it->compare("hedgewars.png") && (it->indexOf("cm_") == -1)) // skip cpu and hedgewars flags as well as all community flags
- {
- QString flag = QString(*it).replace(QRegExp("^(.*)\\.png"), "\\1");
- CBFlag->addItem(icon, QString(flag).replace("_", " "), flag);
- }
- }
-
- CBFlag->insertSeparator(CBFlag->count());
-
- // add all community flags
- for (QStringList::Iterator it = datalist.begin(); it != datalist.end(); ++it )
- {
- if (userlist.contains(*it,Qt::CaseInsensitive)) continue;
- QPixmap pix(datadir->absolutePath() + "/Graphics/Flags/" + *it);
- QIcon icon(pix.copy(0, 0, 22, 15));
- if(it->indexOf("cm_") > -1) // skip non community flags this time
- {
- QString flag = (*it).replace(QRegExp("^(.*)\\.png"), "\\1");
- CBFlag->addItem(icon, QString(flag).replace("cm_", QComboBox::tr("Community") + ": "), flag);
- }
- }
-
- vbox1->addStretch();
- vbox2->addStretch();
-
-// ====== Page 2 ======
- GBoxBinds = new QGroupBox(this);
- GBoxBinds->setTitle(QGroupBox::tr("Key binds"));
- QGridLayout * GBBLayout = new QGridLayout(GBoxBinds);
- BindsBox = new QToolBox(GBoxBinds);
- BindsBox->setLineWidth(0);
- GBBLayout->addWidget(BindsBox);
- page2Layout->addWidget(GBoxBinds, 0, 0);
-
- quint16 i = 0;
- quint16 num = 0;
- QWidget * curW = NULL;
- QGridLayout * pagelayout = NULL;
- QLabel* l = NULL;
- while (i < BINDS_NUMBER) {
- if(cbinds[i].category != NULL)
- {
- if(curW != NULL)
- {
- l = new QLabel(curW);
- l->setText("");
- pagelayout->addWidget(l, num++, 0, 1, 2);
- }
- curW = new QWidget(this);
- BindsBox->addItem(curW, HWApplication::translate("binds (categories)", cbinds[i].category));
- pagelayout = new QGridLayout(curW);
- num = 0;
- }
- if(cbinds[i].description != NULL)
- {
- l = new QLabel(curW);
- l->setText((num > 0 ? QString("\n") : QString("")) + HWApplication::translate("binds (descriptions)", cbinds[i].description));
- pagelayout->addWidget(l, num++, 0, 1, 2);
- }
-
- l = new QLabel(curW);
- l->setText(HWApplication::translate("binds", cbinds[i].name));
- l->setAlignment(Qt::AlignRight);
- pagelayout->addWidget(l, num, 0);
- CBBind[i] = new QComboBox(curW);
- for(int j = 0; sdlkeys[j][1][0] != '\0'; j++)
- CBBind[i]->addItem(HWApplication::translate("binds (keys)", sdlkeys[j][1]).contains(": ") ? HWApplication::translate("binds (keys)", sdlkeys[j][1]) : HWApplication::translate("binds (keys)", "Keyboard") + QString(": ") + HWApplication::translate("binds (keys)", sdlkeys[j][1]), sdlkeys[j][0]);
- pagelayout->addWidget(CBBind[i++], num++, 1);
- }
-}
-
-void PageEditTeam::CBFort_activated(const QString & fortname)
-{
- QFile tmp;
- tmp.setFileName(cfgdir->absolutePath() + "/Data/Forts/" + fortname + "L.png");
- if (!tmp.exists()) tmp.setFileName(datadir->absolutePath() + "/Forts/" + fortname + "L.png");
- QPixmap pix(QFileInfo(tmp).absoluteFilePath());
- FortPreview->setPixmap(pix);
-}
-
-void PageEditTeam::testSound()
-{
- Mix_Chunk *sound;
- QDir tmpdir;
- mySdli->SDLMusicInit();
-
- tmpdir.cd(cfgdir->absolutePath());
- tmpdir.cd("Data/Sounds/voices");
- tmpdir.cd(CBVoicepack->currentText());
-
- if (!tmpdir.exists()) {
- tmpdir.cd(datadir->absolutePath());
- tmpdir.cd("Sounds/voices");
- tmpdir.cd(CBVoicepack->currentText());
- }
-
- QStringList list = tmpdir.entryList(QStringList() << "Illgetyou.ogg" << "Incoming.ogg" << "Stupid.ogg" << "Coward.ogg" << "Firstblood.ogg", QDir::Files);
- if (list.size()) {
- sound = Mix_LoadWAV(QString(tmpdir.absolutePath() + "/" + list[rand() % list.size()]).toLocal8Bit().constData());
- Mix_PlayChannel(-1, sound, 0);
- }
-}
--- a/QTfrontend/pageeditteam.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_EDITTEAM_H
-#define PAGE_EDITTEAM_H
-
-#include "AbstractPage.h"
-#include "binds.h"
-#include "SDLs.h"
-
-class SquareLabel;
-
-class PageEditTeam : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageEditTeam(QWidget* parent, SDLInteraction * sdli);
- QSignalMapper* signalMapper;
- QGroupBox *GBoxHedgehogs;
- QGroupBox *GBoxTeam;
- QGroupBox *GBoxFort;
- QComboBox *CBFort;
- SquareLabel *FortPreview;
- QComboBox *CBGrave;
- QComboBox *CBFlag;
- QComboBox *CBTeamLvl;
- QComboBox *CBVoicepack;
- QGroupBox *GBoxBinds;
- QToolBox *BindsBox;
- QPushButton *BtnTeamDiscard;
- QPushButton *BtnTeamSave;
- QPushButton * BtnTestSound;
- QLineEdit * TeamNameEdit;
- QLineEdit * HHNameEdit[8];
- QComboBox * HHHats[8];
- QPushButton * randButton[8];
- QComboBox * CBBind[BINDS_NUMBER];
- QPushButton * randTeamButton;
-
-private:
- SDLInteraction * mySdli;
-
-public slots:
- void CBFort_activated(const QString & gravename);
-
-private slots:
- void testSound();
-};
-
-#endif
-
--- a/QTfrontend/pagegamestats.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,257 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2010-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QLabel>
-#include <QGridLayout>
-#include <QGraphicsScene>
-#include <QGroupBox>
-#include <QSizePolicy>
-
-#include "pagegamestats.h"
-#include "team.h"
-
-FitGraphicsView::FitGraphicsView(QWidget* parent) : QGraphicsView(parent)
-{
-
-}
-
-void FitGraphicsView::resizeEvent(QResizeEvent * event)
-{
- Q_UNUSED(event);
-
- fitInView(sceneRect());
-}
-
-PageGameStats::PageGameStats(QWidget* parent) : AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
- pageLayout->setSpacing(20);
- pageLayout->setColumnStretch(0, 1);
- pageLayout->setColumnStretch(1, 1);
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 3, 0, true);
- BtnBack->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-
- BtnSave = addButton(":/res/Save.png", pageLayout, 3, 2, true);
- BtnSave->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- BtnSave->setStyleSheet("QPushButton{margin: 12px 0px 12px 0px;}");
- connect(BtnSave, SIGNAL(clicked()), this, SIGNAL(saveDemoRequested()));
-
- QGroupBox * gb = new QGroupBox(this);
- QVBoxLayout * gbl = new QVBoxLayout;
-
- // details
- labelGameStats = new QLabel(this);
- QLabel * l = new QLabel(this);
- l->setTextFormat(Qt::RichText);
- l->setText("<h1><img src=\":/res/StatsD.png\"> " + PageGameStats::tr("Details") + "</h1>");
- l->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- labelGameStats->setTextFormat(Qt::RichText);
- labelGameStats->setAlignment(Qt::AlignTop);
- labelGameStats->setWordWrap(true);
- gbl->addWidget(l);
- gbl->addWidget(labelGameStats);
- gb->setLayout(gbl);
- pageLayout->addWidget(gb, 1, 1, 1, 2);
-
- // graph
- graphic = new FitGraphicsView(gb);
- l = new QLabel(this);
- l->setTextFormat(Qt::RichText);
- l->setText("<br><h1><img src=\":/res/StatsH.png\"> " + PageGameStats::tr("Health graph") + "</h1>");
- l->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- gbl->addWidget(l);
- gbl->addWidget(graphic);
- graphic->scale(1.0, -1.0);
- graphic->setBackgroundBrush(QBrush(Qt::black));
-
- labelGameWin = new QLabel(this);
- labelGameWin->setTextFormat(Qt::RichText);
- pageLayout->addWidget(labelGameWin, 0, 0, 1, 2);
-
- // ranking box
- gb = new QGroupBox(this);
- gbl = new QVBoxLayout;
- labelGameRank = new QLabel(gb);
- l = new QLabel(this);
- l->setTextFormat(Qt::RichText);
- l->setText("<h1><img src=\":/res/StatsR.png\"> " + PageGameStats::tr("Ranking") + "</h1>");
- l->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- gbl->addWidget(l);
- gbl->addWidget(labelGameRank);
- gb->setLayout(gbl);
-
- labelGameRank->setTextFormat(Qt::RichText);
- labelGameRank->setAlignment(Qt::AlignTop);
- pageLayout->addWidget(gb, 1, 0);
-}
-
-void PageGameStats::AddStatText(const QString & msg)
-{
- labelGameStats->setText(labelGameStats->text() + msg);
-}
-
-void PageGameStats::clear()
-{
- labelGameStats->setText("");
- healthPoints.clear();
- labelGameRank->setText("");
- playerPosition = 0;
- lastColor = 0;
-}
-
-void PageGameStats::renderStats()
-{
- QGraphicsScene * scene = new QGraphicsScene();
-
- QMap<quint32, QVector<quint32> >::const_iterator i = healthPoints.constBegin();
- while (i != healthPoints.constEnd())
- {
- quint32 c = i.key();
- QColor clanColor = QColor(qRgb((c >> 16) & 255, (c >> 8) & 255, c & 255));
- QVector<quint32> hps = i.value();
-
- QPainterPath path;
- if (hps.size())
- path.moveTo(0, hps[0]);
-
- for(int t = 1; t < hps.size(); ++t)
- path.lineTo(t, hps[t]);
-
- scene->addPath(path, QPen(c));
- ++i;
- }
-
- graphic->setScene(scene);
- graphic->fitInView(graphic->sceneRect());
-}
-
-void PageGameStats::GameStats(char type, const QString & info)
-{
- switch(type) {
- case 'r' : {
- labelGameWin->setText(QString("<h1 align=\"center\">%1</h1>").arg(info));
- break;
- }
- case 'D' : {
- int i = info.indexOf(' ');
- QString message = "<p><img src=\":/res/StatsBestShot.png\"> " + PageGameStats::tr("The best shot award was won by <b>%1</b> with <b>%2</b> pts.").arg(info.mid(i + 1), info.left(i)) + "</p>";
- AddStatText(message);
- break;
- }
- case 'k' : {
- int i = info.indexOf(' ');
- int num = info.left(i).toInt();
- QString message = "<p><img src=\":/res/StatsBestKiller.png\"> " + PageGameStats::tr("The best killer is <b>%1</b> with <b>%2</b> kills in a turn.", "", num).arg(info.mid(i + 1), info.left(i)) + "</p>";
- AddStatText(message);
- break;
- }
- case 'K' : {
- int num = info.toInt();
- QString message = "<p><img src=\":/res/StatsHedgehogsKilled.png\"> " + PageGameStats::tr("A total of <b>%1</b> hedgehog(s) were killed during this round.", "", num).arg(num) + "</p>";
- AddStatText(message);
- break;
- }
- case 'H' : {
- int i = info.indexOf(' ');
- quint32 clan = info.left(i).toInt();
- quint32 hp = info.mid(i + 1).toUInt();
- healthPoints[clan].append(hp);
- break;
- }
- case 'T': { // local team stats
- //AddStatText("<p>local team: " + info + "</p>");
- QStringList infol = info.split(":");
- HWTeam team(infol[0]);
- if(team.FileExists()) // do some better test to avoid influence from scripted/predefined teams?
- {
- team.LoadFromFile();
- team.Rounds++;
- if(infol[1].toInt() > 0) // might require some better test for winning condition (or changed flag) ... WIP!
- team.Wins++; // should draws count as wins?
- //team.SaveToFile(); // don't save yet
- }
- break;
- }
-
- case 'P' : {
- int i = info.indexOf(' ');
- playerPosition++;
- QString color = info.left(i);
- quint32 c = color.toInt();
- QColor clanColor = QColor(qRgb((c >> 16) & 255, (c >> 8) & 255, c & 255));
-
- QString playerinfo = info.mid(i + 1);
-
- i = playerinfo.indexOf(' ');
-
- int kills = playerinfo.left(i).toInt();
- QString playername = playerinfo.mid(i + 1);
- QString image;
-
- if (lastColor == c) playerPosition--;
- lastColor = c;
-
- switch (playerPosition)
- {
- case 1:
- image = "<img src=\":/res/StatsMedal1.png\">";
- break;
- case 2:
- image = "<img src=\":/res/StatsMedal2.png\">";
- break;
- case 3:
- image = "<img src=\":/res/StatsMedal3.png\">";
- break;
- default:
- image = "<img src=\":/res/StatsMedal4.png\">";
- break;
- }
-
- QString message;
- QString killstring = PageGameStats::tr("(%1 kill)", "", kills).arg(kills);
-
- message = QString("<p><h2>%1 %2. <font color=\"%4\">%3</font> ").arg(image, QString::number(playerPosition), playername, clanColor.name()) + killstring + "</h2></p>";
-
- labelGameRank->setText(labelGameRank->text() + message);
- break;
- }
- case 's' : {
- int i = info.indexOf(' ');
- int num = info.left(i).toInt();
- QString message = "<p><img src=\":/res/StatsMostSelfDamage.png\"> " + PageGameStats::tr("<b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.", "", num).arg(info.mid(i + 1)).arg(num) + "</p>";
- AddStatText(message);
- break;
- }
- case 'S' : {
- int i = info.indexOf(' ');
- int num = info.left(i).toInt();
- QString message = "<p><img src=\":/res/StatsSelfKilled.png\"> " + PageGameStats::tr("<b>%1</b> killed <b>%2</b> of his own hedgehogs.", "", num).arg(info.mid(i + 1)).arg(num) + "</p>";
- AddStatText(message);
- break;
- }
- case 'B' : {
- int i = info.indexOf(' ');
- int num = info.left(i).toInt();
- QString message = "<p><img src=\":/res/StatsSkipped.png\"> " + PageGameStats::tr("<b>%1</b> was scared and skipped turn <b>%2</b> times.", "", num).arg(info.mid(i + 1)).arg(num) + "</p>";
- AddStatText(message);
- break;
- }
-
- }
-}
--- a/QTfrontend/pagegamestats.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2010-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef STATSPAGE_H
-#define STATSPAGE_H
-
-#include <QVector>
-#include <QMap>
-#include <QGraphicsView>
-
-#include "AbstractPage.h"
-
-class FitGraphicsView : public QGraphicsView
-{
- Q_OBJECT
-
-public:
- FitGraphicsView(QWidget* parent = 0);
-
-protected:
- void resizeEvent(QResizeEvent * event);
-};
-
-class PageGameStats : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageGameStats(QWidget* parent = 0);
-
- QPushButton *BtnBack;
- QPushButton *BtnSave;
- QLabel *labelGameStats;
- QLabel *labelGameWin;
- QLabel *labelGameRank;
- FitGraphicsView * graphic;
-
-public slots:
- void GameStats(char type, const QString & info);
- void clear();
- void renderStats();
-
-signals:
- void saveDemoRequested();
-
-private:
- void AddStatText(const QString & msg);
-
- QMap<quint32, QVector<quint32> > healthPoints;
- unsigned int playerPosition;
- quint32 lastColor;
-};
-
-#endif // STATSPAGE_H
--- a/QTfrontend/pageinfo.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-
-#include "pageinfo.h"
-#include "about.h"
-
-PageInfo::PageInfo(QWidget* parent) : AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
- pageLayout->setColumnStretch(0, 1);
- pageLayout->setColumnStretch(1, 1);
- pageLayout->setColumnStretch(2, 1);
-
- BtnSnapshots = addButton(":/res/Star.png", pageLayout, 1, 2, true);
- BtnBack = addButton(":/res/Exit.png", pageLayout, 1, 0, true);
-
- about = new About(this);
- pageLayout->addWidget(about, 0, 0, 1, 3);
-}
--- a/QTfrontend/pageinfo.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_INFO_H
-#define PAGE_INFO_H
-
-#include "AbstractPage.h"
-
-class About;
-
-class PageInfo : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageInfo(QWidget* parent = 0);
-
- QPushButton *BtnSnapshots;
- QPushButton *BtnBack;
- About *about;
-};
-
-#endif
-
--- a/QTfrontend/pageingame.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QLabel>
-
-#include "pageingame.h"
-
-PageInGame::PageInGame(QWidget* parent) :
- AbstractPage(parent)
-{
- QLabel * label = new QLabel(this);
- label->setText("In game...");
-}
-
--- a/QTfrontend/pageingame.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_INGAME_H
-#define PAGE_INGAME_H
-
-#include "AbstractPage.h"
-
-class PageInGame : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageInGame(QWidget* parent = 0);
-};
-
-#endif
-
--- a/QTfrontend/pagemain.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QLabel>
-#include <QTime>
-
-#include "pagemain.h"
-#include "hwconsts.h"
-#include "hwform.h"
-
-PageMain::PageMain(QWidget* parent) :
- AbstractPage(parent)
-{
- if(frontendEffects) setAttribute(Qt::WA_NoSystemBackground, true);
- QGridLayout * pageLayout = new QGridLayout(this);
- //pageLayout->setColumnStretch(0, 1);
- //pageLayout->setColumnStretch(1, 2);
- //pageLayout->setColumnStretch(2, 1);
-
- //QPushButton* btnLogo = addButton(":/res/HedgewarsTitle.png", pageLayout, 0, 0, 1, 4, true);
- //pageLayout->setAlignment(btnLogo, Qt::AlignHCenter);
- pageLayout->setRowStretch(0, 1);
- pageLayout->setRowStretch(1, 1);
- pageLayout->setRowStretch(2, 0);
- pageLayout->setRowStretch(3, 1);
- pageLayout->setRowStretch(4, 1);
- pageLayout->setRowStretch(5, 1);
-
- BtnSinglePlayer = addButton(":/res/LocalPlay.png", pageLayout, 2, 0, 1, 2, true);
- BtnSinglePlayer->setToolTip(tr("Local Game (Play a game on a single computer)"));
- pageLayout->setAlignment(BtnSinglePlayer, Qt::AlignHCenter);
-
- BtnNet = addButton(":/res/NetworkPlay.png", pageLayout, 2, 2, 1, 2, true);
- BtnNet->setToolTip(tr("Network Game (Play a game across a network)"));
- pageLayout->setAlignment(BtnNet, Qt::AlignHCenter);
-
- BtnDataDownload = addButton(tr("Downloadable Content"), pageLayout, 4, 0, 1, 4, false);
- pageLayout->setAlignment(BtnDataDownload, Qt::AlignHCenter);
-
- mainNote = new QLabel(this);
- mainNote->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
- mainNote->setWordWrap(true);
- mainNote->setOpenExternalLinks(true);
-
- if(!isDevBuild)
- {
- QStringList Tips;
- Tips << tr("Simply pick the same color as a friend to play together as a team. Each of you will still control his or her own hedgehogs but they'll win or lose together.", "Tips");
- Tips << tr("Some weapons might do only low damage but they can be a lot more devastating in the right situation. Try to use the Desert Eagle to knock multiple hedgehogs into the water.", "Tips");
- Tips << tr("If you're unsure what to do and don't want to waste ammo, skip one round. But don't let too much time pass as there will be Sudden Death!", "Tips");
- Tips << tr("Want to save ropes? Release the rope in mid air and then shoot again. As long as you don't touch the ground you'll reuse your rope without wasting ammo!", "Tips");
- Tips << tr("If you'd like to keep others from using your preferred nickname on the official server, register an account at http://www.hedgewars.org/.", "Tips");
- Tips << tr("You're bored of default gameplay? Try one of the missions - they'll offer different gameplay depending on the one you picked.", "Tips");
- Tips << tr("By default the game will always record the last game played as a demo. Select 'Local Game' and pick the 'Demos' button on the lower right corner to play or manage them.", "Tips");
- Tips << tr("Hedgewars is Open Source and Freeware we create in our spare time. If you've got problems, ask on our forums but please don't expect 24/7 support!", "Tips");
- Tips << tr("Hedgewars is Open Source and Freeware we create in our spare time. If you like it, help us with a small donation or contribute your own work!", "Tips");
- Tips << tr("Hedgewars is Open Source and Freeware we create in our spare time. Share it with your family and friends as you like!", "Tips");
- Tips << tr("Hedgewars is Open Source and Freeware we create in our spare time. If someone sold you the game, you should try get a refund!", "Tips");
- Tips << tr("From time to time there will be official tournaments. Upcoming events will be announced at http://www.hedgewars.org/ some days in advance.", "Tips");
- Tips << tr("Hedgewars is available in many languages. If the translation in your language seems to be missing or outdated, feel free to contact us!", "Tips");
- Tips << tr("Hedgewars can be run on lots of different operating systems including Microsoft Windows, Mac OS X and Linux.", "Tips");
- Tips << tr("Always remember you're able to set up your own games in local and network/online play. You're not restricted to the 'Simple Game' option.", "Tips");
- Tips << tr("Connect one or more gamepads before starting the game to be able to assign their controls to your teams.", "Tips");
- Tips << tr("Create an account on %1 to keep others from using your most favourite nickname while playing on the official server.", "Tips").arg("<a href=\"http://www.hedgewars.org/\">http://www.hedgewars.org/</a>");
- Tips << tr("While playing you should give yourself a short break at least once an hour.", "Tips");
- Tips << tr("If your graphics card isn't able to provide hardware accelerated OpenGL, try to enable the low quality mode to improve performance.", "Tips");
- Tips << tr("If your graphics card isn't able to provide hardware accelerated OpenGL, try to update the associated drivers.", "Tips");
- Tips << tr("We're open to suggestions and constructive feedback. If you don't like something or got a great idea, let us know!", "Tips");
- Tips << tr("Especially while playing online be polite and always remember there might be some minors playing with or against you as well!", "Tips");
- Tips << tr("Special game modes such as 'Vampirism' or 'Karma' allow you to develop completely new tactics. Try them in a custom game!", "Tips");
- Tips << tr("The Windows version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing.", "Tips");
- Tips << tr("You should never install Hedgewars on computers you don't own (school, university, work, etc.). Please ask the responsible person instead!", "Tips");
- Tips << tr("Hedgewars can be perfect for short games during breaks. Just ensure you don't add too many hedgehogs or use an huge map. Reducing time and health might help as well.", "Tips");
- Tips << tr("No hedgehogs were harmed in making this game.", "Tips");
- Tips << tr("There are three different jumps available. Tap [high jump] twice to do a very high/backwards jump.", "Tips");
- Tips << tr("Afraid of falling off a cliff? Hold down [precise] to turn [left] or [right] without actually moving.", "Tips");
- Tips << tr("Some weapons require special strategies or just lots of training, so don't give up on a particular tool if you miss an enemy once.", "Tips");
- Tips << tr("Most weapons won't work once they touch the water. The Homing Bee as well as the Cake are exceptions to this.", "Tips");
- Tips << tr("The Old Limbuger only causes a small explosion. However the wind affected smelly cloud can poison lots of hogs at once.", "Tips");
- Tips << tr("The Piano Strike is the most damaging air strike. You'll lose the hedgehog performing it, so there's a huge downside as well.", "Tips");
- Tips << tr("The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.", "Tips");
- Tips << tr("Sticky Mines are a perfect tool to create small chain reactions knocking enemy hedgehogs into dire situations ... or water.", "Tips");
- Tips << tr("The Hammer is most effective when used on bridges or girders. Hit hogs will just break through the ground.", "Tips");
- Tips << tr("If you're stuck behind an enemy hedgehog, use the Hammer to free yourself without getting damaged by an explosion.", "Tips");
- Tips << tr("The Cake's maximum walking distance depends on the ground it has to pass. Use [attack] to detonate it early.", "Tips");
- Tips << tr("The Flame Thrower is a weapon but it can be used for tunnel digging as well.", "Tips");
- Tips << tr("Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.", "Tips");
- Tips << tr("Want to know who's behind the game? Click on the Hedgewars logo in the main menu to see the credits.", "Tips");
- Tips << tr("Like Hedgewars? Become a fan on %1 or follow us on %2!", "Tips").arg("<a href=\"http://www.facebook.com/Hedgewars\">Facebook</a>").arg("<a href=\"http://twitter.com/hedgewars\">Twitter</a>");
- Tips << tr("Feel free to draw your own graves, hats, flags or even maps and themes! But note that you'll have to share them somewhere to use them online.", "Tips");
- Tips << tr("Really want to wear a specific hat? Donate to us and receive an exclusive hat of your choice!", "Tips");
- // The following tip will require links to app store entries first.
- //Tips << tr("Want to play Hedgewars any time? Grab the Mobile version for %1 and %2.", "Tips").arg("").arg("");
- // the ios version is located here: http://itunes.apple.com/us/app/hedgewars/id391234866
- Tips << tr("Keep your video card drivers up to date to avoid issues playing the game.", "Tips");
- Tips << tr("You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.", "Tips");
-#ifdef _WIN32
- Tips << tr("You can find your Hedgewars configuration files under \"My Documents\\Hedgewars\". Create backups or take the files with you, but don't edit them by hand.", "Tips");
-#elif defined __APPLE__
- Tips << tr("You can find your Hedgewars configuration files under \"Library/Application Support/Hedgewars\" in your home directory. Create backups or take the files with you, but don't edit them by hand.", "Tips");
-#else
- Tips << tr("You can find your Hedgewars configuration files under \".hedgewars\" in your home directory. Create backups or take the files with you, but don't edit them by hand.", "Tips");
-#endif
- mainNote->setText(QLabel::tr("Tip: ") + Tips[QTime(0, 0, 0).secsTo(QTime::currentTime()) % Tips.length()]);
- }
- else
- mainNote->setText(QLabel::tr("This development build is 'work in progress' and may not be compatible with other versions of the game. Some features might be broken or incomplete. Use at your own risk!"));
-
- pageLayout->addWidget(mainNote, 5, 1, 1, 2);
-
- BtnSetup = addButton(":/res/Settings.png", pageLayout, 5, 3, true);
-
- //BtnInfo = addButton(":/res/About.png", pageLayout, 3, 1, 1, 2, true);
- BtnInfo = addButton(":/res/HedgewarsTitle.png", pageLayout, 0, 0, 1, 4, true);
- BtnInfo->setStyleSheet("border: transparent;background: transparent;");
- pageLayout->setAlignment(BtnInfo, Qt::AlignHCenter);
- //pageLayout->setAlignment(BtnInfo, Qt::AlignHCenter);
-
- BtnExit = addButton(":/res/Exit.png", pageLayout, 5, 0, 1, 1, true);
- BtnExit->setFixedHeight(BtnSetup->height());
- BtnExit->setStyleSheet("QPushButton{margin-top: 2px;}");
-}
--- a/QTfrontend/pagemain.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_MAIN_H
-#define PAGE_MAIN_H
-
-#include "AbstractPage.h"
-
-class PageMain : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageMain(QWidget* parent = 0);
-
- QPushButton *BtnSinglePlayer;
- QPushButton *BtnNet;
- QPushButton *BtnSetup;
- QPushButton *BtnInfo;
- QPushButton *BtnExit;
- QPushButton *BtnDataDownload;
- QLabel *mainNote;
-};
-
-#endif
-
--- a/QTfrontend/pagemultiplayer.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-
-#include "pagemultiplayer.h"
-#include "gamecfgwidget.h"
-#include "teamselect.h"
-
-PageMultiplayer::PageMultiplayer(QWidget* parent) :
- AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 3, 0, true);
-
- gameCFG = new GameCFGWidget(this);
- pageLayout->addWidget(gameCFG, 0, 0, 1, 2);
-
- QPushButton * btnSetup = new QPushButton(this);
- btnSetup->setText(QPushButton::tr("Setup"));
- connect(btnSetup, SIGNAL(clicked()), this, SIGNAL(SetupClicked()));
- pageLayout->addWidget(btnSetup, 1, 0, 1, 2);
-
- pageLayout->setRowStretch(2, 1);
-
- teamsSelect = new TeamSelWidget(this);
- pageLayout->addWidget(teamsSelect, 0, 2, 3, 2);
-
- BtnStartMPGame = addButton(tr("Start"), pageLayout, 3, 3);
-}
--- a/QTfrontend/pagemultiplayer.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_MULTIPLAYER_H
-#define PAGE_MULTIPLAYER_H
-
-#include "AbstractPage.h"
-
-class GameCFGWidget;
-class TeamSelWidget;
-
-class PageMultiplayer : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageMultiplayer(QWidget* parent = 0);
-
- QPushButton *BtnBack;
- GameCFGWidget *gameCFG;
- TeamSelWidget *teamsSelect;
- QPushButton *BtnStartMPGame;
-
-signals:
- void SetupClicked();
-};
-
-#endif
-
-
--- a/QTfrontend/pagenet.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QGroupBox>
-#include <QTableView>
-#include <QMessageBox>
-#include <QHeaderView>
-
-#include "pagenet.h"
-#include "hwconsts.h"
-#include "netudpwidget.h"
-
-PageNet::PageNet(QWidget* parent) : AbstractPage(parent)
-{
- QFont * font14 = new QFont("MS Shell Dlg", 14);
- QGridLayout * pageLayout = new QGridLayout(this);
- pageLayout->setColumnStretch(0, 1);
- pageLayout->setColumnStretch(1, 1);
- pageLayout->setColumnStretch(2, 1);
-
- BtnNetSvrStart = new QPushButton(this);
- BtnNetSvrStart->setFont(*font14);
- BtnNetSvrStart->setText(QPushButton::tr("Start server"));
- BtnNetSvrStart->setVisible(haveServer);
- pageLayout->addWidget(BtnNetSvrStart, 4, 2);
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 4, 0, true);
-
- ConnGroupBox = new QGroupBox(this);
- ConnGroupBox->setTitle(QGroupBox::tr("Net game"));
- pageLayout->addWidget(ConnGroupBox, 2, 0, 1, 3);
- GBClayout = new QGridLayout(ConnGroupBox);
- GBClayout->setColumnStretch(0, 1);
- GBClayout->setColumnStretch(1, 1);
- GBClayout->setColumnStretch(2, 1);
-
- BtnNetConnect = new QPushButton(ConnGroupBox);
- BtnNetConnect->setFont(*font14);
- BtnNetConnect->setText(QPushButton::tr("Connect"));
- GBClayout->addWidget(BtnNetConnect, 2, 2);
-
- tvServersList = new QTableView(ConnGroupBox);
- tvServersList->setSelectionBehavior(QAbstractItemView::SelectRows);
- GBClayout->addWidget(tvServersList, 1, 0, 1, 3);
-
- BtnUpdateSList = new QPushButton(ConnGroupBox);
- BtnUpdateSList->setFont(*font14);
- BtnUpdateSList->setText(QPushButton::tr("Update"));
- GBClayout->addWidget(BtnUpdateSList, 2, 0);
-
- BtnSpecifyServer = new QPushButton(ConnGroupBox);
- BtnSpecifyServer->setFont(*font14);
- BtnSpecifyServer->setText(QPushButton::tr("Specify"));
- GBClayout->addWidget(BtnSpecifyServer, 2, 1);
-
- connect(BtnNetConnect, SIGNAL(clicked()), this, SLOT(slotConnect()));
-}
-
-void PageNet::updateServersList()
-{
- tvServersList->setModel(new HWNetUdpModel(tvServersList));
-
- tvServersList->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
-
- static_cast<HWNetServersModel *>(tvServersList->model())->updateList();
-
- connect(BtnUpdateSList, SIGNAL(clicked()), static_cast<HWNetServersModel *>(tvServersList->model()), SLOT(updateList()));
- connect(tvServersList, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(slotConnect()));
-}
-
-void PageNet::slotConnect()
-{
- HWNetServersModel * model = static_cast<HWNetServersModel *>(tvServersList->model());
- QModelIndex mi = tvServersList->currentIndex();
- if(!mi.isValid())
- {
- QMessageBox::information(this, tr("Error"), tr("Please select server from the list above"));
- return;
- }
- QString host = model->index(mi.row(), 1).data().toString();
- quint16 port = model->index(mi.row(), 2).data().toUInt();
-
- emit connectClicked(host, port);
-}
--- a/QTfrontend/pagenet.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_NET_H
-#define PAGE_NET_H
-
-#include "AbstractPage.h"
-
-class PageNet : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageNet(QWidget* parent = 0);
-
- QPushButton* BtnUpdateSList;
- QTableView * tvServersList;
- QPushButton * BtnBack;
- QPushButton * BtnNetConnect;
- QPushButton * BtnNetSvrStart;
- QPushButton * BtnSpecifyServer;
-
-private:
- QGroupBox * ConnGroupBox;
- QGridLayout * GBClayout;
-
-private slots:
- void slotConnect();
-
-public slots:
- void updateServersList();
-
-signals:
- void connectClicked(const QString & host, quint16 port);
-};
-
-#endif
-
--- a/QTfrontend/pagenetgame.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QAction>
-#include <QMenu>
-#include <QMessageBox>
-
-#include "pagenetgame.h"
-#include "gamecfgwidget.h"
-#include "teamselect.h"
-#include "chatwidget.h"
-
-PageNetGame::PageNetGame(QWidget* parent, QSettings * gameSettings, SDLInteraction * sdli) : AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
- pageLayout->setSizeConstraint(QLayout::SetMinimumSize);
- //pageLayout->setSpacing(1);
- pageLayout->setColumnStretch(0, 50);
- pageLayout->setColumnStretch(1, 50);
-
- // chatwidget
- pChatWidget = new HWChatWidget(this, gameSettings, sdli, true);
- pChatWidget->setShowReady(true); // show status bulbs by default
- pChatWidget->setShowFollow(false); // don't show follow in nicks' context menus
- pageLayout->addWidget(pChatWidget, 2, 0, 1, 2);
- pageLayout->setRowStretch(1, 100);
-
- pGameCFG = new GameCFGWidget(this);
- pageLayout->addWidget(pGameCFG, 0, 0);
-
- QPushButton * btnSetup = new QPushButton(this);
- btnSetup->setText(QPushButton::tr("Setup"));
- connect(btnSetup, SIGNAL(clicked()), this, SIGNAL(SetupClicked()));
- pageLayout->addWidget(btnSetup, 1, 0);
-
- pNetTeamsWidget = new TeamSelWidget(this);
- pNetTeamsWidget->setAcceptOuter(true);
- pageLayout->addWidget(pNetTeamsWidget, 0, 1, 2, 1);
-
-
- QHBoxLayout * bottomLayout = new QHBoxLayout;
- pageLayout->addLayout(bottomLayout, 4, 0, 1, 2);
-
- BtnBack = addButton(":/res/Exit.png", bottomLayout, 0, true);
-
- leRoomName = new QLineEdit(this);
- leRoomName->setMaxLength(60);
- leRoomName->setMinimumWidth(200);
- leRoomName->setMaximumWidth(400);
- bottomLayout->addWidget(leRoomName, 8,0);
- BtnUpdate = addButton(QAction::tr("Update"), bottomLayout, 1, false);
-
- BtnGo = new QPushButton(this);
- BtnGo->setToolTip(QPushButton::tr("Ready"));
- BtnGo->setIcon(QIcon(":/res/lightbulb_off.png"));
- BtnGo->setIconSize(QSize(25, 34));
- BtnGo->setMinimumWidth(50);
- BtnGo->setMinimumHeight(50);
- bottomLayout->addWidget(BtnGo, 4);
-
-
- BtnMaster = addButton(tr("Control"), bottomLayout, 2);
- QMenu * menu = new QMenu(BtnMaster);
- restrictJoins = new QAction(QAction::tr("Restrict Joins"), menu);
- restrictJoins->setCheckable(true);
- restrictTeamAdds = new QAction(QAction::tr("Restrict Team Additions"), menu);
- restrictTeamAdds->setCheckable(true);
- //menu->addAction(startGame);
- menu->addAction(restrictJoins);
- menu->addAction(restrictTeamAdds);
-
- BtnMaster->setMenu(menu);
-
- BtnStart = addButton(QAction::tr("Start"), bottomLayout, 3);
-
- bottomLayout->insertStretch(3, 100);
-
- connect(BtnUpdate, SIGNAL(clicked()), this, SLOT(onUpdateClick()));
-}
-
-void PageNetGame::setReadyStatus(bool isReady)
-{
- if(isReady)
- BtnGo->setIcon(QIcon(":/res/lightbulb_on.png"));
- else
- BtnGo->setIcon(QIcon(":/res/lightbulb_off.png"));
-}
-
-void PageNetGame::onUpdateClick()
-{
- if (leRoomName->text().size())
- emit askForUpdateRoomName(leRoomName->text());
- else
- QMessageBox::critical(this,
- tr("Error"),
- tr("Please enter room name"),
- tr("OK"));
-}
-
-void PageNetGame::setMasterMode(bool isMaster)
-{
- BtnMaster->setVisible(isMaster);
- BtnStart->setVisible(isMaster);
- BtnUpdate->setVisible(isMaster);
- leRoomName->setVisible(isMaster);
-}
--- a/QTfrontend/pagenetgame.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_NETGAME_H
-#define PAGE_NETGAME_H
-
-#include "AbstractPage.h"
-#include "SDLs.h"
-
-class HWChatWidget;
-class TeamSelWidget;
-class GameCFGWidget;
-
-class PageNetGame : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageNetGame(QWidget* parent, QSettings * config, SDLInteraction * sdli);
-
- QPushButton *BtnBack;
- QPushButton *BtnGo;
- QPushButton *BtnMaster;
- QPushButton *BtnStart;
- QPushButton *BtnUpdate;
-
- QLineEdit * leRoomName;
-
- QAction * restrictJoins;
- QAction * restrictTeamAdds;
-
- HWChatWidget* pChatWidget;
-
- TeamSelWidget* pNetTeamsWidget;
- GameCFGWidget* pGameCFG;
-
-public slots:
- void setReadyStatus(bool isReady);
- void onUpdateClick();
- void setMasterMode(bool isMaster);
-
-signals:
- void SetupClicked();
- void askForUpdateRoomName(const QString &);
-};
-
-#endif
--- a/QTfrontend/pagenetserver.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QGroupBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QSpinBox>
-
-#include "pagenetserver.h"
-
-PageNetServer::PageNetServer(QWidget* parent) : AbstractPage(parent)
-{
- QFont * font14 = new QFont("MS Shell Dlg", 14);
- QGridLayout * pageLayout = new QGridLayout(this);
- pageLayout->setColumnStretch(0, 1);
- pageLayout->setColumnStretch(1, 1);
- pageLayout->setColumnStretch(2, 1);
-
- pageLayout->setRowStretch(0, 1);
- pageLayout->setRowStretch(1, 0);
-
- BtnBack =addButton(":/res/Exit.png", pageLayout, 1, 0, true);
-
- BtnStart = new QPushButton(this);
- BtnStart->setFont(*font14);
- BtnStart->setText(QPushButton::tr("Start"));
- pageLayout->addWidget(BtnStart, 1, 2);
-
- QWidget * wg = new QWidget(this);
- pageLayout->addWidget(wg, 0, 0, 1, 3);
-
- QGridLayout * wgLayout = new QGridLayout(wg);
- wgLayout->setColumnStretch(0, 1);
- wgLayout->setColumnStretch(1, 3);
- wgLayout->setColumnStretch(2, 1);
-
- wgLayout->setRowStretch(0, 0);
- wgLayout->setRowStretch(1, 1);
-
- QGroupBox * gb = new QGroupBox(wg);
- wgLayout->addWidget(gb, 0, 1);
-
- QGridLayout * gbLayout = new QGridLayout(gb);
-
- labelSD = new QLabel(gb);
- labelSD->setText(QLabel::tr("Server name:"));
- gbLayout->addWidget(labelSD, 0, 0);
-
- leServerDescr = new QLineEdit(gb);
- gbLayout->addWidget(leServerDescr, 0, 1);
-
- labelPort = new QLabel(gb);
- labelPort->setText(QLabel::tr("Server port:"));
- gbLayout->addWidget(labelPort, 1, 0);
-
- sbPort = new QSpinBox(gb);
- sbPort->setMinimum(0);
- sbPort->setMaximum(65535);
- gbLayout->addWidget(sbPort, 1, 1);
-
- BtnDefault = new QPushButton(gb);
- BtnDefault->setText(QPushButton::tr("default"));
- gbLayout->addWidget(BtnDefault, 1, 2);
-
- connect(BtnDefault, SIGNAL(clicked()), this, SLOT(setDefaultPort()));
-}
-
-void PageNetServer::setDefaultPort()
-{
- sbPort->setValue(46631);
-}
--- a/QTfrontend/pagenetserver.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_NETSERVER_H
-#define PAGE_NETSERVER_H
-
-#include "AbstractPage.h"
-
-class PageNetServer : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageNetServer(QWidget* parent = 0);
-
- QPushButton *BtnBack;
- QPushButton *BtnStart;
- QPushButton *BtnDefault;
- QLabel *labelSD;
- QLineEdit *leServerDescr;
- QLabel *labelPort;
- QSpinBox *sbPort;
-
-private slots:
- void setDefaultPort();
-};
-
-#endif
--- a/QTfrontend/pagenettype.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-
-#include "pagenettype.h"
-
-PageNetType::PageNetType(QWidget* parent) : AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
- pageLayout->setRowStretch(0, 10);
- pageLayout->setRowStretch(3, 10);
-
- pageLayout->setColumnStretch(1, 10);
- pageLayout->setColumnStretch(2, 20);
- pageLayout->setColumnStretch(3, 10);
-
- BtnLAN = addButton(tr("LAN game"), pageLayout, 1, 2);
- BtnOfficialServer = addButton(tr("Official server"), pageLayout, 2, 2);
-
- // hack: temporary deactivated - requires server modifications that aren't backward compatible (yet)
- //BtnOfficialServer->setEnabled(false);
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 4, 0, true);
-}
--- a/QTfrontend/pagenettype.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_NETTYPE_H
-#define PAGE_NETTYPE_H
-
-#include "AbstractPage.h"
-
-class PageNetType : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageNetType(QWidget* parent = 0);
-
- QPushButton * BtnBack;
- QPushButton * BtnLAN;
- QPushButton * BtnOfficialServer;
-};
-
-#endif
--- a/QTfrontend/pageoptions.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,437 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QGroupBox>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QSpinBox>
-#include <QTextBrowser>
-#include <QTableWidget>
-#include <QSlider>
-
-#include "pageoptions.h"
-#include "hwconsts.h"
-#include "fpsedit.h"
-#include "igbox.h"
-
-PageOptions::PageOptions(QWidget* parent) :
- AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
- pageLayout->setColumnStretch(0, 100);
- pageLayout->setColumnStretch(1, 100);
- pageLayout->setColumnStretch(2, 100);
- pageLayout->setRowStretch(0, 0);
- //pageLayout->setRowStretch(1, 100);
- pageLayout->setRowStretch(2, 0);
- pageLayout->setContentsMargins(7, 7, 7, 0);
- pageLayout->setSpacing(0);
-
-
- QGroupBox * gbTwoBoxes = new QGroupBox(this);
- pageLayout->addWidget(gbTwoBoxes, 0, 0, 1, 3);
- QGridLayout * gbTBLayout = new QGridLayout(gbTwoBoxes);
- gbTBLayout->setMargin(0);
- gbTBLayout->setSpacing(0);
- gbTBLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-
- QPixmap pmNew(":/res/new.png");
- QPixmap pmEdit(":/res/edit.png");
- QPixmap pmDelete(":/res/delete.png");
-
- {
- teamsBox = new IconedGroupBox(this);
- //teamsBox->setContentTopPadding(0);
- //teamsBox->setAttribute(Qt::WA_PaintOnScreen, true);
- teamsBox->setIcon(QIcon(":/res/teamicon.png"));
- teamsBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- teamsBox->setTitle(QGroupBox::tr("Teams"));
-
- QGridLayout * GBTlayout = new QGridLayout(teamsBox);
-
- CBTeamName = new QComboBox(teamsBox);
- GBTlayout->addWidget(CBTeamName, 0, 0);
-
- BtnNewTeam = new QPushButton(teamsBox);
- BtnNewTeam->setToolTip(tr("New team"));
- BtnNewTeam->setIconSize(pmNew.size());
- BtnNewTeam->setIcon(pmNew);
- BtnNewTeam->setMaximumWidth(pmNew.width() + 6);
- GBTlayout->addWidget(BtnNewTeam, 0, 1);
-
- BtnEditTeam = new QPushButton(teamsBox);
- BtnEditTeam->setToolTip(tr("Edit team"));
- BtnEditTeam->setIconSize(pmEdit.size());
- BtnEditTeam->setIcon(pmEdit);
- BtnEditTeam->setMaximumWidth(pmEdit.width() + 6);
- GBTlayout->addWidget(BtnEditTeam, 0, 2);
-
- BtnDeleteTeam = new QPushButton(teamsBox);
- BtnDeleteTeam->setToolTip(tr("Delete team"));
- BtnDeleteTeam->setIconSize(pmDelete.size());
- BtnDeleteTeam->setIcon(pmDelete);
- BtnDeleteTeam->setMaximumWidth(pmDelete.width() + 6);
- GBTlayout->addWidget(BtnDeleteTeam, 0, 3);
-
- LblNoEditTeam = new QLabel(teamsBox);
- LblNoEditTeam->setText(tr("You can't edit teams from team selection. Go back to main menu to add, edit or delete teams."));
- LblNoEditTeam->setWordWrap(true);
- LblNoEditTeam->setVisible(false);
- GBTlayout->addWidget(LblNoEditTeam, 0, 0);
-
- gbTBLayout->addWidget(teamsBox, 0, 0);
- }
-
- {
- IconedGroupBox* groupWeapons = new IconedGroupBox(this);
-
- //groupWeapons->setContentTopPadding(0);
- //groupWeapons->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- groupWeapons->setIcon(QIcon(":/res/weaponsicon.png"));
- groupWeapons->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- groupWeapons->setTitle(QGroupBox::tr("Schemes and Weapons"));
- QGridLayout * WeaponsLayout = new QGridLayout(groupWeapons);
-
- QLabel* SchemeLabel = new QLabel(groupWeapons);
- SchemeLabel->setText(QLabel::tr("Game scheme"));
- WeaponsLayout->addWidget(SchemeLabel, 1, 0);
-
- SchemesName = new QComboBox(groupWeapons);
- WeaponsLayout->addWidget(SchemesName, 1, 1);
-
- SchemeNew = new QPushButton(groupWeapons);
- SchemeNew->setToolTip(tr("New scheme"));
- SchemeNew->setIconSize(pmNew.size());
- SchemeNew->setIcon(pmNew);
- SchemeNew->setMaximumWidth(pmNew.width() + 6);
- WeaponsLayout->addWidget(SchemeNew, 1, 2);
-
- SchemeEdit = new QPushButton(groupWeapons);
- SchemeEdit->setToolTip(tr("Edit scheme"));
- SchemeEdit->setIconSize(pmEdit.size());
- SchemeEdit->setIcon(pmEdit);
- SchemeEdit->setMaximumWidth(pmEdit.width() + 6);
- WeaponsLayout->addWidget(SchemeEdit, 1, 3);
-
- SchemeDelete = new QPushButton(groupWeapons);
- SchemeDelete->setToolTip(tr("Delete scheme"));
- SchemeDelete->setIconSize(pmDelete.size());
- SchemeDelete->setIcon(pmDelete);
- SchemeDelete->setMaximumWidth(pmDelete.width() + 6);
- WeaponsLayout->addWidget(SchemeDelete, 1, 4);
-
- QLabel* WeaponLabel = new QLabel(groupWeapons);
- WeaponLabel->setText(QLabel::tr("Weapons"));
- WeaponsLayout->addWidget(WeaponLabel, 2, 0);
-
- WeaponsName = new QComboBox(groupWeapons);
- WeaponsLayout->addWidget(WeaponsName, 2, 1);
-
- WeaponNew = new QPushButton(groupWeapons);
- WeaponNew->setToolTip(tr("New weapon set"));
- WeaponNew->setIconSize(pmNew.size());
- WeaponNew->setIcon(pmNew);
- WeaponNew->setMaximumWidth(pmNew.width() + 6);
- WeaponsLayout->addWidget(WeaponNew, 2, 2);
-
- WeaponEdit = new QPushButton(groupWeapons);
- WeaponEdit->setToolTip(tr("Edit weapon set"));
- WeaponEdit->setIconSize(pmEdit.size());
- WeaponEdit->setIcon(pmEdit);
- WeaponEdit->setMaximumWidth(pmEdit.width() + 6);
- WeaponsLayout->addWidget(WeaponEdit, 2, 3);
-
- WeaponDelete = new QPushButton(groupWeapons);
- WeaponDelete->setToolTip(tr("Delete weapon set"));
- WeaponDelete->setIconSize(pmDelete.size());
- WeaponDelete->setIcon(pmDelete);
- WeaponDelete->setMaximumWidth(pmDelete.width() + 6);
- WeaponsLayout->addWidget(WeaponDelete, 2, 4);
-
- WeaponTooltip = new QCheckBox(this);
- WeaponTooltip->setText(QCheckBox::tr("Show ammo menu tooltips"));
- WeaponsLayout->addWidget(WeaponTooltip, 3, 0, 1, 4);
-
- gbTBLayout->addWidget(groupWeapons, 1, 0);
- }
-
- {
- IconedGroupBox* groupMisc = new IconedGroupBox(this);
- //groupMisc->setContentTopPadding(0);
- groupMisc->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- groupMisc->setIcon(QIcon(":/res/miscicon.png"));
- //groupMisc->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- groupMisc->setTitle(QGroupBox::tr("Misc"));
- QGridLayout * MiscLayout = new QGridLayout(groupMisc);
-
- labelNN = new QLabel(groupMisc);
- labelNN->setText(QLabel::tr("Net nick"));
- MiscLayout->addWidget(labelNN, 0, 0);
-
- editNetNick = new QLineEdit(groupMisc);
- editNetNick->setMaxLength(20);
- editNetNick->setText(QLineEdit::tr("unnamed"));
- connect(editNetNick, SIGNAL(editingFinished()), this, SLOT(trimNetNick()));
- MiscLayout->addWidget(editNetNick, 0, 1);
-
- labelNetPassword = new QLabel(groupMisc);
- labelNetPassword->setText(QLabel::tr("Password"));
- MiscLayout->addWidget(labelNetPassword, 1, 0);
-
- editNetPassword = new QLineEdit(groupMisc);
- editNetPassword->setEchoMode(QLineEdit::Password);
- MiscLayout->addWidget(editNetPassword, 1, 1);
-
- QLabel *labelLanguage = new QLabel(groupMisc);
- labelLanguage->setText(QLabel::tr("Locale") + " *");
- MiscLayout->addWidget(labelLanguage, 2, 0);
-
- CBLanguage = new QComboBox(groupMisc);
- QDir tmpdir;
- tmpdir.cd(cfgdir->absolutePath());
- tmpdir.cd("Data/Locale");
- tmpdir.setFilter(QDir::Files);
- QStringList locs = tmpdir.entryList(QStringList("hedgewars_*.qm"));
- CBLanguage->addItem(QComboBox::tr("(System default)"), QString(""));
- for(int i = 0; i < locs.count(); i++)
- {
- QLocale loc(locs[i].replace(QRegExp("hedgewars_(.*)\\.qm"), "\\1"));
- CBLanguage->addItem(QLocale::languageToString(loc.language()) + " (" + QLocale::countryToString(loc.country()) + ")", loc.name());
- }
-
- tmpdir.cd(datadir->absolutePath());
- tmpdir.cd("Locale");
- tmpdir.setFilter(QDir::Files);
- QStringList tmplist = tmpdir.entryList(QStringList("hedgewars_*.qm"));
- for(int i = 0; i < tmplist.count(); i++)
- {
- if (locs.contains(tmplist[i])) continue;
- QLocale loc(tmplist[i].replace(QRegExp("hedgewars_(.*)\\.qm"), "\\1"));
- CBLanguage->addItem(QLocale::languageToString(loc.language()) + " (" + QLocale::countryToString(loc.country()) + ")", loc.name());
- }
-
- MiscLayout->addWidget(CBLanguage, 2, 1);
-
- CBAltDamage = new QCheckBox(groupMisc);
- CBAltDamage->setText(QCheckBox::tr("Alternative damage show"));
- MiscLayout->addWidget(CBAltDamage, 3, 0, 1, 2);
-
- CBNameWithDate = new QCheckBox(groupMisc);
- CBNameWithDate->setText(QCheckBox::tr("Append date and time to record file name"));
- MiscLayout->addWidget(CBNameWithDate, 4, 0, 1, 2);
-
- BtnAssociateFiles = new QPushButton(groupMisc);
- BtnAssociateFiles->setText(QPushButton::tr("Associate file extensions"));
- BtnAssociateFiles->setEnabled(!custom_data && !custom_config);
- MiscLayout->addWidget(BtnAssociateFiles, 5, 0, 1, 2);
-
-#ifdef __APPLE__
-#ifdef SPARKLE_ENABLED
- CBAutoUpdate = new QCheckBox(groupMisc);
- CBAutoUpdate->setText(QCheckBox::tr("Check for updates at startup"));
- MiscLayout->addWidget(CBAutoUpdate, 6, 0, 1, 3);
-#endif
-#endif
- gbTBLayout->addWidget(groupMisc, 2, 0);
- }
-
- {
- AGGroupBox = new IconedGroupBox(this);
- //AGGroupBox->setContentTopPadding(0);
- AGGroupBox->setIcon(QIcon(":/res/graphicsicon.png"));
- //AGGroupBox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
- AGGroupBox->setTitle(QGroupBox::tr("Audio/Graphic options"));
-
- QVBoxLayout * GBAlayout = new QVBoxLayout(AGGroupBox);
- QHBoxLayout * GBAreslayout = new QHBoxLayout(0);
- QHBoxLayout * GBAstereolayout = new QHBoxLayout(0);
- QHBoxLayout * GBAqualayout = new QHBoxLayout(0);
-
- CBFrontendFullscreen = new QCheckBox(AGGroupBox);
- CBFrontendFullscreen->setText(QCheckBox::tr("Frontend fullscreen"));
- GBAlayout->addWidget(CBFrontendFullscreen);
-
- CBFrontendEffects = new QCheckBox(AGGroupBox);
- CBFrontendEffects->setText(QCheckBox::tr("Frontend effects") + " *");
- GBAlayout->addWidget(CBFrontendEffects);
-
- CBEnableFrontendSound = new QCheckBox(AGGroupBox);
- CBEnableFrontendSound->setText(QCheckBox::tr("Enable frontend sounds"));
- GBAlayout->addWidget(CBEnableFrontendSound);
-
- CBEnableFrontendMusic = new QCheckBox(AGGroupBox);
- CBEnableFrontendMusic->setText(QCheckBox::tr("Enable frontend music"));
- GBAlayout->addWidget(CBEnableFrontendMusic);
-
- QFrame * hr = new QFrame(AGGroupBox);
- hr->setFrameStyle(QFrame::HLine);
- hr->setLineWidth(3);
- hr->setFixedHeight(10);
- GBAlayout->addWidget(hr);
-
- QLabel * resolution = new QLabel(AGGroupBox);
- resolution->setText(QLabel::tr("Resolution"));
- GBAreslayout->addWidget(resolution);
-
- CBResolution = new QComboBox(AGGroupBox);
- GBAreslayout->addWidget(CBResolution);
- GBAlayout->addLayout(GBAreslayout);
-
- CBFullscreen = new QCheckBox(AGGroupBox);
- CBFullscreen->setText(QCheckBox::tr("Fullscreen"));
- GBAlayout->addWidget(CBFullscreen);
- connect(CBFullscreen, SIGNAL(stateChanged(int)), this, SLOT(setFullscreen(void)));
-
- QLabel * quality = new QLabel(AGGroupBox);
- quality->setText(QLabel::tr("Quality"));
- quality->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- GBAqualayout->addWidget(quality);
-
- SLQuality = new QSlider(Qt::Horizontal, AGGroupBox);
- SLQuality->setTickPosition(QSlider::TicksBelow);
- SLQuality->setMaximum(5);
- SLQuality->setMinimum(0);
- SLQuality->setFixedWidth(150);
- GBAqualayout->addWidget(SLQuality);
- GBAlayout->addLayout(GBAqualayout);
- QLabel * stereo = new QLabel(AGGroupBox);
- stereo->setText(QLabel::tr("Stereo rendering"));
- GBAstereolayout->addWidget(stereo);
-
- CBStereoMode = new QComboBox(AGGroupBox);
- CBStereoMode->addItem(QComboBox::tr("Disabled"));
- CBStereoMode->addItem(QComboBox::tr("Red/Cyan"));
- CBStereoMode->addItem(QComboBox::tr("Cyan/Red"));
- CBStereoMode->addItem(QComboBox::tr("Red/Blue"));
- CBStereoMode->addItem(QComboBox::tr("Blue/Red"));
- CBStereoMode->addItem(QComboBox::tr("Red/Green"));
- CBStereoMode->addItem(QComboBox::tr("Green/Red"));
- CBStereoMode->addItem(QComboBox::tr("Side-by-side"));
- CBStereoMode->addItem(QComboBox::tr("Top-Bottom"));
- CBStereoMode->addItem(QComboBox::tr("Wiggle"));
- CBStereoMode->addItem(QComboBox::tr("Red/Cyan grayscale"));
- CBStereoMode->addItem(QComboBox::tr("Cyan/Red grayscale"));
- CBStereoMode->addItem(QComboBox::tr("Red/Blue grayscale"));
- CBStereoMode->addItem(QComboBox::tr("Blue/Red grayscale"));
- CBStereoMode->addItem(QComboBox::tr("Red/Green grayscale"));
- CBStereoMode->addItem(QComboBox::tr("Green/Red grayscale"));
- connect(CBStereoMode, SIGNAL(currentIndexChanged(int)), this, SLOT(forceFullscreen(int)));
-
- GBAstereolayout->addWidget(CBStereoMode);
- GBAlayout->addLayout(GBAstereolayout);
-
- hr = new QFrame(AGGroupBox);
- hr->setFrameStyle(QFrame::HLine);
- hr->setLineWidth(3);
- hr->setFixedHeight(10);
- GBAlayout->addWidget(hr);
-
- QHBoxLayout * GBAvollayout = new QHBoxLayout(0);
- QLabel * vol = new QLabel(AGGroupBox);
- vol->setText(QLabel::tr("Initial sound volume"));
- GBAvollayout->addWidget(vol);
- GBAlayout->addLayout(GBAvollayout);
- volumeBox = new QSpinBox(AGGroupBox);
- volumeBox->setRange(0, 100);
- volumeBox->setSingleStep(5);
- GBAvollayout->addWidget(volumeBox);
-
- CBEnableSound = new QCheckBox(AGGroupBox);
- CBEnableSound->setText(QCheckBox::tr("Enable sound"));
- GBAlayout->addWidget(CBEnableSound);
-
- CBEnableMusic = new QCheckBox(AGGroupBox);
- CBEnableMusic->setText(QCheckBox::tr("Enable music"));
- GBAlayout->addWidget(CBEnableMusic);
-
- hr = new QFrame(AGGroupBox);
- hr->setFrameStyle(QFrame::HLine);
- hr->setLineWidth(3);
- hr->setFixedHeight(10);
- GBAlayout->addWidget(hr);
-
- QHBoxLayout * GBAfpslayout = new QHBoxLayout(0);
- QLabel * maxfps = new QLabel(AGGroupBox);
- maxfps->setText(QLabel::tr("FPS limit"));
- GBAfpslayout->addWidget(maxfps);
- GBAlayout->addLayout(GBAfpslayout);
- fpsedit = new FPSEdit(AGGroupBox);
- GBAfpslayout->addWidget(fpsedit);
-
- CBShowFPS = new QCheckBox(AGGroupBox);
- CBShowFPS->setText(QCheckBox::tr("Show FPS"));
- GBAlayout->addWidget(CBShowFPS);
-
- hr = new QFrame(AGGroupBox);
- hr->setFrameStyle(QFrame::HLine);
- hr->setLineWidth(3);
- hr->setFixedHeight(10);
- GBAlayout->addWidget(hr);
-
- QLabel *restartNote = new QLabel(this);
- restartNote->setText(QString("* ") + QLabel::tr("Restart game to apply"));
- restartNote->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
- GBAlayout->addWidget(restartNote);
-
- gbTBLayout->addWidget(AGGroupBox, 0, 1, 3, 1);
- }
-
- BtnSaveOptions = addButton(":/res/Save.png", pageLayout, 2, 2, true);
- BtnSaveOptions->setStyleSheet("QPushButton{margin: 12px 0px 12px 0px;}");
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 2, 0, true);
- BtnBack->setFixedHeight(BtnSaveOptions->height());
- BtnBack->setFixedWidth(BtnBack->width()+2);
- BtnBack->setStyleSheet("QPushButton{margin: 22px 0 9px 2px;}");
-}
-
-void PageOptions::forceFullscreen(int index)
-{
- if (index != 0) {
- previousFullscreenValue = this->CBFullscreen->isChecked();
- this->CBFullscreen->setChecked(true);
- this->CBFullscreen->setEnabled(false);
- previousQuality = this->SLQuality->value();
- this->SLQuality->setValue(this->SLQuality->maximum());
- this->SLQuality->setEnabled(false);
- } else {
- this->CBFullscreen->setChecked(previousFullscreenValue);
- this->CBFullscreen->setEnabled(true);
- this->SLQuality->setValue(previousQuality);
- this->SLQuality->setEnabled(true);
- }
-}
-
-void PageOptions::setFullscreen(void)
-{
- int tmp = this->CBResolution->currentIndex();
- if (this->CBFullscreen->isChecked())
- this->CBResolution->setCurrentIndex(0);
- else
- this->CBResolution->setCurrentIndex(previousResolutionIndex);
- previousResolutionIndex = tmp;
-}
-
-void PageOptions::trimNetNick()
-{
- editNetNick->setText(editNetNick->text().trimmed());
-}
--- a/QTfrontend/pageoptions.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_OPTIONS_H
-#define PAGE_OPTIONS_H
-
-#include "AbstractPage.h"
-
-class FPSEdit;
-class IconedGroupBox;
-
-class PageOptions : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageOptions(QWidget* parent = 0);
-
- QCheckBox *WeaponTooltip;
- QPushButton *WeaponNew;
- QPushButton *WeaponEdit;
- QPushButton *WeaponDelete;
- QComboBox *WeaponsName;
- QPushButton *SchemeNew;
- QPushButton *SchemeEdit;
- QPushButton *SchemeDelete;
- QComboBox *SchemesName;
-
- QComboBox *CBLanguage;
-
- QPushButton *BtnBack;
- IconedGroupBox *teamsBox;
- QPushButton *BtnNewTeam;
- QPushButton *BtnEditTeam;
- QPushButton *BtnDeleteTeam;
- QPushButton *BtnAssociateFiles;
- QLabel *LblNoEditTeam;
- QComboBox *CBTeamName;
- IconedGroupBox *AGGroupBox;
- QComboBox *CBResolution;
- QComboBox *CBStereoMode;
- QCheckBox *CBEnableSound;
- QCheckBox *CBEnableFrontendSound;
- QCheckBox *CBEnableMusic;
- QCheckBox *CBEnableFrontendMusic;
- QCheckBox *CBFullscreen;
- QCheckBox *CBFrontendFullscreen;
- QCheckBox *CBShowFPS;
- QCheckBox *CBAltDamage;
- QCheckBox *CBNameWithDate;
-#ifdef __APPLE__
- QCheckBox *CBAutoUpdate;
-#endif
-
- FPSEdit *fpsedit;
- QPushButton *BtnSaveOptions;
- QLabel *labelNN;
- QLabel *labelNetPassword;
- QSpinBox * volumeBox;
- QLineEdit *editNetNick;
- QLineEdit *editNetPassword;
- QSlider *SLQuality;
- QCheckBox *CBFrontendEffects;
-
-private:
- bool previousFullscreenValue;
- int previousResolutionIndex;
- int previousQuality;
-
-private slots:
- void forceFullscreen(int index);
- void setFullscreen(void);
- void trimNetNick();
-};
-
-#endif
-
--- a/QTfrontend/pageplayrecord.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QFont>
-#include <QGridLayout>
-#include <QPushButton>
-#include <QListWidget>
-#include <QListWidgetItem>
-#include <QFileInfo>
-#include <QMessageBox>
-#include <QInputDialog>
-
-#include "hwconsts.h"
-#include "pageplayrecord.h"
-
-PagePlayDemo::PagePlayDemo(QWidget* parent) : AbstractPage(parent)
-{
- QFont * font14 = new QFont("MS Shell Dlg", 14);
- QGridLayout * pageLayout = new QGridLayout(this);
- pageLayout->setColumnStretch(0, 1);
- pageLayout->setColumnStretch(1, 2);
- pageLayout->setColumnStretch(2, 1);
- pageLayout->setRowStretch(2, 100);
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 3, 0, true);
-
- BtnPlayDemo = new QPushButton(this);
- BtnPlayDemo->setFont(*font14);
- BtnPlayDemo->setText(QPushButton::tr("Play demo"));
- pageLayout->addWidget(BtnPlayDemo, 3, 2);
-
- BtnRenameRecord = new QPushButton(this);
- BtnRenameRecord->setText(QPushButton::tr("Rename"));
- pageLayout->addWidget(BtnRenameRecord, 0, 2);
-
- BtnRemoveRecord = new QPushButton(this);
- BtnRemoveRecord->setText(QPushButton::tr("Delete"));
- pageLayout->addWidget(BtnRemoveRecord, 1, 2);
-
- DemosList = new QListWidget(this);
- DemosList->setGeometry(QRect(170, 10, 311, 311));
- pageLayout->addWidget(DemosList, 0, 1, 3, 1);
-
- connect(BtnRenameRecord, SIGNAL(clicked()), this, SLOT(renameRecord()));
- connect(BtnRemoveRecord, SIGNAL(clicked()), this, SLOT(removeRecord()));
-}
-
-void PagePlayDemo::FillFromDir(RecordType rectype)
-{
- QDir dir;
- QString extension;
-
- recType = rectype;
-
- dir.cd(cfgdir->absolutePath());
- if (rectype == RT_Demo)
- {
- dir.cd("Demos");
- extension = "hwd";
- BtnPlayDemo->setText(QPushButton::tr("Play demo"));
- } else
- {
- dir.cd("Saves");
- extension = "hws";
- BtnPlayDemo->setText(QPushButton::tr("Load"));
- }
- dir.setFilter(QDir::Files);
-
- QStringList sl = dir.entryList(QStringList(QString("*.%2.%1").arg(extension, *cProtoVer)));
- sl.replaceInStrings(QRegExp(QString("^(.*)\\.%2\\.%1$").arg(extension, *cProtoVer)), "\\1");
-
- DemosList->clear();
- DemosList->addItems(sl);
-
- for (int i = 0; i < DemosList->count(); ++i)
- {
- DemosList->item(i)->setData(Qt::UserRole, dir.absoluteFilePath(QString("%1.%3.%2").arg(sl[i], extension, *cProtoVer)));
- DemosList->item(i)->setIcon(recType == RT_Demo ? QIcon(":/res/file_demo.png") : QIcon(":/res/file_save.png"));
- }
-}
-
-void PagePlayDemo::renameRecord()
-{
- QListWidgetItem * curritem = DemosList->currentItem();
- if (!curritem)
- {
- QMessageBox::critical(this,
- tr("Error"),
- tr("Please select record from the list"),
- tr("OK"));
- return ;
- }
- QFile rfile(curritem->data(Qt::UserRole).toString());
-
- QFileInfo finfo(rfile);
-
- bool ok;
-
- QString newname = QInputDialog::getText(this, tr("Rename dialog"), tr("Enter new file name:"), QLineEdit::Normal, finfo.completeBaseName().replace("." + *cProtoVer, ""), &ok);
-
- if(ok && newname.size())
- {
- QString newfullname = QString("%1/%2.%3.%4")
- .arg(finfo.absolutePath())
- .arg(newname)
- .arg(*cProtoVer)
- .arg(finfo.suffix());
-
- ok = rfile.rename(newfullname);
- if(!ok)
- QMessageBox::critical(this, tr("Error"), tr("Cannot rename to") + newfullname);
- else
- FillFromDir(recType);
- }
-}
-
-void PagePlayDemo::removeRecord()
-{
- QListWidgetItem * curritem = DemosList->currentItem();
- if (!curritem)
- {
- QMessageBox::critical(this,
- tr("Error"),
- tr("Please select record from the list"),
- tr("OK"));
- return ;
- }
- QFile rfile(curritem->data(Qt::UserRole).toString());
-
- bool ok;
-
- ok = rfile.remove();
- if(!ok)
- QMessageBox::critical(this, tr("Error"), tr("Cannot delete file"));
- else
- FillFromDir(recType);
-}
--- a/QTfrontend/pageplayrecord.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PLAYRECORDPAGE_H
-#define PLAYRECORDPAGE_H
-
-#include <QDir>
-
-#include "AbstractPage.h"
-
-class QPushButton;
-class QListWidget;
-
-class PagePlayDemo : public AbstractPage
-{
- Q_OBJECT
-
-public:
- enum RecordType {
- RT_Demo,
- RT_Save
- };
-
- PagePlayDemo(QWidget* parent = 0);
-
- void FillFromDir(RecordType rectype);
-
- QPushButton *BtnBack;
- QPushButton *BtnPlayDemo;
- QPushButton *BtnRenameRecord;
- QPushButton *BtnRemoveRecord;
- QListWidget *DemosList;
-
-private:
- RecordType recType;
-
-private slots:
- void renameRecord();
- void removeRecord();
-};
-
-
-#endif // PLAYRECORDPAGE_H
--- a/QTfrontend/pageroomslist.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,396 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QComboBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QMessageBox>
-#include <QHeaderView>
-#include <QTableWidget>
-
-#include "ammoSchemeModel.h"
-#include "pageroomslist.h"
-#include "hwconsts.h"
-#include "chatwidget.h"
-
-PageRoomsList::PageRoomsList(QWidget* parent, QSettings * gameSettings, SDLInteraction * sdli) :
- AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
-
- QHBoxLayout * newRoomLayout = new QHBoxLayout();
- QLabel * roomNameLabel = new QLabel(this);
- roomNameLabel->setText(tr("Room Name:"));
- roomName = new QLineEdit(this);
- roomName->setMaxLength(60);
- newRoomLayout->addWidget(roomNameLabel);
- newRoomLayout->addWidget(roomName);
- pageLayout->addLayout(newRoomLayout, 0, 0, 1, 2);
-
- roomsList = new QTableWidget(this);
- roomsList->setSelectionBehavior(QAbstractItemView::SelectRows);
- roomsList->verticalHeader()->setVisible(false);
- roomsList->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
- roomsList->setAlternatingRowColors(true);
- roomsList->setShowGrid(false);
- roomsList->setSelectionMode(QAbstractItemView::SingleSelection);
- pageLayout->addWidget(roomsList, 1, 0, 3, 2);
- pageLayout->setRowStretch(2, 100);
-
- QHBoxLayout * filterLayout = new QHBoxLayout();
-
- QLabel * stateLabel = new QLabel(this);
- stateLabel->setText(tr("State:"));
- CBState = new QComboBox(this);
- CBState->addItem(QComboBox::tr("Any"));
- CBState->addItem(QComboBox::tr("In lobby"));
- CBState->addItem(QComboBox::tr("In progress"));
- filterLayout->addWidget(stateLabel);
- filterLayout->addWidget(CBState);
- filterLayout->addSpacing(30);
-
- QLabel * ruleLabel = new QLabel(this);
- ruleLabel->setText(tr("Rules:"));
- CBRules = new QComboBox(this);
- CBRules->addItem(QComboBox::tr("Any"));
- // not the most elegant solution but it works
- ammoSchemeModel = new AmmoSchemeModel(this, NULL);
- for (int i = 0; i < ammoSchemeModel->predefSchemesNames.count(); i++)
- CBRules->addItem(ammoSchemeModel->predefSchemesNames.at(i).toAscii().constData());
- filterLayout->addWidget(ruleLabel);
- filterLayout->addWidget(CBRules);
- filterLayout->addSpacing(30);
-
- QLabel * weaponLabel = new QLabel(this);
- weaponLabel->setText(tr("Weapons:"));
- CBWeapons = new QComboBox(this);
- CBWeapons->addItem(QComboBox::tr("Any"));
- for (int i = 0; i < cDefaultAmmos.count(); i++) {
- QPair<QString,QString> ammo = cDefaultAmmos.at(i);
- CBWeapons->addItem(ammo.first.toAscii().constData());
- }
- filterLayout->addWidget(weaponLabel);
- filterLayout->addWidget(CBWeapons);
- filterLayout->addSpacing(30);
-
- QLabel * searchLabel = new QLabel(this);
- searchLabel->setText(tr("Search:"));
- searchText = new QLineEdit(this);
- searchText->setMaxLength(60);
- filterLayout->addWidget(searchLabel);
- filterLayout->addWidget(searchText);
-
- pageLayout->addLayout(filterLayout, 4, 0, 1, 2);
-
- chatWidget = new HWChatWidget(this, gameSettings, sdli, false);
- pageLayout->addWidget(chatWidget, 5, 0, 1, 3);
- pageLayout->setRowStretch(5, 350);
-
- BtnCreate = addButton(tr("Create"), pageLayout, 0, 2);
- BtnJoin = addButton(tr("Join"), pageLayout, 1, 2);
- BtnRefresh = addButton(tr("Refresh"), pageLayout, 3, 2);
- BtnClear = addButton(tr("Clear"), pageLayout, 4, 2);
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 6, 0, true);
-
- lblCount = new QLabel(this);
- pageLayout->addWidget(lblCount, 6, 1, Qt::AlignHCenter);
- lblCount->setText("?");
- lblCount->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-
- connect(chatWidget, SIGNAL(nickCountUpdate(const int)), this, SLOT(updateNickCounter(const int)));
-
- BtnAdmin = addButton(tr("Admin features"), pageLayout, 6, 2);
-
- connect(BtnCreate, SIGNAL(clicked()), this, SLOT(onCreateClick()));
- connect(BtnJoin, SIGNAL(clicked()), this, SLOT(onJoinClick()));
- connect(BtnRefresh, SIGNAL(clicked()), this, SLOT(onRefreshClick()));
- connect(BtnClear, SIGNAL(clicked()), this, SLOT(onClearClick()));
- connect(roomsList, SIGNAL(doubleClicked (const QModelIndex &)), this, SLOT(onJoinClick()));
- connect(CBState, SIGNAL(currentIndexChanged (int)), this, SLOT(onRefreshClick()));
- connect(CBRules, SIGNAL(currentIndexChanged (int)), this, SLOT(onRefreshClick()));
- connect(CBWeapons, SIGNAL(currentIndexChanged (int)), this, SLOT(onRefreshClick()));
- connect(searchText, SIGNAL(textChanged (const QString &)), this, SLOT(onRefreshClick()));
- connect(this, SIGNAL(askJoinConfirmation (const QString &)), this, SLOT(onJoinConfirmation(const QString &)), Qt::QueuedConnection);
-
- gameInLobby = false;
-}
-
-void PageRoomsList::setAdmin(bool flag)
-{
- BtnAdmin->setVisible(flag);
-}
-
-void PageRoomsList::setRoomsList(const QStringList & list)
-{
- QBrush red(QColor(255, 0, 0));
- QBrush orange(QColor(127, 127, 0));
- QBrush yellow(QColor(255, 255, 0));
- QBrush green(QColor(0, 255, 0));
-
- listFromServer = list;
-
- QString selection = "";
-
- if(QTableWidgetItem *item = roomsList->item(roomsList->currentRow(), 0))
- selection = item->text();
-
- roomsList->clear();
- roomsList->setColumnCount(7);
- roomsList->setHorizontalHeaderLabels(
- QStringList() <<
- QTableWidget::tr("Room Name") <<
- QTableWidget::tr("C") <<
- QTableWidget::tr("T") <<
- QTableWidget::tr("Owner") <<
- QTableWidget::tr("Map") <<
- QTableWidget::tr("Rules") <<
- QTableWidget::tr("Weapons")
- );
-
- // set minimum sizes
-// roomsList->horizontalHeader()->resizeSection(0, 200);
-// roomsList->horizontalHeader()->resizeSection(1, 50);
-// roomsList->horizontalHeader()->resizeSection(2, 50);
-// roomsList->horizontalHeader()->resizeSection(3, 100);
-// roomsList->horizontalHeader()->resizeSection(4, 100);
-// roomsList->horizontalHeader()->resizeSection(5, 100);
-// roomsList->horizontalHeader()->resizeSection(6, 100);
-
- // set resize modes
-// roomsList->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
-
- bool gameCanBeJoined = true;
-
- if (list.size() % 8)
- return;
-
- roomsList->setRowCount(list.size() / 8);
- for(int i = 0, r = 0; i < list.size(); i += 8, r++)
- {
- // if we are joining a game
- // TODO: Should NOT be done here
- if (gameInLobby) {
- if (gameInLobbyName == list[i + 1]) {
- gameCanBeJoined = list[i].compare("True");
- }
- }
-
- // check filter settings
- #define NO_FILTER_MATCH roomsList->setRowCount(roomsList->rowCount() - 1); --r; continue
-
- if (list[i].compare("True") && CBState->currentIndex() == 2) { NO_FILTER_MATCH; }
- if (list[i].compare("False") && CBState->currentIndex() == 1) { NO_FILTER_MATCH; }
- if (CBRules->currentIndex() != 0 && list[i + 6].compare(CBRules->currentText())) { NO_FILTER_MATCH; }
- if (CBWeapons->currentIndex() != 0 && list[i + 7].compare(CBWeapons->currentText())) { NO_FILTER_MATCH; }
- bool found = list[i + 1].contains(searchText->text(), Qt::CaseInsensitive);
- if (!found) {
- for (int a = 4; a <= 7; ++a) {
- QString compString = list[i + a];
- if (a == 5 && compString == "+rnd+") {
- compString = "Random Map";
- } else if (a == 5 && compString == "+maze+") {
- compString = "Random Maze";
- } else if (a == 5 && compString == "+drawn+") {
- compString = "Drawn Map";
- }
- if (compString.contains(searchText->text(), Qt::CaseInsensitive)) {
- found = true;
- break;
- }
- }
- }
- if (!searchText->text().isEmpty() && !found) { NO_FILTER_MATCH; }
-
- QTableWidgetItem * item;
- item = new QTableWidgetItem(list[i + 1]); // room name
- item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
-
- // pick appropriate room icon and tooltip (game in progress yes/no; later maybe locked rooms etc.)
- if(list[i].compare("True"))
- {
- item->setIcon(QIcon(":/res/iconTime.png"));// game is in lobby
- item->setToolTip(tr("This game is in lobby.\nYou may join and start playing once the game starts."));
- }
- else
- {
- item->setIcon(QIcon(":/res/iconDamage.png"));// game has started
- item->setToolTip(tr("This game is in progress.\nYou may join and spectate now but you'll have to wait for the game to end to start playing."));
- }
-
- roomsList->setItem(r, 0, item);
-
- item = new QTableWidgetItem(list[i + 2]); // number of clients
- item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
- item->setTextAlignment(Qt::AlignCenter);
- item->setToolTip(tr("There are %1 clients connected to this room.", "", list[i + 2].toInt()).arg(list[i + 2]));
- roomsList->setItem(r, 1, item);
-
- item = new QTableWidgetItem(list[i + 3]); // number of teams
- item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
- item->setTextAlignment(Qt::AlignCenter);
- item->setToolTip(tr("There are %1 teams participating in this room.", "", list[i + 3].toInt()).arg(list[i + 3]));
- //Should we highlight "full" games? Might get misinterpreted
- //if(list[i + 3].toInt() >= cMaxTeams)
- // item->setForeground(red);
- roomsList->setItem(r, 2, item);
-
- item = new QTableWidgetItem(list[i + 4].left(15)); // name of host
- item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
- item->setToolTip(tr("%1 is the host. He may adjust settings and start the game.").arg(list[i + 4]));
- roomsList->setItem(r, 3, item);
-
- if(list[i + 5] == "+rnd+")
- {
- item = new QTableWidgetItem(tr("Random Map")); // selected map (is randomized)
-// FIXME - need real icons. Disabling until then
-// item->setIcon(QIcon(":/res/mapRandom.png"));
- }
- else if (list[i+5] == "+maze+")
- {
- item = new QTableWidgetItem(tr("Random Maze"));
-// FIXME - need real icons. Disabling until then
-// item->setIcon(QIcon(":/res/mapMaze.png"));
- }
- else
- {
- item = new QTableWidgetItem(list[i + 5]); // selected map
-
- // check to see if we've got this map
- // not perfect but a start
- if(!mapList->contains(list[i + 5]))
- {
- item->setForeground(red);
- item->setIcon(QIcon(":/res/mapMissing.png"));
- }
- else
- {
- // todo: mission icon?
-// FIXME - need real icons. Disabling until then
-// item->setIcon(QIcon(":/res/mapCustom.png"));
- }
- }
-
- item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
- item->setToolTip(tr("Games may be played on precreated or randomized maps."));
- roomsList->setItem(r, 4, item);
-
- item = new QTableWidgetItem(list[i + 6].left(24)); // selected game scheme
- item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
- item->setToolTip(tr("The Game Scheme defines general options and preferences like Round Time, Sudden Death or Vampirism."));
- roomsList->setItem(r, 5, item);
-
- item = new QTableWidgetItem(list[i + 7].left(24)); // selected weapon scheme
- item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
- item->setToolTip(tr("The Weapon Scheme defines available weapons and their ammunition count."));
- roomsList->setItem(r, 6, item);
-
- if(!list[i + 1].compare(selection) && !selection.isEmpty())
- roomsList->selectionModel()->setCurrentIndex(roomsList->model()->index(r, 0), QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
- }
-
- roomsList->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
- roomsList->horizontalHeader()->setResizeMode(1, QHeaderView::ResizeToContents);
- roomsList->horizontalHeader()->setResizeMode(2, QHeaderView::ResizeToContents);
- roomsList->horizontalHeader()->setResizeMode(3, QHeaderView::ResizeToContents);
- roomsList->horizontalHeader()->setResizeMode(4, QHeaderView::ResizeToContents);
- roomsList->horizontalHeader()->setResizeMode(5, QHeaderView::ResizeToContents);
- roomsList->horizontalHeader()->setResizeMode(6, QHeaderView::ResizeToContents);
-
- // TODO: Should NOT be done here
- if (gameInLobby) {
- gameInLobby = false;
- if (gameCanBeJoined) {
- emit askForJoinRoom(gameInLobbyName);
- } else {
- emit askJoinConfirmation(gameInLobbyName);
- }
- }
-
-// roomsList->resizeColumnsToContents();
-}
-
-void PageRoomsList::onCreateClick()
-{
- if (roomName->text().size())
- emit askForCreateRoom(roomName->text());
- else
- QMessageBox::critical(this,
- tr("Error"),
- tr("Please enter room name"),
- tr("OK"));
-}
-
-void PageRoomsList::onJoinClick()
-{
- QTableWidgetItem * curritem = roomsList->item(roomsList->currentRow(), 0);
- if (!curritem)
- {
- QMessageBox::critical(this,
- tr("Error"),
- tr("Please select room from the list"),
- tr("OK"));
- return;
- }
-
- for (int i = 0; i < listFromServer.size(); i += 8) {
- if (listFromServer[i + 1] == curritem->data(Qt::DisplayRole).toString()) {
- gameInLobby = listFromServer[i].compare("True");
- break;
- }
- }
-
- if (gameInLobby) {
- gameInLobbyName = curritem->data(Qt::DisplayRole).toString();
- emit askForRoomList();
- } else {
- emit askForJoinRoom(curritem->data(Qt::DisplayRole).toString());
- }
-}
-
-void PageRoomsList::onRefreshClick()
-{
- emit askForRoomList();
-}
-
-void PageRoomsList::onClearClick()
-{
- CBState->setCurrentIndex(0);
- CBRules->setCurrentIndex(0);
- CBWeapons->setCurrentIndex(0);
- searchText->clear();
-}
-
-void PageRoomsList::onJoinConfirmation(const QString & room)
-{
- if (QMessageBox::warning(this,
- tr("Warning"),
- tr("The game you are trying to join has started.\nDo you still want to join the room?"),
- QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
- {
- emit askForJoinRoom(room);
- }
-}
-
-void PageRoomsList::updateNickCounter(int cnt)
-{
- lblCount->setText(tr("%1 players online", 0, cnt).arg(cnt));
-}
-
--- a/QTfrontend/pageroomslist.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_ROOMLIST_H
-#define PAGE_ROOMLIST_H
-
-#include "AbstractPage.h"
-#include "SDLs.h"
-
-class HWChatWidget;
-class AmmoSchemeModel;
-
-class PageRoomsList : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageRoomsList(QWidget* parent, QSettings * config, SDLInteraction * sdli);
-
- QLineEdit * roomName;
- QLineEdit * searchText;
- QTableWidget * roomsList;
- QPushButton * BtnBack;
- QPushButton * BtnCreate;
- QPushButton * BtnJoin;
- QPushButton * BtnRefresh;
- QPushButton * BtnAdmin;
- QPushButton * BtnClear;
- QComboBox * CBState;
- QComboBox * CBRules;
- QComboBox * CBWeapons;
- HWChatWidget * chatWidget;
- QLabel * lblCount;
-
-private:
- bool gameInLobby;
- QString gameInLobbyName;
- QStringList listFromServer;
- AmmoSchemeModel * ammoSchemeModel;
-
-public slots:
- void setRoomsList(const QStringList & list);
- void setAdmin(bool);
- void updateNickCounter(int cnt);
-
-private slots:
- void onCreateClick();
- void onJoinClick();
- void onRefreshClick();
- void onClearClick();
- void onJoinConfirmation(const QString &);
-
-signals:
- void askForCreateRoom(const QString &);
- void askForJoinRoom(const QString &);
- void askForRoomList();
- void askJoinConfirmation(const QString &);
-};
-
-#endif
--- a/QTfrontend/pagescheme.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,488 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QGroupBox>
-#include <QComboBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QMessageBox>
-#include <QDataWidgetMapper>
-#include <QSpinBox>
-
-#include "ammoSchemeModel.h"
-#include "pagescheme.h"
-#include "misc.h"
-
-PageScheme::PageScheme(QWidget* parent) :
- AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
- QGroupBox * gb = new QGroupBox(this);
-
- QGridLayout * gl = new QGridLayout();
- gb->setLayout(gl);
- QSizePolicy sp;
- sp.setVerticalPolicy(QSizePolicy::MinimumExpanding);
- sp.setHorizontalPolicy(QSizePolicy::Expanding);
-
- pageLayout->addWidget(gb, 1,0,13,5);
-
- gbGameModes = new QGroupBox(QGroupBox::tr("Game Modifiers"), gb);
- gbBasicSettings = new QGroupBox(QGroupBox::tr("Basic Settings"), gb);
-
- gbGameModes->setStyleSheet(".QGroupBox {"
- "background-color: #130f2c; background-image:url();"
- "}");
- gbBasicSettings->setStyleSheet(".QGroupBox {"
- "background-color: #130f2c; background-image:url();"
- "}");
-
- gbGameModes->setSizePolicy(sp);
- gbBasicSettings->setSizePolicy(sp);
- gl->addWidget(gbGameModes,0,0,1,3,Qt::AlignTop);
- gl->addWidget(gbBasicSettings,0,3,1,3,Qt::AlignTop);
-
- QGridLayout * glGMLayout = new QGridLayout(gbGameModes);
- QGridLayout * glBSLayout = new QGridLayout(gbBasicSettings);
- gbGameModes->setLayout(glGMLayout);
- gbBasicSettings->setLayout(glBSLayout);
- // Left
-
- TBW_mode_Forts = new ToggleButtonWidget(gbGameModes, ":/res/btnForts.png");
- TBW_mode_Forts->setToolTip("<b>" + ToggleButtonWidget::tr("Fort Mode") + "</b>:<br />" + tr("Defend your fort and destroy the opponents, two team colours max!"));
- glGMLayout->addWidget(TBW_mode_Forts,0,0,1,1);
-
- TBW_teamsDivide = new ToggleButtonWidget(gbGameModes, ":/res/btnTeamsDivide.png");
- TBW_teamsDivide->setToolTip("<b>" + ToggleButtonWidget::tr("Divide Teams") + "</b>:<br />" + tr("Teams will start on opposite sides of the terrain, two team colours max!"));
- glGMLayout->addWidget(TBW_teamsDivide,0,1,1,1);
-
- TBW_solid = new ToggleButtonWidget(gbGameModes, ":/res/btnSolid.png");
- TBW_solid->setToolTip("<b>" + ToggleButtonWidget::tr("Solid Land") + "</b>:<br />" + tr("Land can not be destroyed!"));
- glGMLayout->addWidget(TBW_solid,0,2,1,1);
-
- TBW_border = new ToggleButtonWidget(gbGameModes, ":/res/btnBorder.png");
- TBW_border->setToolTip("<b>" + ToggleButtonWidget::tr("Add Border") + "</b>:<br />" + tr("Add an indestructible border around the terrain"));
- glGMLayout->addWidget(TBW_border,0,3,1,1);
-
- TBW_lowGravity = new ToggleButtonWidget(gbGameModes, ":/res/btnLowGravity.png");
- TBW_lowGravity->setToolTip("<b>" + ToggleButtonWidget::tr("Low Gravity") + "</b>:<br />" + tr("Lower gravity"));
- glGMLayout->addWidget(TBW_lowGravity,0,4,1,1);
-
- TBW_laserSight = new ToggleButtonWidget(gbGameModes, ":/res/btnLaserSight.png");
- TBW_laserSight->setToolTip("<b>" + ToggleButtonWidget::tr("Laser Sight") + "</b>:<br />" + tr("Assisted aiming with laser sight"));
- glGMLayout->addWidget(TBW_laserSight,1,0,1,1);
-
- TBW_invulnerable = new ToggleButtonWidget(gbGameModes, ":/res/btnInvulnerable.png");
- TBW_invulnerable->setToolTip("<b>" + ToggleButtonWidget::tr("Invulnerable") + "</b>:<br />" + tr("All hogs have a personal forcefield"));
- glGMLayout->addWidget(TBW_invulnerable,1,1,1,1);
-
- TBW_resethealth = new ToggleButtonWidget(gbGameModes, ":/res/btnResetHealth.png");
- TBW_resethealth->setToolTip("<b>" + ToggleButtonWidget::tr("Reset Health") + "</b>:<br />" + tr("All (living) hedgehogs are fully restored at the end of turn"));
- glGMLayout->addWidget(TBW_resethealth,1,2,1,1);
-
- TBW_vampiric = new ToggleButtonWidget(gbGameModes, ":/res/btnVampiric.png");
- TBW_vampiric->setToolTip("<b>" + ToggleButtonWidget::tr("Vampirism") + "</b>:<br />" + tr("Gain 80% of the damage you do back in health"));
- glGMLayout->addWidget(TBW_vampiric,1,3,1,1);
-
- TBW_karma = new ToggleButtonWidget(gbGameModes, ":/res/btnKarma.png");
- TBW_karma->setToolTip("<b>" + ToggleButtonWidget::tr("Karma") + "</b>:<br />" + tr("Share your opponents pain, share their damage"));
- glGMLayout->addWidget(TBW_karma,1,4,1,1);
-
- TBW_artillery = new ToggleButtonWidget(gbGameModes, ":/res/btnArtillery.png");
- TBW_artillery->setToolTip("<b>" + ToggleButtonWidget::tr("Artillery") + "</b>:<br />" + tr("Your hogs are unable to move, put your artillery skills to the test"));
- glGMLayout->addWidget(TBW_artillery,2,0,1,1);
-
- TBW_randomorder = new ToggleButtonWidget(gbGameModes, ":/res/btnRandomOrder.png");
- TBW_randomorder->setToolTip("<b>" + ToggleButtonWidget::tr("Random Order") + "</b>:<br />" + tr("Order of play is random instead of in room order."));
- glGMLayout->addWidget(TBW_randomorder,2,1,1,1);
-
- TBW_king = new ToggleButtonWidget(gbGameModes, ":/res/btnKing.png");
- TBW_king->setToolTip("<b>" + ToggleButtonWidget::tr("King") + "</b>:<br />" + tr("Play with a King. If he dies, your side dies."));
- glGMLayout->addWidget(TBW_king,2,2,1,1);
-
- TBW_placehog = new ToggleButtonWidget(gbGameModes, ":/res/btnPlaceHog.png");
- TBW_placehog->setToolTip("<b>" + ToggleButtonWidget::tr("Place Hedgehogs") + "</b>:<br />" + tr("Take turns placing your hedgehogs before the start of play."));
- glGMLayout->addWidget(TBW_placehog,2,3,1,1);
-
- TBW_sharedammo = new ToggleButtonWidget(gbGameModes, ":/res/btnSharedAmmo.png");
- TBW_sharedammo->setToolTip("<b>" + ToggleButtonWidget::tr("Clan Shares Ammo") + "</b>:<br />" + tr("Ammo is shared between all teams that share a colour."));
- glGMLayout->addWidget(TBW_sharedammo,2,4,1,1);
-
- TBW_disablegirders = new ToggleButtonWidget(gbGameModes, ":/res/btnDisableGirders.png");
- TBW_disablegirders->setToolTip("<b>" + ToggleButtonWidget::tr("Disable Girders") + "</b>:<br />" + tr("Disable girders when generating random maps."));
- glGMLayout->addWidget(TBW_disablegirders,3,0,1,1);
-
- TBW_disablelandobjects = new ToggleButtonWidget(gbGameModes, ":/res/btnDisableLandObjects.png");
- TBW_disablelandobjects->setToolTip("<b>" + ToggleButtonWidget::tr("Disable Land Objects") + "</b>:<br />" + tr("Disable land objects when generating random maps."));
- glGMLayout->addWidget(TBW_disablelandobjects,3,1,1,1);
-
- TBW_aisurvival = new ToggleButtonWidget(gbGameModes, ":/res/btnAISurvival.png");
- TBW_aisurvival->setToolTip("<b>" + ToggleButtonWidget::tr("AI Survival Mode") + "</b>:<br />" + tr("AI respawns on death."));
- glGMLayout->addWidget(TBW_aisurvival,3,2,1,1);
-
- TBW_infattack = new ToggleButtonWidget(gbGameModes, ":/res/btnInfAttack.png");
- TBW_infattack->setToolTip("<b>" + ToggleButtonWidget::tr("Unlimited Attacks") + "</b>:<br />" + tr("Attacking does not end your turn."));
- glGMLayout->addWidget(TBW_infattack,3,3,1,1);
-
- TBW_resetweps = new ToggleButtonWidget(gbGameModes, ":/res/btnResetWeps.png");
- TBW_resetweps->setToolTip("<b>" + ToggleButtonWidget::tr("Reset Weapons") + "</b>:<br />" + tr("Weapons are reset to starting values each turn."));
- glGMLayout->addWidget(TBW_resetweps,3,4,1,1);
-
- TBW_perhogammo = new ToggleButtonWidget(gbGameModes, ":/res/btnPerHogAmmo.png");
- TBW_perhogammo->setToolTip("<b>" + ToggleButtonWidget::tr("Per Hedgehog Ammo") + "</b>:<br />" + tr("Each hedgehog has its own ammo. It does not share with the team."));
- glGMLayout->addWidget(TBW_perhogammo,4,0,1,1);
-
- TBW_nowind = new ToggleButtonWidget(gbGameModes, ":/res/btnNoWind.png");
- TBW_nowind->setToolTip("<b>" + ToggleButtonWidget::tr("Disable Wind") + "</b>:<br />" + tr("You will not have to worry about wind anymore."));
- glGMLayout->addWidget(TBW_nowind,4,1,1,1);
-
- TBW_morewind = new ToggleButtonWidget(gbGameModes, ":/res/btnMoreWind.png");
- TBW_morewind->setToolTip("<b>" + ToggleButtonWidget::tr("More Wind") + "</b>:<br />" + tr("Wind will affect almost everything."));
- glGMLayout->addWidget(TBW_morewind,4,2,1,1);
-
- TBW_tagteam = new ToggleButtonWidget(gbGameModes, ":/res/btnTagTeam.png");
- TBW_tagteam->setToolTip("<b>" + ToggleButtonWidget::tr("Tag Team") + "</b>:<br />" + tr("Teams in each clan take successive turns sharing their turn time."));
- glGMLayout->addWidget(TBW_tagteam,4,3,1,1);
-
- TBW_bottomborder = new ToggleButtonWidget(gbGameModes, ":/res/btnBottomBorder.png");
- TBW_bottomborder->setToolTip("<b>" + ToggleButtonWidget::tr("Add Bottom Border") + "</b>:<br />" + tr("Add an indestructible border along the bottom"));
- glGMLayout->addWidget(TBW_bottomborder,4,4,1,1);
-
-
- // Right
- QLabel * l;
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("Damage Modifier"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,0,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconDamage.png"));
- glBSLayout->addWidget(l,0,1,1,1);
- SB_DamageModifier = new QSpinBox(gbBasicSettings);
- SB_DamageModifier->setRange(10, 300);
- SB_DamageModifier->setValue(100);
- SB_DamageModifier->setSingleStep(25);
- glBSLayout->addWidget(SB_DamageModifier,0,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("Turn Time"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,1,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconTime.png"));
- glBSLayout->addWidget(l,1,1,1,1);
- SB_TurnTime = new QSpinBox(gbBasicSettings);
- SB_TurnTime->setRange(1, 9999);
- SB_TurnTime->setValue(45);
- SB_TurnTime->setSingleStep(15);
- glBSLayout->addWidget(SB_TurnTime,1,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("Initial Health"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,2,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconHealth.png"));
- glBSLayout->addWidget(l,2,1,1,1);
- SB_InitHealth = new QSpinBox(gbBasicSettings);
- SB_InitHealth->setRange(50, 200);
- SB_InitHealth->setValue(100);
- SB_InitHealth->setSingleStep(25);
- glBSLayout->addWidget(SB_InitHealth,2,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("Sudden Death Timeout"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,3,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconSuddenDeath.png"));
- glBSLayout->addWidget(l,3,1,1,1);
- SB_SuddenDeath = new QSpinBox(gbBasicSettings);
- SB_SuddenDeath->setRange(0, 50);
- SB_SuddenDeath->setValue(15);
- SB_SuddenDeath->setSingleStep(3);
- glBSLayout->addWidget(SB_SuddenDeath,3,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("Sudden Death Water Rise"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,4,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconSuddenDeath.png")); // TODO: icon
- glBSLayout->addWidget(l,4,1,1,1);
- SB_WaterRise = new QSpinBox(gbBasicSettings);
- SB_WaterRise->setRange(0, 100);
- SB_WaterRise->setValue(47);
- SB_WaterRise->setSingleStep(5);
- glBSLayout->addWidget(SB_WaterRise,4,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("Sudden Death Health Decrease"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,5,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconSuddenDeath.png")); // TODO: icon
- glBSLayout->addWidget(l,5,1,1,1);
- SB_HealthDecrease = new QSpinBox(gbBasicSettings);
- SB_HealthDecrease->setRange(0, 100);
- SB_HealthDecrease->setValue(5);
- SB_HealthDecrease->setSingleStep(1);
- glBSLayout->addWidget(SB_HealthDecrease,5,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("% Rope Length"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,6,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconRope.png"));
- glBSLayout->addWidget(l,6,1,1,1);
- SB_RopeModifier = new QSpinBox(gbBasicSettings);
- SB_RopeModifier->setRange(25, 999);
- SB_RopeModifier->setValue(100);
- SB_RopeModifier->setSingleStep(25);
- glBSLayout->addWidget(SB_RopeModifier,6,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("Crate Drops"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,7,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconBox.png"));
- glBSLayout->addWidget(l,7,1,1,1);
- SB_CaseProb = new FreqSpinBox(gbBasicSettings);
- SB_CaseProb->setRange(0, 9);
- SB_CaseProb->setValue(5);
- glBSLayout->addWidget(SB_CaseProb,7,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("% Health Crates"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,8,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconHealth.png")); // TODO: icon
- glBSLayout->addWidget(l,8,1,1,1);
- SB_HealthCrates = new QSpinBox(gbBasicSettings);
- SB_HealthCrates->setRange(0, 100);
- SB_HealthCrates->setValue(35);
- SB_HealthCrates->setSingleStep(5);
- glBSLayout->addWidget(SB_HealthCrates,8,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("Health in Crates"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,9,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconHealth.png")); // TODO: icon
- glBSLayout->addWidget(l,9,1,1,1);
- SB_CrateHealth = new QSpinBox(gbBasicSettings);
- SB_CrateHealth->setRange(0, 200);
- SB_CrateHealth->setValue(25);
- SB_CrateHealth->setSingleStep(5);
- glBSLayout->addWidget(SB_CrateHealth,9,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("Mines Time"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,10,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconTime.png")); // TODO: icon
- glBSLayout->addWidget(l,10,1,1,1);
- SB_MinesTime = new QSpinBox(gbBasicSettings);
- SB_MinesTime->setRange(-1, 5);
- SB_MinesTime->setValue(3);
- SB_MinesTime->setSingleStep(1);
- SB_MinesTime->setSpecialValueText(tr("Random"));
- SB_MinesTime->setSuffix(" "+ tr("Seconds"));
- glBSLayout->addWidget(SB_MinesTime,10,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("Mines"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,11,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconMine.png")); // TODO: icon
- glBSLayout->addWidget(l,11,1,1,1);
- SB_Mines = new QSpinBox(gbBasicSettings);
- SB_Mines->setRange(0, 80);
- SB_Mines->setValue(0);
- SB_Mines->setSingleStep(5);
- glBSLayout->addWidget(SB_Mines,11,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("% Dud Mines"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,12,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconDud.png"));
- glBSLayout->addWidget(l,12,1,1,1);
- SB_MineDuds = new QSpinBox(gbBasicSettings);
- SB_MineDuds->setRange(0, 100);
- SB_MineDuds->setValue(0);
- SB_MineDuds->setSingleStep(5);
- glBSLayout->addWidget(SB_MineDuds,12,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("Explosives"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,13,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconDamage.png"));
- glBSLayout->addWidget(l,13,1,1,1);
- SB_Explosives = new QSpinBox(gbBasicSettings);
- SB_Explosives->setRange(0, 40);
- SB_Explosives->setValue(0);
- SB_Explosives->setSingleStep(1);
- glBSLayout->addWidget(SB_Explosives,13,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("% Get Away Time"));
- l->setWordWrap(true);
- glBSLayout->addWidget(l,14,0,1,1);
- l = new QLabel(gbBasicSettings);
- l->setFixedSize(32,32);
- l->setPixmap(QPixmap(":/res/iconTime.png"));
- glBSLayout->addWidget(l,14,1,1,1);
- SB_GetAwayTime = new QSpinBox(gbBasicSettings);
- SB_GetAwayTime->setRange(0, 999);
- SB_GetAwayTime->setValue(100);
- SB_GetAwayTime->setSingleStep(25);
- glBSLayout->addWidget(SB_GetAwayTime,14,2,1,1);
-
- l = new QLabel(gbBasicSettings);
- l->setText(QLabel::tr("Scheme Name:"));
-
- LE_name = new QLineEdit(this);
-
- gl->addWidget(LE_name,15,1,1,5);
- gl->addWidget(l,15,0,1,1);
-
- mapper = new QDataWidgetMapper(this);
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 16, 0, true);
- BtnCopy = addButton(tr("Copy"), pageLayout, 16, 2);
- BtnNew = addButton(tr("New"), pageLayout, 16, 3);
- BtnDelete = addButton(tr("Delete"), pageLayout, 16, 4);
-
- selectScheme = new QComboBox(this);
- pageLayout->addWidget(selectScheme, 16, 1);
-
- connect(BtnCopy, SIGNAL(clicked()), this, SLOT(copyRow()));
- connect(BtnNew, SIGNAL(clicked()), this, SLOT(newRow()));
- connect(BtnDelete, SIGNAL(clicked()), this, SLOT(deleteRow()));
- connect(selectScheme, SIGNAL(currentIndexChanged(int)), mapper, SLOT(setCurrentIndex(int)));
- connect(selectScheme, SIGNAL(currentIndexChanged(int)), this, SLOT(schemeSelected(int)));
-}
-
-void PageScheme::setModel(QAbstractItemModel * model)
-{
- mapper->setModel(model);
- selectScheme->setModel(model);
-
- mapper->addMapping(LE_name, 0);
- mapper->addMapping(TBW_mode_Forts, 1);
- mapper->addMapping(TBW_teamsDivide, 2);
- mapper->addMapping(TBW_solid, 3);
- mapper->addMapping(TBW_border, 4);
- mapper->addMapping(TBW_lowGravity, 5);
- mapper->addMapping(TBW_laserSight, 6);
- mapper->addMapping(TBW_invulnerable, 7);
- mapper->addMapping(TBW_resethealth, 8);
- mapper->addMapping(TBW_vampiric, 9);
- mapper->addMapping(TBW_karma, 10);
- mapper->addMapping(TBW_artillery, 11);
- mapper->addMapping(TBW_randomorder, 12);
- mapper->addMapping(TBW_king, 13);
- mapper->addMapping(TBW_placehog, 14);
- mapper->addMapping(TBW_sharedammo, 15);
- mapper->addMapping(TBW_disablegirders, 16);
- mapper->addMapping(TBW_disablelandobjects, 17);
- mapper->addMapping(TBW_aisurvival, 18);
- mapper->addMapping(TBW_infattack, 19);
- mapper->addMapping(TBW_resetweps, 20);
- mapper->addMapping(TBW_perhogammo, 21);
- mapper->addMapping(TBW_nowind, 22);
- mapper->addMapping(TBW_morewind, 23);
- mapper->addMapping(TBW_tagteam, 24);
- mapper->addMapping(TBW_bottomborder, 25);
- mapper->addMapping(SB_DamageModifier, 26);
- mapper->addMapping(SB_TurnTime, 27);
- mapper->addMapping(SB_InitHealth, 28);
- mapper->addMapping(SB_SuddenDeath, 29);
- mapper->addMapping(SB_CaseProb, 30);
- mapper->addMapping(SB_MinesTime, 31);
- mapper->addMapping(SB_Mines, 32);
- mapper->addMapping(SB_MineDuds, 33);
- mapper->addMapping(SB_Explosives, 34);
- mapper->addMapping(SB_HealthCrates, 35);
- mapper->addMapping(SB_CrateHealth, 36);
- mapper->addMapping(SB_WaterRise, 37);
- mapper->addMapping(SB_HealthDecrease, 38);
- mapper->addMapping(SB_RopeModifier, 39);
- mapper->addMapping(SB_GetAwayTime, 40);
-
- mapper->toFirst();
-}
-
-void PageScheme::newRow()
-{
- QAbstractItemModel * model = mapper->model();
- model->insertRow(-1);
- selectScheme->setCurrentIndex(model->rowCount() - 1);
-}
-
-void PageScheme::copyRow()
-{
- QAbstractItemModel * model = mapper->model();
- model->insertRow(selectScheme->currentIndex());
- selectScheme->setCurrentIndex(model->rowCount() - 1);
-}
-
-void PageScheme::deleteRow()
-{
- QMessageBox reallyDelete(QMessageBox::Question, QMessageBox::tr("Schemes"), QMessageBox::tr("Really delete this game scheme?"), QMessageBox::Ok | QMessageBox::Cancel);
-
- if (reallyDelete.exec() == QMessageBox::Ok) {
- QAbstractItemModel * model = mapper->model();
- model->removeRow(selectScheme->currentIndex());
- }
-}
-
-void PageScheme::schemeSelected(int n)
-{
- int c = ((AmmoSchemeModel*)mapper->model())->numberOfDefaultSchemes;
- gbGameModes->setEnabled(n >= c);
- gbBasicSettings->setEnabled(n >= c);
- LE_name->setEnabled(n >= c);
-}
--- a/QTfrontend/pagescheme.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_SCHEME_H
-#define PAGE_SCHEME_H
-
-#include "AbstractPage.h"
-#include "togglebutton.h"
-
-class FreqSpinBox;
-
-class PageScheme : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageScheme(QWidget* parent = 0);
-
- QPushButton * BtnBack;
- QPushButton * BtnCopy;
- QPushButton * BtnNew;
- QPushButton * BtnDelete;
- QPushButton * BtnSave;
- QComboBox * selectScheme;
-
- void setModel(QAbstractItemModel * model);
-
-public slots:
- void newRow();
- void copyRow();
- void deleteRow();
-
-private:
- QDataWidgetMapper * mapper;
- ToggleButtonWidget * TBW_mode_Forts;
- ToggleButtonWidget * TBW_teamsDivide;
- ToggleButtonWidget * TBW_solid;
- ToggleButtonWidget * TBW_border;
- ToggleButtonWidget * TBW_lowGravity;
- ToggleButtonWidget * TBW_laserSight;
- ToggleButtonWidget * TBW_invulnerable;
- ToggleButtonWidget * TBW_resethealth;
- ToggleButtonWidget * TBW_vampiric;
- ToggleButtonWidget * TBW_karma;
- ToggleButtonWidget * TBW_artillery;
- ToggleButtonWidget * TBW_randomorder;
- ToggleButtonWidget * TBW_king;
- ToggleButtonWidget * TBW_placehog;
- ToggleButtonWidget * TBW_sharedammo;
- ToggleButtonWidget * TBW_disablegirders;
- ToggleButtonWidget * TBW_disablelandobjects;
- ToggleButtonWidget * TBW_aisurvival;
- ToggleButtonWidget * TBW_infattack;
- ToggleButtonWidget * TBW_resetweps;
- ToggleButtonWidget * TBW_perhogammo;
- ToggleButtonWidget * TBW_nowind;
- ToggleButtonWidget * TBW_morewind;
- ToggleButtonWidget * TBW_tagteam;
- ToggleButtonWidget * TBW_bottomborder;
-
- QSpinBox * SB_DamageModifier;
- QSpinBox * SB_TurnTime;
- QSpinBox * SB_InitHealth;
- QSpinBox * SB_SuddenDeath;
- QSpinBox * SB_WaterRise;
- QSpinBox * SB_HealthDecrease;
- FreqSpinBox * SB_CaseProb;
- QSpinBox * SB_HealthCrates;
- QSpinBox * SB_CrateHealth;
- QSpinBox * SB_MinesTime;
- QSpinBox * SB_Mines;
- QSpinBox * SB_MineDuds;
- QSpinBox * SB_Explosives;
- QSpinBox * SB_RopeModifier;
- QSpinBox * SB_GetAwayTime;
- QLineEdit * LE_name;
-
- QGroupBox * gbGameModes;
- QGroupBox * gbBasicSettings;
-
-private slots:
- void schemeSelected(int);
-
-};
-
-#endif
--- a/QTfrontend/pageselectweapon.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QComboBox>
-
-#include "pageselectweapon.h"
-#include "hwconsts.h"
-#include "selectWeapon.h"
-
-PageSelectWeapon::PageSelectWeapon(QWidget* parent) :
- AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
-
- pWeapons = new SelWeaponWidget(cAmmoNumber, this);
- pageLayout->addWidget(pWeapons, 0, 0, 1, 5);
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 1, 0, 2, 1, true);
- BtnDefault = addButton(tr("Default"), pageLayout, 1, 3);
- BtnNew = addButton(tr("New"), pageLayout, 1, 2);
- BtnCopy = addButton(tr("Copy"), pageLayout, 2, 2);
- BtnDelete = addButton(tr("Delete"), pageLayout, 2, 3);
- BtnSave = addButton(":/res/Save.png", pageLayout, 1, 4, 2, 1, true);
- BtnSave->setStyleSheet("QPushButton{margin: 24px 0px 0px 0px;}");
- BtnBack->setFixedHeight(BtnSave->height());
- BtnBack->setStyleSheet("QPushButton{margin-top: 31px;}");
-
- selectWeaponSet = new QComboBox(this);
- pageLayout->addWidget(selectWeaponSet, 1, 1, 2, 1);
-
- connect(BtnDefault, SIGNAL(clicked()), pWeapons, SLOT(setDefault()));
- connect(BtnSave, SIGNAL(clicked()), pWeapons, SLOT(save()));
- connect(BtnNew, SIGNAL(clicked()), pWeapons, SLOT(newWeaponsName()));
- connect(BtnCopy, SIGNAL(clicked()), pWeapons, SLOT(copy()));
- connect(selectWeaponSet, SIGNAL(currentIndexChanged(const QString&)), pWeapons, SLOT(setWeaponsName(const QString&)));
-}
--- a/QTfrontend/pageselectweapon.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_SELECTWEAPON_H
-#define PAGE_SELECTWEAPON_H
-
-#include "AbstractPage.h"
-
-class SelWeaponWidget;
-
-class PageSelectWeapon : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageSelectWeapon(QWidget* parent = 0);
-
- QPushButton *BtnSave;
- QPushButton *BtnDefault;
- QPushButton *BtnDelete;
- QPushButton *BtnNew;
- QPushButton *BtnCopy;
- QPushButton *BtnBack;
- SelWeaponWidget* pWeapons;
- QComboBox* selectWeaponSet;
-};
-
-#endif
--- a/QTfrontend/pagesingleplayer.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-
-#include "pagesingleplayer.h"
-#include "gamecfgwidget.h"
-
-PageSinglePlayer::PageSinglePlayer(QWidget* parent) : AbstractPage(parent)
-{
- QVBoxLayout * vLayout = new QVBoxLayout(this);
- QHBoxLayout * topLine = new QHBoxLayout();
- QHBoxLayout * middleLine = new QHBoxLayout();
- QHBoxLayout * bottomLine = new QHBoxLayout();
- vLayout->addStretch();
- vLayout->addLayout(topLine);
- vLayout->addSpacing(30);
- vLayout->addLayout(middleLine);
- vLayout->addStretch();
- vLayout->addLayout(bottomLine);
-
- topLine->addStretch();
- BtnSimpleGamePage = addButton(":/res/SimpleGame.png", topLine, 0, true);
- BtnSimpleGamePage->setToolTip(tr("Simple Game (a quick game against the computer, settings are chosen for you)"));
- topLine->addSpacing(60);
- BtnMultiplayer = addButton(":/res/Multiplayer.png", topLine, 1, true);
- BtnMultiplayer->setToolTip(tr("Multiplayer (play a hotseat game against your friends, or AI teams)"));
- topLine->addStretch();
-
-
- BtnCampaignPage = addButton(":/res/Campaign.png", middleLine, 0, true);
- BtnCampaignPage->setToolTip(tr("Campaign Mode (...). IN DEVELOPMENT"));
- BtnCampaignPage->setVisible(false);
-
- BtnTrainPage = addButton(":/res/Trainings.png", middleLine, 1, true);
- BtnTrainPage->setToolTip(tr("Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT"));
-
- BtnBack = addButton(":/res/Exit.png", bottomLine, 0, true);
- bottomLine->addStretch();
-
- BtnDemos = addButton(":/res/Record.png", bottomLine, 1, true);
- BtnDemos->setToolTip(tr("Demos (Watch recorded demos)"));
- BtnLoad = addButton(":/res/Save.png", bottomLine, 2, true);
- BtnLoad->setStyleSheet("QPushButton{margin: 12px 0px 12px 0px;}");
- BtnLoad->setToolTip(tr("Load (Load a previously saved game)"));
- BtnBack->setFixedHeight(BtnLoad->height());
- BtnBack->setStyleSheet("QPushButton{margin-top: 31px;}");
-}
--- a/QTfrontend/pagesingleplayer.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_SINGLE_PLAYER_H
-#define PAGE_SINGLE_PLAYER_H
-
-#include "AbstractPage.h"
-
-class GameCFGWidget;
-
-class PageSinglePlayer : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageSinglePlayer(QWidget* parent = 0);
-
- QPushButton *BtnSimpleGamePage;
- QPushButton *BtnTrainPage;
- QPushButton *BtnCampaignPage;
- QPushButton *BtnMultiplayer;
- QPushButton *BtnLoad;
- QPushButton *BtnDemos;
- QPushButton *BtnBack;
- GameCFGWidget *gameCFG;
-};
-
-#endif
-
--- a/QTfrontend/pagetraining.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QGridLayout>
-#include <QPushButton>
-#include <QComboBox>
-
-#include "pagetraining.h"
-#include "hwconsts.h"
-
-PageTraining::PageTraining(QWidget* parent) : AbstractPage(parent)
-{
- QGridLayout * pageLayout = new QGridLayout(this);
- pageLayout->setColumnStretch(0, 1);
- pageLayout->setColumnStretch(1, 2);
- pageLayout->setColumnStretch(2, 1);
- pageLayout->setRowStretch(0, 1);
- pageLayout->setRowStretch(2, 1);
-
- CBSelect = new QComboBox(this);
-
- QDir tmpdir;
- tmpdir.cd(cfgdir->absolutePath());
- tmpdir.cd("Data/Missions/Training");
- tmpdir.setFilter(QDir::Files);
- QStringList userlist = tmpdir.entryList(QStringList("*.lua")).replaceInStrings(QRegExp("^(.*)\\.lua"), "\\1");
- CBSelect->addItems(userlist);
-
- tmpdir.cd(datadir->absolutePath());
- tmpdir.cd("Missions/Training");
- tmpdir.setFilter(QDir::Files);
- QStringList tmplist = tmpdir.entryList(QStringList("*.lua")).replaceInStrings(QRegExp("^(.*)\\.lua"), "\\1");
- QStringList datalist;
- for (QStringList::Iterator it = tmplist.begin(); it != tmplist.end(); ++it)
- if (!userlist.contains(*it,Qt::CaseInsensitive)) datalist.append(*it);
- CBSelect->addItems(datalist);
-
- for(int i = 0; i < CBSelect->count(); i++)
- {
- CBSelect->setItemData(i, CBSelect->itemText(i));
- CBSelect->setItemText(i, CBSelect->itemText(i).replace("_", " "));
- }
-
- pageLayout->addWidget(CBSelect, 1, 1);
-
- BtnStartTrain = new QPushButton(this);
- BtnStartTrain->setFont(*font14);
- BtnStartTrain->setText(QPushButton::tr("Go!"));
- pageLayout->addWidget(BtnStartTrain, 1, 2);
-
- BtnBack = addButton(":/res/Exit.png", pageLayout, 3, 0, true);
-}
--- a/QTfrontend/pagetraining.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef PAGE_TRAINING_H
-#define PAGE_TRAINING_H
-
-#include "AbstractPage.h"
-
-class PageTraining : public AbstractPage
-{
- Q_OBJECT
-
-public:
- PageTraining(QWidget* parent = 0);
-
- QPushButton *BtnStartTrain;
- QPushButton *BtnBack;
- QComboBox *CBSelect;
-};
-
-#endif
-
--- a/QTfrontend/proto.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "proto.h"
-
-HWProto::HWProto()
-{
-
-}
-
-QByteArray & HWProto::addByteArrayToBuffer(QByteArray & buf, const QByteArray & msg)
-{
- QByteArray bmsg = msg;
- bmsg = bmsg.left(250);
- quint8 sz = bmsg.size();
- buf.append(QByteArray((char *)&sz, 1));
- buf.append(bmsg);
- return buf;
-}
-
-QByteArray & HWProto::addStringToBuffer(QByteArray & buf, const QString & string)
-{
- return addByteArrayToBuffer(buf, string.toUtf8());
-}
-
-QByteArray & HWProto::addStringListToBuffer(QByteArray & buf, const QStringList & strList)
-{
- for (int i = 0; i < strList.size(); i++)
- addStringToBuffer(buf, strList[i]);
- return buf;
-}
-
-QString HWProto::formatChatMsgForFrontend(const QString & msg)
-{
- return formatChatMsg("|nick|", msg);
-}
-
-QString HWProto::formatChatMsg(const QString & nick, const QString & msg)
-{
- if(msg.left(4) == "/me ")
- return QString("\x02* %1 %2").arg(nick).arg(msg.mid(4));
- else
- return QString("\x01%1: %2").arg(nick).arg(msg);
-}
--- a/QTfrontend/proto.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _PROTO_H
-#define _PROTO_H
-
-#include <QByteArray>
-#include <QString>
-#include <QStringList>
-
-
-class HWProto : public QObject
-{
- Q_OBJECT
-
-public:
- HWProto();
- static QByteArray & addStringToBuffer(QByteArray & buf, const QString & string);
- static QByteArray & addByteArrayToBuffer(QByteArray & buf, const QByteArray & msg);
- static QByteArray & addStringListToBuffer(QByteArray & buf, const QStringList & strList);
- static QString formatChatMsg(const QString & nick, const QString & msg);
- static QString formatChatMsgForFrontend(const QString & msg);
-};
-
-#endif // _PROTO_H
--- a/QTfrontend/qaspectratiolayout.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation.
- */
-
-#include "qaspectratiolayout.h"
-
-QAspectRatioLayout::QAspectRatioLayout(QWidget* parent, int spacing) : QLayout(parent) {
- init(spacing);
-}
-
-QAspectRatioLayout::QAspectRatioLayout(int spacing) {
- init(spacing);
-}
-
-QAspectRatioLayout::~QAspectRatioLayout() {
- delete item;
- delete lastReceivedRect;
- delete _geometry;
-}
-
-void QAspectRatioLayout::init(int spacing) {
- item = 0;
- lastReceivedRect = new QRect(0, 0, 0, 0);
- _geometry = new QRect(0, 0, 0, 0);
- setSpacing(spacing);
-}
-
-
-/* Adds item if place isn't already taken. */
-void QAspectRatioLayout::add(QLayoutItem* item) {
- if(!hasItem()) {
- replaceItem(item);
- }
-}
-
-/* Adds item if place isn't already taken. */
-void QAspectRatioLayout::addItem(QLayoutItem* item) {
- if(!hasItem()) {
- replaceItem(item);
- }
-}
-
-/* Adds widget if place isn't already taken. */
-void QAspectRatioLayout::addWidget(QWidget* widget) {
- if(!hasItem()) {
- replaceItem(new QWidgetItem(widget));
- }
-}
-
-/* Returns the item pointer and dereferences it here. */
-QLayoutItem* QAspectRatioLayout::take() {
- QLayoutItem* item = 0;
- if(this->hasItem()) {
- item = this->item;
- this->item = 0;
- }
- return item;
-}
-
-/* Returns the item pointer and dereferences it here. */
-QLayoutItem* QAspectRatioLayout::takeAt(int index) {
- if(index != 0) {
- return 0;
- }
- return this->take();
-}
-
-/* Returns the item pointer. */
-QLayoutItem* QAspectRatioLayout::itemAt(int index) const {
- if(index != 0) {
- return 0;
- }
- if(hasItem()) {
- return this->item;
- }
- return 0;
-}
-
-/* Checks if we have an item. */
-bool QAspectRatioLayout::hasItem() const {
- return this->item != 0;
-}
-
-/* Returns the count of items which can be either 0 or 1. */
-int QAspectRatioLayout::count() const {
- int returnValue = 0;
- if(hasItem()) {
- returnValue = 1;
- }
- return returnValue;
-}
-
-/* Replaces the item with the new and returns the old. */
-QLayoutItem* QAspectRatioLayout::replaceItem(QLayoutItem* item) {
- QLayoutItem* old = 0;
- if(this->hasItem()) {
- old = this->item;
- }
- this->item = item;
- setGeometry(*this->_geometry);
- return old;
-}
-
-/* Tells which way layout expands. */
-Qt::Orientations QAspectRatioLayout::expandingDirections() const {
- return Qt::Horizontal | Qt::Vertical;
-}
-
-/* Tells which size is preferred. */
-QSize QAspectRatioLayout::sizeHint() const {
- return this->item->minimumSize();
-}
-
-/* Tells minimum size. */
-QSize QAspectRatioLayout::minimumSize() const {
- return this->item->minimumSize();
-}
-
-/*
- * Tells if heightForWidth calculations is handled.
- * It isn't since width isn't enough to calculate
- * proper size.
- */
-bool QAspectRatioLayout::hasHeightForWidth() const {
- return false;
-}
-
-/* Replaces lastReceivedRect. */
-void QAspectRatioLayout::setLastReceivedRect(const QRect& rect) {
- QRect* oldRect = this->lastReceivedRect;
- this->lastReceivedRect = new QRect(rect.topLeft(), rect.size());
- delete oldRect;
-}
-
-/* Returns geometry */
-QRect QAspectRatioLayout::geometry() {
- return QRect(*this->_geometry);
-}
-
-/* Sets geometry to given size. */
-void QAspectRatioLayout::setGeometry(const QRect& rect) {
- /*
- * We check if the item is set and
- * if size is the same previously received.
- * If either is false nothing is done.
- */
- if(!this->hasItem() ||
- areRectsEqual(*this->lastReceivedRect, rect)) {
- return;
- }
- /* Replace the last received rectangle. */
- setLastReceivedRect(rect);
- /* Calculate proper size for the item relative to the received size. */
- QSize properSize = calculateProperSize(rect.size());
- /* Calculate center location in the rect and with item size. */
- QPoint properLocation = calculateCenterLocation(rect.size(), properSize);
- /* Set items geometry */
- this->item->setGeometry(QRect(properLocation, properSize));
- QRect* oldRect = this->_geometry;
- /* Cache the calculated geometry. */
- this->_geometry = new QRect(properLocation, properSize);
- delete oldRect;
- /* Super classes setGeometry */
- QLayout::setGeometry(*this->_geometry);
-}
-
-/* Takes the shortest side and creates QSize
- * with the shortest side as width and height. */
-QSize QAspectRatioLayout::calculateProperSize(QSize from) const {
- QSize properSize;
- if(from.height() * 2 < from.width()) {
- properSize.setHeight(from.height() - this->margin());
- properSize.setWidth(from.height() * 2 - this->margin());
- }
- else {
- properSize.setWidth(from.width() - this->margin());
- properSize.setHeight(from.width() / 2 - this->margin());
- }
- return properSize;
-}
-
-/* Calculates center location from the given height and width for item size. */
-QPoint QAspectRatioLayout::calculateCenterLocation(QSize from,
- QSize itemSize) const {
- QPoint centerLocation;
- if((from.width() - itemSize.width()) > 0) {
- centerLocation.setX((from.width() - itemSize.width())/2);
- }
- if((from.height() - itemSize.height()) > 0) {
- centerLocation.setY((from.height() - itemSize.height())/2);
- }
- return centerLocation;
-}
-
-/* Compares if two QRects are equal. */
-bool QAspectRatioLayout::areRectsEqual(const QRect& a,
- const QRect& b) const {
- bool result = false;
- if(a.x() == b.x() &&
- a.y() == b.y() &&
- a.height() == b.height() &&
- a.width() == b.width()) {
- result = true;
- }
- return result;
-}
--- a/QTfrontend/qaspectratiolayout.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation.
- */
-
-#ifndef QASPECTRATIOLAYOUT_H_
-#define QASPECTRATIOLAYOUT_H_
-
-#include <QLayout>
-#include <QPointer>
-#include <QRect>
-#include <QWidgetItem>
-#include <QLayoutItem>
-
-
-class QAspectRatioLayout : public QLayout
-{
- Q_OBJECT
-
-public:
- QAspectRatioLayout(QWidget* parent, int spacing =-1);
- QAspectRatioLayout(int spacing = -1);
- ~QAspectRatioLayout();
-
- /* Convenience method */
- virtual void add(QLayoutItem* item);
-
-/* http://doc.trolltech.com/qlayout.html#addItem */
- virtual void addItem(QLayoutItem* item);
- /* http://doc.trolltech.com/qlayout.html#addWidget */
- virtual void addWidget(QWidget* widget);
- /* http://doc.trolltech.com/qlayout.html#takeAt */
- virtual QLayoutItem* takeAt(int index);
- /* http://doc.trolltech.com/qlayout.html#itemAt */
- virtual QLayoutItem* itemAt(int index) const;
- /* http://doc.trolltech.com/qlayout.html#count */
- virtual int count() const;
-
- /*
- * These are ours since we do have only one item.
- */
- virtual QLayoutItem* replaceItem(QLayoutItem* item);
- virtual QLayoutItem* take();
- virtual bool hasItem() const;
-
-/* http://doc.trolltech.com/qlayout.html#expandingDirections */
- virtual Qt::Orientations expandingDirections() const;
-
- /*
- * This method contains most of the juice of this article.
- * http://doc.trolltech.com/qlayoutitem.html#setGeometry
- */
- virtual void setGeometry(const QRect& rect);
- /* http://doc.trolltech.com/qlayoutitem.html#geometry */
- virtual QRect geometry();
-
- /* http://doc.trolltech.com/qlayoutitem.html#sizeHint */
- virtual QSize sizeHint() const;
- /* http://doc.trolltech.com/qlayout.html#minimumSize */
- virtual QSize minimumSize() const;
- /* http://doc.trolltech.com/qlayoutitem.html#hasHeightForWidth */
- virtual bool hasHeightForWidth() const;
-
-private:
- /* Saves the last received rect. */
- void setLastReceivedRect(const QRect& rect);
- /* Used to initialize the object. */
- void init(int spacing);
- /* Calculates the maximum size for the item from the assigned size. */
- QSize calculateProperSize(QSize from) const;
- /* Calculates the center location from the assigned size and
- * the items size. */
- QPoint calculateCenterLocation(QSize from, QSize itemSize) const;
- /* Check if two QRects are equal */
- bool areRectsEqual(const QRect& a, const QRect& b) const;
- /* Contains item reference */
- QLayoutItem* item;
- /*
- * Used for caching so we won't do calculations every time
- * setGeometry is called.
- */
- QRect* lastReceivedRect;
- /* Contains geometry */
- QRect* _geometry;
-
-};
-
-#endif /* QASPECTRATIOLAYOUT_H_ */
Binary file QTfrontend/res/Load.png has changed
Binary file QTfrontend/res/StatsMedal1@2x.png has changed
Binary file QTfrontend/res/StatsMedal2@2x.png has changed
Binary file QTfrontend/res/StatsMedal3@2x.png has changed
Binary file QTfrontend/res/StatsMedal4@2x.png has changed
Binary file QTfrontend/res/ammopic@2x.png has changed
Binary file QTfrontend/res/btnAISurvival.png has changed
Binary file QTfrontend/res/btnAISurvival@2x.png has changed
Binary file QTfrontend/res/btnArtillery.png has changed
Binary file QTfrontend/res/btnArtillery@2x.png has changed
Binary file QTfrontend/res/btnBorder.png has changed
Binary file QTfrontend/res/btnBorder@2x.png has changed
Binary file QTfrontend/res/btnBottomBorder.png has changed
Binary file QTfrontend/res/btnBottomBorder@2x.png has changed
Binary file QTfrontend/res/btnDisableGirders.png has changed
Binary file QTfrontend/res/btnDisableGirders@2x.png has changed
Binary file QTfrontend/res/btnDisableLandObjects.png has changed
Binary file QTfrontend/res/btnDisableLandObjects@2x.png has changed
Binary file QTfrontend/res/btnForts.png has changed
Binary file QTfrontend/res/btnForts@2x.png has changed
Binary file QTfrontend/res/btnInfAttack.png has changed
Binary file QTfrontend/res/btnInfAttack@2x.png has changed
Binary file QTfrontend/res/btnInvulnerable.png has changed
Binary file QTfrontend/res/btnInvulnerable@2x.png has changed
Binary file QTfrontend/res/btnKarma.png has changed
Binary file QTfrontend/res/btnKarma@2x.png has changed
Binary file QTfrontend/res/btnKing.png has changed
Binary file QTfrontend/res/btnKing@2x.png has changed
Binary file QTfrontend/res/btnLaserSight.png has changed
Binary file QTfrontend/res/btnLaserSight@2x.png has changed
Binary file QTfrontend/res/btnLowGravity.png has changed
Binary file QTfrontend/res/btnLowGravity@2x.png has changed
Binary file QTfrontend/res/btnMoreWind.png has changed
Binary file QTfrontend/res/btnMoreWind@2x.png has changed
Binary file QTfrontend/res/btnNoWind.png has changed
Binary file QTfrontend/res/btnNoWind@2x.png has changed
Binary file QTfrontend/res/btnOverlay.png has changed
Binary file QTfrontend/res/btnOverlay@2x.png has changed
Binary file QTfrontend/res/btnPerHogAmmo.png has changed
Binary file QTfrontend/res/btnPerHogAmmo@2x.png has changed
Binary file QTfrontend/res/btnPlaceHog.png has changed
Binary file QTfrontend/res/btnPlaceHog@2x.png has changed
Binary file QTfrontend/res/btnRandomOrder.png has changed
Binary file QTfrontend/res/btnRandomOrder@2x.png has changed
Binary file QTfrontend/res/btnResetHealth.png has changed
Binary file QTfrontend/res/btnResetHealth@2x.png has changed
Binary file QTfrontend/res/btnResetWeps.png has changed
Binary file QTfrontend/res/btnResetWeps@2x.png has changed
Binary file QTfrontend/res/btnSharedAmmo.png has changed
Binary file QTfrontend/res/btnSharedAmmo@2x.png has changed
Binary file QTfrontend/res/btnSolid.png has changed
Binary file QTfrontend/res/btnSolid@2x.png has changed
Binary file QTfrontend/res/btnTagTeam.png has changed
Binary file QTfrontend/res/btnTagTeam@2x.png has changed
Binary file QTfrontend/res/btnTeamsDivide.png has changed
Binary file QTfrontend/res/btnTeamsDivide@2x.png has changed
Binary file QTfrontend/res/btnVampiric.png has changed
Binary file QTfrontend/res/btnVampiric@2x.png has changed
Binary file QTfrontend/res/iconBox@2x.png has changed
Binary file QTfrontend/res/iconDamage.png has changed
Binary file QTfrontend/res/iconDamage@2x.png has changed
Binary file QTfrontend/res/iconDud@2x.png has changed
Binary file QTfrontend/res/iconHealth.png has changed
Binary file QTfrontend/res/iconHealth@2x.png has changed
Binary file QTfrontend/res/iconMine@2x.png has changed
Binary file QTfrontend/res/iconRope@2x.png has changed
Binary file QTfrontend/res/iconSuddenDeath.png has changed
Binary file QTfrontend/res/iconSuddenDeath@2x.png has changed
Binary file QTfrontend/res/iconTime@2x.png has changed
--- a/QTfrontend/selectWeapon.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,294 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "selectWeapon.h"
-#include "weaponItem.h"
-#include "hwconsts.h"
-
-#include <QPushButton>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QBitmap>
-#include <QLineEdit>
-#include <QSettings>
-#include <QMessageBox>
-#include <QTabWidget>
-#include <math.h>
-
-QImage getAmmoImage(int num)
-{
- static QImage ammo(":Ammos.png");
- int x = num/(ammo.height()/32);
- int y = (num-((ammo.height()/32)*x))*32;
- x*=32;
- return ammo.copy(x, y, 32, 32);
-}
-
-SelWeaponItem::SelWeaponItem(bool allowInfinite, int iconNum, int wNum, QImage image, QImage imagegrey, QWidget* parent) :
- QWidget(parent)
-{
- QHBoxLayout* hbLayout = new QHBoxLayout(this);
- hbLayout->setSpacing(1);
- hbLayout->setMargin(1);
-
- QLabel* lbl = new QLabel(this);
- lbl->setPixmap(QPixmap::fromImage(getAmmoImage(iconNum)));
- lbl->setMaximumWidth(30);
- lbl->setGeometry(0, 0, 30, 30);
- hbLayout->addWidget(lbl);
-
- item = new WeaponItem(image, imagegrey, this);
- item->setItemsNum(wNum);
- item->setInfinityState(allowInfinite);
- hbLayout->addWidget(item);
-
- hbLayout->setStretchFactor(lbl, 1);
- hbLayout->setStretchFactor(item, 99);
- hbLayout->setAlignment(lbl, Qt::AlignLeft | Qt::AlignVCenter);
- hbLayout->setAlignment(item, Qt::AlignLeft | Qt::AlignVCenter);
-}
-
-void SelWeaponItem::setItemsNum(const unsigned char num)
-{
- item->setItemsNum(num);
-}
-
-unsigned char SelWeaponItem::getItemsNum() const
-{
- return item->getItemsNum();
-}
-
-void SelWeaponItem::setEnabled(bool value)
-{
- item->setEnabled(value);
-}
-
-SelWeaponWidget::SelWeaponWidget(int numItems, QWidget* parent) :
- QFrame(parent),
- m_numItems(numItems)
-{
- wconf = new QSettings(cfgdir->absolutePath() + "/weapons.ini", QSettings::IniFormat, this);
-
- for(int i = 0; i < cDefaultAmmos.size(); ++i)
- wconf->setValue(cDefaultAmmos[i].first, cDefaultAmmos[i].second);
-
- QStringList keys = wconf->allKeys();
- for(int i = 0; i < keys.size(); i++)
- {
- if (wconf->value(keys[i]).toString().size() != cDefaultAmmoStore->size())
- wconf->remove(keys[i]);
- }
-
- QString currentState = *cDefaultAmmoStore;
-
- QTabWidget * tbw = new QTabWidget(this);
- QWidget * page1 = new QWidget(this);
- p1Layout = new QGridLayout(page1);
- p1Layout->setSpacing(1);
- p1Layout->setMargin(1);
- QWidget * page2 = new QWidget(this);
- p2Layout = new QGridLayout(page2);
- p2Layout->setSpacing(1);
- p2Layout->setMargin(1);
- QWidget * page3 = new QWidget(this);
- p3Layout = new QGridLayout(page3);
- p3Layout->setSpacing(1);
- p3Layout->setMargin(1);
- QWidget * page4 = new QWidget(this);
- p4Layout = new QGridLayout(page4);
- p4Layout->setSpacing(1);
- p4Layout->setMargin(1);
-
- tbw->addTab(page1, tr("Weapon set"));
- tbw->addTab(page2, tr("Probabilities"));
- tbw->addTab(page4, tr("Ammo in boxes"));
- tbw->addTab(page3, tr("Delays"));
-
- QGridLayout * pageLayout = new QGridLayout(this);
- pageLayout->addWidget(tbw);
-
-
- int j = -1;
- int i = 0, k = 0;
- for(; i < m_numItems; ++i) {
- if (i == 6) continue;
- if (i == 52) continue; // Disable structures for now
- if (k % 4 == 0) ++j;
- SelWeaponItem * swi = new SelWeaponItem(true, i, currentState[i].digitValue(), QImage(":/res/ammopic.png"), QImage(":/res/ammopicgrey.png"), this);
- weaponItems[i].append(swi);
- p1Layout->addWidget(swi, j, k % 4);
-
- SelWeaponItem * pwi = new SelWeaponItem(false, i, currentState[numItems + i].digitValue(), QImage(":/res/ammopicbox.png"), QImage(":/res/ammopicboxgrey.png"), this);
- weaponItems[i].append(pwi);
- p2Layout->addWidget(pwi, j, k % 4);
-
- SelWeaponItem * dwi = new SelWeaponItem(false, i, currentState[numItems*2 + i].digitValue(), QImage(":/res/ammopicdelay.png"), QImage(":/res/ammopicdelaygrey.png"), this);
- weaponItems[i].append(dwi);
- p3Layout->addWidget(dwi, j, k % 4);
-
- SelWeaponItem * awi = new SelWeaponItem(false, i, currentState[numItems*3 + i].digitValue(), QImage(":/res/ammopic.png"), QImage(":/res/ammopicgrey.png"), this);
- weaponItems[i].append(awi);
- p4Layout->addWidget(awi, j, k % 4);
-
- ++k;
- }
-
- //pLayout->setRowStretch(5, 100);
- m_name = new QLineEdit(this);
- pageLayout->addWidget(m_name, i, 0, 1, 5);
-}
-
-void SelWeaponWidget::setWeapons(const QString& ammo)
-{
- bool enable = true;
- for(int i = 0; i < cDefaultAmmos.size(); i++)
- if (!cDefaultAmmos[i].first.compare(m_name->text())) {
- enable = false;
- }
- for(int i = 0; i < m_numItems; ++i) {
- twi::iterator it = weaponItems.find(i);
- if (it == weaponItems.end()) continue;
- it.value()[0]->setItemsNum(ammo[i].digitValue());
- it.value()[1]->setItemsNum(ammo[m_numItems + i].digitValue());
- it.value()[2]->setItemsNum(ammo[m_numItems*2 + i].digitValue());
- it.value()[3]->setItemsNum(ammo[m_numItems*3 + i].digitValue());
- it.value()[0]->setEnabled(enable);
- it.value()[1]->setEnabled(enable);
- it.value()[2]->setEnabled(enable);
- it.value()[3]->setEnabled(enable);
- }
- m_name->setEnabled(enable);
-}
-
-void SelWeaponWidget::setDefault()
-{
- for(int i = 0; i < cDefaultAmmos.size(); i++)
- if (!cDefaultAmmos[i].first.compare(m_name->text())) {
- return;
- }
- setWeapons(*cDefaultAmmoStore);
-}
-
-void SelWeaponWidget::save()
-{
- for(int i = 0; i < cDefaultAmmos.size(); i++)
- if (!cDefaultAmmos[i].first.compare(m_name->text())) {
- QMessageBox::warning(0, QMessageBox::tr("Weapons"), QMessageBox::tr("Can not overwrite default weapon set '%1'!").arg(cDefaultAmmos[i].first));
- return;
- }
-
- if (m_name->text() == "") return;
-
- QString state1;
- QString state2;
- QString state3;
- QString state4;
-
- for(int i = 0; i < m_numItems; ++i) {
- twi::const_iterator it = weaponItems.find(i);
- int num = it == weaponItems.end() ? 9 : it.value()[0]->getItemsNum(); // 9 is for 'skip turn'
- state1.append(QString::number(num));
- int prob = it == weaponItems.end() ? 0 : it.value()[1]->getItemsNum();
- state2.append(QString::number(prob));
- int del = it == weaponItems.end() ? 0 : it.value()[2]->getItemsNum();
- state3.append(QString::number(del));
- int am = it == weaponItems.end() ? 0 : it.value()[3]->getItemsNum();
- state4.append(QString::number(am));
- }
- if (curWeaponsName != "") {
- // remove old entry
- wconf->remove(curWeaponsName);
- }
- wconf->setValue(m_name->text(), state1 + state2 + state3 + state4);
- emit weaponsChanged();
-}
-
-int SelWeaponWidget::operator [] (unsigned int weaponIndex) const
-{
- twi::const_iterator it = weaponItems.find(weaponIndex);
- return it == weaponItems.end() ? 9 : it.value()[0]->getItemsNum();
-}
-
-QString SelWeaponWidget::getWeaponsString(const QString& name) const
-{
- return wconf->value(name).toString();
-}
-
-void SelWeaponWidget::deleteWeaponsName()
-{
- if (curWeaponsName == "") return;
-
- for(int i = 0; i < cDefaultAmmos.size(); i++)
- if (!cDefaultAmmos[i].first.compare(m_name->text())) {
- QMessageBox::warning(0, QMessageBox::tr("Weapons"), QMessageBox::tr("Can not delete default weapon set '%1'!").arg(cDefaultAmmos[i].first));
- return;
- }
-
- QMessageBox reallyDelete(QMessageBox::Question, QMessageBox::tr("Weapons"), QMessageBox::tr("Really delete this weapon set?"), QMessageBox::Ok | QMessageBox::Cancel);
-
- if (reallyDelete.exec() == QMessageBox::Ok) {
- wconf->remove(curWeaponsName);
- emit weaponsDeleted();
- }
-}
-
-void SelWeaponWidget::newWeaponsName()
-{
- QString newName = tr("new");
- if(wconf->contains(newName)) {
- //name already used -> look for an appropriate name:
- int i=2;
- while(wconf->contains(newName = tr("new")+QString::number(i++)));
- }
- setWeaponsName(newName);
-}
-
-void SelWeaponWidget::setWeaponsName(const QString& name)
-{
- m_name->setText(name);
-
- curWeaponsName = name;
-
- if(name != "" && wconf->contains(name)) {
- setWeapons(wconf->value(name).toString());
- } else {
- setWeapons(*cDefaultAmmoStore);
- }
-}
-
-QStringList SelWeaponWidget::getWeaponNames() const
-{
- return wconf->allKeys();
-}
-
-void SelWeaponWidget::copy()
-{
- if(wconf->contains(curWeaponsName)) {
- QString ammo = getWeaponsString(curWeaponsName);
- QString newName = tr("copy of") + " " + curWeaponsName;
- if(wconf->contains(newName)) {
- //name already used -> look for an appropriate name:
- int i=2;
- while(wconf->contains(newName = tr("copy of") + " " + curWeaponsName+QString::number(i++)));
- }
- setWeaponsName(newName);
- setWeapons(ammo);
- }
-}
--- a/QTfrontend/selectWeapon.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _SELECT_WEAPON_INCLUDED
-#define _SELECT_WEAPON_INCLUDED
-
-#include <QFrame>
-#include <QMap>
-#include <QList>
-
-class QGridLayout;
-class WeaponItem;
-class QLineEdit;
-class QSettings;
-
-class SelWeaponItem : public QWidget
-{
- Q_OBJECT
-
-public:
- SelWeaponItem(bool allowInfinite, int iconNum, int wNum, QImage image, QImage imagegrey, QWidget* parent=0);
-
- unsigned char getItemsNum() const;
- void setItemsNum(const unsigned char num);
- void setEnabled(bool value);
-
- private:
- WeaponItem* item;
-};
-
-class SelWeaponWidget : public QFrame
-{
- Q_OBJECT
-
- public:
- SelWeaponWidget(int numItems, QWidget* parent=0);
- QString getWeaponsString(const QString& name) const;
- QStringList getWeaponNames() const;
-
- public slots:
- void setDefault();
- void setWeapons(const QString& ammo);
- //sets the name of the current set
- void setWeaponsName(const QString& name);
- void deleteWeaponsName();
- void newWeaponsName();
- void save();
- void copy();
-
- signals:
- void weaponsChanged();
- void weaponsDeleted();
-
- private:
- //the name of the current weapon set
- QString curWeaponsName;
-
- QLineEdit* m_name;
-
- //storage for all the weapons sets
- QSettings* wconf;
-
- const int m_numItems;
- int operator [] (unsigned int weaponIndex) const;
-
- typedef QList<SelWeaponItem*> ItemsList;
- typedef QMap<int, ItemsList> twi;
- twi weaponItems;
- //layout element for each tab:
- QGridLayout* p1Layout;
- QGridLayout* p2Layout;
- QGridLayout* p3Layout;
- QGridLayout* p4Layout;
-};
-
-#endif // _SELECT_WEAPON_INCLUDED
--- a/QTfrontend/tcpBase.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "tcpBase.h"
-
-#include <QMessageBox>
-#include <QList>
-
-#include <QImage>
-
-#include "hwconsts.h"
-
-QList<TCPBase*> srvsList;
-QPointer<QTcpServer> TCPBase::IPCServer(0);
-
-TCPBase::~TCPBase()
-{
-}
-
-TCPBase::TCPBase(bool demoMode) :
- m_isDemoMode(demoMode),
- IPCSocket(0)
-{
- if(!IPCServer) {
- IPCServer = new QTcpServer(0);
- IPCServer->setMaxPendingConnections(1);
- if (!IPCServer->listen(QHostAddress::LocalHost)) {
- QMessageBox::critical(0, tr("Error"),
- tr("Unable to start the server: %1.")
- .arg(IPCServer->errorString()));
- exit(0); // FIXME - should be graceful exit here
- }
- }
- ipc_port=IPCServer->serverPort();
-}
-
-void TCPBase::NewConnection()
-{
- if(IPCSocket) {
- // connection should be already finished
- return;
- }
- disconnect(IPCServer, SIGNAL(newConnection()), this, SLOT(NewConnection()));
- IPCSocket = IPCServer->nextPendingConnection();
- if(!IPCSocket) return;
- connect(IPCSocket, SIGNAL(disconnected()), this, SLOT(ClientDisconnect()));
- connect(IPCSocket, SIGNAL(readyRead()), this, SLOT(ClientRead()));
- SendToClientFirst();
-}
-
-void TCPBase::RealStart()
-{
- connect(IPCServer, SIGNAL(newConnection()), this, SLOT(NewConnection()));
- IPCSocket = 0;
-
- QProcess * process;
- process = new QProcess;
- connect(process, SIGNAL(error(QProcess::ProcessError)), this, SLOT(StartProcessError(QProcess::ProcessError)));
- QStringList arguments=getArguments();
-
- // redirect everything written on stdout/stderr
- if(isDevBuild)
- process->setProcessChannelMode(QProcess::ForwardedChannels);
- process->start(bindir->absolutePath() + "/hwengine", arguments);
-}
-
-void TCPBase::ClientDisconnect()
-{
- disconnect(IPCSocket, SIGNAL(readyRead()), this, SLOT(ClientRead()));
- onClientDisconnect();
-
- if(srvsList.size()==1) srvsList.pop_front();
- emit isReadyNow();
- IPCSocket->deleteLater();
- deleteLater();
-}
-
-void TCPBase::ClientRead()
-{
- QByteArray readed=IPCSocket->readAll();
- if(readed.isEmpty()) return;
- readbuffer.append(readed);
- onClientRead();
-}
-
-void TCPBase::StartProcessError(QProcess::ProcessError error)
-{
- QMessageBox::critical(0, tr("Error"),
- tr("Unable to run engine: %1 (")
- .arg(error) + bindir->absolutePath() + "/hwengine)");
-}
-
-void TCPBase::tcpServerReady()
-{
- disconnect(srvsList.takeFirst(), SIGNAL(isReadyNow()), this, SLOT(tcpServerReady()));
-
- RealStart();
-}
-
-void TCPBase::Start()
-{
- if(srvsList.isEmpty()) {
- srvsList.push_back(this);
- } else {
- connect(srvsList.back(), SIGNAL(isReadyNow()), this, SLOT(tcpServerReady()));
- srvsList.push_back(this);
- return;
- }
-
- RealStart();
-}
-
-void TCPBase::onClientRead()
-{
-}
-
-void TCPBase::onClientDisconnect()
-{
-}
-
-void TCPBase::SendToClientFirst()
-{
-}
-
-void TCPBase::SendIPC(const QByteArray & buf)
-{
- if (buf.size() > MAXMSGCHARS) return;
- quint8 len = buf.size();
- RawSendIPC(QByteArray::fromRawData((char *)&len, 1) + buf);
-}
-
-void TCPBase::RawSendIPC(const QByteArray & buf)
-{
- if (!IPCSocket)
- {
- toSendBuf += buf;
- } else
- {
- if (toSendBuf.size() > 0)
- {
- IPCSocket->write(toSendBuf);
- if(m_isDemoMode) demo.append(toSendBuf);
- toSendBuf.clear();
- }
- if(!buf.isEmpty()) {
- IPCSocket->write(buf);
- if(m_isDemoMode) demo.append(buf);
- }
- }
-}
--- a/QTfrontend/tcpBase.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _TCPBASE_INCLUDED
-#define _TCPBASE_INCLUDED
-
-#include <QObject>
-#include <QTcpServer>
-#include <QTcpSocket>
-#include <QByteArray>
-#include <QString>
-#include <QDir>
-#include <QProcess>
-#include <QPointer>
-
-#include <QImage>
-
-#define MAXMSGCHARS 255
-
-class TCPBase : public QObject
-{
- Q_OBJECT
-
- public:
- TCPBase(bool demoMode);
- virtual ~TCPBase();
-
- signals:
- void isReadyNow();
-
- protected:
- quint16 ipc_port;
-
- void Start();
-
- QByteArray readbuffer;
-
- QByteArray toSendBuf;
- QByteArray demo;
-
- void SendIPC(const QByteArray & buf);
- void RawSendIPC(const QByteArray & buf);
-
- virtual QStringList getArguments()=0;
- virtual void onClientRead();
- virtual void onClientDisconnect();
- virtual void SendToClientFirst();
-
- private:
- static QPointer<QTcpServer> IPCServer;
-
- bool m_isDemoMode;
- void RealStart();
- QPointer<QTcpSocket> IPCSocket;
-
- private slots:
- void NewConnection();
- void ClientDisconnect();
- void ClientRead();
- void StartProcessError(QProcess::ProcessError error);
-
- void tcpServerReady();
-};
-
-#endif // _TCPBASE_INCLUDED
--- a/QTfrontend/team.cpp Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/team.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -25,115 +25,113 @@
#include "team.h"
#include "hwform.h"
-#include "pageeditteam.h"
-#include "hwconsts.h"
#include "hats.h"
HWTeam::HWTeam(const QString & teamname) :
- difficulty(0),
- numHedgehogs(4),
+ m_difficulty(0),
+ m_numHedgehogs(4),
m_isNetTeam(false)
{
- TeamName = teamname;
- OldTeamName = TeamName;
- for (int i = 0; i < 8; i++)
+ m_name = teamname;
+ OldTeamName = m_name;
+ for (int i = 0; i < HEDGEHOGS_PER_TEAM; i++)
{
- Hedgehogs[i].Name.sprintf("hedgehog %d", i);
- Hedgehogs[i].Hat = "NoHat";
+ m_hedgehogs[i].Name = (QLineEdit::tr("hedgehog %1").arg(i+1));
+ m_hedgehogs[i].Hat = "NoHat";
}
- Grave = "Statue";
- Fort = "Plane";
- Voicepack = "Default";
- Flag = "hedgewars";
+ m_grave = "Statue";
+ m_fort = "Plane";
+ m_voicepack = "Default";
+ m_flag = "hedgewars";
for(int i = 0; i < BINDS_NUMBER; i++)
{
- binds[i].action = cbinds[i].action;
- binds[i].strbind = cbinds[i].strbind;
+ m_binds[i].action = cbinds[i].action;
+ m_binds[i].strbind = cbinds[i].strbind;
}
- Rounds = 0;
- Wins = 0;
- CampaignProgress = 0;
+ m_rounds = 0;
+ m_wins = 0;
+ m_campaignProgress = 0;
}
HWTeam::HWTeam(const QStringList& strLst) :
- numHedgehogs(4),
+ m_numHedgehogs(4),
m_isNetTeam(true)
{
// net teams are configured from QStringList
if(strLst.size() != 23) throw HWTeamConstructException();
- TeamName = strLst[0];
- Grave = strLst[1];
- Fort = strLst[2];
- Voicepack = strLst[3];
- Flag = strLst[4];
- Owner = strLst[5];
- difficulty = strLst[6].toUInt();
- for(int i = 0; i < 8; i++)
+ m_name = strLst[0];
+ m_grave = strLst[1];
+ m_fort = strLst[2];
+ m_voicepack = strLst[3];
+ m_flag = strLst[4];
+ m_owner = strLst[5];
+ m_difficulty = strLst[6].toUInt();
+ for(int i = 0; i < HEDGEHOGS_PER_TEAM; i++)
{
- Hedgehogs[i].Name=strLst[i * 2 + 7];
- Hedgehogs[i].Hat=strLst[i * 2 + 8];
+ m_hedgehogs[i].Name=strLst[i * 2 + 7];
+ m_hedgehogs[i].Hat=strLst[i * 2 + 8];
// Somehow claymore managed an empty hat. Until we figure out how, this should avoid a repeat
// Checking net teams is probably pointless, but can't hurt.
- if (Hedgehogs[i].Hat.isEmpty()) Hedgehogs[i].Hat = "NoHat";
+ if (m_hedgehogs[i].Hat.isEmpty()) m_hedgehogs[i].Hat = "NoHat";
}
- Rounds = 0;
- Wins = 0;
- CampaignProgress = 0;
+ m_rounds = 0;
+ m_wins = 0;
+ m_campaignProgress = 0;
}
HWTeam::HWTeam() :
- difficulty(0),
- numHedgehogs(4),
+ m_difficulty(0),
+ m_numHedgehogs(4),
m_isNetTeam(false)
{
- TeamName = QString("Team");
- for (int i = 0; i < 8; i++)
+ m_name = QString("Team");
+ for (int i = 0; i < HEDGEHOGS_PER_TEAM; i++)
{
- Hedgehogs[i].Name.sprintf("hedgehog %d", i);
- Hedgehogs[i].Hat = "NoHat";
+ m_hedgehogs[i].Name.sprintf("hedgehog %d", i);
+ m_hedgehogs[i].Hat = "NoHat";
}
- Grave = QString("Simple"); // default
- Fort = QString("Island"); // default
- Voicepack = "Default";
- Flag = "hedgewars";
+ m_grave = QString("Simple"); // default
+ m_fort = QString("Island"); // default
+ m_voicepack = "Default";
+ m_flag = "hedgewars";
for(int i = 0; i < BINDS_NUMBER; i++)
{
- binds[i].action = cbinds[i].action;
- binds[i].strbind = cbinds[i].strbind;
+ m_binds[i].action = cbinds[i].action;
+ m_binds[i].strbind = cbinds[i].strbind;
}
- Rounds = 0;
- Wins = 0;
- CampaignProgress = 0;
+ m_rounds = 0;
+ m_wins = 0;
+ m_campaignProgress = 0;
}
-bool HWTeam::LoadFromFile()
+bool HWTeam::loadFromFile()
{
- QSettings teamfile(cfgdir->absolutePath() + "/Teams/" + TeamName + ".hwt", QSettings::IniFormat, 0);
+ QSettings teamfile(cfgdir->absolutePath() + "/Teams/" + m_name + ".hwt", QSettings::IniFormat, 0);
teamfile.setIniCodec("UTF-8");
- TeamName = teamfile.value("Team/Name", TeamName).toString();
- Grave = teamfile.value("Team/Grave", "Statue").toString();
- Fort = teamfile.value("Team/Fort", "Plane").toString();
- Voicepack = teamfile.value("Team/Voicepack", "Default").toString();
- Flag = teamfile.value("Team/Flag", "hedgewars").toString();
- difficulty = teamfile.value("Team/Difficulty", 0).toInt();
- Rounds = teamfile.value("Team/Rounds", 0).toInt();
- Wins = teamfile.value("Team/Wins", 0).toInt();
- CampaignProgress = teamfile.value("Team/CampaignProgress", 0).toInt();
- for(int i = 0; i < 8; i++)
+ m_name = teamfile.value("Team/Name", m_name).toString();
+ m_grave = teamfile.value("Team/Grave", "Statue").toString();
+ m_fort = teamfile.value("Team/Fort", "Plane").toString();
+ m_voicepack = teamfile.value("Team/Voicepack", "Default").toString();
+ m_flag = teamfile.value("Team/Flag", "hedgewars").toString();
+ m_difficulty = teamfile.value("Team/Difficulty", 0).toInt();
+ m_rounds = teamfile.value("Team/Rounds", 0).toInt();
+ m_wins = teamfile.value("Team/Wins", 0).toInt();
+ m_campaignProgress = teamfile.value("Team/CampaignProgress", 0).toInt();
+ for(int i = 0; i < HEDGEHOGS_PER_TEAM; i++)
{
QString hh = QString("Hedgehog%1/").arg(i);
- Hedgehogs[i].Name = teamfile.value(hh + "Name", QString("hedgehog %1").arg(i)).toString();
- Hedgehogs[i].Hat = teamfile.value(hh + "Hat", "NoHat").toString();
- Hedgehogs[i].Rounds = teamfile.value(hh + "Rounds", 0).toInt();
- Hedgehogs[i].Kills = teamfile.value(hh + "Kills", 0).toInt();
- Hedgehogs[i].Deaths = teamfile.value(hh + "Deaths", 0).toInt();
- Hedgehogs[i].Suicides = teamfile.value(hh + "Suicides", 0).toInt();
+ m_hedgehogs[i].Name = teamfile.value(hh + "Name", QString("hedgehog %1").arg(i+1)).toString();
+ m_hedgehogs[i].Hat = teamfile.value(hh + "Hat", "NoHat").toString();
+ m_hedgehogs[i].Rounds = teamfile.value(hh + "Rounds", 0).toInt();
+ m_hedgehogs[i].Kills = teamfile.value(hh + "Kills", 0).toInt();
+ m_hedgehogs[i].Deaths = teamfile.value(hh + "Deaths", 0).toInt();
+ m_hedgehogs[i].Suicides = teamfile.value(hh + "Suicides", 0).toInt();
}
for(int i = 0; i < BINDS_NUMBER; i++)
- binds[i].strbind = teamfile.value(QString("Binds/%1").arg(binds[i].action), cbinds[i].strbind).toString();
+ m_binds[i].strbind = teamfile.value(QString("Binds/%1").arg(m_binds[i].action), cbinds[i].strbind).toString();
for(int i = 0; i < MAX_ACHIEVEMENTS; i++)
if(achievements[i][0][0])
AchievementProgress[i] = teamfile.value(QString("Achievements/%1").arg(achievements[i][0]), 0).toUInt();
@@ -142,52 +140,52 @@
return true;
}
-bool HWTeam::FileExists()
+bool HWTeam::fileExists()
{
- QFile f(cfgdir->absolutePath() + "/Teams/" + TeamName + ".hwt");
+ QFile f(cfgdir->absolutePath() + "/Teams/" + m_name + ".hwt");
return f.exists();
}
-bool HWTeam::DeleteFile()
+bool HWTeam::deleteFile()
{
if(m_isNetTeam)
return false;
- QFile cfgfile(cfgdir->absolutePath() + "/Teams/" + TeamName + ".hwt");
+ QFile cfgfile(cfgdir->absolutePath() + "/Teams/" + m_name + ".hwt");
cfgfile.remove();
return true;
}
-bool HWTeam::SaveToFile()
+bool HWTeam::saveToFile()
{
- if (OldTeamName != TeamName)
+ if (OldTeamName != m_name)
{
QFile cfgfile(cfgdir->absolutePath() + "/Teams/" + OldTeamName + ".hwt");
cfgfile.remove();
- OldTeamName = TeamName;
+ OldTeamName = m_name;
}
- QSettings teamfile(cfgdir->absolutePath() + "/Teams/" + TeamName + ".hwt", QSettings::IniFormat, 0);
+ QSettings teamfile(cfgdir->absolutePath() + "/Teams/" + m_name + ".hwt", QSettings::IniFormat, 0);
teamfile.setIniCodec("UTF-8");
- teamfile.setValue("Team/Name", TeamName);
- teamfile.setValue("Team/Grave", Grave);
- teamfile.setValue("Team/Fort", Fort);
- teamfile.setValue("Team/Voicepack", Voicepack);
- teamfile.setValue("Team/Flag", Flag);
- teamfile.setValue("Team/Difficulty", difficulty);
- teamfile.setValue("Team/Rounds", Rounds);
- teamfile.setValue("Team/Wins", Wins);
- teamfile.setValue("Team/CampaignProgress", CampaignProgress);
- for(int i = 0; i < 8; i++)
+ teamfile.setValue("Team/Name", m_name);
+ teamfile.setValue("Team/Grave", m_grave);
+ teamfile.setValue("Team/Fort", m_fort);
+ teamfile.setValue("Team/Voicepack", m_voicepack);
+ teamfile.setValue("Team/Flag", m_flag);
+ teamfile.setValue("Team/Difficulty", m_difficulty);
+ teamfile.setValue("Team/Rounds", m_rounds);
+ teamfile.setValue("Team/Wins", m_wins);
+ teamfile.setValue("Team/CampaignProgress", m_campaignProgress);
+ for(int i = 0; i < HEDGEHOGS_PER_TEAM; i++)
{
QString hh = QString("Hedgehog%1/").arg(i);
- teamfile.setValue(hh + "Name", Hedgehogs[i].Name);
- teamfile.setValue(hh + "Hat", Hedgehogs[i].Hat);
- teamfile.setValue(hh + "Rounds", Hedgehogs[i].Rounds);
- teamfile.setValue(hh + "Kills", Hedgehogs[i].Kills);
- teamfile.setValue(hh + "Deaths", Hedgehogs[i].Deaths);
- teamfile.setValue(hh + "Suicides", Hedgehogs[i].Suicides);
+ teamfile.setValue(hh + "Name", m_hedgehogs[i].Name);
+ teamfile.setValue(hh + "Hat", m_hedgehogs[i].Hat);
+ teamfile.setValue(hh + "Rounds", m_hedgehogs[i].Rounds);
+ teamfile.setValue(hh + "Kills", m_hedgehogs[i].Kills);
+ teamfile.setValue(hh + "Deaths", m_hedgehogs[i].Deaths);
+ teamfile.setValue(hh + "Suicides", m_hedgehogs[i].Suicides);
}
for(int i = 0; i < BINDS_NUMBER; i++)
- teamfile.setValue(QString("Binds/%1").arg(binds[i].action), binds[i].strbind);
+ teamfile.setValue(QString("Binds/%1").arg(m_binds[i].action), m_binds[i].strbind);
for(int i = 0; i < MAX_ACHIEVEMENTS; i++)
if(achievements[i][0][0])
teamfile.setValue(QString("Achievements/%1").arg(achievements[i][0]), AchievementProgress[i]);
@@ -196,82 +194,34 @@
return true;
}
-void HWTeam::SetToPage(HWForm * hwform)
-{
- hwform->ui.pageEditTeam->TeamNameEdit->setText(TeamName);
- hwform->ui.pageEditTeam->CBTeamLvl->setCurrentIndex(difficulty);
- for(int i = 0; i < 8; i++)
- {
- hwform->ui.pageEditTeam->HHNameEdit[i]->setText(Hedgehogs[i].Name);
- if (Hedgehogs[i].Hat.startsWith("Reserved"))
- hwform->ui.pageEditTeam->HHHats[i]->setCurrentIndex(hwform->ui.pageEditTeam->HHHats[i]->findData("Reserved "+Hedgehogs[i].Hat.remove(0,40), Qt::DisplayRole));
- else
- hwform->ui.pageEditTeam->HHHats[i]->setCurrentIndex(hwform->ui.pageEditTeam->HHHats[i]->findData(Hedgehogs[i].Hat, Qt::DisplayRole));
- }
- hwform->ui.pageEditTeam->CBGrave->setCurrentIndex(hwform->ui.pageEditTeam->CBGrave->findText(Grave));
- hwform->ui.pageEditTeam->CBFlag->setCurrentIndex(hwform->ui.pageEditTeam->CBFlag->findData(Flag));
-
- hwform->ui.pageEditTeam->CBFort->setCurrentIndex(hwform->ui.pageEditTeam->CBFort->findText(Fort));
- hwform->ui.pageEditTeam->CBVoicepack->setCurrentIndex(hwform->ui.pageEditTeam->CBVoicepack->findText(Voicepack));
- //hwform->ui.pageEditTeam->CBFort_activated(Fort);
-
- for(int i = 0; i < BINDS_NUMBER; i++)
- {
- hwform->ui.pageEditTeam->CBBind[i]->setCurrentIndex(hwform->ui.pageEditTeam->CBBind[i]->findData(binds[i].strbind));
- }
-}
-
-void HWTeam::GetFromPage(HWForm * hwform)
-{
- TeamName = hwform->ui.pageEditTeam->TeamNameEdit->text();
- difficulty = hwform->ui.pageEditTeam->CBTeamLvl->currentIndex();
- for(int i = 0; i < 8; i++)
- {
- Hedgehogs[i].Name = hwform->ui.pageEditTeam->HHNameEdit[i]->text();
- if (hwform->ui.pageEditTeam->HHHats[i]->currentText().startsWith("Reserved"))
- Hedgehogs[i].Hat = "Reserved"+playerHash+hwform->ui.pageEditTeam->HHHats[i]->currentText().remove(0,9);
- else
- Hedgehogs[i].Hat = hwform->ui.pageEditTeam->HHHats[i]->currentText();
- }
-
- Grave = hwform->ui.pageEditTeam->CBGrave->currentText();
- Fort = hwform->ui.pageEditTeam->CBFort->currentText();
- Voicepack = hwform->ui.pageEditTeam->CBVoicepack->currentText();
- Flag = hwform->ui.pageEditTeam->CBFlag->itemData(hwform->ui.pageEditTeam->CBFlag->currentIndex()).toString();
- for(int i = 0; i < BINDS_NUMBER; i++)
- {
- binds[i].strbind = hwform->ui.pageEditTeam->CBBind[i]->itemData(hwform->ui.pageEditTeam->CBBind[i]->currentIndex()).toString();
- }
-}
-
-QStringList HWTeam::TeamGameConfig(quint32 InitHealth) const
+QStringList HWTeam::teamGameConfig(quint32 InitHealth) const
{
QStringList sl;
if (m_isNetTeam)
{
- sl.push_back(QString("eaddteam %3 %1 %2").arg(teamColor.rgb() & 0xffffff).arg(TeamName).arg(QString(QCryptographicHash::hash(Owner.toLatin1(), QCryptographicHash::Md5).toHex())));
+ sl.push_back(QString("eaddteam %3 %1 %2").arg(m_color.rgb() & 0xffffff).arg(m_name).arg(QString(QCryptographicHash::hash(m_owner.toLatin1(), QCryptographicHash::Md5).toHex())));
sl.push_back("erdriven");
}
- else sl.push_back(QString("eaddteam %3 %1 %2").arg(teamColor.rgb() & 0xffffff).arg(TeamName).arg(playerHash));
+ else sl.push_back(QString("eaddteam %3 %1 %2").arg(m_color.rgb() & 0xffffff).arg(m_name).arg(playerHash));
- sl.push_back(QString("egrave " + Grave));
- sl.push_back(QString("efort " + Fort));
- sl.push_back(QString("evoicepack " + Voicepack));
- sl.push_back(QString("eflag " + Flag));
+ sl.push_back(QString("egrave " + m_grave));
+ sl.push_back(QString("efort " + m_fort));
+ sl.push_back(QString("evoicepack " + m_voicepack));
+ sl.push_back(QString("eflag " + m_flag));
if (!m_isNetTeam)
for(int i = 0; i < BINDS_NUMBER; i++)
- if(!binds[i].strbind.isEmpty())
- sl.push_back(QString("ebind " + binds[i].strbind + " " + binds[i].action));
+ if(!m_binds[i].strbind.isEmpty())
+ sl.push_back(QString("ebind " + m_binds[i].strbind + " " + m_binds[i].action));
- for (int t = 0; t < numHedgehogs; t++)
+ for (int t = 0; t < m_numHedgehogs; t++)
{
sl.push_back(QString("eaddhh %1 %2 %3")
- .arg(QString::number(difficulty),
+ .arg(QString::number(m_difficulty),
QString::number(InitHealth),
- Hedgehogs[t].Name));
+ m_hedgehogs[t].Name));
sl.push_back(QString("ehat %1")
- .arg(Hedgehogs[t].Hat));
+ .arg(m_hedgehogs[t].Hat));
}
return sl;
}
@@ -283,11 +233,70 @@
bool HWTeam::operator==(const HWTeam& t1) const {
- return TeamName==t1.TeamName;
+ return m_name==t1.m_name;
}
bool HWTeam::operator<(const HWTeam& t1) const {
- return TeamName<t1.TeamName; // if names are equal - test if it is net team
+ return m_name<t1.m_name; // if names are equal - test if it is net team
}
+//// Methods for member inspection+modification ////
+
+
+// name
+QString HWTeam::name() const { return m_name; }
+ void HWTeam::setName(const QString & name) { m_name = name; }
+
+// single hedgehog
+const HWHog & HWTeam::hedgehog(unsigned int idx) const { return m_hedgehogs[idx]; }
+ void HWTeam::setHedgehog(unsigned int idx, HWHog hh) { m_hedgehogs[idx] = hh; }
+
+// owner
+QString HWTeam::owner() const { return m_owner; }
+
+
+
+// difficulty
+unsigned int HWTeam::difficulty() const { return m_difficulty; }
+ void HWTeam::setDifficulty(unsigned int level) { m_difficulty = level; }
+
+// color
+QColor HWTeam::color() const { return m_color; }
+ void HWTeam::setColor(const QColor & color) { m_color = color; }
+
+
+// binds
+QString HWTeam::keyBind(unsigned int idx) const { return m_binds[idx].strbind; }
+ void HWTeam::bindKey(unsigned int idx, const QString & key) { m_binds[idx].strbind = key; }
+
+// flag
+void HWTeam::setFlag(const QString & flag) { m_flag = flag; }
+QString HWTeam::flag() const { return m_flag; }
+
+// fort
+void HWTeam::setFort(const QString & fort) { m_fort = fort; }
+QString HWTeam::fort() const { return m_fort; }
+
+// grave
+void HWTeam::setGrave(const QString & grave) { m_grave = grave; }
+QString HWTeam::grave() const { return m_grave; }
+
+// voicepack - getter/setter
+void HWTeam::setVoicepack(const QString & voicepack) { m_voicepack = voicepack; }
+QString HWTeam::voicepack() const { return m_voicepack; }
+
+
+// campaignProgress - getter
+unsigned int HWTeam::campaignProgress() const { return m_campaignProgress; };
+
+// amount of hedgehogs
+unsigned char HWTeam::numHedgehogs() const { return m_numHedgehogs; }
+ void HWTeam::setNumHedgehogs(unsigned char num) { m_numHedgehogs = num; }
+
+
+
+// rounds+wins - incrementors
+void HWTeam::incRounds() { m_rounds++; }
+void HWTeam::incWins() { m_wins++; }
+
--- a/QTfrontend/team.h Sat Oct 08 16:45:52 2011 +0200
+++ b/QTfrontend/team.h Sat Oct 08 16:54:56 2011 +0200
@@ -24,6 +24,7 @@
#include <QString>
#include "binds.h"
#include "achievements.h"
+#include "hwconsts.h"
class HWForm;
class GameUIConfig;
@@ -32,6 +33,7 @@
{
};
+// structure for customization and statistics of a single hedgehog
struct HWHog
{
QString Name;
@@ -39,45 +41,89 @@
int Rounds, Kills, Deaths, Suicides;
};
+// class representing a team
class HWTeam
{
public:
+
+ // constructors
HWTeam(const QString & teamname);
HWTeam(const QStringList& strLst);
HWTeam();
- bool isNetTeam() const;
+ // file operations
+ static HWTeam loadFromFile(const QString & teamName);
+ bool loadFromFile();
+ bool deleteFile();
+ bool saveToFile();
+ bool fileExists();
- QString TeamName;
- QString Grave;
- QString Fort;
- QString Flag;
- QString Voicepack;
- QString Owner;
- int Rounds;
- int Wins;
- int CampaignProgress;
- HWHog Hedgehogs[8];
- unsigned int AchievementProgress[MAX_ACHIEVEMENTS];
- unsigned int difficulty;
- BindAction binds[BINDS_NUMBER];
+ // attribute getters
+ unsigned int campaignProgress() const;
+ QColor color() const;
+ unsigned int difficulty() const;
+ QString flag() const;
+ QString fort() const;
+ QString grave() const;
+ const HWHog & hedgehog(unsigned int idx) const;
+ bool isNetTeam() const;
+ QString keyBind(unsigned int idx) const;
+ QString name() const;
+ unsigned char numHedgehogs() const;
+ QString owner() const;
+ QString voicepack() const;
- unsigned char numHedgehogs;
- QColor teamColor;
+ // attribute setters
+ void bindKey(unsigned int idx, const QString & key);
+ void setColor(const QColor & color);
+ void setDifficulty(unsigned int level);
+ void setFlag(const QString & flag);
+ void setFort(const QString & fort);
+ void setGrave(const QString & grave);
+ void setHedgehog(unsigned int idx, HWHog hh);
+ void setName(const QString & name);
+ void setNumHedgehogs(unsigned char num);
+ void setVoicepack(const QString & voicepack);
- bool LoadFromFile();
- bool DeleteFile();
- bool SaveToFile();
- bool FileExists();
- void SetToPage(HWForm * hwform);
- void GetFromPage(HWForm * hwform);
- QStringList TeamGameConfig(quint32 InitHealth) const;
+ // increments for statistical info
+ void incRounds();
+ void incWins();
+ // convert team info into strings for further computation
+ QStringList teamGameConfig(quint32 InitHealth) const;
+
+ // comparison operators
bool operator==(const HWTeam& t1) const;
bool operator<(const HWTeam& t1) const;
+
+
+
private:
+
+ QString OldTeamName;
+
+ // class members that contain the general team info and settings
+ QString m_name;
+ QString m_grave;
+ QString m_fort;
+ QString m_flag;
+ QString m_voicepack;
+ HWHog m_hedgehogs[HEDGEHOGS_PER_TEAM];
+ unsigned int m_difficulty;
+ BindAction m_binds[BINDS_NUMBER];
+
+ // class members that contain info for the current game setup
+ unsigned char m_numHedgehogs;
+ QColor m_color;
bool m_isNetTeam;
- QString OldTeamName;
+ QString m_owner;
+
+ // class members that contain statistics, etc.
+ unsigned int m_campaignProgress;
+ unsigned int m_rounds;
+ unsigned int m_wins;
+ unsigned int AchievementProgress[MAX_ACHIEVEMENTS];
+
};
--- a/QTfrontend/teamselect.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,281 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <algorithm>
-
-#include <QLabel>
-#include <QPixmap>
-#include <QPushButton>
-#include <QFrame>
-#include <QDebug>
-
-#include "vertScrollArea.h"
-#include "teamselect.h"
-#include "teamselhelper.h"
-#include "frameTeam.h"
-
-void TeamSelWidget::addTeam(HWTeam team)
-{
- if(team.isNetTeam()) {
- framePlaying->addTeam(team, true);
- curPlayingTeams.push_back(team);
- connect(framePlaying->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)),
- this, SLOT(netTeamStatusChanged(const HWTeam&)));
- connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)),
- this, SLOT(hhNumChanged(const HWTeam&)));
- dynamic_cast<TeamShowWidget*>(framePlaying->getTeamWidget(team))->hhNumChanged();
- connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)),
- this, SLOT(proxyTeamColorChanged(const HWTeam&)));
- } else {
- frameDontPlaying->addTeam(team, false);
- m_curNotPlayingTeams.push_back(team);
- if(m_acceptOuter) {
- connect(frameDontPlaying->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)),
- this, SLOT(pre_changeTeamStatus(HWTeam)));
- } else {
- connect(frameDontPlaying->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)),
- this, SLOT(changeTeamStatus(HWTeam)));
- }
- }
- emit setEnabledGameStart(curPlayingTeams.size()>1);
-}
-
-void TeamSelWidget::setInteractivity(bool interactive)
-{
- framePlaying->setInteractivity(interactive);
-}
-
-void TeamSelWidget::hhNumChanged(const HWTeam& team)
-{
- QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
- if(itPlay==curPlayingTeams.end())
- {
- qWarning() << QString("hhNumChanged: team '%1' not found").arg(team.TeamName);
- return;
- }
- itPlay->numHedgehogs=team.numHedgehogs;
- emit hhogsNumChanged(team);
-}
-
-void TeamSelWidget::proxyTeamColorChanged(const HWTeam& team)
-{
- QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
- if(itPlay==curPlayingTeams.end())
- {
- qWarning() << QString("proxyTeamColorChanged: team '%1' not found").arg(team.TeamName);
- return;
- }
- itPlay->teamColor=team.teamColor;
- emit teamColorChanged(team);
-}
-
-void TeamSelWidget::changeHHNum(const HWTeam& team)
-{
- QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
- if(itPlay==curPlayingTeams.end())
- {
- qWarning() << QString("changeHHNum: team '%1' not found").arg(team.TeamName);
- return;
- }
- itPlay->numHedgehogs=team.numHedgehogs;
-
- framePlaying->setHHNum(team);
-}
-
-void TeamSelWidget::changeTeamColor(const HWTeam& team)
-{
- QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
- if(itPlay==curPlayingTeams.end())
- {
- qWarning() << QString("changeTeamColor: team '%1' not found").arg(team.TeamName);
- return;
- }
- itPlay->teamColor=team.teamColor;
-
- framePlaying->setTeamColor(team);
-}
-
-void TeamSelWidget::removeNetTeam(const HWTeam& team)
-{
- //qDebug() << QString("removeNetTeam: removing team '%1'").arg(team.TeamName);
- for(;;) {
- QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
- if(itPlay==curPlayingTeams.end())
- {
- qWarning() << QString("removeNetTeam: team '%1' not found").arg(team.TeamName);
- break;
- }
- if(itPlay->isNetTeam()) {
- QObject::disconnect(framePlaying->getTeamWidget(*itPlay), SIGNAL(teamStatusChanged(HWTeam)));
- framePlaying->removeTeam(team);
- curPlayingTeams.erase(itPlay);
- break;
- }
- }
- emit setEnabledGameStart(curPlayingTeams.size()>1);
-}
-
-void TeamSelWidget::netTeamStatusChanged(const HWTeam& team)
-{
- QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
-
-}
-
-//void TeamSelWidget::removeTeam(__attribute__ ((unused)) HWTeam team)
-//{
- //curDontPlayingTeams.erase(std::find(curDontPlayingTeams.begin(), curDontPlayingTeams.end(), team));
-//}
-
-void TeamSelWidget::changeTeamStatus(HWTeam team)
-{
- QList<HWTeam>::iterator itDontPlay=std::find(m_curNotPlayingTeams.begin(), m_curNotPlayingTeams.end(), team);
- QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
-
- bool willBePlaying=itDontPlay!=m_curNotPlayingTeams.end();
-
- if(!willBePlaying) {
- // playing team => dont playing
- m_curNotPlayingTeams.push_back(*itPlay);
- emit teamNotPlaying(*itPlay);
- curPlayingTeams.erase(itPlay);
- } else {
- // return if max playing teams reached
- if(framePlaying->isFullTeams()) return;
- // dont playing team => playing
- team=*itDontPlay; // for net team info saving in framePlaying (we have only name with netID from network)
- itDontPlay->teamColor=framePlaying->getNextColor();
- curPlayingTeams.push_back(*itDontPlay);
- if(!m_acceptOuter) emit teamWillPlay(*itDontPlay);
- m_curNotPlayingTeams.erase(itDontPlay);
- }
-
- FrameTeams* pRemoveTeams;
- FrameTeams* pAddTeams;
- if(!willBePlaying) {
- pRemoveTeams=framePlaying;
- pAddTeams=frameDontPlaying;
- } else {
- pRemoveTeams=frameDontPlaying;
- pAddTeams=framePlaying;
- }
-
- pAddTeams->addTeam(team, willBePlaying);
- pRemoveTeams->removeTeam(team);
- if(!team.isNetTeam() && m_acceptOuter && !willBePlaying) {
- connect(frameDontPlaying->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)),
- this, SLOT(pre_changeTeamStatus(HWTeam)));
- } else {
- connect(pAddTeams->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)),
- this, SLOT(changeTeamStatus(HWTeam)));
- }
- if(willBePlaying) {
- connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)),
- this, SLOT(hhNumChanged(const HWTeam&)));
- dynamic_cast<TeamShowWidget*>(framePlaying->getTeamWidget(team))->hhNumChanged();
- connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)),
- this, SLOT(proxyTeamColorChanged(const HWTeam&)));
- emit teamColorChanged(((TeamShowWidget*)framePlaying->getTeamWidget(team))->getTeam());
- }
-
- QSize szh=pAddTeams->sizeHint();
- QSize szh1=pRemoveTeams->sizeHint();
- if(szh.isValid() && szh1.isValid()) {
- pAddTeams->resize(pAddTeams->size().width(), szh.height());
- pRemoveTeams->resize(pRemoveTeams->size().width(), szh1.height());
- }
-
- emit setEnabledGameStart(curPlayingTeams.size()>1);
-}
-
-void TeamSelWidget::addScrArea(FrameTeams* pfteams, QColor color, int fixedHeight)
-{
- VertScrArea* area = new VertScrArea(color);
- area->setWidget(pfteams);
- mainLayout.addWidget(area, 30);
- if (fixedHeight > 0)
- {
- area->setMinimumHeight(fixedHeight);
- area->setMaximumHeight(fixedHeight);
- area->setStyleSheet(
- "FrameTeams{"
- "border: solid;"
- "border-width: 1px;"
- "border-radius: 16px;"
- "border-color: #ffcc00;"
- "}"
- );
- }
-}
-
-TeamSelWidget::TeamSelWidget(QWidget* parent) :
- QGroupBox(parent), mainLayout(this), m_acceptOuter(false)
-{
- setTitle(QGroupBox::tr("Playing teams"));
- framePlaying = new FrameTeams();
- frameDontPlaying = new FrameTeams();
-
- QPalette p;
- p.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
- addScrArea(framePlaying, p.color(QPalette::Window).light(105), 250);
- addScrArea(frameDontPlaying, p.color(QPalette::Window).dark(105), 0);
-}
-
-void TeamSelWidget::setAcceptOuter(bool acceptOuter)
-{
- m_acceptOuter=acceptOuter;
-}
-
-void TeamSelWidget::resetPlayingTeams(const QList<HWTeam>& teamslist)
-{
- //for(it=curPlayingTeams.begin(); it!=curPlayingTeams.end(); it++) {
- //framePlaying->removeTeam(*it);
- //}
- framePlaying->resetTeams();
- framePlaying->resetColors();
- curPlayingTeams.clear();
- //for(it=curDontPlayingTeams.begin(); it!=curDontPlayingTeams.end(); it++) {
- //frameDontPlaying->removeTeam(*it);
- //}
- frameDontPlaying->resetTeams();
- m_curNotPlayingTeams.clear();
-
- foreach(HWTeam team, teamslist)
- addTeam(team);
-}
-
-bool TeamSelWidget::isPlaying(HWTeam team) const
-{
- return std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team)!=curPlayingTeams.end();
-}
-
-QList<HWTeam> TeamSelWidget::getPlayingTeams() const
-{
- return curPlayingTeams;
-}
-
-QList<HWTeam> TeamSelWidget::getNotPlayingTeams() const
-{
- return m_curNotPlayingTeams;
-}
-
-void TeamSelWidget::pre_changeTeamStatus(HWTeam team)
-{
- team.teamColor=framePlaying->getNextColor();
- emit acceptRequested(team);
-}
--- a/QTfrontend/teamselect.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _TEAM_SELECT_INCLUDED
-#define _TEAM_SELECT_INCLUDED
-
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QColor>
-#include <QMultiMap>
-
-#include "team.h"
-
-class TeamSelWidget;
-class FrameTeams;
-class QFrame;
-class QPushButton;
-
-using namespace std;
-
-class TeamSelWidget : public QGroupBox
-{
- Q_OBJECT
-
- public:
- TeamSelWidget(QWidget* parent);
- void setAcceptOuter(bool acceptOuter);
- void removeNetTeam(const HWTeam& team);
- void resetPlayingTeams(const QList<HWTeam>& teamslist);
- bool isPlaying(HWTeam team) const;
- QList<HWTeam> getPlayingTeams() const;
- QList<HWTeam> getNotPlayingTeams() const;
- void setInteractivity(bool interactive);
-
- public slots:
- void addTeam(HWTeam team);
- void netTeamStatusChanged(const HWTeam& team);
- void changeHHNum(const HWTeam&);
- void changeTeamColor(const HWTeam&);
- void changeTeamStatus(HWTeam team);
-
- signals:
- void setEnabledGameStart(bool);
- void teamWillPlay(HWTeam team);
- void teamNotPlaying(const HWTeam& team);
- void hhogsNumChanged(const HWTeam&);
- void teamColorChanged(const HWTeam&);
- void acceptRequested(HWTeam team);
-
- private slots:
- void pre_changeTeamStatus(HWTeam);
- void hhNumChanged(const HWTeam& team);
- void proxyTeamColorChanged(const HWTeam& team);
-
- private:
- void addScrArea(FrameTeams* pfteams, QColor color, int maxHeight);
- FrameTeams* frameDontPlaying;
- FrameTeams* framePlaying;
-
- QVBoxLayout mainLayout;
- bool m_acceptOuter;
-
- QList<HWTeam> curPlayingTeams;
- QList<HWTeam> m_curNotPlayingTeams;
-};
-
-#endif // _TEAM_SELECT_INCLUDED
--- a/QTfrontend/teamselhelper.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <QPixmap>
-#include <QPainter>
-#include <QStyleFactory>
-
-#include <algorithm>
-
-#include "teamselhelper.h"
-#include "hwconsts.h"
-#include "frameTeam.h"
-
-void TeamLabel::teamButtonClicked()
-{
- emit teamActivated(text());
-}
-
-TeamShowWidget::TeamShowWidget(HWTeam team, bool isPlaying, QWidget * parent) :
- QWidget(parent), mainLayout(this), m_team(team), m_isPlaying(isPlaying), phhoger(0),
- colorButt(0)
-{
- QPalette newPalette = palette();
- newPalette.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
- setPalette(newPalette);
- setAutoFillBackground(true);
-
- mainLayout.setSpacing(3);
- mainLayout.setMargin(0);
- this->setMaximumHeight(38);
- this->setMinimumHeight(38);
- QIcon difficultyIcon=team.isNetTeam() ?
- QIcon(QString(":/res/botlevels/net%1.png").arg(m_team.difficulty))
- : QIcon(QString(":/res/botlevels/%1.png").arg(m_team.difficulty));
-
- butt = new QPushButton(difficultyIcon, team.TeamName.replace("&","&&"), this);
- butt->setFlat(true);
- butt->setToolTip(team.Owner);
- mainLayout.addWidget(butt);
- butt->setStyleSheet("QPushButton{"
- "icon-size: 48px;"
- "text-align: left;"
- "background-color: #0d0544;"
- "color: orange;"
- "font: bold;"
- "border-width: 2px;"
- "margin: 6px 0px 6px 0px;"
- "}");
-
- if(m_isPlaying) {
- // team color
- colorButt = new QPushButton(this);
- colorButt->setMaximumWidth(26);
- colorButt->setMinimumHeight(26);
- colorButt->setGeometry(0, 0, 26, 26);
-
- changeTeamColor();
- connect(colorButt, SIGNAL(clicked()), this, SLOT(changeTeamColor()));
- mainLayout.addWidget(colorButt);
-
- phhoger = new CHedgehogerWidget(QImage(":/res/hh25x25.png"), QImage(":/res/hh25x25grey.png"), this);
- connect(phhoger, SIGNAL(hedgehogsNumChanged()), this, SLOT(hhNumChanged()));
- phhoger->setHHNum(team.numHedgehogs);
- mainLayout.addWidget(phhoger);
- } else {
- }
-
- QObject::connect(butt, SIGNAL(clicked()), this, SLOT(activateTeam()));
- //QObject::connect(bText, SIGNAL(clicked()), this, SLOT(activateTeam()));
-}
-
-void TeamShowWidget::setInteractivity(bool interactive)
-{
- if(m_team.isNetTeam()) {
- butt->setEnabled(interactive);
- }
-
- colorButt->setEnabled(interactive);
- phhoger->setEnabled(interactive);
-}
-
-void TeamShowWidget::setHHNum(unsigned int num)
-{
- phhoger->setHHNum(num);
-}
-
-void TeamShowWidget::hhNumChanged()
-{
- m_team.numHedgehogs=phhoger->getHedgehogsNum();
- emit hhNmChanged(m_team);
-}
-
-void TeamShowWidget::activateTeam()
-{
- emit teamStatusChanged(m_team);
-}
-
-/*HWTeamTempParams TeamShowWidget::getTeamParams() const
-{
- if(!phhoger) throw;
- HWTeamTempParams params;
- params.numHedgehogs=phhoger->getHedgehogsNum();
- params.teamColor=colorButt->palette().color(QPalette::Button);
- return params;
-}*/
-
-void TeamShowWidget::changeTeamColor(QColor color)
-{
- FrameTeams* pOurFrameTeams=dynamic_cast<FrameTeams*>(parentWidget());
- if(!color.isValid()) {
- if(++pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) {
- pOurFrameTeams->currentColor=pOurFrameTeams->availableColors.begin();
- }
- color=*pOurFrameTeams->currentColor;
- } else {
- // set according color iterator
- pOurFrameTeams->currentColor=std::find(pOurFrameTeams->availableColors.begin(),
- pOurFrameTeams->availableColors.end(), color);
- if(pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) {
- // error condition
- pOurFrameTeams->currentColor=pOurFrameTeams->availableColors.begin();
- }
- }
-
- colorButt->setStyleSheet(QString("QPushButton{"
- "background-color: %1;"
- "border-width: 1px;"
- "border-radius: 2px;"
- "}").arg(pOurFrameTeams->currentColor->name()));
-
- m_team.teamColor=color;
- emit teamColorChanged(m_team);
-}
-
-HWTeam TeamShowWidget::getTeam() const
-{
- return m_team;
-}
--- a/QTfrontend/teamselhelper.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _TEAMSEL_HELPER_INCLUDED
-#define _TEAMSEL_HELPER_INCLUDED
-
-#include <QLabel>
-#include <QWidget>
-#include <QString>
-#include <QPushButton>
-
-#include "teamselect.h"
-#include "hedgehogerWidget.h"
-
-class TeamLabel : public QLabel
-{
- Q_OBJECT
-
- public:
- TeamLabel(const QString& inp_str) : QLabel(inp_str) {};
-
- signals:
- void teamActivated(QString team_name);
-
- public slots:
- void teamButtonClicked();
-
-};
-
-class TeamShowWidget : public QWidget
-{
- Q_OBJECT
-
- public slots:
- void changeTeamColor(QColor color=QColor());
- void hhNumChanged();
-
- private slots:
- void activateTeam();
-
- public:
- TeamShowWidget(HWTeam team, bool isPlaying, QWidget * parent);
- void setPlaying(bool isPlaying);
- void setHHNum(unsigned int num);
- void setInteractivity(bool interactive);
- HWTeam getTeam() const;
-
- private:
- TeamShowWidget();
- QHBoxLayout mainLayout;
- HWTeam m_team;
- bool m_isPlaying;
- CHedgehogerWidget* phhoger;
- QPushButton* colorButt;
- QPushButton* butt;
-// QPushButton* bText;
-
- signals:
- void teamStatusChanged(HWTeam team);
- void hhNmChanged(const HWTeam&);
- void teamColorChanged(const HWTeam&);
-};
-
-#endif // _TEAMSEL_HELPER_INCLUDED
--- a/QTfrontend/themesmodel.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-
-#include "themesmodel.h"
-
-ThemesModel::ThemesModel(QStringList themes, QObject *parent) :
- QAbstractListModel(parent)
-{
-#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
- m_data.reserve(themes.size());
-#endif
-
- foreach(QString theme, themes)
- {
- m_data.append(QHash<int, QVariant>());
- m_data.last().insert(Qt::DisplayRole, theme);
- }
-}
-
-int ThemesModel::rowCount(const QModelIndex &parent) const
-{
- if(parent.isValid())
- return 0;
- else
- return m_data.size();
-}
-
-QVariant ThemesModel::data(const QModelIndex &index, int role) const
-{
- if(index.column() > 0 || index.row() >= m_data.size())
- return QVariant();
- else
- return m_data.at(index.row()).value(role);
-}
-
-bool ThemesModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
- if(index.column() > 0 || index.row() >= m_data.size())
- return false;
- else
- {
- m_data[index.row()].insert(role, value);
-
- return true;
- }
-
-}
-
-
-
-
--- a/QTfrontend/themesmodel.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#ifndef THEMESMODEL_H
-#define THEMESMODEL_H
-
-#include <QAbstractListModel>
-#include <QStringList>
-#include <QHash>
-
-class ThemesModel : public QAbstractListModel
-{
- Q_OBJECT
-public:
- explicit ThemesModel(QStringList themes, QObject *parent = 0);
-
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- QVariant data(const QModelIndex &index, int role) const;
- bool setData(const QModelIndex &index, const QVariant &value,
- int role = Qt::EditRole);
-
-signals:
-
-public slots:
-
-private:
-
- QList<QHash<int, QVariant> > m_data;
-};
-
-#endif // THEMESMODEL_H
--- a/QTfrontend/togglebutton.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2009 Kristian Lehmann <email@thexception.net>
- * Copyright (c) 2009-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "togglebutton.h"
-
-ToggleButtonWidget::ToggleButtonWidget(QWidget * parent, QString img)
- : QPushButton(parent)
-{
- setCheckable(true);
-
- QPixmap pm(":/res/btnDisabled.png");
- QPainter * painter = new QPainter();
-
- pmChecked.load(img);
- pmDisabled.load(img);
-
- setMaximumWidth(pmChecked.width() + 6);
-
- painter->begin(&pmDisabled);
- painter->drawPixmap(pmDisabled.rect(), pm);
- painter->end();
-
- setIconSize(pmDisabled.size());
- setIcon(pmDisabled);
-
- connect(this, SIGNAL(toggled(bool)), this, SLOT(eventToggled(bool)));
-}
-
-ToggleButtonWidget::~ToggleButtonWidget()
-{
-}
-
-void ToggleButtonWidget::eventToggled(bool checked)
-{
- setIcon(checked ? pmChecked : pmDisabled);
-}
--- a/QTfrontend/togglebutton.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2009 Kristian Lehmann <email@thexception.net>
- * Copyright (c) 2009-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef TOGGLEBUTTONWIDGET_H
-#define TOGGLEBUTTONWIDGET_H
-
-#include <QWidget>
-#include <QPainter>
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QLabel>
-
-class ToggleButtonWidget : public QPushButton
-{
- Q_OBJECT
-public:
- ToggleButtonWidget(QWidget * parent, QString img);
- ~ToggleButtonWidget();
-private:
- QPixmap pmChecked;
- QPixmap pmDisabled;
-private slots:
- void eventToggled(bool checked);
-};
-
-#endif // TOGGLEBUTTONWIDGET_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/dialog/input_ip.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,68 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QLineEdit>
+#include <QSpinBox>
+#include <QPushButton>
+#include <QGridLayout>
+#include <QLabel>
+
+#include "input_ip.h"
+
+HWHostPortDialog::HWHostPortDialog(QWidget* parent) : QDialog(parent)
+{
+ QGridLayout * layout = new QGridLayout(this);
+
+ QLabel * lbHost = new QLabel(this);
+ lbHost->setText(QLabel::tr("Host:"));
+ layout->addWidget(lbHost, 0, 0);
+
+ QLabel * lbPort = new QLabel(this);
+ lbPort->setText(QLabel::tr("Port:"));
+ layout->addWidget(lbPort, 1, 0);
+
+ leHost = new QLineEdit(this);
+ layout->addWidget(leHost, 0, 1, 1, 2);
+
+ sbPort = new QSpinBox(this);
+ sbPort->setMinimum(0);
+ sbPort->setMaximum(65535);
+ layout->addWidget(sbPort, 1, 1, 1, 2);
+
+ pbDefault = new QPushButton(this);
+ pbDefault->setText(QPushButton::tr("default"));
+ layout->addWidget(pbDefault, 1, 3);
+
+ pbOK = new QPushButton(this);
+ pbOK->setText(QPushButton::tr("OK"));
+ pbOK->setDefault(true);
+ layout->addWidget(pbOK, 3, 1);
+
+ pbCancel = new QPushButton(this);
+ pbCancel->setText(QPushButton::tr("Cancel"));
+ layout->addWidget(pbCancel, 3, 2);
+
+ connect(pbOK, SIGNAL(clicked()), this, SLOT(accept()));
+ connect(pbCancel, SIGNAL(clicked()), this, SLOT(reject()));
+ connect(pbDefault, SIGNAL(clicked()), this, SLOT(setDefaultPort()));
+}
+
+void HWHostPortDialog::setDefaultPort()
+{
+ sbPort->setValue(46631);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/dialog/input_ip.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,49 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+
+#ifndef INPUT_IP_H
+#define INPUT_IP_H
+
+#include <QDialog>
+#include <QHostAddress>
+
+class QLineEdit;
+class QSpinBox;
+class QPushButton;
+
+class HWHostPortDialog : public QDialog
+{
+ Q_OBJECT
+public:
+ HWHostPortDialog(QWidget* parent = 0);
+
+ QLineEdit* leHost;
+ QSpinBox* sbPort;
+
+private:
+ QPushButton* pbOK;
+ QPushButton* pbCancel;
+ QPushButton * pbDefault;
+
+private slots:
+ void setDefaultPort();
+};
+
+
+#endif // INPUT_IP_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageadmin.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,112 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QSpinBox>
+#include <QPushButton>
+#include <QTextBrowser>
+
+#include "pageadmin.h"
+#include "chatwidget.h"
+
+QLayout * PageAdmin::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+
+ // 0
+ pbAsk = addButton(tr("Fetch data"), pageLayout, 0, 0, 1, 3);
+
+ // 1
+ QLabel * lblSMN = new QLabel(this);
+ lblSMN->setText(tr("Server message for latest version:"));
+ pageLayout->addWidget(lblSMN, 1, 0);
+
+ leServerMessageNew = new QLineEdit(this);
+ pageLayout->addWidget(leServerMessageNew, 1, 1);
+
+ // 2
+ QLabel * lblSMO = new QLabel(this);
+ lblSMO->setText(tr("Server message for previous versions:"));
+ pageLayout->addWidget(lblSMO, 2, 0);
+
+ leServerMessageOld = new QLineEdit(this);
+ pageLayout->addWidget(leServerMessageOld, 2, 1);
+
+ // 3
+ QLabel * lblP = new QLabel(this);
+ lblP->setText(tr("Latest version protocol number:"));
+ pageLayout->addWidget(lblP, 3, 0);
+
+ sbProtocol = new QSpinBox(this);
+ pageLayout->addWidget(sbProtocol, 3, 1);
+
+ // 4
+ QLabel * lblPreview = new QLabel(this);
+ lblPreview->setText(tr("MOTD preview:"));
+ pageLayout->addWidget(lblPreview, 4, 0);
+
+ tb = new QTextBrowser(this);
+ tb->setOpenExternalLinks(true);
+ tb->document()->setDefaultStyleSheet(HWChatWidget::STYLE);
+ pageLayout->addWidget(tb, 4, 1, 1, 2);
+
+ // 5
+ pbClearAccountsCache = addButton(tr("Clear Accounts Cache"), pageLayout, 5, 0);
+
+ // 6
+ pbSetSM = addButton(tr("Set data"), pageLayout, 6, 0, 1, 3);
+
+ return pageLayout;
+}
+
+void PageAdmin::connectSignals()
+{
+ connect(pbAsk, SIGNAL(clicked()), this, SIGNAL(askServerVars()));
+ connect(leServerMessageNew, SIGNAL(textEdited(const QString &)), tb, SLOT(setHtml(const QString &)));
+ connect(leServerMessageOld, SIGNAL(textEdited(const QString &)), tb, SLOT(setHtml(const QString &)));
+ connect(pbClearAccountsCache, SIGNAL(clicked()), this, SIGNAL(clearAccountsCache()));
+ connect(pbSetSM, SIGNAL(clicked()), this, SLOT(smChanged()));
+}
+
+PageAdmin::PageAdmin(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
+
+void PageAdmin::smChanged()
+{
+ emit setServerMessageNew(leServerMessageNew->text());
+ emit setServerMessageOld(leServerMessageOld->text());
+ emit setProtocol(sbProtocol->value());
+}
+
+void PageAdmin::serverMessageNew(const QString & str)
+{
+ leServerMessageNew->setText(str);
+}
+
+void PageAdmin::serverMessageOld(const QString & str)
+{
+ leServerMessageOld->setText(str);
+}
+void PageAdmin::protocol(int proto)
+{
+ sbProtocol->setValue(proto);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageadmin.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,60 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_ADMIN_H
+#define PAGE_ADMIN_H
+
+#include "AbstractPage.h"
+
+class PageAdmin : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageAdmin(QWidget* parent = 0);
+
+public slots:
+ void serverMessageNew(const QString & str);
+ void serverMessageOld(const QString & str);
+ void protocol(int proto);
+
+signals:
+ void setServerMessageNew(const QString & str);
+ void setServerMessageOld(const QString & str);
+ void setProtocol(int proto);
+ void askServerVars();
+ void clearAccountsCache();
+
+protected:
+ QLayout * bodyLayoutDefinition();
+ void connectSignals();
+
+private:
+ QLineEdit * leServerMessageNew;
+ QLineEdit * leServerMessageOld;
+ QPushButton * pbSetSM;
+ QPushButton * pbAsk;
+ QSpinBox * sbProtocol;
+ QTextBrowser * tb;
+ QPushButton * pbClearAccountsCache;
+
+private slots:
+ void smChanged();
+};
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagecampaign.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,53 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QPushButton>
+#include <QComboBox>
+
+#include "pagecampaign.h"
+
+QLayout * PageCampaign::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+ pageLayout->setColumnStretch(0, 1);
+ pageLayout->setColumnStretch(1, 2);
+ pageLayout->setColumnStretch(2, 1);
+ pageLayout->setRowStretch(0, 1);
+ pageLayout->setRowStretch(3, 1);
+
+ CBSelect = new QComboBox(this);
+ CBTeam = new QComboBox(this);
+
+ pageLayout->addWidget(CBTeam, 1, 1);
+ pageLayout->addWidget(CBSelect, 2, 1);
+
+ BtnStartCampaign = new QPushButton(this);
+ BtnStartCampaign->setFont(*font14);
+ BtnStartCampaign->setText(QPushButton::tr("Go!"));
+ pageLayout->addWidget(BtnStartCampaign, 2, 2);
+
+ return pageLayout;
+}
+
+PageCampaign::PageCampaign(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagecampaign.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,39 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_CAMPAIGN_H
+#define PAGE_CAMPAIGN_H
+
+#include "AbstractPage.h"
+
+class PageCampaign : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageCampaign(QWidget* parent = 0);
+
+ QPushButton *BtnStartCampaign;
+ QComboBox *CBSelect;
+ QComboBox *CBTeam;
+
+protected:
+ QLayout * bodyLayoutDefinition();
+};
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageconnecting.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,43 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QVBoxLayout>
+#include <QLabel>
+
+#include "pageconnecting.h"
+
+QLayout * PageConnecting::bodyLayoutDefinition()
+{
+ QVBoxLayout * pageLayout = new QVBoxLayout();
+
+ QLabel * lblConnecting = new QLabel(this);
+ lblConnecting->setText(tr("Connecting..."));
+ pageLayout->addWidget(lblConnecting);
+
+ return pageLayout;
+}
+
+void PageConnecting::connectSignals()
+{
+ connect(this, SIGNAL(goBack()), this, SIGNAL(cancelConnection()));
+}
+
+PageConnecting::PageConnecting(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageconnecting.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,39 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_CONNECTING_H
+#define PAGE_CONNECTING_H
+
+#include "AbstractPage.h"
+
+class PageConnecting : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageConnecting(QWidget* parent = 0);
+
+signals:
+ void cancelConnection();
+
+protected:
+ QLayout * bodyLayoutDefinition();
+ void connectSignals();
+};
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagedata.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,229 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QPushButton>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QFileInfo>
+#include <QFileDialog>
+#include <QDebug>
+#include <QProgressBar>
+#include <QBuffer>
+
+#include "pagedata.h"
+#include "databrowser.h"
+#include "hwconsts.h"
+
+#include "quazip.h"
+#include "quazipfile.h"
+
+QLayout * PageDataDownload::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+ pageLayout->setColumnStretch(0, 1);
+ pageLayout->setColumnStretch(1, 1);
+ pageLayout->setColumnStretch(2, 1);
+
+ web = new DataBrowser(this);
+ pageLayout->addWidget(web, 0, 0, 1, 3);
+
+ progressBarsLayout = new QVBoxLayout();
+ pageLayout->addLayout(progressBarsLayout, 1, 0, 1, 3);
+ return pageLayout;
+}
+
+void PageDataDownload::connectSignals()
+{
+ connect(web, SIGNAL(anchorClicked(QUrl)), this, SLOT(request(const QUrl&)));
+}
+
+PageDataDownload::PageDataDownload(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+
+ web->setOpenLinks(false);
+ fetchList();
+}
+
+void PageDataDownload::request(const QUrl &url)
+{
+ QUrl finalUrl;
+ if(url.host().isEmpty())
+ finalUrl = QUrl("http://www.hedgewars.org" + url.path());
+ else
+ finalUrl = url;
+
+ if(url.path().endsWith(".zip"))
+ {
+ qWarning() << "Download Request" << url.toString();
+ QString fileName = QFileInfo(url.toString()).fileName();
+
+ QNetworkRequest newRequest(finalUrl);
+ newRequest.setAttribute(QNetworkRequest::User, fileName);
+
+ QNetworkAccessManager *manager = new QNetworkAccessManager(this);
+ QNetworkReply *reply = manager->get(newRequest);
+ connect(reply, SIGNAL(finished()), this, SLOT(fileDownloaded()));
+ connect(reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(downloadProgress(qint64, qint64)));
+
+ QProgressBar *progressBar = new QProgressBar(this);
+ progressBarsLayout->addWidget(progressBar);
+ progressBars.insert(reply, progressBar);
+ } else
+ {
+ qWarning() << "Page Request" << url.toString();
+
+ QNetworkRequest newRequest(finalUrl);
+
+ QNetworkAccessManager *manager = new QNetworkAccessManager(this);
+ QNetworkReply *reply = manager->get(newRequest);
+ connect(reply, SIGNAL(finished()), this, SLOT(pageDownloaded()));
+ }
+}
+
+
+void PageDataDownload::pageDownloaded()
+{
+ QNetworkReply * reply = qobject_cast<QNetworkReply *>(sender());
+
+ if(reply)
+ {
+ QString html = QString::fromUtf8(reply->readAll());
+ int begin = html.indexOf("<!-- BEGIN -->");
+ int end = html.indexOf("<!-- END -->");
+ if(begin != -1 && begin < end)
+ {
+ html.truncate(end);
+ html.remove(0, begin);
+ }
+ web->setHtml(html);
+ }
+}
+
+void PageDataDownload::fileDownloaded()
+{
+ QNetworkReply * reply = qobject_cast<QNetworkReply *>(sender());
+
+ if(reply)
+ {
+ QByteArray fileContents = reply->readAll();
+ QProgressBar *progressBar = progressBars.value(reply, 0);
+
+ if(progressBar)
+ {
+ progressBars.remove(reply);
+ progressBar->deleteLater();
+ }
+
+ extractDataPack(&fileContents);
+ }
+}
+
+void PageDataDownload::downloadProgress(qint64 bytesRecieved, qint64 bytesTotal)
+{
+ QNetworkReply * reply = qobject_cast<QNetworkReply *>(sender());
+
+ if(reply)
+ {
+ QProgressBar *progressBar = progressBars.value(reply, 0);
+
+ if(progressBar)
+ {
+ progressBar->setValue(bytesRecieved);
+ progressBar->setMaximum(bytesTotal);
+ }
+ }
+}
+
+void PageDataDownload::fetchList()
+{
+ request(QUrl("http://hedgewars.org/content.html"));
+}
+
+bool PageDataDownload::extractDataPack(QByteArray * buf)
+{
+ QBuffer buffer;
+ buffer.setBuffer(buf);
+
+ QuaZip zip;
+ zip.setIoDevice(&buffer);
+ if(!zip.open(QuaZip::mdUnzip))
+ {
+ qWarning("testRead(): zip.open(): %d", zip.getZipError());
+ return false;
+ }
+
+ QuaZipFile file(&zip);
+
+ QDir extractDir(*cfgdir);
+ extractDir.cd("Data");
+
+ for(bool more = zip.goToFirstFile(); more; more = zip.goToNextFile())
+ {
+ if(!file.open(QIODevice::ReadOnly))
+ {
+ qWarning("file.open(): %d", file.getZipError());
+ return false;
+ }
+
+
+ QString fileName = file.getActualFileName();
+ QString filePath = extractDir.filePath(fileName);
+ if (fileName.endsWith("/"))
+ {
+ QFileInfo fi(filePath);
+ QDir().mkpath(fi.filePath());
+ } else
+ {
+ qDebug() << "Extracting" << filePath;
+ QFile out(filePath);
+ if(!out.open(QFile::WriteOnly))
+ {
+ qWarning() << "out.open():" << out.errorString();
+ return false;
+ }
+
+ out.write(file.readAll());
+
+ out.close();
+
+ if(file.getZipError() != UNZ_OK) {
+ qWarning("file.getFileName(): %d", file.getZipError());
+ return false;
+ }
+
+ if(!file.atEnd()) {
+ qWarning("read all but not EOF");
+ return false;
+ }
+ }
+
+ file.close();
+
+ if(file.getZipError()!=UNZ_OK) {
+ qWarning("file.close(): %d", file.getZipError());
+ return false;
+ }
+ }
+
+ zip.close();
+
+ return true;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagedata.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,59 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_DATA_H
+#define PAGE_DATA_H
+
+#include <QUrl>
+#include "AbstractPage.h"
+
+class DataBrowser;
+class QProgressBar;
+class QNetworkReply;
+class QVBoxLayout;
+
+class PageDataDownload : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageDataDownload(QWidget* parent = 0);
+
+public slots:
+ void fetchList();
+
+protected:
+ QLayout * bodyLayoutDefinition();
+ void connectSignals();
+
+private:
+ DataBrowser *web;
+ QHash<QNetworkReply*, QProgressBar *> progressBars;
+ QVBoxLayout *progressBarsLayout;
+
+ bool extractDataPack(QByteArray * buf);
+
+private slots:
+ void request(const QUrl &url);
+
+ void pageDownloaded();
+ void fileDownloaded();
+ void downloadProgress(qint64, qint64);
+};
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagedrawmap.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,69 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QPushButton>
+#include <QFileDialog>
+
+#include "pagedrawmap.h"
+#include "drawmapwidget.h"
+
+
+QLayout * PageDrawMap::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+
+ pbUndo = addButton(tr("Undo"), pageLayout, 0, 0);
+ pbClear = addButton(tr("Clear"), pageLayout, 1, 0);
+ pbLoad = addButton(tr("Load"), pageLayout, 2, 0);
+ pbSave = addButton(tr("Save"), pageLayout, 3, 0);
+
+ drawMapWidget = new DrawMapWidget(this);
+ pageLayout->addWidget(drawMapWidget, 0, 1, 5, 1);
+
+ return pageLayout;
+}
+
+void PageDrawMap::connectSignals()
+{
+ connect(pbUndo, SIGNAL(clicked()), drawMapWidget, SLOT(undo()));
+ connect(pbClear, SIGNAL(clicked()), drawMapWidget, SLOT(clear()));
+ connect(pbLoad, SIGNAL(clicked()), this, SLOT(load()));
+ connect(pbSave, SIGNAL(clicked()), this, SLOT(save()));
+}
+
+PageDrawMap::PageDrawMap(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
+
+void PageDrawMap::load()
+{
+ QString fileName = QFileDialog::getOpenFileName(NULL, tr("Load drawn map"), ".", tr("Drawn Maps") + " (*.hwmap);;" + tr("All files") + " (*)");
+
+ if(!fileName.isEmpty())
+ drawMapWidget->load(fileName);
+}
+
+void PageDrawMap::save()
+{
+ QString fileName = QFileDialog::getSaveFileName(NULL, tr("Save drawn map"), ".", tr("Drawn Maps") + " (*.hwmap);;" + tr("All files") + " (*)");
+
+ if(!fileName.isEmpty())
+ drawMapWidget->save(fileName);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagedrawmap.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,51 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_DRAWMAP_H
+#define PAGE_DRAWMAP_H
+
+#include "AbstractPage.h"
+
+class DrawMapWidget;
+
+class PageDrawMap : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageDrawMap(QWidget* parent = 0);
+
+ DrawMapWidget * drawMapWidget;
+
+protected:
+ QLayout * bodyLayoutDefinition();
+ void connectSignals();
+
+private:
+ QPushButton * pbUndo;
+ QPushButton * pbClear;
+ QPushButton * pbLoad;
+ QPushButton * pbSave;
+
+private slots:
+ void load();
+ void save();
+};
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageeditteam.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,523 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QTabWidget>
+#include <QGroupBox>
+#include <QToolBox>
+#include <QMessageBox>
+
+#include "pageeditteam.h"
+#include "sdlkeys.h"
+#include "SquareLabel.h"
+#include "hats.h"
+#include "HWApplication.h"
+
+QLayout * PageEditTeam::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+ QTabWidget * tbw = new QTabWidget();
+ QWidget * page1 = new QWidget(this);
+ QWidget * page2 = new QWidget(this);
+ tbw->addTab(page1, tr("General"));
+ tbw->addTab(page2, tr("Advanced"));
+ pageLayout->addWidget(tbw, 0, 0, 1, 3);
+
+ QHBoxLayout * page1Layout = new QHBoxLayout(page1);
+ page1Layout->setAlignment(Qt::AlignTop);
+ QGridLayout * page2Layout = new QGridLayout(page2);
+
+// ====== Page 1 ======
+ QVBoxLayout * vbox1 = new QVBoxLayout();
+ QVBoxLayout * vbox2 = new QVBoxLayout();
+ page1Layout->addLayout(vbox1);
+ page1Layout->addLayout(vbox2);
+
+ GBoxHedgehogs = new QGroupBox(this);
+ GBoxHedgehogs->setTitle(QGroupBox::tr("Team Members"));
+ GBoxHedgehogs->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ QGridLayout * GBHLayout = new QGridLayout(GBoxHedgehogs);
+
+ HatsModel * hatsModel = new HatsModel(GBoxHedgehogs);
+ for(int i = 0; i < HEDGEHOGS_PER_TEAM; i++)
+ {
+ HHHats[i] = new QComboBox(GBoxHedgehogs);
+ HHHats[i]->setModel(hatsModel);
+ HHHats[i]->setIconSize(QSize(32, 37));
+ //HHHats[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+ //HHHats[i]->setModelColumn(1);
+ //HHHats[i]->setMinimumWidth(132);
+ GBHLayout->addWidget(HHHats[i], i, 0);
+
+ HHNameEdit[i] = new QLineEdit(GBoxHedgehogs);
+ HHNameEdit[i]->setMaxLength(64);
+ HHNameEdit[i]->setMinimumWidth(120);
+ GBHLayout->addWidget(HHNameEdit[i], i, 1);
+
+ btnRandomHogName[i] = addButton(":/res/dice.png", GBHLayout, i, 3, true);
+ }
+
+ btnRandomTeam = addButton(QPushButton::tr("Random Team"), GBHLayout, 9, false);
+
+ vbox1->addWidget(GBoxHedgehogs);
+
+ GBoxTeam = new QGroupBox(this);
+ GBoxTeam->setTitle(QGroupBox::tr("Team Settings"));
+ GBoxTeam->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ QGridLayout * GBTLayout = new QGridLayout(GBoxTeam);
+ QLabel * tmpLabel = new QLabel(GBoxTeam);
+ tmpLabel->setText(QLabel::tr("Name"));
+ GBTLayout->addWidget(tmpLabel, 0, 0);
+ tmpLabel = new QLabel(GBoxTeam);
+ tmpLabel->setText(QLabel::tr("Type"));
+ GBTLayout->addWidget(tmpLabel, 1, 0);
+ tmpLabel = new QLabel(GBoxTeam);
+ tmpLabel->setText(QLabel::tr("Grave"));
+ GBTLayout->addWidget(tmpLabel, 2, 0);
+ tmpLabel = new QLabel(GBoxTeam);
+ tmpLabel->setText(QLabel::tr("Flag"));
+ GBTLayout->addWidget(tmpLabel, 3, 0);
+ tmpLabel = new QLabel(GBoxTeam);
+ tmpLabel->setText(QLabel::tr("Voice"));
+ GBTLayout->addWidget(tmpLabel, 4, 0);
+
+ TeamNameEdit = new QLineEdit(GBoxTeam);
+ TeamNameEdit->setMaxLength(64);
+ GBTLayout->addWidget(TeamNameEdit, 0, 1);
+ vbox2->addWidget(GBoxTeam);
+
+ CBTeamLvl = new QComboBox(GBoxTeam);
+ CBTeamLvl->setIconSize(QSize(48, 48));
+ CBTeamLvl->addItem(QIcon(":/res/botlevels/0.png"), QComboBox::tr("Human"));
+ for(int i = 5; i > 0; i--)
+ CBTeamLvl->addItem(
+ QIcon(QString(":/res/botlevels/%1.png").arg(6 - i)),
+ QString("%1 %2").arg(QComboBox::tr("Level")).arg(i)
+ );
+ GBTLayout->addWidget(CBTeamLvl, 1, 1);
+
+ CBGrave = new QComboBox(GBoxTeam);
+ CBGrave->setMaxCount(65535);
+ CBGrave->setIconSize(QSize(32, 32));
+ GBTLayout->addWidget(CBGrave, 2, 1);
+
+ CBFlag = new QComboBox(GBoxTeam);
+ CBFlag->setMaxCount(65535);
+ CBFlag->setIconSize(QSize(22, 15));
+ GBTLayout->addWidget(CBFlag, 3, 1);
+
+ QHBoxLayout * hbox = new QHBoxLayout();
+ CBVoicepack = new QComboBox(GBoxTeam);
+
+ hbox->addWidget(CBVoicepack, 100);
+ btnTestSound = addButton(":/res/PlaySound.png", hbox, 1, true);
+ hbox->setStretchFactor(btnTestSound, 1);
+
+ GBTLayout->addLayout(hbox, 4, 1);
+
+ GBoxFort = new QGroupBox(this);
+ GBoxFort->setTitle(QGroupBox::tr("Fort"));
+ QGridLayout * GBFLayout = new QGridLayout(GBoxFort);
+ CBFort = new QComboBox(GBoxFort);
+ CBFort->setMaxCount(65535);
+ GBFLayout->addWidget(CBFort, 0, 0);
+ FortPreview = new SquareLabel(GBoxFort);
+ FortPreview->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ FortPreview->setMinimumSize(128, 128);
+ FortPreview->setPixmap(QPixmap());
+ // perhaps due to handling its own paintevents, SquareLabel doesn't play nice with the stars
+ //FortPreview->setAttribute(Qt::WA_PaintOnScreen, true);
+ GBFLayout->addWidget(FortPreview, 1, 0);
+ vbox2->addWidget(GBoxFort);
+
+ vbox1->addStretch();
+ vbox2->addStretch();
+
+// ====== Page 2 ======
+ GBoxBinds = new QGroupBox(this);
+ GBoxBinds->setTitle(QGroupBox::tr("Key binds"));
+ QGridLayout * GBBLayout = new QGridLayout(GBoxBinds);
+ BindsBox = new QToolBox(GBoxBinds);
+ BindsBox->setLineWidth(0);
+ GBBLayout->addWidget(BindsBox);
+ page2Layout->addWidget(GBoxBinds, 0, 0);
+
+ quint16 i = 0;
+ quint16 num = 0;
+ QWidget * curW = NULL;
+ QGridLayout * pagelayout = NULL;
+ QLabel* l = NULL;
+ while (i < BINDS_NUMBER) {
+ if(cbinds[i].category != NULL)
+ {
+ if(curW != NULL)
+ {
+ l = new QLabel(curW);
+ l->setText("");
+ pagelayout->addWidget(l, num++, 0, 1, 2);
+ }
+ curW = new QWidget(this);
+ BindsBox->addItem(curW, HWApplication::translate("binds (categories)", cbinds[i].category));
+ pagelayout = new QGridLayout(curW);
+ num = 0;
+ }
+ if(cbinds[i].description != NULL)
+ {
+ l = new QLabel(curW);
+ l->setText((num > 0 ? QString("\n") : QString("")) + HWApplication::translate("binds (descriptions)", cbinds[i].description));
+ pagelayout->addWidget(l, num++, 0, 1, 2);
+ }
+
+ l = new QLabel(curW);
+ l->setText(HWApplication::translate("binds", cbinds[i].name));
+ l->setAlignment(Qt::AlignRight);
+ pagelayout->addWidget(l, num, 0);
+ CBBind[i] = new QComboBox(curW);
+ for(int j = 0; sdlkeys[j][1][0] != '\0'; j++)
+ CBBind[i]->addItem(HWApplication::translate("binds (keys)", sdlkeys[j][1]).contains(": ") ? HWApplication::translate("binds (keys)", sdlkeys[j][1]) : HWApplication::translate("binds (keys)", "Keyboard") + QString(": ") + HWApplication::translate("binds (keys)", sdlkeys[j][1]), sdlkeys[j][0]);
+ pagelayout->addWidget(CBBind[i++], num++, 1);
+ }
+
+ return pageLayout;
+}
+
+QLayout * PageEditTeam::footerLayoutDefinition()
+{
+ QHBoxLayout * bottomLayout = new QHBoxLayout();
+
+ btnSave = addButton(":/res/Save.png", bottomLayout, 0, true);;
+ btnSave->setStyleSheet("QPushButton{margin: 24px 0 0 0;}");
+ bottomLayout->setAlignment(btnSave, Qt::AlignRight | Qt::AlignBottom);
+
+ return bottomLayout;
+}
+
+void PageEditTeam::connectSignals()
+{
+ connect(btnSave, SIGNAL(clicked()), this, SLOT(saveTeam()));
+
+ signalMapper1 = new QSignalMapper(this);
+ signalMapper2 = new QSignalMapper(this);
+
+ connect(signalMapper1, SIGNAL(mapped(int)), this, SLOT(fixHHname(int)));
+ connect(signalMapper2, SIGNAL(mapped(int)), this, SLOT(setRandomName(int)));
+
+ for(int i = 0; i < HEDGEHOGS_PER_TEAM; i++)
+ {
+ connect(HHNameEdit[i], SIGNAL(editingFinished()), signalMapper1, SLOT(map()));
+ signalMapper1->setMapping(HHNameEdit[i], i);
+
+ connect(btnRandomHogName[i], SIGNAL(clicked()), signalMapper2, SLOT(map()));
+ signalMapper2->setMapping(btnRandomHogName[i], i);
+ }
+
+ connect(btnRandomTeam, SIGNAL(clicked()), this, SLOT(setRandomNames()));
+
+ connect(btnTestSound, SIGNAL(clicked()), this, SLOT(testSound()));
+
+ connect(CBFort, SIGNAL(currentIndexChanged(const QString &)), this, SLOT(CBFort_activated(const QString &)));
+}
+
+PageEditTeam::PageEditTeam(QWidget* parent, SDLInteraction * sdli) :
+ AbstractPage(parent)
+{
+ initPage();
+
+ m_playerHash = "0000000000000000000000000000000000000000";
+ mySdli = sdli;
+
+ QDir tmpdir;
+ QStringList list;
+ tmpdir.cd(cfgdir->absolutePath());
+ if (tmpdir.cd("Data/Sounds/voices"))
+ {
+ list = tmpdir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
+ CBVoicepack->addItems(list);
+ }
+
+ tmpdir.cd(datadir->absolutePath());
+ tmpdir.cd("Sounds/voices");
+ QStringList tmplist = tmpdir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
+ QStringList tmplist2;
+ foreach (const QString & line, tmplist)
+ {
+ if (!list.contains(line,Qt::CaseInsensitive))
+ tmplist2.append(line);
+ }
+
+ CBVoicepack->addItems(tmplist2);
+
+ QStringList userforts;
+ tmpdir.cd(cfgdir->absolutePath());
+ if (tmpdir.cd("Data/Forts"))
+ {
+ tmpdir.setFilter(QDir::Files);
+ userforts = tmpdir.entryList(QStringList("*L.png")).replaceInStrings(QRegExp("^(.*)L\\.png"), "\\1");
+ CBFort->addItems(userforts);
+ }
+
+ tmpdir.cd("../Graphics/Graves");
+ QStringList userlist = tmpdir.entryList(QStringList("*.png"));
+ for (QStringList::Iterator it = userlist.begin(); it != userlist.end(); ++it )
+ {
+ QPixmap pix(cfgdir->absolutePath() + "/Data/Graphics/Graves/" + *it);
+ QIcon icon(pix.copy(0, 0, 32, 32));
+ CBGrave->addItem(icon, QString(*it).replace(QRegExp("^(.*)\\.png"), "\\1"));
+ }
+
+ tmpdir.cd(datadir->absolutePath());
+ tmpdir.cd("Forts");
+ tmpdir.setFilter(QDir::Files);
+
+ tmplist = tmpdir.entryList(QStringList("*L.png")).replaceInStrings(QRegExp("^(.*)L\\.png"), "\\1");
+ QStringList dataforts;
+ foreach (const QString & line, tmplist)
+ {
+ if (!userforts.contains(line,Qt::CaseInsensitive))
+ dataforts.append(line);
+ }
+
+ CBFort->addItems(dataforts);
+
+ tmpdir.cd("../Graphics/Graves");
+ QStringList datalist = tmpdir.entryList(QStringList("*.png"));
+ foreach (const QString & line, datalist)
+ {
+ if (userlist.contains(line,Qt::CaseInsensitive)) continue;
+ QPixmap pix(datadir->absolutePath() + "/Graphics/Graves/" + line);
+ QIcon icon(pix.copy(0, 0, 32, 32));
+ QString grave = line;
+ grave = grave.replace(QRegExp("^(.*)\\.png"), "\\1");
+ CBGrave->addItem(icon, grave);
+ }
+
+ // add the default flag
+ CBFlag->addItem(QIcon(QPixmap(datadir->absolutePath() + "/Graphics/Flags/hedgewars.png").copy(0, 0, 22, 15)), "Hedgewars", "hedgewars");
+ CBFlag->insertSeparator(CBFlag->count());
+
+ tmpdir.cd(cfgdir->absolutePath());
+ tmpdir.cd("Data/Graphics/Flags");
+ userlist = tmpdir.entryList(QStringList("*.png"));
+
+ // add all country flags
+ foreach (const QString & line, userlist)
+ {
+ QPixmap pix(cfgdir->absolutePath() + "/Data/Graphics/Flags/" + line);
+ QIcon icon(pix.copy(0, 0, 22, 15));
+ // TODO improve readablility
+ if(line.compare("cpu.png") && line.compare("hedgewars.png") && (line.indexOf("cm_") == -1)) // skip cpu and hedgewars flags as well as all community flags
+ {
+ QString flag = line;
+ flag = flag.replace(QRegExp("^(.*)\\.png"), "\\1");
+ CBFlag->addItem(icon, flag.replace("_", " "), flag);
+ }
+ }
+
+ CBFlag->insertSeparator(CBFlag->count());
+
+ // add all community flags
+ for (QStringList::Iterator it = userlist.begin(); it != userlist.end(); ++it )
+ {
+ QPixmap pix(cfgdir->absolutePath() + "/Data/Graphics/Flags/" + *it);
+ QIcon icon(pix.copy(0, 0, 22, 15));
+ if(it->indexOf("cm_") > -1) // skip non community flags this time
+ {
+ QString flag = QString(*it).replace(QRegExp("^(.*)\\.png"), "\\1");
+ CBFlag->addItem(icon, QString(flag).replace("cm_", QComboBox::tr("Community") + ": "), flag);
+ }
+ }
+
+ CBFlag->insertSeparator(CBFlag->count());
+
+ tmpdir.cd(datadir->absolutePath());
+ tmpdir.cd("Graphics/Flags");
+ datalist = tmpdir.entryList(QStringList("*.png"));
+
+ // add all country flags
+ for (QStringList::Iterator it = datalist.begin(); it != datalist.end(); ++it )
+ {
+ if (userlist.contains(*it,Qt::CaseInsensitive)) continue;
+ QPixmap pix(datadir->absolutePath() + "/Graphics/Flags/" + *it);
+ QIcon icon(pix.copy(0, 0, 22, 15));
+ if(it->compare("cpu.png") && it->compare("hedgewars.png") && (it->indexOf("cm_") == -1)) // skip cpu and hedgewars flags as well as all community flags
+ {
+ QString flag = QString(*it).replace(QRegExp("^(.*)\\.png"), "\\1");
+ CBFlag->addItem(icon, QString(flag).replace("_", " "), flag);
+ }
+ }
+
+ CBFlag->insertSeparator(CBFlag->count());
+
+ // add all community flags
+ for (QStringList::Iterator it = datalist.begin(); it != datalist.end(); ++it )
+ {
+ if (userlist.contains(*it,Qt::CaseInsensitive)) continue;
+ QPixmap pix(datadir->absolutePath() + "/Graphics/Flags/" + *it);
+ QIcon icon(pix.copy(0, 0, 22, 15));
+ if(it->indexOf("cm_") > -1) // skip non community flags this time
+ {
+ QString flag = (*it).replace(QRegExp("^(.*)\\.png"), "\\1");
+ CBFlag->addItem(icon, QString(flag).replace("cm_", QComboBox::tr("Community") + ": "), flag);
+ }
+ }
+}
+
+void PageEditTeam::fixHHname(int idx)
+{
+ HHNameEdit[idx]->setText(HHNameEdit[idx]->text().trimmed());
+
+ if (HHNameEdit[idx]->text().isEmpty())
+ HHNameEdit[idx]->setText(QLineEdit::tr("hedgehog %1").arg(idx+1));
+}
+
+void PageEditTeam::CBFort_activated(const QString & fortname)
+{
+ QFile tmp;
+ tmp.setFileName(cfgdir->absolutePath() + "/Data/Forts/" + fortname + "L.png");
+ if (!tmp.exists()) tmp.setFileName(datadir->absolutePath() + "/Forts/" + fortname + "L.png");
+ QPixmap pix(QFileInfo(tmp).absoluteFilePath());
+ FortPreview->setPixmap(pix);
+}
+
+void PageEditTeam::testSound()
+{
+ Mix_Chunk *sound;
+ QDir tmpdir;
+ mySdli->SDLMusicInit();
+
+ tmpdir.cd(cfgdir->absolutePath());
+ if (!tmpdir.cd("Data/Sounds/voices/"+CBVoicepack->currentText()))
+ {
+ tmpdir.cd(datadir->absolutePath());
+ tmpdir.cd("Sounds/voices");
+ tmpdir.cd(CBVoicepack->currentText());
+ }
+
+ QStringList list = tmpdir.entryList(QStringList() << "Illgetyou.ogg" << "Incoming.ogg" << "Stupid.ogg" << "Coward.ogg" << "Firstblood.ogg", QDir::Files);
+ if (list.size()) {
+ sound = Mix_LoadWAV(QString(tmpdir.absolutePath() + "/" + list[rand() % list.size()]).toLocal8Bit().constData());
+ Mix_PlayChannel(-1, sound, 0);
+ }
+}
+
+void PageEditTeam::createTeam(const QString & name, const QString & playerHash)
+{
+ m_playerHash = playerHash;
+ HWTeam newTeam(name);
+ loadTeam(newTeam);
+}
+
+void PageEditTeam::editTeam(const QString & name, const QString & playerHash)
+{
+ m_playerHash = playerHash;
+ HWTeam team(name);
+ team.loadFromFile();
+ loadTeam(team);
+}
+
+void PageEditTeam::deleteTeam(const QString & name)
+{
+ QMessageBox reallyDelete(QMessageBox::Question, QMessageBox::tr("Teams"), QMessageBox::tr("Really delete this team?"), QMessageBox::Ok | QMessageBox::Cancel, this);
+
+ if (reallyDelete.exec() == QMessageBox::Ok)
+ HWTeam(name).deleteFile();
+}
+
+void PageEditTeam::setRandomNames()
+{
+ HWTeam team = data();
+ HWNamegen::teamRandomNames(team, true);
+ loadTeam(team);
+}
+
+void PageEditTeam::setRandomName(int hh_index)
+{
+ HWTeam team = data();
+ HWNamegen::teamRandomName(team,hh_index);
+ loadTeam(team);
+}
+
+void PageEditTeam::loadTeam(const HWTeam & team)
+{
+ TeamNameEdit->setText(team.name());
+ CBTeamLvl->setCurrentIndex(team.difficulty());
+
+ for(int i = 0; i < HEDGEHOGS_PER_TEAM; i++)
+ {
+ HWHog hh = team.hedgehog(i);
+
+ HHNameEdit[i]->setText(hh.Name);
+
+ if (hh.Hat.startsWith("Reserved"))
+ hh.Hat = hh.Hat.remove(0,40);
+
+ HHHats[i]->setCurrentIndex(HHHats[i]->findData(hh.Hat, Qt::DisplayRole));
+ }
+
+ CBGrave->setCurrentIndex(CBGrave->findText(team.grave()));
+ CBFlag->setCurrentIndex(CBFlag->findData(team.flag()));
+
+ CBFort->setCurrentIndex(CBFort->findText(team.fort()));
+ CBVoicepack->setCurrentIndex(CBVoicepack->findText(team.voicepack()));
+
+ for(int i = 0; i < BINDS_NUMBER; i++)
+ {
+ CBBind[i]->setCurrentIndex(CBBind[i]->findData(team.keyBind(i)));
+ }
+}
+
+HWTeam PageEditTeam::data()
+{
+ HWTeam team(TeamNameEdit->text());
+ team.setDifficulty(CBTeamLvl->currentIndex());
+
+ for(int i = 0; i < HEDGEHOGS_PER_TEAM; i++)
+ {
+ HWHog hh;
+ hh.Name = HHNameEdit[i]->text();
+ hh.Hat = HHHats[i]->currentText();
+
+ if (hh.Hat.startsWith("Reserved"))
+ hh.Hat = "Reserved"+m_playerHash+hh.Hat.remove(0,9);
+
+ team.setHedgehog(i,hh);
+ }
+
+ team.setGrave(CBGrave->currentText());
+ team.setFort(CBFort->currentText());
+ team.setVoicepack(CBVoicepack->currentText());
+ team.setFlag(CBFlag->itemData(CBFlag->currentIndex()).toString());
+
+ for(int i = 0; i < BINDS_NUMBER; i++)
+ {
+ team.bindKey(i,CBBind[i]->itemData(CBBind[i]->currentIndex()).toString());
+ }
+
+ return team;
+}
+
+void PageEditTeam::saveTeam()
+{
+ data().saveToFile();
+ emit teamEdited();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageeditteam.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,94 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_EDITTEAM_H
+#define PAGE_EDITTEAM_H
+
+#include "AbstractPage.h"
+#include "binds.h"
+#include "hwconsts.h"
+#include "namegen.h"
+#include "SDLs.h"
+
+#include "team.h"
+
+class SquareLabel;
+
+class PageEditTeam : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageEditTeam(QWidget* parent, SDLInteraction * sdli);
+
+ void createTeam(const QString & name, const QString & playerHash);
+ void editTeam(const QString & name, const QString & playerHash);
+ void deleteTeam(const QString & name);
+
+signals:
+ void teamEdited();
+
+public slots:
+ void CBFort_activated(const QString & gravename);
+
+private:
+ QSignalMapper* signalMapper1;
+ QSignalMapper* signalMapper2;
+ QGroupBox *GBoxHedgehogs;
+ QGroupBox *GBoxTeam;
+ QGroupBox *GBoxFort;
+ QComboBox *CBFort;
+ SquareLabel *FortPreview;
+ QComboBox *CBGrave;
+ QComboBox *CBFlag;
+ QComboBox *CBTeamLvl;
+ QComboBox *CBVoicepack;
+ QGroupBox *GBoxBinds;
+ QToolBox *BindsBox;
+ QLineEdit * TeamNameEdit;
+ QLineEdit * HHNameEdit[HEDGEHOGS_PER_TEAM];
+ QComboBox * HHHats[HEDGEHOGS_PER_TEAM];
+ QComboBox * CBBind[BINDS_NUMBER];
+ SDLInteraction * mySdli;
+ HWTeam data();
+ QString m_playerHash;
+
+ QLayout * bodyLayoutDefinition();
+ QLayout * footerLayoutDefinition();
+ void connectSignals();
+
+ void loadTeam(const HWTeam & team);
+
+ // page 1
+ QPushButton * btnRandomHogName[HEDGEHOGS_PER_TEAM];
+ QPushButton * btnRandomTeam;
+ QPushButton * btnTestSound;
+
+ // footer
+ QPushButton * btnSave;
+
+private slots:
+ void saveTeam();
+ void setRandomNames();
+ void setRandomName(int hh_index);
+ void testSound();
+ void fixHHname(int idx);
+};
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagegamestats.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,274 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2010-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QLabel>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QGraphicsScene>
+#include <QGroupBox>
+#include <QSizePolicy>
+
+#include "pagegamestats.h"
+#include "team.h"
+
+FitGraphicsView::FitGraphicsView(QWidget* parent) : QGraphicsView(parent)
+{
+
+}
+
+void FitGraphicsView::resizeEvent(QResizeEvent * event)
+{
+ Q_UNUSED(event);
+
+ fitInView(sceneRect());
+}
+
+QLayout * PageGameStats::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+ pageLayout->setSpacing(20);
+ pageLayout->setColumnStretch(0, 1);
+ pageLayout->setColumnStretch(1, 1);
+ pageLayout->setContentsMargins(7, 7, 7, 0);
+
+ QGroupBox * gb = new QGroupBox(this);
+ QVBoxLayout * gbl = new QVBoxLayout;
+
+ // details
+ labelGameStats = new QLabel(this);
+ QLabel * l = new QLabel(this);
+ l->setTextFormat(Qt::RichText);
+ l->setText("<h1><img src=\":/res/StatsD.png\"> " + PageGameStats::tr("Details") + "</h1>");
+ l->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ labelGameStats->setTextFormat(Qt::RichText);
+ labelGameStats->setAlignment(Qt::AlignTop);
+ labelGameStats->setWordWrap(true);
+ gbl->addWidget(l);
+ gbl->addWidget(labelGameStats);
+ gb->setLayout(gbl);
+ pageLayout->addWidget(gb, 1, 1, 1, 2);
+
+ // graph
+ graphic = new FitGraphicsView(gb);
+ l = new QLabel(this);
+ l->setTextFormat(Qt::RichText);
+ l->setText("<br><h1><img src=\":/res/StatsH.png\"> " + PageGameStats::tr("Health graph") + "</h1>");
+ l->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ gbl->addWidget(l);
+ gbl->addWidget(graphic);
+ graphic->scale(1.0, -1.0);
+ graphic->setBackgroundBrush(QBrush(Qt::black));
+
+ labelGameWin = new QLabel(this);
+ labelGameWin->setTextFormat(Qt::RichText);
+ pageLayout->addWidget(labelGameWin, 0, 0, 1, 2);
+
+ // ranking box
+ gb = new QGroupBox(this);
+ gbl = new QVBoxLayout;
+ labelGameRank = new QLabel(gb);
+ l = new QLabel(this);
+ l->setTextFormat(Qt::RichText);
+ l->setText("<h1><img src=\":/res/StatsR.png\"> " + PageGameStats::tr("Ranking") + "</h1>");
+ l->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ gbl->addWidget(l);
+ gbl->addWidget(labelGameRank);
+ gb->setLayout(gbl);
+
+ labelGameRank->setTextFormat(Qt::RichText);
+ labelGameRank->setAlignment(Qt::AlignTop);
+ pageLayout->addWidget(gb, 1, 0);
+
+ return pageLayout;
+}
+
+QLayout * PageGameStats::footerLayoutDefinition()
+{
+ QHBoxLayout * bottomLayout = new QHBoxLayout();
+
+ btnSave = addButton(":/res/Save.png", bottomLayout, 0, true);
+ btnSave->setStyleSheet("QPushButton{margin: 24px 0 0 0;}");
+ bottomLayout->setAlignment(btnSave, Qt::AlignRight | Qt::AlignBottom);
+
+ return bottomLayout;
+}
+
+void PageGameStats::connectSignals()
+{
+ connect(btnSave, SIGNAL(clicked()), this, SIGNAL(saveDemoRequested()));
+}
+
+PageGameStats::PageGameStats(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
+
+void PageGameStats::AddStatText(const QString & msg)
+{
+ labelGameStats->setText(labelGameStats->text() + msg);
+}
+
+void PageGameStats::clear()
+{
+ labelGameStats->setText("");
+ healthPoints.clear();
+ labelGameRank->setText("");
+ playerPosition = 0;
+ lastColor = 0;
+}
+
+void PageGameStats::renderStats()
+{
+ QGraphicsScene * scene = new QGraphicsScene();
+
+ QMap<quint32, QVector<quint32> >::const_iterator i = healthPoints.constBegin();
+ while (i != healthPoints.constEnd())
+ {
+ quint32 c = i.key();
+ QColor clanColor = QColor(qRgb((c >> 16) & 255, (c >> 8) & 255, c & 255));
+ QVector<quint32> hps = i.value();
+
+ QPainterPath path;
+ if (hps.size())
+ path.moveTo(0, hps[0]);
+
+ for(int t = 1; t < hps.size(); ++t)
+ path.lineTo(t, hps[t]);
+
+ scene->addPath(path, QPen(c));
+ ++i;
+ }
+
+ graphic->setScene(scene);
+ graphic->fitInView(graphic->sceneRect());
+}
+
+void PageGameStats::GameStats(char type, const QString & info)
+{
+ switch(type) {
+ case 'r' : {
+ labelGameWin->setText(QString("<h1 align=\"center\">%1</h1>").arg(info));
+ break;
+ }
+ case 'D' : {
+ int i = info.indexOf(' ');
+ QString message = "<p><img src=\":/res/StatsBestShot.png\"> " + PageGameStats::tr("The best shot award was won by <b>%1</b> with <b>%2</b> pts.").arg(info.mid(i + 1), info.left(i)) + "</p>";
+ AddStatText(message);
+ break;
+ }
+ case 'k' : {
+ int i = info.indexOf(' ');
+ int num = info.left(i).toInt();
+ QString message = "<p><img src=\":/res/StatsBestKiller.png\"> " + PageGameStats::tr("The best killer is <b>%1</b> with <b>%2</b> kills in a turn.", "", num).arg(info.mid(i + 1), info.left(i)) + "</p>";
+ AddStatText(message);
+ break;
+ }
+ case 'K' : {
+ int num = info.toInt();
+ QString message = "<p><img src=\":/res/StatsHedgehogsKilled.png\"> " + PageGameStats::tr("A total of <b>%1</b> hedgehog(s) were killed during this round.", "", num).arg(num) + "</p>";
+ AddStatText(message);
+ break;
+ }
+ case 'H' : {
+ int i = info.indexOf(' ');
+ quint32 clan = info.left(i).toInt();
+ quint32 hp = info.mid(i + 1).toUInt();
+ healthPoints[clan].append(hp);
+ break;
+ }
+ case 'T': { // local team stats
+ //AddStatText("<p>local team: " + info + "</p>");
+ QStringList infol = info.split(":");
+ HWTeam team(infol[0]);
+ if(team.fileExists()) // do some better test to avoid influence from scripted/predefined teams?
+ {
+ team.loadFromFile();
+ team.incRounds();
+ if(infol[1].toInt() > 0) // might require some better test for winning condition (or changed flag) ... WIP!
+ team.incWins(); // should draws count as wins?
+ //team.SaveToFile(); // don't save yet
+ }
+ break;
+ }
+
+ case 'P' : {
+ int i = info.indexOf(' ');
+ playerPosition++;
+ QString color = info.left(i);
+ quint32 c = color.toInt();
+ QColor clanColor = QColor(qRgb((c >> 16) & 255, (c >> 8) & 255, c & 255));
+
+ QString playerinfo = info.mid(i + 1);
+
+ i = playerinfo.indexOf(' ');
+
+ int kills = playerinfo.left(i).toInt();
+ QString playername = playerinfo.mid(i + 1);
+ QString image;
+
+ if (lastColor == c) playerPosition--;
+ lastColor = c;
+
+ switch (playerPosition)
+ {
+ case 1:
+ image = "<img src=\":/res/StatsMedal1.png\">";
+ break;
+ case 2:
+ image = "<img src=\":/res/StatsMedal2.png\">";
+ break;
+ case 3:
+ image = "<img src=\":/res/StatsMedal3.png\">";
+ break;
+ default:
+ image = "<img src=\":/res/StatsMedal4.png\">";
+ break;
+ }
+
+ QString message;
+ QString killstring = PageGameStats::tr("(%1 kill)", "", kills).arg(kills);
+
+ message = QString("<p><h2>%1 %2. <font color=\"%4\">%3</font> ").arg(image, QString::number(playerPosition), playername, clanColor.name()) + killstring + "</h2></p>";
+
+ labelGameRank->setText(labelGameRank->text() + message);
+ break;
+ }
+ case 's' : {
+ int i = info.indexOf(' ');
+ int num = info.left(i).toInt();
+ QString message = "<p><img src=\":/res/StatsMostSelfDamage.png\"> " + PageGameStats::tr("<b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.", "", num).arg(info.mid(i + 1)).arg(num) + "</p>";
+ AddStatText(message);
+ break;
+ }
+ case 'S' : {
+ int i = info.indexOf(' ');
+ int num = info.left(i).toInt();
+ QString message = "<p><img src=\":/res/StatsSelfKilled.png\"> " + PageGameStats::tr("<b>%1</b> killed <b>%2</b> of his own hedgehogs.", "", num).arg(info.mid(i + 1)).arg(num) + "</p>";
+ AddStatText(message);
+ break;
+ }
+ case 'B' : {
+ int i = info.indexOf(' ');
+ int num = info.left(i).toInt();
+ QString message = "<p><img src=\":/res/StatsSkipped.png\"> " + PageGameStats::tr("<b>%1</b> was scared and skipped turn <b>%2</b> times.", "", num).arg(info.mid(i + 1)).arg(num) + "</p>";
+ AddStatText(message);
+ break;
+ }
+
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagegamestats.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,73 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2010-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef STATSPAGE_H
+#define STATSPAGE_H
+
+#include <QVector>
+#include <QMap>
+#include <QGraphicsView>
+
+#include "AbstractPage.h"
+
+class FitGraphicsView : public QGraphicsView
+{
+ Q_OBJECT
+
+public:
+ FitGraphicsView(QWidget* parent = 0);
+
+protected:
+ void resizeEvent(QResizeEvent * event);
+};
+
+class PageGameStats : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageGameStats(QWidget* parent = 0);
+
+ QPushButton *btnSave;
+ QLabel *labelGameStats;
+ QLabel *labelGameWin;
+ QLabel *labelGameRank;
+ FitGraphicsView * graphic;
+
+public slots:
+ void GameStats(char type, const QString & info);
+ void clear();
+ void renderStats();
+
+signals:
+ void saveDemoRequested();
+
+private:
+ void AddStatText(const QString & msg);
+
+ QMap<quint32, QVector<quint32> > healthPoints;
+ unsigned int playerPosition;
+ quint32 lastColor;
+
+protected:
+ QLayout * bodyLayoutDefinition();
+ QLayout * footerLayoutDefinition();
+ void connectSignals();
+};
+
+#endif // STATSPAGE_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageinfo.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,56 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QPushButton>
+
+#include "pageinfo.h"
+#include "about.h"
+
+QLayout * PageInfo::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+
+ pageLayout->setColumnStretch(0, 1);
+ pageLayout->setColumnStretch(1, 1);
+ pageLayout->setColumnStretch(2, 1);
+
+ about = new About();
+ pageLayout->addWidget(about, 0, 0, 1, 3);
+
+ return pageLayout;
+}
+
+QLayout * PageInfo::footerLayoutDefinition()
+{
+ QGridLayout * bottomLayout = new QGridLayout();
+ BtnSnapshots = addButton(":/res/Star.png", bottomLayout, 1, 1, true);
+ bottomLayout->setAlignment(BtnSnapshots, Qt::AlignRight | Qt::AlignVCenter);
+ return bottomLayout;
+}
+
+void PageInfo::connectSignals()
+{
+ //TODO
+}
+
+PageInfo::PageInfo(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageinfo.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,43 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_INFO_H
+#define PAGE_INFO_H
+
+#include "AbstractPage.h"
+
+class About;
+
+class PageInfo : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageInfo(QWidget* parent = 0);
+
+ QPushButton *BtnSnapshots;
+ About *about;
+
+private:
+ QLayout * bodyLayoutDefinition();
+ QLayout * footerLayoutDefinition();
+ void connectSignals();
+};
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageingame.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,40 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QHBoxLayout>
+#include <QLabel>
+
+#include "pageingame.h"
+
+QLayout * PageInGame::bodyLayoutDefinition()
+{
+ QHBoxLayout * pageLayout = new QHBoxLayout();
+
+ QLabel * label = new QLabel(this);
+ label->setText(tr("In game..."));
+ pageLayout->addWidget(label);
+
+ setBackButtonVisible(false);
+
+ return pageLayout;
+}
+
+PageInGame::PageInGame(QWidget * parent) : AbstractPage(parent)
+{
+ initPage();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageingame.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,35 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_INGAME_H
+#define PAGE_INGAME_H
+
+#include "AbstractPage.h"
+
+class PageInGame : public AbstractPage
+{
+ Q_OBJECT
+
+ public:
+ PageInGame(QWidget * parent = 0);
+
+ QLayout * bodyLayoutDefinition();
+};
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagemain.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,162 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QLabel>
+#include <QTime>
+
+#include "pagemain.h"
+#include "hwconsts.h"
+#include "hwform.h"
+
+QLayout * PageMain::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+ //pageLayout->setColumnStretch(0, 1);
+ //pageLayout->setColumnStretch(1, 2);
+ //pageLayout->setColumnStretch(2, 1);
+
+ //QPushButton* btnLogo = addButton(":/res/HedgewarsTitle.png", pageLayout, 0, 0, 1, 4, true);
+ //pageLayout->setAlignment(btnLogo, Qt::AlignHCenter);
+ pageLayout->setRowStretch(0, 1);
+ pageLayout->setRowStretch(1, 1);
+ pageLayout->setRowStretch(2, 0);
+ pageLayout->setRowStretch(3, 1);
+ pageLayout->setRowStretch(4, 1);
+
+ //BtnInfo = addButton(":/res/About.png", pageLayout, 3, 1, 1, 2, true);
+ BtnInfo = addButton(":/res/HedgewarsTitle.png", pageLayout, 0, 0, 1, 4, true);
+ BtnInfo->setStyleSheet("border: transparent;background: transparent;");
+ pageLayout->setAlignment(BtnInfo, Qt::AlignHCenter);
+
+ BtnSinglePlayer = addButton(":/res/LocalPlay.png", pageLayout, 2, 0, 1, 2, true);
+ BtnSinglePlayer->setToolTip(tr("Local Game (Play a game on a single computer)"));
+ pageLayout->setAlignment(BtnSinglePlayer, Qt::AlignHCenter);
+
+ BtnNet = addButton(":/res/NetworkPlay.png", pageLayout, 2, 2, 1, 2, true);
+ BtnNet->setToolTip(tr("Network Game (Play a game across a network)"));
+ pageLayout->setAlignment(BtnNet, Qt::AlignHCenter);
+
+ BtnDataDownload = addButton(tr("Downloadable Content"), pageLayout, 4, 0, 1, 4, false);
+ pageLayout->setAlignment(BtnDataDownload, Qt::AlignHCenter);
+
+ return pageLayout;
+}
+
+QLayout * PageMain::footerLayoutDefinition()
+{
+ QHBoxLayout * bottomLayout = new QHBoxLayout();
+
+ mainNote = new QLabel(this);
+ mainNote->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+ mainNote->setWordWrap(true);
+
+ bottomLayout->addWidget(mainNote, 0);
+ bottomLayout->setStretch(0,1);
+
+ BtnSetup = addButton(":/res/Settings.png", bottomLayout, 1, true);
+ bottomLayout->setStretch(1,0);
+
+ return bottomLayout;
+}
+
+void PageMain::connectSignals()
+{
+ //TODO
+}
+
+PageMain::PageMain(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+
+ if(frontendEffects) setAttribute(Qt::WA_NoSystemBackground, true);
+ mainNote->setOpenExternalLinks(true);
+
+ if(!isDevBuild)
+ {
+ mainNote->setText(QLabel::tr("Tip: ") + randomTip());
+ }
+ else
+ mainNote->setText(QLabel::tr("This development build is 'work in progress' and may not be compatible with other versions of the game. Some features might be broken or incomplete. Use at your own risk!"));
+
+}
+
+QString PageMain::randomTip() const
+{
+ QStringList Tips;
+ Tips << tr("Simply pick the same color as a friend to play together as a team. Each of you will still control his or her own hedgehogs but they'll win or lose together.", "Tips");
+ Tips << tr("Some weapons might do only low damage but they can be a lot more devastating in the right situation. Try to use the Desert Eagle to knock multiple hedgehogs into the water.", "Tips");
+ Tips << tr("If you're unsure what to do and don't want to waste ammo, skip one round. But don't let too much time pass as there will be Sudden Death!", "Tips");
+ Tips << tr("Want to save ropes? Release the rope in mid air and then shoot again. As long as you don't touch the ground you'll reuse your rope without wasting ammo!", "Tips");
+ Tips << tr("If you'd like to keep others from using your preferred nickname on the official server, register an account at http://www.hedgewars.org/.", "Tips");
+ Tips << tr("You're bored of default gameplay? Try one of the missions - they'll offer different gameplay depending on the one you picked.", "Tips");
+ Tips << tr("By default the game will always record the last game played as a demo. Select 'Local Game' and pick the 'Demos' button on the lower right corner to play or manage them.", "Tips");
+ Tips << tr("Hedgewars is Open Source and Freeware we create in our spare time. If you've got problems, ask on our forums but please don't expect 24/7 support!", "Tips");
+ Tips << tr("Hedgewars is Open Source and Freeware we create in our spare time. If you like it, help us with a small donation or contribute your own work!", "Tips");
+ Tips << tr("Hedgewars is Open Source and Freeware we create in our spare time. Share it with your family and friends as you like!", "Tips");
+ Tips << tr("Hedgewars is Open Source and Freeware we create in our spare time. If someone sold you the game, you should try get a refund!", "Tips");
+ Tips << tr("From time to time there will be official tournaments. Upcoming events will be announced at http://www.hedgewars.org/ some days in advance.", "Tips");
+ Tips << tr("Hedgewars is available in many languages. If the translation in your language seems to be missing or outdated, feel free to contact us!", "Tips");
+ Tips << tr("Hedgewars can be run on lots of different operating systems including Microsoft Windows, Mac OS X and Linux.", "Tips");
+ Tips << tr("Always remember you're able to set up your own games in local and network/online play. You're not restricted to the 'Simple Game' option.", "Tips");
+ Tips << tr("Connect one or more gamepads before starting the game to be able to assign their controls to your teams.", "Tips");
+ Tips << tr("Create an account on %1 to keep others from using your most favourite nickname while playing on the official server.", "Tips").arg("<a href=\"http://www.hedgewars.org/\">http://www.hedgewars.org/</a>");
+ Tips << tr("While playing you should give yourself a short break at least once an hour.", "Tips");
+ Tips << tr("If your graphics card isn't able to provide hardware accelerated OpenGL, try to enable the low quality mode to improve performance.", "Tips");
+ Tips << tr("If your graphics card isn't able to provide hardware accelerated OpenGL, try to update the associated drivers.", "Tips");
+ Tips << tr("We're open to suggestions and constructive feedback. If you don't like something or got a great idea, let us know!", "Tips");
+ Tips << tr("Especially while playing online be polite and always remember there might be some minors playing with or against you as well!", "Tips");
+ Tips << tr("Special game modes such as 'Vampirism' or 'Karma' allow you to develop completely new tactics. Try them in a custom game!", "Tips");
+ Tips << tr("The Windows version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing.", "Tips");
+ Tips << tr("You should never install Hedgewars on computers you don't own (school, university, work, etc.). Please ask the responsible person instead!", "Tips");
+ Tips << tr("Hedgewars can be perfect for short games during breaks. Just ensure you don't add too many hedgehogs or use an huge map. Reducing time and health might help as well.", "Tips");
+ Tips << tr("No hedgehogs were harmed in making this game.", "Tips");
+ Tips << tr("There are three different jumps available. Tap [high jump] twice to do a very high/backwards jump.", "Tips");
+ Tips << tr("Afraid of falling off a cliff? Hold down [precise] to turn [left] or [right] without actually moving.", "Tips");
+ Tips << tr("Some weapons require special strategies or just lots of training, so don't give up on a particular tool if you miss an enemy once.", "Tips");
+ Tips << tr("Most weapons won't work once they touch the water. The Homing Bee as well as the Cake are exceptions to this.", "Tips");
+ Tips << tr("The Old Limbuger only causes a small explosion. However the wind affected smelly cloud can poison lots of hogs at once.", "Tips");
+ Tips << tr("The Piano Strike is the most damaging air strike. You'll lose the hedgehog performing it, so there's a huge downside as well.", "Tips");
+ Tips << tr("The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.", "Tips");
+ Tips << tr("Sticky Mines are a perfect tool to create small chain reactions knocking enemy hedgehogs into dire situations ... or water.", "Tips");
+ Tips << tr("The Hammer is most effective when used on bridges or girders. Hit hogs will just break through the ground.", "Tips");
+ Tips << tr("If you're stuck behind an enemy hedgehog, use the Hammer to free yourself without getting damaged by an explosion.", "Tips");
+ Tips << tr("The Cake's maximum walking distance depends on the ground it has to pass. Use [attack] to detonate it early.", "Tips");
+ Tips << tr("The Flame Thrower is a weapon but it can be used for tunnel digging as well.", "Tips");
+ Tips << tr("Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.", "Tips");
+ Tips << tr("Want to know who's behind the game? Click on the Hedgewars logo in the main menu to see the credits.", "Tips");
+ Tips << tr("Like Hedgewars? Become a fan on %1 or follow us on %2!", "Tips").arg("<a href=\"http://www.facebook.com/Hedgewars\">Facebook</a>").arg("<a href=\"http://twitter.com/hedgewars\">Twitter</a>");
+ Tips << tr("Feel free to draw your own graves, hats, flags or even maps and themes! But note that you'll have to share them somewhere to use them online.", "Tips");
+ Tips << tr("Really want to wear a specific hat? Donate to us and receive an exclusive hat of your choice!", "Tips");
+ // The following tip will require links to app store entries first.
+ //Tips << tr("Want to play Hedgewars any time? Grab the Mobile version for %1 and %2.", "Tips").arg("").arg("");
+ // the ios version is located here: http://itunes.apple.com/us/app/hedgewars/id391234866
+ Tips << tr("Keep your video card drivers up to date to avoid issues playing the game.", "Tips");
+ Tips << tr("You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.", "Tips");
+#ifdef _WIN32
+ Tips << tr("You can find your Hedgewars configuration files under \"My Documents\\Hedgewars\". Create backups or take the files with you, but don't edit them by hand.", "Tips");
+#elif defined __APPLE__
+ Tips << tr("You can find your Hedgewars configuration files under \"Library/Application Support/Hedgewars\" in your home directory. Create backups or take the files with you, but don't edit them by hand.", "Tips");
+#else
+ Tips << tr("You can find your Hedgewars configuration files under \".hedgewars\" in your home directory. Create backups or take the files with you, but don't edit them by hand.", "Tips");
+#endif
+
+ return Tips[QTime(0, 0, 0).secsTo(QTime::currentTime()) % Tips.length()];
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagemain.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,47 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_MAIN_H
+#define PAGE_MAIN_H
+
+#include "AbstractPage.h"
+
+class PageMain : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageMain(QWidget * parent = 0);
+
+ QPushButton * BtnSinglePlayer;
+ QPushButton * BtnNet;
+ QPushButton * BtnSetup;
+ QPushButton * BtnInfo;
+ QPushButton * BtnDataDownload;
+ QLabel * mainNote;
+
+private:
+ QLayout * bodyLayoutDefinition();
+ QLayout * footerLayoutDefinition();
+ void connectSignals();
+
+ QString randomTip() const;
+};
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagemultiplayer.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,55 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QPushButton>
+
+#include "pagemultiplayer.h"
+#include "gamecfgwidget.h"
+#include "teamselect.h"
+
+QLayout * PageMultiplayer::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+
+ gameCFG = new GameCFGWidget(this);
+ pageLayout->addWidget(gameCFG, 0, 0, 1, 2);
+
+ btnSetup = new QPushButton(this);
+ btnSetup->setText(QPushButton::tr("Setup"));
+ pageLayout->addWidget(btnSetup, 1, 0, 1, 2);
+
+ pageLayout->setRowStretch(2, 1);
+
+ teamsSelect = new TeamSelWidget(this);
+ pageLayout->addWidget(teamsSelect, 0, 2, 3, 2);
+
+ BtnStartMPGame = addButton(tr("Start"), pageLayout, 3, 3);
+
+ return pageLayout;
+}
+
+void PageMultiplayer::connectSignals()
+{
+ PageMultiplayer::connect(btnSetup, SIGNAL(clicked()), this, SIGNAL(SetupClicked()));
+}
+
+PageMultiplayer::PageMultiplayer(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagemultiplayer.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,50 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_MULTIPLAYER_H
+#define PAGE_MULTIPLAYER_H
+
+#include "AbstractPage.h"
+
+class GameCFGWidget;
+class TeamSelWidget;
+
+class PageMultiplayer : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageMultiplayer(QWidget* parent = 0);
+
+ GameCFGWidget *gameCFG;
+ TeamSelWidget *teamsSelect;
+ QPushButton *BtnStartMPGame;
+
+signals:
+ void SetupClicked();
+
+private:
+ QLayout * bodyLayoutDefinition();
+ void connectSignals();
+
+ QPushButton * btnSetup;
+};
+
+#endif
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagenet.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,109 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QPushButton>
+#include <QGroupBox>
+#include <QTableView>
+#include <QMessageBox>
+#include <QHeaderView>
+
+#include "pagenet.h"
+#include "hwconsts.h"
+#include "netudpwidget.h"
+
+QLayout * PageNet::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+
+ pageLayout->setColumnStretch(0, 1);
+ pageLayout->setColumnStretch(1, 1);
+ pageLayout->setColumnStretch(2, 1);
+
+ BtnNetSvrStart = new QPushButton(this);
+ BtnNetSvrStart->setFont(*font14);
+ BtnNetSvrStart->setText(QPushButton::tr("Start server"));
+ BtnNetSvrStart->setVisible(haveServer);
+ pageLayout->addWidget(BtnNetSvrStart, 4, 2);
+
+ ConnGroupBox = new QGroupBox(this);
+ ConnGroupBox->setTitle(QGroupBox::tr("Net game"));
+ pageLayout->addWidget(ConnGroupBox, 2, 0, 1, 3);
+ GBClayout = new QGridLayout(ConnGroupBox);
+ GBClayout->setColumnStretch(0, 1);
+ GBClayout->setColumnStretch(1, 1);
+ GBClayout->setColumnStretch(2, 1);
+
+ BtnNetConnect = new QPushButton(ConnGroupBox);
+ BtnNetConnect->setFont(*font14);
+ BtnNetConnect->setText(QPushButton::tr("Connect"));
+ GBClayout->addWidget(BtnNetConnect, 2, 2);
+
+ tvServersList = new QTableView(ConnGroupBox);
+ tvServersList->setSelectionBehavior(QAbstractItemView::SelectRows);
+ GBClayout->addWidget(tvServersList, 1, 0, 1, 3);
+
+ BtnUpdateSList = new QPushButton(ConnGroupBox);
+ BtnUpdateSList->setFont(*font14);
+ BtnUpdateSList->setText(QPushButton::tr("Update"));
+ GBClayout->addWidget(BtnUpdateSList, 2, 0);
+
+ BtnSpecifyServer = new QPushButton(ConnGroupBox);
+ BtnSpecifyServer->setFont(*font14);
+ BtnSpecifyServer->setText(QPushButton::tr("Specify"));
+ GBClayout->addWidget(BtnSpecifyServer, 2, 1);
+
+ return pageLayout;
+}
+
+void PageNet::connectSignals()
+{
+ connect(BtnNetConnect, SIGNAL(clicked()), this, SLOT(slotConnect()));
+}
+
+PageNet::PageNet(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
+
+void PageNet::updateServersList()
+{
+ tvServersList->setModel(new HWNetUdpModel(tvServersList));
+
+ tvServersList->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
+
+ static_cast<HWNetServersModel *>(tvServersList->model())->updateList();
+
+ connect(BtnUpdateSList, SIGNAL(clicked()), static_cast<HWNetServersModel *>(tvServersList->model()), SLOT(updateList()));
+ connect(tvServersList, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(slotConnect()));
+}
+
+void PageNet::slotConnect()
+{
+ HWNetServersModel * model = static_cast<HWNetServersModel *>(tvServersList->model());
+ QModelIndex mi = tvServersList->currentIndex();
+ if(!mi.isValid())
+ {
+ QMessageBox::information(this, tr("Error"), tr("Please select server from the list above"));
+ return;
+ }
+ QString host = model->index(mi.row(), 1).data().toString();
+ quint16 port = model->index(mi.row(), 2).data().toUInt();
+
+ emit connectClicked(host, port);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagenet.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,55 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_NET_H
+#define PAGE_NET_H
+
+#include "AbstractPage.h"
+
+class PageNet : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageNet(QWidget* parent = 0);
+
+ QPushButton* BtnUpdateSList;
+ QTableView * tvServersList;
+ QPushButton * BtnNetConnect;
+ QPushButton * BtnNetSvrStart;
+ QPushButton * BtnSpecifyServer;
+
+public slots:
+ void updateServersList();
+
+signals:
+ void connectClicked(const QString & host, quint16 port);
+
+private:
+ QLayout * bodyLayoutDefinition();
+ void connectSignals();
+
+ QGroupBox * ConnGroupBox;
+ QGridLayout * GBClayout;
+
+private slots:
+ void slotConnect();
+};
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagenetgame.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,142 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QPushButton>
+#include <QAction>
+#include <QMenu>
+#include <QMessageBox>
+
+#include "pagenetgame.h"
+#include "gamecfgwidget.h"
+#include "teamselect.h"
+#include "chatwidget.h"
+
+QLayout * PageNetGame::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+ pageLayout->setSizeConstraint(QLayout::SetMinimumSize);
+ //pageLayout->setSpacing(1);
+ pageLayout->setColumnStretch(0, 50);
+ pageLayout->setColumnStretch(1, 50);
+
+ // chatwidget
+ pChatWidget = new HWChatWidget(this, m_gameSettings, m_sdli, true);
+ pChatWidget->setShowReady(true); // show status bulbs by default
+ pChatWidget->setShowFollow(false); // don't show follow in nicks' context menus
+ pageLayout->addWidget(pChatWidget, 2, 0, 1, 2);
+ pageLayout->setRowStretch(1, 100);
+ pageLayout->setRowStretch(2, 100);
+
+ pGameCFG = new GameCFGWidget(this);
+ pageLayout->addWidget(pGameCFG, 0, 0);
+
+ btnSetup = new QPushButton(this);
+ btnSetup->setText(QPushButton::tr("Setup"));
+ pageLayout->addWidget(btnSetup, 1, 0);
+
+ pNetTeamsWidget = new TeamSelWidget(this);
+ pNetTeamsWidget->setAcceptOuter(true);
+ pageLayout->addWidget(pNetTeamsWidget, 0, 1, 2, 1);
+
+ return pageLayout;
+}
+
+QLayout * PageNetGame::footerLayoutDefinition()
+{
+ QHBoxLayout * bottomLayout = new QHBoxLayout;
+
+ leRoomName = new QLineEdit(this);
+ leRoomName->setMaxLength(60);
+ leRoomName->setMinimumWidth(200);
+ leRoomName->setMaximumWidth(400);
+
+ BtnGo = new QPushButton(this);
+ BtnGo->setToolTip(QPushButton::tr("Ready"));
+ BtnGo->setIcon(QIcon(":/res/lightbulb_off.png"));
+ BtnGo->setIconSize(QSize(25, 34));
+ BtnGo->setMinimumWidth(50);
+ BtnGo->setMinimumHeight(50);
+
+
+ bottomLayout->addWidget(leRoomName);
+ BtnUpdate = addButton(QAction::tr("Update"), bottomLayout, 1, false);
+ bottomLayout->addWidget(BtnGo);
+
+ BtnMaster = addButton(tr("Control"), bottomLayout, 3);
+ bottomLayout->insertStretch(3, 100);
+
+ BtnStart = addButton(QAction::tr("Start"), bottomLayout, 3);
+
+ return bottomLayout;
+}
+
+void PageNetGame::connectSignals()
+{
+ connect(btnSetup, SIGNAL(clicked()), this, SIGNAL(SetupClicked()));
+
+ connect(BtnUpdate, SIGNAL(clicked()), this, SLOT(onUpdateClick()));
+}
+
+PageNetGame::PageNetGame(QWidget* parent, QSettings * gameSettings, SDLInteraction * sdli) : AbstractPage(parent)
+{
+ m_gameSettings = gameSettings;
+ m_sdli = sdli;
+
+ initPage();
+
+ QMenu * menu = new QMenu(BtnMaster);
+
+ restrictJoins = new QAction(QAction::tr("Restrict Joins"), menu);
+ restrictJoins->setCheckable(true);
+ restrictTeamAdds = new QAction(QAction::tr("Restrict Team Additions"), menu);
+ restrictTeamAdds->setCheckable(true);
+ //menu->addAction(startGame);
+ menu->addAction(restrictJoins);
+ menu->addAction(restrictTeamAdds);
+
+ BtnMaster->setMenu(menu);
+
+}
+
+void PageNetGame::setReadyStatus(bool isReady)
+{
+ if(isReady)
+ BtnGo->setIcon(QIcon(":/res/lightbulb_on.png"));
+ else
+ BtnGo->setIcon(QIcon(":/res/lightbulb_off.png"));
+}
+
+void PageNetGame::onUpdateClick()
+{
+ if (leRoomName->text().size())
+ emit askForUpdateRoomName(leRoomName->text());
+ else
+ QMessageBox::critical(this,
+ tr("Error"),
+ tr("Please enter room name"),
+ tr("OK"));
+}
+
+void PageNetGame::setMasterMode(bool isMaster)
+{
+ BtnMaster->setVisible(isMaster);
+ BtnStart->setVisible(isMaster);
+ BtnUpdate->setVisible(isMaster);
+ leRoomName->setVisible(isMaster);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagenetgame.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,71 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_NETGAME_H
+#define PAGE_NETGAME_H
+
+#include "AbstractPage.h"
+#include "SDLs.h"
+
+class HWChatWidget;
+class TeamSelWidget;
+class GameCFGWidget;
+
+class PageNetGame : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageNetGame(QWidget* parent, QSettings * gameSettings, SDLInteraction * sdli);
+
+ QPushButton *BtnGo;
+ QPushButton *BtnMaster;
+ QPushButton *BtnStart;
+ QPushButton *BtnUpdate;
+
+ QLineEdit * leRoomName;
+
+ QAction * restrictJoins;
+ QAction * restrictTeamAdds;
+
+ HWChatWidget* pChatWidget;
+
+ TeamSelWidget* pNetTeamsWidget;
+ GameCFGWidget* pGameCFG;
+
+public slots:
+ void setReadyStatus(bool isReady);
+ void onUpdateClick();
+ void setMasterMode(bool isMaster);
+
+signals:
+ void SetupClicked();
+ void askForUpdateRoomName(const QString &);
+
+private:
+ QLayout * bodyLayoutDefinition();
+ QLayout * footerLayoutDefinition();
+ void connectSignals();
+
+ QSettings * m_gameSettings;
+ SDLInteraction * m_sdli;
+
+ QPushButton * btnSetup;
+};
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagenetserver.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,100 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QSpinBox>
+
+#include "pagenetserver.h"
+
+QLayout * PageNetServer::bodyLayoutDefinition()
+{
+ QVBoxLayout * pageLayout = new QVBoxLayout();
+
+ QWidget * wg = new QWidget(this);
+ pageLayout->addWidget(wg);
+
+ QGridLayout * wgLayout = new QGridLayout(wg);
+ wgLayout->setColumnStretch(0, 1);
+ wgLayout->setColumnStretch(1, 3);
+ wgLayout->setColumnStretch(2, 1);
+
+ wgLayout->setRowStretch(0, 0);
+ wgLayout->setRowStretch(1, 1);
+
+ QGroupBox * gb = new QGroupBox(wg);
+ wgLayout->addWidget(gb, 0, 1);
+
+ QGridLayout * gbLayout = new QGridLayout(gb);
+
+ labelSD = new QLabel(gb);
+ labelSD->setText(QLabel::tr("Server name:"));
+ gbLayout->addWidget(labelSD, 0, 0);
+
+ leServerDescr = new QLineEdit(gb);
+ gbLayout->addWidget(leServerDescr, 0, 1);
+
+ labelPort = new QLabel(gb);
+ labelPort->setText(QLabel::tr("Server port:"));
+ gbLayout->addWidget(labelPort, 1, 0);
+
+ sbPort = new QSpinBox(gb);
+ sbPort->setMinimum(0);
+ sbPort->setMaximum(65535);
+ gbLayout->addWidget(sbPort, 1, 1);
+
+ BtnDefault = new QPushButton(gb);
+ BtnDefault->setText(QPushButton::tr("default"));
+ gbLayout->addWidget(BtnDefault, 1, 2);
+
+ return pageLayout;
+}
+
+QLayout * PageNetServer::footerLayoutDefinition()
+{
+ QHBoxLayout * bottomLayout = new QHBoxLayout();
+
+ BtnStart = new QPushButton(this);
+ BtnStart->setFont(*font14);
+ BtnStart->setText(QPushButton::tr("Start"));
+
+ bottomLayout->addStretch();
+ bottomLayout->addWidget(BtnStart);
+
+ return bottomLayout;
+}
+
+void PageNetServer::connectSignals()
+{
+ connect(BtnDefault, SIGNAL(clicked()), this, SLOT(setDefaultPort()));
+}
+
+PageNetServer::PageNetServer(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
+
+void PageNetServer::setDefaultPort()
+{
+ sbPort->setValue(46631);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagenetserver.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,47 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_NETSERVER_H
+#define PAGE_NETSERVER_H
+
+#include "AbstractPage.h"
+
+class PageNetServer : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageNetServer(QWidget* parent = 0);
+
+ QPushButton *BtnStart;
+ QPushButton *BtnDefault;
+ QLabel *labelSD;
+ QLineEdit *leServerDescr;
+ QLabel *labelPort;
+ QSpinBox *sbPort;
+
+protected:
+ QLayout * bodyLayoutDefinition();
+ QLayout * footerLayoutDefinition();
+ void connectSignals();
+
+private slots:
+ void setDefaultPort();
+};
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagenettype.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,47 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QPushButton>
+
+#include "pagenettype.h"
+
+
+QLayout * PageNetType::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+ pageLayout->setRowStretch(0, 10);
+ pageLayout->setRowStretch(3, 10);
+
+ pageLayout->setColumnStretch(1, 10);
+ pageLayout->setColumnStretch(2, 20);
+ pageLayout->setColumnStretch(3, 10);
+
+ BtnLAN = addButton(tr("LAN game"), pageLayout, 1, 2);
+ BtnOfficialServer = addButton(tr("Official server"), pageLayout, 2, 2);
+
+ // hack: temporary deactivated - requires server modifications that aren't backward compatible (yet)
+ //BtnOfficialServer->setEnabled(false);
+
+ return pageLayout;
+}
+
+PageNetType::PageNetType(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagenettype.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,38 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_NETTYPE_H
+#define PAGE_NETTYPE_H
+
+#include "AbstractPage.h"
+
+class PageNetType : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageNetType(QWidget* parent = 0);
+
+ QPushButton * BtnLAN;
+ QPushButton * BtnOfficialServer;
+
+protected:
+ QLayout * bodyLayoutDefinition();
+};
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageoptions.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,492 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QGroupBox>
+#include <QComboBox>
+#include <QCheckBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QSpinBox>
+#include <QTextBrowser>
+#include <QTableWidget>
+#include <QSlider>
+
+#include "pageoptions.h"
+#include "hwconsts.h"
+#include "fpsedit.h"
+#include "igbox.h"
+
+// TODO cleanup
+QLayout * PageOptions::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+ pageLayout->setColumnStretch(0, 100);
+ pageLayout->setColumnStretch(1, 100);
+ pageLayout->setColumnStretch(2, 100);
+ pageLayout->setRowStretch(0, 0);
+ //pageLayout->setRowStretch(1, 100);
+ pageLayout->setRowStretch(2, 0);
+ pageLayout->setContentsMargins(7, 7, 7, 0);
+ pageLayout->setSpacing(0);
+
+
+ QGroupBox * gbTwoBoxes = new QGroupBox(this);
+ pageLayout->addWidget(gbTwoBoxes, 0, 0, 1, 3);
+ QGridLayout * gbTBLayout = new QGridLayout(gbTwoBoxes);
+ gbTBLayout->setMargin(0);
+ gbTBLayout->setSpacing(0);
+ gbTBLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+
+ QPixmap pmNew(":/res/new.png");
+ QPixmap pmEdit(":/res/edit.png");
+ QPixmap pmDelete(":/res/delete.png");
+
+ {
+ teamsBox = new IconedGroupBox(this);
+ //teamsBox->setContentTopPadding(0);
+ //teamsBox->setAttribute(Qt::WA_PaintOnScreen, true);
+ teamsBox->setIcon(QIcon(":/res/teamicon.png"));
+ teamsBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ teamsBox->setTitle(QGroupBox::tr("Teams"));
+
+ QGridLayout * GBTlayout = new QGridLayout(teamsBox);
+
+ CBTeamName = new QComboBox(teamsBox);
+ GBTlayout->addWidget(CBTeamName, 0, 0);
+
+ BtnNewTeam = new QPushButton(teamsBox);
+ BtnNewTeam->setToolTip(tr("New team"));
+ BtnNewTeam->setIconSize(pmNew.size());
+ BtnNewTeam->setIcon(pmNew);
+ BtnNewTeam->setMaximumWidth(pmNew.width() + 6);
+ connect(BtnNewTeam, SIGNAL(clicked()), this, SIGNAL(newTeamRequested()));
+ GBTlayout->addWidget(BtnNewTeam, 0, 1);
+
+ BtnEditTeam = new QPushButton(teamsBox);
+ BtnEditTeam->setToolTip(tr("Edit team"));
+ BtnEditTeam->setIconSize(pmEdit.size());
+ BtnEditTeam->setIcon(pmEdit);
+ BtnEditTeam->setMaximumWidth(pmEdit.width() + 6);
+ connect(BtnEditTeam, SIGNAL(clicked()), this, SLOT(requestEditSelectedTeam()));
+ GBTlayout->addWidget(BtnEditTeam, 0, 2);
+
+ BtnDeleteTeam = new QPushButton(teamsBox);
+ BtnDeleteTeam->setToolTip(tr("Delete team"));
+ BtnDeleteTeam->setIconSize(pmDelete.size());
+ BtnDeleteTeam->setIcon(pmDelete);
+ BtnDeleteTeam->setMaximumWidth(pmDelete.width() + 6);
+ connect(BtnDeleteTeam, SIGNAL(clicked()), this, SLOT(requestDeleteSelectedTeam()));
+ GBTlayout->addWidget(BtnDeleteTeam, 0, 3);
+
+ LblNoEditTeam = new QLabel(teamsBox);
+ LblNoEditTeam->setText(tr("You can't edit teams from team selection. Go back to main menu to add, edit or delete teams."));
+ LblNoEditTeam->setWordWrap(true);
+ LblNoEditTeam->setVisible(false);
+ GBTlayout->addWidget(LblNoEditTeam, 0, 0);
+
+ gbTBLayout->addWidget(teamsBox, 0, 0);
+ }
+
+ {
+ IconedGroupBox* groupWeapons = new IconedGroupBox(this);
+
+ //groupWeapons->setContentTopPadding(0);
+ //groupWeapons->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ groupWeapons->setIcon(QIcon(":/res/weaponsicon.png"));
+ groupWeapons->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ groupWeapons->setTitle(QGroupBox::tr("Schemes and Weapons"));
+ QGridLayout * WeaponsLayout = new QGridLayout(groupWeapons);
+
+ QLabel* SchemeLabel = new QLabel(groupWeapons);
+ SchemeLabel->setText(QLabel::tr("Game scheme"));
+ WeaponsLayout->addWidget(SchemeLabel, 1, 0);
+
+ SchemesName = new QComboBox(groupWeapons);
+ WeaponsLayout->addWidget(SchemesName, 1, 1);
+
+ SchemeNew = new QPushButton(groupWeapons);
+ SchemeNew->setToolTip(tr("New scheme"));
+ SchemeNew->setIconSize(pmNew.size());
+ SchemeNew->setIcon(pmNew);
+ SchemeNew->setMaximumWidth(pmNew.width() + 6);
+ WeaponsLayout->addWidget(SchemeNew, 1, 2);
+
+ SchemeEdit = new QPushButton(groupWeapons);
+ SchemeEdit->setToolTip(tr("Edit scheme"));
+ SchemeEdit->setIconSize(pmEdit.size());
+ SchemeEdit->setIcon(pmEdit);
+ SchemeEdit->setMaximumWidth(pmEdit.width() + 6);
+ WeaponsLayout->addWidget(SchemeEdit, 1, 3);
+
+ SchemeDelete = new QPushButton(groupWeapons);
+ SchemeDelete->setToolTip(tr("Delete scheme"));
+ SchemeDelete->setIconSize(pmDelete.size());
+ SchemeDelete->setIcon(pmDelete);
+ SchemeDelete->setMaximumWidth(pmDelete.width() + 6);
+ WeaponsLayout->addWidget(SchemeDelete, 1, 4);
+
+ QLabel* WeaponLabel = new QLabel(groupWeapons);
+ WeaponLabel->setText(QLabel::tr("Weapons"));
+ WeaponsLayout->addWidget(WeaponLabel, 2, 0);
+
+ WeaponsName = new QComboBox(groupWeapons);
+ WeaponsLayout->addWidget(WeaponsName, 2, 1);
+
+ WeaponNew = new QPushButton(groupWeapons);
+ WeaponNew->setToolTip(tr("New weapon set"));
+ WeaponNew->setIconSize(pmNew.size());
+ WeaponNew->setIcon(pmNew);
+ WeaponNew->setMaximumWidth(pmNew.width() + 6);
+ WeaponsLayout->addWidget(WeaponNew, 2, 2);
+
+ WeaponEdit = new QPushButton(groupWeapons);
+ WeaponEdit->setToolTip(tr("Edit weapon set"));
+ WeaponEdit->setIconSize(pmEdit.size());
+ WeaponEdit->setIcon(pmEdit);
+ WeaponEdit->setMaximumWidth(pmEdit.width() + 6);
+ WeaponsLayout->addWidget(WeaponEdit, 2, 3);
+
+ WeaponDelete = new QPushButton(groupWeapons);
+ WeaponDelete->setToolTip(tr("Delete weapon set"));
+ WeaponDelete->setIconSize(pmDelete.size());
+ WeaponDelete->setIcon(pmDelete);
+ WeaponDelete->setMaximumWidth(pmDelete.width() + 6);
+ WeaponsLayout->addWidget(WeaponDelete, 2, 4);
+
+ WeaponTooltip = new QCheckBox(this);
+ WeaponTooltip->setText(QCheckBox::tr("Show ammo menu tooltips"));
+ WeaponsLayout->addWidget(WeaponTooltip, 3, 0, 1, 4);
+
+ gbTBLayout->addWidget(groupWeapons, 1, 0);
+ }
+
+ {
+ IconedGroupBox* groupMisc = new IconedGroupBox(this);
+ //groupMisc->setContentTopPadding(0);
+ groupMisc->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ groupMisc->setIcon(QIcon(":/res/miscicon.png"));
+ //groupMisc->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ groupMisc->setTitle(QGroupBox::tr("Misc"));
+ QGridLayout * MiscLayout = new QGridLayout(groupMisc);
+
+ labelNN = new QLabel(groupMisc);
+ labelNN->setText(QLabel::tr("Net nick"));
+ MiscLayout->addWidget(labelNN, 0, 0);
+
+ editNetNick = new QLineEdit(groupMisc);
+ editNetNick->setMaxLength(20);
+ editNetNick->setText(QLineEdit::tr("unnamed"));
+ connect(editNetNick, SIGNAL(editingFinished()), this, SLOT(trimNetNick()));
+ MiscLayout->addWidget(editNetNick, 0, 1);
+
+ labelNetPassword = new QLabel(groupMisc);
+ labelNetPassword->setText(QLabel::tr("Password"));
+ MiscLayout->addWidget(labelNetPassword, 1, 0);
+
+ editNetPassword = new QLineEdit(groupMisc);
+ editNetPassword->setEchoMode(QLineEdit::Password);
+ MiscLayout->addWidget(editNetPassword, 1, 1);
+
+ QLabel *labelLanguage = new QLabel(groupMisc);
+ labelLanguage->setText(QLabel::tr("Locale") + " *");
+ MiscLayout->addWidget(labelLanguage, 2, 0);
+
+ CBLanguage = new QComboBox(groupMisc);
+ QDir tmpdir;
+ tmpdir.cd(cfgdir->absolutePath());
+ tmpdir.cd("Data/Locale");
+ tmpdir.setFilter(QDir::Files);
+ QStringList locs = tmpdir.entryList(QStringList("hedgewars_*.qm"));
+ CBLanguage->addItem(QComboBox::tr("(System default)"), QString(""));
+ for(int i = 0; i < locs.count(); i++)
+ {
+ QLocale loc(locs[i].replace(QRegExp("hedgewars_(.*)\\.qm"), "\\1"));
+ CBLanguage->addItem(QLocale::languageToString(loc.language()) + " (" + QLocale::countryToString(loc.country()) + ")", loc.name());
+ }
+
+ tmpdir.cd(datadir->absolutePath());
+ tmpdir.cd("Locale");
+ tmpdir.setFilter(QDir::Files);
+ QStringList tmplist = tmpdir.entryList(QStringList("hedgewars_*.qm"));
+ for(int i = 0; i < tmplist.count(); i++)
+ {
+ if (locs.contains(tmplist[i])) continue;
+ QLocale loc(tmplist[i].replace(QRegExp("hedgewars_(.*)\\.qm"), "\\1"));
+ CBLanguage->addItem(QLocale::languageToString(loc.language()) + " (" + QLocale::countryToString(loc.country()) + ")", loc.name());
+ }
+
+ MiscLayout->addWidget(CBLanguage, 2, 1);
+
+ CBAltDamage = new QCheckBox(groupMisc);
+ CBAltDamage->setText(QCheckBox::tr("Alternative damage show"));
+ MiscLayout->addWidget(CBAltDamage, 3, 0, 1, 2);
+
+ CBNameWithDate = new QCheckBox(groupMisc);
+ CBNameWithDate->setText(QCheckBox::tr("Append date and time to record file name"));
+ MiscLayout->addWidget(CBNameWithDate, 4, 0, 1, 2);
+
+ BtnAssociateFiles = new QPushButton(groupMisc);
+ BtnAssociateFiles->setText(QPushButton::tr("Associate file extensions"));
+ BtnAssociateFiles->setEnabled(!custom_data && !custom_config);
+ MiscLayout->addWidget(BtnAssociateFiles, 5, 0, 1, 2);
+
+#ifdef __APPLE__
+#ifdef SPARKLE_ENABLED
+ CBAutoUpdate = new QCheckBox(groupMisc);
+ CBAutoUpdate->setText(QCheckBox::tr("Check for updates at startup"));
+ MiscLayout->addWidget(CBAutoUpdate, 6, 0, 1, 3);
+#endif
+#endif
+ gbTBLayout->addWidget(groupMisc, 2, 0);
+ }
+
+ {
+ AGGroupBox = new IconedGroupBox(this);
+ //AGGroupBox->setContentTopPadding(0);
+ AGGroupBox->setIcon(QIcon(":/res/graphicsicon.png"));
+ //AGGroupBox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+ AGGroupBox->setTitle(QGroupBox::tr("Audio/Graphic options"));
+
+ QVBoxLayout * GBAlayout = new QVBoxLayout(AGGroupBox);
+ QHBoxLayout * GBAreslayout = new QHBoxLayout(0);
+ QHBoxLayout * GBAstereolayout = new QHBoxLayout(0);
+ QHBoxLayout * GBAqualayout = new QHBoxLayout(0);
+
+ CBFrontendFullscreen = new QCheckBox(AGGroupBox);
+ CBFrontendFullscreen->setText(QCheckBox::tr("Frontend fullscreen"));
+ GBAlayout->addWidget(CBFrontendFullscreen);
+
+ CBFrontendEffects = new QCheckBox(AGGroupBox);
+ CBFrontendEffects->setText(QCheckBox::tr("Frontend effects") + " *");
+ GBAlayout->addWidget(CBFrontendEffects);
+
+ CBEnableFrontendSound = new QCheckBox(AGGroupBox);
+ CBEnableFrontendSound->setText(QCheckBox::tr("Enable frontend sounds"));
+ GBAlayout->addWidget(CBEnableFrontendSound);
+
+ CBEnableFrontendMusic = new QCheckBox(AGGroupBox);
+ CBEnableFrontendMusic->setText(QCheckBox::tr("Enable frontend music"));
+ GBAlayout->addWidget(CBEnableFrontendMusic);
+
+ QFrame * hr = new QFrame(AGGroupBox);
+ hr->setFrameStyle(QFrame::HLine);
+ hr->setLineWidth(3);
+ hr->setFixedHeight(10);
+ GBAlayout->addWidget(hr);
+
+ QLabel * resolution = new QLabel(AGGroupBox);
+ resolution->setText(QLabel::tr("Resolution"));
+ GBAreslayout->addWidget(resolution);
+
+ CBResolution = new QComboBox(AGGroupBox);
+ GBAreslayout->addWidget(CBResolution);
+ GBAlayout->addLayout(GBAreslayout);
+
+ CBFullscreen = new QCheckBox(AGGroupBox);
+ CBFullscreen->setText(QCheckBox::tr("Fullscreen"));
+ GBAlayout->addWidget(CBFullscreen);
+
+ QLabel * quality = new QLabel(AGGroupBox);
+ quality->setText(QLabel::tr("Quality"));
+ quality->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ GBAqualayout->addWidget(quality);
+
+ SLQuality = new QSlider(Qt::Horizontal, AGGroupBox);
+ SLQuality->setTickPosition(QSlider::TicksBelow);
+ SLQuality->setMaximum(5);
+ SLQuality->setMinimum(0);
+ SLQuality->setFixedWidth(150);
+ GBAqualayout->addWidget(SLQuality);
+ GBAlayout->addLayout(GBAqualayout);
+
+ QLabel * stereo = new QLabel(AGGroupBox);
+ stereo->setText(QLabel::tr("Stereo rendering"));
+ GBAstereolayout->addWidget(stereo);
+
+ CBStereoMode = new QComboBox(AGGroupBox);
+ CBStereoMode->addItem(QComboBox::tr("Disabled"));
+ CBStereoMode->addItem(QComboBox::tr("Red/Cyan"));
+ CBStereoMode->addItem(QComboBox::tr("Cyan/Red"));
+ CBStereoMode->addItem(QComboBox::tr("Red/Blue"));
+ CBStereoMode->addItem(QComboBox::tr("Blue/Red"));
+ CBStereoMode->addItem(QComboBox::tr("Red/Green"));
+ CBStereoMode->addItem(QComboBox::tr("Green/Red"));
+ CBStereoMode->addItem(QComboBox::tr("Side-by-side"));
+ CBStereoMode->addItem(QComboBox::tr("Top-Bottom"));
+ CBStereoMode->addItem(QComboBox::tr("Wiggle"));
+ CBStereoMode->addItem(QComboBox::tr("Red/Cyan grayscale"));
+ CBStereoMode->addItem(QComboBox::tr("Cyan/Red grayscale"));
+ CBStereoMode->addItem(QComboBox::tr("Red/Blue grayscale"));
+ CBStereoMode->addItem(QComboBox::tr("Blue/Red grayscale"));
+ CBStereoMode->addItem(QComboBox::tr("Red/Green grayscale"));
+ CBStereoMode->addItem(QComboBox::tr("Green/Red grayscale"));
+ connect(CBStereoMode, SIGNAL(currentIndexChanged(int)), this, SLOT(forceFullscreen(int)));
+
+ GBAstereolayout->addWidget(CBStereoMode);
+ GBAlayout->addLayout(GBAstereolayout);
+
+ hr = new QFrame(AGGroupBox);
+ hr->setFrameStyle(QFrame::HLine);
+ hr->setLineWidth(3);
+ hr->setFixedHeight(10);
+ GBAlayout->addWidget(hr);
+
+ QHBoxLayout * GBAvollayout = new QHBoxLayout(0);
+ QLabel * vol = new QLabel(AGGroupBox);
+ vol->setText(QLabel::tr("Initial sound volume"));
+ GBAvollayout->addWidget(vol);
+ GBAlayout->addLayout(GBAvollayout);
+ volumeBox = new QSpinBox(AGGroupBox);
+ volumeBox->setRange(0, 100);
+ volumeBox->setSingleStep(5);
+ GBAvollayout->addWidget(volumeBox);
+
+ CBEnableSound = new QCheckBox(AGGroupBox);
+ CBEnableSound->setText(QCheckBox::tr("Enable sound"));
+ GBAlayout->addWidget(CBEnableSound);
+
+ CBEnableMusic = new QCheckBox(AGGroupBox);
+ CBEnableMusic->setText(QCheckBox::tr("Enable music"));
+ GBAlayout->addWidget(CBEnableMusic);
+
+ hr = new QFrame(AGGroupBox);
+ hr->setFrameStyle(QFrame::HLine);
+ hr->setLineWidth(3);
+ hr->setFixedHeight(10);
+ GBAlayout->addWidget(hr);
+
+ QHBoxLayout * GBAfpslayout = new QHBoxLayout(0);
+ QLabel * maxfps = new QLabel(AGGroupBox);
+ maxfps->setText(QLabel::tr("FPS limit"));
+ GBAfpslayout->addWidget(maxfps);
+ GBAlayout->addLayout(GBAfpslayout);
+ fpsedit = new FPSEdit(AGGroupBox);
+ GBAfpslayout->addWidget(fpsedit);
+
+ CBShowFPS = new QCheckBox(AGGroupBox);
+ CBShowFPS->setText(QCheckBox::tr("Show FPS"));
+ GBAlayout->addWidget(CBShowFPS);
+
+ hr = new QFrame(AGGroupBox);
+ hr->setFrameStyle(QFrame::HLine);
+ hr->setLineWidth(3);
+ hr->setFixedHeight(10);
+ GBAlayout->addWidget(hr);
+
+ QLabel *restartNote = new QLabel(this);
+ restartNote->setText(QString("* ") + QLabel::tr("Restart game to apply"));
+ restartNote->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+ GBAlayout->addWidget(restartNote);
+
+ gbTBLayout->addWidget(AGGroupBox, 0, 1, 3, 1);
+ }
+
+ previousQuality = this->SLQuality->value();
+ previousResolutionIndex = this->CBResolution->currentIndex();
+ previousFullscreenValue = this->CBFullscreen->isChecked();
+
+ return pageLayout;
+}
+
+QLayout * PageOptions::footerLayoutDefinition()
+{
+ QHBoxLayout * bottomLayout = new QHBoxLayout();
+ btnSave = addButton(":/res/Save.png", bottomLayout, 0, true);
+ btnSave->setStyleSheet("QPushButton{margin: 24px 0 0 0;}");
+ bottomLayout->setAlignment(btnSave, Qt::AlignRight | Qt::AlignBottom);
+ return bottomLayout;
+}
+
+void PageOptions::connectSignals()
+{
+ connect(CBResolution, SIGNAL(currentIndexChanged(int)), this, SLOT(setResolution(int)));
+ connect(CBFullscreen, SIGNAL(stateChanged(int)), this, SLOT(setFullscreen(int)));
+ connect(SLQuality, SIGNAL(valueChanged(int)), this, SLOT(setQuality(int)));
+}
+
+PageOptions::PageOptions(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
+
+void PageOptions::forceFullscreen(int index)
+{
+ bool forced = (index == 7 || index == 8 || index == 9);
+
+ if (index != 0) {
+ this->SLQuality->setValue(this->SLQuality->maximum());
+ this->SLQuality->setEnabled(false);
+ this->CBFullscreen->setEnabled(!forced);
+ this->CBFullscreen->setChecked(forced ? true : previousFullscreenValue);
+ this->CBResolution->setCurrentIndex(forced ? 0 : previousResolutionIndex);
+ } else {
+ this->SLQuality->setEnabled(true);
+ this->CBFullscreen->setEnabled(true);
+ this->SLQuality->setValue(previousQuality);
+ this->CBFullscreen->setChecked(previousFullscreenValue);
+ this->CBResolution->setCurrentIndex(previousResolutionIndex);
+ }
+}
+
+void PageOptions::setQuality(int value)
+{
+ int index = this->CBStereoMode->currentIndex();
+ if (index == 0)
+ previousQuality = this->SLQuality->value();
+}
+
+void PageOptions::setFullscreen(int state)
+{
+ int index = this->CBStereoMode->currentIndex();
+ if (index != 7 && index != 8 && index != 9)
+ previousFullscreenValue = this->CBFullscreen->isChecked();
+}
+
+void PageOptions::setResolution(int state)
+{
+ int index = this->CBStereoMode->currentIndex();
+ if (index != 7 && index != 8 && index != 9)
+ previousResolutionIndex = this->CBResolution->currentIndex();
+}
+
+void PageOptions::trimNetNick()
+{
+ editNetNick->setText(editNetNick->text().trimmed());
+}
+
+void PageOptions::requestEditSelectedTeam()
+{
+ emit editTeamRequested(CBTeamName->currentText());
+}
+
+void PageOptions::requestDeleteSelectedTeam()
+{
+ emit deleteTeamRequested(CBTeamName->currentText());
+}
+
+void PageOptions::setTeamOptionsEnabled(bool enabled)
+{
+ BtnNewTeam->setVisible(enabled);
+ BtnEditTeam->setVisible(enabled);
+ BtnDeleteTeam->setVisible(enabled);
+ CBTeamName->setVisible(enabled);
+ LblNoEditTeam->setVisible(!enabled);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageoptions.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,107 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_OPTIONS_H
+#define PAGE_OPTIONS_H
+
+#include "AbstractPage.h"
+
+class FPSEdit;
+class IconedGroupBox;
+
+class PageOptions : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageOptions(QWidget* parent = 0);
+
+ QCheckBox *WeaponTooltip;
+ QPushButton *WeaponNew;
+ QPushButton *WeaponEdit;
+ QPushButton *WeaponDelete;
+ QComboBox *WeaponsName;
+ QPushButton *SchemeNew;
+ QPushButton *SchemeEdit;
+ QPushButton *SchemeDelete;
+ QComboBox *SchemesName;
+
+ QComboBox *CBLanguage;
+
+ IconedGroupBox *teamsBox;;
+ QPushButton *BtnAssociateFiles;
+ QComboBox *CBTeamName;
+ IconedGroupBox *AGGroupBox;
+ QComboBox *CBResolution;
+ QComboBox *CBStereoMode;
+ QCheckBox *CBEnableSound;
+ QCheckBox *CBEnableFrontendSound;
+ QCheckBox *CBEnableMusic;
+ QCheckBox *CBEnableFrontendMusic;
+ QCheckBox *CBFullscreen;
+ QCheckBox *CBFrontendFullscreen;
+ QCheckBox *CBShowFPS;
+ QCheckBox *CBAltDamage;
+ QCheckBox *CBNameWithDate;
+#ifdef __APPLE__
+ QCheckBox *CBAutoUpdate;
+#endif
+
+ FPSEdit *fpsedit;
+ QPushButton *btnSave;
+ QLabel *labelNN;
+ QLabel *labelNetPassword;
+ QSpinBox * volumeBox;
+ QLineEdit *editNetNick;
+ QLineEdit *editNetPassword;
+ QSlider *SLQuality;
+ QCheckBox *CBFrontendEffects;
+
+ void setTeamOptionsEnabled(bool enabled);
+
+signals:
+ void newTeamRequested();
+ void editTeamRequested(const QString & teamName);
+ void deleteTeamRequested(const QString & teamName);
+
+
+private:
+ QLayout * bodyLayoutDefinition();
+ QLayout * footerLayoutDefinition();
+ void connectSignals();
+
+ bool previousFullscreenValue;
+ int previousResolutionIndex;
+ int previousQuality;
+ QLabel *LblNoEditTeam;
+ QPushButton *BtnNewTeam;
+ QPushButton *BtnEditTeam;
+ QPushButton *BtnDeleteTeam;
+
+private slots:
+ void forceFullscreen(int index);
+ void setFullscreen(int state);
+ void setResolution(int state);
+ void setQuality(int value);
+ void trimNetNick();
+ void requestEditSelectedTeam();
+ void requestDeleteSelectedTeam();
+};
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageplayrecord.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,165 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QFont>
+#include <QGridLayout>
+#include <QPushButton>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QInputDialog>
+
+#include "hwconsts.h"
+#include "pageplayrecord.h"
+
+QLayout * PagePlayDemo::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+
+ pageLayout->setColumnStretch(0, 1);
+ pageLayout->setColumnStretch(1, 2);
+ pageLayout->setColumnStretch(2, 1);
+ pageLayout->setRowStretch(2, 100);
+
+ BtnPlayDemo = new QPushButton(this);
+ BtnPlayDemo->setFont(*font14);
+ BtnPlayDemo->setText(QPushButton::tr("Play demo"));
+ pageLayout->addWidget(BtnPlayDemo, 3, 2);
+
+ BtnRenameRecord = new QPushButton(this);
+ BtnRenameRecord->setText(QPushButton::tr("Rename"));
+ pageLayout->addWidget(BtnRenameRecord, 0, 2);
+
+ BtnRemoveRecord = new QPushButton(this);
+ BtnRemoveRecord->setText(QPushButton::tr("Delete"));
+ pageLayout->addWidget(BtnRemoveRecord, 1, 2);
+
+ DemosList = new QListWidget(this);
+ DemosList->setGeometry(QRect(170, 10, 311, 311));
+ pageLayout->addWidget(DemosList, 0, 1, 3, 1);
+
+ return pageLayout;
+}
+
+void PagePlayDemo::connectSignals()
+{
+ connect(BtnRenameRecord, SIGNAL(clicked()), this, SLOT(renameRecord()));
+ connect(BtnRemoveRecord, SIGNAL(clicked()), this, SLOT(removeRecord()));
+}
+
+PagePlayDemo::PagePlayDemo(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
+
+void PagePlayDemo::FillFromDir(RecordType rectype)
+{
+ QDir dir;
+ QString extension;
+
+ recType = rectype;
+
+ dir.cd(cfgdir->absolutePath());
+ if (rectype == RT_Demo)
+ {
+ dir.cd("Demos");
+ extension = "hwd";
+ BtnPlayDemo->setText(QPushButton::tr("Play demo"));
+ } else
+ {
+ dir.cd("Saves");
+ extension = "hws";
+ BtnPlayDemo->setText(QPushButton::tr("Load"));
+ }
+ dir.setFilter(QDir::Files);
+
+ QStringList sl = dir.entryList(QStringList(QString("*.%2.%1").arg(extension, *cProtoVer)));
+ sl.replaceInStrings(QRegExp(QString("^(.*)\\.%2\\.%1$").arg(extension, *cProtoVer)), "\\1");
+
+ DemosList->clear();
+ DemosList->addItems(sl);
+
+ for (int i = 0; i < DemosList->count(); ++i)
+ {
+ DemosList->item(i)->setData(Qt::UserRole, dir.absoluteFilePath(QString("%1.%3.%2").arg(sl[i], extension, *cProtoVer)));
+ DemosList->item(i)->setIcon(recType == RT_Demo ? QIcon(":/res/file_demo.png") : QIcon(":/res/file_save.png"));
+ }
+}
+
+void PagePlayDemo::renameRecord()
+{
+ QListWidgetItem * curritem = DemosList->currentItem();
+ if (!curritem)
+ {
+ QMessageBox::critical(this,
+ tr("Error"),
+ tr("Please select record from the list"),
+ tr("OK"));
+ return ;
+ }
+ QFile rfile(curritem->data(Qt::UserRole).toString());
+
+ QFileInfo finfo(rfile);
+
+ bool ok;
+
+ QString newname = QInputDialog::getText(this, tr("Rename dialog"), tr("Enter new file name:"), QLineEdit::Normal, finfo.completeBaseName().replace("." + *cProtoVer, ""), &ok);
+
+ if(ok && newname.size())
+ {
+ QString newfullname = QString("%1/%2.%3.%4")
+ .arg(finfo.absolutePath())
+ .arg(newname)
+ .arg(*cProtoVer)
+ .arg(finfo.suffix());
+
+ ok = rfile.rename(newfullname);
+ if(!ok)
+ QMessageBox::critical(this, tr("Error"), tr("Cannot rename to") + newfullname);
+ else
+ FillFromDir(recType);
+ }
+}
+
+void PagePlayDemo::removeRecord()
+{
+ QListWidgetItem * curritem = DemosList->currentItem();
+ if (!curritem)
+ {
+ QMessageBox::critical(this,
+ tr("Error"),
+ tr("Please select record from the list"),
+ tr("OK"));
+ return ;
+ }
+ QFile rfile(curritem->data(Qt::UserRole).toString());
+
+ bool ok;
+
+ ok = rfile.remove();
+ if(!ok)
+ QMessageBox::critical(this, tr("Error"), tr("Cannot delete file"));
+ else
+ FillFromDir(recType);
+}
+
+bool PagePlayDemo::isSave()
+{
+ return recType == RT_Save;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageplayrecord.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,61 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PLAYRECORDPAGE_H
+#define PLAYRECORDPAGE_H
+
+#include <QDir>
+
+#include "AbstractPage.h"
+
+class QPushButton;
+class QListWidget;
+
+class PagePlayDemo : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ enum RecordType {
+ RT_Demo,
+ RT_Save
+ };
+
+ PagePlayDemo(QWidget* parent = 0);
+
+ void FillFromDir(RecordType rectype);
+ bool isSave();
+
+ QPushButton *BtnPlayDemo;
+ QPushButton *BtnRenameRecord;
+ QPushButton *BtnRemoveRecord;
+ QListWidget *DemosList;
+
+private:
+ QLayout * bodyLayoutDefinition();
+ void connectSignals();
+
+ RecordType recType;
+
+private slots:
+ void renameRecord();
+ void removeRecord();
+};
+
+
+#endif // PLAYRECORDPAGE_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageroomslist.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,419 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QPushButton>
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QHeaderView>
+#include <QTableWidget>
+
+#include "ammoSchemeModel.h"
+#include "pageroomslist.h"
+#include "hwconsts.h"
+#include "chatwidget.h"
+
+QLayout * PageRoomsList::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+
+ QHBoxLayout * newRoomLayout = new QHBoxLayout();
+ QLabel * roomNameLabel = new QLabel(this);
+ roomNameLabel->setText(tr("Room Name:"));
+ roomName = new QLineEdit(this);
+ roomName->setMaxLength(60);
+ newRoomLayout->addWidget(roomNameLabel);
+ newRoomLayout->addWidget(roomName);
+ pageLayout->addLayout(newRoomLayout, 0, 0, 1, 2);
+
+ roomsList = new QTableWidget(this);
+ roomsList->setSelectionBehavior(QAbstractItemView::SelectRows);
+ roomsList->verticalHeader()->setVisible(false);
+ roomsList->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
+ roomsList->setAlternatingRowColors(true);
+ roomsList->setShowGrid(false);
+ roomsList->setSelectionMode(QAbstractItemView::SingleSelection);
+ pageLayout->addWidget(roomsList, 1, 0, 3, 2);
+ pageLayout->setRowStretch(2, 100);
+
+ QHBoxLayout * filterLayout = new QHBoxLayout();
+
+ QLabel * stateLabel = new QLabel(this);
+ CBState = new QComboBox(this);
+
+ filterLayout->addWidget(stateLabel);
+ filterLayout->addWidget(CBState);
+ filterLayout->addSpacing(30);
+
+ QLabel * ruleLabel = new QLabel(this);
+ ruleLabel->setText(tr("Rules:"));
+ CBRules = new QComboBox(this);
+
+ filterLayout->addWidget(ruleLabel);
+ filterLayout->addWidget(CBRules);
+ filterLayout->addSpacing(30);
+
+ QLabel * weaponLabel = new QLabel(this);
+ weaponLabel->setText(tr("Weapons:"));
+ CBWeapons = new QComboBox(this);
+
+ filterLayout->addWidget(weaponLabel);
+ filterLayout->addWidget(CBWeapons);
+ filterLayout->addSpacing(30);
+
+ QLabel * searchLabel = new QLabel(this);
+ searchLabel->setText(tr("Search:"));
+ searchText = new QLineEdit(this);
+ searchText->setMaxLength(60);
+ filterLayout->addWidget(searchLabel);
+ filterLayout->addWidget(searchText);
+
+ pageLayout->addLayout(filterLayout, 4, 0, 1, 2);
+
+ chatWidget = new HWChatWidget(this, m_gameSettings, m_sdli, false);
+ pageLayout->addWidget(chatWidget, 5, 0, 1, 3);
+ pageLayout->setRowStretch(5, 350);
+
+ BtnCreate = addButton(tr("Create"), pageLayout, 0, 2);
+ BtnJoin = addButton(tr("Join"), pageLayout, 1, 2);
+ BtnRefresh = addButton(tr("Refresh"), pageLayout, 3, 2);
+ BtnClear = addButton(tr("Clear"), pageLayout, 4, 2);
+
+ CBRules->addItem(QComboBox::tr("Any"));
+ CBState->addItem(QComboBox::tr("Any"));
+ CBState->addItem(QComboBox::tr("In lobby"));
+ CBState->addItem(QComboBox::tr("In progress"));
+
+ return pageLayout;
+}
+
+QLayout * PageRoomsList::footerLayoutDefinition()
+{
+ QGridLayout * bottomLayout = new QGridLayout();
+
+ lblCount = new QLabel(this);
+ bottomLayout->addWidget(lblCount, 0, 0, Qt::AlignHCenter);
+ lblCount->setText("?");
+ lblCount->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+
+ BtnAdmin = addButton(tr("Admin features"), bottomLayout, 6, 2);
+
+ return bottomLayout;
+}
+
+void PageRoomsList::connectSignals()
+{
+ connect(chatWidget, SIGNAL(nickCountUpdate(const int)), this, SLOT(updateNickCounter(const int)));
+
+ connect(BtnCreate, SIGNAL(clicked()), this, SLOT(onCreateClick()));
+ connect(BtnJoin, SIGNAL(clicked()), this, SLOT(onJoinClick()));
+ connect(BtnRefresh, SIGNAL(clicked()), this, SLOT(onRefreshClick()));
+ connect(BtnClear, SIGNAL(clicked()), this, SLOT(onClearClick()));
+ connect(roomsList, SIGNAL(doubleClicked (const QModelIndex &)), this, SLOT(onJoinClick()));
+ connect(CBState, SIGNAL(currentIndexChanged (int)), this, SLOT(onRefreshClick()));
+ connect(CBRules, SIGNAL(currentIndexChanged (int)), this, SLOT(onRefreshClick()));
+ connect(CBWeapons, SIGNAL(currentIndexChanged (int)), this, SLOT(onRefreshClick()));
+ connect(searchText, SIGNAL(textChanged (const QString &)), this, SLOT(onRefreshClick()));
+ connect(this, SIGNAL(askJoinConfirmation (const QString &)), this, SLOT(onJoinConfirmation(const QString &)), Qt::QueuedConnection);
+}
+
+
+PageRoomsList::PageRoomsList(QWidget* parent, QSettings * gameSettings, SDLInteraction * sdli) :
+ AbstractPage(parent)
+{
+ m_gameSettings = gameSettings;
+ m_sdli = sdli;
+
+ initPage();
+
+ // not the most elegant solution but it works
+ ammoSchemeModel = new AmmoSchemeModel(this, NULL);
+ for (int i = 0; i < ammoSchemeModel->predefSchemesNames.count(); i++)
+ CBRules->addItem(ammoSchemeModel->predefSchemesNames.at(i).toAscii().constData());
+
+ CBWeapons->addItem(QComboBox::tr("Any"));
+ for (int i = 0; i < cDefaultAmmos.count(); i++) {
+ QPair<QString,QString> ammo = cDefaultAmmos.at(i);
+ CBWeapons->addItem(ammo.first.toAscii().constData());
+ }
+
+ gameInLobby = false;
+}
+
+void PageRoomsList::setAdmin(bool flag)
+{
+ BtnAdmin->setVisible(flag);
+}
+
+void PageRoomsList::setRoomsList(const QStringList & list)
+{
+ QBrush red(QColor(255, 0, 0));
+ QBrush orange(QColor(127, 127, 0));
+ QBrush yellow(QColor(255, 255, 0));
+ QBrush green(QColor(0, 255, 0));
+
+ listFromServer = list;
+
+ QString selection = "";
+
+ if(QTableWidgetItem *item = roomsList->item(roomsList->currentRow(), 0))
+ selection = item->text();
+
+ roomsList->clear();
+ roomsList->setColumnCount(7);
+ roomsList->setHorizontalHeaderLabels(
+ QStringList() <<
+ QTableWidget::tr("Room Name") <<
+ QTableWidget::tr("C") <<
+ QTableWidget::tr("T") <<
+ QTableWidget::tr("Owner") <<
+ QTableWidget::tr("Map") <<
+ QTableWidget::tr("Rules") <<
+ QTableWidget::tr("Weapons")
+ );
+
+ // set minimum sizes
+// roomsList->horizontalHeader()->resizeSection(0, 200);
+// roomsList->horizontalHeader()->resizeSection(1, 50);
+// roomsList->horizontalHeader()->resizeSection(2, 50);
+// roomsList->horizontalHeader()->resizeSection(3, 100);
+// roomsList->horizontalHeader()->resizeSection(4, 100);
+// roomsList->horizontalHeader()->resizeSection(5, 100);
+// roomsList->horizontalHeader()->resizeSection(6, 100);
+
+ // set resize modes
+// roomsList->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
+
+ bool gameCanBeJoined = true;
+
+ if (list.size() % 8)
+ return;
+
+ roomsList->setRowCount(list.size() / 8);
+ for(int i = 0, r = 0; i < list.size(); i += 8, r++)
+ {
+ // if we are joining a game
+ // TODO: Should NOT be done here
+ if (gameInLobby) {
+ if (gameInLobbyName == list[i + 1]) {
+ gameCanBeJoined = list[i].compare("True");
+ }
+ }
+
+ // check filter settings
+ #define NO_FILTER_MATCH roomsList->setRowCount(roomsList->rowCount() - 1); --r; continue
+
+ if (list[i].compare("True") && CBState->currentIndex() == 2) { NO_FILTER_MATCH; }
+ if (list[i].compare("False") && CBState->currentIndex() == 1) { NO_FILTER_MATCH; }
+ if (CBRules->currentIndex() != 0 && list[i + 6].compare(CBRules->currentText())) { NO_FILTER_MATCH; }
+ if (CBWeapons->currentIndex() != 0 && list[i + 7].compare(CBWeapons->currentText())) { NO_FILTER_MATCH; }
+ bool found = list[i + 1].contains(searchText->text(), Qt::CaseInsensitive);
+ if (!found) {
+ for (int a = 4; a <= 7; ++a) {
+ QString compString = list[i + a];
+ if (a == 5 && compString == "+rnd+") {
+ compString = "Random Map";
+ } else if (a == 5 && compString == "+maze+") {
+ compString = "Random Maze";
+ } else if (a == 5 && compString == "+drawn+") {
+ compString = "Drawn Map";
+ }
+ if (compString.contains(searchText->text(), Qt::CaseInsensitive)) {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!searchText->text().isEmpty() && !found) { NO_FILTER_MATCH; }
+
+ QTableWidgetItem * item;
+ item = new QTableWidgetItem(list[i + 1]); // room name
+ item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+
+ // pick appropriate room icon and tooltip (game in progress yes/no; later maybe locked rooms etc.)
+ if(list[i].compare("True"))
+ {
+ item->setIcon(QIcon(":/res/iconTime.png"));// game is in lobby
+ item->setToolTip(tr("This game is in lobby.\nYou may join and start playing once the game starts."));
+ }
+ else
+ {
+ item->setIcon(QIcon(":/res/iconDamage.png"));// game has started
+ item->setToolTip(tr("This game is in progress.\nYou may join and spectate now but you'll have to wait for the game to end to start playing."));
+ }
+
+ roomsList->setItem(r, 0, item);
+
+ item = new QTableWidgetItem(list[i + 2]); // number of clients
+ item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+ item->setTextAlignment(Qt::AlignCenter);
+ item->setToolTip(tr("There are %1 clients connected to this room.", "", list[i + 2].toInt()).arg(list[i + 2]));
+ roomsList->setItem(r, 1, item);
+
+ item = new QTableWidgetItem(list[i + 3]); // number of teams
+ item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+ item->setTextAlignment(Qt::AlignCenter);
+ item->setToolTip(tr("There are %1 teams participating in this room.", "", list[i + 3].toInt()).arg(list[i + 3]));
+ //Should we highlight "full" games? Might get misinterpreted
+ //if(list[i + 3].toInt() >= cMaxTeams)
+ // item->setForeground(red);
+ roomsList->setItem(r, 2, item);
+
+ item = new QTableWidgetItem(list[i + 4].left(15)); // name of host
+ item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+ item->setToolTip(tr("%1 is the host. He may adjust settings and start the game.").arg(list[i + 4]));
+ roomsList->setItem(r, 3, item);
+
+ if(list[i + 5] == "+rnd+")
+ {
+ item = new QTableWidgetItem(tr("Random Map")); // selected map (is randomized)
+// FIXME - need real icons. Disabling until then
+// item->setIcon(QIcon(":/res/mapRandom.png"));
+ }
+ else if (list[i+5] == "+maze+")
+ {
+ item = new QTableWidgetItem(tr("Random Maze"));
+// FIXME - need real icons. Disabling until then
+// item->setIcon(QIcon(":/res/mapMaze.png"));
+ }
+ else
+ {
+ item = new QTableWidgetItem(list[i + 5]); // selected map
+
+ // check to see if we've got this map
+ // not perfect but a start
+ if(!mapList->contains(list[i + 5]))
+ {
+ item->setForeground(red);
+ item->setIcon(QIcon(":/res/mapMissing.png"));
+ }
+ else
+ {
+ // todo: mission icon?
+// FIXME - need real icons. Disabling until then
+// item->setIcon(QIcon(":/res/mapCustom.png"));
+ }
+ }
+
+ item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+ item->setToolTip(tr("Games may be played on precreated or randomized maps."));
+ roomsList->setItem(r, 4, item);
+
+ item = new QTableWidgetItem(list[i + 6].left(24)); // selected game scheme
+ item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+ item->setToolTip(tr("The Game Scheme defines general options and preferences like Round Time, Sudden Death or Vampirism."));
+ roomsList->setItem(r, 5, item);
+
+ item = new QTableWidgetItem(list[i + 7].left(24)); // selected weapon scheme
+ item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+ item->setToolTip(tr("The Weapon Scheme defines available weapons and their ammunition count."));
+ roomsList->setItem(r, 6, item);
+
+ if(!list[i + 1].compare(selection) && !selection.isEmpty())
+ roomsList->selectionModel()->setCurrentIndex(roomsList->model()->index(r, 0), QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+ }
+
+ roomsList->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
+ roomsList->horizontalHeader()->setResizeMode(1, QHeaderView::ResizeToContents);
+ roomsList->horizontalHeader()->setResizeMode(2, QHeaderView::ResizeToContents);
+ roomsList->horizontalHeader()->setResizeMode(3, QHeaderView::ResizeToContents);
+ roomsList->horizontalHeader()->setResizeMode(4, QHeaderView::ResizeToContents);
+ roomsList->horizontalHeader()->setResizeMode(5, QHeaderView::ResizeToContents);
+ roomsList->horizontalHeader()->setResizeMode(6, QHeaderView::ResizeToContents);
+
+ // TODO: Should NOT be done here
+ if (gameInLobby) {
+ gameInLobby = false;
+ if (gameCanBeJoined) {
+ emit askForJoinRoom(gameInLobbyName);
+ } else {
+ emit askJoinConfirmation(gameInLobbyName);
+ }
+ }
+
+// roomsList->resizeColumnsToContents();
+}
+
+void PageRoomsList::onCreateClick()
+{
+ if (roomName->text().size())
+ emit askForCreateRoom(roomName->text());
+ else
+ QMessageBox::critical(this,
+ tr("Error"),
+ tr("Please enter room name"),
+ tr("OK"));
+}
+
+void PageRoomsList::onJoinClick()
+{
+ QTableWidgetItem * curritem = roomsList->item(roomsList->currentRow(), 0);
+ if (!curritem)
+ {
+ QMessageBox::critical(this,
+ tr("Error"),
+ tr("Please select room from the list"),
+ tr("OK"));
+ return;
+ }
+
+ for (int i = 0; i < listFromServer.size(); i += 8) {
+ if (listFromServer[i + 1] == curritem->data(Qt::DisplayRole).toString()) {
+ gameInLobby = listFromServer[i].compare("True");
+ break;
+ }
+ }
+
+ if (gameInLobby) {
+ gameInLobbyName = curritem->data(Qt::DisplayRole).toString();
+ emit askForRoomList();
+ } else {
+ emit askForJoinRoom(curritem->data(Qt::DisplayRole).toString());
+ }
+}
+
+void PageRoomsList::onRefreshClick()
+{
+ emit askForRoomList();
+}
+
+void PageRoomsList::onClearClick()
+{
+ CBState->setCurrentIndex(0);
+ CBRules->setCurrentIndex(0);
+ CBWeapons->setCurrentIndex(0);
+ searchText->clear();
+}
+
+void PageRoomsList::onJoinConfirmation(const QString & room)
+{
+ if (QMessageBox::warning(this,
+ tr("Warning"),
+ tr("The game you are trying to join has started.\nDo you still want to join the room?"),
+ QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
+ {
+ emit askForJoinRoom(room);
+ }
+}
+
+void PageRoomsList::updateNickCounter(int cnt)
+{
+ lblCount->setText(tr("%1 players online", 0, cnt).arg(cnt));
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageroomslist.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,83 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_ROOMLIST_H
+#define PAGE_ROOMLIST_H
+
+#include "AbstractPage.h"
+#include "SDLs.h"
+
+class HWChatWidget;
+class AmmoSchemeModel;
+
+class PageRoomsList : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageRoomsList(QWidget* parent, QSettings * config, SDLInteraction * sdli);
+
+ QLineEdit * roomName;
+ QLineEdit * searchText;
+ QTableWidget * roomsList;
+ QPushButton * BtnCreate;
+ QPushButton * BtnJoin;
+ QPushButton * BtnRefresh;
+ QPushButton * BtnAdmin;
+ QPushButton * BtnClear;
+ QComboBox * CBState;
+ QComboBox * CBRules;
+ QComboBox * CBWeapons;
+ HWChatWidget * chatWidget;
+ QLabel * lblCount;
+
+public slots:
+ void setRoomsList(const QStringList & list);
+ void setAdmin(bool);
+ void updateNickCounter(int cnt);
+
+signals:
+ void askForCreateRoom(const QString &);
+ void askForJoinRoom(const QString &);
+ void askForRoomList();
+ void askJoinConfirmation(const QString &);
+
+protected:
+ QLayout * bodyLayoutDefinition();
+ QLayout * footerLayoutDefinition();
+ void connectSignals();
+
+private slots:
+ void onCreateClick();
+ void onJoinClick();
+ void onRefreshClick();
+ void onClearClick();
+ void onJoinConfirmation(const QString &);
+
+private:
+ QSettings * m_gameSettings;
+ SDLInteraction * m_sdli;
+
+ bool gameInLobby;
+ QString gameInLobbyName;
+ QStringList listFromServer;
+ AmmoSchemeModel * ammoSchemeModel;
+
+};
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagescheme.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,510 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QGroupBox>
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QDataWidgetMapper>
+#include <QSpinBox>
+
+#include "ammoSchemeModel.h"
+#include "pagescheme.h"
+#include "FreqSpinBox.h"
+
+
+QLayout * PageScheme::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+ QGroupBox * gb = new QGroupBox(this);
+
+ QGridLayout * gl = new QGridLayout();
+ gb->setLayout(gl);
+ QSizePolicy sp;
+ sp.setVerticalPolicy(QSizePolicy::MinimumExpanding);
+ sp.setHorizontalPolicy(QSizePolicy::Expanding);
+
+ pageLayout->addWidget(gb, 1,0,13,5);
+
+ gbGameModes = new QGroupBox(QGroupBox::tr("Game Modifiers"), gb);
+ gbBasicSettings = new QGroupBox(QGroupBox::tr("Basic Settings"), gb);
+
+ // TODO name stuff and put CSS into main style sheet
+ gbGameModes->setStyleSheet(".QGroupBox {"
+ "background-color: #130f2c; background-image:url();"
+ "}");
+ gbBasicSettings->setStyleSheet(".QGroupBox {"
+ "background-color: #130f2c; background-image:url();"
+ "}");
+
+ gbGameModes->setSizePolicy(sp);
+ gbBasicSettings->setSizePolicy(sp);
+ gl->addWidget(gbGameModes,0,0,1,3,Qt::AlignTop);
+ gl->addWidget(gbBasicSettings,0,3,1,3,Qt::AlignTop);
+
+ QGridLayout * glGMLayout = new QGridLayout(gbGameModes);
+ QGridLayout * glBSLayout = new QGridLayout(gbBasicSettings);
+ gbGameModes->setLayout(glGMLayout);
+ gbBasicSettings->setLayout(glBSLayout);
+ // Left
+
+ TBW_mode_Forts = new ToggleButtonWidget(gbGameModes, ":/res/btnForts@2x.png");
+ TBW_mode_Forts->setToolTip("<b>" + ToggleButtonWidget::tr("Fort Mode") + "</b>:<br />" + tr("Defend your fort and destroy the opponents, two team colours max!"));
+ glGMLayout->addWidget(TBW_mode_Forts,0,0,1,1);
+
+ TBW_teamsDivide = new ToggleButtonWidget(gbGameModes, ":/res/btnTeamsDivide@2x.png");
+ TBW_teamsDivide->setToolTip("<b>" + ToggleButtonWidget::tr("Divide Teams") + "</b>:<br />" + tr("Teams will start on opposite sides of the terrain, two team colours max!"));
+ glGMLayout->addWidget(TBW_teamsDivide,0,1,1,1);
+
+ TBW_solid = new ToggleButtonWidget(gbGameModes, ":/res/btnSolid@2x.png");
+ TBW_solid->setToolTip("<b>" + ToggleButtonWidget::tr("Solid Land") + "</b>:<br />" + tr("Land can not be destroyed!"));
+ glGMLayout->addWidget(TBW_solid,0,2,1,1);
+
+ TBW_border = new ToggleButtonWidget(gbGameModes, ":/res/btnBorder@2x.png");
+ TBW_border->setToolTip("<b>" + ToggleButtonWidget::tr("Add Border") + "</b>:<br />" + tr("Add an indestructible border around the terrain"));
+ glGMLayout->addWidget(TBW_border,0,3,1,1);
+
+ TBW_lowGravity = new ToggleButtonWidget(gbGameModes, ":/res/btnLowGravity@2x.png");
+ TBW_lowGravity->setToolTip("<b>" + ToggleButtonWidget::tr("Low Gravity") + "</b>:<br />" + tr("Lower gravity"));
+ glGMLayout->addWidget(TBW_lowGravity,0,4,1,1);
+
+ TBW_laserSight = new ToggleButtonWidget(gbGameModes, ":/res/btnLaserSight@2x.png");
+ TBW_laserSight->setToolTip("<b>" + ToggleButtonWidget::tr("Laser Sight") + "</b>:<br />" + tr("Assisted aiming with laser sight"));
+ glGMLayout->addWidget(TBW_laserSight,1,0,1,1);
+
+ TBW_invulnerable = new ToggleButtonWidget(gbGameModes, ":/res/btnInvulnerable@2x.png");
+ TBW_invulnerable->setToolTip("<b>" + ToggleButtonWidget::tr("Invulnerable") + "</b>:<br />" + tr("All hogs have a personal forcefield"));
+ glGMLayout->addWidget(TBW_invulnerable,1,1,1,1);
+
+ TBW_resethealth = new ToggleButtonWidget(gbGameModes, ":/res/btnResetHealth@2x.png");
+ TBW_resethealth->setToolTip("<b>" + ToggleButtonWidget::tr("Reset Health") + "</b>:<br />" + tr("All (living) hedgehogs are fully restored at the end of turn"));
+ glGMLayout->addWidget(TBW_resethealth,1,2,1,1);
+
+ TBW_vampiric = new ToggleButtonWidget(gbGameModes, ":/res/btnVampiric@2x.png");
+ TBW_vampiric->setToolTip("<b>" + ToggleButtonWidget::tr("Vampirism") + "</b>:<br />" + tr("Gain 80% of the damage you do back in health"));
+ glGMLayout->addWidget(TBW_vampiric,1,3,1,1);
+
+ TBW_karma = new ToggleButtonWidget(gbGameModes, ":/res/btnKarma@2x.png");
+ TBW_karma->setToolTip("<b>" + ToggleButtonWidget::tr("Karma") + "</b>:<br />" + tr("Share your opponents pain, share their damage"));
+ glGMLayout->addWidget(TBW_karma,1,4,1,1);
+
+ TBW_artillery = new ToggleButtonWidget(gbGameModes, ":/res/btnArtillery@2x.png");
+ TBW_artillery->setToolTip("<b>" + ToggleButtonWidget::tr("Artillery") + "</b>:<br />" + tr("Your hogs are unable to move, put your artillery skills to the test"));
+ glGMLayout->addWidget(TBW_artillery,2,0,1,1);
+
+ TBW_randomorder = new ToggleButtonWidget(gbGameModes, ":/res/btnRandomOrder@2x.png");
+ TBW_randomorder->setToolTip("<b>" + ToggleButtonWidget::tr("Random Order") + "</b>:<br />" + tr("Order of play is random instead of in room order."));
+ glGMLayout->addWidget(TBW_randomorder,2,1,1,1);
+
+ TBW_king = new ToggleButtonWidget(gbGameModes, ":/res/btnKing@2x.png");
+ TBW_king->setToolTip("<b>" + ToggleButtonWidget::tr("King") + "</b>:<br />" + tr("Play with a King. If he dies, your side dies."));
+ glGMLayout->addWidget(TBW_king,2,2,1,1);
+
+ TBW_placehog = new ToggleButtonWidget(gbGameModes, ":/res/btnPlaceHog@2x.png");
+ TBW_placehog->setToolTip("<b>" + ToggleButtonWidget::tr("Place Hedgehogs") + "</b>:<br />" + tr("Take turns placing your hedgehogs before the start of play."));
+ glGMLayout->addWidget(TBW_placehog,2,3,1,1);
+
+ TBW_sharedammo = new ToggleButtonWidget(gbGameModes, ":/res/btnSharedAmmo@2x.png");
+ TBW_sharedammo->setToolTip("<b>" + ToggleButtonWidget::tr("Clan Shares Ammo") + "</b>:<br />" + tr("Ammo is shared between all teams that share a colour."));
+ glGMLayout->addWidget(TBW_sharedammo,2,4,1,1);
+
+ TBW_disablegirders = new ToggleButtonWidget(gbGameModes, ":/res/btnDisableGirders@2x.png");
+ TBW_disablegirders->setToolTip("<b>" + ToggleButtonWidget::tr("Disable Girders") + "</b>:<br />" + tr("Disable girders when generating random maps."));
+ glGMLayout->addWidget(TBW_disablegirders,3,0,1,1);
+
+ TBW_disablelandobjects = new ToggleButtonWidget(gbGameModes, ":/res/btnDisableLandObjects@2x.png");
+ TBW_disablelandobjects->setToolTip("<b>" + ToggleButtonWidget::tr("Disable Land Objects") + "</b>:<br />" + tr("Disable land objects when generating random maps."));
+ glGMLayout->addWidget(TBW_disablelandobjects,3,1,1,1);
+
+ TBW_aisurvival = new ToggleButtonWidget(gbGameModes, ":/res/btnAISurvival@2x.png");
+ TBW_aisurvival->setToolTip("<b>" + ToggleButtonWidget::tr("AI Survival Mode") + "</b>:<br />" + tr("AI respawns on death."));
+ glGMLayout->addWidget(TBW_aisurvival,3,2,1,1);
+
+ TBW_infattack = new ToggleButtonWidget(gbGameModes, ":/res/btnInfAttack@2x.png");
+ TBW_infattack->setToolTip("<b>" + ToggleButtonWidget::tr("Unlimited Attacks") + "</b>:<br />" + tr("Attacking does not end your turn."));
+ glGMLayout->addWidget(TBW_infattack,3,3,1,1);
+
+ TBW_resetweps = new ToggleButtonWidget(gbGameModes, ":/res/btnResetWeps@2x.png");
+ TBW_resetweps->setToolTip("<b>" + ToggleButtonWidget::tr("Reset Weapons") + "</b>:<br />" + tr("Weapons are reset to starting values each turn."));
+ glGMLayout->addWidget(TBW_resetweps,3,4,1,1);
+
+ TBW_perhogammo = new ToggleButtonWidget(gbGameModes, ":/res/btnPerHogAmmo@2x.png");
+ TBW_perhogammo->setToolTip("<b>" + ToggleButtonWidget::tr("Per Hedgehog Ammo") + "</b>:<br />" + tr("Each hedgehog has its own ammo. It does not share with the team."));
+ glGMLayout->addWidget(TBW_perhogammo,4,0,1,1);
+
+ TBW_nowind = new ToggleButtonWidget(gbGameModes, ":/res/btnNoWind@2x.png");
+ TBW_nowind->setToolTip("<b>" + ToggleButtonWidget::tr("Disable Wind") + "</b>:<br />" + tr("You will not have to worry about wind anymore."));
+ glGMLayout->addWidget(TBW_nowind,4,1,1,1);
+
+ TBW_morewind = new ToggleButtonWidget(gbGameModes, ":/res/btnMoreWind@2x.png");
+ TBW_morewind->setToolTip("<b>" + ToggleButtonWidget::tr("More Wind") + "</b>:<br />" + tr("Wind will affect almost everything."));
+ glGMLayout->addWidget(TBW_morewind,4,2,1,1);
+
+ TBW_tagteam = new ToggleButtonWidget(gbGameModes, ":/res/btnTagTeam@2x.png");
+ TBW_tagteam->setToolTip("<b>" + ToggleButtonWidget::tr("Tag Team") + "</b>:<br />" + tr("Teams in each clan take successive turns sharing their turn time."));
+ glGMLayout->addWidget(TBW_tagteam,4,3,1,1);
+
+ TBW_bottomborder = new ToggleButtonWidget(gbGameModes, ":/res/btnBottomBorder@2x.png");
+ TBW_bottomborder->setToolTip("<b>" + ToggleButtonWidget::tr("Add Bottom Border") + "</b>:<br />" + tr("Add an indestructible border along the bottom"));
+ glGMLayout->addWidget(TBW_bottomborder,4,4,1,1);
+
+
+ // Right
+ QLabel * l;
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("Damage Modifier"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,0,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconDamage.png"));
+ glBSLayout->addWidget(l,0,1,1,1);
+ SB_DamageModifier = new QSpinBox(gbBasicSettings);
+ SB_DamageModifier->setRange(10, 300);
+ SB_DamageModifier->setValue(100);
+ SB_DamageModifier->setSingleStep(25);
+ glBSLayout->addWidget(SB_DamageModifier,0,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("Turn Time"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,1,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconTime.png"));
+ glBSLayout->addWidget(l,1,1,1,1);
+ SB_TurnTime = new QSpinBox(gbBasicSettings);
+ SB_TurnTime->setRange(1, 9999);
+ SB_TurnTime->setValue(45);
+ SB_TurnTime->setSingleStep(15);
+ glBSLayout->addWidget(SB_TurnTime,1,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("Initial Health"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,2,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconHealth.png"));
+ glBSLayout->addWidget(l,2,1,1,1);
+ SB_InitHealth = new QSpinBox(gbBasicSettings);
+ SB_InitHealth->setRange(50, 200);
+ SB_InitHealth->setValue(100);
+ SB_InitHealth->setSingleStep(25);
+ glBSLayout->addWidget(SB_InitHealth,2,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("Sudden Death Timeout"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,3,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconSuddenDeath.png"));
+ glBSLayout->addWidget(l,3,1,1,1);
+ SB_SuddenDeath = new QSpinBox(gbBasicSettings);
+ SB_SuddenDeath->setRange(0, 50);
+ SB_SuddenDeath->setValue(15);
+ SB_SuddenDeath->setSingleStep(3);
+ glBSLayout->addWidget(SB_SuddenDeath,3,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("Sudden Death Water Rise"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,4,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconSuddenDeath.png")); // TODO: icon
+ glBSLayout->addWidget(l,4,1,1,1);
+ SB_WaterRise = new QSpinBox(gbBasicSettings);
+ SB_WaterRise->setRange(0, 100);
+ SB_WaterRise->setValue(47);
+ SB_WaterRise->setSingleStep(5);
+ glBSLayout->addWidget(SB_WaterRise,4,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("Sudden Death Health Decrease"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,5,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconSuddenDeath.png")); // TODO: icon
+ glBSLayout->addWidget(l,5,1,1,1);
+ SB_HealthDecrease = new QSpinBox(gbBasicSettings);
+ SB_HealthDecrease->setRange(0, 100);
+ SB_HealthDecrease->setValue(5);
+ SB_HealthDecrease->setSingleStep(1);
+ glBSLayout->addWidget(SB_HealthDecrease,5,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("% Rope Length"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,6,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconRope.png"));
+ glBSLayout->addWidget(l,6,1,1,1);
+ SB_RopeModifier = new QSpinBox(gbBasicSettings);
+ SB_RopeModifier->setRange(25, 999);
+ SB_RopeModifier->setValue(100);
+ SB_RopeModifier->setSingleStep(25);
+ glBSLayout->addWidget(SB_RopeModifier,6,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("Crate Drops"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,7,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconBox.png"));
+ glBSLayout->addWidget(l,7,1,1,1);
+ SB_CaseProb = new FreqSpinBox(gbBasicSettings);
+ SB_CaseProb->setRange(0, 9);
+ SB_CaseProb->setValue(5);
+ glBSLayout->addWidget(SB_CaseProb,7,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("% Health Crates"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,8,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconHealth.png")); // TODO: icon
+ glBSLayout->addWidget(l,8,1,1,1);
+ SB_HealthCrates = new QSpinBox(gbBasicSettings);
+ SB_HealthCrates->setRange(0, 100);
+ SB_HealthCrates->setValue(35);
+ SB_HealthCrates->setSingleStep(5);
+ glBSLayout->addWidget(SB_HealthCrates,8,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("Health in Crates"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,9,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconHealth.png")); // TODO: icon
+ glBSLayout->addWidget(l,9,1,1,1);
+ SB_CrateHealth = new QSpinBox(gbBasicSettings);
+ SB_CrateHealth->setRange(0, 200);
+ SB_CrateHealth->setValue(25);
+ SB_CrateHealth->setSingleStep(5);
+ glBSLayout->addWidget(SB_CrateHealth,9,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("Mines Time"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,10,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconTime.png")); // TODO: icon
+ glBSLayout->addWidget(l,10,1,1,1);
+ SB_MinesTime = new QSpinBox(gbBasicSettings);
+ SB_MinesTime->setRange(-1, 5);
+ SB_MinesTime->setValue(3);
+ SB_MinesTime->setSingleStep(1);
+ SB_MinesTime->setSpecialValueText(tr("Random"));
+ SB_MinesTime->setSuffix(" "+ tr("Seconds"));
+ glBSLayout->addWidget(SB_MinesTime,10,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("Mines"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,11,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconMine.png")); // TODO: icon
+ glBSLayout->addWidget(l,11,1,1,1);
+ SB_Mines = new QSpinBox(gbBasicSettings);
+ SB_Mines->setRange(0, 80);
+ SB_Mines->setValue(0);
+ SB_Mines->setSingleStep(5);
+ glBSLayout->addWidget(SB_Mines,11,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("% Dud Mines"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,12,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconDud.png"));
+ glBSLayout->addWidget(l,12,1,1,1);
+ SB_MineDuds = new QSpinBox(gbBasicSettings);
+ SB_MineDuds->setRange(0, 100);
+ SB_MineDuds->setValue(0);
+ SB_MineDuds->setSingleStep(5);
+ glBSLayout->addWidget(SB_MineDuds,12,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("Explosives"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,13,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconDamage.png"));
+ glBSLayout->addWidget(l,13,1,1,1);
+ SB_Explosives = new QSpinBox(gbBasicSettings);
+ SB_Explosives->setRange(0, 40);
+ SB_Explosives->setValue(0);
+ SB_Explosives->setSingleStep(1);
+ glBSLayout->addWidget(SB_Explosives,13,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("% Get Away Time"));
+ l->setWordWrap(true);
+ glBSLayout->addWidget(l,14,0,1,1);
+ l = new QLabel(gbBasicSettings);
+ l->setFixedSize(32,32);
+ l->setPixmap(QPixmap(":/res/iconTime.png"));
+ glBSLayout->addWidget(l,14,1,1,1);
+ SB_GetAwayTime = new QSpinBox(gbBasicSettings);
+ SB_GetAwayTime->setRange(0, 999);
+ SB_GetAwayTime->setValue(100);
+ SB_GetAwayTime->setSingleStep(25);
+ glBSLayout->addWidget(SB_GetAwayTime,14,2,1,1);
+
+ l = new QLabel(gbBasicSettings);
+ l->setText(QLabel::tr("Scheme Name:"));
+
+ LE_name = new QLineEdit(this);
+
+ gl->addWidget(LE_name,15,1,1,5);
+ gl->addWidget(l,15,0,1,1);
+
+ return pageLayout;
+}
+
+QLayout * PageScheme::footerLayoutDefinition()
+{
+ QHBoxLayout * bottomLayout = new QHBoxLayout();
+ selectScheme = new QComboBox(this);
+
+ bottomLayout->addWidget(selectScheme, 0);
+ BtnCopy = addButton(tr("Copy"), bottomLayout, 1);
+ BtnNew = addButton(tr("New"), bottomLayout, 2);
+ BtnDelete = addButton(tr("Delete"), bottomLayout, 3);
+
+ bottomLayout->setStretch(1,1);
+ bottomLayout->setStretch(2,1);
+ bottomLayout->setStretch(3,1);
+
+ return bottomLayout;
+}
+
+void PageScheme::connectSignals()
+{
+ connect(BtnCopy, SIGNAL(clicked()), this, SLOT(copyRow()));
+ connect(BtnNew, SIGNAL(clicked()), this, SLOT(newRow()));
+ connect(BtnDelete, SIGNAL(clicked()), this, SLOT(deleteRow()));
+ mapper = new QDataWidgetMapper(this);
+ connect(selectScheme, SIGNAL(currentIndexChanged(int)), mapper, SLOT(setCurrentIndex(int)));
+ connect(selectScheme, SIGNAL(currentIndexChanged(int)), this, SLOT(schemeSelected(int)));
+}
+
+PageScheme::PageScheme(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
+
+void PageScheme::setModel(QAbstractItemModel * model)
+{
+ mapper->setModel(model);
+ selectScheme->setModel(model);
+
+ mapper->addMapping(LE_name, 0);
+ mapper->addMapping(TBW_mode_Forts, 1);
+ mapper->addMapping(TBW_teamsDivide, 2);
+ mapper->addMapping(TBW_solid, 3);
+ mapper->addMapping(TBW_border, 4);
+ mapper->addMapping(TBW_lowGravity, 5);
+ mapper->addMapping(TBW_laserSight, 6);
+ mapper->addMapping(TBW_invulnerable, 7);
+ mapper->addMapping(TBW_resethealth, 8);
+ mapper->addMapping(TBW_vampiric, 9);
+ mapper->addMapping(TBW_karma, 10);
+ mapper->addMapping(TBW_artillery, 11);
+ mapper->addMapping(TBW_randomorder, 12);
+ mapper->addMapping(TBW_king, 13);
+ mapper->addMapping(TBW_placehog, 14);
+ mapper->addMapping(TBW_sharedammo, 15);
+ mapper->addMapping(TBW_disablegirders, 16);
+ mapper->addMapping(TBW_disablelandobjects, 17);
+ mapper->addMapping(TBW_aisurvival, 18);
+ mapper->addMapping(TBW_infattack, 19);
+ mapper->addMapping(TBW_resetweps, 20);
+ mapper->addMapping(TBW_perhogammo, 21);
+ mapper->addMapping(TBW_nowind, 22);
+ mapper->addMapping(TBW_morewind, 23);
+ mapper->addMapping(TBW_tagteam, 24);
+ mapper->addMapping(TBW_bottomborder, 25);
+ mapper->addMapping(SB_DamageModifier, 26);
+ mapper->addMapping(SB_TurnTime, 27);
+ mapper->addMapping(SB_InitHealth, 28);
+ mapper->addMapping(SB_SuddenDeath, 29);
+ mapper->addMapping(SB_CaseProb, 30);
+ mapper->addMapping(SB_MinesTime, 31);
+ mapper->addMapping(SB_Mines, 32);
+ mapper->addMapping(SB_MineDuds, 33);
+ mapper->addMapping(SB_Explosives, 34);
+ mapper->addMapping(SB_HealthCrates, 35);
+ mapper->addMapping(SB_CrateHealth, 36);
+ mapper->addMapping(SB_WaterRise, 37);
+ mapper->addMapping(SB_HealthDecrease, 38);
+ mapper->addMapping(SB_RopeModifier, 39);
+ mapper->addMapping(SB_GetAwayTime, 40);
+
+ mapper->toFirst();
+}
+
+void PageScheme::newRow()
+{
+ QAbstractItemModel * model = mapper->model();
+ model->insertRow(-1);
+ selectScheme->setCurrentIndex(model->rowCount() - 1);
+}
+
+void PageScheme::copyRow()
+{
+ QAbstractItemModel * model = mapper->model();
+ model->insertRow(selectScheme->currentIndex());
+ selectScheme->setCurrentIndex(model->rowCount() - 1);
+}
+
+void PageScheme::deleteRow()
+{
+ QMessageBox reallyDelete(QMessageBox::Question, QMessageBox::tr("Schemes"), QMessageBox::tr("Really delete this game scheme?"), QMessageBox::Ok | QMessageBox::Cancel);
+
+ if (reallyDelete.exec() == QMessageBox::Ok) {
+ QAbstractItemModel * model = mapper->model();
+ model->removeRow(selectScheme->currentIndex());
+ }
+}
+
+void PageScheme::schemeSelected(int n)
+{
+ int c = ((AmmoSchemeModel*)mapper->model())->numberOfDefaultSchemes;
+ gbGameModes->setEnabled(n >= c);
+ gbBasicSettings->setEnabled(n >= c);
+ LE_name->setEnabled(n >= c);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagescheme.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,104 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_SCHEME_H
+#define PAGE_SCHEME_H
+
+#include "AbstractPage.h"
+#include "togglebutton.h"
+
+class FreqSpinBox;
+
+class PageScheme : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageScheme(QWidget* parent = 0);
+
+ QPushButton * BtnCopy;
+ QPushButton * BtnNew;
+ QPushButton * BtnDelete;
+ QPushButton * btnSave;
+ QComboBox * selectScheme;
+
+ void setModel(QAbstractItemModel * model);
+
+public slots:
+ void newRow();
+ void copyRow();
+ void deleteRow();
+
+protected:
+ QLayout * bodyLayoutDefinition();
+ QLayout * footerLayoutDefinition();
+ void connectSignals();
+
+private:
+ QDataWidgetMapper * mapper;
+ ToggleButtonWidget * TBW_mode_Forts;
+ ToggleButtonWidget * TBW_teamsDivide;
+ ToggleButtonWidget * TBW_solid;
+ ToggleButtonWidget * TBW_border;
+ ToggleButtonWidget * TBW_lowGravity;
+ ToggleButtonWidget * TBW_laserSight;
+ ToggleButtonWidget * TBW_invulnerable;
+ ToggleButtonWidget * TBW_resethealth;
+ ToggleButtonWidget * TBW_vampiric;
+ ToggleButtonWidget * TBW_karma;
+ ToggleButtonWidget * TBW_artillery;
+ ToggleButtonWidget * TBW_randomorder;
+ ToggleButtonWidget * TBW_king;
+ ToggleButtonWidget * TBW_placehog;
+ ToggleButtonWidget * TBW_sharedammo;
+ ToggleButtonWidget * TBW_disablegirders;
+ ToggleButtonWidget * TBW_disablelandobjects;
+ ToggleButtonWidget * TBW_aisurvival;
+ ToggleButtonWidget * TBW_infattack;
+ ToggleButtonWidget * TBW_resetweps;
+ ToggleButtonWidget * TBW_perhogammo;
+ ToggleButtonWidget * TBW_nowind;
+ ToggleButtonWidget * TBW_morewind;
+ ToggleButtonWidget * TBW_tagteam;
+ ToggleButtonWidget * TBW_bottomborder;
+
+ QSpinBox * SB_DamageModifier;
+ QSpinBox * SB_TurnTime;
+ QSpinBox * SB_InitHealth;
+ QSpinBox * SB_SuddenDeath;
+ QSpinBox * SB_WaterRise;
+ QSpinBox * SB_HealthDecrease;
+ FreqSpinBox * SB_CaseProb;
+ QSpinBox * SB_HealthCrates;
+ QSpinBox * SB_CrateHealth;
+ QSpinBox * SB_MinesTime;
+ QSpinBox * SB_Mines;
+ QSpinBox * SB_MineDuds;
+ QSpinBox * SB_Explosives;
+ QSpinBox * SB_RopeModifier;
+ QSpinBox * SB_GetAwayTime;
+ QLineEdit * LE_name;
+
+ QGroupBox * gbGameModes;
+ QGroupBox * gbBasicSettings;
+
+private slots:
+ void schemeSelected(int);
+};
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageselectweapon.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,75 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QComboBox>
+
+#include "pageselectweapon.h"
+#include "hwconsts.h"
+#include "selectWeapon.h"
+
+QLayout * PageSelectWeapon::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+
+ pWeapons = new SelWeaponWidget(cAmmoNumber, this);
+ pageLayout->addWidget(pWeapons);
+
+ return pageLayout;
+}
+
+QLayout * PageSelectWeapon::footerLayoutDefinition()
+{
+ QGridLayout * bottomLayout = new QGridLayout();
+
+ selectWeaponSet = new QComboBox(this);
+ bottomLayout->addWidget(selectWeaponSet, 0, 0, 2, 1);
+
+ // first row
+ BtnNew = addButton(tr("New"), bottomLayout, 0, 1);
+ BtnDefault = addButton(tr("Default"), bottomLayout, 0, 2);
+
+ // second row
+ BtnCopy = addButton(tr("Copy"), bottomLayout, 1, 1);
+ BtnDelete = addButton(tr("Delete"), bottomLayout, 1, 2);
+
+ bottomLayout->setColumnStretch(1,1);
+ bottomLayout->setColumnStretch(2,1);
+
+ btnSave = addButton(":/res/Save.png", bottomLayout, 0, 3, 2, 1, true);
+ btnSave->setStyleSheet("QPushButton{margin: 24px 0 0 0;}");
+ bottomLayout->setAlignment(btnSave, Qt::AlignRight | Qt::AlignBottom);
+
+ return bottomLayout;
+}
+
+void PageSelectWeapon::connectSignals()
+{
+ connect(BtnDefault, SIGNAL(clicked()), pWeapons, SLOT(setDefault()));
+ connect(btnSave, SIGNAL(clicked()), pWeapons, SLOT(save()));
+ connect(BtnNew, SIGNAL(clicked()), pWeapons, SLOT(newWeaponsName()));
+ connect(BtnCopy, SIGNAL(clicked()), pWeapons, SLOT(copy()));
+ connect(selectWeaponSet, SIGNAL(currentIndexChanged(const QString&)), pWeapons, SLOT(setWeaponsName(const QString&)));
+}
+
+PageSelectWeapon::PageSelectWeapon(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pageselectweapon.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,47 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_SELECTWEAPON_H
+#define PAGE_SELECTWEAPON_H
+
+#include "AbstractPage.h"
+
+class SelWeaponWidget;
+
+class PageSelectWeapon : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageSelectWeapon(QWidget* parent = 0);
+
+ QPushButton *btnSave;
+ QPushButton *BtnDefault;
+ QPushButton *BtnDelete;
+ QPushButton *BtnNew;
+ QPushButton *BtnCopy;
+ SelWeaponWidget* pWeapons;
+ QComboBox* selectWeaponSet;
+
+protected:
+ QLayout * bodyLayoutDefinition();
+ QLayout * footerLayoutDefinition();
+ void connectSignals();
+};
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagesingleplayer.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,83 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QPushButton>
+
+#include "pagesingleplayer.h"
+#include "gamecfgwidget.h"
+
+QLayout * PageSinglePlayer::bodyLayoutDefinition()
+{
+ QVBoxLayout * vLayout = new QVBoxLayout();
+
+ QHBoxLayout * topLine = new QHBoxLayout();
+ QHBoxLayout * middleLine = new QHBoxLayout();
+ vLayout->addStretch();
+ vLayout->addLayout(topLine);
+ vLayout->addSpacing(30);
+ vLayout->addLayout(middleLine);
+ vLayout->addStretch();
+
+ topLine->addStretch();
+ BtnSimpleGamePage = addButton(":/res/SimpleGame.png", topLine, 0, true);
+ BtnSimpleGamePage->setToolTip(tr("Simple Game (a quick game against the computer, settings are chosen for you)"));
+ topLine->addSpacing(60);
+ BtnMultiplayer = addButton(":/res/Multiplayer.png", topLine, 1, true);
+ BtnMultiplayer->setToolTip(tr("Multiplayer (play a hotseat game against your friends, or AI teams)"));
+ topLine->addStretch();
+
+
+ BtnCampaignPage = addButton(":/res/Campaign.png", middleLine, 0, true);
+ BtnCampaignPage->setToolTip(tr("Campaign Mode (...). IN DEVELOPMENT"));
+ BtnCampaignPage->setVisible(false);
+
+ BtnTrainPage = addButton(":/res/Trainings.png", middleLine, 1, true);
+ BtnTrainPage->setToolTip(tr("Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT"));
+
+ return vLayout;
+}
+
+QLayout * PageSinglePlayer::footerLayoutDefinition()
+{
+ QHBoxLayout * bottomLine = new QHBoxLayout();
+ bottomLine->addStretch();
+
+ BtnDemos = addButton(":/res/Record.png", bottomLine, 1, true);
+ BtnDemos->setToolTip(tr("Demos (Watch recorded demos)"));
+ BtnLoad = addButton(":/res/Load.png", bottomLine, 2, true);
+ BtnLoad->setStyleSheet("QPushButton{margin: 24px 0 0 0;}");
+ BtnLoad->setToolTip(tr("Load (Load a previously saved game)"));
+
+ bottomLine->setStretch(1,0);
+ bottomLine->setStretch(2,0);
+ bottomLine->setAlignment(BtnDemos, Qt::AlignRight | Qt::AlignBottom);
+ bottomLine->setAlignment(BtnLoad, Qt::AlignRight | Qt::AlignBottom);
+
+ return bottomLine;
+}
+
+void PageSinglePlayer::connectSignals()
+{
+ //TODO
+}
+
+PageSinglePlayer::PageSinglePlayer(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagesingleplayer.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,48 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_SINGLE_PLAYER_H
+#define PAGE_SINGLE_PLAYER_H
+
+#include "AbstractPage.h"
+
+class GameCFGWidget;
+
+class PageSinglePlayer : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageSinglePlayer(QWidget* parent = 0);
+
+ QPushButton *BtnSimpleGamePage;
+ QPushButton *BtnTrainPage;
+ QPushButton *BtnCampaignPage;
+ QPushButton *BtnMultiplayer;
+ QPushButton *BtnLoad;
+ QPushButton *BtnDemos;
+ GameCFGWidget *gameCFG;
+
+private:
+ QLayout * bodyLayoutDefinition();
+ QLayout * footerLayoutDefinition();
+ void connectSignals();
+};
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagetraining.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,234 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QPushButton>
+
+#include <QFile>
+#include <QLocale>
+#include <QSettings>
+
+#include "pagetraining.h"
+#include "hwconsts.h"
+
+QLayout * PageTraining::bodyLayoutDefinition()
+{
+ QGridLayout * pageLayout = new QGridLayout();
+
+// left column
+
+ // declare start button, caption and description
+ btnPreview = formattedButton(":/res/Trainings.png", true);
+ btnPreview->setToolTip(QPushButton::tr("Go!"));
+
+ // make both rows equal height
+ pageLayout->setRowStretch(0, 1);
+ pageLayout->setRowStretch(1, 1);
+
+ // add start button, caption and description to 3 different rows
+ pageLayout->addWidget(btnPreview, 0, 0);
+
+ // center preview
+ pageLayout->setAlignment(btnPreview, Qt::AlignRight | Qt::AlignVCenter);
+
+
+// right column
+
+ // info area (caption on top, description below)
+ QVBoxLayout * infoLayout = new QVBoxLayout();
+
+ lblCaption = new QLabel();
+ lblCaption->setMinimumWidth(360);
+ lblCaption->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+ lblCaption->setWordWrap(true);
+ lblDescription = new QLabel();
+ lblDescription->setMinimumWidth(360);
+ lblDescription->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+ lblDescription->setWordWrap(true);
+
+ infoLayout->addWidget(lblCaption);
+ infoLayout->addWidget(lblDescription);
+
+ pageLayout->addLayout(infoLayout, 0, 1);
+ pageLayout->setAlignment(infoLayout, Qt::AlignLeft);
+
+
+ // mission list
+ lstMissions = new QListWidget(this);
+ pageLayout->addWidget(lstMissions, 1, 0, 1, 2); // span 2 columns
+
+ // let's not make the list use more space than needed
+ lstMissions->setFixedWidth(360);
+ pageLayout->setAlignment(lstMissions, Qt::AlignHCenter);
+
+ return pageLayout;
+}
+
+QLayout * PageTraining::footerLayoutDefinition()
+{
+ QBoxLayout * bottomLayout = new QVBoxLayout();
+
+ btnStart = formattedButton(QPushButton::tr("Go!"));
+ btnStart->setFixedWidth(140);
+
+ bottomLayout->addWidget(btnStart);
+
+ bottomLayout->setAlignment(btnStart, Qt::AlignRight | Qt::AlignVCenter);
+
+ return bottomLayout;
+}
+
+
+void PageTraining::connectSignals()
+{
+ connect(lstMissions, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(updateInfo()));
+ connect(lstMissions, SIGNAL(clicked()), this, SLOT(updateInfo()));
+ connect(lstMissions, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(startSelected()));
+ connect(btnPreview, SIGNAL(clicked()), this, SLOT(startSelected()));
+ connect(btnStart, SIGNAL(clicked()), this, SLOT(startSelected()));
+}
+
+
+PageTraining::PageTraining(QWidget* parent) : AbstractPage(parent)
+{
+ initPage();
+
+ // get locale
+ QSettings settings(cfgdir->absolutePath() + "/hedgewars.ini",
+ QSettings::IniFormat);
+
+ QString loc = settings.value("misc/locale", "").toString();
+ if (loc.isEmpty())
+ loc = QLocale::system().name();
+
+ QString infoFile =
+ datadir->absolutePath() + "/Locale/missions_" + loc + ".txt";
+
+ // if file is non-existant try with language only
+ if (!QFile::exists(infoFile))
+ infoFile = datadir->absolutePath() + "/Locale/missions_" +
+ loc.replace(QRegExp("_.*$"),"") + ".txt";
+
+ // fallback if file for current locale is non-existant
+ if (!QFile::exists(infoFile))
+ infoFile = datadir->absolutePath() + "/Locale/missions_en.txt";
+
+ // preload mission info for current locale
+ m_info = new QSettings(infoFile, QSettings::IniFormat, this);
+
+// TODO -> this should be done in a tool "DataDir" class
+ QDir tmpdir;
+ tmpdir.cd(cfgdir->absolutePath());
+ tmpdir.cd("Data/Missions/Training");
+ QStringList missionList = scriptList(tmpdir);
+ missionList.sort();
+
+ tmpdir.cd(datadir->absolutePath());
+ tmpdir.cd("Missions/Training");
+ QStringList defaultList = scriptList(tmpdir);
+ defaultList.sort();
+
+ // add non-duplicate default scripts to the list
+ foreach (const QString & mission, defaultList)
+ {
+ if (!missionList.contains(mission))
+ missionList.append(mission);
+ }
+
+ // add default scripts that have names different from detected user scripts
+ foreach (const QString & mission, missionList)
+ {
+ QListWidgetItem * item = new QListWidgetItem(mission);
+
+ // fallback name: replace underscores in mission name with spaces
+ QString name = item->text().replace("_", " ");
+
+ // see if we can get a prettier/translated name
+ name = m_info->value(mission + ".name", name).toString();
+
+ item->setText(name);
+
+ // store original name in data
+ item->setData(Qt::UserRole, mission);
+
+ lstMissions->addItem(item);
+ }
+
+ updateInfo();
+
+ // pre-select first mission
+ if (lstMissions->count() > 0)
+ lstMissions->setCurrentRow(0);
+}
+
+QStringList PageTraining::scriptList(const QDir & scriptDir) const
+{
+ QDir dir = scriptDir;
+ dir.setFilter(QDir::Files);
+ return dir.entryList(QStringList("*.lua")).replaceInStrings(QRegExp("^(.*)\\.lua"), "\\1");
+}
+
+
+void PageTraining::startSelected()
+{
+ QListWidgetItem * curItem = lstMissions->currentItem();
+
+ if (curItem != NULL)
+ emit startMission(curItem->data(Qt::UserRole).toString());
+}
+
+
+void PageTraining::updateInfo()
+{
+ if (lstMissions->currentItem())
+ {
+ // TODO also use .pngs in userdata folder
+ QString thumbFile = datadir->absolutePath() +
+ "/Graphics/Missions/Training/" +
+ lstMissions->currentItem()->data(Qt::UserRole).toString() +
+ "@2x.png";
+
+ if (QFile::exists(thumbFile))
+ btnPreview->setIcon(QIcon(thumbFile));
+ else
+ btnPreview->setIcon(QIcon(":/res/Trainings.png"));
+
+ QString realName = lstMissions->currentItem()->data(
+ Qt::UserRole).toString();
+
+ QString caption = m_info->value(realName + ".name",
+ lstMissions->currentItem()->text()).toString();
+
+ QString description = m_info->value(realName + ".desc",
+ tr("No description available")).toString();
+
+ lblCaption->setText("<h2>" + caption +"</h2>");
+ lblDescription->setText(description);
+ }
+ else
+ {
+ btnPreview->setIcon(QIcon(":/res/Trainings.png"));
+ lblCaption->setText(tr("Select a mission!"));
+ // TODO better text and tr()
+ lblDescription->setText("");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/page/pagetraining.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,62 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef PAGE_TRAINING_H
+#define PAGE_TRAINING_H
+
+#include <QDir>
+
+#include "AbstractPage.h"
+
+class PageTraining : public AbstractPage
+{
+ Q_OBJECT
+
+public:
+ PageTraining(QWidget* parent = 0);
+
+
+signals:
+ void startMission(const QString & scriptName);
+
+
+protected:
+ QLayout * bodyLayoutDefinition();
+ QLayout * footerLayoutDefinition();
+ void connectSignals();
+
+
+private:
+ QPushButton * btnPreview;
+ QPushButton * btnStart;
+ QLabel * lblCaption;
+ QLabel * lblDescription;
+ QListWidget * lstMissions;
+ QSettings * m_info;
+
+ QStringList scriptList(const QDir & scriptDir) const;
+
+
+private slots:
+ void startSelected();
+ void updateInfo();
+
+};
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/qaspectratiolayout.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation.
+ */
+
+#include "qaspectratiolayout.h"
+
+QAspectRatioLayout::QAspectRatioLayout(QWidget* parent, int spacing) : QLayout(parent) {
+ init(spacing);
+}
+
+QAspectRatioLayout::QAspectRatioLayout(int spacing) {
+ init(spacing);
+}
+
+QAspectRatioLayout::~QAspectRatioLayout() {
+ delete item;
+ delete lastReceivedRect;
+ delete _geometry;
+}
+
+void QAspectRatioLayout::init(int spacing) {
+ item = 0;
+ lastReceivedRect = new QRect(0, 0, 0, 0);
+ _geometry = new QRect(0, 0, 0, 0);
+ setSpacing(spacing);
+}
+
+
+/* Adds item if place isn't already taken. */
+void QAspectRatioLayout::add(QLayoutItem* item) {
+ if(!hasItem()) {
+ replaceItem(item);
+ }
+}
+
+/* Adds item if place isn't already taken. */
+void QAspectRatioLayout::addItem(QLayoutItem* item) {
+ if(!hasItem()) {
+ replaceItem(item);
+ }
+}
+
+/* Adds widget if place isn't already taken. */
+void QAspectRatioLayout::addWidget(QWidget* widget) {
+ if(!hasItem()) {
+ replaceItem(new QWidgetItem(widget));
+ }
+}
+
+/* Returns the item pointer and dereferences it here. */
+QLayoutItem* QAspectRatioLayout::take() {
+ QLayoutItem* item = 0;
+ if(this->hasItem()) {
+ item = this->item;
+ this->item = 0;
+ }
+ return item;
+}
+
+/* Returns the item pointer and dereferences it here. */
+QLayoutItem* QAspectRatioLayout::takeAt(int index) {
+ if(index != 0) {
+ return 0;
+ }
+ return this->take();
+}
+
+/* Returns the item pointer. */
+QLayoutItem* QAspectRatioLayout::itemAt(int index) const {
+ if(index != 0) {
+ return 0;
+ }
+ if(hasItem()) {
+ return this->item;
+ }
+ return 0;
+}
+
+/* Checks if we have an item. */
+bool QAspectRatioLayout::hasItem() const {
+ return this->item != 0;
+}
+
+/* Returns the count of items which can be either 0 or 1. */
+int QAspectRatioLayout::count() const {
+ int returnValue = 0;
+ if(hasItem()) {
+ returnValue = 1;
+ }
+ return returnValue;
+}
+
+/* Replaces the item with the new and returns the old. */
+QLayoutItem* QAspectRatioLayout::replaceItem(QLayoutItem* item) {
+ QLayoutItem* old = 0;
+ if(this->hasItem()) {
+ old = this->item;
+ }
+ this->item = item;
+ setGeometry(*this->_geometry);
+ return old;
+}
+
+/* Tells which way layout expands. */
+Qt::Orientations QAspectRatioLayout::expandingDirections() const {
+ return Qt::Horizontal | Qt::Vertical;
+}
+
+/* Tells which size is preferred. */
+QSize QAspectRatioLayout::sizeHint() const {
+ return this->item->minimumSize();
+}
+
+/* Tells minimum size. */
+QSize QAspectRatioLayout::minimumSize() const {
+ return this->item->minimumSize();
+}
+
+/*
+ * Tells if heightForWidth calculations is handled.
+ * It isn't since width isn't enough to calculate
+ * proper size.
+ */
+bool QAspectRatioLayout::hasHeightForWidth() const {
+ return false;
+}
+
+/* Replaces lastReceivedRect. */
+void QAspectRatioLayout::setLastReceivedRect(const QRect& rect) {
+ QRect* oldRect = this->lastReceivedRect;
+ this->lastReceivedRect = new QRect(rect.topLeft(), rect.size());
+ delete oldRect;
+}
+
+/* Returns geometry */
+QRect QAspectRatioLayout::geometry() {
+ return QRect(*this->_geometry);
+}
+
+/* Sets geometry to given size. */
+void QAspectRatioLayout::setGeometry(const QRect& rect) {
+ /*
+ * We check if the item is set and
+ * if size is the same previously received.
+ * If either is false nothing is done.
+ */
+ if(!this->hasItem() ||
+ areRectsEqual(*this->lastReceivedRect, rect)) {
+ return;
+ }
+ /* Replace the last received rectangle. */
+ setLastReceivedRect(rect);
+ /* Calculate proper size for the item relative to the received size. */
+ QSize properSize = calculateProperSize(rect.size());
+ /* Calculate center location in the rect and with item size. */
+ QPoint properLocation = calculateCenterLocation(rect.size(), properSize);
+ /* Set items geometry */
+ this->item->setGeometry(QRect(properLocation, properSize));
+ QRect* oldRect = this->_geometry;
+ /* Cache the calculated geometry. */
+ this->_geometry = new QRect(properLocation, properSize);
+ delete oldRect;
+ /* Super classes setGeometry */
+ QLayout::setGeometry(*this->_geometry);
+}
+
+/* Takes the shortest side and creates QSize
+ * with the shortest side as width and height. */
+QSize QAspectRatioLayout::calculateProperSize(QSize from) const {
+ QSize properSize;
+ if(from.height() * 2 < from.width()) {
+ properSize.setHeight(from.height() - this->margin());
+ properSize.setWidth(from.height() * 2 - this->margin());
+ }
+ else {
+ properSize.setWidth(from.width() - this->margin());
+ properSize.setHeight(from.width() / 2 - this->margin());
+ }
+ return properSize;
+}
+
+/* Calculates center location from the given height and width for item size. */
+QPoint QAspectRatioLayout::calculateCenterLocation(QSize from,
+ QSize itemSize) const {
+ QPoint centerLocation;
+ if((from.width() - itemSize.width()) > 0) {
+ centerLocation.setX((from.width() - itemSize.width())/2);
+ }
+ if((from.height() - itemSize.height()) > 0) {
+ centerLocation.setY((from.height() - itemSize.height())/2);
+ }
+ return centerLocation;
+}
+
+/* Compares if two QRects are equal. */
+bool QAspectRatioLayout::areRectsEqual(const QRect& a,
+ const QRect& b) const {
+ bool result = false;
+ if(a.x() == b.x() &&
+ a.y() == b.y() &&
+ a.height() == b.height() &&
+ a.width() == b.width()) {
+ result = true;
+ }
+ return result;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/qaspectratiolayout.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation.
+ */
+
+#ifndef QASPECTRATIOLAYOUT_H_
+#define QASPECTRATIOLAYOUT_H_
+
+#include <QLayout>
+#include <QPointer>
+#include <QRect>
+#include <QWidgetItem>
+#include <QLayoutItem>
+
+
+class QAspectRatioLayout : public QLayout
+{
+ Q_OBJECT
+
+public:
+ QAspectRatioLayout(QWidget* parent, int spacing =-1);
+ QAspectRatioLayout(int spacing = -1);
+ ~QAspectRatioLayout();
+
+ /* Convenience method */
+ virtual void add(QLayoutItem* item);
+
+/* http://doc.trolltech.com/qlayout.html#addItem */
+ virtual void addItem(QLayoutItem* item);
+ /* http://doc.trolltech.com/qlayout.html#addWidget */
+ virtual void addWidget(QWidget* widget);
+ /* http://doc.trolltech.com/qlayout.html#takeAt */
+ virtual QLayoutItem* takeAt(int index);
+ /* http://doc.trolltech.com/qlayout.html#itemAt */
+ virtual QLayoutItem* itemAt(int index) const;
+ /* http://doc.trolltech.com/qlayout.html#count */
+ virtual int count() const;
+
+ /*
+ * These are ours since we do have only one item.
+ */
+ virtual QLayoutItem* replaceItem(QLayoutItem* item);
+ virtual QLayoutItem* take();
+ virtual bool hasItem() const;
+
+/* http://doc.trolltech.com/qlayout.html#expandingDirections */
+ virtual Qt::Orientations expandingDirections() const;
+
+ /*
+ * This method contains most of the juice of this article.
+ * http://doc.trolltech.com/qlayoutitem.html#setGeometry
+ */
+ virtual void setGeometry(const QRect& rect);
+ /* http://doc.trolltech.com/qlayoutitem.html#geometry */
+ virtual QRect geometry();
+
+ /* http://doc.trolltech.com/qlayoutitem.html#sizeHint */
+ virtual QSize sizeHint() const;
+ /* http://doc.trolltech.com/qlayout.html#minimumSize */
+ virtual QSize minimumSize() const;
+ /* http://doc.trolltech.com/qlayoutitem.html#hasHeightForWidth */
+ virtual bool hasHeightForWidth() const;
+
+private:
+ /* Saves the last received rect. */
+ void setLastReceivedRect(const QRect& rect);
+ /* Used to initialize the object. */
+ void init(int spacing);
+ /* Calculates the maximum size for the item from the assigned size. */
+ QSize calculateProperSize(QSize from) const;
+ /* Calculates the center location from the assigned size and
+ * the items size. */
+ QPoint calculateCenterLocation(QSize from, QSize itemSize) const;
+ /* Check if two QRects are equal */
+ bool areRectsEqual(const QRect& a, const QRect& b) const;
+ /* Contains item reference */
+ QLayoutItem* item;
+ /*
+ * Used for caching so we won't do calculations every time
+ * setGeometry is called.
+ */
+ QRect* lastReceivedRect;
+ /* Contains geometry */
+ QRect* _geometry;
+
+};
+
+#endif /* QASPECTRATIOLAYOUT_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/FreqSpinBox.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,33 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2005-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "FreqSpinBox.h"
+
+/**
+ * Returns it's value as localized frequency.
+ * 'Never', 'Every Turn', 'Every 2 Turns', etc.
+ * @param value integer value to be representing as string
+ * @return the turn frequence-like string representation
+ */
+QString FreqSpinBox::textFromValue(int value) const
+{
+ if (value == 0)
+ return tr("Never");
+ else
+ return tr("Every %1 turn", "", value).arg(value);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/FreqSpinBox.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,44 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2005-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef FREQSPINBOX_H
+#define FREQSPINBOX_H
+
+
+#include <QObject>
+#include <QSpinBox>
+
+/**
+ * A SpinBox that returns it's value as localized turn frequency.
+ * 'Never', 'Every Turn', 'Every 2 Turns', etc.
+ * @author unc0rr
+ * @since 0.9.12
+ */
+class FreqSpinBox : public QSpinBox
+{
+ Q_OBJECT
+
+public:
+ FreqSpinBox(QWidget* parent) : QSpinBox(parent) {};
+
+protected:
+ QString textFromValue(int value) const;
+};
+
+
+#endif // FREQSPINBOX_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/SquareLabel.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,50 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QPaintEvent>
+#include <QPainter>
+#include "SquareLabel.h"
+#include "hwform.h"
+
+SquareLabel::SquareLabel(QWidget * parent) :
+ QWidget(parent)
+{
+ if(frontendEffects) setAttribute(Qt::WA_PaintOnScreen, true);
+}
+
+void SquareLabel::paintEvent(QPaintEvent * event)
+{
+ Q_UNUSED(event);
+
+ QPainter painter(this);
+ int pixsize;
+ if (width() > height()) {
+ pixsize = height();
+ painter.translate((width() - pixsize) / 2, 0);
+ } else {
+ pixsize = width();
+ painter.translate(0, (height() - pixsize) / 2);
+ }
+ painter.drawPixmap(0, 0, pixsize, pixsize, pixmap.scaled(pixsize, pixsize, Qt::KeepAspectRatio));
+}
+
+void SquareLabel::setPixmap(const QPixmap & pixmap)
+{
+ this->pixmap = pixmap;
+ repaint();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/SquareLabel.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,41 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _SQUARELABEL_H
+#define _SQUARELABEL_H
+
+#include <QWidget>
+#include <QPixmap>
+
+class SquareLabel : public QWidget
+{
+ Q_OBJECT
+
+public:
+ SquareLabel(QWidget * parent = 0);
+
+ void setPixmap(const QPixmap & pixmap);
+protected:
+ virtual void paintEvent(QPaintEvent * event);
+
+private:
+ QPixmap pixmap;
+
+};
+
+#endif // _SQUARELABEL_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/about.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,146 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QLabel>
+#include <QTextBrowser>
+#include "about.h"
+#include "hwconsts.h"
+
+About::About(QWidget * parent) :
+ QWidget(parent)
+{
+ QGridLayout *mainLayout = new QGridLayout(this);
+
+ QLabel *imageLabel = new QLabel;
+ QImage image(":/res/Hedgehog.png");
+ imageLabel->setPixmap(QPixmap::fromImage(image));
+ imageLabel->setScaledContents(true);
+ imageLabel->setMinimumWidth(2.8);
+ imageLabel->setMaximumWidth(280);
+ imageLabel->setMinimumHeight(30);
+ imageLabel->setMaximumHeight(300);
+
+ mainLayout->addWidget(imageLabel, 0, 0, 2, 1);
+
+ QLabel *lbl1 = new QLabel(this);
+ lbl1->setOpenExternalLinks(true);
+ lbl1->setText(
+ "<style type=\"text/css\">"
+ "a { color: #ffcc00; }"
+// "a:hover { color: yellow; }"
+ "</style>"
+ "<div align=\"center\"><h1>Hedgewars</h1>"
+ "<h3>" + QLabel::tr("Version") + " " + *cVersionString + "</h3>"
+ "<p><a href=\"http://www.hedgewars.org/\">http://www.hedgewars.org/</a></p><br>" +
+ QLabel::tr("This program is distributed under the GNU General Public License v2") +
+ "</div>"
+ );
+ lbl1->setWordWrap(true);
+ mainLayout->addWidget(lbl1, 0, 1);
+
+ QTextBrowser *lbl2 = new QTextBrowser(this);
+
+ lbl2->setOpenExternalLinks(true);
+ lbl2->setText(
+ "<style type=\"text/css\">"
+ "a { color: #ffcc00; }"
+// "a:hover { color: yellow; }"
+ "</style>" +
+ QString("<h2>") +
+ QLabel::tr("Developers:") +
+ "</h2><p>"
+ "Engine, frontend, net server: Andrey Korotaev <<a href=\"mailto:unC0Rr@gmail.com\">unC0Rr@gmail.com</a>><br>"
+ "Many frontend improvements: Igor Ulyanov <<a href=\"mailto:disinbox@gmail.com\">disinbox@gmail.com</a>><br>"
+ "Many engine and frontend improvements: Derek Pomery <<a href=\"mailto:nemo@m8y.org\">nemo@m8y.org</a>><br>"
+ "Drill rocket, Ballgun, RC Plane weapons: Martin Boze <<a href=\"mailto:afffect@gmail.com\">afffect@gmail.com</a>><br>"
+ "Mine number and time game settings: David A. Cuadrado <<a href=\"mailto:krawek@gmail.com\">krawek@gmail.com</a>><br>"
+ "Frontend improvements: Martin Minarik <<a href=\"mailto:ttsmj@pokec.sk\">ttsmj@pokec.sk</a>><br>"
+ "Frontend improvements: Kristian Lehmann <<a href=\"mailto:email@thexception.net\">email@thexception.net</a>><br>"
+ "Mac OS X/iPhone port, OpenGL-ES conversion: Vittorio Giovara <<a href=\"mailto:vittorio.giovara@gmail.com\">vittorio.giovara@gmail.com</a>><br>"
+ "Many engine and frontend improvements (and bugs): Richard Karolyi <<a href=\"mailto:sheepluva@" "ercatec.net\">sheepluva@" "ercatec.net</a>><br>"
+ "Gamepad and Lua integration: Mario Liebisch <<a href=\"mailto:mario.liebisch@gmail.com\">mario.liebisch@gmail.com</a>><br>"
+ "Many engine improvements and graphics: Carlos Vives <<a href=\"mailto:mail@carlosvives.es\">mail@carlosvives.es</a>><br>"
+ "Maze maps: Henning Kühn <<a href=\"mailto:prg@cooco.de\">prg@cooco.de</a>><br>"
+ "Engine and frontend improvements: Henrik Rostedt <<a href=\"mailto:henrik.rostedt@gmail.com\">henrik.rostedt@gmail.com</a>><br>"
+ "Lua game modes and missions: John Lambert <<a href=\"mailto:redgrinner@gmail.com\">redgrinner@gmail.com</a>><br>"
+ "Frontend improvements: Mayur Pawashe <<a href=\"mailto:zorgiepoo@gmail.com\">zorgiepoo@gmail.com</a>><br>"
+ "Android port: Richard Deurwaarder <<a href=\"mailto:xeli@xelification.com\">xeli@xelification.com</a>><br>"
+ "</p><h2>" +
+
+ QLabel::tr("Art:") + "</h2>"
+ + QString::fromUtf8(
+ "<p>John Dum <<a href=\"mailto:fizzy@gmail.com\">fizzy@gmail.com</a>>"
+ "<br>"
+ "Joshua Frese <<a href=\"mailto:joshfrese@gmail.com\">joshfrese@gmail.com</a>>"
+ "<br>"
+ "Stanko Tadić <<a href=\"mailto:stanko@mfhinc.net\">stanko@mfhinc.net</a>>"
+ "<br>"
+ "Julien Koesten <<a href=\"mailto:julienkoesten@aol.com\">julienkoesten@aol.com</a>>"
+ "<br>"
+ "Joshua O'Sullivan <<a href=\"mailto:coheedftw@hotmail.co.uk\">coheedftw@hotmail.co.uk</a>>"
+ "<br>"
+ "Nils Lück <<a href=\"mailto:nils.luck.design@gmail.com\">nils.luck.design@gmail.com</a>>"
+ "<br>"
+ "Guillaume Englert <<a href=\"mailto:genglert@hybird.org\">genglert@hybird.org</a>>"
+ "<br>"
+ "Hats: Trey Perry <<a href=\"mailto:tx.perry.j@gmail.com\">tx.perry.j@gmail.com</a>>"
+ "</p><h2>") +
+ QLabel::tr("Sounds:") + "</h2>"
+ "Hedgehogs voice: Stephen Alexander <<a href=\"mailto:ArmagonNo1@gmail.com\">ArmagonNo1@gmail.com</a>>"
+ "<br>"
+ "John Dum <<a href=\"mailto:fizzy@gmail.com\">fizzy@gmail.com</a>>"
+ "<br>"
+ "Jonatan Nilsson <<a href=\"mailto:jonatanfan@gmail.com\">jonatanfan@gmail.com</a>>"
+ "<br>"
+ "Daniel Martin <<a href=\"mailto:elhombresinremedio@gmail.com\">elhombresinremedio@gmail.com</a>>"
+ "</p><h2>" +
+
+ QLabel::tr("Translations:") + "</h2><p>"
+ + QString::fromUtf8(
+ "Brazilian Portuguese: Romulo Fernandes Machado <<a href=\"mailto:abra185@gmail.com\">abra185@gmail.com</a>><br>"
+ "Bulgarian: Svetoslav Stefanov<br>"
+ "Czech: Petr ŘezáÄek <<a href=\"mailto:rezacek@gmail.com\">rezacek@gmail.com</a>><br>"
+ "Chinese: Jie Luo <<a href=\"mailto:lililjlj@gmail.com\">lililjlj@gmail.com</a>><br>"
+ "English: Andrey Korotaev <<a href=\"mailto:unC0Rr@gmail.com\">unC0Rr@gmail.com</a>><br>"
+ "Finnish: Nina Kuisma <<a href=\"mailto:ninnnu@gmail.com\">ninnnu@gmail.com</a>><br>"
+ "French: Antoine Turmel <<a href=\"mailto:geekshadow@gmail.com\">geekshadow@gmail.com</a>><br>"
+ "German: Peter Hüwe <<a href=\"mailto:PeterHuewe@gmx.de\">PeterHuewe@gmx.de</a>>, Mario Liebisch <<a href=\"mailto:mario.liebisch@gmail.com\">mario.liebisch@gmail.com</a>>, Richard Karolyi <<a href=\"mailto:sheepluva@" "ercatec.net\">sheepluva@" "ercatec.net</a>><br>"
+ "Greek: <<a href=\"mailto:talos_kriti@yahoo.gr\">talos_kriti@yahoo.gr</a>><br>"
+ "Italian: Luca Bonora <<a href=\"mailto:bonora.luca@gmail.com\">bonora.luca@gmail.com</a>>, Marco Bresciani<br>"
+ "Japanese: ADAM Etienne <<a href=\"mailto:etienne.adam@gmail.com\">etienne.adam@gmail.com</a>><br>"
+ "Korean: Anthony Bellew <<a href=\"mailto:webmaster@anthonybellew.com\">webmaster@anthonybellew.com</a>><br>"
+ "Lithuanian: Lukas Urbonas <<a href=\"mailto:lukasu08@gmail.com\">lukasu08@gmail.com</a>><br>"
+ "Polish: Maciej Mroziński <<a href=\"mailto:mynick2@o2.pl\">mynick2@o2.pl</a>>, Wojciech Latkowski <<a href=\"mailto:magik17l@gmail.com\">magik17l@gmail.com</a>>, Piotr Mitana, Maciej Górny<br>"
+ "Portuguese: Fábio Canário <<a href=\"mailto:inufabie@gmail.com\">inufabie@gmail.com</a>><br>"
+ "Russian: Andrey Korotaev <<a href=\"mailto:unC0Rr@gmail.com\">unC0Rr@gmail.com</a>><br>"
+ "Slovak: Jose Riha<br>"
+ "Spanish: Carlos Vives <<a href=\"mailto:mail@carlosvives.es\">mail@carlosvives.es</a>><br>"
+ "Swedish: Niklas Grahn <<a href=\"mailto:raewolusjoon@yaoo.com\">raewolusjoon@yaoo.com</a>>, Henrik Rostedt <<a href=\"mailto:henrik.rostedt@gmail.com\">henrik.rostedt@gmail.com</a>><br>"
+ "Ukrainian: Eugene V. Lyubimkin <<a href=\"mailto:jackyf.devel@gmail.com\">jackyf.devel@gmail.com</a>>, Igor Paliychuk <<a href=\"mailto:mansonigor@gmail.com\">mansonigor@gmail.com</a>>, Eugene Sakara <<a href=\"mailto:eresid@gmail.com\">eresid@gmail.com</a>>"
+ "</p><h2>") +
+
+ QLabel::tr("Special thanks:") + "</h2><p>"
+ "Aleksey Andreev <<a href=\"mailto:blaknayabr@gmail.com\">blaknayabr@gmail.com</a>><br>"
+ "Aleksander Rudalev <<a href=\"mailto:alexv@pomorsu.ru\">alexv@pomorsu.ru</a>><br>"
+ "Natasha Korotaeva <<a href=\"mailto:layout@pisem.net\">layout@pisem.net</a>><br>"
+ "Adam Higerd (aka ahigerd at FreeNode)"
+ "</p>"
+ );
+ mainLayout->addWidget(lbl2, 1, 1);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/about.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,33 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _ABOUT_H
+#define _ABOUT_H
+
+#include <QWidget>
+
+
+class About : public QWidget
+{
+ Q_OBJECT
+
+public:
+ About(QWidget * parent = 0);
+};
+
+#endif // _ABOUT_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/bgwidget.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,143 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2009 Kristian Lehmann <email@thexception.net>
+ * Copyright (c) 2009-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "bgwidget.h"
+
+SpritePosition::SpritePosition(QWidget * parent, int sh)
+{
+ wParent = parent;
+ iSpriteHeight = sh;
+ reset();
+}
+
+SpritePosition::~SpritePosition()
+{
+}
+
+void SpritePosition::move()
+{
+ fX += fXMov;
+ fY += fYMov;
+ iAngle += 4;
+ if (iAngle >= 360) iAngle = 0;
+ if (fY > wParent->height()) reset();
+}
+
+void SpritePosition::reset()
+{
+ fY = -1 * iSpriteHeight;
+ fX = (qrand() % ((int)(wParent->width() * 1.5))) - wParent->width()/2;
+ fYMov = ((qrand() % 400)+300) / 100.0f;
+ fXMov = fYMov * 0.2f+((qrand()%100)/100.0f * 0.6f); //so between 0.2 and 0.6, or 0.5 +/- 0.3
+ iAngle = qrand() % 360;
+}
+
+QPoint SpritePosition::pos()
+{
+ return QPoint((int)fX,(int)fY);
+}
+
+int SpritePosition::getAngle()
+{
+ return iAngle;
+}
+
+void SpritePosition::init()
+{
+ fY = qrand() % (wParent->height() + 1);
+ fX = qrand() % (wParent->width() + 1);
+}
+
+BGWidget::BGWidget(QWidget * parent) : QWidget(parent)
+{
+ setAttribute(Qt::WA_NoSystemBackground, true);
+ sprite.load(":/res/Star.png");
+
+ setAutoFillBackground(false);
+
+ for (int i = 0; i < SPRITE_MAX; i++) spritePositions[i] = new SpritePosition(this, sprite.height());
+
+ for (int i = 0; i < 360; i++)
+ {
+ rotatedSprites[i] = new QImage(sprite.width(), sprite.height(), QImage::Format_ARGB32);
+ rotatedSprites[i]->fill(0);
+
+ QPoint translate(sprite.width()/2, sprite.height()/2);
+
+ QPainter p;
+ p.begin(rotatedSprites[i]);
+ // p.setRenderHint(QPainter::Antialiasing);
+ p.setRenderHint(QPainter::SmoothPixmapTransform);
+ p.translate(translate.x(), translate.y());
+ p.rotate(i);
+ p.translate(-1*translate.x(), -1*translate.y());
+ p.drawImage(0, 0, sprite);
+ }
+
+ timerAnimation = new QTimer();
+ connect(timerAnimation, SIGNAL(timeout()), this, SLOT(animate()));
+ timerAnimation->setInterval(ANIMATION_INTERVAL);
+}
+
+BGWidget::~BGWidget()
+{
+ for (int i = 0; i < SPRITE_MAX; i++) delete spritePositions[i];
+ for (int i = 0; i < 360; i++) delete rotatedSprites[i];
+ delete timerAnimation;
+}
+
+void BGWidget::paintEvent(QPaintEvent *event)
+{
+ Q_UNUSED(event);
+
+ QPainter p;
+ p.begin(this);
+ //p.setRenderHint(QPainter::Antialiasing);
+ for (int i = 0; i < SPRITE_MAX; i++)
+ {
+ QPoint point = spritePositions[i]->pos();
+ p.drawImage(point.x(), point.y(), *rotatedSprites[spritePositions[i]->getAngle()]);
+ }
+ p.end();
+}
+
+void BGWidget::animate()
+{
+ for (int i = 0; i < SPRITE_MAX; i++)
+ {
+ // bottom edge of star *seems* clipped, but in fact, if I switch to just plain old repaint()/update() it is still clipped - artifact of transform? As for 5, is arbitrary number. 4 was noticeably clipping, 5 seemed same as update() - I assume extra room is due to rotation and value really should be calculated proportional to width/height
+ update(spritePositions[i]->pos().x(),spritePositions[i]->pos().y(), sprite.width()+5, sprite.height()+5);
+ spritePositions[i]->move();
+ }
+}
+
+void BGWidget::startAnimation()
+{
+ timerAnimation->start();
+}
+
+void BGWidget::stopAnimation()
+{
+ timerAnimation->stop();
+}
+
+void BGWidget::init()
+{
+ for (int i = 0; i < SPRITE_MAX; i++) spritePositions[i]->init();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/bgwidget.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,76 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2009 Kristian Lehmann <email@thexception.net>
+ * Copyright (c) 2009-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef BGWIDGET_H
+#define BGWIDGET_H
+
+#include <QWidget>
+//#include <QGLWidget>
+#include <QPainter>
+#include <QTimer>
+#include <QPaintEvent>
+#include <QTime>
+#include <QPoint>
+
+#define SPRITE_MAX 12
+
+#define ANIMATION_INTERVAL 40
+
+class SpritePosition
+{
+public:
+ SpritePosition(QWidget * parent, int sh);
+ ~SpritePosition();
+private:
+ float fX;
+ float fY;
+ float fXMov;
+ float fYMov;
+ int iAngle;
+ QWidget * wParent;
+ int iSpriteHeight;
+public:
+ void move();
+ void reset();
+ QPoint pos();
+ int getAngle();
+ void init();
+};
+
+class BGWidget : public QWidget
+{
+ Q_OBJECT
+public:
+ BGWidget(QWidget * parent);
+ ~BGWidget();
+ void startAnimation();
+ void stopAnimation();
+ void init();
+private:
+ QImage sprite;
+ QTimer * timerAnimation;
+ SpritePosition * spritePositions[SPRITE_MAX];
+ QImage * rotatedSprites[360];
+protected:
+ void paintEvent(QPaintEvent * event);
+private slots:
+ void animate();
+};
+
+#endif // BGWIDGET_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/chatwidget.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,584 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QDesktopServices>
+#include <QTextBrowser>
+#include <QLineEdit>
+#include <QAction>
+#include <QTextDocument>
+#include <QDir>
+#include <QSettings>
+#include <QFile>
+#include <QTextStream>
+#include <QMenu>
+#include <QCursor>
+#include <QScrollBar>
+#include <QItemSelectionModel>
+#include <QStringList>
+
+#include "hwconsts.h"
+#include "SDLs.h"
+#include "gameuiconfig.h"
+#include "chatwidget.h"
+
+ListWidgetNickItem::ListWidgetNickItem(const QString& nick, bool isFriend, bool isIgnored) : QListWidgetItem(nick)
+{
+ this->aFriend = isFriend;
+ this->isIgnored = isIgnored;
+}
+
+void ListWidgetNickItem::setFriend(bool isFriend)
+{
+ this->aFriend = isFriend;
+}
+
+void ListWidgetNickItem::setIgnored(bool isIgnored)
+{
+ this->isIgnored = isIgnored;
+}
+
+bool ListWidgetNickItem::isFriend()
+{
+ return aFriend;
+}
+
+bool ListWidgetNickItem::ignored()
+{
+ return isIgnored;
+}
+
+bool ListWidgetNickItem::operator< (const QListWidgetItem & other) const
+{
+ // case in-sensitive comparison of the associated strings
+ // chars that are no letters are sorted at the end of the list
+
+ ListWidgetNickItem otherNick = const_cast<ListWidgetNickItem &>(dynamic_cast<const ListWidgetNickItem &>(other));
+
+ // ignored always down
+ if (isIgnored != otherNick.ignored())
+ return !isIgnored;
+
+ // friends always up
+ if (aFriend != otherNick.isFriend())
+ return aFriend;
+
+ QString txt1 = text().toLower();
+ QString txt2 = other.text().toLower();
+
+ bool firstIsShorter = (txt1.size() < txt2.size());
+ int len = firstIsShorter?txt1.size():txt2.size();
+
+ for (int i = 0; i < len; i++)
+ {
+ if (txt1[i] == txt2[i])
+ continue;
+ if (txt1[i].isLetter() != txt2[i].isLetter())
+ return txt1[i].isLetter();
+ return (txt1[i] < txt2[i]);
+ }
+
+ return firstIsShorter;
+}
+
+const char* HWChatWidget::STYLE =
+"\
+a { color:#c8c8ff; }\
+.nick { text-decoration: none; }\
+.UserChat .nick { color:#ffec20; }\
+.FriendChat { color: #08e008; }\
+.FriendChat .nick { color: #20ff20; }\
+.UserJoin { color: #c0c0c0; }\
+.UserJoin .nick { color: #d0d0d0; }\
+.FriendJoin { color: #c0e0c0; }\
+.FriendJoin .nick { color: #d0f0d0; }\
+.UserAction { color: #ff80ff; }\
+.UserAction .nick { color: #ffa0ff; }\
+.FriendAction { color: #ff00ff; }\
+.FriendAction .nick { color: #ff30ff; }\
+.Error { color: #ff0000 }\
+.Warning { color: #ff8000 }\
+.Notice { color: #fefefe }\
+";
+
+HWChatWidget::HWChatWidget(QWidget* parent, QSettings * gameSettings, SDLInteraction * sdli, bool notify) :
+ QWidget(parent),
+ mainLayout(this)
+{
+ this->gameSettings = gameSettings;
+ this->sdli = sdli;
+ this->notify = notify;
+ if(notify && gameSettings->value("frontend/sound", true).toBool()) {
+ QFile tmpfile;
+ sdli->SDLMusicInit();
+ for(int i=0;i<4;i++) {
+ tmpfile.setFileName(cfgdir->absolutePath() + "/Data/Sounds/voices/Classic/Hello.ogg");
+ if (tmpfile.exists()) sound[i] = Mix_LoadWAV(QFileInfo(tmpfile).absoluteFilePath().toLocal8Bit().constData());
+ else sound[i] = Mix_LoadWAV(QString(datadir->absolutePath() +
+ "/Sounds/voices/Classic/Hello.ogg").toLocal8Bit().constData());
+ }
+ }
+
+ mainLayout.setSpacing(1);
+ mainLayout.setMargin(1);
+ mainLayout.setSizeConstraint(QLayout::SetMinimumSize);
+ mainLayout.setColumnStretch(0, 76);
+ mainLayout.setColumnStretch(1, 24);
+
+ chatEditLine = new QLineEdit(this);
+ chatEditLine->setMaxLength(300);
+ connect(chatEditLine, SIGNAL(returnPressed()), this, SLOT(returnPressed()));
+
+ mainLayout.addWidget(chatEditLine, 2, 0);
+
+ chatText = new QTextBrowser(this);
+ chatText->document()->setDefaultStyleSheet(STYLE);
+ chatText->setMinimumHeight(20);
+ chatText->setMinimumWidth(10);
+ chatText->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ chatText->setOpenLinks(false);
+ connect(chatText, SIGNAL(anchorClicked(const QUrl&)),
+ this, SLOT(linkClicked(const QUrl&)));
+ mainLayout.addWidget(chatText, 0, 0, 2, 1);
+
+ chatNicks = new QListWidget(this);
+ chatNicks->setMinimumHeight(10);
+ chatNicks->setMinimumWidth(10);
+ chatNicks->setSortingEnabled(true);
+ chatNicks->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ chatNicks->setContextMenuPolicy(Qt::ActionsContextMenu);
+ connect(chatNicks, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
+ this, SLOT(chatNickDoubleClicked(QListWidgetItem *)));
+ connect(chatNicks, SIGNAL(currentRowChanged(int)),
+ this, SLOT(chatNickSelected(int)));
+
+ mainLayout.addWidget(chatNicks, 0, 1, 3, 1);
+
+ acInfo = new QAction(QAction::tr("Info"), chatNicks);
+ acInfo->setIcon(QIcon(":/res/info.png"));
+ connect(acInfo, SIGNAL(triggered(bool)), this, SLOT(onInfo()));
+ acKick = new QAction(QAction::tr("Kick"), chatNicks);
+ acKick->setIcon(QIcon(":/res/kick.png"));
+ connect(acKick, SIGNAL(triggered(bool)), this, SLOT(onKick()));
+ acBan = new QAction(QAction::tr("Ban"), chatNicks);
+ acBan->setIcon(QIcon(":/res/ban.png"));
+ connect(acBan, SIGNAL(triggered(bool)), this, SLOT(onBan()));
+ acFollow = new QAction(QAction::tr("Follow"), chatNicks);
+ acFollow->setIcon(QIcon(":/res/follow.png"));
+ connect(acFollow, SIGNAL(triggered(bool)), this, SLOT(onFollow()));
+ acIgnore = new QAction(QAction::tr("Ignore"), chatNicks);
+ acIgnore->setIcon(QIcon(":/res/ignore.png"));
+ connect(acIgnore, SIGNAL(triggered(bool)), this, SLOT(onIgnore()));
+ acFriend = new QAction(QAction::tr("Add friend"), chatNicks);
+ acFriend->setIcon(QIcon(":/res/addfriend.png"));
+ connect(acFriend, SIGNAL(triggered(bool)), this, SLOT(onFriend()));
+
+ chatNicks->insertAction(0, acFriend);
+ chatNicks->insertAction(0, acInfo);
+ chatNicks->insertAction(0, acIgnore);
+
+ showReady = false;
+ setShowFollow(true);
+}
+
+void HWChatWidget::linkClicked(const QUrl & link)
+{
+ if (link.scheme() == "http")
+ QDesktopServices::openUrl(link);
+ if (link.scheme() == "hwnick")
+ {
+ // decode nick
+ const QString& nick = QString::fromUtf8(QByteArray::fromBase64(link.encodedQuery()));
+ QList<QListWidgetItem *> items = chatNicks->findItems(nick, Qt::MatchExactly);
+ if (items.size() < 1)
+ return;
+ QMenu * popup = new QMenu(this);
+ // selecting an item will automatically scroll there, so let's save old position
+ QScrollBar * scrollBar = chatNicks->verticalScrollBar();
+ int oldScrollPos = scrollBar->sliderPosition();
+ // select the nick which we want to see the actions for
+ chatNicks->setCurrentItem(items[0], QItemSelectionModel::Clear);
+ // selecting an item will automatically scroll there, so let's save old position
+ scrollBar->setSliderPosition(oldScrollPos);
+ // load actions
+ popup->addActions(chatNicks->actions());
+ // display menu popup at mouse cursor position
+ popup->popup(QCursor::pos());
+ }
+}
+
+void HWChatWidget::setShowFollow(bool enabled)
+{
+ if (enabled) {
+ if (!(chatNicks->actions().contains(acFollow)))
+ chatNicks->insertAction(acFriend, acFollow);
+ }
+ else {
+ if (chatNicks->actions().contains(acFollow))
+ chatNicks->removeAction(acFollow);
+ }
+}
+
+void HWChatWidget::loadList(QStringList & list, const QString & file)
+{
+ list.clear();
+ QFile txt(cfgdir->absolutePath() + "/" + file);
+ if(!txt.open(QIODevice::ReadOnly))
+ return;
+ QTextStream stream(&txt);
+ stream.setCodec("UTF-8");
+
+ while(!stream.atEnd())
+ {
+ QString str = stream.readLine();
+ if(str.startsWith(";") || str.length() == 0)
+ continue;
+ list << str.trimmed();
+ }
+ //readd once we require newer Qt than 4.4
+ //list.removeDuplicates();
+ txt.close();
+}
+
+void HWChatWidget::saveList(QStringList & list, const QString & file)
+{
+ QFile txt(cfgdir->absolutePath() + "/" + file);
+ if(!txt.open(QIODevice::WriteOnly | QIODevice::Truncate))
+ return;
+ QTextStream stream(&txt);
+ stream.setCodec("UTF-8");
+
+ stream << "; this list is used by Hedgewars - do not edit it unless you know what you're doing!" << endl;
+ for(int i = 0; i < list.size(); i++)
+ stream << list[i] << endl;
+ txt.close();
+}
+
+void HWChatWidget::updateNickItem(QListWidgetItem *nickItem)
+{
+ QString nick = nickItem->text();
+ ListWidgetNickItem * item = dynamic_cast<ListWidgetNickItem*>(nickItem);
+
+ item->setFriend(friendsList.contains(nick, Qt::CaseInsensitive));
+ item->setIgnored(ignoreList.contains(nick, Qt::CaseInsensitive));
+
+ if(item->ignored())
+ {
+ item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_ignore_on.png" : ":/res/chat_ignore_off.png") : ":/res/chat_ignore.png"));
+ item->setForeground(Qt::gray);
+ }
+ else if(item->isFriend())
+ {
+ item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_friend_on.png" : ":/res/chat_friend_off.png") : ":/res/chat_friend.png"));
+ item->setForeground(Qt::green);
+ }
+ else
+ {
+ item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_default_on.png" : ":/res/chat_default_off.png") : ":/res/chat_default.png"));
+ item->setForeground(QBrush(QColor(0xff, 0xcc, 0x00)));
+ }
+}
+
+void HWChatWidget::updateNickItems()
+{
+ for(int i = 0; i < chatNicks->count(); i++)
+ updateNickItem(chatNicks->item(i));
+
+ chatNicks->sortItems();
+}
+
+void HWChatWidget::loadLists(const QString & nick)
+{
+ loadList(ignoreList, nick.toLower() + "_ignore.txt");
+ loadList(friendsList, nick.toLower() + "_friends.txt");
+ updateNickItems();
+}
+
+void HWChatWidget::saveLists(const QString & nick)
+{
+ saveList(ignoreList, nick.toLower() + "_ignore.txt");
+ saveList(friendsList, nick.toLower() + "_friends.txt");
+}
+
+void HWChatWidget::returnPressed()
+{
+ QStringList lines = chatEditLine->text().split('\n');
+ chatEditLine->clear();
+ foreach (const QString &line, lines)
+ emit chatLine(line);
+}
+
+
+void HWChatWidget::onChatString(const QString& str)
+{
+ onChatString("", str);
+}
+
+const QRegExp HWChatWidget::URLREGEXP = QRegExp("(http://)?(www\\.)?(hedgewars\\.org(/[^ ]*)?)");
+
+void HWChatWidget::onChatString(const QString& nick, const QString& str)
+{
+ bool isFriend = false;
+
+ if (!nick.isEmpty()) {
+ // don't show chat lines that are from ignored nicks
+ if (ignoreList.contains(nick, Qt::CaseInsensitive))
+ return;
+ // friends will get special treatment, of course
+ isFriend = friendsList.contains(nick, Qt::CaseInsensitive);
+ }
+
+ QString formattedStr = Qt::escape(str.mid(1));
+ // make hedgewars.org urls actual links
+ formattedStr = formattedStr.replace(URLREGEXP, "<a href=\"http://\\3\">\\3</a>");
+
+ // "link" nick, but before that encode it in base64 to make sure it can't intefere with html/url syntax
+ // the nick is put as querystring as putting it as host would convert it to it's lower case variant
+ if(!nick.isEmpty())
+ formattedStr.replace("|nick|",QString("<a href=\"hwnick://?%1\" class=\"nick\">%2</a>").arg(QString(nick.toUtf8().toBase64())).arg(nick));
+
+ QString cssClass("UserChat");
+
+ // check first character for color code and set color properly
+ switch (str[0].toAscii()) {
+ case 3:
+ cssClass = (isFriend ? "FriendJoin" : "UserJoin");
+ break;
+ case 2:
+ cssClass = (isFriend ? "FriendAction" : "UserAction");
+ break;
+ default:
+ if (isFriend)
+ cssClass = "FriendChat";
+ }
+
+ addLine(cssClass,formattedStr);
+}
+
+void HWChatWidget::addLine(const QString& cssClass, QString line)
+{
+ if (chatStrings.size() > 250)
+ chatStrings.removeFirst();
+
+ line = QString("<span class=\"%2\">%1</span>").arg(line).arg(cssClass);
+
+ chatStrings.append(line);
+
+ chatText->setHtml(chatStrings.join("<br>"));
+
+ chatText->moveCursor(QTextCursor::End);
+}
+
+void HWChatWidget::onServerMessage(const QString& str)
+{
+ if (chatStrings.size() > 250)
+ chatStrings.removeFirst();
+
+ chatStrings.append("<hr>" + str + "<hr>");
+
+ chatText->setHtml(chatStrings.join("<br>"));
+
+ chatText->moveCursor(QTextCursor::End);
+}
+
+void HWChatWidget::nickAdded(const QString& nick, bool notifyNick)
+{
+ QListWidgetItem * item = new ListWidgetNickItem(nick, friendsList.contains(nick, Qt::CaseInsensitive), ignoreList.contains(nick, Qt::CaseInsensitive));
+ updateNickItem(item);
+ chatNicks->addItem(item);
+
+ emit nickCountUpdate(chatNicks->count());
+
+ if(notifyNick && notify && gameSettings->value("frontend/sound", true).toBool()) {
+ Mix_PlayChannel(-1, sound[rand()%4], 0);
+ }
+}
+
+void HWChatWidget::nickRemoved(const QString& nick)
+{
+ foreach(QListWidgetItem * item, chatNicks->findItems(nick, Qt::MatchExactly))
+ chatNicks->takeItem(chatNicks->row(item));
+
+ emit nickCountUpdate(chatNicks->count());
+}
+
+void HWChatWidget::clear()
+{
+ chatText->clear();
+ chatStrings.clear();
+ chatNicks->clear();
+}
+
+void HWChatWidget::onKick()
+{
+ QListWidgetItem * curritem = chatNicks->currentItem();
+ if (curritem)
+ emit kick(curritem->text());
+}
+
+void HWChatWidget::onBan()
+{
+ QListWidgetItem * curritem = chatNicks->currentItem();
+ if (curritem)
+ emit ban(curritem->text());
+}
+
+void HWChatWidget::onInfo()
+{
+ QListWidgetItem * curritem = chatNicks->currentItem();
+ if (curritem)
+ emit info(curritem->text());
+}
+
+void HWChatWidget::onFollow()
+{
+ QListWidgetItem * curritem = chatNicks->currentItem();
+ if (curritem)
+ emit follow(curritem->text());
+}
+
+void HWChatWidget::onIgnore()
+{
+ QListWidgetItem * curritem = chatNicks->currentItem();
+ if(!curritem)
+ return;
+
+ if(ignoreList.contains(curritem->text(), Qt::CaseInsensitive)) // already on list - remove him
+ {
+ ignoreList.removeAll(curritem->text().toLower());
+ onChatString(HWChatWidget::tr("%1 *** %2 has been removed from your ignore list").arg('\x03').arg(curritem->text()));
+ }
+ else // not on list - add
+ {
+ // don't consider ignored people friends
+ if(friendsList.contains(curritem->text(), Qt::CaseInsensitive))
+ emit onFriend();
+
+ // scroll down on first ignore added so that people see where that nick went to
+ if (ignoreList.isEmpty())
+ chatNicks->scrollToBottom();
+
+ ignoreList << curritem->text().toLower();
+ onChatString(HWChatWidget::tr("%1 *** %2 has been added to your ignore list").arg('\x03').arg(curritem->text()));
+ }
+ updateNickItem(curritem); // update icon/sort order/etc
+ chatNicks->sortItems();
+ chatNickSelected(0); // update context menu
+}
+
+void HWChatWidget::onFriend()
+{
+ QListWidgetItem * curritem = chatNicks->currentItem();
+ if(!curritem)
+ return;
+
+ if(friendsList.contains(curritem->text(), Qt::CaseInsensitive)) // already on list - remove him
+ {
+ friendsList.removeAll(curritem->text().toLower());
+ onChatString(HWChatWidget::tr("%1 *** %2 has been removed from your friends list").arg('\x03').arg(curritem->text()));
+ }
+ else // not on list - add
+ {
+ // don't ignore the new friend
+ if(ignoreList.contains(curritem->text(), Qt::CaseInsensitive))
+ emit onIgnore();
+
+ // scroll up on first friend added so that people see where that nick went to
+ if (friendsList.isEmpty())
+ chatNicks->scrollToTop();
+
+ friendsList << curritem->text().toLower();
+ onChatString(HWChatWidget::tr("%1 *** %2 has been added to your friends list").arg('\x03').arg(curritem->text()));
+ }
+ updateNickItem(curritem); // update icon/sort order/etc
+ chatNicks->sortItems();
+ chatNickSelected(0); // update context menu
+}
+
+void HWChatWidget::chatNickDoubleClicked(QListWidgetItem * item)
+{
+ Q_UNUSED(item);
+
+ QList<QAction *> actions = chatNicks->actions();
+ actions.first()->activate(QAction::Trigger);
+}
+
+void HWChatWidget::chatNickSelected(int index)
+{
+ Q_UNUSED(index);
+
+ QListWidgetItem* item = chatNicks->currentItem();
+ if (!item)
+ return;
+
+ // update context menu labels according to possible action
+ if(ignoreList.contains(item->text(), Qt::CaseInsensitive))
+ {
+ acIgnore->setText(QAction::tr("Unignore"));
+ acIgnore->setIcon(QIcon(":/res/unignore.png"));
+ }
+ else
+ {
+ acIgnore->setText(QAction::tr("Ignore"));
+ acIgnore->setIcon(QIcon(":/res/ignore.png"));
+ }
+
+ if(friendsList.contains(item->text(), Qt::CaseInsensitive))
+ {
+ acFriend->setText(QAction::tr("Remove friend"));
+ acFriend->setIcon(QIcon(":/res/remfriend.png"));
+ }
+ else
+ {
+ acFriend->setText(QAction::tr("Add friend"));
+ acFriend->setIcon(QIcon(":/res/addfriend.png"));
+ }
+}
+
+void HWChatWidget::setShowReady(bool s)
+{
+ showReady = s;
+}
+
+void HWChatWidget::setReadyStatus(const QString & nick, bool isReady)
+{
+ QList<QListWidgetItem *> items = chatNicks->findItems(nick, Qt::MatchExactly);
+ if (items.size() != 1)
+ {
+ qWarning("Bug: cannot find user in chat");
+ return;
+ }
+
+ items[0]->setData(Qt::UserRole, isReady); // bulb status
+ updateNickItem(items[0]);
+
+ // ensure we're still showing the status bulbs
+ showReady = true;
+}
+
+void HWChatWidget::adminAccess(bool b)
+{
+ chatNicks->removeAction(acKick);
+ chatNicks->removeAction(acBan);
+
+ if(b)
+ {
+ chatNicks->insertAction(0, acKick);
+// chatNicks->insertAction(0, acBan);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/chatwidget.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,124 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _CHAT_WIDGET_INCLUDED
+#define _CHAT_WIDGET_INCLUDED
+
+#include <QWidget>
+#include <QListWidget>
+#include <QString>
+#include <QGridLayout>
+#include <QRegExp>
+
+#include "SDLs.h"
+
+class ListWidgetNickItem;
+class QTextBrowser;
+class QLineEdit;
+class QListWidget;
+class QSettings;
+class SDLInteraction;
+
+// this class is for custom nick sorting
+class ListWidgetNickItem : public QListWidgetItem
+{
+public:
+ ListWidgetNickItem(const QString& nick, bool isFriend, bool isIgnored);
+ bool operator<(const QListWidgetItem & other) const;
+ void setFriend(bool isFriend);
+ void setIgnored(bool isIgnored);
+ bool isFriend();
+ bool ignored();
+
+private:
+ bool aFriend;
+ bool isIgnored;
+};
+
+class HWChatWidget : public QWidget
+{
+ Q_OBJECT
+
+ public:
+ HWChatWidget(QWidget* parent, QSettings * gameSettings, SDLInteraction * sdli, bool notify);
+ void loadLists(const QString & nick);
+ void saveLists(const QString & nick);
+ void setShowReady(bool s);
+ void setShowFollow(bool enabled);
+ void addLine(const QString & cssClass, QString line);
+ static const char* STYLE;
+ QStringList ignoreList, friendsList;
+
+private:
+ void loadList(QStringList & list, const QString & file);
+ void saveList(QStringList & list, const QString & file);
+ void updateNickItem(QListWidgetItem *item);
+ void updateNickItems();
+ static const QRegExp URLREGEXP;
+
+ public slots:
+ void onChatString(const QString& str);
+ void onChatString(const QString& nick, const QString& str);
+ void onServerMessage(const QString& str);
+ void nickAdded(const QString& nick, bool notifyNick);
+ void nickRemoved(const QString& nick);
+ void clear();
+ void setReadyStatus(const QString & nick, bool isReady);
+ void adminAccess(bool);
+
+ signals:
+ void chatLine(const QString& str);
+ void kick(const QString & str);
+ void ban(const QString & str);
+ void info(const QString & str);
+ void follow(const QString &);
+ void nickCountUpdate(int cnt);
+
+ private:
+ QGridLayout mainLayout;
+ QTextBrowser* chatText;
+ QStringList chatStrings;
+ QListWidget* chatNicks;
+ QLineEdit* chatEditLine;
+ QAction * acInfo;
+ QAction * acKick;
+ QAction * acBan;
+ QAction * acFollow;
+ QAction * acIgnore;
+ QAction * acFriend;
+ QSettings * gameSettings;
+ SDLInteraction * sdli;
+ Mix_Chunk *sound[4];
+ bool notify;
+ bool showReady;
+
+ private slots:
+ void returnPressed();
+ void onBan();
+ void onKick();
+ void onInfo();
+ void onFollow();
+ void onIgnore();
+ void onFriend();
+ void chatNickDoubleClicked(QListWidgetItem * item);
+ void chatNickSelected(int index);
+ void linkClicked(const QUrl & link);
+};
+
+#endif // _CHAT_WIDGET_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/databrowser.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,57 @@
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QDebug>
+#include <QUrl>
+
+#include "databrowser.h"
+
+const QNetworkRequest::Attribute typeAttribute = (QNetworkRequest::Attribute)(QNetworkRequest::User + 1);
+const QNetworkRequest::Attribute urlAttribute = (QNetworkRequest::Attribute)(QNetworkRequest::User + 2);
+
+DataBrowser::DataBrowser(QWidget *parent) :
+ QTextBrowser(parent)
+{
+
+ manager = new QNetworkAccessManager(this);
+}
+
+QVariant DataBrowser::loadResource(int type, const QUrl & name)
+{
+ if(type == QTextDocument::ImageResource || type == QTextDocument::StyleSheetResource)
+ {
+ if(resources.contains(name.toString()))
+ {
+ return resources.take(name.toString());
+ }
+ else
+ if(!requestedResources.contains(name.toString()))
+ {
+ qDebug() << "Requesting resource" << name.toString();
+ requestedResources.insert(name.toString());
+
+ QNetworkRequest newRequest(QUrl("http://www.hedgewars.org" + name.toString()));
+ newRequest.setAttribute(typeAttribute, type);
+ newRequest.setAttribute(urlAttribute, name);
+
+ QNetworkReply *reply = manager->get(newRequest);
+ connect(reply, SIGNAL(finished()), this, SLOT(resourceDownloaded()));
+ }
+ }
+
+ return QVariant();
+}
+
+void DataBrowser::resourceDownloaded()
+{
+ QNetworkReply * reply = qobject_cast<QNetworkReply *>(sender());
+
+ if(reply)
+ {
+ int type = reply->request().attribute(typeAttribute).toInt();
+ QUrl url = reply->request().attribute(urlAttribute).toUrl();
+ resources.insert(url.toString(), reply->readAll());
+ document()->addResource(type, reply->request().url(), QVariant());
+ update();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/databrowser.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,33 @@
+#ifndef DATABROWSER_H
+#define DATABROWSER_H
+
+#include <QTextBrowser>
+#include <QSet>
+
+class QNetworkAccessManager;
+
+class DataBrowser : public QTextBrowser
+{
+ Q_OBJECT
+public:
+ explicit DataBrowser(QWidget *parent = 0);
+
+signals:
+
+public slots:
+
+private:
+ QNetworkAccessManager *manager;
+
+ // hash and set of QString instead of QUrl to support Qt versions
+ // older than 4.7 (those have no support for qHash(const QUrl &))
+ QHash<QString, QByteArray> resources;
+ QSet<QString> requestedResources;
+
+ QVariant loadResource(int type, const QUrl & name);
+
+private slots:
+ void resourceDownloaded();
+};
+
+#endif // DATABROWSER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/drawmapwidget.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,106 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QFile>
+#include <QMessageBox>
+#include <QEvent>
+
+#include "drawmapwidget.h"
+
+DrawMapWidget::DrawMapWidget(QWidget *parent) :
+ QWidget(parent),
+ ui(new Ui::DrawMapWidget)
+{
+ ui->setupUi(this);
+
+ m_scene = 0;
+}
+
+DrawMapWidget::~DrawMapWidget()
+{
+ delete ui;
+}
+
+void DrawMapWidget::changeEvent(QEvent *e)
+{
+ QWidget::changeEvent(e);
+ switch (e->type()) {
+ case QEvent::LanguageChange:
+ ui->retranslateUi(this);
+ break;
+ default:
+ break;
+ }
+}
+
+void DrawMapWidget::setScene(DrawMapScene * scene)
+{
+ ui->graphicsView->setScene(scene);
+ m_scene = scene;
+}
+
+void DrawMapWidget::resizeEvent(QResizeEvent * event)
+{
+ Q_UNUSED(event);
+
+ if(ui->graphicsView && ui->graphicsView->scene())
+ ui->graphicsView->fitInView(ui->graphicsView->scene()->sceneRect(), Qt::KeepAspectRatio);
+}
+
+void DrawMapWidget::showEvent(QShowEvent * event)
+{
+ Q_UNUSED(event);
+
+ resizeEvent(0);
+}
+
+void DrawMapWidget::undo()
+{
+ if(m_scene) m_scene->undo();
+}
+
+void DrawMapWidget::clear()
+{
+ if(m_scene) m_scene->clearMap();
+}
+
+void DrawMapWidget::save(const QString & fileName)
+{
+ if(m_scene)
+ {
+ QFile file(fileName);
+
+ if(!file.open(QIODevice::WriteOnly))
+ QMessageBox::warning(this, tr("File error"), tr("Cannot open file '%1' for writing").arg(fileName));
+ else
+ file.write(qCompress(m_scene->encode()).toBase64());
+ }
+}
+
+void DrawMapWidget::load(const QString & fileName)
+{
+ if(m_scene)
+ {
+ QFile f(fileName);
+
+ if(!f.open(QIODevice::ReadOnly))
+ QMessageBox::warning(this, tr("File error"), tr("Cannot read file '%1'").arg(fileName));
+ else
+ m_scene->decode(qUncompress(QByteArray::fromBase64(f.readAll())));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/drawmapwidget.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,86 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef DRAWMAPWIDGET_H
+#define DRAWMAPWIDGET_H
+
+#include <QWidget>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QGraphicsView>
+
+#include "qaspectratiolayout.h"
+#include "drawmapscene.h"
+
+namespace Ui {
+ class Ui_DrawMapWidget
+ {
+ public:
+ QGraphicsView *graphicsView;
+
+ void setupUi(QWidget *drawMapWidget)
+ {
+ QAspectRatioLayout * arLayout = new QAspectRatioLayout(drawMapWidget);
+ arLayout->setMargin(0);
+
+ graphicsView = new QGraphicsView(drawMapWidget);
+ arLayout->addWidget(graphicsView);
+
+ retranslateUi(drawMapWidget);
+
+ QMetaObject::connectSlotsByName(drawMapWidget);
+ } // setupUi
+
+ void retranslateUi(QWidget *drawMapWidget)
+ {
+ Q_UNUSED(drawMapWidget);
+ } // retranslateUi
+
+ };
+
+ class DrawMapWidget: public Ui_DrawMapWidget {};
+}
+
+class DrawMapWidget : public QWidget
+{
+ Q_OBJECT
+
+public:
+ explicit DrawMapWidget(QWidget *parent = 0);
+ ~DrawMapWidget();
+
+ void setScene(DrawMapScene * scene);
+
+public slots:
+ void undo();
+ void clear();
+ void save(const QString & fileName);
+ void load(const QString & fileName);
+
+protected:
+ void changeEvent(QEvent *e);
+ virtual void resizeEvent(QResizeEvent * event);
+ virtual void showEvent(QShowEvent * event);
+
+private:
+ Ui::DrawMapWidget *ui;
+
+ DrawMapScene * m_scene;
+};
+
+#endif // DRAWMAPWIDGET_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/fpsedit.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,31 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "fpsedit.h"
+
+FPSEdit::FPSEdit(QWidget * parent) :
+ QSpinBox(parent)
+{
+ setRange(1, 34);
+ setValue(27);
+}
+
+QString FPSEdit::textFromValue(int value) const
+{
+ return QString::number(1000 / (35 - value));
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/fpsedit.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,35 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _FPSEDIT_H
+#define _FPSEDIT_H
+
+#include <QSpinBox>
+
+class FPSEdit : public QSpinBox
+{
+ Q_OBJECT
+
+public:
+ FPSEdit(QWidget * parent = 0);
+
+protected:
+ QString textFromValue (int value) const;
+};
+
+#endif // _FPSEDIT_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/frameTeam.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,128 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QResizeEvent>
+#include <QCoreApplication>
+#include <QPalette>
+
+#include "frameTeam.h"
+#include "teamselhelper.h"
+#include "hwconsts.h"
+
+FrameTeams::FrameTeams(QWidget* parent) :
+ QFrame(parent), maxHedgehogsPerGame(48), overallHedgehogs(0), mainLayout(this), nonInteractive(false)
+{
+ QPalette newPalette = palette();
+ newPalette.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
+ setPalette(newPalette);
+ setAutoFillBackground(true);
+
+ mainLayout.setSpacing(1);
+ mainLayout.setContentsMargins(4, 4, 4, 4);
+
+ int i = 0;
+ while(colors[i] != 0)
+ availableColors.push_back(QColor(colors[i++]));
+
+ resetColors();
+}
+
+void FrameTeams::setInteractivity(bool interactive)
+{
+ nonInteractive = !interactive;
+ for(tmapTeamToWidget::iterator it=teamToWidget.begin(); it!=teamToWidget.end(); ++it) {
+ TeamShowWidget* pts = dynamic_cast<TeamShowWidget*>(it.value());
+ if(!pts) throw;
+ pts->setInteractivity(interactive);
+ }
+}
+
+void FrameTeams::resetColors()
+{
+ currentColor=availableColors.end() - 1; // ensure next color is the first one
+}
+
+QColor FrameTeams::getNextColor() const
+{
+ QList<QColor>::ConstIterator nextColor=currentColor;
+ ++nextColor;
+ if (nextColor==availableColors.end()) nextColor=availableColors.begin();
+ return *nextColor;
+}
+
+void FrameTeams::addTeam(HWTeam team, bool willPlay)
+{
+ TeamShowWidget* pTeamShowWidget = new TeamShowWidget(team, willPlay, this);
+ if(nonInteractive) pTeamShowWidget->setInteractivity(false);
+// int hght=teamToWidget.empty() ? 0 : teamToWidget.begin()->second->size().height();
+ mainLayout.addWidget(pTeamShowWidget);
+ teamToWidget.insert(team, pTeamShowWidget);
+ QResizeEvent* pevent=new QResizeEvent(parentWidget()->size(), parentWidget()->size());
+ QCoreApplication::postEvent(parentWidget(), pevent);
+}
+
+void FrameTeams::removeTeam(HWTeam team)
+{
+ tmapTeamToWidget::iterator it=teamToWidget.find(team);
+ if(it==teamToWidget.end()) return;
+ mainLayout.removeWidget(it.value());
+ it.value()->deleteLater();
+ teamToWidget.erase(it);
+}
+
+void FrameTeams::resetTeams()
+{
+ for(tmapTeamToWidget::iterator it=teamToWidget.begin(); it!=teamToWidget.end(); ) {
+ mainLayout.removeWidget(it.value());
+ it.value()->deleteLater();
+ teamToWidget.erase(it++);
+ }
+}
+
+void FrameTeams::setHHNum(const HWTeam& team)
+{
+ TeamShowWidget* pTeamShowWidget = dynamic_cast<TeamShowWidget*>(getTeamWidget(team));
+ if(!pTeamShowWidget) return;
+ pTeamShowWidget->setHHNum(team.numHedgehogs());
+}
+
+void FrameTeams::setTeamColor(const HWTeam& team)
+{
+ TeamShowWidget* pTeamShowWidget = dynamic_cast<TeamShowWidget*>(getTeamWidget(team));
+ if(!pTeamShowWidget) return;
+ pTeamShowWidget->changeTeamColor(team.color());
+}
+
+QWidget* FrameTeams::getTeamWidget(HWTeam team)
+{
+//qDebug() << "FrameTeams::getTeamWidget getNetID() = " << team.getNetID();
+ tmapTeamToWidget::iterator it=teamToWidget.find(team);
+ QWidget* ret = it!=teamToWidget.end() ? it.value() : 0;
+ return ret;
+}
+
+bool FrameTeams::isFullTeams() const
+{
+ return overallHedgehogs==maxHedgehogsPerGame;
+}
+
+void FrameTeams::emitTeamColorChanged(const HWTeam& team)
+{
+ emit teamColorChanged(team);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/frameTeam.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,68 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _FRAME_TEAM_INCLUDED
+#define _FRAME_TEAM_INCLUDED
+
+#include <QFrame>
+#include <QList>
+#include <QColor>
+
+#include "teamselect.h"
+
+class FrameTeams : public QFrame
+{
+ Q_OBJECT
+
+ friend class CHedgehogerWidget;
+ friend class TeamShowWidget;
+
+ public:
+ FrameTeams(QWidget* parent=0);
+ QWidget* getTeamWidget(HWTeam team);
+ bool isFullTeams() const;
+ void resetColors();
+ void resetTeams();
+ void setHHNum(const HWTeam& team);
+ void setTeamColor(const HWTeam& team);
+ void setInteractivity(bool interactive);
+ QColor getNextColor() const;
+
+ signals:
+ void teamColorChanged(const HWTeam&);
+
+ public slots:
+ void addTeam(HWTeam team, bool willPlay);
+ void removeTeam(HWTeam team);
+
+ private:
+ const int maxHedgehogsPerGame;
+ int overallHedgehogs;
+ QList<QColor> availableColors;
+ QList<QColor>::Iterator currentColor;
+
+ void emitTeamColorChanged(const HWTeam& team);
+
+ QVBoxLayout mainLayout;
+ typedef QMap<HWTeam, QWidget*> tmapTeamToWidget;
+ tmapTeamToWidget teamToWidget;
+ bool nonInteractive;
+};
+
+#endif // _FRAME_TAM_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/gamecfgwidget.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,575 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QResizeEvent>
+#include <QGroupBox>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QSpinBox>
+#include <QLabel>
+#include <QMessageBox>
+#include <QTableView>
+#include <QPushButton>
+
+#include "gamecfgwidget.h"
+#include "igbox.h"
+#include "hwconsts.h"
+#include "ammoSchemeModel.h"
+#include "proto.h"
+
+GameCFGWidget::GameCFGWidget(QWidget* parent) :
+ QGroupBox(parent)
+ , mainLayout(this)
+ , seedRegexp("\\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\\}")
+{
+ mainLayout.setMargin(0);
+// mainLayout.setSizeConstraint(QLayout::SetMinimumSize);
+
+ pMapContainer = new HWMapContainer(this);
+ mainLayout.addWidget(pMapContainer, 0, 0);
+
+ IconedGroupBox *GBoxOptions = new IconedGroupBox(this);
+ GBoxOptions->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+ mainLayout.addWidget(GBoxOptions, 1, 0);
+
+ QGridLayout *GBoxOptionsLayout = new QGridLayout(GBoxOptions);
+
+ GBoxOptions->setTitle(tr("Game Options"));
+ GBoxOptionsLayout->addWidget(new QLabel(QLabel::tr("Style"), GBoxOptions), 1, 0);
+
+ Scripts = new QComboBox(GBoxOptions);
+ GBoxOptionsLayout->addWidget(Scripts, 1, 1);
+
+ Scripts->addItem("Normal");
+ Scripts->insertSeparator(1);
+
+ for (int i = 0; i < scriptList->size(); ++i) {
+ QString script = (*scriptList)[i].remove(".lua", Qt::CaseInsensitive);
+ QList<QVariant> scriptInfo;
+ scriptInfo.push_back(script);
+ QFile scriptCfgFile;
+ scriptCfgFile.setFileName(QString("%1/Data/Scripts/Multiplayer/%2.cfg").arg(cfgdir->absolutePath()).arg(script));
+ if (!scriptCfgFile.exists()) scriptCfgFile.setFileName(QString("%1/Scripts/Multiplayer/%2.cfg").arg(datadir->absolutePath()).arg(script));
+ if (scriptCfgFile.exists() && scriptCfgFile.open(QFile::ReadOnly)) {
+ QString scheme;
+ QString weapons;
+ QTextStream input(&scriptCfgFile);
+ input >> scheme;
+ input >> weapons;
+ if (scheme.isEmpty())
+ scheme = "locked";
+ scheme.replace("_", " ");
+ if (weapons.isEmpty())
+ weapons = "locked";
+ weapons.replace("_", " ");
+ scriptInfo.push_back(scheme);
+ scriptInfo.push_back(weapons);
+ scriptCfgFile.close();
+ }
+ else
+ {
+ scriptInfo.push_back("locked");
+ scriptInfo.push_back("locked");
+ }
+ Scripts->addItem(script.replace("_", " "), scriptInfo);
+ }
+
+ connect(Scripts, SIGNAL(currentIndexChanged(int)), this, SLOT(scriptChanged(int)));
+
+ QWidget *SchemeWidget = new QWidget(GBoxOptions);
+ GBoxOptionsLayout->addWidget(SchemeWidget, 2, 0, 1, 2);
+
+ QGridLayout *SchemeWidgetLayout = new QGridLayout(SchemeWidget);
+ SchemeWidgetLayout->setMargin(0);
+
+ GameSchemes = new QComboBox(SchemeWidget);
+ SchemeWidgetLayout->addWidget(GameSchemes, 0, 2);
+ connect(GameSchemes, SIGNAL(currentIndexChanged(int)), this, SLOT(schemeChanged(int)));
+
+ SchemeWidgetLayout->addWidget(new QLabel(QLabel::tr("Scheme"), SchemeWidget), 0, 0);
+
+ QPixmap pmEdit(":/res/edit.png");
+
+ QPushButton * goToSchemePage = new QPushButton(SchemeWidget);
+ goToSchemePage->setToolTip(tr("Edit schemes"));
+ goToSchemePage->setIconSize(pmEdit.size());
+ goToSchemePage->setIcon(pmEdit);
+ goToSchemePage->setMaximumWidth(pmEdit.width() + 6);
+ SchemeWidgetLayout->addWidget(goToSchemePage, 0, 3);
+ connect(goToSchemePage, SIGNAL(clicked()), this, SLOT(jumpToSchemes()));
+
+ SchemeWidgetLayout->addWidget(new QLabel(QLabel::tr("Weapons"), SchemeWidget), 1, 0);
+
+ WeaponsName = new QComboBox(SchemeWidget);
+ SchemeWidgetLayout->addWidget(WeaponsName, 1, 2);
+
+ connect(WeaponsName, SIGNAL(currentIndexChanged(int)), this, SLOT(ammoChanged(int)));
+
+ QPushButton * goToWeaponPage = new QPushButton(SchemeWidget);
+ goToWeaponPage->setToolTip(tr("Edit weapons"));
+ goToWeaponPage->setIconSize(pmEdit.size());
+ goToWeaponPage->setIcon(pmEdit);
+ goToWeaponPage->setMaximumWidth(pmEdit.width() + 6);
+ SchemeWidgetLayout->addWidget(goToWeaponPage, 1, 3);
+ connect(goToWeaponPage, SIGNAL(clicked()), this, SLOT(jumpToWeapons()));
+
+ bindEntries = new QCheckBox(SchemeWidget);
+ bindEntries->setToolTip(tr("When this option is enabled selecting a game scheme will auto-select a weapon"));
+ bindEntries->setChecked(true);
+ bindEntries->setMaximumWidth(42);
+ bindEntries->setStyleSheet( "QCheckBox::indicator:checked { image: url(\":/res/lock.png\"); }"
+ "QCheckBox::indicator:unchecked { image: url(\":/res/unlock.png\"); }" );
+ SchemeWidgetLayout->addWidget(bindEntries, 0, 1, 0, 1, Qt::AlignVCenter);
+
+ connect(pMapContainer, SIGNAL(seedChanged(const QString &)), this, SLOT(seedChanged(const QString &)));
+ connect(pMapContainer, SIGNAL(mapChanged(const QString &)), this, SLOT(mapChanged(const QString &)));
+ connect(pMapContainer, SIGNAL(mapgenChanged(MapGenerator)), this, SLOT(mapgenChanged(MapGenerator)));
+ connect(pMapContainer, SIGNAL(mazeSizeChanged(int)), this, SLOT(maze_sizeChanged(int)));
+ connect(pMapContainer, SIGNAL(themeChanged(const QString &)), this, SLOT(themeChanged(const QString &)));
+ connect(pMapContainer, SIGNAL(newTemplateFilter(int)), this, SLOT(templateFilterChanged(int)));
+ connect(pMapContainer, SIGNAL(drawMapRequested()), this, SIGNAL(goToDrawMap()));
+ connect(pMapContainer, SIGNAL(drawnMapChanged(const QByteArray &)), this, SLOT(onDrawnMapChanged(const QByteArray &)));
+}
+
+void GameCFGWidget::jumpToSchemes()
+{
+ emit goToSchemes(GameSchemes->currentIndex());
+}
+
+void GameCFGWidget::jumpToWeapons()
+{
+ emit goToWeapons(WeaponsName->currentIndex());
+}
+
+QVariant GameCFGWidget::schemeData(int column) const
+{
+ return GameSchemes->model()->data(GameSchemes->model()->index(GameSchemes->currentIndex(), column));
+}
+
+quint32 GameCFGWidget::getGameFlags() const
+{
+ quint32 result = 0;
+
+ if (schemeData(1).toBool())
+ result |= 0x00001000; // fort
+ if (schemeData(2).toBool())
+ result |= 0x00000010; // divide teams
+ if (schemeData(3).toBool())
+ result |= 0x00000004; // solid land
+ if (schemeData(4).toBool())
+ result |= 0x00000008; // border
+ if (schemeData(5).toBool())
+ result |= 0x00000020; // low gravity
+ if (schemeData(6).toBool())
+ result |= 0x00000040; // laser sight
+ if (schemeData(7).toBool())
+ result |= 0x00000080; // invulnerable
+ if (schemeData(8).toBool())
+ result |= 0x00000100; // mines
+ if (schemeData(9).toBool())
+ result |= 0x00000200; // vampirism
+ if (schemeData(10).toBool())
+ result |= 0x00000400; // karma
+ if (schemeData(11).toBool())
+ result |= 0x00000800; // artillery
+ if (schemeData(12).toBool())
+ result |= 0x00002000; // random
+ if (schemeData(13).toBool())
+ result |= 0x00004000; // king
+ if (schemeData(14).toBool())
+ result |= 0x00008000; // place hogs
+ if (schemeData(15).toBool())
+ result |= 0x00010000; // shared ammo
+ if (schemeData(16).toBool())
+ result |= 0x00020000; // disable girders
+ if (schemeData(17).toBool())
+ result |= 0x00040000; // disable land obj
+ if (schemeData(18).toBool())
+ result |= 0x00080000; // ai survival
+ if (schemeData(19).toBool())
+ result |= 0x00100000; // infinite attacks
+ if (schemeData(20).toBool())
+ result |= 0x00200000; // reset weaps
+ if (schemeData(21).toBool())
+ result |= 0x00400000; // per hog ammo
+ if (schemeData(22).toBool())
+ result |= 0x00800000; // no wind
+ if (schemeData(23).toBool())
+ result |= 0x01000000; // more wind
+ if (schemeData(24).toBool())
+ result |= 0x02000000; // tag team
+ if (schemeData(25).toBool())
+ result |= 0x04000000; // bottom border
+
+ return result;
+}
+
+quint32 GameCFGWidget::getInitHealth() const
+{
+ return schemeData(28).toInt();
+}
+
+QByteArray GameCFGWidget::getFullConfig() const
+{
+ QList<QByteArray> bcfg;
+ int mapgen = pMapContainer->get_mapgen();
+
+ QString currentMap = pMapContainer->getCurrentMap();
+ if (currentMap.size() > 0)
+ {
+ bcfg << QString("emap " + currentMap).toUtf8();
+
+// engine should figure it out on its own
+// if(pMapContainer->getCurrentIsMission())
+// bcfg << QString("escript Maps/%1/map.lua").arg(currentMap).toUtf8();
+ }
+ bcfg << QString("etheme " + pMapContainer->getCurrentTheme()).toUtf8();
+
+ if (Scripts->currentIndex() > 0)
+ {
+ bcfg << QString("escript Scripts/Multiplayer/%1.lua").arg(Scripts->itemData(Scripts->currentIndex()).toList()[0].toString()).toUtf8();
+ }
+
+ bcfg << QString("eseed " + pMapContainer->getCurrentSeed()).toUtf8();
+ bcfg << QString("e$gmflags %1").arg(getGameFlags()).toUtf8();
+ bcfg << QString("e$damagepct %1").arg(schemeData(26).toInt()).toUtf8();
+ bcfg << QString("e$turntime %1").arg(schemeData(27).toInt() * 1000).toUtf8();
+ bcfg << QString("e$sd_turns %1").arg(schemeData(29).toInt()).toUtf8();
+ bcfg << QString("e$casefreq %1").arg(schemeData(30).toInt()).toUtf8();
+ bcfg << QString("e$minestime %1").arg(schemeData(31).toInt() * 1000).toUtf8();
+ bcfg << QString("e$minesnum %1").arg(schemeData(32).toInt()).toUtf8();
+ bcfg << QString("e$minedudpct %1").arg(schemeData(33).toInt()).toUtf8();
+ bcfg << QString("e$explosives %1").arg(schemeData(34).toInt()).toUtf8();
+ bcfg << QString("e$healthprob %1").arg(schemeData(35).toInt()).toUtf8();
+ bcfg << QString("e$hcaseamount %1").arg(schemeData(36).toInt()).toUtf8();
+ bcfg << QString("e$waterrise %1").arg(schemeData(37).toInt()).toUtf8();
+ bcfg << QString("e$healthdec %1").arg(schemeData(38).toInt()).toUtf8();
+ bcfg << QString("e$ropepct %1").arg(schemeData(39).toInt()).toUtf8();
+ bcfg << QString("e$getawaytime %1").arg(schemeData(40).toInt()).toUtf8();
+ bcfg << QString("e$template_filter %1").arg(pMapContainer->getTemplateFilter()).toUtf8();
+ bcfg << QString("e$mapgen %1").arg(mapgen).toUtf8();
+
+ switch (mapgen)
+ {
+ case MAPGEN_MAZE:
+ bcfg << QString("e$maze_size %1").arg(pMapContainer->getMazeSize()).toUtf8();
+ break;
+
+ case MAPGEN_DRAWN:
+ {
+ QByteArray data = pMapContainer->getDrawnMapData();
+ while(data.size() > 0)
+ {
+ QByteArray tmp = data;
+ tmp.truncate(200);
+ tmp.prepend("edraw ");
+ bcfg << tmp;
+ data.remove(0, 200);
+ }
+ break;
+ }
+ default: ;
+ }
+
+ QByteArray result;
+
+ foreach(QByteArray ba, bcfg)
+ HWProto::addByteArrayToBuffer(result, ba);
+
+ return result;
+}
+
+void GameCFGWidget::setNetAmmo(const QString& name, const QString& ammo)
+{
+ bool illegal = ammo.size() != cDefaultAmmoStore->size();
+ if (illegal)
+ QMessageBox::critical(this, tr("Error"), tr("Illegal ammo scheme"));
+
+ int pos = WeaponsName->findText(name);
+ if ((pos == -1) || illegal) { // prevent from overriding schemes with bad ones
+ WeaponsName->addItem(name, ammo);
+ WeaponsName->setCurrentIndex(WeaponsName->count() - 1);
+ } else {
+ WeaponsName->setItemData(pos, ammo);
+ WeaponsName->setCurrentIndex(pos);
+ }
+}
+
+void GameCFGWidget::fullNetConfig()
+{
+ ammoChanged(WeaponsName->currentIndex());
+
+ seedChanged(pMapContainer->getCurrentSeed());
+ templateFilterChanged(pMapContainer->getTemplateFilter());
+ themeChanged(pMapContainer->getCurrentTheme());
+
+ schemeChanged(GameSchemes->currentIndex());
+ scriptChanged(Scripts->currentIndex());
+
+ mapgenChanged(pMapContainer->get_mapgen());
+ maze_sizeChanged(pMapContainer->getMazeSize());
+
+ // map must be the last
+ QString map = pMapContainer->getCurrentMap();
+ if (map.size())
+ mapChanged(map);
+}
+
+void GameCFGWidget::setParam(const QString & param, const QStringList & slValue)
+{
+ if (slValue.size() == 1)
+ {
+ QString value = slValue[0];
+ if (param == "MAP") {
+ pMapContainer->setMap(value);
+ return;
+ }
+ if (param == "SEED") {
+ pMapContainer->setSeed(value);
+ if (!seedRegexp.exactMatch(value)) {
+ pMapContainer->seedEdit->setVisible(true);
+ }
+ return;
+ }
+ if (param == "THEME") {
+ pMapContainer->setTheme(value);
+ return;
+ }
+ if (param == "TEMPLATE") {
+ pMapContainer->setTemplateFilter(value.toUInt());
+ return;
+ }
+ if (param == "MAPGEN") {
+ pMapContainer->setMapgen((MapGenerator)value.toUInt());
+ return;
+ }
+ if (param == "MAZE_SIZE") {
+ pMapContainer->setMazeSize(value.toUInt());
+ return;
+ }
+ if (param == "SCRIPT") {
+ Scripts->setCurrentIndex(Scripts->findText(value));
+ return;
+ }
+ if (param == "DRAWNMAP") {
+ pMapContainer->setDrawnMapData(qUncompress(QByteArray::fromBase64(slValue[0].toLatin1())));
+ return;
+ }
+ }
+
+ if (slValue.size() == 2)
+ {
+ if (param == "AMMO") {
+ setNetAmmo(slValue[0], slValue[1]);
+ return;
+ }
+ }
+
+ if (slValue.size() == 5)
+ {
+ if (param == "FULLMAPCONFIG")
+ {
+ QString seed = slValue[3];
+ if (!seedRegexp.exactMatch(seed))
+ pMapContainer->seedEdit->setVisible(true);
+
+ pMapContainer->setAllMapParameters(
+ slValue[0],
+ (MapGenerator)slValue[1].toUInt(),
+ slValue[2].toUInt(),
+ seed,
+ slValue[4].toUInt()
+ );
+ return;
+ }
+ }
+
+ qWarning("Got bad config param from net");
+}
+
+void GameCFGWidget::ammoChanged(int index)
+{
+ if (index >= 0) {
+ emit paramChanged(
+ "AMMO",
+ QStringList() << WeaponsName->itemText(index) << WeaponsName->itemData(index).toString()
+ );
+ }
+}
+
+void GameCFGWidget::mapChanged(const QString & value)
+{
+ if(isEnabled() && pMapContainer->getCurrentIsMission())
+ {
+ Scripts->setEnabled(false);
+ Scripts->setCurrentIndex(0);
+
+ if (pMapContainer->getCurrentScheme() == "locked")
+ {
+ GameSchemes->setEnabled(false);
+ GameSchemes->setCurrentIndex(GameSchemes->findText("Default"));
+ }
+ else
+ {
+ GameSchemes->setEnabled(true);
+ int num = GameSchemes->findText(pMapContainer->getCurrentScheme());
+ if (num != -1)
+ GameSchemes->setCurrentIndex(num);
+ else
+ GameSchemes->setCurrentIndex(GameSchemes->findText("Default"));
+ }
+
+ if (pMapContainer->getCurrentWeapons() == "locked")
+ {
+ WeaponsName->setEnabled(false);
+ WeaponsName->setCurrentIndex(WeaponsName->findText("Default"));
+ }
+ else
+ {
+ WeaponsName->setEnabled(true);
+ int num = WeaponsName->findText(pMapContainer->getCurrentWeapons());
+ if (num != -1)
+ WeaponsName->setCurrentIndex(num);
+ else
+ WeaponsName->setCurrentIndex(WeaponsName->findText("Default"));
+ }
+
+ if (pMapContainer->getCurrentScheme() != "locked" && pMapContainer->getCurrentWeapons() != "locked")
+ bindEntries->setEnabled(true);
+ else
+ bindEntries->setEnabled(false);
+ }
+ else
+ {
+ Scripts->setEnabled(true);
+ GameSchemes->setEnabled(true);
+ WeaponsName->setEnabled(true);
+ bindEntries->setEnabled(true);
+ }
+ emit paramChanged("MAP", QStringList(value));
+}
+
+void GameCFGWidget::templateFilterChanged(int value)
+{
+ emit paramChanged("TEMPLATE", QStringList(QString::number(value)));
+}
+
+void GameCFGWidget::seedChanged(const QString & value)
+{
+ emit paramChanged("SEED", QStringList(value));
+}
+
+void GameCFGWidget::themeChanged(const QString & value)
+{
+ emit paramChanged("THEME", QStringList(value));
+}
+
+void GameCFGWidget::schemeChanged(int index)
+{
+ QStringList sl;
+
+ int size = GameSchemes->model()->columnCount();
+ for(int i = 0; i < size; ++i)
+ sl << schemeData(i).toString();
+
+ emit paramChanged("SCHEME", sl);
+
+ if (isEnabled() && bindEntries->isEnabled() && bindEntries->isChecked()) {
+ QString schemeName = GameSchemes->itemText(index);
+ for (int i = 0; i < WeaponsName->count(); i++) {
+ QString weapName = WeaponsName->itemText(i);
+ int res = QString::compare(weapName, schemeName, Qt::CaseSensitive);
+ if (0 == res) {
+ WeaponsName->setCurrentIndex(i);
+ emit ammoChanged(i);
+ break;
+ }
+ }
+ }
+}
+
+void GameCFGWidget::scriptChanged(int index)
+{
+ if(isEnabled() && index > 0)
+ {
+ QString scheme = Scripts->itemData(Scripts->currentIndex()).toList()[1].toString();
+ QString weapons = Scripts->itemData(Scripts->currentIndex()).toList()[2].toString();
+
+ if (scheme == "locked")
+ {
+ GameSchemes->setEnabled(false);
+ GameSchemes->setCurrentIndex(GameSchemes->findText("Default"));
+ }
+ else
+ {
+ GameSchemes->setEnabled(true);
+ int num = GameSchemes->findText(scheme);
+ if (num != -1)
+ GameSchemes->setCurrentIndex(num);
+ else
+ GameSchemes->setCurrentIndex(GameSchemes->findText("Default"));
+ }
+
+ if (weapons == "locked")
+ {
+ WeaponsName->setEnabled(false);
+ WeaponsName->setCurrentIndex(WeaponsName->findText("Default"));
+ }
+ else
+ {
+ WeaponsName->setEnabled(true);
+ int num = WeaponsName->findText(weapons);
+ if (num != -1)
+ WeaponsName->setCurrentIndex(num);
+ else
+ WeaponsName->setCurrentIndex(WeaponsName->findText("Default"));
+ }
+
+ if (scheme != "locked" && weapons != "locked")
+ bindEntries->setEnabled(true);
+ else
+ bindEntries->setEnabled(false);
+ }
+ else
+ {
+ GameSchemes->setEnabled(true);
+ WeaponsName->setEnabled(true);
+ bindEntries->setEnabled(true);
+ }
+ emit paramChanged("SCRIPT", QStringList(Scripts->itemText(index)));
+}
+
+void GameCFGWidget::mapgenChanged(MapGenerator m)
+{
+ emit paramChanged("MAPGEN", QStringList(QString::number(m)));
+}
+
+void GameCFGWidget::maze_sizeChanged(int s)
+{
+ emit paramChanged("MAZE_SIZE", QStringList(QString::number(s)));
+}
+
+void GameCFGWidget::resendSchemeData()
+{
+ schemeChanged(GameSchemes->currentIndex());
+}
+
+void GameCFGWidget::onDrawnMapChanged(const QByteArray & data)
+{
+ emit paramChanged("DRAWNMAP", QStringList(qCompress(data, 9).toBase64()));
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/gamecfgwidget.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,87 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef GAMECONFIGWIDGET_H
+#define GAMECONFIGWIDGET_H
+
+#include <QWidget>
+#include <QStringList>
+#include <QGroupBox>
+#include <QSpinBox>
+#include <QRegExp>
+
+#include "mapContainer.h"
+
+class QCheckBox;
+class QVBoxLayout;
+class QLabel;
+class QTableView;
+
+class GameCFGWidget : public QGroupBox
+{
+ Q_OBJECT
+
+public:
+ GameCFGWidget(QWidget* parent);
+ quint32 getGameFlags() const;
+ quint32 getInitHealth() const;
+ QByteArray getFullConfig() const;
+ QComboBox * Scripts;
+ QComboBox * GameSchemes;
+ QComboBox * WeaponsName;
+ HWMapContainer* pMapContainer;
+ QTableView * tv;
+ QVariant schemeData(int column) const;
+
+public slots:
+ void setParam(const QString & param, const QStringList & value);
+ void fullNetConfig();
+ void resendSchemeData();
+
+signals:
+ void paramChanged(const QString & param, const QStringList & value);
+ void goToSchemes(int);
+ void goToWeapons(int);
+ void goToDrawMap();
+
+private slots:
+ void ammoChanged(int index);
+ void mapChanged(const QString &);
+ void templateFilterChanged(int);
+ void seedChanged(const QString &);
+ void themeChanged(const QString &);
+ void schemeChanged(int);
+ void scriptChanged(int);
+ void jumpToSchemes();
+ void jumpToWeapons();
+ void mapgenChanged(MapGenerator m);
+ void maze_sizeChanged(int s);
+ void onDrawnMapChanged(const QByteArray & data);
+
+private:
+ QGridLayout mainLayout;
+ QCheckBox * bindEntries;
+ QString curNetAmmoName;
+ QString curNetAmmo;
+ QRegExp seedRegexp;
+
+ void setNetAmmo(const QString& name, const QString& ammo);
+
+};
+
+#endif // GAMECONFIGWIDGET_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/hedgehogerWidget.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,76 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2008 Ulyanov Igor <iulyanov@gmail.com>
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "hedgehogerWidget.h"
+
+#include "frameTeam.h"
+
+CHedgehogerWidget::CHedgehogerWidget(const QImage& im, const QImage& img, QWidget * parent) :
+ ItemNum(im, img, parent, 1)
+{
+ // TODO: maxHedgehogsPerGame doesn't reset properly and won't match map limits for now
+ /*if(parent) {
+ pOurFrameTeams = dynamic_cast<FrameTeams*>(parent->parentWidget());
+ }
+ if(pOurFrameTeams->overallHedgehogs + 4 > pOurFrameTeams->maxHedgehogsPerGame) {
+ numItems = pOurFrameTeams->maxHedgehogsPerGame - pOurFrameTeams->overallHedgehogs;
+ } else numItems = 4;
+ pOurFrameTeams->overallHedgehogs += numItems;*/
+}
+
+void CHedgehogerWidget::incItems()
+{
+ //if (pOurFrameTeams->overallHedgehogs < pOurFrameTeams->maxHedgehogsPerGame) {
+ numItems++;
+ //pOurFrameTeams->overallHedgehogs++;
+ emit hedgehogsNumChanged();
+ //}
+}
+
+void CHedgehogerWidget::decItems()
+{
+ numItems--;
+ //pOurFrameTeams->overallHedgehogs--;
+ emit hedgehogsNumChanged();
+}
+
+CHedgehogerWidget::~CHedgehogerWidget()
+{
+ // TODO: not called?
+ //pOurFrameTeams->overallHedgehogs-=numItems;
+}
+
+void CHedgehogerWidget::setNonInteractive()
+{
+ nonInteractive=true;
+}
+
+void CHedgehogerWidget::setHHNum(unsigned int num)
+{
+ /*unsigned int diff = num - numItems;
+ numItems += diff;
+ pOurFrameTeams->overallHedgehogs += diff;*/
+ numItems = num;
+ repaint();
+}
+
+unsigned char CHedgehogerWidget::getHedgehogsNum() const
+{
+ return numItems;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/hedgehogerWidget.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,50 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2007 Ulyanov Igor <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _HEDGEHOGER_WIDGET
+#define _HEDGEHOGER_WIDGET
+
+#include "itemNum.h"
+
+class FrameTeams;
+
+class CHedgehogerWidget : public ItemNum
+{
+ Q_OBJECT
+
+ public:
+ CHedgehogerWidget(const QImage& im, const QImage& img, QWidget * parent);
+ virtual ~CHedgehogerWidget();
+ unsigned char getHedgehogsNum() const;
+ void setHHNum (unsigned int num);
+ void setNonInteractive();
+
+ signals:
+ void hedgehogsNumChanged();
+
+ protected:
+ virtual void incItems();
+ virtual void decItems();
+
+ private:
+ CHedgehogerWidget();
+ FrameTeams* pOurFrameTeams;
+};
+
+#endif // _HEDGEHOGER_WIDGET
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/igbox.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,79 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QPainter>
+#include <QPoint>
+#include <QStylePainter>
+#include <QStyleOptionGroupBox>
+
+#include "igbox.h"
+
+IconedGroupBox::IconedGroupBox(QWidget * parent)
+ : QGroupBox(parent)
+{
+// Has issues with border-radius on children
+// setAttribute(Qt::WA_PaintOnScreen, true);
+ titleLeftPadding = 49;
+ contentTopPadding = 15;
+}
+
+void IconedGroupBox::setIcon(const QIcon & icon)
+{
+ if (this->icon.isNull())
+ setStyleSheet(QString(
+ "IconedGroupBox{"
+ "margin-top: 46px;"
+ "margin-left: 12px;"
+ "padding: %1px 2px 5px 2px;"
+ "}"
+ "IconedGroupBox::title{"
+ "subcontrol-origin: margin;"
+ "subcontrol-position: top left;"
+ "padding-left: %2px;"
+ "padding-top: %1px;"
+ "text-align: left;"
+ "}"
+ ).arg(contentTopPadding).arg(titleLeftPadding)
+ );
+
+ this->icon = icon;
+ repaint();
+}
+
+void IconedGroupBox::paintEvent(QPaintEvent * event)
+{
+ Q_UNUSED(event);
+
+ QStylePainter painter(this);
+
+ QStyleOptionGroupBox option;
+ initStyleOption(&option);
+ painter.drawComplexControl(QStyle::CC_GroupBox, option);
+
+ icon.paint(&painter, QRect(QPoint(0, 0), icon.actualSize(size())));
+}
+
+void IconedGroupBox::setTitleTextPadding(int px)
+{
+ titleLeftPadding = px;
+}
+
+void IconedGroupBox::setContentTopPadding(int px)
+{
+ contentTopPadding = px;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/igbox.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,44 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _IGBOX_H
+#define _IGBOX_H
+
+#include <QGroupBox>
+#include <QIcon>
+
+class IconedGroupBox : public QGroupBox
+{
+ Q_OBJECT
+
+public:
+ IconedGroupBox(QWidget * parent = 0);
+
+ void setIcon(const QIcon & icon);
+ void setTitleTextPadding(int px);
+ void setContentTopPadding(int px);
+protected:
+ virtual void paintEvent(QPaintEvent * event);
+
+private:
+ QIcon icon;
+ int titleLeftPadding;
+ int contentTopPadding;
+};
+
+#endif // _IGBOX_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/itemNum.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,114 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Igor Ulyanov <iulyanov@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "itemNum.h"
+#include "hwform.h"
+
+#include <QMouseEvent>
+#include <QPainter>
+
+ItemNum::ItemNum(const QImage& im, const QImage& img, QWidget * parent, unsigned char min, unsigned char max) :
+ QFrame(parent), m_im(im), m_img(img), infinityState(false), nonInteractive(false), minItems(min), maxItems(max),
+ numItems(min+2 >= max ? min : min+2)
+{
+ enabled = true;
+ if(frontendEffects) setAttribute(Qt::WA_PaintOnScreen, true);
+}
+
+ItemNum::~ItemNum()
+{
+}
+
+void ItemNum::mousePressEvent ( QMouseEvent * event )
+{
+ if(nonInteractive) return;
+ if(event->button()==Qt::LeftButton && enabled) {
+ event->accept();
+ if((infinityState && numItems <= maxItems) || (!infinityState && numItems < maxItems)) {
+ incItems();
+ } else {
+ numItems = minItems+1;
+ // appears there's an emit in there
+ decItems();
+ }
+ } else if (event->button()==Qt::RightButton && enabled) {
+ event->accept();
+ if(numItems > minItems) {
+ decItems();
+ } else {
+ numItems = maxItems+(infinityState?0:-1);
+ incItems();
+ }
+ } else {
+ event->ignore();
+ return;
+ }
+ repaint();
+}
+
+QSize ItemNum::sizeHint () const
+{
+ return QSize((maxItems+1)*12, 32);
+}
+
+void ItemNum::paintEvent(QPaintEvent* event)
+{
+ Q_UNUSED(event);
+
+ QPainter painter(this);
+
+ if (numItems==maxItems+1) {
+ QRect target(0, 0, 100, 32);
+ if (enabled) {
+ painter.drawImage(target, QImage(":/res/infinity.png"));
+ } else {
+ painter.drawImage(target, QImage(":/res/infinitygrey.png"));
+ }
+ } else {
+ for(int i=0; i<numItems; i++) {
+ QRect target(11 * i, i % 2, 25, 35);
+ if (enabled) {
+ painter.drawImage(target, m_im);
+ } else {
+ painter.drawImage(target, m_img);
+ }
+ }
+ }
+}
+
+unsigned char ItemNum::getItemsNum() const
+{
+ return numItems;
+}
+
+void ItemNum::setItemsNum(const unsigned char num)
+{
+ numItems=num;
+ repaint();
+}
+
+void ItemNum::setInfinityState(bool value)
+{
+ infinityState=value;
+}
+
+void ItemNum::setEnabled(bool value)
+{
+ enabled=value;
+ repaint();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/itemNum.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,60 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Igor Ulyanov <iulyanov@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QFrame>
+#include <QImage>
+
+#ifndef _ITEM_NUM_INCLUDED
+#define _ITEM_NUM_INCLUDED
+
+class ItemNum : public QFrame
+{
+ Q_OBJECT
+
+ public:
+ void setInfinityState(bool value);
+ void setEnabled(bool value);
+ unsigned char getItemsNum() const;
+ void setItemsNum(const unsigned char num);
+
+ private:
+ QImage m_im;
+ QImage m_img;
+ bool infinityState;
+ bool enabled;
+
+ protected:
+ ItemNum(const QImage& im, const QImage& img, QWidget * parent, unsigned char min=2, unsigned char max=8);
+ virtual QSize sizeHint () const;
+ virtual ~ItemNum()=0;
+
+ bool nonInteractive;
+ unsigned char minItems;
+ unsigned char maxItems;
+ unsigned char numItems;
+
+ // from QWidget
+ virtual void mousePressEvent ( QMouseEvent * event );
+ virtual void paintEvent(QPaintEvent* event);
+
+ // to be implemented in child
+ virtual void incItems()=0;
+ virtual void decItems()=0;
+};
+
+#endif // _ITEM_NUM_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/selectWeapon.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,294 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "selectWeapon.h"
+#include "weaponItem.h"
+#include "hwconsts.h"
+
+#include <QPushButton>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QBitmap>
+#include <QLineEdit>
+#include <QSettings>
+#include <QMessageBox>
+#include <QTabWidget>
+#include <math.h>
+
+QImage getAmmoImage(int num)
+{
+ static QImage ammo(":Ammos.png");
+ int x = num/(ammo.height()/32);
+ int y = (num-((ammo.height()/32)*x))*32;
+ x*=32;
+ return ammo.copy(x, y, 32, 32);
+}
+
+SelWeaponItem::SelWeaponItem(bool allowInfinite, int iconNum, int wNum, QImage image, QImage imagegrey, QWidget* parent) :
+ QWidget(parent)
+{
+ QHBoxLayout* hbLayout = new QHBoxLayout(this);
+ hbLayout->setSpacing(1);
+ hbLayout->setMargin(1);
+
+ QLabel* lbl = new QLabel(this);
+ lbl->setPixmap(QPixmap::fromImage(getAmmoImage(iconNum)));
+ lbl->setMaximumWidth(30);
+ lbl->setGeometry(0, 0, 30, 30);
+ hbLayout->addWidget(lbl);
+
+ item = new WeaponItem(image, imagegrey, this);
+ item->setItemsNum(wNum);
+ item->setInfinityState(allowInfinite);
+ hbLayout->addWidget(item);
+
+ hbLayout->setStretchFactor(lbl, 1);
+ hbLayout->setStretchFactor(item, 99);
+ hbLayout->setAlignment(lbl, Qt::AlignLeft | Qt::AlignVCenter);
+ hbLayout->setAlignment(item, Qt::AlignLeft | Qt::AlignVCenter);
+}
+
+void SelWeaponItem::setItemsNum(const unsigned char num)
+{
+ item->setItemsNum(num);
+}
+
+unsigned char SelWeaponItem::getItemsNum() const
+{
+ return item->getItemsNum();
+}
+
+void SelWeaponItem::setEnabled(bool value)
+{
+ item->setEnabled(value);
+}
+
+SelWeaponWidget::SelWeaponWidget(int numItems, QWidget* parent) :
+ QFrame(parent),
+ m_numItems(numItems)
+{
+ wconf = new QSettings(cfgdir->absolutePath() + "/weapons.ini", QSettings::IniFormat, this);
+
+ for(int i = 0; i < cDefaultAmmos.size(); ++i)
+ wconf->setValue(cDefaultAmmos[i].first, cDefaultAmmos[i].second);
+
+ QStringList keys = wconf->allKeys();
+ for(int i = 0; i < keys.size(); i++)
+ {
+ if (wconf->value(keys[i]).toString().size() != cDefaultAmmoStore->size())
+ wconf->remove(keys[i]);
+ }
+
+ QString currentState = *cDefaultAmmoStore;
+
+ QTabWidget * tbw = new QTabWidget(this);
+ QWidget * page1 = new QWidget(this);
+ p1Layout = new QGridLayout(page1);
+ p1Layout->setSpacing(1);
+ p1Layout->setMargin(1);
+ QWidget * page2 = new QWidget(this);
+ p2Layout = new QGridLayout(page2);
+ p2Layout->setSpacing(1);
+ p2Layout->setMargin(1);
+ QWidget * page3 = new QWidget(this);
+ p3Layout = new QGridLayout(page3);
+ p3Layout->setSpacing(1);
+ p3Layout->setMargin(1);
+ QWidget * page4 = new QWidget(this);
+ p4Layout = new QGridLayout(page4);
+ p4Layout->setSpacing(1);
+ p4Layout->setMargin(1);
+
+ tbw->addTab(page1, tr("Weapon set"));
+ tbw->addTab(page2, tr("Probabilities"));
+ tbw->addTab(page4, tr("Ammo in boxes"));
+ tbw->addTab(page3, tr("Delays"));
+
+ QGridLayout * pageLayout = new QGridLayout(this);
+ pageLayout->addWidget(tbw);
+
+
+ int j = -1;
+ int i = 0, k = 0;
+ for(; i < m_numItems; ++i) {
+ if (i == 6) continue;
+ if (i == 52) continue; // Disable structures for now
+ if (k % 4 == 0) ++j;
+ SelWeaponItem * swi = new SelWeaponItem(true, i, currentState[i].digitValue(), QImage(":/res/ammopic.png"), QImage(":/res/ammopicgrey.png"), this);
+ weaponItems[i].append(swi);
+ p1Layout->addWidget(swi, j, k % 4);
+
+ SelWeaponItem * pwi = new SelWeaponItem(false, i, currentState[numItems + i].digitValue(), QImage(":/res/ammopicbox.png"), QImage(":/res/ammopicboxgrey.png"), this);
+ weaponItems[i].append(pwi);
+ p2Layout->addWidget(pwi, j, k % 4);
+
+ SelWeaponItem * dwi = new SelWeaponItem(false, i, currentState[numItems*2 + i].digitValue(), QImage(":/res/ammopicdelay.png"), QImage(":/res/ammopicdelaygrey.png"), this);
+ weaponItems[i].append(dwi);
+ p3Layout->addWidget(dwi, j, k % 4);
+
+ SelWeaponItem * awi = new SelWeaponItem(false, i, currentState[numItems*3 + i].digitValue(), QImage(":/res/ammopic.png"), QImage(":/res/ammopicgrey.png"), this);
+ weaponItems[i].append(awi);
+ p4Layout->addWidget(awi, j, k % 4);
+
+ ++k;
+ }
+
+ //pLayout->setRowStretch(5, 100);
+ m_name = new QLineEdit(this);
+ pageLayout->addWidget(m_name, i, 0, 1, 5);
+}
+
+void SelWeaponWidget::setWeapons(const QString& ammo)
+{
+ bool enable = true;
+ for(int i = 0; i < cDefaultAmmos.size(); i++)
+ if (!cDefaultAmmos[i].first.compare(m_name->text())) {
+ enable = false;
+ }
+ for(int i = 0; i < m_numItems; ++i) {
+ twi::iterator it = weaponItems.find(i);
+ if (it == weaponItems.end()) continue;
+ it.value()[0]->setItemsNum(ammo[i].digitValue());
+ it.value()[1]->setItemsNum(ammo[m_numItems + i].digitValue());
+ it.value()[2]->setItemsNum(ammo[m_numItems*2 + i].digitValue());
+ it.value()[3]->setItemsNum(ammo[m_numItems*3 + i].digitValue());
+ it.value()[0]->setEnabled(enable);
+ it.value()[1]->setEnabled(enable);
+ it.value()[2]->setEnabled(enable);
+ it.value()[3]->setEnabled(enable);
+ }
+ m_name->setEnabled(enable);
+}
+
+void SelWeaponWidget::setDefault()
+{
+ for(int i = 0; i < cDefaultAmmos.size(); i++)
+ if (!cDefaultAmmos[i].first.compare(m_name->text())) {
+ return;
+ }
+ setWeapons(*cDefaultAmmoStore);
+}
+
+void SelWeaponWidget::save()
+{
+ for(int i = 0; i < cDefaultAmmos.size(); i++)
+ if (!cDefaultAmmos[i].first.compare(m_name->text())) {
+ QMessageBox::warning(0, QMessageBox::tr("Weapons"), QMessageBox::tr("Can not overwrite default weapon set '%1'!").arg(cDefaultAmmos[i].first));
+ return;
+ }
+
+ if (m_name->text() == "") return;
+
+ QString state1;
+ QString state2;
+ QString state3;
+ QString state4;
+
+ for(int i = 0; i < m_numItems; ++i) {
+ twi::const_iterator it = weaponItems.find(i);
+ int num = it == weaponItems.end() ? 9 : it.value()[0]->getItemsNum(); // 9 is for 'skip turn'
+ state1.append(QString::number(num));
+ int prob = it == weaponItems.end() ? 0 : it.value()[1]->getItemsNum();
+ state2.append(QString::number(prob));
+ int del = it == weaponItems.end() ? 0 : it.value()[2]->getItemsNum();
+ state3.append(QString::number(del));
+ int am = it == weaponItems.end() ? 0 : it.value()[3]->getItemsNum();
+ state4.append(QString::number(am));
+ }
+ if (curWeaponsName != "") {
+ // remove old entry
+ wconf->remove(curWeaponsName);
+ }
+ wconf->setValue(m_name->text(), state1 + state2 + state3 + state4);
+ emit weaponsChanged();
+}
+
+int SelWeaponWidget::operator [] (unsigned int weaponIndex) const
+{
+ twi::const_iterator it = weaponItems.find(weaponIndex);
+ return it == weaponItems.end() ? 9 : it.value()[0]->getItemsNum();
+}
+
+QString SelWeaponWidget::getWeaponsString(const QString& name) const
+{
+ return wconf->value(name).toString();
+}
+
+void SelWeaponWidget::deleteWeaponsName()
+{
+ if (curWeaponsName == "") return;
+
+ for(int i = 0; i < cDefaultAmmos.size(); i++)
+ if (!cDefaultAmmos[i].first.compare(m_name->text())) {
+ QMessageBox::warning(0, QMessageBox::tr("Weapons"), QMessageBox::tr("Can not delete default weapon set '%1'!").arg(cDefaultAmmos[i].first));
+ return;
+ }
+
+ QMessageBox reallyDelete(QMessageBox::Question, QMessageBox::tr("Weapons"), QMessageBox::tr("Really delete this weapon set?"), QMessageBox::Ok | QMessageBox::Cancel);
+
+ if (reallyDelete.exec() == QMessageBox::Ok) {
+ wconf->remove(curWeaponsName);
+ emit weaponsDeleted();
+ }
+}
+
+void SelWeaponWidget::newWeaponsName()
+{
+ QString newName = tr("new");
+ if(wconf->contains(newName)) {
+ //name already used -> look for an appropriate name:
+ int i=2;
+ while(wconf->contains(newName = tr("new")+QString::number(i++)));
+ }
+ setWeaponsName(newName);
+}
+
+void SelWeaponWidget::setWeaponsName(const QString& name)
+{
+ m_name->setText(name);
+
+ curWeaponsName = name;
+
+ if(name != "" && wconf->contains(name)) {
+ setWeapons(wconf->value(name).toString());
+ } else {
+ setWeapons(*cDefaultAmmoStore);
+ }
+}
+
+QStringList SelWeaponWidget::getWeaponNames() const
+{
+ return wconf->allKeys();
+}
+
+void SelWeaponWidget::copy()
+{
+ if(wconf->contains(curWeaponsName)) {
+ QString ammo = getWeaponsString(curWeaponsName);
+ QString newName = tr("copy of") + " " + curWeaponsName;
+ if(wconf->contains(newName)) {
+ //name already used -> look for an appropriate name:
+ int i=2;
+ while(wconf->contains(newName = tr("copy of") + " " + curWeaponsName+QString::number(i++)));
+ }
+ setWeaponsName(newName);
+ setWeapons(ammo);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/selectWeapon.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,92 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _SELECT_WEAPON_INCLUDED
+#define _SELECT_WEAPON_INCLUDED
+
+#include <QFrame>
+#include <QMap>
+#include <QList>
+
+class QGridLayout;
+class WeaponItem;
+class QLineEdit;
+class QSettings;
+
+class SelWeaponItem : public QWidget
+{
+ Q_OBJECT
+
+public:
+ SelWeaponItem(bool allowInfinite, int iconNum, int wNum, QImage image, QImage imagegrey, QWidget* parent=0);
+
+ unsigned char getItemsNum() const;
+ void setItemsNum(const unsigned char num);
+ void setEnabled(bool value);
+
+ private:
+ WeaponItem* item;
+};
+
+class SelWeaponWidget : public QFrame
+{
+ Q_OBJECT
+
+ public:
+ SelWeaponWidget(int numItems, QWidget* parent=0);
+ QString getWeaponsString(const QString& name) const;
+ QStringList getWeaponNames() const;
+
+ public slots:
+ void setDefault();
+ void setWeapons(const QString& ammo);
+ //sets the name of the current set
+ void setWeaponsName(const QString& name);
+ void deleteWeaponsName();
+ void newWeaponsName();
+ void save();
+ void copy();
+
+ signals:
+ void weaponsChanged();
+ void weaponsDeleted();
+
+ private:
+ //the name of the current weapon set
+ QString curWeaponsName;
+
+ QLineEdit* m_name;
+
+ //storage for all the weapons sets
+ QSettings* wconf;
+
+ const int m_numItems;
+ int operator [] (unsigned int weaponIndex) const;
+
+ typedef QList<SelWeaponItem*> ItemsList;
+ typedef QMap<int, ItemsList> twi;
+ twi weaponItems;
+ //layout element for each tab:
+ QGridLayout* p1Layout;
+ QGridLayout* p2Layout;
+ QGridLayout* p3Layout;
+ QGridLayout* p4Layout;
+};
+
+#endif // _SELECT_WEAPON_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/teamselect.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,281 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <algorithm>
+
+#include <QLabel>
+#include <QPixmap>
+#include <QPushButton>
+#include <QFrame>
+#include <QDebug>
+
+#include "vertScrollArea.h"
+#include "teamselect.h"
+#include "teamselhelper.h"
+#include "frameTeam.h"
+
+void TeamSelWidget::addTeam(HWTeam team)
+{
+ if(team.isNetTeam()) {
+ framePlaying->addTeam(team, true);
+ curPlayingTeams.push_back(team);
+ connect(framePlaying->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)),
+ this, SLOT(netTeamStatusChanged(const HWTeam&)));
+ connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)),
+ this, SLOT(hhNumChanged(const HWTeam&)));
+ dynamic_cast<TeamShowWidget*>(framePlaying->getTeamWidget(team))->hhNumChanged();
+ connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)),
+ this, SLOT(proxyTeamColorChanged(const HWTeam&)));
+ } else {
+ frameDontPlaying->addTeam(team, false);
+ m_curNotPlayingTeams.push_back(team);
+ if(m_acceptOuter) {
+ connect(frameDontPlaying->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)),
+ this, SLOT(pre_changeTeamStatus(HWTeam)));
+ } else {
+ connect(frameDontPlaying->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)),
+ this, SLOT(changeTeamStatus(HWTeam)));
+ }
+ }
+ emit setEnabledGameStart(curPlayingTeams.size()>1);
+}
+
+void TeamSelWidget::setInteractivity(bool interactive)
+{
+ framePlaying->setInteractivity(interactive);
+}
+
+void TeamSelWidget::hhNumChanged(const HWTeam& team)
+{
+ QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
+ if(itPlay==curPlayingTeams.end())
+ {
+ qWarning() << QString("hhNumChanged: team '%1' not found").arg(team.name());
+ return;
+ }
+ itPlay->setNumHedgehogs(team.numHedgehogs());
+ emit hhogsNumChanged(team);
+}
+
+void TeamSelWidget::proxyTeamColorChanged(const HWTeam& team)
+{
+ QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
+ if(itPlay==curPlayingTeams.end())
+ {
+ qWarning() << QString("proxyTeamColorChanged: team '%1' not found").arg(team.name());
+ return;
+ }
+ itPlay->setColor(team.color());
+ emit teamColorChanged(team);
+}
+
+void TeamSelWidget::changeHHNum(const HWTeam& team)
+{
+ QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
+ if(itPlay==curPlayingTeams.end())
+ {
+ qWarning() << QString("changeHHNum: team '%1' not found").arg(team.name());
+ return;
+ }
+ itPlay->setNumHedgehogs(team.numHedgehogs());
+
+ framePlaying->setHHNum(team);
+}
+
+void TeamSelWidget::changeTeamColor(const HWTeam& team)
+{
+ QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
+ if(itPlay==curPlayingTeams.end())
+ {
+ qWarning() << QString("changeTeamColor: team '%1' not found").arg(team.name());
+ return;
+ }
+ itPlay->setColor(team.color());
+
+ framePlaying->setTeamColor(team);
+}
+
+void TeamSelWidget::removeNetTeam(const HWTeam& team)
+{
+ //qDebug() << QString("removeNetTeam: removing team '%1'").arg(team.TeamName);
+ for(;;) {
+ QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
+ if(itPlay==curPlayingTeams.end())
+ {
+ qWarning() << QString("removeNetTeam: team '%1' not found").arg(team.name());
+ break;
+ }
+ if(itPlay->isNetTeam()) {
+ QObject::disconnect(framePlaying->getTeamWidget(*itPlay), SIGNAL(teamStatusChanged(HWTeam)));
+ framePlaying->removeTeam(team);
+ curPlayingTeams.erase(itPlay);
+ break;
+ }
+ }
+ emit setEnabledGameStart(curPlayingTeams.size()>1);
+}
+
+void TeamSelWidget::netTeamStatusChanged(const HWTeam& team)
+{
+ QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
+
+}
+
+//void TeamSelWidget::removeTeam(__attribute__ ((unused)) HWTeam team)
+//{
+ //curDontPlayingTeams.erase(std::find(curDontPlayingTeams.begin(), curDontPlayingTeams.end(), team));
+//}
+
+void TeamSelWidget::changeTeamStatus(HWTeam team)
+{
+ QList<HWTeam>::iterator itDontPlay=std::find(m_curNotPlayingTeams.begin(), m_curNotPlayingTeams.end(), team);
+ QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
+
+ bool willBePlaying=itDontPlay!=m_curNotPlayingTeams.end();
+
+ if(!willBePlaying) {
+ // playing team => dont playing
+ m_curNotPlayingTeams.push_back(*itPlay);
+ emit teamNotPlaying(*itPlay);
+ curPlayingTeams.erase(itPlay);
+ } else {
+ // return if max playing teams reached
+ if(framePlaying->isFullTeams()) return;
+ // dont playing team => playing
+ team=*itDontPlay; // for net team info saving in framePlaying (we have only name with netID from network)
+ itDontPlay->setColor(framePlaying->getNextColor());
+ curPlayingTeams.push_back(*itDontPlay);
+ if(!m_acceptOuter) emit teamWillPlay(*itDontPlay);
+ m_curNotPlayingTeams.erase(itDontPlay);
+ }
+
+ FrameTeams* pRemoveTeams;
+ FrameTeams* pAddTeams;
+ if(!willBePlaying) {
+ pRemoveTeams=framePlaying;
+ pAddTeams=frameDontPlaying;
+ } else {
+ pRemoveTeams=frameDontPlaying;
+ pAddTeams=framePlaying;
+ }
+
+ pAddTeams->addTeam(team, willBePlaying);
+ pRemoveTeams->removeTeam(team);
+ if(!team.isNetTeam() && m_acceptOuter && !willBePlaying) {
+ connect(frameDontPlaying->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)),
+ this, SLOT(pre_changeTeamStatus(HWTeam)));
+ } else {
+ connect(pAddTeams->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)),
+ this, SLOT(changeTeamStatus(HWTeam)));
+ }
+ if(willBePlaying) {
+ connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)),
+ this, SLOT(hhNumChanged(const HWTeam&)));
+ dynamic_cast<TeamShowWidget*>(framePlaying->getTeamWidget(team))->hhNumChanged();
+ connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)),
+ this, SLOT(proxyTeamColorChanged(const HWTeam&)));
+ emit teamColorChanged(((TeamShowWidget*)framePlaying->getTeamWidget(team))->getTeam());
+ }
+
+ QSize szh=pAddTeams->sizeHint();
+ QSize szh1=pRemoveTeams->sizeHint();
+ if(szh.isValid() && szh1.isValid()) {
+ pAddTeams->resize(pAddTeams->size().width(), szh.height());
+ pRemoveTeams->resize(pRemoveTeams->size().width(), szh1.height());
+ }
+
+ emit setEnabledGameStart(curPlayingTeams.size()>1);
+}
+
+void TeamSelWidget::addScrArea(FrameTeams* pfteams, QColor color, int fixedHeight)
+{
+ VertScrArea* area = new VertScrArea(color);
+ area->setWidget(pfteams);
+ mainLayout.addWidget(area, 30);
+ if (fixedHeight > 0)
+ {
+ area->setMinimumHeight(fixedHeight);
+ area->setMaximumHeight(fixedHeight);
+ area->setStyleSheet(
+ "FrameTeams{"
+ "border: solid;"
+ "border-width: 1px;"
+ "border-radius: 16px;"
+ "border-color: #ffcc00;"
+ "}"
+ );
+ }
+}
+
+TeamSelWidget::TeamSelWidget(QWidget* parent) :
+ QGroupBox(parent), mainLayout(this), m_acceptOuter(false)
+{
+ setTitle(QGroupBox::tr("Playing teams"));
+ framePlaying = new FrameTeams();
+ frameDontPlaying = new FrameTeams();
+
+ QPalette p;
+ p.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
+ addScrArea(framePlaying, p.color(QPalette::Window).light(105), 250);
+ addScrArea(frameDontPlaying, p.color(QPalette::Window).dark(105), 0);
+}
+
+void TeamSelWidget::setAcceptOuter(bool acceptOuter)
+{
+ m_acceptOuter=acceptOuter;
+}
+
+void TeamSelWidget::resetPlayingTeams(const QList<HWTeam>& teamslist)
+{
+ //for(it=curPlayingTeams.begin(); it!=curPlayingTeams.end(); it++) {
+ //framePlaying->removeTeam(*it);
+ //}
+ framePlaying->resetTeams();
+ framePlaying->resetColors();
+ curPlayingTeams.clear();
+ //for(it=curDontPlayingTeams.begin(); it!=curDontPlayingTeams.end(); it++) {
+ //frameDontPlaying->removeTeam(*it);
+ //}
+ frameDontPlaying->resetTeams();
+ m_curNotPlayingTeams.clear();
+
+ foreach(HWTeam team, teamslist)
+ addTeam(team);
+}
+
+bool TeamSelWidget::isPlaying(HWTeam team) const
+{
+ return std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team)!=curPlayingTeams.end();
+}
+
+QList<HWTeam> TeamSelWidget::getPlayingTeams() const
+{
+ return curPlayingTeams;
+}
+
+QList<HWTeam> TeamSelWidget::getNotPlayingTeams() const
+{
+ return m_curNotPlayingTeams;
+}
+
+void TeamSelWidget::pre_changeTeamStatus(HWTeam team)
+{
+ team.setColor(framePlaying->getNextColor());
+ emit acceptRequested(team);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/teamselect.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,83 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _TEAM_SELECT_INCLUDED
+#define _TEAM_SELECT_INCLUDED
+
+#include <QGroupBox>
+#include <QVBoxLayout>
+#include <QColor>
+#include <QMultiMap>
+
+#include "team.h"
+
+class TeamSelWidget;
+class FrameTeams;
+class QFrame;
+class QPushButton;
+
+using namespace std;
+
+class TeamSelWidget : public QGroupBox
+{
+ Q_OBJECT
+
+ public:
+ TeamSelWidget(QWidget* parent);
+ void setAcceptOuter(bool acceptOuter);
+ void removeNetTeam(const HWTeam& team);
+ void resetPlayingTeams(const QList<HWTeam>& teamslist);
+ bool isPlaying(HWTeam team) const;
+ QList<HWTeam> getPlayingTeams() const;
+ QList<HWTeam> getNotPlayingTeams() const;
+ void setInteractivity(bool interactive);
+
+ public slots:
+ void addTeam(HWTeam team);
+ void netTeamStatusChanged(const HWTeam& team);
+ void changeHHNum(const HWTeam&);
+ void changeTeamColor(const HWTeam&);
+ void changeTeamStatus(HWTeam team);
+
+ signals:
+ void setEnabledGameStart(bool);
+ void teamWillPlay(HWTeam team);
+ void teamNotPlaying(const HWTeam& team);
+ void hhogsNumChanged(const HWTeam&);
+ void teamColorChanged(const HWTeam&);
+ void acceptRequested(HWTeam team);
+
+ private slots:
+ void pre_changeTeamStatus(HWTeam);
+ void hhNumChanged(const HWTeam& team);
+ void proxyTeamColorChanged(const HWTeam& team);
+
+ private:
+ void addScrArea(FrameTeams* pfteams, QColor color, int maxHeight);
+ FrameTeams* frameDontPlaying;
+ FrameTeams* framePlaying;
+
+ QVBoxLayout mainLayout;
+ bool m_acceptOuter;
+
+ QList<HWTeam> curPlayingTeams;
+ QList<HWTeam> m_curNotPlayingTeams;
+};
+
+#endif // _TEAM_SELECT_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/teamselhelper.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,154 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QPixmap>
+#include <QPainter>
+#include <QStyleFactory>
+
+#include <algorithm>
+
+#include "teamselhelper.h"
+#include "hwconsts.h"
+#include "frameTeam.h"
+
+void TeamLabel::teamButtonClicked()
+{
+ emit teamActivated(text());
+}
+
+TeamShowWidget::TeamShowWidget(HWTeam team, bool isPlaying, QWidget * parent) :
+ QWidget(parent), mainLayout(this), m_team(team), m_isPlaying(isPlaying), phhoger(0),
+ colorButt(0)
+{
+ QPalette newPalette = palette();
+ newPalette.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
+ setPalette(newPalette);
+ setAutoFillBackground(true);
+
+ mainLayout.setSpacing(3);
+ mainLayout.setMargin(0);
+ this->setMaximumHeight(38);
+ this->setMinimumHeight(38);
+ QIcon difficultyIcon=team.isNetTeam() ?
+ QIcon(QString(":/res/botlevels/net%1.png").arg(m_team.difficulty()))
+ : QIcon(QString(":/res/botlevels/%1.png").arg(m_team.difficulty()));
+
+ butt = new QPushButton(difficultyIcon, team.name().replace("&","&&"), this);
+ butt->setFlat(true);
+ butt->setToolTip(team.owner());
+ mainLayout.addWidget(butt);
+ butt->setStyleSheet("QPushButton{"
+ "icon-size: 48px;"
+ "text-align: left;"
+ "background-color: #0d0544;"
+ "color: orange;"
+ "font: bold;"
+ "border-width: 2px;"
+ "margin: 6px 0px 6px 0px;"
+ "}");
+
+ if(m_isPlaying) {
+ // team color
+ colorButt = new QPushButton(this);
+ colorButt->setMaximumWidth(26);
+ colorButt->setMinimumHeight(26);
+ colorButt->setGeometry(0, 0, 26, 26);
+
+ changeTeamColor();
+ connect(colorButt, SIGNAL(clicked()), this, SLOT(changeTeamColor()));
+ mainLayout.addWidget(colorButt);
+
+ phhoger = new CHedgehogerWidget(QImage(":/res/hh25x25.png"), QImage(":/res/hh25x25grey.png"), this);
+ connect(phhoger, SIGNAL(hedgehogsNumChanged()), this, SLOT(hhNumChanged()));
+ phhoger->setHHNum(team.numHedgehogs());
+ mainLayout.addWidget(phhoger);
+ } else {
+ }
+
+ QObject::connect(butt, SIGNAL(clicked()), this, SLOT(activateTeam()));
+ //QObject::connect(bText, SIGNAL(clicked()), this, SLOT(activateTeam()));
+}
+
+void TeamShowWidget::setInteractivity(bool interactive)
+{
+ if(m_team.isNetTeam()) {
+ butt->setEnabled(interactive);
+ }
+
+ colorButt->setEnabled(interactive);
+ phhoger->setEnabled(interactive);
+}
+
+void TeamShowWidget::setHHNum(unsigned int num)
+{
+ phhoger->setHHNum(num);
+}
+
+void TeamShowWidget::hhNumChanged()
+{
+ m_team.setNumHedgehogs(phhoger->getHedgehogsNum());
+ emit hhNmChanged(m_team);
+}
+
+void TeamShowWidget::activateTeam()
+{
+ emit teamStatusChanged(m_team);
+}
+
+/*HWTeamTempParams TeamShowWidget::getTeamParams() const
+{
+ if(!phhoger) throw;
+ HWTeamTempParams params;
+ params.numHedgehogs=phhoger->getHedgehogsNum();
+ params.teamColor=colorButt->palette().color(QPalette::Button);
+ return params;
+}*/
+
+void TeamShowWidget::changeTeamColor(QColor color)
+{
+ FrameTeams* pOurFrameTeams=dynamic_cast<FrameTeams*>(parentWidget());
+ if(!color.isValid()) {
+ if(++pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) {
+ pOurFrameTeams->currentColor=pOurFrameTeams->availableColors.begin();
+ }
+ color=*pOurFrameTeams->currentColor;
+ } else {
+ // set according color iterator
+ pOurFrameTeams->currentColor=std::find(pOurFrameTeams->availableColors.begin(),
+ pOurFrameTeams->availableColors.end(), color);
+ if(pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) {
+ // error condition
+ pOurFrameTeams->currentColor=pOurFrameTeams->availableColors.begin();
+ }
+ }
+
+ colorButt->setStyleSheet(QString("QPushButton{"
+ "background-color: %1;"
+ "border-width: 1px;"
+ "border-radius: 2px;"
+ "}").arg(pOurFrameTeams->currentColor->name()));
+
+ m_team.setColor(color);
+ emit teamColorChanged(m_team);
+}
+
+HWTeam TeamShowWidget::getTeam() const
+{
+ return m_team;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/teamselhelper.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,80 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _TEAMSEL_HELPER_INCLUDED
+#define _TEAMSEL_HELPER_INCLUDED
+
+#include <QLabel>
+#include <QWidget>
+#include <QString>
+#include <QPushButton>
+
+#include "teamselect.h"
+#include "hedgehogerWidget.h"
+
+class TeamLabel : public QLabel
+{
+ Q_OBJECT
+
+ public:
+ TeamLabel(const QString& inp_str) : QLabel(inp_str) {};
+
+ signals:
+ void teamActivated(QString team_name);
+
+ public slots:
+ void teamButtonClicked();
+
+};
+
+class TeamShowWidget : public QWidget
+{
+ Q_OBJECT
+
+ public slots:
+ void changeTeamColor(QColor color=QColor());
+ void hhNumChanged();
+
+ private slots:
+ void activateTeam();
+
+ public:
+ TeamShowWidget(HWTeam team, bool isPlaying, QWidget * parent);
+ void setPlaying(bool isPlaying);
+ void setHHNum(unsigned int num);
+ void setInteractivity(bool interactive);
+ HWTeam getTeam() const;
+
+ private:
+ TeamShowWidget();
+ QHBoxLayout mainLayout;
+ HWTeam m_team;
+ bool m_isPlaying;
+ CHedgehogerWidget* phhoger;
+ QPushButton* colorButt;
+ QPushButton* butt;
+// QPushButton* bText;
+
+ signals:
+ void teamStatusChanged(HWTeam team);
+ void hhNmChanged(const HWTeam&);
+ void teamColorChanged(const HWTeam&);
+};
+
+#endif // _TEAMSEL_HELPER_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/togglebutton.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,52 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2009 Kristian Lehmann <email@thexception.net>
+ * Copyright (c) 2009-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "togglebutton.h"
+
+ToggleButtonWidget::ToggleButtonWidget(QWidget * parent, QString img)
+ : QPushButton(parent)
+{
+ setCheckable(true);
+
+ QPixmap pm(":/res/btnDisabled.png");
+ QPainter * painter = new QPainter();
+
+ pmChecked.load(img);
+ pmDisabled.load(img);
+
+ setMaximumWidth(pmChecked.width() + 6);
+
+ painter->begin(&pmDisabled);
+ painter->drawPixmap(pmDisabled.rect(), pm);
+ painter->end();
+
+ setIconSize(pmDisabled.size());
+ setIcon(pmDisabled);
+
+ connect(this, SIGNAL(toggled(bool)), this, SLOT(eventToggled(bool)));
+}
+
+ToggleButtonWidget::~ToggleButtonWidget()
+{
+}
+
+void ToggleButtonWidget::eventToggled(bool checked)
+{
+ setIcon(checked ? pmChecked : pmDisabled);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/togglebutton.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,42 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2009 Kristian Lehmann <email@thexception.net>
+ * Copyright (c) 2009-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef TOGGLEBUTTONWIDGET_H
+#define TOGGLEBUTTONWIDGET_H
+
+#include <QWidget>
+#include <QPainter>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QLabel>
+
+class ToggleButtonWidget : public QPushButton
+{
+ Q_OBJECT
+public:
+ ToggleButtonWidget(QWidget * parent, QString img);
+ ~ToggleButtonWidget();
+private:
+ QPixmap pmChecked;
+ QPixmap pmDisabled;
+private slots:
+ void eventToggled(bool checked);
+};
+
+#endif // TOGGLEBUTTONWIDGET_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/vertScrollArea.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,35 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "vertScrollArea.h"
+
+#include <QResizeEvent>
+
+VertScrArea::VertScrArea(QColor frameColor, QWidget * parent) :
+ QScrollArea(parent)
+{
+ QPalette newPalette = palette();
+ newPalette.setColor(QPalette::Background, frameColor);
+ setPalette(newPalette);
+}
+
+void VertScrArea::resizeEvent(QResizeEvent * event)
+{
+ widget()->resize(event->size().width(), widget()->sizeHint().height());
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/vertScrollArea.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,36 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _VERT_SCROLL_AREA_INCLUDED
+#define _VERT_SCROLL_AREA_INCLUDED
+
+#include <QScrollArea>
+
+class VertScrArea : public QScrollArea
+{
+ Q_OBJECT
+
+public:
+ VertScrArea(QColor frameColor, QWidget * parent = 0);
+
+protected:
+ virtual void resizeEvent(QResizeEvent * event);
+};
+
+#endif // _VERT_SCROLL_AREA_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/weaponItem.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,40 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "weaponItem.h"
+
+WeaponItem::WeaponItem(const QImage& im, const QImage& img, QWidget * parent) :
+ ItemNum(im, img, parent, 0)
+{
+}
+
+WeaponItem::~WeaponItem()
+{
+}
+
+void WeaponItem::incItems()
+{
+ ++numItems;
+}
+
+void WeaponItem::decItems()
+{
+ --numItems;
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/weaponItem.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,44 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef _WEAPON_ITEM
+#define _WEAPON_ITEM
+
+#include "itemNum.h"
+
+class WeaponItem : public ItemNum
+{
+ Q_OBJECT
+
+ public:
+ WeaponItem(const QImage& im, const QImage& img, QWidget * parent);
+ virtual ~WeaponItem();
+
+ signals:
+ void hedgehogsNumChanged();
+
+ protected:
+ virtual void incItems();
+ virtual void decItems();
+
+ private:
+ WeaponItem();
+};
+
+#endif // _WEAPON_ITEM
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/util/namegen.cpp Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,285 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2009 Martin Minarik <ttsmj@pokec.sk>
+ * Copyright (c) 2009-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QFile>
+#include <QTextStream>
+#include <QStringList>
+#include <QLineEdit>
+#include "namegen.h"
+#include "hwform.h"
+#include "hwconsts.h"
+
+
+HWNamegen::HWNamegen() {}
+
+QList<QStringList> HWNamegen::TypesTeamnames;
+QList<QStringList> HWNamegen::TypesHatnames;
+bool HWNamegen::typesAvailable = false;
+
+
+void HWNamegen::teamRandomNames(HWTeam & team, const bool changeteamname)
+{
+ // load types if not already loaded
+ if (!typesAvailable)
+ if (!loadTypes())
+ return; // abort if loading failed
+
+ // abort if there are no hat types
+ if (TypesHatnames.size() <= 0)
+ return;
+
+ // the hat will influence which names the hogs get
+ int kind = (rand()%(TypesHatnames.size()));
+
+ // pick team name based on hat
+ if (changeteamname)
+ {
+ if (TypesTeamnames[kind].size() > 0)
+ team.setName(TypesTeamnames[kind][rand()%(TypesTeamnames[kind].size())]);
+
+ team.setGrave(getRandomGrave());
+ team.setFort(getRandomFort());
+ team.setVoicepack("Default");
+ }
+
+ QStringList dicts;
+ QStringList dict;
+
+ if ((TypesHatnames[kind].size()) <= 0)
+ {
+ dicts = dictsForHat(team.hedgehog(0).Hat);
+ dict = dictContents(dicts[rand()%(dicts.size())]);
+ }
+
+ for(int i = 0; i < HEDGEHOGS_PER_TEAM; i++)
+ {
+ if ((TypesHatnames[kind].size()) > 0)
+ {
+ HWHog hh = team.hedgehog(i);
+ hh.Hat = TypesHatnames[kind][rand()%(TypesHatnames[kind].size())];
+ team.setHedgehog(i,hh);
+ }
+
+ // there is a chance that this hog has the same hat as the previous one
+ // let's reuse the hat-specific dict in this case
+ if ((i == 0) or (team.hedgehog(i).Hat != team.hedgehog(i-1).Hat))
+ {
+ dicts = dictsForHat(team.hedgehog(i).Hat);
+ dict = dictContents(dicts[rand()%(dicts.size())]);
+ }
+
+ // give each hedgehog a random name
+ HWNamegen::teamRandomName(team,i,dict);
+ }
+
+}
+
+void HWNamegen::teamRandomName(HWTeam & team, const int HedgehogNumber)
+{
+ QStringList dicts = dictsForHat(team.hedgehog(HedgehogNumber).Hat);
+
+ QStringList dict = dictContents(dicts[rand()%(dicts.size())]);
+
+ teamRandomName(team, HedgehogNumber, dict);
+}
+
+void HWNamegen::teamRandomName(HWTeam & team, const int HedgehogNumber, const QStringList & dict)
+{
+ QStringList namesDict = dict;
+
+ for(int i = 0; i < HEDGEHOGS_PER_TEAM; i++)
+ {
+ namesDict.removeOne(team.hedgehog(i).Name);
+ }
+
+ // if our dict doesn't have any new names we'll have to use duplicates
+ if (namesDict.size() < 1)
+ namesDict = dict;
+
+ HWHog hh = team.hedgehog(HedgehogNumber);
+
+ hh.Name = namesDict[rand()%(namesDict.size())];
+
+ team.setHedgehog(HedgehogNumber, hh);
+}
+
+QStringList HWNamegen::dictContents(const QString filename)
+{
+ QStringList list;
+
+ QFile file;
+
+ // find .cfg to load the names from
+ file.setFileName(QString("%1/Data/Names/%2.txt").arg(cfgdir->absolutePath()).arg(filename));
+ if (!file.exists())
+ file.setFileName(QString("%1/Names/%2.txt").arg(datadir->absolutePath()).arg(filename));
+
+ if (file.open(QIODevice::ReadOnly | QIODevice::Text))
+ {
+
+ QTextStream in(&file);
+ while (!in.atEnd())
+ {
+ QString line = in.readLine();
+ if(!line.isEmpty())
+ list.append(line);
+ }
+ }
+
+ if (list.size() == 0)
+ list.append(filename);
+
+ return list;
+}
+
+
+QStringList HWNamegen::dictsForHat(const QString hatname)
+{
+ QStringList list;
+
+ QFile file;
+
+ // find .cfg to load the names from
+ file.setFileName(QString("%1/Data/Names/%2.cfg").arg(cfgdir->absolutePath()).arg(hatname));
+ if (!file.exists())
+ file.setFileName(QString("%1/Names/%2.cfg").arg(datadir->absolutePath()).arg(hatname));
+
+
+ if (file.open(QIODevice::ReadOnly | QIODevice::Text))
+ {
+ QTextStream in(&file);
+ while (!in.atEnd())
+ {
+ QString line = in.readLine();
+ if(!line.isEmpty())
+ list.append(line);
+ }
+ }
+
+ if (list.size() == 0)
+ list.append(QString("generic"));
+
+ return list;
+}
+
+// loades types from ini files. returns true on success.
+bool HWNamegen::loadTypes()
+{
+ QFile file;
+
+ // find .cfg to load the names from
+ file.setFileName(QString("%1/Data/Names/types.ini").arg(cfgdir->absolutePath()));
+ if (!file.exists())
+ file.setFileName(QString("%1/Names/types.ini").arg(datadir->absolutePath()));
+
+
+ if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+ return false;
+
+ int counter = 0; //counter starts with 0 (teamnames mode)
+ TypesTeamnames.append(QStringList());
+ TypesHatnames.append(QStringList());
+
+ QTextStream in(&file);
+ while (!in.atEnd())
+ {
+ QString line = in.readLine();
+ if (line == QString("#####"))
+ {
+ counter++; //toggle mode (teamnames || hats)
+ if ((counter%2) == 0)
+ {
+ TypesTeamnames.append(QStringList());
+ TypesHatnames.append(QStringList());
+ }
+ }
+ else if ((line == QString("*****")) || (line == QString("*END*")))
+ {
+ typesAvailable = true;
+ return true; // bye bye
+ }
+ else
+ {
+ if ((counter%2) == 0)
+ {
+ // even => teamnames mode
+ TypesTeamnames[(counter/2)].append(line);
+ }
+ else
+ {
+ // odd => hats mode
+ TypesHatnames[((counter-1)/2)].append(line);
+ }
+ }
+ }
+
+ typesAvailable = true;
+ return true;
+}
+
+
+
+QString HWNamegen::getRandomGrave()
+{
+ QStringList Graves;
+
+ //list all available Graves
+ QDir tmpdir;
+ tmpdir.cd(cfgdir->absolutePath());
+ tmpdir.cd("Data/Graphics/Graves");
+ tmpdir.setFilter(QDir::Files);
+ Graves.append(tmpdir.entryList(QStringList("*.png")).replaceInStrings(QRegExp("^(.*)\\.png"), "\\1"));
+
+ tmpdir.cd(datadir->absolutePath());
+ tmpdir.cd("Graphics/Graves");
+ tmpdir.setFilter(QDir::Files);
+ QStringList tmpList = tmpdir.entryList(QStringList("*.png")).replaceInStrings(QRegExp("^(.*)\\.png"), "\\1");
+ for (QStringList::Iterator it = tmpList.begin(); it != tmpList.end(); ++it)
+ if (!Graves.contains(*it,Qt::CaseInsensitive)) Graves.append(*it);
+
+ if(Graves.size()==0)
+ {
+ //do some serious error handling
+ return "Error";
+ }
+
+ //pick a random grave
+ return Graves[rand()%(Graves.size())];
+}
+
+QString HWNamegen::getRandomFort()
+{
+ QStringList Forts;
+
+ //list all available Forts
+ QDir tmpdir;
+ tmpdir.cd(datadir->absolutePath());
+ tmpdir.cd("Forts");
+ tmpdir.setFilter(QDir::Files);
+ Forts.append(tmpdir.entryList(QStringList("*L.png")).replaceInStrings(QRegExp("^(.*)L\\.png"), "\\1"));
+
+ if(Forts.size()==0)
+ {
+ //do some serious error handling
+ return "Error";
+ }
+
+ //pick a random fort
+ return Forts[rand()%(Forts.size())];
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/util/namegen.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,53 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2009 Martin Minarik <ttsmj@pokec.sk>
+ * Copyright (c) 2009-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef NAMEGEN_H
+#define NAMEGEN_H
+
+#include <QString>
+
+class HWForm;
+class HWTeam;
+
+class HWNamegen
+{
+public:
+
+ static void teamRandomName(HWTeam & team, const int HedgehogNumber);
+ static void teamRandomNames(HWTeam & team, const bool changeteamname);
+
+private:
+ HWNamegen();
+
+ static QList<QStringList> TypesTeamnames;
+ static QList<QStringList> TypesHatnames;
+ static bool typesAvailable;
+
+ static bool loadTypes();
+ static QStringList dictContents(const QString filename);
+ static QStringList dictsForHat(const QString hatname);
+
+ static QString getRandomGrave();
+ static QString getRandomFort();
+ static void teamRandomName(HWTeam & team, const int HedgehogNumber, const QStringList & dict);
+};
+
+
+
+#endif
--- a/QTfrontend/vertScrollArea.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "vertScrollArea.h"
-
-#include <QResizeEvent>
-
-VertScrArea::VertScrArea(QColor frameColor, QWidget * parent) :
- QScrollArea(parent)
-{
- QPalette newPalette = palette();
- newPalette.setColor(QPalette::Background, frameColor);
- setPalette(newPalette);
-}
-
-void VertScrArea::resizeEvent(QResizeEvent * event)
-{
- widget()->resize(event->size().width(), widget()->sizeHint().height());
-}
--- a/QTfrontend/vertScrollArea.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _VERT_SCROLL_AREA_INCLUDED
-#define _VERT_SCROLL_AREA_INCLUDED
-
-#include <QScrollArea>
-
-class VertScrArea : public QScrollArea
-{
- Q_OBJECT
-
-public:
- VertScrArea(QColor frameColor, QWidget * parent = 0);
-
-protected:
- virtual void resizeEvent(QResizeEvent * event);
-};
-
-#endif // _VERT_SCROLL_AREA_INCLUDED
--- a/QTfrontend/weaponItem.cpp Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "weaponItem.h"
-
-WeaponItem::WeaponItem(const QImage& im, const QImage& img, QWidget * parent) :
- ItemNum(im, img, parent, 0)
-{
-}
-
-WeaponItem::~WeaponItem()
-{
-}
-
-void WeaponItem::incItems()
-{
- ++numItems;
-}
-
-void WeaponItem::decItems()
-{
- --numItems;
-}
-
--- a/QTfrontend/weaponItem.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2008-2011 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _WEAPON_ITEM
-#define _WEAPON_ITEM
-
-#include "itemNum.h"
-
-class WeaponItem : public ItemNum
-{
- Q_OBJECT
-
- public:
- WeaponItem(const QImage& im, const QImage& img, QWidget * parent);
- virtual ~WeaponItem();
-
- signals:
- void hedgehogsNumChanged();
-
- protected:
- virtual void incItems();
- virtual void decItems();
-
- private:
- WeaponItem();
-};
-
-#endif // _WEAPON_ITEM
--- a/README Sat Oct 08 16:45:52 2011 +0200
+++ b/README Sat Oct 08 16:54:56 2011 +0200
@@ -3,5 +3,5 @@
Images and sounds are distributed under the terms of the GNU FDL licence.
Source:
-Copyright 2004-2010 Andrey Korotaev <unC0Rr@gmail.com>
+Copyright 2004-2011 Andrey Korotaev <unC0Rr@gmail.com>
Portions copyright 2006-2008 Igor Ulyanov aka Displacer <iulyanov@gmail.com>
--- a/gameServer/Actions.hs Sat Oct 08 16:45:52 2011 +0200
+++ b/gameServer/Actions.hs Sat Oct 08 16:54:56 2011 +0200
@@ -1,4 +1,4 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP, OverloadedStrings #-}
module Actions where
import Control.Concurrent
@@ -17,16 +17,17 @@
import Data.Unique
import Control.Arrow
import Control.Exception
-import OfficialServer.GameReplayStore
import System.Process
import Network.Socket
-----------------------------
+import OfficialServer.GameReplayStore
import CoreTypes
import Utils
import ClientIO
import ServerState
import Consts
import ConfigFile
+import EngineInteraction
data Action =
AnswerClients ![ClientChan] ![B.ByteString]
@@ -206,7 +207,7 @@
(Just ci) <- gets clientIndex
ri <- clientRoomA
rnc <- gets roomsClients
- (gameProgress, playersNum) <- io $ room'sM rnc (gameinprogress &&& playersIn) ri
+ (gameProgress, playersNum) <- io $ room'sM rnc ((isJust . gameInfo) &&& playersIn) ri
ready <- client's isReady
master <- client's isMaster
-- client <- client's id
@@ -298,7 +299,7 @@
processAction (RemoveTeam teamName) = do
rnc <- gets roomsClients
ri <- clientRoomA
- inGame <- io $ room'sM rnc gameinprogress ri
+ inGame <- io $ room'sM rnc (isJust . gameInfo) ri
chans <- othersChans
if not $ inGame then
mapM_ processAction [
@@ -310,8 +311,10 @@
AnswerClients chans ["EM", rmTeamMsg],
ModifyRoom (\r -> r{
teams = Prelude.filter (\t -> teamName /= teamname t) $ teams r,
- leftTeams = teamName : leftTeams r,
- roundMsgs = roundMsgs r Seq.|> rmTeamMsg
+ gameInfo = liftM (\g -> g{
+ leftTeams = teamName : leftTeams g,
+ roundMsgs = roundMsgs g Seq.|> rmTeamMsg
+ }) $ gameInfo r
})
]
where
@@ -505,9 +508,13 @@
return ()
processAction $ ModifyServerInfo (\s -> s{shutdownPending = True})
+#if defined(OFFICIAL_SERVER)
processAction SaveReplay = do
ri <- clientRoomA
rnc <- gets roomsClients
io $ do
r <- room'sM rnc id ri
saveReplay r
+#else
+processAction SaveReplay = return ()
+#endif
--- a/gameServer/ClientIO.hs Sat Oct 08 16:45:52 2011 +0200
+++ b/gameServer/ClientIO.hs Sat Oct 08 16:54:56 2011 +0200
@@ -58,6 +58,10 @@
clientSendLoop :: Socket -> ThreadId -> Chan [B.ByteString] -> ClientIndex -> IO ()
clientSendLoop s tId chan ci = do
answer <- readChan chan
+
+ when (isQuit answer) $
+ killReciever . B.unpack $ quitMessage answer
+
Exception.handle
(\(e :: Exception.IOException) -> unless (isQuit answer) . killReciever $ show e) $
sendAll s $ B.unlines answer `B.snoc` '\n'
@@ -65,7 +69,6 @@
if isQuit answer then
do
Exception.handle (\(_ :: Exception.IOException) -> putStrLn "error on sClose") $ sClose s
- killReciever . B.unpack $ quitMessage answer
else
clientSendLoop s tId chan ci
--- a/gameServer/CoreTypes.hs Sat Oct 08 16:45:52 2011 +0200
+++ b/gameServer/CoreTypes.hs Sat Oct 08 16:54:56 2011 +0200
@@ -62,6 +62,24 @@
hedgehogs :: [HedgehogInfo]
}
deriving (Show, Read)
+
+data GameInfo =
+ GameInfo
+ {
+ roundMsgs :: Seq B.ByteString,
+ leftTeams :: [B.ByteString],
+ teamsAtStart :: [TeamInfo],
+ allPlayersHaveRegisteredAccounts :: Bool,
+ giMapParams :: Map.Map B.ByteString B.ByteString,
+ giParams :: Map.Map B.ByteString [B.ByteString]
+ } deriving (Show, Read)
+
+--newGameInfo :: -> GameInfo
+newGameInfo =
+ GameInfo
+ Data.Sequence.empty
+ []
+ []
data RoomInfo =
RoomInfo
@@ -71,14 +89,11 @@
password :: B.ByteString,
roomProto :: Word16,
teams :: [TeamInfo],
- gameinprogress :: Bool,
+ gameInfo :: Maybe GameInfo,
playersIn :: !Int,
readyPlayers :: !Int,
isRestrictedJoins :: Bool,
isRestrictedTeams :: Bool,
- roundMsgs :: Seq B.ByteString,
- leftTeams :: [B.ByteString],
- teamsAtStart :: [TeamInfo],
mapParams :: Map.Map B.ByteString B.ByteString,
params :: Map.Map B.ByteString [B.ByteString]
}
@@ -91,14 +106,11 @@
""
0
[]
- False
+ Nothing
0
0
False
False
- Data.Sequence.empty
- []
- []
(
Map.fromList $ Prelude.zipWith (,)
["MAP", "MAPGEN", "MAZE_SIZE", "SEED", "TEMPLATE"]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gameServer/EngineInteraction.hs Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,38 @@
+module EngineInteraction where
+
+import qualified Data.Set as Set
+import qualified Data.List as List
+import Control.Monad
+import qualified Codec.Binary.Base64 as Base64
+import qualified Data.ByteString.Char8 as B
+import qualified Data.ByteString as BW
+-------------
+import CoreTypes
+
+
+toEngineMsg :: B.ByteString -> B.ByteString
+toEngineMsg msg = B.pack $ Base64.encode (fromIntegral (BW.length msg) : BW.unpack msg)
+
+
+fromEngineMsg :: B.ByteString -> Maybe B.ByteString
+fromEngineMsg msg = liftM BW.pack (Base64.decode (B.unpack msg) >>= removeLength)
+ where
+ removeLength (x:xs) = if length xs == fromIntegral x then Just xs else Nothing
+ removeLength _ = Nothing
+
+
+checkNetCmd :: B.ByteString -> (Bool, Bool)
+checkNetCmd msg = check decoded
+ where
+ decoded = fromEngineMsg msg
+ check Nothing = (False, False)
+ check (Just ms) | B.length ms > 0 = let m = B.head ms in (m `Set.member` legalMessages, m == '+')
+ | otherwise = (False, False)
+ legalMessages = Set.fromList $ "M#+LlRrUuDdZzAaSjJ,sFNpPwtghbc12345" ++ slotMessages
+ slotMessages = "\128\129\130\131\132\133\134\135\136\137\138"
+
+gameInfo2Replay :: GameInfo -> B.ByteString
+gameInfo2Replay GameInfo{roundMsgs = rm,
+ teamsAtStart = teams,
+ giMapParams = params1,
+ giParams = params2} = undefined
--- a/gameServer/HWProtoCore.hs Sat Oct 08 16:45:52 2011 +0200
+++ b/gameServer/HWProtoCore.hs Sat Oct 08 16:54:56 2011 +0200
@@ -52,7 +52,7 @@
let roomMasterSign = if isMaster cl then "@" else ""
let adminSign = if isAdministrator cl then "@" else ""
let roomInfo = if roomId /= lobbyId then B.concat [roomMasterSign, "room ", name clRoom] else adminSign `B.append` "lobby"
- let roomStatus = if gameinprogress clRoom then
+ let roomStatus = if isJust $ gameInfo clRoom then
if teamsInGame cl > 0 then "(playing)" else "(spectating)"
else
""
--- a/gameServer/HWProtoInRoomState.hs Sat Oct 08 16:45:52 2011 +0200
+++ b/gameServer/HWProtoInRoomState.hs Sat Oct 08 16:54:56 2011 +0200
@@ -14,6 +14,7 @@
import Utils
import HandlerUtils
import RoomsAndClients
+import EngineInteraction
handleCmd_inRoom :: CmdHandler
@@ -52,13 +53,13 @@
clChan <- thisClientChans
othChans <- roomOthersChans
return $
- if not . null . drop 5 $ teams rm then
+ if not . null . drop (maxTeams rm - 1) $ teams rm then
[Warning "too many teams"]
else if canAddNumber rm <= 0 then
[Warning "too many hedgehogs"]
else if isJust $ findTeam rm then
[Warning "There's already a team with same name in the list"]
- else if gameinprogress rm then
+ else if isJust $ gameInfo rm then
[Warning "round in progress"]
else if isRestrictedTeams rm then
[Warning "restricted"]
@@ -78,6 +79,10 @@
hhsList [_] = error "Hedgehogs list with odd elements number"
hhsList (n:h:hhs) = HedgehogInfo n h : hhsList hhs
newTeamHHNum r = min 4 (canAddNumber r)
+ maxTeams r
+ | roomProto r < 38 = 6
+ | otherwise = 8
+
handleCmd_inRoom ["REMOVE_TEAM", tName] = do
(ci, _) <- ask
@@ -162,19 +167,20 @@
]
handleCmd_inRoom ["START_GAME"] = do
+ (ci, rnc) <- ask
cl <- thisClient
rm <- thisRoom
chans <- roomClientsChans
+
+ let allPlayersRegistered = all ((<) 0 . B.length . webPassword . client rnc . teamownerId) $ teams rm
- if isMaster cl && playersIn rm == readyPlayers rm && not (gameinprogress rm) then
+ if isMaster cl && playersIn rm == readyPlayers rm && not (isJust $ gameInfo rm) then
if enoughClans rm then
return [
ModifyRoom
(\r -> r{
- gameinprogress = True,
- roundMsgs = empty,
- leftTeams = [],
- teamsAtStart = teams r}
+ gameInfo = Just $ newGameInfo allPlayersRegistered (mapParams rm) (params rm)
+ }
),
AnswerClients chans ["RUN_GAME"]
]
@@ -191,35 +197,35 @@
rm <- thisRoom
chans <- roomOthersChans
- if teamsInGame cl > 0 && gameinprogress rm && isLegal then
- return $ AnswerClients chans ["EM", msg] : [ModifyRoom (\r -> r{roundMsgs = roundMsgs r |> msg}) | not isKeepAlive]
+ if teamsInGame cl > 0 && (isJust $ gameInfo rm) && isLegal then
+ return $ AnswerClients chans ["EM", msg] : [ModifyRoom (\r -> r{gameInfo = liftM (\g -> g{roundMsgs = roundMsgs g |> msg}) $ gameInfo r}) | not isKeepAlive]
else
return []
where
(isLegal, isKeepAlive) = checkNetCmd msg
-handleCmd_inRoom ["ROUNDFINISHED", _] = do
+handleCmd_inRoom ["ROUNDFINISHED", correctly] = do
cl <- thisClient
rm <- thisRoom
chans <- roomClientsChans
- if isMaster cl && gameinprogress rm then
- return $
- ModifyRoom
+ if isMaster cl && (isJust $ gameInfo rm) then
+ return $
+ SaveReplay
+ : ModifyRoom
(\r -> r{
- gameinprogress = False,
- readyPlayers = 0,
- roundMsgs = empty,
- leftTeams = [],
- teamsAtStart = []}
+ gameInfo = Nothing,
+ readyPlayers = 0
+ }
)
: UnreadyRoomClients
: answerRemovedTeams chans rm
else
return []
where
- answerRemovedTeams chans = map (\t -> AnswerClients chans ["REMOVE_TEAM", t]) . leftTeams
+ answerRemovedTeams chans = map (\t -> AnswerClients chans ["REMOVE_TEAM", t]) . leftTeams . fromJust . gameInfo
+ isCorrect = correctly == "1"
-- compatibility with clients with protocol < 38
handleCmd_inRoom ["ROUNDFINISHED"] =
--- a/gameServer/HWProtoLobbyState.hs Sat Oct 08 16:45:52 2011 +0200
+++ b/gameServer/HWProtoLobbyState.hs Sat Oct 08 16:54:56 2011 +0200
@@ -12,6 +12,7 @@
import Utils
import HandlerUtils
import RoomsAndClients
+import EngineInteraction
answerAllTeams :: ClientInfo -> [TeamInfo] -> [Action]
@@ -34,7 +35,7 @@
return [AnswerClients [sendChan cl] ("ROOMS" : roomsInfoList rooms)]
where
roomInfo irnc r = [
- showB $ gameinprogress r,
+ showB $ isJust $ gameInfo r,
name r,
showB $ playersIn r,
showB $ length $ teams r,
@@ -75,11 +76,12 @@
let maybeRI = find (\ri -> roomName == name (irnc `room` ri)) ris
let jRI = fromJust maybeRI
let jRoom = irnc `room` jRI
+ let sameProto = clientProto cl == roomProto jRoom
let jRoomClients = map (client irnc) $ roomClients irnc jRI
let nicks = map nick jRoomClients
let chans = map sendChan (cl : jRoomClients)
return $
- if isNothing maybeRI then
+ if isNothing maybeRI || not sameProto then
[Warning "No such rooms"]
else if isRestrictedJoins jRoom then
[Warning "Joining restricted"]
@@ -116,13 +118,13 @@
: ("SCHEME", pr Map.! "SCHEME")
: (filter (\(p, _) -> p /= "SCHEME") $ Map.toList pr)
- answerTeams cl jRoom = let f = if gameinprogress jRoom then teamsAtStart else teams in answerAllTeams cl $ f jRoom
+ answerTeams cl jRoom = let f = if isJust $ gameInfo jRoom then teamsAtStart . fromJust . gameInfo else teams in answerAllTeams cl $ f jRoom
- watchRound cl jRoom = if not $ gameinprogress jRoom then
+ watchRound cl jRoom = if isNothing $ gameInfo jRoom then
[]
else
[AnswerClients [sendChan cl] ["RUN_GAME"],
- AnswerClients [sendChan cl] $ "EM" : toEngineMsg "e$spectate 1" : Foldable.toList (roundMsgs jRoom)]
+ AnswerClients [sendChan cl] $ "EM" : toEngineMsg "e$spectate 1" : Foldable.toList (roundMsgs . fromJust . gameInfo $ jRoom)]
handleCmd_lobby ["JOIN_ROOM", roomName] =
@@ -135,7 +137,7 @@
cl <- thisClient
let ri = clientRoom rnc $ fromJust ci
let clRoom = room rnc ri
- if isNothing ci || ri == lobbyId || clientProto cl /= roomProto clRoom then
+ if isNothing ci || ri == lobbyId then
return []
else
handleCmd_lobby ["JOIN_ROOM", name clRoom]
--- a/gameServer/OfficialServer/GameReplayStore.hs Sat Oct 08 16:45:52 2011 +0200
+++ b/gameServer/OfficialServer/GameReplayStore.hs Sat Oct 08 16:54:56 2011 +0200
@@ -1,18 +1,25 @@
{-# LANGUAGE ScopedTypeVariables #-}
module OfficialServer.GameReplayStore where
-import CoreTypes
import Data.Time
import Control.Exception as E
import qualified Data.Map as Map
import Data.Sequence()
import System.Log.Logger
+import Data.Maybe
+import Data.Unique
+import Control.Monad
+---------------
+import CoreTypes
+
saveReplay :: RoomInfo -> IO ()
saveReplay r = do
time <- getCurrentTime
- let fileName = "replays/" ++ show time
- let replayInfo = (teamsAtStart r, Map.toList $ mapParams r, Map.toList $ params r, roundMsgs r)
+ u <- liftM hashUnique newUnique
+ let fileName = "replays/" ++ show time ++ "-" ++ show u
+ let gi = fromJust $ gameInfo r
+ let replayInfo = (teamsAtStart gi, Map.toList $ mapParams r, Map.toList $ params r, roundMsgs gi)
E.catch
(writeFile fileName (show replayInfo))
(\(e :: IOException) -> warningM "REPLAYS" $ "Couldn't write to " ++ fileName ++ ": " ++ show e)
--- a/gameServer/OfficialServer/extdbinterface.hs Sat Oct 08 16:45:52 2011 +0200
+++ b/gameServer/OfficialServer/extdbinterface.hs Sat Oct 08 16:54:56 2011 +0200
@@ -17,7 +17,7 @@
"SELECT users.pass, users_roles.rid FROM users LEFT JOIN users_roles ON users.uid = users_roles.uid WHERE users.name = ?"
dbQueryStats =
- "UPDATE gameserver_stats SET players = ?, rooms = ?, last_update = UNIX_TIMESTAMP()"
+ "INSERT INTO gameserver_stats (players, rooms, last_update) VALUES (?, ?, UNIX_TIMESTAMP())"
dbInteractionLoop dbConn = forever $ do
q <- liftM read getLine
--- a/gameServer/Utils.hs Sat Oct 08 16:45:52 2011 +0200
+++ b/gameServer/Utils.hs Sat Oct 08 16:54:56 2011 +0200
@@ -26,25 +26,6 @@
$ List.intersperse (':':)
$ concatMap (\n -> (\(a0, a1) -> [showHex a0, showHex a1]) $ divMod n 65536) [a, b, c, d]) []
-toEngineMsg :: B.ByteString -> B.ByteString
-toEngineMsg msg = B.pack $ Base64.encode (fromIntegral (BW.length msg) : BW.unpack msg)
-
-fromEngineMsg :: B.ByteString -> Maybe B.ByteString
-fromEngineMsg msg = liftM BW.pack (Base64.decode (B.unpack msg) >>= removeLength)
- where
- removeLength (x:xs) = if length xs == fromIntegral x then Just xs else Nothing
- removeLength _ = Nothing
-
-checkNetCmd :: B.ByteString -> (Bool, Bool)
-checkNetCmd msg = check decoded
- where
- decoded = fromEngineMsg msg
- check Nothing = (False, False)
- check (Just ms) | B.length ms > 0 = let m = B.head ms in (m `Set.member` legalMessages, m == '+')
- | otherwise = (False, False)
- legalMessages = Set.fromList $ "M#+LlRrUuDdZzAaSjJ,sFNpPwtghbc12345" ++ slotMessages
- slotMessages = "\128\129\130\131\132\133\134\135\136\137\138"
-
maybeRead :: Read a => String -> Maybe a
maybeRead s = case reads s of
[(x, rest)] | all isSpace rest -> Just x
@@ -103,6 +84,8 @@
, (35, "0.9.14.1")
, (37, "0.9.15")
, (38, "0.9.16-dev")
+ , (39, "0.9.16")
+ , (40, "0.9.17-dev")
]
askFromConsole :: B.ByteString -> IO B.ByteString
--- a/hedgewars/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -183,6 +183,10 @@
add_custom_target(${engine_output_name} ALL DEPENDS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}")
+IF(NOT APPLE)
+add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars")
+add_dependencies(${engine_output_name} ENGINECLEAN)
+ENDIF()
install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir})
--- a/hedgewars/GSHandlers.inc Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/GSHandlers.inc Sat Oct 08 16:54:56 2011 +0200
@@ -103,6 +103,35 @@
end;
end;
+procedure HideHog(HH: PHedgehog);
+begin
+ScriptCall('onHogHide', HH^.Gear^.Uid);
+DeleteCI(HH^.Gear);
+if FollowGear = HH^.Gear then FollowGear:= nil;
+if lastGearByUID = HH^.Gear then lastGearByUID := nil;
+RemoveGearFromList(HH^.Gear);
+with HH^.Gear^ do
+ begin
+ Z := cHHZ;
+ Active := false;
+ State:= State and not (gstHHDriven or gstAttacking or gstAttacked);
+ Message := Message and not gmAttack;
+ end;
+HH^.GearHidden:= HH^.Gear;
+HH^.Gear:= nil
+end;
+
+procedure RestoreHog(HH: PHedgehog);
+begin
+HH^.Gear:=HH^.GearHidden;
+HH^.GearHidden:= nil;
+InsertGearToList(HH^.Gear);
+HH^.Gear^.State:= (HH^.Gear^.State and not (gstHHDriven or gstInvisible or gstAttacking)) or gstAttacked;
+AddGearCI(HH^.Gear);
+HH^.Gear^.Active:= true;
+ScriptCall('onHogRestore', HH^.Gear^.Uid)
+end;
+
////////////////////////////////////////////////////////////////////////////////
procedure doStepDrowningGear(Gear: PGear);
forward;
@@ -190,8 +219,7 @@
procedure CheckCollision(Gear: PGear); inline;
begin
- if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) or TestCollisionYwithGear(Gear, hwSign(Gear^.dY)
- )
+ if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) or (TestCollisionYwithGear(Gear, hwSign(Gear^.dY)) <> 0)
then Gear^.State := Gear^.State or gstCollision
else Gear^.State := Gear^.State and not gstCollision
end;
@@ -274,6 +302,7 @@
//tmp: QWord;
tdX, tdY: hwFloat;
collV, collH: LongInt;
+ land: word;
begin
// clip velocity at 1.9 - over 1 per pixel, but really shouldn't cause many actual problems.
if Gear^.dX.QWordValue > 8160437862 then Gear^.dX.QWordValue:= 8160437862;
@@ -291,28 +320,37 @@
if Gear^.dY.isNegative then
begin
isFalling := true;
- if TestCollisionYwithGear(Gear, -1) then
+ land:= TestCollisionYwithGear(Gear, -1);
+ if land <> 0 then
begin
collV := -1;
- Gear^.dX := Gear^.dX * Gear^.Friction;
+ if land and lfIce <> 0 then Gear^.dX := Gear^.dX * (_1 - (_1 - Gear^.Friction) / _10)
+ else Gear^.dX := Gear^.dX * Gear^.Friction;
+
Gear^.dY := - Gear^.dY * Gear^.Elasticity;
Gear^.State := Gear^.State or gstCollision
end
- else if (Gear^.AdvBounce=1) and TestCollisionYwithGear(Gear, 1) then collV := 1;
+ else if (Gear^.AdvBounce=1) and (TestCollisionYwithGear(Gear, 1) <> 0) then collV := 1;
end
- else if TestCollisionYwithGear(Gear, 1) then
+ else
begin
- collV := 1;
- isFalling := false;
- Gear^.dX := Gear^.dX * Gear^.Friction;
- Gear^.dY := - Gear^.dY * Gear^.Elasticity;
- Gear^.State := Gear^.State or gstCollision
- end
- else
- begin
- isFalling := true;
- if (Gear^.AdvBounce=1) and not Gear^.dY.isNegative and TestCollisionYwithGear(Gear, -1) then
- collV := -1;
+ land:= TestCollisionYwithGear(Gear, 1);
+ if land <> 0 then
+ begin
+ collV := 1;
+ isFalling := false;
+ if land and lfIce <> 0 then Gear^.dX := Gear^.dX * (_1 - (_1 - Gear^.Friction) / _10)
+ else Gear^.dX := Gear^.dX * Gear^.Friction;
+
+ Gear^.dY := - Gear^.dY * Gear^.Elasticity;
+ Gear^.State := Gear^.State or gstCollision
+ end
+ else
+ begin
+ isFalling := true;
+ if (Gear^.AdvBounce=1) and not Gear^.dY.isNegative and (TestCollisionYwithGear(Gear, -1) <> 0) then
+ collV := -1
+ end
end;
@@ -480,21 +518,56 @@
////////////////////////////////////////////////////////////////////////////////
procedure doStepMolotov(Gear: PGear);
var
+ s: Longword;
i, gX, gY: LongInt;
dX, dY: hwFloat;
Fire: PGear;
+ smoke, glass: PVisualGear;
begin
AllInactive := false;
doStepFallingGear(Gear);
CalcRotationDirAngle(Gear);
+ // let's add some smoke depending on speed
+ s:= max(32,152 - hwRound(Distance(Gear^.dX,Gear^.dY)*120))+random(10);
+ if (GameTicks mod s) = 0 then
+ begin
+ // adjust angle to match the texture
+ if Gear^.dX.isNegative then i:= 130 else i:= 50;
+ smoke:= AddVisualGear(hwRound(Gear^.X)-round(cos((Gear^.DirAngle+i) * pi / 180)*20), hwRound(Gear^.Y)-round(sin((Gear^.DirAngle+i) * pi / 180)*20), vgtSmoke);
+ if smoke <> nil then smoke^.Scale:= 0.75;
+ end;
+
if (Gear^.State and gstCollision) <> 0 then
begin
PlaySound(sndMolotov);
gX := hwRound(Gear^.X);
gY := hwRound(Gear^.Y);
- //doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 5, EXPLAutoSound);
+ for i:= 0 to 4 do
+ begin
+ (*glass:= AddVisualGear(gx+random(7)-3, gy+random(5)-2, vgtEgg);
+ if glass <> nil then
+ begin
+ glass^.Frame:= 2;
+ glass^.Tint:= $41B83ED0 - i * $10081000;
+ glass^.dX:= 1/(10*(random(11)-5));
+ glass^.dY:= -1/(random(4)+5);
+ end;*)
+ glass:= AddVisualGear(gx+random(7)-3, gy+random(7)-3, vgtStraightShot);
+ if glass <> nil then
+ with glass^ do
+ begin
+ Frame:= 2;
+ Tint:= $41B83ED0 - i * $10081000;
+ Angle:= random * 360;
+ dx:= 0.0000001;
+ dy:= 0;
+ if random(2) = 0 then dx := -dx;
+ FrameTicks:= 750;
+ State:= ord(sprEgg)
+ end;
+ end;
for i:= 0 to 24 do
begin
dX := AngleCos(i * 2) * ((_0_15*(i div 5))) * (GetRandom + _1);
@@ -930,6 +1003,44 @@
end;
////////////////////////////////////////////////////////////////////////////////
+procedure spawnBulletTrail(Bullet: PGear);
+var oX, oY: hwFloat;
+ VGear: PVisualGear;
+begin
+ if Bullet^.PortalCounter = 0 then
+ begin
+ ox:= CurrentHedgehog^.Gear^.X + Int2hwFloat(GetLaunchX(CurrentHedgehog^.CurAmmoType, hwSign(CurrentHedgehog^.Gear^.dX), CurrentHedgehog^.Gear^.Angle));
+ oy:= CurrentHedgehog^.Gear^.Y + Int2hwFloat(GetLaunchY(CurrentHedgehog^.CurAmmoType, CurrentHedgehog^.Gear^.Angle));
+ end
+ else
+ begin
+ ox:= Bullet^.Elasticity;
+ oy:= Bullet^.Friction;
+ end;
+
+ // Bullet trail
+ VGear := AddVisualGear(hwRound(ox), hwRound(oy), vgtLineTrail);
+ if VGear <> nil then
+ begin
+ VGear^.X:= hwFloat2Float(ox);
+ VGear^.Y:= hwFloat2Float(oy);
+ VGear^.dX:= hwFloat2Float(Bullet^.X);
+ VGear^.dY:= hwFloat2Float(Bullet^.Y);
+
+ // reached edge of land. assume infinite beam. Extend it way out past camera
+ if (hwRound(Bullet^.X) and LAND_WIDTH_MASK <> 0)
+ or (hwRound(Bullet^.Y) and LAND_HEIGHT_MASK <> 0) then
+ // only extend if not under water
+ if hwRound(Bullet^.Y) < cWaterLine then
+ begin
+ VGear^.dX := VGear^.dX + LAND_WIDTH * (VGear^.dX - VGear^.X);
+ VGear^.dY := VGear^.dY + LAND_WIDTH * (VGear^.dY - VGear^.Y);
+ end;
+
+ VGear^.Timer := 200;
+ end;
+end;
+
procedure doStepBulletWork(Gear: PGear);
var
i, x, y: LongWord;
@@ -948,6 +1059,19 @@
y := hwRound(Gear^.Y);
if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0)
and (Land[y, x] <> 0) then inc(Gear^.Damage);
+ // let's interrupt before a collision to give portals a chance to catch the bullet
+ if (Gear^.Damage = 1) and (Gear^.Tag = 0) and (Land[y, x] > 255) then
+ begin
+ Gear^.Tag := 1;
+ Gear^.Damage := 0;
+ Gear^.X := Gear^.X - Gear^.dX;
+ Gear^.Y := Gear^.Y - Gear^.dY;
+ CheckGearDrowning(Gear);
+ break;
+ end
+ else
+ Gear^.Tag := 0;
+
if Gear^.Damage > 5 then
if Gear^.AmmoType = amDEagle then
AmmoShove(Gear, 7, 20)
@@ -993,31 +1117,7 @@
end;
end;
- if Gear^.PortalCounter = 0 then
- begin
- // Bullet trail
- VGear := AddVisualGear(
- hwround(CurrentHedgehog^.Gear^.X) + GetLaunchX(CurrentHedgehog^.CurAmmoType, hwSign(CurrentHedgehog^.Gear^.dX), CurrentHedgehog^.Gear^.Angle),
- hwround(CurrentHedgehog^.Gear^.Y) + GetLaunchY(CurrentHedgehog^.CurAmmoType, CurrentHedgehog^.Gear^.Angle),
- vgtLineTrail
- );
- if VGear <> nil then
- begin
- // http://mantis.freepascal.org/view.php?id=17714 hits again
- VGear^.dX := Gear^.X.QWordValue / SignAs(_1,_1).QWordValue;
- VGear^.dY := Gear^.Y.QWordValue / SignAs(_1,_1).QWordValue;
-
- // reached edge of land. assume infinite beam. Extend it way out past camera
- if (hwRound(Gear^.X) and LAND_WIDTH_MASK <> 0)
- or (hwRound(Gear^.Y) and LAND_HEIGHT_MASK <> 0) then
- begin
- VGear^.dX := VGear^.dX + (CurrentHedgehog^.Gear^.dX * LAND_WIDTH).QWordValue / SignAs(_1,_1).QWordValue;
- VGear^.dY := VGear^.dY + (CurrentHedgehog^.Gear^.dY * LAND_WIDTH).QWordValue / SignAs(_1,_1).QWordValue;
- end;
-
- VGear^.Timer := 200;
- end
- end;
+ spawnBulletTrail(Gear);
Gear^.doStep := @doStepShotIdle
end;
end;
@@ -1025,9 +1125,9 @@
procedure doStepDEagleShot(Gear: PGear);
begin
PlaySound(sndGun);
- // add 2 initial steps to avoid problem with ammoshove related to calculation of radius + 1 radius as gear widths
- Gear^.X := Gear^.X + Gear^.dX * 2;
- Gear^.Y := Gear^.Y + Gear^.dY * 2;
+ // add 3 initial steps to avoid problem with ammoshove related to calculation of radius + 1 radius as gear widths, and also just plain old weird angles
+ Gear^.X := Gear^.X + Gear^.dX * 3;
+ Gear^.Y := Gear^.Y + Gear^.dY * 3;
Gear^.doStep := @doStepBulletWork
end;
@@ -1061,9 +1161,9 @@
Gear^.dX := SignAs(AngleSin(HHGear^.Angle), HHGear^.dX) * _0_5;
Gear^.dY := -AngleCos(HHGear^.Angle) * _0_5;
PlaySound(sndGun);
- // add an initial step to avoid problem with ammoshove related to calculation of radius + 1 radius as gear widths
- Gear^.X := Gear^.X + Gear^.dX;
- Gear^.Y := Gear^.Y + Gear^.dY;
+ // add 3 initial steps to avoid problem with ammoshove related to calculation of radius + 1 radius as gear widths, and also just weird angles
+ Gear^.X := Gear^.X + Gear^.dX * 3;
+ Gear^.Y := Gear^.Y + Gear^.dY * 3;
Gear^.doStep := @doStepBulletWork;
end
else
@@ -1169,7 +1269,7 @@
end;
SetAllHHToActive;
end;
- if TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) <> 0 then
begin
Gear^.dY := _0;
SetLittle(HHGear^.dX);
@@ -1338,7 +1438,7 @@
HHGear := Gear^.Hedgehog^.Gear;
if ((HHGear^.State and gstHHDriven) = 0)
or (CheckGearDrowning(HHGear))
- or TestCollisionYwithGear(HHGear, 1) then
+ or (TestCollisionYwithGear(HHGear, 1) <> 0) then
begin
DeleteGear(Gear);
isCursorVisible := false;
@@ -1350,7 +1450,7 @@
if TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then SetLittle(HHGear^.dX);
- if HHGear^.dY.isNegative and TestCollisionYwithGear(HHGear, -1) then HHGear^.dY := _0;
+ if HHGear^.dY.isNegative and (TestCollisionYwithGear(HHGear, -1) <> 0) then HHGear^.dY := _0;
HHGear^.X := HHGear^.X + HHGear^.dX;
HHGear^.Y := HHGear^.Y + HHGear^.dY;
HHGear^.dY := HHGear^.dY + cGravity;
@@ -1376,7 +1476,7 @@
var
HHGear: PGear;
len, tx, ty, nx, ny, ropeDx, ropeDy, mdX, mdY: hwFloat;
- lx, ly: LongInt;
+ lx, ly, cd: LongInt;
haveCollision,
haveDivided: boolean;
@@ -1413,20 +1513,36 @@
exit
end;
- if (Gear^.Message and gmLeft <> 0) then HHGear^.dX := HHGear^.dX - _0_0002
- else
- if (Gear^.Message and gmRight <> 0) then HHGear^.dX := HHGear^.dX + _0_0002;
-
- if not TestCollisionYwithGear(HHGear, 1) then
- begin
- HHGear^.dY := HHGear^.dY + cGravity;
- if (GameFlags and gfMoreWind) <> 0 then HHGear^.dX := HHGear^.dX + cWindSpeed / HHGear^.Density;
- end;
+ if (Gear^.Message and gmLeft <> 0) and not TestCollisionXwithGear(HHGear, -1) then
+ HHGear^.dX := HHGear^.dX - _0_0002;
+
+ if (Gear^.Message and gmRight <> 0) and not TestCollisionXwithGear(HHGear, 1) then
+ HHGear^.dX := HHGear^.dX + _0_0002;
// vector between hedgehog and rope attaching point
ropeDx := HHGear^.X - Gear^.X;
ropeDy := HHGear^.Y - Gear^.Y;
+ if TestCollisionYwithGear(HHGear, 1) = 0 then
+ begin
+
+ // depending on the rope vector we know which X-side to check for collision
+ // in order to find out if the hog can still be moved by gravity
+ if ropeDx.isNegative = RopeDy.IsNegative then
+ cd:= -1
+ else
+ cd:= 1;
+
+ // apply gravity if there is no obstacle
+ if not TestCollisionXwithGear(HHGear, cd) then
+ HHGear^.dY := HHGear^.dY + cGravity;
+
+ if (GameFlags and gfMoreWind) <> 0 then
+ // apply wind if there's no obstacle
+ if not TestCollisionXwithGear(HHGear, hwSign(cWindSpeed)) then
+ HHGear^.dX := HHGear^.dX + cWindSpeed / HHGear^.Density;
+ end;
+
mdX := ropeDx + HHGear^.dX;
mdY := ropeDy + HHGear^.dY;
len := _1 / Distance(mdX, mdY);
@@ -1444,12 +1560,12 @@
if ((Gear^.Message and gmDown) <> 0) and (Gear^.Elasticity < Gear^.Friction) then
if not (TestCollisionXwithGear(HHGear, hwSign(ropeDx))
- or TestCollisionYwithGear(HHGear, hwSign(ropeDy))) then
+ or (TestCollisionYwithGear(HHGear, hwSign(ropeDy)) <> 0)) then
Gear^.Elasticity := Gear^.Elasticity + _0_3;
if ((Gear^.Message and gmUp) <> 0) and (Gear^.Elasticity > _30) then
if not (TestCollisionXwithGear(HHGear, -hwSign(ropeDx))
- or TestCollisionYwithGear(HHGear, -hwSign(ropeDy))) then
+ or (TestCollisionYwithGear(HHGear, -hwSign(ropeDy)) <> 0)) then
Gear^.Elasticity := Gear^.Elasticity - _0_3;
HHGear^.X := Gear^.X + mdX * Gear^.Elasticity;
@@ -1541,7 +1657,7 @@
HHGear^.dX := -_0_6 * HHGear^.dX;
haveCollision := true
end;
- if TestCollisionYwithGear(HHGear, hwSign(HHGear^.dY)) then
+ if TestCollisionYwithGear(HHGear, hwSign(HHGear^.dY)) <> 0 then
begin
HHGear^.dY := -_0_6 * HHGear^.dY;
haveCollision := true
@@ -1643,12 +1759,12 @@
if (HHGear^.State and gstMoving) <> 0 then
begin
if TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then SetLittle(HHGear^.dX);
- if HHGear^.dY.isNegative and TestCollisionYwithGear(HHGear, -1) then HHGear^.dY := _0;
+ if HHGear^.dY.isNegative and (TestCollisionYwithGear(HHGear, -1) <> 0) then HHGear^.dY := _0;
HHGear^.X := HHGear^.X + HHGear^.dX;
Gear^.X := Gear^.X + HHGear^.dX;
- if TestCollisionYwithGear(HHGear, 1) then
+ if TestCollisionYwithGear(HHGear, 1) <> 0 then
begin
CheckHHDamage(HHGear);
HHGear^.dY := _0
@@ -1756,11 +1872,11 @@
doStepFallingGear(Gear);
if (Gear^.Health = 0) then
begin
- if not Gear^.dY.isNegative and (Gear^.dY > _0_2) and TestCollisionYwithGear(Gear, 1) then
+ if not Gear^.dY.isNegative and (Gear^.dY > _0_2) and (TestCollisionYwithGear(Gear, 1) <> 0) then
inc(Gear^.Damage, hwRound(Gear^.dY * _70))
else if not Gear^.dX.isNegative and (Gear^.dX > _0_2) and TestCollisionXwithGear(Gear, 1) then
inc(Gear^.Damage, hwRound(Gear^.dX * _70))
- else if Gear^.dY.isNegative and (Gear^.dY < -_0_2) and TestCollisionYwithGear(Gear, -1) then
+ else if Gear^.dY.isNegative and (Gear^.dY < -_0_2) and (TestCollisionYwithGear(Gear, -1) <> 0) then
inc(Gear^.Damage, hwRound(Gear^.dY * -_70))
else if Gear^.dX.isNegative and (Gear^.dX < -_0_2) and TestCollisionXwithGear(Gear, -1) then
inc(Gear^.Damage, hwRound(Gear^.dX * -_70));
@@ -1820,7 +1936,7 @@
procedure doStepSMine(Gear: PGear);
begin
// TODO: do real calculation?
- if TestCollisionXwithGear(Gear, 2) or TestCollisionYwithGear(Gear, -2) or TestCollisionXwithGear(Gear, -2) or TestCollisionYwithGear(Gear, 2) then
+ if TestCollisionXwithGear(Gear, 2) or (TestCollisionYwithGear(Gear, -2) <> 0) or TestCollisionXwithGear(Gear, -2) or (TestCollisionYwithGear(Gear, 2) <> 0) then
begin
if (hwAbs(Gear^.dX) > _0) or (hwAbs(Gear^.dY) > _0) then
begin
@@ -1892,13 +2008,13 @@
i: LongInt;
particle: PVisualGear;
begin
- if (Gear^.dY.QWordValue = 0) and (Gear^.dY.QWordValue = 0) and not TestCollisionYwithGear(Gear, 1) then SetLittle(Gear^.dY);
+ if (Gear^.dY.QWordValue = 0) and (Gear^.dY.QWordValue = 0) and (TestCollisionYwithGear(Gear, 1) = 0) then SetLittle(Gear^.dY);
Gear^.State := Gear^.State or gstAnimation;
if ((Gear^.dX.QWordValue <> 0) or (Gear^.dY.QWordValue <> 0)) then
begin
DeleteCI(Gear);
AllInactive := false;
- if not Gear^.dY.isNegative and (Gear^.dY > _0_2) and TestCollisionYwithGear(Gear, 1) then
+ if not Gear^.dY.isNegative and (Gear^.dY > _0_2) and (TestCollisionYwithGear(Gear, 1) <> 0) then
begin
Gear^.State := Gear^.State or gsttmpFlag;
inc(Gear^.Damage, hwRound(Gear^.dY * _70));
@@ -1912,7 +2028,7 @@
else if not Gear^.dX.isNegative and (Gear^.dX > _0_2) and TestCollisionXwithGear(Gear, 1)
then
inc(Gear^.Damage, hwRound(Gear^.dX * _70))
- else if Gear^.dY.isNegative and (Gear^.dY < -_0_2) and TestCollisionYwithGear(Gear, -1)
+ else if Gear^.dY.isNegative and (Gear^.dY < -_0_2) and (TestCollisionYwithGear(Gear, -1) <> 0)
then
inc(Gear^.Damage, hwRound(Gear^.dY * -_70))
else if Gear^.dX.isNegative and (Gear^.dX < -_0_2) and TestCollisionXwithGear(Gear, -1)
@@ -1945,7 +2061,7 @@
if Gear^.dX.QWordValue = 0 then AddGearCI(Gear)
end; *)
- if not Gear^.dY.isNegative and (Gear^.dY < _0_001) and TestCollisionYwithGear(Gear, 1) then Gear
+ if not Gear^.dY.isNegative and (Gear^.dY < _0_001) and (TestCollisionYwithGear(Gear, 1) <> 0) then Gear
^.dY := _0;
if hwAbs(Gear^.dX) < _0_001 then Gear^.dX := _0;
@@ -2029,14 +2145,14 @@
exit
end;
- if (Gear^.dY.QWordValue <> 0) or (not TestCollisionYwithGear(Gear, 1)) then
+ if (Gear^.dY.QWordValue <> 0) or (TestCollisionYwithGear(Gear, 1) = 0) then
begin
AllInactive := false;
Gear^.dY := Gear^.dY + cGravity;
Gear^.Y := Gear^.Y + Gear^.dY;
if (not Gear^.dY.isNegative) and (Gear^.dY > _0_001) then SetAllHHToActive;
- if (Gear^.dY.isNegative) and TestCollisionYwithGear(Gear, -1) then Gear^.dY := _0;
- if (not Gear^.dY.isNegative) and TestCollisionYwithGear(Gear, 1) then
+ if (Gear^.dY.isNegative) and (TestCollisionYwithGear(Gear, -1) <> 0) then Gear^.dY := _0;
+ if (not Gear^.dY.isNegative) and (TestCollisionYwithGear(Gear, 1) <> 0) then
begin
if (Gear^.dY > _0_2) and (k = gtExplosives) then
inc(Gear^.Damage, hwRound(Gear^.dY * _70));
@@ -2142,7 +2258,7 @@
sticky:= (Gear^.State and gsttmpFlag) <> 0;
if not sticky then AllInactive := false;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
AllInactive := false;
@@ -2340,7 +2456,7 @@
inc(Gear^.Timer);
- if TestCollisionYwithGear(HHGear, 1)
+ if (TestCollisionYwithGear(HHGear, 1) <> 0)
or ((HHGear^.State and gstHHDriven) = 0)
or CheckGearDrowning(HHGear)
or ((Gear^.Message and gmAttack) <> 0) then
@@ -2526,7 +2642,7 @@
HHGear^.X := HHGear^.X + HHGear^.dX;
// hedgehog falling to collect cases
HHGear^.dY := HHGear^.dY + cGravity;
- if TestCollisionYwithGear(HHGear, 1)
+ if (TestCollisionYwithGear(HHGear, 1) <> 0)
or CheckGearDrowning(HHGear) then
begin
DeleteGear(Gear);
@@ -2622,7 +2738,7 @@
repeat
CurrentTeam^.CurrHedgehog := Succ(CurrentTeam^.CurrHedgehog) mod (CurrentTeam^.
HedgehogsNumber);
- until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil);
+ until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil) and (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^.Damage = 0);
CurrentHedgehog := @CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog];
@@ -2693,8 +2809,12 @@
var
i: LongWord;
HHGear: PGear;
+ sparkles: PVisualGear;
+ hasWishes: boolean;
begin
AllInactive := false;
+ hasWishes:= ((Gear^.Message and (gmPrecise or gmSwitch)) = (gmPrecise or gmSwitch));
+ if hasWishes then Gear^.AdvBounce:= 1;
HHGear := Gear^.Hedgehog^.Gear;
HHGear^.State := HHGear^.State or gstNoDamage;
@@ -2702,9 +2822,19 @@
Gear^.X := HHGear^.X;
Gear^.Y := HHGear^.Y;
+ if (GameTicks mod 2 = 0) and hasWishes then
+ begin
+ sparkles:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtDust, 1);
+ if sparkles <> nil then
+ begin
+ sparkles^.Tint:= ((random(210)+45) shl 24) or ((random(210)+45) shl 16) or ((random(210)+45) shl 8) or $FF;
+ sparkles^.Angle:= random * 360;
+ end
+ end;
i := 2;
repeat
+
Gear^.X := Gear^.X + HHGear^.dX;
Gear^.Y := Gear^.Y + HHGear^.dY;
HHGear^.X := Gear^.X;
@@ -2721,7 +2851,13 @@
inc(upd);
if upd > 3 then
begin
- if Gear^.Health < 1500 then Gear^.Pos := 2;
+ if Gear^.Health < 1500 then
+ begin
+ if Gear^.AdvBounce <> 0 then
+ Gear^.Pos := 3
+ else
+ Gear^.Pos := 2;
+ end;
AmmoShove(Gear, 30, 40);
@@ -2738,6 +2874,21 @@
if Gear^.Health < Gear^.Damage then
begin
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound);
+ for i:= 0 to 31 do
+ begin
+ sparkles:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot);
+ if sparkles <> nil then
+ with sparkles^ do
+ begin
+ Tint:= ((random(210)+45) shl 24) or ((random(210)+45) shl 16) or ((random(210)+45) shl 8) or $FF;
+ Angle:= random * 360;
+ dx:= 0.001 * (random(200));
+ dy:= 0.001 * (random(200));
+ if random(2) = 0 then dx := -dx;
+ if random(2) = 0 then dy := -dy;
+ FrameTicks:= random(400) + 250
+ end;
+ end;
AfterAttack;
DeleteGear(Gear);
DeleteGear(HHGear);
@@ -2754,11 +2905,11 @@
AllInactive := false;
dec(Gear^.Timer);
if Gear^.Timer = 0 then
- begin
+ begin
Gear^.Pos := 1;
PlaySound(sndKamikaze, Gear^.Hedgehog^.Team^.voicepack);
Gear^.doStep := @doStepKamikazeWork
- end
+ end
end;
procedure doStepKamikaze(Gear: PGear);
@@ -2864,7 +3015,7 @@
yyn := dirs[(LongInt(Gear^.Angle) + 4 + dA) mod 4].y;
if (xx = 0) then
- if TestCollisionYwithGear(Gear, yy) then
+ if TestCollisionYwithGear(Gear, yy) <> 0 then
PrevAngle
else
begin
@@ -2941,13 +3092,12 @@
AllInactive := false;
Gear^.dY := Gear^.dY + cGravity;
- if TestCollisionYwithGear(Gear, 1) then
- Gear^.doStep := @doStepCakeUp
+ if TestCollisionYwithGear(Gear, 1) <> 0 then Gear^.doStep := @doStepCakeUp
else
- begin
+ begin
Gear^.Y := Gear^.Y + Gear^.dY;
if CheckGearDrowning(Gear) then AfterAttack
- end
+ end
end;
procedure doStepCake(Gear: PGear);
@@ -3112,11 +3262,10 @@
t := CheckGearsCollision(Gear);
//fixes drill not exploding when touching HH bug
- if (Gear^.Timer = 0)
- or (t^.Count <> 0)
- or (not TestCollisionYWithGear(Gear, hwSign(Gear^.dY))
- and not TestCollisionXWithGear(Gear, hwSign(Gear^.dX))
- and ((Gear^.State and gsttmpFlag) = 0))
+ if (Gear^.Timer = 0) or (t^.Count <> 0) or
+ ( ((Gear^.State and gsttmpFlag) = 0) and
+ (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0)
+ and not TestCollisionXWithGear(Gear, hwSign(Gear^.dX)))
// CheckLandValue returns true if the type isn't matched
or not CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y), lfIndestructible) then
begin
@@ -3129,7 +3278,7 @@
DeleteGear(Gear);
exit
end
- else if not TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) and not TestCollisionXWithGear(Gear, hwSign(Gear^.dX)) then
+ else if (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0) and not TestCollisionXWithGear(Gear, hwSign(Gear^.dX)) then
begin
StopSound(Gear^.SoundChannel);
Gear^.Tag := 1;
@@ -3483,8 +3632,7 @@
or (cWaterLine + 512 < hwRound(HHGear^.Y))
or (TurnTimeLeft = 0)
// allow brief ground touches - to be fair on this, might need another counter
- or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and TestCollisionYwithGear(
- HHGear, 1))
+ or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and (TestCollisionYwithGear(HHGear, 1) <> 0))
or ((Gear^.Message and gmAttack) <> 0) then
begin
with HHGear^ do
@@ -3608,8 +3756,7 @@
or CheckGearDrowning(HHGear)
or (TurnTimeLeft = 0)
// allow brief ground touches - to be fair on this, might need another counter
- or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and TestCollisionYwithGear(
- HHGear, 1))
+ or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and (TestCollisionYwithGear(HHGear, 1) <> 0))
or ((Gear^.Message and gmAttack) <> 0) then
begin
with HHGear^ do
@@ -3883,12 +4030,20 @@
continue;
end;
+ // draw bullet trail
+ if isbullet then
+ spawnBulletTrail(iterator);
+
// calc gear offset in portal vector direction
ox := (iterator^.X - Gear^.X);
oy := (iterator^.Y - Gear^.Y);
poffs:= (Gear^.dX * ox + Gear^.dY * oy);
- if poffs < _0 then
+ if not isBullet and poffs.isNegative then
+ continue;
+
+ // only port bullets close to the portal
+ if isBullet and not (hwAbs(poffs) < _3) then
continue;
//
@@ -3916,8 +4071,11 @@
// calc gear offset in portal normal vector direction
noffs:= (nx * ox + ny * oy);
+ if isBullet and (hwRound(hwAbs(noffs)) >= Gear^.Radius) then
+ continue;
+
// avoid gravity related loops of not really moving gear
- if not iscake and (Gear^.dY.isNegative) and (conPortal^.dY.isNegative)
+ if not (iscake or isbullet) and (Gear^.dY.isNegative) and (conPortal^.dY.isNegative)
and ((iterator^.dX.QWordValue + iterator^.dY.QWordValue) < _0_08.QWordValue)
and (iterator^.PortalCounter > 0) then
continue;
@@ -4027,16 +4185,28 @@
// Until loops are reliably broken
if iscake then iterator^.PortalCounter:= 33
- else inc(iterator^.PortalCounter);
+ else
+ begin
+ inc(iterator^.PortalCounter);
+ iterator^.State:= iterator^.State and not gstHHHJump
+ end;
if not isbullet and (iterator^.Kind <> gtFlake) then
FollowGear := iterator;
+ // store X/Y values of exit for net bullet trail
+ if isbullet then
+ begin
+ iterator^.Elasticity:= iterator^.X;
+ iterator^.Friction := iterator^.Y;
+ end;
+
// This jiggles gears, to ensure a portal connection just placed under a gear takes effect.
iterator:= GearsList;
while iterator <> nil do
begin
- if iterator^.Kind <> gtPortal then
+ if (iterator^.Kind <> gtPortal) and
+ ((iterator^.Hedgehog <> CurrentHedgehog) or ((iterator^.Message and gmAllStoppable) = 0)) then
begin
iterator^.Active:= true;
if iterator^.dY.QWordValue = _0.QWordValue then iterator^.dY.isNegative:= false;
@@ -4093,7 +4263,7 @@
begin
Gear^.State := Gear^.State or gstCollision;
Gear^.State := Gear^.State and not gstMoving;
- if not calcSlopeTangent(Gear, x, y, tx, ty, 255)
+ if not CalcSlopeTangent(Gear, x, y, tx, ty, 255)
or (DistanceI(tx,ty) < _12) then // reject shots at too irregular terrain
begin
loadNewPortalBall(Gear, true);
@@ -4646,7 +4816,7 @@
i := hwRound(Gear^.X) - HitGear^.Radius + 2;
ei := hwRound(Gear^.X) + HitGear^.Radius - 2;
for j := 1 to 4 do DrawExplosion(i - GetRandom(5), hwRound(Gear^.Y) + 6*j, 3);
- for j := 1 to 4 do DrawExplosion(ei + GetRandom(5), hwRound(Gear^.Y) + 6*j, 3);
+ for j := 1 to 4 do DrawExplosion(ei + LongInt(GetRandom(5)), hwRound(Gear^.Y) + 6*j, 3);
while i <= ei do
begin
for j := 1 to 11 do DrawExplosion(i, hwRound(Gear^.Y) + 3*j, 3);
@@ -4660,7 +4830,7 @@
Gear^.Y := Gear^.Y + _1_9;
end;
end;
- if TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) <> 0 then
begin
Gear^.dY := _0;
SetLittle(HitGear^.dX);
@@ -4735,7 +4905,7 @@
if Gear^.Power < 45 then
begin
inc(Gear^.Power);
- if not TestCollisionYwithGear(hh^.Gear, -1) then hh^.Gear^.Y := hh^.Gear^.Y - _1;
+ if TestCollisionYwithGear(hh^.Gear, -1) = 0 then hh^.Gear^.Y := hh^.Gear^.Y - _1;
end;
graves := GearsNear(Gear^.X, Gear^.Y, gtGrave, Gear^.Radius);
@@ -4936,7 +5106,6 @@
var HH: PHedgehog;
i,j,cnt: LongWord;
begin
-
HH:= Gear^.Hedgehog;
if Gear^.Pos = 2 then
begin
@@ -4945,30 +5114,15 @@
begin
if (HH^.Gear <> nil) and (HH^.Gear^.State and gstInvisible = 0) then
begin
- AfterAttack;
+ AfterAttack;
if Gear = CurAmmoGear then CurAmmoGear := nil;
- DeleteCI(HH^.Gear);
- RemoveGearFromList(HH^.Gear);
- with HH^.Gear^ do
- begin
- Z := cHHZ;
- Active := false;
- State:= State and not (gstHHDriven or gstAttacking or gstAttacked);
- Message := Message and not gmAttack;
- end;
- HH^.GearHidden:= HH^.Gear;
- HH^.Gear:= nil
+ if (HH^.Gear^.Damage = 0) and (HH^.Gear^.Health > 0) and
+ ((Gear^.State and (gstMoving or gstHHDeath or gstHHGone)) = 0) then
+ HideHog(HH)
end
//else if (HH^.Gear <> nil) and (HH^.Gear^.State and gstInvisible <> 0) then
else if (HH^.GearHidden <> nil) then// and (HH^.Gear^.State and gstInvisible <> 0) then
- begin
- HH^.Gear:=HH^.GearHidden;
- HH^.GearHidden:= nil;
- InsertGearToList(HH^.Gear);
- HH^.Gear^.State:= (HH^.Gear^.State and not (gstHHDriven or gstInvisible or gstAttacking)) or gstAttacked;
- AddGearCI(HH^.Gear);
- HH^.Gear^.Active:= true
- end;
+ RestoreHog(HH)
end;
inc(Gear^.Timer);
@@ -4979,7 +5133,20 @@
end
end;
-if (Gear^.Pos = 1) and (GameTicks and $1F = 0) and (Gear^.Power < 255) then inc(Gear^.Power);
+if (Gear^.Pos = 1) and (GameTicks and $1F = 0) and (Gear^.Power < 255) then
+ begin
+ inc(Gear^.Power);
+ if (Gear^.Power = 172) and (HH^.Gear <> nil) and
+ (HH^.Gear^.Damage = 0) and (HH^.Gear^.Health > 0) and
+ ((HH^.Gear^.State and (gstMoving or gstHHDeath or gstHHGone)) = 0) then
+ with HH^.Gear^ do
+ begin
+ State:= State or gstAnimation;
+ Tag:= 2;
+ Timer:= 0;
+ Pos:= 0
+ end
+ end;
if (Gear^.Pos = 3) and (GameTicks and $1F = 0) and (Gear^.Power > 0) then dec(Gear^.Power);
if (Gear^.Pos = 1) and (Gear^.Power = 255) and ((GameTicks mod 2000) = 1000) then Gear^.Pos:= 2;
if (Gear^.Pos = 3) and (Gear^.Power = 0) then
@@ -5036,13 +5203,14 @@
3. Hog is a king
*)
HH:= Gear^.Hedgehog;
+ if HH^.Gear <> nil then
if (HH^.Gear = nil) or (HH^.King) or (SuddenDeathDmg) then
begin
- if HH^.Gear <> nil then
- begin
- HH^.Gear^.Message := HH^.Gear^.Message and not gmAttack;
- HH^.Gear^.State:= HH^.Gear^.State and not gstAttacking;
- end;
+ if HH^.Gear <> nil then
+ begin
+ HH^.Gear^.Message := HH^.Gear^.Message and not gmAttack;
+ HH^.Gear^.State:= HH^.Gear^.State and not gstAttacking;
+ end;
PlaySound(sndDenied);
DeleteGear(gear);
exit
@@ -5056,14 +5224,14 @@
HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear^.Damage) then inc(cnt);
if cnt < 2 then
begin
- if HH^.Gear <> nil then
- begin
- HH^.Gear^.Message := HH^.Gear^.Message and not gmAttack;
- HH^.Gear^.State:= HH^.Gear^.State and not gstAttacking;
- end;
- PlaySound(sndDenied);
- DeleteGear(gear);
- exit
+ if HH^.Gear <> nil then
+ begin
+ HH^.Gear^.Message := HH^.Gear^.Message and not gmAttack;
+ HH^.Gear^.State:= HH^.Gear^.State and not gstAttacking;
+ end;
+ PlaySound(sndDenied);
+ DeleteGear(gear);
+ exit
end;
Gear^.SoundChannel := LoopSound(sndTardis);
Gear^.doStep:= @doStepTardisWarp
--- a/hedgewars/HHHandlers.inc Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/HHHandlers.inc Sat Oct 08 16:54:56 2011 +0200
@@ -53,7 +53,6 @@
HHGear^.Message:= HHGear^.Message and not gmSlot;
ammoidx:= 0;
if ((HHGear^.State and (gstAttacking or gstAttacked)) <> 0) or
- (TargetPoint.X <> NoPointX) or
((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) = 0)) or
((HHGear^.State and gstHHDriven) = 0) then exit;
ChangeAmmo:= true;
@@ -483,15 +482,16 @@
AllInactive:= false;
dec(Gear^.Timer);
if (Gear^.Timer mod frametime) = 0 then inc(Gear^.Pos)
- end else
-if Gear^.Timer = 1 then
+ end
+else if Gear^.Timer = 1 then
begin
Gear^.State:= Gear^.State or gstNoDamage;
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, CurrentHedgehog, EXPLAutoSound);
AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtGrave, 0, _0, _0, 0)^.Hedgehog:= Gear^.Hedgehog;
DeleteGear(Gear);
SetAllToActive
- end else // Gear^.Timer = 0
+ end
+else // Gear^.Timer = 0
begin
AllInactive:= false;
Gear^.Z:= cCurrHHZ;
@@ -638,11 +638,11 @@
begin
Gear^.Message:= Gear^.Message and not gmLJump;
DeleteCI(Gear);
- if not TestCollisionYwithGear(Gear, -1) then
+ if TestCollisionYwithGear(Gear, -1) = 0 then
if not TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - _2 else
if not TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithGear(Gear, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then
begin
Gear^.dY:= -_0_15;
if not cArtillery then Gear^.dX:= SignAs(_0_15, Gear^.dX);
@@ -685,17 +685,17 @@
if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
begin
if not (TestCollisionXwithXYShift(Gear, _0, -6, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithXYShift(Gear, _0, -5, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithXYShift(Gear, _0, -4, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithXYShift(Gear, _0, -3, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
end;
if (not cArtillery) and ((Gear^.Message and gmPrecise) = 0) and (not TestCollisionXwithGear(Gear, hwSign(Gear^.dX))) then
@@ -703,25 +703,25 @@
SetAllHHToActive;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y + _1;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y + _1;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y + _1;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y + _1;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y + _1;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y + _1;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y - _6;
Gear^.dY:= _0;
@@ -758,7 +758,9 @@
////////////////////////////////////////////////////////////////////////////////
procedure doStepHedgehogMoving(Gear: PGear);
var isFalling, isUnderwater: boolean;
+ land: Word;
begin
+land:= 0;
isUnderwater:= cWaterLine < hwRound(Gear^.Y) + Gear^.Radius;
if Gear^.dX.QWordValue > 8160437862 then Gear^.dX.QWordValue:= 8160437862;
if Gear^.dY.QWordValue > 8160437862 then Gear^.dY.QWordValue:= 8160437862;
@@ -775,6 +777,11 @@
begin
if (Gear^.dY.isNegative) and TestCollisionYKick(Gear, -1) then Gear^.dY:= _0;
Gear^.State:= Gear^.State or gstMoving;
+ if (CurrentHedgehog^.Gear = Gear)
+ and (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) > _0_003) then
+ begin
+ FollowGear:= Gear;
+ end;
if isUnderwater then Gear^.dY:= Gear^.dY + cGravity / _2
else
begin
@@ -791,7 +798,8 @@
end
else
begin
- if ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) < _0_55.QWordValue)
+ land:= TestCollisionYwithGear(Gear, 1);
+ if ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) < _0_55.QWordValue) and ((land and lfIce) = 0)
and ((Gear^.State and gstHHJumping) <> 0) then SetLittle(Gear^.dX);
if not Gear^.dY.isNegative then
@@ -805,7 +813,11 @@
Gear^.dY:= _0;
end else Gear^.dY:= Gear^.dY + cGravity;
- if ((Gear^.State and gstMoving) <> 0) then Gear^.dX:= Gear^.dX * Gear^.Friction
+ if ((Gear^.State and gstMoving) <> 0) then
+ begin
+ if land and lfIce <> 0 then Gear^.dX:= Gear^.dX * (_1 - (_1 - Gear^.Friction) / _2)
+ else Gear^.dX:= Gear^.dX * Gear^.Friction;
+ end
end;
if (Gear^.State <> 0) then DeleteCI(Gear);
@@ -868,7 +880,7 @@
if (hwAbs(Gear^.dY) > _0) and (Gear^.FlightTime > 0) and ((GameFlags and gfLowGravity) = 0) then
begin
- inc(Gear^.FlightTime, 1);
+ inc(Gear^.FlightTime);
if Gear^.FlightTime = 3000 then
begin
AddCaption(GetEventString(eidHomerun), cWhiteColor, capgrpMessage);
@@ -877,6 +889,7 @@
end
else
begin
+ uStats.hedgehogFlight(Gear, Gear^.FlightTime);
Gear^.FlightTime:= 0;
end;
@@ -888,11 +901,13 @@
Hedgehog: PHedgehog;
begin
Hedgehog:= HHGear^.Hedgehog;
-if not isInMultiShoot then
- AllInactive:= false
-else
+if isInMultiShoot then
HHGear^.Message:= 0;
+if ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_Utility) <> 0) and isInMultiShoot then
+ AllInactive:= true
+else if not isInMultiShoot then AllInactive:= false;
+
if (TurnTimeLeft = 0) or (HHGear^.Damage > 0) then
begin
if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft;
@@ -1034,22 +1049,24 @@
PrvInactive:= false;
AllInactive:= false;
- if not Gear^.Hedgehog^.Team^.hasGone then
+ if (Gear^.State and gstHHGone) = 0 then
begin
Gear^.Hedgehog^.Effects[hePoisoned] := false;
if Gear^.Hedgehog^.Effects[heResurrectable] then begin
ResurrectHedgehog(Gear);
- end else begin
- Gear^.State:= Gear^.State or gstHHDeath;
+ end else
+ begin
+ Gear^.State:= (Gear^.State or gstHHDeath) and not gstAnimation;
Gear^.doStep:= @doStepHedgehogDead;
// Death message
AddCaption(Format(GetEventString(eidDied), Gear^.Hedgehog^.Name), cWhiteColor, capgrpMessage);
- end;
+ end;
end
else
begin
- Gear^.State:= Gear^.State or gstHHGone;
+ Gear^.State:= Gear^.State and not gstAnimation;
Gear^.doStep:= @doStepHedgehogGone;
+
// Gone message
AddCaption(Format(GetEventString(eidGone), Gear^.Hedgehog^.Name), cWhiteColor, capgrpMessage);
end
@@ -1060,13 +1077,13 @@
if ((Gear^.State and gstWait) = 0) and
(prevState <> Gear^.State) then
begin
- Gear^.State:= gstWait;
+ Gear^.State:= Gear^.State or gstWait;
Gear^.Timer:= 150
end else
begin
if Gear^.Timer = 0 then
begin
- Gear^.State:= 0;
+ Gear^.State:= Gear^.State and not (gstWait or gstLoser or gstWinner or gstAttacked);
Gear^.Active:= false;
AddGearCI(Gear);
exit
@@ -1090,7 +1107,9 @@
else
begin
with Gear^.Hedgehog^ do
- if Team^.hasGone then TeamGoneEffect(Team^);
- doStepHedgehogDriven(Gear)
+ if Team^.hasGone then
+ TeamGoneEffect(Team^)
+ else
+ doStepHedgehogDriven(Gear)
end;
end;
--- a/hedgewars/SDLh.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/SDLh.pas Sat Oct 08 16:54:56 2011 +0200
@@ -228,6 +228,8 @@
SDL_HWPALETTE = $20000000;
SDL_DOUBLEBUF = $40000000;
SDL_FULLSCREEN = $80000000;
+
+ SDL_ALLEVENTS = $FFFFFFFF;
{$ENDIF}
{$IFDEF ENDIAN_LITTLE}
@@ -279,9 +281,6 @@
IMG_INIT_TIF = $00000004;
{* SDL_EventMask type definition *}
-{$IFNDEF SDL13}
- SDL_ALLEVENTS = $FFFFFFFF;
-{$ENDIF}
/////////////////////////////////////////////////////////////////
/////////////////////// TYPE DEFINITIONS ///////////////////////
@@ -776,6 +775,7 @@
function SDL_CreateRenderer(window: PSDL_Window; index, flags: LongInt): PSDL_Renderer; cdecl; external SDLLibName;
function SDL_DestroyWindow(window: PSDL_Window): LongInt; cdecl; external SDLLibName;
function SDL_DestroyRenderer(renderer: PSDL_Renderer): LongInt; cdecl; external SDLLibName;
+procedure SDL_SetWindowSize(window: PSDL_Window; w, h: LongInt); cdecl; external SDLLibName;
function SDL_GL_CreateContext(window: PSDL_Window): PSDL_GLContext; cdecl; external SDLLibName;
procedure SDL_GL_DeleteContext(context: PSDL_GLContext); cdecl; external SDLLibName;
@@ -804,7 +804,7 @@
function SDL_PeepEvents(event: PSDL_Event; numevents: LongInt; action: SDL_eventaction; minType, maxType: LongInt): LongInt; cdecl; external SDLLibName;
{$ELSE}
-function SDL_PeepEvents(event: PSDL_Event; numevents: LongInt; action: SDL_eventaction; mask: LongInt): LongInt; cdecl; external SDLLibName;
+function SDL_PeepEvents(event: PSDL_Event; numevents: LongInt; action: SDL_eventaction; mask: Longword): LongInt; cdecl; external SDLLibName;
{$ENDIF}
function SDL_GetMouseState(x, y: PLongInt): Byte; cdecl; external SDLLibName;
@@ -871,8 +871,8 @@
procedure TTF_SetFontStyle(font: PTTF_Font; style: LongInt); cdecl; external SDL_TTFLibName;
(* SDL_mixer *)
-function Mix_Init(flags: LongInt): LongInt; cdecl; external SDL_MixerLibName;
-procedure Mix_Quit; cdecl; external SDL_MixerLibName;
+function Mix_Init(flags: LongInt): LongInt; {$IFDEF SDL_MIXER_NEWER}cdecl; external SDL_MixerLibName;{$ENDIF}
+procedure Mix_Quit; {$IFDEF SDL_MIXER_NEWER}cdecl; external SDL_MixerLibName;{$ENDIF}
function Mix_OpenAudio(frequency: LongInt; format: Word; channels: LongInt; chunksize: LongInt): LongInt; cdecl; external SDL_MixerLibName;
procedure Mix_CloseAudio; cdecl; external SDL_MixerLibName;
@@ -903,8 +903,8 @@
function Mix_FadeOutChannel(channel: LongInt; fadems: LongInt): LongInt; cdecl; external SDL_MixerLibName;
(* SDL_image *)
-function IMG_Init(flags: LongInt): LongInt; cdecl; external SDL_ImageLibName;
-procedure IMG_Quit; cdecl; external SDL_ImageLibName;
+function IMG_Init(flags: LongInt): LongInt; {$IFDEF SDL_IMAGE_NEWER}cdecl; external SDL_ImageLibName;{$ENDIF}
+procedure IMG_Quit; {$IFDEF SDL_IMAGE_NEWER}cdecl; external SDL_ImageLibName;{$ENDIF}
function IMG_Load(const _file: PChar): PSDL_Surface; cdecl; external SDL_ImageLibName;
function IMG_Load_RW(rwop: PSDL_RWops; freesrc: LongInt): PSDL_Surface; cdecl; external SDL_ImageLibName;
@@ -963,13 +963,36 @@
function SDL_MustLock(Surface: PSDL_Surface): Boolean;
begin
+ SDL_MustLock:=
{$IFDEF SDL13}
- SDL_MustLock:= ((surface^.flags and SDL_RLEACCEL) <> 0)
+ ((surface^.flags and SDL_RLEACCEL) <> 0)
{$ELSE}
- SDL_MustLock:= ( surface^.offset <> 0 ) or (( surface^.flags and (SDL_HWSURFACE or SDL_ASYNCBLIT or SDL_RLEACCEL)) <> 0)
+ ( surface^.offset <> 0 ) or (( surface^.flags and (SDL_HWSURFACE or SDL_ASYNCBLIT or SDL_RLEACCEL)) <> 0)
{$ENDIF}
end;
+{$IFNDEF SDL_MIXER_NEWER}
+function Mix_Init(flags: LongInt): LongInt;
+begin
+ exit(flags);
+end;
+
+procedure Mix_Quit;
+begin
+end;
+{$ENDIF}
+
+{$IFNDEF SDL_IMAGE_NEWER}
+function IMG_Init(flags: LongInt): LongInt;
+begin
+ exit(flags);
+end;
+
+procedure IMG_Quit;
+begin
+end;
+{$ENDIF}
+
procedure SDLNet_Write16(value: Word; buf: pointer);
begin
PByteArray(buf)^[1]:= value;
--- a/hedgewars/VGSHandlers.inc Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/VGSHandlers.inc Sat Oct 08 16:54:56 2011 +0200
@@ -174,7 +174,10 @@
if Gear^.FrameTicks <= Steps then
DeleteVisualGear(Gear)
else
- dec(Gear^.FrameTicks, Steps)
+ dec(Gear^.FrameTicks, Steps);
+
+if Gear^.FrameTicks < $FF then
+ Gear^.Tint:= (Gear^.Tint and $FFFFFF00) or Gear^.FrameTicks
end;
////////////////////////////////////////////////////////////////////////////////
@@ -587,22 +590,16 @@
////////////////////////////////////////////////////////////////////////////////
procedure doStepBigExplosionWork(Gear: PVisualGear; Steps: Longword);
-//var maxMovement: LongInt;
+var maxMovement: LongInt;
begin
inc(Gear^.Timer, Steps);
-(*
-FIXME - This block desyncs due to the way WorldDx is important for various things network related.
-One possible solution is, instead of using WorldDx, to use straight gl/SDL calls to jitter the screen a bit.
-
-// a comment by unC0Rr: instead of changing WorldDx shake cursor coordinates, that should be safe
-
if (Gear^.Timer and 5) = 0 then
begin
maxMovement := max(1, 13 - ((Gear^.Timer * 15) div 250));
ShakeCamera(maxMovement);
end;
-*)
+
if Gear^.Timer > 250 then DeleteVisualGear(Gear);
end;
@@ -611,6 +608,9 @@
gX,gY: LongInt;
vg: PVisualGear;
begin
+//ScreenFade:= sfFromWhite;
+//ScreenFadeValue:= round(60 * zoom * zoom);
+//ScreenFadeSpeed:= 5;
gX:= round(Gear^.X);
gY:= round(Gear^.Y);
AddVisualGear(gX, gY, vgtSmokeRing);
--- a/hedgewars/hwengine.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/hwengine.pas Sat Oct 08 16:54:56 2011 +0200
@@ -100,6 +100,7 @@
gsExit: begin
isTerminated:= true;
end;
+ gsSuspend: exit;
end;
{$IFDEF SDL13}
@@ -112,9 +113,17 @@
begin
flagMakeCapture:= false;
s:= 'hw_' + FormatDateTime('YYYY-MM-DD_HH-mm-ss', Now()) + inttostr(GameTicks);
- WriteLnToConsole('Saving ' + s + '...');
+
playSound(sndShutter);
- {$IFNDEF IPHONEOS}MakeScreenshot(s);{$ENDIF}
+{$IFNDEF IPHONEOS}
+ if not MakeScreenshot(s) then
+ begin
+ WriteLnToConsole('Screenshot failed.');
+ AddChatString(#5 + 'screen capture failed (lack of memory or write permissions)');
+ end
+ else
+{$ENDIF}
+ WriteLnToConsole('Screenshot saved: ' + s);
end;
end;
@@ -144,21 +153,21 @@
const event: TSDL_Event = ();
{$WARNINGS ON}
var PrevTime, CurrTime: Longword;
+{$IFDEF SDL13}
+ previousGameState: TGameState;
+{$ELSE}
prevFocusState: boolean;
+{$ENDIF}
begin
PrevTime:= SDL_GetTicks;
while isTerminated = false do
begin
SDL_PumpEvents();
- {$IFDEF SDL13}
- while SDL_PeepEvents(@event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) > 0 do
- {$ELSE}
- while SDL_PeepEvents(@event, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0 do
- {$ENDIF}
+ while SDL_PeepEvents(@event, 1, SDL_GETEVENT, {$IFDEF SDL13}SDL_FIRSTEVENT, SDL_LASTEVENT{$ELSE}SDL_ALLEVENTS{$ENDIF}) > 0 do
begin
case event.type_ of
+{$IFDEF SDL13}
SDL_KEYDOWN: if GameState = gsChat then
-{$IFDEF SDL13}
// sdl on iphone supports only ashii keyboards and the unicode field is deprecated in sdl 1.3
KeyPressChat(event.key.keysym.sym);
SDL_WINDOWEVENT:
@@ -166,8 +175,24 @@
begin
cHasFocus:= true;
onFocusStateChanged()
+ end
+ else if event.window.event = SDL_WINDOWEVENT_MINIMIZED then
+ begin
+ previousGameState:= GameState;
+ GameState:= gsSuspend;
+ end
+ else if event.window.event = SDL_WINDOWEVENT_RESTORED then
+ begin
+ GameState:= previousGameState;
+ end
+ else if event.window.event = SDL_WINDOWEVENT_RESIZED then
+ begin
+ cNewScreenWidth:= max(2 * (event.window.data1 div 2), cMinScreenWidth);
+ cNewScreenHeight:= max(2 * (event.window.data2 div 2), cMinScreenHeight);
+ cScreenResizeDelay:= RealTicks+500;
end;
{$ELSE}
+ SDL_KEYDOWN: if GameState = gsChat then
KeyPressChat(event.key.keysym.unicode);
SDL_MOUSEBUTTONDOWN: if event.button.button = SDL_BUTTON_WHEELDOWN then wheelDown:= true;
SDL_MOUSEBUTTONUP: if event.button.button = SDL_BUTTON_WHEELUP then wheelUp:= true;
@@ -180,9 +205,12 @@
onFocusStateChanged()
end;
SDL_VIDEORESIZE: begin
- // using lower values causes widget overlap and video issues
- cNewScreenWidth:= max(event.resize.w, cMinScreenWidth);
- cNewScreenHeight:= max(event.resize.h, cMinScreenHeight);
+ // using lower values than cMinScreenWidth or cMinScreenHeight causes widget overlap and off-screen widget parts
+ // Change by sheepluva:
+ // Let's only use even numbers for custom width/height since I ran into scaling issues with odd width values.
+ // Maybe just fixes the symptom not the actual cause(?), I'm too tired to find out :P
+ cNewScreenWidth:= max(2 * (event.resize.w div 2), cMinScreenWidth);
+ cNewScreenHeight:= max(2 * (event.resize.h div 2), cMinScreenHeight);
cScreenResizeDelay:= RealTicks+500;
end;
{$ENDIF}
@@ -193,6 +221,7 @@
SDL_QUITEV: isTerminated:= true
end; //end case event.type_ of
end; //end while SDL_PollEvent(@event) <> 0 do
+
if (cScreenResizeDelay <> 0) and (cScreenResizeDelay < RealTicks) and ((cNewScreenWidth <> cScreenWidth) or (cNewScreenHeight <> cScreenHeight)) then
begin
cScreenResizeDelay:= 0;
@@ -200,30 +229,27 @@
cScreenHeight:= cNewScreenHeight;
ParseCommand('fullscr '+intToStr(LongInt(cFullScreen)), true);
- WriteLnToConsole('window resize');
+ WriteLnToConsole('window resize: ' + IntToStr(cScreenWidth) + ' x ' + IntToStr(cScreenHeight));
+ ScriptOnScreenResize();
InitCameraBorders()
end;
if isTerminated = false then
- begin
+ begin
CurrTime:= SDL_GetTicks;
if PrevTime + longword(cTimerInterval) <= CurrTime then
- begin
+ begin
DoTimer(CurrTime - PrevTime);
PrevTime:= CurrTime
- end
+ end
else SDL_Delay(1);
IPCCheckSock();
- end;
+ end;
end;
end;
///////////////
-{$IFDEF HWLIBRARY}
-procedure Game(gameArgs: PPChar); cdecl; export;
-{$ELSE}
-procedure Game;
-{$ENDIF}
+procedure Game{$IFDEF HWLIBRARY}(gameArgs: PPChar); cdecl; export{$ENDIF};
var p: TPathType;
s: shortstring;
i: LongInt;
@@ -250,8 +276,8 @@
recordFileName:= gameArgs[10];
cStereoMode:= smNone;
{$ENDIF}
- cMinScreenWidth:= min(cScreenWidth, 480);
- cMinScreenHeight:= min(cScreenHeight, 320);
+ cMinScreenWidth:= min(cScreenWidth, cMinScreenWidth);
+ cMinScreenHeight:= min(cScreenHeight, cMinScreenHeight);
cOrigScreenWidth:= cScreenWidth;
cOrigScreenHeight:= cScreenHeight;
--- a/hedgewars/uAIAmmoTests.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uAIAmmoTests.pas Sat Oct 08 16:54:56 2011 +0200
@@ -105,7 +105,7 @@
(proc: @TestHammer; flags: 0), // amHammer
(proc: nil; flags: 0), // amResurrector
(proc: nil; flags: 0), // amDrillStrike
- (proc: @TestSnowball; flags: 0), // amSnowball
+ (proc: nil; flags: 0), // amSnowball
(proc: nil; flags: 0), // amTardis
(proc: nil; flags: 0), // amStructure
(proc: nil; flags: 0) // amLandGun
--- a/hedgewars/uAIMisc.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uAIMisc.pas Sat Oct 08 16:54:56 2011 +0200
@@ -80,7 +80,7 @@
procedure FillTargets;
var i, t: Longword;
- f, e: Longword;
+ f, e: LongInt;
begin
Targets.Count:= 0;
f:= 0;
@@ -112,7 +112,7 @@
end;
if e > f then friendlyfactor:= 300 + (e - f) * 30
-else friendlyfactor:= max(30, 300 - f * 80 div e)
+else friendlyfactor:= max(30, 300 - f * 80 div max(1,e))
end;
procedure FillBonuses(isAfterAttack: boolean; filter: TGearsType);
@@ -233,7 +233,7 @@
with Targets.ar[i] do
begin
dmg:= hwRound(_0_01 * cDamageModifier
- * min((r + cHHRadius div 2 - DistanceI(Point.x - x, Point.y - y).Round) div 2, r) * cDamagePercent);
+ * min((r + cHHRadius div 2 - LongInt(DistanceI(Point.x - x, Point.y - y).Round)) div 2, r) * cDamagePercent);
if dmg > 0 then
begin
@@ -332,18 +332,18 @@
bY:= hwRound(Gear^.Y);
case JumpType of
jmpNone: exit(bRes);
- jmpHJump: if not TestCollisionYwithGear(Gear, -1) then
+ jmpHJump: if TestCollisionYwithGear(Gear, -1) = 0 then
begin
Gear^.dY:= -_0_2;
SetLittle(Gear^.dX);
Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
end else exit(bRes);
jmpLJump: begin
- if not TestCollisionYwithGear(Gear, -1) then
+ if TestCollisionYwithGear(Gear, -1) <> 0 then
if not TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - int2hwFloat(2) else
if not TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithGear(Gear, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then
begin
Gear^.dY:= -_0_15;
Gear^.dX:= SignAs(_0_15, Gear^.dX);
@@ -367,9 +367,9 @@
inc(GoInfo.Ticks);
Gear^.dY:= Gear^.dY + cGravity;
if Gear^.dY > _0_4 then exit(bRes);
- if (Gear^.dY.isNegative)and TestCollisionYwithGear(Gear, -1) then Gear^.dY:= _0;
+ if (Gear^.dY.isNegative)and (TestCollisionYwithGear(Gear, -1) <> 0) then Gear^.dY:= _0;
Gear^.Y:= Gear^.Y + Gear^.dY;
- if (not Gear^.dY.isNegative)and TestCollisionYwithGear(Gear, 1) then
+ if (not Gear^.dY.isNegative)and (TestCollisionYwithGear(Gear, 1) <> 0) then
begin
Gear^.State:= Gear^.State and not (gstMoving or gstHHJumping);
Gear^.dY:= _0;
@@ -417,7 +417,7 @@
end;
Gear^.Y:= Gear^.Y + Gear^.dY;
if hwRound(Gear^.Y) > pY then inc(GoInfo.FallPix);
- if TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) <> 0 then
begin
inc(GoInfo.Ticks, 410);
Gear^.State:= Gear^.State and not (gstMoving or gstHHJumping);
@@ -432,17 +432,17 @@
if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
begin
if not (TestCollisionXwithXYShift(Gear, _0, -6, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithXYShift(Gear, _0, -5, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithXYShift(Gear, _0, -4, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithXYShift(Gear, _0, -3, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
end;
if not TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
@@ -450,25 +450,25 @@
Gear^.X:= Gear^.X + int2hwFloat(hwSign(Gear^.dX));
inc(GoInfo.Ticks, cHHStepTicks)
end;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y + _1;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y + _1;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y + _1;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y + _1;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y + _1;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y + _1;
- if not TestCollisionYwithGear(Gear, 1) then
+ if TestCollisionYwithGear(Gear, 1) = 0 then
begin
Gear^.Y:= Gear^.Y - _6;
Gear^.dY:= _0;
--- a/hedgewars/uAmmos.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uAmmos.pas Sat Oct 08 16:54:56 2011 +0200
@@ -339,7 +339,8 @@
CurWeapon:= GetAmmoEntry(Hedgehog);
if (CurWeapon^.Count = 0) then
- SwitchToFirstLegalAmmo(Hedgehog);
+ SwitchToFirstLegalAmmo(Hedgehog)
+ else if CurWeapon^.AmmoType = amNothing then Hedgehog.CurAmmoType:= amNothing;
CurWeapon:= GetAmmoEntry(Hedgehog);
--- a/hedgewars/uCollisions.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uCollisions.pas Sat Oct 08 16:54:56 2011 +0200
@@ -39,7 +39,7 @@
function CheckGearsCollision(Gear: PGear): PGearArray;
function TestCollisionXwithGear(Gear: PGear; Dir: LongInt): boolean;
-function TestCollisionYwithGear(Gear: PGear; Dir: LongInt): boolean;
+function TestCollisionYwithGear(Gear: PGear; Dir: LongInt): Word;
function TestCollisionXKick(Gear: PGear; Dir: LongInt): boolean;
function TestCollisionYKick(Gear: PGear; Dir: LongInt): boolean;
@@ -50,7 +50,8 @@
function TestCollisionXwithXYShift(Gear: PGear; ShiftX: hwFloat; ShiftY: LongInt; Dir: LongInt; withGear: boolean = true): boolean;
function TestCollisionYwithXYShift(Gear: PGear; ShiftX, ShiftY: LongInt; Dir: LongInt; withGear: boolean = true): boolean;
-function calcSlopeTangent(Gear: PGear; collisionX, collisionY: LongInt; var outDeltaX, outDeltaY: LongInt; TestWord: LongWord): Boolean;
+function TestRectancleForObstacle(x1, y1, x2, y2: LongInt; landOnly: boolean): boolean;
+function CalcSlopeTangent(Gear: PGear; collisionX, collisionY: LongInt; var outDeltaX, outDeltaY: LongInt; TestWord: LongWord): Boolean;
implementation
uses uConsts, uLandGraphics, uVariables, uDebug, uGears;
@@ -156,7 +157,7 @@
TestCollisionXwithGear:= false
end;
-function TestCollisionYwithGear(Gear: PGear; Dir: LongInt): boolean;
+function TestCollisionYwithGear(Gear: PGear; Dir: LongInt): Word;
var x, y, i: LongInt;
TestWord: LongWord;
begin
@@ -180,11 +181,11 @@
i:= x + Gear^.Radius * 2 - 2;
repeat
if (x and LAND_WIDTH_MASK) = 0 then
- if Land[y, x] > TestWord then exit(true);
+ if Land[y, x] > TestWord then exit(Land[y, x]);
inc(x)
until (x > i);
end;
-TestCollisionYwithGear:= false
+TestCollisionYwithGear:= 0
end;
function TestCollisionXKick(Gear: PGear; Dir: LongInt): boolean;
@@ -343,14 +344,48 @@
begin
Gear^.X:= Gear^.X + int2hwFloat(ShiftX);
Gear^.Y:= Gear^.Y + int2hwFloat(ShiftY);
-if withGear then TestCollisionYwithXYShift:= TestCollisionYwithGear(Gear, Dir)
+if withGear then TestCollisionYwithXYShift:= TestCollisionYwithGear(Gear, Dir) <> 0
else TestCollisionYwithXYShift:= TestCollisionY(Gear, Dir);
Gear^.X:= Gear^.X - int2hwFloat(ShiftX);
Gear^.Y:= Gear^.Y - int2hwFloat(ShiftY)
end;
+function TestRectancleForObstacle(x1, y1, x2, y2: LongInt; landOnly: boolean): boolean;
+var x, y: LongInt;
+ TestWord: LongWord;
+begin
+if landOnly then
+ TestWord:= 255
+else
+ TestWord:= 0;
-function calcSlopeTangent(Gear: PGear; collisionX, collisionY: LongInt; var outDeltaX, outDeltaY: LongInt; TestWord: LongWord): boolean;
+if x1 > x2 then
+begin
+ x := x1;
+ x1 := x2;
+ x2 := x;
+end;
+
+if y1 > y2 then
+begin
+ y := y1;
+ y1 := y2;
+ y2 := y;
+end;
+
+if (hasBorder and ((y1 < 0) or (x1 < 0) or (x2 > LAND_WIDTH))) then
+ exit(true);
+
+for y := y1 to y2 do
+ for x := x1 to x2 do
+ if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0)
+ and (Land[y, x] > TestWord) then
+ exit(true);
+
+TestRectancleForObstacle:= false
+end;
+
+function CalcSlopeTangent(Gear: PGear; collisionX, collisionY: LongInt; var outDeltaX, outDeltaY: LongInt; TestWord: LongWord): boolean;
var ldx, ldy, rdx, rdy: LongInt;
i, j, mx, my, li, ri, jfr, jto, tmpo : ShortInt;
tmpx, tmpy: LongWord;
--- a/hedgewars/uCommandHandlers.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uCommandHandlers.pas Sat Oct 08 16:54:56 2011 +0200
@@ -451,11 +451,13 @@
procedure chSetMap(var s: shortstring);
begin
if isDeveloperMode then
-begin
-UserPathz[ptMapCurrent]:= UserPathz[ptMaps] + '/' + s;
-Pathz[ptMapCurrent]:= Pathz[ptMaps] + '/' + s;
-InitStepsFlags:= InitStepsFlags or cifMap
-end
+ begin
+ UserPathz[ptMapCurrent]:= UserPathz[ptMaps] + '/' + s;
+ Pathz[ptMapCurrent]:= Pathz[ptMaps] + '/' + s;
+ InitStepsFlags:= InitStepsFlags or cifMap
+ end;
+
+ScriptLoad(s)
end;
procedure chSetTheme(var s: shortstring);
--- a/hedgewars/uConsts.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uConsts.pas Sat Oct 08 16:54:56 2011 +0200
@@ -89,10 +89,12 @@
// To allow these to layer, going to treat them as masks. The bottom byte is reserved for objects
// TODO - set lfBasic for all solid land, ensure all uses of the flags can handle multiple flag bits
+// lfObject and lfBasic are only to be different *graphically* in all other ways they should be treated the same
lfBasic = $8000; // white
lfIndestructible = $4000; // red
- lfObject = $2000; // no idea
- lfDamaged = $1000; // no idea
+ lfObject = $2000;
+ lfDamaged = $1000; //
+ lfIce = $0800; // blue
cMaxPower = 1500;
cMaxAngle = 2048;
--- a/hedgewars/uGame.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uGame.pas Sat Oct 08 16:54:56 2011 +0200
@@ -72,7 +72,7 @@
SetBinds(CurrentTeam^.Binds);
//CurrentHedgehog^.Gear^.Message:= 0; <- produces bugs with further save restoring and demos
isSoundEnabled:= isSEBackup;
- if isSoundEnabled then playMusic;
+ PlayMusic;
GameType:= gmtLocal;
AddVisualGear(0, 0, vgtTeamHealthSorter);
AddVisualGear(0, 0, vgtSmoothWindBar);
--- a/hedgewars/uGears.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uGears.pas Sat Oct 08 16:54:56 2011 +0200
@@ -43,6 +43,8 @@
function GetAmmo: TAmmoType;
function GetUtility: TAmmoType;
procedure ResurrectHedgehog(gear: PGear);
+procedure HideHog(HH: PHedgehog);
+procedure RestoreHog(HH: PHedgehog);
procedure ProcessGears;
procedure EndTurnCleanup;
procedure ApplyDamage(Gear: PGear; AttackerHog: PHedgehog; Damage: Longword; Source: TDamageSource);
@@ -222,6 +224,7 @@
gear^.SoundChannel:= -1;
gear^.ImpactSound:= sndNone;
gear^.nImpactSounds:= 0;
+gear^.Density:= _1;
// Define ammo association, if any.
gear^.AmmoType:= GearKindAmmoTypeMap[Kind];
if Ammoz[Gear^.AmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0 then gear^.Z:= cHHZ+1
@@ -599,13 +602,16 @@
Gear^.IntersectGear^.IntersectGear:= nil;
end
else if Gear^.Kind = gtHedgehog then
- if (CurAmmoGear <> nil) and (CurrentHedgehog^.Gear = Gear) then
+ (*
+ This behaviour dates back to revision 4, and I accidentally encountered it with TARDIS. I don't think it must apply to any modern weapon, since if it was actually hit, the best the gear could do would be to destroy itself immediately, and you'd still end up with two graves. I believe it should be removed
+ if (CurAmmoGear <> nil) and (CurrentHedgehog^.Gear = Gear) then
begin
+ AttackBar:= 0;
Gear^.Message:= gmDestroy;
CurAmmoGear^.Message:= gmDestroy;
exit
end
- else
+ else*)
begin
if (hwRound(Gear^.Y) >= cWaterLine) then
begin
@@ -618,6 +624,7 @@
team:= Gear^.Hedgehog^.Team;
if CurrentHedgehog^.Gear = Gear then
begin
+ AttackBar:= 0;
FreeActionsList; // to avoid ThinkThread on drawned gear
if ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) <> 0) and (CurrentHedgehog^.MultiShootAttacks > 0) then OnUsedAmmo(CurrentHedgehog^);
end;
@@ -991,7 +998,10 @@
if ((GameTicks and $FFFF) = $FFFF) then
begin
if (not CurrentTeam^.ExtDriven) then
- SendIPCTimeInc;
+ begin
+ SendIPC('#');
+ AddFileLog('hiTicks increment message sent')
+ end;
if (not CurrentTeam^.ExtDriven) or CurrentTeam^.hasGone then
inc(hiTicks) // we do not recieve a message for this
@@ -1231,11 +1241,8 @@
cArtillery:= true;
if not hasBorder and ((Theme = 'Snow') or (Theme = 'Christmas')) then
- begin
for i:= 0 to Pred(vobCount*2) do
AddGear(GetRandom(LAND_WIDTH+1024)-512, LAND_HEIGHT - GetRandom(LAND_HEIGHT div 2), gtFlake, 0, _0, _0, 0);
- //disableLandBack:= true
- end
end;
procedure doMakeExplosion(X, Y, Radius: LongInt; AttackingHog: PHedgehog; Mask: Longword; const Tint: LongWord);
@@ -1480,11 +1487,11 @@
if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
begin
if not (TestCollisionXwithXYShift(Gear, _0, -3, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
if not (TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX))
- or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
+ or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
end;
if (Ammo^.Kind <> gtFlame) or ((Ammo^.State and gsttmpFlag) = 0) then FollowGear:= Gear
@@ -1650,6 +1657,7 @@
procedure ResurrectHedgehog(gear: PGear);
var tempTeam : PTeam;
begin
+ AttackBar:= 0;
gear^.dX := _0;
gear^.dY := _0;
gear^.Damage := 0;
@@ -1747,7 +1755,6 @@
if (t > 0) then
begin
t:= GetRandom(t);
- AddFileLog(inttostr(t)+' --------------');
while t >= 0 do
begin
inc(i);
--- a/hedgewars/uGearsRender.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uGearsRender.pas Sat Oct 08 16:54:56 2011 +0200
@@ -328,7 +328,7 @@
hx:= ox + 8 * sign;
hy:= oy - 2;
aangle:= Gear^.Angle * 180 / cMaxAngle - 90;
- if CurAmmoGear <> nil then
+ if (CurAmmoGear <> nil) and (CurAmmoGear^.Kind <> gtTardis) then
begin
case CurAmmoGear^.Kind of
gtShotgunShot: begin
@@ -886,7 +886,10 @@
gtGrenade: DrawRotated(sprBomb, x, y, 0, Gear^.DirAngle);
gtSnowball: DrawRotated(sprSnowball, x, y, 0, Gear^.DirAngle);
gtGasBomb: DrawRotated(sprCheese, x, y, 0, Gear^.DirAngle);
- gtMolotov: DrawRotated(sprMolotov, x, y, 0, Gear^.DirAngle);
+
+ gtMolotov: if (Gear^.State and gstDrowning) = 0 then
+ DrawRotatedF(sprMolotov, x, y, (RealTicks div 125) mod 8, hwSign(Gear^.dX), Gear^.DirAngle * hwSign(Gear^.dX))
+ else DrawSprite(sprMolotov, x, y, 8);
gtRCPlane: begin
if (Gear^.Tag = -1) then
--- a/hedgewars/uIO.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uIO.pas Sat Oct 08 16:54:56 2011 +0200
@@ -29,7 +29,6 @@
procedure SendIPCXY(cmd: char; X, Y: SmallInt);
procedure SendIPCRaw(p: pointer; len: Longword);
procedure SendIPCAndWaitReply(s: shortstring);
-procedure SendIPCTimeInc;
procedure SendKeepAliveMessage(Lag: Longword);
procedure LoadRecordFromFile(fileName: shortstring);
procedure SendStat(sit: TStatInfoType; s: shortstring);
@@ -246,13 +245,6 @@
SendIPC(s)
end;
-procedure SendIPCTimeInc;
-const timeinc: shortstring = '#';
-begin
-AddFileLog('[IPC out] <time increment>');
-SendIPCRaw(@timeinc, 2)
-end;
-
procedure IPCWaitPongEvent;
begin
isPonged:= false;
@@ -288,13 +280,16 @@
and ((GameTicks = hiTicks shl 16 + headcmd^.loTime)
or (headcmd^.cmd = 's') // for these commands time is not specified
or (headcmd^.cmd = 'h') // seems the hedgewars protocol does not allow remote synced commands
- or (headcmd^.cmd = '#')
+ or (headcmd^.cmd = '#') // must be synced for saves to work
or (headcmd^.cmd = 'b')
or (headcmd^.cmd = 'F')) do
begin
case headcmd^.cmd of
'+': ; // do nothing - it is just an empty packet
- '#': inc(hiTicks);
+ '#': begin
+ AddFileLog('hiTicks increment by remote message');
+ inc(hiTicks);
+ end;
'L': ParseCommand('+left', true);
'l': ParseCommand('-left', true);
'R': ParseCommand('+right', true);
--- a/hedgewars/uLand.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uLand.pas Sat Oct 08 16:54:56 2011 +0200
@@ -1142,34 +1142,50 @@
if tmpsurf = nil then tmpsurf:= LoadImage(Pathz[ptMissionMaps] + '/' + mapName + '/mask', ifAlpha or ifTransparent or ifIgnoreCaps);
end;
- if (tmpsurf <> nil) and (tmpsurf^.w <= LAND_WIDTH) and (tmpsurf^.h <= LAND_HEIGHT) and (tmpsurf^.format^.BytesPerPixel = 4) then
- begin
- cpX:= (LAND_WIDTH - tmpsurf^.w) div 2;
- cpY:= LAND_HEIGHT - tmpsurf^.h;
- if SDL_MustLock(tmpsurf) then
- SDLTry(SDL_LockSurface(tmpsurf) >= 0, true);
+
+if (tmpsurf <> nil) and (tmpsurf^.w <= LAND_WIDTH) and (tmpsurf^.h <= LAND_HEIGHT) and (tmpsurf^.format^.BytesPerPixel = 4) then
+begin
+ disableLandBack:= true;
- p:= tmpsurf^.pixels;
- for y:= 0 to Pred(tmpsurf^.h) do
+ cpX:= (LAND_WIDTH - tmpsurf^.w) div 2;
+ cpY:= LAND_HEIGHT - tmpsurf^.h;
+ if SDL_MustLock(tmpsurf) then
+ SDLTry(SDL_LockSurface(tmpsurf) >= 0, true);
+
+ p:= tmpsurf^.pixels;
+ for y:= 0 to Pred(tmpsurf^.h) do
+ begin
+ for x:= 0 to Pred(tmpsurf^.w) do
begin
- for x:= 0 to Pred(tmpsurf^.w) do
- begin
- if ((AMask and p^[x]) = 0) then // Tiy was having trouble generating transparent black
- Land[cpY + y, cpX + x]:= 0
- else if p^[x] = (AMask or RMask) then
- Land[cpY + y, cpX + x]:= lfIndestructible
- else if p^[x] = $FFFFFFFF then
- Land[cpY + y, cpX + x]:= lfBasic;
- end;
- p:= @(p^[tmpsurf^.pitch div 4]);
+ if ((AMask and p^[x]) = 0) then
+ Land[cpY + y, cpX + x]:= 0
+ else if p^[x] = $FFFFFFFF then
+ Land[cpY + y, cpX + x]:= lfObject
+ else if p^[x] = (AMask or RMask) then
+ Land[cpY + y, cpX + x]:= lfIndestructible
+ else if p^[x] = AMask then
+ begin
+ Land[cpY + y, cpX + x]:= lfBasic;
+ disableLandBack:= false
+ end
+ else if p^[x] = (AMask or BMask) then
+ Land[cpY + y, cpX + x]:= lfObject or lfIce
end;
+ p:= @(p^[tmpsurf^.pitch div 4]);
+ end;
- if SDL_MustLock(tmpsurf) then
- SDL_UnlockSurface(tmpsurf);
- end;
- if (tmpsurf <> nil) then
- SDL_FreeSurface(tmpsurf);
- tmpsurf:= nil;
+ if SDL_MustLock(tmpsurf) then
+ SDL_UnlockSurface(tmpsurf);
+ if not disableLandBack then
+ begin
+ // freed in freeModule() below
+ LandBackSurface:= LoadImage(UserPathz[ptCurrTheme] + '/LandBackTex', ifIgnoreCaps or ifTransparent);
+ if LandBackSurface = nil then LandBackSurface:= LoadImage(Pathz[ptCurrTheme] + '/LandBackTex', ifIgnoreCaps or ifTransparent)
+ end;
+end;
+if (tmpsurf <> nil) then
+ SDL_FreeSurface(tmpsurf);
+tmpsurf:= nil;
end;
procedure LoadMap;
@@ -1229,21 +1245,21 @@
end;
procedure DrawBottomBorder; // broken out from other borders for doing a floor-only map, or possibly updating bottom during SD
-var x, y, w, c: Longword;
+var x, w, c: Longword;
begin
for w:= 0 to 23 do
for x:= leftX to rightX do
begin
- Land[cWaterLine-1 - w, x]:= lfIndestructible;
+ Land[Longword(cWaterLine) - 1 - w, x]:= lfIndestructible;
if (x + w) mod 32 < 16 then
c:= AMask
else
c:= AMask or RMask or GMask; // FF00FFFF
if (cReducedQuality and rqBlurryLand) = 0 then
- LandPixels[cWaterLine-1 - w, x]:= c
+ LandPixels[Longword(cWaterLine) - 1 - w, x]:= c
else
- LandPixels[(cWaterLine-1 - w) div 2, x div 2]:= c
+ LandPixels[(Longword(cWaterLine) - 1 - w) div 2, x div 2]:= c
end
end;
--- a/hedgewars/uLandGraphics.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uLandGraphics.pas Sat Oct 08 16:54:56 2011 +0200
@@ -29,7 +29,7 @@
function addBgColor(OldColor, NewColor: LongWord): LongWord;
function SweepDirty: boolean;
-function Despeckle(X, Y: LongInt; gfxOnly: boolean): LongWord;
+function Despeckle(X, Y: LongInt): Boolean;
procedure Smooth(X, Y: LongInt);
function CheckLandValue(X, Y: LongInt; LandFlag: Word): boolean;
function DrawExplosion(X, Y, Radius: LongInt): Longword;
@@ -47,10 +47,10 @@
function addBgColor(OldColor, NewColor: LongWord): LongWord;
// Factor ranges from 0 to 100% NewColor
var
- oRed, oBlue, oGreen, oAlpha, nRed, nBlue, nGreen, nAlpha: LongWord;
+ oRed, oBlue, oGreen, oAlpha, nRed, nBlue, nGreen, nAlpha: byte;
begin
- oAlpha := (OldColor shr AShift) and $FF;
- nAlpha := (NewColor shr AShift) and $FF;
+ oAlpha := (OldColor shr AShift);
+ nAlpha := (NewColor shr AShift);
// shortcircuit
if (oAlpha = 0) or (nAlpha = $FF) then
begin
@@ -58,18 +58,18 @@
exit
end;
// Get colors
- oRed := (OldColor shr RShift) and $FF;
- oGreen := (OldColor shr GShift) and $FF;
- oBlue := (OldColor shr BShift) and $FF;
+ oRed := (OldColor shr RShift);
+ oGreen := (OldColor shr GShift);
+ oBlue := (OldColor shr BShift);
- nRed := (NewColor shr RShift) and $FF;
- nGreen := (NewColor shr GShift) and $FF;
- nBlue := (NewColor shr BShift) and $FF;
+ nRed := (NewColor shr RShift);
+ nGreen := (NewColor shr GShift);
+ nBlue := (NewColor shr BShift);
// Mix colors
- nRed := min(255,((nRed*nAlpha) div 255) + ((oRed*oAlpha*(255-nAlpha)) div 65025));
- nGreen := min(255,((nGreen*nAlpha) div 255) + ((oGreen*oAlpha*(255-nAlpha)) div 65025));
- nBlue := min(255,((nBlue*nAlpha) div 255) + ((oBlue*oAlpha*(255-nAlpha)) div 65025));
+ nRed := min(255,((nRed*nAlpha) div 255) + ((oRed*oAlpha*byte(255-nAlpha)) div 65025));
+ nGreen := min(255,((nGreen*nAlpha) div 255) + ((oGreen*oAlpha*byte(255-nAlpha)) div 65025));
+ nBlue := min(255,((nBlue*nAlpha) div 255) + ((oBlue*oAlpha*byte(255-nAlpha)) div 65025));
nAlpha := min(255, oAlpha + nAlpha);
addBgColor := (nAlpha shl AShift) or (nRed shl RShift) or (nGreen shl GShift) or (nBlue shl BShift);
@@ -180,7 +180,7 @@
t:= y + dy;
if (t and LAND_HEIGHT_MASK) = 0 then
for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
- if (not isMap and ((Land[t, i] and lfIndestructible) = 0)) or ((Land[t, i] and lfBasic) <> 0) then
+ if ((Land[t, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[t, i] > 255)) then
if (cReducedQuality and rqBlurryLand) = 0 then
LandPixels[t, i]:= 0
else
@@ -189,7 +189,7 @@
t:= y - dy;
if (t and LAND_HEIGHT_MASK) = 0 then
for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
- if (not isMap and ((Land[t, i] and lfIndestructible) = 0)) or ((Land[t, i] and lfBasic) <> 0) then
+ if ((Land[t, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[t, i] > 255)) then
if (cReducedQuality and rqBlurryLand) = 0 then
LandPixels[t, i]:= 0
else
@@ -198,7 +198,7 @@
t:= y + dx;
if (t and LAND_HEIGHT_MASK) = 0 then
for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
- if (not isMap and ((Land[t, i] and lfIndestructible) = 0)) or ((Land[t, i] and lfBasic) <> 0) then
+ if ((Land[t, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[t, i] > 255)) then
if (cReducedQuality and rqBlurryLand) = 0 then
LandPixels[t, i]:= 0
else
@@ -207,7 +207,7 @@
t:= y - dx;
if (t and LAND_HEIGHT_MASK) = 0 then
for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
- if (not isMap and ((Land[t, i] and lfIndestructible) = 0)) or ((Land[t, i] and lfBasic) <> 0) then
+ if ((Land[t, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[t, i] > 255)) then
if (cReducedQuality and rqBlurryLand) = 0 then
LandPixels[t, i]:= 0
else
@@ -223,86 +223,89 @@
t:= y + dy;
if (t and LAND_HEIGHT_MASK) = 0 then
for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
- begin
- if (cReducedQuality and rqBlurryLand) = 0 then
+ if (Land[t, i] and lfIndestructible) = 0 then
begin
- by:= t; bx:= i;
- end
- else
- begin
- by:= t div 2; bx:= i div 2;
+ if (cReducedQuality and rqBlurryLand) = 0 then
+ begin
+ by:= t; bx:= i;
+ end
+ else
+ begin
+ by:= t div 2; bx:= i div 2;
+ end;
+ if ((Land[t, i] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and not disableLandBack then
+ begin
+ inc(cnt);
+ LandPixels[by, bx]:= LandBackPixel(i, t)
+ end
+ else if ((Land[t, i] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
+ LandPixels[by, bx]:= 0
end;
- if ((Land[t, i] and lfBasic) <> 0) and ((LandPixels[by,bx] and AMask) shr AShift = 255) and not disableLandBack then
- begin
- inc(cnt);
- LandPixels[by, bx]:= LandBackPixel(i, t)
- end
- else
- if ((Land[t, i] and lfObject) <> 0) or (disableLandBack and ((Land[t, i] and lfIndestructible) = 0)) or ((LandPixels[by,bx] and AMask) shr AShift < 255) then
- LandPixels[by, bx]:= 0
- end;
t:= y - dy;
if (t and LAND_HEIGHT_MASK) = 0 then
for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
- begin
- if (cReducedQuality and rqBlurryLand) = 0 then
+ if (Land[t, i] and lfIndestructible) = 0 then
begin
- by:= t; bx:= i;
- end
- else
- begin
- by:= t div 2; bx:= i div 2;
+ if (cReducedQuality and rqBlurryLand) = 0 then
+ begin
+ by:= t; bx:= i;
+ end
+ else
+ begin
+ by:= t div 2; bx:= i div 2;
+ end;
+ if ((Land[t, i] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and not disableLandBack then
+ begin
+ inc(cnt);
+ LandPixels[by, bx]:= LandBackPixel(i, t)
+ end
+ else if ((Land[t, i] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
+ LandPixels[by, bx]:= 0
end;
- if ((Land[t, i] and lfBasic) <> 0) and ((LandPixels[by,bx] and AMask) shr AShift = 255) and not disableLandBack then
- begin
- inc(cnt);
- LandPixels[by, bx]:= LandBackPixel(i, t)
- end
- else if ((Land[t, i] and lfObject) <> 0) or (disableLandBack and ((Land[t, i] and lfIndestructible) = 0)) or ((LandPixels[by,bx] and AMask) shr AShift < 255) then
- LandPixels[by, bx]:= 0
- end;
t:= y + dx;
if (t and LAND_HEIGHT_MASK) = 0 then
for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
- begin
- if (cReducedQuality and rqBlurryLand) = 0 then
+ if (Land[t, i] and lfIndestructible) = 0 then
begin
- by:= t; bx:= i;
- end
- else
- begin
- by:= t div 2; bx:= i div 2;
+ if (cReducedQuality and rqBlurryLand) = 0 then
+ begin
+ by:= t; bx:= i;
+ end
+ else
+ begin
+ by:= t div 2; bx:= i div 2;
+ end;
+ if ((Land[t, i] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and not disableLandBack then
+ begin
+ inc(cnt);
+ LandPixels[by, bx]:= LandBackPixel(i, t)
+ end
+ else if ((Land[t, i] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
+ LandPixels[by, bx]:= 0
end;
- if ((Land[t, i] and lfBasic) <> 0) and ((LandPixels[by,bx] and AMask) shr AShift = 255) and not disableLandBack then
- begin
- inc(cnt);
- LandPixels[by, bx]:= LandBackPixel(i, t)
- end
- else if ((Land[t, i] and lfObject) <> 0) or (disableLandBack and ((Land[t, i] and lfIndestructible) = 0)) or ((LandPixels[by,bx] and AMask) shr AShift < 255) then
- LandPixels[by, bx]:= 0
- end;
t:= y - dx;
if (t and LAND_HEIGHT_MASK) = 0 then
for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
- begin
- if (cReducedQuality and rqBlurryLand) = 0 then
+ if (Land[t, i] and lfIndestructible) = 0 then
begin
- by:= t; bx:= i;
- end
- else
- begin
- by:= t div 2; bx:= i div 2;
+ if (cReducedQuality and rqBlurryLand) = 0 then
+ begin
+ by:= t; bx:= i;
+ end
+ else
+ begin
+ by:= t div 2; bx:= i div 2;
+ end;
+ if ((Land[t, i] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and not disableLandBack then
+ begin
+ inc(cnt);
+ LandPixels[by, bx]:= LandBackPixel(i, t)
+ end
+ else if ((Land[t, i] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
+ LandPixels[by, bx]:= 0
end;
- if ((Land[t, i] and lfBasic) <> 0) and ((LandPixels[by,bx] and AMask) shr AShift = 255) and not disableLandBack then
- begin
- inc(cnt);
- LandPixels[by, bx]:= LandBackPixel(i, t)
- end
- else if ((Land[t, i] and lfObject) <> 0) or (disableLandBack and ((Land[t, i] and lfIndestructible) = 0)) or ((LandPixels[by,bx] and AMask) shr AShift < 255) then
- LandPixels[by, bx]:= 0
- end;
FillLandCircleLinesBG:= cnt;
end;
@@ -455,18 +458,21 @@
for ty:= Max(y - Radius, 0) to Min(y + Radius, LAND_HEIGHT) do
for tx:= Max(0, ar^[i].Left - Radius) to Min(LAND_WIDTH, ar^[i].Right + Radius) do
begin
- if (cReducedQuality and rqBlurryLand) = 0 then
- begin
- by:= ty; bx:= tx;
- end
- else
+ if (Land[ty, tx] and lfIndestructible) = 0 then
begin
- by:= ty div 2; bx:= tx div 2;
- end;
- if ((Land[ty, tx] and lfBasic) <> 0) and ((LandPixels[by,bx] and AMask) shr AShift = 255) and not disableLandBack then
- LandPixels[by, bx]:= LandBackPixel(tx, ty)
- else if ((Land[ty, tx] and lfObject) <> 0) or (disableLandBack and ((Land[ty, tx] and lfIndestructible) = 0)) or ((LandPixels[by,bx] and AMask) shr AShift < 255) then
- LandPixels[by, bx]:= 0
+ if (cReducedQuality and rqBlurryLand) = 0 then
+ begin
+ by:= ty; bx:= tx;
+ end
+ else
+ begin
+ by:= ty div 2; bx:= tx div 2;
+ end;
+ if ((Land[ty, tx] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and not disableLandBack then
+ LandPixels[by, bx]:= LandBackPixel(tx, ty)
+ else if ((Land[ty, tx] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
+ LandPixels[by, bx]:= 0
+ end
end;
inc(y, dY)
end;
@@ -528,8 +534,11 @@
(((Land[ty, tx] and lfBasic) <> 0) or
((Land[ty, tx] and lfObject) <> 0)) then
begin
- Land[ty, tx]:= Land[ty, tx] or lfDamaged;
- if despeckle then LandDirty[ty div 32, tx div 32]:= 1;
+ if despeckle then
+ begin
+ Land[ty, tx]:= Land[ty, tx] or lfDamaged;
+ LandDirty[ty div 32, tx div 32]:= 1
+ end;
if (cReducedQuality and rqBlurryLand) = 0 then
LandPixels[ty, tx]:= cExplosionBorderColor
else LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
@@ -579,11 +588,10 @@
begin
by:= ty div 2; bx:= tx div 2;
end;
- if ((Land[ty, tx] and lfBasic) <> 0) and ((LandPixels[by,bx] and AMask) shr AShift = 255) and not disableLandBack then
- LandPixels[by, bx]:= LandBackPixel(tx, ty)
- else if ((Land[ty, tx] and lfObject) <> 0) or (disableLandBack and ((Land[ty, tx] and lfIndestructible) = 0)) or ((LandPixels[by,bx] and AMask) shr AShift < 255) then
+ if ((Land[ty, tx] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and not disableLandBack then
+ LandPixels[by, bx]:= LandBackPixel(tx, ty)
+ else if ((Land[ty, tx] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
LandPixels[by, bx]:= 0;
-
Land[ty, tx]:= 0;
end
end;
@@ -644,7 +652,7 @@
end;
function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace: boolean; indestructible: boolean): boolean;
-var X, Y, bpp, h, w, row, col, numFramesFirstCol: LongInt;
+var X, Y, bpp, h, w, row, col, gx, gy, numFramesFirstCol: LongInt;
p: PByteArray;
Image: PSDL_Surface;
begin
@@ -699,14 +707,25 @@
for x:= 0 to Pred(w) do
if PLongword(@(p^[x * 4]))^ <> 0 then
begin
+ if (cReducedQuality and rqBlurryLand) = 0 then
+ begin
+ gX:= cpX + x;
+ gY:= cpY + y;
+ end
+ else
+ begin
+ gX:= (cpX + x) div 2;
+ gY:= (cpY + y) div 2;
+ end;
if indestructible then
Land[cpY + y, cpX + x]:= lfIndestructible
+ else if (LandPixels[gY, gX] and AMask) shr AShift = 255 then // This test assumes lfBasic and lfObject differ only graphically
+ Land[cpY + y, cpX + x]:= lfBasic
else
Land[cpY + y, cpX + x]:= lfObject;
- if (cReducedQuality and rqBlurryLand) = 0 then
- LandPixels[cpY + y, cpX + x]:= PLongword(@(p^[x * 4]))^
- else
- LandPixels[(cpY + y) div 2, (cpX + x) div 2]:= PLongword(@(p^[x * 4]))^
+ // For testing only. Intent is to flag this on objects with masks, or use it for an ice ray gun
+ if (Theme = 'Snow') or (Theme = 'Christmas') then Land[cpY + y, cpX + x]:= Land[cpY + y, cpX + x] or lfIce;
+ LandPixels[gY, gX]:= PLongword(@(p^[x * 4]))^
end;
p:= @(p^[Image^.pitch]);
end;
@@ -721,8 +740,7 @@
UpdateLandTexture(x, w, y, h)
end;
-// was experimenting with applying as damage occurred.
-function Despeckle(X, Y: LongInt; gfxOnly: boolean): LongWord;
+function Despeckle(X, Y: LongInt): boolean;
var nx, ny, i, j, c, xx, yy: LongInt;
pixelsweep: boolean;
begin
@@ -737,8 +755,7 @@
yy:= Y div 2;
end;
pixelsweep:= ((Land[Y, X] and $FF00) = 0) and (LandPixels[yy, xx] <> 0);
-if not pixelsweep and gfxOnly then exit(0);
-if ((Land[Y, X] > 255) and ((Land[Y, X] and lfIndestructible) = 0)) or pixelsweep then
+if (((Land[Y, X] and lfDamaged) <> 0) and ((Land[Y, X] and lfIndestructible) = 0)) or pixelsweep then
begin
c:= 0;
for i:= -1 to 1 do
@@ -761,8 +778,8 @@
else if Land[ny, nx] > 255 then inc(c);
end
end;
- if (c < 2) or
- ((c < 4) and (((Land[Y, X] and lfDamaged) <> 0) or pixelsweep)) then
+
+ if c < 4 then // 0-3 neighbours
begin
if ((Land[Y, X] and lfBasic) <> 0) and not disableLandBack then
LandPixels[yy, xx]:= LandBackPixel(X, Y)
@@ -770,18 +787,17 @@
LandPixels[yy, xx]:= 0;
Land[Y, X]:= 0;
- if not pixelsweep then exit(1)
- else exit(2)
+ if not pixelsweep then exit(true);
end;
end;
-Despeckle:= 0
+Despeckle:= false
end;
procedure Smooth(X, Y: LongInt);
begin
// a bit of AA for explosions
-if (Land[Y, X] = 0) and (Y > topY+1) and
- (Y < LAND_HEIGHT-2) and (X>leftX+1) and (X<rightX-1) then
+if (Land[Y, X] = 0) and (Y > LongInt(topY) + 1) and
+ (Y < LAND_HEIGHT-2) and (X > LongInt(leftX) + 1) and (X < LongInt(rightX) - 1) then
begin
if ((((Land[y, x-1] and lfDamaged) <> 0) and (((Land[y+1,x] and lfDamaged) <> 0)) or ((Land[y-1,x] and lfDamaged) <> 0)) or
(((Land[y, x+1] and lfDamaged) <> 0) and (((Land[y-1,x] and lfDamaged) <> 0) or ((Land[y+1,x] and lfDamaged) <> 0)))) then
@@ -827,8 +843,8 @@
end;
function SweepDirty: boolean;
-var x, y, xx, yy, ty, tx, d: LongInt;
- bRes, updateBlock, resweepCol, resweepGfx, gfxOnly, recheck, firstpass: boolean;
+var x, y, xx, yy, ty, tx: LongInt;
+ bRes, updateBlock, resweep, recheck: boolean;
begin
bRes:= false;
reCheck:= true;
@@ -840,72 +856,74 @@
begin
for x:= 0 to LAND_WIDTH div 32 - 1 do
begin
- if LandDirty[y, x] <> 0 then
+ if LandDirty[y, x] = 1 then
begin
updateBlock:= false;
- resweepCol:= true;
- resweepGfx:= true;
- firstpass:= true;
+ resweep:= true;
ty:= y * 32;
tx:= x * 32;
- while(resweepCol or resweepGfx) do
+ while(resweep) do
begin
- gfxOnly:= resweepGfx and not resweepCol;
- resweepCol:= false;
- resweepGfx:= false;
+ resweep:= false;
for yy:= ty to ty + 31 do
for xx:= tx to tx + 31 do
- begin
- d:= Despeckle(xx, yy, gfxOnly);
- if d <> 0 then
+ if Despeckle(xx, yy) then
begin
bRes:= true;
updateBlock:= true;
- if d = 1 then resweepCol:= true
- else resweepGfx:= true;
- if d = 1 then
- if (yy = ty) and (y > 0) then
- begin
- LandDirty[y-1, x]:= 1;
- recheck:= true;
- end
- else if (yy = ty+31) and (y < LAND_HEIGHT div 32 - 1) then
- begin
- LandDirty[y+1, x]:= 1;
- recheck:= true;
- end;
- if (xx = tx) and (x > 0) then
- begin
- LandDirty[y, x-1]:= 1;
- recheck:= true;
- end
- else if (xx = tx+31) and (x < LAND_WIDTH div 32 - 1) then
- begin
- LandDirty[y, x+1]:= 1;
- recheck:= true;
- end
+ resweep:= true;
+ if (yy = ty) and (y > 0) then
+ begin
+ LandDirty[y-1, x]:= 1;
+ recheck:= true;
+ end
+ else if (yy = ty+31) and (y < LAND_HEIGHT div 32 - 1) then
+ begin
+ LandDirty[y+1, x]:= 1;
+ recheck:= true;
+ end;
+ if (xx = tx) and (x > 0) then
+ begin
+ LandDirty[y, x-1]:= 1;
+ recheck:= true;
+ end
+ else if (xx = tx+31) and (x < LAND_WIDTH div 32 - 1) then
+ begin
+ LandDirty[y, x+1]:= 1;
+ recheck:= true;
+ end
end;
- if firstpass then Smooth(xx,yy);
- end;
- firstpass:= false
end;
if updateBlock then UpdateLandTexture(tx, 32, ty, 32);
- LandDirty[y, x]:= 0;
+ LandDirty[y, x]:= 2;
end;
end;
end;
end;
+for y:= 0 to LAND_HEIGHT div 32 - 1 do
+ for x:= 0 to LAND_WIDTH div 32 - 1 do
+ if LandDirty[y, x] <> 0 then
+ begin
+ LandDirty[y, x]:= 0;
+ ty:= y * 32;
+ tx:= x * 32;
+ for yy:= ty to ty + 31 do
+ for xx:= tx to tx + 31 do
+ Smooth(xx,yy)
+ end;
+
SweepDirty:= bRes;
end;
+
// Return true if outside of land or not the value tested, used right now for some X/Y movement that does not use normal hedgehog movement in GSHandlers.inc
-function CheckLandValue(X, Y: LongInt; LandFlag: Word): boolean;
+function CheckLandValue(X, Y: LongInt; LandFlag: Word): boolean; inline;
begin
CheckLandValue:= ((X and LAND_WIDTH_MASK <> 0) or (Y and LAND_HEIGHT_MASK <> 0)) or ((Land[Y, X] and LandFlag) = 0)
end;
-function LandBackPixel(x, y: LongInt): LongWord;
+function LandBackPixel(x, y: LongInt): LongWord; inline;
var p: PLongWordArray;
begin
if LandBackSurface = nil then LandBackPixel:= 0
--- a/hedgewars/uLandObjects.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uLandObjects.pas Sat Oct 08 16:54:56 2011 +0200
@@ -97,7 +97,11 @@
LandPixels[(cpY + y) div 2, (cpX + x) div 2]:= p^[x];
if ((Land[cpY + y, cpX + x] and $FF00) = 0) and ((p^[x] and AMask) <> 0) then
- Land[cpY + y, cpX + x]:= lfObject
+ begin
+ Land[cpY + y, cpX + x]:= lfObject;
+ // For testing only. Intent is to flag this on objects with masks, or use it for an ice ray gun
+ if (Theme = 'Snow') or (Theme = 'Christmas') then Land[cpY + y, cpX + x]:= Land[cpY + y, cpX + x] or lfIce
+ end;
end;
p:= @(p^[Image^.pitch shr 2])
end;
@@ -373,7 +377,7 @@
f: textfile;
i: LongInt;
ii, t: Longword;
- c1, c2: TSDL_Color;
+ c2: TSDL_Color;
procedure CheckRect(Width, Height, x, y, w, h: LongWord);
begin
--- a/hedgewars/uMisc.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uMisc.pas Sat Oct 08 16:54:56 2011 +0200
@@ -25,14 +25,14 @@
procedure movecursor(dx, dy: LongInt);
function doSurfaceConversion(tmpsurf: PSDL_Surface): PSDL_Surface;
-procedure MakeScreenshot(filename: shortstring);
+function MakeScreenshot(filename: shortstring): boolean;
function GetTeamStatString(p: PTeam): shortstring;
procedure initModule;
procedure freeModule;
implementation
-uses typinfo, sysutils, uVariables;
+uses typinfo, sysutils, uVariables, uUtils;
procedure movecursor(dx, dy: LongInt);
var x, y: LongInt;
@@ -45,10 +45,11 @@
SDL_WarpMouse(x, y);
end;
-
-procedure MakeScreenshot(filename: shortstring);
-var p: Pointer;
- size: Longword;
+// captures and saves the screen. returns true on success.
+function MakeScreenshot(filename: shortstring): Boolean;
+var success: boolean;
+ p: Pointer;
+ size: QWord;
f: file;
// Windows Bitmap Header
head: array[0..53] of Byte = (
@@ -74,9 +75,16 @@
ScreenFadeValue:= sfMax;
ScreenFadeSpeed:= 5;
-size:= cScreenWidth * cScreenHeight * 3;
+size:= toPowerOf2(cScreenWidth) * toPowerOf2(cScreenHeight) * 3;
p:= GetMem(size);
+// memory could not be allocated
+if p = nil then
+begin
+ AddFileLog('Error: Could not allocate memory for screenshot.');
+ exit(false);
+end;
+
// update header information and file name
filename:= UserPathPrefix + '/Screenshots/' + filename + '.bmp';
@@ -102,7 +110,7 @@
//glReadBuffer(GL_FRONT);
glReadPixels(0, 0, cScreenWidth, cScreenHeight, GL_BGR, GL_UNSIGNED_BYTE, p);
-{$I-}
+{$IOCHECKS OFF}
Assign(f, filename);
Rewrite(f, 1);
if IOResult = 0 then
@@ -110,10 +118,18 @@
BlockWrite(f, head, sizeof(head));
BlockWrite(f, p^, size);
Close(f);
+ success:= true;
+ end
+else
+ begin
+ AddFileLog('Error: Could not write to ' + filename);
+ success:= false;
end;
-{$I+}
+{$IOCHECKS ON}
-FreeMem(p)
+FreeMem(p, size);
+
+MakeScreenshot:= success;
end;
// http://www.idevgames.com/forums/thread-5602-post-21860.html#pid21860
--- a/hedgewars/uMobile.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uMobile.pas Sat Oct 08 16:54:56 2011 +0200
@@ -38,7 +38,7 @@
procedure GameLoading; inline;
procedure GameLoaded; inline;
-procedure AmmoUpdate; // don't inline
+procedure AmmoUpdate; // do not inline
procedure NewTurnBeginning; inline;
procedure SaveBegan; inline;
procedure SaveFinished; inline;
@@ -46,6 +46,7 @@
implementation
uses uVariables;
+// this function is just to determine whether we are running on a limited screen device
function isPhone: Boolean; inline;
begin
{$IFDEF IPHONEOS}
@@ -54,12 +55,17 @@
exit(false);
end;
+// this function should make the device vibrate in some way
procedure performRumble; inline;
const kSystemSoundID_Vibrate = $00000FFF;
begin
+ // do not vibrate while synchronising a demo/save
+ if not fastUntilLag then
+ begin
{$IFDEF IPHONEOS}
- AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
+ AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
{$ENDIF}
+ end;
end;
procedure GameLoading; inline;
@@ -76,7 +82,7 @@
{$ENDIF}
end;
-procedure AmmoUpdate; // don't inline
+procedure AmmoUpdate; // do not inline
begin
{$IFDEF IPHONEOS}
if (CurrentTeam = nil) or
--- a/hedgewars/uScript.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uScript.pas Sat Oct 08 16:54:56 2011 +0200
@@ -36,6 +36,7 @@
procedure ScriptLoad(name : shortstring);
procedure ScriptOnGameInit;
+procedure ScriptOnScreenResize();
procedure ScriptCall(fname : shortstring);
function ScriptCall(fname : shortstring; par1: LongInt) : LongInt;
@@ -956,8 +957,12 @@
end
else lua_pushinteger(L, 0)
end
- else LuaError('Lua: Wrong number of parameters passed to GetAmmoCount!');
- lc_getammocount:= 0
+ else
+ begin
+ LuaError('Lua: Wrong number of parameters passed to GetAmmoCount!');
+ lua_pushnil(L)
+ end;
+ lc_getammocount:= 1
end;
function lc_sethealth(L : Plua_State) : LongInt; Cdecl;
@@ -1206,6 +1211,11 @@
lua_pushinteger(L, hwRound(gear^.X));
lua_pushinteger(L, hwRound(gear^.Y))
end
+ else
+ begin
+ lua_pushnil(L);
+ lua_pushnil(L)
+ end;
end;
lc_getgearposition:= 2;
end;
@@ -1502,6 +1512,29 @@
lua_pushinteger(L, ord(CurrentHedgehog^.CurAmmoType));
lc_getcurammotype := 1;
end;
+
+// boolean TestRectForObstacle(x1, y1, x2, y2, landOnly)
+function lc_testrectforobstacle(L : Plua_State) : LongInt; Cdecl;
+var rtn: Boolean;
+begin
+ if lua_gettop(L) <> 5 then
+ begin
+ LuaError('Lua: Wrong number of parameters passed to TestRectForObstacle!');
+ lua_pushnil(L); // return value on stack (nil)
+ end
+ else
+ begin
+ rtn:= TestRectancleForObstacle(
+ lua_tointeger(L, 1),
+ lua_tointeger(L, 2),
+ lua_tointeger(L, 3),
+ lua_tointeger(L, 4),
+ lua_toboolean(L, 5)
+ );
+ lua_pushboolean(L, rtn);
+ end;
+ lc_testrectforobstacle:= 1
+end;
///////////////////
procedure ScriptPrintStack;
@@ -1624,12 +1657,24 @@
ScriptSetInteger('TeamsCount', TeamsCount)
end;
+
+// Update values of screen dimensions and allow script to react to resolution change
+procedure ScriptOnScreenResize();
+begin
+ScriptSetInteger('ScreenHeight', cScreenHeight);
+ScriptSetInteger('ScreenWidth', cScreenWidth);
+ScriptCall('onScreenResize');
+end;
+
+
procedure ScriptLoad(name : shortstring);
var ret : LongInt;
s : shortstring;
begin
s:= UserPathz[ptData] + '/' + name;
if not FileExists(s) then s:= Pathz[ptData] + '/' + name;
+if not FileExists(s) then exit;
+
ret:= luaL_loadfile(luaState, Str2PChar(s));
if ret <> 0 then
begin
@@ -1749,7 +1794,8 @@
procedure ScriptSetAmmo(ammo : TAmmoType; count, propability, delay, reinforcement: Byte);
begin
-if (ord(ammo) < 1) or (count > 9) or (count < 0) or (propability < 0) or (propability > 8) or (delay < 0) or (delay > 9) or (reinforcement < 0) or (reinforcement > 8) then
+//if (ord(ammo) < 1) or (count > 9) or (count < 0) or (propability < 0) or (propability > 8) or (delay < 0) or (delay > 9) or (reinforcement < 0) or (reinforcement > 8) then
+if (ord(ammo) < 1) or (count > 9) or (propability > 8) or (delay > 9) or (reinforcement > 8) then
exit;
ScriptAmmoLoadout[ord(ammo)]:= inttostr(count)[1];
ScriptAmmoProbability[ord(ammo)]:= inttostr(propability)[1];
@@ -1798,7 +1844,6 @@
// import some variables
ScriptSetInteger('LAND_WIDTH', LAND_WIDTH);
ScriptSetInteger('LAND_HEIGHT', LAND_HEIGHT);
-
ScriptSetString('L', cLocale);
// import game flags
@@ -1972,6 +2017,7 @@
lua_register(luaState, 'SetHogHat', @lc_sethoghat);
lua_register(luaState, 'PlaceGirder', @lc_placegirder);
lua_register(luaState, 'GetCurAmmoType', @lc_getcurammotype);
+lua_register(luaState, 'TestRectForObstacle', @lc_testrectforobstacle);
ScriptClearStack; // just to be sure stack is empty
--- a/hedgewars/uSound.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uSound.pas Sat Oct 08 16:54:56 2011 +0200
@@ -157,11 +157,9 @@
if isSoundEnabled then
isSoundEnabled:= Mix_OpenAudio(44100, $8010, channels, 1024) = 0;
-{$IFDEF SDL_MIXER_NEWER}
WriteToConsole('Init SDL_mixer... ');
SDLTry(Mix_Init(MIX_INIT_OGG) <> 0, true);
WriteLnToConsole(msgOK);
-{$ENDIF}
if isSoundEnabled then
WriteLnToConsole(msgOK)
@@ -191,11 +189,9 @@
if Mus <> nil then
Mix_FreeMusic(Mus);
-{$IFDEF SDL_MIXER_NEWER}
// make sure all instances of sdl_mixer are unloaded before continuing
while Mix_Init(0) <> 0 do
Mix_Quit();
-{$ENDIF}
Mix_CloseAudio();
end;
@@ -290,10 +286,12 @@
procedure AddVoice(snd: TSound; voicepack: PVoicepack);
var i : LongInt;
begin
- if (not isSoundEnabled) or fastUntilLag then exit;
+ if (not isSoundEnabled) or fastUntilLag or ((LastVoice.snd = snd) and (LastVoice.voicepack = voicepack)) then exit;
i:= 0;
while (i<8) and (VoiceList[i].snd <> sndNone) do inc(i);
+ // skip playing same sound for same hog twice
+ if (i>0) and (VoiceList[i-1].snd = snd) and (VoiceList[i-1].voicepack = voicepack) then exit;
VoiceList[i].snd:= snd;
VoiceList[i].voicepack:= voicepack;
end;
--- a/hedgewars/uStats.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uStats.pas Sat Oct 08 16:54:56 2011 +0200
@@ -33,6 +33,7 @@
procedure Skipped;
procedure TurnReaction;
procedure SendStats;
+procedure hedgehogFlight(Gear: PGear; time: Longword);
implementation
uses uSound, uLocale, uVariables, uUtils, uIO, uCaptions, uDebug, uMisc;
@@ -175,6 +176,17 @@
AmmoDamagingUsed:= AmmoDamagingUsed or Ammoz[am].isDamaging
end;
+procedure hedgehogFlight(Gear: PGear; time: Longword);
+begin
+if time > 4000 then
+ begin
+ writeln('FLIGHT');
+ writeln(Gear^.Hedgehog^.Team^.TeamName);
+ writeln(time);
+ writeln;
+ end
+end;
+
procedure SendStats;
var i, t: LongInt;
msd, msk: Longword; msdhh, mskhh: PHedgehog;
@@ -270,9 +282,10 @@
writeln('WINNERS');
for t:= 0 to winnersClan^.TeamsNumber - 1 do
writeln(winnersClan^.Teams[t]^.TeamName);
- writeln;
end else
writeln('DRAW');
+
+writeln;
end;
procedure initModule;
--- a/hedgewars/uStore.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uStore.pas Sat Oct 08 16:54:56 2011 +0200
@@ -399,10 +399,7 @@
end;
AddProgress;
-
-{$IFDEF SDL_IMAGE_NEWER}
IMG_Quit();
-{$ENDIF}
end;
procedure StoreRelease(reload: boolean);
@@ -587,7 +584,11 @@
procedure SetupOpenGL;
//var vendor: shortstring = '';
+var buf: array[byte] of char;
begin
+ buf[0]:= char(0); // avoid compiler hint
+ AddFileLog('Setting up OpenGL (using driver: ' + shortstring(SDL_VideoDriverName(buf, sizeof(buf))) + ')');
+
{$IFDEF SDL13}
// this function creates an opengles1.1 context by default on mobile devices
// use SDL_GL_SetAttribute to change this behaviour
@@ -945,43 +946,36 @@
procedure chFullScr(var s: shortstring);
var flags: Longword = 0;
- ico: PSDL_Surface;
- buf: array[byte] of char;
- reinit: boolean;
+ reinit: boolean = false;
+ {$IFNDEF DARWIN}ico: PSDL_Surface;{$ENDIF}
{$IFDEF SDL13}x, y: LongInt;{$ENDIF}
begin
if Length(s) = 0 then cFullScreen:= not cFullScreen
else cFullScreen:= s = '1';
- buf[0]:= char(0); // avoid compiler hint
AddFileLog('Preparing to change video parameters...');
-
- reinit:= false;
+{$IFNDEF IPHONEOS}
if SDLPrimSurface = nil then
begin
// set window title
SDL_WM_SetCaption('Hedgewars', nil);
-{$IFDEF SDL_IMAGE_NEWER}
WriteToConsole('Init SDL_image... ');
SDLTry(IMG_Init(IMG_INIT_PNG) <> 0, true);
WriteLnToConsole(msgOK);
-{$ENDIF}
// load engine icon
-{$IFDEF DARWIN}
- ico:= LoadImage(UserPathz[ptGraphics] + '/hwengine_mac', ifIgnoreCaps);
- if ico = nil then ico:= LoadImage(Pathz[ptGraphics] + '/hwengine_mac', ifIgnoreCaps);
-{$ELSE}
+{$IFNDEF DARWIN}
ico:= LoadImage(UserPathz[ptGraphics] + '/hwengine', ifIgnoreCaps);
if ico = nil then ico:= LoadImage(Pathz[ptGraphics] + '/hwengine', ifIgnoreCaps);
-{$ENDIF}
if ico <> nil then
begin
SDL_WM_SetIcon(ico, 0);
SDL_FreeSurface(ico)
end;
+{$ENDIF}
end
else
begin
+ SetScale(cDefaultZoomLevel);
{$IF DEFINED(DARWIN) OR DEFINED(WIN32)}
reinit:= true;
{$ENDIF}
@@ -989,9 +983,16 @@
SDL_FreeSurface(SDLPrimSurface);
SDLPrimSurface:= nil;
end;
+{$ENDIF}
// these attributes must be set up before creating the sdl window
+{$IFNDEF WIN32}
+(* On a large number of testers machines, SDL default to software rendering when opengl attributes were set.
+ These attributes were "set" after CreateWindow in .15, which probably did nothing.
+ IMO we should rely on the gl_config defaults from SDL, and use SDL_GL_GetAttribute to possibly post warnings if any
+ bad values are set. *)
SetupOpenGLAttributes();
+{$ENDIF}
{$IFDEF SDL13}
// these values in x and y make the window appear in the center
x:= SDL_WINDOWPOS_CENTERED_MASK;
@@ -1007,8 +1008,9 @@
flags:= flags or SDL_WINDOW_BORDERLESS or SDL_WINDOW_RESIZABLE;
{$ENDIF}
- if cFullScreen then SDLwindow:= SDL_CreateWindow('Hedgewars', x, y, cOrigScreenWidth, cOrigScreenHeight, flags or SDL_WINDOW_FULLSCREEN)
- else SDLwindow:= SDL_CreateWindow('Hedgewars', x, y, cScreenWidth, cScreenHeight, flags);
+ if SDLwindow = nil then
+ if cFullScreen then SDLwindow:= SDL_CreateWindow('Hedgewars', x, y, cOrigScreenWidth, cOrigScreenHeight, flags or SDL_WINDOW_FULLSCREEN)
+ else SDLwindow:= SDL_CreateWindow('Hedgewars', x, y, cScreenWidth, cScreenHeight, flags);
SDLTry(SDLwindow <> nil, true);
{$ELSE}
flags:= SDL_OPENGL or SDL_RESIZABLE;
@@ -1027,7 +1029,6 @@
end;
{$ENDIF}
- AddFileLog('Setting up OpenGL (using driver: ' + shortstring(SDL_VideoDriverName(buf, sizeof(buf))) + ')');
SetupOpenGL();
if reinit then
begin
--- a/hedgewars/uTeams.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uTeams.pas Sat Oct 08 16:54:56 2011 +0200
@@ -234,7 +234,7 @@
ApplyAmmoChanges(CurrentHedgehog^);
-if not CurrentTeam^.ExtDriven then SetBinds(CurrentTeam^.Binds);
+if (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then SetBinds(CurrentTeam^.Binds);
bShowFinger:= true;
@@ -427,11 +427,17 @@
with Team do
for i:= 0 to cMaxHHIndex do
with Hedgehogs[i] do
+ begin
+ if Hedgehogs[i].GearHidden <> nil then
+ RestoreHog(@Hedgehogs[i]);
+
if Gear <> nil then
begin
Gear^.Invulnerable:= false;
- Gear^.Damage:= Gear^.Health
+ Gear^.Damage:= Gear^.Health;
+ Gear^.State:= (Gear^.State or gstHHGone) and not gstHHDriven
end
+ end
end;
procedure chAddHH(var id: shortstring);
--- a/hedgewars/uTypes.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uTypes.pas Sat Oct 08 16:54:56 2011 +0200
@@ -36,7 +36,7 @@
end;
// Possible states of the game
- TGameState = (gsLandGen, gsStart, gsGame, gsChat, gsConfirm, gsExit);
+ TGameState = (gsLandGen, gsStart, gsGame, gsChat, gsConfirm, gsExit, gsSuspend);
// Game types that help determining what the engine is actually supposed to do
TGameType = (gmtLocal, gmtDemo, gmtNet, gmtSave, gmtLandPreview, gmtSyntax);
--- a/hedgewars/uUtils.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uUtils.pas Sat Oct 08 16:54:56 2011 +0200
@@ -341,20 +341,7 @@
Assign(f,'../Documents/hw-' + cLogfileBase + '.log');
Rewrite(f);
{$ELSE}
- if (ParamStr(1) <> '') and (ParamStr(2) <> '') then
- if (ParamCount <> 3) and (ParamCount <> cDefaultParamNum) then
- begin
- i:= 0;
- while(i < 7) do
- begin
- assign(f, ExtractFileDir(ParamStr(2)) + '/' + cLogfileBase + inttostr(i) + '.log');
- rewrite(f);
- if IOResult = 0 then break;
- inc(i)
- end;
- if i = 7 then f:= stderr; // if everything fails, write to stderr
- end
- else
+ if (UserPathPrefix <> '') then
begin
i:= 0;
while(i < 7) do
--- a/hedgewars/uVariables.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uVariables.pas Sat Oct 08 16:54:56 2011 +0200
@@ -25,8 +25,8 @@
var
/////// init flags ///////
- cMinScreenWidth : LongInt = 480;
- cMinScreenHeight : LongInt = 320;
+ cMinScreenWidth : LongInt = 640;
+ cMinScreenHeight : LongInt = 480;
cScreenWidth : LongInt = 1024;
cScreenHeight : LongInt = 768;
cOrigScreenWidth : LongInt = 1024;
@@ -402,7 +402,7 @@
(FileName: 'TurnsLeft'; Path: ptAmmoMenu; AltPath: ptNone; Texture: nil; Surface: nil;
Width: 16; Height: 16; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprTurnsLeft
(FileName: 'amKamikaze'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
- Width: 256; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprKamikaze
+ Width: 128; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprKamikaze
(FileName: 'amWhip'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
Width: 128; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprWhip
(FileName: 'Kowtow'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
@@ -490,7 +490,7 @@
(FileName: 'amMolotov'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
Width: 32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),//sprHandMolotov
(FileName: 'Molotov'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
- Width: 16; Height: 16; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprMolotov
+ Width: 32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprMolotov
(FileName: 'Smoke'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
Width: 22; Height: 22; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpHighest; getDimensions: false; getImageDimensions: true),// sprSmoke
(FileName: 'SmokeWhite'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
--- a/hedgewars/uVisualGears.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uVisualGears.pas Sat Oct 08 16:54:56 2011 +0200
@@ -29,7 +29,7 @@
* E.g.: background flakes, visual effects: explosion, smoke trails, etc.
*)
interface
-uses uConsts, uFloat, GLunit, uTypes;
+uses uConsts, uFloat, GLunit, uTypes, uWorld;
procedure initModule;
procedure freeModule;
@@ -321,6 +321,7 @@
end;
vgtSmoothWindBar: Tag:= hwRound(cWindSpeed * 72 / cMaxWindSpeed);
vgtStraightShot: begin
+ Angle:= 0;
Scale:= 1.0;
dx:= 0.001 * random(45);
dy:= 0.001 * (random(20) + 25);
@@ -596,7 +597,7 @@
end;
vgtStraightShot: begin
if Gear^.dX < 0 then i:= -1 else i:= 1;
- DrawTextureF(SpritesData[TSprite(Gear^.State)].Texture, Gear^.Scale, round(Gear^.X) + WorldDx, round(Gear^.Y) + WorldDy, Gear^.Frame, i, SpritesData[TSprite(Gear^.State)].Width, SpritesData[TSprite(Gear^.State)].Height);
+ DrawRotatedTextureF(SpritesData[TSprite(Gear^.State)].Texture, Gear^.Scale, 0, 0, round(Gear^.X) + WorldDx, round(Gear^.Y) + WorldDy, Gear^.Frame, i, SpritesData[TSprite(Gear^.State)].Width, SpritesData[TSprite(Gear^.State)].Height, Gear^.Angle);
end;
end;
if (cReducedQuality and rqAntiBoom) = 0 then
@@ -649,14 +650,7 @@
end;
DrawRotatedF(sprFeather, round(Gear^.X) + WorldDx, round(Gear^.Y) + WorldDy, Gear^.Frame, 1, Gear^.Angle);
end;
- vgtEgg: begin
- if Gear^.FrameTicks < $FF then
- begin
- Tint($FF, $FF, $FF, Gear^.FrameTicks);
- tinted:= true
- end;
- DrawRotatedF(sprEgg, round(Gear^.X) + WorldDx, round(Gear^.Y) + WorldDy, Gear^.Frame, 1, Gear^.Angle);
- end;
+ vgtEgg: DrawRotatedF(sprEgg, round(Gear^.X) + WorldDx, round(Gear^.Y) + WorldDy, Gear^.Frame, 1, Gear^.Angle);
vgtBeeTrace: begin
if Gear^.FrameTicks < $FF then
Tint($FF, $FF, $FF, Gear^.FrameTicks div 2)
--- a/hedgewars/uWorld.pas Sat Oct 08 16:45:52 2011 +0200
+++ b/hedgewars/uWorld.pas Sat Oct 08 16:54:56 2011 +0200
@@ -31,7 +31,7 @@
procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt);
procedure HideMission;
-procedure ShakeCamera(amount: LongWord);
+procedure ShakeCamera(amount: LongInt);
procedure InitCameraBorders;
procedure MoveCamera;
procedure onFocusStateChanged;
@@ -54,7 +54,8 @@
uRender,
uCaptions,
uCursor,
- uCommands
+ uCommands,
+ uMobile
;
var cWaveWidth, cWaveHeight: LongInt;
@@ -914,11 +915,11 @@
DrawCaptions;
// Teams Healths
-if TeamsCount * 20 > cScreenHeight div 7 then // take up less screen on small displays
+if TeamsCount * 20 > Longword(cScreenHeight) div 7 then // take up less screen on small displays
begin
SetScale(1.5);
smallScreenOffset:= cScreenHeight div 6;
- if TeamsCount * 20 > cScreenHeight div 5 then Tint($FF,$FF,$FF,$80);
+ if TeamsCount * 20 > Longword(cScreenHeight) div 5 then Tint($FF,$FF,$FF,$80);
end
else smallScreenOffset:= 0;
for t:= 0 to Pred(TeamsCount) do
@@ -957,7 +958,7 @@
// this approach should be faster than drawing all borders one by one tinted or not
if highlight then
begin
- if TeamsCount * 20 > cScreenHeight div 5 then Tint($FF,$FF,$FF,$80)
+ if TeamsCount * 20 > Longword(cScreenHeight) div 5 then Tint($FF,$FF,$FF,$80)
else Tint($FF, $FF, $FF, $FF);
// draw name
@@ -979,7 +980,7 @@
if smallScreenOffset <> 0 then
begin
SetScale(cDefaultZoomLevel);
- if TeamsCount * 20 > cScreenHeight div 5 then Tint($FF,$FF,$FF,$FF);
+ if TeamsCount * 20 > Longword(cScreenHeight) div 5 then Tint($FF,$FF,$FF,$FF);
end;
// Lag alert
@@ -1178,16 +1179,16 @@
end;
procedure MoveCamera;
-var EdgesDist, wdy, shs: LongInt;
+var EdgesDist, wdy, shs,z: LongInt;
PrevSentPointTime: LongWord = 0;
begin
{$IFNDEF IPHONEOS}
if (not (CurrentTeam^.ExtDriven and isCursorVisible and not bShowAmmoMenu)) and cHasFocus and (GameState <> gsConfirm) then
uCursor.updatePosition();
{$ENDIF}
-
+z:= round(200/zoom);
if (not PlacingHogs) and (FollowGear <> nil) and (not isCursorVisible) and (not fastUntilLag) then
- if (not autoCameraOn) or (abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y) > 4) then
+ if (not autoCameraOn) or ((abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y)) > 4) then
begin
FollowGear:= nil;
prevPoint:= CursorPoint;
@@ -1195,8 +1196,11 @@
end
else
begin
- CursorPoint.X:= (prevPoint.X * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * 100 + WorldDx) div 8;
- CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + WorldDy)) div 8;
+ CursorPoint.X:= (prevPoint.X * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * z + WorldDx) div 8;
+ if isPhone() or (cScreenHeight < 600) or ((hwSign(FollowGear^.dY) * z) < 10) then
+ CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + WorldDy)) div 8
+ else
+ CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + hwSign(FollowGear^.dY) * z + WorldDy)) div 8;
end;
wdy:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine - cVisibleWater;
@@ -1312,11 +1316,14 @@
if missionTex <> nil then FreeTexture(missionTex);
end;
-procedure ShakeCamera(amount: LongWord);
+procedure ShakeCamera(amount: LongInt);
begin
- amount:= Max(1, amount);
- WorldDx:= WorldDx - amount + LongInt(getRandom(1 + amount * 2));
- WorldDy:= WorldDy - amount + LongInt(getRandom(1 + amount * 2));
+ if isCursorVisible then exit;
+ amount:= Max(1, round(amount*zoom/2));
+ WorldDx:= WorldDx - amount + LongInt(random(1 + amount * 2));
+ WorldDy:= WorldDy - amount + LongInt(random(1 + amount * 2));
+ //CursorPoint.X:= CursorPoint.X - amount + LongInt(random(1 + amount * 2));
+ //CursorPoint.Y:= CursorPoint.Y - amount + LongInt(random(1 + amount * 2))
end;
--- a/project_files/HedgewarsMobile/Classes/AboutViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,7 +20,7 @@
#import "AboutViewController.h"
-#import "CommodityFunctions.h"
+
@implementation AboutViewController
@synthesize tableView, segmentedControl, people;
@@ -50,12 +50,12 @@
}
-(IBAction) buttonPressed:(id) sender {
- playSound(@"backSound");
+ [AudioManagerController playBackSound];
[[self parentViewController] dismissModalViewControllerAnimated:YES];
}
-(IBAction) segmentedControlChanged:(id) sender {
- playSound(@"clickSound");
+ [AudioManagerController playClickSound];
[self.tableView setContentOffset:CGPointMake(0, 0) animated:NO];
[self.tableView reloadData];
}
@@ -79,6 +79,8 @@
// first all the names, then the title (which is offset 5)
cell.textLabel.text = [[self.people objectAtIndex:self.segmentedControl.selectedSegmentIndex] objectAtIndex:[indexPath row]];
+ cell.textLabel.adjustsFontSizeToFitWidth = YES;
+ cell.textLabel.minimumFontSize = 8;
cell.detailTextLabel.text = [[self.people objectAtIndex:(self.segmentedControl.selectedSegmentIndex + 5)] objectAtIndex:[indexPath row]];
return cell;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,658 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1024</int>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">123</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="841351856">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBProxyObject" id="606714003">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBUIView" id="766721923">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUINavigationBar" id="241300702">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">290</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUISegmentedControl" id="674364401">
+ <reference key="NSNextResponder" ref="241300702"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{127, 7}, {289, 30}}</string>
+ <reference key="NSSuperview" ref="241300702"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBSegmentControlStyle">2</int>
+ <int key="IBNumberOfSegments">5</int>
+ <int key="IBSelectedSegmentIndex">0</int>
+ <object class="NSArray" key="IBSegmentTitles">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>Code</string>
+ <string>Art</string>
+ <string>Sound</string>
+ <string>Locale</string>
+ <string>Special</string>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentWidths">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentEnabledStates">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentContentOffsets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentImages">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSNull" id="4"/>
+ <reference ref="4"/>
+ <reference ref="4"/>
+ <reference ref="4"/>
+ <reference ref="4"/>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{543, 44}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSArray" key="IBUIItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUINavigationItem" id="824792699">
+ <reference key="IBUINavigationBar" ref="241300702"/>
+ <object class="IBUIBarButtonItem" key="IBUILeftBarButtonItem" id="322694234">
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUINavigationItem" ref="824792699"/>
+ <int key="IBUISystemItemIdentifier">0</int>
+ </object>
+ <reference key="IBUITitleView" ref="674364401"/>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBUITableView" id="411460868">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{0, 44}, {543, 577}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAgMAA</bytes>
+ </object>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <bool key="IBUIAlwaysBounceVertical">YES</bool>
+ <int key="IBUIStyle">1</int>
+ <int key="IBUISeparatorStyle">2</int>
+ <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+ <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+ <float key="IBUIRowHeight">44</float>
+ <float key="IBUISectionHeaderHeight">10</float>
+ <float key="IBUISectionFooterHeight">10</float>
+ </object>
+ </object>
+ <string key="NSFrameSize">{543, 621}</string>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="766721923"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="322694234"/>
+ <reference key="destination" ref="841351856"/>
+ </object>
+ <int key="connectionID">8</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="411460868"/>
+ <reference key="destination" ref="841351856"/>
+ </object>
+ <int key="connectionID">12</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="411460868"/>
+ <reference key="destination" ref="841351856"/>
+ </object>
+ <int key="connectionID">13</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">tableView</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="411460868"/>
+ </object>
+ <int key="connectionID">14</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">segmentedControlChanged:</string>
+ <reference key="source" ref="674364401"/>
+ <reference key="destination" ref="841351856"/>
+ <int key="IBEventType">13</int>
+ </object>
+ <int key="connectionID">15</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">segmentedControl</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="674364401"/>
+ </object>
+ <int key="connectionID">16</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="841351856"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="606714003"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">2</int>
+ <reference key="object" ref="766721923"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="241300702"/>
+ <reference ref="411460868"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="241300702"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="824792699"/>
+ </object>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6</int>
+ <reference key="object" ref="824792699"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="322694234"/>
+ <reference ref="674364401"/>
+ </object>
+ <reference key="parent" ref="241300702"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="322694234"/>
+ <reference key="parent" ref="824792699"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">10</int>
+ <reference key="object" ref="411460868"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">11</int>
+ <reference key="object" ref="674364401"/>
+ <reference key="parent" ref="824792699"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>10.IBPluginDependency</string>
+ <string>11.IBPluginDependency</string>
+ <string>2.IBEditorWindowLastContentRect</string>
+ <string>2.IBPluginDependency</string>
+ <string>5.IBPluginDependency</string>
+ <string>6.IBPluginDependency</string>
+ <string>7.IBPluginDependency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>AboutViewController</string>
+ <string>UIResponder</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{376, 170}, {543, 621}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">16</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">AboutViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>segmentedControlChanged:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>segmentedControlChanged:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">buttonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">segmentedControlChanged:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>segmentedControl</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UISegmentedControl</string>
+ <string>UITableView</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>segmentedControl</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">segmentedControl</string>
+ <string key="candidateClassName">UISegmentedControl</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableView</string>
+ <string key="candidateClassName">UITableView</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/AboutViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIBarButtonItem</string>
+ <string key="superclassName">UIBarItem</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIBarItem</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UINavigationBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="802309264">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UINavigationItem</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="802309264"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="786211723"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISegmentedControl</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISegmentedControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableView</string>
+ <string key="superclassName">UIScrollView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1024" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3100" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <string key="IBCocoaTouchPluginVersion">123</string>
+ </data>
+</archive>
--- a/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -21,9 +21,7 @@
#import "AmmoMenuViewController.h"
#import <QuartzCore/QuartzCore.h>
-#import "CommodityFunctions.h"
-#import "UIImageExtra.h"
-#import "PascalImports.h"
+
#define BTNS_PER_ROW 9
#define DEFAULT_DESCRIPTION IS_IPAD() ? \
@@ -92,7 +90,7 @@
int y = (HW_getNumberOfWeapons()/BTNS_PER_ROW)*44 + 18;
UILabel *name = [[UILabel alloc] initWithFrame:CGRectMake(x, y, 200, 20)];
name.backgroundColor = [UIColor clearColor];
- name.textColor = UICOLOR_HW_YELLOW_BODER;
+ name.textColor = [UIColor darkYellowColor];
name.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]];
self.nameLabel = name;
[self.view addSubview:self.nameLabel];
@@ -152,14 +150,14 @@
UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
button.frame = CGRectMake(x, y, 40, 40);
button.tag = i;
- button.layer.borderColor = [UICOLOR_HW_YELLOW_TEXT CGColor];
+ button.layer.borderColor = [[UIColor lightYellowColor] CGColor];
button.layer.borderWidth = w;
[button.layer setCornerRadius:radius];
[button.layer setMasksToBounds:YES];
[button addTarget:self action:@selector(buttonPressed:) forControlEvents:UIControlEventTouchDown];
[button addTarget:self action:@selector(buttonReleased:) forControlEvents:UIControlEventTouchUpInside];
[button addTarget:self action:@selector(buttonCancelled:) forControlEvents:UIControlEventTouchUpOutside|UIControlEventTouchCancel];
- [button setTitleColor:UICOLOR_HW_YELLOW_TEXT forState:UIControlStateNormal];
+ [button setTitleColor:[UIColor lightYellowColor] forState:UIControlStateNormal];
button.titleLabel.backgroundColor = [UIColor blackColor];
button.titleLabel.font = [UIFont boldSystemFontOfSize:[UIFont smallSystemFontSize]];
[button.titleLabel.layer setCornerRadius:3];
@@ -169,9 +167,10 @@
[self.view addSubview:button];
[array addObject:button];
- int x_src = ((i*32)/(int)ammoStoreImage.size.height)*32;
- int y_src = (i*32)%(int)ammoStoreImage.size.height;
- UIImage *img = [ammoStoreImage cutAt:CGRectMake(x_src, y_src, 32, 32)];
+ int size = 32 * [[UIScreen mainScreen] scale];
+ int x_src = ((i*size)/(int)(ammoStoreImage.size.height * [[UIScreen mainScreen] scale]))*size;
+ int y_src = (i*size)%(int)(ammoStoreImage.size.height * [[UIScreen mainScreen] scale]);
+ UIImage *img = [ammoStoreImage cutAt:CGRectMake(x_src, y_src, size, size)];
[imgs addObject:img];
}
[self performSelectorOnMainThread:@selector(setButtonsArray:) withObject:array waitUntilDone:NO];
@@ -220,7 +219,7 @@
shouldUpdateImage[i] = YES;
}
} else {
- button.layer.borderColor = [UICOLOR_HW_YELLOW_TEXT CGColor];
+ button.layer.borderColor = [[UIColor lightYellowColor] CGColor];
[button setTitle:nil forState:UIControlStateNormal];
if (button.currentBackgroundImage == nil || shouldUpdateImage[i] == YES) {
UIImage *img = [self.imagesArray objectAtIndex:i];
@@ -296,7 +295,7 @@
if (theButton.currentTitle == nil) {
HW_setWeapon(theButton.tag);
- playSound(@"clickSound");
+ [AudioManagerController playClickSound];
if (IS_DUALHEAD() == NO)
[self disappear];
}
--- a/project_files/HedgewarsMobile/Classes/Appirater.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/Appirater.m Sat Oct 08 16:54:56 2011 +0200
@@ -37,7 +37,7 @@
#import "Appirater.h"
#import <SystemConfiguration/SCNetworkReachability.h>
#import <netinet/in.h>
-#import "CommodityFunctions.h"
+#import "ServerSetup.h"
NSString *const kAppiraterLaunchDate = @"kAppiraterLaunchDate";
NSString *const kAppiraterLaunchCount = @"kAppiraterLaunchCount";
@@ -106,7 +106,7 @@
launchCount > LAUNCHES_UNTIL_PROMPT &&
!declinedToRate &&
!ratedApp) {
- if (isNetworkReachable()) { // check if they can reach the app store
+ if ([ServerSetup isNetworkReachable]) { // check if they can reach the app store
willShowPrompt = YES;
[self performSelectorOnMainThread:@selector(showPrompt) withObject:nil waitUntilDone:NO];
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/AudioManagerController.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,39 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 23/09/2011.
+ */
+
+
+#import <Foundation/Foundation.h>
+
+
+@interface AudioManagerController : NSObject {
+
+}
+
++(void) playBackgroundMusic;
++(void) pauseBackgroundMusic;
++(void) stopBackgroundMusic;
+
++(void) playClickSound;
++(void) playBackSound;
++(void) playSelectSound;
+
++(void) cleanupMemory;
+
+@end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/AudioManagerController.m Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,120 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 23/09/2011.
+ */
+
+
+#import "AudioManagerController.h"
+#import "AVFoundation/AVAudioPlayer.h"
+#import <AudioToolbox/AudioToolbox.h>
+
+
+static AVAudioPlayer *backgroundMusic = nil;
+static SystemSoundID clickSound = -1;
+static SystemSoundID backSound = -1;
+static SystemSoundID selSound = -1;
+
+@implementation AudioManagerController
+
+#pragma mark -
+#pragma mark background music control
++(void) loadBackgroundMusic {
+ NSString *musicString = [[NSBundle mainBundle] pathForResource:@"hwclassic" ofType:@"mp3"];
+ backgroundMusic = [[AVAudioPlayer alloc] initWithContentsOfURL:[NSURL fileURLWithPath:musicString] error:nil];
+
+ backgroundMusic.delegate = nil;
+ backgroundMusic.volume = 0.4f;
+ backgroundMusic.numberOfLoops = -1;
+ [backgroundMusic prepareToPlay];
+}
+
++(void) playBackgroundMusic {
+ if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"music"] boolValue] == NO)
+ return;
+
+ if (backgroundMusic == nil)
+ [AudioManagerController loadBackgroundMusic];
+
+ [backgroundMusic play];
+}
+
++(void) pauseBackgroundMusic {
+ [backgroundMusic pause];
+}
+
++(void) stopBackgroundMusic {
+ [backgroundMusic stop];
+}
+
+#pragma mark -
+#pragma mark sound effects control
++(SystemSoundID) loadSound:(NSString *)snd {
+ // get the filename of the sound file:
+ NSString *path = [NSString stringWithFormat:@"%@/%@",[[NSBundle mainBundle] resourcePath],snd];
+
+ // declare a system sound id and get a URL for the sound file
+ SystemSoundID soundID;
+ NSURL *filePath = [NSURL fileURLWithPath:path isDirectory:NO];
+
+ // use audio sevices to create and play the sound
+ AudioServicesCreateSystemSoundID((CFURLRef)filePath, &soundID);
+ return soundID;
+}
+
++(void) playClickSound {
+ if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"sound"] boolValue] == NO)
+ return;
+
+ if (clickSound == -1)
+ clickSound = [AudioManagerController loadSound:@"clickSound.wav"];
+
+ AudioServicesPlaySystemSound(clickSound);
+}
+
++(void) playBackSound {
+ if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"sound"] boolValue] == NO)
+ return;
+
+ if (backSound == -1)
+ backSound = [AudioManagerController loadSound:@"backSound.wav"];
+
+ AudioServicesPlaySystemSound(backSound);
+}
+
++(void) playSelectSound {
+ if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"sound"] boolValue] == NO)
+ return;
+
+ if (selSound == -1)
+ selSound = [AudioManagerController loadSound:@"selSound.wav"];
+
+ AudioServicesPlaySystemSound(selSound);
+}
+
+#pragma mark -
+#pragma mark memory management
++(void) cleanupMemory {
+ [backgroundMusic stop];
+ [backgroundMusic release], backgroundMusic = nil;
+ AudioServicesDisposeSystemSoundID(clickSound), clickSound = -1;
+ AudioServicesDisposeSystemSoundID(backSound), backSound = -1;
+ AudioServicesDisposeSystemSoundID(selSound), selSound = -1;
+ MSG_MEMCLEAN();
+}
+
+@end
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
- * Hedgewars-iOS, a Hedgewars port for iOS devices
- * Copyright (c) 2009-2010 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * File created on 08/04/2010.
- */
-
-
-#import <Foundation/Foundation.h>
-
-#define DOCUMENTS_FOLDER() [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0]
-
-#define DEBUG_FILE() [DOCUMENTS_FOLDER() stringByAppendingString:@"/hw-game.log"]
-#define HEDGEHOG_FILE() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/Images/hedgehog.png"]
-#define BASICFLAGS_FILE() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/basicFlags.plist"]
-#define GAMEMODS_FILE() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/gameMods.plist"]
-#define CREDITS_FILE() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/credits.plist"]
-
-#define TEAMS_DIRECTORY() [DOCUMENTS_FOLDER() stringByAppendingString:@"/Teams/"]
-#define WEAPONS_DIRECTORY() [DOCUMENTS_FOLDER() stringByAppendingString:@"/Weapons/"]
-#define SCHEMES_DIRECTORY() [DOCUMENTS_FOLDER() stringByAppendingString:@"/Schemes/"]
-#define SAVES_DIRECTORY() [DOCUMENTS_FOLDER() stringByAppendingString:@"/Saves/"]
-
-#define GRAPHICS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/"]
-#define HATS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hats/"]
-#define GRAVES_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Graves/"]
-#define BOTLEVELS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hedgehog/botlevels/"]
-#define BTN_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Btn/"]
-#define FLAGS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Flags/"]
-#define FORTS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Forts/"]
-#define VOICES_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Sounds/voices/"]
-#define THEMES_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Themes/"]
-#define MAPS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Maps/"]
-#define MISSIONS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Missions/Maps/"]
-#define LOCALE_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Locale/"]
-#define SCRIPTS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Scripts/plist/"]
-
-#define MSG_MEMCLEAN() DLog(@"has cleaned up some memory");
-#define MSG_DIDUNLOAD() DLog(@"unloaded");
-
-#define UICOLOR_HW_YELLOW_BODER [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xC0/255 blue:0 alpha:1]
-#define UICOLOR_HW_YELLOW_TEXT [UIColor colorWithRed:(CGFloat)0xF0/255 green:(CGFloat)0xD0/255 blue:0 alpha:1]
-#define UICOLOR_HW_DARKBLUE [UIColor colorWithRed:(CGFloat)0x0F/255 green:0 blue:(CGFloat)0x42/255 alpha:1]
-#define UICOLOR_HW_ALPHABLUE [UIColor colorWithRed:(CGFloat)0x0F/255 green:0 blue:(CGFloat)0x42/255 alpha:0.58f]
-#define UICOLOR_HW_ALMOSTBLACK (IS_NOT_POWERFUL(getModelType())) ? [UIColor blackColor] : [UIColor colorWithRed:0 green:0 blue:0 alpha:0.6]
-
-#define IS_DUALHEAD() ([[UIScreen class] respondsToSelector:@selector(screens)] && [[UIScreen screens] count] > 1)
-#define IS_IPAD() (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
-#define IS_NOT_POWERFUL(x) ([x hasPrefix:@"iPhone1"] || [x hasPrefix:@"iPod1,1"] || [x hasPrefix:@"iPod2,1"])
-#define IS_NOT_VERY_POWERFUL(x) ([x hasPrefix:@"iPad1"] || [x hasPrefix:@"iPhone2"] || [x hasPrefix:@"iPod3"] || [x hasPrefix:@"iPod4"])
-#define IS_VERY_POWERFUL(x) (IS_NOT_POWERFUL(x) == NO && IS_NOT_VERY_POWERFUL(x) == NO)
-
-#define UIVIEW_HW_SDLVIEW [[[[UIApplication sharedApplication] keyWindow] subviews] objectAtIndex:0]
-
-void print_free_memory (void);
-void playSound (NSString *snd);
-BOOL isApplePhone (void);
-NSInteger randomPort (void);
-
-NSString *getModelType (void);
-NSArray *getAvailableColors (void);
-
-UILabel *createBlueLabel (NSString *title, CGRect frame);
-UILabel *createLabelWithParams (NSString *title, CGRect frame, CGFloat borderWidth, UIColor *borderColor, UIColor *backgroundColor);
-
-CGSize PSPNGSizeFromMetaData (NSString *aFileName);
-BOOL isNetworkReachable (void);
-
-@interface NSString (extra)
-
--(NSString *) MD5hash;
-
-@end
-
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.m Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +0,0 @@
-/*
- * Hedgewars-iOS, a Hedgewars port for iOS devices
- * Copyright (c) 2009-2010 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * File created on 08/04/2010.
- */
-
-
-#import "CommodityFunctions.h"
-#import <sys/types.h>
-#import <sys/sysctl.h>
-#import <mach/mach.h>
-#import <mach/mach_host.h>
-#import <QuartzCore/QuartzCore.h>
-#import <AudioToolbox/AudioToolbox.h>
-#import <CommonCrypto/CommonDigest.h>
-#import <SystemConfiguration/SCNetworkReachability.h>
-#import <netinet/in.h>
-#import "PascalImports.h"
-#import "hwconsts.h"
-
-
-NSInteger inline randomPort () {
- srandom(time(NULL));
- NSInteger res = (random() % 64511) + 1024;
- return (res == NETGAME_DEFAULT_PORT) ? randomPort() : res;
-}
-
-// by http://landonf.bikemonkey.org/code/iphone/Determining_Available_Memory.20081203.html
-void print_free_memory () {
-#ifdef DEBUG
- mach_port_t host_port;
- mach_msg_type_number_t host_size;
- vm_size_t pagesize;
-
- host_port = mach_host_self();
- host_size = sizeof(vm_statistics_data_t) / sizeof(integer_t);
- host_page_size(host_port, &pagesize);
-
- vm_statistics_data_t vm_stat;
-
- if (host_statistics(host_port, HOST_VM_INFO, (host_info_t)&vm_stat, &host_size) != KERN_SUCCESS)
- DLog(@"Failed to fetch vm statistics");
-
- /* Stats in bytes */
- natural_t mem_used = (vm_stat.active_count + vm_stat.inactive_count + vm_stat.wire_count) * pagesize;
- natural_t mem_free = vm_stat.free_count * pagesize;
- natural_t mem_total = mem_used + mem_free;
- DLog(@"used: %u free: %u total: %u", mem_used, mem_free, mem_total);
-#endif
-}
-
-BOOL inline isApplePhone () {
- return (IS_IPAD() == NO);
-}
-
-NSString *getModelType () {
- size_t size;
- // set 'oldp' parameter to NULL to get the size of the data returned so we can allocate appropriate amount of space
- sysctlbyname("hw.machine", NULL, &size, NULL, 0);
- char *name = (char *)malloc(sizeof(char) * size);
- // get the platform name
- sysctlbyname("hw.machine", name, &size, NULL, 0);
- NSString *modelId = [NSString stringWithUTF8String:name];
- free(name);
-
- return modelId;
-}
-
-void playSound (NSString *snd) {
- if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"sound"] boolValue] == YES) {
- // get the filename of the sound file:
- NSString *path = [NSString stringWithFormat:@"%@/%@.wav",[[NSBundle mainBundle] resourcePath],snd];
-
- // declare a system sound id and get a URL for the sound file
- SystemSoundID soundID;
- NSURL *filePath = [NSURL fileURLWithPath:path isDirectory:NO];
-
- // use audio sevices to create and play the sound
- AudioServicesCreateSystemSoundID((CFURLRef)filePath, &soundID);
- AudioServicesPlaySystemSound(soundID);
- }
-}
-
-NSArray *getAvailableColors (void) {
- // by default colors are ARGB but we do computation over RGB, hence we have to "& 0x00FFFFFF" before processing
- unsigned int colors[] = HW_TEAMCOLOR_ARRAY;
- NSMutableArray *array = [[NSMutableArray alloc] init];
-
- int i = 0;
- while(colors[i] != 0)
- [array addObject:[NSNumber numberWithUnsignedInt:(colors[i++] & 0x00FFFFFF)]];
-
- NSArray *final = [NSArray arrayWithArray:array];
- [array release];
- return final;
-}
-
-UILabel *createBlueLabel (NSString *title, CGRect frame) {
- return createLabelWithParams(title, frame, 1.5f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_DARKBLUE);
-}
-
-UILabel *createLabelWithParams (NSString *title, CGRect frame, CGFloat borderWidth, UIColor *borderColor, UIColor *backgroundColor) {
- UILabel *theLabel = [[UILabel alloc] initWithFrame:frame];
- theLabel.backgroundColor = backgroundColor;
-
- if (title != nil) {
- theLabel.text = title;
- theLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
- theLabel.textAlignment = UITextAlignmentCenter;
- theLabel.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]*80/100];
- }
-
- [theLabel.layer setBorderWidth:borderWidth];
- [theLabel.layer setBorderColor:borderColor.CGColor];
- [theLabel.layer setCornerRadius:8.0f];
- [theLabel.layer setMasksToBounds:YES];
-
- return theLabel;
-}
-
-BOOL isNetworkReachable (void) {
- // Create zero addy
- struct sockaddr_in zeroAddress;
- bzero(&zeroAddress, sizeof(zeroAddress));
- zeroAddress.sin_len = sizeof(zeroAddress);
- zeroAddress.sin_family = AF_INET;
-
- // Recover reachability flags
- SCNetworkReachabilityRef defaultRouteReachability = SCNetworkReachabilityCreateWithAddress(NULL, (struct sockaddr *)&zeroAddress);
- SCNetworkReachabilityFlags flags;
-
- BOOL didRetrieveFlags = SCNetworkReachabilityGetFlags(defaultRouteReachability, &flags);
- CFRelease(defaultRouteReachability);
-
- if (!didRetrieveFlags) {
- NSLog(@"Error. Could not recover network reachability flags");
- return NO;
- }
-
- BOOL isReachable = flags & kSCNetworkFlagsReachable;
- BOOL needsConnection = flags & kSCNetworkFlagsConnectionRequired;
- BOOL nonWiFi = flags & kSCNetworkReachabilityFlagsTransientConnection;
-
- NSURL *testURL = [NSURL URLWithString:@"http://www.apple.com/"];
- NSURLRequest *testRequest = [NSURLRequest requestWithURL:testURL
- cachePolicy:NSURLRequestReloadIgnoringLocalCacheData
- timeoutInterval:20.0];
- NSURLConnection *testConnection = [[NSURLConnection alloc] initWithRequest:testRequest delegate:nil];
- BOOL testResult = testConnection ? YES : NO;
- [testConnection release];
-
- return ((isReachable && !needsConnection) || nonWiFi) ? testResult : NO;
-}
-
-// this routine checks for the PNG size without loading it in memory
-// https://github.com/steipete/PSFramework/blob/master/PSFramework%20Version%200.3/PhotoshopFramework/PSMetaDataFunctions.m
-CGSize PSPNGSizeFromMetaData (NSString *aFileName) {
- // File Name to C String.
- const char *fileName = [aFileName UTF8String];
- // source file
- FILE *infile = fopen(fileName, "rb");
- if (infile == NULL) {
- DLog(@"Can't open the file: %@", aFileName);
- return CGSizeZero;
- }
-
- // Bytes Buffer.
- unsigned char buffer[30];
- // Grab Only First Bytes.
- fread(buffer, 1, 30, infile);
- // Close File.
- fclose(infile);
-
- // PNG Signature.
- unsigned char png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
-
- // Compare File signature.
- if ((int)(memcmp(&buffer[0], &png_signature[0], 8))) {
- DLog(@"The file (%@) is not a PNG file", aFileName);
- return CGSizeZero;
- }
-
- // Calc Sizes. Isolate only four bytes of each size (width, height).
- int width[4];
- int height[4];
- for (int d = 16; d < (16 + 4); d++) {
- width[d-16] = buffer[d];
- height[d-16] = buffer[d+4];
- }
-
- // Convert bytes to Long (Integer)
- long resultWidth = (width[0] << (int)24) | (width[1] << (int)16) | (width[2] << (int)8) | width[3];
- long resultHeight = (height[0] << (int)24) | (height[1] << (int)16) | (height[2] << (int)8) | height[3];
-
- // Return Size.
- return CGSizeMake(resultWidth,resultHeight);
-}
-
-@implementation NSString (extra)
-
--(NSString *)MD5hash {
- const char *cStr = [self UTF8String];
- unsigned char result[16];
- CC_MD5( cStr, strlen(cStr), result );
- return [NSString stringWithFormat:
- @"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
- result[0], result[1], result[2], result[3], result[4], result[5],
- result[6], result[7], result[8], result[9], result[10], result[11],
- result[12], result[13], result[14], result[15]];
-}
-
-
-@end
--- a/project_files/HedgewarsMobile/Classes/CreationChamber.h Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/CreationChamber.h Sat Oct 08 16:54:56 2011 +0200
@@ -24,4 +24,4 @@
void createSettings (void);
void createTeamNamed (NSString *nameWithoutExt);
void createWeaponNamed (NSString *nameWithoutExt, int type);
-void createSchemeNamed (NSString *nameWithoutExt);
+void createSchemeNamed (NSString *nameWithoutExt, int type);
--- a/project_files/HedgewarsMobile/Classes/CreationChamber.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/CreationChamber.m Sat Oct 08 16:54:56 2011 +0200
@@ -150,7 +150,7 @@
[theWeapon release];
}
-void createSchemeNamed (NSString *nameWithoutExt) {
+void createSchemeNamed (NSString *nameWithoutExt, int type) {
NSString *schemesDirectory = SCHEMES_DIRECTORY();
if (![[NSFileManager defaultManager] fileExistsAtPath: schemesDirectory]) {
@@ -173,8 +173,106 @@
[gamemodArray addObject:[NSNumber numberWithBool:NO]];
[mods release];
- // workaround for randomorder that has to be set to YES
- [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+ switch (type) {
+ case 0: // default
+ [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+ break;
+ case 1: // pro mode
+ [basicArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithInt:15]];
+ [basicArray replaceObjectAtIndex:7 withObject:[NSNumber numberWithInt:0]];
+ [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:0]];
+ [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:14 withObject:[NSNumber numberWithBool:YES]];
+ break;
+ case 2: // shoppa
+ [basicArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithInt:30]];
+ [basicArray replaceObjectAtIndex:3 withObject:[NSNumber numberWithInt:50]];
+ [basicArray replaceObjectAtIndex:7 withObject:[NSNumber numberWithInt:1]];
+ [basicArray replaceObjectAtIndex:8 withObject:[NSNumber numberWithInt:0]];
+ [basicArray replaceObjectAtIndex:9 withObject:[NSNumber numberWithInt:25]];
+ [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:0]];
+ [basicArray replaceObjectAtIndex:13 withObject:[NSNumber numberWithInt:0]];
+ [gamemodArray replaceObjectAtIndex:1 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:14 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:15 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:19 withObject:[NSNumber numberWithBool:YES]];
+ break;
+ case 3: // clean slate
+ [gamemodArray replaceObjectAtIndex:6 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:18 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:19 withObject:[NSNumber numberWithBool:YES]];
+ break;
+ case 4: // minefield
+ [basicArray replaceObjectAtIndex:0 withObject:[NSNumber numberWithInt:50]];
+ [basicArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithInt:30]];
+ [basicArray replaceObjectAtIndex:7 withObject:[NSNumber numberWithInt:0]];
+ [basicArray replaceObjectAtIndex:10 withObject:[NSNumber numberWithInt:0]];
+ [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:80]];
+ [basicArray replaceObjectAtIndex:13 withObject:[NSNumber numberWithInt:0]];
+ [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:14 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:15 withObject:[NSNumber numberWithBool:YES]];
+ break;
+ case 5: // barrel mayhem
+ [basicArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithInt:30]];
+ [basicArray replaceObjectAtIndex:7 withObject:[NSNumber numberWithInt:0]];
+ [basicArray replaceObjectAtIndex:10 withObject:[NSNumber numberWithInt:0]];
+ [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:0]];
+ [basicArray replaceObjectAtIndex:13 withObject:[NSNumber numberWithInt:40]];
+ [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:14 withObject:[NSNumber numberWithBool:YES]];
+ break;
+ case 6: // tunnel hogs
+ [basicArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithInt:30]];
+ [basicArray replaceObjectAtIndex:9 withObject:[NSNumber numberWithInt:3]];
+ [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:10]];
+ [basicArray replaceObjectAtIndex:12 withObject:[NSNumber numberWithInt:10]];
+ [basicArray replaceObjectAtIndex:13 withObject:[NSNumber numberWithInt:10]];
+ [gamemodArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:14 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:15 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:16 withObject:[NSNumber numberWithBool:YES]];
+ break;
+ case 7: // fort mode
+ [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:0]];
+ [basicArray replaceObjectAtIndex:13 withObject:[NSNumber numberWithInt:0]];
+ [gamemodArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:3 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:10 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+ break;
+ case 8: // timeless
+ [basicArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithInt:100]];
+ [basicArray replaceObjectAtIndex:4 withObject:[NSNumber numberWithInt:0]];
+ [basicArray replaceObjectAtIndex:5 withObject:[NSNumber numberWithInt:0]];
+ [basicArray replaceObjectAtIndex:9 withObject:[NSNumber numberWithInt:30]];
+ [basicArray replaceObjectAtIndex:10 withObject:[NSNumber numberWithInt:5]];
+ [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:3]];
+ [basicArray replaceObjectAtIndex:12 withObject:[NSNumber numberWithInt:10]];
+ [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:20 withObject:[NSNumber numberWithBool:YES]];
+ break;
+ case 9: // thinking with portals
+ [basicArray replaceObjectAtIndex:7 withObject:[NSNumber numberWithInt:2]];
+ [basicArray replaceObjectAtIndex:8 withObject:[NSNumber numberWithInt:25]];
+ [basicArray replaceObjectAtIndex:10 withObject:[NSNumber numberWithInt:4]];
+ [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:5]];
+ [basicArray replaceObjectAtIndex:13 withObject:[NSNumber numberWithInt:5]];
+ [gamemodArray replaceObjectAtIndex:9 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+ break;
+ case 10:// king mode
+ [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+ [gamemodArray replaceObjectAtIndex:12 withObject:[NSNumber numberWithBool:YES]];
+ break;
+ default:
+ DLog(@"Impossible");
+ break;
+ }
NSMutableDictionary *theScheme = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
basicArray,@"basic",
@@ -182,7 +280,7 @@
nil];
[gamemodArray release];
[basicArray release];
-
+
NSString *schemeFile = [[NSString alloc] initWithFormat:@"%@/%@.plist", schemesDirectory, nameWithoutExt];
[theScheme writeToFile:schemeFile atomically:YES];
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/DefinesAndMacros.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,83 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2010 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 01/10/2011.
+ */
+
+
+// some macros by http://www.cimgf.com/2010/05/02/my-current-prefix-pch-file/
+// and http://blog.coriolis.ch/2009/01/05/macros-for-xcode/
+
+
+#ifdef DEBUG
+ #define DLog(...) NSLog(@"%s %@", __PRETTY_FUNCTION__, [NSString stringWithFormat:__VA_ARGS__])
+ #define ALog(...) [[NSAssertionHandler currentHandler] handleFailureInFunction:[NSString stringWithCString:__PRETTY_FUNCTION__ encoding:NSUTF8StringEncoding] file:[NSString stringWithCString:__FILE__ encoding:NSUTF8StringEncoding] lineNumber:__LINE__ description:__VA_ARGS__]
+ #define releaseAndNil(x) [x release]
+#else
+ #define DLog(...) do { } while (0)
+ #ifndef NS_BLOCK_ASSERTIONS
+ #define NS_BLOCK_ASSERTIONS
+ #endif
+ #define ALog(...) NSLog(@"%s %@", __PRETTY_FUNCTION__, [NSString stringWithFormat:__VA_ARGS__])
+ #define releaseAndNil(x) [x release], x = nil
+#endif
+
+
+#define ZAssert(condition, ...) do { if (!(condition)) { ALog(__VA_ARGS__); }} while(0)
+#define rotationManager(x) (x == UIInterfaceOrientationLandscapeRight) || (x == UIInterfaceOrientationLandscapeLeft)
+
+#define START_TIMER NSTimeInterval start = [NSDate timeIntervalSinceReferenceDate];
+#define END_TIMER(msg) NSTimeInterval stop = [NSDate timeIntervalSinceReferenceDate]; CMLog([NSString stringWithFormat:@"%@ Time = %f", msg, stop-start]);
+
+
+#define DOCUMENTS_FOLDER() [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0]
+
+#define DEBUG_FILE() [DOCUMENTS_FOLDER() stringByAppendingString:@"/hw-game.log"]
+#define BASICFLAGS_FILE() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/basicFlags.plist"]
+#define GAMEMODS_FILE() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/gameMods.plist"]
+#define CREDITS_FILE() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/credits.plist"]
+
+#define TEAMS_DIRECTORY() [DOCUMENTS_FOLDER() stringByAppendingString:@"/Teams/"]
+#define WEAPONS_DIRECTORY() [DOCUMENTS_FOLDER() stringByAppendingString:@"/Weapons/"]
+#define SCHEMES_DIRECTORY() [DOCUMENTS_FOLDER() stringByAppendingString:@"/Schemes/"]
+#define SAVES_DIRECTORY() [DOCUMENTS_FOLDER() stringByAppendingString:@"/Saves/"]
+
+#define GRAPHICS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/"]
+#define ICONS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Icons/"]
+#define HATS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hats/"]
+#define GRAVES_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Graves/"]
+#define FLAGS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Flags/"]
+#define FORTS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Forts/"]
+#define VOICES_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Sounds/voices/"]
+#define THEMES_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Themes/"]
+#define MAPS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Maps/"]
+#define MISSIONS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Missions/Maps/"]
+#define TRAININGS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Missions/Training/"]
+#define LOCALE_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Locale/"]
+#define SCRIPTS_DIRECTORY() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Scripts/plist/"]
+
+#define MSG_MEMCLEAN() DLog(@"has cleaned up some memory");
+#define MSG_DIDUNLOAD() DLog(@"unloaded");
+
+#define IS_DUALHEAD() ([[UIScreen class] respondsToSelector:@selector(screens)] && [[UIScreen screens] count] > 1)
+#define IS_IPAD() (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+#define IS_NOT_POWERFUL(x) ([x hasPrefix:@"iPhone1"] || [x hasPrefix:@"iPod1,1"] || [x hasPrefix:@"iPod2,1"])
+#define IS_NOT_VERY_POWERFUL(x) ([x hasPrefix:@"iPad1"] || [x hasPrefix:@"iPhone2"] || [x hasPrefix:@"iPod3"] || [x hasPrefix:@"iPod4"])
+#define IS_VERY_POWERFUL(x) (IS_NOT_POWERFUL(x) == NO && IS_NOT_VERY_POWERFUL(x) == NO)
+
+#define UIVIEW_HW_SDLVIEW [[[[UIApplication sharedApplication] keyWindow] subviews] objectAtIndex:0]
+
--- a/project_files/HedgewarsMobile/Classes/EditableCellView.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/EditableCellView.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,7 +20,7 @@
#import "EditableCellView.h"
-#import "CommodityFunctions.h"
+
@implementation EditableCellView
@synthesize delegate, textField, titleLabel, minimumCharacters, maximumCharacters, respectEditing, oldValue;
--- a/project_files/HedgewarsMobile/Classes/EngineProtocolNetwork.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/EngineProtocolNetwork.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,10 +20,9 @@
#import "EngineProtocolNetwork.h"
-#import "PascalImports.h"
-#import "CommodityFunctions.h"
#import "OverlayViewController.h"
+
#define BUFFER_SIZE 255 // like in original frontend
@implementation EngineProtocolNetwork
@@ -62,7 +61,7 @@
#pragma mark -
#pragma mark Spawner functions
-(void) spawnThread:(NSString *)onSaveFile withOptions:(NSDictionary *)dictionary {
- self.stream = [[NSOutputStream alloc] initToFileAtPath:onSaveFile append:YES];
+ self.stream = (onSaveFile) ? [[NSOutputStream alloc] initToFileAtPath:onSaveFile append:YES] : nil;
[self.stream open];
[NSThread detachNewThreadSelector:@selector(engineProtocol:)
@@ -289,6 +288,9 @@
NSString *script = [gameConfig objectForKey:@"mission_command"];
if ([script length] != 0)
[self sendToEngine:script];
+ // missions/tranings only need the script configuration set
+ if ([gameConfig count] == 1)
+ break;
// seed info
[self sendToEngine:[gameConfig objectForKey:@"seed_command"]];
--- a/project_files/HedgewarsMobile/Classes/FlagsViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/FlagsViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -21,7 +21,7 @@
#import "FlagsViewController.h"
#import <QuartzCore/QuartzCore.h>
-#import "CommodityFunctions.h"
+
@implementation FlagsViewController
@synthesize teamDictionary, flagArray, communityArray, lastIndexPath;
--- a/project_files/HedgewarsMobile/Classes/FortsViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/FortsViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,10 +20,9 @@
#import "FortsViewController.h"
-#import "CommodityFunctions.h"
-#import "UIImageExtra.h"
+
-#define IMGNUM_PER_FORT 4
+#define IMGNUM_PER_FORT 6
@implementation FortsViewController
@synthesize teamDictionary, fortArray, lastIndexPath;
@@ -40,10 +39,10 @@
[super viewDidLoad];
NSArray *directoryContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:FORTS_DIRECTORY() error:NULL];
- NSMutableArray *filteredContents = [[NSMutableArray alloc] initWithCapacity:([directoryContents count] / 3)];
+ NSMutableArray *filteredContents = [[NSMutableArray alloc] initWithCapacity:([directoryContents count] / IMGNUM_PER_FORT)];
// we need to remove the double entries and the L.png suffix
for (int i = 0; i < [directoryContents count]; i++) {
- if (i % IMGNUM_PER_FORT == 3) {
+ if (i % IMGNUM_PER_FORT == IMGNUM_PER_FORT-1) {
NSString *currentName = [directoryContents objectAtIndex:i];
NSString *correctName = [currentName substringToIndex:([currentName length] - 5)];
[filteredContents addObject:correctName];
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Sat Oct 08 16:54:56 2011 +0200
@@ -47,5 +47,6 @@
-(IBAction) buttonPressed:(id) sender;
-(IBAction) segmentPressed:(id) sender;
-(void) startGame:(UIButton *)button;
+-(BOOL) isEverythingSet;
@end
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -25,9 +25,7 @@
#import "SchemeWeaponConfigViewController.h"
#import "HelpPageViewController.h"
#import "GameInterfaceBridge.h"
-#import "CommodityFunctions.h"
-#import "UIImageExtra.h"
-#import "PascalImports.h"
+
@implementation GameConfigViewController
@synthesize imgContainer, helpPage, mapConfigViewController, teamConfigViewController, schemeWeaponConfigViewController, interfaceBridge;
@@ -51,17 +49,26 @@
[alert show];
[alert release];
} else {
- playSound(@"backSound");
+ [AudioManagerController playBackSound];
[[self parentViewController] dismissModalViewControllerAnimated:YES];
}
break;
case 1:
- playSound(@"clickSound");
+ [AudioManagerController playClickSound];
+ if ([self isEverythingSet] == NO)
+ return;
theButton.enabled = NO;
+ for (UIView *oneView in self.imgContainer.subviews) {
+ if ([oneView isMemberOfClass:[UIImageView class]]) {
+ UIImageView *anImageView = (UIImageView *)oneView;
+ [anImageView removeFromSuperview];
+ }
+ }
[self startGame:theButton];
+
break;
case 2:
- playSound(@"clickSound");
+ [AudioManagerController playClickSound];
if (self.helpPage == nil)
self.helpPage = [[HelpPageViewController alloc] initWithNibName:@"HelpPageLobbyViewController-iPad" bundle:nil];
self.helpPage.view.alpha = 0;
@@ -79,7 +86,7 @@
-(IBAction) segmentPressed:(id) sender {
UISegmentedControl *theSegment = (UISegmentedControl *)sender;
- playSound(@"selSound");
+ [AudioManagerController playSelectSound];
switch (theSegment.selectedSegmentIndex) {
case 0:
// this init here is just aestetic as this controller was already set up in viewDidLoad
@@ -208,9 +215,6 @@
-(void) startGame:(UIButton *)button {
button.enabled = YES;
-
- if ([self isEverythingSet] == NO)
- return;
NSString *script = self.mapConfigViewController.missionCommand;
if ([script isEqualToString:@""])
@@ -240,35 +244,52 @@
-(void) loadNiceHogs {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- NSString *filePath = [NSString stringWithFormat:@"%@/Hedgehog.png",GRAPHICS_DIRECTORY()];
- UIImage *sprite = [[UIImage alloc] initWithContentsOfFile:filePath andCutAt:CGRectMake(96, 0, 32, 32)];
-
+ srand(time(NULL));
+ NSString *filePath = [[NSString alloc] initWithFormat:@"%@/Hedgehog/Idle.png",GRAPHICS_DIRECTORY()];
+ UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:filePath];
+ [filePath release];
+
NSArray *hatArray = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:HATS_DIRECTORY() error:NULL];
int numberOfHats = [hatArray count];
+ int animationFrames = IS_VERY_POWERFUL([HWUtils modelType]) ? 18 : 1;
if (self.imgContainer != nil)
[self.imgContainer removeFromSuperview];
-
+
self.imgContainer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 40)];
for (int i = 0; i < 1 + random()%20; i++) {
NSString *hat = [hatArray objectAtIndex:random()%numberOfHats];
-
+
NSString *hatFile = [[NSString alloc] initWithFormat:@"%@/%@", HATS_DIRECTORY(), hat];
- UIImage *hatSprite = [[UIImage alloc] initWithContentsOfFile: hatFile andCutAt:CGRectMake(0, 0, 32, 32)];
- [hatFile release];
- UIImage *hogWithHat = [sprite mergeWith:hatSprite atPoint:CGPointMake(0, 5)];
+ UIImage *hatSprite = [[UIImage alloc] initWithContentsOfFile:hatFile];
+ NSMutableArray *animation = [[NSMutableArray alloc] initWithCapacity:animationFrames];
+ for (int j = 0; j < animationFrames; j++) {
+ int x = ((j*32)/(int)hatSprite.size.height)*32;
+ int y = (j*32)%(int)hatSprite.size.height;
+ UIImage *hatSpriteFrame = [hatSprite cutAt:CGRectMake(x, y, 32, 32)];
+ UIImage *hogSpriteFrame = [hogSprite cutAt:CGRectMake(x, y, 32, 32)];
+ UIImage *hogWithHat = [hogSpriteFrame mergeWith:hatSpriteFrame atPoint:CGPointMake(0, 5)];
+ [animation addObject:hogWithHat];
+ }
[hatSprite release];
-
- UIImageView *hog = [[UIImageView alloc] initWithImage:hogWithHat];
- int x = 15*(i+1)+random()%40;
- if (x + 32 > 300)
- x = i*10;
- hog.frame = CGRectMake(x, 30, 32, 32);
+ [hatFile release];
+
+ UIImageView *hog = [[UIImageView alloc] initWithImage:[animation objectAtIndex:0]];
+ hog.animationImages = animation;
+ hog.animationDuration = 3;
+ [animation release];
+
+ int x = 20*i+random()%128;
+ if (x > 320 - 32)
+ x = i*random()%32;
+ hog.frame = CGRectMake(x, 25, hog.frame.size.width, hog.frame.size.height);
[self.imgContainer addSubview:hog];
+ [hog startAnimating];
[hog release];
}
+
[self.view addSubview:self.imgContainer];
- [sprite release];
+ [hogSprite release];
[pool drain];
}
@@ -279,29 +300,41 @@
self.view.frame = CGRectMake(0, 0, screen.size.height, screen.size.width);
if (IS_IPAD()) {
- // load other controllers
+ // load other controllers and the background
if (self.mapConfigViewController == nil)
self.mapConfigViewController = [[MapConfigViewController alloc] initWithNibName:@"MapConfigViewController-iPad" bundle:nil];
- UILabel *leftBackground = createLabelWithParams(nil, CGRectMake(0, 60, 320, 620), 2.7f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_ALPHABLUE);
- [self.mapConfigViewController.view addSubview:leftBackground];
- [leftBackground release];
- UILabel *middleBackground = createLabelWithParams(nil, CGRectMake(337, 187, 350, 505), 2.7f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_ALPHABLUE);
- [self.mapConfigViewController.view addSubview:middleBackground];
- [middleBackground release];
- UILabel *rightBackground = createLabelWithParams(nil, CGRectMake(704, 214, 320, 464), 2.7f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_ALPHABLUE);
- [self.mapConfigViewController.view addSubview:rightBackground];
- [rightBackground release];
- UILabel *topBackground = createLabelWithParams(nil, CGRectMake(714, 14, 300, 190), 2.3f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_ALPHABLUE);
- [self.mapConfigViewController.view addSubview:topBackground];
- [topBackground release];
- UILabel *bottomLeftBackground = createLabelWithParams(nil, CGRectMake(106, 714, 320, 40), 2.0f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_ALPHABLUE);
- [self.mapConfigViewController.view addSubview:bottomLeftBackground];
- [bottomLeftBackground release];
- UILabel *bottomRightBackground = createLabelWithParams(NSLocalizedString(@"Max Hogs: ",@""), CGRectMake(594, 714, 320, 40), 2.0f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_ALPHABLUE);
- bottomRightBackground.font = [UIFont italicSystemFontOfSize:[UIFont labelFontSize]];
- [self.mapConfigViewController.view addSubview:bottomRightBackground];
- [bottomRightBackground release];
+ UILabel *theLabel;
+ // left column
+ theLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 60, 320, 620) andTitle:nil withBorderWidth:2.7f];
+ [self.mapConfigViewController.view addSubview:theLabel];
+ releaseAndNil(theLabel);
+ // center column
+ theLabel = [[UILabel alloc] initWithFrame:CGRectMake(337, 187, 350, 505) andTitle:nil withBorderWidth:2.7f];
+ [self.mapConfigViewController.view addSubview:theLabel];
+ releaseAndNil(theLabel);
+ // right column
+ theLabel = [[UILabel alloc] initWithFrame:CGRectMake(704, 214, 320, 466) andTitle:nil withBorderWidth:2.7f];
+ [self.mapConfigViewController.view addSubview:theLabel];
+ releaseAndNil(theLabel);
+ // top right column (map)
+ theLabel = [[UILabel alloc] initWithFrame:CGRectMake(714, 14, 300, 190) andTitle:nil withBorderWidth:2.3f];
+ [self.mapConfigViewController.view addSubview:theLabel];
+ releaseAndNil(theLabel);
+ // bottom left
+ theLabel = [[UILabel alloc] initWithFrame:CGRectMake(110, 714, 320, 40) andTitle:nil withBorderWidth:2.0f];
+ [self.mapConfigViewController.view addSubview:theLabel];
+ releaseAndNil(theLabel);
+ // bottom right
+ theLabel = [[UILabel alloc] initWithFrame:CGRectMake(596, 714, 320, 40)
+ andTitle:NSLocalizedString(@" Max Hogs:",@"")
+ withBorderWidth:2.0f];
+ theLabel.font = [UIFont italicSystemFontOfSize:[UIFont labelFontSize]];
+ theLabel.textColor = [UIColor lightYellowColor];
+ theLabel.textAlignment = UITextAlignmentLeft;
+ [self.mapConfigViewController.view addSubview:theLabel];
+ releaseAndNil(theLabel);
+
[self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.maxLabel];
[self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.sizeLabel];
[self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.segmentedControl];
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,608 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10K540</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">132</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="2"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="841351856">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="606714003">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="766721923">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIToolbar" id="836721772">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">266</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUISegmentedControl" id="563596142">
+ <reference key="NSNextResponder" ref="836721772"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{96, 8}, {270, 30}}</string>
+ <reference key="NSSuperview" ref="836721772"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">12345</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBSegmentControlStyle">2</int>
+ <int key="IBNumberOfSegments">4</int>
+ <int key="IBSelectedSegmentIndex">0</int>
+ <object class="NSArray" key="IBSegmentTitles">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>Map</string>
+ <string>Teams</string>
+ <string>Details</string>
+ <string>Help</string>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentWidths">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentEnabledStates">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentContentOffsets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentImages">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSNull" id="4"/>
+ <reference ref="4"/>
+ <reference ref="4"/>
+ <reference ref="4"/>
+ </object>
+ <object class="NSColor" key="IBTintColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC42IDAuNiAwLjYAA</bytes>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrame">{{0, 276}, {480, 44}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIBarStyle">1</int>
+ <object class="NSMutableArray" key="IBUIItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIBarButtonItem" id="80281356">
+ <string key="IBUITitle">Back</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUIToolbar" ref="836721772"/>
+ </object>
+ <object class="IBUIBarButtonItem" id="716161941">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <reference key="IBUIToolbar" ref="836721772"/>
+ <int key="IBUISystemItemIdentifier">5</int>
+ </object>
+ <object class="IBUIBarButtonItem" id="530186890">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <reference key="IBUICustomView" ref="563596142"/>
+ <reference key="IBUIToolbar" ref="836721772"/>
+ </object>
+ <object class="IBUIBarButtonItem" id="188600069">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <reference key="IBUIToolbar" ref="836721772"/>
+ <int key="IBUISystemItemIdentifier">5</int>
+ </object>
+ <object class="IBUIBarButtonItem" id="919181414">
+ <int key="IBUITag">1</int>
+ <string key="IBUITitle">Start</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <float key="IBUIWidth">68</float>
+ <int key="IBUIStyle">2</int>
+ <reference key="IBUIToolbar" ref="836721772"/>
+ </object>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{480, 320}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="766721923"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="80281356"/>
+ <reference key="destination" ref="841351856"/>
+ </object>
+ <int key="connectionID">17</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="919181414"/>
+ <reference key="destination" ref="841351856"/>
+ </object>
+ <int key="connectionID">23</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">segmentPressed:</string>
+ <reference key="source" ref="563596142"/>
+ <reference key="destination" ref="841351856"/>
+ <int key="IBEventType">13</int>
+ </object>
+ <int key="connectionID">29</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="841351856"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="606714003"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">2</int>
+ <reference key="object" ref="766721923"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="836721772"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">15</int>
+ <reference key="object" ref="836721772"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="80281356"/>
+ <reference ref="919181414"/>
+ <reference ref="188600069"/>
+ <reference ref="530186890"/>
+ <reference ref="716161941"/>
+ </object>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">16</int>
+ <reference key="object" ref="80281356"/>
+ <reference key="parent" ref="836721772"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">18</int>
+ <reference key="object" ref="919181414"/>
+ <reference key="parent" ref="836721772"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">19</int>
+ <reference key="object" ref="188600069"/>
+ <reference key="parent" ref="836721772"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">21</int>
+ <reference key="object" ref="530186890"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="563596142"/>
+ </object>
+ <reference key="parent" ref="836721772"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">20</int>
+ <reference key="object" ref="563596142"/>
+ <reference key="parent" ref="530186890"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">22</int>
+ <reference key="object" ref="716161941"/>
+ <reference key="parent" ref="836721772"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>15.IBPluginDependency</string>
+ <string>15.IBViewBoundsToFrameTransform</string>
+ <string>16.IBPluginDependency</string>
+ <string>18.IBPluginDependency</string>
+ <string>19.IBPluginDependency</string>
+ <string>2.IBEditorWindowLastContentRect</string>
+ <string>2.IBPluginDependency</string>
+ <string>20.IBPluginDependency</string>
+ <string>22.IBPluginDependency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>GameConfigViewController</string>
+ <string>UIResponder</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw58AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{131, 321}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">29</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">GameConfigViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>segmentPressed:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>segmentPressed:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">buttonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">segmentPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/GameConfigViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIBarButtonItem</string>
+ <string key="superclassName">UIBarItem</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIBarItem</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="786211723"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISegmentedControl</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISegmentedControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIToolbar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIToolbar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1056" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3100" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <string key="IBCocoaTouchPluginVersion">132</string>
+ </data>
+</archive>
--- a/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.h Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.h Sat Oct 08 16:54:56 2011 +0200
@@ -22,7 +22,7 @@
#import <Foundation/Foundation.h>
#import "EngineProtocolNetwork.h"
-typedef enum {gtNone, gtLocal, gtSave, gtNet} TGameType;
+typedef enum {gtNone, gtLocal, gtSave, gtMission, gtNet} TGameType;
typedef enum {gsNone, gsInGame, gsEnded, gsInterrupted} TGameStatus;
@class OverlayViewController;
@@ -49,10 +49,12 @@
-(id) initWithController:(id) viewController;
--(void) startLocalGame:(NSDictionary *)withDictionary;
+-(void) startLocalGame:(NSDictionary *)withOptions;
-(void) startSaveGame:(NSString *)atPath;
+-(void) startMissionGame:(NSString *)withScript;
+
-(void) prepareEngineLaunch;
--(void) startGameEngine;
+-(void) engineLaunch;
-(void) gameHasEndedWithStats:(NSArray *)stats;
@end
--- a/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,10 +20,11 @@
#import "GameInterfaceBridge.h"
-#import "PascalImports.h"
+#import "ServerSetup.h"
#import "EngineProtocolNetwork.h"
#import "OverlayViewController.h"
#import "StatsPageViewController.h"
+#import "AudioManagerController.h"
#import "ObjcExports.h"
@implementation GameInterfaceBridge
@@ -31,7 +32,7 @@
-(id) initWithController:(id) viewController {
if (self = [super init]) {
- self.ipcPort = randomPort();
+ self.ipcPort = [ServerSetup randomPort];
self.gameType = gtNone;
self.savePath = nil;
@@ -61,7 +62,7 @@
}
// main routine for calling the actual game engine
--(void) startGameEngine {
+-(void) engineLaunch {
const char *gameArgs[11];
NSInteger width, height;
NSString *ipcString = [[NSString alloc] initWithFormat:@"%d", self.ipcPort];
@@ -78,17 +79,17 @@
height = (int) screenBounds.size.width;
}
- NSString *horizontalSize = [[NSString alloc] initWithFormat:@"%d", width];
- NSString *verticalSize = [[NSString alloc] initWithFormat:@"%d", height];
+ NSString *horizontalSize = [[NSString alloc] initWithFormat:@"%d", width * (int)[[UIScreen mainScreen] scale]];
+ NSString *verticalSize = [[NSString alloc] initWithFormat:@"%d", height * (int)[[UIScreen mainScreen] scale]];
NSString *rotation = [[NSString alloc] initWithString:@"0"];
- NSString *modelId = getModelType();
+ NSString *modelId = [HWUtils modelType];
NSInteger tmpQuality;
if ([modelId hasPrefix:@"iPhone1"] || [modelId hasPrefix:@"iPod1,1"] || [modelId hasPrefix:@"iPod2,1"]) // = iPhone and iPhone 3G or iPod Touch or iPod Touch 2G
tmpQuality = 0x00000001 | 0x00000002 | 0x00000008 | 0x00000040; // rqLowRes | rqBlurryLand | rqSimpleRope | rqKillFlakes
else if ([modelId hasPrefix:@"iPhone2"] || [modelId hasPrefix:@"iPod3"]) // = iPhone 3GS or iPod Touch 3G
tmpQuality = 0x00000002 | 0x00000040; // rqBlurryLand | rqKillFlakes
- else if ([modelId hasPrefix:@"iPad1"] || [modelId hasPrefix:@"iPod4"]) // = iPad 1G or iPod Touch 4G
+ else if ([modelId hasPrefix:@"iPad1"] || [modelId hasPrefix:@"iPod4"]) // = iPad 1G or iPod Touch 4G
tmpQuality = 0x00000002; // rqBlurryLand
else // = everything else
tmpQuality = 0; // full quality
@@ -120,7 +121,7 @@
[localeString release];
[ipcString release];
- objcExportsInit(self.overlayController);
+ [ObjcExports initialize];
// this is the pascal fuction that starts the game, wrapped around isInGame
[HedgewarsAppDelegate sharedAppDelegate].isInGame = YES;
@@ -154,16 +155,18 @@
[userDefaults setObject:self.savePath forKey:@"savedGamePath"];
[userDefaults synchronize];
- [HedgewarsAppDelegate pauseBackgroundMusic];
+ [AudioManagerController pauseBackgroundMusic];
// SYSTEMS ARE GO!!
- [self startGameEngine];
+ [self engineLaunch];
// remove completed games notification
[userDefaults setObject:@"" forKey:@"savedGamePath"];
[userDefaults synchronize];
// now we can remove the cover with a transition
+ blackView.frame = theFrame;
+ blackView.alpha = 1;
[UIView beginAnimations:@"fade in" context:NULL];
[UIView setAnimationDuration:1];
blackView.alpha = 0;
@@ -177,12 +180,11 @@
// warn our host that it's going to be visible again
[self.parentController viewWillAppear:YES];
- if ([[userDefaults objectForKey:@"music"] boolValue])
- [HedgewarsAppDelegate playBackgroundMusic];
+ [AudioManagerController playBackgroundMusic];
}
// set up variables for a local game
--(void) startLocalGame:(NSDictionary *)withDictionary {
+-(void) startLocalGame:(NSDictionary *)withOptions {
self.gameType = gtLocal;
NSDateFormatter *outputFormatter = [[NSDateFormatter alloc] init];
@@ -196,7 +198,7 @@
if ([[NSFileManager defaultManager] fileExistsAtPath:self.savePath])
[[NSFileManager defaultManager] removeItemAtPath:self.savePath error:nil];
- [self.engineProtocol spawnThread:self.savePath withOptions:withDictionary];
+ [self.engineProtocol spawnThread:self.savePath withOptions:withOptions];
[self prepareEngineLaunch];
}
@@ -209,8 +211,21 @@
[self prepareEngineLaunch];
}
+-(void) startMissionGame:(NSString *)withScript {
+ self.gameType = gtMission;
+ self.savePath = nil;
+
+ NSString *missionPath = [[NSString alloc] initWithFormat:@"escript Missions/Training/%@.lua",withScript];
+ NSDictionary *config = [NSDictionary dictionaryWithObject:missionPath forKey:@"mission_command"];
+ [missionPath release];
+ [self.engineProtocol spawnThread:nil withOptions:config];
+ [self prepareEngineLaunch];
+}
+
-(void) gameHasEndedWithStats:(NSArray *)stats {
- // display stats page
+ // wrap this around a retain/realse to prevent being deallocated too soon
+ [self retain];
+ // display stats page if there is something to display
if (stats != nil) {
StatsPageViewController *statsPage = [[StatsPageViewController alloc] initWithStyle:UITableViewStyleGrouped];
statsPage.statsArray = stats;
@@ -225,6 +240,7 @@
// can remove the savefile if the replay has ended
if (self.gameType == gtSave)
[[NSFileManager defaultManager] removeItemAtPath:self.savePath error:nil];
+ [self release];
}
@end
--- a/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,7 +20,7 @@
#import "GeneralSettingsViewController.h"
-#import "CommodityFunctions.h"
+
@implementation GeneralSettingsViewController
@@ -32,6 +32,7 @@
#pragma mark -
#pragma mark View Lifecycle
-(void) viewDidLoad {
+ self.navigationItem.title = @"Edit game options";
[super viewDidLoad];
}
@@ -44,7 +45,7 @@
NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
[userDefaults synchronize];
if ([[userDefaults objectForKey:@"music"] boolValue] == NO)
- [HedgewarsAppDelegate stopBackgroundMusic];
+ [AudioManagerController stopBackgroundMusic];
[super viewWillDisappear:animated];
}
@@ -64,7 +65,7 @@
[theOtherSwitch setOn:NO animated:YES];
if (theOtherSwitch.on)
- [HedgewarsAppDelegate pauseBackgroundMusic];
+ [AudioManagerController pauseBackgroundMusic];
break;
case 20: //musicSwitch
// if switch above (sound) is off, never turn on
@@ -76,9 +77,9 @@
[settings setObject:[NSNumber numberWithBool:theSwitch.on] forKey:@"music"];
if (theSwitch.on)
- [HedgewarsAppDelegate playBackgroundMusic];
+ [AudioManagerController playBackgroundMusic];
else
- [HedgewarsAppDelegate pauseBackgroundMusic];
+ [AudioManagerController pauseBackgroundMusic];
break;
case 30: //alternateSwitch
--- a/project_files/HedgewarsMobile/Classes/GravesViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/GravesViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,8 +20,7 @@
#import "GravesViewController.h"
-#import "CommodityFunctions.h"
-#import "UIImageExtra.h"
+
@implementation GravesViewController
@synthesize teamDictionary, graveArray, lastIndexPath;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/HWUtils.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,60 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2010 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 01/10/2011.
+ */
+
+
+#import <Foundation/Foundation.h>
+
+@interface HWUtils : NSObject {
+
+}
+
++(NSString *)modelType;
++(NSArray *)teamColors;
+
+@end
+
+
+@interface UIColor (extra)
+
++(UIColor *)darkYellowColor;
++(UIColor *)lightYellowColor;
++(UIColor *)darkBlueColor;
++(UIColor *)darkBlueColorTransparent;
++(UIColor *)blackColorTransparent;
+
+@end
+
+
+@interface UILabel (extra)
+
+-(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title;
+-(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth;
+-(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth
+ withBorderColor:(UIColor *)borderColor withBackgroundColor:(UIColor *)backColor;
+
+@end
+
+
+@interface NSString (extra)
+
+-(NSString *)MD5hash;
+
+@end
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/HWUtils.m Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,141 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2010 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 01/10/2011.
+ */
+
+
+#import "HWUtils.h"
+#import <sys/types.h>
+#import <sys/sysctl.h>
+#import <QuartzCore/QuartzCore.h>
+#import <CommonCrypto/CommonDigest.h>
+#import "PascalImports.h"
+#import "hwconsts.h"
+
+@implementation HWUtils
+
++(NSString *)modelType {
+ size_t size;
+ // set 'oldp' parameter to NULL to get the size of the data returned so we can allocate appropriate amount of space
+ sysctlbyname("hw.machine", NULL, &size, NULL, 0);
+ char *name = (char *)malloc(sizeof(char) * size);
+ // get the platform name
+ sysctlbyname("hw.machine", name, &size, NULL, 0);
+ NSString *modelId = [NSString stringWithUTF8String:name];
+ free(name);
+
+ return modelId;
+}
+
++(NSArray *)teamColors {
+ // by default colors are ARGB but we do computation over RGB, hence we have to "& 0x00FFFFFF" before processing
+ unsigned int colors[] = HW_TEAMCOLOR_ARRAY;
+ NSMutableArray *array = [[NSMutableArray alloc] init];
+
+ int i = 0;
+ while(colors[i] != 0)
+ [array addObject:[NSNumber numberWithUnsignedInt:(colors[i++] & 0x00FFFFFF)]];
+
+ NSArray *final = [NSArray arrayWithArray:array];
+ [array release];
+ return final;
+}
+
+@end
+
+
+@implementation UIColor (extra)
+
++(UIColor *)darkYellowColor {
+ return [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xC0/255 blue:0 alpha:1];
+}
+
++(UIColor *)lightYellowColor {
+ return [UIColor colorWithRed:(CGFloat)0xF0/255 green:(CGFloat)0xD0/255 blue:0 alpha:1];
+}
+
++(UIColor *)darkBlueColor {
+ return [UIColor colorWithRed:(CGFloat)0x0F/255 green:0 blue:(CGFloat)0x42/255 alpha:1];
+}
+
++(UIColor *)darkBlueColorTransparent {
+ return [UIColor colorWithRed:(CGFloat)0x0F/255 green:0 blue:(CGFloat)0x55/255 alpha:0.6f];
+}
+
++(UIColor *)blackColorTransparent {
+ return [UIColor colorWithRed:0 green:0 blue:0 alpha:0.65f];
+}
+
+@end
+
+
+@implementation UILabel (extra)
+
+-(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title {
+ return [self initWithFrame:frame
+ andTitle:title
+ withBorderWidth:1.5f
+ withBorderColor:[UIColor darkYellowColor]
+ withBackgroundColor:[UIColor darkBlueColor]];
+}
+
+-(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth {
+ return [self initWithFrame:frame
+ andTitle:title
+ withBorderWidth:borderWidth
+ withBorderColor:[UIColor darkYellowColor]
+ withBackgroundColor:[UIColor darkBlueColorTransparent]];
+}
+
+-(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth
+ withBorderColor:(UIColor *)borderColor withBackgroundColor:(UIColor *)backColor{
+ UILabel *theLabel = [self initWithFrame:frame];
+ theLabel.backgroundColor = backColor;
+
+ if (title != nil) {
+ theLabel.text = title;
+ theLabel.textColor = [UIColor lightYellowColor];
+ theLabel.textAlignment = UITextAlignmentCenter;
+ theLabel.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]*80/100];
+ }
+
+ [theLabel.layer setBorderWidth:borderWidth];
+ [theLabel.layer setBorderColor:borderColor.CGColor];
+ [theLabel.layer setCornerRadius:8.0f];
+ [theLabel.layer setMasksToBounds:YES];
+
+ return theLabel;
+}
+
+@end
+
+
+@implementation NSString (extra)
+
+-(NSString *)MD5hash {
+ const char *cStr = [self UTF8String];
+ unsigned char result[16];
+ CC_MD5( cStr, strlen(cStr), result );
+ return [NSString stringWithFormat:
+ @"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+ result[0], result[1], result[2], result[3], result[4], result[5],
+ result[6], result[7], result[8], result[9], result[10], result[11],
+ result[12], result[13], result[14], result[15]];
+}
+
+@end
--- a/project_files/HedgewarsMobile/Classes/HedgewarsAppDelegate.h Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/HedgewarsAppDelegate.h Sat Oct 08 16:54:56 2011 +0200
@@ -23,27 +23,20 @@
#import "SDL_uikitappdelegate.h"
@class MainMenuViewController;
-@class AVAudioPlayer;
@interface HedgewarsAppDelegate : SDLUIKitDelegate {
MainMenuViewController *mainViewController;
UIWindow *uiwindow;
UIWindow *secondWindow;
BOOL isInGame;
- AVAudioPlayer *backgroundMusic;
}
@property (nonatomic,retain) MainMenuViewController *mainViewController;
@property (nonatomic,retain) UIWindow *uiwindow;
@property (nonatomic,retain) UIWindow *secondWindow;
@property (assign) BOOL isInGame;
-@property (nonatomic,retain) AVAudioPlayer *backgroundMusic;
+(HedgewarsAppDelegate *)sharedAppDelegate;
-+(void) playBackgroundMusic;
-+(void) pauseBackgroundMusic;
-+(void) stopBackgroundMusic;
-+(void) loadBackgroundMusic;
@end
--- a/project_files/HedgewarsMobile/Classes/HedgewarsAppDelegate.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/HedgewarsAppDelegate.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,11 +20,8 @@
#import "HedgewarsAppDelegate.h"
-#import "PascalImports.h"
+#import "MainMenuViewController.h"
#import "ObjcExports.h"
-#import "CommodityFunctions.h"
-#import "MainMenuViewController.h"
-#import "AVFoundation/AVAudioPlayer.h"
#include <unistd.h>
@@ -37,7 +34,7 @@
@end
@implementation HedgewarsAppDelegate
-@synthesize mainViewController, uiwindow, secondWindow, isInGame, backgroundMusic;
+@synthesize mainViewController, uiwindow, secondWindow, isInGame;
// convenience method
+(HedgewarsAppDelegate *)sharedAppDelegate {
@@ -45,34 +42,6 @@
}
#pragma mark -
-#pragma mark Music control
-+(void) playBackgroundMusic {
- if ([HedgewarsAppDelegate sharedAppDelegate].backgroundMusic == nil)
- [HedgewarsAppDelegate loadBackgroundMusic];
- [[HedgewarsAppDelegate sharedAppDelegate].backgroundMusic play];
-}
-
-+(void) pauseBackgroundMusic {
- [[HedgewarsAppDelegate sharedAppDelegate].backgroundMusic pause];
-}
-
-+(void) stopBackgroundMusic {
- [[HedgewarsAppDelegate sharedAppDelegate].backgroundMusic stop];
-}
-
-+(void) loadBackgroundMusic {
- NSString *musicString = [[NSBundle mainBundle] pathForResource:@"hwclassic" ofType:@"mp3"];
- AVAudioPlayer *background = [[AVAudioPlayer alloc] initWithContentsOfURL:[NSURL fileURLWithPath:musicString] error:nil];
-
- background.delegate = nil;
- background.volume = 0.4f;
- background.numberOfLoops = -1;
- [background prepareToPlay];
- [HedgewarsAppDelegate sharedAppDelegate].backgroundMusic = background;
- [background release];
-}
-
-#pragma mark -
#pragma mark AppDelegate methods
-(id) init {
if (self = [super init]){
@@ -80,7 +49,6 @@
uiwindow = nil;
secondWindow = nil;
isInGame = NO;
- backgroundMusic = nil;
}
return self;
}
@@ -89,7 +57,6 @@
[mainViewController release];
[uiwindow release];
[secondWindow release];
- [backgroundMusic release];
[super dealloc];
}
@@ -125,20 +92,18 @@
-(void) applicationDidReceiveMemoryWarning:(UIApplication *)application {
// don't stop music when it is playing
if (self.isInGame) {
- [self.backgroundMusic stop];
- self.backgroundMusic = nil;
+ [AudioManagerController cleanupMemory];
MSG_MEMCLEAN();
}
- print_free_memory();
// don't clean mainMenuViewController here!!!
}
+// true multitasking with sdl works only on 4.2 and above; we close the game to avoid a black screen at return
-(void) applicationWillResignActive:(UIApplication *)application {
- // true multitasking with sdl works only on 4.2 and above; we close the game to avoid a black screen at return
- if (self.isInGame && ([[[UIDevice currentDevice] systemVersion] floatValue] < 4.2f))
- HW_terminate(NO);
+ if (self.isInGame && [[[UIDevice currentDevice] systemVersion] floatValue] < 4.2f)
+ HW_terminate(NO);
+
[super applicationWillResignActive:application];
}
-
@end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/HelpPageInGameViewController-iPad.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,889 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1024</int>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">117</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="2"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="841351856">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBProxyObject" id="606714003">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBUIView" id="766721923">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIImageView" id="625666841">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{0, -1}, {1024, 768}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">helpingame.png</string>
+ </object>
+ </object>
+ <object class="IBUILabel" id="271354909">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{79, 473}, {150, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Direction buttons</string>
+ <object class="NSFont" key="IBUIFont" id="583365693">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">18</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor" id="283637272">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="1061067446">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{79, 491}, {203, 85}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">With these buttons you can move your hog, aim and control certain weapons.</string>
+ <object class="NSFont" key="IBUIFont" id="818038162">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">16</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="435000744">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{53, 97}, {186, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Timer</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="580244456">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{53, 118}, {187, 43}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Don't let your turn time run out!</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUIImageView" id="162303877">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{780, 248}, {240, 128}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">helpright.png</string>
+ </object>
+ </object>
+ <object class="IBUILabel" id="323588470">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{790, 256}, {109, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Ammo Menu</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="687330896">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{790, 282}, {214, 84}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">This menu contains all the weapons you can use. Drag your finger on a weapon for more details on what it does!</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="697316303">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{780, 97}, {186, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Pause / Open ammos</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="859729380">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{782, 118}, {187, 43}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Tap to pause or open the ammo menu.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="1045445495">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{418, 73}, {186, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Wind bar</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="635730473">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{418, 89}, {191, 63}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Some weapons are affected by the wind and their direction may shift.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="701155026">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{447, 573}, {203, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Teams flags and health</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="929603608">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{447, 592}, {203, 85}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">These bars report the team name, the team flags and the global health status of every hog.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">4</int>
+ </object>
+ <object class="IBUILabel" id="157896337">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{741, 501}, {135, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Joypad buttons</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="213370333">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{741, 520}, {211, 85}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Press X to jump forward, Y to jump backwards (double tap to jump twice) and Missile to attack or use items.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUIImageView" id="533288614">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{67, 238}, {240, 128}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">helpplain.png</string>
+ </object>
+ </object>
+ <object class="IBUILabel" id="203633929">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{72, 246}, {229, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Tap to return to game</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ <object class="IBUILabel" id="345016434">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{72, 268}, {229, 87}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Pan to move camera, pinch to zoom, double tap to center hog, and a single touch to interact with weapons and much more!</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ </object>
+ <string key="NSFrameSize">{1024, 768}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwLjQAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="766721923"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">dismiss</string>
+ <reference key="source" ref="766721923"/>
+ <reference key="destination" ref="841351856"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">16</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="841351856"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="606714003"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">2</int>
+ <reference key="object" ref="766721923"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="625666841"/>
+ <reference ref="162303877"/>
+ <reference ref="323588470"/>
+ <reference ref="697316303"/>
+ <reference ref="859729380"/>
+ <reference ref="1045445495"/>
+ <reference ref="635730473"/>
+ <reference ref="435000744"/>
+ <reference ref="580244456"/>
+ <reference ref="271354909"/>
+ <reference ref="1061067446"/>
+ <reference ref="701155026"/>
+ <reference ref="157896337"/>
+ <reference ref="533288614"/>
+ <reference ref="203633929"/>
+ <reference ref="345016434"/>
+ <reference ref="213370333"/>
+ <reference ref="929603608"/>
+ <reference ref="687330896"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="625666841"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6</int>
+ <reference key="object" ref="162303877"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="323588470"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8</int>
+ <reference key="object" ref="687330896"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">9</int>
+ <reference key="object" ref="697316303"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">10</int>
+ <reference key="object" ref="859729380"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">11</int>
+ <reference key="object" ref="1045445495"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">12</int>
+ <reference key="object" ref="635730473"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">13</int>
+ <reference key="object" ref="435000744"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">14</int>
+ <reference key="object" ref="580244456"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">17</int>
+ <reference key="object" ref="271354909"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">18</int>
+ <reference key="object" ref="1061067446"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">21</int>
+ <reference key="object" ref="701155026"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">22</int>
+ <reference key="object" ref="929603608"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">23</int>
+ <reference key="object" ref="157896337"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">24</int>
+ <reference key="object" ref="213370333"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">25</int>
+ <reference key="object" ref="533288614"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">26</int>
+ <reference key="object" ref="203633929"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">27</int>
+ <reference key="object" ref="345016434"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>10.IBPluginDependency</string>
+ <string>11.IBPluginDependency</string>
+ <string>12.IBPluginDependency</string>
+ <string>13.IBPluginDependency</string>
+ <string>14.IBPluginDependency</string>
+ <string>17.IBPluginDependency</string>
+ <string>18.IBPluginDependency</string>
+ <string>2.CustomClassName</string>
+ <string>2.IBEditorWindowLastContentRect</string>
+ <string>2.IBPluginDependency</string>
+ <string>21.IBPluginDependency</string>
+ <string>22.IBPluginDependency</string>
+ <string>23.IBPluginDependency</string>
+ <string>24.IBPluginDependency</string>
+ <string>25.IBPluginDependency</string>
+ <string>26.IBPluginDependency</string>
+ <string>27.IBPluginDependency</string>
+ <string>5.IBPluginDependency</string>
+ <string>6.IBPluginDependency</string>
+ <string>7.IBPluginDependency</string>
+ <string>8.IBPluginDependency</string>
+ <string>9.IBPluginDependency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>HelpPageViewController</string>
+ <string>UIResponder</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>UIControl</string>
+ <string>{{288, 355}, {1024, 768}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">27</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">HelpPageViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">dismiss</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">dismiss</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">dismiss</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/HelpPageViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIImageView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="786211723"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1024" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3100" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>helpingame.png</string>
+ <string>helpplain.png</string>
+ <string>helpright.png</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{1024, 768}</string>
+ <string>{296, 138}</string>
+ <string>{308, 144}</string>
+ </object>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">117</string>
+ </data>
+</archive>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/HelpPageInGameViewController-iPhone.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1014 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10H574</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">132</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="2"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="841351856">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="606714003">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="766721923">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIScrollView" id="480371523">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUILabel" id="806535969">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 283}, {150, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Direction buttons</string>
+ <object class="NSFont" key="IBUIFont" id="583365693">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">18</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor" id="283637272">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="837055082">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 292}, {203, 85}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">With these buttons you can move your hog, aim and control certain weapons.</string>
+ <object class="NSFont" key="IBUIFont" id="818038162">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">16</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="669645325">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 13}, {186, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Timer</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="392421036">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 34}, {187, 43}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Don't let your turn time run out!</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="709427542">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{217, 308}, {243, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Touch interface</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">2</int>
+ </object>
+ <object class="IBUILabel" id="748437184">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{231, 328}, {229, 87}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Pan to move camera, pinch to zoom, double tap to center hog, and a single touch to interact with weapons and much more!</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ <int key="IBUITextAlignment">2</int>
+ </object>
+ <object class="IBUILabel" id="941791832">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 85}, {186, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Wind bar</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="26100154">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 101}, {191, 63}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Some weapons are affected by the wind and their direction may shift.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="413836006">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 172}, {203, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Teams flags and health</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="579557686">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 191}, {203, 85}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">These bars report the team name, the team flags and the global health status of every hog.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">4</int>
+ </object>
+ <object class="IBUILabel" id="740577465">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{274, 13}, {186, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Pause / Open ammos</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">2</int>
+ </object>
+ <object class="IBUILabel" id="347724774">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{273, 35}, {187, 43}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Tap to pause or open the ammo menu.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ <int key="IBUITextAlignment">2</int>
+ </object>
+ <object class="IBUILabel" id="318624215">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{351, 82}, {109, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Ammo Menu</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">2</int>
+ </object>
+ <object class="IBUILabel" id="145842014">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{246, 105}, {214, 84}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">This menu contains all the weapons you can use. Drag your finger on a weapon for more details on what it does!</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ <int key="IBUITextAlignment">2</int>
+ </object>
+ <object class="IBUILabel" id="415037922">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{325, 197}, {135, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Joypad buttons</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">2</int>
+ </object>
+ <object class="IBUILabel" id="499026341">
+ <reference key="NSNextResponder" ref="480371523"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{249, 217}, {211, 85}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Press X to jump forward, Y to jump backwards (double tap to jump twice) and Missile to attack or use items.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ <int key="IBUITextAlignment">2</int>
+ </object>
+ </object>
+ <string key="NSFrame">{{-5, 44}, {489, 332}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <int key="IBUITag">1</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUINavigationBar" id="126317414">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">290</int>
+ <string key="NSFrame">{{-1, 0}, {481, 44}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSArray" key="IBUIItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUINavigationItem" id="477618874">
+ <reference key="IBUINavigationBar" ref="126317414"/>
+ <string key="IBUITitle">Help page</string>
+ <object class="IBUIBarButtonItem" key="IBUILeftBarButtonItem" id="843591489">
+ <string key="IBUITitle">Back</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUINavigationItem" ref="477618874"/>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{480, 320}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45OTYwNzg0OTEyIDAuOTg4MjM1MzU0NCAxAA</bytes>
+ </object>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="766721923"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">dismiss</string>
+ <reference key="source" ref="843591489"/>
+ <reference key="destination" ref="841351856"/>
+ </object>
+ <int key="connectionID">141</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">scrollView</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="480371523"/>
+ </object>
+ <int key="connectionID">142</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="841351856"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="606714003"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">2</int>
+ <reference key="object" ref="766721923"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="126317414"/>
+ <reference ref="480371523"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">118</int>
+ <reference key="object" ref="126317414"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="477618874"/>
+ </object>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">121</int>
+ <reference key="object" ref="480371523"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="709427542"/>
+ <reference ref="392421036"/>
+ <reference ref="669645325"/>
+ <reference ref="941791832"/>
+ <reference ref="26100154"/>
+ <reference ref="806535969"/>
+ <reference ref="837055082"/>
+ <reference ref="413836006"/>
+ <reference ref="579557686"/>
+ <reference ref="748437184"/>
+ <reference ref="740577465"/>
+ <reference ref="347724774"/>
+ <reference ref="318624215"/>
+ <reference ref="145842014"/>
+ <reference ref="415037922"/>
+ <reference ref="499026341"/>
+ </object>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">122</int>
+ <reference key="object" ref="709427542"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">124</int>
+ <reference key="object" ref="392421036"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">125</int>
+ <reference key="object" ref="669645325"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">126</int>
+ <reference key="object" ref="941791832"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">127</int>
+ <reference key="object" ref="26100154"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">128</int>
+ <reference key="object" ref="806535969"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">129</int>
+ <reference key="object" ref="837055082"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">130</int>
+ <reference key="object" ref="413836006"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">131</int>
+ <reference key="object" ref="579557686"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">132</int>
+ <reference key="object" ref="748437184"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">133</int>
+ <reference key="object" ref="740577465"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">134</int>
+ <reference key="object" ref="347724774"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">135</int>
+ <reference key="object" ref="318624215"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">136</int>
+ <reference key="object" ref="145842014"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">137</int>
+ <reference key="object" ref="415037922"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">138</int>
+ <reference key="object" ref="499026341"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">119</int>
+ <reference key="object" ref="477618874"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="843591489"/>
+ </object>
+ <reference key="parent" ref="126317414"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">140</int>
+ <reference key="object" ref="843591489"/>
+ <reference key="parent" ref="477618874"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>118.IBPluginDependency</string>
+ <string>118.IBViewBoundsToFrameTransform</string>
+ <string>119.IBPluginDependency</string>
+ <string>121.IBEditorWindowLastContentRect</string>
+ <string>121.IBPluginDependency</string>
+ <string>121.IBViewBoundsToFrameTransform</string>
+ <string>122.IBPluginDependency</string>
+ <string>122.IBViewBoundsToFrameTransform</string>
+ <string>124.IBPluginDependency</string>
+ <string>124.IBViewBoundsToFrameTransform</string>
+ <string>125.IBPluginDependency</string>
+ <string>125.IBViewBoundsToFrameTransform</string>
+ <string>126.IBPluginDependency</string>
+ <string>126.IBViewBoundsToFrameTransform</string>
+ <string>127.IBPluginDependency</string>
+ <string>127.IBViewBoundsToFrameTransform</string>
+ <string>128.IBPluginDependency</string>
+ <string>128.IBViewBoundsToFrameTransform</string>
+ <string>129.IBPluginDependency</string>
+ <string>129.IBViewBoundsToFrameTransform</string>
+ <string>130.IBPluginDependency</string>
+ <string>130.IBViewBoundsToFrameTransform</string>
+ <string>131.IBPluginDependency</string>
+ <string>131.IBViewBoundsToFrameTransform</string>
+ <string>132.IBPluginDependency</string>
+ <string>132.IBViewBoundsToFrameTransform</string>
+ <string>133.IBPluginDependency</string>
+ <string>133.IBViewBoundsToFrameTransform</string>
+ <string>134.IBPluginDependency</string>
+ <string>134.IBViewBoundsToFrameTransform</string>
+ <string>135.IBPluginDependency</string>
+ <string>135.IBViewBoundsToFrameTransform</string>
+ <string>136.IBPluginDependency</string>
+ <string>136.IBViewBoundsToFrameTransform</string>
+ <string>137.IBPluginDependency</string>
+ <string>137.IBViewBoundsToFrameTransform</string>
+ <string>138.IBPluginDependency</string>
+ <string>138.IBViewBoundsToFrameTransform</string>
+ <string>140.IBPluginDependency</string>
+ <string>2.IBEditorWindowLastContentRect</string>
+ <string>2.IBPluginDependency</string>
+ <string>2.IBViewBoundsToFrameTransform</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>HelpPageViewController</string>
+ <string>UIResponder</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AQAAAADAQAAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{589, 578}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AcCgAABCMAAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDZwAAw7aAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCVAAAwx8AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwnQAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCxgAAwtYAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCxgAAwyQAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw+SAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAxARAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw6aAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw8+AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDZwAAw+EAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDiQAAwmwAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDiIAAwswAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDr4AAwwUAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDdgAAw1oAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDooAAw3gAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDeQAAw6aAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{165, 514}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw4kAAA</bytes>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">142</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">HelpPageViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">dismiss</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">dismiss</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">dismiss</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">scrollView</string>
+ <string key="NS.object.0">UIScrollView</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">scrollView</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">scrollView</string>
+ <string key="candidateClassName">UIScrollView</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/HelpPageViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIBarButtonItem</string>
+ <string key="superclassName">UIBarItem</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIBarItem</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UINavigationBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="847596400">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UINavigationItem</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="847596400"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="786211723"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1056" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3100" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <string key="IBCocoaTouchPluginVersion">132</string>
+ </data>
+</archive>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPad.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1024</int>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">123</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="841351856">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBProxyObject" id="606714003">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBUIView" id="766721923">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIImageView" id="1011244481">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{742, 389}, {240, 102}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage" id="468391955">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">helpabove.png</string>
+ </object>
+ </object>
+ <object class="IBUILabel" id="636170775">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{753, 408}, {109, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Map theme</string>
+ <object class="NSFont" key="IBUIFont" id="583365693">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">18</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor" id="283637272">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="552788325">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{753, 425}, {218, 66}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Here you can choose how your map will appear in game.</string>
+ <object class="NSFont" key="IBUIFont" id="818038162">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">16</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUIImageView" id="379980516">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{653, 202}, {240, 146}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <reference key="IBUIImage" ref="468391955"/>
+ </object>
+ <object class="IBUILabel" id="901581152">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{664, 223}, {109, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Map type</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="595424508">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{664, 244}, {218, 99}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Choose between a static map or a randomly generated one (might require more time). In a mission you need to perfom some action to win.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUIImageView" id="162303877">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{494, 20}, {240, 101}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">helpright.png</string>
+ </object>
+ </object>
+ <object class="IBUILabel" id="323588470">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{502, 25}, {109, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Map preview</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="687330896">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{502, 46}, {218, 65}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">This is a small preview of your next map. Tap to select / generate a new map.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUIImageView" id="713859408">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{391, 389}, {242, 171}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <reference key="IBUIImage" ref="468391955"/>
+ </object>
+ <object class="IBUILabel" id="896727228">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{401, 413}, {109, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Teams</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="704238452">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{400, 434}, {232, 120}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Select which teams are playing! Add hogs by tapping on them and set their color to figure friend and foe teams out. AI teams will appear with a small robot badge next their name.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUIImageView" id="993770514">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{142, 125}, {240, 104}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage" id="63133621">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">helpleft.png</string>
+ </object>
+ </object>
+ <object class="IBUILabel" id="488737408">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{162, 133}, {204, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Schemes and Weapons</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="463058693">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{162, 152}, {210, 71}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Here you can choose which rules and which weapon set will be applied in game.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUIImageView" id="845663511">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{155, 8}, {278, 50}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <reference key="IBUIImage" ref="63133621"/>
+ </object>
+ <object class="IBUILabel" id="823916653">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{177, 6}, {248, 54}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Did you know you can customize almost everything in the settings page?</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Oblique</string>
+ <double key="NSSize">14</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUIImageView" id="678356402">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{686, 583}, {240, 117}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage" id="835742298">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">helpbottom.png</string>
+ </object>
+ </object>
+ <object class="IBUILabel" id="1068254353">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{697, 592}, {138, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Max hedgehogs</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="1023832701">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{697, 609}, {218, 73}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">This number is the maximum size for all the hogs playing (in every team).</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUIImageView" id="261734864">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 587}, {240, 109}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <reference key="IBUIImage" ref="835742298"/>
+ </object>
+ <object class="IBUILabel" id="578857422">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{30, 592}, {138, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Size slider</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="972150858">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{30, 608}, {218, 73}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">For Random and Maze maps you can decide to generate only maps of a certain size.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUIImageView" id="533288614">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{45, 318}, {240, 128}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">helpplain.png</string>
+ </object>
+ </object>
+ <object class="IBUILabel" id="203633929">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{50, 326}, {229, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Tap anywhere to dismiss</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ <object class="IBUILabel" id="345016434">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{52, 348}, {224, 87}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Still confused? Don't worry, it's really simple! Try a couple of games and everything will become clear to you.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUIImageView" id="109182727">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{344, 635}, {240, 61}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <reference key="IBUIImage" ref="835742298"/>
+ </object>
+ <object class="IBUILabel" id="815146899">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{353, 637}, {138, 22}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Start button</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="379008984">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{354, 650}, {218, 46}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">This button starts the game.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ </object>
+ <string key="NSFrameSize">{1024, 768}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwLjQAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="766721923"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">dismiss</string>
+ <reference key="source" ref="766721923"/>
+ <reference key="destination" ref="841351856"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">16</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="841351856"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="606714003"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">2</int>
+ <reference key="object" ref="766721923"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="162303877"/>
+ <reference ref="323588470"/>
+ <reference ref="687330896"/>
+ <reference ref="1011244481"/>
+ <reference ref="552788325"/>
+ <reference ref="636170775"/>
+ <reference ref="1023832701"/>
+ <reference ref="1068254353"/>
+ <reference ref="261734864"/>
+ <reference ref="578857422"/>
+ <reference ref="972150858"/>
+ <reference ref="713859408"/>
+ <reference ref="896727228"/>
+ <reference ref="704238452"/>
+ <reference ref="533288614"/>
+ <reference ref="203633929"/>
+ <reference ref="345016434"/>
+ <reference ref="109182727"/>
+ <reference ref="379008984"/>
+ <reference ref="815146899"/>
+ <reference ref="379980516"/>
+ <reference ref="901581152"/>
+ <reference ref="595424508"/>
+ <reference ref="678356402"/>
+ <reference ref="993770514"/>
+ <reference ref="488737408"/>
+ <reference ref="463058693"/>
+ <reference ref="845663511"/>
+ <reference ref="823916653"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6</int>
+ <reference key="object" ref="162303877"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="323588470"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8</int>
+ <reference key="object" ref="687330896"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">25</int>
+ <reference key="object" ref="533288614"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">26</int>
+ <reference key="object" ref="203633929"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">27</int>
+ <reference key="object" ref="345016434"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">28</int>
+ <reference key="object" ref="1011244481"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">29</int>
+ <reference key="object" ref="636170775"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">30</int>
+ <reference key="object" ref="552788325"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">34</int>
+ <reference key="object" ref="678356402"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">35</int>
+ <reference key="object" ref="1068254353"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">36</int>
+ <reference key="object" ref="1023832701"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">37</int>
+ <reference key="object" ref="261734864"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">38</int>
+ <reference key="object" ref="578857422"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">39</int>
+ <reference key="object" ref="972150858"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">40</int>
+ <reference key="object" ref="993770514"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">41</int>
+ <reference key="object" ref="488737408"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">42</int>
+ <reference key="object" ref="463058693"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">43</int>
+ <reference key="object" ref="713859408"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">44</int>
+ <reference key="object" ref="896727228"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">45</int>
+ <reference key="object" ref="704238452"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">49</int>
+ <reference key="object" ref="109182727"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">50</int>
+ <reference key="object" ref="815146899"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">51</int>
+ <reference key="object" ref="379008984"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">52</int>
+ <reference key="object" ref="379980516"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">53</int>
+ <reference key="object" ref="901581152"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">54</int>
+ <reference key="object" ref="595424508"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">58</int>
+ <reference key="object" ref="845663511"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">59</int>
+ <reference key="object" ref="823916653"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>2.CustomClassName</string>
+ <string>2.IBEditorWindowLastContentRect</string>
+ <string>2.IBPluginDependency</string>
+ <string>25.IBPluginDependency</string>
+ <string>26.IBPluginDependency</string>
+ <string>27.IBPluginDependency</string>
+ <string>28.IBPluginDependency</string>
+ <string>29.IBPluginDependency</string>
+ <string>30.IBPluginDependency</string>
+ <string>34.IBPluginDependency</string>
+ <string>35.IBPluginDependency</string>
+ <string>36.IBPluginDependency</string>
+ <string>37.IBPluginDependency</string>
+ <string>38.IBPluginDependency</string>
+ <string>39.IBPluginDependency</string>
+ <string>40.IBPluginDependency</string>
+ <string>41.IBPluginDependency</string>
+ <string>42.IBPluginDependency</string>
+ <string>43.IBPluginDependency</string>
+ <string>44.IBPluginDependency</string>
+ <string>45.IBPluginDependency</string>
+ <string>49.IBPluginDependency</string>
+ <string>50.IBPluginDependency</string>
+ <string>51.IBPluginDependency</string>
+ <string>52.IBPluginDependency</string>
+ <string>53.IBPluginDependency</string>
+ <string>54.IBPluginDependency</string>
+ <string>58.IBPluginDependency</string>
+ <string>59.IBPluginDependency</string>
+ <string>6.IBPluginDependency</string>
+ <string>7.IBPluginDependency</string>
+ <string>8.IBPluginDependency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>HelpPageViewController</string>
+ <string>UIResponder</string>
+ <string>UIControl</string>
+ <string>{{273, 125}, {1024, 768}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">59</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">HelpPageViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">dismiss</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">dismiss</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">dismiss</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/HelpPageViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIImageView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="786211723"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1024" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3100" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>helpabove.png</string>
+ <string>helpbottom.png</string>
+ <string>helpleft.png</string>
+ <string>helpplain.png</string>
+ <string>helpright.png</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{295, 156}</string>
+ <string>{295, 156}</string>
+ <string>{308, 144}</string>
+ <string>{296, 138}</string>
+ <string>{308, 144}</string>
+ </object>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">123</string>
+ </data>
+</archive>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPhone.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,907 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1024</int>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">123</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="2"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="841351856">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="606714003">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="766721923">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIScrollView" id="451725730">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">268</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUILabel" id="381271451">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 587}, {440, 52}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Still confused? Don't worry, it's really simple! Try a couple of games and everything will become clear to you.</string>
+ <object class="NSFont" key="IBUIFont" id="818038162">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">16</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor" id="283637272">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ <object class="IBUILabel" id="160273292">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 279}, {138, 22}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Size slider</string>
+ <object class="NSFont" key="IBUIFont" id="583365693">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">18</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="399703336">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 298}, {440, 44}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">For Random and Maze maps you can decide to generate only maps of a certain size.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="780482878">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 511}, {204, 22}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Schemes and Weapons</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="715276626">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 530}, {433, 45}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Here you can choose which rules and which weapon set will be applied in game.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="81383071">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 68}, {109, 22}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Map preview</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="518187701">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 88}, {440, 44}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">This is a small preview of your next map. Tap to select / generate a new map.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="601567061">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 140}, {109, 22}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Map type</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="514192288">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 164}, {440, 58}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Choose between a static map or a randomly generated one (might require more time). In a mission you need to perfom some action to win.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="136109594">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 229}, {109, 22}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Map theme</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="345586237">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 244}, {440, 33}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Here you can choose how your map will appear in game.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="686505362">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 347}, {138, 22}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Max hedgehogs</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="629677748">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 367}, {440, 41}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">This number is the maximum size for all the hogs playing (in every team).</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="79643170">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 418}, {109, 22}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Teams</string>
+ <reference key="IBUIFont" ref="583365693"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUILabel" id="676482380">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 436}, {433, 66}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Select which teams are playing! Add hogs by tapping on them and set their color to figure friend and foe teams out. AI teams will appear with a small robot badge next their name.</string>
+ <reference key="IBUIFont" ref="818038162"/>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ </object>
+ <object class="IBUILabel" id="66496634">
+ <reference key="NSNextResponder" ref="451725730"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{13, 3}, {440, 60}}</string>
+ <reference key="NSSuperview" ref="451725730"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Here you can find help for the game configuration options. You can customize almost everything in the settings page.</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Oblique</string>
+ <double key="NSSize">16</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="IBUITextColor" ref="283637272"/>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">0</int>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ </object>
+ <string key="NSFrameSize">{480, 276}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <string key="NSFrameSize">{480, 276}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45OTYwNzg0OTEyIDAuOTg4MjM1MzU0NCAxAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <object class="IBUISimulatedToolbarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="766721923"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">scrollView</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="451725730"/>
+ </object>
+ <int key="connectionID">95</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="841351856"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="606714003"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">2</int>
+ <reference key="object" ref="766721923"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="451725730"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">60</int>
+ <reference key="object" ref="451725730"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="381271451"/>
+ <reference ref="160273292"/>
+ <reference ref="399703336"/>
+ <reference ref="81383071"/>
+ <reference ref="518187701"/>
+ <reference ref="601567061"/>
+ <reference ref="514192288"/>
+ <reference ref="136109594"/>
+ <reference ref="345586237"/>
+ <reference ref="686505362"/>
+ <reference ref="629677748"/>
+ <reference ref="780482878"/>
+ <reference ref="715276626"/>
+ <reference ref="79643170"/>
+ <reference ref="676482380"/>
+ <reference ref="66496634"/>
+ </object>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">61</int>
+ <reference key="object" ref="381271451"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">62</int>
+ <reference key="object" ref="160273292"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">63</int>
+ <reference key="object" ref="399703336"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">64</int>
+ <reference key="object" ref="780482878"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">65</int>
+ <reference key="object" ref="715276626"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">66</int>
+ <reference key="object" ref="81383071"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">67</int>
+ <reference key="object" ref="518187701"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">68</int>
+ <reference key="object" ref="601567061"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">69</int>
+ <reference key="object" ref="514192288"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">70</int>
+ <reference key="object" ref="136109594"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">71</int>
+ <reference key="object" ref="345586237"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">72</int>
+ <reference key="object" ref="686505362"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">73</int>
+ <reference key="object" ref="629677748"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">74</int>
+ <reference key="object" ref="79643170"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">75</int>
+ <reference key="object" ref="676482380"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">76</int>
+ <reference key="object" ref="66496634"/>
+ <reference key="parent" ref="451725730"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>2.IBEditorWindowLastContentRect</string>
+ <string>2.IBPluginDependency</string>
+ <string>60.IBPluginDependency</string>
+ <string>60.IBViewBoundsToFrameTransform</string>
+ <string>61.IBPluginDependency</string>
+ <string>61.IBViewBoundsToFrameTransform</string>
+ <string>62.IBPluginDependency</string>
+ <string>62.IBViewBoundsToFrameTransform</string>
+ <string>63.IBPluginDependency</string>
+ <string>63.IBViewBoundsToFrameTransform</string>
+ <string>64.IBPluginDependency</string>
+ <string>64.IBViewBoundsToFrameTransform</string>
+ <string>65.IBPluginDependency</string>
+ <string>65.IBViewBoundsToFrameTransform</string>
+ <string>66.IBPluginDependency</string>
+ <string>66.IBViewBoundsToFrameTransform</string>
+ <string>67.IBPluginDependency</string>
+ <string>67.IBViewBoundsToFrameTransform</string>
+ <string>68.IBPluginDependency</string>
+ <string>68.IBViewBoundsToFrameTransform</string>
+ <string>69.IBPluginDependency</string>
+ <string>69.IBViewBoundsToFrameTransform</string>
+ <string>70.IBPluginDependency</string>
+ <string>70.IBViewBoundsToFrameTransform</string>
+ <string>71.IBPluginDependency</string>
+ <string>71.IBViewBoundsToFrameTransform</string>
+ <string>72.IBPluginDependency</string>
+ <string>72.IBViewBoundsToFrameTransform</string>
+ <string>73.IBPluginDependency</string>
+ <string>73.IBViewBoundsToFrameTransform</string>
+ <string>74.IBPluginDependency</string>
+ <string>74.IBViewBoundsToFrameTransform</string>
+ <string>75.IBPluginDependency</string>
+ <string>75.IBViewBoundsToFrameTransform</string>
+ <string>76.IBPluginDependency</string>
+ <string>76.IBViewBoundsToFrameTransform</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>HelpPageViewController</string>
+ <string>UIResponder</string>
+ <string>{{16, 775}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform"/>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AUGgAABEDIAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABC+AAAw0kAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw14AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw9mAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw+6AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABByAAAwqYAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwxMAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAADCQAAAwqYAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAADCQAAAwzcAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDAAAAw3AAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDAAAAw5aAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDOwAAw6OAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDOwAAw8WAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDDgAAw7UAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDDQAAw/CAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAADBAAAAwlQAAA</bytes>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">95</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">HelpPageViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">dismiss</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">dismiss</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">dismiss</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">scrollView</string>
+ <string key="NS.object.0">UIScrollView</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">scrollView</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">scrollView</string>
+ <string key="candidateClassName">UIScrollView</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/HelpPageViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="786211723"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1024" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3100" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <string key="IBCocoaTouchPluginVersion">123</string>
+ </data>
+</archive>
--- a/project_files/HedgewarsMobile/Classes/HelpPageViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/HelpPageViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,7 +20,7 @@
#import "HelpPageViewController.h"
-#import "CommodityFunctions.h"
+
@implementation HelpPageViewController
@synthesize scrollView;
--- a/project_files/HedgewarsMobile/Classes/HogHatViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/HogHatViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,8 +20,7 @@
#import "HogHatViewController.h"
-#import "CommodityFunctions.h"
-#import "UIImageExtra.h"
+
@implementation HogHatViewController
@synthesize teamDictionary, hatArray, normalHogSprite, lastIndexPath, selectedHog;
@@ -42,13 +41,13 @@
self.hatArray = array;
// load the base hog image, drawing will occure in cellForRow...
- NSString *normalHogFile = [[NSString alloc] initWithFormat:@"%@/Hedgehog.png",GRAPHICS_DIRECTORY()];
- UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:normalHogFile andCutAt:CGRectMake(96, 0, 32, 32)];
+ NSString *normalHogFile = [[NSString alloc] initWithFormat:@"%@/basehat-hedgehog.png",[[NSBundle mainBundle] resourcePath]];
+ UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:normalHogFile];
[normalHogFile release];
self.normalHogSprite = hogSprite;
[hogSprite release];
- self.title = NSLocalizedString(@"Change hedgehog's hat",@"");
+ self.title = NSLocalizedString(@"Change hedgehogs' hat",@"");
}
-(void) viewWillAppear:(BOOL)animated {
--- a/project_files/HedgewarsMobile/Classes/InGameMenuViewController.h Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/InGameMenuViewController.h Sat Oct 08 16:54:56 2011 +0200
@@ -31,6 +31,6 @@
-(void) present;
-(void) dismiss;
--(void) saveCurrentScreenToPhotoAlbum:(UIAlertView *)alert;
+//-(void) saveCurrentScreenToPhotoAlbum:(UIAlertView *)alert;
@end
--- a/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,11 +20,9 @@
#import "InGameMenuViewController.h"
-#import "PascalImports.h"
-#import "CommodityFunctions.h"
#import "SDL_sysvideo.h"
#import "SDL_uikitkeyboard.h"
-#import "OpenGLES/ES1/gl.h"
+
#define VIEW_HEIGHT 200
@@ -45,7 +43,7 @@
NSArray *array = [[NSArray alloc] initWithObjects:
NSLocalizedString(@"Show Help", @""),
NSLocalizedString(@"Tag", @""),
- NSLocalizedString(@"Snapshot",@""),
+// NSLocalizedString(@"Snapshot",@""),
NSLocalizedString(@"End Game", @""),
nil];
self.menuList = array;
@@ -90,6 +88,7 @@
SDL_iPhoneKeyboardHide((SDL_Window *)HW_getSDLWindow());
+ /*
if (shouldTakeScreenshot) {
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Please wait"
message:nil
@@ -107,6 +106,7 @@
// all these hacks because of the PAUSE caption on top of everything...
[self performSelector:@selector(saveCurrentScreenToPhotoAlbum:) withObject:alert afterDelay:0.3];
}
+ */
shouldTakeScreenshot = NO;
}
@@ -117,7 +117,8 @@
}
-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
- return 4;
+ return 3;
+// return 4;
}
-(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -138,7 +139,7 @@
-(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
UIActionSheet *actionSheet;
- UIAlertView *alert;
+// UIAlertView *alert;
switch ([indexPath row]) {
case 0:
@@ -151,6 +152,7 @@
break;
case 2:
+/*
alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Going to take a screenshot",@"")
message:NSLocalizedString(@"The game snapshot will be placed in your Photo Album and it will be taken as soon as the pause menu is dismissed",@"")
delegate:nil
@@ -162,6 +164,7 @@
break;
case 3:
+*/
actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you reeeeeally sure?", @"")
delegate:self
cancelButtonTitle:NSLocalizedString(@"Well, maybe not...", @"")
@@ -189,6 +192,7 @@
}
//TODO: check this is still needed since we switched to SDL_GL_CreateContext()
+/*
#pragma mark -
#pragma mark save screenshot
//by http://www.bit-101.com/blog/?p=1861
@@ -244,6 +248,6 @@
// add callback for cleaning memory and removing alert
UIImageWriteToSavedPhotosAlbum(image, self, @selector(image:didFinishSavingWithError:contextInfo:), (void *)alert);
}
-
+*/
@end
--- a/project_files/HedgewarsMobile/Classes/LevelViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/LevelViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,7 +20,6 @@
#import "LevelViewController.h"
-#import "CommodityFunctions.h"
@implementation LevelViewController
@@ -119,7 +118,7 @@
cell.accessoryType = UITableViewCellAccessoryNone;
}
- NSString *botlevelPath = [[NSString alloc] initWithFormat:@"%@/%d.png",BOTLEVELS_DIRECTORY(),row+1];
+ NSString *botlevelPath = [[NSString alloc] initWithFormat:@"%@/bot%d.png",[[NSBundle mainBundle] resourcePath],row+1];
UIImage *levelImage = [[UIImage alloc] initWithContentsOfFile:botlevelPath];
[botlevelPath release];
cell.imageView.image = levelImage;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController-iPad.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,670 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">132</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBUIView" id="191373211">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIImageView" id="976741091">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrameSize">{1024, 768}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">background.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="867308721">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{383, 389}, {263, 244}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <object class="NSFont" key="IBUIFont" id="917635782">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <double key="IBUITitleEdgeInsets.top">215</double>
+ <double key="IBUITitleEdgeInsets.bottom">0.0</double>
+ <double key="IBUITitleEdgeInsets.left">0.0</double>
+ <double key="IBUITitleEdgeInsets.right">0.0</double>
+ <object class="NSColor" key="IBUIHighlightedTitleColor" id="918890028">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45OTYwNzg0OTEyIDAuODAwMDAwMDcxNSAwLjAzOTIxNTY4NzY2AA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleShadowColor" id="112471976">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">localplayButton~ipad.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="95106947">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{795, 317}, {18, 19}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <float key="IBUIAlpha">0.31690141558647156</float>
+ <int key="IBUITag">3</int>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="917635782"/>
+ <int key="IBUIButtonType">3</int>
+ <bool key="IBUIShowsTouchWhenHighlighted">YES</bool>
+ <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
+ </object>
+ <object class="IBUIButton" id="898948205">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{940, 686}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">2</int>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="917635782"/>
+ <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">settingsButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="894101036">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 686}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">4</int>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="917635782"/>
+ <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">savesButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIImageView" id="1019880682">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{242, 43}, {540, 300}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">title~ipad.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="357438048">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{468, 686}, {89, 37}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">5</int>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="917635782"/>
+ <int key="IBUIButtonType">1</int>
+ <string key="IBUINormalTitle">Missions</string>
+ <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
+ </object>
+ </object>
+ <string key="NSFrameSize">{1024, 768}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="191373211"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">switchViews:</string>
+ <reference key="source" ref="95106947"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">47</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">switchViews:</string>
+ <reference key="source" ref="867308721"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">48</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">switchViews:</string>
+ <reference key="source" ref="898948205"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">54</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">switchViews:</string>
+ <reference key="source" ref="894101036"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">89</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">switchViews:</string>
+ <reference key="source" ref="357438048"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">92</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1</int>
+ <reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="976741091"/>
+ <reference ref="867308721"/>
+ <reference ref="95106947"/>
+ <reference ref="898948205"/>
+ <reference ref="894101036"/>
+ <reference ref="1019880682"/>
+ <reference ref="357438048"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">39</int>
+ <reference key="object" ref="867308721"/>
+ <reference key="parent" ref="191373211"/>
+ <string key="objectName">local</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">45</int>
+ <reference key="object" ref="95106947"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">52</int>
+ <reference key="object" ref="898948205"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">37</int>
+ <reference key="object" ref="976741091"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">88</int>
+ <reference key="object" ref="894101036"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">90</int>
+ <reference key="object" ref="1019880682"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">91</int>
+ <reference key="object" ref="357438048"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>1.IBEditorWindowLastContentRect</string>
+ <string>1.IBPluginDependency</string>
+ <string>37.IBPluginDependency</string>
+ <string>39.IBPluginDependency</string>
+ <string>45.IBPluginDependency</string>
+ <string>45.IBViewBoundsToFrameTransform</string>
+ <string>52.IBPluginDependency</string>
+ <string>52.IBViewBoundsToFrameTransform</string>
+ <string>88.IBPluginDependency</string>
+ <string>88.IBViewBoundsToFrameTransform</string>
+ <string>90.IBPluginDependency</string>
+ <string>90.IBViewBoundsToFrameTransform</string>
+ <string>91.IBPluginDependency</string>
+ <string>91.IBViewBoundsToFrameTransform</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>MainMenuViewController</string>
+ <string>UIResponder</string>
+ <string>{{267, 388}, {1024, 768}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABERQAAw56AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABEaQAAxDsAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAxDsAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDbQAAw6qAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AUPqAABEK4AAA</bytes>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">92</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">MainMenuViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">switchViews:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">switchViews:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">switchViews:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/MainMenuViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="864669175">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIButton</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIImageView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="864669175"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1056" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>background.png</string>
+ <string>localplayButton~ipad.png</string>
+ <string>savesButton.png</string>
+ <string>settingsButton.png</string>
+ <string>title~ipad.png</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{1024, 768}</string>
+ <string>{263, 244}</string>
+ <string>{64, 64}</string>
+ <string>{64, 64}</string>
+ <string>{540, 300}</string>
+ </object>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">132</string>
+ </data>
+</archive>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController-iPhone.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,687 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">132</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="191373211">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">293</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIImageView" id="249993817">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrameSize">{480, 320}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ <int key="IBUIContentMode">4</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">background~iphone.png</string>
+ </object>
+ </object>
+ <object class="IBUIImageView" id="171108356">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">293</int>
+ <string key="NSFrame">{{105, 20}, {270, 150}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUIContentMode">4</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">title~iphone.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="124270424">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">289</int>
+ <string key="NSFrame">{{190, 200}, {100, 100}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAgMAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <object class="NSFont" key="IBUIFont" id="917635782">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUIHighlightedTitleColor" id="918890028">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleShadowColor" id="112471976">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">localplayButton~iphone.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="753723574">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">269</int>
+ <string key="NSFrame">{{396, 236}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUITag">2</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="917635782"/>
+ <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">settingsButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="705508539">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">269</int>
+ <string key="NSFrame">{{20, 236}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUITag">4</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="917635782"/>
+ <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">savesButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="818907840">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 19}, {18, 19}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <float key="IBUIAlpha">0.5</float>
+ <int key="IBUITag">3</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="917635782"/>
+ <int key="IBUIButtonType">3</int>
+ <bool key="IBUIShowsTouchWhenHighlighted">YES</bool>
+ <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
+ </object>
+ <object class="IBUIButton" id="629390161">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{439, 13}, {29, 31}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">5</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="917635782"/>
+ <int key="IBUIButtonType">2</int>
+ <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
+ </object>
+ </object>
+ <string key="NSFrameSize">{480, 320}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="191373211"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">switchViews:</string>
+ <reference key="source" ref="753723574"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">30</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">switchViews:</string>
+ <reference key="source" ref="124270424"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">40</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">switchViews:</string>
+ <reference key="source" ref="818907840"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">42</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">switchViews:</string>
+ <reference key="source" ref="705508539"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">44</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">switchViews:</string>
+ <reference key="source" ref="629390161"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">47</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1</int>
+ <reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="249993817"/>
+ <reference ref="818907840"/>
+ <reference ref="171108356"/>
+ <reference ref="705508539"/>
+ <reference ref="753723574"/>
+ <reference ref="124270424"/>
+ <reference ref="629390161"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">23</int>
+ <reference key="object" ref="171108356"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">22</int>
+ <reference key="object" ref="249993817"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">41</int>
+ <reference key="object" ref="818907840"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">43</int>
+ <reference key="object" ref="705508539"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">24</int>
+ <reference key="object" ref="124270424"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">28</int>
+ <reference key="object" ref="753723574"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">46</int>
+ <reference key="object" ref="629390161"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>1.IBEditorWindowLastContentRect</string>
+ <string>1.IBPluginDependency</string>
+ <string>22.IBPluginDependency</string>
+ <string>22.IBViewBoundsToFrameTransform</string>
+ <string>23.IBPluginDependency</string>
+ <string>23.IBViewBoundsToFrameTransform</string>
+ <string>24.IBPluginDependency</string>
+ <string>24.IBViewBoundsToFrameTransform</string>
+ <string>28.IBPluginDependency</string>
+ <string>28.IBViewBoundsToFrameTransform</string>
+ <string>41.IBPluginDependency</string>
+ <string>41.IBViewBoundsToFrameTransform</string>
+ <string>43.IBPluginDependency</string>
+ <string>43.IBViewBoundsToFrameTransform</string>
+ <string>46.IBPluginDependency</string>
+ <string>46.IBViewBoundsToFrameTransform</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>MainMenuViewController</string>
+ <string>UIResponder</string>
+ <string>{{517, 519}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw5UAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCygAAwzcAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDPgAAw5UAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDxgAAw5iAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwhAAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw5iAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABD0YAAwmgAAA</bytes>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">47</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">MainMenuViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">switchViews:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">switchViews:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">switchViews:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/MainMenuViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="238583711">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIButton</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIImageView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="238583711"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1056" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>background~iphone.png</string>
+ <string>localplayButton~iphone.png</string>
+ <string>savesButton.png</string>
+ <string>settingsButton.png</string>
+ <string>title~iphone.png</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{480, 320}</string>
+ <string>{100, 100}</string>
+ <string>{64, 64}</string>
+ <string>{64, 64}</string>
+ <string>{270, 150}</string>
+ </object>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">132</string>
+ </data>
+</archive>
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.h Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.h Sat Oct 08 16:54:56 2011 +0200
@@ -22,24 +22,27 @@
#import <UIKit/UIKit.h>
@class GameConfigViewController;
-@class SplitViewRootController;
+@class SettingsContainerViewController;
@class AboutViewController;
@class SavedGamesViewController;
@class RestoreViewController;
+@class MissionTrainingViewController;
@interface MainMenuViewController : UIViewController <UIAlertViewDelegate> {
GameConfigViewController *gameConfigViewController;
- SplitViewRootController *settingsViewController;
+ SettingsContainerViewController *settingsViewController;
AboutViewController *aboutViewController;
SavedGamesViewController *savedGamesViewController;
- RestoreViewController *restoreViewCOntroller;
+ RestoreViewController *restoreViewController;
+ MissionTrainingViewController *missionsViewController;
}
@property (nonatomic,retain) GameConfigViewController *gameConfigViewController;
-@property (nonatomic,retain) SplitViewRootController *settingsViewController;
+@property (nonatomic,retain) SettingsContainerViewController *settingsViewController;
@property (nonatomic,retain) AboutViewController *aboutViewController;
@property (nonatomic,retain) SavedGamesViewController *savedGamesViewController;
@property (nonatomic,retain) RestoreViewController *restoreViewController;
+@property (nonatomic,retain) MissionTrainingViewController *missionsViewController;
-(IBAction) switchViews:(id)sender;
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -21,17 +21,20 @@
#import "MainMenuViewController.h"
#import "CreationChamber.h"
-#import "PascalImports.h"
#import "GameConfigViewController.h"
-#import "SplitViewRootController.h"
+#import "SettingsContainerViewController.h"
#import "AboutViewController.h"
#import "SavedGamesViewController.h"
#import "RestoreViewController.h"
+#import "MissionTrainingViewController.h"
+#import "GameInterfaceBridge.h"
#import "Appirater.h"
#import "ServerSetup.h"
+
@implementation MainMenuViewController
-@synthesize gameConfigViewController, settingsViewController, aboutViewController, savedGamesViewController, restoreViewController;
+@synthesize gameConfigViewController, settingsViewController, aboutViewController, savedGamesViewController,
+ restoreViewController, missionsViewController;
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
return rotationManager(interfaceOrientation);
@@ -71,16 +74,19 @@
// SCHEMES - always overwrite and delete custom ones
if ([[NSFileManager defaultManager] fileExistsAtPath:SCHEMES_DIRECTORY()] == YES)
[[NSFileManager defaultManager] removeItemAtPath:SCHEMES_DIRECTORY() error:NULL];
- NSString *baseSchemesDir = [[NSString alloc] initWithFormat:@"%@/Settings/Schemes/",resourcesDir];
- [[NSFileManager defaultManager] copyItemAtPath:baseSchemesDir toPath:SCHEMES_DIRECTORY() error:NULL];
- [baseSchemesDir release];
+ createSchemeNamed(@"Default", 0);
+ createSchemeNamed(@"Pro Mode", 1);
+ createSchemeNamed(@"Shoppa", 2);
+ createSchemeNamed(@"Clean Slate", 3);
+ createSchemeNamed(@"Minefield", 4);
+ createSchemeNamed(@"Barrel Mayhem", 5);
+ createSchemeNamed(@"Tunnel Hogs", 6);
+ createSchemeNamed(@"Fort Mode", 7);
+ createSchemeNamed(@"Timeless", 8);
+ createSchemeNamed(@"Thinking with Portals", 9);
+ createSchemeNamed(@"King Mode", 10);
// WEAPONS - always overwrite
- if ([[NSFileManager defaultManager] fileExistsAtPath:WEAPONS_DIRECTORY()] == NO)
- [[NSFileManager defaultManager] createDirectoryAtPath:WEAPONS_DIRECTORY()
- withIntermediateDirectories:YES
- attributes:nil
- error:NULL];
createWeaponNamed(@"Default", 0);
createWeaponNamed(@"Crazy", 1);
createWeaponNamed(@"Pro Mode", 2);
@@ -102,9 +108,6 @@
NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
NSString *trackingVersion = [userDefaults stringForKey:@"HedgeVersion"];
- if ([[userDefaults objectForKey:@"music"] boolValue])
- [HedgewarsAppDelegate playBackgroundMusic];
-
if (trackingVersion == nil || [trackingVersion isEqualToString:version] == NO) {
// remove any reminder of previous games as saves are going to be wiped out
[userDefaults setObject:@"" forKey:@"savedGamePath"];
@@ -118,6 +121,7 @@
// prompt for restoring any previous game
NSString *saveString = [userDefaults objectForKey:@"savedGamePath"];
if (saveString != nil && [saveString isEqualToString:@""] == NO) {
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(launchRestoredGame) name:@"launchRestoredGame" object:nil];
if (self.restoreViewController == nil) {
NSString *xibName = [@"RestoreViewController-" stringByAppendingString:(IS_IPAD() ? @"iPad" : @"iPhone")];
RestoreViewController *restored = [[RestoreViewController alloc] initWithNibName:xibName bundle:nil];
@@ -126,7 +130,7 @@
self.restoreViewController = restored;
[restored release];
}
- [self performSelector:@selector(presentModalViewController:animated:) withObject:self.restoreViewController afterDelay:0.3];
+ [self performSelector:@selector(presentModalViewController:animated:) withObject:self.restoreViewController afterDelay:0.25];
} else {
// let's not prompt for rating when app crashed >_>
[Appirater appLaunched];
@@ -145,6 +149,10 @@
*/
}
+-(void) viewWillAppear:(BOOL)animated {
+ [AudioManagerController playBackgroundMusic];
+ [super viewWillAppear:animated];
+}
#pragma mark -
-(IBAction) switchViews:(id) sender {
@@ -153,7 +161,7 @@
NSString *xib = nil;
NSString *debugStr = nil;
- playSound(@"clickSound");
+ [AudioManagerController playClickSound];
switch (button.tag) {
case 0:
if (nil == self.gameConfigViewController) {
@@ -164,17 +172,15 @@
self.gameConfigViewController = gcvc;
[gcvc release];
}
-
[self presentModalViewController:self.gameConfigViewController animated:YES];
break;
case 2:
if (nil == self.settingsViewController) {
- SplitViewRootController *svrc = [[SplitViewRootController alloc] initWithNibName:nil bundle:nil];
+ SettingsContainerViewController *svrc = [[SettingsContainerViewController alloc] initWithNibName:nil bundle:nil];
svrc.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
self.settingsViewController = svrc;
[svrc release];
}
-
[self presentModalViewController:self.settingsViewController animated:YES];
break;
case 3:
@@ -217,9 +223,20 @@
self.savedGamesViewController = savedgames;
[savedgames release];
}
-
[self presentModalViewController:self.savedGamesViewController animated:YES];
break;
+ case 5:
+ if (nil == self.missionsViewController) {
+ xib = IS_IPAD() ? @"MissionTrainingViewController-iPad" : @"MissionTrainingViewController-iPhone";
+ MissionTrainingViewController *missions = [[MissionTrainingViewController alloc] initWithNibName:xib bundle:nil];
+ missions.modalTransitionStyle = IS_IPAD() ? UIModalTransitionStyleCoverVertical : UIModalTransitionStyleCrossDissolve;
+ if ([missions respondsToSelector:@selector(setModalPresentationStyle:)])
+ missions.modalPresentationStyle = UIModalPresentationPageSheet;
+ self.missionsViewController = missions;
+ [missions release];
+ }
+ [self presentModalViewController:self.missionsViewController animated:YES];
+ break;
default:
alert = [[UIAlertView alloc] initWithTitle:@"Not Yet Implemented"
message:@"Sorry, this feature is not yet implemented"
@@ -232,12 +249,22 @@
}
}
+#pragma mark -
+-(void) launchRestoredGame {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+ GameInterfaceBridge *bridge = [[GameInterfaceBridge alloc] initWithController:self];
+ [bridge startSaveGame:[[NSUserDefaults standardUserDefaults] objectForKey:@"savedGamePath"]];
+ [bridge release];
+}
+
+#pragma mark -
-(void) viewDidUnload {
self.gameConfigViewController = nil;
self.settingsViewController = nil;
self.aboutViewController = nil;
self.savedGamesViewController = nil;
self.restoreViewController = nil;
+ self.missionsViewController = nil;
MSG_DIDUNLOAD();
[super viewDidUnload];
}
@@ -253,6 +280,8 @@
self.savedGamesViewController = nil;
if (self.restoreViewController.view.superview == nil)
self.restoreViewController = nil;
+ if (self.missionsViewController.view.superview == nil)
+ self.missionsViewController = nil;
MSG_MEMCLEAN();
[super didReceiveMemoryWarning];
}
@@ -263,6 +292,7 @@
releaseAndNil(aboutViewController);
releaseAndNil(savedGamesViewController);
releaseAndNil(restoreViewController);
+ releaseAndNil(missionsViewController);
[super dealloc];
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPad.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1073 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">132</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBUIView" id="191373211">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIImageView" id="420136851">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrameSize">{1024, 768}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIAutoresizesSubviews">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">background.png</string>
+ </object>
+ </object>
+ <object class="IBUISegmentedControl" id="88728219">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">289</int>
+ <string key="NSFrame">{{724, 166}, {280, 30}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBSegmentControlStyle">2</int>
+ <int key="IBNumberOfSegments">4</int>
+ <int key="IBSelectedSegmentIndex">1</int>
+ <object class="NSArray" key="IBSegmentTitles">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>Random</string>
+ <string>Map</string>
+ <string>Maze</string>
+ <string>Mission</string>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentWidths">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentEnabledStates">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentContentOffsets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentImages">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSNull" id="4"/>
+ <reference ref="4"/>
+ <reference ref="4"/>
+ <reference ref="4"/>
+ </object>
+ <object class="NSColor" key="IBTintColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ </object>
+ </object>
+ <object class="IBUISlider" id="938256702">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{263, 723}, {149, 23}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <float key="IBUIValue">0.05000000074505806</float>
+ <float key="IBUIMaxValue">0.05000000074505806</float>
+ </object>
+ <object class="IBUIButton" id="326163764">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">289</int>
+ <string key="NSFrame">{{736, 26}, {256, 128}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <object class="NSFont" key="IBUIFont" id="261639815">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <double key="IBUIImageEdgeInsets.top">4</double>
+ <double key="IBUIImageEdgeInsets.bottom">4</double>
+ <double key="IBUIImageEdgeInsets.left">4</double>
+ <double key="IBUIImageEdgeInsets.right">4</double>
+ <object class="NSColor" key="IBUIHighlightedTitleColor" id="437070330">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleShadowColor" id="65043801">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ </object>
+ <object class="IBUILabel" id="634417433">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{778, 724}, {42, 21}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">...</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">17</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ <object class="IBUILabel" id="743202682">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{112, 720}, {145, 29}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Label</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Oblique</string>
+ <double key="NSSize">18</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45MjU0OTAyNjAxIDAuODAwMDAwMDcxNSAwAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ <object class="IBUIImageView" id="920829014">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{357, 19}, {309, 165}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">title~iphone.png</string>
+ </object>
+ </object>
+ <object class="IBUITableView" id="394383001">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{714, 225}, {300, 445}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <bool key="IBUIAlwaysBounceVertical">YES</bool>
+ <int key="IBUIStyle">1</int>
+ <int key="IBUISeparatorStyle">2</int>
+ <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+ <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+ <float key="IBUIRowHeight">45</float>
+ </object>
+ <object class="IBUIButton" id="550636851">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{441, 702}, {142, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">1</int>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="261639815"/>
+ <reference key="IBUIHighlightedTitleColor" ref="437070330"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="65043801"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">startGameButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="403581306">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{11, 693}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="261639815"/>
+ <reference key="IBUIHighlightedTitleColor" ref="437070330"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="65043801"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">backButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="1065439841">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{955, 693}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">2</int>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="261639815"/>
+ <reference key="IBUIHighlightedTitleColor" ref="437070330"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="65043801"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">helpButton.png</string>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{1024, 768}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC44MzkyMTU3NTU1IDAuODQ3MDU4ODkyMyAwLjg3MDU4ODMwMjYAA</bytes>
+ </object>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="191373211"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">previewButton</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="326163764"/>
+ </object>
+ <int key="connectionID">13</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">maxLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="634417433"/>
+ </object>
+ <int key="connectionID">16</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">sizeLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="743202682"/>
+ </object>
+ <int key="connectionID">18</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">sliderChanged:</string>
+ <reference key="source" ref="938256702"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">13</int>
+ </object>
+ <int key="connectionID">19</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">sliderEndedChanging:</string>
+ <reference key="source" ref="938256702"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">20</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">segmentedControl</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="88728219"/>
+ </object>
+ <int key="connectionID">21</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">segmentedControlChanged:</string>
+ <reference key="source" ref="88728219"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">13</int>
+ </object>
+ <int key="connectionID">22</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">slider</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="938256702"/>
+ </object>
+ <int key="connectionID">23</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="394383001"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">67</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="394383001"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">68</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">tableView</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="394383001"/>
+ </object>
+ <int key="connectionID">69</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="403581306"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">73</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="550636851"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">74</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="1065439841"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">77</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">mapButtonPressed</string>
+ <reference key="source" ref="326163764"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">113</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="326163764"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">114</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1</int>
+ <reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="550636851"/>
+ <reference ref="394383001"/>
+ <reference ref="743202682"/>
+ <reference ref="634417433"/>
+ <reference ref="326163764"/>
+ <reference ref="938256702"/>
+ <reference ref="420136851"/>
+ <reference ref="88728219"/>
+ <reference ref="920829014"/>
+ <reference ref="403581306"/>
+ <reference ref="1065439841"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">75</int>
+ <reference key="object" ref="1065439841"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">72</int>
+ <reference key="object" ref="403581306"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">70</int>
+ <reference key="object" ref="550636851"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">66</int>
+ <reference key="object" ref="394383001"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">57</int>
+ <reference key="object" ref="920829014"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">17</int>
+ <reference key="object" ref="743202682"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">11</int>
+ <reference key="object" ref="634417433"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">9</int>
+ <reference key="object" ref="326163764"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8</int>
+ <reference key="object" ref="938256702"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="88728219"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">50</int>
+ <reference key="object" ref="420136851"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>1.IBEditorWindowLastContentRect</string>
+ <string>1.IBPluginDependency</string>
+ <string>11.IBPluginDependency</string>
+ <string>17.IBPluginDependency</string>
+ <string>50.IBPluginDependency</string>
+ <string>50.IBViewBoundsToFrameTransform</string>
+ <string>57.IBPluginDependency</string>
+ <string>57.IBViewBoundsToFrameTransform</string>
+ <string>66.IBPluginDependency</string>
+ <string>7.IBPluginDependency</string>
+ <string>7.IBViewBoundsToFrameTransform</string>
+ <string>70.IBPluginDependency</string>
+ <string>70.IBViewBoundsToFrameTransform</string>
+ <string>72.IBPluginDependency</string>
+ <string>72.IBViewBoundsToFrameTransform</string>
+ <string>75.IBPluginDependency</string>
+ <string>75.IBViewBoundsToFrameTransform</string>
+ <string>8.IBPluginDependency</string>
+ <string>9.CustomClassName</string>
+ <string>9.IBPluginDependency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>MapConfigViewController</string>
+ <string>UIResponder</string>
+ <string>{{288, 236}, {1024, 768}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform"/>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDsoAAwz8AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABENUAAw0IAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABD3IAAxD8AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBIAAAxDzAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABEbsAAxDzAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>MapPreviewButtonView</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">120</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">MapConfigViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>mapButtonPressed</string>
+ <string>segmentedControlChanged:</string>
+ <string>sliderChanged:</string>
+ <string>sliderEndedChanging:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>mapButtonPressed</string>
+ <string>segmentedControlChanged:</string>
+ <string>sliderChanged:</string>
+ <string>sliderEndedChanging:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">buttonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">mapButtonPressed</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">segmentedControlChanged:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">sliderChanged:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">sliderEndedChanging:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>maxLabel</string>
+ <string>previewButton</string>
+ <string>segmentedControl</string>
+ <string>sizeLabel</string>
+ <string>slider</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UILabel</string>
+ <string>MapPreviewButtonView</string>
+ <string>UISegmentedControl</string>
+ <string>UILabel</string>
+ <string>UISlider</string>
+ <string>UITableView</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>maxLabel</string>
+ <string>previewButton</string>
+ <string>segmentedControl</string>
+ <string>sizeLabel</string>
+ <string>slider</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">maxLabel</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">previewButton</string>
+ <string key="candidateClassName">MapPreviewButtonView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">segmentedControl</string>
+ <string key="candidateClassName">UISegmentedControl</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">sizeLabel</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">slider</string>
+ <string key="candidateClassName">UISlider</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableView</string>
+ <string key="candidateClassName">UITableView</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/MapConfigViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">MapPreviewButtonView</string>
+ <string key="superclassName">UIButton</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">delegate</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">delegate</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">delegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/MapPreviewButtonView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/HWUtils.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="567455553">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIButton</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIImageView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="567455553"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISegmentedControl</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISegmentedControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISlider</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISlider.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableView</string>
+ <string key="superclassName">UIScrollView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1056" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>backButton.png</string>
+ <string>background.png</string>
+ <string>helpButton.png</string>
+ <string>startGameButton.png</string>
+ <string>title~iphone.png</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{64, 64}</string>
+ <string>{1024, 768}</string>
+ <string>{64, 64}</string>
+ <string>{142, 64}</string>
+ <string>{270, 150}</string>
+ </object>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">132</string>
+ </data>
+</archive>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,961 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">132</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="191373211">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIImageView" id="574494641">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrameSize">{480, 276}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">background~iphone.png</string>
+ </object>
+ </object>
+ <object class="IBUISegmentedControl" id="88728219">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{9, 14}, {270, 30}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBSegmentControlStyle">2</int>
+ <int key="IBNumberOfSegments">4</int>
+ <int key="IBSelectedSegmentIndex">1</int>
+ <object class="NSArray" key="IBSegmentTitles">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>Random</string>
+ <string>Map</string>
+ <string>Maze</string>
+ <string>Mission</string>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentWidths">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentEnabledStates">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentContentOffsets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentImages">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSNull" id="4"/>
+ <reference ref="4"/>
+ <reference ref="4"/>
+ <reference ref="4"/>
+ </object>
+ <object class="NSColor" key="IBTintColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ </object>
+ </object>
+ <object class="IBUISlider" id="938256702">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{119, 207}, {149, 23}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <float key="IBUIValue">0.05000000074505806</float>
+ <float key="IBUIMaxValue">0.05000000074505806</float>
+ </object>
+ <object class="IBUIButton" id="326163764">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{16, 58}, {256, 128}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUIHighlightedTitleColor" id="437070330">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleShadowColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ </object>
+ <object class="IBUILabel" id="634417433">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{58, 221}, {48, 35}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">...</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">17</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ <object class="IBUILabel" id="743202682">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{109, 237}, {169, 29}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Label</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Oblique</string>
+ <double key="NSSize">22</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor" id="312386610">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ <object class="IBUITableView" id="565214171">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{284, 0}, {196, 276}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <bool key="IBUIBouncesZoom">NO</bool>
+ <int key="IBUIStyle">1</int>
+ <int key="IBUISeparatorStyle">2</int>
+ <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+ <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+ <float key="IBUIRowHeight">44</float>
+ <float key="IBUISectionHeaderHeight">10</float>
+ <float key="IBUISectionFooterHeight">10</float>
+ </object>
+ <object class="IBUILabel" id="32436512">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{-9, 225}, {92, 27}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Max</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-BoldOblique</string>
+ <double key="NSSize">18</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="IBUITextColor" ref="312386610"/>
+ <reference key="IBUIHighlightedColor" ref="437070330"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ </object>
+ <string key="NSFrameSize">{480, 276}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="IBUIBackgroundColor" ref="437070330"/>
+ <object class="IBUISimulatedToolbarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="191373211"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">previewButton</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="326163764"/>
+ </object>
+ <int key="connectionID">13</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">maxLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="634417433"/>
+ </object>
+ <int key="connectionID">16</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">sizeLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="743202682"/>
+ </object>
+ <int key="connectionID">18</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">sliderChanged:</string>
+ <reference key="source" ref="938256702"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">13</int>
+ </object>
+ <int key="connectionID">19</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">sliderEndedChanging:</string>
+ <reference key="source" ref="938256702"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">20</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">segmentedControl</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="88728219"/>
+ </object>
+ <int key="connectionID">21</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">segmentedControlChanged:</string>
+ <reference key="source" ref="88728219"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">13</int>
+ </object>
+ <int key="connectionID">22</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">slider</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="938256702"/>
+ </object>
+ <int key="connectionID">23</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="565214171"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">26</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="565214171"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">27</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">tableView</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="565214171"/>
+ </object>
+ <int key="connectionID">32</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">mapButtonPressed</string>
+ <reference key="source" ref="326163764"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">33</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="326163764"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">34</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1</int>
+ <reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="326163764"/>
+ <reference ref="565214171"/>
+ <reference ref="938256702"/>
+ <reference ref="743202682"/>
+ <reference ref="574494641"/>
+ <reference ref="88728219"/>
+ <reference ref="634417433"/>
+ <reference ref="32436512"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="88728219"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8</int>
+ <reference key="object" ref="938256702"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">9</int>
+ <reference key="object" ref="326163764"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">11</int>
+ <reference key="object" ref="634417433"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">17</int>
+ <reference key="object" ref="743202682"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">25</int>
+ <reference key="object" ref="565214171"/>
+ <reference key="parent" ref="191373211"/>
+ <string key="objectName">Table View (Themes)</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">35</int>
+ <reference key="object" ref="574494641"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">36</int>
+ <reference key="object" ref="32436512"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>1.IBEditorWindowLastContentRect</string>
+ <string>1.IBPluginDependency</string>
+ <string>11.IBPluginDependency</string>
+ <string>11.IBViewBoundsToFrameTransform</string>
+ <string>17.IBPluginDependency</string>
+ <string>17.IBViewBoundsToFrameTransform</string>
+ <string>25.IBPluginDependency</string>
+ <string>25.IBViewBoundsToFrameTransform</string>
+ <string>35.IBPluginDependency</string>
+ <string>35.IBViewBoundsToFrameTransform</string>
+ <string>36.IBPluginDependency</string>
+ <string>36.IBViewBoundsToFrameTransform</string>
+ <string>7.IBPluginDependency</string>
+ <string>7.IBViewBoundsToFrameTransform</string>
+ <string>8.IBPluginDependency</string>
+ <string>9.CustomClassName</string>
+ <string>9.IBPluginDependency</string>
+ <string>9.IBViewBoundsToFrameTransform</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>MapConfigViewController</string>
+ <string>UIResponder</string>
+ <string>{{790, 298}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABB+AAAw4QAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCyAAAw2YAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDjgAAw4kAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw4kAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBMAAAw2gAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwigAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>MapPreviewButtonView</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwxIAAA</bytes>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">36</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">MapConfigViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>mapButtonPressed</string>
+ <string>segmentedControlChanged:</string>
+ <string>sliderChanged:</string>
+ <string>sliderEndedChanging:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>mapButtonPressed</string>
+ <string>segmentedControlChanged:</string>
+ <string>sliderChanged:</string>
+ <string>sliderEndedChanging:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">buttonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">mapButtonPressed</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">segmentedControlChanged:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">sliderChanged:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">sliderEndedChanging:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>maxLabel</string>
+ <string>previewButton</string>
+ <string>segmentedControl</string>
+ <string>sizeLabel</string>
+ <string>slider</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UILabel</string>
+ <string>MapPreviewButtonView</string>
+ <string>UISegmentedControl</string>
+ <string>UILabel</string>
+ <string>UISlider</string>
+ <string>UITableView</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>maxLabel</string>
+ <string>previewButton</string>
+ <string>segmentedControl</string>
+ <string>sizeLabel</string>
+ <string>slider</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">maxLabel</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">previewButton</string>
+ <string key="candidateClassName">MapPreviewButtonView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">segmentedControl</string>
+ <string key="candidateClassName">UISegmentedControl</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">sizeLabel</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">slider</string>
+ <string key="candidateClassName">UISlider</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableView</string>
+ <string key="candidateClassName">UITableView</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/MapConfigViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">MapPreviewButtonView</string>
+ <string key="superclassName">UIButton</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">delegate</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">delegate</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">delegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/MapPreviewButtonView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/HWUtils.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="567455553">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIButton</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIImageView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="567455553"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISegmentedControl</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISegmentedControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISlider</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISlider.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableView</string>
+ <string key="superclassName">UIScrollView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1056" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">background~iphone.png</string>
+ <string key="NS.object.0">{480, 320}</string>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">132</string>
+ </data>
+</archive>
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,12 +20,10 @@
#import "MapConfigViewController.h"
-#import "PascalImports.h"
-#import "CommodityFunctions.h"
-#import "UIImageExtra.h"
#import "SchemeWeaponConfigViewController.h"
#import "GameConfigViewController.h"
+
#define scIndex self.segmentedControl.selectedSegmentIndex
#define isRandomness() (segmentedControl.selectedSegmentIndex == 0 || segmentedControl.selectedSegmentIndex == 2)
@@ -40,7 +38,7 @@
}
-(IBAction) mapButtonPressed {
- playSound(@"clickSound");
+ [AudioManagerController playClickSound];
[self updatePreview];
}
@@ -74,7 +72,7 @@
// perform as if user clicked on an entry
[self tableView:self.tableView didSelectRowAtIndexPath:theIndex];
- if (IS_NOT_POWERFUL(getModelType()) == NO)
+ if (IS_NOT_POWERFUL([HWUtils modelType]) == NO)
[self.tableView scrollToRowAtIndexPath:theIndex atScrollPosition:UITableViewScrollPositionMiddle animated:YES];
}
@@ -138,7 +136,7 @@
cell.textLabel.text = labelString;
cell.textLabel.adjustsFontSizeToFitWidth = YES;
cell.textLabel.minimumFontSize = 7;
- cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
+ cell.textLabel.textColor = [UIColor lightYellowColor];
cell.textLabel.backgroundColor = [UIColor clearColor];
if (isRandomness()) {
@@ -155,7 +153,7 @@
} else
cell.accessoryView = nil;
- cell.backgroundColor = UICOLOR_HW_ALMOSTBLACK;
+ cell.backgroundColor = [UIColor blackColorTransparent];
return cell;
}
@@ -307,7 +305,7 @@
[self updatePreview];
oldValue = num;
}
- playSound(@"clickSound");
+ [AudioManagerController playClickSound];
}
// perform actions based on the activated section, then call updatePreview to visually update the selection
@@ -316,7 +314,7 @@
NSString *mapgen, *staticmap, *mission;
NSInteger newPage = self.segmentedControl.selectedSegmentIndex;
- playSound(@"selSound");
+ [AudioManagerController playSelectSound];
switch (newPage) {
case 0: // Random
mapgen = @"e$mapgen 0";
@@ -378,7 +376,7 @@
#pragma mark -
#pragma mark view management
-(void) loadDataSourceArray {
- NSString *model = getModelType();
+ NSString *model = [HWUtils modelType];
// only folders containing icon.png are a valid theme
NSArray *themeArrayFull = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:THEMES_DIRECTORY() error:NULL];
@@ -394,7 +392,7 @@
NSArray *mapArrayFull = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:MAPS_DIRECTORY() error:NULL];
NSMutableArray *mapArray = [[NSMutableArray alloc] init];
for (NSString *str in mapArrayFull) {
- CGSize imgSize = PSPNGSizeFromMetaData([MAPS_DIRECTORY() stringByAppendingFormat:@"%@/map.png",str]);
+ CGSize imgSize = [UIImage imageSizeFromMetadataOf:[MAPS_DIRECTORY() stringByAppendingFormat:@"%@/map.png",str]];
if (IS_NOT_POWERFUL(model) && imgSize.height > 1024.0f)
continue;
if (IS_NOT_VERY_POWERFUL(model) && imgSize.height > 1280.0f)
@@ -405,7 +403,7 @@
NSArray *missionArrayFull = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:MISSIONS_DIRECTORY() error:NULL];
NSMutableArray *missionArray = [[NSMutableArray alloc] init];
for (NSString *str in missionArrayFull) {
- CGSize imgSize = PSPNGSizeFromMetaData([MISSIONS_DIRECTORY() stringByAppendingFormat:@"%@/map.png",str]);
+ CGSize imgSize = [UIImage imageSizeFromMetadataOf:[MISSIONS_DIRECTORY() stringByAppendingFormat:@"%@/map.png",str]];
if (IS_NOT_POWERFUL(model) && imgSize.height > 1024.0f)
continue;
if (IS_NOT_VERY_POWERFUL(model) && imgSize.height > 1280.0f)
@@ -443,6 +441,7 @@
if (self.segmentedControl.selectedSegmentIndex == 1) {
self.slider.enabled = NO;
self.sizeLabel.text = NSLocalizedString(@"No filter",@"");
+ self.sizeLabel.textColor = [UIColor lightYellowColor];
}
self.templateFilterCommand = @"e$template_filter 0";
@@ -454,7 +453,7 @@
if ([self.tableView respondsToSelector:@selector(setBackgroundView:)])
[self.tableView setBackgroundView:nil];
self.tableView.backgroundColor = [UIColor clearColor];
- self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER;
+ self.tableView.separatorColor = [UIColor darkYellowColor];
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
}
--- a/project_files/HedgewarsMobile/Classes/MapPreviewButtonView.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/MapPreviewButtonView.m Sat Oct 08 16:54:56 2011 +0200
@@ -22,6 +22,7 @@
#import "MapPreviewButtonView.h"
#import "MapConfigViewController.h"
#import "UIImageExtra.h"
+#import "ServerSetup.h"
#import <pthread.h>
#define INDICATOR_TAG 7654
@@ -78,7 +79,7 @@
IPaddress ip;
BOOL serverQuit = NO;
static uint8_t map[128*32];
- int port = randomPort();
+ int port = [ServerSetup randomPort];
if (SDLNet_Init() < 0) {
DLog(@"SDLNet_Init: %s", SDLNet_GetError());
@@ -197,7 +198,7 @@
[self setTitle:nil forState:UIControlStateNormal];
// don't display preview on slower device, too slow and memory hog
- if (IS_NOT_POWERFUL(getModelType())) {
+ if (IS_NOT_POWERFUL([HWUtils modelType])) {
[self setTitle:NSLocalizedString(@"Preview not available",@"") forState:UIControlStateNormal];
[self turnOnWidgets];
} else {
--- a/project_files/HedgewarsMobile/Classes/MasterViewController.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
- * Hedgewars-iOS, a Hedgewars port for iOS devices
- * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * File created on 27/03/2010.
- */
-
-
-#import <UIKit/UIKit.h>
-
-
-@class SplitViewRootController;
-@class GeneralSettingsViewController;
-@class TeamSettingsViewController;
-@class WeaponSettingsViewController;
-@class SchemeSettingsViewController;
-@class SupportViewController;
-
-@interface MasterViewController : UITableViewController {
- SplitViewRootController *rootController;
- MasterViewController *targetController;
- NSArray *controllerNames;
- NSIndexPath *lastIndexPath;
- GeneralSettingsViewController *generalSettingsViewController;
- TeamSettingsViewController *teamSettingsViewController;
- WeaponSettingsViewController *weaponSettingsViewController;
- SchemeSettingsViewController *schemeSettingsViewController;
- SupportViewController *supportViewController;
-}
-
-@property (nonatomic, retain) MasterViewController *targetController;
-@property (nonatomic, retain) SplitViewRootController *rootController;
-@property (nonatomic, retain) NSArray *controllerNames;
-@property (nonatomic, retain) NSIndexPath *lastIndexPath;
-
--(IBAction) dismissSplitView;
-
-@end
--- a/project_files/HedgewarsMobile/Classes/MasterViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,226 +0,0 @@
-/*
- * Hedgewars-iOS, a Hedgewars port for iOS devices
- * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * File created on 27/03/2010.
- */
-
-
-#import "MasterViewController.h"
-#import "CommodityFunctions.h"
-#import "GeneralSettingsViewController.h"
-#import "TeamSettingsViewController.h"
-#import "WeaponSettingsViewController.h"
-#import "SchemeSettingsViewController.h"
-#import "SupportViewController.h"
-
-@implementation MasterViewController
-@synthesize rootController, targetController, controllerNames, lastIndexPath;
-
-
--(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
- return rotationManager(interfaceOrientation);
-}
-
-
-#pragma mark -
-#pragma mark View lifecycle
--(void) viewDidLoad {
- [super viewDidLoad];
-
- // the list of selectable controllers
- NSArray *array = [[NSArray alloc] initWithObjects:NSLocalizedString(@"General",@""),
- NSLocalizedString(@"Teams",@""),
- NSLocalizedString(@"Weapons",@""),
- NSLocalizedString(@"Schemes",@""),
- NSLocalizedString(@"Support",@""),
- nil];
- self.controllerNames = array;
- [array release];
-
- // targetControllers tells whether we're on the right or left side of the splitview -- on iphone we only use the right side
- if (targetController == nil && IS_IPAD()) {
- if (nil == generalSettingsViewController)
- generalSettingsViewController = [[GeneralSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
- generalSettingsViewController.navigationItem.hidesBackButton = YES;
- [generalSettingsViewController viewWillAppear:YES];
- [self.navigationController pushViewController:generalSettingsViewController animated:NO];
- } else {
- self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
- target:self
- action:@selector(dismissSplitView)];
- }
-}
-
-#pragma mark -
-#pragma mark Table view data source
--(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
- return 1;
-}
-
--(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
- return [controllerNames count];
-}
-
-// Customize the appearance of table view cells.
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
- static NSString *CellIdentifier = @"Cell";
-
- UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
- if (cell == nil)
- cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
-
- NSString *iconStr = nil;
- switch ([indexPath row]) {
- case 0:
- iconStr = [NSString stringWithFormat:@"%@/TargetBee.png",GRAPHICS_DIRECTORY()];
- break;
- case 1:
- iconStr = [NSString stringWithFormat:@"%@/Egg.png",GRAPHICS_DIRECTORY()];
- break;
- case 2:
- iconStr = [NSString stringWithFormat:@"%@/Molotov.png",GRAPHICS_DIRECTORY()];
- break;
- case 3:
- iconStr = [NSString stringWithFormat:@"%@/Target.png",GRAPHICS_DIRECTORY()];
- break;
- case 4:
- iconStr = [NSString stringWithFormat:@"%@/Seduction.png",GRAPHICS_DIRECTORY()];
- break;
- default:
- //seduction.png for support page
- DLog(@"Nope");
- break;
- }
-
- if (nil == targetController)
- cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
- else
- cell.accessoryType = UITableViewCellAccessoryNone;
-
- cell.textLabel.text = [controllerNames objectAtIndex:[indexPath row]];
- UIImage *icon = [[UIImage alloc] initWithContentsOfFile:iconStr];
- cell.imageView.image = icon;
- [icon release];
-
- return cell;
-}
-
-#pragma mark -
-#pragma mark Table view delegate
--(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
- int newRow = [indexPath row];
- int oldRow = (lastIndexPath != nil) ? [lastIndexPath row] : -1;
- UIViewController *nextController = nil;
-
- if (newRow != oldRow) {
- [self.tableView deselectRowAtIndexPath:lastIndexPath animated:YES];
- [targetController.navigationController popToRootViewControllerAnimated:NO];
-
- switch (newRow) {
- case 0:
- if (nil == generalSettingsViewController)
- generalSettingsViewController = [[GeneralSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
- nextController = generalSettingsViewController;
- break;
- case 1:
- if (nil == teamSettingsViewController)
- teamSettingsViewController = [[TeamSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
- nextController = teamSettingsViewController;
- break;
- case 2:
- if (nil == weaponSettingsViewController)
- weaponSettingsViewController = [[WeaponSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
- nextController = weaponSettingsViewController;
- break;
- case 3:
- if (nil == schemeSettingsViewController)
- schemeSettingsViewController = [[SchemeSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
- nextController = schemeSettingsViewController;
- break;
- case 4:
- if (nil == supportViewController)
- supportViewController = [[SupportViewController alloc] initWithStyle:UITableViewStyleGrouped];
- nextController = supportViewController;
- break;
- }
-
- nextController.title = [controllerNames objectAtIndex:newRow];
- self.lastIndexPath = indexPath;
- [self.tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone];
-
- if (nil == targetController) {
- nextController.navigationItem.hidesBackButton = NO;
- [self.navigationController pushViewController:nextController animated:YES];
- } else {
- playSound(@"clickSound");
- nextController.navigationItem.hidesBackButton = YES;
- [targetController.navigationController pushViewController:nextController animated:NO];
- }
- }
-}
-
-
-#pragma mark -
-#pragma mark Memory management
--(void) didReceiveMemoryWarning {
- if (generalSettingsViewController.view.superview == nil)
- generalSettingsViewController = nil;
- if (teamSettingsViewController.view.superview == nil)
- teamSettingsViewController = nil;
- if (weaponSettingsViewController.view.superview == nil)
- weaponSettingsViewController = nil;
- if (schemeSettingsViewController.view.superview == nil)
- schemeSettingsViewController = nil;
- if (supportViewController.view.superview == nil)
- supportViewController = nil;
- MSG_MEMCLEAN();
- [super didReceiveMemoryWarning];
-}
-
--(void) viewDidUnload {
- //self.rootController = nil;
- //self.targetController = nil;
- self.controllerNames = nil;
- self.lastIndexPath = nil;
- generalSettingsViewController = nil;
- teamSettingsViewController = nil;
- weaponSettingsViewController = nil;
- schemeSettingsViewController = nil;
- supportViewController = nil;
- MSG_DIDUNLOAD();
- [super viewDidUnload];
-}
-
--(void) dealloc {
- releaseAndNil(rootController);
- releaseAndNil(targetController);
- releaseAndNil(controllerNames);
- releaseAndNil(lastIndexPath);
- releaseAndNil(generalSettingsViewController);
- releaseAndNil(teamSettingsViewController);
- releaseAndNil(weaponSettingsViewController);
- releaseAndNil(schemeSettingsViewController);
- releaseAndNil(supportViewController);
- [super dealloc];
-}
-
--(IBAction) dismissSplitView {
- [self.rootController dismissModalViewControllerAnimated:YES];
-}
-
-@end
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/MissionTrainingViewController-iPad.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,702 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">132</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBUIView" id="191373211">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUITableView" id="609221433">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{91, 86}, {585, 391}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAgMAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <bool key="IBUIAlwaysBounceVertical">YES</bool>
+ <int key="IBUIIndicatorStyle">2</int>
+ <int key="IBUIStyle">1</int>
+ <int key="IBUISeparatorStyle">2</int>
+ <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+ <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+ <float key="IBUIRowHeight">44</float>
+ <float key="IBUISectionHeaderHeight">10</float>
+ <float key="IBUISectionFooterHeight">10</float>
+ </object>
+ <object class="IBUIImageView" id="776434219">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{227, 496}, {314, 260}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBUIButton" id="1038942684">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 684}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <object class="NSFont" key="IBUIFont" id="1000305902">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUIHighlightedTitleColor" id="76134506">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleShadowColor" id="181044244">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">backButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="1068873625">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{606, 684}, {142, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">1</int>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="1000305902"/>
+ <reference key="IBUIHighlightedTitleColor" ref="76134506"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="181044244"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">startGameButton.png</string>
+ </object>
+ </object>
+ <object class="IBUILabel" id="12882009">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{5, 6}, {757, 72}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Description here</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-BoldOblique</string>
+ <double key="NSSize">21</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <reference key="IBUIHighlightedColor" ref="76134506"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">2</int>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ </object>
+ <string key="NSFrameSize">{768, 768}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ <object class="NSColorSpace" key="NSCustomColorSpace">
+ <int key="NSID">2</int>
+ </object>
+ </object>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="191373211"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="609221433"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">11</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="609221433"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">12</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">previewImage</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="776434219"/>
+ </object>
+ <int key="connectionID">13</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">tableView</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="609221433"/>
+ </object>
+ <int key="connectionID">14</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="1038942684"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">19</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="1068873625"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">20</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">descriptionLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="12882009"/>
+ </object>
+ <int key="connectionID">22</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1</int>
+ <reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="776434219"/>
+ <reference ref="1038942684"/>
+ <reference ref="1068873625"/>
+ <reference ref="12882009"/>
+ <reference ref="609221433"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">9</int>
+ <reference key="object" ref="609221433"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">10</int>
+ <reference key="object" ref="776434219"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">17</int>
+ <reference key="object" ref="1038942684"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">18</int>
+ <reference key="object" ref="1068873625"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">21</int>
+ <reference key="object" ref="12882009"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>1.IBEditorWindowLastContentRect</string>
+ <string>1.IBPluginDependency</string>
+ <string>10.IBPluginDependency</string>
+ <string>10.IBViewBoundsToFrameTransform</string>
+ <string>17.IBPluginDependency</string>
+ <string>17.IBViewBoundsToFrameTransform</string>
+ <string>18.IBPluginDependency</string>
+ <string>18.IBViewBoundsToFrameTransform</string>
+ <string>21.IBPluginDependency</string>
+ <string>21.IBViewBoundsToFrameTransform</string>
+ <string>9.IBPluginDependency</string>
+ <string>9.IBViewBoundsToFrameTransform</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>MissionTrainingViewController</string>
+ <string>UIResponder</string>
+ <string>{{139, 166}, {768, 768}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDYwAAxD2AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAxC1AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABEF4AAxC1AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCDAAAwowAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCtgAAw+2AAA</bytes>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">22</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">MissionTrainingViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">buttonPressed:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">buttonPressed:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">buttonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>descriptionLabel</string>
+ <string>previewImage</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UILabel</string>
+ <string>UIImageView</string>
+ <string>UITableView</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>descriptionLabel</string>
+ <string>previewImage</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">descriptionLabel</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">previewImage</string>
+ <string key="candidateClassName">UIImageView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableView</string>
+ <string key="candidateClassName">UITableView</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/MissionTrainingViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/HWUtils.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="6906421">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIButton</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIImageView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="6906421"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableView</string>
+ <string key="superclassName">UIScrollView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1056" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>backButton.png</string>
+ <string>startGameButton.png</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{64, 64}</string>
+ <string>{142, 64}</string>
+ </object>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">132</string>
+ </data>
+</archive>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/MissionTrainingViewController-iPhone.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,652 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">132</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="191373211">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUITableView" id="609221433">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{180, 0}, {300, 320}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <object class="NSColor" key="IBUIBackgroundColor" id="76134506">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <bool key="IBUIAlwaysBounceVertical">YES</bool>
+ <int key="IBUIIndicatorStyle">2</int>
+ <int key="IBUISeparatorStyle">1</int>
+ <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+ <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+ <float key="IBUIRowHeight">44</float>
+ <float key="IBUISectionHeaderHeight">22</float>
+ <float key="IBUISectionFooterHeight">22</float>
+ </object>
+ <object class="IBUIImageView" id="776434219">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{11, 19}, {157, 130}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIButton" id="1038942684">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{57, 245}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <object class="NSFont" key="IBUIFont" id="1000305902">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="IBUIHighlightedTitleColor" ref="76134506"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleShadowColor" id="181044244">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">backButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="1068873625">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{18, 164}, {142, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">1</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="1000305902"/>
+ <reference key="IBUIHighlightedTitleColor" ref="76134506"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="181044244"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">startGameButton.png</string>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{480, 320}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ <object class="NSColorSpace" key="NSCustomColorSpace">
+ <int key="NSID">2</int>
+ </object>
+ </object>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="191373211"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="609221433"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">11</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="609221433"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">12</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">previewImage</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="776434219"/>
+ </object>
+ <int key="connectionID">13</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">tableView</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="609221433"/>
+ </object>
+ <int key="connectionID">14</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="1038942684"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">19</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="1068873625"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">20</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1</int>
+ <reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="609221433"/>
+ <reference ref="776434219"/>
+ <reference ref="1038942684"/>
+ <reference ref="1068873625"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">9</int>
+ <reference key="object" ref="609221433"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">10</int>
+ <reference key="object" ref="776434219"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">17</int>
+ <reference key="object" ref="1038942684"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">18</int>
+ <reference key="object" ref="1068873625"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>1.IBEditorWindowLastContentRect</string>
+ <string>1.IBPluginDependency</string>
+ <string>10.IBPluginDependency</string>
+ <string>10.IBViewBoundsToFrameTransform</string>
+ <string>17.IBPluginDependency</string>
+ <string>17.IBViewBoundsToFrameTransform</string>
+ <string>18.IBPluginDependency</string>
+ <string>18.IBViewBoundsToFrameTransform</string>
+ <string>9.IBPluginDependency</string>
+ <string>9.IBViewBoundsToFrameTransform</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>MissionTrainingViewController</string>
+ <string>UIResponder</string>
+ <string>{{492, 751}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABAoAAAwwYAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABChAAAw5eAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABB2AAAw2cAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDUAAAw5UAAA</bytes>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">22</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">MissionTrainingViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">buttonPressed:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">buttonPressed:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">buttonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>descriptionLabel</string>
+ <string>previewImage</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UILabel</string>
+ <string>UIImageView</string>
+ <string>UITableView</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>descriptionLabel</string>
+ <string>previewImage</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">descriptionLabel</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">previewImage</string>
+ <string key="candidateClassName">UIImageView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableView</string>
+ <string key="candidateClassName">UITableView</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/MissionTrainingViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/HWUtils.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="6906421">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIButton</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIImageView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="6906421"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableView</string>
+ <string key="superclassName">UIScrollView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1056" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>backButton.png</string>
+ <string>startGameButton.png</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{64, 64}</string>
+ <string>{142, 64}</string>
+ </object>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">132</string>
+ </data>
+</archive>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,42 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 03/10/2011.
+ */
+
+#import <UIKit/UIKit.h>
+
+
+@interface MissionTrainingViewController : UIViewController <UITableViewDelegate, UITableViewDataSource> {
+ NSArray *listOfMissions;
+ NSArray *listOfDescriptions;
+ NSString *missionName;
+ UIImageView *previewImage;
+ UITableView *tableView;
+ UILabel *descriptionLabel;
+}
+
+@property (nonatomic, retain) NSArray *listOfMissions;
+@property (nonatomic, retain) NSArray *listOfDescriptions;
+@property (nonatomic, retain) NSString *missionName;
+@property (nonatomic, retain) IBOutlet UIImageView *previewImage;
+@property (nonatomic, retain) IBOutlet UITableView *tableView;
+@property (nonatomic, retain) IBOutlet UILabel *descriptionLabel;
+
+-(IBAction) buttonPressed:(id) sender;
+
+@end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,205 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 03/10/2011.
+ */
+
+
+#import "MissionTrainingViewController.h"
+#import <QuartzCore/QuartzCore.h>
+#import "GameInterfaceBridge.h"
+
+
+@implementation MissionTrainingViewController
+@synthesize listOfMissions, listOfDescriptions, previewImage, tableView, descriptionLabel, missionName;
+
+-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
+ return rotationManager(interfaceOrientation);
+}
+
+#pragma mark -
+#pragma mark View management
+-(void) viewDidLoad {
+ NSString *imgName = (IS_IPAD()) ? @"mediumBackground~ipad.png" : @"smallerBackground~iphone.png";
+ UIImage *img = [[UIImage alloc] initWithContentsOfFile:imgName];
+ self.view.backgroundColor = [UIColor colorWithPatternImage:img];
+ [img release];
+
+ self.previewImage.layer.borderColor = [[UIColor darkYellowColor] CGColor];
+ self.previewImage.layer.borderWidth = 3.8f;
+ self.previewImage.layer.cornerRadius = 14;
+
+ UIView *backView = [[UIView alloc] initWithFrame:self.tableView.frame];
+ backView.backgroundColor = IS_IPAD() ? [UIColor darkBlueColorTransparent] : [UIColor blackColorTransparent];
+ [self.tableView setBackgroundView:backView];
+ [backView release];
+ self.tableView.backgroundColor = [UIColor clearColor];
+ self.tableView.layer.borderColor = IS_IPAD() ? [[UIColor darkYellowColor] CGColor] : [[UIColor whiteColor] CGColor];
+ self.tableView.layer.borderWidth = 2.4f;
+ self.tableView.layer.cornerRadius = 8;
+ self.tableView.separatorColor = [UIColor whiteColor];
+ self.tableView.separatorStyle = IS_IPAD() ? UITableViewCellSeparatorStyleNone : UITableViewCellSeparatorStyleSingleLine;
+
+ self.descriptionLabel.textColor = [UIColor lightYellowColor];
+ [super viewDidLoad];
+}
+
+-(void) viewWillAppear:(BOOL)animated {
+ NSIndexPath *indexPath = [NSIndexPath indexPathForRow:random()%[self.listOfMissions count] inSection:0];
+ [self.tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone];
+ [self tableView:self.tableView didSelectRowAtIndexPath:indexPath];
+ [super viewWillAppear:animated];
+}
+
+-(IBAction) buttonPressed:(id) sender {
+ UIButton *button = (UIButton *)sender;
+
+ if (button.tag == 0) {
+ [AudioManagerController playBackSound];
+ [[self parentViewController] dismissModalViewControllerAnimated:YES];
+ } else {
+ GameInterfaceBridge *bridge = [[GameInterfaceBridge alloc] initWithController:self];
+ [bridge startMissionGame:self.missionName];
+ [bridge release];
+ }
+}
+
+#pragma mark -
+#pragma mark override setters/getters for better memory handling
+-(NSArray *)listOfMissions {
+ if (listOfMissions == nil)
+ self.listOfMissions = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:TRAININGS_DIRECTORY() error:NULL];
+ return listOfMissions;
+}
+
+-(NSArray *)listOfDescriptions {
+ if (listOfDescriptions == nil) {
+ NSString *descLocation = [[NSString alloc] initWithFormat:@"%@/missions_en.txt",LOCALE_DIRECTORY()];
+ NSString *descComplete = [[NSString alloc] initWithContentsOfFile:descLocation encoding:NSUTF8StringEncoding error:NULL];
+ [descLocation release];
+ NSArray *descArray = [descComplete componentsSeparatedByString:@"\n"];
+ NSMutableArray *filteredArray = [[NSMutableArray alloc] initWithCapacity:[descArray count]];
+ [descComplete release];
+ // sanity check to avoid having missions and descriptions conflicts
+ for (int i = 0; i < [self.listOfMissions count]; i++) {
+ NSString *desc = [[self.listOfMissions objectAtIndex:i] stringByDeletingPathExtension];
+ for (NSString *str in descArray)
+ if ([str hasPrefix:desc]) {
+ NSArray *descriptionText = [str componentsSeparatedByString:@"\""];
+ [filteredArray insertObject:[descriptionText objectAtIndex:1] atIndex:i];
+ break;
+ }
+ }
+ self.listOfDescriptions = filteredArray;
+ [filteredArray release];
+ }
+ return listOfDescriptions;
+}
+
+#pragma mark -
+#pragma mark Table view data source
+-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
+ return 1;
+}
+
+-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return [self.listOfMissions count];
+}
+
+-(CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+ return (IS_IPAD()) ? self.tableView.rowHeight : 80;
+}
+
+-(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ static NSString *CellIdentifier = @"CellTr";
+ NSInteger row = [indexPath row];
+
+ UITableViewCell *cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier];
+ if (cell == nil)
+ cell = [[[UITableViewCell alloc] initWithStyle:(IS_IPAD()) ? UITableViewCellStyleDefault : UITableViewCellStyleSubtitle
+ reuseIdentifier:CellIdentifier] autorelease];
+
+ cell.textLabel.text = [[[self.listOfMissions objectAtIndex:row] stringByDeletingPathExtension]
+ stringByReplacingOccurrencesOfString:@"_" withString:@" "];
+ cell.textLabel.textColor = [UIColor lightYellowColor];
+ //cell.textLabel.font = [UIFont fontWithName:@"Bradley Hand Bold" size:[UIFont labelFontSize]];
+ cell.textLabel.textAlignment = (IS_IPAD()) ? UITextAlignmentCenter : UITextAlignmentLeft;
+ cell.textLabel.backgroundColor = [UIColor clearColor];
+ cell.textLabel.adjustsFontSizeToFitWidth = YES;
+ cell.detailTextLabel.text = (IS_IPAD()) ? nil : [self.listOfDescriptions objectAtIndex:row];
+ cell.detailTextLabel.textColor = [UIColor whiteColor];
+ cell.detailTextLabel.backgroundColor = [UIColor clearColor];
+ cell.detailTextLabel.adjustsFontSizeToFitWidth = YES;
+ cell.detailTextLabel.numberOfLines = ([cell.detailTextLabel.text length] % 40);
+ cell.detailTextLabel.baselineAdjustment = UIBaselineAdjustmentAlignCenters;
+
+ cell.backgroundColor = [UIColor blackColorTransparent];
+ return cell;
+}
+
+#pragma mark -
+#pragma mark Table view delegate
+-(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ NSInteger row = [indexPath row];
+
+ self.missionName = [[self.listOfMissions objectAtIndex:row] stringByDeletingPathExtension];
+ NSString *size = IS_IPAD() ? @"@2x" : @"";
+ NSString *filePath = [[NSString alloc] initWithFormat:@"%@/Missions/Training/%@%@.png",GRAPHICS_DIRECTORY(),self.missionName,size];
+ UIImage *img = [[UIImage alloc] initWithContentsOfFile:filePath];
+ [filePath release];
+ [self.previewImage setImage:img];
+ [img release];
+
+ self.descriptionLabel.text = [self.listOfDescriptions objectAtIndex:row];
+}
+
+#pragma mark -
+#pragma mark Memory management
+-(void) didReceiveMemoryWarning {
+ self.previewImage = nil;
+ self.missionName = nil;
+ self.listOfMissions = nil;
+ self.listOfDescriptions = nil;
+ // if you nil this one it won't get updated anymore
+ //self.previewImage = nil;
+ [super didReceiveMemoryWarning];
+}
+
+-(void) viewDidUnload {
+ self.listOfMissions = nil;
+ self.listOfDescriptions = nil;
+ self.previewImage = nil;
+ self.tableView = nil;
+ self.descriptionLabel = nil;
+ self.missionName = nil;
+ MSG_DIDUNLOAD();
+ [super viewDidUnload];
+}
+
+
+-(void) dealloc {
+ releaseAndNil(listOfMissions);
+ releaseAndNil(listOfDescriptions);
+ releaseAndNil(previewImage);
+ releaseAndNil(tableView);
+ releaseAndNil(descriptionLabel);
+ releaseAndNil(missionName);
+ [super dealloc];
+}
+
+
+@end
--- a/project_files/HedgewarsMobile/Classes/ObjcExports.h Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/ObjcExports.h Sat Oct 08 16:54:56 2011 +0200
@@ -19,16 +19,23 @@
*/
-@class OverlayViewController;
+@interface ObjcExports : NSObject {
+
+}
-void objcExportsInit(OverlayViewController *instance);
-BOOL isGameRunning();
++(void) initialize;
+
+@end
+
+
+BOOL isGameRunning(void);
void setGameRunning(BOOL value);
-NSInteger cachedGrenadeTime();
-void clearView();
+NSInteger cachedGrenadeTime(void);
+void clearView(void);
void setGrenadeTime(NSInteger value);
+BOOL isApplePhone(void);
-void startSpinningProgress();
-void stopSpinningProgress();
-void saveBeganSynching();
-void saveFinishedSynching();
+void startSpinningProgress(void);
+void stopSpinningProgress(void);
+void saveBeganSynching(void);
+void saveFinishedSynching(void);
--- a/project_files/HedgewarsMobile/Classes/ObjcExports.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/ObjcExports.m Sat Oct 08 16:54:56 2011 +0200
@@ -23,27 +23,29 @@
#import "OverlayViewController.h"
#import "AmmoMenuViewController.h"
-#pragma mark -
-#pragma mark internal variables
+
// actual game started (controls should be enabled)
-BOOL gameRunning;
+static BOOL gameRunning;
// black screen present
-BOOL savedGame;
+static BOOL savedGame;
// cache the grenade time
-NSInteger grenadeTime;
+static NSInteger grenadeTime;
// the reference to the newMenu instance
-OverlayViewController *overlay_instance;
-
+static OverlayViewController *overlay_instance;
-#pragma mark -
-#pragma mark functions called like oop
-void objcExportsInit(OverlayViewController* instance) {
- overlay_instance = instance;
+@implementation ObjcExports
+
++(void) initialize {
+ overlay_instance = [OverlayViewController mainOverlay];
gameRunning = NO;
savedGame = NO;
grenadeTime = 2;
}
+@end
+
+#pragma mark -
+#pragma mark functions called by objc code
BOOL inline isGameRunning() {
return gameRunning;
}
@@ -62,6 +64,10 @@
#pragma mark -
#pragma mark functions called by pascal code
+BOOL inline isApplePhone() {
+ return (IS_IPAD() == NO);
+}
+
void startSpinningProgress() {
gameRunning = NO;
overlay_instance.lowerIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
@@ -102,6 +108,7 @@
void saveBeganSynching() {
savedGame = YES;
stopSpinningProgress();
+ [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
overlay_instance.view.backgroundColor = [UIColor blackColor];
overlay_instance.view.alpha = 0.75;
@@ -128,6 +135,7 @@
[overlay_instance.savesIndicator stopAnimating];
[overlay_instance.savesIndicator performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:1];
+ [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
gameRunning = YES;
}
--- a/project_files/HedgewarsMobile/Classes/OverlayViewController.h Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.h Sat Oct 08 16:54:56 2011 +0200
@@ -67,6 +67,8 @@
@property (assign) NSInteger initialScreenCount;
++(OverlayViewController *)mainOverlay;
+
-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
-(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event;
-(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event;
--- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -23,17 +23,18 @@
#import "InGameMenuViewController.h"
#import "HelpPageViewController.h"
#import "AmmoMenuViewController.h"
-#import "PascalImports.h"
-#import "CommodityFunctions.h"
#import "CGPointUtils.h"
#import "ObjcExports.h"
+
#define HIDING_TIME_DEFAULT [NSDate dateWithTimeIntervalSinceNow:2.7]
#define HIDING_TIME_NEVER [NSDate dateWithTimeIntervalSinceNow:10000]
#define doDim() [dimTimer setFireDate: (IS_DUALHEAD()) ? HIDING_TIME_NEVER : HIDING_TIME_DEFAULT]
#define doNotDim() [dimTimer setFireDate:HIDING_TIME_NEVER]
+static OverlayViewController *mainOverlay;
+
@implementation OverlayViewController
@synthesize popoverController, popupMenu, helpPage, amvc, initialScreenCount, lowerIndicator, savesIndicator,
confirmButton, grenadeTimeSegment;
@@ -47,17 +48,22 @@
#pragma mark -
#pragma mark View Management
--(id) initWithCoder:(NSCoder *)aDecoder {
- if ((self = [super initWithCoder:aDecoder])) {
+-(id) initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
+ if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
isAttacking = NO;
isPopoverVisible = NO;
initialScreenCount = (IS_DUALHEAD() ? 2 : 1);
lowerIndicator = nil;
savesIndicator = nil;
+ mainOverlay = self;
}
return self;
}
++(OverlayViewController *)mainOverlay {
+ return mainOverlay;
+}
+
-(void) viewDidLoad {
// fill all the screen available as sdlview disables autoresizing
CGRect rect = [[UIScreen mainScreen] bounds];
@@ -108,6 +114,7 @@
// only objects initialized in viewDidLoad should be here
dimTimer = nil;
+ mainOverlay = nil;
self.helpPage = nil;
[self dismissPopover];
self.popoverController = nil;
@@ -278,7 +285,7 @@
HW_backjump();
break;
case 10:
- playSound(@"clickSound");
+ [AudioManagerController playClickSound];
clearView();
HW_pause();
if (self.amvc.isVisible && IS_DUALHEAD() == NO) {
@@ -289,7 +296,7 @@
[self showPopover];
break;
case 11:
- playSound(@"clickSound");
+ [AudioManagerController playClickSound];
clearView();
if (IS_DUALHEAD() || [[[NSUserDefaults standardUserDefaults] objectForKey:@"classic_menu"] boolValue] == NO) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1014 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10H574</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">132</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="191373211">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIButton" id="584263820">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{0, 229}, {50, 50}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <object class="NSFont" key="IBUIFont" id="969592940">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUIHighlightedTitleColor" id="708011311">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleShadowColor" id="280149554">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">arrowLeft.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="123494776">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{87, 229}, {50, 50}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <int key="IBUITag">1</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="969592940"/>
+ <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">arrowRight.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="590902961">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">265</int>
+ <string key="NSFrame">{{412, 236}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <int key="IBUITag">5</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="969592940"/>
+ <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">joyButtonBackJump.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="132251648">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">265</int>
+ <string key="NSFrame">{{365, 203}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <int key="IBUITag">6</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="969592940"/>
+ <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">joyButtonForwardJump.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="752933969">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">265</int>
+ <string key="NSFrame">{{354, 256}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <int key="IBUITag">4</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="969592940"/>
+ <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">joyButtonAttack.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="261686746">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{44, 187}, {50, 50}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <int key="IBUITag">2</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="969592940"/>
+ <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">arrowUp.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="81315603">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{44, 270}, {50, 50}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <int key="IBUITag">3</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="969592940"/>
+ <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">arrowDown.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="309477778">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">289</int>
+ <string key="NSFrame">{{341, 0}, {64, 50}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <int key="IBUITag">10</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="969592940"/>
+ <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">cornerButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="50885250">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">289</int>
+ <string key="NSFrame">{{402, 0}, {78, 50}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <int key="IBUITag">11</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="969592940"/>
+ <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">ammoButton.png</string>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{480, 320}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MSAwAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="191373211"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="584263820"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">1</int>
+ </object>
+ <int key="connectionID">8</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="584263820"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">9</int>
+ </object>
+ <int key="connectionID">9</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="584263820"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">10</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="584263820"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">8</int>
+ </object>
+ <int key="connectionID">11</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="123494776"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">8</int>
+ </object>
+ <int key="connectionID">13</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="123494776"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">9</int>
+ </object>
+ <int key="connectionID">14</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="123494776"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">1</int>
+ </object>
+ <int key="connectionID">15</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="123494776"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">16</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="261686746"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">9</int>
+ </object>
+ <int key="connectionID">18</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="261686746"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">1</int>
+ </object>
+ <int key="connectionID">19</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="261686746"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">8</int>
+ </object>
+ <int key="connectionID">20</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="261686746"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">21</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="81315603"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">8</int>
+ </object>
+ <int key="connectionID">23</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="81315603"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">9</int>
+ </object>
+ <int key="connectionID">24</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="81315603"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">1</int>
+ </object>
+ <int key="connectionID">25</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="81315603"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">26</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="590902961"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">9</int>
+ </object>
+ <int key="connectionID">44</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="590902961"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">1</int>
+ </object>
+ <int key="connectionID">45</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="590902961"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">8</int>
+ </object>
+ <int key="connectionID">46</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="590902961"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">47</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="752933969"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">8</int>
+ </object>
+ <int key="connectionID">49</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="752933969"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">50</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="752933969"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">9</int>
+ </object>
+ <int key="connectionID">51</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="752933969"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">1</int>
+ </object>
+ <int key="connectionID">52</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="132251648"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">9</int>
+ </object>
+ <int key="connectionID">54</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="132251648"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">55</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="132251648"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">1</int>
+ </object>
+ <int key="connectionID">56</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="132251648"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">8</int>
+ </object>
+ <int key="connectionID">57</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="309477778"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">60</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="50885250"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">68</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="50885250"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">9</int>
+ </object>
+ <int key="connectionID">69</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1</int>
+ <reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="590902961"/>
+ <reference ref="81315603"/>
+ <reference ref="584263820"/>
+ <reference ref="261686746"/>
+ <reference ref="123494776"/>
+ <reference ref="132251648"/>
+ <reference ref="752933969"/>
+ <reference ref="50885250"/>
+ <reference ref="309477778"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">4</int>
+ <reference key="object" ref="584263820"/>
+ <reference key="parent" ref="191373211"/>
+ <string key="objectName">left</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">12</int>
+ <reference key="object" ref="123494776"/>
+ <reference key="parent" ref="191373211"/>
+ <string key="objectName">right</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">17</int>
+ <reference key="object" ref="261686746"/>
+ <reference key="parent" ref="191373211"/>
+ <string key="objectName">up</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">22</int>
+ <reference key="object" ref="81315603"/>
+ <reference key="parent" ref="191373211"/>
+ <string key="objectName">down</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">43</int>
+ <reference key="object" ref="590902961"/>
+ <reference key="parent" ref="191373211"/>
+ <string key="objectName">push2</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">48</int>
+ <reference key="object" ref="752933969"/>
+ <reference key="parent" ref="191373211"/>
+ <string key="objectName">push1</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">53</int>
+ <reference key="object" ref="132251648"/>
+ <reference key="parent" ref="191373211"/>
+ <string key="objectName">push3</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">58</int>
+ <reference key="object" ref="309477778"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">67</int>
+ <reference key="object" ref="50885250"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>1.IBEditorWindowLastContentRect</string>
+ <string>1.IBPluginDependency</string>
+ <string>12.IBPluginDependency</string>
+ <string>12.IBViewBoundsToFrameTransform</string>
+ <string>17.IBPluginDependency</string>
+ <string>22.IBPluginDependency</string>
+ <string>4.IBPluginDependency</string>
+ <string>43.IBPluginDependency</string>
+ <string>48.IBPluginDependency</string>
+ <string>53.IBPluginDependency</string>
+ <string>58.IBPluginDependency</string>
+ <string>67.IBPluginDependency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>OverlayViewController</string>
+ <string>UIResponder</string>
+ <string>{{690, 375}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCkAAAw5SAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">72</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">OverlayViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>buttonReleased:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>buttonReleased:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">buttonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">buttonReleased:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/OverlayViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="917531033">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIButton</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="917531033"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1056" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3100" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>ammoButton.png</string>
+ <string>arrowDown.png</string>
+ <string>arrowLeft.png</string>
+ <string>arrowRight.png</string>
+ <string>arrowUp.png</string>
+ <string>cornerButton.png</string>
+ <string>joyButtonAttack.png</string>
+ <string>joyButtonBackJump.png</string>
+ <string>joyButtonForwardJump.png</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{78, 50}</string>
+ <string>{50, 50}</string>
+ <string>{50, 50}</string>
+ <string>{50, 50}</string>
+ <string>{50, 50}</string>
+ <string>{60, 50}</string>
+ <string>{64, 64}</string>
+ <string>{64, 64}</string>
+ <string>{64, 64}</string>
+ </object>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">132</string>
+ </data>
+</archive>
--- a/project_files/HedgewarsMobile/Classes/PascalImports.h Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/PascalImports.h Sat Oct 08 16:54:56 2011 +0200
@@ -71,8 +71,6 @@
void *HW_getSDLWindow(void);
void HW_terminate(BOOL andCloseFrontend);
- void HW_suspend(void);
- void HW_resume(void);
void HW_setCursor(int x, int y);
void HW_getCursor(int *x, int *y);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/RestoreViewController-iPad.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,616 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">132</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBUIView" id="191373211">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIButton" id="155385540">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">302</int>
+ <string key="NSFrame">{{84, 517}, {151, 37}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <object class="NSFont" key="IBUIFont" id="204967016">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <int key="IBUIButtonType">1</int>
+ <string key="IBUINormalTitle">Dismiss</string>
+ <object class="NSColor" key="IBUIHighlightedTitleColor" id="790402446">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleColor" id="829178890">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAuNTAxOTYwODE0AA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleShadowColor" id="644451038">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ </object>
+ <object class="IBUIButton" id="202794507">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">299</int>
+ <string key="NSFrame">{{308, 517}, {151, 37}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">1</int>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="204967016"/>
+ <int key="IBUIButtonType">1</int>
+ <string key="IBUINormalTitle">Restore</string>
+ <reference key="IBUIHighlightedTitleColor" ref="790402446"/>
+ <reference key="IBUINormalTitleColor" ref="829178890"/>
+ <reference key="IBUINormalTitleShadowColor" ref="644451038"/>
+ </object>
+ <object class="IBUILabel" id="655269955">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">315</int>
+ <string key="NSFrame">{{216, 35}, {108, 29}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Hmm...</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">24</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MSAwLjc4MDM5MjIyOTYgMAA</bytes>
+ </object>
+ <reference key="IBUIHighlightedColor" ref="790402446"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ <object class="IBUILabel" id="19933541">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">307</int>
+ <string key="NSFrame">{{80, 375}, {380, 96}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Would you like to restore it?</string>
+ <object class="NSFont" key="IBUIFont" id="276115526">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">18</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC45MDE5NjA3OTAyIDAuOTAxOTYwNzkwMiAwLjkwMTk2MDc5MDIAA</bytes>
+ </object>
+ <reference key="IBUIHighlightedColor" ref="790402446"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">4</int>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ <object class="IBUILabel" id="151967545">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">307</int>
+ <string key="NSFrame">{{80, 87}, {380, 96}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">It appears you didn't complete your last game!</string>
+ <reference key="IBUIFont" ref="276115526"/>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC45MDE5NjA3OTAyIDAuOTAxOTYwNzkwMiAwLjkwMTk2MDc5MDIAA</bytes>
+ </object>
+ <reference key="IBUIHighlightedColor" ref="790402446"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">4</int>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ <object class="IBUIImageView" id="129485928">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">300</int>
+ <string key="NSFrame">{{150, 191}, {240, 160}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">denied.png</string>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{540, 640}</string>
+ <reference key="NSSuperview"/>
+ <reference key="IBUIBackgroundColor" ref="790402446"/>
+ <int key="IBUIContentMode">4</int>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="191373211"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="155385540"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">21</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="202794507"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">22</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1</int>
+ <reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="155385540"/>
+ <reference ref="202794507"/>
+ <reference ref="655269955"/>
+ <reference ref="19933541"/>
+ <reference ref="151967545"/>
+ <reference ref="129485928"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">15</int>
+ <reference key="object" ref="155385540"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">16</int>
+ <reference key="object" ref="202794507"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">18</int>
+ <reference key="object" ref="655269955"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">19</int>
+ <reference key="object" ref="19933541"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">20</int>
+ <reference key="object" ref="129485928"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">23</int>
+ <reference key="object" ref="151967545"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>1.IBEditorWindowLastContentRect</string>
+ <string>1.IBPluginDependency</string>
+ <string>15.IBPluginDependency</string>
+ <string>15.IBViewBoundsToFrameTransform</string>
+ <string>16.IBPluginDependency</string>
+ <string>16.IBViewBoundsToFrameTransform</string>
+ <string>18.IBPluginDependency</string>
+ <string>18.IBViewBoundsToFrameTransform</string>
+ <string>19.IBPluginDependency</string>
+ <string>19.IBViewBoundsToFrameTransform</string>
+ <string>20.IBPluginDependency</string>
+ <string>20.IBViewBoundsToFrameTransform</string>
+ <string>23.IBPluginDependency</string>
+ <string>23.IBViewBoundsToFrameTransform</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>RestoreViewController</string>
+ <string>UIResponder</string>
+ <string>{{566, 244}, {540, 640}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDlIAAw2gAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABEAkAAw2gAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDXAAAw3UAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AUKgAABDmYAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDFgAAw8cAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCoAAAw9uAAA</bytes>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">23</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">RestoreViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">buttonReleased:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">buttonReleased:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">buttonReleased:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/RestoreViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="749404015">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIButton</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIImageView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="749404015"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1056" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">denied.png</string>
+ <string key="NS.object.0">{240, 160}</string>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">132</string>
+ </data>
+</archive>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/RestoreViewController-iPhone.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,582 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">132</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="191373211">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIImageView" id="508553704">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">300</int>
+ <string key="NSFrame">{{20, 20}, {240, 160}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">denied.png</string>
+ </object>
+ </object>
+ <object class="IBUILabel" id="531154203">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">315</int>
+ <string key="NSFrame">{{310, 32}, {108, 29}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Hmm...</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">24</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MSAwLjgyNzQ1MTA1MDMgMAA</bytes>
+ </object>
+ <object class="NSColor" key="IBUIHighlightedColor" id="790402446">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ <object class="IBUILabel" id="785455561">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">307</int>
+ <string key="NSFrame">{{268, 74}, {192, 96}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">It appears you didn't complete your last game! Would you like to restore it?</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">18</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC45MDE5NjA3OTAyIDAuOTAxOTYwNzkwMiAwLjkwMTk2MDc5MDIAA</bytes>
+ </object>
+ <reference key="IBUIHighlightedColor" ref="790402446"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">4</int>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ <object class="IBUIButton" id="472385208">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">302</int>
+ <string key="NSFrame">{{53, 229}, {151, 37}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <object class="NSFont" key="IBUIFont" id="204967016">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <int key="IBUIButtonType">1</int>
+ <string key="IBUINormalTitle">Dismiss</string>
+ <reference key="IBUIHighlightedTitleColor" ref="790402446"/>
+ <object class="NSColor" key="IBUINormalTitleColor" id="734262812">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAuNTAxOTYwODE0AA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleShadowColor" id="644451038">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ </object>
+ <object class="IBUIButton" id="923913762">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">299</int>
+ <string key="NSFrame">{{277, 229}, {151, 37}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">1</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="204967016"/>
+ <int key="IBUIButtonType">1</int>
+ <string key="IBUINormalTitle">Restore</string>
+ <reference key="IBUIHighlightedTitleColor" ref="790402446"/>
+ <reference key="IBUINormalTitleColor" ref="734262812"/>
+ <reference key="IBUINormalTitleShadowColor" ref="644451038"/>
+ </object>
+ </object>
+ <string key="NSFrameSize">{480, 320}</string>
+ <reference key="NSSuperview"/>
+ <reference key="IBUIBackgroundColor" ref="790402446"/>
+ <int key="IBUIContentMode">4</int>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="191373211"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="923913762"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">11</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonReleased:</string>
+ <reference key="source" ref="472385208"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">12</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1</int>
+ <reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="508553704"/>
+ <reference ref="923913762"/>
+ <reference ref="785455561"/>
+ <reference ref="531154203"/>
+ <reference ref="472385208"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="508553704"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6</int>
+ <reference key="object" ref="531154203"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="785455561"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8</int>
+ <reference key="object" ref="472385208"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">10</int>
+ <reference key="object" ref="923913762"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>1.IBEditorWindowLastContentRect</string>
+ <string>1.IBPluginDependency</string>
+ <string>10.IBPluginDependency</string>
+ <string>10.IBViewBoundsToFrameTransform</string>
+ <string>5.IBPluginDependency</string>
+ <string>5.IBViewBoundsToFrameTransform</string>
+ <string>6.IBPluginDependency</string>
+ <string>6.IBViewBoundsToFrameTransform</string>
+ <string>7.IBPluginDependency</string>
+ <string>7.IBViewBoundsToFrameTransform</string>
+ <string>8.IBPluginDependency</string>
+ <string>8.IBViewBoundsToFrameTransform</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>RestoreViewController</string>
+ <string>UIResponder</string>
+ <string>{{206, 423}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AUOKgABDZQAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AUGgAABBoAAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AUObAABCAAAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AUOGAABClAAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AUJUAABDZQAAA</bytes>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">14</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">RestoreViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">buttonReleased:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">buttonReleased:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">buttonReleased:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/RestoreViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="749404015">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIButton</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIImageView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="749404015"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1056" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">denied.png</string>
+ <string key="NS.object.0">{240, 160}</string>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">132</string>
+ </data>
+</archive>
--- a/project_files/HedgewarsMobile/Classes/RestoreViewController.h Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/RestoreViewController.h Sat Oct 08 16:54:56 2011 +0200
@@ -21,14 +21,11 @@
#import <UIKit/UIKit.h>
-@class GameInterfaceBridge;
@interface RestoreViewController : UIViewController {
- GameInterfaceBridge *interfaceBridge;
+
}
-@property (nonatomic,retain) GameInterfaceBridge *interfaceBridge;
-
-(IBAction) buttonReleased:(id) sender;
@end
--- a/project_files/HedgewarsMobile/Classes/RestoreViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/RestoreViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -23,7 +23,6 @@
#import "GameInterfaceBridge.h"
@implementation RestoreViewController
-@synthesize interfaceBridge;
// Override to allow orientations other than the default portrait orientation.
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
@@ -36,16 +35,11 @@
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
if (theButton.tag != 0) {
- playSound(@"clickSound");
- if (self.interfaceBridge == nil) {
- GameInterfaceBridge *bridge = [[GameInterfaceBridge alloc] initWithController:self.parentViewController];
- self.interfaceBridge = bridge;
- [bridge release];
- }
+ [AudioManagerController playClickSound];
[self.parentViewController dismissModalViewControllerAnimated:NO];
- [self.interfaceBridge startSaveGame:[defaults objectForKey:@"savedGamePath"]];
+ [[NSNotificationCenter defaultCenter] postNotificationName:@"launchRestoredGame" object:nil];
} else {
- playSound(@"backSound");
+ [AudioManagerController playBackSound];
[defaults setObject:@"" forKey:@"savedGamePath"];
[defaults synchronize];
[self.parentViewController dismissModalViewControllerAnimated:YES];
@@ -65,18 +59,14 @@
}
-(void) didReceiveMemoryWarning {
- // don't nil this one or it won't be able to send messages
- //self.interfaceBridge = nil;
[super didReceiveMemoryWarning];
}
-(void) viewDidUnload {
- self.interfaceBridge = nil;
[super viewDidUnload];
}
-(void) dealloc {
- releaseAndNil(interfaceBridge);
[super dealloc];
}
--- a/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -21,7 +21,7 @@
#import "SavedGamesViewController.h"
#import "GameInterfaceBridge.h"
-#import "CommodityFunctions.h"
+
@implementation SavedGamesViewController
@synthesize tableView, listOfSavegames, interfaceBridge, numberOfItems;
@@ -44,11 +44,7 @@
if ([self.tableView respondsToSelector:@selector(setBackgroundView:)])
self.tableView.backgroundView = nil;
- NSString *imgName;
- if (IS_IPAD())
- imgName = @"mediumBackground~ipad.png";
- else
- imgName = @"smallerBackground~iphone.png";
+ NSString *imgName = (IS_IPAD()) ? @"mediumBackground~ipad.png" : @"smallerBackground~iphone.png";
UIImage *img = [[UIImage alloc] initWithContentsOfFile:imgName];
self.view.backgroundColor = [UIColor colorWithPatternImage:img];
[img release];
@@ -69,7 +65,7 @@
UIButton *button = (UIButton *)sender;
if (button.tag == 0) {
- playSound(@"backSound");
+ [AudioManagerController playBackSound];
[self.tableView setEditing:NO animated:YES];
[[self parentViewController] dismissModalViewControllerAnimated:YES];
} else {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.xib Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,574 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">132</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="4"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="841351856">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBProxyObject" id="606714003">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBUIView" id="766721923">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIToolbar" id="832454237">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">290</int>
+ <string key="NSFrameSize">{768, 44}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUITag">458912</int>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSMutableArray" key="IBUIItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIBarButtonItem" id="422926197">
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUIToolbar" ref="832454237"/>
+ <int key="IBUISystemItemIdentifier">0</int>
+ </object>
+ <object class="IBUIBarButtonItem" id="881124109">
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <reference key="IBUIToolbar" ref="832454237"/>
+ <int key="IBUISystemItemIdentifier">5</int>
+ </object>
+ <object class="IBUIBarButtonItem" id="882246004">
+ <int key="IBUITag">1</int>
+ <string key="IBUITitle">Clear All</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUIToolbar" ref="832454237"/>
+ </object>
+ </object>
+ </object>
+ <object class="IBUITableView" id="399289716">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{0, 44}, {768, 724}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAgMAA</bytes>
+ </object>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <bool key="IBUIAlwaysBounceVertical">YES</bool>
+ <int key="IBUIStyle">1</int>
+ <int key="IBUISeparatorStyle">2</int>
+ <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+ <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+ <float key="IBUIRowHeight">44</float>
+ <float key="IBUISectionHeaderHeight">10</float>
+ <float key="IBUISectionFooterHeight">10</float>
+ </object>
+ </object>
+ <string key="NSFrameSize">{768, 768}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="766721923"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="422926197"/>
+ <reference key="destination" ref="841351856"/>
+ </object>
+ <int key="connectionID">6</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="399289716"/>
+ <reference key="destination" ref="841351856"/>
+ </object>
+ <int key="connectionID">8</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="399289716"/>
+ <reference key="destination" ref="841351856"/>
+ </object>
+ <int key="connectionID">9</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">tableView</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="399289716"/>
+ </object>
+ <int key="connectionID">10</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="882246004"/>
+ <reference key="destination" ref="841351856"/>
+ </object>
+ <int key="connectionID">17</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="841351856"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="606714003"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">2</int>
+ <reference key="object" ref="766721923"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="832454237"/>
+ <reference ref="399289716"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">4</int>
+ <reference key="object" ref="832454237"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="422926197"/>
+ <reference ref="881124109"/>
+ <reference ref="882246004"/>
+ </object>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="422926197"/>
+ <reference key="parent" ref="832454237"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="399289716"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">13</int>
+ <reference key="object" ref="881124109"/>
+ <reference key="parent" ref="832454237"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">15</int>
+ <reference key="object" ref="882246004"/>
+ <reference key="parent" ref="832454237"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>13.IBPluginDependency</string>
+ <string>15.IBPluginDependency</string>
+ <string>2.IBEditorWindowLastContentRect</string>
+ <string>2.IBPluginDependency</string>
+ <string>4.IBPluginDependency</string>
+ <string>5.IBPluginDependency</string>
+ <string>7.IBPluginDependency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>SavedGamesViewController</string>
+ <string>UIResponder</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{467, 276}, {768, 768}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">17</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">SavedGamesViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>clearAll:</string>
+ <string>toggleEdit:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
+ <string>clearAll:</string>
+ <string>toggleEdit:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">buttonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">clearAll:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">toggleEdit:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">tableView</string>
+ <string key="NS.object.0">UITableView</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">tableView</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">tableView</string>
+ <string key="candidateClassName">UITableView</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/SavedGamesViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIBarButtonItem</string>
+ <string key="superclassName">UIBarItem</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIBarItem</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="786211723"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableView</string>
+ <string key="superclassName">UIScrollView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIToolbar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIToolbar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1056" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3100" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <string key="IBCocoaTouchPluginVersion">132</string>
+ </data>
+</archive>
--- a/project_files/HedgewarsMobile/Classes/SchemeSettingsViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SchemeSettingsViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -41,6 +41,8 @@
action:@selector(toggleEdit:)];
self.navigationItem.rightBarButtonItem = editButton;
[editButton release];
+
+ self.navigationItem.title = @"List of schemes";
}
-(void) viewWillAppear:(BOOL) animated {
@@ -78,7 +80,7 @@
-(void) addScheme:(id) sender {
NSString *fileName = [[NSString alloc] initWithFormat:@"Scheme %u.plist", [self.listOfSchemes count]];
- createSchemeNamed([fileName stringByDeletingPathExtension]);
+ createSchemeNamed([fileName stringByDeletingPathExtension], 0);
[self.listOfSchemes addObject:fileName];
@@ -126,7 +128,7 @@
[schemeFile release];
[self.listOfSchemes removeObjectAtIndex:row];
- [self.tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade];
+ [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade];
}
#pragma mark -
@@ -144,6 +146,7 @@
[childController.tableView setContentOffset:CGPointMake(0,0) animated:NO];
[self.navigationController pushViewController:childController animated:YES];
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
}
--- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,7 +20,7 @@
#import "SchemeWeaponConfigViewController.h"
-#import "CommodityFunctions.h"
+
#define LABEL_TAG 57423
@@ -59,7 +59,7 @@
self.view.backgroundColor = [UIColor blackColor];
}
- self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER;
+ self.tableView.separatorColor = [UIColor darkYellowColor];
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
}
@@ -154,8 +154,8 @@
}
}
- cell.backgroundColor = UICOLOR_HW_ALMOSTBLACK;
- cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
+ cell.backgroundColor = [UIColor blackColorTransparent];
+ cell.textLabel.textColor = [UIColor lightYellowColor];
cell.detailTextLabel.textColor = [UIColor whiteColor];
cell.textLabel.adjustsFontSizeToFitWidth = YES;
cell.detailTextLabel.adjustsFontSizeToFitWidth = YES;
@@ -294,7 +294,8 @@
self.tableView.scrollEnabled = NO;
CGRect frame = CGRectMake(0, 0, self.view.frame.size.width * 80/100, 60);
- UILabel *theLabel = createBlueLabel(NSLocalizedString(@"Missions don't need further configuration",@""), frame);
+ UILabel *theLabel = [[UILabel alloc] initWithFrame:frame
+ andTitle:NSLocalizedString(@"Missions don't need further configuration",@"")];
theLabel.center = CGPointMake(self.view.frame.size.width/2, self.view.frame.size.height/2);
theLabel.numberOfLines = 2;
theLabel.tag = LABEL_TAG;
--- a/project_files/HedgewarsMobile/Classes/ServerSetup.h Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/ServerSetup.h Sat Oct 08 16:54:56 2011 +0200
@@ -28,6 +28,9 @@
TCPsocket sd; // External socket descriptor
}
++(NSInteger) randomPort;
++(BOOL) isNetworkReachable;
+
@property (nonatomic, retain) NSDictionary *systemSettings;
@end
--- a/project_files/HedgewarsMobile/Classes/ServerSetup.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/ServerSetup.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,8 +20,9 @@
#import "ServerSetup.h"
-#import "PascalImports.h"
-#import "CommodityFunctions.h"
+#import <netinet/in.h>
+#import <SystemConfiguration/SCNetworkReachability.h>
+
#import "hwconsts.h"
#define BUFFER_SIZE 256
@@ -29,6 +30,47 @@
@implementation ServerSetup
@synthesize systemSettings;
+
++(NSInteger) randomPort {
+ srandom(time(NULL));
+ NSInteger res = (random() % 64511) + 1024;
+ return (res == NETGAME_DEFAULT_PORT) ? [ServerSetup randomPort] : res;
+}
+
++(BOOL) isNetworkReachable {
+ // Create zero addy
+ struct sockaddr_in zeroAddress;
+ bzero(&zeroAddress, sizeof(zeroAddress));
+ zeroAddress.sin_len = sizeof(zeroAddress);
+ zeroAddress.sin_family = AF_INET;
+
+ // Recover reachability flags
+ SCNetworkReachabilityRef defaultRouteReachability = SCNetworkReachabilityCreateWithAddress(NULL, (struct sockaddr *)&zeroAddress);
+ SCNetworkReachabilityFlags flags;
+
+ BOOL didRetrieveFlags = SCNetworkReachabilityGetFlags(defaultRouteReachability, &flags);
+ CFRelease(defaultRouteReachability);
+
+ if (!didRetrieveFlags) {
+ NSLog(@"Error. Could not recover network reachability flags");
+ return NO;
+ }
+
+ BOOL isReachable = flags & kSCNetworkFlagsReachable;
+ BOOL needsConnection = flags & kSCNetworkFlagsConnectionRequired;
+ BOOL nonWiFi = flags & kSCNetworkReachabilityFlagsTransientConnection;
+
+ NSURL *testURL = [NSURL URLWithString:@"http://www.apple.com/"];
+ NSURLRequest *testRequest = [NSURLRequest requestWithURL:testURL
+ cachePolicy:NSURLRequestReloadIgnoringLocalCacheData
+ timeoutInterval:20.0];
+ NSURLConnection *testConnection = [[NSURLConnection alloc] initWithRequest:testRequest delegate:nil];
+ BOOL testResult = testConnection ? YES : NO;
+ [testConnection release];
+
+ return ((isReachable && !needsConnection) || nonWiFi) ? testResult : NO;
+}
+
-(id) init {
if (self = [super init]) {
self.systemSettings = nil; //nsuserdefault
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/SettingsBaseViewController.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,50 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 27/03/2010.
+ */
+
+
+#import <UIKit/UIKit.h>
+
+
+@class GeneralSettingsViewController;
+@class TeamSettingsViewController;
+@class WeaponSettingsViewController;
+@class SchemeSettingsViewController;
+@class SupportViewController;
+
+@interface SettingsBaseViewController : UIViewController <UITableViewDelegate, UITableViewDataSource, UITabBarControllerDelegate> {
+ UIViewController *targetController;
+ NSArray *controllerNames;
+ NSIndexPath *lastIndexPath;
+ UITabBarController *tabController;
+ GeneralSettingsViewController *generalSettingsViewController;
+ TeamSettingsViewController *teamSettingsViewController;
+ WeaponSettingsViewController *weaponSettingsViewController;
+ SchemeSettingsViewController *schemeSettingsViewController;
+ SupportViewController *supportViewController;
+}
+
+@property (nonatomic, retain) UIViewController *targetController;
+@property (nonatomic, retain) NSArray *controllerNames;
+@property (nonatomic, retain) NSIndexPath *lastIndexPath;
+@property (nonatomic, retain) UITabBarController *tabController;
+
+-(void) dismissSplitView;
+
+@end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/SettingsBaseViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,288 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 27/03/2010.
+ */
+
+
+#import "SettingsBaseViewController.h"
+#import "GeneralSettingsViewController.h"
+#import "TeamSettingsViewController.h"
+#import "WeaponSettingsViewController.h"
+#import "SchemeSettingsViewController.h"
+#import "SupportViewController.h"
+
+@implementation SettingsBaseViewController
+@synthesize tabController, targetController, controllerNames, lastIndexPath;
+
+
+-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
+ return rotationManager(interfaceOrientation);
+}
+
+
+#pragma mark -
+#pragma mark View lifecycle
+-(void) viewDidLoad {
+ // the list of available controllers
+ NSArray *array = [[NSArray alloc] initWithObjects:NSLocalizedString(@"General",@""),
+ NSLocalizedString(@"Teams",@""),
+ NSLocalizedString(@"Weapons",@""),
+ NSLocalizedString(@"Schemes",@""),
+ NSLocalizedString(@"Support",@""),
+ nil];
+ self.controllerNames = array;
+ [array release];
+
+ UIBarButtonItem *doneButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
+ target:self
+ action:@selector(dismissSplitView)];
+ if (IS_IPAD()) {
+ // this class gets loaded twice, we tell the difference by looking at targetController
+ if (self.targetController != nil) {
+ UITableView *tableView = [[UITableView alloc] initWithFrame:self.view.frame style:UITableViewStylePlain];
+ tableView.delegate = self;
+ tableView.dataSource = self;
+ [tableView reloadData];
+ [self.view addSubview:tableView];
+ [self tableView:tableView didSelectRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+ [tableView release];
+ self.navigationItem.leftBarButtonItem = doneButton;
+ }
+ } else {
+ // this class just loads all controllers and set up tabbar and navigation controllers
+ NSMutableArray *tabBarNavigationControllers = [[NSMutableArray alloc] initWithCapacity:5];
+ UINavigationController *navController = nil;
+
+ if (nil == generalSettingsViewController) {
+ generalSettingsViewController = [[GeneralSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ generalSettingsViewController.tabBarItem.title = [self.controllerNames objectAtIndex:0];
+ generalSettingsViewController.tabBarItem.image = [UIImage imageWithContentsOfFile:[NSString stringWithFormat:@"%@/TargetBee.png",GRAPHICS_DIRECTORY()]];
+ navController = [[UINavigationController alloc] initWithRootViewController:generalSettingsViewController];
+ generalSettingsViewController.navigationItem.backBarButtonItem = doneButton;
+ generalSettingsViewController.navigationItem.leftBarButtonItem = doneButton;
+ [generalSettingsViewController release];
+ [tabBarNavigationControllers addObject:navController];
+ releaseAndNil(navController);
+ }
+ if (nil == teamSettingsViewController) {
+ teamSettingsViewController = [[TeamSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ teamSettingsViewController.tabBarItem.title = [self.controllerNames objectAtIndex:1];
+ teamSettingsViewController.tabBarItem.image = [UIImage imageWithContentsOfFile:[NSString stringWithFormat:@"%@/Egg.png",GRAPHICS_DIRECTORY()]];
+ navController = [[UINavigationController alloc] initWithRootViewController:teamSettingsViewController];
+ teamSettingsViewController.navigationItem.backBarButtonItem = doneButton;
+ teamSettingsViewController.navigationItem.leftBarButtonItem = doneButton;
+ [tabBarNavigationControllers addObject:navController];
+ releaseAndNil(navController);
+ }
+ if (nil == weaponSettingsViewController) {
+ weaponSettingsViewController = [[WeaponSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ weaponSettingsViewController.tabBarItem.title = [self.controllerNames objectAtIndex:2];
+ weaponSettingsViewController.tabBarItem.image = [UIImage imageWithContentsOfFile:[NSString stringWithFormat:@"%@/cheese.png",GRAPHICS_DIRECTORY()]];
+ navController = [[UINavigationController alloc] initWithRootViewController:weaponSettingsViewController];
+ weaponSettingsViewController.navigationItem.backBarButtonItem = doneButton;
+ weaponSettingsViewController.navigationItem.leftBarButtonItem = doneButton;
+ [tabBarNavigationControllers addObject:navController];
+ releaseAndNil(navController);
+ }
+ if (nil == schemeSettingsViewController) {
+ schemeSettingsViewController = [[SchemeSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ schemeSettingsViewController.tabBarItem.title = [self.controllerNames objectAtIndex:3];
+ schemeSettingsViewController.tabBarItem.image = [UIImage imageWithContentsOfFile:[NSString stringWithFormat:@"%@/Targetp.png",GRAPHICS_DIRECTORY()]];
+ navController = [[UINavigationController alloc] initWithRootViewController:schemeSettingsViewController];
+ schemeSettingsViewController.navigationItem.backBarButtonItem = doneButton;
+ schemeSettingsViewController.navigationItem.leftBarButtonItem = doneButton;
+ [tabBarNavigationControllers addObject:navController];
+ releaseAndNil(navController);
+ }
+ if (nil == supportViewController) {
+ supportViewController = [[SupportViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ supportViewController.tabBarItem.title = [self.controllerNames objectAtIndex:4];
+ supportViewController.tabBarItem.image = [UIImage imageWithContentsOfFile:[NSString stringWithFormat:@"%@/Seduction.png",GRAPHICS_DIRECTORY()]];
+ navController = [[UINavigationController alloc] initWithRootViewController:supportViewController];
+ supportViewController.navigationItem.backBarButtonItem = doneButton;
+ supportViewController.navigationItem.leftBarButtonItem = doneButton;
+ [tabBarNavigationControllers addObject:navController];
+ releaseAndNil(navController);
+ }
+
+ self.tabController = [[UITabBarController alloc] init];
+ self.tabController.viewControllers = tabBarNavigationControllers;
+ self.tabController.delegate = self;
+
+ [self.view addSubview:self.tabController.view];
+ }
+ [doneButton release];
+ [super viewDidLoad];
+}
+
+-(void) tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController {
+ [viewController viewWillAppear:NO];
+}
+
+-(void) dismissSplitView {
+ [AudioManagerController playBackSound];
+ [[[HedgewarsAppDelegate sharedAppDelegate] mainViewController] dismissModalViewControllerAnimated:YES];
+}
+
+#pragma mark -
+#pragma mark Table view data source
+-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
+ return 1;
+}
+
+-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return [self.controllerNames count];
+}
+
+// Customize the appearance of table view cells.
+-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ static NSString *CellIdentifier = @"Cell";
+
+ UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+ if (cell == nil)
+ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+
+ NSString *iconStr = nil;
+ switch ([indexPath row]) {
+ case 0:
+ iconStr = [NSString stringWithFormat:@"%@/TargetBee.png",GRAPHICS_DIRECTORY()];
+ break;
+ case 1:
+ iconStr = [NSString stringWithFormat:@"%@/Egg.png",GRAPHICS_DIRECTORY()];
+ break;
+ case 2:
+ iconStr = [NSString stringWithFormat:@"%@/cheese.png",GRAPHICS_DIRECTORY()];
+ break;
+ case 3:
+ iconStr = [NSString stringWithFormat:@"%@/Target.png",GRAPHICS_DIRECTORY()];
+ break;
+ case 4:
+ iconStr = [NSString stringWithFormat:@"%@/Seduction.png",GRAPHICS_DIRECTORY()];
+ break;
+ default:
+ DLog(@"Nope");
+ break;
+ }
+
+ cell.accessoryType = UITableViewCellAccessoryNone;
+ cell.textLabel.text = [controllerNames objectAtIndex:[indexPath row]];
+ UIImage *icon = [[UIImage alloc] initWithContentsOfFile:iconStr];
+ cell.imageView.image = icon;
+ [icon release];
+
+ return cell;
+}
+
+#pragma mark -
+#pragma mark Table view delegate
+-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ int newRow = [indexPath row];
+ int oldRow = (lastIndexPath != nil) ? [lastIndexPath row] : -1;
+ UIViewController *nextController = nil;
+
+ if (newRow != oldRow) {
+ [tableView deselectRowAtIndexPath:lastIndexPath animated:YES];
+ [targetController.navigationController popToRootViewControllerAnimated:NO];
+
+ switch (newRow) {
+ case 0:
+ if (nil == generalSettingsViewController)
+ generalSettingsViewController = [[GeneralSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ nextController = generalSettingsViewController;
+ break;
+ case 1:
+ if (nil == teamSettingsViewController)
+ teamSettingsViewController = [[TeamSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ nextController = teamSettingsViewController;
+ break;
+ case 2:
+ if (nil == weaponSettingsViewController)
+ weaponSettingsViewController = [[WeaponSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ nextController = weaponSettingsViewController;
+ break;
+ case 3:
+ if (nil == schemeSettingsViewController)
+ schemeSettingsViewController = [[SchemeSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ nextController = schemeSettingsViewController;
+ break;
+ case 4:
+ if (nil == supportViewController)
+ supportViewController = [[SupportViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ nextController = supportViewController;
+ break;
+ }
+
+ self.lastIndexPath = indexPath;
+ [tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone];
+
+ nextController.navigationItem.hidesBackButton = YES;
+ [nextController viewWillAppear:NO];
+ [targetController.navigationController pushViewController:nextController animated:NO];
+ [AudioManagerController playClickSound];
+ }
+}
+
+
+#pragma mark -
+#pragma mark Memory management
+-(void) didReceiveMemoryWarning {
+ if (generalSettingsViewController.view.superview == nil)
+ generalSettingsViewController = nil;
+ if (teamSettingsViewController.view.superview == nil)
+ teamSettingsViewController = nil;
+ if (weaponSettingsViewController.view.superview == nil)
+ weaponSettingsViewController = nil;
+ if (schemeSettingsViewController.view.superview == nil)
+ schemeSettingsViewController = nil;
+ if (supportViewController.view.superview == nil)
+ supportViewController = nil;
+ if (tabController.view.superview == nil)
+ tabController = nil;
+ MSG_MEMCLEAN();
+ [super didReceiveMemoryWarning];
+}
+
+-(void) viewDidUnload {
+ self.controllerNames = nil;
+ self.lastIndexPath = nil;
+ self.targetController = nil;
+ self.tabController = nil;
+ generalSettingsViewController = nil;
+ teamSettingsViewController = nil;
+ weaponSettingsViewController = nil;
+ schemeSettingsViewController = nil;
+ supportViewController = nil;
+ MSG_DIDUNLOAD();
+ [super viewDidUnload];
+}
+
+-(void) dealloc {
+ releaseAndNil(targetController);
+ releaseAndNil(controllerNames);
+ releaseAndNil(lastIndexPath);
+ releaseAndNil(tabController);
+ releaseAndNil(generalSettingsViewController);
+ releaseAndNil(teamSettingsViewController);
+ releaseAndNil(weaponSettingsViewController);
+ releaseAndNil(schemeSettingsViewController);
+ releaseAndNil(supportViewController);
+ [super dealloc];
+}
+
+@end
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/SettingsContainerViewController.h Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,36 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 27/03/2010.
+ */
+
+
+#import <UIKit/UIKit.h>
+
+@class SettingsBaseViewController;
+
+@interface SettingsContainerViewController : UIViewController {
+ SettingsBaseViewController *baseController;
+ UINavigationController *activeController;
+ UISplitViewController *splitViewRootController;
+}
+
+@property (nonatomic,retain) SettingsBaseViewController *baseController;
+@property (nonatomic,retain) UINavigationController *activeController;
+@property (nonatomic,retain) UISplitViewController *splitViewRootController;
+
+@end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/SettingsContainerViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,130 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 27/03/2010.
+ */
+
+
+#import "SettingsContainerViewController.h"
+#import "SettingsBaseViewController.h"
+
+
+@implementation SettingsContainerViewController
+@synthesize baseController, activeController, splitViewRootController;
+
+-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+ return rotationManager(interfaceOrientation);
+}
+
+
+-(void) viewDidLoad {
+ CGRect rect = [[UIScreen mainScreen] bounds];
+ self.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width);
+
+ if (IS_IPAD()) {
+ // the contents on the right of the splitview, setting targetController to nil to avoid creating the table
+ SettingsBaseViewController *rightController = [[SettingsBaseViewController alloc] init];
+ rightController.targetController = nil;
+ UINavigationController *rightNavController = [[UINavigationController alloc] initWithRootViewController:rightController];
+ [rightController release];
+
+ // the contens on the left of the splitview, setting targetController that will receive push/pop actions
+ SettingsBaseViewController *leftController = [[SettingsBaseViewController alloc] init];
+ leftController.targetController = rightNavController.topViewController;
+ UINavigationController *leftNavController = [[UINavigationController alloc] initWithRootViewController:leftController];
+ [leftController release];
+
+ self.activeController = rightNavController;
+ self.splitViewRootController = [[UISplitViewController alloc] init];
+ self.splitViewRootController.delegate = nil;
+ self.splitViewRootController.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width);
+ self.splitViewRootController.viewControllers = [NSArray arrayWithObjects: leftNavController, rightNavController, nil];
+ [leftNavController release];
+ [rightNavController release];
+
+ // add view to main controller
+ [self.view addSubview:self.splitViewRootController.view];
+ } else {
+ if (nil == self.baseController) {
+ SettingsBaseViewController *sbvc = [[SettingsBaseViewController alloc] init];
+ self.baseController = sbvc;
+ [sbvc release];
+ }
+ self.baseController.targetController = nil;
+ self.baseController.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width);
+
+ [self.view addSubview:self.baseController.view];
+ // here setting activeController is not needed as the event is kept active by the uitabbarcontroller
+ }
+
+ [super viewDidLoad];
+}
+
+#pragma mark -
+#pragma mark Memory management
+-(void) didReceiveMemoryWarning {
+ if (self.baseController.view.superview == nil)
+ self.baseController = nil;
+ if (self.activeController.view.superview == nil)
+ self.activeController = nil;
+ if (self.splitViewRootController.view.superview == nil)
+ self.splitViewRootController = nil;
+ MSG_MEMCLEAN();
+ [super didReceiveMemoryWarning];
+}
+
+-(void) viewDidUnload {
+ self.baseController = nil;
+ self.activeController = nil;
+ self.splitViewRootController = nil;
+ MSG_DIDUNLOAD();
+ [super viewDidUnload];
+}
+
+-(void) dealloc {
+ releaseAndNil(baseController);
+ releaseAndNil(activeController);
+ releaseAndNil(splitViewRootController);
+ [super dealloc];
+}
+
+
+#pragma mark -
+#pragma mark additional methods as we're using a UINavigationController programmatically
+// see http://davidebenini.it/2009/01/03/viewwillappear-not-being-called-inside-a-uinavigationcontroller/
+-(void) viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+ [self.activeController viewWillAppear:animated];
+}
+
+-(void) viewWillDisappear:(BOOL)animated {
+ [super viewWillDisappear:animated];
+ [self.activeController viewWillDisappear:animated];
+}
+
+-(void) viewDidAppear:(BOOL)animated {
+ [super viewDidLoad];
+ [self.activeController viewDidAppear:animated];
+}
+
+-(void) viewDidDisappear:(BOOL)animated {
+ [super viewDidUnload];
+ [self.activeController viewDidDisappear:animated];
+}
+
+
+@end
--- a/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -21,8 +21,7 @@
#import "SingleSchemeViewController.h"
#import <QuartzCore/QuartzCore.h>
-#import "CommodityFunctions.h"
-#import "UIImageExtra.h"
+
#define LABEL_TAG 12345
#define SLIDER_TAG 54321
@@ -184,7 +183,8 @@
[label release];
}
- UIImage *img = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/icon%@.png",BTN_DIRECTORY(),[[self.basicSettingList objectAtIndex:row] objectForKey:@"image"]]];
+ UIImage *img = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/icon%@.png",ICONS_DIRECTORY(),
+ [[self.basicSettingList objectAtIndex:row] objectForKey:@"image"]]];
cell.imageView.image = img;
[img release];
@@ -230,11 +230,12 @@
switcher.tag = SWITCH_TAG + row;
[switcher setOn:[[[self.schemeDictionary objectForKey:@"gamemod"] objectAtIndex:row] boolValue] animated:NO];
- UIImage *image = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/btn%@.png",BTN_DIRECTORY(),[[self.gameModifierArray objectAtIndex:row] objectForKey:@"image"]]];
+ UIImage *image = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/btn%@.png",ICONS_DIRECTORY(),
+ [[self.gameModifierArray objectAtIndex:row] objectForKey:@"image"]]];
cell.imageView.image = image;
[image release];
- [cell.imageView.layer setCornerRadius:7.0f];
- [cell.imageView.layer setMasksToBounds:YES];
+ cell.imageView.layer.cornerRadius = 6.0f;
+ cell.imageView.layer.masksToBounds = YES;
cell.textLabel.text = [[self.gameModifierArray objectAtIndex:row] objectForKey:@"title"];
cell.detailTextLabel.text = [[self.gameModifierArray objectAtIndex:row] objectForKey:@"description"];
cell.detailTextLabel.adjustsFontSizeToFitWidth = YES;
--- a/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -27,9 +27,7 @@
#import "FortsViewController.h"
#import "FlagsViewController.h"
#import "LevelViewController.h"
-#import "CommodityFunctions.h"
-#import "UIImageExtra.h"
-#import "PascalImports.h"
+
#define TEAMNAME_TAG 78789
@@ -85,8 +83,8 @@
[moreArray release];
// load the base hog image, drawing will occure in cellForRow...
- NSString *normalHogFile = [[NSString alloc] initWithFormat:@"%@/Hedgehog.png",GRAPHICS_DIRECTORY()];
- UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:normalHogFile andCutAt:CGRectMake(96, 0, 32, 32)];
+ NSString *normalHogFile = [[NSString alloc] initWithFormat:@"%@/basehat-hedgehog.png",[[NSBundle mainBundle] resourcePath]];
+ UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:normalHogFile];
[normalHogFile release];
self.normalHogSprite = hogSprite;
[hogSprite release];
@@ -255,24 +253,25 @@
[accessoryImage release];
break;
case 2: // fort
- accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@-preview.png",
+ accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@-icon.png",
FORTS_DIRECTORY(),[teamDictionary objectForKey:@"fort"]]];
- cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(32, 32)];
+ cell.imageView.image = accessoryImage;
[accessoryImage release];
break;
case 3: // flags
accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.png",
FLAGS_DIRECTORY(),[teamDictionary objectForKey:@"flag"]]];
- cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(27, 19)];
+ cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(26, 18)];
cell.imageView.layer.borderWidth = 0.3;
[accessoryImage release];
break;
case 4: // level
- accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%d.png",
- BOTLEVELS_DIRECTORY(),[[[[teamDictionary objectForKey:@"hedgehogs"]
- objectAtIndex:0] objectForKey:@"level"]
- intValue]]];
- cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(32, 32)];
+ accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/bot%d.png",
+ [[NSBundle mainBundle] resourcePath],
+ [[[[teamDictionary objectForKey:@"hedgehogs"]
+ objectAtIndex:0] objectForKey:@"level"]
+ intValue]]];
+ cell.imageView.image = accessoryImage;
[accessoryImage release];
break;
default:
--- a/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,9 +20,7 @@
#import "SingleWeaponViewController.h"
-#import "CommodityFunctions.h"
-#import "UIImageExtra.h"
-#import "PascalImports.h"
+
@implementation SingleWeaponViewController
@synthesize weaponName, description, ammoStoreImage;
@@ -165,10 +163,12 @@
weaponCell.delegate = self;
}
- int x = ((row*32)/(int)self.ammoStoreImage.size.height)*32;
- int y = (row*32)%(int)self.ammoStoreImage.size.height;
+ int size = 32 * [[UIScreen mainScreen] scale];
+ int corners = 8 * [[UIScreen mainScreen] scale];
+ int x = ((row*size)/(int)(self.ammoStoreImage.size.height * [[UIScreen mainScreen] scale]))*size;
+ int y = (row*size)%(int)(self.ammoStoreImage.size.height * [[UIScreen mainScreen] scale]);
- UIImage *img = [[self.ammoStoreImage cutAt:CGRectMake(x, y, 32, 32)] makeRoundCornersOfSize:CGSizeMake(7, 7)];
+ UIImage *img = [[self.ammoStoreImage cutAt:CGRectMake(x, y, size, size)] makeRoundCornersOfSize:CGSizeMake(corners, corners)];
weaponCell.weaponIcon.image = img;
weaponCell.weaponName.text = [NSString stringWithUTF8String:HW_getWeaponNameByIndex(row)];
weaponCell.tag = row;
--- a/project_files/HedgewarsMobile/Classes/SplitViewRootController.h Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Hedgewars-iOS, a Hedgewars port for iOS devices
- * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * File created on 27/03/2010.
- */
-
-
-#import <UIKit/UIKit.h>
-
-@class MasterViewController;
-
-@interface SplitViewRootController: UIViewController {
- MasterViewController *activeController;
- UINavigationController *rightNavController;
- UISplitViewController *splitViewRootController;
-}
-
-@property (nonatomic,retain) MasterViewController *activeController;
-@property (nonatomic,retain) UINavigationController *rightNavController;
-@property (nonatomic,retain) UISplitViewController *splitViewRootController;
-
-@end
--- a/project_files/HedgewarsMobile/Classes/SplitViewRootController.m Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-/*
- * Hedgewars-iOS, a Hedgewars port for iOS devices
- * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * File created on 27/03/2010.
- */
-
-
-#import "SplitViewRootController.h"
-#import "MasterViewController.h"
-#import "CommodityFunctions.h"
-
-@implementation SplitViewRootController
-@synthesize activeController, rightNavController, splitViewRootController;
-
--(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
- return rotationManager(interfaceOrientation);
-}
-
--(void) didReceiveMemoryWarning {
- if (self.activeController.view.superview == nil)
- self.activeController = nil;
- MSG_MEMCLEAN();
- [super didReceiveMemoryWarning];
-}
-
-// load the view programmatically; we need a splitViewController that handles a MasterViewController
-// (which is just a UITableViewController) and a DetailViewController where we present options
--(void) viewDidLoad {
- CGRect rect = [[UIScreen mainScreen] bounds];
- self.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width);
-
- if (self.activeController == nil) {
- MasterViewController *rightController = [[MasterViewController alloc] initWithStyle:UITableViewStyleGrouped];
- rightController.rootController = self;
- rightController.targetController = nil;
- self.activeController = rightController;
- [rightController release];
- }
- self.rightNavController = [[UINavigationController alloc] initWithRootViewController:self.activeController];
-
- if (IS_IPAD()) {
- MasterViewController *leftController = [[MasterViewController alloc] initWithStyle:UITableViewStylePlain];
- leftController.rootController = self;
- leftController.targetController = self.activeController;
- UINavigationController *leftNavController = [[UINavigationController alloc] initWithRootViewController:leftController];
- [leftController release];
-
- self.splitViewRootController = [[UISplitViewController alloc] init];
- self.splitViewRootController.delegate = nil;
- self.splitViewRootController.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width);
- self.splitViewRootController.viewControllers = [NSArray arrayWithObjects: leftNavController, self.rightNavController, nil];
- [leftNavController release];
- [self.rightNavController release];
-
- // add view to main controller
- [self.view addSubview:self.splitViewRootController.view];
- } else {
- self.rightNavController.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width);
- [self.view addSubview:self.rightNavController.view];
- }
-
- [super viewDidLoad];
-}
-
--(void) dismissModalViewControllerAnimated:(BOOL)animated {
- playSound(@"backSound");
- [self.parentViewController dismissModalViewControllerAnimated:YES];
-}
-
--(void) viewDidUnload {
- self.activeController = nil;
- self.rightNavController = nil;
- self.splitViewRootController = nil;
- MSG_DIDUNLOAD();
- [super viewDidUnload];
-}
-
--(void) dealloc {
- releaseAndNil(activeController);
- releaseAndNil(rightNavController);
- releaseAndNil(splitViewRootController);
- [super dealloc];
-}
-
-#pragma mark -
-#pragma mark additional methods as we're using a UINavigationController programmatically
-// see http://davidebenini.it/2009/01/03/viewwillappear-not-being-called-inside-a-uinavigationcontroller/
--(void) viewWillAppear:(BOOL)animated {
- [super viewWillAppear:animated];
- [self.activeController.navigationController viewWillAppear:animated];
-}
-
--(void) viewWillDisappear:(BOOL)animated {
- [super viewWillDisappear:animated];
- [self.activeController.navigationController viewWillDisappear:animated];
-}
-
--(void) viewDidAppear:(BOOL)animated {
- [super viewDidLoad];
- [self.activeController.navigationController viewDidAppear:animated];
-}
-
--(void) viewDidDisappear:(BOOL)animated {
- [super viewDidUnload];
- [self.activeController.navigationController viewDidDisappear:animated];
-}
-
-
-@end
--- a/project_files/HedgewarsMobile/Classes/SquareButtonView.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SquareButtonView.m Sat Oct 08 16:54:56 2011 +0200
@@ -21,8 +21,7 @@
#import "SquareButtonView.h"
#import <QuartzCore/QuartzCore.h>
-#import "CommodityFunctions.h"
-#import "UIImageExtra.h"
+
@implementation SquareButtonView
@synthesize colorArray, selectedColor, ownerDictionary;
@@ -32,7 +31,7 @@
colorIndex = -1;
selectedColor = 0;
- self.colorArray = getAvailableColors();
+ self.colorArray = [HWUtils teamColors];
// set the color to the first available one
[self nextColor];
@@ -41,7 +40,7 @@
[self.layer setCornerRadius:7.0f];
[self.layer setMasksToBounds:YES];
[self.layer setBorderWidth:2];
- [self.layer setBorderColor:[UICOLOR_HW_YELLOW_BODER CGColor]];
+ [self.layer setBorderColor:[[UIColor darkYellowColor] CGColor]];
// this changes the color at button press
[self addTarget:self action:@selector(nextColor) forControlEvents:UIControlEventTouchUpInside];
@@ -67,7 +66,7 @@
-(void) selectColor:(NSUInteger) color {
if (color != selectedColor) {
selectedColor = color;
- colorIndex = [colorArray indexOfObject:[NSNumber numberWithUnsignedInt:color]];
+ colorIndex = [self.colorArray indexOfObject:[NSNumber numberWithUnsignedInt:color]];
self.backgroundColor = [UIColor colorWithRed:((color & 0x00FF0000) >> 16)/255.0f
green:((color & 0x0000FF00) >> 8)/255.0f
--- a/project_files/HedgewarsMobile/Classes/StatsPageViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/StatsPageViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,7 +20,7 @@
#import "StatsPageViewController.h"
-#import "CommodityFunctions.h"
+#import <QuartzCore/QuartzCore.h>
@implementation StatsPageViewController
@synthesize statsArray;
@@ -48,7 +48,7 @@
} else
self.view.backgroundColor = [UIColor blackColor];
- self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER;
+ self.tableView.separatorColor = [UIColor darkYellowColor];
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
[super viewDidLoad];
@@ -57,11 +57,11 @@
#pragma mark -
#pragma mark Table view data source
-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
- return 4;
+ return 3;
}
-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
- if (section == 0 || section == 3)
+ if (section == 0)
return 1;
else if (section == 1)
return [[self.statsArray objectAtIndex:0] count];
@@ -73,16 +73,18 @@
static NSString *CellIdentifier0 = @"Cell0";
NSInteger section = [indexPath section];
NSInteger row = [indexPath row];
- NSString *imgString = @"";
+ NSString *imgName = @"";
+ NSString *imgPath = ICONS_DIRECTORY();
UITableViewCell *cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier0];
if (cell == nil)
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier0] autorelease];
if (section == 0) { // winning team
- imgString = @"StatsStar";
+ imgName = @"star";
+ imgPath = [[NSBundle mainBundle] resourcePath];
cell.textLabel.text = [self.statsArray objectAtIndex:1];
- cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
+ cell.textLabel.textColor = [UIColor lightYellowColor];
} else if (section == 1) { // teams ranking
// color, # kills, teamname
NSArray *info = [[[self.statsArray objectAtIndex:0] objectAtIndex:row] componentsSeparatedByString:@" "];
@@ -92,19 +94,16 @@
blue:(color & 0xFF)/255.0f
alpha:1.0f];
cell.textLabel.text = [NSString stringWithFormat:@"%d. %@ (%@ kills)", row+1, [info objectAtIndex:2], [info objectAtIndex:1]];
- imgString = [NSString stringWithFormat:@"StatsMedal%d",row+1];
+ imgName = [NSString stringWithFormat:@"StatsMedal%d",row+1];
} else if (section == 2) { // general info
- imgString = @"iconDamage";
+ imgName = @"iconDamage";
cell.textLabel.text = [self.statsArray objectAtIndex:row + 2];
- cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
- } else { // exit button
- cell.textLabel.text = NSLocalizedString(@"Done",@"");
- cell.textLabel.textColor = [UIColor whiteColor];
- cell.accessoryView = nil;
- cell.imageView.image = nil;
+ cell.textLabel.textColor = [UIColor lightYellowColor];
}
- UIImage *img = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.png",BTN_DIRECTORY(),imgString]];
+ NSString *imgString = [[NSString alloc] initWithFormat:@"%@/%@.png",imgPath,imgName];
+ UIImage *img = [[UIImage alloc] initWithContentsOfFile:imgString];
+ [imgString release];
UIImageView *imgView = [[UIImageView alloc] initWithImage:img];
cell.imageView.image = img;
[img release];
@@ -138,13 +137,42 @@
return nil;
}
+-(CGFloat) tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return self.tableView.rowHeight + 30;
+}
+
+-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
+ if (section == 2) {
+
+ UIView *footer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.height * 70 / 100, self.tableView.rowHeight)];
+ footer.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+
+ UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0, 17, self.view.frame.size.height * 70 / 100, self.tableView.rowHeight)];
+ button.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
+ [button setTitle:NSLocalizedString(@"Done",@"") forState:UIControlStateNormal];
+ [button setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+ [button setTitleColor:[UIColor grayColor] forState:UIControlStateHighlighted];
+
+ button.titleLabel.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]];
+ button.backgroundColor = [UIColor blackColorTransparent];
+ [button.layer setBorderWidth:1];
+ [button.layer setBorderColor:[[UIColor darkYellowColor] CGColor]];
+ [button.layer setCornerRadius:9.0f];
+ [button.layer setMasksToBounds:YES];
+ [button addTarget:self action:@selector(dismissView) forControlEvents:UIControlEventTouchUpInside];
+ [footer addSubview:button];
+ [button release];
+
+ return [footer autorelease];
+ } else
+ return nil;
+}
+
#pragma mark -
-#pragma mark Table view delegate
--(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
- if ([indexPath section] == 3) {
- playSound(@"backSound");
- [self dismissModalViewControllerAnimated:YES];
- }
+#pragma mark button delegate
+-(void) dismissView {
+ [AudioManagerController playClickSound];
+ [self dismissModalViewControllerAnimated:YES];
}
#pragma mark -
--- a/project_files/HedgewarsMobile/Classes/SupportViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SupportViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,7 +20,7 @@
#import "SupportViewController.h"
-#import "CommodityFunctions.h"
+
@implementation SupportViewController
@synthesize waysToSupport;
@@ -44,6 +44,7 @@
self.waysToSupport = array;
[array release];
+ self.navigationItem.title = @"♥";
self.tableView.rowHeight = 50;
}
@@ -64,6 +65,7 @@
static NSString *CellIdentifier = @"Cell";
NSInteger row = [indexPath row];
NSInteger section = [indexPath section];
+ NSString *imgName = @"";
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
if (cell == nil)
@@ -71,33 +73,35 @@
NSString *rowString = [self.waysToSupport objectAtIndex:(row + section)];
cell.textLabel.text = rowString;
- NSString *imgString = nil;
if (section == 0) {
- imgString = [BTN_DIRECTORY() stringByAppendingString:@"/StatsStar.png"];
+ imgName = @"star";
cell.textLabel.textAlignment = UITextAlignmentCenter;
cell.imageView.image = nil;
} else {
cell.textLabel.textAlignment = UITextAlignmentLeft;
switch (row) {
case 0:
- imgString = @"fb.png";
+ imgName = @"fb";
break;
case 1:
- imgString = @"tw.png";
+ imgName = @"tw";
break;
case 2:
- imgString = @"Icon-Small.png";
+ imgName = @"hedgehog";
break;
case 3:
- imgString = @"irc.png";
+ imgName = @"irc";
break;
default:
DLog(@"No way");
break;
}
}
+
+ NSString *imgString = [[NSString alloc] initWithFormat:@"%@/%@.png",[[NSBundle mainBundle] resourcePath],imgName];
UIImage *img = [[UIImage alloc] initWithContentsOfFile:imgString];
+ [imgString release];
cell.imageView.image = img;
if (section == 0) {
UIImageView *imgView = [[UIImageView alloc] initWithImage:img];
--- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,9 +20,9 @@
#import "TeamConfigViewController.h"
-#import "CommodityFunctions.h"
#import "SquareButtonView.h"
+
@implementation TeamConfigViewController
@synthesize listOfTeams, listOfSelectedTeams, cachedContentsOfDir;
@@ -47,7 +47,7 @@
} else
self.view.backgroundColor = [UIColor blackColor];
- self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER;
+ self.tableView.separatorColor = [UIColor darkYellowColor];
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
}
@@ -57,7 +57,7 @@
NSArray *contentsOfDir = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:TEAMS_DIRECTORY() error:NULL];
// avoid overwriting selected teams when returning on this view
if ([self.cachedContentsOfDir isEqualToArray:contentsOfDir] == NO) {
- NSArray *colors = getAvailableColors();
+ NSArray *colors = [HWUtils teamColors];
NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:[contentsOfDir count]];
for (int i = 0; i < [contentsOfDir count]; i++) {
NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
@@ -102,8 +102,10 @@
}
-(UIImage *)drawHogsRepeated:(NSInteger) manyTimes {
- UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:HEDGEHOG_FILE()];
- CGFloat screenScale = getScreenScale();
+ NSString *imgString = [[NSString alloc] initWithFormat:@"%@/hedgehog.png",[[NSBundle mainBundle] resourcePath]];
+ UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:imgString];
+ [imgString release];
+ CGFloat screenScale = [[UIScreen mainScreen] scale];
int w = hogSprite.size.width * screenScale;
int h = hogSprite.size.height * screenScale;
CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
@@ -118,11 +120,7 @@
CGImageRef imageRef = CGBitmapContextCreateImage(context);
// Create a new UIImage object
- UIImage *resultImage;
- if ([self respondsToSelector:@selector(imageWithCGImage:scale:orientation:)])
- resultImage = [UIImage imageWithCGImage:imageRef scale:screenScale orientation:UIImageOrientationUp];
- else
- resultImage = [UIImage imageWithCGImage:imageRef];
+ UIImage *resultImage = [UIImage imageWithCGImage:imageRef scale:screenScale orientation:UIImageOrientationUp];
// Release colorspace, context and bitmap information
CGColorSpaceRelease(colorSpace);
@@ -185,8 +183,9 @@
NSString *teamPath = [NSString stringWithFormat:@"%@/%@.plist",TEAMS_DIRECTORY(),cell.textLabel.text];
NSDictionary *firstHog = [[[NSDictionary dictionaryWithContentsOfFile:teamPath] objectForKey:@"hedgehogs"] objectAtIndex:0];
if ([[firstHog objectForKey:@"level"] intValue] != 0) {
- NSString *filePath = [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/Images/robotBadge.png"];
- UIImage *sprite = [[UIImage alloc] initWithContentsOfFile:filePath];
+ NSString *imgString = [[NSString alloc] initWithFormat:@"%@/robotBadge.png",[[NSBundle mainBundle] resourcePath]];
+ UIImage *sprite = [[UIImage alloc] initWithContentsOfFile:imgString];
+ [imgString release];
UIImageView *spriteView = [[UIImageView alloc] initWithImage:sprite];
[sprite release];
@@ -196,8 +195,8 @@
cell.accessoryView = nil;
}
- cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
- cell.backgroundColor = UICOLOR_HW_ALMOSTBLACK;
+ cell.textLabel.textColor = [UIColor lightYellowColor];
+ cell.backgroundColor = [UIColor blackColorTransparent];
cell.selectionStyle = UITableViewCellSelectionStyleNone;
return cell;
@@ -209,12 +208,8 @@
-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
CGRect frame = CGRectMake(0, 0, self.view.frame.size.width * 80/100, 30);
- NSString *text;
- if (section == 0)
- text = NSLocalizedString(@"Playing Teams",@"");
- else
- text = NSLocalizedString(@"Available Teams",@"");
- UILabel *theLabel = createBlueLabel(text, frame);
+ NSString *text = (section == 0) ? NSLocalizedString(@"Playing Teams",@"") : NSLocalizedString(@"Available Teams",@"");
+ UILabel *theLabel = [[UILabel alloc] initWithFrame:frame andTitle:text];
theLabel.center = CGPointMake(self.view.frame.size.width/2, 20);
UIView *theView = [[[UIView alloc] init] autorelease];
--- a/project_files/HedgewarsMobile/Classes/TeamSettingsViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/TeamSettingsViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -43,6 +43,8 @@
action:@selector(toggleEdit:)];
self.navigationItem.rightBarButtonItem = editButton;
[editButton release];
+
+ self.navigationItem.title = @"List of teams";
}
// load the list of teams in the teams directory
@@ -131,7 +133,7 @@
[teamFile release];
[self.listOfTeams removeObjectAtIndex:row];
- [self.tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade];
+ [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade];
}
@@ -150,6 +152,7 @@
[childController.tableView setContentOffset:CGPointMake(0,0) animated:NO];
[self.navigationController pushViewController:childController animated:YES];
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
}
--- a/project_files/HedgewarsMobile/Classes/UIImageExtra.h Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/UIImageExtra.h Sat Oct 08 16:54:56 2011 +0200
@@ -24,7 +24,8 @@
@interface UIImage (extra)
-CGFloat getScreenScale(void);
++(UIImage *)whiteImage:(CGSize) ofSize;
++(CGSize) imageSizeFromMetadataOf:(NSString *)aFileName;
-(UIImage *)scaleToSize:(CGSize) size;
-(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint;
@@ -34,6 +35,5 @@
-(UIImage *)convertToNegative;
-(UIImage *)maskImageWith:(UIImage *)maskImage;
-(UIImage *)makeRoundCornersOfSize:(CGSize) sizewh;
-+(UIImage *)whiteImage:(CGSize) ofSize;
@end
--- a/project_files/HedgewarsMobile/Classes/UIImageExtra.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/UIImageExtra.m Sat Oct 08 16:54:56 2011 +0200
@@ -24,21 +24,11 @@
@implementation UIImage (extra)
-CGFloat getScreenScale(void) {
- float scale = 1.0f;
- if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])
- scale = [[UIScreen mainScreen] scale];
- return scale;
-}
-
-(UIImage *)scaleToSize:(CGSize) size {
DLog(@"warning - this is a very expensive operation, you should avoid using it");
// Create a bitmap graphics context; this will also set it as the current context
- if (UIGraphicsBeginImageContextWithOptions != NULL)
- UIGraphicsBeginImageContextWithOptions(size, NO, getScreenScale());
- else
- UIGraphicsBeginImageContext(size);
+ UIGraphicsBeginImageContextWithOptions(size, NO, [[UIScreen mainScreen] scale]);
// Draw the scaled image in the current context
[self drawInRect:CGRectMake(0, 0, size.width, size.height)];
@@ -58,18 +48,19 @@
DLog(@"Warning, secondImage == nil");
return self;
}
- CGFloat screenScale = getScreenScale();
+ CGFloat screenScale = [[UIScreen mainScreen] scale];
int w = self.size.width * screenScale;
int h = self.size.height * screenScale;
-
+ int yOffset = self.size.height - secondImage.size.height + secondImagePoint.y;
+
if (w == 0 || h == 0) {
- DLog(@"Can have 0 dimesions");
+ DLog(@"Cannot have 0 dimesions");
return self;
}
// Create a bitmap graphics context; this will also set it as the current context
CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
- CGContextRef context = CGBitmapContextCreate(NULL, w, h, 8, 4 * w, colorSpace, kCGImageAlphaPremultipliedFirst);
+ CGContextRef context = CGBitmapContextCreate(NULL, w, h+yOffset, 8, 4 * w, colorSpace, kCGImageAlphaPremultipliedFirst);
// draw the two images in the current context
CGContextDrawImage(context, CGRectMake(0, 0, self.size.width*screenScale, self.size.height*screenScale), [self CGImage]);
@@ -79,11 +70,7 @@
CGImageRef imageRef = CGBitmapContextCreateImage(context);
// Create a new UIImage object
- UIImage *resultImage;
- if ([self respondsToSelector:@selector(imageWithCGImage:scale:orientation:)])
- resultImage = [UIImage imageWithCGImage:imageRef scale:screenScale orientation:UIImageOrientationUp];
- else
- resultImage = [UIImage imageWithCGImage:imageRef];
+ UIImage *resultImage = [UIImage imageWithCGImage:imageRef scale:screenScale orientation:UIImageOrientationUp];
// Release colorspace, context and bitmap information
CGColorSpaceRelease(colorSpace);
@@ -203,7 +190,7 @@
-(UIImage *)makeRoundCornersOfSize:(CGSize) sizewh {
CGFloat cornerWidth = sizewh.width;
CGFloat cornerHeight = sizewh.height;
- CGFloat screenScale = getScreenScale();
+ CGFloat screenScale = [[UIScreen mainScreen] scale];
CGFloat w = self.size.width * screenScale;
CGFloat h = self.size.height * screenScale;
@@ -222,11 +209,7 @@
CGContextRelease(context);
CGColorSpaceRelease(colorSpace);
- UIImage *newImage;
- if ([self respondsToSelector:@selector(imageWithCGImage:scale:orientation:)])
- newImage = [UIImage imageWithCGImage:imageMasked scale:screenScale orientation:UIImageOrientationUp];
- else
- newImage = [UIImage imageWithCGImage:imageMasked];
+ UIImage *newImage = [UIImage imageWithCGImage:imageMasked scale:screenScale orientation:UIImageOrientationUp];
CGImageRelease(imageMasked);
@@ -268,4 +251,48 @@
return bkgImg;
}
+// this routine checks for the PNG size without loading it in memory
+// https://github.com/steipete/PSFramework/blob/master/PSFramework%20Version%200.3/PhotoshopFramework/PSMetaDataFunctions.m
++(CGSize) imageSizeFromMetadataOf:(NSString *)aFileName {
+ // File Name to C String.
+ const char *fileName = [aFileName UTF8String];
+ // source file
+ FILE *infile = fopen(fileName, "rb");
+ if (infile == NULL) {
+ DLog(@"Can't open the file: %@", aFileName);
+ return CGSizeZero;
+ }
+
+ // Bytes Buffer.
+ unsigned char buffer[30];
+ // Grab Only First Bytes.
+ fread(buffer, 1, 30, infile);
+ // Close File.
+ fclose(infile);
+
+ // PNG Signature.
+ unsigned char png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+
+ // Compare File signature.
+ if ((int)(memcmp(&buffer[0], &png_signature[0], 8))) {
+ DLog(@"The file (%@) is not a PNG file", aFileName);
+ return CGSizeZero;
+ }
+
+ // Calc Sizes. Isolate only four bytes of each size (width, height).
+ int width[4];
+ int height[4];
+ for (int d = 16; d < (16 + 4); d++) {
+ width[d-16] = buffer[d];
+ height[d-16] = buffer[d+4];
+ }
+
+ // Convert bytes to Long (Integer)
+ long resultWidth = (width[0] << (int)24) | (width[1] << (int)16) | (width[2] << (int)8) | width[3];
+ long resultHeight = (height[0] << (int)24) | (height[1] << (int)16) | (height[2] << (int)8) | height[3];
+
+ // Return Size.
+ return CGSizeMake(resultWidth,resultHeight);
+}
+
@end
--- a/project_files/HedgewarsMobile/Classes/VoicesViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/VoicesViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,7 +20,7 @@
#import "VoicesViewController.h"
-#import "CommodityFunctions.h"
+
@implementation VoicesViewController
@synthesize teamDictionary, voiceArray, lastIndexPath;
--- a/project_files/HedgewarsMobile/Classes/WeaponCellView.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/WeaponCellView.m Sat Oct 08 16:54:56 2011 +0200
@@ -20,7 +20,7 @@
#import "WeaponCellView.h"
-#import "CommodityFunctions.h"
+
@implementation WeaponCellView
@synthesize delegate, weaponName, weaponIcon, initialSli, probabilitySli, delaySli, crateSli, helpLabel,
@@ -67,15 +67,18 @@
crateSli.minimumValue = 0;
crateSli.tag = 400;
- NSString *imgAmmoStr = [NSString stringWithFormat:@"%@/iconAmmo.png",BTN_DIRECTORY()];
- NSString *imgDamageStr = [NSString stringWithFormat:@"%@/iconDamage.png",BTN_DIRECTORY()];
- NSString *imgTimeStr = [NSString stringWithFormat:@"%@/iconTime.png",BTN_DIRECTORY()];
- NSString *imgBoxStr = [NSString stringWithFormat:@"%@/iconBox.png",BTN_DIRECTORY()];
-
+ NSString *imgAmmoStr = [[NSString alloc] initWithFormat:@"%@/ammopic.png",ICONS_DIRECTORY()];
initialImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgAmmoStr]];
+ [imgAmmoStr release];
+ NSString *imgDamageStr = [[NSString alloc] initWithFormat:@"%@/iconDamage.png",ICONS_DIRECTORY()];
probabilityImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgDamageStr]];
+ [imgDamageStr release];
+ NSString *imgTimeStr = [[NSString alloc] initWithFormat:@"%@/iconTime.png",ICONS_DIRECTORY()];
delayImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgTimeStr]];
+ [imgTimeStr release];
+ NSString *imgBoxStr = [[NSString alloc] initWithFormat:@"%@/iconBox.png",ICONS_DIRECTORY()];
crateImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgBoxStr]];
+ [imgBoxStr release];
initialLab = [[UILabel alloc] init];
initialLab.backgroundColor = [UIColor clearColor];
@@ -99,9 +102,9 @@
helpLabel = [[UILabel alloc] init];
helpLabel.backgroundColor = [UIColor clearColor];
- helpLabel.textColor = [UIColor grayColor];
+ helpLabel.textColor = [UIColor darkGrayColor];
helpLabel.textAlignment = UITextAlignmentRight;
- helpLabel.font = [UIFont italicSystemFontOfSize:[UIFont smallSystemFontSize]];
+ helpLabel.font = [UIFont italicSystemFontOfSize:[UIFont systemFontSize]];
[self.contentView addSubview:weaponName];
[self.contentView addSubview:weaponIcon];
--- a/project_files/HedgewarsMobile/Classes/WeaponSettingsViewController.m Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/WeaponSettingsViewController.m Sat Oct 08 16:54:56 2011 +0200
@@ -42,6 +42,7 @@
self.navigationItem.rightBarButtonItem = editButton;
[editButton release];
+ self.navigationItem.title = @"List of weapons";
}
-(void) viewWillAppear:(BOOL) animated {
@@ -127,7 +128,7 @@
[schemeFile release];
[self.listOfWeapons removeObjectAtIndex:row];
- [self.tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade];
+ [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade];
}
#pragma mark -
@@ -145,6 +146,7 @@
[childController.tableView setContentOffset:CGPointMake(0,0) animated:NO];
[self.navigationController pushViewController:childController animated:YES];
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
}
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sat Oct 08 16:54:56 2011 +0200
@@ -26,6 +26,8 @@
28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; };
28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; settings = {ATTRIBUTES = (Required, ); }; };
61006F95128DE31F00EBA7F7 /* CreationChamber.m in Sources */ = {isa = PBXBuildFile; fileRef = 61006F94128DE31F00EBA7F7 /* CreationChamber.m */; };
+ 61077E87143FB09800645B29 /* MissionTrainingViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61077E86143FB09800645B29 /* MissionTrainingViewController-iPad.xib */; };
+ 6107802A143FCCC800645B29 /* startGameButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 61078029143FCCC800645B29 /* startGameButton@2x.png */; };
610D5FB21270E2660033333A /* Icon-Small@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43411E290650040BA66 /* Icon-Small@2x.png */; };
610D5FB31270E26C0033333A /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43611E290650040BA66 /* Icon@2x.png */; };
61188BF212A6FE530026C5DA /* ammoButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6103D399129B350700911D8D /* ammoButton@2x.png */; };
@@ -50,7 +52,7 @@
61188C0512A6FE8F0026C5DA /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 61798A5E114AE08600BA94A9 /* Data */; };
61188C0612A6FE950026C5DA /* smallerBackground@2x~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEEC1298D25D00D73365 /* smallerBackground@2x~iphone.png */; };
61188C0712A6FE960026C5DA /* settingsButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FECA1298CE4E00D73365 /* settingsButton@2x.png */; };
- 61188C0812A6FE9A0026C5DA /* title@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 618899811299516000D55FD6 /* title@2x.png */; };
+ 61188C0812A6FE9A0026C5DA /* title@2x~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 618899811299516000D55FD6 /* title@2x~iphone.png */; };
61188C0912A6FE9C0026C5DA /* tw@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6103D385129B348200911D8D /* tw@2x.png */; };
611D9BFB12497E9800008271 /* SavedGamesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611D9BF912497E9800008271 /* SavedGamesViewController.m */; };
611D9BFC12497E9800008271 /* SavedGamesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611D9BFA12497E9800008271 /* SavedGamesViewController.xib */; };
@@ -90,20 +92,20 @@
6165921411CA9BA200D6E256 /* LevelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591EF11CA9BA200D6E256 /* LevelViewController.m */; };
6165921511CA9BA200D6E256 /* MainMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591F111CA9BA200D6E256 /* MainMenuViewController.m */; };
6165921611CA9BA200D6E256 /* MapConfigViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591F311CA9BA200D6E256 /* MapConfigViewController.m */; };
- 6165921711CA9BA200D6E256 /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591F511CA9BA200D6E256 /* MasterViewController.m */; };
+ 6165921711CA9BA200D6E256 /* SettingsBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591F511CA9BA200D6E256 /* SettingsBaseViewController.m */; };
6165921811CA9BA200D6E256 /* OverlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591F711CA9BA200D6E256 /* OverlayViewController.m */; };
6165921911CA9BA200D6E256 /* InGameMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591F911CA9BA200D6E256 /* InGameMenuViewController.m */; };
6165921A11CA9BA200D6E256 /* SchemeSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591FB11CA9BA200D6E256 /* SchemeSettingsViewController.m */; };
6165921B11CA9BA200D6E256 /* SchemeWeaponConfigViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591FD11CA9BA200D6E256 /* SchemeWeaponConfigViewController.m */; };
6165921C11CA9BA200D6E256 /* SingleSchemeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591FF11CA9BA200D6E256 /* SingleSchemeViewController.m */; };
6165921D11CA9BA200D6E256 /* SingleTeamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165920111CA9BA200D6E256 /* SingleTeamViewController.m */; };
- 6165921E11CA9BA200D6E256 /* SplitViewRootController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165920311CA9BA200D6E256 /* SplitViewRootController.m */; };
+ 6165921E11CA9BA200D6E256 /* SettingsContainerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165920311CA9BA200D6E256 /* SettingsContainerViewController.m */; };
6165921F11CA9BA200D6E256 /* TeamConfigViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165920511CA9BA200D6E256 /* TeamConfigViewController.m */; };
6165922011CA9BA200D6E256 /* TeamSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165920711CA9BA200D6E256 /* TeamSettingsViewController.m */; };
6165922111CA9BA200D6E256 /* VoicesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165920911CA9BA200D6E256 /* VoicesViewController.m */; };
6165922211CA9BA200D6E256 /* WeaponSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165920B11CA9BA200D6E256 /* WeaponSettingsViewController.m */; };
6165922E11CA9BD500D6E256 /* CGPointUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = 6165922311CA9BD500D6E256 /* CGPointUtils.c */; };
- 6165922F11CA9BD500D6E256 /* CommodityFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165922611CA9BD500D6E256 /* CommodityFunctions.m */; };
+ 6165922F11CA9BD500D6E256 /* HWUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165922611CA9BD500D6E256 /* HWUtils.m */; };
6165923111CA9BD500D6E256 /* SquareButtonView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165922B11CA9BD500D6E256 /* SquareButtonView.m */; };
6165923211CA9BD500D6E256 /* UIImageExtra.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165922D11CA9BD500D6E256 /* UIImageExtra.m */; };
6165925311CA9CB400D6E256 /* MainMenuViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924B11CA9CB400D6E256 /* MainMenuViewController-iPad.xib */; };
@@ -113,6 +115,28 @@
6167A6761391514600AA6D07 /* RestoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6167A6741391514600AA6D07 /* RestoreViewController.m */; };
6167A6771391514600AA6D07 /* RestoreViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6167A6751391514600AA6D07 /* RestoreViewController-iPhone.xib */; };
6167A72D13919E6800AA6D07 /* RestoreViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6167A72C13919E6800AA6D07 /* RestoreViewController-iPad.xib */; };
+ 6167C87414294727003DD50F /* surprise@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C87314294727003DD50F /* surprise@2x.png */; };
+ 6167C88C14294738003DD50F /* denied@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C88B14294738003DD50F /* denied@2x.png */; };
+ 6167C8F51429502C003DD50F /* hedgehog.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8EF1429502C003DD50F /* hedgehog.png */; };
+ 6167C8F61429502C003DD50F /* hedgehog@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F01429502C003DD50F /* hedgehog@2x.png */; };
+ 6167C8F71429502C003DD50F /* robotBadge.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F11429502C003DD50F /* robotBadge.png */; };
+ 6167C8F81429502C003DD50F /* robotBadge@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F21429502C003DD50F /* robotBadge@2x.png */; };
+ 6167C8F91429502C003DD50F /* star.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F31429502C003DD50F /* star.png */; };
+ 6167C8FA1429502C003DD50F /* star@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F41429502C003DD50F /* star@2x.png */; };
+ 6167CA37142A6ED7003DD50F /* bot0.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA2B142A6ED7003DD50F /* bot0.png */; };
+ 6167CA38142A6ED7003DD50F /* bot0@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA2C142A6ED7003DD50F /* bot0@2x.png */; };
+ 6167CA39142A6ED7003DD50F /* bot1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA2D142A6ED7003DD50F /* bot1.png */; };
+ 6167CA3A142A6ED7003DD50F /* bot1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA2E142A6ED7003DD50F /* bot1@2x.png */; };
+ 6167CA3B142A6ED7003DD50F /* bot2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA2F142A6ED7003DD50F /* bot2.png */; };
+ 6167CA3C142A6ED7003DD50F /* bot2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA30142A6ED7003DD50F /* bot2@2x.png */; };
+ 6167CA3D142A6ED7003DD50F /* bot3.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA31142A6ED7003DD50F /* bot3.png */; };
+ 6167CA3E142A6ED7003DD50F /* bot3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA32142A6ED7003DD50F /* bot3@2x.png */; };
+ 6167CA3F142A6ED7003DD50F /* bot4.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA33142A6ED7003DD50F /* bot4.png */; };
+ 6167CA40142A6ED7003DD50F /* bot4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA34142A6ED7003DD50F /* bot4@2x.png */; };
+ 6167CA41142A6ED7003DD50F /* bot5.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA35142A6ED7003DD50F /* bot5.png */; };
+ 6167CA42142A6ED7003DD50F /* bot5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA36142A6ED7003DD50F /* bot5@2x.png */; };
+ 6167CB48142A8769003DD50F /* basehat-hedgehog.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CB46142A8769003DD50F /* basehat-hedgehog.png */; };
+ 6167CB49142A8769003DD50F /* basehat-hedgehog@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CB47142A8769003DD50F /* basehat-hedgehog@2x.png */; };
6172FED91298CF9800D73365 /* background~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FED71298CF9800D73365 /* background~iphone.png */; };
6172FEEF1298D25D00D73365 /* mediumBackground~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEEB1298D25D00D73365 /* mediumBackground~ipad.png */; };
6172FEF11298D25D00D73365 /* smallerBackground~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEED1298D25D00D73365 /* smallerBackground~ipad.png */; };
@@ -157,6 +181,8 @@
61842B40122B66280096E335 /* helpleft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61842B3F122B66280096E335 /* helpleft.png */; };
6187AEBD120781B900B31A27 /* Settings in Resources */ = {isa = PBXBuildFile; fileRef = 6187AEA5120781B900B31A27 /* Settings */; };
61889985129995B500D55FD6 /* title~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 61889984129995B500D55FD6 /* title~ipad.png */; };
+ 61915D5B143A4E2C00299991 /* MissionTrainingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61915D59143A4E2C00299991 /* MissionTrainingViewController.m */; };
+ 61915D5C143A4E2C00299991 /* MissionTrainingViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61915D5A143A4E2C00299991 /* MissionTrainingViewController-iPhone.xib */; };
6195981F1364BCEF00B429B6 /* libTremor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6195981D1364BCD200B429B6 /* libTremor.a */; };
619599451364C83D00B429B6 /* libLua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 619599441364C82B00B429B6 /* libLua.a */; };
619599C01364E66B00B429B6 /* libFreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 619599BF1364E65900B429B6 /* libFreetype.a */; };
@@ -192,6 +218,7 @@
61B7A61812FA13B00051E14E /* libSDL_net.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B7A56812FA12D00051E14E /* libSDL_net.a */; };
61B7A61912FA13B00051E14E /* libSDL_ttf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B7A59012FA13330051E14E /* libSDL_ttf.a */; };
61C079E411F35A300072BF46 /* EditableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C079E311F35A300072BF46 /* EditableCellView.m */; };
+ 61C28D3F142D380400DA16C2 /* AudioManagerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C28D3E142D380400DA16C2 /* AudioManagerController.m */; };
61CADE331402EE290030C3EB /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61CADE321402EE290030C3EB /* ImageIO.framework */; };
61D205A1127CDD1100ABD83E /* ObjcExports.m in Sources */ = {isa = PBXBuildFile; fileRef = 61D205A0127CDD1100ABD83E /* ObjcExports.m */; };
61D3D2A51290E03A003CE7C3 /* irc.png in Resources */ = {isa = PBXBuildFile; fileRef = 61D3D2A41290E03A003CE7C3 /* irc.png */; };
@@ -203,7 +230,7 @@
61E2F7441283752C00E12521 /* fb.png in Resources */ = {isa = PBXBuildFile; fileRef = 61E2F7421283752C00E12521 /* fb.png */; };
61E2F7451283752C00E12521 /* tw.png in Resources */ = {isa = PBXBuildFile; fileRef = 61E2F7431283752C00E12521 /* tw.png */; };
61E5D68D12AB006F00566F29 /* uLandPainted.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61E5D68C12AB006F00566F29 /* uLandPainted.pas */; };
- 61EBA62A11DFF2BC0048B68A /* title.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62811DFF2BC0048B68A /* title.png */; };
+ 61EBA62A11DFF2BC0048B68A /* title~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62811DFF2BC0048B68A /* title~iphone.png */; };
61EDB5B0135B3F97009B29A6 /* GameInterfaceBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EDB5AF135B3F97009B29A6 /* GameInterfaceBridge.m */; };
61EF920E11DF57AC003441C4 /* arrowDown.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920511DF57AC003441C4 /* arrowDown.png */; };
61EF920F11DF57AC003441C4 /* arrowLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920611DF57AC003441C4 /* arrowLeft.png */; };
@@ -334,9 +361,11 @@
6103D39C129B350700911D8D /* arrowRight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrowRight@2x.png"; path = "Resources/Overlay/arrowRight@2x.png"; sourceTree = "<group>"; };
6103D39D129B350700911D8D /* arrowUp@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrowUp@2x.png"; path = "Resources/Overlay/arrowUp@2x.png"; sourceTree = "<group>"; };
6103D39E129B350700911D8D /* cornerButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cornerButton@2x.png"; path = "Resources/Overlay/cornerButton@2x.png"; sourceTree = "<group>"; };
+ 61077E86143FB09800645B29 /* MissionTrainingViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "MissionTrainingViewController-iPad.xib"; sourceTree = "<group>"; };
+ 61078029143FCCC800645B29 /* startGameButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "startGameButton@2x.png"; path = "Resources/Frontend/startGameButton@2x.png"; sourceTree = "<group>"; };
611D9BF812497E9800008271 /* SavedGamesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SavedGamesViewController.h; sourceTree = "<group>"; };
611D9BF912497E9800008271 /* SavedGamesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SavedGamesViewController.m; sourceTree = "<group>"; };
- 611D9BFA12497E9800008271 /* SavedGamesViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SavedGamesViewController.xib; path = ../Resources/SavedGamesViewController.xib; sourceTree = "<group>"; };
+ 611D9BFA12497E9800008271 /* SavedGamesViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SavedGamesViewController.xib; sourceTree = "<group>"; };
611E0EE511FB20610077A41E /* ammoButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ammoButton.png; path = Resources/Overlay/ammoButton.png; sourceTree = "<group>"; };
611E0EE611FB20610077A41E /* cornerButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cornerButton.png; path = Resources/Overlay/cornerButton.png; sourceTree = "<group>"; };
611E12FE117BBBDA0044B62F /* Entitlements-Development.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Entitlements-Development.plist"; sourceTree = "<group>"; };
@@ -345,7 +374,7 @@
611EE9D8122AA10A00DF6938 /* selSound.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = selSound.wav; path = Resources/selSound.wav; sourceTree = "<group>"; };
611EEAEB122B2A4D00DF6938 /* HelpPageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpPageViewController.h; sourceTree = "<group>"; };
611EEAEC122B2A4D00DF6938 /* HelpPageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelpPageViewController.m; sourceTree = "<group>"; };
- 611EEAED122B2A4D00DF6938 /* HelpPageLobbyViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "HelpPageLobbyViewController-iPad.xib"; path = "../Resources/HelpPageLobbyViewController-iPad.xib"; sourceTree = "<group>"; };
+ 611EEAED122B2A4D00DF6938 /* HelpPageLobbyViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "HelpPageLobbyViewController-iPad.xib"; sourceTree = "<group>"; };
611EEBC0122B34A800DF6938 /* helpingame.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpingame.png; path = Resources/Overlay/helpingame.png; sourceTree = "<group>"; };
611EEBC2122B355700DF6938 /* helpbottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpbottom.png; path = Resources/Overlay/helpbottom.png; sourceTree = "<group>"; };
611EEBC3122B355700DF6938 /* helpright.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpright.png; path = Resources/Overlay/helpright.png; sourceTree = "<group>"; };
@@ -369,6 +398,7 @@
615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton~iphone.png"; path = "Resources/Frontend/localplayButton~iphone.png"; sourceTree = "<group>"; };
6163EE7C11CC2600001C0453 /* SingleWeaponViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleWeaponViewController.h; sourceTree = "<group>"; };
6163EE7D11CC2600001C0453 /* SingleWeaponViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SingleWeaponViewController.m; sourceTree = "<group>"; };
+ 61641FE31437CDAA006E049C /* DefinesAndMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefinesAndMacros.h; path = Classes/DefinesAndMacros.h; sourceTree = "<group>"; };
616591E011CA9BA200D6E256 /* FlagsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlagsViewController.h; sourceTree = "<group>"; };
616591E111CA9BA200D6E256 /* FlagsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FlagsViewController.m; sourceTree = "<group>"; };
616591E211CA9BA200D6E256 /* FortsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FortsViewController.h; sourceTree = "<group>"; };
@@ -389,8 +419,8 @@
616591F111CA9BA200D6E256 /* MainMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainMenuViewController.m; sourceTree = "<group>"; };
616591F211CA9BA200D6E256 /* MapConfigViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapConfigViewController.h; sourceTree = "<group>"; };
616591F311CA9BA200D6E256 /* MapConfigViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapConfigViewController.m; sourceTree = "<group>"; };
- 616591F411CA9BA200D6E256 /* MasterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MasterViewController.h; sourceTree = "<group>"; };
- 616591F511CA9BA200D6E256 /* MasterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MasterViewController.m; sourceTree = "<group>"; };
+ 616591F411CA9BA200D6E256 /* SettingsBaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsBaseViewController.h; sourceTree = "<group>"; };
+ 616591F511CA9BA200D6E256 /* SettingsBaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsBaseViewController.m; sourceTree = "<group>"; };
616591F611CA9BA200D6E256 /* OverlayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlayViewController.h; sourceTree = "<group>"; };
616591F711CA9BA200D6E256 /* OverlayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OverlayViewController.m; sourceTree = "<group>"; };
616591F811CA9BA200D6E256 /* InGameMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InGameMenuViewController.h; sourceTree = "<group>"; };
@@ -403,8 +433,8 @@
616591FF11CA9BA200D6E256 /* SingleSchemeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SingleSchemeViewController.m; sourceTree = "<group>"; };
6165920011CA9BA200D6E256 /* SingleTeamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleTeamViewController.h; sourceTree = "<group>"; };
6165920111CA9BA200D6E256 /* SingleTeamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SingleTeamViewController.m; sourceTree = "<group>"; };
- 6165920211CA9BA200D6E256 /* SplitViewRootController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SplitViewRootController.h; sourceTree = "<group>"; };
- 6165920311CA9BA200D6E256 /* SplitViewRootController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SplitViewRootController.m; sourceTree = "<group>"; };
+ 6165920211CA9BA200D6E256 /* SettingsContainerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsContainerViewController.h; sourceTree = "<group>"; };
+ 6165920311CA9BA200D6E256 /* SettingsContainerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsContainerViewController.m; sourceTree = "<group>"; };
6165920411CA9BA200D6E256 /* TeamConfigViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TeamConfigViewController.h; sourceTree = "<group>"; };
6165920511CA9BA200D6E256 /* TeamConfigViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TeamConfigViewController.m; sourceTree = "<group>"; };
6165920611CA9BA200D6E256 /* TeamSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TeamSettingsViewController.h; sourceTree = "<group>"; };
@@ -415,25 +445,47 @@
6165920B11CA9BA200D6E256 /* WeaponSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WeaponSettingsViewController.m; sourceTree = "<group>"; };
6165922311CA9BD500D6E256 /* CGPointUtils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CGPointUtils.c; path = Classes/CGPointUtils.c; sourceTree = "<group>"; };
6165922411CA9BD500D6E256 /* CGPointUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CGPointUtils.h; path = Classes/CGPointUtils.h; sourceTree = "<group>"; };
- 6165922511CA9BD500D6E256 /* CommodityFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommodityFunctions.h; path = Classes/CommodityFunctions.h; sourceTree = "<group>"; };
- 6165922611CA9BD500D6E256 /* CommodityFunctions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CommodityFunctions.m; path = Classes/CommodityFunctions.m; sourceTree = "<group>"; };
+ 6165922511CA9BD500D6E256 /* HWUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HWUtils.h; path = Classes/HWUtils.h; sourceTree = "<group>"; };
+ 6165922611CA9BD500D6E256 /* HWUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HWUtils.m; path = Classes/HWUtils.m; sourceTree = "<group>"; };
6165922911CA9BD500D6E256 /* PascalImports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PascalImports.h; path = Classes/PascalImports.h; sourceTree = "<group>"; };
6165922A11CA9BD500D6E256 /* SquareButtonView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SquareButtonView.h; path = Classes/SquareButtonView.h; sourceTree = "<group>"; };
6165922B11CA9BD500D6E256 /* SquareButtonView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SquareButtonView.m; path = Classes/SquareButtonView.m; sourceTree = "<group>"; };
6165922C11CA9BD500D6E256 /* UIImageExtra.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UIImageExtra.h; path = Classes/UIImageExtra.h; sourceTree = "<group>"; };
6165922D11CA9BD500D6E256 /* UIImageExtra.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UIImageExtra.m; path = Classes/UIImageExtra.m; sourceTree = "<group>"; };
- 6165924A11CA9CB400D6E256 /* GameConfigViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = GameConfigViewController.xib; path = Resources/GameConfigViewController.xib; sourceTree = SOURCE_ROOT; };
- 6165924B11CA9CB400D6E256 /* MainMenuViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainMenuViewController-iPad.xib"; path = "Resources/MainMenuViewController-iPad.xib"; sourceTree = SOURCE_ROOT; };
- 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainMenuViewController-iPhone.xib"; path = "Resources/MainMenuViewController-iPhone.xib"; sourceTree = SOURCE_ROOT; };
- 6165924D11CA9CB400D6E256 /* MapConfigViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MapConfigViewController-iPad.xib"; path = "Resources/MapConfigViewController-iPad.xib"; sourceTree = SOURCE_ROOT; };
- 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MapConfigViewController-iPhone.xib"; path = "Resources/MapConfigViewController-iPhone.xib"; sourceTree = SOURCE_ROOT; };
- 6165925011CA9CB400D6E256 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OverlayViewController.xib; path = Resources/OverlayViewController.xib; sourceTree = SOURCE_ROOT; };
+ 6165924A11CA9CB400D6E256 /* GameConfigViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GameConfigViewController.xib; sourceTree = "<group>"; };
+ 6165924B11CA9CB400D6E256 /* MainMenuViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "MainMenuViewController-iPad.xib"; sourceTree = "<group>"; };
+ 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "MainMenuViewController-iPhone.xib"; sourceTree = "<group>"; };
+ 6165924D11CA9CB400D6E256 /* MapConfigViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "MapConfigViewController-iPad.xib"; sourceTree = "<group>"; };
+ 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "MapConfigViewController-iPhone.xib"; sourceTree = "<group>"; };
+ 6165925011CA9CB400D6E256 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OverlayViewController.xib; sourceTree = "<group>"; };
6165929C11CA9E2F00D6E256 /* HedgewarsAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HedgewarsAppDelegate.h; path = Classes/HedgewarsAppDelegate.h; sourceTree = "<group>"; };
6165929D11CA9E2F00D6E256 /* HedgewarsAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HedgewarsAppDelegate.m; path = Classes/HedgewarsAppDelegate.m; sourceTree = "<group>"; };
6167A6731391514600AA6D07 /* RestoreViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RestoreViewController.h; sourceTree = "<group>"; };
6167A6741391514600AA6D07 /* RestoreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RestoreViewController.m; sourceTree = "<group>"; };
- 6167A6751391514600AA6D07 /* RestoreViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "RestoreViewController-iPhone.xib"; path = "../Resources/RestoreViewController-iPhone.xib"; sourceTree = "<group>"; };
- 6167A72C13919E6800AA6D07 /* RestoreViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "RestoreViewController-iPad.xib"; path = "../Resources/RestoreViewController-iPad.xib"; sourceTree = "<group>"; };
+ 6167A6751391514600AA6D07 /* RestoreViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "RestoreViewController-iPhone.xib"; sourceTree = "<group>"; };
+ 6167A72C13919E6800AA6D07 /* RestoreViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "RestoreViewController-iPad.xib"; sourceTree = "<group>"; };
+ 6167C87314294727003DD50F /* surprise@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "surprise@2x.png"; path = "Resources/surprise@2x.png"; sourceTree = "<group>"; };
+ 6167C88B14294738003DD50F /* denied@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "denied@2x.png"; path = "Resources/denied@2x.png"; sourceTree = "<group>"; };
+ 6167C8EF1429502C003DD50F /* hedgehog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = hedgehog.png; path = Resources/Icons/hedgehog.png; sourceTree = "<group>"; };
+ 6167C8F01429502C003DD50F /* hedgehog@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "hedgehog@2x.png"; path = "Resources/Icons/hedgehog@2x.png"; sourceTree = "<group>"; };
+ 6167C8F11429502C003DD50F /* robotBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = robotBadge.png; path = Resources/Icons/robotBadge.png; sourceTree = "<group>"; };
+ 6167C8F21429502C003DD50F /* robotBadge@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "robotBadge@2x.png"; path = "Resources/Icons/robotBadge@2x.png"; sourceTree = "<group>"; };
+ 6167C8F31429502C003DD50F /* star.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = star.png; path = Resources/Icons/star.png; sourceTree = "<group>"; };
+ 6167C8F41429502C003DD50F /* star@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "star@2x.png"; path = "Resources/Icons/star@2x.png"; sourceTree = "<group>"; };
+ 6167CA2B142A6ED7003DD50F /* bot0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bot0.png; path = Resources/Icons/bot0.png; sourceTree = "<group>"; };
+ 6167CA2C142A6ED7003DD50F /* bot0@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bot0@2x.png"; path = "Resources/Icons/bot0@2x.png"; sourceTree = "<group>"; };
+ 6167CA2D142A6ED7003DD50F /* bot1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bot1.png; path = Resources/Icons/bot1.png; sourceTree = "<group>"; };
+ 6167CA2E142A6ED7003DD50F /* bot1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bot1@2x.png"; path = "Resources/Icons/bot1@2x.png"; sourceTree = "<group>"; };
+ 6167CA2F142A6ED7003DD50F /* bot2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bot2.png; path = Resources/Icons/bot2.png; sourceTree = "<group>"; };
+ 6167CA30142A6ED7003DD50F /* bot2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bot2@2x.png"; path = "Resources/Icons/bot2@2x.png"; sourceTree = "<group>"; };
+ 6167CA31142A6ED7003DD50F /* bot3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bot3.png; path = Resources/Icons/bot3.png; sourceTree = "<group>"; };
+ 6167CA32142A6ED7003DD50F /* bot3@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bot3@2x.png"; path = "Resources/Icons/bot3@2x.png"; sourceTree = "<group>"; };
+ 6167CA33142A6ED7003DD50F /* bot4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bot4.png; path = Resources/Icons/bot4.png; sourceTree = "<group>"; };
+ 6167CA34142A6ED7003DD50F /* bot4@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bot4@2x.png"; path = "Resources/Icons/bot4@2x.png"; sourceTree = "<group>"; };
+ 6167CA35142A6ED7003DD50F /* bot5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bot5.png; path = Resources/Icons/bot5.png; sourceTree = "<group>"; };
+ 6167CA36142A6ED7003DD50F /* bot5@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bot5@2x.png"; path = "Resources/Icons/bot5@2x.png"; sourceTree = "<group>"; };
+ 6167CB46142A8769003DD50F /* basehat-hedgehog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "basehat-hedgehog.png"; path = "Resources/Icons/basehat-hedgehog.png"; sourceTree = "<group>"; };
+ 6167CB47142A8769003DD50F /* basehat-hedgehog@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "basehat-hedgehog@2x.png"; path = "Resources/Icons/basehat-hedgehog@2x.png"; sourceTree = "<group>"; };
6172FEA21298C7F900D73365 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Resources/Icons/Default@2x.png"; sourceTree = "<group>"; };
6172FEC81298CE4800D73365 /* savesButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "savesButton@2x.png"; path = "Resources/Frontend/savesButton@2x.png"; sourceTree = "<group>"; };
6172FECA1298CE4E00D73365 /* settingsButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "settingsButton@2x.png"; path = "Resources/Frontend/settingsButton@2x.png"; sourceTree = "<group>"; };
@@ -489,13 +541,16 @@
61798A5E114AE08600BA94A9 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Data; path = ../../../trunk/project_files/HedgewarsMobile/Data; sourceTree = "<group>"; };
6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-ipad-Landscape.png"; path = "Resources/Icons/Default-ipad-Landscape.png"; sourceTree = "<group>"; };
6183D83D11E2BCE200A88903 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/Icons/Default.png; sourceTree = "<group>"; };
- 61842B23122B619D0096E335 /* HelpPageInGameViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "HelpPageInGameViewController-iPad.xib"; path = "../Resources/HelpPageInGameViewController-iPad.xib"; sourceTree = "<group>"; };
+ 61842B23122B619D0096E335 /* HelpPageInGameViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "HelpPageInGameViewController-iPad.xib"; sourceTree = "<group>"; };
61842B3D122B65BD0096E335 /* helpabove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpabove.png; path = Resources/Overlay/helpabove.png; sourceTree = "<group>"; };
61842B3F122B66280096E335 /* helpleft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpleft.png; path = Resources/Overlay/helpleft.png; sourceTree = "<group>"; };
6187AEA5120781B900B31A27 /* Settings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Settings; path = Resources/Settings; sourceTree = "<group>"; };
- 618899811299516000D55FD6 /* title@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title@2x.png"; path = "Resources/Frontend/title@2x.png"; sourceTree = "<group>"; };
+ 618899811299516000D55FD6 /* title@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title@2x~iphone.png"; path = "Resources/Frontend/title@2x~iphone.png"; sourceTree = "<group>"; };
61889984129995B500D55FD6 /* title~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title~ipad.png"; path = "Resources/Frontend/title~ipad.png"; sourceTree = "<group>"; };
618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_net.xcodeproj; path = "../../../Library/SDL_net/Xcode-iPhoneOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; };
+ 61915D58143A4E2C00299991 /* MissionTrainingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MissionTrainingViewController.h; sourceTree = "<group>"; };
+ 61915D59143A4E2C00299991 /* MissionTrainingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MissionTrainingViewController.m; sourceTree = "<group>"; };
+ 61915D5A143A4E2C00299991 /* MissionTrainingViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "MissionTrainingViewController-iPhone.xib"; sourceTree = "<group>"; };
619598181364BCD200B429B6 /* Tremor.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Tremor.xcodeproj; path = ../../misc/libtremor/Xcode/Tremor.xcodeproj; sourceTree = SOURCE_ROOT; };
6195993F1364C82B00B429B6 /* Lua.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Lua.xcodeproj; path = ../../misc/liblua/Xcode/Lua.xcodeproj; sourceTree = SOURCE_ROOT; };
619599BA1364E65900B429B6 /* Freetype.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Freetype.xcodeproj; path = "../../misc/libfreetype/Xcode-iPhoneOS/Freetype.xcodeproj"; sourceTree = SOURCE_ROOT; };
@@ -528,21 +583,23 @@
61B7A33712CC21080086B604 /* StatsPageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatsPageViewController.m; sourceTree = "<group>"; };
61C079E211F35A300072BF46 /* EditableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EditableCellView.h; path = Classes/EditableCellView.h; sourceTree = "<group>"; };
61C079E311F35A300072BF46 /* EditableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EditableCellView.m; path = Classes/EditableCellView.m; sourceTree = "<group>"; };
+ 61C28D3D142D380400DA16C2 /* AudioManagerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioManagerController.h; path = Classes/AudioManagerController.h; sourceTree = "<group>"; };
+ 61C28D3E142D380400DA16C2 /* AudioManagerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AudioManagerController.m; path = Classes/AudioManagerController.m; sourceTree = "<group>"; };
61CADE321402EE290030C3EB /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
61D2059F127CDD1100ABD83E /* ObjcExports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjcExports.h; path = Classes/ObjcExports.h; sourceTree = "<group>"; };
61D205A0127CDD1100ABD83E /* ObjcExports.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ObjcExports.m; path = Classes/ObjcExports.m; sourceTree = "<group>"; };
61D3D2A41290E03A003CE7C3 /* irc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = irc.png; path = Resources/Icons/irc.png; sourceTree = "<group>"; };
61DE8F201257EB1100B80214 /* AmmoMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AmmoMenuViewController.h; sourceTree = "<group>"; };
61DE8F211257EB1100B80214 /* AmmoMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AmmoMenuViewController.m; sourceTree = "<group>"; };
- 61DF0EDB1284DF2300F3F10B /* HelpPageLobbyViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "HelpPageLobbyViewController-iPhone.xib"; path = "../Resources/HelpPageLobbyViewController-iPhone.xib"; sourceTree = "<group>"; };
- 61DF0F201284F72A00F3F10B /* HelpPageInGameViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "HelpPageInGameViewController-iPhone.xib"; path = "Resources/HelpPageInGameViewController-iPhone.xib"; sourceTree = SOURCE_ROOT; };
+ 61DF0EDB1284DF2300F3F10B /* HelpPageLobbyViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "HelpPageLobbyViewController-iPhone.xib"; sourceTree = "<group>"; };
+ 61DF0F201284F72A00F3F10B /* HelpPageInGameViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "HelpPageInGameViewController-iPhone.xib"; sourceTree = "<group>"; };
61E1F4F711D004240016A5AA /* adler32.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = adler32.pas; path = ../../hedgewars/adler32.pas; sourceTree = SOURCE_ROOT; };
61E2E12C12BAAEE30051B659 /* ServerSetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServerSetup.h; sourceTree = "<group>"; };
61E2E12D12BAAEE30051B659 /* ServerSetup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServerSetup.m; sourceTree = "<group>"; };
61E2F7421283752C00E12521 /* fb.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fb.png; path = Resources/Icons/fb.png; sourceTree = "<group>"; };
61E2F7431283752C00E12521 /* tw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tw.png; path = Resources/Icons/tw.png; sourceTree = "<group>"; };
61E5D68C12AB006F00566F29 /* uLandPainted.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uLandPainted.pas; path = ../../hedgewars/uLandPainted.pas; sourceTree = SOURCE_ROOT; };
- 61EBA62811DFF2BC0048B68A /* title.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title.png; path = Resources/Frontend/title.png; sourceTree = "<group>"; };
+ 61EBA62811DFF2BC0048B68A /* title~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title~iphone.png"; path = "Resources/Frontend/title~iphone.png"; sourceTree = "<group>"; };
61EDB5AE135B3F97009B29A6 /* GameInterfaceBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameInterfaceBridge.h; sourceTree = "<group>"; };
61EDB5AF135B3F97009B29A6 /* GameInterfaceBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameInterfaceBridge.m; sourceTree = "<group>"; };
61EF920511DF57AC003441C4 /* arrowDown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowDown.png; path = Resources/Overlay/arrowDown.png; sourceTree = "<group>"; };
@@ -554,7 +611,7 @@
61EF920B11DF57AC003441C4 /* joyButtonForwardJump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButtonForwardJump.png; path = Resources/Overlay/joyButtonForwardJump.png; sourceTree = "<group>"; };
61F2E7CB1205EDE0005734F7 /* AboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutViewController.h; sourceTree = "<group>"; };
61F2E7CC1205EDE0005734F7 /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutViewController.m; sourceTree = "<group>"; };
- 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = AboutViewController.xib; path = ../Resources/AboutViewController.xib; sourceTree = "<group>"; };
+ 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AboutViewController.xib; sourceTree = "<group>"; };
61F2E7EB12060E31005734F7 /* checkbox.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = checkbox.png; path = Resources/Icons/checkbox.png; sourceTree = "<group>"; };
61F544C512AF1748007FD913 /* HoldTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HoldTableViewCell.h; path = Classes/HoldTableViewCell.h; sourceTree = "<group>"; };
61F544C612AF1748007FD913 /* HoldTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HoldTableViewCell.m; path = Classes/HoldTableViewCell.m; sourceTree = "<group>"; };
@@ -614,8 +671,8 @@
6163EE6C11CC253F001C0453 /* Overlay */,
616591F011CA9BA200D6E256 /* MainMenuViewController.h */,
616591F111CA9BA200D6E256 /* MainMenuViewController.m */,
+ 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */,
6165924B11CA9CB400D6E256 /* MainMenuViewController-iPad.xib */,
- 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */,
61EDB5AE135B3F97009B29A6 /* GameInterfaceBridge.h */,
61EDB5AF135B3F97009B29A6 /* GameInterfaceBridge.m */,
616591E611CA9BA200D6E256 /* EngineProtocolNetwork.h */,
@@ -653,18 +710,18 @@
29B97315FDCFA39411CA2CEA /* Other Sources */ = {
isa = PBXGroup;
children = (
+ 61641FE21437CD8F006E049C /* Headers */,
+ 61DE91561258B76800B80214 /* Custom UIs */,
61AC067212B2E32D000B52A2 /* Appirater.h */,
61AC067312B2E32D000B52A2 /* Appirater.m */,
+ 61C28D3D142D380400DA16C2 /* AudioManagerController.h */,
+ 61C28D3E142D380400DA16C2 /* AudioManagerController.m */,
6165929C11CA9E2F00D6E256 /* HedgewarsAppDelegate.h */,
6165929D11CA9E2F00D6E256 /* HedgewarsAppDelegate.m */,
- 61DE91561258B76800B80214 /* Custom UIs */,
- 32CA4F630368D1EE00C91783 /* Hedgewars_Prefix.pch */,
- 61A97F0E136F675A00DD9878 /* hwconsts.h */,
- 6165922911CA9BD500D6E256 /* PascalImports.h */,
61D2059F127CDD1100ABD83E /* ObjcExports.h */,
61D205A0127CDD1100ABD83E /* ObjcExports.m */,
- 6165922511CA9BD500D6E256 /* CommodityFunctions.h */,
- 6165922611CA9BD500D6E256 /* CommodityFunctions.m */,
+ 6165922511CA9BD500D6E256 /* HWUtils.h */,
+ 6165922611CA9BD500D6E256 /* HWUtils.m */,
61006F93128DE31F00EBA7F7 /* CreationChamber.h */,
61006F94128DE31F00EBA7F7 /* CreationChamber.m */,
6165922411CA9BD500D6E256 /* CGPointUtils.h */,
@@ -678,8 +735,6 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
- 612CABCA1391D3D1005E9596 /* Sounds */,
- 6199E86C12464A8E00DADF8C /* surprise.png */,
611EEBC0122B34A800DF6938 /* helpingame.png */,
611EEC30122B54D700DF6938 /* helpplain.png */,
611EEBC2122B355700DF6938 /* helpbottom.png */,
@@ -687,6 +742,10 @@
611EEBC3122B355700DF6938 /* helpright.png */,
61842B3F122B66280096E335 /* helpleft.png */,
6129B9F611EFB04D0017E305 /* denied.png */,
+ 6167C88B14294738003DD50F /* denied@2x.png */,
+ 6199E86C12464A8E00DADF8C /* surprise.png */,
+ 6167C87314294727003DD50F /* surprise@2x.png */,
+ 612CABCA1391D3D1005E9596 /* Sounds */,
61F7A42811E2905C0040BA66 /* Icons */,
61F903FA11DF58680068B24D /* Frontend */,
6179936611501D1E00BA94A9 /* Overlay */,
@@ -726,8 +785,6 @@
611D9BF312497B7700008271 /* Other Controllers */ = {
isa = PBXGroup;
children = (
- 61B7A33612CC21080086B604 /* StatsPageViewController.h */,
- 61B7A33712CC21080086B604 /* StatsPageViewController.m */,
61F2E7CB1205EDE0005734F7 /* AboutViewController.h */,
61F2E7CC1205EDE0005734F7 /* AboutViewController.m */,
61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */,
@@ -738,6 +795,12 @@
611D9BF812497E9800008271 /* SavedGamesViewController.h */,
611D9BF912497E9800008271 /* SavedGamesViewController.m */,
611D9BFA12497E9800008271 /* SavedGamesViewController.xib */,
+ 61B7A33612CC21080086B604 /* StatsPageViewController.h */,
+ 61B7A33712CC21080086B604 /* StatsPageViewController.m */,
+ 61915D58143A4E2C00299991 /* MissionTrainingViewController.h */,
+ 61915D59143A4E2C00299991 /* MissionTrainingViewController.m */,
+ 61915D5A143A4E2C00299991 /* MissionTrainingViewController-iPhone.xib */,
+ 61077E86143FB09800645B29 /* MissionTrainingViewController-iPad.xib */,
);
name = "Other Controllers";
sourceTree = "<group>";
@@ -756,10 +819,10 @@
6163EE4C11CC2478001C0453 /* Settings Pages */ = {
isa = PBXGroup;
children = (
- 6165920211CA9BA200D6E256 /* SplitViewRootController.h */,
- 6165920311CA9BA200D6E256 /* SplitViewRootController.m */,
- 616591F411CA9BA200D6E256 /* MasterViewController.h */,
- 616591F511CA9BA200D6E256 /* MasterViewController.m */,
+ 6165920211CA9BA200D6E256 /* SettingsContainerViewController.h */,
+ 6165920311CA9BA200D6E256 /* SettingsContainerViewController.m */,
+ 616591F411CA9BA200D6E256 /* SettingsBaseViewController.h */,
+ 616591F511CA9BA200D6E256 /* SettingsBaseViewController.m */,
6163EE4E11CC248D001C0453 /* First Level */,
6163EE4F11CC2497001C0453 /* Second Level */,
6163EE5011CC24A1001C0453 /* Third Level */,
@@ -854,6 +917,17 @@
name = Overlay;
sourceTree = "<group>";
};
+ 61641FE21437CD8F006E049C /* Headers */ = {
+ isa = PBXGroup;
+ children = (
+ 61641FE31437CDAA006E049C /* DefinesAndMacros.h */,
+ 32CA4F630368D1EE00C91783 /* Hedgewars_Prefix.pch */,
+ 61A97F0E136F675A00DD9878 /* hwconsts.h */,
+ 6165922911CA9BD500D6E256 /* PascalImports.h */,
+ );
+ name = Headers;
+ sourceTree = "<group>";
+ };
61798892114AA56300BA94A9 /* inc */ = {
isa = PBXGroup;
children = (
@@ -984,6 +1058,26 @@
6103D383129B346A00911D8D /* fb@2x.png */,
61E2F7431283752C00E12521 /* tw.png */,
6103D385129B348200911D8D /* tw@2x.png */,
+ 6167C8EF1429502C003DD50F /* hedgehog.png */,
+ 6167C8F01429502C003DD50F /* hedgehog@2x.png */,
+ 6167C8F11429502C003DD50F /* robotBadge.png */,
+ 6167C8F21429502C003DD50F /* robotBadge@2x.png */,
+ 6167C8F31429502C003DD50F /* star.png */,
+ 6167C8F41429502C003DD50F /* star@2x.png */,
+ 6167CB46142A8769003DD50F /* basehat-hedgehog.png */,
+ 6167CB47142A8769003DD50F /* basehat-hedgehog@2x.png */,
+ 6167CA2B142A6ED7003DD50F /* bot0.png */,
+ 6167CA2C142A6ED7003DD50F /* bot0@2x.png */,
+ 6167CA2D142A6ED7003DD50F /* bot1.png */,
+ 6167CA2E142A6ED7003DD50F /* bot1@2x.png */,
+ 6167CA2F142A6ED7003DD50F /* bot2.png */,
+ 6167CA30142A6ED7003DD50F /* bot2@2x.png */,
+ 6167CA31142A6ED7003DD50F /* bot3.png */,
+ 6167CA32142A6ED7003DD50F /* bot3@2x.png */,
+ 6167CA33142A6ED7003DD50F /* bot4.png */,
+ 6167CA34142A6ED7003DD50F /* bot4@2x.png */,
+ 6167CA35142A6ED7003DD50F /* bot5.png */,
+ 6167CA36142A6ED7003DD50F /* bot5@2x.png */,
6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */,
6183D83D11E2BCE200A88903 /* Default.png */,
6172FEA21298C7F900D73365 /* Default@2x.png */,
@@ -1009,12 +1103,13 @@
615AD9E8120764CA00F2FF04 /* backButton.png */,
6172FED31298CE6600D73365 /* backButton@2x.png */,
615AD96112073B4D00F2FF04 /* startGameButton.png */,
+ 61078029143FCCC800645B29 /* startGameButton@2x.png */,
615FEADE12A2A6640098EE92 /* localplayButton@2x~iphone.png */,
615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */,
615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */,
61F9040D11DF59D10068B24D /* netplayButton.png */,
- 61EBA62811DFF2BC0048B68A /* title.png */,
- 618899811299516000D55FD6 /* title@2x.png */,
+ 61EBA62811DFF2BC0048B68A /* title~iphone.png */,
+ 618899811299516000D55FD6 /* title@2x~iphone.png */,
61889984129995B500D55FD6 /* title~ipad.png */,
6174F7C612CD62E300205D6F /* smallerTitle.png */,
6174F7C712CD62E300205D6F /* smallerTitle@2x.png */,
@@ -1274,7 +1369,7 @@
61EF921411DF57AC003441C4 /* joyButtonForwardJump.png in Resources */,
61F9040911DF58B00068B24D /* settingsButton.png in Resources */,
61F9040B11DF59370068B24D /* background.png in Resources */,
- 61EBA62A11DFF2BC0048B68A /* title.png in Resources */,
+ 61EBA62A11DFF2BC0048B68A /* title~iphone.png in Resources */,
61F7A43811E290650040BA66 /* Icon-72.png in Resources */,
61F7A43911E290650040BA66 /* Icon-Small-50.png in Resources */,
61F7A43A11E290650040BA66 /* Icon-Small.png in Resources */,
@@ -1342,13 +1437,38 @@
61188C0512A6FE8F0026C5DA /* Data in Resources */,
61188C0612A6FE950026C5DA /* smallerBackground@2x~iphone.png in Resources */,
61188C0712A6FE960026C5DA /* settingsButton@2x.png in Resources */,
- 61188C0812A6FE9A0026C5DA /* title@2x.png in Resources */,
+ 61188C0812A6FE9A0026C5DA /* title@2x~iphone.png in Resources */,
61188C0912A6FE9C0026C5DA /* tw@2x.png in Resources */,
6174F7C812CD62E300205D6F /* smallerTitle.png in Resources */,
6174F7C912CD62E300205D6F /* smallerTitle@2x.png in Resources */,
6167A6771391514600AA6D07 /* RestoreViewController-iPhone.xib in Resources */,
6167A72D13919E6800AA6D07 /* RestoreViewController-iPad.xib in Resources */,
612CABC81391D3CC005E9596 /* hwclassic.mp3 in Resources */,
+ 6167C87414294727003DD50F /* surprise@2x.png in Resources */,
+ 6167C88C14294738003DD50F /* denied@2x.png in Resources */,
+ 6167C8F51429502C003DD50F /* hedgehog.png in Resources */,
+ 6167C8F61429502C003DD50F /* hedgehog@2x.png in Resources */,
+ 6167C8F71429502C003DD50F /* robotBadge.png in Resources */,
+ 6167C8F81429502C003DD50F /* robotBadge@2x.png in Resources */,
+ 6167C8F91429502C003DD50F /* star.png in Resources */,
+ 6167C8FA1429502C003DD50F /* star@2x.png in Resources */,
+ 6167CA37142A6ED7003DD50F /* bot0.png in Resources */,
+ 6167CA38142A6ED7003DD50F /* bot0@2x.png in Resources */,
+ 6167CA39142A6ED7003DD50F /* bot1.png in Resources */,
+ 6167CA3A142A6ED7003DD50F /* bot1@2x.png in Resources */,
+ 6167CA3B142A6ED7003DD50F /* bot2.png in Resources */,
+ 6167CA3C142A6ED7003DD50F /* bot2@2x.png in Resources */,
+ 6167CA3D142A6ED7003DD50F /* bot3.png in Resources */,
+ 6167CA3E142A6ED7003DD50F /* bot3@2x.png in Resources */,
+ 6167CA3F142A6ED7003DD50F /* bot4.png in Resources */,
+ 6167CA40142A6ED7003DD50F /* bot4@2x.png in Resources */,
+ 6167CA41142A6ED7003DD50F /* bot5.png in Resources */,
+ 6167CA42142A6ED7003DD50F /* bot5@2x.png in Resources */,
+ 6167CB48142A8769003DD50F /* basehat-hedgehog.png in Resources */,
+ 6167CB49142A8769003DD50F /* basehat-hedgehog@2x.png in Resources */,
+ 61915D5C143A4E2C00299991 /* MissionTrainingViewController-iPhone.xib in Resources */,
+ 61077E87143FB09800645B29 /* MissionTrainingViewController-iPad.xib in Resources */,
+ 6107802A143FCCC800645B29 /* startGameButton@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1366,7 +1486,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\n\n#create config.inc\necho \"Updating config file...\"\nPROTO=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep HEDGEWARS_PROTO_VER | cut -d ' ' -f 2 | cut -d ')' -f 1`\nMAJN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_MAJOR | xargs | cut -d ' ' -f 2 |cut -d ')' -f 1`\nMINN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_MINOR | xargs | cut -d ' ' -f 2 |cut -d ')' -f 1`\nPATN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_PATCH | xargs | cut -d ' ' -f 2 | cut -d '$' -f 1`\nREVN=-`/usr/local/bin/hg id -n ${PROJECT_DIR}/../../`\necho \"const cNetProtoVersion = $PROTO; const cVersionString = '${MAJN}.${MINN}.${PATN}${REVN}'; const cLuaLibrary = '';\" > ${PROJECT_DIR}/../../hedgewars/config.inc\n\necho \"Copying Data...\"\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\necho \"Fetching additional graphics from QTfrontend/res...\"\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn/\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn/\ncp ${PROJECT_DIR}/../../QTfrontend/res/StatsMedal*.png ${PROJECT_DIR}/Data/Graphics/Btn/\ncp ${PROJECT_DIR}/../../QTfrontend/res/StatsR.png ${PROJECT_DIR}/Data/Graphics/Btn/StatsStar.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels/\n\necho \"Removing text and dummy files...\"\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.svgz -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\nfind ${PROJECT_DIR}/Data -name *.orig -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats, misc stuff\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,Ruler}\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/{TeamCap,TeamHeadband,TeamHair}\nrm -rf ${PROJECT_DIR}/Data/misc/\n\n#delete forbidden maps and WIP themes (remember to check that no Map uses them)\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\nrm -rf ${PROJECT_DIR}/Data/Themes/{Beach,Digital}\n\n#delete unused fonts\nrm -rf ${PROJECT_DIR}/Data/Fonts/{wqy-zenhei.ttc,DroidSansFallback.ttf}\n\n#delete all names, reserved hats\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\n\necho \"Handling audio files...\"\n#delete the Classic voice\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n#delete the main theme file\nrm -rf ${PROJECT_DIR}/Data/Music/main_theme.ogg\n#copy mono audio\ncp -R ${PROJECT_DIR}/Audio/* ${PROJECT_DIR}/Data/\n#remove unused voices\nfor i in {Amazing,Brilliant,Bugger,Bungee,Cutitout,Drat,Excellent,Fire,FlawlessPossibility,Gonnagetyou,Grenade,Hmm,Justyouwait,Leavemealone,Ohdear,Ouch,Perfect,Revenge,Runaway,Solong,Thisoneismine,VictoryPossibility,Watchthis,Whatthe,Whoopsee}; do find Data/Sounds/voices/ -name $i.ogg -delete; done\n\necho \"Tweaking Data contents...\"\n#move Lua maps in Missions\nmkdir ${PROJECT_DIR}/Data/Missions/Maps/\nmv ${PROJECT_DIR}/Data/Maps/{Basketball,Knockball,TrophyRace,CTF_Blizzard,Control} ${PROJECT_DIR}/Data/Missions/Maps/\n#workaround for missing map in CTF_Blizzard\nln -s ../../../Maps/Blizzard/map.png ${PROJECT_DIR}/Data/Missions/Maps/CTF_Blizzard/map.png\n#remove cfg files since we have plists\nfind ${PROJECT_DIR}/Data/Scripts -name *.cfg -delete\n\n#reduce the number of flakes for City\nawk '{if ($1 == 1500) $1=40; print $0}' < ${PROJECT_DIR}/Data/Themes/City/theme.cfg > /tmp/tempfile\nmv /tmp/tempfile ${PROJECT_DIR}/Data/Themes/City/theme.cfg\n\necho \"Done\"";
+ shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\n\n#create config.inc\necho \"Updating config file...\"\nPROTO=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep HEDGEWARS_PROTO_VER | cut -d ' ' -f 2 | cut -d ')' -f 1`\nMAJN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_MAJOR | xargs | cut -d ' ' -f 2 |cut -d ')' -f 1`\nMINN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_MINOR | xargs | cut -d ' ' -f 2 |cut -d ')' -f 1`\nPATN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_PATCH | xargs | cut -d ' ' -f 2 |cut -d '$' -f 1`\nREVN=-`/usr/local/bin/hg id -n ${PROJECT_DIR}/../../`\necho \"const cNetProtoVersion = $PROTO; const cVersionString = '${MAJN}.${MINN}.${PATN}${REVN}'; const cLuaLibrary = '';\" > ${PROJECT_DIR}/../../hedgewars/config.inc\n\necho \"Copying Data...\"\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\necho \"Fetching additional graphics from QTfrontend...\"\nmkdir ${PROJECT_DIR}/Data/Graphics/Icons\ncp ${PROJECT_DIR}/../../QTfrontend/res/{btn*,icon*,StatsMedal*,ammopic*}.png ${PROJECT_DIR}/Data/Graphics/Icons/\n\necho \"Removing text and dummy files...\"\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg* -delete\nfind ${PROJECT_DIR}/Data -name *.psd -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\nfind ${PROJECT_DIR}/Data -name *.orig -delete\nfind ${PROJECT_DIR}/Data -name *.ts -delete\n\n#delete dummy maps and hats, misc stuff\nrm -rf ${PROJECT_DIR}/Data/Maps/test*\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/{TeamCap,TeamHeadband,TeamHair}\nrm -rf ${PROJECT_DIR}/Data/misc/\n\n#delete forbidden maps and WIP themes (remember to check that no Map uses them)\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\nrm -rf ${PROJECT_DIR}/Data/Themes/{Beach,Digital}\n\n#delete all names, reserved hats and unused fonts\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\nrm -rf ${PROJECT_DIR}/Data/Fonts/{wqy-zenhei.ttc,DroidSansFallback.ttf}\n\necho \"Handling audio files...\"\n#delete the Classic voice\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n#delete the main theme file\nrm -rf ${PROJECT_DIR}/Data/Music/main_theme.ogg\n#copy mono audio\ncp -R ${PROJECT_DIR}/Audio/* ${PROJECT_DIR}/Data/\n#remove unused voices\nfor i in {Amazing,Brilliant,Bugger,Bungee,Cutitout,Drat,Excellent,Fire,FlawlessPossibility,Gonnagetyou,Grenade,Hmm,Justyouwait,Leavemealone,Ohdear,Ouch,Perfect,Revenge,Runaway,Solong,Thisoneismine,VictoryPossibility,Watchthis,Whatthe,Whoopsee}; do find Data/Sounds/voices/ -name $i.ogg -delete; done\n\necho \"Tweaking Data contents...\"\n#move Lua maps in Missions\nmkdir ${PROJECT_DIR}/Data/Missions/Maps/\nfor i in `ls ${PROJECT_DIR}/Data/Maps/`; do if [[ `ls -f ${PROJECT_DIR}/Data/Maps/$i/map.lua 2> /dev/null` != '' ]]; then mv ${PROJECT_DIR}/Data/Maps/$i ${PROJECT_DIR}/Data/Missions/Maps/; fi; done;\n#workaround for missing map in CTF_Blizzard\nln -s ../../../Maps/Blizzard/map.png ${PROJECT_DIR}/Data/Missions/Maps/CTF_Blizzard/map.png\n#remove cfg files since we have plists\nfind ${PROJECT_DIR}/Data/Scripts -name *.cfg -delete\nif ((`ls ${PROJECT_DIR}/Data/Scripts/Multiplayer/*.lua|wc -l` >= `ls ${PROJECT_DIR}/Data/Scripts/plist/*.plist|wc -l` ))\nthen\necho \"${PROJECT_DIR}/Data/Scripts/Multiplayer/Normal.plist:0: warning, missing plist implementation of a Multiplayer script file\"\nfi\n\n#reduce the number of flakes for City\nsed -i -e 's/1500/50/' ${PROJECT_DIR}/Data/Themes/City/theme.cfg\n#cleanup missions/trainings info\nsed -i -e -n '/\"/p' ${PROJECT_DIR}/Data/Locale/missions_en.txt\n\necho \"Done\"";
showEnvVarsInLog = 0;
};
9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = {
@@ -1449,20 +1569,20 @@
6165921411CA9BA200D6E256 /* LevelViewController.m in Sources */,
6165921511CA9BA200D6E256 /* MainMenuViewController.m in Sources */,
6165921611CA9BA200D6E256 /* MapConfigViewController.m in Sources */,
- 6165921711CA9BA200D6E256 /* MasterViewController.m in Sources */,
+ 6165921711CA9BA200D6E256 /* SettingsBaseViewController.m in Sources */,
6165921811CA9BA200D6E256 /* OverlayViewController.m in Sources */,
6165921911CA9BA200D6E256 /* InGameMenuViewController.m in Sources */,
6165921A11CA9BA200D6E256 /* SchemeSettingsViewController.m in Sources */,
6165921B11CA9BA200D6E256 /* SchemeWeaponConfigViewController.m in Sources */,
6165921C11CA9BA200D6E256 /* SingleSchemeViewController.m in Sources */,
6165921D11CA9BA200D6E256 /* SingleTeamViewController.m in Sources */,
- 6165921E11CA9BA200D6E256 /* SplitViewRootController.m in Sources */,
+ 6165921E11CA9BA200D6E256 /* SettingsContainerViewController.m in Sources */,
6165921F11CA9BA200D6E256 /* TeamConfigViewController.m in Sources */,
6165922011CA9BA200D6E256 /* TeamSettingsViewController.m in Sources */,
6165922111CA9BA200D6E256 /* VoicesViewController.m in Sources */,
6165922211CA9BA200D6E256 /* WeaponSettingsViewController.m in Sources */,
6165922E11CA9BD500D6E256 /* CGPointUtils.c in Sources */,
- 6165922F11CA9BD500D6E256 /* CommodityFunctions.m in Sources */,
+ 6165922F11CA9BD500D6E256 /* HWUtils.m in Sources */,
6165923111CA9BD500D6E256 /* SquareButtonView.m in Sources */,
6165923211CA9BD500D6E256 /* UIImageExtra.m in Sources */,
6165929E11CA9E2F00D6E256 /* HedgewarsAppDelegate.m in Sources */,
@@ -1501,6 +1621,8 @@
61EDB5B0135B3F97009B29A6 /* GameInterfaceBridge.m in Sources */,
61A976B3136F668500DD9878 /* uCursor.pas in Sources */,
6167A6761391514600AA6D07 /* RestoreViewController.m in Sources */,
+ 61C28D3F142D380400DA16C2 /* AudioManagerController.m in Sources */,
+ 61915D5B143A4E2C00299991 /* MissionTrainingViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1547,10 +1669,10 @@
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
- FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
+ FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.7.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
- FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -O-2 -Xs -Cfvfpv2 -dNOCONSOLE";
+ FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -Os -Xs -Cfvfpv3 -dNOCONSOLE";
FPC_UNITS_PATH = "-Fu\"$(PROJECT_DIR)\"";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_DEBUGGING_SYMBOLS = default;
@@ -1630,10 +1752,10 @@
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
- FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
+ FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.7.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
- FPC_SPECIFIC_OPTIONS = "-dDEBUGFILE -O- -g -gl -gw2 -gt -ghttt -Xs- -Cfvfpv2";
+ FPC_SPECIFIC_OPTIONS = "-dDEBUGFILE -O- -g -gl -gw2 -gt -ghttt -Xs- -Cfvfpv3";
FPC_UNITS_PATH = "-Fu\"$(PROJECT_DIR)\"";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_DEBUGGING_SYMBOLS = full;
@@ -1802,10 +1924,10 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
- FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
+ FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.7.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
- FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -O-2 -Xs -Cfvfpv2 -dDEBUGFILE";
+ FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -Os -Xs -Cfvfpv3 -dDEBUGFILE";
FPC_UNITS_PATH = "-Fu\"$(PROJECT_DIR)\"";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_DEBUGGING_SYMBOLS = default;
--- a/project_files/HedgewarsMobile/Hedgewars_Prefix.pch Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars_Prefix.pch Sat Oct 08 16:54:56 2011 +0200
@@ -14,53 +14,20 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 25/04/2010.
*/
-// some macros by http://www.cimgf.com/2010/05/02/my-current-prefix-pch-file/
-// and http://blog.coriolis.ch/2009/01/05/macros-for-xcode/
-
#ifdef __OBJC__
#import <Foundation/Foundation.h>
#import <CoreGraphics/CoreGraphics.h>
#import <UIKit/UIKit.h>
#import "PascalImports.h"
#import "UIImageExtra.h"
-#import "CommodityFunctions.h"
+#import "DefinesAndMacros.h"
#import "HedgewarsAppDelegate.h"
-#import "SDL.h"
-#import "SDL_video.h"
-#import "SDL_net.h"
-#import "SDL_mixer.h"
+#import "AudioManagerController.h"
+#import "HWUtils.h"
#endif
-
-#ifdef DEBUG
- #define DLog(...) NSLog(@"%s %@", __PRETTY_FUNCTION__, [NSString stringWithFormat:__VA_ARGS__])
- #define ALog(...) [[NSAssertionHandler currentHandler] handleFailureInFunction:[NSString stringWithCString:__PRETTY_FUNCTION__ encoding:NSUTF8StringEncoding] file:[NSString stringWithCString:__FILE__ encoding:NSUTF8StringEncoding] lineNumber:__LINE__ description:__VA_ARGS__]
- #define releaseAndNil(x) [x release]
-#else
- #define DLog(...) do { } while (0)
- #ifndef NS_BLOCK_ASSERTIONS
- #define NS_BLOCK_ASSERTIONS
- #endif
- #define ALog(...) NSLog(@"%s %@", __PRETTY_FUNCTION__, [NSString stringWithFormat:__VA_ARGS__])
- #define releaseAndNil(x) [x release], x = nil
-#endif
-
-
-#define ZAssert(condition, ...) do { if (!(condition)) { ALog(__VA_ARGS__); }} while(0)
-#define rotationManager(x) (x == UIInterfaceOrientationLandscapeRight) || (x == UIInterfaceOrientationLandscapeLeft)
-
-#define START_TIMER NSTimeInterval start = [NSDate timeIntervalSinceReferenceDate];
-#define END_TIMER(msg) NSTimeInterval stop = [NSDate timeIntervalSinceReferenceDate]; CMLog([NSString stringWithFormat:@"%@ Time = %f", msg, stop-start]);
-
-
-#if !__IPHONE_3_2
-typedef enum {
- UIUserInterfaceIdiomPhone, // iPhone and iPod touch style UI
- UIUserInterfaceIdiomPad, // iPad style UI
-} UIUserInterfaceIdiom;
-#define UI_USER_INTERFACE_IDIOM() UIUserInterfaceIdiomPhone
-#define UIPopoverController id
-#endif // ifndef __IPHONE_3_2
--- a/project_files/HedgewarsMobile/Info.plist Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Info.plist Sat Oct 08 16:54:56 2011 +0200
@@ -28,13 +28,15 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.2.3</string>
+ <string>1.3.2</string>
<key>LSRequiresIPhoneOS</key>
<true/>
+ <key>UIPrerenderedIcon</key>
+ <true/>
+ <key>UIStatusBarHidden</key>
+ <true/>
<key>UILaunchImageFile~ipad</key>
<string>Default-ipad</string>
- <key>UIStatusBarHidden</key>
- <true/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
--- a/project_files/HedgewarsMobile/Resources/AboutViewController.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,658 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1024</int>
- <string key="IBDocument.SystemVersion">10F569</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">123</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="841351856">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBProxyObject" id="606714003">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBUIView" id="766721923">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">292</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUINavigationBar" id="241300702">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">290</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUISegmentedControl" id="674364401">
- <reference key="NSNextResponder" ref="241300702"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{127, 7}, {289, 30}}</string>
- <reference key="NSSuperview" ref="241300702"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBSegmentControlStyle">2</int>
- <int key="IBNumberOfSegments">5</int>
- <int key="IBSelectedSegmentIndex">0</int>
- <object class="NSArray" key="IBSegmentTitles">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>Code</string>
- <string>Art</string>
- <string>Sound</string>
- <string>Locale</string>
- <string>Special</string>
- </object>
- <object class="NSMutableArray" key="IBSegmentWidths">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <real value="0.0"/>
- <real value="0.0"/>
- <real value="0.0"/>
- <real value="0.0"/>
- <real value="0.0"/>
- </object>
- <object class="NSMutableArray" key="IBSegmentEnabledStates">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <boolean value="YES"/>
- <boolean value="YES"/>
- <boolean value="YES"/>
- <boolean value="YES"/>
- <boolean value="YES"/>
- </object>
- <object class="NSMutableArray" key="IBSegmentContentOffsets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- </object>
- <object class="NSMutableArray" key="IBSegmentImages">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSNull" id="4"/>
- <reference ref="4"/>
- <reference ref="4"/>
- <reference ref="4"/>
- <reference ref="4"/>
- </object>
- </object>
- </object>
- <string key="NSFrameSize">{543, 44}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSArray" key="IBUIItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUINavigationItem" id="824792699">
- <reference key="IBUINavigationBar" ref="241300702"/>
- <object class="IBUIBarButtonItem" key="IBUILeftBarButtonItem" id="322694234">
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIStyle">1</int>
- <reference key="IBUINavigationItem" ref="824792699"/>
- <int key="IBUISystemItemIdentifier">0</int>
- </object>
- <reference key="IBUITitleView" ref="674364401"/>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- </object>
- </object>
- <object class="IBUITableView" id="411460868">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrame">{{0, 44}, {543, 577}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAgMAA</bytes>
- </object>
- <bool key="IBUIClipsSubviews">YES</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <bool key="IBUIAlwaysBounceVertical">YES</bool>
- <int key="IBUIStyle">1</int>
- <int key="IBUISeparatorStyle">2</int>
- <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
- <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
- <float key="IBUIRowHeight">44</float>
- <float key="IBUISectionHeaderHeight">10</float>
- <float key="IBUISectionFooterHeight">10</float>
- </object>
- </object>
- <string key="NSFrameSize">{543, 621}</string>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="766721923"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="322694234"/>
- <reference key="destination" ref="841351856"/>
- </object>
- <int key="connectionID">8</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">dataSource</string>
- <reference key="source" ref="411460868"/>
- <reference key="destination" ref="841351856"/>
- </object>
- <int key="connectionID">12</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="411460868"/>
- <reference key="destination" ref="841351856"/>
- </object>
- <int key="connectionID">13</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">tableView</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="411460868"/>
- </object>
- <int key="connectionID">14</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">segmentedControlChanged:</string>
- <reference key="source" ref="674364401"/>
- <reference key="destination" ref="841351856"/>
- <int key="IBEventType">13</int>
- </object>
- <int key="connectionID">15</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">segmentedControl</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="674364401"/>
- </object>
- <int key="connectionID">16</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="841351856"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="606714003"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="766721923"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="241300702"/>
- <reference ref="411460868"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object" ref="241300702"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="824792699"/>
- </object>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6</int>
- <reference key="object" ref="824792699"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="322694234"/>
- <reference ref="674364401"/>
- </object>
- <reference key="parent" ref="241300702"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="322694234"/>
- <reference key="parent" ref="824792699"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">10</int>
- <reference key="object" ref="411460868"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">11</int>
- <reference key="object" ref="674364401"/>
- <reference key="parent" ref="824792699"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>10.IBPluginDependency</string>
- <string>11.IBPluginDependency</string>
- <string>2.IBEditorWindowLastContentRect</string>
- <string>2.IBPluginDependency</string>
- <string>5.IBPluginDependency</string>
- <string>6.IBPluginDependency</string>
- <string>7.IBPluginDependency</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>AboutViewController</string>
- <string>UIResponder</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>{{376, 170}, {543, 621}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">16</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">AboutViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
- <string>segmentedControlChanged:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
- <string>segmentedControlChanged:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">buttonPressed:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">segmentedControlChanged:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>segmentedControl</string>
- <string>tableView</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>UISegmentedControl</string>
- <string>UITableView</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>segmentedControl</string>
- <string>tableView</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">segmentedControl</string>
- <string key="candidateClassName">UISegmentedControl</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">tableView</string>
- <string key="candidateClassName">UITableView</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/AboutViewController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIBarButtonItem</string>
- <string key="superclassName">UIBarItem</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIBarItem</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UINavigationBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="802309264">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UINavigationItem</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="802309264"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="786211723"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIScrollView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISegmentedControl</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISegmentedControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UITableView</string>
- <string key="superclassName">UIScrollView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1024" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3100" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">123</string>
- </data>
-</archive>
Binary file project_files/HedgewarsMobile/Resources/Frontend/startGameButton@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend/title.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend/title@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend/title@2x~iphone.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend/title~iphone.png has changed
--- a/project_files/HedgewarsMobile/Resources/GameConfigViewController.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,608 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10K540</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.36</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">132</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="841351856">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="606714003">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUIView" id="766721923">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">292</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIToolbar" id="836721772">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">266</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUISegmentedControl" id="563596142">
- <reference key="NSNextResponder" ref="836721772"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{96, 8}, {270, 30}}</string>
- <reference key="NSSuperview" ref="836721772"/>
- <bool key="IBUIOpaque">NO</bool>
- <int key="IBUITag">12345</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBSegmentControlStyle">2</int>
- <int key="IBNumberOfSegments">4</int>
- <int key="IBSelectedSegmentIndex">0</int>
- <object class="NSArray" key="IBSegmentTitles">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>Map</string>
- <string>Teams</string>
- <string>Details</string>
- <string>Help</string>
- </object>
- <object class="NSMutableArray" key="IBSegmentWidths">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <real value="0.0"/>
- <real value="0.0"/>
- <real value="0.0"/>
- <real value="0.0"/>
- </object>
- <object class="NSMutableArray" key="IBSegmentEnabledStates">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <boolean value="YES"/>
- <boolean value="YES"/>
- <boolean value="YES"/>
- <boolean value="YES"/>
- </object>
- <object class="NSMutableArray" key="IBSegmentContentOffsets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- </object>
- <object class="NSMutableArray" key="IBSegmentImages">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSNull" id="4"/>
- <reference ref="4"/>
- <reference ref="4"/>
- <reference ref="4"/>
- </object>
- <object class="NSColor" key="IBTintColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC42IDAuNiAwLjYAA</bytes>
- </object>
- </object>
- </object>
- <string key="NSFrame">{{0, 276}, {480, 44}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIBarStyle">1</int>
- <object class="NSMutableArray" key="IBUIItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIBarButtonItem" id="80281356">
- <string key="IBUITitle">Back</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIStyle">1</int>
- <reference key="IBUIToolbar" ref="836721772"/>
- </object>
- <object class="IBUIBarButtonItem" id="716161941">
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <reference key="IBUIToolbar" ref="836721772"/>
- <int key="IBUISystemItemIdentifier">5</int>
- </object>
- <object class="IBUIBarButtonItem" id="530186890">
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <reference key="IBUICustomView" ref="563596142"/>
- <reference key="IBUIToolbar" ref="836721772"/>
- </object>
- <object class="IBUIBarButtonItem" id="188600069">
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <reference key="IBUIToolbar" ref="836721772"/>
- <int key="IBUISystemItemIdentifier">5</int>
- </object>
- <object class="IBUIBarButtonItem" id="919181414">
- <int key="IBUITag">1</int>
- <string key="IBUITitle">Start</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <float key="IBUIWidth">68</float>
- <int key="IBUIStyle">2</int>
- <reference key="IBUIToolbar" ref="836721772"/>
- </object>
- </object>
- </object>
- </object>
- <string key="NSFrameSize">{480, 320}</string>
- <reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="766721923"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="80281356"/>
- <reference key="destination" ref="841351856"/>
- </object>
- <int key="connectionID">17</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="919181414"/>
- <reference key="destination" ref="841351856"/>
- </object>
- <int key="connectionID">23</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">segmentPressed:</string>
- <reference key="source" ref="563596142"/>
- <reference key="destination" ref="841351856"/>
- <int key="IBEventType">13</int>
- </object>
- <int key="connectionID">29</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="841351856"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="606714003"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="766721923"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="836721772"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">15</int>
- <reference key="object" ref="836721772"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="80281356"/>
- <reference ref="919181414"/>
- <reference ref="188600069"/>
- <reference ref="530186890"/>
- <reference ref="716161941"/>
- </object>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">16</int>
- <reference key="object" ref="80281356"/>
- <reference key="parent" ref="836721772"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">18</int>
- <reference key="object" ref="919181414"/>
- <reference key="parent" ref="836721772"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">19</int>
- <reference key="object" ref="188600069"/>
- <reference key="parent" ref="836721772"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">21</int>
- <reference key="object" ref="530186890"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="563596142"/>
- </object>
- <reference key="parent" ref="836721772"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">20</int>
- <reference key="object" ref="563596142"/>
- <reference key="parent" ref="530186890"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">22</int>
- <reference key="object" ref="716161941"/>
- <reference key="parent" ref="836721772"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>15.IBPluginDependency</string>
- <string>15.IBViewBoundsToFrameTransform</string>
- <string>16.IBPluginDependency</string>
- <string>18.IBPluginDependency</string>
- <string>19.IBPluginDependency</string>
- <string>2.IBEditorWindowLastContentRect</string>
- <string>2.IBPluginDependency</string>
- <string>20.IBPluginDependency</string>
- <string>22.IBPluginDependency</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>GameConfigViewController</string>
- <string>UIResponder</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw58AAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>{{131, 321}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">29</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">GameConfigViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
- <string>segmentPressed:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
- <string>segmentPressed:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">buttonPressed:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">segmentPressed:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/GameConfigViewController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIBarButtonItem</string>
- <string key="superclassName">UIBarItem</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIBarItem</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="786211723"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISegmentedControl</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISegmentedControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIToolbar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIToolbar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1056" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3100" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">132</string>
- </data>
-</archive>
--- a/project_files/HedgewarsMobile/Resources/HelpPageInGameViewController-iPad.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,889 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1024</int>
- <string key="IBDocument.SystemVersion">10F569</string>
- <string key="IBDocument.InterfaceBuilderVersion">788</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">117</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="841351856">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBProxyObject" id="606714003">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBUIView" id="766721923">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">292</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIImageView" id="625666841">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{0, -1}, {1024, 768}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">helpingame.png</string>
- </object>
- </object>
- <object class="IBUILabel" id="271354909">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{79, 473}, {150, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Direction buttons</string>
- <object class="NSFont" key="IBUIFont" id="583365693">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">18</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor" id="283637272">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="1061067446">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{79, 491}, {203, 85}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">With these buttons you can move your hog, aim and control certain weapons.</string>
- <object class="NSFont" key="IBUIFont" id="818038162">
- <string key="NSName">Helvetica</string>
- <double key="NSSize">16</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="435000744">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{53, 97}, {186, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Timer</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="580244456">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{53, 118}, {187, 43}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Don't let your turn time run out!</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUIImageView" id="162303877">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{780, 248}, {240, 128}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">helpright.png</string>
- </object>
- </object>
- <object class="IBUILabel" id="323588470">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{790, 256}, {109, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Ammo Menu</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="687330896">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{790, 282}, {214, 84}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">This menu contains all the weapons you can use. Drag your finger on a weapon for more details on what it does!</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="697316303">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{780, 97}, {186, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Pause / Open ammos</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="859729380">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{782, 118}, {187, 43}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Tap to pause or open the ammo menu.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="1045445495">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{418, 73}, {186, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Wind bar</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="635730473">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{418, 89}, {191, 63}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Some weapons are affected by the wind and their direction may shift.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="701155026">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{447, 573}, {203, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Teams flags and health</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="929603608">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{447, 592}, {203, 85}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">These bars report the team name, the team flags and the global health status of every hog.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">4</int>
- </object>
- <object class="IBUILabel" id="157896337">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{741, 501}, {135, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Joypad buttons</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="213370333">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{741, 520}, {211, 85}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Press X to jump forward, Y to jump backwards (double tap to jump twice) and Missile to attack or use items.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUIImageView" id="533288614">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{67, 238}, {240, 128}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">helpplain.png</string>
- </object>
- </object>
- <object class="IBUILabel" id="203633929">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{72, 246}, {229, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Tap to return to game</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUILabel" id="345016434">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{72, 268}, {229, 87}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Pan to move camera, pinch to zoom, double tap to center hog, and a single touch to interact with weapons and much more!</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- </object>
- <string key="NSFrameSize">{1024, 768}</string>
- <reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwLjQAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="766721923"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">dismiss</string>
- <reference key="source" ref="766721923"/>
- <reference key="destination" ref="841351856"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">16</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="841351856"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="606714003"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="766721923"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="625666841"/>
- <reference ref="162303877"/>
- <reference ref="323588470"/>
- <reference ref="697316303"/>
- <reference ref="859729380"/>
- <reference ref="1045445495"/>
- <reference ref="635730473"/>
- <reference ref="435000744"/>
- <reference ref="580244456"/>
- <reference ref="271354909"/>
- <reference ref="1061067446"/>
- <reference ref="701155026"/>
- <reference ref="157896337"/>
- <reference ref="533288614"/>
- <reference ref="203633929"/>
- <reference ref="345016434"/>
- <reference ref="213370333"/>
- <reference ref="929603608"/>
- <reference ref="687330896"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object" ref="625666841"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6</int>
- <reference key="object" ref="162303877"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="323588470"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="687330896"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">9</int>
- <reference key="object" ref="697316303"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">10</int>
- <reference key="object" ref="859729380"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">11</int>
- <reference key="object" ref="1045445495"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">12</int>
- <reference key="object" ref="635730473"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">13</int>
- <reference key="object" ref="435000744"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">14</int>
- <reference key="object" ref="580244456"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">17</int>
- <reference key="object" ref="271354909"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">18</int>
- <reference key="object" ref="1061067446"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">21</int>
- <reference key="object" ref="701155026"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">22</int>
- <reference key="object" ref="929603608"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">23</int>
- <reference key="object" ref="157896337"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">24</int>
- <reference key="object" ref="213370333"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">25</int>
- <reference key="object" ref="533288614"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">26</int>
- <reference key="object" ref="203633929"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">27</int>
- <reference key="object" ref="345016434"/>
- <reference key="parent" ref="766721923"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>10.IBPluginDependency</string>
- <string>11.IBPluginDependency</string>
- <string>12.IBPluginDependency</string>
- <string>13.IBPluginDependency</string>
- <string>14.IBPluginDependency</string>
- <string>17.IBPluginDependency</string>
- <string>18.IBPluginDependency</string>
- <string>2.CustomClassName</string>
- <string>2.IBEditorWindowLastContentRect</string>
- <string>2.IBPluginDependency</string>
- <string>21.IBPluginDependency</string>
- <string>22.IBPluginDependency</string>
- <string>23.IBPluginDependency</string>
- <string>24.IBPluginDependency</string>
- <string>25.IBPluginDependency</string>
- <string>26.IBPluginDependency</string>
- <string>27.IBPluginDependency</string>
- <string>5.IBPluginDependency</string>
- <string>6.IBPluginDependency</string>
- <string>7.IBPluginDependency</string>
- <string>8.IBPluginDependency</string>
- <string>9.IBPluginDependency</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>HelpPageViewController</string>
- <string>UIResponder</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>UIControl</string>
- <string>{{288, 355}, {1024, 768}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">27</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">HelpPageViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">dismiss</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">dismiss</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">dismiss</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/HelpPageViewController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIImageView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UILabel</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="786211723"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1024" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3100" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>helpingame.png</string>
- <string>helpplain.png</string>
- <string>helpright.png</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{1024, 768}</string>
- <string>{296, 138}</string>
- <string>{308, 144}</string>
- </object>
- </object>
- <string key="IBCocoaTouchPluginVersion">117</string>
- </data>
-</archive>
--- a/project_files/HedgewarsMobile/Resources/HelpPageInGameViewController-iPhone.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1014 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">132</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="841351856">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="606714003">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUIView" id="766721923">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">292</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIScrollView" id="480371523">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">274</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUILabel" id="806535969">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 283}, {150, 22}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Direction buttons</string>
- <object class="NSFont" key="IBUIFont" id="583365693">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">18</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor" id="283637272">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="837055082">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 292}, {203, 85}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">With these buttons you can move your hog, aim and control certain weapons.</string>
- <object class="NSFont" key="IBUIFont" id="818038162">
- <string key="NSName">Helvetica</string>
- <double key="NSSize">16</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="669645325">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 13}, {186, 22}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Timer</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="392421036">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 34}, {187, 43}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Don't let your turn time run out!</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="709427542">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{217, 308}, {243, 22}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Touch interface</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">2</int>
- </object>
- <object class="IBUILabel" id="748437184">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{231, 328}, {229, 87}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Pan to move camera, pinch to zoom, double tap to center hog, and a single touch to interact with weapons and much more!</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- <int key="IBUITextAlignment">2</int>
- </object>
- <object class="IBUILabel" id="941791832">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 85}, {186, 22}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Wind bar</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="26100154">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 101}, {191, 63}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Some weapons are affected by the wind and their direction may shift.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="413836006">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 172}, {203, 22}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Teams flags and health</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="579557686">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 191}, {203, 85}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">These bars report the team name, the team flags and the global health status of every hog.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">4</int>
- </object>
- <object class="IBUILabel" id="740577465">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{274, 13}, {186, 22}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Pause / Open ammos</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">2</int>
- </object>
- <object class="IBUILabel" id="347724774">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{273, 35}, {187, 43}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Tap to pause or open the ammo menu.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- <int key="IBUITextAlignment">2</int>
- </object>
- <object class="IBUILabel" id="318624215">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{351, 82}, {109, 22}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Ammo Menu</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">2</int>
- </object>
- <object class="IBUILabel" id="145842014">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{246, 105}, {214, 84}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">This menu contains all the weapons you can use. Drag your finger on a weapon for more details on what it does!</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- <int key="IBUITextAlignment">2</int>
- </object>
- <object class="IBUILabel" id="415037922">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{325, 197}, {135, 22}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Joypad buttons</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">2</int>
- </object>
- <object class="IBUILabel" id="499026341">
- <reference key="NSNextResponder" ref="480371523"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{249, 217}, {211, 85}}</string>
- <reference key="NSSuperview" ref="480371523"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Press X to jump forward, Y to jump backwards (double tap to jump twice) and Missile to attack or use items.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- <int key="IBUITextAlignment">2</int>
- </object>
- </object>
- <string key="NSFrame">{{-5, 44}, {489, 332}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUITag">1</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUINavigationBar" id="126317414">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">290</int>
- <string key="NSFrame">{{-1, 0}, {481, 44}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSArray" key="IBUIItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUINavigationItem" id="477618874">
- <reference key="IBUINavigationBar" ref="126317414"/>
- <string key="IBUITitle">Help page</string>
- <object class="IBUIBarButtonItem" key="IBUILeftBarButtonItem" id="843591489">
- <string key="IBUITitle">Back</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIStyle">1</int>
- <reference key="IBUINavigationItem" ref="477618874"/>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </object>
- </object>
- </object>
- <string key="NSFrameSize">{480, 320}</string>
- <reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45OTYwNzg0OTEyIDAuOTg4MjM1MzU0NCAxAA</bytes>
- </object>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="766721923"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">dismiss</string>
- <reference key="source" ref="843591489"/>
- <reference key="destination" ref="841351856"/>
- </object>
- <int key="connectionID">141</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">scrollView</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="480371523"/>
- </object>
- <int key="connectionID">142</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="841351856"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="606714003"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="766721923"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="126317414"/>
- <reference ref="480371523"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">118</int>
- <reference key="object" ref="126317414"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="477618874"/>
- </object>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">121</int>
- <reference key="object" ref="480371523"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="709427542"/>
- <reference ref="392421036"/>
- <reference ref="669645325"/>
- <reference ref="941791832"/>
- <reference ref="26100154"/>
- <reference ref="806535969"/>
- <reference ref="837055082"/>
- <reference ref="413836006"/>
- <reference ref="579557686"/>
- <reference ref="748437184"/>
- <reference ref="740577465"/>
- <reference ref="347724774"/>
- <reference ref="318624215"/>
- <reference ref="145842014"/>
- <reference ref="415037922"/>
- <reference ref="499026341"/>
- </object>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">122</int>
- <reference key="object" ref="709427542"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">124</int>
- <reference key="object" ref="392421036"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">125</int>
- <reference key="object" ref="669645325"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">126</int>
- <reference key="object" ref="941791832"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">127</int>
- <reference key="object" ref="26100154"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">128</int>
- <reference key="object" ref="806535969"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">129</int>
- <reference key="object" ref="837055082"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">130</int>
- <reference key="object" ref="413836006"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">131</int>
- <reference key="object" ref="579557686"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">132</int>
- <reference key="object" ref="748437184"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">133</int>
- <reference key="object" ref="740577465"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">134</int>
- <reference key="object" ref="347724774"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">135</int>
- <reference key="object" ref="318624215"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">136</int>
- <reference key="object" ref="145842014"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">137</int>
- <reference key="object" ref="415037922"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">138</int>
- <reference key="object" ref="499026341"/>
- <reference key="parent" ref="480371523"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">119</int>
- <reference key="object" ref="477618874"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="843591489"/>
- </object>
- <reference key="parent" ref="126317414"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">140</int>
- <reference key="object" ref="843591489"/>
- <reference key="parent" ref="477618874"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>118.IBPluginDependency</string>
- <string>118.IBViewBoundsToFrameTransform</string>
- <string>119.IBPluginDependency</string>
- <string>121.IBEditorWindowLastContentRect</string>
- <string>121.IBPluginDependency</string>
- <string>121.IBViewBoundsToFrameTransform</string>
- <string>122.IBPluginDependency</string>
- <string>122.IBViewBoundsToFrameTransform</string>
- <string>124.IBPluginDependency</string>
- <string>124.IBViewBoundsToFrameTransform</string>
- <string>125.IBPluginDependency</string>
- <string>125.IBViewBoundsToFrameTransform</string>
- <string>126.IBPluginDependency</string>
- <string>126.IBViewBoundsToFrameTransform</string>
- <string>127.IBPluginDependency</string>
- <string>127.IBViewBoundsToFrameTransform</string>
- <string>128.IBPluginDependency</string>
- <string>128.IBViewBoundsToFrameTransform</string>
- <string>129.IBPluginDependency</string>
- <string>129.IBViewBoundsToFrameTransform</string>
- <string>130.IBPluginDependency</string>
- <string>130.IBViewBoundsToFrameTransform</string>
- <string>131.IBPluginDependency</string>
- <string>131.IBViewBoundsToFrameTransform</string>
- <string>132.IBPluginDependency</string>
- <string>132.IBViewBoundsToFrameTransform</string>
- <string>133.IBPluginDependency</string>
- <string>133.IBViewBoundsToFrameTransform</string>
- <string>134.IBPluginDependency</string>
- <string>134.IBViewBoundsToFrameTransform</string>
- <string>135.IBPluginDependency</string>
- <string>135.IBViewBoundsToFrameTransform</string>
- <string>136.IBPluginDependency</string>
- <string>136.IBViewBoundsToFrameTransform</string>
- <string>137.IBPluginDependency</string>
- <string>137.IBViewBoundsToFrameTransform</string>
- <string>138.IBPluginDependency</string>
- <string>138.IBViewBoundsToFrameTransform</string>
- <string>140.IBPluginDependency</string>
- <string>2.IBEditorWindowLastContentRect</string>
- <string>2.IBPluginDependency</string>
- <string>2.IBViewBoundsToFrameTransform</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>HelpPageViewController</string>
- <string>UIResponder</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AQAAAADAQAAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>{{589, 578}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AcCgAABCMAAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDZwAAw7aAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABCVAAAwx8AAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwnQAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABCxgAAwtYAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABCxgAAwyQAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw+SAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAxARAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw6aAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw8+AAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDZwAAw+EAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDiQAAwmwAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDiIAAwswAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDr4AAwwUAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDdgAAw1oAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDooAAw3gAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDeQAAw6aAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>{{165, 514}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw4kAAA</bytes>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">142</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">HelpPageViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">dismiss</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">dismiss</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">dismiss</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">scrollView</string>
- <string key="NS.object.0">UIScrollView</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">scrollView</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">scrollView</string>
- <string key="candidateClassName">UIScrollView</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/HelpPageViewController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIBarButtonItem</string>
- <string key="superclassName">UIBarItem</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIBarItem</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UILabel</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UINavigationBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="847596400">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UINavigationItem</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="847596400"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="786211723"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIScrollView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1056" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3100" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">132</string>
- </data>
-</archive>
--- a/project_files/HedgewarsMobile/Resources/HelpPageLobbyViewController-iPad.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1024</int>
- <string key="IBDocument.SystemVersion">10F569</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">123</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="841351856">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBProxyObject" id="606714003">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBUIView" id="766721923">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">292</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIImageView" id="1011244481">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{742, 389}, {240, 102}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage" id="468391955">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">helpabove.png</string>
- </object>
- </object>
- <object class="IBUILabel" id="636170775">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{753, 408}, {109, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Map theme</string>
- <object class="NSFont" key="IBUIFont" id="583365693">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">18</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor" id="283637272">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="552788325">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{753, 425}, {218, 66}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Here you can choose how your map will appear in game.</string>
- <object class="NSFont" key="IBUIFont" id="818038162">
- <string key="NSName">Helvetica</string>
- <double key="NSSize">16</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUIImageView" id="379980516">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{653, 202}, {240, 146}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <reference key="IBUIImage" ref="468391955"/>
- </object>
- <object class="IBUILabel" id="901581152">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{664, 223}, {109, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Map type</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="595424508">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{664, 244}, {218, 99}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Choose between a static map or a randomly generated one (might require more time). In a mission you need to perfom some action to win.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUIImageView" id="162303877">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{494, 20}, {240, 101}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">helpright.png</string>
- </object>
- </object>
- <object class="IBUILabel" id="323588470">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{502, 25}, {109, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Map preview</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="687330896">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{502, 46}, {218, 65}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">This is a small preview of your next map. Tap to select / generate a new map.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUIImageView" id="713859408">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{391, 389}, {242, 171}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <reference key="IBUIImage" ref="468391955"/>
- </object>
- <object class="IBUILabel" id="896727228">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{401, 413}, {109, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Teams</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="704238452">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{400, 434}, {232, 120}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Select which teams are playing! Add hogs by tapping on them and set their color to figure friend and foe teams out. AI teams will appear with a small robot badge next their name.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUIImageView" id="993770514">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{142, 125}, {240, 104}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage" id="63133621">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">helpleft.png</string>
- </object>
- </object>
- <object class="IBUILabel" id="488737408">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{162, 133}, {204, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Schemes and Weapons</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="463058693">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{162, 152}, {210, 71}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Here you can choose which rules and which weapon set will be applied in game.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUIImageView" id="845663511">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{155, 8}, {278, 50}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <reference key="IBUIImage" ref="63133621"/>
- </object>
- <object class="IBUILabel" id="823916653">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{177, 6}, {248, 54}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Did you know you can customize almost everything in the settings page?</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Oblique</string>
- <double key="NSSize">14</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUIImageView" id="678356402">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{686, 583}, {240, 117}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage" id="835742298">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">helpbottom.png</string>
- </object>
- </object>
- <object class="IBUILabel" id="1068254353">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{697, 592}, {138, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Max hedgehogs</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="1023832701">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{697, 609}, {218, 73}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">This number is the maximum size for all the hogs playing (in every team).</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUIImageView" id="261734864">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 587}, {240, 109}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <reference key="IBUIImage" ref="835742298"/>
- </object>
- <object class="IBUILabel" id="578857422">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{30, 592}, {138, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Size slider</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="972150858">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{30, 608}, {218, 73}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">For Random and Maze maps you can decide to generate only maps of a certain size.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUIImageView" id="533288614">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{45, 318}, {240, 128}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">helpplain.png</string>
- </object>
- </object>
- <object class="IBUILabel" id="203633929">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{50, 326}, {229, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Tap anywhere to dismiss</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUILabel" id="345016434">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{52, 348}, {224, 87}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Still confused? Don't worry, it's really simple! Try a couple of games and everything will become clear to you.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUIImageView" id="109182727">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{344, 635}, {240, 61}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <reference key="IBUIImage" ref="835742298"/>
- </object>
- <object class="IBUILabel" id="815146899">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{353, 637}, {138, 22}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Start button</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="379008984">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{354, 650}, {218, 46}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">This button starts the game.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- </object>
- <string key="NSFrameSize">{1024, 768}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwLjQAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="766721923"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">dismiss</string>
- <reference key="source" ref="766721923"/>
- <reference key="destination" ref="841351856"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">16</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="841351856"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="606714003"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="766721923"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="162303877"/>
- <reference ref="323588470"/>
- <reference ref="687330896"/>
- <reference ref="1011244481"/>
- <reference ref="552788325"/>
- <reference ref="636170775"/>
- <reference ref="1023832701"/>
- <reference ref="1068254353"/>
- <reference ref="261734864"/>
- <reference ref="578857422"/>
- <reference ref="972150858"/>
- <reference ref="713859408"/>
- <reference ref="896727228"/>
- <reference ref="704238452"/>
- <reference ref="533288614"/>
- <reference ref="203633929"/>
- <reference ref="345016434"/>
- <reference ref="109182727"/>
- <reference ref="379008984"/>
- <reference ref="815146899"/>
- <reference ref="379980516"/>
- <reference ref="901581152"/>
- <reference ref="595424508"/>
- <reference ref="678356402"/>
- <reference ref="993770514"/>
- <reference ref="488737408"/>
- <reference ref="463058693"/>
- <reference ref="845663511"/>
- <reference ref="823916653"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6</int>
- <reference key="object" ref="162303877"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="323588470"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="687330896"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">25</int>
- <reference key="object" ref="533288614"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">26</int>
- <reference key="object" ref="203633929"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">27</int>
- <reference key="object" ref="345016434"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">28</int>
- <reference key="object" ref="1011244481"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">29</int>
- <reference key="object" ref="636170775"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">30</int>
- <reference key="object" ref="552788325"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">34</int>
- <reference key="object" ref="678356402"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">35</int>
- <reference key="object" ref="1068254353"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">36</int>
- <reference key="object" ref="1023832701"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">37</int>
- <reference key="object" ref="261734864"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">38</int>
- <reference key="object" ref="578857422"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">39</int>
- <reference key="object" ref="972150858"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">40</int>
- <reference key="object" ref="993770514"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">41</int>
- <reference key="object" ref="488737408"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">42</int>
- <reference key="object" ref="463058693"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">43</int>
- <reference key="object" ref="713859408"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">44</int>
- <reference key="object" ref="896727228"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">45</int>
- <reference key="object" ref="704238452"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">49</int>
- <reference key="object" ref="109182727"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">50</int>
- <reference key="object" ref="815146899"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">51</int>
- <reference key="object" ref="379008984"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">52</int>
- <reference key="object" ref="379980516"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">53</int>
- <reference key="object" ref="901581152"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">54</int>
- <reference key="object" ref="595424508"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">58</int>
- <reference key="object" ref="845663511"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">59</int>
- <reference key="object" ref="823916653"/>
- <reference key="parent" ref="766721923"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>2.CustomClassName</string>
- <string>2.IBEditorWindowLastContentRect</string>
- <string>2.IBPluginDependency</string>
- <string>25.IBPluginDependency</string>
- <string>26.IBPluginDependency</string>
- <string>27.IBPluginDependency</string>
- <string>28.IBPluginDependency</string>
- <string>29.IBPluginDependency</string>
- <string>30.IBPluginDependency</string>
- <string>34.IBPluginDependency</string>
- <string>35.IBPluginDependency</string>
- <string>36.IBPluginDependency</string>
- <string>37.IBPluginDependency</string>
- <string>38.IBPluginDependency</string>
- <string>39.IBPluginDependency</string>
- <string>40.IBPluginDependency</string>
- <string>41.IBPluginDependency</string>
- <string>42.IBPluginDependency</string>
- <string>43.IBPluginDependency</string>
- <string>44.IBPluginDependency</string>
- <string>45.IBPluginDependency</string>
- <string>49.IBPluginDependency</string>
- <string>50.IBPluginDependency</string>
- <string>51.IBPluginDependency</string>
- <string>52.IBPluginDependency</string>
- <string>53.IBPluginDependency</string>
- <string>54.IBPluginDependency</string>
- <string>58.IBPluginDependency</string>
- <string>59.IBPluginDependency</string>
- <string>6.IBPluginDependency</string>
- <string>7.IBPluginDependency</string>
- <string>8.IBPluginDependency</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>HelpPageViewController</string>
- <string>UIResponder</string>
- <string>UIControl</string>
- <string>{{273, 125}, {1024, 768}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">59</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">HelpPageViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">dismiss</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">dismiss</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">dismiss</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/HelpPageViewController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIImageView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UILabel</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="786211723"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1024" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3100" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>helpabove.png</string>
- <string>helpbottom.png</string>
- <string>helpleft.png</string>
- <string>helpplain.png</string>
- <string>helpright.png</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{295, 156}</string>
- <string>{295, 156}</string>
- <string>{308, 144}</string>
- <string>{296, 138}</string>
- <string>{308, 144}</string>
- </object>
- </object>
- <string key="IBCocoaTouchPluginVersion">123</string>
- </data>
-</archive>
--- a/project_files/HedgewarsMobile/Resources/HelpPageLobbyViewController-iPhone.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,907 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1024</int>
- <string key="IBDocument.SystemVersion">10F569</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">123</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="841351856">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="606714003">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUIView" id="766721923">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">292</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIScrollView" id="451725730">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">268</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUILabel" id="381271451">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 587}, {440, 52}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Still confused? Don't worry, it's really simple! Try a couple of games and everything will become clear to you.</string>
- <object class="NSFont" key="IBUIFont" id="818038162">
- <string key="NSName">Helvetica</string>
- <double key="NSSize">16</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor" id="283637272">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUILabel" id="160273292">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 279}, {138, 22}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Size slider</string>
- <object class="NSFont" key="IBUIFont" id="583365693">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">18</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="399703336">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 298}, {440, 44}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">For Random and Maze maps you can decide to generate only maps of a certain size.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="780482878">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 511}, {204, 22}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Schemes and Weapons</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="715276626">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 530}, {433, 45}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Here you can choose which rules and which weapon set will be applied in game.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="81383071">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 68}, {109, 22}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Map preview</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="518187701">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 88}, {440, 44}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">This is a small preview of your next map. Tap to select / generate a new map.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="601567061">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 140}, {109, 22}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Map type</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="514192288">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 164}, {440, 58}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Choose between a static map or a randomly generated one (might require more time). In a mission you need to perfom some action to win.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="136109594">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 229}, {109, 22}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Map theme</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="345586237">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 244}, {440, 33}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Here you can choose how your map will appear in game.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="686505362">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 347}, {138, 22}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Max hedgehogs</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="629677748">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 367}, {440, 41}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">This number is the maximum size for all the hogs playing (in every team).</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="79643170">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 418}, {109, 22}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Teams</string>
- <reference key="IBUIFont" ref="583365693"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUILabel" id="676482380">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 436}, {433, 66}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Select which teams are playing! Add hogs by tapping on them and set their color to figure friend and foe teams out. AI teams will appear with a small robot badge next their name.</string>
- <reference key="IBUIFont" ref="818038162"/>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- </object>
- <object class="IBUILabel" id="66496634">
- <reference key="NSNextResponder" ref="451725730"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{13, 3}, {440, 60}}</string>
- <reference key="NSSuperview" ref="451725730"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Here you can find help for the game configuration options. You can customize almost everything in the settings page.</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Oblique</string>
- <double key="NSSize">16</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="IBUITextColor" ref="283637272"/>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- <int key="IBUITextAlignment">1</int>
- </object>
- </object>
- <string key="NSFrameSize">{480, 276}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </object>
- <string key="NSFrameSize">{480, 276}</string>
- <reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45OTYwNzg0OTEyIDAuOTg4MjM1MzU0NCAxAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <object class="IBUISimulatedToolbarMetrics" key="IBUISimulatedBottomBarMetrics"/>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="766721923"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">scrollView</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="451725730"/>
- </object>
- <int key="connectionID">95</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="841351856"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="606714003"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="766721923"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="451725730"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">60</int>
- <reference key="object" ref="451725730"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="381271451"/>
- <reference ref="160273292"/>
- <reference ref="399703336"/>
- <reference ref="81383071"/>
- <reference ref="518187701"/>
- <reference ref="601567061"/>
- <reference ref="514192288"/>
- <reference ref="136109594"/>
- <reference ref="345586237"/>
- <reference ref="686505362"/>
- <reference ref="629677748"/>
- <reference ref="780482878"/>
- <reference ref="715276626"/>
- <reference ref="79643170"/>
- <reference ref="676482380"/>
- <reference ref="66496634"/>
- </object>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">61</int>
- <reference key="object" ref="381271451"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">62</int>
- <reference key="object" ref="160273292"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">63</int>
- <reference key="object" ref="399703336"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">64</int>
- <reference key="object" ref="780482878"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">65</int>
- <reference key="object" ref="715276626"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">66</int>
- <reference key="object" ref="81383071"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">67</int>
- <reference key="object" ref="518187701"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">68</int>
- <reference key="object" ref="601567061"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">69</int>
- <reference key="object" ref="514192288"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">70</int>
- <reference key="object" ref="136109594"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">71</int>
- <reference key="object" ref="345586237"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">72</int>
- <reference key="object" ref="686505362"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">73</int>
- <reference key="object" ref="629677748"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">74</int>
- <reference key="object" ref="79643170"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">75</int>
- <reference key="object" ref="676482380"/>
- <reference key="parent" ref="451725730"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">76</int>
- <reference key="object" ref="66496634"/>
- <reference key="parent" ref="451725730"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>2.IBEditorWindowLastContentRect</string>
- <string>2.IBPluginDependency</string>
- <string>60.IBPluginDependency</string>
- <string>60.IBViewBoundsToFrameTransform</string>
- <string>61.IBPluginDependency</string>
- <string>61.IBViewBoundsToFrameTransform</string>
- <string>62.IBPluginDependency</string>
- <string>62.IBViewBoundsToFrameTransform</string>
- <string>63.IBPluginDependency</string>
- <string>63.IBViewBoundsToFrameTransform</string>
- <string>64.IBPluginDependency</string>
- <string>64.IBViewBoundsToFrameTransform</string>
- <string>65.IBPluginDependency</string>
- <string>65.IBViewBoundsToFrameTransform</string>
- <string>66.IBPluginDependency</string>
- <string>66.IBViewBoundsToFrameTransform</string>
- <string>67.IBPluginDependency</string>
- <string>67.IBViewBoundsToFrameTransform</string>
- <string>68.IBPluginDependency</string>
- <string>68.IBViewBoundsToFrameTransform</string>
- <string>69.IBPluginDependency</string>
- <string>69.IBViewBoundsToFrameTransform</string>
- <string>70.IBPluginDependency</string>
- <string>70.IBViewBoundsToFrameTransform</string>
- <string>71.IBPluginDependency</string>
- <string>71.IBViewBoundsToFrameTransform</string>
- <string>72.IBPluginDependency</string>
- <string>72.IBViewBoundsToFrameTransform</string>
- <string>73.IBPluginDependency</string>
- <string>73.IBViewBoundsToFrameTransform</string>
- <string>74.IBPluginDependency</string>
- <string>74.IBViewBoundsToFrameTransform</string>
- <string>75.IBPluginDependency</string>
- <string>75.IBViewBoundsToFrameTransform</string>
- <string>76.IBPluginDependency</string>
- <string>76.IBViewBoundsToFrameTransform</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>HelpPageViewController</string>
- <string>UIResponder</string>
- <string>{{16, 775}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform"/>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AUGgAABEDIAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABC+AAAw0kAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw14AAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw9mAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw+6AAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABByAAAwqYAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwxMAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAADCQAAAwqYAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAADCQAAAwzcAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDAAAAw3AAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDAAAAw5aAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDOwAAw6OAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDOwAAw8WAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDDgAAw7UAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDDQAAw/CAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAADBAAAAwlQAAA</bytes>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">95</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">HelpPageViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">dismiss</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">dismiss</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">dismiss</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">scrollView</string>
- <string key="NS.object.0">UIScrollView</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">scrollView</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">scrollView</string>
- <string key="candidateClassName">UIScrollView</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/HelpPageViewController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UILabel</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="786211723"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIScrollView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1024" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3100" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">123</string>
- </data>
-</archive>
Binary file project_files/HedgewarsMobile/Resources/Icons/basehat-hedgehog.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/basehat-hedgehog@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/bot0.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/bot0@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/bot1.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/bot1@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/bot2.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/bot2@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/bot3.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/bot3@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/bot4.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/bot4@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/bot5.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/bot5@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/hedgehog.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/hedgehog@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/robotBadge.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/robotBadge@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/star.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/star@2x.png has changed
--- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,629 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">132</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="372490531">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBProxyObject" id="975951072">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBUIView" id="191373211">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">292</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIImageView" id="976741091">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrameSize">{1024, 768}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">background.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="867308721">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{383, 427}, {263, 244}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <object class="NSFont" key="IBUIFont" id="917635782">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">15</double>
- <int key="NSfFlags">16</int>
- </object>
- <double key="IBUITitleEdgeInsets.top">215</double>
- <double key="IBUITitleEdgeInsets.bottom">0.0</double>
- <double key="IBUITitleEdgeInsets.left">0.0</double>
- <double key="IBUITitleEdgeInsets.right">0.0</double>
- <object class="NSColor" key="IBUIHighlightedTitleColor" id="918890028">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45OTYwNzg0OTEyIDAuODAwMDAwMDcxNSAwLjAzOTIxNTY4NzY2AA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleShadowColor" id="112471976">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">localplayButton~ipad.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="95106947">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{795, 317}, {18, 19}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <float key="IBUIAlpha">0.31690141558647156</float>
- <int key="IBUITag">3</int>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="917635782"/>
- <int key="IBUIButtonType">3</int>
- <bool key="IBUIShowsTouchWhenHighlighted">YES</bool>
- <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
- </object>
- <object class="IBUIButton" id="898948205">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{940, 686}, {64, 64}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <int key="IBUITag">2</int>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="917635782"/>
- <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">settingsButton.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="894101036">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 686}, {64, 64}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <int key="IBUITag">4</int>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="917635782"/>
- <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">savesButton.png</string>
- </object>
- </object>
- <object class="IBUIImageView" id="1019880682">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{242, 43}, {540, 300}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">title~ipad.png</string>
- </object>
- </object>
- </object>
- <string key="NSFrameSize">{1024, 768}</string>
- <reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
- </object>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="191373211"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">switchViews:</string>
- <reference key="source" ref="95106947"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">47</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">switchViews:</string>
- <reference key="source" ref="867308721"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">48</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">switchViews:</string>
- <reference key="source" ref="898948205"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">54</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">switchViews:</string>
- <reference key="source" ref="894101036"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">89</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object" ref="191373211"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="976741091"/>
- <reference ref="867308721"/>
- <reference ref="95106947"/>
- <reference ref="898948205"/>
- <reference ref="894101036"/>
- <reference ref="1019880682"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="372490531"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="975951072"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">39</int>
- <reference key="object" ref="867308721"/>
- <reference key="parent" ref="191373211"/>
- <string key="objectName">local</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">45</int>
- <reference key="object" ref="95106947"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">52</int>
- <reference key="object" ref="898948205"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">37</int>
- <reference key="object" ref="976741091"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">88</int>
- <reference key="object" ref="894101036"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">90</int>
- <reference key="object" ref="1019880682"/>
- <reference key="parent" ref="191373211"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>1.IBEditorWindowLastContentRect</string>
- <string>1.IBPluginDependency</string>
- <string>37.IBPluginDependency</string>
- <string>39.IBPluginDependency</string>
- <string>45.IBPluginDependency</string>
- <string>45.IBViewBoundsToFrameTransform</string>
- <string>52.IBPluginDependency</string>
- <string>52.IBViewBoundsToFrameTransform</string>
- <string>88.IBPluginDependency</string>
- <string>88.IBViewBoundsToFrameTransform</string>
- <string>90.IBPluginDependency</string>
- <string>90.IBViewBoundsToFrameTransform</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>MainMenuViewController</string>
- <string>UIResponder</string>
- <string>{{267, 388}, {1024, 768}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABERQAAw56AAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABEaQAAxDsAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAxDsAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDbQAAw6qAAA</bytes>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">90</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">MainMenuViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">switchViews:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">switchViews:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">switchViews:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/MainMenuViewController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="864669175">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIButton</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIImageView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="864669175"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1056" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>background.png</string>
- <string>localplayButton~ipad.png</string>
- <string>savesButton.png</string>
- <string>settingsButton.png</string>
- <string>title~ipad.png</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{1024, 768}</string>
- <string>{263, 244}</string>
- <string>{64, 64}</string>
- <string>{64, 64}</string>
- <string>{540, 300}</string>
- </object>
- </object>
- <string key="IBCocoaTouchPluginVersion">132</string>
- </data>
-</archive>
--- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,647 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">132</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="22"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="372490531">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="975951072">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUIView" id="191373211">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">293</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIImageView" id="249993817">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrameSize">{480, 320}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwAA</bytes>
- </object>
- <int key="IBUIContentMode">4</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">background~iphone.png</string>
- </object>
- </object>
- <object class="IBUIImageView" id="171108356">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">293</int>
- <string key="NSFrame">{{105, 20}, {270, 150}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUIContentMode">4</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">title.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="124270424">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">289</int>
- <string key="NSFrame">{{190, 200}, {100, 100}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAgMAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <object class="NSFont" key="IBUIFont" id="917635782">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">15</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUIHighlightedTitleColor" id="918890028">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleShadowColor" id="112471976">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">localplayButton~iphone.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="753723574">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">269</int>
- <string key="NSFrame">{{396, 236}, {64, 64}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUITag">2</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="917635782"/>
- <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">settingsButton.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="705508539">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">269</int>
- <string key="NSFrame">{{20, 236}, {64, 64}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUITag">4</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="917635782"/>
- <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">savesButton.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="818907840">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 19}, {18, 19}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <float key="IBUIAlpha">0.5</float>
- <int key="IBUITag">3</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="917635782"/>
- <int key="IBUIButtonType">3</int>
- <bool key="IBUIShowsTouchWhenHighlighted">YES</bool>
- <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
- </object>
- </object>
- <string key="NSFrameSize">{480, 320}</string>
- <reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
- </object>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="191373211"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">switchViews:</string>
- <reference key="source" ref="753723574"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">30</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">switchViews:</string>
- <reference key="source" ref="124270424"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">40</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">switchViews:</string>
- <reference key="source" ref="818907840"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">42</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">switchViews:</string>
- <reference key="source" ref="705508539"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">44</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object" ref="191373211"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="249993817"/>
- <reference ref="818907840"/>
- <reference ref="171108356"/>
- <reference ref="705508539"/>
- <reference ref="753723574"/>
- <reference ref="124270424"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="372490531"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="975951072"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">23</int>
- <reference key="object" ref="171108356"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">22</int>
- <reference key="object" ref="249993817"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">41</int>
- <reference key="object" ref="818907840"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">43</int>
- <reference key="object" ref="705508539"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">24</int>
- <reference key="object" ref="124270424"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">28</int>
- <reference key="object" ref="753723574"/>
- <reference key="parent" ref="191373211"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>1.IBEditorWindowLastContentRect</string>
- <string>1.IBPluginDependency</string>
- <string>22.IBPluginDependency</string>
- <string>22.IBViewBoundsToFrameTransform</string>
- <string>23.IBPluginDependency</string>
- <string>23.IBViewBoundsToFrameTransform</string>
- <string>24.IBPluginDependency</string>
- <string>24.IBViewBoundsToFrameTransform</string>
- <string>28.IBPluginDependency</string>
- <string>28.IBViewBoundsToFrameTransform</string>
- <string>41.IBPluginDependency</string>
- <string>41.IBViewBoundsToFrameTransform</string>
- <string>43.IBPluginDependency</string>
- <string>43.IBViewBoundsToFrameTransform</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>MainMenuViewController</string>
- <string>UIResponder</string>
- <string>{{517, 519}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw5UAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABCygAAwzcAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDPgAAw5UAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDxgAAw5iAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwhAAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw5iAAA</bytes>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">45</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">MainMenuViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">switchViews:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">switchViews:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">switchViews:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/MainMenuViewController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="238583711">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIButton</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIImageView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="238583711"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1056" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>background~iphone.png</string>
- <string>localplayButton~iphone.png</string>
- <string>savesButton.png</string>
- <string>settingsButton.png</string>
- <string>title.png</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{480, 320}</string>
- <string>{100, 100}</string>
- <string>{64, 64}</string>
- <string>{64, 64}</string>
- <string>{270, 150}</string>
- </object>
- </object>
- <string key="IBCocoaTouchPluginVersion">132</string>
- </data>
-</archive>
--- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1048 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10K540</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.36</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">132</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="372490531">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBProxyObject" id="975951072">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBUIView" id="191373211">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">274</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIImageView" id="420136851">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrameSize">{1024, 768}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIAutoresizesSubviews">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">background.png</string>
- </object>
- </object>
- <object class="IBUISegmentedControl" id="88728219">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">289</int>
- <string key="NSFrame">{{724, 166}, {280, 30}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBSegmentControlStyle">2</int>
- <int key="IBNumberOfSegments">4</int>
- <int key="IBSelectedSegmentIndex">1</int>
- <object class="NSArray" key="IBSegmentTitles">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>Random</string>
- <string>Map</string>
- <string>Maze</string>
- <string>Mission</string>
- </object>
- <object class="NSMutableArray" key="IBSegmentWidths">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <real value="0.0"/>
- <real value="0.0"/>
- <real value="0.0"/>
- <real value="0.0"/>
- </object>
- <object class="NSMutableArray" key="IBSegmentEnabledStates">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <boolean value="YES"/>
- <boolean value="YES"/>
- <boolean value="YES"/>
- <boolean value="YES"/>
- </object>
- <object class="NSMutableArray" key="IBSegmentContentOffsets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- </object>
- <object class="NSMutableArray" key="IBSegmentImages">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSNull" id="4"/>
- <reference ref="4"/>
- <reference ref="4"/>
- <reference ref="4"/>
- </object>
- <object class="NSColor" key="IBTintColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
- <object class="IBUISlider" id="938256702">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{263, 723}, {149, 23}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <float key="IBUIValue">0.05000000074505806</float>
- <float key="IBUIMaxValue">0.05000000074505806</float>
- </object>
- <object class="IBUIButton" id="326163764">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">289</int>
- <string key="NSFrame">{{736, 26}, {256, 128}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <object class="NSFont" key="IBUIFont" id="261639815">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">15</double>
- <int key="NSfFlags">16</int>
- </object>
- <double key="IBUIImageEdgeInsets.top">4</double>
- <double key="IBUIImageEdgeInsets.bottom">4</double>
- <double key="IBUIImageEdgeInsets.left">4</double>
- <double key="IBUIImageEdgeInsets.right">4</double>
- <object class="NSColor" key="IBUIHighlightedTitleColor" id="437070330">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleShadowColor" id="65043801">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- </object>
- <object class="IBUILabel" id="634417433">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{778, 724}, {42, 21}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">...</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">17</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45MTc2NDcxMjMzIDAuNjc0NTA5ODIzMyAwAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUILabel" id="743202682">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{112, 720}, {145, 29}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Label</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Oblique</string>
- <double key="NSSize">18</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45MTM3MjU1NTQ5IDAuNzMzMzMzMzQ5MiAwLjAxMTc2NDcwNzA0AA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUIImageView" id="920829014">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{357, 28}, {309, 165}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">title.png</string>
- </object>
- </object>
- <object class="IBUITableView" id="394383001">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrame">{{714, 225}, {300, 445}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwAA</bytes>
- </object>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <bool key="IBUIAlwaysBounceVertical">YES</bool>
- <int key="IBUIStyle">1</int>
- <int key="IBUISeparatorStyle">2</int>
- <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
- <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
- <float key="IBUIRowHeight">45</float>
- </object>
- <object class="IBUIButton" id="550636851">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{441, 702}, {142, 64}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <int key="IBUITag">1</int>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="261639815"/>
- <reference key="IBUIHighlightedTitleColor" ref="437070330"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="65043801"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">startGameButton.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="403581306">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{10, 693}, {64, 64}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="261639815"/>
- <reference key="IBUIHighlightedTitleColor" ref="437070330"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="65043801"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">backButton.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="1065439841">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{950, 693}, {64, 64}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <int key="IBUITag">2</int>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="261639815"/>
- <reference key="IBUIHighlightedTitleColor" ref="437070330"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="65043801"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">helpButton.png</string>
- </object>
- </object>
- </object>
- <string key="NSFrameSize">{1024, 768}</string>
- <reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC44MzkyMTU3NTU1IDAuODQ3MDU4ODkyMyAwLjg3MDU4ODMwMjYAA</bytes>
- </object>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="191373211"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">previewButton</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="326163764"/>
- </object>
- <int key="connectionID">13</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">maxLabel</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="634417433"/>
- </object>
- <int key="connectionID">16</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">sizeLabel</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="743202682"/>
- </object>
- <int key="connectionID">18</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">sliderChanged:</string>
- <reference key="source" ref="938256702"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">13</int>
- </object>
- <int key="connectionID">19</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">sliderEndedChanging:</string>
- <reference key="source" ref="938256702"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">20</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">segmentedControl</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="88728219"/>
- </object>
- <int key="connectionID">21</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">segmentedControlChanged:</string>
- <reference key="source" ref="88728219"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">13</int>
- </object>
- <int key="connectionID">22</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">slider</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="938256702"/>
- </object>
- <int key="connectionID">23</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">dataSource</string>
- <reference key="source" ref="394383001"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">67</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="394383001"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">68</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">tableView</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="394383001"/>
- </object>
- <int key="connectionID">69</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="403581306"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">73</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="550636851"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">74</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="1065439841"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">77</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">mapButtonPressed</string>
- <reference key="source" ref="326163764"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">113</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="326163764"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">114</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="372490531"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="975951072"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object" ref="191373211"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1065439841"/>
- <reference ref="403581306"/>
- <reference ref="550636851"/>
- <reference ref="394383001"/>
- <reference ref="920829014"/>
- <reference ref="743202682"/>
- <reference ref="634417433"/>
- <reference ref="326163764"/>
- <reference ref="938256702"/>
- <reference ref="420136851"/>
- <reference ref="88728219"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">75</int>
- <reference key="object" ref="1065439841"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">72</int>
- <reference key="object" ref="403581306"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">70</int>
- <reference key="object" ref="550636851"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">66</int>
- <reference key="object" ref="394383001"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">57</int>
- <reference key="object" ref="920829014"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">17</int>
- <reference key="object" ref="743202682"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">11</int>
- <reference key="object" ref="634417433"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">9</int>
- <reference key="object" ref="326163764"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="938256702"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="88728219"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">50</int>
- <reference key="object" ref="420136851"/>
- <reference key="parent" ref="191373211"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>1.IBEditorWindowLastContentRect</string>
- <string>1.IBPluginDependency</string>
- <string>11.IBPluginDependency</string>
- <string>17.IBPluginDependency</string>
- <string>50.IBPluginDependency</string>
- <string>57.IBPluginDependency</string>
- <string>66.IBPluginDependency</string>
- <string>7.IBPluginDependency</string>
- <string>7.IBViewBoundsToFrameTransform</string>
- <string>70.IBPluginDependency</string>
- <string>72.IBPluginDependency</string>
- <string>75.IBPluginDependency</string>
- <string>8.IBPluginDependency</string>
- <string>9.CustomClassName</string>
- <string>9.IBPluginDependency</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>MapConfigViewController</string>
- <string>UIResponder</string>
- <string>{{288, 236}, {1024, 768}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABENUAAw0IAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>MapPreviewButtonView</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">119</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">MapConfigViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
- <string>mapButtonPressed</string>
- <string>segmentedControlChanged:</string>
- <string>sliderChanged:</string>
- <string>sliderEndedChanging:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
- <string>mapButtonPressed</string>
- <string>segmentedControlChanged:</string>
- <string>sliderChanged:</string>
- <string>sliderEndedChanging:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">buttonPressed:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">mapButtonPressed</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">segmentedControlChanged:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">sliderChanged:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">sliderEndedChanging:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>maxLabel</string>
- <string>previewButton</string>
- <string>segmentedControl</string>
- <string>sizeLabel</string>
- <string>slider</string>
- <string>tableView</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>UILabel</string>
- <string>MapPreviewButtonView</string>
- <string>UISegmentedControl</string>
- <string>UILabel</string>
- <string>UISlider</string>
- <string>UITableView</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>maxLabel</string>
- <string>previewButton</string>
- <string>segmentedControl</string>
- <string>sizeLabel</string>
- <string>slider</string>
- <string>tableView</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">maxLabel</string>
- <string key="candidateClassName">UILabel</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">previewButton</string>
- <string key="candidateClassName">MapPreviewButtonView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">segmentedControl</string>
- <string key="candidateClassName">UISegmentedControl</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">sizeLabel</string>
- <string key="candidateClassName">UILabel</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">slider</string>
- <string key="candidateClassName">UISlider</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">tableView</string>
- <string key="candidateClassName">UITableView</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/MapConfigViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">MapPreviewButtonView</string>
- <string key="superclassName">UIButton</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">delegate</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">delegate</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">delegate</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/MapPreviewButtonView.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="567455553">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIButton</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIImageView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UILabel</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="567455553"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIScrollView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISegmentedControl</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISegmentedControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISlider</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISlider.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UITableView</string>
- <string key="superclassName">UIScrollView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1056" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>backButton.png</string>
- <string>background.png</string>
- <string>helpButton.png</string>
- <string>startGameButton.png</string>
- <string>title.png</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{64, 64}</string>
- <string>{1024, 768}</string>
- <string>{64, 64}</string>
- <string>{142, 64}</string>
- <string>{270, 150}</string>
- </object>
- </object>
- <string key="IBCocoaTouchPluginVersion">132</string>
- </data>
-</archive>
--- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,949 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10K540</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.36</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">132</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="372490531">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="975951072">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUIView" id="191373211">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">274</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIImageView" id="574494641">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrameSize">{480, 276}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">background~iphone.png</string>
- </object>
- </object>
- <object class="IBUISegmentedControl" id="88728219">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{9, 14}, {270, 30}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBSegmentControlStyle">2</int>
- <int key="IBNumberOfSegments">4</int>
- <int key="IBSelectedSegmentIndex">1</int>
- <object class="NSArray" key="IBSegmentTitles">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>Random</string>
- <string>Map</string>
- <string>Maze</string>
- <string>Mission</string>
- </object>
- <object class="NSMutableArray" key="IBSegmentWidths">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <real value="0.0"/>
- <real value="0.0"/>
- <real value="0.0"/>
- <real value="0.0"/>
- </object>
- <object class="NSMutableArray" key="IBSegmentEnabledStates">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <boolean value="YES"/>
- <boolean value="YES"/>
- <boolean value="YES"/>
- <boolean value="YES"/>
- </object>
- <object class="NSMutableArray" key="IBSegmentContentOffsets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- <string>{0, 0}</string>
- </object>
- <object class="NSMutableArray" key="IBSegmentImages">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSNull" id="4"/>
- <reference ref="4"/>
- <reference ref="4"/>
- <reference ref="4"/>
- </object>
- <object class="NSColor" key="IBTintColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
- <object class="IBUISlider" id="938256702">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{119, 207}, {149, 23}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <float key="IBUIValue">0.05000000074505806</float>
- <float key="IBUIMaxValue">0.05000000074505806</float>
- </object>
- <object class="IBUIButton" id="326163764">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{16, 58}, {256, 128}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">15</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUIHighlightedTitleColor" id="437070330">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleShadowColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- </object>
- <object class="IBUILabel" id="634417433">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{58, 221}, {48, 35}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">...</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">17</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45NDkwMTk2NzA1IDAuNzY4NjI3NTI0NCAwAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUILabel" id="743202682">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{109, 237}, {169, 29}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Label</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Oblique</string>
- <double key="NSSize">22</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUITableView" id="565214171">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrame">{{284, 0}, {196, 276}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <bool key="IBUIBouncesZoom">NO</bool>
- <int key="IBUIStyle">1</int>
- <int key="IBUISeparatorStyle">2</int>
- <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
- <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
- <float key="IBUIRowHeight">44</float>
- <float key="IBUISectionHeaderHeight">10</float>
- <float key="IBUISectionFooterHeight">10</float>
- </object>
- <object class="IBUILabel" id="32436512">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{-9, 225}, {92, 27}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Max</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-BoldOblique</string>
- <double key="NSSize">18</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45NDkwMTk2NzA1IDAuNzY4NjI3NTI0NCAwAA</bytes>
- </object>
- <reference key="IBUIHighlightedColor" ref="437070330"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
- </object>
- <string key="NSFrameSize">{480, 276}</string>
- <reference key="NSSuperview"/>
- <reference key="IBUIBackgroundColor" ref="437070330"/>
- <object class="IBUISimulatedToolbarMetrics" key="IBUISimulatedBottomBarMetrics"/>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="191373211"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">previewButton</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="326163764"/>
- </object>
- <int key="connectionID">13</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">maxLabel</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="634417433"/>
- </object>
- <int key="connectionID">16</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">sizeLabel</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="743202682"/>
- </object>
- <int key="connectionID">18</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">sliderChanged:</string>
- <reference key="source" ref="938256702"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">13</int>
- </object>
- <int key="connectionID">19</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">sliderEndedChanging:</string>
- <reference key="source" ref="938256702"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">20</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">segmentedControl</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="88728219"/>
- </object>
- <int key="connectionID">21</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">segmentedControlChanged:</string>
- <reference key="source" ref="88728219"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">13</int>
- </object>
- <int key="connectionID">22</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">slider</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="938256702"/>
- </object>
- <int key="connectionID">23</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">dataSource</string>
- <reference key="source" ref="565214171"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">26</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="565214171"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">27</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">tableView</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="565214171"/>
- </object>
- <int key="connectionID">32</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">mapButtonPressed</string>
- <reference key="source" ref="326163764"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">33</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="326163764"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">34</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object" ref="191373211"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="326163764"/>
- <reference ref="565214171"/>
- <reference ref="938256702"/>
- <reference ref="743202682"/>
- <reference ref="574494641"/>
- <reference ref="88728219"/>
- <reference ref="634417433"/>
- <reference ref="32436512"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="372490531"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="975951072"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="88728219"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="938256702"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">9</int>
- <reference key="object" ref="326163764"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">11</int>
- <reference key="object" ref="634417433"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">17</int>
- <reference key="object" ref="743202682"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">25</int>
- <reference key="object" ref="565214171"/>
- <reference key="parent" ref="191373211"/>
- <string key="objectName">Table View (Themes)</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">35</int>
- <reference key="object" ref="574494641"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">36</int>
- <reference key="object" ref="32436512"/>
- <reference key="parent" ref="191373211"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>1.IBEditorWindowLastContentRect</string>
- <string>1.IBPluginDependency</string>
- <string>11.IBPluginDependency</string>
- <string>11.IBViewBoundsToFrameTransform</string>
- <string>17.IBPluginDependency</string>
- <string>17.IBViewBoundsToFrameTransform</string>
- <string>25.IBPluginDependency</string>
- <string>25.IBViewBoundsToFrameTransform</string>
- <string>35.IBPluginDependency</string>
- <string>35.IBViewBoundsToFrameTransform</string>
- <string>36.IBPluginDependency</string>
- <string>36.IBViewBoundsToFrameTransform</string>
- <string>7.IBPluginDependency</string>
- <string>7.IBViewBoundsToFrameTransform</string>
- <string>8.IBPluginDependency</string>
- <string>9.CustomClassName</string>
- <string>9.IBPluginDependency</string>
- <string>9.IBViewBoundsToFrameTransform</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>MapConfigViewController</string>
- <string>UIResponder</string>
- <string>{{790, 298}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABB+AAAw4QAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABCyAAAw2YAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDjgAAw4kAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw4kAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBMAAAw2gAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwigAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>MapPreviewButtonView</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwxIAAA</bytes>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">36</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">MapConfigViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
- <string>mapButtonPressed</string>
- <string>segmentedControlChanged:</string>
- <string>sliderChanged:</string>
- <string>sliderEndedChanging:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
- <string>mapButtonPressed</string>
- <string>segmentedControlChanged:</string>
- <string>sliderChanged:</string>
- <string>sliderEndedChanging:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">buttonPressed:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">mapButtonPressed</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">segmentedControlChanged:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">sliderChanged:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">sliderEndedChanging:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>maxLabel</string>
- <string>previewButton</string>
- <string>segmentedControl</string>
- <string>sizeLabel</string>
- <string>slider</string>
- <string>tableView</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>UILabel</string>
- <string>MapPreviewButtonView</string>
- <string>UISegmentedControl</string>
- <string>UILabel</string>
- <string>UISlider</string>
- <string>UITableView</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>maxLabel</string>
- <string>previewButton</string>
- <string>segmentedControl</string>
- <string>sizeLabel</string>
- <string>slider</string>
- <string>tableView</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">maxLabel</string>
- <string key="candidateClassName">UILabel</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">previewButton</string>
- <string key="candidateClassName">MapPreviewButtonView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">segmentedControl</string>
- <string key="candidateClassName">UISegmentedControl</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">sizeLabel</string>
- <string key="candidateClassName">UILabel</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">slider</string>
- <string key="candidateClassName">UISlider</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">tableView</string>
- <string key="candidateClassName">UITableView</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/MapConfigViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">MapPreviewButtonView</string>
- <string key="superclassName">UIButton</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">delegate</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">delegate</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">delegate</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/MapPreviewButtonView.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="567455553">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIButton</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIImageView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UILabel</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="567455553"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIScrollView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISegmentedControl</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISegmentedControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISlider</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISlider.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UITableView</string>
- <string key="superclassName">UIScrollView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1056" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <string key="NS.key.0">background~iphone.png</string>
- <string key="NS.object.0">{480, 320}</string>
- </object>
- <string key="IBCocoaTouchPluginVersion">132</string>
- </data>
-</archive>
--- a/project_files/HedgewarsMobile/Resources/OverlayViewController.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1014 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">132</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="372490531">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="975951072">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUIView" id="191373211">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">274</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIButton" id="584263820">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{0, 229}, {50, 50}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <object class="NSFont" key="IBUIFont" id="969592940">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">15</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUIHighlightedTitleColor" id="708011311">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleShadowColor" id="280149554">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">arrowLeft.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="123494776">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{87, 229}, {50, 50}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUITag">1</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="969592940"/>
- <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">arrowRight.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="590902961">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">265</int>
- <string key="NSFrame">{{412, 236}, {64, 64}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUITag">5</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="969592940"/>
- <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">joyButtonBackJump.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="132251648">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">265</int>
- <string key="NSFrame">{{365, 203}, {64, 64}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUITag">6</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="969592940"/>
- <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">joyButtonForwardJump.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="752933969">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">265</int>
- <string key="NSFrame">{{354, 256}, {64, 64}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUITag">4</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="969592940"/>
- <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">joyButtonAttack.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="261686746">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{44, 187}, {50, 50}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUITag">2</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="969592940"/>
- <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">arrowUp.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="81315603">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{44, 270}, {50, 50}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUITag">3</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="969592940"/>
- <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">arrowDown.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="309477778">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">289</int>
- <string key="NSFrame">{{341, 0}, {64, 50}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUITag">10</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="969592940"/>
- <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">cornerButton.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="50885250">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">289</int>
- <string key="NSFrame">{{402, 0}, {78, 50}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUITag">11</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="969592940"/>
- <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">ammoButton.png</string>
- </object>
- </object>
- </object>
- <string key="NSFrameSize">{480, 320}</string>
- <reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MSAwAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="191373211"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="584263820"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">1</int>
- </object>
- <int key="connectionID">8</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="584263820"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">9</int>
- </object>
- <int key="connectionID">9</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="584263820"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">10</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="584263820"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">8</int>
- </object>
- <int key="connectionID">11</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="123494776"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">8</int>
- </object>
- <int key="connectionID">13</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="123494776"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">9</int>
- </object>
- <int key="connectionID">14</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="123494776"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">1</int>
- </object>
- <int key="connectionID">15</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="123494776"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">16</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="261686746"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">9</int>
- </object>
- <int key="connectionID">18</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="261686746"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">1</int>
- </object>
- <int key="connectionID">19</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="261686746"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">8</int>
- </object>
- <int key="connectionID">20</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="261686746"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">21</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="81315603"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">8</int>
- </object>
- <int key="connectionID">23</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="81315603"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">9</int>
- </object>
- <int key="connectionID">24</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="81315603"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">1</int>
- </object>
- <int key="connectionID">25</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="81315603"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">26</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="590902961"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">9</int>
- </object>
- <int key="connectionID">44</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="590902961"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">1</int>
- </object>
- <int key="connectionID">45</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="590902961"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">8</int>
- </object>
- <int key="connectionID">46</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="590902961"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">47</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="752933969"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">8</int>
- </object>
- <int key="connectionID">49</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="752933969"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">50</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="752933969"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">9</int>
- </object>
- <int key="connectionID">51</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="752933969"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">1</int>
- </object>
- <int key="connectionID">52</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="132251648"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">9</int>
- </object>
- <int key="connectionID">54</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="132251648"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">55</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="132251648"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">1</int>
- </object>
- <int key="connectionID">56</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="132251648"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">8</int>
- </object>
- <int key="connectionID">57</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="309477778"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">60</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="50885250"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">68</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="50885250"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">9</int>
- </object>
- <int key="connectionID">69</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object" ref="191373211"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="590902961"/>
- <reference ref="81315603"/>
- <reference ref="584263820"/>
- <reference ref="261686746"/>
- <reference ref="123494776"/>
- <reference ref="132251648"/>
- <reference ref="752933969"/>
- <reference ref="50885250"/>
- <reference ref="309477778"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="372490531"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="975951072"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4</int>
- <reference key="object" ref="584263820"/>
- <reference key="parent" ref="191373211"/>
- <string key="objectName">left</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">12</int>
- <reference key="object" ref="123494776"/>
- <reference key="parent" ref="191373211"/>
- <string key="objectName">right</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">17</int>
- <reference key="object" ref="261686746"/>
- <reference key="parent" ref="191373211"/>
- <string key="objectName">up</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">22</int>
- <reference key="object" ref="81315603"/>
- <reference key="parent" ref="191373211"/>
- <string key="objectName">down</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">43</int>
- <reference key="object" ref="590902961"/>
- <reference key="parent" ref="191373211"/>
- <string key="objectName">push2</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">48</int>
- <reference key="object" ref="752933969"/>
- <reference key="parent" ref="191373211"/>
- <string key="objectName">push1</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">53</int>
- <reference key="object" ref="132251648"/>
- <reference key="parent" ref="191373211"/>
- <string key="objectName">push3</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">58</int>
- <reference key="object" ref="309477778"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">67</int>
- <reference key="object" ref="50885250"/>
- <reference key="parent" ref="191373211"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>1.IBEditorWindowLastContentRect</string>
- <string>1.IBPluginDependency</string>
- <string>12.IBPluginDependency</string>
- <string>12.IBViewBoundsToFrameTransform</string>
- <string>17.IBPluginDependency</string>
- <string>22.IBPluginDependency</string>
- <string>4.IBPluginDependency</string>
- <string>43.IBPluginDependency</string>
- <string>48.IBPluginDependency</string>
- <string>53.IBPluginDependency</string>
- <string>58.IBPluginDependency</string>
- <string>67.IBPluginDependency</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>OverlayViewController</string>
- <string>UIResponder</string>
- <string>{{690, 375}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABCkAAAw5SAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">72</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">OverlayViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
- <string>buttonReleased:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
- <string>buttonReleased:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">buttonPressed:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">buttonReleased:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/OverlayViewController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="917531033">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIButton</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="917531033"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1056" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3100" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>ammoButton.png</string>
- <string>arrowDown.png</string>
- <string>arrowLeft.png</string>
- <string>arrowRight.png</string>
- <string>arrowUp.png</string>
- <string>cornerButton.png</string>
- <string>joyButtonAttack.png</string>
- <string>joyButtonBackJump.png</string>
- <string>joyButtonForwardJump.png</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{78, 50}</string>
- <string>{50, 50}</string>
- <string>{50, 50}</string>
- <string>{50, 50}</string>
- <string>{50, 50}</string>
- <string>{60, 50}</string>
- <string>{64, 64}</string>
- <string>{64, 64}</string>
- <string>{64, 64}</string>
- </object>
- </object>
- <string key="IBCocoaTouchPluginVersion">132</string>
- </data>
-</archive>
--- a/project_files/HedgewarsMobile/Resources/RestoreViewController-iPad.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,616 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10J869</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">132</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="372490531">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBProxyObject" id="975951072">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBUIView" id="191373211">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">274</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIButton" id="155385540">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">302</int>
- <string key="NSFrame">{{84, 517}, {151, 37}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <object class="NSFont" key="IBUIFont" id="204967016">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">15</double>
- <int key="NSfFlags">16</int>
- </object>
- <int key="IBUIButtonType">1</int>
- <string key="IBUINormalTitle">Dismiss</string>
- <object class="NSColor" key="IBUIHighlightedTitleColor" id="790402446">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleColor" id="829178890">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAuNTAxOTYwODE0AA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleShadowColor" id="644451038">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- </object>
- <object class="IBUIButton" id="202794507">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">299</int>
- <string key="NSFrame">{{308, 517}, {151, 37}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <int key="IBUITag">1</int>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="204967016"/>
- <int key="IBUIButtonType">1</int>
- <string key="IBUINormalTitle">Restore</string>
- <reference key="IBUIHighlightedTitleColor" ref="790402446"/>
- <reference key="IBUINormalTitleColor" ref="829178890"/>
- <reference key="IBUINormalTitleShadowColor" ref="644451038"/>
- </object>
- <object class="IBUILabel" id="655269955">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">315</int>
- <string key="NSFrame">{{216, 35}, {108, 29}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Hmm...</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">24</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MSAxIDAAA</bytes>
- </object>
- <reference key="IBUIHighlightedColor" ref="790402446"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUILabel" id="19933541">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">307</int>
- <string key="NSFrame">{{80, 375}, {380, 96}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Would you like to restore it?</string>
- <object class="NSFont" key="IBUIFont" id="276115526">
- <string key="NSName">Helvetica</string>
- <double key="NSSize">18</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC45MDE5NjA3OTAyIDAuOTAxOTYwNzkwMiAwLjkwMTk2MDc5MDIAA</bytes>
- </object>
- <reference key="IBUIHighlightedColor" ref="790402446"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">4</int>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUILabel" id="151967545">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">307</int>
- <string key="NSFrame">{{80, 87}, {380, 96}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">It appears you didn't complete your last game!</string>
- <reference key="IBUIFont" ref="276115526"/>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC45MDE5NjA3OTAyIDAuOTAxOTYwNzkwMiAwLjkwMTk2MDc5MDIAA</bytes>
- </object>
- <reference key="IBUIHighlightedColor" ref="790402446"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">4</int>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUIImageView" id="129485928">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">300</int>
- <string key="NSFrame">{{150, 191}, {240, 160}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">denied.png</string>
- </object>
- </object>
- </object>
- <string key="NSFrameSize">{540, 640}</string>
- <reference key="NSSuperview"/>
- <reference key="IBUIBackgroundColor" ref="790402446"/>
- <int key="IBUIContentMode">4</int>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="191373211"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="155385540"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">21</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="202794507"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">22</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object" ref="191373211"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="155385540"/>
- <reference ref="202794507"/>
- <reference ref="655269955"/>
- <reference ref="19933541"/>
- <reference ref="151967545"/>
- <reference ref="129485928"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="372490531"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="975951072"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">15</int>
- <reference key="object" ref="155385540"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">16</int>
- <reference key="object" ref="202794507"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">18</int>
- <reference key="object" ref="655269955"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">19</int>
- <reference key="object" ref="19933541"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">20</int>
- <reference key="object" ref="129485928"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">23</int>
- <reference key="object" ref="151967545"/>
- <reference key="parent" ref="191373211"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>1.IBEditorWindowLastContentRect</string>
- <string>1.IBPluginDependency</string>
- <string>15.IBPluginDependency</string>
- <string>15.IBViewBoundsToFrameTransform</string>
- <string>16.IBPluginDependency</string>
- <string>16.IBViewBoundsToFrameTransform</string>
- <string>18.IBPluginDependency</string>
- <string>18.IBViewBoundsToFrameTransform</string>
- <string>19.IBPluginDependency</string>
- <string>19.IBViewBoundsToFrameTransform</string>
- <string>20.IBPluginDependency</string>
- <string>20.IBViewBoundsToFrameTransform</string>
- <string>23.IBPluginDependency</string>
- <string>23.IBViewBoundsToFrameTransform</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>RestoreViewController</string>
- <string>UIResponder</string>
- <string>{{640, 244}, {540, 640}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDlIAAw2gAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABEAkAAw2gAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDXAAAw3UAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AUKgAABDmYAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDFgAAw8cAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABCoAAAw9uAAA</bytes>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">23</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">RestoreViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">buttonReleased:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">buttonReleased:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">buttonReleased:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/RestoreViewController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="749404015">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIButton</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIImageView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UILabel</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="749404015"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1056" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <string key="NS.key.0">denied.png</string>
- <string key="NS.object.0">{240, 160}</string>
- </object>
- <string key="IBCocoaTouchPluginVersion">132</string>
- </data>
-</archive>
--- a/project_files/HedgewarsMobile/Resources/RestoreViewController-iPhone.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,582 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10J869</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">132</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="372490531">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="975951072">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUIView" id="191373211">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">274</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIImageView" id="508553704">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">300</int>
- <string key="NSFrame">{{20, 20}, {240, 160}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">denied.png</string>
- </object>
- </object>
- <object class="IBUILabel" id="531154203">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">315</int>
- <string key="NSFrame">{{310, 32}, {108, 29}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Hmm...</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">24</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MSAxIDAAA</bytes>
- </object>
- <object class="NSColor" key="IBUIHighlightedColor" id="790402446">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUILabel" id="785455561">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">307</int>
- <string key="NSFrame">{{268, 74}, {192, 96}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">It appears you didn't complete your last game! Would you like to restore it?</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica</string>
- <double key="NSSize">18</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC45MDE5NjA3OTAyIDAuOTAxOTYwNzkwMiAwLjkwMTk2MDc5MDIAA</bytes>
- </object>
- <reference key="IBUIHighlightedColor" ref="790402446"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">4</int>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUIButton" id="472385208">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">302</int>
- <string key="NSFrame">{{53, 229}, {151, 37}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <object class="NSFont" key="IBUIFont" id="204967016">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">15</double>
- <int key="NSfFlags">16</int>
- </object>
- <int key="IBUIButtonType">1</int>
- <string key="IBUINormalTitle">Dismiss</string>
- <reference key="IBUIHighlightedTitleColor" ref="790402446"/>
- <object class="NSColor" key="IBUINormalTitleColor" id="734262812">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAuNTAxOTYwODE0AA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleShadowColor" id="644451038">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- </object>
- <object class="IBUIButton" id="923913762">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">299</int>
- <string key="NSFrame">{{277, 229}, {151, 37}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <int key="IBUITag">1</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="204967016"/>
- <int key="IBUIButtonType">1</int>
- <string key="IBUINormalTitle">Restore</string>
- <reference key="IBUIHighlightedTitleColor" ref="790402446"/>
- <reference key="IBUINormalTitleColor" ref="734262812"/>
- <reference key="IBUINormalTitleShadowColor" ref="644451038"/>
- </object>
- </object>
- <string key="NSFrameSize">{480, 320}</string>
- <reference key="NSSuperview"/>
- <reference key="IBUIBackgroundColor" ref="790402446"/>
- <int key="IBUIContentMode">4</int>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="191373211"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="923913762"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">11</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonReleased:</string>
- <reference key="source" ref="472385208"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">12</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object" ref="191373211"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="508553704"/>
- <reference ref="923913762"/>
- <reference ref="785455561"/>
- <reference ref="531154203"/>
- <reference ref="472385208"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="372490531"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="975951072"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object" ref="508553704"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6</int>
- <reference key="object" ref="531154203"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="785455561"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="472385208"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">10</int>
- <reference key="object" ref="923913762"/>
- <reference key="parent" ref="191373211"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>1.IBEditorWindowLastContentRect</string>
- <string>1.IBPluginDependency</string>
- <string>10.IBPluginDependency</string>
- <string>10.IBViewBoundsToFrameTransform</string>
- <string>5.IBPluginDependency</string>
- <string>5.IBViewBoundsToFrameTransform</string>
- <string>6.IBPluginDependency</string>
- <string>6.IBViewBoundsToFrameTransform</string>
- <string>7.IBPluginDependency</string>
- <string>7.IBViewBoundsToFrameTransform</string>
- <string>8.IBPluginDependency</string>
- <string>8.IBViewBoundsToFrameTransform</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>RestoreViewController</string>
- <string>UIResponder</string>
- <string>{{206, 423}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AUOKgABDZQAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AUGgAABBoAAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AUObAABCAAAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AUOGAABClAAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AUJUAABDZQAAA</bytes>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">14</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">RestoreViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">buttonReleased:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">buttonReleased:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">buttonReleased:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/RestoreViewController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="749404015">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIButton</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIImageView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UILabel</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="749404015"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1056" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <string key="NS.key.0">denied.png</string>
- <string key="NS.object.0">{240, 160}</string>
- </object>
- <string key="IBCocoaTouchPluginVersion">132</string>
- </data>
-</archive>
--- a/project_files/HedgewarsMobile/Resources/SavedGamesViewController.xib Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,574 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10K549</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.36</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">132</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="4"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="841351856">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBProxyObject" id="606714003">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBUIView" id="766721923">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">292</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIToolbar" id="832454237">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">290</int>
- <string key="NSFrameSize">{768, 44}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUITag">458912</int>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSMutableArray" key="IBUIItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIBarButtonItem" id="422926197">
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIStyle">1</int>
- <reference key="IBUIToolbar" ref="832454237"/>
- <int key="IBUISystemItemIdentifier">0</int>
- </object>
- <object class="IBUIBarButtonItem" id="881124109">
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <reference key="IBUIToolbar" ref="832454237"/>
- <int key="IBUISystemItemIdentifier">5</int>
- </object>
- <object class="IBUIBarButtonItem" id="882246004">
- <int key="IBUITag">1</int>
- <string key="IBUITitle">Clear All</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIStyle">1</int>
- <reference key="IBUIToolbar" ref="832454237"/>
- </object>
- </object>
- </object>
- <object class="IBUITableView" id="399289716">
- <reference key="NSNextResponder" ref="766721923"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrame">{{0, 44}, {768, 724}}</string>
- <reference key="NSSuperview" ref="766721923"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAgMAA</bytes>
- </object>
- <bool key="IBUIClipsSubviews">YES</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <bool key="IBUIAlwaysBounceVertical">YES</bool>
- <int key="IBUIStyle">1</int>
- <int key="IBUISeparatorStyle">2</int>
- <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
- <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
- <float key="IBUIRowHeight">44</float>
- <float key="IBUISectionHeaderHeight">10</float>
- <float key="IBUISectionFooterHeight">10</float>
- </object>
- </object>
- <string key="NSFrameSize">{768, 768}</string>
- <reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="interfaceOrientation">3</int>
- </object>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="766721923"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="422926197"/>
- <reference key="destination" ref="841351856"/>
- </object>
- <int key="connectionID">6</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">dataSource</string>
- <reference key="source" ref="399289716"/>
- <reference key="destination" ref="841351856"/>
- </object>
- <int key="connectionID">8</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="399289716"/>
- <reference key="destination" ref="841351856"/>
- </object>
- <int key="connectionID">9</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">tableView</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="399289716"/>
- </object>
- <int key="connectionID">10</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">buttonPressed:</string>
- <reference key="source" ref="882246004"/>
- <reference key="destination" ref="841351856"/>
- </object>
- <int key="connectionID">17</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="841351856"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="606714003"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="766721923"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="832454237"/>
- <reference ref="399289716"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4</int>
- <reference key="object" ref="832454237"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="422926197"/>
- <reference ref="881124109"/>
- <reference ref="882246004"/>
- </object>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object" ref="422926197"/>
- <reference key="parent" ref="832454237"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="399289716"/>
- <reference key="parent" ref="766721923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">13</int>
- <reference key="object" ref="881124109"/>
- <reference key="parent" ref="832454237"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">15</int>
- <reference key="object" ref="882246004"/>
- <reference key="parent" ref="832454237"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-2.CustomClassName</string>
- <string>13.IBPluginDependency</string>
- <string>15.IBPluginDependency</string>
- <string>2.IBEditorWindowLastContentRect</string>
- <string>2.IBPluginDependency</string>
- <string>4.IBPluginDependency</string>
- <string>5.IBPluginDependency</string>
- <string>7.IBPluginDependency</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>SavedGamesViewController</string>
- <string>UIResponder</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>{{467, 276}, {768, 768}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">17</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">SavedGamesViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
- <string>clearAll:</string>
- <string>toggleEdit:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
- <string>clearAll:</string>
- <string>toggleEdit:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">buttonPressed:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">clearAll:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">toggleEdit:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">tableView</string>
- <string key="NS.object.0">UITableView</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">tableView</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">tableView</string>
- <string key="candidateClassName">UITableView</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/SavedGamesViewController.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIBarButtonItem</string>
- <string key="superclassName">UIBarItem</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIBarItem</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIResponder</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="786211723"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIScrollView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchBar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UISearchDisplayController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UITableView</string>
- <string key="superclassName">UIScrollView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIToolbar</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIToolbar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIViewController</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1056" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3100" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">132</string>
- </data>
-</archive>
Binary file project_files/HedgewarsMobile/Resources/Settings/Images/hedgehog.png has changed
Binary file project_files/HedgewarsMobile/Resources/Settings/Images/hedgehog@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Settings/Images/robotBadge.png has changed
Binary file project_files/HedgewarsMobile/Resources/Settings/Images/robotBadge@2x.png has changed
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>basic</key>
- <array>
- <integer>100</integer>
- <integer>100</integer>
- <integer>30</integer>
- <integer>15</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
- <integer>0</integer>
- <integer>35</integer>
- <integer>25</integer>
- <integer>0</integer>
- <integer>0</integer>
- <integer>0</integer>
- <integer>40</integer>
- </array>
- <key>gamemod</key>
- <array>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- </array>
-</dict>
-</plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>basic</key>
- <array>
- <integer>100</integer>
- <integer>100</integer>
- <integer>45</integer>
- <integer>15</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
- <integer>5</integer>
- <integer>35</integer>
- <integer>25</integer>
- <integer>3</integer>
- <integer>4</integer>
- <integer>0</integer>
- <integer>2</integer>
- </array>
- <key>gamemod</key>
- <array>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- </array>
-</dict>
-</plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>basic</key>
- <array>
- <integer>100</integer>
- <integer>100</integer>
- <integer>45</integer>
- <integer>15</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
- <integer>5</integer>
- <integer>35</integer>
- <integer>25</integer>
- <integer>3</integer>
- <integer>4</integer>
- <integer>0</integer>
- <integer>2</integer>
- </array>
- <key>gamemod</key>
- <array>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- </array>
-</dict>
-</plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>basic</key>
- <array>
- <integer>100</integer>
- <integer>100</integer>
- <integer>45</integer>
- <integer>15</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
- <integer>5</integer>
- <integer>35</integer>
- <integer>25</integer>
- <integer>3</integer>
- <integer>0</integer>
- <integer>0</integer>
- <integer>0</integer>
- </array>
- <key>gamemod</key>
- <array>
- <false/>
- <false/>
- <true/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- </array>
-</dict>
-</plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>basic</key>
- <array>
- <integer>100</integer>
- <integer>100</integer>
- <integer>45</integer>
- <integer>15</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
- <integer>5</integer>
- <integer>35</integer>
- <integer>25</integer>
- <integer>3</integer>
- <integer>4</integer>
- <integer>0</integer>
- <integer>2</integer>
- </array>
- <key>gamemod</key>
- <array>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- </array>
-</dict>
-</plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>basic</key>
- <array>
- <integer>50</integer>
- <integer>150</integer>
- <integer>30</integer>
- <integer>15</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
- <integer>0</integer>
- <integer>35</integer>
- <integer>25</integer>
- <integer>0</integer>
- <integer>80</integer>
- <integer>0</integer>
- <integer>0</integer>
- </array>
- <key>gamemod</key>
- <array>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <true/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- </array>
-</dict>
-</plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>basic</key>
- <array>
- <integer>100</integer>
- <integer>100</integer>
- <integer>15</integer>
- <integer>15</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
- <integer>0</integer>
- <integer>35</integer>
- <integer>25</integer>
- <integer>3</integer>
- <integer>0</integer>
- <integer>0</integer>
- <integer>2</integer>
- </array>
- <key>gamemod</key>
- <array>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- </array>
-</dict>
-</plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>basic</key>
- <array>
- <integer>100</integer>
- <integer>100</integer>
- <integer>300</integer>
- <integer>50</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
- <integer>1</integer>
- <integer>0</integer>
- <integer>35</integer>
- <integer>3</integer>
- <integer>0</integer>
- <integer>0</integer>
- <integer>0</integer>
- </array>
- <key>gamemod</key>
- <array>
- <false/>
- <true/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <true/>
- <true/>
- <false/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- </array>
-</dict>
-</plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>basic</key>
- <array>
- <integer>100</integer>
- <integer>100</integer>
- <integer>45</integer>
- <integer>15</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
- <integer>2</integer>
- <integer>25</integer>
- <integer>25</integer>
- <integer>4</integer>
- <integer>5</integer>
- <integer>0</integer>
- <integer>5</integer>
- </array>
- <key>gamemod</key>
- <array>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <false/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- </array>
-</dict>
-</plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>basic</key>
- <array>
- <integer>100</integer>
- <integer>100</integer>
- <integer>100</integer>
- <integer>100</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
- <integer>5</integer>
- <integer>35</integer>
- <integer>30</integer>
- <integer>5</integer>
- <integer>3</integer>
- <integer>10</integer>
- <integer>2</integer>
- </array>
- <key>gamemod</key>
- <array>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <false/>
- </array>
-</dict>
-</plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>basic</key>
- <array>
- <integer>100</integer>
- <integer>100</integer>
- <integer>30</integer>
- <integer>15</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
- <integer>5</integer>
- <integer>35</integer>
- <integer>3</integer>
- <integer>25</integer>
- <integer>10</integer>
- <integer>10</integer>
- <integer>10</integer>
- </array>
- <key>gamemod</key>
- <array>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <true/>
- <false/>
- <false/>
- <true/>
- <true/>
- <true/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- <false/>
- </array>
-</dict>
-</plist>
--- a/project_files/HedgewarsMobile/Resources/Settings/Teams/Robots.plist Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/Teams/Robots.plist Sat Oct 08 16:54:56 2011 +0200
@@ -14,7 +14,7 @@
<array>
<dict>
<key>hat</key>
- <string>cyborg</string>
+ <string>cyborg1</string>
<key>hogname</key>
<string>HAL</string>
<key>level</key>
@@ -22,7 +22,7 @@
</dict>
<dict>
<key>hat</key>
- <string>cyborg</string>
+ <string>cyborg2</string>
<key>hogname</key>
<string>R2-D2</string>
<key>level</key>
@@ -30,7 +30,7 @@
</dict>
<dict>
<key>hat</key>
- <string>cyborg</string>
+ <string>cyborg1</string>
<key>hogname</key>
<string>Wall-E</string>
<key>level</key>
@@ -38,7 +38,7 @@
</dict>
<dict>
<key>hat</key>
- <string>cyborg</string>
+ <string>cyborg2</string>
<key>hogname</key>
<string>Robocob</string>
<key>level</key>
@@ -46,7 +46,7 @@
</dict>
<dict>
<key>hat</key>
- <string>cyborg</string>
+ <string>cyborg1</string>
<key>hogname</key>
<string>Optimus Prime</string>
<key>level</key>
@@ -54,7 +54,15 @@
</dict>
<dict>
<key>hat</key>
- <string>cyborg</string>
+ <string>cyborg2</string>
+ <key>hogname</key>
+ <string>Terminator</string>
+ <key>level</key>
+ <integer>4</integer>
+ </dict>
+ <dict>
+ <key>hat</key>
+ <string>cyborg1</string>
<key>hogname</key>
<string>C-3PO</string>
<key>level</key>
@@ -62,15 +70,7 @@
</dict>
<dict>
<key>hat</key>
- <string>cyborg</string>
- <key>hogname</key>
- <string>Terminator</string>
- <key>level</key>
- <integer>4</integer>
- </dict>
- <dict>
- <key>hat</key>
- <string>cyborg</string>
+ <string>cyborg2</string>
<key>hogname</key>
<string>KITT</string>
<key>level</key>
--- a/project_files/HedgewarsMobile/Resources/Settings/credits.plist Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/credits.plist Sat Oct 08 16:54:56 2011 +0200
@@ -16,6 +16,9 @@
<string>Richard "Sheepluva" Korlyi</string>
<string>Henning "Prg" Kühn</string>
<string>Henrik "Henek" Rostedt</string>
+ <string>John "Mikade" Lambert</string>
+ <string>Mayur "Zorg" Pawashe</string>
+ <string>Richard "Xeli" Deurwaarder</string>
</array>
<array>
<string>John "Fizzy" Dum</string>
@@ -40,16 +43,19 @@
<string>Andrey Korotaev</string>
<string>Nina Kuisma</string>
<string>Antoine Turmel</string>
- <string>Peter Hüwe, Mario Liebisch</string>
- <string>Luca Bonora</string>
+ <string>Peter Hüwe, Mario Liebisch, Richard Karolyi</string>
+ <string>Talos Kriti</string>
+ <string>Luca Bonora, Marco Bresciani</string>
<string>Adam Etienne</string>
- <string>Maciej Mroziński, Wojciech Latkowski, Maciej Górny</string>
+ <string>Anthony Bellew</string>
+ <string>Lukas Urbonas</string>
+ <string>Maciej Mroziński, Wojciech Latkowski, Piotr Mitana, Maciej Górny</string>
<string>Fábio Canário</string>
<string>Andrey Korotaev</string>
<string>Jose Riha</string>
<string>Carlos Vives</string>
- <string>Niklas Grahn</string>
- <string>Eugene V. Lyubimkin</string>
+ <string>Niklas Grahn, Henrik Rostedt</string>
+ <string>Eugene V. Lyubimkin, Igor Paliychuk, Eugene Sakara</string>
</array>
<array>
<string>Aleksey Andreev</string>
@@ -58,19 +64,22 @@
<string>Adam Higerd</string>
</array>
<array>
- <string>Engine, frontend, net server author</string>
- <string>Desktop frontend improvements</string>
- <string>Many engine and frontend improvements</string>
+ <string>Engine, frontend, net server</string>
+ <string>Many desktop frontend improvements</string>
+ <string>Many engine and desktop frontend improvements</string>
<string>Drillrocket, Ballgun, RC Plane weapons</string>
<string>Mine number and time game settings</string>
<string>Desktop frontend improvements</string>
<string>Desktop frontend improvements</string>
<string>Mac OS X and iPhone version</string>
- <string>Gamepad support</string>
+ <string>Many engine and desktop frontend improvements</string>
+ <string>Gamepad and Lua integration</string>
<string>Many engine improvements and graphics</string>
- <string>Many engine and server improvements</string>
<string>Maze maps</string>
- <string>Engine and frontend improvements</string>
+ <string>Engine and desktop frontend improvements</string>
+ <string>Lua game modes and missions</string>
+ <string>Desktop frontend improvements</string>
+ <string>Android port</string>
</array>
<array>
<string>Main graphics</string>
@@ -96,8 +105,11 @@
<string>Finnish</string>
<string>French</string>
<string>German</string>
+ <string>Greek</string>
<string>Italian</string>
<string>Japanese</string>
+ <string>Korean</string>
+ <string>Lithuanian</string>
<string>Polish</string>
<string>Portuguese</string>
<string>Russian</string>
--- a/project_files/HedgewarsMobile/Resources/Settings/gameMods.plist Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/gameMods.plist Sat Oct 08 16:54:56 2011 +0200
@@ -194,5 +194,13 @@
<key>title</key>
<string>Tag Team</string>
</dict>
+ <dict>
+ <key>description</key>
+ <string>Add an indestructible border along the bottom</string>
+ <key>image</key>
+ <string>BottomBorder</string>
+ <key>title</key>
+ <string>Bottom Border</string>
+ </dict>
</array>
</plist>
Binary file project_files/HedgewarsMobile/Resources/denied@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/surprise@2x.png has changed
--- a/project_files/hedgewars.pro Sat Oct 08 16:45:52 2011 +0200
+++ b/project_files/hedgewars.pro Sat Oct 08 16:54:56 2011 +0200
@@ -2,6 +2,13 @@
TARGET = hedgewars
DEPENDPATH += ../QTfrontend/
INCLUDEPATH += ../QTfrontend/
+INCLUDEPATH += ../QTfrontend/model
+INCLUDEPATH += ../QTfrontend/ui
+INCLUDEPATH += ../QTfrontend/ui/widget
+INCLUDEPATH += ../QTfrontend/ui/page
+INCLUDEPATH += ../QTfrontend/ui/dialog
+INCLUDEPATH += ../QTfrontend/net
+INCLUDEPATH += ../QTfrontend/util
INCLUDEPATH += /usr/local/include/SDL
INCLUDEPATH += /usr/include/SDL
INCLUDEPATH += ../misc/quazip/
@@ -15,110 +22,148 @@
QT += network
QT += webkit
-HEADERS += ../QTfrontend/KB.h ../QTfrontend/SDLs.h \
- ../QTfrontend/SquareLabel.h ../QTfrontend/about.h \
- ../QTfrontend/ammoSchemeModel.h ../QTfrontend/bgwidget.h \
- ../QTfrontend/binds.h ../QTfrontend/chatwidget.h \
- ../QTfrontend/fpsedit.h ../QTfrontend/frameTeam.h \
- ../QTfrontend/game.h ../QTfrontend/gamecfgwidget.h \
- ../QTfrontend/gameuiconfig.h ../QTfrontend/hats.h \
- ../QTfrontend/hedgehogerWidget.h ../QTfrontend/hwconsts.h \
- ../QTfrontend/hwform.h ../QTfrontend/hwmap.h \
- ../QTfrontend/igbox.h ../QTfrontend/input_ip.h \
- ../QTfrontend/itemNum.h ../QTfrontend/mapContainer.h \
- ../QTfrontend/misc.h ../QTfrontend/namegen.h \
- ../QTfrontend/netregister.h ../QTfrontend/netserver.h \
- ../QTfrontend/netserverslist.h ../QTfrontend/netudpserver.h \
- ../QTfrontend/netudpwidget.h ../QTfrontend/newnetclient.h \
- ../QTfrontend/proto.h \
- ../QTfrontend/sdlkeys.h ../QTfrontend/selectWeapon.h \
- ../QTfrontend/tcpBase.h \
- ../QTfrontend/team.h ../QTfrontend/teamselect.h \
- ../QTfrontend/teamselhelper.h ../QTfrontend/togglebutton.h \
- ../QTfrontend/ui_hwform.h ../QTfrontend/vertScrollArea.h \
- ../QTfrontend/weaponItem.h ../QTfrontend/xfire.h \
- ../QTfrontend/achievements.h \
- ../QTfrontend/drawmapwidget.h \
- ../QTfrontend/drawmapscene.h \
- ../QTfrontend/qaspectratiolayout.h \
- ../QTfrontend/pagetraining.h \
- ../QTfrontend/pagesingleplayer.h \
- ../QTfrontend/pageselectweapon.h \
- ../QTfrontend/pagescheme.h \
- ../QTfrontend/pageroomslist.h \
- ../QTfrontend/pageoptions.h \
- ../QTfrontend/pagenettype.h \
- ../QTfrontend/pagenetserver.h \
- ../QTfrontend/pagenetgame.h \
- ../QTfrontend/pagenet.h \
- ../QTfrontend/pagemultiplayer.h \
- ../QTfrontend/pagemain.h \
- ../QTfrontend/pageingame.h \
- ../QTfrontend/pageinfo.h \
- ../QTfrontend/pagedata.h \
- ../QTfrontend/pageeditteam.h \
- ../QTfrontend/pagedrawmap.h \
- ../QTfrontend/pageconnecting.h \
- ../QTfrontend/pagecampaign.h \
- ../QTfrontend/pageadmin.h \
- ../QTfrontend/pageplayrecord.h \
- ../QTfrontend/pagegamestats.h \
- ../QTfrontend/HWApplication.h \
+HEADERS += ../QTfrontend/model/themesmodel.h \
+ ../QTfrontend/model/ammoSchemeModel.h \
+ ../QTfrontend/model/netserverslist.h \
+ ../QTfrontend/model/hats.h \
+ ../QTfrontend/ui/page/pagedrawmap.h \
+ ../QTfrontend/ui/page/pagedata.h \
+ ../QTfrontend/ui/page/pagetraining.h \
+ ../QTfrontend/ui/page/pageselectweapon.h \
+ ../QTfrontend/ui/page/pagesingleplayer.h \
+ ../QTfrontend/ui/page/pagenettype.h \
+ ../QTfrontend/ui/page/pageingame.h \
+ ../QTfrontend/ui/page/pageadmin.h \
+ ../QTfrontend/ui/page/pagescheme.h \
+ ../QTfrontend/ui/page/pagemultiplayer.h \
+ ../QTfrontend/ui/page/pageplayrecord.h \
+ ../QTfrontend/ui/page/pagemain.h \
+ ../QTfrontend/ui/page/pageoptions.h \
+ ../QTfrontend/ui/page/pagenetgame.h \
+ ../QTfrontend/ui/page/pageeditteam.h \
+ ../QTfrontend/ui/page/pageconnecting.h \
+ ../QTfrontend/ui/page/pageroomslist.h \
+ ../QTfrontend/ui/page/pagenet.h \
+ ../QTfrontend/ui/page/pagecampaign.h \
+ ../QTfrontend/ui/page/pageinfo.h \
+ ../QTfrontend/ui/page/pagenetserver.h \
+ ../QTfrontend/ui/page/pagegamestats.h \
+ ../QTfrontend/ui/dialog/input_ip.h \
+ ../QTfrontend/ui/qaspectratiolayout.h \
+ ../QTfrontend/ui/widget/bgwidget.h \
+ ../QTfrontend/ui/widget/fpsedit.h \
+ ../QTfrontend/ui/widget/FreqSpinBox.h \
+ ../QTfrontend/ui/widget/igbox.h \
+ ../QTfrontend/ui/widget/chatwidget.h \
+ ../QTfrontend/ui/widget/togglebutton.h \
+ ../QTfrontend/ui/widget/SquareLabel.h \
+ ../QTfrontend/ui/widget/itemNum.h \
+ ../QTfrontend/ui/widget/frameTeam.h \
+ ../QTfrontend/ui/widget/teamselect.h \
+ ../QTfrontend/ui/widget/vertScrollArea.h \
+ ../QTfrontend/ui/widget/about.h \
+ ../QTfrontend/ui/widget/teamselhelper.h \
+ ../QTfrontend/ui/widget/drawmapwidget.h \
+ ../QTfrontend/ui/widget/databrowser.h \
+ ../QTfrontend/ui/widget/hedgehogerWidget.h \
+ ../QTfrontend/ui/widget/selectWeapon.h \
+ ../QTfrontend/ui/widget/weaponItem.h \
+ ../QTfrontend/ui/widget/gamecfgwidget.h \
+ ../QTfrontend/net/netregister.h \
+ ../QTfrontend/net/netserver.h \
+ ../QTfrontend/net/netudpwidget.h \
+ ../QTfrontend/net/tcpBase.h \
+ ../QTfrontend/net/proto.h \
+ ../QTfrontend/net/newnetclient.h \
+ ../QTfrontend/net/netudpserver.h \
+ ../QTfrontend/net/hwmap.h \
+ ../QTfrontend/util/namegen.h \
../QTfrontend/AbstractPage.h \
- ../QTfrontend/themesmodel.h \
- ../QTfrontend/databrowser.h
+ ../QTfrontend/drawmapscene.h \
+ ../QTfrontend/game.h \
+ ../QTfrontend/gameuiconfig.h \
+ ../QTfrontend/HWApplication.h \
+ ../QTfrontend/hwform.h \
+ ../QTfrontend/mapContainer.h \
+ ../QTfrontend/SDLs.h \
+ ../QTfrontend/team.h \
+ ../QTfrontend/achievements.h \
+ ../QTfrontend/binds.h \
+ ../QTfrontend/ui_hwform.h \
+ ../QTfrontend/KB.h \
+ ../QTfrontend/hwconsts.h \
+ ../QTfrontend/sdlkeys.h
-SOURCES += ../QTfrontend/SDLs.cpp ../QTfrontend/SquareLabel.cpp \
- ../QTfrontend/about.cpp ../QTfrontend/ammoSchemeModel.cpp \
- ../QTfrontend/bgwidget.cpp ../QTfrontend/binds.cpp \
- ../QTfrontend/chatwidget.cpp ../QTfrontend/fpsedit.cpp \
- ../QTfrontend/frameTeam.cpp ../QTfrontend/game.cpp \
- ../QTfrontend/gamecfgwidget.cpp ../QTfrontend/gameuiconfig.cpp \
- ../QTfrontend/hats.cpp ../QTfrontend/hedgehogerWidget.cpp \
- ../QTfrontend/hwform.cpp ../QTfrontend/hwmap.cpp \
- ../QTfrontend/igbox.cpp ../QTfrontend/input_ip.cpp \
- ../QTfrontend/itemNum.cpp ../QTfrontend/main.cpp \
- ../QTfrontend/mapContainer.cpp ../QTfrontend/misc.cpp \
- ../QTfrontend/namegen.cpp ../QTfrontend/netregister.cpp \
- ../QTfrontend/netserver.cpp ../QTfrontend/netserverslist.cpp \
- ../QTfrontend/netudpserver.cpp ../QTfrontend/netudpwidget.cpp \
- ../QTfrontend/newnetclient.cpp \
- ../QTfrontend/proto.cpp \
- ../QTfrontend/selectWeapon.cpp \
- ../QTfrontend/tcpBase.cpp ../QTfrontend/team.cpp \
- ../QTfrontend/teamselect.cpp ../QTfrontend/teamselhelper.cpp \
- ../QTfrontend/togglebutton.cpp ../QTfrontend/ui_hwform.cpp \
- ../QTfrontend/vertScrollArea.cpp ../QTfrontend/weaponItem.cpp \
- ../QTfrontend/achievements.cpp \
- ../QTfrontend/hwconsts.cpp \
- ../QTfrontend/drawmapwidget.cpp \
+SOURCES += ../QTfrontend/model/ammoSchemeModel.cpp \
+ ../QTfrontend/model/themesmodel.cpp \
+ ../QTfrontend/model/hats.cpp \
+ ../QTfrontend/model/netserverslist.cpp \
+ ../QTfrontend/ui/qaspectratiolayout.cpp \
+ ../QTfrontend/ui/page/pagemain.cpp \
+ ../QTfrontend/ui/page/pagetraining.cpp \
+ ../QTfrontend/ui/page/pageroomslist.cpp \
+ ../QTfrontend/ui/page/pagemultiplayer.cpp \
+ ../QTfrontend/ui/page/pagegamestats.cpp \
+ ../QTfrontend/ui/page/pagenettype.cpp \
+ ../QTfrontend/ui/page/pageeditteam.cpp \
+ ../QTfrontend/ui/page/pagenetgame.cpp \
+ ../QTfrontend/ui/page/pagedata.cpp \
+ ../QTfrontend/ui/page/pagedrawmap.cpp \
+ ../QTfrontend/ui/page/pageplayrecord.cpp \
+ ../QTfrontend/ui/page/pageselectweapon.cpp \
+ ../QTfrontend/ui/page/pageingame.cpp \
+ ../QTfrontend/ui/page/pagenetserver.cpp \
+ ../QTfrontend/ui/page/pagecampaign.cpp \
+ ../QTfrontend/ui/page/pageadmin.cpp \
+ ../QTfrontend/ui/page/pageinfo.cpp \
+ ../QTfrontend/ui/page/pageconnecting.cpp \
+ ../QTfrontend/ui/page/pagesingleplayer.cpp \
+ ../QTfrontend/ui/page/pagenet.cpp \
+ ../QTfrontend/ui/page/pagescheme.cpp \
+ ../QTfrontend/ui/page/pageoptions.cpp \
+ ../QTfrontend/ui/dialog/input_ip.cpp \
+ ../QTfrontend/ui/widget/igbox.cpp \
+ ../QTfrontend/ui/widget/selectWeapon.cpp \
+ ../QTfrontend/ui/widget/FreqSpinBox.cpp \
+ ../QTfrontend/ui/widget/SquareLabel.cpp \
+ ../QTfrontend/ui/widget/frameTeam.cpp \
+ ../QTfrontend/ui/widget/fpsedit.cpp \
+ ../QTfrontend/ui/widget/databrowser.cpp \
+ ../QTfrontend/ui/widget/teamselect.cpp \
+ ../QTfrontend/ui/widget/gamecfgwidget.cpp \
+ ../QTfrontend/ui/widget/chatwidget.cpp \
+ ../QTfrontend/ui/widget/itemNum.cpp \
+ ../QTfrontend/ui/widget/bgwidget.cpp \
+ ../QTfrontend/ui/widget/about.cpp \
+ ../QTfrontend/ui/widget/togglebutton.cpp \
+ ../QTfrontend/ui/widget/vertScrollArea.cpp \
+ ../QTfrontend/ui/widget/hedgehogerWidget.cpp \
+ ../QTfrontend/ui/widget/teamselhelper.cpp \
+ ../QTfrontend/ui/widget/drawmapwidget.cpp \
+ ../QTfrontend/ui/widget/weaponItem.cpp \
+ ../QTfrontend/net/tcpBase.cpp \
+ ../QTfrontend/net/netregister.cpp \
+ ../QTfrontend/net/proto.cpp \
+ ../QTfrontend/net/hwmap.cpp \
+ ../QTfrontend/net/netudpserver.cpp \
+ ../QTfrontend/net/newnetclient.cpp \
+ ../QTfrontend/net/netudpwidget.cpp \
+ ../QTfrontend/net/netserver.cpp \
+ ../QTfrontend/util/namegen.cpp \
+ ../QTfrontend/AbstractPage.cpp \
+ ../QTfrontend/achievements.cpp \
+ ../QTfrontend/binds.cpp \
../QTfrontend/drawmapscene.cpp \
- ../QTfrontend/qaspectratiolayout.cpp \
- ../QTfrontend/pagetraining.cpp \
- ../QTfrontend/pagesingleplayer.cpp \
- ../QTfrontend/pageselectweapon.cpp \
- ../QTfrontend/pagescheme.cpp \
- ../QTfrontend/pageroomslist.cpp \
- ../QTfrontend/pageoptions.cpp \
- ../QTfrontend/pagenettype.cpp \
- ../QTfrontend/pagenetserver.cpp \
- ../QTfrontend/pagenetgame.cpp \
- ../QTfrontend/pagenet.cpp \
- ../QTfrontend/pagemultiplayer.cpp \
- ../QTfrontend/pagemain.cpp \
- ../QTfrontend/pageingame.cpp \
- ../QTfrontend/pageinfo.cpp \
- ../QTfrontend/pagedata.cpp \
- ../QTfrontend/pageeditteam.cpp \
- ../QTfrontend/pagedrawmap.cpp \
- ../QTfrontend/pageconnecting.cpp \
- ../QTfrontend/pagecampaign.cpp \
- ../QTfrontend/pageadmin.cpp \
- ../QTfrontend/pagegamestats.cpp \
- ../QTfrontend/pageplayrecord.cpp \
+ ../QTfrontend/game.cpp \
+ ../QTfrontend/gameuiconfig.cpp \
../QTfrontend/HWApplication.cpp \
- ../QTfrontend/themesmodel.cpp \
- ../QTfrontend/databrowser.cpp
+ ../QTfrontend/hwform.cpp \
+ ../QTfrontend/main.cpp \
+ ../QTfrontend/mapContainer.cpp \
+ ../QTfrontend/SDLs.cpp \
+ ../QTfrontend/team.cpp \
+ ../QTfrontend/ui_hwform.cpp \
+ ../QTfrontend/hwconsts.cpp
win32 {
SOURCES += ../QTfrontend/xfire.cpp
--- a/share/hedgewars/Data/Forts/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Forts/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -1,4 +1,6 @@
file(GLOB FortSprites *L.png *R.png)
+list(REMOVE_ITEM FortSprites *@2x.png)
+list(REMOVE_ITEM FortSprites *-icon.png)
install(FILES
${FortSprites}
Binary file share/hedgewars/Data/Forts/Cake-icon.png has changed
Binary file share/hedgewars/Data/Forts/Cake-icon@2x.png has changed
Binary file share/hedgewars/Data/Forts/Castle-icon.png has changed
Binary file share/hedgewars/Data/Forts/Castle-icon@2x.png has changed
Binary file share/hedgewars/Data/Forts/Earth-icon.png has changed
Binary file share/hedgewars/Data/Forts/Earth-icon@2x.png has changed
Binary file share/hedgewars/Data/Forts/EvilChicken-icon.png has changed
Binary file share/hedgewars/Data/Forts/EvilChicken-icon@2x.png has changed
Binary file share/hedgewars/Data/Forts/Flowerhog-icon.png has changed
Binary file share/hedgewars/Data/Forts/Flowerhog-icon@2x.png has changed
Binary file share/hedgewars/Data/Forts/Hydrant-icon.png has changed
Binary file share/hedgewars/Data/Forts/Hydrant-icon@2x.png has changed
Binary file share/hedgewars/Data/Forts/Lego-icon.png has changed
Binary file share/hedgewars/Data/Forts/Lego-icon@2x.png has changed
Binary file share/hedgewars/Data/Forts/Plane-icon.png has changed
Binary file share/hedgewars/Data/Forts/Plane-icon@2x.png has changed
Binary file share/hedgewars/Data/Forts/Statue-icon.png has changed
Binary file share/hedgewars/Data/Forts/Statue-icon@2x.png has changed
Binary file share/hedgewars/Data/Forts/Tank-icon.png has changed
Binary file share/hedgewars/Data/Forts/Tank-icon@2x.png has changed
Binary file share/hedgewars/Data/Forts/UFO-icon.png has changed
Binary file share/hedgewars/Data/Forts/UFO-icon@2x.png has changed
Binary file share/hedgewars/Data/Forts/Wood-icon.png has changed
Binary file share/hedgewars/Data/Forts/Wood-icon@2x.png has changed
Binary file share/hedgewars/Data/Graphics/AmmoMenu/Ammos@2x.png has changed
Binary file share/hedgewars/Data/Graphics/AmmoMenu/Ammos_bw@2x.png has changed
--- a/share/hedgewars/Data/Graphics/AmmoMenu/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Graphics/AmmoMenu/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,5 @@
file(GLOB AmmoMenuSprites *.png)
-list(REMOVE_ITEM AmmoMenuSprites *_iPhone.png)
+list(REMOVE_ITEM AmmoMenuSprites *@2x.png)
install(FILES
${AmmoMenuSprites}
--- a/share/hedgewars/Data/Graphics/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Graphics/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -4,8 +4,10 @@
add_subdirectory(Hats)
add_subdirectory(Hedgehog)
add_subdirectory(SuddenDeath)
+add_subdirectory(Missions)
file(GLOB BaseSprites *.png)
+list(REMOVE_ITEM BaseSprites *@2x.png)
install(FILES
${BaseSprites}
Binary file share/hedgewars/Data/Graphics/Egg@2x.png has changed
Binary file share/hedgewars/Data/Graphics/Graves/Ghost.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/Reserved/a1ed4756b565d13aaecb1f2b1a556570alwayss.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/Reserved/e587f6146ebfbdefdc028c591643f220alwayss.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/TeamHeadband.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/TeamSoldier.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/cyclops.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/knight.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/sf_Guilie.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/sf_Honda.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/sf_Ryu.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/sf_guile.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/sf_honda.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/sf_ryu.png has changed
Binary file share/hedgewars/Data/Graphics/Hats/zoo_Hedgehog.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amKamikaze.png has changed
Binary file share/hedgewars/Data/Graphics/HellishBomb@2x.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Graphics/Missions/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+add_subdirectory(Training)
Binary file share/hedgewars/Data/Graphics/Missions/Training/Basic_Training_-_Bazooka.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/Basic_Training_-_Bazooka@2x.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/Basic_Training_-_Shotgun.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/Basic_Training_-_Shotgun@2x.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/Basic_Training_-_Sniper_Rifle.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/Basic_Training_-_Sniper_Rifle@2x.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Graphics/Missions/Training/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,5 @@
+file(GLOB MissionPics *@2x.png)
+
+install(FILES
+ ${MissionPics}
+ DESTINATION ${SHAREPATH}Data/Graphics/Missions/Training)
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_Bamboo_Thicket.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_Bamboo_Thicket@2x.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_Dangerous_Ducklings.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_Dangerous_Ducklings@2x.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_Diver.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_Diver@2x.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_Newton_and_the_Hammock.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_Newton_and_the_Hammock@2x.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_Spooky_Tree.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_Spooky_Tree@2x.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_Teamwork.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_Teamwork@2x.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_That_Sinking_Feeling.png has changed
Binary file share/hedgewars/Data/Graphics/Missions/Training/User_Mission_-_That_Sinking_Feeling@2x.png has changed
Binary file share/hedgewars/Data/Graphics/Molotov.png has changed
Binary file share/hedgewars/Data/Graphics/Seduction@2x.png has changed
Binary file share/hedgewars/Data/Graphics/TargetBee@2x.png has changed
Binary file share/hedgewars/Data/Graphics/Targetp@2x.png has changed
Binary file share/hedgewars/Data/Graphics/cheese@2x.png has changed
--- a/share/hedgewars/Data/Locale/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -2,6 +2,7 @@
file(GLOB txttrans5 ?????.txt)
file(GLOB tsfiles *.ts)
file(GLOB luafiles *.lua)
+file(GLOB missionfiles missions_*.txt)
QT4_ADD_TRANSLATION(QM ${tsfiles})
@@ -15,6 +16,7 @@
${txttrans5}
${QM}
${luafiles}
+ ${missionfiles}
DESTINATION ${SHAREPATH}Data/Locale
)
--- a/share/hedgewars/Data/Locale/cs.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/cs.lua Sat Oct 08 16:54:56 2011 +0200
@@ -3,12 +3,19 @@
["!!!"] = "!!!",
["..."] = "...",
["Accuracy Bonus!"] = "Bonus za přesnost!",
+-- ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
["a Hedgewars mini-game"] = "Hedgewars mini-hra", -- Space_Invasion, The_Specialists
["Aiming Practice"] = "Trénink přesnosti", --Bazooka, Shotgun, SniperRifle
+ ["Ammo Depleted!"] = "Munice vyÄerpána!",
+-- ["ammo extended!"] = "",
+-- ["Ammo is reset at the end of your turn."] = "",
+ ["Ammo Maniac!"] = "MuniÄnà maniak!",
["Ammo"] = "Munice",
- ["Ammo Depleted!"] = "Munice vyÄerpána!",
- ["Ammo Maniac!"] = "MuniÄnà maniak!",
["Available points remaining: "] = "Zbývá bodů:",
+-- ["[Backspace]"] = "",
+-- ["Bamboo Thicket"] = "",
+-- ["Barrel Eater!"] = "",
+-- ["Barrel Launcher"] = "",
["Bat balls at your enemies and|push them into the sea!"] = "Odpal mÃÄky na své nepřátele|a odstrÄ je do vody!",
["Bat your opponents through the|baskets and out of the map!"] = "Odpal protivnÃky skrz|koÅ¡e a pryÄ z mapy!",
["Bazooka Training"] = "Trénink s bazukou",
@@ -19,8 +26,10 @@
["BOOM!"] = "BUM!",
["Boss defeated!"] = "Velitel poražen!",
["Boss Slayer!"] = "Velitel zabit!",
+-- ["Build a track and race."] = "",
["CAPTURE THE FLAG"] = "ZAJMI VLAJKU",
["Careless"] = "Neopatrný",
+-- ["Change Weapon"] = "",
["Clumsy"] = "Nešikovný",
["Codename: Teamwork"] = "Krycà jméno: Týmová práce",
["Complete the track as fast as you can!"] = "DokonÄi trasu tak rychle, jak můžeÅ¡!",
@@ -28,12 +37,14 @@
["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Gratuluji! Eliminoval jsi vÅ¡echny cÃle|bÄ›hem stanoveného limitu", --Bazooka, Shotgun, SniperRifle
["Control pillars to score points."] = "ObsaÄ vÅ¡echny sloupy, abys dostal body.",
["Cybernetic Empire"] = "Kybernetická Å™ÃÅ¡e",
+ ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "ZATRACENÄš, ZELENÃÄŒI! VYPADNI Z MOJI HLAVY!",
["DAMMIT, ROOKIE!"] = "ZATRACENÄš, ZELENÃÄŒI!",
- ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "ZATRACENÄš, ZELENÃÄŒI! VYPADNI Z MOJI HLAVY!",
["Dangerous Ducklings"] = "NebezpeÄná káÄátka",
["Deadweight"] = "Mrtvá váha",
+-- ["Demolition is fun!"] = "",
["Depleted Kamikaze!"] = "VyÄerpaný sebevrah!",
["Destroy invaders to score points."] = "ZniÄ nájezdnÃky k zÃskánà bodů.",
+-- ["Double Kill!"] = "",
["Drone Hunter!"] = "Lovec trubců!",
["Drowner"] = "Utopenec",
["Each turn you get 1-3 random weapons"] = "Každý tah dostaneš 1-3 náhodné zbraně",
@@ -42,8 +53,11 @@
["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "ZniÄ vÅ¡echny cÃle, než ti vyprÅ¡Ã Äas.|Na tuto misi máš neomezenÄ› munice.", --Bazooka, Shotgun, SniperRifle
["Eliminate Poison before the time runs out"] = "Odstraň Otravu, než vyprÅ¡Ã Äas.",
["Eliminate the Blue Team"] = "ZniÄ modrý tým",
+-- ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+-- ["Eliminate the enemy hogs to win."] = "",
["Eliminate the enemy specialists."] = "Zabij nepřátelské specialisty",
["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- ZniÄ Jednotku 3378 |- Slabý odpor musà pÅ™ežÃt",
+-- ["Energetic Engineer"] = "",
["Enjoy the swim..."] = "Užij si plavánÃ...",
["[Enter]"] = "[Enter]",
["Fastest lap: "] = "Nejrychlejšà kolo: ",
@@ -53,6 +67,9 @@
["Flag respawned!"] = "Vlajka obnovena!",
["Flag returned!"] = "Vlajka navrácena!",
["Flags, and their home base will be placed where each team ends their first turn."] = "Vlajky a domovské základny budou umÃstÄ›ny tam, kde každý tým skonÄà svůj prvnà tah.",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+-- ["fuel extended!"] = "",
["GAME BEGUN!!!"] = "HRA ZAÄŒALA!!!",
["Game Modifiers: "] = "Hernà modifikátory: ",
["GAME OVER!"] = "KONEC HRY!",
@@ -62,11 +79,15 @@
["GO! GO! GO!"] = "Běž! Běž! Běž!",
["Good birdy......"] = "Hodný ptáÄek......",
["Good luck out there!"] = "Hodně štěstà tam venku!",
+-- ["Good so far!"] = "",
+-- ["Good to go!"] = "",
["GOTCHA!"] = "Mám tě!",
+-- ["Grab Mines/Explosives"] = "",
["Hahahaha!"] = "Hahahaha!",
["Haha, now THAT would be something!"] = "Haha, tak TOHLE bude něco!",
+ [" Hapless Hogs left!"] = "Nešťastný ježek odešel!",
["Hapless Hogs"] = "Nešťastný ježek",
- [" Hapless Hogs left!"] = "Nešťastný ježek odešel!",
+-- ["Health crates extend your time."] = "",
["Heavy"] = "Těžký",
["Hedgewars-Basketball"] = "Hedgewars-Basketbal",
["Hedgewars-Knockball"] = "Hedgewars=VybÃjená",
@@ -80,19 +101,28 @@
["It's a good thing SUDDEN DEATH is 99 turns away..."] = "To je dobÅ™e, že NÃHLà SMRT je 99 tahů vzdálená...",
["Jumping is disabled"] = "Skákánà je vypnuto",
["Kamikaze Expert!"] = "Expert na sebevraždy!",
+-- ["Keep it up!"] = "",
+-- ["Killing spree!"] = "",
["KILLS"] = "ÚLOVKY",
+-- ["Last Target!"] = "",
["[Left Shift]"] = "[Levý shift]",
["Listen up, maggot!!"] = "Poslouchej, bÃdný Äerve!!",
+-- ["Lively Lifeguard"] = "",
+-- ["Mine Deployer"] = "",
+-- ["Mine Eater!"] = "",
["|- Mines Time:"] = "|- ÄŒasovaÄ min:", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["MISSION FAILED"] = "MISE NEÚSPĚŠNÃ", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+ ["MISSION SUCCESSFUL"] = "MISE ÚSPĚŠNÃ", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["MISSION SUCCESS"] = "MISE ÚSPĚŠNÃ",
- ["MISSION SUCCESSFUL"] = "MISE ÚSPĚŠNÃ", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["Movement: [Up], [Down], [Left], [Right]"] = "Pohyb: [nahoru], [dolu], [vlevo], [vpravo]",
["Multi-shot!"] = "VÃcenásobná rána!",
["Nameless Heroes"] = "Bezejmennà hrdinové",
+-- ["New Barrels Per Turn"] = "",
["NEW CLAN RECORD: "] = "NOVÃ KLANOVÃ REKORD: ",
["NEW fastest lap: "] = "NOVÉ nejrychlejšà kolo: ",
+-- ["New Mines Per Turn"] = "",
["NEW RACE RECORD: "] = "NOVà TRAŤOVà REKORD: ",
+-- ["Newton's Hammock"] = "",
["NOT ENOUGH WAYPOINTS"] = "NEDOSTATEK NAVIGAÄŒNÃCH BODÅ®",
["Not So Friendly Match"] = "Ne moc přátelský zápas", -- Basketball, Knockball
["Oh no! Just try again!"] = "Ale ne! ProstÄ› to zkus znovu!", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -100,23 +130,28 @@
["Operation Diver"] = "Operace potápÄ›Ä",
["Opposing Team: "] = "ProtivnÃkův tým: ",
["Pathetic Hog #%d"] = "Žalostný ježek #%d",
+-- ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
["Per-Hog Ammo"] = "Individuálnà munice",
["Place more waypoints using [ENTER]"] = "UmÃsti vÃce navigaÄnÃch bodů pomocà klávesy [enter]",
+-- ["Place more waypoints using the 'Air Attack' weapon."] = "",
["points"] = "body", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
["Poison"] = "Otrava",
["Power Remaining"] = "ZbývajÃcà energie",
+-- ["Prepare yourself"] = "",
["Press [Precise] to skip intro"] = "Stiskni [pÅ™esnost] pro pÅ™eskoÄenÃ",
["Race complexity limit reached."] = "Dosažen limit složitosti závodu.",
+-- ["RACER"] = "",
[" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Dones nepřátelskou vlajku do své základny k zÃskánà bodů | - Prvnà tým se tÅ™emi ukoÅ™istÄ›nÃmi vÃtÄ›zà | - MůžeÅ¡ bodovat, pokud je tvá vlajka v základnÄ› | - Ježci pustà vlajku, pokud jsou zabiti, nebo utopeni | - UpuÅ¡tÄ›ná vlajka může být navrácena, nebo opÄ›t zajmuta | - Ježci jsou po smrti oživeni",
+-- ["Round Limit:"] = "",
["Round Limit"] = "Limit kol",
+-- ["Rounds Complete: "] = "",
["Rounds Complete"] = "DokonÄených kol",
["RULES OF THE GAME [Press ESC to view]"] = "PRAVIDLA HRY [Stiskni ESC pro prohlédnutÃ]",
- ["s|"] = "s|",
["Save as many hapless hogs as possible!"] = "Zachraň tolik nešťastných ježků, kolik jen můžeš!",
["SCORE"] = "SKÓRE",
["sec"] = "vt.", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
["See ya!"] = "UvidÃme se!",
- ["s"] = "s", -- GaudyRacer, Space_Invasion
+-- ["selected!"] = "",
["Shield boosted! +30 power"] = "Å tÃt posÃlen! +30 energie",
["Shield Depleted"] = "Å tÃt vyÄerpán",
["Shield is fully recharged!"] = "Å tÃt je plnÄ› dobit",
@@ -127,7 +162,7 @@
["Shield Seeker!"] = "HledaÄ Å¡tÃtů!",
["Shotgun Team"] = "Brokovnicový tým",
["Shotgun Training"] = "Trénink s brokovnicÃ",
- ["Shots Left: "] = "Zbývá střel: ", -- GaudyRacer, Tumbler
+-- ["shots remaining."] = "",
["Silly"] = "Hloupý",
["Sinky"] = "Propadlý",
["%s is out and Team %d|scored a penalty!| |Score:"] = "%s je venku a tým %d|má penaltu!| |Skóre:", -- Basketball, Knockball
@@ -136,6 +171,8 @@
["Sniperz"] = "Snajpři",
["Sponge"] = "Mycà houba",
["Spooky Tree"] = "Strašidelný strom",
+ ["s|"] = "s|",
+ ["s"] = "s", -- GaudyRacer, Space_Invasion
["STATUS UPDATE"] = "AKTUALIZACE STAVU", -- GaudyRacer, Space_Invasion
["Switched to "] = "Přepnut na ",
["Team %d: "] = "Tým %d: ",
@@ -146,26 +183,33 @@
["The flag will respawn next round."] = "Vlajka se obnovà pÅ™ÃÅ¡tà kolo.",
["The Nameless One"] = "Bezejmenný",
["THE SPECIALISTS"] = "SPECIALISTÉ",
+-- ["This one's tricky."] = "",
["This rain is really something..."] = "Tenhle déšť je opravdu něco...",
["TIME: "] = "ÄŒAS: ",
["Timed Kamikaze!"] = "Časovaná sebevražda!",
["Time Extended!"] = "Čas prodloužen!",
- ["Time Left: "] = "Zbývá Äasu: ",
+-- ["Time Extension"] = "",
["Toggle Shield"] = "PÅ™epnout Å¡tÃt",
["Toxic Team"] = "Jedovatý tým", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["TRACK COMPLETED"] = "TRASA KOMPLETNÃ",
- ["Track Time: "] = "ÄŒas na trati: ",
+-- ["TRACK FAILED!"] = "",
["TrophyRace"] = "Závod o trofej",
["T_T"] = "T_T",
+-- ["Tumbling Time Extended!"] = "",
["Turn Time"] = "ÄŒas kola",
+-- ["Unit"] = "",
["Unit 3378"] = "Jednotka 3378",
+-- ["Unit 835"] = "",
["Unlimited Attacks"] = "Neomezeně útoků",
+-- ["Unstoppable!"] = "",
["User Challenge"] = "Výzva",
["Use your rope to get from start to finish as fast as you can!"] = "Použij lano a dostaň se ze startu do cÃle, jak nejrychleji umÃÅ¡!",
- ["v.06"] = "v.06",
["Victory for the "] = "VÃtÄ›zstvà pro ", -- CTF_Blizzard, Capture_the_Flag
["Waypoint placed."] = "NavigaÄnà bod umÃstÄ›n.",
+-- ["Way-Points Remaining"] = "",
["Weapons Reset"] = "ZbranÄ› obnoveny",
+-- ["Well done."] = "",
+-- ["Will this ever end?"] = "",
["WINNING TIME: "] = "VÃTÄšZNÃ ÄŒAS: ",
["You'd almost swear the water was rising!"] = "PÅ™Ãsahal bys, že voda stoupá!",
["You have SCORED!!"] = "SKÓROVAL jsi!!",
--- a/share/hedgewars/Data/Locale/de.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/de.lua Sat Oct 08 16:54:56 2011 +0200
@@ -2,175 +2,221 @@
-- [":("] = "",
-- ["!!!"] = "",
-- ["..."] = "",
--- ["Accuracy Bonus!"] = "",
--- ["a Hedgewars mini-game"] = "", -- Space_Invasion, The_Specialists
+ ["Accuracy Bonus!"] = "Präzisions-Bonus!",
+-- ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
+ ["a Hedgewars mini-game"] = "ein Hedgewars Mini-Spiel", -- Space_Invasion, The_Specialists
["Aiming Practice"] = "Zielübung", --Bazooka, Shotgun, SniperRifle
--- ["Ammo"] = "",
--- ["Ammo Depleted!"] = "",
--- ["Ammo Maniac!"] = "",
--- ["Available points remaining: "] = "",
+ ["Ammo Depleted!"] = "Munition erschöpft!",
+ ["ammo extended!"] = "Munition aufgestockt!",
+ ["Ammo is reset at the end of your turn."] = "Munition wird am Ende des Spielzuges zurückgesetzt.",
+ ["Ammo Maniac!"] = "Munitionsverrückter!",
+ ["Ammo"] = "Munition",
+ ["Available points remaining: "] = "Verfügbare Punkte verbleibend:",
+-- ["[Backspace]"] = "",
+-- ["Bamboo Thicket"] = "",
+ ["Barrel Eater!"] = "Fassfresser!",
+ ["Barrel Launcher"] = "Fasswerfer",
["Bat balls at your enemies and|push them into the sea!"] = "Schlage Bälle auf deine Widersacher|und lass sie ins Meer fallen!",
["Bat your opponents through the|baskets and out of the map!"] = "Schlage deine Widersacher durch|die Körbe und aus der Karte hinaus!",
["Bazooka Training"] = "Bazooka-Training",
--- ["Best laps per team: "] = "",
--- ["Best Team Times: "] = "",
--- ["Bloody Rookies"] = "", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
--- ["Boom!"] = "",
--- ["BOOM!"] = "",
--- ["Boss defeated!"] = "",
--- ["Boss Slayer!"] = "",
--- ["CAPTURE THE FLAG"] = "",
--- ["Careless"] = "",
--- ["Clumsy"] = "",
--- ["Codename: Teamwork"] = "",
--- ["Complete the track as fast as you can!"] = "",
--- ["Congratulations!"] = "",
+ ["Best laps per team: "] = "Beste Rundenzeiten pro Team: ",
+ ["Best Team Times: "] = "Beste Team-Zeiten: ",
+ ["Bloody Rookies"] = "Blutige Anfänger", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
+ ["Boom!"] = "Bumm!",
+ ["BOOM!"] = "KABUMM!",
+ ["Boss defeated!"] = "Boss wurde besiegt!",
+ ["Boss Slayer!"] = "Boss-Töter!",
+ ["Build a track and race."] = "Konstruiere eine Strecke und mach ein Wettrennen.",
+ ["CAPTURE THE FLAG"] = "EROBERE DIE FAHNE",
+ ["Careless"] = "Achtlos",
+ ["Change Weapon"] = "Waffenwechsel",
+ ["Clumsy"] = "Hoppla",
+ ["Codename: Teamwork"] = "Code-Name: Teamwork",
+ ["Complete the track as fast as you can!"] = "Durchlaufe die Strecke so schnell du kannst!",
+ ["Congratulations!"] = "Gratulation!",
["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Gratulation! Du hast alle Ziele innerhalb der|verfügbaren Zeit ausgeschaltet.", --Bazooka, Shotgun, SniperRifle
--- ["Control pillars to score points."] = "",
--- ["Cybernetic Empire"] = "",
--- ["DAMMIT, ROOKIE!"] = "",
--- ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "",
+ ["Control pillars to score points."] = "Kontrolliere die Säulen um Punkte zu erhalten.",
+ ["Cybernetic Empire"] = "Kybernetisches Imperium",
+ ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "VERDAMMT, REKRUT! RUNTER VON MEINEM KOPF!",
+ ["DAMMIT, ROOKIE!"] = "VERDAMMT, REKRUT!",
-- ["Dangerous Ducklings"] = "",
--- ["Deadweight"] = "",
--- ["Depleted Kamikaze!"] = "",
--- ["Destroy invaders to score points."] = "",
+ ["Deadweight"] = "Gravitus",
+ ["Demolition is fun!"] = "Zerstörung macht Spaß!",
+ ["Depleted Kamikaze!"] = "Munitionsloses Kamikaze!",
+ ["Destroy invaders to score points."] = "Zerstöre die Angreifer um Punkte zu erhalten.",
+-- ["Double Kill!"] = "",
-- ["Drone Hunter!"] = "",
--- ["Drowner"] = "",
--- ["Each turn you get 1-3 random weapons"] = "",
--- ["Each turn you get one random weapon"] = "",
--- ["Eliminate all enemies"] = "",
+ ["Drowner"] = "Absäufer",
+ ["Each turn you get 1-3 random weapons"] = "Du bekommst jede Runde 1-3 zufällig gewählte Waffen",
+ ["Each turn you get one random weapon"] = "Du bekommst jede Runde eine zufällig gewählte Waffe.",
+ ["Eliminate all enemies"] = "Vernichte alle Gegner",
["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Eliminiere alle Ziele bevor die Zeit ausläuft.|Du hast in dieser Mission unbegrenzte Munition.", --Bazooka, Shotgun, SniperRifle
--- ["Eliminate Poison before the time runs out"] = "",
--- ["Eliminate the Blue Team"] = "",
--- ["Eliminate the enemy specialists."] = "",
--- ["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "",
--- ["Enjoy the swim..."] = "",
+ ["Eliminate Poison before the time runs out"] = "Neutralisiere das Gift bevor die Zeit abgelaufen ist",
+ ["Eliminate the Blue Team"] = "Lösche das Blaue Team aus",
+ ["Eliminate the enemy before the time runs out"] = "Vernichte den Feind bevor die Zeit abgelaufen ist", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+ ["Eliminate the enemy hogs to win."] = "Vernichte alle gegnerischen Igel um zu gewinnen",
+ ["Eliminate the enemy specialists."] = "Vernichte die gegnerischen Spezialisten",
+ ["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Vernichte Einheit 3378 | Kraftloser Widerstand muss überleben",
+-- ["Energetic Engineer"] = "",
+ ["Enjoy the swim..."] = "Viel Spaß beim Schwimmen...",
-- ["[Enter]"] = "",
--- ["Fastest lap: "] = "",
--- ["Feeble Resistance"] = "",
--- ["Fire"] = "",
--- ["Flag captured!"] = "",
--- ["Flag respawned!"] = "",
--- ["Flag returned!"] = "",
--- ["Flags, and their home base will be placed where each team ends their first turn."] = "",
--- ["GAME BEGUN!!!"] = "",
--- ["Game Modifiers: "] = "",
--- ["GAME OVER!"] = "",
--- ["Game Started!"] = "",
--- ["Get on over there and take him out!"] = "",
--- ["Goal"] = "",
--- ["GO! GO! GO!"] = "",
--- ["Good birdy......"] = "",
--- ["Good luck out there!"] = "",
--- ["GOTCHA!"] = "",
+ ["Fastest lap: "] = "Schnellste Runde: ",
+ ["Feeble Resistance"] = "Kraftloser Widerstand",
+ ["Fire"] = "Feuer",
+ ["Flag captured!"] = "Fahne erobert!",
+ ["Flag respawned!"] = "Fahne wieder erschienen!",
+ ["Flag returned!"] = "Fahne zurückgebracht!",
+ ["Flags, and their home base will be placed where each team ends their first turn."] = "Fahnen und deren Heimatstandort werden dort plaziert wo jedes Team deren ersten Zug beendet.",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+ ["fuel extended!"] = "Treibstoff aus!",
+ ["GAME BEGUN!!!"] = "SPIEL GESTARTET!!!",
+ ["Spielmodifikatoren: "] = "",
+ ["GAME OVER!"] = "SPIEL ZU ENDE!",
+ ["Game Started!"] = "Spiel Gestartet!]",
+ ["Get on over there and take him out!"] = "Mach, dass du hinüber kommst und schalte ihn aus!",
+ ["Goal"] = "Ziel",
+ ["GO! GO! GO!"] = "Bewegung, Bewegung, Bewegung!",
+ ["Good birdy......"] = "Braver Vogel......",
+ ["Good luck out there!"] = "Viel Glück da draußen!",
+ ["Good so far!"] = "Gut soweit!",
+ ["Good to go!"] = "Startklar!",
+ ["GOTCHA!"] = "ERWISCHT!",
+ ["Grab Mines/Explosives"] = "Sammle Minen/Fässer",
-- ["Hahahaha!"] = "",
--- ["Haha, now THAT would be something!"] = "",
--- ["Hapless Hogs"] = "",
--- [" Hapless Hogs left!"] = "",
--- ["Heavy"] = "",
+ ["Haha, now THAT would be something!"] = "Haha, na DAS wär ja was!",
+ ["Hapless Hogs"] = "Glücklose Igel",
+ [" Hapless Hogs left!"] = " Glücklose Igel verbleibend!",
+ ["Health crates extend your time."] = "Medipacks verlängern deine Zeit.",
+ ["Heavy"] = "Schwierig",
["Hedgewars-Basketball"] = "Hedgewars-Basketball",
["Hedgewars-Knockball"] = "Hedgewars-Knockball",
--- ["Heh, it's not that bad."] = "",
+ ["Heh, it's not that bad."] = "Hehe, so schlimm ist es nicht.",
-- ["Hit Combo!"] = "",
-- ["Hmmm..."] = "",
--- ["Hooray!"] = "",
+ ["Hooray!"] = "Hurra!",
["Hunter"] = "Jäger", --Bazooka, Shotgun, SniperRifle
--- ["Instructor"] = "", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings
--- ["invaders destroyed"] = "",
--- ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
--- ["Jumping is disabled"] = "",
--- ["Kamikaze Expert!"] = "",
+ ["Instructor"] = "Ausbilder", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings
+ ["invaders destroyed"] = "Angreifer zerstört",
+ ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "Gut, dass SUDDEN DEATH noch 99 Runden entfernt ist...",
+ ["Jumping is disabled"] = "Sprünge sind deaktiviert!",
+ ["Kamikaze Expert!"] = "Kamikazeexperte!",
+ ["Keep it up!"] = "Weiter so!",
+ ["Killing spree!"] = "Blutrausch!",
-- ["KILLS"] = "",
+ ["Last Target!"] = "Letzte Zielscheibe!",
-- ["[Left Shift]"] = "",
--- ["Listen up, maggot!!"] = "",
--- ["|- Mines Time:"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
--- ["MISSION FAILED"] = "", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
--- ["MISSION SUCCESS"] = "",
--- ["MISSION SUCCESSFUL"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
--- ["Movement: [Up], [Down], [Left], [Right]"] = "",
+ ["Listen up, maggot!!"] = "Aufgepasst, du Made!!",
+-- ["Lively Lifeguard"] = "",
+ ["Mine Deployer"] = "Minenleger",
+ ["Mine Eater!"] = "Minenfresser!",
+ ["|- Mines Time:"] = "| - Minenzündzeit: ", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+ ["MISSION FAILED"] = "MISSION GESCHEITERT", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+ ["MISSION SUCCESSFUL"] = "MISSION ERFOLGREICH", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+ ["MISSION SUCCESS"] = "MISSIONSERFOLG",
+ ["Movement: [Up], [Down], [Left], [Right]"] = "Bewegung: [Hoch], [Runter], [Links], [Rechts]",
-- ["Multi-shot!"] = "",
--- ["Nameless Heroes"] = "",
--- ["NEW CLAN RECORD: "] = "",
--- ["NEW fastest lap: "] = "",
--- ["NEW RACE RECORD: "] = "",
--- ["NOT ENOUGH WAYPOINTS"] = "",
+ ["Munition!"] = "Munition erschöpft!",
+ ["Nameless Heroes"] = "Namenlose Helden",
+ ["New Barrels Per Turn"] = "Neue Fässer jede Runde",
+ ["NEW CLAN RECORD: "] = "NEUER KLAN-REKORD",
+ ["NEW fastest lap: "] = "NEUE schnellste Runde: ",
+ ["New Mines Per Turn"] = "Neue Minen jede Runde",
+ ["NEW RACE RECORD: "] = "NEUER RENNREKORD: ",
+-- ["Newton's Hammock"] = "",
+ ["NOT ENOUGH WAYPOINTS"] = "NICHT GENUG WEGPUNKTE",
["Not So Friendly Match"] = "Kein-so-Freundschaftsspiel", -- Basketball, Knockball
--- ["Oh no! Just try again!"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+ ["Oh no! Just try again!"] = "Oh nein! Versuch's nochmal!", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["Oh no! Time's up! Just try again."] = "Oh nein! Die Zeit ist um! Versuche es nochmal.", --Bazooka, Shotgun, SniperRifle
-- ["Operation Diver"] = "",
--- ["Opposing Team: "] = "",
--- ["Pathetic Hog #%d"] = "",
--- ["Per-Hog Ammo"] = "",
--- ["Place more waypoints using [ENTER]"] = "",
--- ["points"] = "", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
--- ["Poison"] = "",
--- ["Power Remaining"] = "",
+ ["Opposing Team: "] = "Gegnerisches Team: ",
+ ["Pathetic Hog #%d"] = "Erbärmlicher Igel #%d",
+ ["Pathetic Resistance"] = "Erbärmlicher Widerstand", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+ ["Per-Hog Ammo"] = "Munition pro Igel",
+ ["Place more waypoints using [ENTER]"] = "Setze mehr Wegpunkte durch Drücken von [ENTER]",
+ ["Place more waypoints using the 'Air Attack' weapon."] = "Platziere mehr Wegpunkte durch Verwenden der 'Luftangriff'-Waffe",
+ ["points"] = "Punkte", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
+ ["Poison"] = "Gift",
+ ["Power Remaining"] = "Verbleibende Energie",
+ ["Prepare yourself"] = "Mach dich bereit",
-- ["Press [Precise] to skip intro"] = "",
--- ["Race complexity limit reached."] = "",
--- [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = "",
--- ["Round Limit"] = "",
--- ["Rounds Complete"] = "",
--- ["RULES OF THE GAME [Press ESC to view]"] = "",
+ ["Race complexity limit reached."] = "Rennkomplexitätslimit erreicht.",
+-- ["RACER"] = "",
+ [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Bringe die gegnerische Flagge zu deiner Heimatbasis um zu punkten. | - Das Team das zuerst 3 Flaggen erobert gewinnt. | - Du kannst nur punkten wenn deine eigene Flagge in deiner Basis ist | - Igel lassen die Flagge fallen wenn sie sterben oder ertrinken | - Fallen gelassene Flaggen können zurückgebracht oder wieder gestohlen werden | - Igel tauchen nach ihrem Tod wieder auf",
+-- ["Round Limit:"] = "",
+ ["Round Limit"] = "Rundenbegrenzung",
+-- ["Rounds Complete: "] = "",
+ ["Rounds Complete"] = "Runden Gespielt",
+ ["RULES OF THE GAME [Press ESC to view]"] = "SPIEL REGELN (Drücke ESC zum Anzeigen)",
-- ["s|"] = "",
--- ["Save as many hapless hogs as possible!"] = "",
--- ["SCORE"] = "",
+ ["Save as many hapless hogs as possible!"] = "Rette so viele glücklose Igel als möglich!",
+ ["PUNKTESTAND"] = "",
-- ["sec"] = "", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
--- ["See ya!"] = "",
+ ["See ya!"] = "Mach's gut!",
+ ["selected!"] = "ausgewählt!",
-- ["s"] = "", -- GaudyRacer, Space_Invasion
--- ["Shield boosted! +30 power"] = "",
--- ["Shield Depleted"] = "",
--- ["Shield is fully recharged!"] = "",
--- ["Shield Master!"] = "",
--- ["Shield Miser!"] = "",
--- ["Shield OFF:"] = "",
--- ["Shield ON:"] = "",
--- ["Shield Seeker!"] = "",
- ["Shotgun Team"] = "Entrenamiento con escopeta",
+ ["Shield boosted! +30 power"] = "Schild verstärkt! +30 Energie",
+ ["Shield Depleted"] = "Schild aufgebraucht!",
+ ["Shield is fully recharged!"] = "Schild vollständig aufgeladen!",
+ ["Shield Master!"] = "Schildmeister!",
+ ["Shield Miser!"] = "Schildgieriger",
+ ["Shield OFF:"] = "Schild AUS:",
+ ["Shield ON:"] = "Schild AN:",
+ ["Shield Seeker!"] = "Schildsucher!",
+ ["Shotgun Team"] = "Schrotflinten-Team",
["Shotgun Training"] = "Schrotflinten-Training",
--- ["Shots Left: "] = "", -- GaudyRacer, Tumbler
--- ["Silly"] = "",
--- ["Sinky"] = "",
+ ["shots remaining."] = "Schüsse übrig",
+ ["Silly"] = "Doofi",
+ ["Sinky"] = "Blubb",
["%s is out and Team %d|scored a penalty!| |Score:"] = "%s ist draußen und Team %d|erhält eine Strafe!| |Punktestand:", -- Basketball, Knockball
["%s is out and Team %d|scored a point!| |Score:"] = "%s ist draußen und Team %d|erhält einen Punkt!| |Punktestand:", -- Basketball, Knockball
["Sniper Training"] = "Scharfschützen-Training",
["Sniperz"] = "Heckenschützen",
--- ["Sponge"] = "",
+ ["Sponge"] = "Schwamm",
-- ["Spooky Tree"] = "",
-- ["STATUS UPDATE"] = "", -- GaudyRacer, Space_Invasion
--- ["Switched to "] = "",
+ ["Switched to "] = "Gewechselt zu ",
-- ["Team %d: "] = "",
--- ["Team Scores"] = "", -- Control, Space_Invasion
+ ["Team Scores"] = "Teampunktestand", -- Control, Space_Invasion
-- ["That Sinking Feeling"] = "",
--- ["That was pointless."] = "",
--- ["The enemy is hiding out on yonder ducky!"] = "",
--- ["The flag will respawn next round."] = "",
--- ["The Nameless One"] = "",
--- ["THE SPECIALISTS"] = "",
--- ["This rain is really something..."] = "",
--- ["TIME: "] = "",
--- ["Timed Kamikaze!"] = "",
--- ["Time Extended!"] = "",
--- ["Time Left: "] = "",
--- ["Toggle Shield"] = "",
--- ["Toxic Team"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
--- ["TRACK COMPLETED"] = "",
--- ["Track Time: "] = "",
+ ["That was pointless."] = "Das war sinnlos.",
+ ["The enemy is hiding out on yonder ducky!"] = "Der Feind versteckt sich auf dem Entlein dort drüben!",
+ ["The flag will respawn next round."] = "Die Fahne wird nächste Runde wieder auftauchen.",
+ ["The Nameless One"] = "Der Namenlose",
+ ["THE SPECIALISTS"] = "DIE SPEZIALISTEN",
+ ["This one's tricky."] = "Der hier ist knifflig.",
+ ["This rain is really something..."] = "Das nenne ich mal einen Regenschauer...",
+ ["Timed Kamikaze!"] = "Pünktliches Kamikaze!",
+ ["Time Extended!"] = "Zeit verlängert!",
+ ["Time Extension"] = "Zeitverlängerung",
+ ["Time Left: "] = "Verbleibende Zeit",
+ ["TIME: "] = "ZEIT: ",
+ ["Toggle Shield"] = "Schild ein/aus",
+ ["Toxic Team"] = "Giftige Gegner", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+ ["TRACK COMPLETED"] = "STRECKENLAUF BEENDET",
+ ["TRACK FAILED!"] = "STRECKENLAUF GESCHEITERT",
-- ["TrophyRace"] = "",
-- ["T_T"] = "",
--- ["Turn Time"] = "",
--- ["Unit 3378"] = "",
--- ["Unlimited Attacks"] = "",
+ ["Tumbling Time Extended!"] = "Purzelzeit verlängert!",
+ ["Turn Time"] = "Zeit pro Zug",
+ ["Unit 3378"] = "Einheit 3378",
+ ["Unit 835"] = "Einheit 3378",
+ ["Unit"] = "Einheit",
+ ["Unlimited Attacks"] = "Unbegrenzte Angriffe",
+ ["Unstoppable!"] = "Unaufhaltbar!",
-- ["User Challenge"] = "",
--- ["Use your rope to get from start to finish as fast as you can!"] = "",
--- ["v.06"] = "",
--- ["Victory for the "] = "", -- CTF_Blizzard, Capture_the_Flag
--- ["Waypoint placed."] = "",
--- ["Weapons Reset"] = "",
--- ["WINNING TIME: "] = "",
--- ["You'd almost swear the water was rising!"] = "",
--- ["You have SCORED!!"] = "",
--- ["You saved"] = "",
--- ["You've failed. Try again."] = "",
--- ["You've reached the goal!| |Time: "] = "",
+ ["Use your rope to get from start to finish as fast as you can!"] = "Nutze das Seil um von Start zu Ziel zu gelangen - so schnell du kannst!",
+ ["Victory for the "] = "Sieg für ", -- CTF_Blizzard, Capture_the_Flag
+ ["Waypoint placed."] = "Wegpunkt gesetzt",
+ ["Way-Points Remaining"] = "Wegpunkte verbleibend",
+ ["Weapons Reset"] = "Waffenzurücksetzung",
+ ["Well done."] = "Gut gemacht.",
+ ["Will this ever end?"] = "Wird dies je enden?",
+ ["WINNING TIME: "] = "BESTZEIT: ",
+ ["You'd almost swear the water was rising!"] = "Man könnte fast schwören das Wasser würde steigen!",
+ ["You have SCORED!!"] = "Du hast GEPUNKTET!",
+ ["You saved"] = "Gerettet: ",
+ ["You've failed. Try again."] = "Du bist gescheitert. Versuche es nochmal.",
+ ["You've reached the goal!| |Time: "] = "Ziel erreicht!| |Zeit: ",
["'Zooka Team"] = "Die Knalltüten",
}
--- a/share/hedgewars/Data/Locale/de.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/de.txt Sat Oct 08 16:54:56 2011 +0200
@@ -53,6 +53,9 @@
00:50=Bohr-Luftangriff
00:51=Schlammball
00:52=Keine Waffe ausgewählt
+00:53=ZeitBox
+00:54=Bauwerk
+00:55=Landkanone
01:00=Auf in die Schlacht!
@@ -72,6 +75,12 @@
01:12=Letzte Runde bis zum Sudden Death!
01:13=%1 Runden bis zum Sudden Death!
01:14=Mach dich bereit, %1!
+01:15=Minimale
+01:16=Niedrige
+01:17=Normale
+01:18=Hohe
+01:19=Extreme
+01:20=%1 Sprungkraft
; Event messages
; Hog (%1) died
@@ -233,6 +242,12 @@
03:47=Mach es weg!
03:48=Stop! Hammer time!
03:49=Tut, was man vermutet
+03:50=Maulwurfsfreund
+03:51=Am Boden gefunden
+03:52=NICHT IN VERWENDUNG
+03:53=Typ 40
+03:54=Baue etwas
+03:55=Werkzeug
; Weapon Descriptions (use | as line breaks)
04:00=Greife deine Feinde mit einfachen Granaten an.|Der Zeitzünder steuert den Explosionszeitpunkt.|1-5: Zeitzünder einstellen|Angriff: Halten, um mit mehr Kraft zu werfen
@@ -285,6 +300,13 @@
04:47=Verdopple den Spaß mit zwei spitzigen, schicken, klebrigen Minen.|Löse eine Kettenreaktion aus oder beschütze dich (oder beides).|Angriff: Halten, um mit mehr Kraft zu feuern (zweimal)
04:48=Warum sind Maulwürfe verhasst? Einen|Igel in den Boden zu stampfen kann sehr lustig sein!|Ein guter Treffer des Hammers wird ein Drittel|der Lebenspunkte eines Igels abziehen und ihn|im Boden versenken.|Angriff: Aktivieren
04:49=Hol deine Freunde zurück!|Aber pass auf, dass du keine Feinde beschwörst.|Angriff: Gedrückt halten, um Igel langsam wiederauferstehen zu lassen.|Hoch: Beschleunige Totenbeschwörung
+04:50=Verstecken sich Feinde im Untergrund?|Grabe sie aus mit dem Bohr-Luftangriff!|Der Zeitzünder bestimmt wie tief dieser graben wird.
+04:51=Wirf mit Dreck um dich!|Schmerzt ein wenig und schubst Igel weg.
+04:52=NICHT IN VERWENDUNG
+04:53=Unternimm eine Reise durch Zeit und Raum,|während du deine Kameraden alleine am Schlachtfeld zurücklässt.|Sei darauf vorbereitet jederzeit wieder zurückzukommen,|oder auf Sudden Death wenn sie alle besiegt wurden.|Disclaimer: Nicht funktionstüchtig wenn in Sudden Death,|wenn du alleine bist - oder der König.
+04:54=IN ARBEIT
+
+04:55=Versprühe einen Strahl klebriger Flocken.|Baue Brücken, begrabe Gegner, versiegle Tunnel.|Pass auf, dass du selbst nichts abbekommst!
; Game goal strings
05:00=Spielmodifikationen
@@ -303,3 +325,10 @@
05:13=Minenzünder: Minen explodieren sofort
05:14=Minenzünder: Minen explodieren nach 0 - 3 Sekunden
05:15=Prozentualer Schaden: Alle Waffen verursachen %1 % Schaden
+05:16=Lebenspunkter aller Igel wird am Ende jeder Runde zurückgesetzt
+05:17=Computergesteuerte Igel erscheinen nach dem Tod wieder
+05:18=Unbegrenzte Attacken
+05:19=Waffen werden am Ende jedes Zuges zurückgesetzt
+05:20=Igel teilen Waffen nicht untereinander
+05:21=Tag Team: Teams gleicher Farbe kommen nacheinander dran und teilen sich ihre Zugzeit.
+
--- a/share/hedgewars/Data/Locale/en.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/en.txt Sat Oct 08 16:54:56 2011 +0200
@@ -502,7 +502,7 @@
04:48=Why should the moles get all the abuse?|Wacking a hog can be just as fun! A good|blow from this hammer will shave off one|third of a hog's health and plunge them|underground.|Attack: Activate
04:49=Resurrect your friends!|But beware that this also resurrects your foes.|Attack: Keep attack pressed to resurrect slowly|Up: Accelerate resurrection
04:50=Is someone hiding underground?|Dig them out with a drill strike!|Timer controls how far it will dig.
-04:51=Get in a free shot in by hurling a ball of mud.|Stings a bit, and knocks hogs back.
+04:51=Get in a free shot by hurling a ball of mud.|Stings a bit, and knocks hogs back.
04:52=UNUSED
04:53=Go on an adventure through time and space,|while leaving your comrades to fight on alone.|Be prepared to return at any time,|or for Sudden Death or if they are all defeated.|Disclaimer. Does not function in Sudden Death,|if you are alone, or if you are a King.
04:54=INCOMPLETE
--- a/share/hedgewars/Data/Locale/es.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/es.lua Sat Oct 08 16:54:56 2011 +0200
@@ -1,29 +1,38 @@
locale = {
--- ["..."] = "",
+ ["..."] = "...",
[":("] = ":(",
["!!!"] = "!!!",
--- ["Accuracy Bonus!"] = "",
--- ["a Hedgewars mini-game"] = "", -- Space_Invasion, The_Specialists
+ ["Accuracy Bonus!"] = "¡Buena punterÃa!",
+ ["Achievement Unlocked"] = "Logro conseguido", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
+ ["a Hedgewars mini-game"] = "un minijuego de Hedgewars", -- Space_Invasion, The_Specialists
["Aiming Practice"] = "Practica tu punterÃa", --Bazooka, Shotgun, SniperRifle
--- ["Ammo"] = "",
--- ["Ammo Depleted!"] = "",
--- ["Ammo Maniac!"] = "",
--- ["Available points remaining: "] = "",
- ["Bat balls at your enemies and|push them into the sea!"] = "¡Batea pelotas hacia tus enemigos|y hazlos caer al agua!",
+ ["Ammo"] = "Munición",
+ ["Ammo Depleted!"] = "¡Munición agotada!",
+ ["ammo extended!"] = "¡Munición aumentada!",
+ ["Ammo is reset at the end of your turn."] = "",
+ ["Ammo Maniac!"] = "¡Loco por la munición!",
+ ["Available points remaining: "] = "Puntos restantes:",
+ ["[Backspace]"] = "[Retroceso]",
+ ["Bamboo Thicket"] = "Maraña de bambú",
+ ["Barrel Eater!"] = "¡Tragabarriles!",
+ ["Barrel Launcher"] = "Lanzador de barriles",
+ ["Bat balls at your enemies and|push them into the sea!"] = "¡Batea pelotas contra tus enemigos|y hazlos caer al agua!",
["Bat your opponents through the|baskets and out of the map!"] = "¡Batea a tus enemigos fuera del campo de juego|a través de las canastas laterales!",
["Bazooka Training"] = "Entrenamiento con bazuca",
["Best laps per team: "] = "Mejores tiempos por equipo: ",
--- ["Best Team Times: "] = "",
+ ["Best Team Times: "] = "Mejores tiempos del equipo: ",
["Bloody Rookies"] = "Reclutas", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
--- ["Boom!"] = "",
--- ["BOOM!"] = "",
--- ["Boss defeated!"] = "",
--- ["Boss Slayer!"] = "",
+ ["Boom!"] = "¡Bum!",
+ ["BOOM!"] = "¡BUM!",
+ ["Boss defeated!"] = "¡Jefe derrotado!",
+ ["Boss Slayer!"] = "¡Matajefes!",
+ ["Build a track and race."] = "Dibuja un recorrido y compite.",
["CAPTURE THE FLAG"] = "Capturar la bandera",
--- ["Careless"] = "",
--- ["Clumsy"] = "",
+ ["Careless"] = "Descuidado",
+ ["Change Weapon"] = "Cambiar arma",
+ ["Clumsy"] = "Patoso",
["Codename: Teamwork"] = "Nombre en clave: Trabajo en equipo",
--- ["Complete the track as fast as you can!"] = "",
+ ["Complete the track as fast as you can!"] = "¡Completa el recorrido lo más rápido que puedas!",
["Congratulations!"] = "¡Felicidades!",
["Congratulations! You've eliminated all targets|within the allowed time frame."] = "¡Felicidades! Has destruido todos los objectivos|dentro del tiempo establecido.", --Bazooka, Shotgun, SniperRifle
["Control pillars to score points."] = "Controla los pilares para anotar puntos.",
@@ -31,146 +40,180 @@
["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "¡MALDITA SEA, RECLUTA! ¡FUERA DE MI CABEZA!",
["DAMMIT, ROOKIE!"] = "¡MALDITA SEA, RECLUTA!",
["Dangerous Ducklings"] = "Patitos peligrosos",
--- ["Deadweight"] = "",
--- ["Depleted Kamikaze!"] = "",
--- ["Destroy invaders to score points."] = "",
--- ["Drone Hunter!"] = "",
--- ["Drowner"] = "",
--- ["Each turn you get 1-3 random weapons"] = "",
--- ["Each turn you get one random weapon"] = "",
+ ["Deadweight"] = "Peso muerto",
+ ["Demolition is fun!"] = "¡Destruir es divertido!",
+ ["Depleted Kamikaze!"] = "¡No quedan más kamikazes!",
+ ["Destroy invaders to score points."] = "Acaba con los invasores para conseguir puntos.",
+ ["Double Kill!"] = "¡Dos por uno!",
+ ["Drone Hunter!"] = "Matadrones",
+ ["Drowner"] = "Ahogado",
+ ["Each turn you get 1-3 random weapons"] = "Cada turno tendrás de 1 a 3 armas elegidas aleatoriamente",
+ ["Each turn you get one random weapon"] = "Cada turno tendrás un arma elegida aleatoriamente",
["Eliminate all enemies"] = "Elimina a todos los enemigos",
["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Destruye todos los objetivos antes de que se agote el tiempo.|La munición en esta misión es ilimitada.", --Bazooka, Shotgun, SniperRifle
["Eliminate Poison before the time runs out"] = "Acaba con los Tóxicos antes de que se agote el tiempo",
["Eliminate the Blue Team"] = "Elimina al Equipo azul",
--- ["Eliminate the enemy specialists."] = "",
- ["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Elimina a la Unidad 3378 |- Resustencia Fútil debe sobrevivir",
+ ["Eliminate the enemy before the time runs out"] = "Acaba con el enemigo antes de que se agote el tiempo", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+ ["Eliminate the enemy hogs to win."] = "Acaba con los erizos enemigos para ganar",
+ ["Eliminate the enemy specialists."] = "Acaba con los Especialistas",
+ ["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Elimina a la Unidad 3378 |- Resistencia Fútil debe sobrevivir",
+ ["Energetic Engineer"] = "Ingeniero Eléctrico",
["Enjoy the swim..."] = "Disfruta del baño...",
--- ["[Enter]"] = "",
+ ["[Enter]"] = "[Intro]",
["Fastest lap: "] = "Vuelta rápida: ",
["Feeble Resistance"] = "Resistencia Fútil",
--- ["Fire"] = "",
+ ["Fire"] = "Fuego",
["Flag captured!"] = "¡Bandera capturada!",
["Flag respawned!"] = "¡Bandera restablecida!",
["Flag returned!"] = "¡Bandera recuperada!",
--- ["Flags, and their home base will be placed where each team ends their first turn."] = "",
--- ["GAME BEGUN!!!"] = "",
--- ["Game Modifiers: "] = "",
+ ["Flags, and their home base will be placed where each team ends their first turn."] = "Las banderas y las bases se colocarán donde los equipos acaben su primer turno.",
+ ["Flamer"] = "Incinerador",
+ ["Friendly Fire!"] = "¡Fuego amigo!",
+ ["fuel extended!"] = "¡Más combustible!",
+ ["GAME BEGUN!!!"] = "¡EL JUEGO HA EMPEZADO!",
+ ["Game Modifiers: "] = "Modificadores: ",
["GAME OVER!"] = "¡FIN DEL JUEGO!",
["Game Started!"] = "¡El juego ha empezado!",
["Get on over there and take him out!"] = "¡Ves allà y elimÃnalo!",
--- ["Goal"] = "",
+ ["Goal"] = "Objetivo",
["GO! GO! GO!"] = "¡VAMOS! ¡VAMOS! ¡VAMOS!",
["Good birdy......"] = "Buen pajarito......",
["Good luck out there!"] = "¡Buena suerte!",
--- ["GOTCHA!"] = "",
--- ["Hahahaha!"] = "",
--- ["Haha, now THAT would be something!"] = "",
--- ["Hapless Hogs"] = "",
--- [" Hapless Hogs left!"] = "",
--- ["Heavy"] = "",
+ ["Good so far!"] = "¡Vamos bien!",
+ ["Good to go!"] = "¡Sigue!",
+ ["GOTCHA!"] = "¡TE PILLÉ!",
+ ["Grab Mines/Explosives"] = "Coge minas/explosivos",
+ ["Hahahaha!"] = "¡Jajajaja!",
+ ["Haha, now THAT would be something!"] = "¡Jajaja, eso Sà que serÃa espectacular!",
+ ["Hapless Hogs"] = "Pobres desgraciados",
+ [" Hapless Hogs left!"] = " pobres desgraciados restantes!",
+ ["Health crates extend your time."] = "Los botiquines aumentan el tiempo disponible.",
+ ["Heavy"] = "Pesado",
["Hedgewars-Basketball"] = "Hedgewars-Baloncesto",
["Hedgewars-Knockball"] = "Hedgewars-Knockball",
--- ["Heh, it's not that bad."] = "",
--- ["Hit Combo!"] = "",
+ ["Heh, it's not that bad."] = "Jeje, no es para tanto.",
+ ["Hit Combo!"] = "¡Combo!",
["Hmmm..."] = "Mmm...",
["Hooray!"] = "¡Hurra!",
["Hunter"] = "Artillero", --Bazooka, Shotgun, SniperRifle
["Instructor"] = "Instructor", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings
--- ["invaders destroyed"] = "",
--- ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
--- ["Jumping is disabled"] = "",
--- ["Kamikaze Expert!"] = "",
--- ["KILLS"] = "",
--- ["[Left Shift]"] = "",
+ ["invaders destroyed"] = "invasores destruÃdos",
+ ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "Menos mal que aún quedan 99 turnos hasta la MUERTE SÚBITA...",
+ ["Jumping is disabled"] = "No se puede saltar",
+ ["Kamikaze Expert!"] = "¡Kamikaze experto!",
+ ["Keep it up!"] = "¡Sigue asÃ!",
+ ["Killing spree!"] = "¡Frenesà asesino!",
+ ["KILLS"] = "MUERTES",
+ ["Last Target!"] = "¡Último objetivo!",
+ ["[Left Shift]"] = "[Shift izquierdo]",
["Listen up, maggot!!"] = "¡Atento, escoria!",
--- ["|- Mines Time:"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
- ["MISSION FAILED"] = "MISIÓN FALLIDA", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
--- ["MISSION SUCCESS"] = "",
+ ["Lively Lifeguard"] = "Salvavidas dicharachero",
+ ["Mine Deployer"] = "Plantador de minas",
+ ["Mine Eater!"] = "¡Tragaminas!",
+ ["|- Mines Time:"] = "|- Retraso de las minas:", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+ ["MISSION FAILED"] = "MISIÓN FRACASADA", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+ ["MISSION SUCCESS"] = "MISIÓN COMPLETADA",
["MISSION SUCCESSFUL"] = "MISIÓN COMPLETADA", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
--- ["Movement: [Up], [Down], [Left], [Right]"] = "",
--- ["Multi-shot!"] = "",
--- ["Nameless Heroes"] = "",
--- ["NEW CLAN RECORD: "] = "",
+ ["Movement: [Up], [Down], [Left], [Right]"] = "Movimiento: [Arriba], [Abajo], [Izquierda], [Derecha]",
+ ["Multi-shot!"] = "¡Disparo múltiple!",
+ ["Nameless Heroes"] = "Héroes anónimos",
+ ["New Barrels Per Turn"] = "Barriles por turno",
+ ["NEW CLAN RECORD: "] = "NUEVO RÉCORD PARA EL CLAN",
["NEW fastest lap: "] = "NUEVA vuelta rápida: ",
--- ["NEW RACE RECORD: "] = "",
--- ["NOT ENOUGH WAYPOINTS"] = "",
+ ["New Mines Per Turn"] = "Minas por turno",
+ ["NEW RACE RECORD: "] = "NUEVO RÉCORD PARA EL RECORRIDO: ",
+ ["Newton's Hammock"] = "La hamaca de Newton",
+ ["NOT ENOUGH WAYPOINTS"] = "NO HAY SUFICIENTES BALIZAS",
["Not So Friendly Match"] = "Partido no-tan-amistoso", -- Basketball, Knockball
["Oh no! Just try again!"] = "¡Oh, no! ¿Por qué no lo intentas de nuevo?", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["Oh no! Time's up! Just try again."] = "¡Oh, no, se te acabó el tiempo! ¿Por qué no lo intentas de nuevo?", --Bazooka, Shotgun, SniperRifle
["Operation Diver"] = "Buzo",
["Opposing Team: "] = "Equipo enemigo: ",
["Pathetic Hog #%d"] = "Erizo patético #%d",
--- ["Per-Hog Ammo"] = "",
--- ["Place more waypoints using [ENTER]"] = "",
--- ["points"] = "", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
+ ["Pathetic Resistance"] = "Patética resistencia", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+ ["Per-Hog Ammo"] = "Armamento individualizado",
+ ["Place more waypoints using [ENTER]"] = "Coloca más balizas presionando [INTRO]",
+ ["Place more waypoints using the 'Air Attack' weapon."] = "Coloca más balizas usando el 'Bombardeo aéreo'",
+ ["points"] = "puntos", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
["Poison"] = "Veneno",
--- ["Power Remaining"] = "",
--- ["Press [Precise] to skip intro"] = "",
--- ["Race complexity limit reached."] = "",
+ ["Power Remaining"] = "EnergÃa restante",
+ ["Prepare yourself"] = "Prepárate",
+ ["Press [Precise] to skip intro"] = "Aprieta [Incrementar precisión] para saltar la intro",
+ ["Race complexity limit reached."] = "Máximo de complejidad para el recorrido alcanzado.",
+ ["RACER"] = "CORREDOR",
[" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = "- Vuelve a tu base con la bandera enemiga para anotar un punto | - El equipo que anote 3 puntos gana | - Sólo se puede anotar si tu propia bandera está en tu base | - Los erizos resucitan cuando mueren",
--- ["Round Limit"] = "",
--- ["Rounds Complete"] = "",
--- ["RULES OF THE GAME [Press ESC to view]"] = "",
+ ["Round Limit:"] = "LÃmite de rondas:",
+ ["Round Limit"] = "LÃmite de rondas",
+ ["Rounds Complete: "] = "Rondas completadas: ",
+ ["Rounds Complete"] = "Rondas completadas",
["RULES OF THE GAME [Press ESC to view]"] = "REGLAS DEL JUEGO (Presiona ESC para leerlas)",
--- ["s|"] = "",
--- ["Save as many hapless hogs as possible!"] = "",
--- ["SCORE"] = "",
--- ["sec"] = "", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
+ ["s|"] = "s|",
+ ["Save as many hapless hogs as possible!"] = "¡Salva a tantos pobres desgraciados como puedas!",
+ ["SCORE"] = "PUNTUACIÓN",
+ ["sec"] = "segundo", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
["See ya!"] = "¡Hasta otra!",
--- ["s"] = "", -- GaudyRacer, Space_Invasion
--- ["Shield boosted! +30 power"] = "",
--- ["Shield Depleted"] = "",
--- ["Shield is fully recharged!"] = "",
--- ["Shield Master!"] = "",
--- ["Shield Miser!"] = "",
--- ["Shield OFF:"] = "",
--- ["Shield ON:"] = "",
--- ["Shield Seeker!"] = "",
+ ["selected!"] = "¡Seleccionado!",
+ ["s"] = "s", -- GaudyRacer, Space_Invasion
+ ["Shield boosted! +30 power"] = "¡Escudo mejorado! +30 puntos",
+ ["Shield Depleted"] = "Escudo descargado",
+ ["Shield is fully recharged!"] = "¡Escudo completamente cargado!",
+ ["Shield Master!"] = "¡Experto del escudo!",
+ ["Shield Miser!"] = "¡Novato con los escudos!",
+ ["Shield OFF:"] = "Escudo desactivado:",
+ ["Shield ON:"] = "Escudo activado:",
+ ["Shield Seeker!"] = "¡A cubierto!",
["Shotgun Team"] = "Escopeteros",
["Shotgun Training"] = "Entrenamiento con escopeta",
--- ["Shots Left: "] = "", -- GaudyRacer, Tumbler
--- ["Silly"] = "",
--- ["Sinky"] = "",
+ ["shots remaining."] = "disparos restantes.",
+ ["Silly"] = "Idiota",
+ ["Sinky"] = "Sumergible",
["%s is out and Team %d|scored a penalty!| |Score:"] = "¡%s cayó y Equipo %d|anotó una falta!| |Puntuación:", -- Basketball, Knockball
["%s is out and Team %d|scored a point!| |Score:"] = "¡%s cayó y Equipo %d|anotó un tanto!| |Puntuación:", -- Basketball, Knockball
["Sniper Training"] = "Entrenamiento con rifle francotirador",
["Sniperz"] = "Francotiradores",
--- ["Sponge"] = "",
+ ["Sponge"] = "Esponja",
["Spooky Tree"] = "Ãrbol tenebroso",
--- ["STATUS UPDATE"] = "", -- GaudyRacer, Space_Invasion
--- ["Switched to "] = "",
+ ["STATUS UPDATE"] = "ACTUALIZACIÓN DE ESTADO", -- GaudyRacer, Space_Invasion
+ ["Switched to "] = "Cambiar a ",
["Team %d: "] = "Equipo %d",
--- ["Team Scores"] = "", -- Control, Space_Invasion
--- ["That Sinking Feeling"] = "",
--- ["That was pointless."] = "",
+ ["Team Scores"] = "Puntuaciones", -- Control, Space_Invasion
+ ["That Sinking Feeling"] = "Esa sensación de pesadez",
+ ["That was pointless."] = "Eso era innecesario.",
["The enemy is hiding out on yonder ducky!"] = "¡El enemigo está escondido detrás del patito del fondo!",
--- ["The flag will respawn next round."] = "",
--- ["The Nameless One"] = "",
--- ["THE SPECIALISTS"] = "",
--- ["This rain is really something..."] = "",
--- ["TIME: "] = "",
--- ["Timed Kamikaze!"] = "",
--- ["Time Extended!"] = "",
--- ["Time Left: "] = "",
--- ["Toggle Shield"] = "",
+ ["The flag will respawn next round."] = "La bandera reaparecerá en el próximo turno.",
+ ["The Nameless One"] = "Anónimo",
+ ["THE SPECIALISTS"] = "LOS ESPECIALISTAS",
+ ["This one's tricky."] = "Esto va a ser complicado.",
+ ["This rain is really something..."] = "Vaya que si llueve...",
+ ["TIME: "] = "TIEMPO: ",
+ ["Timed Kamikaze!"] = "¡Kamikaze de precisión!",
+ ["Time Extended!"] = "¡Tiempo aumentado!",
+ ["Time Extension"] = "¡Bonus de tiempo!",
+ ["Toggle Shield"] = "Activad/desactivar escudo",
["Toxic Team"] = "Tóxicos", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
--- ["TRACK COMPLETED"] = "",
--- ["Track Time: "] = "",
+ ["TRACK COMPLETED"] = "¡PISTA COMPLETADA!",
+ ["TRACK FAILED!"] = "¡PISTA FRACASADA!",
["TrophyRace"] = "TrophyRace",
["T_T"] = "T_T",
--- ["Turn Time"] = "",
+ ["Tumbling Time Extended!"] = "¡Tiempo de volteretas aumentado!",
+ ["Turn Time"] = "Duración del turno",
+ ["Unit"] = "Unidad",
["Unit 3378"] = "Unidad 3378",
--- ["Unlimited Attacks"] = "",
--- ["User Challenge"] = "",
+ ["Unit 835"] = "Unidad 835",
+ ["Unlimited Attacks"] = "Ataques ilimitados",
+ ["Unstoppable!"] = "¡Imparable!",
+ ["User Challenge"] = "Reto personal",
["Use your rope to get from start to finish as fast as you can!"] = "¡Usa tu cuerda para llegar a la salida lo más rápido que puedas!",
--- ["v.06"] = "",
- ["Victory for the "] = "La victoria es para", -- CTF_Blizzard, Capture_the_Flag
--- ["Waypoint placed."] = "",
--- ["Weapons Reset"] = "",
--- ["WINNING TIME: "] = "",
--- ["You'd almost swear the water was rising!"] = "",
+ ["Victory for the "] = "La victoria es para ", -- CTF_Blizzard, Capture_the_Flag
+ ["Waypoint placed."] = "Baliza colocada.",
+ ["Way-Points Remaining"] = "Balizas restantes",
+ ["Weapons Reset"] = "Armamento reiniciado",
+ ["Well done."] = "Bien hecho.",
+ ["Will this ever end?"] = "¿Es que nunca se va a terminar?",
+ ["WINNING TIME: "] = "MEJOR TIEMPO: ",
+ ["You'd almost swear the water was rising!"] = "¡Pero si podrÃa jurar que está subiendo el nivel del mar!",
["You have SCORED!!"] = "¡Has anotado!",
--- ["You saved"] = "",
+ ["You saved"] = "¡Has salvado",
["You've failed. Try again."] = "Has fracasado. Inténtalo de nuevo.",
["You've reached the goal!| |Time: "] = "¡Has llegado a la meta!| |Tiempo: ",
["'Zooka Team"] = "Bazuqueros",
--- a/share/hedgewars/Data/Locale/es.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/es.txt Sat Oct 08 16:54:56 2011 +0200
@@ -52,23 +52,33 @@
00:48=Mazo
00:49=Resurrección
00:50=Bombardeo perforador aéreo
-00:51=Bola de tierra
+00:51=Bola de barro
+00:52=No hay arma seleccionada
+00:53=Cabina del tiempo
+00:54=Estructura
+00:55=Pistola de barro
01:00=¡Luchad!
01:01=Empate
01:02=¡%1 venció!
01:03=Volumen %1%
01:04=Pausa
-01:05=¿Realmente deseas salir (Y / Esc)?
+01:05=¿Seguro que quieres salir (Y / Esc)?
01:06=¡Muerte súbita!
01:07=%1 restante
01:08=Combustible
01:09=Sincronizando...
-01:10=Activar esta herramienta no hará que tu turno acabe.
+01:10=Usar esta herramienta no hará que acabe tu turno.
01:11=Esta herramienta o arma todavÃa no está disponible.
01:12=¡Última ronda antes de la muerte súbita!
01:13=¡%1 rondas hasta la muerte súbita!
01:14=¡Prepárate, %1!
+01:15=mÃnimo
+01:16=bajo
+01:17=normal
+01:18=alto
+01:19=extremo
+01:20=Nivel de elasticidad: %1
; Eventos
; El erizo (%1) ha muerto
@@ -433,6 +443,11 @@
03:48=Pablo clavó un clavito
03:49=Hace exactamente lo que dice
03:50=Para los amantes de los topos
+03:51=Me la encontré por el suelo
+03:52=SIN USAR
+03:53=Tipo 40
+03:54=Construye algo
+03:55=Herramienta
; Descripciones de armamento ( lÃneas delimitadas con | )
04:00=Ataca a tus enemigos usando una sencilla granada.|Explotará una vez el temporizador llegue a cero.|1-5: ajustar temporizador.|Atacar: mantener presionado para lanzar más lejos.
@@ -485,6 +500,12 @@
04:47=¡Dos bombas lapa, doble diversión!|Útiles para planear reacciones en cadena, atrincherarte...|¡o las dos cosas!.|Atacar: mantener presionado para lanzar más lejos (dos disparos).
04:48=¿Por qué la gente siempre la toma con los topos?|¡Golpear erizos es aún más divertido!|Un buen mazazo puede reducir en un tercio la|vida de cualquier erizo y enterrarlo completamente.|Atacar: activar.
04:49=¡Resucita a tus aliados!|Pero ten cuidado, también resucitarás a tus enemigos.|Atacar: mantener presionado para resucitar lentamente.|Arriba: acelerar resurrección.
+04:50=¿Alguien está oculto bajo tierra?|¡Desentiérralos con un bombardeo perforador!|El temporizador controla la profundidad a alcanzar.
+04:51=¿Qué hay más barato que el barro?|Un tiro gratis gracias a la bola de barro.|Hará que el enemigo salga volando|y escuece un poco si te entra en los ojos.
+04:52=SIN USAR
+04:53=Vive una trepidante aventura a través del|espacio y el tiempo mientras tus compañeros|siguen luchando en tu lugar.|Estate preparado para volver en cualquier momento,|o al llegar la Muerte súbita si te has quedado solo.|Aviso: no funciona durante la Muerte súbita,|si estás solo o si eres el rey.
+04:54=INCOMPLETO
+04:55=Esparce un chorro de pegajoso barro.|Construye puentes, entierra enemigos o cierra túneles.|¡Ten especial cuidado de no mancharte!
; Game goal strings
05:00=Modos de juego
@@ -508,3 +529,4 @@
05:18=Sin lÃmite de ataques por turno
05:19=El arsenal se restaura al final de cada turno
05:20=Los erizos no comparten arsenal
+05:21=Tag Team: los equipos del mismo clan se van turnando entre ellos.|Turno compartido: los equipos del mismo clan comparten la duración del turno.
--- a/share/hedgewars/Data/Locale/fr.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/fr.lua Sat Oct 08 16:54:56 2011 +0200
@@ -3,12 +3,19 @@
-- ["!!!"] = "",
-- ["..."] = "",
-- ["Accuracy Bonus!"] = "",
+-- ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
-- ["a Hedgewars mini-game"] = "", -- Space_Invasion, The_Specialists
["Aiming Practice"] = "Entrainement de tir", --Bazooka, Shotgun, SniperRifle
-- ["Ammo"] = "",
-- ["Ammo Depleted!"] = "",
+-- ["ammo extended!"] = "",
+-- ["Ammo is reset at the end of your turn."] = "",
-- ["Ammo Maniac!"] = "",
-- ["Available points remaining: "] = "",
+-- ["[Backspace]"] = "",
+-- ["Bamboo Thicket"] = "",
+-- ["Barrel Eater!"] = "",
+-- ["Barrel Launcher"] = "",
["Bat balls at your enemies and|push them into the sea!"] = "Frappez vos ennemis à la batte|et envoyez-les à la mer !",
["Bat your opponents through the|baskets and out of the map!"] = "Frappez vos ennemis à la batte|, marquez des paniers ou envoyez-les à la mer !",
["Bazooka Training"] = "Entrainement au Bazooka",
@@ -19,8 +26,10 @@
-- ["BOOM!"] = "",
-- ["Boss defeated!"] = "",
-- ["Boss Slayer!"] = "",
+-- ["Build a track and race."] = "",
["CAPTURE THE FLAG"] = "Capturez le drapeau !",
-- ["Careless"] = "",
+-- ["Change Weapon"] = "",
-- ["Clumsy"] = "",
["Codename: Teamwork"] = "Nom de code : Travail d'équipe",
-- ["Complete the track as fast as you can!"] = "",
@@ -32,8 +41,10 @@
["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "Et merde, recrue ! Dégage de me tête !",
["Dangerous Ducklings"] = "Canetons dangereux",
-- ["Deadweight"] = "",
+-- ["Demolition is fun!"] = "",
-- ["Depleted Kamikaze!"] = "",
-- ["Destroy invaders to score points."] = "",
+-- ["Double Kill!"] = "",
-- ["Drone Hunter!"] = "",
-- ["Drowner"] = "",
-- ["Each turn you get 1-3 random weapons"] = "",
@@ -42,8 +53,11 @@
["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Éliminez toutes les cibles avant d'être à cours de temps.|Vos munitions sont illimitées pour cette mission.", --Bazooka, Shotgun, SniperRifle
["Eliminate Poison before the time runs out"] = "Éliminez tout le Poison avant d'être à cours de temps.",
["Eliminate the Blue Team"] = "Éliminez l'équipe bleue",
+-- ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+-- ["Eliminate the enemy hogs to win."] = "",
-- ["Eliminate the enemy specialists."] = "",
["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "Éliminez l'unité 3378|- Résistance Futile doit survivre",
+-- ["Energetic Engineer"] = "",
["Enjoy the swim..."] = "Profitez du bain ...",
-- ["[Enter]"] = "",
["Fastest lap: "] = "Meilleur tour : ",
@@ -53,6 +67,9 @@
["Flag respawned!"] = "Drapeau réapparu",
["Flag returned!"] = "Drapeau récupéré",
-- ["Flags, and their home base will be placed where each team ends their first turn."] = "",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+-- ["fuel extended!"] = "",
-- ["GAME BEGUN!!!"] = "",
-- ["Game Modifiers: "] = "",
["GAME OVER!"] = "Fin du jeu ! ",
@@ -62,11 +79,15 @@
-- ["GO! GO! GO!"] = "",
["Good birdy......"] = "Gentil oiseau ...",
["Good luck out there!"] = "Bonne chance pour sortir d'ici",
+-- ["Good so far!"] = "",
+-- ["Good to go!"] = "",
-- ["GOTCHA!"] = "",
+-- ["Grab Mines/Explosives"] = "",
-- ["Hahahaha!"] = "",
-- ["Haha, now THAT would be something!"] = "",
-- ["Hapless Hogs"] = "",
-- [" Hapless Hogs left!"] = "",
+-- ["Health crates extend your time."] = "",
-- ["Heavy"] = "",
-- ["Hedgewars-Basketball"] = "",
-- ["Hedgewars-Knockball"] = "",
@@ -80,9 +101,15 @@
-- ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
-- ["Jumping is disabled"] = "",
-- ["Kamikaze Expert!"] = "",
+-- ["Keep it up!"] = "",
+-- ["Killing spree!"] = "",
-- ["KILLS"] = "",
+-- ["Last Target!"] = "",
-- ["[Left Shift]"] = "",
["Listen up, maggot!!"] = "Écoutez, asticots",
+-- ["Lively Lifeguard"] = "",
+-- ["Mine Deployer"] = "",
+-- ["Mine Eater!"] = "",
-- ["|- Mines Time:"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["MISSION FAILED"] = "Mission échouée", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["MISSION SUCCESS"] = "",
@@ -90,9 +117,12 @@
-- ["Movement: [Up], [Down], [Left], [Right]"] = "",
-- ["Multi-shot!"] = "",
-- ["Nameless Heroes"] = "",
+-- ["New Barrels Per Turn"] = "",
-- ["NEW CLAN RECORD: "] = "",
["NEW fastest lap: "] = "Nouveau meilleur temps",
+-- ["New Mines Per Turn"] = "",
-- ["NEW RACE RECORD: "] = "",
+-- ["Newton's Hammock"] = "",
-- ["NOT ENOUGH WAYPOINTS"] = "",
["Not So Friendly Match"] = "Match pas si amical", -- Basketball, Knockball
["Oh no! Just try again!"] = "Eh non ! Essayez encore ! ", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -100,15 +130,21 @@
-- ["Operation Diver"] = "",
["Opposing Team: "] = "Équipe opposée",
["Pathetic Hog #%d"] = "Hérisson pathétique #%d",
+-- ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
-- ["Per-Hog Ammo"] = "",
-- ["Place more waypoints using [ENTER]"] = "",
+-- ["Place more waypoints using the 'Air Attack' weapon."] = "",
["points"] = "points", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
["Poison"] = "Poison",
-- ["Power Remaining"] = "",
+-- ["Prepare yourself"] = "",
-- ["Press [Precise] to skip intro"] = "",
-- ["Race complexity limit reached."] = "",
+-- ["RACER"] = "",
[" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = "Ramenez le drapeau ennemi à votre base pour marquer | -La première équipe à 3 captures gagne | - Vous marquez uniquement si votre drapeau est dans votre base | - Les hérissons vont lâcher le drapeau s'ils sont tués ou noyés | - Les drapeaux lâchés peuvent être ramenés ou recapturés | - Les hérissons réapparaissent quand ils sont tués",
+-- ["Round Limit:"] = "",
-- ["Round Limit"] = "",
+-- ["Rounds Complete: "] = "",
-- ["Rounds Complete"] = "",
["RULES OF THE GAME [Press ESC to view]"] = "RÈGLES DU JEU | [Appuyez Échap pour voir]",
-- ["s|"] = "",
@@ -116,6 +152,7 @@
-- ["SCORE"] = "",
-- ["sec"] = "", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
["See ya!"] = "Bye bye",
+-- ["selected!"] = "",
-- ["s"] = "", -- GaudyRacer, Space_Invasion
-- ["Shield boosted! +30 power"] = "",
-- ["Shield Depleted"] = "",
@@ -127,7 +164,7 @@
-- ["Shield Seeker!"] = "",
["Shotgun Team"] = "Équipe de choc",
["Shotgun Training"] = "Entrainement au fusil",
--- ["Shots Left: "] = "", -- GaudyRacer, Tumbler
+-- ["shots remaining."] = "",
-- ["Silly"] = "",
-- ["Sinky"] = "",
["%s is out and Team %d|scored a penalty!| |Score:"] = "%s est dehors et l'équipe %d| reçoit une pénalité ! | |Score : ", -- Basketball, Knockball
@@ -146,26 +183,33 @@
["The flag will respawn next round."] = "Le drapeau va réapparaitre au prochain tour",
-- ["The Nameless One"] = "",
-- ["THE SPECIALISTS"] = "",
+-- ["This one's tricky."] = "",
-- ["This rain is really something..."] = "",
-- ["TIME: "] = "",
-- ["Timed Kamikaze!"] = "",
-- ["Time Extended!"] = "",
--- ["Time Left: "] = "",
+-- ["Time Extension"] = "",
-- ["Toggle Shield"] = "",
["Toxic Team"] = "Équipe toxique", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["TRACK COMPLETED"] = "",
--- ["Track Time: "] = "",
+-- ["TRACK FAILED!"] = "",
-- ["TrophyRace"] = "",
-- ["T_T"] = "",
+-- ["Tumbling Time Extended!"] = "",
-- ["Turn Time"] = "",
+-- ["Unit"] = "",
["Unit 3378"] = "Unité 3378",
+-- ["Unit 835"] = "",
-- ["Unlimited Attacks"] = "",
+-- ["Unstoppable!"] = "",
-- ["User Challenge"] = "",
["Use your rope to get from start to finish as fast as you can!"] = "Utilisez votre Corde Ninja pour aller du début à la fin aussi vite que vous pouvez !",
--- ["v.06"] = "",
["Victory for the "] = "Victoire pour ", -- CTF_Blizzard, Capture_the_Flag
-- ["Waypoint placed."] = "",
+-- ["Way-Points Remaining"] = "",
-- ["Weapons Reset"] = "",
+-- ["Well done."] = "",
+-- ["Will this ever end?"] = "",
-- ["WINNING TIME: "] = "",
-- ["You'd almost swear the water was rising!"] = "",
["You have SCORED!!"] = "Vous avez marqué !",
--- a/share/hedgewars/Data/Locale/hedgewars_ar.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts Sat Oct 08 16:54:56 2011 +0200
@@ -124,6 +124,14 @@
<comment>File Types</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -377,11 +385,15 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Drawn Maps (*.hwmap);;All files (*.*)</source>
+ <source>Save drawn map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save drawn map</source>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -726,6 +738,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1005,7 +1021,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>اض٠اطار لا يمكن تدميره</translation>
+ <translation type="obsolete">اض٠اطار لا يمكن تدميره</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1111,6 +1127,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>اض٠اطار لا يمكن تدميره</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1635,6 +1659,10 @@
<source>unnamed</source>
<translation>غير مسمى</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1991,6 +2019,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Sat Oct 08 16:54:56 2011 +0200
@@ -123,6 +123,14 @@
<comment>File Types</comment>
<translation>Файл ÑÑŠÑ Ð·Ð°Ð¿Ð°Ð·ÐµÐ½Ð° игра на Hedgewars</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -362,12 +370,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>Ðачертани карти (*.hwmap);;Ð’Ñички файлове (*.*)</translation>
+ <translation type="obsolete">Ðачертани карти (*.hwmap);;Ð’Ñички файлове (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>Запазване на начертана карта</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -700,6 +716,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -964,10 +984,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Add an indestructable border around the terrain</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Lower gravity</source>
<translation type="unfinished"></translation>
</message>
@@ -1067,6 +1083,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1591,6 +1615,10 @@
<source>unnamed</source>
<translation>Безименен</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1943,6 +1971,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Sat Oct 08 16:54:56 2011 +0200
@@ -124,6 +124,14 @@
<comment>File Types</comment>
<translation>Hedgewars Save Soubor</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -363,12 +371,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>Nakreslené mapy (*.hwmap);;Všechny soubory (*.*)</translation>
+ <translation type="obsolete">Nakreslené mapy (*.hwmap);;Všechny soubory (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>Uložit nakreslenou mapu</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -712,6 +728,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -988,7 +1008,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>PÅ™idá nezniÄitelnou hranici okolo terénu</translation>
+ <translation type="obsolete">PÅ™idá nezniÄitelnou hranici okolo terénu</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1082,6 +1102,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>PÅ™idá nezniÄitelnou hranici okolo terénu</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1606,6 +1634,10 @@
<source>unnamed</source>
<translation>nepojmenovaný</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1958,6 +1990,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_de.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Sat Oct 08 16:54:56 2011 +0200
@@ -5,26 +5,26 @@
<name>AmmoSchemeModel</name>
<message>
<source>new</source>
- <translation>Neu</translation>
+ <translation>neu</translation>
</message>
<message>
<source>copy of</source>
- <translation type="unfinished"></translation>
+ <translation>Kopie von</translation>
</message>
</context>
<context>
<name>DrawMapWidget</name>
<message>
<source>File error</source>
- <translation type="unfinished"></translation>
+ <translation>Dateifehler</translation>
</message>
<message>
<source>Cannot open file '%1' for writing</source>
- <translation type="unfinished"></translation>
+ <translation>Datei '%1' konnte nicht für Schreibzugriff geöffnet werden.</translation>
</message>
<message>
<source>Cannot read file '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Datei '%1' konnte nicht gelese werden.</translation>
</message>
</context>
<context>
@@ -61,7 +61,7 @@
</message>
<message>
<source>When this option is enabled selecting a game scheme will auto-select a weapon</source>
- <translation type="unfinished"></translation>
+ <translation>Wenn diese Option aktiviert ist, wird durch Auswählen eines Spielprofils auch automatisch Waffen ausgewählt</translation>
</message>
</context>
<context>
@@ -123,6 +123,14 @@
<comment>File Types</comment>
<translation>Hedgewars gespeichertes Spiel</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation>Demo-Name</translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation>Demo-Name:</translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -207,11 +215,11 @@
</message>
<message>
<source>Seed</source>
- <translation type="unfinished"></translation>
+ <translation>Seed</translation>
</message>
<message>
<source>Set</source>
- <translation type="unfinished"></translation>
+ <translation>Setzen</translation>
</message>
</context>
<context>
@@ -295,14 +303,17 @@
</message>
<message>
<source>Nickname</source>
- <translation type="unfinished">Spitzname</translation>
+ <translation>Spitzname</translation>
</message>
<message>
<source>Some one already uses
your nickname %1
on the server.
Please pick another nickname:</source>
- <translation type="unfinished"></translation>
+ <translation>Jemand verwendet
+deinen Spiznamen %1
+bereits auf dem Server.
+Bitte wähle einen anderen Spitznamen:</translation>
</message>
</context>
<context>
@@ -359,38 +370,42 @@
</message>
<message>
<source>Cancel</source>
- <translation type="unfinished">Abbrechen</translation>
+ <translation>Abbrechen</translation>
</message>
</context>
<context>
<name>PageDrawMap</name>
<message>
<source>Undo</source>
- <translation type="unfinished"></translation>
+ <translation>Rückgängig</translation>
</message>
<message>
<source>Clear</source>
- <translation type="unfinished"></translation>
+ <translation>Löschen</translation>
</message>
<message>
<source>Load</source>
- <translation type="unfinished">Laden</translation>
+ <translation>Laden</translation>
</message>
<message>
<source>Save</source>
- <translation type="unfinished"></translation>
+ <translation>Sichern</translation>
</message>
<message>
<source>Load drawn map</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation type="unfinished"></translation>
+ <translation>Gezeichnete Karte laden</translation>
</message>
<message>
<source>Save drawn map</source>
- <translation type="unfinished"></translation>
+ <translation>Gezeichnete Karte sichern</translation>
+ </message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation>Gezeichnete Karten</translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation>Alle Dateien</translation>
</message>
</context>
<context>
@@ -745,27 +760,31 @@
<message>
<source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Du findest die Hedgewars Konfigurationsdateien unter "Library/Application Support/Hedgewars" in deinem Home-Verzeichnis. Erstelle Backups oder kopiere deine Dateien, aber editiere sie besser nicht selbst.</translation>
</message>
<message>
<source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Du findest die Hedgewars Konfigurationsdateien unter ".hedgewars" in deinem Home-Verzeichnis. Erstelle Backups oder kopiere deine Dateien, aber editiere sie besser nicht selbst.</translation>
</message>
<message>
<source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Die Windows version von Hedgewars unterstützt Xfire. Füge Hedgewars zu deiner Spieleliste hinzu damit deine Freunde dich spielen sehen können.</translation>
</message>
<message>
<source>Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Benutze den Molotov-Cocktail oder den Flammenwerfer um Igel vorübergehend am passieren von Gelände wie z.B. Tunnels oder Platformen zu hindern.</translation>
</message>
<message>
<source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Die Verwendung der Zielsuchende Biene ist ein bisschen knifflig. Ihr Wenderadius hängt von der Geschwindigkeit ab, versuche sie also nicht mit voller Stärke wegzuschießen.</translation>
+ </message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation>Herunterladbare Inhalte</translation>
</message>
</context>
<context>
@@ -794,15 +813,15 @@
</message>
<message>
<source>Error</source>
- <translation type="unfinished">Fehler</translation>
+ <translation>Fehler</translation>
</message>
<message>
<source>Please enter room name</source>
- <translation type="unfinished">Bitte einen Raumnamen eingeben</translation>
+ <translation>Bitte einen Raumnamen eingeben</translation>
</message>
<message>
<source>OK</source>
- <translation type="unfinished">OK</translation>
+ <translation>OK</translation>
</message>
</context>
<context>
@@ -848,27 +867,27 @@
</message>
<message>
<source>New scheme</source>
- <translation type="unfinished"></translation>
+ <translation>Neues Spielprofil</translation>
</message>
<message>
<source>Edit scheme</source>
- <translation type="unfinished"></translation>
+ <translation>Spielprofil bearbeiten</translation>
</message>
<message>
<source>Delete scheme</source>
- <translation type="unfinished"></translation>
+ <translation>Spielprofil löschen</translation>
</message>
<message>
<source>New weapon set</source>
- <translation type="unfinished"></translation>
+ <translation>Neues Waffenprofil</translation>
</message>
<message>
<source>Edit weapon set</source>
- <translation type="unfinished"></translation>
+ <translation>Waffenprofil bearbeiten</translation>
</message>
<message>
<source>Delete weapon set</source>
- <translation type="unfinished"></translation>
+ <translation>Waffenprofil löschen</translation>
</message>
</context>
<context>
@@ -1022,9 +1041,9 @@
</message>
<message numerus="yes">
<source>%1 players online</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%1 Spieler online</numerusform>
+ <numerusform>%1 Spieler online</numerusform>
</translation>
</message>
</context>
@@ -1075,10 +1094,6 @@
<translation>Die Landschaft ist nicht zerstörbar!</translation>
</message>
<message>
- <source>Add an indestructable border around the terrain</source>
- <translation>Einfügen eines unzerstörbaren Kartenrand</translation>
- </message>
- <message>
<source>Lower gravity</source>
<translation>Verringerte Schwerkraft</translation>
</message>
@@ -1136,19 +1151,27 @@
</message>
<message>
<source>You will not have to worry about wind anymore.</source>
- <translation type="unfinished"></translation>
+ <translation>Du wirst dich nicht mehr um Wind kümmern müssen.</translation>
</message>
<message>
<source>Wind will affect almost everything.</source>
- <translation type="unfinished"></translation>
+ <translation>Wind beeinflusst fast alles.</translation>
</message>
<message>
<source>Copy</source>
- <translation type="unfinished"></translation>
+ <translation>Kopieren</translation>
</message>
<message>
<source>Teams in each clan take successive turns sharing their turn time.</source>
- <translation type="unfinished"></translation>
+ <translation>Teams gleicher Farbe kommen nacheinander dran und teilen sich ihre Zugzeit.</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>Fügt eine unzerstörbare Randbegrenzung um das Spielfeld herum hinzu.</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation>Fügt eine unzerstörbare Randbegrenzung am unteren Kartenrand hinzu.</translation>
</message>
</context>
<context>
@@ -1163,11 +1186,11 @@
</message>
<message>
<source>New</source>
- <translation type="unfinished">Neu</translation>
+ <translation>Neu</translation>
</message>
<message>
<source>Copy</source>
- <translation type="unfinished"></translation>
+ <translation>Kopieren</translation>
</message>
</context>
<context>
@@ -1245,7 +1268,7 @@
</message>
<message>
<source>Update</source>
- <translation type="unfinished">Aktualisieren</translation>
+ <translation>Aktualisieren</translation>
</message>
</context>
<context>
@@ -1351,71 +1374,71 @@
</message>
<message>
<source>hand drawn map...</source>
- <translation type="unfinished"></translation>
+ <translation>Handgezeichnete Karte</translation>
</message>
<message>
<source>Disabled</source>
- <translation type="unfinished"></translation>
+ <translation>Deaktiviert</translation>
</message>
<message>
<source>Red/Cyan</source>
- <translation type="unfinished"></translation>
+ <translation>Rot/Türkis</translation>
</message>
<message>
<source>Cyan/Red</source>
- <translation type="unfinished"></translation>
+ <translation>Türkis/Rot</translation>
</message>
<message>
<source>Red/Blue</source>
- <translation type="unfinished"></translation>
+ <translation>Rot/Blau</translation>
</message>
<message>
<source>Blue/Red</source>
- <translation type="unfinished"></translation>
+ <translation>Blau/Rot</translation>
</message>
<message>
<source>Red/Green</source>
- <translation type="unfinished"></translation>
+ <translation>Rot/Grün</translation>
</message>
<message>
<source>Green/Red</source>
- <translation type="unfinished"></translation>
+ <translation>Grün/Rot</translation>
</message>
<message>
<source>Side-by-side</source>
- <translation type="unfinished"></translation>
+ <translation>Nebeneinander</translation>
</message>
<message>
<source>Top-Bottom</source>
- <translation type="unfinished"></translation>
+ <translation>Ãœbereinander</translation>
</message>
<message>
<source>Wiggle</source>
- <translation type="unfinished"></translation>
+ <translation>Wackeln</translation>
</message>
<message>
<source>Red/Cyan grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Rot/Türkis Graustufen</translation>
</message>
<message>
<source>Cyan/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Türkis/Rot Graustufen</translation>
</message>
<message>
<source>Red/Blue grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Rot/Blau Graustufen</translation>
</message>
<message>
<source>Blue/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Blau/Rot Graustufen</translation>
</message>
<message>
<source>Red/Green grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Rot/Grün Graustufen</translation>
</message>
<message>
<source>Green/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Grün/Rot Graustufen</translation>
</message>
</context>
<context>
@@ -1470,7 +1493,7 @@
</message>
<message>
<source>Schemes and Weapons</source>
- <translation type="unfinished"></translation>
+ <translation>Spielprofile und Waffen</translation>
</message>
</context>
<context>
@@ -1647,31 +1670,31 @@
</message>
<message>
<source>% Rope Length</source>
- <translation type="unfinished"></translation>
+ <translation>% Seillänge</translation>
</message>
<message>
<source>Stereo rendering</source>
- <translation type="unfinished"></translation>
+ <translation>Stereo-Rendering</translation>
</message>
<message>
<source>Game Options</source>
- <translation type="unfinished"></translation>
+ <translation>Spieloptionen</translation>
</message>
<message>
<source>Style</source>
- <translation type="unfinished"></translation>
+ <translation>Stil</translation>
</message>
<message>
<source>Scheme</source>
- <translation type="unfinished"></translation>
+ <translation>Spielprofil</translation>
</message>
<message>
<source>Password</source>
- <translation type="unfinished">Passwort</translation>
+ <translation>Passwort</translation>
</message>
<message>
<source>% Get Away Time</source>
- <translation type="unfinished"></translation>
+ <translation>% Rückzugszeit</translation>
</message>
</context>
<context>
@@ -1680,6 +1703,10 @@
<source>unnamed</source>
<translation>unbenannt</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation>Igel %1</translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1740,27 +1767,27 @@
</message>
<message>
<source>Teams</source>
- <translation type="unfinished">Teams</translation>
+ <translation>Teams</translation>
</message>
<message>
<source>Really delete this team?</source>
- <translation type="unfinished"></translation>
+ <translation>Dieses Team wirklich löschen?</translation>
</message>
<message>
<source>Schemes</source>
- <translation type="unfinished"></translation>
+ <translation>Spielprofil</translation>
</message>
<message>
<source>Can not delete default scheme '%1'!</source>
- <translation type="unfinished"></translation>
+ <translation>Standardspielprofil '%1' kann nicht gelöscht werden!</translation>
</message>
<message>
<source>Really delete this game scheme?</source>
- <translation type="unfinished"></translation>
+ <translation>Dieses Spielprofil wirklich löschen?</translation>
</message>
<message>
<source>Can not delete default weapon set '%1'!</source>
- <translation type="unfinished"></translation>
+ <translation>Standardwaffenprofil '%1' kann nicht gelöscht werden!</translation>
</message>
</context>
<context>
@@ -1858,7 +1885,7 @@
</message>
<message>
<source>more</source>
- <translation type="unfinished"></translation>
+ <translation>mehr</translation>
</message>
</context>
<context>
@@ -1912,11 +1939,11 @@
</message>
<message>
<source>new</source>
- <translation type="unfinished">Neu</translation>
+ <translation>neu</translation>
</message>
<message>
<source>copy of</source>
- <translation type="unfinished"></translation>
+ <translation>Kopie von</translation>
</message>
</context>
<context>
@@ -2026,15 +2053,19 @@
</message>
<message>
<source>Disable Wind</source>
- <translation type="unfinished"></translation>
+ <translation>Kein Wind</translation>
</message>
<message>
<source>More Wind</source>
- <translation type="unfinished"></translation>
+ <translation>Mehr Wind</translation>
</message>
<message>
<source>Tag Team</source>
- <translation type="unfinished"></translation>
+ <translation>Tag Team</translation>
+ </message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation>Untere Randbegrenzung hinzufügen</translation>
</message>
</context>
<context>
--- a/share/hedgewars/Data/Locale/hedgewars_en.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Sat Oct 08 16:54:56 2011 +0200
@@ -123,6 +123,14 @@
<comment>File Types</comment>
<translation>Hedgewars Save File</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -379,11 +387,15 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Drawn Maps (*.hwmap);;All files (*.*)</source>
+ <source>Save drawn map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save drawn map</source>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -732,6 +744,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1009,7 +1025,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>Add an indestructable border around the terrain</translation>
+ <translation type="obsolete">Add an indestructable border around the terrain</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1115,6 +1131,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>Add an indestructible border around the terrain</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1639,6 +1663,10 @@
<source>unnamed</source>
<translation>unnamed</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1995,6 +2023,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_es.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_es.ts Sat Oct 08 16:54:56 2011 +0200
@@ -16,15 +16,15 @@
<name>DrawMapWidget</name>
<message>
<source>File error</source>
- <translation type="unfinished"></translation>
+ <translation>Error de fichero</translation>
</message>
<message>
<source>Cannot open file '%1' for writing</source>
- <translation type="unfinished"></translation>
+ <translation>No se puede abrir el fichero '%1' en modo lectura</translation>
</message>
<message>
<source>Cannot read file '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>No se puede leer '%1'</translation>
</message>
</context>
<context>
@@ -127,6 +127,14 @@
<comment>File Types</comment>
<translation>Partida guardada de Hedgewars</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation>Nombre de la demo</translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation>Nombre de la demo:</translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -215,7 +223,7 @@
</message>
<message>
<source>Set</source>
- <translation type="unfinished">Establecer</translation>
+ <translation>Cambiar</translation>
</message>
</context>
<context>
@@ -297,14 +305,17 @@
</message>
<message>
<source>Nickname</source>
- <translation type="unfinished">Nick</translation>
+ <translation>Nick</translation>
</message>
<message>
<source>Some one already uses
your nickname %1
on the server.
Please pick another nickname:</source>
- <translation type="unfinished"></translation>
+ <translation>Ya hay alguien conectado
+como %1 en estos momentos
+en el servidor.
+Por favor, introduce otro nick:</translation>
</message>
</context>
<context>
@@ -357,11 +368,11 @@
<name>PageConnecting</name>
<message>
<source>Connecting...</source>
- <translation>Conectando...</translation>
+ <translation>Estableciendo conexión...</translation>
</message>
<message>
<source>Cancel</source>
- <translation type="unfinished">Cancelar</translation>
+ <translation>Cancelar</translation>
</message>
</context>
<context>
@@ -388,12 +399,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>Mapas dibujados a mano (*.hwmap);;Todos los ficheros (*.*)</translation>
+ <translation type="obsolete">Mapas dibujados a mano (*.hwmap);;Todos los ficheros (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>Guardar mapa</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation>Mapas dibujados a mano</translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation>Todos los ficheros</translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -757,17 +776,21 @@
<message>
<source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>La versión de Hedgewars para Windows soporta Xfire. Recuerda agregar Hedgewars a tu lista de juegos para que tus amigos puedan saber cuándo estás jugando.</translation>
</message>
<message>
<source>Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Puedes usar el cóctel molotov o el lanzallamas para evitar que erizos enemigos crucen túneles angostos o puentes.</translation>
</message>
<message>
<source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>El abejorro puede ser complicado de usar. Su maniobrabilidad depende de su velocidad, asà que intenta no lanzarlo a máxima potencia.</translation>
+ </message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation>Contenido adicional</translation>
</message>
</context>
<context>
@@ -796,15 +819,15 @@
</message>
<message>
<source>Error</source>
- <translation type="unfinished">Error</translation>
+ <translation>Error</translation>
</message>
<message>
<source>Please enter room name</source>
- <translation type="unfinished">Por favor, introduce un nombre para la sala</translation>
+ <translation>Por favor, introduce un nombre para la sala</translation>
</message>
<message>
<source>OK</source>
- <translation type="unfinished">OK</translation>
+ <translation>OK</translation>
</message>
</context>
<context>
@@ -1024,8 +1047,8 @@
</message>
<message numerus="yes">
<source>%1 players online</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%1 jugadores conectados</numerusform>
<numerusform></numerusform>
</translation>
</message>
@@ -1078,7 +1101,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>Añade un borde indestructible alrededor del campo de juego</translation>
+ <translation type="obsolete">Añade un borde indestructible alrededor del campo de juego</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1150,7 +1173,15 @@
</message>
<message>
<source>Teams in each clan take successive turns sharing their turn time.</source>
- <translation type="unfinished"></translation>
+ <translation>Los equipos del mismo clan alternan entre ellos compartiendo la duración de su turno.</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>Añade un borde indestructible alrededor del campo de juego</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation>Añade un borde indestructible en la parta inferior</translation>
</message>
</context>
<context>
@@ -1247,7 +1278,7 @@
</message>
<message>
<source>Update</source>
- <translation type="unfinished">Actualizar</translation>
+ <translation>Actualizar</translation>
</message>
</context>
<context>
@@ -1389,67 +1420,67 @@
</message>
<message>
<source>Disabled</source>
- <translation type="unfinished"></translation>
+ <translation>Deshabilitado</translation>
</message>
<message>
<source>Red/Cyan</source>
- <translation type="unfinished"></translation>
+ <translation>Rojo/Cian</translation>
</message>
<message>
<source>Cyan/Red</source>
- <translation type="unfinished"></translation>
+ <translation>Cian/Rojo</translation>
</message>
<message>
<source>Red/Blue</source>
- <translation type="unfinished"></translation>
+ <translation>Rojo/Azul</translation>
</message>
<message>
<source>Blue/Red</source>
- <translation type="unfinished"></translation>
+ <translation>Azul/Rojo</translation>
</message>
<message>
<source>Red/Green</source>
- <translation type="unfinished"></translation>
+ <translation>Rojo/Verde</translation>
</message>
<message>
<source>Green/Red</source>
- <translation type="unfinished"></translation>
+ <translation>Verde/Rojo</translation>
</message>
<message>
<source>Side-by-side</source>
- <translation type="unfinished"></translation>
+ <translation>Izquierda-Derecha</translation>
</message>
<message>
<source>Top-Bottom</source>
- <translation type="unfinished"></translation>
+ <translation>Arriba-Abajo</translation>
</message>
<message>
<source>Wiggle</source>
- <translation type="unfinished"></translation>
+ <translation>Temblor</translation>
</message>
<message>
<source>Red/Cyan grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Rojo/Cian en escala de grises</translation>
</message>
<message>
<source>Cyan/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Cian/Rojo en escala de grises</translation>
</message>
<message>
<source>Red/Blue grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Rojo/Azul en escala de grises</translation>
</message>
<message>
<source>Blue/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Azul/Rojo en escala de grises</translation>
</message>
<message>
<source>Red/Green grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Rojo/Verde en escala de grises</translation>
</message>
<message>
<source>Green/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Verde/Rojo en escala de grises</translation>
</message>
</context>
<context>
@@ -1696,27 +1727,27 @@
</message>
<message>
<source>Stereo rendering</source>
- <translation type="unfinished"></translation>
+ <translation>EstereoscopÃa</translation>
</message>
<message>
<source>Game Options</source>
- <translation type="unfinished"></translation>
+ <translation>Opciones de juego</translation>
</message>
<message>
<source>Style</source>
- <translation type="unfinished"></translation>
+ <translation>Estilo</translation>
</message>
<message>
<source>Scheme</source>
- <translation type="unfinished"></translation>
+ <translation>Modo de juego</translation>
</message>
<message>
<source>Password</source>
- <translation type="unfinished">Contraseña</translation>
+ <translation>Contraseña</translation>
</message>
<message>
<source>% Get Away Time</source>
- <translation type="unfinished"></translation>
+ <translation>% duración de retirada</translation>
</message>
</context>
<context>
@@ -1725,6 +1756,10 @@
<source>unnamed</source>
<translation>sin nombre</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation>erizo %1</translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1907,7 +1942,7 @@
</message>
<message>
<source>more</source>
- <translation type="unfinished"></translation>
+ <translation>más</translation>
</message>
</context>
<context>
@@ -2083,7 +2118,11 @@
</message>
<message>
<source>Tag Team</source>
- <translation type="unfinished"></translation>
+ <translation>Tag team</translation>
+ </message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation>Añadir borde inferior</translation>
</message>
</context>
<context>
@@ -2126,39 +2165,39 @@
</message>
<message>
<source>slot 1</source>
- <translation>posición 1</translation>
+ <translation>fila 1</translation>
</message>
<message>
<source>slot 2</source>
- <translation>posición 2</translation>
+ <translation>fila 2</translation>
</message>
<message>
<source>slot 3</source>
- <translation>posición 3</translation>
+ <translation>fila 3</translation>
</message>
<message>
<source>slot 4</source>
- <translation>posición 4</translation>
+ <translation>fila 4</translation>
</message>
<message>
<source>slot 5</source>
- <translation>posición 5</translation>
+ <translation>fila 5</translation>
</message>
<message>
<source>slot 6</source>
- <translation>posición 6</translation>
+ <translation>fila 6</translation>
</message>
<message>
<source>slot 7</source>
- <translation>posición 7</translation>
+ <translation>fila 7</translation>
</message>
<message>
<source>slot 8</source>
- <translation>posición 8</translation>
+ <translation>fila 8</translation>
</message>
<message>
<source>slot 9</source>
- <translation>posición 9</translation>
+ <translation>fila 9</translation>
</message>
<message>
<source>timer 1 sec</source>
--- a/share/hedgewars/Data/Locale/hedgewars_fi.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts Sat Oct 08 16:54:56 2011 +0200
@@ -123,6 +123,14 @@
<comment>File Types</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -379,11 +387,15 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Drawn Maps (*.hwmap);;All files (*.*)</source>
+ <source>Save drawn map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save drawn map</source>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -761,6 +773,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1038,7 +1054,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>Lisää tuhoutumattomat reunat kartan ympärille</translation>
+ <translation type="obsolete">Lisää tuhoutumattomat reunat kartan ympärille</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1144,6 +1160,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>Lisää tuhoutumattomat reunat kartan ympärille</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1696,6 +1720,10 @@
<source>unnamed</source>
<translation>nimetön</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -2052,6 +2080,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Sat Oct 08 16:54:56 2011 +0200
@@ -123,6 +123,14 @@
<comment>File Types</comment>
<translation>Fichier de sauvegarde d'Hedgewars</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -380,12 +388,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>Cartes dessinées (*.hwmap);;Tous les fichiers (*.*)</translation>
+ <translation type="obsolete">Cartes dessinées (*.hwmap);;Tous les fichiers (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>Enregistrer une carte dessinée</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -752,6 +768,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1048,7 +1068,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>Ajouter une bordure indestructible autour du terrain</translation>
+ <translation type="obsolete">Ajouter une bordure indestructible autour du terrain</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1122,6 +1142,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>Ajouter une bordure indestructible autour du terrain</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1650,6 +1678,10 @@
<source>unnamed</source>
<translation>sans nom</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -2006,6 +2038,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_hu.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_hu.ts Sat Oct 08 16:54:56 2011 +0200
@@ -122,6 +122,14 @@
<comment>File Types</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -375,11 +383,15 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Drawn Maps (*.hwmap);;All files (*.*)</source>
+ <source>Save drawn map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save drawn map</source>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -720,6 +732,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -993,7 +1009,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>A pálya köré egy elpusztÃthatatlan keret felhúzása</translation>
+ <translation type="obsolete">A pálya köré egy elpusztÃthatatlan keret felhúzása</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1099,6 +1115,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>A pálya köré egy elpusztÃthatatlan keret felhúzása</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1629,6 +1653,10 @@
<source>unnamed</source>
<translation>névtelen</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1985,6 +2013,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_it.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Sat Oct 08 16:54:56 2011 +0200
@@ -16,15 +16,15 @@
<name>DrawMapWidget</name>
<message>
<source>File error</source>
- <translation type="unfinished"></translation>
+ <translation>Errore file</translation>
</message>
<message>
<source>Cannot open file '%1' for writing</source>
- <translation type="unfinished"></translation>
+ <translation>Impossibile aprire il file '%1' in scrittura</translation>
</message>
<message>
<source>Cannot read file '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Impossibile leggere il file '%1'</translation>
</message>
</context>
<context>
@@ -123,6 +123,14 @@
<comment>File Types</comment>
<translation>Salvataggio di Hedgewars</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation>Nome della demo</translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation>Nome della demo:</translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -293,14 +301,17 @@
</message>
<message>
<source>Nickname</source>
- <translation type="unfinished">Nickname</translation>
+ <translation>Nickname</translation>
</message>
<message>
<source>Some one already uses
your nickname %1
on the server.
Please pick another nickname:</source>
- <translation type="unfinished"></translation>
+ <translation>Qualcun altro sta usando
+ il tuo nickname %1
+sul server.
+Per favore scelto un altro nickname:</translation>
</message>
</context>
<context>
@@ -357,7 +368,7 @@
</message>
<message>
<source>Cancel</source>
- <translation type="unfinished">Annulla</translation>
+ <translation>Annulla</translation>
</message>
</context>
<context>
@@ -384,12 +395,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>Mappe Disegnate (*.hwmap);;Tutti i file (*.*)</translation>
+ <translation type="obsolete">Mappe Disegnate (*.hwmap);;Tutti i file (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>Salva mappa disegnata</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation>Mappe disegnate</translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation>Tutti i file</translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -604,7 +623,7 @@
<message>
<source>Connect one or more gamepads before starting the game to be able to assign their controls to your teams.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Collega uno o più gamepad prima di iniziare il gioco per poterli assegnare alle tue squadra.</translation>
</message>
<message>
<source>Create an account on %1 to keep others from using your most favourite nickname while playing on the official server.</source>
@@ -699,7 +718,7 @@
<message>
<source>You can find your Hedgewars configuration files under "My Documents\Hedgewars". Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Puoi trovare i tuoi file di configurazione Hedgewars in "Documenti\Hedgewars". Crea delle copie di sicurezza o prendi i file con te, ma non modificarli a mano.</translation>
</message>
<message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
@@ -739,7 +758,11 @@
<message>
<source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>L'Ape a Ricerca può essere difficile da usare. Il suo raggio di curvatura dipende dalla sua velocità , quindi cerca di non usarla a piena potenza.</translation>
+ </message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation>Contenuto scaricabile</translation>
</message>
</context>
<context>
@@ -768,15 +791,15 @@
</message>
<message>
<source>Error</source>
- <translation type="unfinished">Errore</translation>
+ <translation>Errore</translation>
</message>
<message>
<source>Please enter room name</source>
- <translation type="unfinished">Inserisci il nome della stanza</translation>
+ <translation>Inserisci il nome della stanza</translation>
</message>
<message>
<source>OK</source>
- <translation type="unfinished">OK</translation>
+ <translation>OK</translation>
</message>
</context>
<context>
@@ -996,9 +1019,9 @@
</message>
<message numerus="yes">
<source>%1 players online</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>1 giocatore online</numerusform>
+ <numerusform>%1 giocatori online</numerusform>
</translation>
</message>
</context>
@@ -1050,7 +1073,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>Aggiungi un bordo indistruttibile intorno al terreno</translation>
+ <translation type="obsolete">Aggiungi un bordo indistruttibile intorno al terreno</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1122,7 +1145,15 @@
</message>
<message>
<source>Teams in each clan take successive turns sharing their turn time.</source>
- <translation type="unfinished"></translation>
+ <translation>Le squadre di ogni clan possono avere turni consecutivi condividendo il tempo del loro turno.</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>Aggiungi un bordo indistruttibile intorno al terreno</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation>Aggiungi un bordo indistruttibile lungo la parte inferiore</translation>
</message>
</context>
<context>
@@ -1219,7 +1250,7 @@
</message>
<message>
<source>Update</source>
- <translation type="unfinished">Aggiorna</translation>
+ <translation>Aggiorna</translation>
</message>
</context>
<context>
@@ -1357,39 +1388,39 @@
</message>
<message>
<source>Side-by-side</source>
- <translation type="unfinished"></translation>
+ <translation>Lato-a-lato</translation>
</message>
<message>
<source>Top-Bottom</source>
- <translation type="unfinished"></translation>
+ <translation>Dall'alto in basso</translation>
</message>
<message>
<source>Wiggle</source>
- <translation type="unfinished"></translation>
+ <translation>Movimento continuo</translation>
</message>
<message>
<source>Red/Cyan grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Scala di grigio rosso/azzurro</translation>
</message>
<message>
<source>Cyan/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Scala di grigio azzurro/rosso</translation>
</message>
<message>
<source>Red/Blue grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Scala di grigio rosso/blu</translation>
</message>
<message>
<source>Blue/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Scala di grigio blu/rosso</translation>
</message>
<message>
<source>Red/Green grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Scala di grigio rosso/verde</translation>
</message>
<message>
<source>Green/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Scala di grigio verde/rosso</translation>
</message>
</context>
<context>
@@ -1633,23 +1664,23 @@
</message>
<message>
<source>Game Options</source>
- <translation type="unfinished"></translation>
+ <translation>Opzioni di gioco</translation>
</message>
<message>
<source>Style</source>
- <translation type="unfinished"></translation>
+ <translation>Style</translation>
</message>
<message>
<source>Scheme</source>
- <translation type="unfinished"></translation>
+ <translation>Schema</translation>
</message>
<message>
<source>Password</source>
- <translation type="unfinished">Password</translation>
+ <translation>Password</translation>
</message>
<message>
<source>% Get Away Time</source>
- <translation type="unfinished"></translation>
+ <translation>% tempo regalo</translation>
</message>
</context>
<context>
@@ -1658,6 +1689,10 @@
<source>unnamed</source>
<translation>senza nome</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation>riccio %1</translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -2012,7 +2047,11 @@
</message>
<message>
<source>Tag Team</source>
- <translation type="unfinished"></translation>
+ <translation>Squadre etichettate</translation>
+ </message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation>Aggiungi bordo inferiore</translation>
</message>
</context>
<context>
--- a/share/hedgewars/Data/Locale/hedgewars_ja.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts Sat Oct 08 16:54:56 2011 +0200
@@ -122,6 +122,14 @@
<comment>File Types</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -361,11 +369,15 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Drawn Maps (*.hwmap);;All files (*.*)</source>
+ <source>Save drawn map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save drawn map</source>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -694,6 +706,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -952,10 +968,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Add an indestructable border around the terrain</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Lower gravity</source>
<translation type="unfinished"></translation>
</message>
@@ -1055,6 +1067,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1575,6 +1595,10 @@
<source>unnamed</source>
<translation>ç„¡å</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1927,6 +1951,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_ko.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_ko.ts Sat Oct 08 16:54:56 2011 +0200
@@ -118,6 +118,14 @@
<comment>File Types</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -353,13 +361,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Save drawn map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -682,6 +694,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -940,10 +956,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Add an indestructable border around the terrain</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Lower gravity</source>
<translation type="unfinished"></translation>
</message>
@@ -1043,6 +1055,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1555,6 +1575,10 @@
<source>unnamed</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1897,6 +1921,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_lt.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_lt.ts Sat Oct 08 16:54:56 2011 +0200
@@ -4,12 +4,12 @@
<context>
<name>AmmoSchemeModel</name>
<message>
- <location filename="../../../../QTfrontend/ammoSchemeModel.cpp" line="660"/>
+ <location filename="../../../../QTfrontend/ammoSchemeModel.cpp" line="672"/>
<source>new</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/ammoSchemeModel.cpp" line="666"/>
+ <location filename="../../../../QTfrontend/ammoSchemeModel.cpp" line="678"/>
<source>copy of</source>
<translation type="unfinished"></translation>
</message>
@@ -68,12 +68,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="299"/>
+ <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="301"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="299"/>
+ <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="301"/>
<source>Illegal ammo scheme</source>
<translation type="unfinished"></translation>
</message>
@@ -81,22 +81,22 @@
<context>
<name>HWChatWidget</name>
<message>
- <location filename="../../../../QTfrontend/chatwidget.cpp" line="454"/>
+ <location filename="../../../../QTfrontend/chatwidget.cpp" line="453"/>
<source>%1 *** %2 has been removed from your ignore list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/chatwidget.cpp" line="467"/>
+ <location filename="../../../../QTfrontend/chatwidget.cpp" line="466"/>
<source>%1 *** %2 has been added to your ignore list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/chatwidget.cpp" line="483"/>
+ <location filename="../../../../QTfrontend/chatwidget.cpp" line="482"/>
<source>%1 *** %2 has been removed from your friends list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/chatwidget.cpp" line="496"/>
+ <location filename="../../../../QTfrontend/chatwidget.cpp" line="495"/>
<source>%1 *** %2 has been added to your friends list</source>
<translation type="unfinished"></translation>
</message>
@@ -104,59 +104,70 @@
<context>
<name>HWForm</name>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="391"/>
- <location filename="../../../../QTfrontend/hwform.cpp" line="393"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="401"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="403"/>
<source>DefaultTeam</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="711"/>
- <location filename="../../../../QTfrontend/hwform.cpp" line="893"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="728"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="910"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="712"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="729"/>
<source>Please select record from the list above</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="713"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="730"/>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="894"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="911"/>
<source>Unable to start the server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="1067"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="1086"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="1323"/>
<source>Cannot save record to file %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="1256"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="1275"/>
<source>Hedgewars Demo File</source>
<comment>File Types</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="1257"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="1276"/>
<source>Hedgewars Save File</source>
<comment>File Types</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="1315"/>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="1315"/>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
<message>
- <location filename="../../../../QTfrontend/game.cpp" line="311"/>
+ <location filename="../../../../QTfrontend/game.cpp" line="318"/>
<source>en.txt</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../QTfrontend/game.cpp" line="329"/>
+ <translation>lt.txt</translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/game.cpp" line="336"/>
<source>Cannot open demofile %1</source>
<translation type="unfinished"></translation>
</message>
@@ -164,87 +175,87 @@
<context>
<name>HWMapContainer</name>
<message>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="160"/>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="158"/>
<source>Map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="163"/>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="161"/>
<source>Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="165"/>
+ <source>All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="166"/>
+ <source>Small</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../../../QTfrontend/mapContainer.cpp" line="167"/>
- <source>All</source>
+ <source>Medium</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/mapContainer.cpp" line="168"/>
- <source>Small</source>
+ <source>Large</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/mapContainer.cpp" line="169"/>
- <source>Medium</source>
+ <source>Cavern</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/mapContainer.cpp" line="170"/>
- <source>Large</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="171"/>
- <source>Cavern</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="172"/>
<source>Wacky</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="177"/>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="175"/>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="179"/>
+ <source>Small tunnels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="180"/>
+ <source>Medium tunnels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../../../QTfrontend/mapContainer.cpp" line="181"/>
- <source>Small tunnels</source>
+ <source>Large tunnels</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/mapContainer.cpp" line="182"/>
- <source>Medium tunnels</source>
+ <source>Small floating islands</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/mapContainer.cpp" line="183"/>
- <source>Large tunnels</source>
+ <source>Medium floating islands</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/mapContainer.cpp" line="184"/>
- <source>Small floating islands</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="185"/>
- <source>Medium floating islands</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="186"/>
<source>Large floating islands</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="196"/>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="194"/>
<source>Themes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="238"/>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="236"/>
<source>Seed</source>
<translation type="unfinished"></translation>
</message>
@@ -317,12 +328,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/newnetclient.cpp" line="519"/>
+ <location filename="../../../../QTfrontend/newnetclient.cpp" line="508"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/newnetclient.cpp" line="519"/>
+ <location filename="../../../../QTfrontend/newnetclient.cpp" line="508"/>
<source>Your nickname %1 is
registered on Hedgewars.org
Please provide your password below
@@ -330,17 +341,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/newnetclient.cpp" line="628"/>
+ <location filename="../../../../QTfrontend/newnetclient.cpp" line="623"/>
<source>Quit reason: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/newnetclient.cpp" line="834"/>
+ <location filename="../../../../QTfrontend/newnetclient.cpp" line="829"/>
<source>Nickname</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/newnetclient.cpp" line="834"/>
+ <location filename="../../../../QTfrontend/newnetclient.cpp" line="829"/>
<source>Some one already uses
your nickname %1
on the server.
@@ -437,7 +448,13 @@
<message>
<location filename="../../../../QTfrontend/pagedrawmap.cpp" line="48"/>
<location filename="../../../../QTfrontend/pagedrawmap.cpp" line="56"/>
- <source>Drawn Maps (*.hwmap);;All files (*.*)</source>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/pagedrawmap.cpp" line="48"/>
+ <location filename="../../../../QTfrontend/pagedrawmap.cpp" line="56"/>
+ <source>All files</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -462,27 +479,27 @@
<context>
<name>PageGameStats</name>
<message>
- <location filename="../../../../QTfrontend/pagegamestats.cpp" line="57"/>
+ <location filename="../../../../QTfrontend/pagegamestats.cpp" line="62"/>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagegamestats.cpp" line="71"/>
+ <location filename="../../../../QTfrontend/pagegamestats.cpp" line="76"/>
<source>Health graph</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagegamestats.cpp" line="88"/>
+ <location filename="../../../../QTfrontend/pagegamestats.cpp" line="93"/>
<source>Ranking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagegamestats.cpp" line="148"/>
+ <location filename="../../../../QTfrontend/pagegamestats.cpp" line="153"/>
<source>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../../../../QTfrontend/pagegamestats.cpp" line="155"/>
+ <location filename="../../../../QTfrontend/pagegamestats.cpp" line="160"/>
<source>The best killer is <b>%1</b> with <b>%2</b> kills in a turn.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -491,7 +508,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../../../../QTfrontend/pagegamestats.cpp" line="161"/>
+ <location filename="../../../../QTfrontend/pagegamestats.cpp" line="166"/>
<source>A total of <b>%1</b> hedgehog(s) were killed during this round.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -500,7 +517,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../../../../QTfrontend/pagegamestats.cpp" line="222"/>
+ <location filename="../../../../QTfrontend/pagegamestats.cpp" line="227"/>
<source>(%1 kill)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -509,7 +526,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../../../../QTfrontend/pagegamestats.cpp" line="232"/>
+ <location filename="../../../../QTfrontend/pagegamestats.cpp" line="237"/>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -518,7 +535,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../../../../QTfrontend/pagegamestats.cpp" line="239"/>
+ <location filename="../../../../QTfrontend/pagegamestats.cpp" line="244"/>
<source><b>%1</b> killed <b>%2</b> of his own hedgehogs.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -527,7 +544,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../../../../QTfrontend/pagegamestats.cpp" line="246"/>
+ <location filename="../../../../QTfrontend/pagegamestats.cpp" line="251"/>
<source><b>%1</b> was scared and skipped turn <b>%2</b> times.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -539,305 +556,310 @@
<context>
<name>PageMain</name>
<message>
- <location filename="../../../../QTfrontend/pagemain.cpp" line="46"/>
+ <location filename="../../../../QTfrontend/pagemain.cpp" line="47"/>
<source>Local Game (Play a game on a single computer)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagemain.cpp" line="50"/>
+ <location filename="../../../../QTfrontend/pagemain.cpp" line="51"/>
<source>Network Game (Play a game across a network)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagemain.cpp" line="61"/>
- <source>Simply pick the same color as a friend to play together as a team. Each of you will still control his or her own hedgehogs but they'll win or lose together.</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../QTfrontend/pagemain.cpp" line="62"/>
- <source>Some weapons might do only low damage but they can be a lot more devastating in the right situation. Try to use the Desert Eagle to knock multiple hedgehogs into the water.</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../QTfrontend/pagemain.cpp" line="63"/>
- <source>If you're unsure what to do and don't want to waste ammo, skip one round. But don't let too much time pass as there will be Sudden Death!</source>
- <comment>Tips</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../QTfrontend/pagemain.cpp" line="64"/>
- <source>Want to save ropes? Release the rope in mid air and then shoot again. As long as you don't touch the ground you'll reuse your rope without wasting ammo!</source>
- <comment>Tips</comment>
+ <location filename="../../../../QTfrontend/pagemain.cpp" line="54"/>
+ <source>Downloadable Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="65"/>
- <source>If you'd like to keep others from using your preferred nickname on the official server, register an account at http://www.hedgewars.org/.</source>
+ <source>Simply pick the same color as a friend to play together as a team. Each of you will still control his or her own hedgehogs but they'll win or lose together.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="66"/>
- <source>You're bored of default gameplay? Try one of the missions - they'll offer different gameplay depending on the one you picked.</source>
+ <source>Some weapons might do only low damage but they can be a lot more devastating in the right situation. Try to use the Desert Eagle to knock multiple hedgehogs into the water.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="67"/>
- <source>By default the game will always record the last game played as a demo. Select 'Local Game' and pick the 'Demos' button on the lower right corner to play or manage them.</source>
+ <source>If you're unsure what to do and don't want to waste ammo, skip one round. But don't let too much time pass as there will be Sudden Death!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="68"/>
- <source>Hedgewars is Open Source and Freeware we create in our spare time. If you've got problems, ask on our forums but please don't expect 24/7 support!</source>
+ <source>Want to save ropes? Release the rope in mid air and then shoot again. As long as you don't touch the ground you'll reuse your rope without wasting ammo!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="69"/>
- <source>Hedgewars is Open Source and Freeware we create in our spare time. If you like it, help us with a small donation or contribute your own work!</source>
+ <source>If you'd like to keep others from using your preferred nickname on the official server, register an account at http://www.hedgewars.org/.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="70"/>
- <source>Hedgewars is Open Source and Freeware we create in our spare time. Share it with your family and friends as you like!</source>
+ <source>You're bored of default gameplay? Try one of the missions - they'll offer different gameplay depending on the one you picked.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="71"/>
- <source>Hedgewars is Open Source and Freeware we create in our spare time. If someone sold you the game, you should try get a refund!</source>
+ <source>By default the game will always record the last game played as a demo. Select 'Local Game' and pick the 'Demos' button on the lower right corner to play or manage them.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="72"/>
- <source>From time to time there will be official tournaments. Upcoming events will be announced at http://www.hedgewars.org/ some days in advance.</source>
+ <source>Hedgewars is Open Source and Freeware we create in our spare time. If you've got problems, ask on our forums but please don't expect 24/7 support!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="73"/>
- <source>Hedgewars is available in many languages. If the translation in your language seems to be missing or outdated, feel free to contact us!</source>
+ <source>Hedgewars is Open Source and Freeware we create in our spare time. If you like it, help us with a small donation or contribute your own work!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="74"/>
- <source>Hedgewars can be run on lots of different operating systems including Microsoft Windows, Mac OS X and Linux.</source>
+ <source>Hedgewars is Open Source and Freeware we create in our spare time. Share it with your family and friends as you like!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="75"/>
- <source>Always remember you're able to set up your own games in local and network/online play. You're not restricted to the 'Simple Game' option.</source>
+ <source>Hedgewars is Open Source and Freeware we create in our spare time. If someone sold you the game, you should try get a refund!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="76"/>
- <source>Connect one or more gamepads before starting the game to be able to assign their controls to your teams.</source>
+ <source>From time to time there will be official tournaments. Upcoming events will be announced at http://www.hedgewars.org/ some days in advance.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="77"/>
- <source>Create an account on %1 to keep others from using your most favourite nickname while playing on the official server.</source>
+ <source>Hedgewars is available in many languages. If the translation in your language seems to be missing or outdated, feel free to contact us!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="78"/>
- <source>While playing you should give yourself a short break at least once an hour.</source>
+ <source>Hedgewars can be run on lots of different operating systems including Microsoft Windows, Mac OS X and Linux.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="79"/>
- <source>If your graphics card isn't able to provide hardware accelerated OpenGL, try to enable the low quality mode to improve performance.</source>
+ <source>Always remember you're able to set up your own games in local and network/online play. You're not restricted to the 'Simple Game' option.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="80"/>
- <source>If your graphics card isn't able to provide hardware accelerated OpenGL, try to update the associated drivers.</source>
+ <source>Connect one or more gamepads before starting the game to be able to assign their controls to your teams.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="81"/>
- <source>We're open to suggestions and constructive feedback. If you don't like something or got a great idea, let us know!</source>
+ <source>Create an account on %1 to keep others from using your most favourite nickname while playing on the official server.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="82"/>
- <source>Especially while playing online be polite and always remember there might be some minors playing with or against you as well!</source>
+ <source>While playing you should give yourself a short break at least once an hour.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="83"/>
- <source>Special game modes such as 'Vampirism' or 'Karma' allow you to develop completely new tactics. Try them in a custom game!</source>
+ <source>If your graphics card isn't able to provide hardware accelerated OpenGL, try to enable the low quality mode to improve performance.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="84"/>
- <source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing.</source>
+ <source>If your graphics card isn't able to provide hardware accelerated OpenGL, try to update the associated drivers.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="85"/>
- <source>You should never install Hedgewars on computers you don't own (school, university, work, etc.). Please ask the responsible person instead!</source>
+ <source>We're open to suggestions and constructive feedback. If you don't like something or got a great idea, let us know!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="86"/>
- <source>Hedgewars can be perfect for short games during breaks. Just ensure you don't add too many hedgehogs or use an huge map. Reducing time and health might help as well.</source>
+ <source>Especially while playing online be polite and always remember there might be some minors playing with or against you as well!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="87"/>
- <source>No hedgehogs were harmed in making this game.</source>
+ <source>Special game modes such as 'Vampirism' or 'Karma' allow you to develop completely new tactics. Try them in a custom game!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="88"/>
- <source>There are three different jumps available. Tap [high jump] twice to do a very high/backwards jump.</source>
+ <source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="89"/>
- <source>Afraid of falling off a cliff? Hold down [precise] to turn [left] or [right] without actually moving.</source>
+ <source>You should never install Hedgewars on computers you don't own (school, university, work, etc.). Please ask the responsible person instead!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="90"/>
- <source>Some weapons require special strategies or just lots of training, so don't give up on a particular tool if you miss an enemy once.</source>
+ <source>Hedgewars can be perfect for short games during breaks. Just ensure you don't add too many hedgehogs or use an huge map. Reducing time and health might help as well.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="91"/>
- <source>Most weapons won't work once they touch the water. The Homing Bee as well as the Cake are exceptions to this.</source>
+ <source>No hedgehogs were harmed in making this game.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="92"/>
- <source>The Old Limbuger only causes a small explosion. However the wind affected smelly cloud can poison lots of hogs at once.</source>
+ <source>There are three different jumps available. Tap [high jump] twice to do a very high/backwards jump.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="93"/>
- <source>The Piano Strike is the most damaging air strike. You'll lose the hedgehog performing it, so there's a huge downside as well.</source>
+ <source>Afraid of falling off a cliff? Hold down [precise] to turn [left] or [right] without actually moving.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="94"/>
- <source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
+ <source>Some weapons require special strategies or just lots of training, so don't give up on a particular tool if you miss an enemy once.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="95"/>
- <source>Sticky Mines are a perfect tool to create small chain reactions knocking enemy hedgehogs into dire situations ... or water.</source>
+ <source>Most weapons won't work once they touch the water. The Homing Bee as well as the Cake are exceptions to this.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="96"/>
- <source>The Hammer is most effective when used on bridges or girders. Hit hogs will just break through the ground.</source>
+ <source>The Old Limbuger only causes a small explosion. However the wind affected smelly cloud can poison lots of hogs at once.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="97"/>
- <source>If you're stuck behind an enemy hedgehog, use the Hammer to free yourself without getting damaged by an explosion.</source>
+ <source>The Piano Strike is the most damaging air strike. You'll lose the hedgehog performing it, so there's a huge downside as well.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="98"/>
- <source>The Cake's maximum walking distance depends on the ground it has to pass. Use [attack] to detonate it early.</source>
+ <source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="99"/>
- <source>The Flame Thrower is a weapon but it can be used for tunnel digging as well.</source>
+ <source>Sticky Mines are a perfect tool to create small chain reactions knocking enemy hedgehogs into dire situations ... or water.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="100"/>
- <source>Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
+ <source>The Hammer is most effective when used on bridges or girders. Hit hogs will just break through the ground.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="101"/>
- <source>Want to know who's behind the game? Click on the Hedgewars logo in the main menu to see the credits.</source>
+ <source>If you're stuck behind an enemy hedgehog, use the Hammer to free yourself without getting damaged by an explosion.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="102"/>
- <source>Like Hedgewars? Become a fan on %1 or follow us on %2!</source>
+ <source>The Cake's maximum walking distance depends on the ground it has to pass. Use [attack] to detonate it early.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="103"/>
- <source>Feel free to draw your own graves, hats, flags or even maps and themes! But note that you'll have to share them somewhere to use them online.</source>
+ <source>The Flame Thrower is a weapon but it can be used for tunnel digging as well.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="104"/>
- <source>Really want to wear a specific hat? Donate to us and receive an exclusive hat of your choice!</source>
+ <source>Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/pagemain.cpp" line="105"/>
+ <source>Want to know who's behind the game? Click on the Hedgewars logo in the main menu to see the credits.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/pagemain.cpp" line="106"/>
+ <source>Like Hedgewars? Become a fan on %1 or follow us on %2!</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="107"/>
- <source>Keep your video card drivers up to date to avoid issues playing the game.</source>
+ <source>Feel free to draw your own graves, hats, flags or even maps and themes! But note that you'll have to share them somewhere to use them online.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagemain.cpp" line="110"/>
- <source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
+ <location filename="../../../../QTfrontend/pagemain.cpp" line="108"/>
+ <source>Really want to wear a specific hat? Donate to us and receive an exclusive hat of your choice!</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/pagemain.cpp" line="112"/>
+ <source>Keep your video card drivers up to date to avoid issues playing the game.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="113"/>
- <source>You can find your Hedgewars configuration files under "My Documents\Hedgewars". Create backups or take the files with you, but don't edit them by hand.</source>
+ <source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="115"/>
- <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <source>You can find your Hedgewars configuration files under "My Documents\Hedgewars". Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pagemain.cpp" line="117"/>
+ <source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
+ <comment>Tips</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/pagemain.cpp" line="119"/>
<source>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
<comment>Tips</comment>
<translation type="unfinished"></translation>
@@ -1170,7 +1192,7 @@
</message>
<message>
<location filename="../../../../QTfrontend/pagescheme.cpp" line="81"/>
- <source>Add an indestructable border around the terrain</source>
+ <source>Add an indestructible border around the terrain</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1274,27 +1296,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="318"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="165"/>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="323"/>
<source>Random</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="319"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="324"/>
<source>Seconds</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="389"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="394"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="390"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="395"/>
<source>New</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="391"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="396"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
@@ -1379,23 +1406,23 @@
</message>
<message>
<location filename="../../../../QTfrontend/chatwidget.cpp" line="180"/>
- <location filename="../../../../QTfrontend/chatwidget.cpp" line="527"/>
+ <location filename="../../../../QTfrontend/chatwidget.cpp" line="526"/>
<source>Ignore</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/chatwidget.cpp" line="183"/>
- <location filename="../../../../QTfrontend/chatwidget.cpp" line="538"/>
+ <location filename="../../../../QTfrontend/chatwidget.cpp" line="537"/>
<source>Add friend</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/chatwidget.cpp" line="522"/>
+ <location filename="../../../../QTfrontend/chatwidget.cpp" line="521"/>
<source>Unignore</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/chatwidget.cpp" line="533"/>
+ <location filename="../../../../QTfrontend/chatwidget.cpp" line="532"/>
<source>Remove friend</source>
<translation type="unfinished"></translation>
</message>
@@ -1463,22 +1490,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="300"/>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="301"/>
<source>Fullscreen</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="359"/>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="362"/>
<source>Enable sound</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="363"/>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="366"/>
<source>Enable music</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="381"/>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="384"/>
<source>Show FPS</source>
<translation type="unfinished"></translation>
</message>
@@ -1486,40 +1513,40 @@
<context>
<name>QComboBox</name>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="1217"/>
- <location filename="../../../../QTfrontend/hwform.cpp" line="1226"/>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="144"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="1236"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="1245"/>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="142"/>
<source>Mission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="76"/>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="74"/>
<source>generated map...</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="78"/>
+ <source>generated maze...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../../../QTfrontend/mapContainer.cpp" line="80"/>
- <source>generated maze...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="82"/>
<source>hand drawn map...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="125"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="130"/>
<source>Human</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="129"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="134"/>
<source>Level</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="258"/>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="292"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="263"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="297"/>
<source>Community</source>
<translation type="unfinished"></translation>
</message>
@@ -1529,82 +1556,82 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="321"/>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="324"/>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="322"/>
- <source>Red/Cyan</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="323"/>
- <source>Cyan/Red</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="324"/>
- <source>Red/Blue</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="325"/>
- <source>Blue/Red</source>
+ <source>Red/Cyan</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="326"/>
- <source>Red/Green</source>
+ <source>Cyan/Red</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="327"/>
- <source>Green/Red</source>
+ <source>Red/Blue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="328"/>
- <source>Side-by-side</source>
+ <source>Blue/Red</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="329"/>
- <source>Top-Bottom</source>
+ <source>Red/Green</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="330"/>
- <source>Wiggle</source>
+ <source>Green/Red</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="331"/>
- <source>Red/Cyan grayscale</source>
+ <source>Side-by-side</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="332"/>
- <source>Cyan/Red grayscale</source>
+ <source>Top-Bottom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="333"/>
- <source>Red/Blue grayscale</source>
+ <source>Wiggle</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="334"/>
- <source>Blue/Red grayscale</source>
+ <source>Red/Cyan grayscale</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="335"/>
- <source>Red/Green grayscale</source>
+ <source>Cyan/Red grayscale</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="336"/>
+ <source>Red/Blue grayscale</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="337"/>
+ <source>Blue/Red grayscale</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="338"/>
+ <source>Red/Green grayscale</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="339"/>
<source>Green/Red grayscale</source>
<translation type="unfinished"></translation>
</message>
@@ -1634,17 +1661,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="98"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="103"/>
<source>Team Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="173"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="178"/>
<source>Fort</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="301"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="306"/>
<source>Key binds</source>
<translation type="unfinished"></translation>
</message>
@@ -1692,37 +1719,37 @@
<context>
<name>QLabel</name>
<message>
- <location filename="../../../../QTfrontend/about.cpp" line="50"/>
+ <location filename="../../../../QTfrontend/about.cpp" line="49"/>
<source>Version</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/about.cpp" line="52"/>
+ <location filename="../../../../QTfrontend/about.cpp" line="51"/>
<source>This program is distributed under the GNU General Public License</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/about.cpp" line="67"/>
+ <location filename="../../../../QTfrontend/about.cpp" line="66"/>
<source>Developers:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/about.cpp" line="84"/>
+ <location filename="../../../../QTfrontend/about.cpp" line="86"/>
<source>Art:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/about.cpp" line="102"/>
+ <location filename="../../../../QTfrontend/about.cpp" line="104"/>
<source>Sounds:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/about.cpp" line="112"/>
+ <location filename="../../../../QTfrontend/about.cpp" line="114"/>
<source>Translations:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/about.cpp" line="135"/>
+ <location filename="../../../../QTfrontend/about.cpp" line="138"/>
<source>Special thanks:</source>
<translation type="unfinished"></translation>
</message>
@@ -1758,37 +1785,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="102"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="107"/>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="105"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="110"/>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="108"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="113"/>
<source>Grave</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="111"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="116"/>
<source>Flag</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="114"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="119"/>
<source>Voice</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagemain.cpp" line="119"/>
+ <location filename="../../../../QTfrontend/pagemain.cpp" line="121"/>
<source>Tip: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagemain.cpp" line="122"/>
+ <location filename="../../../../QTfrontend/pagemain.cpp" line="124"/>
<source>This development build is 'work in progress' and may not be compatible with other versions of the game. Some features might be broken or incomplete. Use at your own risk!</source>
<translation type="unfinished"></translation>
</message>
@@ -1828,107 +1855,107 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="305"/>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="306"/>
<source>Quality</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="317"/>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="320"/>
<source>Stereo rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="350"/>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="353"/>
<source>Initial sound volume</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="374"/>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="377"/>
<source>FPS limit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageoptions.cpp" line="391"/>
+ <location filename="../../../../QTfrontend/pageoptions.cpp" line="394"/>
<source>Restart game to apply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="168"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="173"/>
<source>Damage Modifier</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="182"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="187"/>
<source>Turn Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="196"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="201"/>
<source>Initial Health</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="210"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="215"/>
<source>Sudden Death Timeout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="224"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="229"/>
<source>Sudden Death Water Rise</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="238"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="243"/>
<source>Sudden Death Health Decrease</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="252"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="257"/>
<source>% Rope Length</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="266"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="271"/>
<source>Crate Drops</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="279"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="284"/>
<source>% Health Crates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="293"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="298"/>
<source>Health in Crates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="307"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="312"/>
<source>Mines Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="323"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="328"/>
<source>Mines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="337"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="342"/>
<source>% Dud Mines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="351"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="356"/>
<source>Explosives</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="365"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="370"/>
<source>% Get Away Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="379"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="384"/>
<source>Scheme Name:</source>
<translation type="unfinished"></translation>
</message>
@@ -1936,10 +1963,17 @@
<context>
<name>QLineEdit</name>
<message>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="642"/>
<location filename="../../../../QTfrontend/pageoptions.cpp" line="192"/>
<source>unnamed</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="355"/>
+ <location filename="../../../../QTfrontend/team.cpp" line="41"/>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1952,60 +1986,60 @@
<context>
<name>QMessageBox</name>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="640"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="657"/>
<source>Teams</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="640"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="657"/>
<source>Really delete this team?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="686"/>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="468"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="703"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="474"/>
<source>Schemes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="686"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="703"/>
<source>Can not delete default scheme '%1'!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="939"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="956"/>
<source>Network</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="940"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="957"/>
<source>Connection to server is lost</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="1284"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="1303"/>
<source>All file associations have been set.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/hwform.cpp" line="1285"/>
+ <location filename="../../../../QTfrontend/hwform.cpp" line="1304"/>
<source>File association failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../../../QTfrontend/main.cpp" line="380"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../../../QTfrontend/main.cpp" line="381"/>
- <source>Error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../QTfrontend/main.cpp" line="382"/>
<source>Failed to open data directory:
%1
Please check your installation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pagescheme.cpp" line="468"/>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="474"/>
<source>Really delete this game scheme?</source>
<translation type="unfinished"></translation>
</message>
@@ -2079,7 +2113,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/mapContainer.cpp" line="246"/>
+ <location filename="../../../../QTfrontend/mapContainer.cpp" line="244"/>
<source>more</source>
<translation type="unfinished"></translation>
</message>
@@ -2090,7 +2124,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="92"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="97"/>
<source>Random Team</source>
<translation type="unfinished"></translation>
</message>
@@ -2371,6 +2405,11 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../../../QTfrontend/pagescheme.cpp" line="165"/>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
@@ -2564,17 +2603,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/binds.cpp" line="66"/>
+ <location filename="../../../../QTfrontend/binds.cpp" line="65"/>
<source>change mode</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/binds.cpp" line="68"/>
+ <location filename="../../../../QTfrontend/binds.cpp" line="66"/>
<source>capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/binds.cpp" line="69"/>
+ <location filename="../../../../QTfrontend/binds.cpp" line="67"/>
<source>hedgehogs
info</source>
<translation type="unfinished"></translation>
@@ -2671,17 +2710,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/binds.cpp" line="66"/>
+ <location filename="../../../../QTfrontend/binds.cpp" line="65"/>
<source>Toggle fullscreen mode:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/binds.cpp" line="68"/>
+ <location filename="../../../../QTfrontend/binds.cpp" line="66"/>
<source>Take a screenshot:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/binds.cpp" line="69"/>
+ <location filename="../../../../QTfrontend/binds.cpp" line="67"/>
<source>Toggle labels above hedgehogs:</source>
<translation type="unfinished"></translation>
</message>
@@ -2726,7 +2765,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/pageeditteam.cpp" line="340"/>
+ <location filename="../../../../QTfrontend/pageeditteam.cpp" line="345"/>
<source>Keyboard</source>
<translation type="unfinished"></translation>
</message>
--- a/share/hedgewars/Data/Locale/hedgewars_nl.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_nl.ts Sat Oct 08 16:54:56 2011 +0200
@@ -119,6 +119,14 @@
<comment>File Types</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -364,13 +372,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Save drawn map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -699,6 +711,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -960,10 +976,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Add an indestructable border around the terrain</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Lower gravity</source>
<translation type="unfinished"></translation>
</message>
@@ -1063,6 +1075,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1575,6 +1595,10 @@
<source>unnamed</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1917,6 +1941,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Sat Oct 08 16:54:56 2011 +0200
@@ -130,11 +130,11 @@
</message>
<message>
<source>Demo name</source>
- <translation type="unfinished">Nazwa demo</translation>
+ <translation>Podaj nazwÄ™</translation>
</message>
<message>
<source>Demo name:</source>
- <translation type="unfinished">Nazwa demo:</translation>
+ <translation>Nazwa demo:</translation>
</message>
</context>
<context>
@@ -400,12 +400,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>Narysowane mapy (*.hwmap);;Wszystkie pliki (*.*)</translation>
+ <translation type="obsolete">Narysowane mapy (*.hwmap);;Wszystkie pliki (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>Zapisz mapÄ™</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation>Narysowane mapy</translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation>Wszystkie pliki</translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -527,7 +535,7 @@
<message>
<source>Some weapons might do only low damage but they can be a lot more devastating in the right situation. Try to use the Desert Eagle to knock multiple hedgehogs into the water.</source>
<comment>Tips</comment>
- <translation type="unfinished">Niektóre z broni zadają mało punktów obrażeń jednak użyte w odpowiednim momencie mogą pokazać pazur. Na przykład spróbuj użyć pistoletu by strącić swoich przeciwników do wody.</translation>
+ <translation>Niektóre z broni zadają mało punktów obrażeń jednak użyte w odpowiednim momencie mogą pokazać pazur. Na przykład spróbuj użyć pistoletu by strącić swoich przeciwników do wody.</translation>
</message>
<message>
<source>If you're unsure what to do and don't want to waste ammo, skip one round. But don't let too much time pass as there will be Sudden Death!</source>
@@ -572,17 +580,17 @@
<message>
<source>From time to time there will be official tournaments. Upcoming events will be announced at http://www.hedgewars.org/ some days in advance.</source>
<comment>Tips</comment>
- <translation type="unfinished">Od czasu do czasu będą organizowane mistrzostwa. Będą one ogłaszane z wyprzedzeniem na http://www.hedgewars.org/ .</translation>
+ <translation>Od czasu do czasu będą organizowane mistrzostwa. Będą one ogłaszane z wyprzedzeniem na http://www.hedgewars.org/ .</translation>
</message>
<message>
<source>Hedgewars is available in many languages. If the translation in your language seems to be missing or outdated, feel free to contact us!</source>
<comment>Tips</comment>
- <translation type="unfinished">Hedgewars jest dostępne w wielu językach. Jeśli brakuje tłumaczenia w twoim języku bądź jest ono niekompletne, nie bój się z nami skontaktować!</translation>
+ <translation>Hedgewars jest dostępne w wielu językach. Jeśli brakuje tłumaczenia w twoim języku bądź jest ono niekompletne, nie bój się z nami skontaktować!</translation>
</message>
<message>
<source>Hedgewars can be run on lots of different operating systems including Microsoft Windows, Mac OS X and Linux.</source>
<comment>Tips</comment>
- <translation type="unfinished">Hedgewars może być uruchomione na różnych systemach operacyjnych takich jak Microsoft Windows, MacOS X, FreeBSD oraz Linux.</translation>
+ <translation>Hedgewars może być uruchomione na różnych systemach operacyjnych takich jak Microsoft Windows, MacOS X, FreeBSD oraz Linux.</translation>
</message>
<message>
<source>Always remember you're able to set up your own games in local and network/online play. You're not restricted to the 'Simple Game' option.</source>
@@ -617,7 +625,7 @@
<message>
<source>Especially while playing online be polite and always remember there might be some minors playing with or against you as well!</source>
<comment>Tips</comment>
- <translation type="unfinished">Bądź kulturalny grając przez internet. Pamiętaj o tym, że w Hedgewars mogą grać także młodsze osoby!</translation>
+ <translation>Bądź kulturalny grając przez internet. Pamiętaj o tym, że w Hedgewars mogą grać także młodsze osoby!</translation>
</message>
<message>
<source>Special game modes such as 'Vampirism' or 'Karma' allow you to develop completely new tactics. Try them in a custom game!</source>
@@ -657,7 +665,7 @@
<message>
<source>Connect one or more gamepads before starting the game to be able to assign their controls to your teams.</source>
<comment>Tips</comment>
- <translation type="unfinished">Jeśli podłączysz jeden lub więcej gamepadów przed włączeniem gry będziesz miał możliwość przypisania klawiszy by sterować swoimi jeżami.</translation>
+ <translation>Jeśli podłączysz jeden lub więcej gamepadów przed włączeniem gry będziesz miał możliwość przypisania klawiszy by sterować swoimi jeżami.</translation>
</message>
<message>
<source>Create an account on %1 to keep others from using your most favourite nickname while playing on the official server.</source>
@@ -772,12 +780,12 @@
<message>
<source>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
<comment>Tips</comment>
- <translation type="unfinished">Możesz powiązać typy plików związane z Hedgewars (zapisy gier i dema) by móc je uruchamiać bezpośrednio z ulubionego menedżera plików bądź przeglądarki internetowej.</translation>
+ <translation>Możesz powiązać typy plików związane z Hedgewars (zapisy gier i dema) by móc je uruchamiać bezpośrednio z ulubionego menedżera plików bądź przeglądarki internetowej.</translation>
</message>
<message>
<source>Want to save ropes? Release the rope in mid air and then shoot again. As long as you don't touch the ground you'll reuse your rope without wasting ammo!</source>
<comment>Tips</comment>
- <translation type="unfinished">Chcesz zaoszczędzić liny? Odłącz ją będąc w powietrzu, a potem wypuść ją ponownie. Dopóki nie dotkniesz ziemi, będziesz używał pojedynczego naboju!</translation>
+ <translation>Chcesz zaoszczędzić liny? Odłącz ją będąc w powietrzu, a potem wypuść ją ponownie. Dopóki nie dotkniesz ziemi, będziesz używał pojedynczego naboju!</translation>
</message>
<message>
<source>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</source>
@@ -792,21 +800,21 @@
<message>
<source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing.</source>
<comment>Tips</comment>
- <translation type="unfinished">Wersja Hedgewars dla systemu Windows wspiera XFire. Upewnij się, że dodałeś Hedgewars do listy gier by Twoi znajomi mogli zobaczyć Ciebie w czasie gry.</translation>
+ <translation>Wersja Hedgewars dla systemu Windows wspiera XFire. Upewnij się, że dodałeś Hedgewars do listy gier by Twoi znajomi mogli zobaczyć Ciebie w czasie gry.</translation>
</message>
<message>
<source>Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
<comment>Tips</comment>
- <translation type="unfinished">Użyj koktajlu Mołotowa lub Miotacza ognia by powstrzymać przeciwnika przed przedostaniem się przez tunele lub platformy.</translation>
+ <translation>Użyj koktajlu Mołotowa lub Miotacza ognia by powstrzymać przeciwnika przed przedostaniem się przez tunele lub platformy.</translation>
</message>
<message>
<source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
<comment>Tips</comment>
- <translation type="unfinished">Pszczoła potrafi być ciężka w użyciu. Jej promień skrętu zależy od prędkości lotu, więc nie staraj się nie używać pełnej mocy podczas strzału.</translation>
+ <translation>Pszczoła potrafi być ciężka w użyciu. Jej promień skrętu zależy od prędkości lotu, więc nie staraj się nie używać pełnej mocy podczas strzału.</translation>
</message>
<message>
<source>Downloadable Content</source>
- <translation type="unfinished">Dodatki do pobrania</translation>
+ <translation>Dodatki do pobrania</translation>
</message>
</context>
<context>
@@ -1196,11 +1204,11 @@
</message>
<message>
<source>Add an indestructible border around the terrain</source>
- <translation type="unfinished">Dodaje niezniszczalną ramkę dookoła terenu</translation>
+ <translation>Dodaje niezniszczalną ramkę dookoła terenu</translation>
</message>
<message>
<source>Add an indestructible border along the bottom</source>
- <translation type="unfinished">Dodaje na dole niezniszczalnÄ… ramkÄ™</translation>
+ <translation>>Dodaje niezniszczalną ramkę u dołu mapy</translation>
</message>
</context>
<context>
@@ -1439,67 +1447,67 @@
</message>
<message>
<source>Disabled</source>
- <translation type="unfinished">Wyłączone</translation>
+ <translation>Wyłączone</translation>
</message>
<message>
<source>Red/Cyan</source>
- <translation type="unfinished">Czerwone/Błękitne</translation>
+ <translation>Czerwone/Błękitne</translation>
</message>
<message>
<source>Cyan/Red</source>
- <translation type="unfinished">Błękitne/Czerwone</translation>
+ <translation>Błękitne/Czerwone</translation>
</message>
<message>
<source>Red/Blue</source>
- <translation type="unfinished">Czerwone/Niebieskie</translation>
+ <translation>Czerwone/Niebieskie</translation>
</message>
<message>
<source>Blue/Red</source>
- <translation type="unfinished">Niebieskie/Czerwone</translation>
+ <translation>Niebieskie/Czerwone</translation>
</message>
<message>
<source>Red/Green</source>
- <translation type="unfinished">Czerwone/Zielone</translation>
+ <translation>Czerwone/Zielone</translation>
</message>
<message>
<source>Green/Red</source>
- <translation type="unfinished">Zielone/Czerwone</translation>
+ <translation>Zielone/Czerwone</translation>
</message>
<message>
<source>Side-by-side</source>
- <translation type="unfinished">Obok siebie</translation>
+ <translation>Obok siebie</translation>
</message>
<message>
<source>Top-Bottom</source>
- <translation type="unfinished">Góra-dół</translation>
+ <translation>Góra-dół</translation>
</message>
<message>
<source>Wiggle</source>
- <translation type="unfinished">Trzęsący się obraz</translation>
+ <translation>Trzęsący się obraz</translation>
</message>
<message>
<source>Red/Cyan grayscale</source>
- <translation type="unfinished">Czer/Błęk w odc. szar</translation>
+ <translation>Czer/Błęk w odc. szar</translation>
</message>
<message>
<source>Cyan/Red grayscale</source>
- <translation type="unfinished">Błęk/Czer w odc. szar</translation>
+ <translation>Błęk/Czer w odc. szar</translation>
</message>
<message>
<source>Red/Blue grayscale</source>
- <translation type="unfinished">Czer/Nieb w odc. szar</translation>
+ <translation>Czer/Nieb w odc. szar</translation>
</message>
<message>
<source>Blue/Red grayscale</source>
- <translation type="unfinished">Nieb/Czer w odc. szar</translation>
+ <translation>Nieb/Czer w odc. szar</translation>
</message>
<message>
<source>Red/Green grayscale</source>
- <translation type="unfinished">Czer/Ziel w odc. szar</translation>
+ <translation>Czer/Ziel w odc. szar</translation>
</message>
<message>
<source>Green/Red grayscale</source>
- <translation type="unfinished">Ziel/Czer w odc. szar</translation>
+ <translation>Ziel/Czer w odc. szar</translation>
</message>
</context>
<context>
@@ -1749,27 +1757,27 @@
</message>
<message>
<source>Stereo rendering</source>
- <translation type="unfinished">Wyświetlanie w 3D</translation>
+ <translation>Wyświetlanie w 3D</translation>
</message>
<message>
<source>Game Options</source>
- <translation type="unfinished">Opcje</translation>
+ <translation>Opcje</translation>
</message>
<message>
<source>Style</source>
- <translation type="unfinished">Tryb gry</translation>
+ <translation>Tryb gry</translation>
</message>
<message>
<source>Scheme</source>
- <translation type="unfinished">Schemat</translation>
+ <translation>Schemat</translation>
</message>
<message>
<source>Password</source>
- <translation type="unfinished">Hasło</translation>
+ <translation>Hasło</translation>
</message>
<message>
<source>% Get Away Time</source>
- <translation type="unfinished">Czas na ucieczkÄ™ w %</translation>
+ <translation>Czas na ucieczkÄ™ w %</translation>
</message>
</context>
<context>
@@ -1778,6 +1786,10 @@
<source>unnamed</source>
<translation>nienazwany</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation>jeż %1</translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -2136,11 +2148,11 @@
</message>
<message>
<source>Tag Team</source>
- <translation type="unfinished">Zespół</translation>
+ <translation>Zespół</translation>
</message>
<message>
<source>Add Bottom Border</source>
- <translation type="unfinished">Ddoaj ramkÄ™ na dole</translation>
+ <translation>Dodaj ramkÄ™ na dole</translation>
</message>
</context>
<context>
--- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sat Oct 08 16:54:56 2011 +0200
@@ -123,6 +123,14 @@
<comment>File Types</comment>
<translation>Arquivo do Jogo Hedgewars</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -373,12 +381,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>Mapas Desenhados (*.hwmaps);; Todos os arquivos (*.*)</translation>
+ <translation type="obsolete">Mapas Desenhados (*.hwmaps);; Todos os arquivos (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>Salvar Mapa</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -820,6 +836,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1129,7 +1149,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>Adicione uma borda indestrutÃvel em volta do terreno</translation>
+ <translation type="obsolete">Adicione uma borda indestrutÃvel em volta do terreno</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1203,6 +1223,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>Adicione uma borda indestrutÃvel em volta do terreno</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1773,6 +1801,10 @@
<source>unnamed</source>
<translation>sem nome</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -2138,6 +2170,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Sat Oct 08 16:54:56 2011 +0200
@@ -123,6 +123,14 @@
<comment>File Types</comment>
<translation>Ficheiro de jogo Hedgewars</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation>Nome do demo</translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation>Nome do demo:</translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -382,12 +390,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>Mapas Desenhados (*.hwmap);;Todos os ficheiros (*.*)</translation>
+ <translation type="obsolete">Mapas Desenhados (*.hwmap);;Todos os ficheiros (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>Gravar mapa desenhado</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation>Mapas Desenhados</translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation>Todos os ficheiros</translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -734,6 +750,11 @@
<comment>Tips</comment>
<translation>A Abelha Teleguiada pode-se demonstrar complicada de utilizar. O grau a que consegue virar depende da sua velocidade, por isso experimenta lança-la com diferentes nÃveis de força.</translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation>Conteúdo TransferÃvel
+Downloadable Content</translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -990,8 +1011,8 @@
<message numerus="yes">
<source>%1 players online</source>
<translation>
+ <numerusform>%1 jogador online</numerusform>
<numerusform>%1 jogadores online</numerusform>
- <numerusform>%1 jogador online</numerusform>
</translation>
</message>
</context>
@@ -1010,10 +1031,6 @@
<translation>O terreno não pode ser destruÃdo!</translation>
</message>
<message>
- <source>Add an indestructable border around the terrain</source>
- <translation>Adiciona uma borda indestrutÃvel à volta do terreno</translation>
- </message>
- <message>
<source>Lower gravity</source>
<translation>Baixa gravidade</translation>
</message>
@@ -1117,6 +1134,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation>As equipas do mesmo clã jogam de forma sucessiva partilhando o seu tempo para jogar.</translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>Adiciona uma barreira indestrutÃvel à volta do terreno</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation>Adiciona uma barreira indestrutÃvel ao longo do fundo do terreno</translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1358,7 +1383,7 @@
</message>
<message>
<source>Wiggle</source>
- <translation>"Wiggle"</translation>
+ <translation>"Wiggle"</translation>
</message>
<message>
<source>Red/Cyan grayscale</source>
@@ -1641,6 +1666,10 @@
<source>unnamed</source>
<translation>sem nome</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation>ouriço %1</translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1997,6 +2026,10 @@
<source>Tag Team</source>
<translation>Tag Team</translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation>Adicionar borda inferior</translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Sat Oct 08 16:54:56 2011 +0200
@@ -128,6 +128,14 @@
<comment>File Types</comment>
<translation>Файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¸Ð³Ñ€Ñ‹ hedgewars</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -388,12 +396,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>РиÑованные карты (*.hwmap);;Ð’Ñе файлы (*.*)</translation>
+ <translation type="obsolete">РиÑованные карты (*.hwmap);;Ð’Ñе файлы (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>Сохранить риÑованную карту</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -748,6 +764,10 @@
<comment>Tips</comment>
<translation>Пчёлку можеть быть Ñложно иÑпользовать. Её Ñ€Ð°Ð´Ð¸ÑƒÑ Ð¿Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚Ð° завиÑит от ÑкороÑти, поÑтому попробуйте не иÑпользовать полную Ñилу броÑка.</translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1060,7 +1080,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>Добавить неразрушимую границу вокруг карты</translation>
+ <translation type="obsolete">Добавить неразрушимую границу вокруг карты</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1134,6 +1154,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation>Команды в каждом клане будут поÑледовательно получать право хода, Ð¸Ð¼ÐµÑ Ð¾Ð±Ñ‰ÐµÐµ Ð²Ñ€ÐµÐ¼Ñ Ð½Ð° ход.</translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>Добавить неразрушимую границу вокруг карты</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1668,6 +1696,10 @@
<source>unnamed</source>
<translation>безымÑнный</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -2024,6 +2056,10 @@
<source>Tag Team</source>
<translation>ÐÑтафета команд</translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Sat Oct 08 16:54:56 2011 +0200
@@ -128,6 +128,14 @@
<comment>File Types</comment>
<translation>Súbor s uloženou hrou Hedgewars</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -390,12 +398,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>Nakreslené mapy (*.hwmap);;Všetky súbory (*.*)</translation>
+ <translation type="obsolete">Nakreslené mapy (*.hwmap);;Všetky súbory (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>Uložiť nakreslenú mapu</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -789,6 +805,10 @@
<comment>Tips</comment>
<translation>Navádzaná vÄela je troÅ¡ku zložitejÅ¡ia na použitie. Jej polomer otoÄenia závisà na jej rýchlosti, takže ju radÅ¡ej nepoužÃvajte pri plnej sile.</translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1101,7 +1121,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>PridaÅ¥ nezniÄiteľný okraj okolo terénu</translation>
+ <translation type="obsolete">PridaÅ¥ nezniÄiteľný okraj okolo terénu</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1175,6 +1195,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation>TÃmy každého klanu sa striedajú v Å¥ahanà a zdieľajú svoj Äas na Å¥ah.</translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>PridaÅ¥ nezniÄiteľný okraj okolo terénu</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1746,6 +1774,10 @@
<source>unnamed</source>
<translation>beznázvu</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -2106,6 +2138,10 @@
<source>Tag Team</source>
<translation>OznaÄit tÃm</translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_sv.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts Sat Oct 08 16:54:56 2011 +0200
@@ -16,15 +16,15 @@
<name>DrawMapWidget</name>
<message>
<source>File error</source>
- <translation type="unfinished"></translation>
+ <translation>Fel på fil</translation>
</message>
<message>
<source>Cannot open file '%1' for writing</source>
- <translation type="unfinished"></translation>
+ <translation>Kan inte skriva till '%1'</translation>
</message>
<message>
<source>Cannot read file '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Kan inte läsa '%1'</translation>
</message>
</context>
<context>
@@ -123,6 +123,14 @@
<comment>File Types</comment>
<translation>Sparfil för Hedgewars</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation>Demonamn</translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation>Demonamn:</translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -207,7 +215,7 @@
</message>
<message>
<source>Set</source>
- <translation type="unfinished">Ange</translation>
+ <translation>Ange</translation>
</message>
</context>
<context>
@@ -289,14 +297,17 @@
</message>
<message>
<source>Nickname</source>
- <translation type="unfinished">Smeknamn</translation>
+ <translation>Smeknamn</translation>
</message>
<message>
<source>Some one already uses
your nickname %1
on the server.
Please pick another nickname:</source>
- <translation type="unfinished"></translation>
+ <translation>Någon använder redan
+ditt smeknamn %1
+på servern.
+Välj ett annat smeknamn:</translation>
</message>
</context>
<context>
@@ -353,7 +364,7 @@
</message>
<message>
<source>Cancel</source>
- <translation type="unfinished">Avbryt</translation>
+ <translation>Avbryt</translation>
</message>
</context>
<context>
@@ -380,12 +391,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>Ritade kartor (*.hwmap);;Alla filer (*.*)</translation>
+ <translation type="obsolete">Ritade kartor (*.hwmap);;Alla filer (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>Spara ritad karta</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation>Ritade kartor</translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation>Alla filer</translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -749,17 +768,21 @@
<message>
<source>The Windows version of Hedgewars supports Xfire. Make sure to add Hedgewars to its game list so your friends can see you playing.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Windows-versionen av Hedgewars har stöd för Xfire. Se till att lägga till Hedgewars till spellistan så att dina vänner kan se dig spela.</translation>
</message>
<message>
<source>Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Använd molotov eller eldkastaren för att temporärt förhindra att igelkottar passerar terräng så som tunnlar eller platformar.</translation>
</message>
<message>
<source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
<comment>Tips</comment>
- <translation type="unfinished"></translation>
+ <translation>Målsökande bin kan vara kluriga att använda. Svängradien beror på hastigheten, så försök att inte använda full kraft.</translation>
+ </message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation>Nedladdningsbart innehåll</translation>
</message>
</context>
<context>
@@ -788,15 +811,15 @@
</message>
<message>
<source>Error</source>
- <translation type="unfinished">Fel</translation>
+ <translation>Fel</translation>
</message>
<message>
<source>Please enter room name</source>
- <translation type="unfinished">Skriv in rummets namn</translation>
+ <translation>Skriv in rummets namn</translation>
</message>
<message>
<source>OK</source>
- <translation type="unfinished">OK</translation>
+ <translation>OK</translation>
</message>
</context>
<context>
@@ -1016,8 +1039,8 @@
</message>
<message numerus="yes">
<source>%1 players online</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%1 spelare inne</numerusform>
<numerusform></numerusform>
</translation>
</message>
@@ -1070,7 +1093,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>Lägger till en oförstörbar kant runt terrängen</translation>
+ <translation type="obsolete">Lägger till en oförstörbar kant runt terrängen</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1142,7 +1165,15 @@
</message>
<message>
<source>Teams in each clan take successive turns sharing their turn time.</source>
- <translation type="unfinished"></translation>
+ <translation>Lag inom en klan spelar efter varandra och delar på turtiden.</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>Lägger till en oförstörbar kant runt terrängen</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation>Lägg till en oförstörbar barriär längs botten</translation>
</message>
</context>
<context>
@@ -1239,7 +1270,7 @@
</message>
<message>
<source>Update</source>
- <translation type="unfinished">Uppdatera</translation>
+ <translation>Uppdatera</translation>
</message>
</context>
<context>
@@ -1381,67 +1412,67 @@
</message>
<message>
<source>Disabled</source>
- <translation type="unfinished"></translation>
+ <translation>Avaktiverad</translation>
</message>
<message>
<source>Red/Cyan</source>
- <translation type="unfinished"></translation>
+ <translation>Röd/Cyan</translation>
</message>
<message>
<source>Cyan/Red</source>
- <translation type="unfinished"></translation>
+ <translation>Cyan/Röd</translation>
</message>
<message>
<source>Red/Blue</source>
- <translation type="unfinished"></translation>
+ <translation>Röd/Blå</translation>
</message>
<message>
<source>Blue/Red</source>
- <translation type="unfinished"></translation>
+ <translation>Blå/Röd</translation>
</message>
<message>
<source>Red/Green</source>
- <translation type="unfinished"></translation>
+ <translation>Röd/Grön</translation>
</message>
<message>
<source>Green/Red</source>
- <translation type="unfinished"></translation>
+ <translation>Grön/Röd</translation>
</message>
<message>
<source>Side-by-side</source>
- <translation type="unfinished"></translation>
+ <translation>Sida vid sida</translation>
</message>
<message>
<source>Top-Bottom</source>
- <translation type="unfinished"></translation>
+ <translation>Uppe och nere</translation>
</message>
<message>
<source>Wiggle</source>
- <translation type="unfinished"></translation>
+ <translation>Vicka</translation>
</message>
<message>
<source>Red/Cyan grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Röd/Cyan gråskala</translation>
</message>
<message>
<source>Cyan/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Cyan/Röd gråskala</translation>
</message>
<message>
<source>Red/Blue grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Röd/Blå gråskala</translation>
</message>
<message>
<source>Blue/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Blå/Röd gråskala</translation>
</message>
<message>
<source>Red/Green grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Röd/Grön gråskala</translation>
</message>
<message>
<source>Green/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Grön/Röd gråskala</translation>
</message>
</context>
<context>
@@ -1681,27 +1712,27 @@
</message>
<message>
<source>Stereo rendering</source>
- <translation type="unfinished"></translation>
+ <translation>Stereorendering</translation>
</message>
<message>
<source>Game Options</source>
- <translation type="unfinished"></translation>
+ <translation>Spelinställningar</translation>
</message>
<message>
<source>Style</source>
- <translation type="unfinished"></translation>
+ <translation>Stil</translation>
</message>
<message>
<source>Scheme</source>
- <translation type="unfinished"></translation>
+ <translation>Schema</translation>
</message>
<message>
<source>Password</source>
- <translation type="unfinished">Lösenord</translation>
+ <translation>Lösenord</translation>
</message>
<message>
<source>% Get Away Time</source>
- <translation type="unfinished"></translation>
+ <translation>% flykttid</translation>
</message>
</context>
<context>
@@ -1710,6 +1741,10 @@
<source>unnamed</source>
<translation>onämnd</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation>igelkott %1</translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1892,7 +1927,7 @@
</message>
<message>
<source>more</source>
- <translation type="unfinished"></translation>
+ <translation>mer</translation>
</message>
</context>
<context>
@@ -2068,7 +2103,11 @@
</message>
<message>
<source>Tag Team</source>
- <translation type="unfinished"></translation>
+ <translation>Maraton</translation>
+ </message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation>Lägg till undre barriär</translation>
</message>
</context>
<context>
--- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Sat Oct 08 16:54:56 2011 +0200
@@ -122,6 +122,14 @@
<comment>File Types</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -365,11 +373,15 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Drawn Maps (*.hwmap);;All files (*.*)</source>
+ <source>Save drawn map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save drawn map</source>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -698,6 +710,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -957,7 +973,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>Bölgenin etrafına yok edilemez bir sınır ekle</translation>
+ <translation type="obsolete">Bölgenin etrafına yok edilemez bir sınır ekle</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1063,6 +1079,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>Bölgenin etrafına yok edilemez bir sınır ekle</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1583,6 +1607,10 @@
<source>unnamed</source>
<translation>isimsiz</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1939,6 +1967,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Sat Oct 08 16:54:56 2011 +0200
@@ -16,15 +16,15 @@
<name>DrawMapWidget</name>
<message>
<source>File error</source>
- <translation type="unfinished"></translation>
+ <translation>Помилка файлу</translation>
</message>
<message>
<source>Cannot open file '%1' for writing</source>
- <translation type="unfinished"></translation>
+ <translation>Ðе можу відкрити файл '%1' Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу</translation>
</message>
<message>
<source>Cannot read file '%1'</source>
- <translation type="unfinished"></translation>
+ <translation>Ðе можу прочитати файл '%1'</translation>
</message>
</context>
<context>
@@ -124,6 +124,14 @@
<comment>File Types</comment>
<translation>Файл Ð—Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Hedgewars</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -290,14 +298,17 @@
</message>
<message>
<source>Nickname</source>
- <translation type="unfinished">Ім'Ñ</translation>
+ <translation>Ðікнейм</translation>
</message>
<message>
<source>Some one already uses
your nickname %1
on the server.
Please pick another nickname:</source>
- <translation type="unfinished"></translation>
+ <translation>ХтоÑÑŒ вже викориÑтовує
+ нікнейм %1
+на Ñервері.
+Виберіть інший нікнейм:</translation>
</message>
</context>
<context>
@@ -354,7 +365,7 @@
</message>
<message>
<source>Cancel</source>
- <translation type="unfinished">СкаÑувати</translation>
+ <translation>СкаÑувати</translation>
</message>
</context>
<context>
@@ -381,12 +392,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>Ðамальовані мапи (*.hwmap);;Ð’ÑÑ– файли (*.*)</translation>
+ <translation type="obsolete">Ðамальовані мапи (*.hwmap);;Ð’ÑÑ– файли (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>Зберегти намальовану мапу</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -732,11 +751,6 @@
<translation>Windows-верÑÑ–Ñ Hedgewars підтримує Xfire. ПереконайтеÑÑ Ð² тому, що ви додали Hedgewars до ÑпиÑку ігор, щоб ваші друзі могли бачити Ð²Ð°Ñ Ð² грі.</translation>
</message>
<message>
- <source>The Homing Bee can be tricky to use. Its turn radius depends on it's velocity, so try to not use full power.</source>
- <comment>Tips</comment>
- <translation type="obsolete">Ðавідна Бджілка може бути Ñкладною у керуванні. Ð Ð°Ð´Ñ–ÑƒÑ Ð¿Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚Ñƒ залежить від Ñ—Ñ— швидкоÑÑ‚Ñ–, тому поÑтарайтеÑÑ Ð½Ðµ ÑтрілÑти на повну Ñилу.</translation>
- </message>
- <message>
<source>Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</source>
<comment>Tips</comment>
<translation>ВикориÑтайте Коктейль Молотова або Вогнемет щоб тимчаÑово утримати їжаків від Ð¿Ñ€Ð¾Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ñ‚Ð°ÐºÐ¾Ñ— міÑцевоÑÑ‚Ñ– Ñк тунелі або платформи.</translation>
@@ -744,6 +758,10 @@
<message>
<source>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</source>
<comment>Tips</comment>
+ <translation>Ðавідна Бджілка може бути Ñкладною у керуванні. Ð Ð°Ð´Ñ–ÑƒÑ Ð¿Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚Ñƒ залежить від Ñ—Ñ— швидкоÑÑ‚Ñ–, тому поÑтарайтеÑÑ Ð½Ðµ ÑтрілÑти на повну Ñилу.</translation>
+ </message>
+ <message>
+ <source>Downloadable Content</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -773,15 +791,15 @@
</message>
<message>
<source>Error</source>
- <translation type="unfinished">Помилка</translation>
+ <translation>Помилка</translation>
</message>
<message>
<source>Please enter room name</source>
- <translation type="unfinished">Введіть назву кімнати</translation>
+ <translation>Введіть назву кімнати</translation>
</message>
<message>
<source>OK</source>
- <translation type="unfinished">Так</translation>
+ <translation>Так</translation>
</message>
</context>
<context>
@@ -1003,10 +1021,10 @@
</message>
<message numerus="yes">
<source>%1 players online</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%1 гравець в мережі</numerusform>
+ <numerusform>%1 Ð³Ñ€Ð°Ð²Ñ†Ñ Ð² мережі</numerusform>
+ <numerusform>%1 гравців в мережі</numerusform>
</translation>
</message>
</context>
@@ -1026,7 +1044,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>Додати невразливу рамку навколо міÑцевоÑÑ‚Ñ–</translation>
+ <translation type="obsolete">Додати невразливу рамку навколо міÑцевоÑÑ‚Ñ–</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1130,6 +1148,14 @@
</message>
<message>
<source>Teams in each clan take successive turns sharing their turn time.</source>
+ <translation>Команди в кожному клані здійÑнюють поÑлідовні ходи, поділÑючи Ñ‡Ð°Ñ Ñ…Ð¾Ð´Ñƒ.</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>Додати невразливу рамку навколо міÑцевоÑÑ‚Ñ–</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1227,7 +1253,7 @@
</message>
<message>
<source>Update</source>
- <translation type="unfinished">Оновити</translation>
+ <translation>Оновити</translation>
</message>
</context>
<context>
@@ -1377,27 +1403,27 @@
</message>
<message>
<source>Red/Cyan grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Черв./Блак. відтінки Ñірого</translation>
</message>
<message>
<source>Cyan/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Блак./Черв. відтінки Ñірого</translation>
</message>
<message>
<source>Red/Blue grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Черв./Синій відтінки Ñірого</translation>
</message>
<message>
<source>Blue/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Синій/Черв. відтінки Ñірого</translation>
</message>
<message>
<source>Red/Green grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Черв./Зел. відтінки Ñірого</translation>
</message>
<message>
<source>Green/Red grayscale</source>
- <translation type="unfinished"></translation>
+ <translation>Зел./Черв. відтінки Ñірого</translation>
</message>
</context>
<context>
@@ -1626,32 +1652,28 @@
<translation>% Довжина Мотузки</translation>
</message>
<message>
- <source>Gameplay</source>
- <translation type="obsolete">Геймплей</translation>
- </message>
- <message>
<source>Stereo rendering</source>
<translation>Стерео рендеринг</translation>
</message>
<message>
<source>Game Options</source>
- <translation type="unfinished"></translation>
+ <translation>Параметри гри</translation>
</message>
<message>
<source>Style</source>
- <translation type="unfinished"></translation>
+ <translation>Стиль</translation>
</message>
<message>
<source>Scheme</source>
- <translation type="unfinished"></translation>
+ <translation>Схема</translation>
</message>
<message>
<source>Password</source>
- <translation type="unfinished">Пароль</translation>
+ <translation>Пароль</translation>
</message>
<message>
<source>% Get Away Time</source>
- <translation type="unfinished"></translation>
+ <translation>% Ð§Ð°Ñ Ð¢Ñ–ÐºÐ°Ñ‚Ð¸</translation>
</message>
</context>
<context>
@@ -1660,6 +1682,10 @@
<source>unnamed</source>
<translation>без_назви</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -2014,6 +2040,10 @@
</message>
<message>
<source>Tag Team</source>
+ <translation>Збірна Команда</translation>
+ </message>
+ <message>
+ <source>Add Bottom Border</source>
<translation type="unfinished"></translation>
</message>
</context>
--- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Sat Oct 08 16:54:56 2011 +0200
@@ -122,6 +122,14 @@
<comment>File Types</comment>
<translation>刺猬大作战å˜æ¡£æ–‡ä»¶</translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -379,12 +387,20 @@
</message>
<message>
<source>Drawn Maps (*.hwmap);;All files (*.*)</source>
- <translation>绘制的地图 (*.hwmap);;全部文件 (*.*)</translation>
+ <translation type="obsolete">绘制的地图 (*.hwmap);;全部文件 (*.*)</translation>
</message>
<message>
<source>Save drawn map</source>
<translation>ä¿å˜ç»˜åˆ¶çš„地图</translation>
</message>
+ <message>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageEditTeam</name>
@@ -772,6 +788,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1054,7 +1074,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>æ·»åŠ ä¸å¯æ¯å地边界</translation>
+ <translation type="obsolete">æ·»åŠ ä¸å¯æ¯å地边界</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1152,6 +1172,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>æ·»åŠ ä¸å¯æ¯å地边界</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1708,6 +1736,10 @@
<source>unnamed</source>
<translation>æ— å</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -2064,6 +2096,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Sat Oct 08 16:54:56 2011 +0200
@@ -122,6 +122,14 @@
<comment>File Types</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Demo name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Demo name:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HWGame</name>
@@ -375,11 +383,15 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Drawn Maps (*.hwmap);;All files (*.*)</source>
+ <source>Save drawn map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save drawn map</source>
+ <source>Drawn Maps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All files</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -720,6 +732,10 @@
<comment>Tips</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Downloadable Content</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageMultiplayer</name>
@@ -1013,7 +1029,7 @@
</message>
<message>
<source>Add an indestructable border around the terrain</source>
- <translation>æ·»åŠ ä¸å¯æ¯€å£žåœ°é‚Šç•Œ</translation>
+ <translation type="obsolete">æ·»åŠ ä¸å¯æ¯€å£žåœ°é‚Šç•Œ</translation>
</message>
<message>
<source>Lower gravity</source>
@@ -1087,6 +1103,14 @@
<source>Teams in each clan take successive turns sharing their turn time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add an indestructible border around the terrain</source>
+ <translation>æ·»åŠ ä¸å¯æ¯€å£žåœ°é‚Šç•Œ</translation>
+ </message>
+ <message>
+ <source>Add an indestructible border along the bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageSelectWeapon</name>
@@ -1611,6 +1635,10 @@
<source>unnamed</source>
<translation>ç„¡å</translation>
</message>
+ <message>
+ <source>hedgehog %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QMainWindow</name>
@@ -1967,6 +1995,10 @@
<source>Tag Team</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Add Bottom Border</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>binds</name>
--- a/share/hedgewars/Data/Locale/it.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/it.lua Sat Oct 08 16:54:56 2011 +0200
@@ -2,25 +2,34 @@
-- ["..."] = "",
[":("] = ":(",
["!!!"] = "!!!",
--- ["Accuracy Bonus!"] = "",
--- ["a Hedgewars mini-game"] = "", -- Space_Invasion, The_Specialists
+-- ["Accuracy Bonus!"] = "Bonus accuratezza",
+-- ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
+-- ["a Hedgewars mini-game"] = "Mini gioco Hedgewars", -- Space_Invasion, The_Specialists
["Aiming Practice"] = "Pratica la tua mira", --Bazooka, Shotgun, SniperRifle
--- ["Ammo"] = "",
--- ["Ammo Depleted!"] = "",
--- ["Ammo Maniac!"] = "",
--- ["Available points remaining: "] = "",
+-- ["Ammo"] = "Munizioni",
+-- ["Ammo Depleted!"] = "Munizioni scarse!",
+-- ["ammo extended!"] = "",
+-- ["Ammo is reset at the end of your turn."] = "",
+-- ["Ammo Maniac!"] = "Maniaco delle munizioni!",
+-- ["Available points remaining: "] = "Punti disponibili rimasti: ",
+-- ["[Backspace]"] = "[Cancella]",
+-- ["Bamboo Thicket"] = "",
+-- ["Barrel Eater!"] = "",
+-- ["Barrel Launcher"] = "",
["Bat balls at your enemies and|push them into the sea!"] = "Lancia delle palle ai tuoi nemici|e spingili in acqua!",
["Bat your opponents through the|baskets and out of the map!"] = "Manda (colpendoli) i tuoi nemici|in acqua attraverso i canestri laterali!",
["Bazooka Training"] = "Addestramento con il Bazooka",
["Best laps per team: "] = "Tempo migliore per squadra: ",
--- ["Best Team Times: "] = "",
+-- ["Best Team Times: "] = "Tempi della squadra migliore: ",
["Bloody Rookies"] = "Reclute Sanguinose", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
--- ["BOOM!"] = "",
--- ["Boom!"] = "BOOM!",
+-- ["BOOM!"] = "BOOM!",
+-- ["Boom!"] = "Boom!",
-- ["Boss defeated!"] = "",
-- ["Boss Slayer!"] = "",
+-- ["Build a track and race."] = "",
["CAPTURE THE FLAG"] = "Cattura la Bandiera",
-- ["Careless"] = "",
+-- ["Change Weapon"] = "",
-- ["Clumsy"] = "",
["Codename: Teamwork"] = "Nome in codice: Lavoro di Squadra",
-- ["Complete the track as fast as you can!"] = "",
@@ -32,8 +41,10 @@
["DAMMIT, ROOKIE!"] = "MALEDIZIONE, RECLUTA!",
["Dangerous Ducklings"] = "Papere Pericolose",
-- ["Deadweight"] = "",
+-- ["Demolition is fun!"] = "",
-- ["Depleted Kamikaze!"] = "",
-- ["Destroy invaders to score points."] = "",
+-- ["Double Kill!"] = "",
-- ["Drone Hunter!"] = "",
-- ["Drowner"] = "",
-- ["Each turn you get 1-3 random weapons"] = "",
@@ -42,8 +53,11 @@
["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Distruggi tutti gli obiettivi entro il tempo previsto.|Hai armi illimitate per questa missione.", --Bazooka, Shotgun, SniperRifle
["Eliminate Poison before the time runs out"] = "Elimina Veleno prima che il tempo finisca",
["Eliminate the Blue Team"] = "Elimina il Blue Team",
+-- ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+-- ["Eliminate the enemy hogs to win."] = "",
-- ["Eliminate the enemy specialists."] = "",
["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Elimina l'Unità 3378 |- La Resistenza Finale deve sopravvivere",
+-- ["Energetic Engineer"] = "",
["Enjoy the swim..."] = "Nuota con piacere...",
-- ["[Enter]"] = "",
["Fastest lap: "] = "Giro migliore: ",
@@ -53,6 +67,9 @@
["Flag respawned!"] = "Bandiera restituita!",
["Flag returned!"] = "Bandiera recuperata!",
-- ["Flags, and their home base will be placed where each team ends their first turn."] = "",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+-- ["fuel extended!"] = "",
-- ["GAME BEGUN!!!"] = "",
-- ["Game Modifiers: "] = "",
["GAME OVER!"] = "GAME OVER!",
@@ -62,11 +79,15 @@
["GO! GO! GO!"] = "VAI! VAI! VAI!",
["Good birdy......"] = "Bell'uccellino......",
["Good luck out there!"] = "Buona fortuna!",
+-- ["Good so far!"] = "",
+-- ["Good to go!"] = "",
-- ["GOTCHA!"] = "",
+-- ["Grab Mines/Explosives"] = "",
-- ["Hahahaha!"] = "",
-- ["Haha, now THAT would be something!"] = "",
-- ["Hapless Hogs"] = "",
-- [" Hapless Hogs left!"] = "",
+-- ["Health crates extend your time."] = "",
-- ["Heavy"] = "",
["Hedgewars-Basketball"] = "Hedgewars-Pallacanestro",
["Hedgewars-Knockball"] = "Hedgewars-Knockball",
@@ -80,9 +101,15 @@
-- ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
-- ["Jumping is disabled"] = "",
-- ["Kamikaze Expert!"] = "",
+-- ["Keep it up!"] = "",
+-- ["Killing spree!"] = "",
-- ["KILLS"] = "",
+-- ["Last Target!"] = "",
-- ["[Left Shift]"] = "",
["Listen up, maggot!!"] = "Recluta, Attenzione!!",
+-- ["Lively Lifeguard"] = "",
+-- ["Mine Deployer"] = "",
+-- ["Mine Eater!"] = "",
-- ["|- Mines Time:"] = "|-Timer delle mine:", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["MISSION FAILED"] = "MISSIONE FALLITA", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["MISSION SUCCESSFUL"] = "MISSIONE COMPLETATA CON SUCCESSO", -- User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -90,9 +117,12 @@
-- ["Movement: [Up], [Down], [Left], [Right]"] = "",
-- ["Multi-shot!"] = "",
-- ["Nameless Heroes"] = "",
+-- ["New Barrels Per Turn"] = "",
-- ["NEW CLAN RECORD: "] = "",
["NEW fastest lap: "] = "Nuovo giro migliore: ",
+-- ["New Mines Per Turn"] = "",
-- ["NEW RACE RECORD: "] = "",
+-- ["Newton's Hammock"] = "",
-- ["NOT ENOUGH WAYPOINTS"] = "",
["Not So Friendly Match"] = "Partita non molto amichevole", -- Basketball, Knockball
["Oh no! Just try again!"] = "Oh no! Prova ancora!", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -100,15 +130,21 @@
["Operation Diver"] = "Operazione Sub",
["Opposing Team: "] = "Squadra Nemica: ",
["Pathetic Hog #%d"] = "Riccio Patetico #%d",
+-- ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
-- ["Per-Hog Ammo"] = "",
-- ["Place more waypoints using [ENTER]"] = "",
+-- ["Place more waypoints using the 'Air Attack' weapon."] = "",
-- ["points"] = "", -- Control, Space_Invasion
["Poison"] = "Veleno",
-- ["Power Remaining"] = "",
+-- ["Prepare yourself"] = "",
-- ["Press [Precise] to skip intro"] = "",
-- ["Race complexity limit reached."] = "",
+-- ["RACER"] = "",
[" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Riporta la bandiera nemica alla tua base per guadagnare un punto| - La prima squadra a catturarne 3 vince! | - Puoi guadagnare punti solo quando la tua bandiera si trova nella tua base! | - I ricci lasceranno cadere la bandiera se uccisi o caduti in acqua! | - Le bandiere cadute possono essere restituite o ricatturate! | - I ricci risorgono dalla morte!",
+-- ["Round Limit:"] = "",
-- ["Round Limit"] = "",
+-- ["Rounds Complete: "] = "",
-- ["Rounds Complete"] = "",
-- ["RULES OF THE GAME [Press ESC to view]"] = "",
["RULES OF THE GAME [Press ESC to view]"] = "REGOLE DEL GIOCO (Premi ESC per visualizzarle)",
@@ -117,6 +153,7 @@
-- ["SCORE"] = "",
-- ["sec"] = "sec", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
["See ya!"] = "Ci vediamo!",
+-- ["selected!"] = "",
-- ["s"] = "", -- GaudyRacer, Space_Invasion
-- ["Shield boosted! +30 power"] = "",
-- ["Shield Depleted"] = "",
@@ -128,7 +165,7 @@
-- ["Shield Seeker!"] = "",
["Shotgun Team"] = "Squadra FaP",
["Shotgun Training"] = "Allenamento con il Fucile a Pompa",
--- ["Shots Left: "] = "", -- GaudyRacer, Tumbler
+-- ["shots remaining."] = "",
-- ["Silly"] = "",
-- ["Sinky"] = "",
["%s is out and Team %d|scored a penalty!| |Score:"] = "%s è fuori dal campo e la squadra %d|prende una penalità !| |Punteggio:", -- Basketball, Knockball
@@ -147,27 +184,34 @@
-- ["The flag will respawn next round."] = "La bandiera verrà restituita alla fine del turno.",
-- ["The Nameless One"] = "",
-- ["THE SPECIALISTS"] = "",
+-- ["This one's tricky."] = "",
-- ["This rain is really something..."] = "",
-- ["TIME: "] = "",
-- ["Timed Kamikaze!"] = "",
-- ["Time Extended!"] = "",
--- ["Time Left: "] = "",
+-- ["Time Extension"] = "",
-- ["Toggle Shield"] = "",
["Toxic Team"] = "Team Velenoso", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["TRACK COMPLETED"] = "",
--- ["Track Time: "] = "",
+-- ["TRACK FAILED!"] = "",
["TrophyRace"] = "TrophyRace",
["T_T"] = "T_T",
+-- ["Tumbling Time Extended!"] = "",
-- ["Turn Time"] = "",
+-- ["Unit"] = "",
["Unit 3378"] = "Unità 3378",
+-- ["Unit 835"] = "",
-- ["Unlimited Attacks"] = "",
+-- ["Unstoppable!"] = "",
-- ["User Challenge"] = "",
["Use your rope to get from start to finish as fast as you can!"] = "Usa la tua corda per raggiungere il traguardo il più velocemente possibile!",
--- ["v.06"] = "",
-- ["Victory for the "] = "", -- CTF_Blizzard, Capture_the_Flag
["Victory for the"] = "La vittoria è di",
-- ["Waypoint placed."] = "",
+-- ["Way-Points Remaining"] = "",
-- ["Weapons Reset"] = "",
+-- ["Well done."] = "",
+-- ["Will this ever end?"] = "",
-- ["WINNING TIME: "] = "",
-- ["You'd almost swear the water was rising!"] = "",
["You have SCORED!!"] = "Hai guadagnato un PUNTO!",
--- a/share/hedgewars/Data/Locale/ko.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/ko.lua Sat Oct 08 16:54:56 2011 +0200
@@ -3,12 +3,19 @@
-- ["!!!"] = "",
-- ["..."] = "",
-- ["Accuracy Bonus!"] = "",
+-- ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
-- ["a Hedgewars mini-game"] = "", -- Space_Invasion, The_Specialists
-- ["Aiming Practice"] = "", --Bazooka, Shotgun, SniperRifle
-- ["Ammo"] = "",
-- ["Ammo Depleted!"] = "",
+-- ["ammo extended!"] = "",
+-- ["Ammo is reset at the end of your turn."] = "",
-- ["Ammo Maniac!"] = "",
-- ["Available points remaining: "] = "",
+-- ["[Backspace]"] = "",
+-- ["Bamboo Thicket"] = "",
+-- ["Barrel Eater!"] = "",
+-- ["Barrel Launcher"] = "",
-- ["Bat balls at your enemies and|push them into the sea!"] = "",
-- ["Bat your opponents through the|baskets and out of the map!"] = "",
-- ["Bazooka Training"] = "",
@@ -19,8 +26,10 @@
-- ["BOOM!"] = "",
-- ["Boss defeated!"] = "",
-- ["Boss Slayer!"] = "",
+-- ["Build a track and race."] = "",
-- ["CAPTURE THE FLAG"] = "",
-- ["Careless"] = "",
+-- ["Change Weapon"] = "",
-- ["Clumsy"] = "",
-- ["Codename: Teamwork"] = "",
-- ["Complete the track as fast as you can!"] = "",
@@ -32,8 +41,10 @@
-- ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "",
-- ["Dangerous Ducklings"] = "",
-- ["Deadweight"] = "",
+-- ["Demolition is fun!"] = "",
-- ["Depleted Kamikaze!"] = "",
-- ["Destroy invaders to score points."] = "",
+-- ["Double Kill!"] = "",
-- ["Drone Hunter!"] = "",
-- ["Drowner"] = "",
-- ["Each turn you get 1-3 random weapons"] = "",
@@ -42,8 +53,11 @@
-- ["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "", --Bazooka, Shotgun, SniperRifle
-- ["Eliminate Poison before the time runs out"] = "",
-- ["Eliminate the Blue Team"] = "",
+-- ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+-- ["Eliminate the enemy hogs to win."] = "",
-- ["Eliminate the enemy specialists."] = "",
-- ["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "",
+-- ["Energetic Engineer"] = "",
-- ["Enjoy the swim..."] = "",
-- ["[Enter]"] = "",
-- ["Fastest lap: "] = "",
@@ -53,6 +67,9 @@
-- ["Flag respawned!"] = "",
-- ["Flag returned!"] = "",
-- ["Flags, and their home base will be placed where each team ends their first turn."] = "",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+-- ["fuel extended!"] = "",
-- ["GAME BEGUN!!!"] = "",
-- ["Game Modifiers: "] = "",
-- ["GAME OVER!"] = "",
@@ -62,11 +79,15 @@
-- ["GO! GO! GO!"] = "",
-- ["Good birdy......"] = "",
-- ["Good luck out there!"] = "",
+-- ["Good so far!"] = "",
+-- ["Good to go!"] = "",
-- ["GOTCHA!"] = "",
+-- ["Grab Mines/Explosives"] = "",
-- ["Hahahaha!"] = "",
-- ["Haha, now THAT would be something!"] = "",
-- ["Hapless Hogs"] = "",
-- [" Hapless Hogs left!"] = "",
+-- ["Health crates extend your time."] = "",
-- ["Heavy"] = "",
-- ["Hedgewars-Basketball"] = "",
-- ["Hedgewars-Knockball"] = "",
@@ -80,9 +101,15 @@
-- ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
-- ["Jumping is disabled"] = "",
-- ["Kamikaze Expert!"] = "",
+-- ["Keep it up!"] = "",
+-- ["Killing spree!"] = "",
-- ["KILLS"] = "",
+-- ["Last Target!"] = "",
-- ["[Left Shift]"] = "",
-- ["Listen up, maggot!!"] = "",
+-- ["Lively Lifeguard"] = "",
+-- ["Mine Deployer"] = "",
+-- ["Mine Eater!"] = "",
-- ["|- Mines Time:"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["MISSION FAILED"] = "", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["MISSION SUCCESS"] = "",
@@ -90,9 +117,12 @@
-- ["Movement: [Up], [Down], [Left], [Right]"] = "",
-- ["Multi-shot!"] = "",
-- ["Nameless Heroes"] = "",
+-- ["New Barrels Per Turn"] = "",
-- ["NEW CLAN RECORD: "] = "",
-- ["NEW fastest lap: "] = "",
+-- ["New Mines Per Turn"] = "",
-- ["NEW RACE RECORD: "] = "",
+-- ["Newton's Hammock"] = "",
-- ["NOT ENOUGH WAYPOINTS"] = "",
-- ["Not So Friendly Match"] = "", -- Basketball, Knockball
-- ["Oh no! Just try again!"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -100,15 +130,21 @@
-- ["Operation Diver"] = "",
-- ["Opposing Team: "] = "",
-- ["Pathetic Hog #%d"] = "",
+-- ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
-- ["Per-Hog Ammo"] = "",
-- ["Place more waypoints using [ENTER]"] = "",
+-- ["Place more waypoints using the 'Air Attack' weapon."] = "",
-- ["points"] = "", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
-- ["Poison"] = "",
-- ["Power Remaining"] = "",
+-- ["Prepare yourself"] = "",
-- ["Press [Precise] to skip intro"] = "",
-- ["Race complexity limit reached."] = "",
+-- ["RACER"] = "",
-- [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = "",
+-- ["Round Limit:"] = "",
-- ["Round Limit"] = "",
+-- ["Rounds Complete: "] = "",
-- ["Rounds Complete"] = "",
-- ["RULES OF THE GAME [Press ESC to view]"] = "",
-- ["s|"] = "",
@@ -116,6 +152,7 @@
-- ["SCORE"] = "",
-- ["sec"] = "", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
-- ["See ya!"] = "",
+-- ["selected!"] = "",
-- ["s"] = "", -- GaudyRacer, Space_Invasion
-- ["Shield boosted! +30 power"] = "",
-- ["Shield Depleted"] = "",
@@ -127,7 +164,7 @@
-- ["Shield Seeker!"] = "",
-- ["Shotgun Team"] = "",
-- ["Shotgun Training"] = "",
--- ["Shots Left: "] = "", -- GaudyRacer, Tumbler
+-- ["shots remaining."] = "",
-- ["Silly"] = "",
-- ["Sinky"] = "",
-- ["%s is out and Team %d|scored a penalty!| |Score:"] = "", -- Basketball, Knockball
@@ -146,26 +183,33 @@
-- ["The flag will respawn next round."] = "",
-- ["The Nameless One"] = "",
-- ["THE SPECIALISTS"] = "",
+-- ["This one's tricky."] = "",
-- ["This rain is really something..."] = "",
-- ["TIME: "] = "",
-- ["Timed Kamikaze!"] = "",
-- ["Time Extended!"] = "",
--- ["Time Left: "] = "",
+-- ["Time Extension"] = "",
-- ["Toggle Shield"] = "",
-- ["Toxic Team"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["TRACK COMPLETED"] = "",
--- ["Track Time: "] = "",
+-- ["TRACK FAILED!"] = "",
-- ["TrophyRace"] = "",
-- ["T_T"] = "",
+-- ["Tumbling Time Extended!"] = "",
-- ["Turn Time"] = "",
+-- ["Unit"] = "",
-- ["Unit 3378"] = "",
+-- ["Unit 835"] = "",
-- ["Unlimited Attacks"] = "",
+-- ["Unstoppable!"] = "",
-- ["User Challenge"] = "",
-- ["Use your rope to get from start to finish as fast as you can!"] = "",
--- ["v.06"] = "",
-- ["Victory for the "] = "", -- CTF_Blizzard, Capture_the_Flag
-- ["Waypoint placed."] = "",
+-- ["Way-Points Remaining"] = "",
-- ["Weapons Reset"] = "",
+-- ["Well done."] = "",
+-- ["Will this ever end?"] = "",
-- ["WINNING TIME: "] = "",
-- ["You'd almost swear the water was rising!"] = "",
-- ["You have SCORED!!"] = "",
--- a/share/hedgewars/Data/Locale/lt.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/lt.lua Sat Oct 08 16:54:56 2011 +0200
@@ -3,12 +3,19 @@
["!!!"] = "!!!",
["..."] = "...",
["Accuracy Bonus!"] = "Taiklumo Bonusas!",
+-- ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
["a Hedgewars mini-game"] = "Eþiu karu mini þaidimas", -- Space_Invasion, The_Specialists
["Aiming Practice"] = "Taiklumo Treniruotë", --Bazooka, Shotgun, SniperRifle
+ ["Ammo Depleted!"] = "Nusodrintojo Kulkos!",
+-- ["ammo extended!"] = "",
+-- ["Ammo is reset at the end of your turn."] = "",
["Ammo"] = "Kulkos",
- ["Ammo Depleted!"] = "Nusodrintojo Kulkos!",
["Ammo Maniac!"] = "Kulku Maniakas!",
["Available points remaining: "] = "Pajamumu taðku liko: ",
+-- ["[Backspace]"] = "",
+-- ["Bamboo Thicket"] = "",
+-- ["Barrel Eater!"] = "",
+-- ["Barrel Launcher"] = "",
["Bat balls at your enemies and|push them into the sea!"] = "Dauþk is kamuoliu i savo prieðus|ir nustumk juos i jûra!",
["Bat your opponents through the|baskets and out of the map!"] = "Dauþk savo obonentus pro kaðes|ir ið þemëlapio!",
["Bazooka Training"] = "Bazukos Treniruotë",
@@ -19,8 +26,10 @@
["BOOM!"] = "BOOM!",
["Boss defeated!"] = "Bosas Nugalëtas!",
["Boss Slayer!"] = "Bosu Þudikas!",
+-- ["Build a track and race."] = "",
["CAPTURE THE FLAG"] = "Pagriebk Vëliava",
["Careless"] = "Neatsargus",
+-- ["Change Weapon"] = "",
["Clumsy"] = "Durnelis",
["Codename: Teamwork"] = "Kodas: Komandinis Darbas",
["Complete the track as fast as you can!"] = "Apvaryk trasa taip greitai kaip gali!",
@@ -28,12 +37,14 @@
["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Sveikinu! Tu pradanginai visus taikinius|per leista laika.", --Bazooka, Shotgun, SniperRifle
["Control pillars to score points."] = "Valdyk stulpus ir gausi taðku.",
["Cybernetic Empire"] = "Kibernetinë Karalystë",
+ ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "PO VELNIU EILINI NULIPK MAN NUO GALVOS!",
["DAMMIT, ROOKIE!"] = "PO VELNIU EILINI!",
- ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "PO VELNIU EILINI NULIPK MAN NUO GALVOS!",
["Dangerous Ducklings"] = "Pavojingos Antis",
["Deadweight"] = "Dedveitas",
+-- ["Demolition is fun!"] = "",
["Depleted Kamikaze!"] = "Nusodrintojo Kamikaze!",
["Destroy invaders to score points."] = "Sunaikink Isiverþëjus Ir Gauk Taðku.",
+-- ["Double Kill!"] = "",
["Drone Hunter!"] = "Drone Medþiotojas!",
["Drowner"] = "Skendëjas",
["Each turn you get 1-3 random weapons"] = "Kekviena Eile Gausi 1-3 Atsitiktiniu Ginklu",
@@ -42,8 +53,11 @@
["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Sunaikink Visus taikinius kol neiðseko laikas.|Ãitai misijai gausi nesibaigianèiu kulku.", --Bazooka, Shotgun, SniperRifle
["Eliminate Poison before the time runs out"] = "Sunaikink Nuodus kol nepasibaigë laikas",
["Eliminate the Blue Team"] = "Sunaikink Mëlyna komanda",
+-- ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+-- ["Eliminate the enemy hogs to win."] = "",
["Eliminate the enemy specialists."] = "Sunaikink prieðus specialistus.",
["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Sunaikink Tipa 3378 |- Silpnaus atsparumo tvirtovë turi iðlikti",
+-- ["Energetic Engineer"] = "",
["Enjoy the swim..."] = "Pasimëgauk Rlaukimu...",
["[Enter]"] = "[ENTER"],
["Fastest lap: "] = "Greièiausias Ratas: ",
@@ -53,6 +67,9 @@
["Flag respawned!"] = "Vëliava Atsigavo!",
["Flag returned!"] = "Vëliava Sugraþinta!",
["Flags, and their home base will be placed where each team ends their first turn."] = "Vëliavos, Ir Ju Bazës Bus Padëtos Kur Kekviena Komanda Pabaigs Ëjima.",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+-- ["fuel extended!"] = "",
["GAME BEGUN!!!"] = "Þaidimas Prasidëjo!!!",
["Game Modifiers: "] = "Þaidimo Modifikatoriai: ",
["GAME OVER!"] = "Þaidimas Baigtas!",
@@ -62,11 +79,15 @@
["GO! GO! GO!"] = "Bëk! Bëk! Bëk!",
["Good birdy......"] = "Geras Paukðtelis......",
["Good luck out there!"] = "Sëkmës Tau Ten!",
+-- ["Good so far!"] = "",
+-- ["Good to go!"] = "",
["GOTCHA!"] = "Prigavau!",
+-- ["Grab Mines/Explosives"] = "",
["Hahahaha!"] = "Hahahaha!",
["Haha, now THAT would be something!"] = "Haha, na tai jau butu kaþkas!",
+ [" Hapless Hogs left!"] = " Nelaimingu Eþiu Liko!",
["Hapless Hogs"] = "Nelaimingi Eþiai",
- [" Hapless Hogs left!"] = " Nelaimingu Eþiu Liko!",
+-- ["Health crates extend your time."] = "",
["Heavy"] = "Sunku",
["Hedgewars-Basketball"] = "Eþiukaru-Krepðinis",
["Hedgewars-Knockball"] = "Eþiukaru-Trenktaskamuolys",
@@ -80,19 +101,28 @@
["It's a good thing SUDDEN DEATH is 99 turns away..."] = "Geras dalykas kad MARAS dar po 99 eiliu...",
["Jumping is disabled"] = "Ãokimas ira iðjungtas",
["Kamikaze Expert!"] = "Kamikazes Ekspertas!",
+-- ["Keep it up!"] = "",
+-- ["Killing spree!"] = "",
["KILLS"] = "Nuþudymai",
+-- ["Last Target!"] = "",
["[Left Shift]"] = "[Kairis Shiftas"],
["Listen up, maggot!!"] = "Paklausyk eilini!!",
+-- ["Lively Lifeguard"] = "",
+-- ["Mine Deployer"] = "",
+-- ["Mine Eater!"] = "",
["|- Mines Time:"] = "|- Minu Laikas:", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["MISSION FAILED"] = "Misija Nepavyko", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+ ["MISSION SUCCESSFUL"] = "Misija Buvo Ivykdita", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["MISSION SUCCESS"] = "Misija Pavyko",
- ["MISSION SUCCESSFUL"] = "Misija Buvo Ivykdita", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["Movement: [Up], [Down], [Left], [Right]"] = "Judëjimas: [I Virðu, [I Apaèia], [I Kaire], [I Deðine]"],
["Multi-shot!"] = "Dvigubas-Ãuvis!",
["Nameless Heroes"] = "Bevardþiai Herojiai",
+-- ["New Barrels Per Turn"] = "",
["NEW CLAN RECORD: "] = "Naujas Klano Rekordas: ",
["NEW fastest lap: "] = "Naujas Greièiausias Ratas: ",
+-- ["New Mines Per Turn"] = "",
["NEW RACE RECORD: "] = "Naujas Lenktyniu Rekordas: ",
+-- ["Newton's Hammock"] = "",
["NOT ENOUGH WAYPOINTS"] = "Neuþtenka Kelio Taðku",
["Not So Friendly Match"] = "Ne Toks Jau Ir Draugiðkas Turnyras", -- Basketball, Knockball
["Oh no! Just try again!"] = "O NE! Tiesiog Bandyk Vël", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -100,23 +130,28 @@
["Operation Diver"] = "Operacijos Vairuotojas",
["Opposing Team: "] = "Pasiprieðinanti Komanda: ",
["Pathetic Hog #%d"] = "Niekam Tikes Eþys #%d",
+-- ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
["Per-Hog Ammo"] = "Kulkos Per-Eþy",
["Place more waypoints using [ENTER]"] = "Padëk Daugiau Kelio Taðku Su [ENTER"],
+-- ["Place more waypoints using the 'Air Attack' weapon."] = "",
["points"] = "taðkai", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
["Poison"] = "Nuodai",
["Power Remaining"] = "Jëgos Liko",
+-- ["Prepare yourself"] = "",
["Press [Precise] to skip intro"] = "Spausk [TaikluNusitaikima kad baigtum iëjima"],
["Race complexity limit reached."] = "Lenktyniu Sudëtingumo Limitas Pasiektas.",
+-- ["RACER"] = "",
[" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Graþink prieðu vëliava i savo baze ir gausi taðku | - Pirma komanda su 3 vëliavom laimi | - Taðkus gausi tik tada kaip tavo vëliava bazëje | - Eþiai pames vëliava jeigu mirs, arba paskes | - Pamestos vëliavos gali buti graþintos arba pavogtos | - Eþiai atsikelia kaip nuþudyti",
+-- ["Round Limit:"] = "",
["Round Limit"] = "Raundu Limitas",
+-- ["Rounds Complete: "] = "",
["Rounds Complete"] = "Raundai Ivykditi",
["RULES OF THE GAME [Press ESC to view]"] = "ÞAIDIMO TAISYKLES [Spausk ESC Kad Parodytu"],
- ["s|"] = "s|",
["Save as many hapless hogs as possible!"] = "Iðgelbëk kuo daugiau nelaimingu eþiu!",
["SCORE"] = "Taðkai",
["sec"] = "sek", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
["See ya!"] = "Iki!",
- ["s"] = "s", -- GaudyRacer, Space_Invasion
+-- ["selected!"] = "",
["Shield boosted! +30 power"] = "Skydas Pagerintas! +30 jëga",
["Shield Depleted"] = "Skydas Nusodrintas",
["Shield is fully recharged!"] = "Skydas Pilnai Pakrautas!",
@@ -127,7 +162,7 @@
["Shield Seeker!"] = "Skydo Ieðkotojas!",
["Shotgun Team"] = "Ãratinio Ãautuvo Komanda",
["Shotgun Training"] = "Ãratinio Ãautuvo Treniruotë",
- ["Shots Left: "] = "Liko Ãuviu: ", -- GaudyRacer, Tumbler
+-- ["shots remaining."] = "",
["Silly"] = "Durnelis",
["Sinky"] = "Paskenduolis",
["%s is out and Team %d|scored a penalty!| |Score:"] = "%s Iðkrito ir komanda %d|gavo bausme!| |Score:", -- Basketball, Knockball
@@ -136,6 +171,8 @@
["Sniperz"] = "Snaiperiai",
["Sponge"] = "Kempinë",
["Spooky Tree"] = "Baisusis Medis",
+ ["s|"] = "s|",
+ ["s"] = "s", -- GaudyRacer, Space_Invasion
["STATUS UPDATE"] = "Bûsenos Atnaujinimas", -- GaudyRacer, Space_Invasion
["Switched to "] = "Pakeistas i ",
["Team %d: "] = "Komanda %d: ",
@@ -146,26 +183,33 @@
["The flag will respawn next round."] = "Vëliava atsigaus kita raunda.",
["The Nameless One"] = "Bevardis",
["THE SPECIALISTS"] = "Specialistai",
+-- ["This one's tricky."] = "",
["This rain is really something..."] = "Ãis lietus tikrai kaþkas...",
- ["TIME: "] = "Laikas: ",
["Timed Kamikaze!"] = "Laikina Kamikaze!",
["Time Extended!"] = "Laikas Prailgintas!",
- ["Time Left: "] = "Liko Laiko: ",
+-- ["Time Extension"] = "",
+ ["TIME: "] = "Laikas: ",
["Toggle Shield"] = "Perjungti i skyda",
["Toxic Team"] = "Toksinë Komanda", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["TRACK COMPLETED"] = "Trasa Ivykdita",
- ["Track Time: "] = "Trasos Laikas: ",
+-- ["TRACK FAILED!"] = "",
["TrophyRace"] = "Trophëju Trasa",
["T_T"] = "T_T",
+-- ["Tumbling Time Extended!"] = "",
["Turn Time"] = "Eilës Laikas",
+-- ["Unit"] = "",
["Unit 3378"] = "Tipas 3378",
+-- ["Unit 835"] = "",
["Unlimited Attacks"] = "Nesibaigianèios Atakos",
+-- ["Unstoppable!"] = "",
["User Challenge"] = "Vartotojo Iðukis",
["Use your rope to get from start to finish as fast as you can!"] = "Naudok virve kad nusigautum nuo starto iki finiðo taip greitai kaip gali!",
- ["v.06"] = "v.06",
["Victory for the "] = "Pergalë ", -- CTF_Blizzard, Capture_the_Flag
["Waypoint placed."] = "Kelio Taðkas Pasiektas.",
+-- ["Way-Points Remaining"] = "",
["Weapons Reset"] = "Ginklai Atgaivinti",
+-- ["Well done."] = "",
+-- ["Will this ever end?"] = "",
["WINNING TIME: "] = "Laimëjimo Laikas: ",
["You'd almost swear the water was rising!"] = "Galima pamanyti kad vanduo tikrai kyla!",
["You have SCORED!!"] = "Tu gavai TAÃKU!!",
@@ -173,4 +217,4 @@
["You've failed. Try again."] = "Tau nepavyko. Bandyk vël.",
["You've reached the goal!| |Time: "] = "Tu pasiekiai taikini!| |Laikas: ",
["'Zooka Team"] = "'Zukos Komanda",
- }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Locale/missions_de.txt Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,32 @@
+Basic_Training_-_Bazooka.name=Training: Bazooka - Grundlagen
+Basic_Training_-_Bazooka.desc="Nutze den Wind zu deinem Vorteil aus!"
+
+Basic_Training_-_Grenade.name=Training: Granate - Grundlagen
+Basic_Training_-_Grenade.desc="Vergiss nicht: Stift ziehen UND werfen!"
+
+Basic_Training_-_Shotgun.name=Training: Schrotflinte - Grundlagen
+Basic_Training_-_Shotgun.desc="Zuerst schießen, dann fragen!"
+
+Basic_Training_-_Sniper_Rifle.name=Training: Scharfschützengewehr - Grundlagen
+Basic_Training_-_Sniper_Rifle.desc="Boom, headshot!"
+
+User_Mission_-_Dangerous_Ducklings.name=Mission: Dangerous Ducklings
+User_Mission_-_Dangerous_Ducklings.desc="Nun gut, Rekrut! Es ist Zeit, dass du das im Grundlagentraining gelernte in die Tag umsetzt!"
+
+User_Mission_-_Diver.name=Mission: Taucher
+User_Mission_-_Diver.desc="Diese amphibische Angriffstrategie ist schwieriger als sie aussieht."
+
+User_Mission_-_Teamwork.name=Mission: Teamwork
+User_Mission_-_Teamwork.desc="Ab und zu... tut Liebe weh."
+
+User_Mission_-_Spooky_Tree.name=Mission: Spukiger Baum
+User_Mission_-_Spooky_Tree.desc="Viele Kisten hier draußen. Ich hoffe jedenfalls, dass dieser Vogel hier nicht hungrig wird."
+
+User_Mission_-_Bamboo_Thicket.name=Mission: Bambusdickicht
+User_Mission_-_Bamboo_Thicket.desc="Tod von oben."
+
+User_Mission_-_That_Sinking_Feeling.name=Mission: That Sinking Feeling
+User_Mission_-_That_Sinking_Feeling.desc="Hier steht einen das Wasser ganz schön schnell bis zu Hals. Viele sind hieran gescheitert. Kannst du alle Igel retten?"
+
+User_Mission_-_Newton_and_the_Hammock.name=Mission: Newton und die Hängematte
+User_Mission_-_Newton_and_the_Hammock.desc="Nicht vergessen Igelinge: Die Geschwindigkeit eines Körpers bleibt konstant, es sei denn es wirkt eine äußere Kraft wird auf ihn ein!
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Locale/missions_en.txt Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,32 @@
+Basic_Training_-_Bazooka.name=Basic Bazooka Training
+Basic_Training_-_Bazooka.desc="Using the wind to your advantage is key!"
+
+Basic_Training_-_Grenade.name=Basic Grenade Training
+Basic_Training_-_Grenade.desc="Remember, you pull the pin out AND throw!"
+
+Basic_Training_-_Shotgun.name=Basic Shotgun Training
+Basic_Training_-_Shotgun.desc="Shoot first, ask questions later!"
+
+Basic_Training_-_Sniper_Rifle.name=Basic Sniper Rifle Training
+Basic_Training_-_Sniper_Rifle.desc="Boom, headshot!"
+
+User_Mission_-_Dangerous_Ducklings.name=Mission: Dangerous Ducklings
+User_Mission_-_Dangerous_Ducklings.desc="Alright, rookie! Time to put what we learned in Basic Training into practice!"
+
+User_Mission_-_Diver.name=Mission: Diver
+User_Mission_-_Diver.desc="This 'amphibious assault' thing is harder than it looks..."
+
+User_Mission_-_Teamwork.name=Mission: Teamwork
+User_Mission_-_Teamwork.desc="Sometimes, love hurts."
+
+User_Mission_-_Spooky_Tree.name=Mission: Spooky Tree
+User_Mission_-_Spooky_Tree.desc="Lots of crates out here. I sure hope that bird ain't feeling hungry."
+
+User_Mission_-_Bamboo_Thicket.name=Mission: Bamboo Thicket
+User_Mission_-_Bamboo_Thicket.desc="Death comes from above."
+
+User_Mission_-_That_Sinking_Feeling.name=Mission: That Sinking Feeling
+User_Mission_-_That_Sinking_Feeling.desc="The water is rising rapidly and time is limited. Many have tried and failed. Can you save them all?"
+
+User_Mission_-_Newton_and_the_Hammock.name=Mission: Newton and the Hammock
+User_Mission_-_Newton_and_the_Hammock.desc="Remember hoglets: The velocity of a body remains constant unless the body is acted upon by an external force!"
--- a/share/hedgewars/Data/Locale/pl.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/pl.lua Sat Oct 08 16:54:56 2011 +0200
@@ -3,24 +3,33 @@
["!!!"] = "!!!",
["..."] = "...",
["Accuracy Bonus!"] = "Bonus za celność",
+ ["Achievement Unlocked"] = "Zdobyłeś Osiągnięcie!", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
["a Hedgewars mini-game"] = "Mini gra", -- Space_Invasion, The_Specialists
["Aiming Practice"] = "Potrenuj celność",
["Ammo"] = "Amunicja",
["Ammo Depleted!"] = "Koniec amunicji!",
+-- ["ammo extended!"] = "",
+ ["Ammo is reset at the end of your turn."] = "Amunicja jest resetowana przy końcu tury.",
["Ammo Maniac!"] = "Nabojowy Maniak!",
["Available points remaining: "] = "Pozostały następujące punkty: ",
+-- ["[Backspace]"] = "",
+-- ["Bamboo Thicket"] = "",
+ ["Barrel Eater!"] = "Pożeracz Beczek!",
+ ["Barrel Launcher"] = "Wyrzutnia Beczek",
["Bat balls at your enemies and|push them into the sea!"] = "Uderzaj piłkami w swoich przeciwników|i strącaj ich do wody!",
["Bat your opponents through the|baskets and out of the map!"] = "Uderzaj swoich przekiwników|wyrzucając przez kosz, poza mapę!",
["Bazooka Training"] = "Trening bazooki",
["Best laps per team: "] = "Najszybsze okrążenie drużyny: ",
["Best Team Times: "] = "Najlepszy czas zespołów",
["Bloody Rookies"] = "Żółtodzioby",
+ ["Boom!"] = "BUM!",
["BOOM!"] = "BUM!",
- ["Boom!"] = "BUM!",
["Boss defeated!"] = "Boss pokonany!",
["Boss Slayer!"] = "Pogromca bossów",
+ ["Build a track and race."] = "Zbuduj trasię i ścigaj się.",
["CAPTURE THE FLAG"] = "PRZECHWYĆ FLAGĘ",
["Careless"] = "Nieostrożny",
+ ["Change Weapon"] = "Zmień broń",
["Clumsy"] = "Fajtłapa",
["Codename: Teamwork"] = "Kryptonim: Praca zespołowa",
["Complete the track as fast as you can!"] = "Ukończ trasę tak szybko jak tylko potrafisz!",
@@ -32,8 +41,10 @@
["DAMMIT, ROOKIE!"] = "Żółtodziobie!",
["Dangerous Ducklings"] = "Niebezpieczne Kaczory",
-- ["Deadweight"] = "",
+ ["Demolition is fun!"] = "Rozwałka jest fajna!",
-- ["Depleted Kamikaze!"] = "",
["Destroy invaders to score points."] = "Zabijaj najeźdźców by zdobyć punkty.",
+ ["Double Kill!"] = "Podwójna śmierć!",
["Drone Hunter!"] = "Åowca dronów",
-- ["Drowner"] = "",
["Each turn you get 1-3 random weapons"] = "Z każdą turą dostaniesz 1-3 bronie",
@@ -42,8 +53,11 @@
["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Zniszcz wszystkie cele zanim upłynie czas.|W tej misji masz nieskończoną ilość amunicji.",
["Eliminate Poison before the time runs out"] = "Zabij Truciciela zanim skończy się czas",
["Eliminate the Blue Team"] = "Zniszcz niebieską drużynę",
- ["Eliminate the enemy specialists."] = "Weliminuj specjalistów wroga.",
+ ["Eliminate the enemy before the time runs out"] = "Wyeliminuj przeciwnika przed upłynięciem czasu.", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+ ["Eliminate the enemy hogs to win."] = "Wybij jeże przeciwnika by wygrać.",
+ ["Eliminate the enemy specialists."] = "Zabij specjalistów wroga.",
["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Rozwal Jednostkę 3378 |- Twoja drużyna musi przetrwać",
+ ["Energetic Engineer"] = "Energetyczny Inżynier",
["Enjoy the swim..."] = "Popływaj trochę...",
["[Enter]"] = "[Enter]",
["Fastest lap: "] = "Najszybsze okrążenie: ",
@@ -53,6 +67,9 @@
["Flag respawned!"] = "Flaga przywrócona!",
["Flag returned!"] = "Flaga odzyskana!",
["Flags, and their home base will be placed where each team ends their first turn."] = "Flagi i baza zostaną umieszzcone tam gdzie zespół zakończy swą pierwszą turę.",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+ ["fuel extended!"] = "zdobyto paliwo",
["GAME BEGUN!!!"] = "GRA ROZPOCZĘTA!!!",
["Game Modifiers: "] = "Modyfikatory: ",
["GAME OVER!"] = "KONIEC GRY!",
@@ -62,11 +79,15 @@
["GO! GO! GO!"] = "RUCHY! RUCHY! RUCHY!",
["Good birdy......"] = "Dooobry ptaszek...",
["Good luck out there!"] = "Powodzenia!",
+ ["Good so far!"] = "Jak dotÄ…d idzie dobrze!",
+ ["Good to go!"] = "Gotowi do akcji!",
["GOTCHA!"] = "MAM CIĘ!",
+ ["Grab Mines/Explosives"] = "Chwyć miny/beczki",
["Hahahaha!"] = "Hahahaha!",
["Haha, now THAT would be something!"] = "Haha, to było by COŚ",
+ [" Hapless Hogs left!"] = " Nieszczęsne Jeże pozostały",
["Hapless Hogs"] = "Nieszczęsne Jeże",
- [" Hapless Hogs left!"] = " Nieszczęsne Jeże pozostały",
+ ["Health crates extend your time."] = "Apteczki dodajÄ… czas.",
-- ["Heavy"] = "",
["Hedgewars-Basketball"] = "Hedgewars-Koszykówka",
["Hedgewars-Knockball"] = "Hedgewars-Knockball",
@@ -80,43 +101,57 @@
["It's a good thing SUDDEN DEATH is 99 turns away..."] = "Jak to dobrze, że Nagła Śmierć jest dopiero za 99 tur...",
["Jumping is disabled"] = "Skakanie jest niemożliwe",
-- ["Kamikaze Expert!"] = "",
+ ["Keep it up!"] = "Tak trzymaj!",
+ ["Killing spree!"] = "Masakra!",
["KILLS"] = "Zabicia",
+ ["Last Target!"] = "Ostatni cel!",
["[Left Shift]"] = "[Lewy Shift]",
["Listen up, maggot!!"] = "SÅ‚uchaj mnie, gnido!",
+ ["Lively Lifeguard"] = "Ratownik!",
+-- ["Mine Deployer"] = "",
+ ["Mine Eater!"] = "Pożeracz min!",
["|- Mines Time:"] = "|- Czas detonacji min:",
["MISSION FAILED"] = "MISJA ZAKOŃCZONA NIEPOWODZENIEM",
+ ["MISSION SUCCESSFUL"] = "MISJA POWIODÅA SIĘ",
["MISSION SUCCESS"] = "MISJA ZAKOŃCZONA SUKCESEM",
- ["MISSION SUCCESSFUL"] = "MISJA POWIODÅA SIĘ",
["Movement: [Up], [Down], [Left], [Right]"] = "Poruszanie się: [Góra], [Dół], [Lewo], [Prawo]",
["Multi-shot!"] = "Wielokrotny strzał",
["Nameless Heroes"] = "Bezimienni Bohaterowie",
+ ["New Barrels Per Turn"] = "Ilość beczek dodanych co turę",
["NEW CLAN RECORD: "] = "NOWY REKORD ZESPOÅU: ",
["NEW fastest lap: "] = "NOWE najszybsze okrążenie: ",
+ ["New Mines Per Turn"] = "Ilość min dodanych co turę",
["NEW RACE RECORD: "] = "NOWY REKORD WYÅšCIGU: ",
- ["NOT ENOUGH WAYPOINTS"] = "BRAK PUNKTÓW ORIENTACYJNYCH",
+ ["Newton's Hammock"] = "Hamak Newtona",
+ ["NOT ENOUGH WAYPOINTS"] = "ZA MAÅO PUNKTÓW KONTROLNYCH",
["Not So Friendly Match"] = "Mecz Nie-Do-Końca Towarzyski",
["Oh no! Just try again!"] = "Ojojoj! Spróbuj jeszcze raz!",
["Oh no! Time's up! Just try again."] = "Ajajaj! Koniec czasu! Spróbuj jeszcze raz.",
["Operation Diver"] = "Operacja Nurek",
["Opposing Team: "] = "Przeciwna drużyna",
["Pathetic Hog #%d"] = "Załosny Jeż #%d",
+-- ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
["Per-Hog Ammo"] = "Oddzielna amunicja dla jeży",
["Place more waypoints using [ENTER]"] = "Postaw więcej punktów orientacyjnych za pomocą [Entera]",
+ ["Place more waypoints using the 'Air Attack' weapon."] = "Postaw więcej punktów orientacyjnych używając [Nalotu]",
["points"] = "punkty", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
["Poison"] = "Truciciel",
["Power Remaining"] = "pkt. energii pozostało",
+ ["Prepare yourself"] = "Przygotuj siÄ™",
["Press [Precise] to skip intro"] = "Naciśnij [Precyzyjne celowanie] by pominąć intro",
--- ["Race complexity limit reached."] = "",
+ ["Race complexity limit reached."] = "Osiągnięto limit złożoności trasy.",
+ ["RACER"] = "WYÅšCIG",
[" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Przynieś flagę wroga do swojej bazy by zdobyć punkt | - Pierwszy kto zrobi to 3 razy, wygrywa | - Punkt zdobywasz tylko gdy twoja flaga znajduje się w bazie | - Jeże upuszczą flagę gdy zostaną zabite bądź utopione | - Upuszczona flaga może być przywrócona lub przechwycona ponownie | - Jeże odradzają się po śmierci",
+ ["Round Limit:"] = "Ilość rund:",
["Round Limit"] = "Ilość rund",
+ ["Rounds Complete: "] = "Ukończono rund: ",
["Rounds Complete"] = "Koniec",
["RULES OF THE GAME [Press ESC to view]"] = "ZASADY GRY [Naciśnij ESC by zobaczyć]",
- ["s|"] = "s|",
["Save as many hapless hogs as possible!"] = "Uratuj jak najwięcej nieszczęsnych jeży",
["SCORE"] = "PUNKTY",
["sec"] = "sek",
["See ya!"] = "Do zobaczenia!",
- ["s"] = "s", -- GaudyRacer, Space_Invasion
+ ["selected!"] = "wybrany!",
["Shield boosted! +30 power"] = "Osłona ulepszona: +30 energii",
["Shield Depleted"] = "Straciłeś Osłonę",
["Shield is fully recharged!"] = "Osłona całkowicie naładowana",
@@ -127,7 +162,7 @@
["Shield Seeker!"] = "Zdobywca osłon!",
["Shotgun Team"] = "Strzelcy",
["Shotgun Training"] = "Trening strzelecki",
- ["Shots Left: "] = "Pozostało strzałów: ", -- GaudyRacer, Tumbler
+ ["shots remaining."] = "strzałów pozostało.",
["Silly"] = "GÅ‚uptas",
-- ["Sinky"] = "",
["%s is out and Team %d|scored a penalty!| |Score:"] = "%s utonął i drużyna %d|dostała punkt karny!| |Punktacja:",
@@ -136,6 +171,8 @@
["Sniperz"] = "Snajperzy",
["Sponge"] = "GÄ…bka",
["Spooky Tree"] = "Straszne drzewo",
+ ["s|"] = "s|",
+ ["s"] = "s", -- GaudyRacer, Space_Invasion
["STATUS UPDATE"] = "WYNIKI", -- GaudyRacer, Space_Invasion
["Switched to "] = "Przełączono na ",
["Team %d: "] = "Drużyna %d: ",
@@ -146,26 +183,33 @@
["The flag will respawn next round."] = "Flaga pojawi się ponownie przy następnej rundzie.",
["The Nameless One"] = "Bezimienny",
["THE SPECIALISTS"] = "SPECJALIÅšCI",
+-- ["This one's tricky."] = "",
-- ["This rain is really something..."] = "",
["TIME: "] = "CZAS: ",
-- ["Timed Kamikaze!"] = "",
- ["Time Extended!"] = "Dodatkowy Czas!",
- ["Time Left: "] = "Pozostały czas: ",
+ ["Time Extended!"] = "Więcej Czasu!",
+ ["Time Extension"] = "Dodatkowy Czas!",
["Toggle Shield"] = "Wł/Wył Osłonę",
["Toxic Team"] = "Toksyczny zespół",
["TRACK COMPLETED"] = "UKOŃCZONO TRASĘ",
- ["Track Time: "] = "Czas: ",
+ ["TRACK FAILED!"] = "TRASA NIEUKOŃCZONA!",
["TrophyRace"] = "TrophyRace",
["T_T"] = "T_T",
+-- ["Tumbling Time Extended!"] = "",
["Turn Time"] = "Długość Tury",
+ ["Unit"] = "Jednostka",
["Unit 3378"] = "Jednostka 3378",
+ ["Unit 835"] = "Jednostka 835",
-- ["Unlimited Attacks"] = "",
+ ["Unstoppable!"] = "Nie do zatrzymania!",
-- ["User Challenge"] = "",
["Use your rope to get from start to finish as fast as you can!"] = "Użyj liny by jak najszybciej dotrzec od startu do mety",
- ["v.06"] = "v.06",
["Victory for the "] = "Zwycięstwo przypadło",
- ["Waypoint placed."] = "Postawiono punkt orientacyjny",
+ ["Waypoint placed."] = "Postawiono punkt kontrolny",
+ ["Way-Points Remaining"] = "Pozostało punktów: ",
["Weapons Reset"] = "Bronie odnawiajÄ… siÄ™",
+ ["Well done."] = "Dobra robota",
+ ["Will this ever end?"] = "Co to się kiedyś skończy?",
["WINNING TIME: "] = "ZWYCIĘSKI CZAS: ",
["You'd almost swear the water was rising!"] = "Przysiągłbym, że woda zdaje się podnosić!",
["You have SCORED!!"] = "Zdobyłeś PUNKT",
--- a/share/hedgewars/Data/Locale/pt_BR.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/pt_BR.lua Sat Oct 08 16:54:56 2011 +0200
@@ -3,12 +3,19 @@
-- ["!!!"] = "",
-- ["..."] = "",
-- ["Accuracy Bonus!"] = "",
+-- ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
-- ["a Hedgewars mini-game"] = "", -- Space_Invasion, The_Specialists
["Aiming Practice"] = "Pratique a sua pontaria", --Bazooka, Shotgun, SniperRifle
-- ["Ammo"] = "",
-- ["Ammo Depleted!"] = "",
+-- ["ammo extended!"] = "",
+-- ["Ammo is reset at the end of your turn."] = "",
-- ["Ammo Maniac!"] = "",
-- ["Available points remaining: "] = "",
+-- ["[Backspace]"] = "",
+-- ["Bamboo Thicket"] = "",
+-- ["Barrel Eater!"] = "",
+-- ["Barrel Launcher"] = "",
["Bat balls at your enemies and|push them into the sea!"] = "Rebata as bolas em direção ao seus|e derrube-os no mar!",
["Bat your opponents through the|baskets and out of the map!"] = "Rebata seus oponentes para|fora do mapa através dos cestos!",
["Bazooka Training"] = "Treino com a Bazuca",
@@ -19,8 +26,10 @@
-- ["BOOM!"] = "",
-- ["Boss defeated!"] = "",
-- ["Boss Slayer!"] = "",
+-- ["Build a track and race."] = "",
-- ["CAPTURE THE FLAG"] = "",
-- ["Careless"] = "",
+-- ["Change Weapon"] = "",
-- ["Clumsy"] = "",
-- ["Codename: Teamwork"] = "",
-- ["Complete the track as fast as you can!"] = "",
@@ -32,8 +41,10 @@
-- ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "",
-- ["Dangerous Ducklings"] = "",
-- ["Deadweight"] = "",
+-- ["Demolition is fun!"] = "",
-- ["Depleted Kamikaze!"] = "",
-- ["Destroy invaders to score points."] = "",
+-- ["Double Kill!"] = "",
-- ["Drone Hunter!"] = "",
-- ["Drowner"] = "",
-- ["Each turn you get 1-3 random weapons"] = "",
@@ -42,8 +53,11 @@
["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Destrua todos os alvos antes que o tempo acabe.|Você tem munição infinita para esta missão.", --Bazooka, Shotgun, SniperRifle
-- ["Eliminate Poison before the time runs out"] = "",
-- ["Eliminate the Blue Team"] = "",
+-- ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+-- ["Eliminate the enemy hogs to win."] = "",
-- ["Eliminate the enemy specialists."] = "",
-- ["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "",
+-- ["Energetic Engineer"] = "",
-- ["Enjoy the swim..."] = "",
-- ["[Enter]"] = "",
["Fastest lap: "] = "Volta mais rápida: ",
@@ -53,6 +67,9 @@
-- ["Flag respawned!"] = "",
-- ["Flag returned!"] = "",
-- ["Flags, and their home base will be placed where each team ends their first turn."] = "",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+-- ["fuel extended!"] = "",
-- ["GAME BEGUN!!!"] = "",
-- ["Game Modifiers: "] = "",
-- ["GAME OVER!"] = "",
@@ -62,11 +79,15 @@
-- ["GO! GO! GO!"] = "",
-- ["Good birdy......"] = "",
-- ["Good luck out there!"] = "",
+-- ["Good so far!"] = "",
+-- ["Good to go!"] = "",
-- ["GOTCHA!"] = "",
+-- ["Grab Mines/Explosives"] = "",
-- ["Hahahaha!"] = "",
-- ["Haha, now THAT would be something!"] = "",
-- ["Hapless Hogs"] = "",
-- [" Hapless Hogs left!"] = "",
+-- ["Health crates extend your time."] = "",
-- ["Heavy"] = "",
["Hedgewars-Basketball"] = "Hedgewars-Basketball",
["Hedgewars-Knockball"] = "Hedgewars-Knockball",
@@ -80,9 +101,15 @@
-- ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
-- ["Jumping is disabled"] = "",
-- ["Kamikaze Expert!"] = "",
+-- ["Keep it up!"] = "",
+-- ["Killing spree!"] = "",
-- ["KILLS"] = "",
+-- ["Last Target!"] = "",
-- ["[Left Shift]"] = "",
-- ["Listen up, maggot!!"] = "",
+-- ["Lively Lifeguard"] = "",
+-- ["Mine Deployer"] = "",
+-- ["Mine Eater!"] = "",
-- ["|- Mines Time:"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["MISSION FAILED"] = "", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["MISSION SUCCESS"] = "",
@@ -90,9 +117,12 @@
-- ["Movement: [Up], [Down], [Left], [Right]"] = "",
-- ["Multi-shot!"] = "",
-- ["Nameless Heroes"] = "",
+-- ["New Barrels Per Turn"] = "",
-- ["NEW CLAN RECORD: "] = "",
["NEW fastest lap: "] = "NOVA volta mais rápida: ",
+-- ["New Mines Per Turn"] = "",
-- ["NEW RACE RECORD: "] = "",
+-- ["Newton's Hammock"] = "",
-- ["NOT ENOUGH WAYPOINTS"] = "",
["Not So Friendly Match"] = "Partida não muito amigável", -- Basketball, Knockball
-- ["Oh no! Just try again!"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -100,15 +130,21 @@
-- ["Operation Diver"] = "",
-- ["Opposing Team: "] = "",
-- ["Pathetic Hog #%d"] = "",
+-- ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
-- ["Per-Hog Ammo"] = "",
-- ["Place more waypoints using [ENTER]"] = "",
+-- ["Place more waypoints using the 'Air Attack' weapon."] = "",
-- ["points"] = "", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
-- ["Poison"] = "",
-- ["Power Remaining"] = "",
+-- ["Prepare yourself"] = "",
-- ["Press [Precise] to skip intro"] = "",
-- ["Race complexity limit reached."] = "",
+-- ["RACER"] = "",
-- [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = "",
+-- ["Round Limit:"] = "",
-- ["Round Limit"] = "",
+-- ["Rounds Complete: "] = "",
-- ["Rounds Complete"] = "",
-- ["RULES OF THE GAME [Press ESC to view]"] = "",
-- ["s|"] = "",
@@ -116,6 +152,7 @@
-- ["SCORE"] = "",
-- ["sec"] = "", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
-- ["See ya!"] = "",
+-- ["selected!"] = "",
-- ["s"] = "", -- GaudyRacer, Space_Invasion
-- ["Shield boosted! +30 power"] = "",
-- ["Shield Depleted"] = "",
@@ -127,7 +164,7 @@
-- ["Shield Seeker!"] = "",
["Shotgun Team"] = "Carabineiros",
["Shotgun Training"] = "Treino com a Escopeta",
--- ["Shots Left: "] = "", -- GaudyRacer, Tumbler
+-- ["shots remaining."] = "",
-- ["Silly"] = "",
-- ["Sinky"] = "",
["%s is out and Team %d|scored a penalty!| |Score:"] = "%s está fora e a Equipe %d|sofreu uma penalidade!| |Pontuação:", -- Basketball, Knockball
@@ -146,26 +183,33 @@
-- ["The flag will respawn next round."] = "",
-- ["The Nameless One"] = "",
-- ["THE SPECIALISTS"] = "",
+-- ["This one's tricky."] = "",
-- ["This rain is really something..."] = "",
-- ["TIME: "] = "",
-- ["Timed Kamikaze!"] = "",
-- ["Time Extended!"] = "",
--- ["Time Left: "] = "",
+-- ["Time Extension"] = "",
-- ["Toggle Shield"] = "",
-- ["Toxic Team"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["TRACK COMPLETED"] = "",
--- ["Track Time: "] = "",
+-- ["TRACK FAILED!"] = "",
["TrophyRace"] = "TrophyRace",
-- ["T_T"] = "",
+-- ["Tumbling Time Extended!"] = "",
-- ["Turn Time"] = "",
+-- ["Unit"] = "",
-- ["Unit 3378"] = "",
+-- ["Unit 835"] = "",
-- ["Unlimited Attacks"] = "",
+-- ["Unstoppable!"] = "",
-- ["User Challenge"] = "",
["Use your rope to get from start to finish as fast as you can!"] = "Use sua corda para ir do inÃcio ao fim o mais rápido que você puder!",
--- ["v.06"] = "",
-- ["Victory for the "] = "", -- CTF_Blizzard, Capture_the_Flag
-- ["Waypoint placed."] = "",
+-- ["Way-Points Remaining"] = "",
-- ["Weapons Reset"] = "",
+-- ["Well done."] = "",
+-- ["Will this ever end?"] = "",
-- ["WINNING TIME: "] = "",
-- ["You'd almost swear the water was rising!"] = "",
-- ["You have SCORED!!"] = "",
--- a/share/hedgewars/Data/Locale/pt_PT.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/pt_PT.lua Sat Oct 08 16:54:56 2011 +0200
@@ -1,39 +1,50 @@
locale = {
- ["..."] = "...",
[":("] = ":(",
["!!!"] = "!!!",
--- ["Accuracy Bonus!"] = "",
+ ["..."] = "...",
+ ["Accuracy Bonus!"] = "Bónus de precisão!",
+-- ["Achievement Unlocked"] = "Desbloqueado", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
["a Hedgewars mini-game"] = "um mini-jogo Hedgewars", -- Space_Invasion, The_Specialists
["Aiming Practice"] = "Pratica a tua pontaria", --Bazooka, Shotgun, SniperRifle
- ["Ammo"] = "Munições",
-- ["Ammo Depleted!"] = "",
+-- ["ammo extended!"] = "",
+-- ["Ammo is reset at the end of your turn."] = "",
-- ["Ammo Maniac!"] = "",
+ ["Ammo"] = "Munições",
-- ["Available points remaining: "] = "",
+ ["[Backspace]"] = "[Retrocesso (backspace)]",
+-- ["Bamboo Thicket"] = "",
+-- ["Barrel Eater!"] = "",
+-- ["Barrel Launcher"] = "",
["Bat balls at your enemies and|push them into the sea!"] = "Bate bolas contra os teus|enimigos e empurra-os ao mar!",
["Bat your opponents through the|baskets and out of the map!"] = "Bate os teus adversarios|fora do mapa acertando com eles no cesto!",
["Bazooka Training"] = "Treino com Bazuca",
["Best laps per team: "] = "Melhores voltas por equipa: ",
-- ["Best Team Times: "] = "",
-- ["Bloody Rookies"] = "", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
+ ["Boom!"] = "Boom!",
["BOOM!"] = "BOOM!",
- ["Boom!"] = "Boom!",
["Boss defeated!"] = "Boss derrotado!",
-- ["Boss Slayer!"] = "",
+-- ["Build a track and race."] = "",
["CAPTURE THE FLAG"] = "CAPTURAR A BANDEIRA",
- ["Careless"] = "Descuidado",
+ ["Careless"] = "Descuidado",
+ ["Change Weapon"] = "Trocar Arma",
-- ["Clumsy"] = "",
-- ["Codename: Teamwork"] = "",
["Complete the track as fast as you can!"] = "Completa a pista o mais rápido que conseguires!",
["Congratulations!"] = "Parabéns!",
["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Parabéns! Eliminaste todos os alvos|dentro do tempo limite.", --Bazooka, Shotgun, SniperRifle
-- ["Control pillars to score points."] = "",
--- ["Cybernetic Empire"] = "",
+ ["Cybernetic Empire"] = "Império Cibernético",
-- ["DAMMIT, ROOKIE!"] = "",
-- ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "",
["Dangerous Ducklings"] = "Patinhos perigosos",
-- ["Deadweight"] = "",
+-- ["Demolition is fun!"] = "",
-- ["Depleted Kamikaze!"] = "",
-- ["Destroy invaders to score points."] = "",
+-- ["Double Kill!"] = "",
-- ["Drone Hunter!"] = "",
-- ["Drowner"] = "",
-- ["Each turn you get 1-3 random weapons"] = "",
@@ -42,8 +53,11 @@
["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Destrói todos os alvos antes do tempo terminar.|Tens munições infinitas para esta missão.", --Bazooka, Shotgun, SniperRifle
["Eliminate Poison before the time runs out"] = "Elimina o Poison antes do tempo terminar.",
["Eliminate the Blue Team"] = "Elimina a equipa azul",
--- ["Eliminate the enemy specialists."] = "",
+-- ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+-- ["Eliminate the enemy hogs to win."] = "Elimina os ouriços inimigos para ganhar.",
+-- ["Eliminate the enemy specialists."] = "Elimina os especialistas inimigos.",
-- ["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "",
+-- ["Energetic Engineer"] = "",
["Enjoy the swim..."] = "Aproveita o mergulho",
["[Enter]"] = "[Enter]",
["Fastest lap: "] = "Volta mais rápida: ",
@@ -53,20 +67,27 @@
["Flag respawned!"] = "Bandeira reiniciada!",
["Flag returned!"] = "Bandeira devolvida!",
-- ["Flags, and their home base will be placed where each team ends their first turn."] = "",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+-- ["fuel extended!"] = "",
-- ["GAME BEGUN!!!"] = "",
--- ["Game Modifiers: "] = "",
--- ["GAME OVER!"] = "",
+ ["Game Modifiers: "] = "Modificadores de Jogo: ",
+ ["GAME OVER!"] = "GAME OVER!",
-- ["Game Started!"] = "",
- ["Get on over there and take him out!"] = "Chega-te aqui e acaba com ele!",
+ ["Get on over there and take him out!"] = "Chega-te aqui e acaba com ele!",
-- ["Goal"] = "",
["GO! GO! GO!"] = "GO! GO! GO!",
- ["Good birdy......"] = "Bom passarito......",
+-- ["Good birdy......"] = "Lindo\Bom passarito......" (needs ingame confirmation),
["Good luck out there!"] = "Boa sorte aà fora!",
+-- ["Good so far!"] = "",
+-- ["Good to go!"] = "",
-- ["GOTCHA!"] = "",
+-- ["Grab Mines/Explosives"] = "",
["Hahahaha!"] = "Hahahaha!",
-- ["Haha, now THAT would be something!"] = "",
-- ["Hapless Hogs"] = "",
-- [" Hapless Hogs left!"] = "",
+-- ["Health crates extend your time."] = "",
-- ["Heavy"] = "",
["Hedgewars-Basketball"] = "Hedgewars-Basketball",
["Hedgewars-Knockball"] = "Hedgewars-Knockball",
@@ -76,13 +97,19 @@
["Hooray!"] = "Hurra!",
["Hunter"] = "Comando", --Bazooka, Shotgun, SniperRifle
["Instructor"] = "Instrutor", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings
--- ["invaders destroyed"] = "",
+ ["invaders destroyed"] = "invasores destruidos",
-- ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
-- ["Jumping is disabled"] = "",
["Kamikaze Expert!"] = "Kamikaze profissional!",
+-- ["Keep it up!"] = "Continua assim!",
+-- ["Killing spree!"] = "",
-- ["KILLS"] = "",
+-- ["Last Target!"] = "",
["[Left Shift]"] = "[Shift Esquerdo]",
["Listen up, maggot!!"] = "Oiçam bem suas larvas!!",
+-- ["Lively Lifeguard"] = "",
+-- ["Mine Deployer"] = "",
+-- ["Mine Eater!"] = "",
["|- Mines Time:"] = "|- Tempo das minas:", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["MISSION FAILED"] = "MISSÃO FALHADA", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["MISSION SUCCESSFUL"] = "MISSÃO COMPLETA", -- User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -90,35 +117,43 @@
["Movement: [Up], [Down], [Left], [Right]"] = "Movimento: [Cima], [Baixo], [Esquerda], [Direita]",
-- ["Multi-shot!"] = "",
-- ["Nameless Heroes"] = "",
+-- ["New Barrels Per Turn"] = "",
-- ["NEW CLAN RECORD: "] = "",
["NEW fastest lap: "] = "NOVA volta recorde: ",
+-- ["New Mines Per Turn"] = "",
-- ["NEW RACE RECORD: "] = "",
+-- ["Newton's Hammock"] = "",
-- ["NOT ENOUGH WAYPOINTS"] = "",
["Not So Friendly Match"] = "Partida não muito amigável", -- Basketball, Knockball
["Oh no! Just try again!"] = "Oh não! Tenta novamente!", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
- ["Oh no! Time's up! Just try again."] = "Oh não! Acabou o tempo! Tenta novamente.", --Bazooka, Shotgun, SniperRifle
+ ["Oh no! Time's up! Just try again."] = "Oh não! Terminou o tempo! Tenta novamente.", --Bazooka, Shotgun, SniperRifle
["Operation Diver"] = "Operação Mergulho",
["Opposing Team: "] = "Equipa adversária",
["Pathetic Hog #%d"] = "Ouriço patético #%d",
+-- ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
-- ["Per-Hog Ammo"] = "",
-- ["Place more waypoints using [ENTER]"] = "",
+-- ["Place more waypoints using the 'Air Attack' weapon."] = "",
-- ["points"] = "", -- Control, Space_Invasion
["Poison"] = "Poison",
--- ["Power Remaining"] = "",
+ ["Power Remaining"] = "Energia Restante",
+ ["Prepare yourself"] = "Prepara-te!",
-- ["Press [Precise] to skip intro"] = "",
-- ["Race complexity limit reached."] = "",
+-- ["RACER"] = "",
[" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Traz a bandeira inimiga para tua base | - A primeira equipa a captura-la 3 vezes ganha | - Apenas podes marcar quando a tua bandeira está na tua base | - Os ouriços largam a bandeira se morrerem ou se afogarem | - As bandeiras abandonadas podem ser devolvidas ou recapturadas | - Os ouriços mortos ressuscitam",
+-- ["Round Limit:"] = "",
-- ["Round Limit"] = "",
+-- ["Rounds Complete: "] = "",
-- ["Rounds Complete"] = "",
["RULES OF THE GAME [Press ESC to view]"] = "REGRAS DE JOGO [Pressiona ESC para as visualizar]",
- ["RULES OF THE GAME [Press ESC to view]"] = "REGRAS DE JOGO [Pressiona ESC para as visualizar]",
-- ["s|"] = "",
-- ["Save as many hapless hogs as possible!"] = "",
--- ["SCORE"] = "",
+ ["SCORE"] = "RESULTADOS",
["sec"] = "seg", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
["See ya!"] = "Chau!",
- ["s"] = "s", -- GaudyRacer, Space_Invasion
--- ["Shield boosted! +30 power"] = "",
+ ["selected!"] = "seleccionado!",
+-- ["Shield boosted! +30 power"] = "Escudo melhorado! +30 energia (-unconfirmed)",
["Shield Depleted"] = "Escudo Esgotado",
["Shield is fully recharged!"] = "Escudo completamente recarregado!",
-- ["Shield Master!"] = "",
@@ -128,7 +163,7 @@
-- ["Shield Seeker!"] = "",
["Shotgun Team"] = "Caçadores",
["Shotgun Training"] = "Treino com Caçadeira",
--- ["Shots Left: "] = "", -- GaudyRacer, Tumbler
+-- ["shots remaining."] = "tiros restantes.",
-- ["Silly"] = "",
-- ["Sinky"] = "",
["%s is out and Team %d|scored a penalty!| |Score:"] = "%s está fora e a equipa %d|perde um ponto!| |Pontuação:", -- Basketball, Knockball
@@ -137,6 +172,7 @@
["Sniperz"] = "Sniperz",
-- ["Sponge"] = "",
-- ["Spooky Tree"] = "",
+ ["s"] = "s", -- GaudyRacer, Space_Invasion
-- ["STATUS UPDATE"] = "", -- GaudyRacer, Space_Invasion
-- ["Switched to "] = "",
["Team %d: "] = "Equipa %d: ",
@@ -146,28 +182,35 @@
["The enemy is hiding out on yonder ducky!"] = "O inimigo está escondido ali a diante ao pé do patinho!",
["The flag will respawn next round."] = "A bandeira ira reaparecer no próximo turno.",
-- ["The Nameless One"] = "",
--- ["THE SPECIALISTS"] = "",
+ ["THE SPECIALISTS"] = "OS ESPECIALISTAS",
+-- ["This one's tricky."] = "",
-- ["This rain is really something..."] = "",
- ["TIME: "] = "TEMPO: ",
-- ["Timed Kamikaze!"] = "",
-- ["Time Extended!"] = "",
- ["Time Left: "] = "Tempo Restante: ",
+-- ["Time Extension"] = "",
+ ["TIME: "] = "TEMPO: ",
-- ["Toggle Shield"] = "",
-- ["Toxic Team"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
--- ["TRACK COMPLETED"] = "",
--- ["Track Time: "] = "",
+-- ["TRACK COMPLETED"] = "PISTA COMPLETA",
+-- ["TRACK FAILED!"] = "PISTA",
["TrophyRace"] = "TrophyRace",
["T_T"] = "T_T",
+-- ["Tumbling Time Extended!"] = "",
-- ["Turn Time"] = "",
+-- ["Unit"] = "",
["Unit 3378"] = "Unidade 3378",
+-- ["Unit 835"] = "",
["Unlimited Attacks"] = "Ataques Ilimitados",
+-- ["Unstoppable!"] = "",
-- ["User Challenge"] = "",
["Use your rope to get from start to finish as fast as you can!"] = "Utilizando a corda, percorre o percurso do inicio ao fim o mais rápido que conseguires!",
--- ["v.06"] = "",
-- ["Victory for the "] = "", -- CTF_Blizzard, Capture_the_Flag
["Victory for the"] = "Vitória para a",
-- ["Waypoint placed."] = "",
+-- ["Way-Points Remaining"] = "",
-- ["Weapons Reset"] = "",
+ ["Well done."] = "Bom trabalho.",
+-- ["Will this ever end?"] = "",
-- ["WINNING TIME: "] = "",
-- ["You'd almost swear the water was rising!"] = "",
["You have SCORED!!"] = "Marcaste!!",
--- a/share/hedgewars/Data/Locale/pt_PT.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/pt_PT.txt Sat Oct 08 16:54:56 2011 +0200
@@ -53,7 +53,7 @@
00:50=Ataque Perfurador
00:51=Bola de Lama
00:52=Nenhuma arma selecionada
-00:53=TARDIS
+00:53=Caixote do Tempo
00:54=Estrutura
00:55=Terreno-instantâneo
@@ -235,12 +235,12 @@
02:02=Luta com honra
02:02=Não desistas
02:02=Nunca te rendas
-02:02=Rebenta-os e empilha-os
+02:02=Rebenta e empilha!
02:02=Que comece a festa explosiva!
02:02=Espero que estejas pronto para a rixa!
02:02=Vai vai vai!
02:02=Os ouriços avançam!
-02:02=Vai haver tiros e bombas e socos nas trombas!
+02:02=Vai haver tiros, bombas e socos nas trombas!
02:02=Não temas!
02:02=Sê corajoso e conquista
@@ -253,12 +253,12 @@
; New health crate
02:05=AuxÃlio iminente!
02:05=Médico!
-02:05=Primeiros-socorros atirados dos céus!
+02:05=Kit de primeiros-socorros, largado do céu!
02:05=Um pacote de vida para ti
02:05=Energia... em forma de caixa!
02:05=O doutor chama
02:05=Ligaduras frescas!
-02:05=Isto irá fazer-te sentir melhor
+02:05=Isto vai-te fazer sentir melhor
02:05=Um Hi-Potion! Ups, jogo errado
02:05=Um "agarra-me já"!
02:05=Agarra-o
@@ -448,6 +448,7 @@
03:52=UNUSED
03:53=Modelo 40
03:54=Constroi qualquer coisa
+03:55=Utilitário
; Weapon Descriptions (use | as line breaks)
04:00=Ataca os teus inimigos usando uma simples granada.|Explodirá quando o tempo chegar a zero.|1-5: Define o temporizador da granada|Ataque: Deixa premido para lançar com mais força
@@ -500,6 +501,12 @@
04:47=Duplica a diversão com estas duas minas autocolantes!|Utiliza-as para atacar ou defender. É contigo!|Ataque: Deixa pressionado para disparar mais longe
04:48=Porque é que têm as toupeiras de ser sempre as vitimas?|Dar marteladas em ouriços pode ser igualmente divertido!|Uma boa martelada rapidamente remove um terço da vida|de um ouriço e ainda o enterra no solo!|Ataque: Activar
04:49=Ressuscita os teus amigos!|Mas cuidado, esta tecnica ressuscita também os teus enimigos.|Ataque: Deixa pressionado para ressuscitar lentamente|Up: Acelerar a ressureição
+04:50=Está alguém escondido num túnel subterrâneo?|Escava-os de lá para fora com um Ataque Perfurador!|O temporizador controla quão longe os misseis irão escavar.
+04:51=Empurra um ouriço sem perder o turno|criando uma bola de lama tu mesmo!
+04:52=UNUSED
+04:53=Parte numa aventura pelo tempo e espaço,|deixando os teus colegas para se defenderem sozinhos.|Está preparado para regressar a qualquer altura,|para Morte Súbita ou se todos forem derrotados.|Atenção: Não funciona em Morte Súbita,|se estiveres sozinho, ou se fores o Rei.
+04:54=INCOMPLETO
+04:55=Aplica estas particulas de terreno em spray onde quiseres.|Constroi pontes, enterra inimigos ou fecha túneis.|Tem apenas cuidado, não o uses em ti proprio!
; Game goal strings
05:00=Modos de Jogo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Locale/ru.lua Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,220 @@
+locale = {
+-- [":("] = "",
+-- ["!!!"] = "",
+-- ["..."] = "",
+ ["Accuracy Bonus!"] = "Ð‘Ð¾Ð½ÑƒÑ Ð·Ð° аккуратноÑÑ‚ÑŒ!",
+-- ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
+ ["a Hedgewars mini-game"] = "Мини-игра в Hedgewars", -- Space_Invasion, The_Specialists
+ ["Aiming Practice"] = "Упражнение на точноÑÑ‚ÑŒ", --Bazooka, Shotgun, SniperRifle
+-- ["Ammo"] = "",
+-- ["Ammo Depleted!"] = "",
+-- ["ammo extended!"] = "",
+-- ["Ammo is reset at the end of your turn."] = "",
+-- ["Ammo Maniac!"] = "",
+-- ["Available points remaining: "] = "",
+-- ["[Backspace]"] = "",
+-- ["Bamboo Thicket"] = "",
+-- ["Barrel Eater!"] = "",
+-- ["Barrel Launcher"] = "",
+-- ["Bat balls at your enemies and|push them into the sea!"] = "",
+-- ["Bat your opponents through the|baskets and out of the map!"] = "",
+ ["Bazooka Training"] = "Упражнение Ñ Ð±Ð°Ð·ÑƒÐºÐ¾Ð¹",
+-- ["Best laps per team: "] = "",
+-- ["Best Team Times: "] = "",
+-- ["Bloody Rookies"] = "", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
+ ["Boom!"] = "Бум!",
+ ["BOOM!"] = "БÐБÐÐ¥!",
+-- ["Boss defeated!"] = "",
+-- ["Boss Slayer!"] = "",
+-- ["Build a track and race."] = "",
+ ["CAPTURE THE FLAG"] = "ЗÐХВÐТ ФЛÐГÐ",
+-- ["Careless"] = "",
+ ["Change Weapon"] = "Сменить оружие",
+-- ["Clumsy"] = "",
+-- ["Codename: Teamwork"] = "",
+-- ["Complete the track as fast as you can!"] = "",
+ ["Congratulations!"] = "ПоздравлениÑ!",
+-- ["Congratulations! You've eliminated all targets|within the allowed time frame."] = "", --Bazooka, Shotgun, SniperRifle
+-- ["Control pillars to score points."] = "",
+-- ["Cybernetic Empire"] = "",
+-- ["DAMMIT, ROOKIE!"] = "",
+-- ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "",
+-- ["Dangerous Ducklings"] = "",
+-- ["Deadweight"] = "",
+-- ["Demolition is fun!"] = "",
+-- ["Depleted Kamikaze!"] = "",
+-- ["Destroy invaders to score points."] = "",
+ ["Double Kill!"] = "Двойное убийÑтво!",
+-- ["Drone Hunter!"] = "",
+-- ["Drowner"] = "",
+-- ["Each turn you get 1-3 random weapons"] = "",
+-- ["Each turn you get one random weapon"] = "",
+-- ["Eliminate all enemies"] = "",
+-- ["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "", --Bazooka, Shotgun, SniperRifle
+-- ["Eliminate Poison before the time runs out"] = "",
+-- ["Eliminate the Blue Team"] = "",
+-- ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+-- ["Eliminate the enemy hogs to win."] = "",
+-- ["Eliminate the enemy specialists."] = "",
+-- ["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "",
+-- ["Energetic Engineer"] = "",
+ ["Enjoy the swim..."] = "ПриÑтного плаваниÑ...",
+-- ["[Enter]"] = "",
+-- ["Fastest lap: "] = "",
+-- ["Feeble Resistance"] = "",
+-- ["Fire"] = "",
+-- ["Flag captured!"] = "",
+-- ["Flag respawned!"] = "",
+-- ["Flag returned!"] = "",
+-- ["Flags, and their home base will be placed where each team ends their first turn."] = "",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+-- ["fuel extended!"] = "",
+-- ["GAME BEGUN!!!"] = "",
+-- ["Game Modifiers: "] = "",
+ ["GAME OVER!"] = "ИГРРОКОÐЧЕÐÐ!",
+-- ["Game Started!"] = "",
+-- ["Get on over there and take him out!"] = "",
+ ["Goal"] = "Цель",
+-- ["GO! GO! GO!"] = "",
+-- ["Good birdy......"] = "",
+-- ["Good luck out there!"] = "",
+-- ["Good so far!"] = "",
+-- ["Good to go!"] = "",
+ ["GOTCHA!"] = "ПОПÐЛСЯ!",
+-- ["Grab Mines/Explosives"] = "",
+-- ["Hahahaha!"] = "",
+-- ["Haha, now THAT would be something!"] = "",
+-- ["Hapless Hogs"] = "",
+-- [" Hapless Hogs left!"] = "",
+-- ["Health crates extend your time."] = "",
+-- ["Heavy"] = "",
+-- ["Hedgewars-Basketball"] = "",
+-- ["Hedgewars-Knockball"] = "",
+-- ["Heh, it's not that bad."] = "",
+-- ["Hit Combo!"] = "",
+ ["Hmmm..."] = "Хммм...",
+ ["Hooray!"] = "Ура!",
+ ["Hunter"] = "Охотник", --Bazooka, Shotgun, SniperRifle
+ ["Instructor"] = "ИнÑтруктор", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings
+-- ["invaders destroyed"] = "",
+-- ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
+ ["Jumping is disabled"] = "Прыжки отключены",
+-- ["Kamikaze Expert!"] = "",
+-- ["Keep it up!"] = "",
+-- ["Killing spree!"] = "",
+-- ["KILLS"] = "",
+ ["Last Target!"] = "ПоÑледнÑÑ Ñ†ÐµÐ»ÑŒ!",
+-- ["[Left Shift]"] = "",
+-- ["Listen up, maggot!!"] = "",
+-- ["Lively Lifeguard"] = "",
+-- ["Mine Deployer"] = "",
+-- ["Mine Eater!"] = "",
+-- ["|- Mines Time:"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+ ["MISSION FAILED"] = "МИССИЯ ПРОВÐЛЕÐÐ", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+-- ["MISSION SUCCESS"] = "",
+ ["MISSION SUCCESSFUL"] = "МИССИЯ УСПЕШÐÐ", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+-- ["Movement: [Up], [Down], [Left], [Right]"] = "",
+-- ["Multi-shot!"] = "",
+ ["Nameless Heroes"] = "БезымÑнные герои",
+-- ["New Barrels Per Turn"] = "",
+ ["NEW CLAN RECORD: "] = "ÐОВЫЙ РЕКОРД КЛÐÐÐ: ",
+-- ["NEW fastest lap: "] = "",
+-- ["New Mines Per Turn"] = "",
+-- ["NEW RACE RECORD: "] = "",
+ ["Newton's Hammock"] = "Гамак Ðьютона",
+-- ["NOT ENOUGH WAYPOINTS"] = "",
+-- ["Not So Friendly Match"] = "", -- Basketball, Knockball
+-- ["Oh no! Just try again!"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+-- ["Oh no! Time's up! Just try again."] = "", --Bazooka, Shotgun, SniperRifle
+-- ["Operation Diver"] = "",
+-- ["Opposing Team: "] = "",
+-- ["Pathetic Hog #%d"] = "",
+-- ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+-- ["Per-Hog Ammo"] = "",
+-- ["Place more waypoints using [ENTER]"] = "",
+-- ["Place more waypoints using the 'Air Attack' weapon."] = "",
+-- ["points"] = "", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
+ ["Poison"] = "Яд",
+-- ["Power Remaining"] = "",
+-- ["Prepare yourself"] = "",
+-- ["Press [Precise] to skip intro"] = "",
+-- ["Race complexity limit reached."] = "",
+-- ["RACER"] = "",
+-- [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = "",
+-- ["Round Limit:"] = "",
+-- ["Round Limit"] = "",
+-- ["Rounds Complete: "] = "",
+-- ["Rounds Complete"] = "",
+-- ["RULES OF THE GAME [Press ESC to view]"] = "",
+-- ["s|"] = "",
+-- ["Save as many hapless hogs as possible!"] = "",
+-- ["SCORE"] = "",
+ ["sec"] = "Ñек", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
+ ["See ya!"] = "УвидимÑÑ!",
+-- ["selected!"] = "",
+-- ["s"] = "", -- GaudyRacer, Space_Invasion
+-- ["Shield boosted! +30 power"] = "",
+-- ["Shield Depleted"] = "",
+-- ["Shield is fully recharged!"] = "",
+-- ["Shield Master!"] = "",
+-- ["Shield Miser!"] = "",
+-- ["Shield OFF:"] = "",
+-- ["Shield ON:"] = "",
+-- ["Shield Seeker!"] = "",
+-- ["Shotgun Team"] = "",
+-- ["Shotgun Training"] = "",
+-- ["shots remaining."] = "",
+-- ["Silly"] = "",
+-- ["Sinky"] = "",
+-- ["%s is out and Team %d|scored a penalty!| |Score:"] = "", -- Basketball, Knockball
+-- ["%s is out and Team %d|scored a point!| |Score:"] = "", -- Basketball, Knockball
+ ["Sniper Training"] = "Тренировка Ñнайпера",
+-- ["Sniperz"] = "",
+-- ["Sponge"] = "",
+-- ["Spooky Tree"] = "",
+-- ["STATUS UPDATE"] = "", -- GaudyRacer, Space_Invasion
+-- ["Switched to "] = "",
+ ["Team %d: "] = "Команда %d: ",
+ ["Team Scores"] = "Очки команды", -- Control, Space_Invasion
+-- ["That Sinking Feeling"] = "",
+-- ["That was pointless."] = "",
+-- ["The enemy is hiding out on yonder ducky!"] = "",
+-- ["The flag will respawn next round."] = "",
+-- ["The Nameless One"] = "",
+-- ["THE SPECIALISTS"] = "",
+-- ["This one's tricky."] = "",
+-- ["This rain is really something..."] = "",
+ ["TIME: "] = "ВРЕМЯ: ",
+-- ["Timed Kamikaze!"] = "",
+-- ["Time Extended!"] = "",
+-- ["Time Extension"] = "",
+-- ["Toggle Shield"] = "",
+-- ["Toxic Team"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+-- ["TRACK COMPLETED"] = "",
+-- ["TRACK FAILED!"] = "",
+-- ["TrophyRace"] = "",
+-- ["T_T"] = "",
+-- ["Tumbling Time Extended!"] = "",
+-- ["Turn Time"] = "",
+-- ["Unit"] = "",
+-- ["Unit 3378"] = "",
+-- ["Unit 835"] = "",
+-- ["Unlimited Attacks"] = "",
+-- ["Unstoppable!"] = "",
+-- ["User Challenge"] = "",
+-- ["Use your rope to get from start to finish as fast as you can!"] = "",
+-- ["Victory for the "] = "", -- CTF_Blizzard, Capture_the_Flag
+-- ["Waypoint placed."] = "",
+-- ["Way-Points Remaining"] = "",
+-- ["Weapons Reset"] = "",
+-- ["Well done."] = "",
+-- ["Will this ever end?"] = "",
+-- ["WINNING TIME: "] = "",
+-- ["You'd almost swear the water was rising!"] = "",
+-- ["You have SCORED!!"] = "",
+-- ["You saved"] = "",
+-- ["You've failed. Try again."] = "",
+-- ["You've reached the goal!| |Time: "] = "",
+-- ["'Zooka Team"] = "",
+ }
--- a/share/hedgewars/Data/Locale/ru.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/ru.txt Sat Oct 08 16:54:56 2011 +0200
@@ -45,7 +45,7 @@
00:42=Портативный телепорт
00:43=ФортепьÑновый удар
00:44=Старый Лимбургер
-00:45=СинуÑ-пушка (в разработке)
+00:45=СинуÑ-пушка (бета)
00:46=Огнемет
00:47=Мина-липучка
00:48=Молот
@@ -53,9 +53,9 @@
00:50=СверлÑщий удар
00:51=Комок грÑзи
00:52=Оружие не выбрано
-00:53=Ограничитель времени
+00:53=Будка времени
00:54=Структура
-00:55=ЗемлÑной раÑпылитель
+00:55=РаÑпылитель земли
01:00=Вперёд к победе!
01:01=ÐичьÑ
@@ -107,11 +107,11 @@
02:00=%1 уже не доÑтанет Ñвой Desert Eagle
02:00=%1 заплатил Ñполна
02:00=%1 мог бы воÑпользоватьÑÑ Ð°Ð¿Ñ‚ÐµÑ‡ÐºÐ¾Ð¹
-02:00=%1 ушел играть в игру получше
+02:00=%1 ушел играть лучшую игру
02:00=%1 прожил трудную жизнь
02:00=%1 вышел из ÑтроÑ
02:00=Бедный, бедный %1...
-02:00=%1 предпочитает Wormux
+02:00=%1 предпочитает Warmux
02:00=%1 принÑл удар на ÑебÑ
02:00=%1 герой Ñреди лю...гм...ежей
02:00=%1 занÑл Ñвое меÑто в Валгале
@@ -125,7 +125,7 @@
02:00=Скажите "Прощай, %1!"
02:00=Ðадежды больше нет, %1
02:00=Ðто было твое поÑледнее предÑтавление, %1
-02:00=Закури перед Ñмертью, %1, Ñ‚.к твоему здоровью Ñто уже не повредит
+02:00=Закури перед Ñмертью, %1, твоему здоровью Ñто уже не повредит
02:00=%1 иÑпытал Внезапный МаÑÑовый Отказ в СиÑтеме ЖизнеобеÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ (C)
02:00=%1 преÑтавилÑÑ
02:00=%1 Ñтопроцентный труп
@@ -152,7 +152,7 @@
02:01=%1 помылÑÑ
02:01=%1 - Ñто один мокрый ёж
02:01=%1 забыл надеть ÑпаÑательный жилет
-02:01=%1 плеÑкаетÑÑ Ð² воде
+02:01=%1 плещетÑÑ Ð² воде
02:01=%1 Ñпит Ñреди рыб
02:01=%1 думал, что физика воды в Ñтой игре полный отÑтой
02:01=%1 иÑпытывает жажду
@@ -338,9 +338,9 @@
02:08=%1 вообще не хотел идти в армию
02:08=Хватит впуÑтую тратить времÑ, %1
02:08=Я разочарован тобой, %1
-02:08=Давай, Ñ‚Ñ‹ можешь добитьÑÑ Ð±Ð¾Ð»ÑŒÑˆÐµÐ³Ð¾, чем Ñтот %1
+02:08=Давай, Ñ‚Ñ‹ можешь быть лучше, чем ÑейчаÑ, %1
02:08=ÐÐ°Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ %1 провалилиÑÑŒ
-02:08=%1 очевидно знает более интереÑные дела
+02:08=%1, очевидно, знает более интереÑные дела
02:08=%1 оцепенел от Ñтраха
02:08=%1 уÑнул
@@ -383,7 +383,7 @@
; Hog shot an home run (using the bat and another hog)
02:10=Хоум-ран!
02:10=Птица, Ñамолет, ...
-02:10=Тот отÑутÑтвует!
+02:10=Вылетел!
; Hog (%1) has to leave (team is gone)
02:11=%1 должен идти Ñпать!
@@ -435,8 +435,9 @@
03:40=ИÑпепелÑÑŽÑ‰Ð°Ñ Ð³Ñ€Ð°Ð½Ð°Ñ‚Ð°
03:41=Большой поклонник Squawks
03:42=ЗдеÑÑŒ Ñ Ð²ÐµÐ´Ñƒ запиÑи...
+
; the misspelled "Beethoven" is intentional (-> to beat)
-03:43=ИÑполнение Ñмертельной Ñонаты Бетховена
+03:43=ИÑполнение Ñмертельной Ñонаты Битьховена
03:44=Годен до: 1923
03:45=ДоÑÑ‚Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð½Ð°ÑƒÐºÐ¸
03:46=ГорÑчо, горÑчо, горÑчо!
--- a/share/hedgewars/Data/Locale/stub.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/stub.lua Sat Oct 08 16:54:56 2011 +0200
@@ -3,12 +3,19 @@
-- ["!!!"] = "",
-- ["..."] = "",
-- ["Accuracy Bonus!"] = "",
+-- ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
-- ["a Hedgewars mini-game"] = "", -- Space_Invasion, The_Specialists
-- ["Aiming Practice"] = "", --Bazooka, Shotgun, SniperRifle
-- ["Ammo"] = "",
-- ["Ammo Depleted!"] = "",
+-- ["ammo extended!"] = "",
+-- ["Ammo is reset at the end of your turn."] = "",
-- ["Ammo Maniac!"] = "",
-- ["Available points remaining: "] = "",
+-- ["[Backspace]"] = "",
+-- ["Bamboo Thicket"] = "",
+-- ["Barrel Eater!"] = "",
+-- ["Barrel Launcher"] = "",
-- ["Bat balls at your enemies and|push them into the sea!"] = "",
-- ["Bat your opponents through the|baskets and out of the map!"] = "",
-- ["Bazooka Training"] = "",
@@ -19,8 +26,10 @@
-- ["BOOM!"] = "",
-- ["Boss defeated!"] = "",
-- ["Boss Slayer!"] = "",
+-- ["Build a track and race."] = "",
-- ["CAPTURE THE FLAG"] = "",
-- ["Careless"] = "",
+-- ["Change Weapon"] = "",
-- ["Clumsy"] = "",
-- ["Codename: Teamwork"] = "",
-- ["Complete the track as fast as you can!"] = "",
@@ -32,8 +41,10 @@
-- ["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "",
-- ["Dangerous Ducklings"] = "",
-- ["Deadweight"] = "",
+-- ["Demolition is fun!"] = "",
-- ["Depleted Kamikaze!"] = "",
-- ["Destroy invaders to score points."] = "",
+-- ["Double Kill!"] = "",
-- ["Drone Hunter!"] = "",
-- ["Drowner"] = "",
-- ["Each turn you get 1-3 random weapons"] = "",
@@ -42,8 +53,11 @@
-- ["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "", --Bazooka, Shotgun, SniperRifle
-- ["Eliminate Poison before the time runs out"] = "",
-- ["Eliminate the Blue Team"] = "",
+-- ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+-- ["Eliminate the enemy hogs to win."] = "",
-- ["Eliminate the enemy specialists."] = "",
-- ["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "",
+-- ["Energetic Engineer"] = "",
-- ["Enjoy the swim..."] = "",
-- ["[Enter]"] = "",
-- ["Fastest lap: "] = "",
@@ -53,6 +67,9 @@
-- ["Flag respawned!"] = "",
-- ["Flag returned!"] = "",
-- ["Flags, and their home base will be placed where each team ends their first turn."] = "",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+-- ["fuel extended!"] = "",
-- ["GAME BEGUN!!!"] = "",
-- ["Game Modifiers: "] = "",
-- ["GAME OVER!"] = "",
@@ -62,11 +79,15 @@
-- ["GO! GO! GO!"] = "",
-- ["Good birdy......"] = "",
-- ["Good luck out there!"] = "",
+-- ["Good so far!"] = "",
+-- ["Good to go!"] = "",
-- ["GOTCHA!"] = "",
+-- ["Grab Mines/Explosives"] = "",
-- ["Hahahaha!"] = "",
-- ["Haha, now THAT would be something!"] = "",
-- ["Hapless Hogs"] = "",
-- [" Hapless Hogs left!"] = "",
+-- ["Health crates extend your time."] = "",
-- ["Heavy"] = "",
-- ["Hedgewars-Basketball"] = "",
-- ["Hedgewars-Knockball"] = "",
@@ -80,9 +101,15 @@
-- ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
-- ["Jumping is disabled"] = "",
-- ["Kamikaze Expert!"] = "",
+-- ["Keep it up!"] = "",
+-- ["Killing spree!"] = "",
-- ["KILLS"] = "",
+-- ["Last Target!"] = "",
-- ["[Left Shift]"] = "",
-- ["Listen up, maggot!!"] = "",
+-- ["Lively Lifeguard"] = "",
+-- ["Mine Deployer"] = "",
+-- ["Mine Eater!"] = "",
-- ["|- Mines Time:"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["MISSION FAILED"] = "", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["MISSION SUCCESS"] = "",
@@ -90,9 +117,12 @@
-- ["Movement: [Up], [Down], [Left], [Right]"] = "",
-- ["Multi-shot!"] = "",
-- ["Nameless Heroes"] = "",
+-- ["New Barrels Per Turn"] = "",
-- ["NEW CLAN RECORD: "] = "",
-- ["NEW fastest lap: "] = "",
+-- ["New Mines Per Turn"] = "",
-- ["NEW RACE RECORD: "] = "",
+-- ["Newton's Hammock"] = "",
-- ["NOT ENOUGH WAYPOINTS"] = "",
-- ["Not So Friendly Match"] = "", -- Basketball, Knockball
-- ["Oh no! Just try again!"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -100,15 +130,21 @@
-- ["Operation Diver"] = "",
-- ["Opposing Team: "] = "",
-- ["Pathetic Hog #%d"] = "",
+-- ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
-- ["Per-Hog Ammo"] = "",
-- ["Place more waypoints using [ENTER]"] = "",
+-- ["Place more waypoints using the 'Air Attack' weapon."] = "",
-- ["points"] = "", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
-- ["Poison"] = "",
-- ["Power Remaining"] = "",
+-- ["Prepare yourself"] = "",
-- ["Press [Precise] to skip intro"] = "",
-- ["Race complexity limit reached."] = "",
+-- ["RACER"] = "",
-- [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = "",
+-- ["Round Limit:"] = "",
-- ["Round Limit"] = "",
+-- ["Rounds Complete: "] = "",
-- ["Rounds Complete"] = "",
-- ["RULES OF THE GAME [Press ESC to view]"] = "",
-- ["s|"] = "",
@@ -116,6 +152,7 @@
-- ["SCORE"] = "",
-- ["sec"] = "", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
-- ["See ya!"] = "",
+-- ["selected!"] = "",
-- ["s"] = "", -- GaudyRacer, Space_Invasion
-- ["Shield boosted! +30 power"] = "",
-- ["Shield Depleted"] = "",
@@ -127,7 +164,7 @@
-- ["Shield Seeker!"] = "",
-- ["Shotgun Team"] = "",
-- ["Shotgun Training"] = "",
--- ["Shots Left: "] = "", -- GaudyRacer, Tumbler
+-- ["shots remaining."] = "",
-- ["Silly"] = "",
-- ["Sinky"] = "",
-- ["%s is out and Team %d|scored a penalty!| |Score:"] = "", -- Basketball, Knockball
@@ -146,26 +183,33 @@
-- ["The flag will respawn next round."] = "",
-- ["The Nameless One"] = "",
-- ["THE SPECIALISTS"] = "",
+-- ["This one's tricky."] = "",
-- ["This rain is really something..."] = "",
-- ["TIME: "] = "",
-- ["Timed Kamikaze!"] = "",
-- ["Time Extended!"] = "",
--- ["Time Left: "] = "",
+-- ["Time Extension"] = "",
-- ["Toggle Shield"] = "",
-- ["Toxic Team"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["TRACK COMPLETED"] = "",
--- ["Track Time: "] = "",
+-- ["TRACK FAILED!"] = "",
-- ["TrophyRace"] = "",
-- ["T_T"] = "",
+-- ["Tumbling Time Extended!"] = "",
-- ["Turn Time"] = "",
+-- ["Unit"] = "",
-- ["Unit 3378"] = "",
+-- ["Unit 835"] = "",
-- ["Unlimited Attacks"] = "",
+-- ["Unstoppable!"] = "",
-- ["User Challenge"] = "",
-- ["Use your rope to get from start to finish as fast as you can!"] = "",
--- ["v.06"] = "",
-- ["Victory for the "] = "", -- CTF_Blizzard, Capture_the_Flag
-- ["Waypoint placed."] = "",
+-- ["Way-Points Remaining"] = "",
-- ["Weapons Reset"] = "",
+-- ["Well done."] = "",
+-- ["Will this ever end?"] = "",
-- ["WINNING TIME: "] = "",
-- ["You'd almost swear the water was rising!"] = "",
-- ["You have SCORED!!"] = "",
--- a/share/hedgewars/Data/Locale/sv.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/sv.lua Sat Oct 08 16:54:56 2011 +0200
@@ -3,12 +3,19 @@
[":("] = ":(",
["!!!"] = "!!!",
-- ["Accuracy Bonus!"] = "",
+-- ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
-- ["a Hedgewars mini-game"] = "", -- Space_Invasion, The_Specialists
["Aiming Practice"] = "Siktesövning", --Bazooka, Shotgun, SniperRifle
-- ["Ammo"] = "",
-- ["Ammo Depleted!"] = "",
+-- ["ammo extended!"] = "",
+-- ["Ammo is reset at the end of your turn."] = "",
-- ["Ammo Maniac!"] = "",
-- ["Available points remaining: "] = "",
+-- ["[Backspace]"] = "",
+-- ["Bamboo Thicket"] = "",
+-- ["Barrel Eater!"] = "",
+-- ["Barrel Launcher"] = "",
["Bat balls at your enemies and|push them into the sea!"] = "Slå bollar mot dina fiender|och slå ner dem i havet",
["Bat your opponents through the|baskets and out of the map!"] = "Slå ner dina motståndare i|korgarna och ut ur kartan!",
["Bazooka Training"] = "Bazookaträning",
@@ -19,8 +26,10 @@
["Boom!"] = "Bom!",
-- ["Boss defeated!"] = "",
-- ["Boss Slayer!"] = "",
+-- ["Build a track and race."] = "",
["CAPTURE THE FLAG"] = "CAPTURE THE FLAG",
-- ["Careless"] = "",
+-- ["Change Weapon"] = "",
-- ["Clumsy"] = "",
["Codename: Teamwork"] = "Kodnamn: Lagarbete",
-- ["Complete the track as fast as you can!"] = "",
@@ -32,8 +41,10 @@
["DAMMIT, ROOKIE!"] = "SATAN, GRÖNGÖLING!",
["Dangerous Ducklings"] = "Farliga ankungar",
-- ["Deadweight"] = "",
+-- ["Demolition is fun!"] = "",
-- ["Depleted Kamikaze!"] = "",
-- ["Destroy invaders to score points."] = "",
+-- ["Double Kill!"] = "",
-- ["Drone Hunter!"] = "",
-- ["Drowner"] = "",
-- ["Each turn you get 1-3 random weapons"] = "",
@@ -42,8 +53,11 @@
["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Förstör alla målen innan din tid tar slut.|Du har obegränsad ammunition för deta uppdrag", --Bazooka, Shotgun, SniperRifle
["Eliminate Poison before the time runs out"] = "Förgör Gift innan tiden tar slut",
["Eliminate the Blue Team"] = "Förgör det Blå laget",
+-- ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+-- ["Eliminate the enemy hogs to win."] = "",
-- ["Eliminate the enemy specialists."] = "",
["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Förgör Enhet 3378 |- Klent motstånd måste överleva",
+-- ["Energetic Engineer"] = "",
["Enjoy the swim..."] = "Ha en trevlig simtur...",
-- ["[Enter]"] = "",
["Fastest lap: "] = "Snabbast varv: ",
@@ -53,6 +67,9 @@
["Flag respawned!"] = "Flagga återställd!",
["Flag returned!"] = "Flagga återvänd!",
-- ["Flags, and their home base will be placed where each team ends their first turn."] = "",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+-- ["fuel extended!"] = "",
-- ["GAME BEGUN!!!"] = "",
-- ["Game Modifiers: "] = "",
["GAME OVER!"] = "SPELET ÄR SLUT!",
@@ -62,11 +79,15 @@
["GO! GO! GO!"] = "Kör! Kör! Kör!",
["Good birdy......"] = "Fin fågel......",
["Good luck out there!"] = "Lycka till där ute!",
+-- ["Good so far!"] = "",
+-- ["Good to go!"] = "",
-- ["GOTCHA!"] = "",
+-- ["Grab Mines/Explosives"] = "",
-- ["Hahahaha!"] = "",
-- ["Haha, now THAT would be something!"] = "",
-- ["Hapless Hogs"] = "",
-- [" Hapless Hogs left!"] = "",
+-- ["Health crates extend your time."] = "",
-- ["Heavy"] = "",
["Hedgewars-Basketball"] = "Hedgewars-Basket",
["Hedgewars-Knockball"] = "Hedgewars-Knockball",
@@ -80,9 +101,15 @@
-- ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
-- ["Jumping is disabled"] = "",
-- ["Kamikaze Expert!"] = "",
+-- ["Keep it up!"] = "",
+-- ["Killing spree!"] = "",
-- ["KILLS"] = "",
+-- ["Last Target!"] = "",
-- ["[Left Shift]"] = "",
["Listen up, maggot!!"] = "Hör här, ynkrygg!!",
+-- ["Lively Lifeguard"] = "",
+-- ["Mine Deployer"] = "",
+-- ["Mine Eater!"] = "",
["|- Mines Time:"] = "|- Mintid:", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["MISSION FAILED"] = "UPPDRAG MISSLYCKADES", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["MISSION SUCCESS"] = "",
@@ -90,9 +117,12 @@
-- ["Movement: [Up], [Down], [Left], [Right]"] = "",
-- ["Multi-shot!"] = "",
-- ["Nameless Heroes"] = "",
+-- ["New Barrels Per Turn"] = "",
-- ["NEW CLAN RECORD: "] = "",
["NEW fastest lap: "] = "NYTT snabbast varv: ",
+-- ["New Mines Per Turn"] = "",
-- ["NEW RACE RECORD: "] = "",
+-- ["Newton's Hammock"] = "",
-- ["NOT ENOUGH WAYPOINTS"] = "",
["Not So Friendly Match"] = "En inte så vänlig match", -- Basketball, Knockball
["Oh no! Just try again!"] = "Å nej! Bara att försöka igen!", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -100,15 +130,21 @@
["Operation Diver"] = "Operationens dykare",
["Opposing Team: "] = "Motståndarlag: ",
["Pathetic Hog #%d"] = "Patetisk kott #%d",
+-- ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
-- ["Per-Hog Ammo"] = "",
-- ["Place more waypoints using [ENTER]"] = "",
+-- ["Place more waypoints using the 'Air Attack' weapon."] = "",
-- ["points"] = "", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
["Poison"] = "Gift",
-- ["Power Remaining"] = "",
+-- ["Prepare yourself"] = "",
-- ["Press [Precise] to skip intro"] = "",
-- ["Race complexity limit reached."] = "",
+-- ["RACER"] = "",
[" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Återvänd med fiendens flagga till din bas för att ta poäng | - Första laget till tre vinner | - Du kan bara ta poäng när din egen flagga är i basen | - Kottar tappar flaggan när de dödas eller drunknar | - Tappade flaggor kan tas tillbaka eller fångas | - Kottar kommer tillbaka när de dör",
+-- ["Round Limit:"] = "",
-- ["Round Limit"] = "",
+-- ["Rounds Complete: "] = "",
-- ["Rounds Complete"] = "",
["RULES OF THE GAME [Press ESC to view]"] = "SPELREGLER [Tryck ESC för att se]",
-- ["s|"] = "",
@@ -116,6 +152,7 @@
-- ["SCORE"] = "",
["sec"] = "sec", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
["See ya!"] = "Ses!",
+-- ["selected!"] = "",
-- ["s"] = "", -- GaudyRacer, Space_Invasion
-- ["Shield boosted! +30 power"] = "",
-- ["Shield Depleted"] = "",
@@ -127,7 +164,7 @@
-- ["Shield Seeker!"] = "",
["Shotgun Team"] = "Hagelgevärslaget",
["Shotgun Training"] = "Hagelgevärsträning",
--- ["Shots Left: "] = "", -- GaudyRacer, Tumbler
+-- ["shots remaining."] = "",
-- ["Silly"] = "",
-- ["Sinky"] = "",
["%s is out and Team %d|scored a penalty!| |Score:"] = "%s är ute och lag %d|fick ett straff!| |Poängställning:", -- Basketball, Knockball
@@ -146,26 +183,33 @@
["The flag will respawn next round."] = "Flaggan kommer tillbaka nästa runda.",
-- ["The Nameless One"] = "",
-- ["THE SPECIALISTS"] = "",
+-- ["This one's tricky."] = "",
-- ["This rain is really something..."] = "",
-- ["TIME: "] = "",
-- ["Timed Kamikaze!"] = "",
-- ["Time Extended!"] = "",
--- ["Time Left: "] = "",
+-- ["Time Extension"] = "",
-- ["Toggle Shield"] = "",
["Toxic Team"] = "Förgiftade laget", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["TRACK COMPLETED"] = "",
--- ["Track Time: "] = "",
+-- ["TRACK FAILED!"] = "",
["TrophyRace"] = "TrophyRace",
["T_T"] = "T_T",
+-- ["Tumbling Time Extended!"] = "",
-- ["Turn Time"] = "",
+-- ["Unit"] = "",
["Unit 3378"] = "Enhet 3378",
+-- ["Unit 835"] = "",
-- ["Unlimited Attacks"] = "",
+-- ["Unstoppable!"] = "",
-- ["User Challenge"] = "",
["Use your rope to get from start to finish as fast as you can!"] = "Använd ditt rep för att ta dig från start till mål så fort som möjligt!",
--- ["v.06"] = "",
["Victory for the "] = "Vinst för", -- CTF_Blizzard, Capture_the_Flag
-- ["Waypoint placed."] = "",
+-- ["Way-Points Remaining"] = "",
-- ["Weapons Reset"] = "",
+-- ["Well done."] = "",
+-- ["Will this ever end?"] = "",
-- ["WINNING TIME: "] = "",
-- ["You'd almost swear the water was rising!"] = "",
["You have SCORED!!"] = "Du har tagit poäng!",
--- a/share/hedgewars/Data/Locale/sv.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/sv.txt Sat Oct 08 16:54:56 2011 +0200
@@ -50,6 +50,12 @@
00:47=Fästande mina
00:48=Hammare
00:49=Ã…teruppliva
+00:50=Borrangrepp
+00:51=Jordboll
+00:52=Inget vapen valt
+00:53=Tidslåda
+00:54=Struktur
+00:55=Markspruta
01:00=Nu kör vi!
01:01=Oavgjort
@@ -66,6 +72,12 @@
01:12=Sista rundan till sudden death!
01:13=%1 rundor till sudden death!
01:14=Gör dig redo, %1!
+01:15=Märkbar
+01:16=LÃ¥g
+01:17=Normal
+01:18=Hög
+01:19=Extrem
+01:20=%1 studs
; Event messages
; Hog (%1) died
@@ -461,6 +473,12 @@
03:47=Fäst de här på ett användbart ställe!
03:48=Dags att banka järnet!
03:49=Gör det du tror
+03:50=Siktar mot stjärnorna
+03:51=Upphittad på marken
+03:52=UNUSED
+03:53=Typ 40
+03:54=Bygg något
+03:55=Verktyg
; Weapon Descriptions (use | as line breaks)
04:00=Attackera fienden med en enkel granat.|Exploderar när tiden når noll.|1-5: Ställ in granatens tid|Attack: Håll ner för att kasta med mer kraft
@@ -513,6 +531,12 @@
04:47=Det är dubbelt så roligt med två farliga, fantastiska,|fästande minor. Skapa en kedjereaktion eller försvara|dig själv (eller både och!)|Attack: Håll ner för att skjuta med mer kraft (två gånger)
04:48=Varför ska mullvadarna få all misshandel? Att|drämma till en igelkott kan vara minst lika roligt!|Ett rejält slag med den här hammaren kan skala|av en tredjedel av en igelkotts hälsa och slå ner|dem i marken.|Attack: Aktivera
04:49=Återuppliva dina vänner!|Men tänk på att du också återupplivar dina fiender.|Attack: Håll inne för att återuppliva långsamt|Upp: Accelerera återupplivning
+04:50=Gömmer sig någon under marken?|Gräv fram dem med ett borrangrepp!|1-5: Ställ in hur långt raketerna borrar.
+04:51=Få till en gratisträff genom att kasta en boll med|jord. Känns lite gran, och knuffar tillbaka|igelkottar.
+04:52=UNUSED
+04:53=Åk på ett äventyr genom tid och rymd, medan dina|kamrater blir kvar själva att slåss. Var beredd|att komma tillbaka när som helst, eller till|Sudden Death eller om de andra blir besegrade.|Varning. Fungerar inte under Sudden Death, om du|är ensam, eller om du är en kung.
+04:54=INCOMPLETE
+04:55=Spruta en ström av fästande jord.|Bygg broar, gräv ner fienden, stäng igen tunnlar.|Var försiktig så att du inte får något på dig!
; Game goal strings
05:00=Spellägen
@@ -536,3 +560,4 @@
05:18=Obegränsade attacker
05:19=Vapen nollställs när turen är över
05:20=Igelkottar delar inte på vapnen
+05:21=Maraton: Lag i en klan tar på vart andra följande turer|Delad tid: Lag inom en klan delar på turtiden
--- a/share/hedgewars/Data/Locale/uk.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/uk.lua Sat Oct 08 16:54:56 2011 +0200
@@ -1,28 +1,38 @@
locale = {
-- [":("] = "",
+ ["!!!"] = "Я!",
-- ["..."] = "",
--- ["Accuracy Bonus!"] = "",
--- ["a Hedgewars mini-game"] = "", -- Space_Invasion, The_Specialists
+ ["Accuracy Bonus!"] = "Ð‘Ð¾Ð½ÑƒÑ Ð¢Ð¾Ñ‡Ð½Ð¾ÑÑ‚Ñ–!",
+ ["Achievement Unlocked"] = "ДоÑÑÐ³Ð½ÐµÐ½Ð½Ñ Ð Ð¾Ð·Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¾", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
+ ["a Hedgewars mini-game"] = "Міні-гра Hedgewars", -- Space_Invasion, The_Specialists
["Aiming Practice"] = "Практика прицілюваннÑ", --Bazooka, Shotgun, SniperRifle
--- ["Ammo"] = "",
--- ["Ammo Depleted!"] = "",
--- ["Ammo Maniac!"] = "",
--- ["Available points remaining: "] = "",
+ ["Ammo"] = "БоєприпаÑи",
+ ["Ammo Depleted!"] = "БоєприпаÑи СкінчилиÑÑŒ!",
+ ["ammo extended!"] = "БоєприпаÑи поповнені!",
+ ["Ammo is reset at the end of your turn."] = "БоєприпаÑи обнулÑÑŽÑ‚ÑŒÑÑ Ð² кінці вашого ходу.",
+ ["Ammo Maniac!"] = "МаніÑк БоєприпаÑів!",
+ ["Available points remaining: "] = "ЗалишилоÑÑŒ доÑтупних очків: ",
+-- ["[Backspace]"] = "",
+ ["Bamboo Thicket"] = "Бамбукові Хащі",
+ ["Barrel Eater!"] = "Поїдач Бочок!",
+ ["Barrel Launcher"] = "Катапульта Ð´Ð»Ñ Ð±Ð¾Ñ‡Ð¾Ðº",
["Bat balls at your enemies and|push them into the sea!"] = "Закидайте ворогів м'Ñчами щоб|зіштовути Ñ—Ñ… у море!",
["Bat your opponents through the|baskets and out of the map!"] = "ДубаÑьте опонентів битою через|кошики та за межі карти!",
["Bazooka Training"] = "Ð¢Ñ€ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ð· базукою",
["Best laps per team: "] = "Кращі партії на команду: ",
--- ["Best Team Times: "] = "",
+ ["Best Team Times: "] = "Кращий Командний ЧаÑ: ",
["Bloody Rookies"] = "Криваві Салаги", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
--- ["BOOM!"] = "",
+ ["BOOM!"] = "БÐБÐÐ¥!",
["Boom!"] = "Бабах!",
--- ["Boss defeated!"] = "",
--- ["Boss Slayer!"] = "",
+ ["Boss defeated!"] = "БоÑа переможено!",
+ ["Boss Slayer!"] = "Ð’Ð±Ð¸Ð²Ñ†Ñ Ð‘Ð¾Ñа!",
+ ["Build a track and race."] = "Створіть траÑу та женіть.",
["CAPTURE THE FLAG"] = "ЗÐХОПЛЕÐÐЯ ПРÐПОРÐ",
--- ["Careless"] = "",
--- ["Clumsy"] = "",
+ ["Careless"] = "Безтурботний",
+ ["Change Weapon"] = "Змінити Зброю",
+ ["Clumsy"] = "Ðезграбний",
["Codename: Teamwork"] = "Кодова назва: Командна гра",
--- ["Complete the track as fast as you can!"] = "",
+ ["Complete the track as fast as you can!"] = "Подолайте траÑу так швидко, Ñк тільки зможете!",
["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Вітаємо! Ви знищили вÑÑ– цілі|в межах дозволеного чаÑу.", --Bazooka, Shotgun, SniperRifle
["Congratulations!"] = "Вітаємо!",
["Control pillars to score points."] = "Контрольюй Ñтовпи щоб набрати очки.",
@@ -30,147 +40,181 @@
["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "ЧОРТ ЗÐБИРÐЙ, СÐЛÐГÐ! ЗЛІЗЬ З МОЄЇ ГОЛОВИ!",
["DAMMIT, ROOKIE!"] = "ЧОРТ ЗÐБИРÐЙ, СÐЛÐГÐ!",
["Dangerous Ducklings"] = "Ðебезпечні КаченÑта",
--- ["Deadweight"] = "",
--- ["Depleted Kamikaze!"] = "",
--- ["Destroy invaders to score points."] = "",
--- ["Drone Hunter!"] = "",
--- ["Drowner"] = "",
--- ["Each turn you get 1-3 random weapons"] = "",
--- ["Each turn you get one random weapon"] = "",
+ ["Deadweight"] = "ВлаÑна вага",
+ ["Demolition is fun!"] = "Ð ÑƒÐ¹Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ†Ðµ веÑело!",
+ ["Depleted Kamikaze!"] = "ВиÑнажений Камікадзе!",
+ ["Destroy invaders to score points."] = "Знищіть загарбників, щоб набрати очки.",
+ ["Double Kill!"] = "Подвійне ВбивÑтво!",
+ ["Drone Hunter!"] = "МиÑливець за ДжмелÑми!",
+ ["Drowner"] = "Потопаючий",
+ ["Each turn you get 1-3 random weapons"] = "Кожного ходу ви отримуєте 1-3 випадкової зброї",
+ ["Each turn you get one random weapon"] = "Кожного ходу ви отримуєте одну випадкову зброю",
["Eliminate all enemies"] = "Ліквідуйте вÑÑ–Ñ… ворогів",
["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Знищіть вÑÑ– цілі до Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу.|У Ð²Ð°Ñ Ð±ÐµÐ·Ð¼ÐµÐ¶Ð½Ñ– боєприпаÑи.", --Bazooka, Shotgun, SniperRifle
["Eliminate Poison before the time runs out"] = "Знешкодьте Смердюка до Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу",
["Eliminate the Blue Team"] = "Знищіть Синю Команду",
--- ["Eliminate the enemy specialists."] = "",
+ ["Eliminate the enemy before the time runs out"] = "Знешкодьте ворога до Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+ ["Eliminate the enemy hogs to win."] = "Знешкодьте ворожих їжаків щоб перемогти.",
+ ["Eliminate the enemy specialists."] = "Знешкодьте ворожих ÑпеціаліÑтів.",
["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- Знищіть Об'єкт 3378 |- Жалюгідні ПовÑтанці повинні вижити",
+ ["Energetic Engineer"] = "Енергетичний Інженер",
["Enjoy the swim..."] = "ÐаÑолоджуйÑÑ Ð¿Ð»Ð°Ð²Ð°Ð½Ð½Ñм...",
-- ["[Enter]"] = "",
["Fastest lap: "] = "Ðайшвидша партіÑ: ",
["Feeble Resistance"] = "Жалюгідні ПовÑтанці",
--- ["Fire"] = "",
+ ["Fire"] = "Вогонь",
["Flag captured!"] = "Прапор захоплено!",
["Flag respawned!"] = "Прапор відновлено!",
["Flag returned!"] = "Прапор повернено!",
--- ["Flags, and their home base will be placed where each team ends their first turn."] = "",
--- ["GAME BEGUN!!!"] = "",
--- ["Game Modifiers: "] = "",
+ ["Flags, and their home base will be placed where each team ends their first turn."] = "Прапори Ñ– Ñ—Ñ… Ð±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ розміщені там, де кожна команда закінчить Ñ—Ñ— перший хід.",
+ ["Flamer"] = "Вогнемет",
+ ["Friendly Fire!"] = "Дружній Вогонь!",
+ ["fuel extended!"] = "пальне поповнене!",
+ ["GAME BEGUN!!!"] = "ГРРПОЧÐЛÐСЬ!!!",
+ ["Game Modifiers: "] = "Модифікатори Гри: ",
["GAME OVER!"] = "КІÐЕЦЬ ГРИ!",
["Game Started!"] = "Гра почалаÑÑŒ!",
["Get on over there and take him out!"] = "Залізь туди і прикінчи його!",
--- ["Goal"] = "",
+ ["Goal"] = "Мета",
["GO! GO! GO!"] = "ДÐÐ’ÐЙ! ДÐÐ’ÐЙ! РУХÐЙСЯ!",
["Good birdy......"] = "Гарна пташка......",
["Good luck out there!"] = "Удачі!",
--- ["GOTCHA!"] = "",
--- ["Hahahaha!"] = "",
--- ["Haha, now THAT would be something!"] = "",
--- ["Hapless Hogs"] = "",
--- [" Hapless Hogs left!"] = "",
--- ["Heavy"] = "",
+ ["Good so far!"] = "Покищо добре!",
+ ["Good to go!"] = "Так тримати!",
+ ["GOTCHA!"] = "ПОПÐВСЯ!",
+ ["Grab Mines/Explosives"] = "Схопити Міни/Вибухівку",
+ ["Hahahaha!"] = "Хахахаха!",
+ ["Haha, now THAT would be something!"] = "Хаха, от ЦЕ буде щоÑÑŒ!",
+ ["Hapless Hogs"] = "ÐещаÑні Їжаки",
+ [" Hapless Hogs left!"] = " ÐещаÑних Їжаків лишилоÑÑŒ!",
+ ["Health crates extend your time."] = "Ящики зі здоров'Ñм продовжують ваш чаÑ.",
+ ["Heavy"] = "Ð’'Ñлий",
["Hedgewars-Basketball"] = "БаÑкетбол Їжаками",
["Hedgewars-Knockball"] = "БейÑбол Їжаками",
--- ["Heh, it's not that bad."] = "",
--- ["Hit Combo!"] = "",
+ ["Heh, it's not that bad."] = "хех, це не так вже й погано.",
+ ["Hit Combo!"] = "Зробив Комбо!",
["Hmmm..."] = "Хмм...",
["Hooray!"] = "Урааа!",
["Hunter"] = "МиÑливець", --Bazooka, Shotgun, SniperRifle
["Instructor"] = "ІнÑтруктор", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings
--- ["invaders destroyed"] = "",
--- ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
--- ["Jumping is disabled"] = "",
--- ["Kamikaze Expert!"] = "",
--- ["KILLS"] = "",
--- ["[Left Shift]"] = "",
+ ["invaders destroyed"] = "Загарбників знищено",
+ ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "Це чудово що Ð ÐПТОВРСМЕРТЬ віддалилаÑÑŒ на 99 ходів...",
+ ["Jumping is disabled"] = "Ð¡Ñ‚Ñ€Ð¸Ð±Ð°Ð½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ðµ",
+ ["Kamikaze Expert!"] = "Камікадзе ЕкÑперт!",
+ ["Keep it up!"] = "Так тримати!",
+ ["Killing spree!"] = "Череда вбивÑтв!",
+ ["KILLS"] = "ВБИВСТВ",
+ ["Last Target!"] = "ОÑÑ‚Ð°Ð½Ð½Ñ Ð¦Ñ–Ð»ÑŒ!",
+ ["[Left Shift]"] = "[Лівий Shift]",
["Listen up, maggot!!"] = "Слухай, хробак!",
+ ["Lively Lifeguard"] = "Жвавий Ð Ñтівник",
+ ["Mine Deployer"] = "Мінер",
+ ["Mine Eater!"] = "Поїдач Мін!",
["|- Mines Time:"] = "|- Ð§Ð°Ñ Ð´ÐµÑ‚Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼Ñ–Ð½:", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["MISSION FAILED"] = "МІСІЮ ПРОВÐЛЕÐО", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
--- ["MISSION SUCCESS"] = "",
+ ["MISSION SUCCESS"] = "УСПІХ МІСІЇ",
["MISSION SUCCESSFUL"] = "МІСІЮ ВИКОÐÐÐО", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
--- ["Movement: [Up], [Down], [Left], [Right]"] = "",
--- ["Multi-shot!"] = "",
--- ["Nameless Heroes"] = "",
--- ["NEW CLAN RECORD: "] = "",
+ ["Movement: [Up], [Down], [Left], [Right]"] = "КеруваннÑ: [Вверх], [Вниз], [Вліво], [Вправо]",
+ ["Multi-shot!"] = "МультипоÑтріл!",
+ ["Nameless Heroes"] = "Безіменні Герої",
+ ["New Barrels Per Turn"] = "Ðових Бочок на Хід",
+ ["NEW CLAN RECORD: "] = "ÐОВИЙ РЕКОРД КЛÐÐУ: ",
["NEW fastest lap: "] = "ÐОВРнайшвидша партіÑ: ",
--- ["NEW RACE RECORD: "] = "",
--- ["NOT ENOUGH WAYPOINTS"] = "",
+ ["New Mines Per Turn"] = "Ðових Мін на Хід",
+ ["NEW RACE RECORD: "] = "ÐОВИЙ РЕКОРД ГОÐКИ: ",
+ ["Newton's Hammock"] = "Гамак Ðьютона",
+ ["NOT ENOUGH WAYPOINTS"] = "ÐЕДОСТÐТÐЬО ТОЧОК ШЛЯХУ",
["Not So Friendly Match"] = "Ðе дуже товариÑький матч", -- Basketball, Knockball
["Oh no! Just try again!"] = "О, ні! Давай, Ñпробуй ще раз!", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
["Oh no! Time's up! Just try again."] = "О, ні! Ð§Ð°Ñ Ð¹Ð´Ðµ! Спробуй ще раз.", --Bazooka, Shotgun, SniperRifle
["Operation Diver"] = "ÐžÐ¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð’Ð¾Ð´Ð¾Ð»Ð°Ð·",
["Opposing Team: "] = "Команда-Противник: ",
["Pathetic Hog #%d"] = "Жалюгідний Їжак #%d",
--- ["Per-Hog Ammo"] = "",
--- ["Place more waypoints using [ENTER]"] = "",
+ ["Pathetic Resistance"] = "Жалюгідний Опір", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+ ["Per-Hog Ammo"] = "БоєприпаÑи на їжака",
+ ["Place more waypoints using [ENTER]"] = "РозміÑÑ‚Ñ–Ñ‚ÑŒ більше точок шлÑху за допомогою [Enter]",
+ ["Place more waypoints using the 'Air Attack' weapon."] = "РозміÑÑ‚Ñ–Ñ‚ÑŒ більше точок шлÑху викориÑтавши зброю 'ПовітрÑна Ðтака'.",
["points"] = "очок", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
["Poison"] = "Смердюк",
--- ["Power Remaining"] = "",
--- ["Press [Precise] to skip intro"] = "",
--- ["Race complexity limit reached."] = "",
+ ["Power Remaining"] = "ЗалишилоÑÑŒ Енергії",
+ ["Prepare yourself"] = "ПриготуйÑÑ",
+ ["Press [Precise] to skip intro"] = "ÐатиÑніть [Приціл] щоб пропуÑтити вÑтуп",
+ ["Race complexity limit reached."] = "ДоÑÑгнута межа ÑкладноÑÑ‚Ñ– гонки.",
+ ["RACER"] = "ГОÐЩИК",
[" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Поверніть ворожий прапор на Ñвою базу щоб заробити очко | - Виграє команда з трьома очками | - Ви можете заробити очко лише коли ваш прапор на вашій базі | - Їжак покине прапор Ñкщо потоне чи буде вбитий | - Покинутий прапор можна повернути або захопити знов | - Їжаки відновлюютьÑÑ Ð¿Ñ–ÑÐ»Ñ Ñмерті",
--- ["Round Limit"] = "",
--- ["Rounds Complete"] = "",
+ ["Round Limit:"] = "Межа Раунду:",
+ ["Round Limit"] = "Межа Раунду",
+ ["Rounds Complete: "] = "Раундів Завершено: ",
+ ["Rounds Complete"] = "Раундів Завершено",
["RULES OF THE GAME [Press ESC to view]"] = "ПРÐВИЛРГРИ [ÐатиÑніть ESC Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду]",
--- ["s|"] = "",
--- ["Save as many hapless hogs as possible!"] = "",
--- ["SCORE"] = "",
+ ["s|"] = "Ñ|",
+ ["Save as many hapless hogs as possible!"] = "Ð’Ñ€Ñтуйте Ñкнайбільше нещаÑних їжаків!",
+ ["SCORE"] = "Ð ÐХУÐОК",
["sec"] = "Ñек", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
["See ya!"] = "ПобачимоÑÑ!",
--- ["s"] = "", -- GaudyRacer, Space_Invasion
--- ["Shield boosted! +30 power"] = "",
--- ["Shield Depleted"] = "",
--- ["Shield is fully recharged!"] = "",
--- ["Shield Master!"] = "",
--- ["Shield Miser!"] = "",
--- ["Shield OFF:"] = "",
--- ["Shield ON:"] = "",
--- ["Shield Seeker!"] = "",
+ ["selected!"] = "вибрано!",
+ ["s"] = "Ñ", -- GaudyRacer, Space_Invasion
+ ["Shield boosted! +30 power"] = "Щит підÑилено! +30 Ñили",
+ ["Shield Depleted"] = "Щит Вичерпаний",
+ ["Shield is fully recharged!"] = "Щит повніÑÑ‚ÑŽ зарÑджений!",
+ ["Shield Master!"] = "МайÑтер Щита!",
+ ["Shield Miser!"] = "Скупій Щита!",
+ ["Shield OFF:"] = "Щит Вимкнено:",
+ ["Shield ON:"] = "Щит Ввімкнено:",
+ ["Shield Seeker!"] = "Шукач Щита!",
["Shotgun Team"] = "Команда Рушниць",
["Shotgun Training"] = "Ð¢Ñ€ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ð· рушницею",
--- ["Shots Left: "] = "", -- GaudyRacer, Tumbler
--- ["Silly"] = "",
--- ["Sinky"] = "",
+ ["shots remaining."] = "поÑтрілів залишилоÑÑŒ.",
+ ["Silly"] = "Дурник",
+ ["Sinky"] = "Любимчик",
["%s is out and Team %d|scored a penalty!| |Score:"] = "%s вибув і Команда %d|отримала штраф!| |Рахунок:", -- Basketball, Knockball
["%s is out and Team %d|scored a point!| |Score:"] = "%s вибув і Команда %d|заробила очко!| |Рахунок:", -- Basketball, Knockball
["Sniper Training"] = "СнайперÑьке тренуваннÑ",
-- ["Sniperz"] = "",
--- ["Sponge"] = "",
+ ["Sponge"] = "Губка",
["Spooky Tree"] = "Примарне Дерево",
--- ["STATUS UPDATE"] = "", -- GaudyRacer, Space_Invasion
--- ["Switched to "] = "",
+ ["STATUS UPDATE"] = "ОÐОВЛЕÐÐЯ СТÐÐУ", -- GaudyRacer, Space_Invasion
+ ["Switched to "] = "Перейшов до ",
["Team %d: "] = "Команда %d: ",
--- ["Team Scores"] = "", -- Control, Space_Invasion
--- ["That Sinking Feeling"] = "",
+ ["Team Scores"] = "Очки Команди", -- Control, Space_Invasion
+ ["That Sinking Feeling"] = "Ð¦Ñ Ñ€Ð°Ð¿Ñ‚Ð¾Ð²Ð° ÑлабкіÑÑ‚ÑŒ",
["That was pointless."] = "Це було безглуздо.",
["The enemy is hiding out on yonder ducky!"] = "Ворог ховаєтьÑÑ Ð½Ð° он тій качечці!",
["The flag will respawn next round."] = "Прапор відновитьÑÑ Ð² наÑтупному раунді.",
--- ["The Nameless One"] = "",
--- ["THE SPECIALISTS"] = "",
--- ["This rain is really something..."] = "",
--- ["TIME: "] = "",
--- ["Timed Kamikaze!"] = "",
--- ["Time Extended!"] = "",
--- ["Time Left: "] = "",
--- ["Toggle Shield"] = "",
+ ["The Nameless One"] = "Безіменний",
+ ["THE SPECIALISTS"] = "СПЕЦІÐЛІСТИ",
+ ["This one's tricky."] = "Хитро придумано.",
+ ["This rain is really something..."] = "Цей дощ дійÑно дещо...",
+ ["TIME: "] = "ЧÐС: ",
+ ["Timed Kamikaze!"] = "ЧаÑовий Камікадзе!",
+ ["Time Extended!"] = "Ð§Ð°Ñ ÐŸÑ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð¾!",
+ ["Time Extension"] = "Ð—Ð±Ñ–Ð»ÑŒÑˆÐµÐ½Ð½Ñ Ð§Ð°Ñу",
+ ["Toggle Shield"] = "Перемкнути Щит",
["Toxic Team"] = "ТокÑична Команда", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
--- ["TRACK COMPLETED"] = "",
--- ["Track Time: "] = "",
+ ["TRACK COMPLETED"] = "ТРÐСУ ПРОЙДЕÐО",
+ ["TRACK FAILED!"] = "ТРÐСУ ÐЕ ПРОЙДЕÐО!",
["TrophyRace"] = "ÐŸÐ¾Ð³Ð¾Ð½Ñ Ð·Ð° Трофеєм",
["T_T"] = "Ðаааа!!!",
--- ["Turn Time"] = "",
+ ["Tumbling Time Extended!"] = "Ð§Ð°Ñ ÐŸÐ°Ð´Ñ–Ð½Ð½Ñ Ð—Ð±Ñ–Ð»ÑŒÑˆÐµÐ½Ð¸Ð¹!",
+ ["Turn Time"] = "Ð§Ð°Ñ Ð¥Ð¾Ð´Ñƒ",
+ ["Unit"] = "Модуль",
["Unit 3378"] = "Об'єкт 3378",
--- ["Unlimited Attacks"] = "",
--- ["User Challenge"] = "",
+ ["Unit 835"] = "Об'єкт 835",
+ ["Unlimited Attacks"] = "Ðеобмежені Ðтаки",
+ ["Unstoppable!"] = "Ðевпинний!",
+ ["User Challenge"] = "Дуель між кориÑтувачами",
["Use your rope to get from start to finish as fast as you can!"] = "СкориÑтайÑÑ Ð¼Ð¾Ñ‚ÑƒÐ·ÐºÐ¾ÑŽ щоб Ñкнайшвидше доÑÑгнути фінішу!",
--- ["v.06"] = "",
["Victory for the "] = "Перемога Ð´Ð»Ñ ", -- CTF_Blizzard, Capture_the_Flag
--- ["Waypoint placed."] = "",
--- ["Weapons Reset"] = "",
--- ["WINNING TIME: "] = "",
--- ["You'd almost swear the water was rising!"] = "",
+ ["Waypoint placed."] = "Точка шлÑху розміщена.",
+ ["Way-Points Remaining"] = "ЗалишилоÑÑŒ Точок",
+ ["Weapons Reset"] = "Ð¡ÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð—Ð±Ñ€Ð¾Ñ—",
+ ["Well done."] = "Чудова робота.",
+ ["Will this ever end?"] = "Це коли-небудь закінчитьÑÑ?",
+ ["WINNING TIME: "] = "ЧÐС ВИГРÐШУ: ",
+ ["You'd almost swear the water was rising!"] = "Ти ледь не приÑÑгавÑÑ, що вода піднімаєтьÑÑ!",
["You have SCORED!!"] = "Ви заробили ОЧКО!!",
--- ["You saved"] = "",
+ ["You saved"] = "Ви врÑтували",
["You've failed. Try again."] = "Спроба не вдалаÑÑŒ. Спробуйте знов.",
["You've reached the goal!| |Time: "] = "Ви доÑÑгли мети!| |ЧаÑ: ",
["'Zooka Team"] = "Команда 'Zooka",
- ["!!!"] = "Я!",
}
--- a/share/hedgewars/Data/Locale/uk.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/uk.txt Sat Oct 08 16:54:56 2011 +0200
@@ -53,8 +53,9 @@
00:50=Ðтака дрелÑми
00:51=Грудка багна
00:52=Ð—Ð±Ñ€Ð¾Ñ Ð½Ðµ вибрана
-00:53=TARDIS
+00:53=Будка ЧаÑу
00:54=Структура
+00:55=ЗемлÑний Спрей
01:00=Вперед до перемоги!
01:01=ÐічиÑ
@@ -286,6 +287,7 @@
03:52=UNUSED
03:53=Тип 40
03:54=Збудуй щоÑÑŒ
+03:55=Утиліта
; Weapon Descriptions (use | as line breaks)
04:00=Ðтакуй ворогів викориÑтовуючи проÑту гранату.|Вона вибухне Ñк тільки Ñ—Ñ— таймер доходить до нулÑ.|1-5: ВиÑтав таймер гранати|Ðтака: Утримуй щоб метнути Ñильніше
@@ -338,6 +340,12 @@
04:47=Подвійні веÑелощі з двома гоÑтрими, підлими,|липкими мінами. Ðалаштуй ланцюгову реакцію|або захищайÑÑ (або Ñ– те Ñ– те!)|Ðтака: Утримуй щоб кинути Ñильніше (двічі)
04:48=Чому вÑÑ– образи повинні отримати кроти?|Зробити з їжака божевільного теж веÑело!|Удар цим молотком забере у їжака|третину здоров'Ñ Ñ– заб'Ñ” його під землю.|Ðтака: Ðктивуй
04:49=ВоÑкреÑи Ñвоїх друзів! Ðле май на|увазі що це воÑкреÑить також Ñ– ворогів.|Ðтака: Утримуй атаку Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ–Ð»ÑŒÐ½Ð¾Ð³Ð¾ відновленнÑ|Вверх: Пришвидш відновленнÑ
+04:50=ХтоÑÑŒ ховаєтьÑÑ Ð¿Ñ–Ð´ землею?|Вирий Ñ—Ñ… атакою дрелÑми!|Таймер керує тим, Ñк далеко вони будуть рити.
+04:51=ЗдійÑни халÑвний удар, шпурни грудку багна.|Трохи пече Ñ– відкидає їжака назад.
+04:52=UNUSED
+04:53=ЗдійÑни подорож крізь Ñ‡Ð°Ñ Ñ‚Ð° проÑÑ‚Ñ–Ñ€,|залишивши товаришів битиÑÑŒ далі Ñамим.|Будь готовий повернутиÑÑŒ в кожну мить,|або до Раптової Ñмерті або до Ñ—Ñ… поразки.|Відмова. Ðе працює в Раптовій Смерті,|Ñкщо ти один, або Ñкщо ти Король.
+04:54=ÐЕЗÐВЕРШЕÐО
+04:55=Розпили потік лепких плаÑтівців.|будуй моÑти, хорони ворогів, перекривай тунелі.|Стеж щоб на тебе не впала жодна з них!
; Game goal strings
05:00=Режими Гри
@@ -361,3 +369,4 @@
05:18=Ðеобмежені Ðтаки
05:19=Ð—Ð±Ñ€Ð¾Ñ ÑкидаєтьÑÑ Ð½Ð° кінці ходу
05:20=Ð—Ð±Ñ€Ð¾Ñ Ð½Ðµ розподілÑєтьÑÑ Ð¼Ñ–Ð¶ їжаками
+05:21=Збірна Команда: Команди одного клану виконують поÑлідовні ходи|Спільний ЧаÑ: Команди одного клану ділÑÑ‚ÑŒ між Ñобою Ñ‡Ð°Ñ Ñ…Ð¾Ð´Ñƒ
--- a/share/hedgewars/Data/Locale/zh_CN.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Locale/zh_CN.lua Sat Oct 08 16:54:56 2011 +0200
@@ -2,12 +2,19 @@
["!!!"] = "!!!",
-- ["..."] = "",
-- ["Accuracy Bonus!"] = "",
+-- ["Achievement Unlocked"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_That_Sinking_Feeling, Tumbler
-- ["a Hedgewars mini-game"] = "", -- Space_Invasion, The_Specialists
["Aiming Practice"] = "çž„å‡†ç»ƒä¹ ", --ç«ç®ç’ã€éœ°å¼¹æžªã€ç‹™å‡»æžª
-- ["Ammo"] = "",
-- ["Ammo Depleted!"] = "",
+-- ["ammo extended!"] = "",
+-- ["Ammo is reset at the end of your turn."] = "",
-- ["Ammo Maniac!"] = "",
-- ["Available points remaining: "] = "",
+-- ["[Backspace]"] = "",
+-- ["Bamboo Thicket"] = "",
+-- ["Barrel Eater!"] = "",
+-- ["Barrel Launcher"] = "",
["Bat balls at your enemies and|push them into the sea!"] = "å‘射棒çƒå°†æ•Œäººå‡»æ‰“入水",
["Bat your opponents through the|baskets and out of the map!"] = "把敌人击出场地——对准æ 框",
["Bazooka Training"] = "ç«ç®ç’è®ç»ƒ",
@@ -18,8 +25,10 @@
-- ["BOOM!"] = "",
-- ["Boss defeated!"] = "",
-- ["Boss Slayer!"] = "",
+-- ["Build a track and race."] = "",
["CAPTURE THE FLAG"] = "抢旗å",
-- ["Careless"] = "",
+-- ["Change Weapon"] = "",
-- ["Clumsy"] = "",
["Codename: Teamwork"] = "代å·ï¼šå›¢é˜Ÿè¡ŒåŠ¨",
-- ["Complete the track as fast as you can!"] = "",
@@ -31,8 +40,10 @@
["DAMMIT, ROOKIE!"] = "新人",
["Dangerous Ducklings"] = "å±é™©çš„å°é¸å",
-- ["Deadweight"] = "",
+-- ["Demolition is fun!"] = "",
-- ["Depleted Kamikaze!"] = "",
-- ["Destroy invaders to score points."] = "",
+-- ["Double Kill!"] = "",
-- ["Drone Hunter!"] = "",
-- ["Drowner"] = "",
-- ["Each turn you get 1-3 random weapons"] = "",
@@ -41,8 +52,11 @@
["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "时间é™åˆ¶å†…æ¸…é™¤å…¨éƒ¨ç›®æ ‡ã€‚å¼¹è¯æ— é™ã€‚", --Bazooka, Shotgun, SniperRifle
["Eliminate Poison before the time runs out"] = "时间é™åˆ¶å†…æ¸…é™¤æ¯’ç´ ã€‚",
["Eliminate the Blue Team"] = "解决è“色队ä¼",
+-- ["Eliminate the enemy before the time runs out"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
+-- ["Eliminate the enemy hogs to win."] = "",
-- ["Eliminate the enemy specialists."] = "",
["- Eliminate Unit 3378 |- Feeble Resistance must survive"] = "- 打倒 3378 |-å抗者必须å˜æ´»",
+-- ["Energetic Engineer"] = "",
["Enjoy the swim..."] = "游水愉快",
-- ["[Enter]"] = "",
["Fastest lap: "] = "最快记录:",
@@ -52,6 +66,9 @@
["Flag respawned!"] = "旗帜é‡ç”Ÿï¼",
["Flag returned!"] = "旗帜归还ï¼",
-- ["Flags, and their home base will be placed where each team ends their first turn."] = "",
+-- ["Flamer"] = "",
+-- ["Friendly Fire!"] = "",
+-- ["fuel extended!"] = "",
-- ["GAME BEGUN!!!"] = "",
-- ["Game Modifiers: "] = "",
["GAME OVER!"] = "结æŸäº†ï¼",
@@ -61,11 +78,15 @@
["GO! GO! GO!"] = "上!",
["Good birdy......"] = "乖鸟儿",
["Good luck out there!"] = "ç¥å¥½è¿",
+-- ["Good so far!"] = "",
+-- ["Good to go!"] = "",
-- ["GOTCHA!"] = "",
+-- ["Grab Mines/Explosives"] = "",
-- ["Hahahaha!"] = "",
-- ["Haha, now THAT would be something!"] = "",
-- ["Hapless Hogs"] = "",
-- [" Hapless Hogs left!"] = "",
+-- ["Health crates extend your time."] = "",
-- ["Heavy"] = "",
["Hedgewars-Basketball"] = "刺猬大作战-篮çƒè®¡åˆ’",
["Hedgewars-Knockball"] = "刺猬大作战-击çƒè®¡åˆ’",
@@ -79,9 +100,15 @@
-- ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
-- ["Jumping is disabled"] = "",
-- ["Kamikaze Expert!"] = "",
+-- ["Keep it up!"] = "",
+-- ["Killing spree!"] = "",
-- ["KILLS"] = "",
+-- ["Last Target!"] = "",
-- ["[Left Shift]"] = "",
["Listen up, maggot!!"] = "å¬å¥½ï¼Œå°å!!",
+-- ["Lively Lifeguard"] = "",
+-- ["Mine Deployer"] = "",
+-- ["Mine Eater!"] = "",
-- ["|- Mines Time:"] =
["MISSION FAILED"] = "任务失败", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["MISSION SUCCESS"] = "",
@@ -89,9 +116,12 @@
-- ["Movement: [Up], [Down], [Left], [Right]"] = "",
-- ["Multi-shot!"] = "",
-- ["Nameless Heroes"] = "",
+-- ["New Barrels Per Turn"] = "",
-- ["NEW CLAN RECORD: "] = "",
["NEW fastest lap: "] = "新记录",
+-- ["New Mines Per Turn"] = "",
-- ["NEW RACE RECORD: "] = "",
+-- ["Newton's Hammock"] = "",
-- ["NOT ENOUGH WAYPOINTS"] = "",
["Not So Friendly Match"] = "éžå‹å–„对抗", -- Basketball, Knockball
["Oh no! Just try again!"] = "ä¸ï¼é‡æ–°å†æ¥ã€‚", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -102,16 +132,22 @@
["Pathetic Hog #1"] = "å¯æ€œåˆºçŒ¬ä¸€å·",
["Pathetic Hog #2"] = "å¯æ€œåˆºçŒ¬äºŒå·",
-- ["Pathetic Hog #%d"] =
+-- ["Pathetic Resistance"] = "", -- User_Mission_-_Bamboo_Thicket, User_Mission_-_Newton_and_the_Hammock
-- ["Per-Hog Ammo"] = "",
-- ["Place more waypoints using [ENTER]"] = "",
+-- ["Place more waypoints using the 'Air Attack' weapon."] = "",
-- ["points"] =
-- ["Poison"] =
-- ["Power Remaining"] = "",
+-- ["Prepare yourself"] = "",
-- ["Press [Precise] to skip intro"] = "",
-- ["Race complexity limit reached."] = "",
+-- ["RACER"] = "",
-- [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] =
["- Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = "-带回敌人旗帜得分| -第一支3次夺旗队ä¼èŽ·èƒœ| - åªæœ‰æ——帜在己方基地æ‰ç®—| -带旗刺猬消é€åˆ™æ——帜è½ä¸‹| -è½ä¸‹çš„旗帜使用方å¼ä¸å˜| -æŸå¤±çš„刺猬瞬间还原",
+-- ["Round Limit:"] = "",
-- ["Round Limit"] = "",
+-- ["Rounds Complete: "] = "",
-- ["Rounds Complete"] = "",
["RULES OF THE GAME [Press ESC to view]"] = "游æˆè§„则 [按下 ESCé”® 查看]",
-- ["s|"] = "",
@@ -119,6 +155,7 @@
-- ["SCORE"] = "",
-- ["sec"] =
["See ya!"] = "å†è§!",
+-- ["selected!"] = "",
-- ["s"] = "", -- GaudyRacer, Space_Invasion
-- ["Shield boosted! +30 power"] = "",
-- ["Shield Depleted"] = "",
@@ -130,7 +167,7 @@
-- ["Shield Seeker!"] = "",
["Shotgun Team"] = "霰弹枪队",
["Shotgun Training"] = "霰弹枪è®ç»ƒ",
--- ["Shots Left: "] = "", -- GaudyRacer, Tumbler
+-- ["shots remaining."] = "",
-- ["Silly"] = "",
-- ["Sinky"] = "",
["%s is out and Team %d|scored a penalty!| |Score:"] = "%s 出局， %d 惩罚分数ï¼", -- Basketball, Knockball
@@ -149,26 +186,33 @@
-- ["The flag will respawn next round."] =
-- ["The Nameless One"] = "",
-- ["THE SPECIALISTS"] = "",
+-- ["This one's tricky."] = "",
-- ["This rain is really something..."] = "",
-- ["TIME: "] = "",
-- ["Timed Kamikaze!"] = "",
-- ["Time Extended!"] = "",
--- ["Time Left: "] = "",
+-- ["Time Extension"] = "",
-- ["Toggle Shield"] = "",
["Toxic Team"] = "è…å的队ä¼", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
-- ["TRACK COMPLETED"] = "",
--- ["Track Time: "] = "",
+-- ["TRACK FAILED!"] = "",
["TrophyRace"] = "竞速",
["T_T"] = "T_T",
+-- ["Tumbling Time Extended!"] = "",
-- ["Turn Time"] = "",
+-- ["Unit"] = "",
["Unit 3378"] = "3378",
+-- ["Unit 835"] = "",
-- ["Unlimited Attacks"] = "",
+-- ["Unstoppable!"] = "",
-- ["User Challenge"] = "",
["Use your rope to get from start to finish as fast as you can!"] = "抓起绳å飞å‘目的地，越快越好。",
--- ["v.06"] = "",
["Victory for the "] = "胜利属于",
-- ["Waypoint placed."] = "",
+-- ["Way-Points Remaining"] = "",
-- ["Weapons Reset"] = "",
+-- ["Well done."] = "",
+-- ["Will this ever end?"] = "",
-- ["WINNING TIME: "] = "",
-- ["You'd almost swear the water was rising!"] = "",
["You have SCORED!!"] = "得分",
--- a/share/hedgewars/Data/Maps/Battlefield/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Maps/Battlefield/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,6 @@
install(FILES
map.png
+ mask.png
map.cfg
preview.png
DESTINATION ${SHAREPATH}Data/Maps/Battlefield)
Binary file share/hedgewars/Data/Maps/Battlefield/mask.png has changed
Binary file share/hedgewars/Data/Maps/Blizzard/mask.png has changed
--- a/share/hedgewars/Data/Maps/Blox/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Maps/Blox/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,6 @@
install(FILES
map.png
+ mask.png
map.cfg
preview.png
DESTINATION ${SHAREPATH}Data/Maps/Blox)
Binary file share/hedgewars/Data/Maps/Blox/mask.png has changed
--- a/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,5 @@
--------------------------------
--- CTF_BLIZZARD 0.8
+-- CTF_BLIZZARD 0.9
--------------------------------
---------
@@ -68,14 +68,14 @@
-- removed teleport from starting weapons
-- increased captures to 3
------------
+------------
-- 0.7
------------
-- hopefully fixed a bug with the teleporters
-- added a fix for crate possibly getting imbedded in land when it was near the water line
------------
+------------
-- 0.8
------------
@@ -84,6 +84,13 @@
-- changed hog placements code so that they start in the same place for both teams
-- and hogs move in the same order, not backwards to each other.
+-----------
+-- 0.9
+------------
+
+-- add support for more players
+-- re-enable sudden death, but set water rise to 0
+
loadfile(GetDataPath() .. "Scripts/Locale.lua")()
---------------------------------------------------------------
@@ -469,7 +476,7 @@
-- make a list of individual team names
- for i = 0, 5 do
+ for i = 0, (TeamsCount-1) do
teamNameArr[i] = i
teamSize[i] = 0
teamIndex[i] = 0
@@ -566,7 +573,8 @@
MinesTime = 2000
Explosives = 0 -- The number of explosives being placed
Delay = 10 -- The delay between each round
- SuddenDeathTurns = 99 -- suddendeath is off, effectively
+ WaterRise = 0 -- I sure hope this works
+ --SuddenDeathTurns = 99 -- suddendeath is off, effectively
Map = "Blizzard" -- The map to be played
Theme = "Snow" -- The theme to be used "Nature"
--- a/share/hedgewars/Data/Maps/Cake/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Maps/Cake/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,6 @@
install(FILES
map.png
+ mask.png
map.cfg
preview.png
DESTINATION ${SHAREPATH}Data/Maps/Cake)
Binary file share/hedgewars/Data/Maps/Cake/mask.png has changed
--- a/share/hedgewars/Data/Maps/Castle/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Maps/Castle/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,6 @@
install(FILES
map.png
+ mask.png
map.cfg
preview.png
DESTINATION ${SHAREPATH}Data/Maps/Castle)
Binary file share/hedgewars/Data/Maps/Castle/mask.png has changed
--- a/share/hedgewars/Data/Maps/Cave/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Maps/Cave/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,6 @@
install(FILES
map.png
+ mask.png
map.cfg
preview.png
DESTINATION ${SHAREPATH}Data/Maps/Cave)
Binary file share/hedgewars/Data/Maps/Cave/mask.png has changed
--- a/share/hedgewars/Data/Maps/Cheese/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Maps/Cheese/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,6 @@
install(FILES
map.png
+ mask.png
map.cfg
preview.png
DESTINATION ${SHAREPATH}Data/Maps/Cheese)
Binary file share/hedgewars/Data/Maps/Cheese/mask.png has changed
--- a/share/hedgewars/Data/Maps/Control/map.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Maps/Control/map.lua Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,5 @@
--------------------------------
--- CONTROL 0.5
+-- CONTROL 0.6
--------------------------------
---------
@@ -35,6 +35,16 @@
-- removed user branding
-- fixed infinite attack time exploit
+--------
+-- 0.6
+--------
+
+-- timebox fix
+-- support for more players
+-- remove version numbers
+-- enable limited sudden death
+-- using skip go generates as many points as you would have gotten had you sat and waited
+
-----------------
--script begins
-----------------
@@ -88,10 +98,6 @@
--zone and teleporter variables
--------------------------------
---local redTel
---local orangeTel
---local areaArr = {} -- no longer used
-
local cPoint = {}
local cOwnerClan = {}
@@ -159,26 +165,27 @@
SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], 0xffffffff)
cOwnerClan[i] = nil
for k = 0, (numhhs-1) do
- if (hhs[k] ~= nil) then
- if (GearIsInZone(hhs[k],i)) == true then
+ if (hhs[k] ~= nil) then --and (GetGearType(hhs[k]) ~= nil) then
+ if (GearIsInZone(hhs[k],i)) == true then
- if cOwnerClan[i] ~= nil then
- if cOwnerClan[i] ~= GetHogClan(hhs[k]) then
- --if the hog now being compared is different to one that is also here and was previously compared
-
- SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], 0xffffffff)
- --SetVisualGearValues(vCirc[i], 2739, 1378, 20, 255, 1, 10, 0, 300, 5, 0xffffffff)
-
- cOwnerClan[i] = 10 -- this means conflicted
- end
- elseif cOwnerClan[i] == nil then
- cOwnerClan[i] = GetHogClan(hhs[k])
- --SetVisualGearValues(vCirc[i], 2739, 1378, 20, 255, 1, 10, 0, 300, 5, GetClanColor( GetHogClan(hhs[k])) )
- SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], GetClanColor( GetHogClan(hhs[k])))
-
- end
+ if cOwnerClan[i] ~= nil then
+ if cOwnerClan[i] ~= GetHogClan(hhs[k]) then
+ --if the hog now being compared is different to one that is also here and was previously compared
+
+ SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], 0xffffffff)
+ --SetVisualGearValues(vCirc[i], 2739, 1378, 20, 255, 1, 10, 0, 300, 5, 0xffffffff)
+
+ cOwnerClan[i] = 10 -- this means conflicted
+ end
+ elseif cOwnerClan[i] == nil then
+ cOwnerClan[i] = GetHogClan(hhs[k])
+ --SetVisualGearValues(vCirc[i], 2739, 1378, 20, 255, 1, 10, 0, 300, 5, GetClanColor( GetHogClan(hhs[k])) )
+ SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], GetClanColor( GetHogClan(hhs[k])))
+
+ end
- end
+ end
+ -- else hhs[k] = nil
end
end
@@ -206,9 +213,9 @@
for i = 0,(zCount-1) do
if CurrentHedgehog ~= nil then
if cOwnerClan[i] == GetHogClan(CurrentHedgehog) then
- g = AddVisualGear(vCircX[i], vCircY[i], vgtHealthTag, 100, False)
+ g = AddVisualGear(vCircX[i], vCircY[i]-100, vgtHealthTag, 100, False)
if g ~= 0 then
- SetVisualGearValues(g, vCircX[i], vCircY[i], 0, 0, 0, 0, 0, teamScore[cOwnerClan[i]], 1500, GetClanColor(cOwnerClan[i]))
+ SetVisualGearValues(g, vCircX[i], vCircY[i]-100, 0, 0, 0, 0, 0, teamScore[cOwnerClan[i]], 1500, GetClanColor(cOwnerClan[i]))
end
end
end
@@ -224,7 +231,7 @@
-- make a list of individual team names
- for i = 0, 5 do
+ for i = 0, (TeamsCount-1) do
teamNameArr[i] = " " -- = i
teamSize[i] = 0
teamIndex[i] = 0
@@ -281,14 +288,27 @@
-- game methods
------------------------
+function onAttack()
+
+ if CurrentHedgehog ~= nil then
+ if GetCurAmmoType() == amSkip then
+ z = (TurnTimeLeft / 2000) - (TurnTimeLeft / 2000)%2
+ --AddCaption("scored: " .. z,GetClanColor(GetHogClan(CurrentHedgehog)),capgrpMessage2)
+ for i = 0, z do
+ AwardPoints()
+ end
+ end
+ end
+
+end
+
function onGameInit()
-- Things we don't modify here will use their default values.
--GameFlags = gfInfAttack + gfSolidLand -- Game settings and rules
GameFlags = band(bor(GameFlags, gfInfAttack + gfSolidLand), bnot(gfKing + gfForts))
-
- SuddenDeathTurns = 99 -- suddendeath is off, effectively
+ WaterRise = 0
end
@@ -334,10 +354,7 @@
for i = 0, (numTeams-1) do
pointLimit = pointLimit - 25
end
- --SetGearPosition(hhs[0], 631, 82)
- --SetGearPosition(hhs[1], 1088, 684)
- --SetGearPosition(hhs[2], 381, 1569)
-
+
-- reposition hogs if they are on control points until they are not or sanity limit kicks in
reN = 0
--zz = 0
@@ -352,7 +369,10 @@
--AddCaption(zz) -- number of times it took to work
end
- ShowMission("CONTROL v0.3", "", loc("Control pillars to score points.") .. "|" .. loc("Goal") .. ": " .. pointLimit .. " " .. loc("points"), 0, 0)
+ ShowMission("CONTROL",
+ "",
+ loc("Control pillars to score points.") .. "|" ..
+ loc("Goal") .. ": " .. pointLimit .. " " .. loc("points"), 0, 0)
end
@@ -388,14 +408,19 @@
TurnTimeLeft = 1
end
- for i = 0,5 do
+ totalComment = ""
+ for i = 0,(TeamsCount-1) do
if teamNameArr[i] ~= " " then -- i
teamComment[i] = teamNameArr[i] .. ": " .. teamScore[teamClan[i]] .. " " .. loc("points") .. "|"
+ totalComment = totalComment .. teamComment[i]
elseif teamNameArr[i] == " " then
teamComment[i] = "|"
end
end
- ShowMission("CONTROL", loc("Team Scores") .. ":", teamComment[0] .. teamComment[1] .. teamComment[2] .. teamComment[3] .. teamComment[4] .. teamComment[5], 0, 1600)
+
+ ShowMission("CONTROL",
+ loc("Team Scores") .. ":",
+ totalComment, 0, 1600)
end
@@ -407,20 +432,6 @@
if (vCircCount >= 500) and (gameWon == false) then
vCircCount = 0
CheckZones()
- --AwardPoints()
-
-
- --[[for i = 0,5 do
-
- if teamNameArr[i] ~= " " then -- i
- teamComment[i] = teamNameArr[i] .. ": " .. teamScore[teamClan[i] ] .. " points|"
- elseif teamNameArr[i] == " " then
- teamComment[i] = "|"
- end
- end
-
- ShowMission("CONTROL", "Team Scores:", teamComment[0] .. teamComment[1] .. teamComment[2] .. teamComment[3] .. teamComment[4] .. teamComment[5], 0, 1600)]]
-
end
-- things we wanna check often
@@ -460,15 +471,37 @@
AddVisualGear(GetX(gear), GetY(gear), vgtBigExplosion, 0, false)
end
+function InABetterPlaceNow(gear)
+ for i = 0, (numhhs-1) do
+ if gear == hhs[i] then
+ hhs[i] = nil
+ end
+ end
+end
+
+function onHogHide(gear)
+ InABetterPlaceNow(gear)
+end
+
+function onHogRestore(gear)
+ match = false
+ for i = 0, (numhhs-1) do
+ if (hhs[i] == nil) and (match == false) then
+ hhs[i] = gear
+ --AddCaption(GetHogName(gear) .. " has reappeared it seems!")
+ --FollowGear(gear)
+ match = true
+ end
+ end
+end
+
function onGearAdd(gear)
if GetGearType(gear) == gtHedgehog then
-
hhs[numhhs] = gear
numhhs = numhhs + 1
SetEffect(gear, heResurrectable, true)
-
end
end
@@ -476,13 +509,7 @@
function onGearDelete(gear)
if GetGearType(gear) == gtHedgehog then
- --AddCaption("gear deleted!")
- for i = 0, (numhhs-1) do
- if gear == hhs[i] then
- hhs[i] = nil
- --AddCaption("for real")
- end
- end
+ InABetterPlaceNow(gear)
end
end
Binary file share/hedgewars/Data/Maps/Control/preview@2x.png has changed
--- a/share/hedgewars/Data/Maps/EarthRise/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Maps/EarthRise/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,6 @@
install(FILES
map.png
+ mask.png
map.cfg
preview.png
DESTINATION ${SHAREPATH}Data/Maps/EarthRise)
Binary file share/hedgewars/Data/Maps/EarthRise/mask.png has changed
Binary file share/hedgewars/Data/Maps/Ruler/preview.png has changed
Binary file share/hedgewars/Data/Maps/ShoppaKing/map.png has changed
Binary file share/hedgewars/Data/Maps/TrophyRace/map.png has changed
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Sniper_Rifle.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Sniper_Rifle.lua Sat Oct 08 16:54:56 2011 +0200
@@ -189,6 +189,7 @@
elseif score == 3 then
spawnTarget(2080,780)
elseif score == 4 then
+ AddCaption(loc("Good so far!") .. " " .. loc("Keep it up!"));
blowUp(1730,1226)
blowUp(1440,1595)
blowUp(1527,1575)
@@ -213,8 +214,10 @@
elseif score == 10 then
spawnTarget(2930,1500)
elseif score == 11 then
+ AddCaption(loc("This one's tricky."));
spawnTarget(700,720)
elseif score == 12 then
+ AddCaption(loc("Well done."));
blowUp(914,1222)
blowUp(1050,1222)
blowUp(1160,1008)
@@ -239,6 +242,7 @@
elseif score == 17 then
spawnTarget(2080,820)
elseif score == 18 then
+ AddCaption(loc("Demolition is fun!"));
blowUp(2110,920)
blowUp(2210,920)
blowUp(2200,305)
@@ -260,6 +264,7 @@
elseif score == 21 then
spawnTarget(2590,-100)
elseif score == 22 then
+ AddCaption(loc("Will this ever end?"));
blowUp(2790,305)
blowUp(2930,305)
blowUp(3060,305)
@@ -271,7 +276,6 @@
blowUp(2805,630)
blowUp(2805,760)
blowUp(2805,890)
- blowUp(2700,890)
blowUp(3258,370)
blowUp(3258,475)
blowUp(3264,575)
@@ -291,6 +295,7 @@
elseif score == 29 then
spawnTarget(3670,0)
elseif score == 30 then
+ AddCaption(loc("Last Target!"));
spawnTarget(3480,1200)
end
else
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Bamboo_Thicket.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Bamboo_Thicket.lua Sat Oct 08 16:54:56 2011 +0200
@@ -18,12 +18,13 @@
Explosives = 0
Map = "Bamboo"
Theme = "Bamboo"
+ SuddenDeathTurns = 99999
AddTeam(loc("Pathetic Resistance"), 14483456, "Simple", "Island", "Default")
player = AddHog("Ikeda", 0, 10, "StrawHat")
AddTeam(loc("Cybernetic Empire"), 1175851, "Simple", "Island", "Default")
- enemy = AddHog(loc("Unit 835"), 1, 10, "cyborg")
+ enemy = AddHog(loc("Unit 835"), 1, 10, "cyborg1")
SetGearPosition(player,1166,1680)
SetGearPosition(enemy,2848,1443)
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Dangerous_Ducklings.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Dangerous_Ducklings.lua Sat Oct 08 16:54:56 2011 +0200
@@ -28,13 +28,14 @@
Delay = 0 -- The delay between each round
Map = "Bath" -- The map to be played
Theme = "Bath" -- The theme to be used
+ SuddenDeathTurns = 99999
AddTeam(loc("Bloody Rookies"), 14483456, "Simple", "Island", "Default")
player = AddHog(loc("Hunter"), 0, 1, "NoHat")
--AddTeam("Instructors", 14483456, "Simple", "Island", "Default")
- instructor = AddHog(loc("Instructor"), 1, 1, "Vega")
+ instructor = AddHog(loc("Instructor"), 1, 1, "sf_vega")
AddTeam("Blue Team", 29439, "Simple", "Island", "Default")
enemy = AddHog("Filthy Blue", 1, 100, "Skull")
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Diver.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Diver.lua Sat Oct 08 16:54:56 2011 +0200
@@ -20,6 +20,7 @@
Delay = 10 -- The delay between each round
Map = "Hydrant" -- The map to be played
Theme = "City" -- The theme to be used
+ SuddenDeathTurns = 99999
AddTeam(loc("Bloody Rookies"), 14483456, "Simple", "Island", "Default")
player = AddHog(loc("Hunter"), 0, 1, "NoHat")
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Newton_and_the_Hammock.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Newton_and_the_Hammock.lua Sat Oct 08 16:54:56 2011 +0200
@@ -25,7 +25,7 @@
player = AddHog("Ikeda", 0, 48, "StrawHat")
AddTeam(loc("Cybernetic Empire"), 1175851, "Simple", "Island", "Default")
- enemy = AddHog(loc("Unit") .. " 811", 1, 100, "cyborg")
+ enemy = AddHog(loc("Unit") .. " 811", 1, 100, "cyborg1")
SetGearPosition(player, 1454, 1540)
SetGearPosition(enemy, 2488, 1960)
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Spooky_Tree.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Spooky_Tree.lua Sat Oct 08 16:54:56 2011 +0200
@@ -26,6 +26,7 @@
Delay = 10 -- The delay between each round
Map = "Tree" -- The map to be played
Theme = "Halloween" -- The theme to be used
+ SuddenDeathTurns = 99999
AddTeam(loc("Bloody Rookies"), 14483456, "Simple", "Island", "Default")
player = AddHog(loc("Hunter"), 0, 1, "NoHat")
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Teamwork.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Teamwork.lua Sat Oct 08 16:54:56 2011 +0200
@@ -12,7 +12,6 @@
-- Things we don't modify here will use their default values.
Seed = 0 -- The base number for the random number generator
GameFlags = gfDisableWind-- Game settings and rules
- SuddenDeathTurns = 9999
TurnTime = 30000 -- The time the player has to move each round (in ms)
CaseFreq = 0 -- The frequency of crate drops
MinesNum = 0 -- The number of mines being placed
@@ -21,6 +20,7 @@
Delay = 10 -- The delay between each round
Map = "Mushrooms" -- The map to be played
Theme = "Nature" -- The theme to be used
+ SuddenDeathTurns = 99999
AddTeam(loc("Feeble Resistance"), 14483456, "Simple", "Island", "Default")
player = AddHog(string.format(loc("Pathetic Hog #%d"), 1), 0, 50, "NoHat")
@@ -28,7 +28,7 @@
--AddTeam("Toxic Team", 1175851, "Simple", "Island", "Robot","cm_binary")
AddTeam(loc("Cybernetic Empire"), 1175851, "Simple", "Island", "Robot", "cm_binary")
- enemy = AddHog(loc("Unit 3378"), 5, 30, "cyborg")
+ enemy = AddHog(loc("Unit 3378"), 5, 30, "cyborg1")
SetGearPosition(player, 2427, 1259)
SetGearPosition(p2, 2293, 1263)
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_That_Sinking_Feeling.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_That_Sinking_Feeling.lua Sat Oct 08 16:54:56 2011 +0200
@@ -10,6 +10,8 @@
local genCounter = 0
local waterCounter = 0
local waterPix = 0
+local frig = 0
+local watGear = nil
-- allow skipping of the intro via hitting precise key
function onPrecise()
@@ -34,19 +36,20 @@
Delay = 10
Map = "Islands"
Theme = "City"
+ SuddenDeathTurns = 1
AddTeam(loc("Nameless Heroes"), 14483456, "Simple", "Island", "Default")
player = AddHog(loc("The Nameless One"), 0, 1, "NoHat")
AddTeam(loc("Hapless Hogs"), 1175851, "Simple", "Island", "Default")
- hh[0] = AddHog(loc("Sinky"), 1, 100, "lemon")
- hh[1] = AddHog(loc("Drowner"), 1, 100, "orange")
- hh[2] = AddHog(loc("Heavy"), 1, 100, "Teapot")
- hh[3] = AddHog(loc("Clumsy"), 1, 100, "SauceBoatSilver")
- hh[4] = AddHog(loc("Silly"), 1, 100, "Ladle")
+ hh[0] = AddHog(loc("Sinky"), 1, 100, "fr_lemon")
+ hh[1] = AddHog(loc("Drowner"), 1, 100, "fr_orange")
+ hh[2] = AddHog(loc("Heavy"), 1, 100, "dish_Teapot")
+ hh[3] = AddHog(loc("Clumsy"), 1, 100, "dish_SauceBoatSilver")
+ hh[4] = AddHog(loc("Silly"), 1, 100, "dish_Ladle")
hh[5] = AddHog(loc("Careless"), 1, 100, "StrawHatEyes")
- hh[6] = AddHog(loc("Sponge"), 1, 100, "Chunli")
- hh[7] = AddHog(loc("Deadweight"), 1, 100, "Teacup")
+ hh[6] = AddHog(loc("Sponge"), 1, 100, "sf_chunli")
+ hh[7] = AddHog(loc("Deadweight"), 1, 100, "dish_Teacup")
SetGearPosition(player, 3992, 733)
SetGearPosition(hh[0], 938, 1369)
@@ -83,15 +86,26 @@
-- intro sequence
if introStage < 100 then
- AddCaption(loc("Press [Precise] to skip intro"))
+ frig = frig + 1
+ if frig == 50 then
+ frig = 0
+ AddCaption(loc("Press [Precise] to skip intro"))
+ if watGear ~= nil then
+ FollowGear(watGear)
+ end
+ end
+
+ --AddCaption(loc("Press [Precise] to skip intro"))
genCounter = genCounter + 1
if introStage == 0 then
- FollowGear(hh[0])
+
+ --FollowGear(hh[0])
if genCounter == 2000 then
+ watGear = hh[0]
HogSay(hh[0], loc("This rain is really something..."), SAY_SAY,2)
elseif genCounter == 5000 then
introStage = 1
@@ -99,10 +113,11 @@
end
elseif introStage == 1 then
-
- FollowGear(hh[1])
+
+ --FollowGear(hh[1])
if genCounter == 2000 then
+ watGear = hh[1]
HogSay(hh[1], loc("Heh, it's not that bad."), SAY_SAY,2)
elseif genCounter == 5000 then
introStage = 2
@@ -111,9 +126,10 @@
elseif introStage == 2 then
- FollowGear(hh[0])
+ --FollowGear(hh[0])
if genCounter == 2000 then
+ watGear = hh[0]
HogSay(hh[0], loc("You'd almost swear the water was rising!"), SAY_SHOUT,2)
elseif genCounter == 6000 then
introStage = 3
@@ -122,9 +138,10 @@
elseif introStage == 3 then
- FollowGear(hh[1])
+ --FollowGear(hh[1])
if genCounter == 2000 then
+ watGear = hh[1]
HogSay(hh[1], loc("Haha, now THAT would be something!"), SAY_SAY,2)
elseif genCounter == 6000 then
introStage = 4
@@ -133,9 +150,10 @@
elseif introStage == 4 then
- FollowGear(hh[0])
+ --FollowGear(hh[0])
if genCounter == 2000 then
+ watGear = hh[0]
HogSay(hh[0], loc("Hahahaha!"), SAY_SHOUT,2)
HogSay(hh[1], loc("Hahahaha!"), SAY_SHOUT,2)
elseif genCounter == 3000 then
@@ -145,9 +163,10 @@
elseif introStage == 5 then
- FollowGear(hh[1])
+ --FollowGear(hh[1])
if genCounter == 2000 then
+ watGear = hh[1]
HogSay(hh[0], loc("..."), SAY_THINK,2)
HogSay(hh[1], loc("..."), SAY_THINK,2)
elseif genCounter == 5000 then
@@ -157,9 +176,10 @@
elseif introStage == 6 then
- FollowGear(hh[0])
+ --FollowGear(hh[0])
if genCounter == 2000 then
+ watGear = hh[0]
HogSay(hh[0], loc("It's a good thing SUDDEN DEATH is 99 turns away..."), SAY_THINK,2)
elseif genCounter == 6000 then
introStage = 7
@@ -194,6 +214,11 @@
SetHealth(player, 0)
TurnTimeLeft = 1
ShowMission(loc("That Sinking Feeling"), loc("MISSION SUCCESS"), loc("You saved") .. " " .. hhCount .. " " .. loc("Hapless Hogs") .."!", 0, 0)
+
+ if hhCount == 8 then
+ AddCaption(loc("Achievement Unlocked") .. ": " .. loc("Lively Lifeguard"),0xffba00ff,capgrpMessage2)
+ end
+
end
end
--- a/share/hedgewars/Data/Names/BlueCap.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/BlueHair.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/BrainSlug.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-brainslug
--- a/share/hedgewars/Data/Names/BrainSlugMouth.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-brainslug
--- a/share/hedgewars/Data/Names/Bunny.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/GreenCap.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/GreenHair.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/GreyHair.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/KirbyMask.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/OrangeHair.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/PinkHair.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/PurpleHair.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/RedCap.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/RedHair.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/Ryu.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/Sonic.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/YellowCap.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/YellowHair.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/apple.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-apple
-fruit
--- a/share/hedgewars/Data/Names/banana.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-banana
-fruit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/cap_blue.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/cap_green.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/cap_red.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/cap_yellow.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- a/share/hedgewars/Data/Names/clown.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Names/clown.txt Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,5 @@
Binky
-bb_bobo
+Bobo
Bozo
Buttons
Chocko
--- a/share/hedgewars/Data/Names/cowboy.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Names/cowboy.txt Sat Oct 08 16:54:56 2011 +0200
@@ -7,7 +7,7 @@
Tom
Ernesto
Douglas
-sm_mario
+Mario
Jose
Francisco
Brian
--- a/share/hedgewars/Data/Names/cyborg.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/cyborg1.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- a/share/hedgewars/Data/Names/darthvader.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/fr_apple.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,2 @@
+apple
+fruit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/fr_banana.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,2 @@
+banana
+fruit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/fr_lemon.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,2 @@
+lemon
+fruit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/fr_orange.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,2 @@
+orange
+fruit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/hair_blue.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/hair_green.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/hair_grey.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/hair_orange.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/hair_pink.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/hair_purple.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/hair_red.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/hair_yellow.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- a/share/hedgewars/Data/Names/lemon.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-lemon
-fruit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/mv_Venom.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- a/share/hedgewars/Data/Names/ninja.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Names/ninja.txt Sat Oct 08 16:54:56 2011 +0200
@@ -6,4 +6,4 @@
Arashi
Bushi
Itami
-sf_kenshi
+Kenshi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/ntd_Kirby.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- a/share/hedgewars/Data/Names/orange.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-orange
-fruit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/poke_slowpoke.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/scif_BrainSlug.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+brainslug
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/scif_BrainSlug2.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+brainslug
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/scif_swDarthvader.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/scif_swStormtrooper.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/sf_ryu.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- a/share/hedgewars/Data/Names/slowpoke.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/sth_Sonic.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- a/share/hedgewars/Data/Names/stormtrooper.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- a/share/hedgewars/Data/Names/types.ini Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Names/types.ini Sat Oct 08 16:54:56 2011 +0200
@@ -12,10 +12,10 @@
#####
Fruit
#####
-apple
-banana
-lemon
-orange
+fr_apple
+fr_banana
+fr_lemon
+fr_orange
#####
Indians
Apache
@@ -37,13 +37,13 @@
Possessed
Parasites
#####
-BrainSlug
-BrainSlugMouth
-BrainSlugMouth
+scif_BrainSlug
+scif_BrainSlug2
+scif_BrainSlug2
#####
Bunnies
#####
-Bunny
+zoo_Bunny
#####
Detectives
#####
@@ -79,9 +79,9 @@
#####
StarHogs
#####
-darthvader
-stormtrooper
-stormtrooper
+scif_swDarthvader
+scif_swStormtrooper
+scif_swStormtrooper
#####
Hogtrix
#####
@@ -89,24 +89,24 @@
#####
Hog Fighters
#####
-Balrog
-Blanka
-BlankaToothless
-Chunli
-Guile
-Honda
-Ken
-Ryu
-Vega
+sf_balrog
+sf_blanka
+sf_blankatoothless
+sf_chunli
+sf_guile
+sf_honda
+sf_ken
+sf_ryu
+sf_vega
#####
Mushroom Kingdom
#####
-Mario
-Luigi
-PrincessPeach
-PrincessDaisy
-Toad
-Wario
+sm_mario
+sm_luigi
+sm_peach
+sm_daisy
+sm_toad
+sm_wario
#####
Honor
#####
@@ -120,13 +120,13 @@
#####
Rainbow
#####
-GreenHair
-BlueHair
-RedHair
-OrangeHair
-YellowHair
-PurpleHair
-GreyHair
+hair_green
+hair_blue
+hair_red
+hair_orange
+hair_yellow
+hair_purple
+hair_grey
#####
Pride
#####
@@ -146,17 +146,17 @@
#####
Pocket Pros
#####
-ash
-charmander
-chikorita
-diglett
-jigglypuff
-lugia
-mudkip
-pikachu
-slowpoke
-squirtle
-voltorb
+poke_ash
+poke_charmander
+poke_chikorita
+poke_diglett
+poke_jigglypuff
+poke_lugia
+poke_mudkip
+poke_pikachu
+poke_slowpoke
+poke_squirtle
+poke_voltorb
#####
Vikings
#####
--- a/share/hedgewars/Data/Names/venom.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-generic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/zoo_Bunny.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1 @@
+generic
--- a/share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua Sat Oct 08 16:54:56 2011 +0200
@@ -18,16 +18,16 @@
function randomAmmo()
local n = 3 --"points" to be allocated on weapons
-
+
--pick random weapon and subtract cost
local r = GetRandom(table.maxn(weapons_values)) + 1
local picked_items = {}
table.insert(picked_items, weapons[r])
n = n - weapons_values[r]
-
-
+
+
--choose any weapons or utilities to use up remaining n
-
+
while n > 0 do
local items = {}
local items_values = {}
@@ -63,12 +63,12 @@
end
end
end
-
+
local r = GetRandom(table.maxn(items_values)) + 1
table.insert(picked_items, items[r])
n = n - items_values[r]
end
-
+
return picked_items
end
@@ -111,7 +111,7 @@
function onAmmoStoreInit()
SetAmmo(amSkip, 9, 0, 0, 0)
-
+
SetAmmo(amExtraDamage, 0, 1, 0, 1)
SetAmmo(amInvulnerable, 0, 1, 0, 1)
SetAmmo(amExtraTime, 0, 1, 0, 1)
--- a/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,5 @@
---------------------------------------
--- CAPTURE_THE_FLAG GAMEPLAY MODE 0.4
+-- CAPTURE_THE_FLAG GAMEPLAY MODE 0.5
-- by mikade
---------------------------------------
@@ -61,6 +61,15 @@
-- changed starting feedback a little
-- increased the radius around the circle indicating the flag thief so that it doesn't obscure his health
+--------
+-- 0.5
+--------
+
+-- add support for more players
+-- allow limited sudden death
+-- stop TimeBox ruining my life
+-- profit???
+
-----------------
--SCRIPT BEGINS
-----------------
@@ -75,7 +84,7 @@
------------------ "Oh well, they probably have the memory"
local gameStarted = false
-local gameTurns = 0
+local gameTurns = 0
--------------------------
-- hog and team tracking variales
@@ -133,14 +142,14 @@
if fCaptures[teamID] == 3 then
for i = 0, (numhhs-1) do
- if hhs[i] ~= nil then
+ if hhs[i] ~= nil then
if GetHogClan(hhs[i]) == alt then
SetEffect(hhs[i], heResurrectable, false)
SetHealth(hhs[i],0)
end
end
end
- if CurrentHedgehog ~= nil then
+ if CurrentHedgehog ~= nil then
ShowMission(loc("GAME OVER!"), loc("Victory for the ") .. GetHogTeamName(CurrentHedgehog), loc("Hooray!"), 0, 0)
end
end
@@ -156,18 +165,18 @@
wtf = 1
bbq = 0
end
-
+
-- player has successfully captured the enemy flag
if (GetHogClan(CurrentHedgehog) == wtf) and (CurrentHedgehog == fThief[bbq]) and (fIsMissing[wtf] == false) then
-
+
DeleteVisualGear(fGear[wtf])
- fGear[wtf] = nil -- the flag has now disappeared
-
+ fGear[wtf] = nil -- the flag has now disappeared
+
fIsMissing[wtf] = false
fNeedsRespawn[wtf] = true
fIsMissing[bbq] = false
fNeedsRespawn[bbq] = true
- fCaptures[wtf] = fCaptures[wtf] +1
+ fCaptures[wtf] = fCaptures[wtf] +1
ShowMission(loc("You have SCORED!!"), GetHogTeamName(CurrentHedgehog) .. ": " .. fCaptures[wtf], loc("Opposing Team: ") .. fCaptures[bbq], 0, 0)
PlaySound(sndVictory)
fThief[bbq] = nil -- player no longer has the enemy flag
@@ -175,23 +184,23 @@
--if the player is returning the flag
elseif (GetHogClan(CurrentHedgehog) == wtf) and (fIsMissing[wtf] == true) then
-
+
DeleteVisualGear(fGear[wtf])
fGear[wtf] = nil -- the flag has now disappeared
-
- fNeedsRespawn[wtf] = true
+
+ fNeedsRespawn[wtf] = true
HandleRespawns() -- this will set fIsMissing[wtf] to false :)
AddCaption(loc("Flag returned!"))
-
+
--if the player is taking the enemy flag
elseif GetHogClan(CurrentHedgehog) == bbq then
-
+
DeleteVisualGear(fGear[wtf])
- fGear[wtf] = nil -- the flag has now disappeared
-
+ fGear[wtf] = nil -- the flag has now disappeared
+
fIsMissing[wtf] = true
for i = 0,numhhs-1 do
- if CurrentHedgehog ~= nil then
+ if CurrentHedgehog ~= nil then
if CurrentHedgehog == hhs[i] then
fThief[wtf] = hhs[i]
end
@@ -200,23 +209,23 @@
AddCaption(loc("Flag captured!"))
end
-
+
end
-function CheckFlagProximity()
+function CheckFlagProximity()
for i = 0, 1 do
if fGear[i] ~= nil then
-
+
g1X = fGearX[i]
- g1Y = fGearY[i]
-
+ g1Y = fGearY[i]
+
g2X, g2Y = GetGearPosition(CurrentHedgehog)
q = g1X - g2X
w = g1Y - g2Y
dist = (q*q) + (w*w)
-
+
if dist < 500 then --1600
DoFlagStuff(fGear[i])
end
@@ -233,7 +242,7 @@
if fNeedsRespawn[i] == true then
fGear[i] = AddVisualGear(fSpawnX[i],fSpawnY[i],vgtCircle,0,true)
fGearX[i] = fSpawnX[i]
- fGearY[i] = fSpawnY[i]
+ fGearY[i] = fSpawnY[i]
fNeedsRespawn[i] = false
fIsMissing[i] = false -- new, this should solve problems of a respawned flag being "returned" when a player tries to score
@@ -256,16 +265,16 @@
end
if fThief[wtf] ~= nil then
- -- falls into water
- --ShowMission(LAND_HEIGHT, fThiefY[wtf], (LAND_HEIGHT - fThiefY[wtf]), 0, 0)
+ -- falls into water
+ --ShowMission(LAND_HEIGHT, fThiefY[wtf], (LAND_HEIGHT - fThiefY[wtf]), 0, 0)
if (LAND_HEIGHT - fThiefY[wtf]) < 15 then
fIsMissing[wtf] = true
fNeedsRespawn[wtf] = true
HandleRespawns()
- else --normally
+ else --normally
fGearX[wtf] = fThiefX[wtf]
- fGearY[wtf] = fThiefY[wtf]
- fGear[wtf] = AddVisualGear(fGearX[wtf],fGearY[wtf],vgtCircle,0,true)
+ fGearY[wtf] = fThiefY[wtf]
+ fGear[wtf] = AddVisualGear(fGearX[wtf],fGearY[wtf],vgtCircle,0,true)
end
AddVisualGear(fThiefX[wtf], fThiefY[wtf], vgtBigExplosion, 0, false)
@@ -281,14 +290,14 @@
fGearTimer = 0
fGearRad = fGearRad + 1
if fGearRad > fGearRadMax then
- fGearRad = fGearRadMin
+ fGearRad = fGearRadMin
end
end
for i = 0, 1 do
-
+
--SetVisualGearValues(fSpawnC[i], fSpawnX[i],fSpawnY[i], 20, 200, 0, 0, 100, 50, 3, fCol[i]) -- draw a circ for spawning area
-
+
if fIsMissing[i] == false then -- draw a flag marker at the flag's spawning place
SetVisualGearValues(fCirc[i], fSpawnX[i],fSpawnY[i], 20, 20, 0, 10, 0, 33, 3, fCol[i])
if fGear[i] ~= nil then -- draw the flag gear itself
@@ -299,12 +308,12 @@
SetVisualGearValues(fCirc[i], fThiefX[i], fThiefY[i], 20, 200, 0, 0, 100, 50, 3, fCol[i])
--AddCaption("circle marking carrier")
elseif fThief[i] == nil then -- draw cirle round dropped flag
- --g1X,g1Y,g4,g5,g6,g7,g8,g9,g10,g11 = GetVisualGearValues(fGear[i])
+ --g1X,g1Y,g4,g5,g6,g7,g8,g9,g10,g11 = GetVisualGearValues(fGear[i])
--SetVisualGearValues(fCirc[i], g1X, g1Y, 20, 200, 0, 0, 100, 33, 2, fCol[i])
SetVisualGearValues(fCirc[i], fGearX[i], fGearY[i], 20, 200, 0, 0, 100, 33, 3, fCol[i])
- --AddCaption('dropped circle marker')
+ --AddCaption('dropped circle marker')
if fGear[i] ~= nil then -- flag gear itself
- --SetVisualGearValues(fGear[i], g1X, g1Y, 20, 200, 0, 0, 100, 10, 4, fCol[i])
+ --SetVisualGearValues(fGear[i], g1X, g1Y, 20, 200, 0, 0, 100, 10, 4, fCol[i])
SetVisualGearValues(fGear[i], fGearX[i], fGearY[i], 20, 200, 0, 0, 100, fGearRad, 2, fCol[i])
--AddCaption('dropped flag itself')
end
@@ -342,7 +351,7 @@
-- make a list of individual team names
- for i = 0, 5 do
+ for i = 0, (TeamsCount-1) do
teamNameArr[i] = i
teamSize[i] = 0
teamIndex[i] = 0
@@ -401,13 +410,13 @@
for i = 0, 1 do
- -- if someone uses kamikaze downwards, this can happen as the hog won't respawn
+ -- if someone uses kamikaze downwards, this can happen as the hog won't respawn
if (LAND_HEIGHT - fSpawnY[i]) < 0 then
tempG = AddGear(0, 0, gtTarget, 0, 0, 0, 0)
- FindPlace(tempG, true, 0, LAND_WIDTH, true)
+ FindPlace(tempG, true, 0, LAND_WIDTH, true)
fSpawnX[i], fSpawnY[i] = GetGearPosition(tempG)
DeleteGear(tempG)
- end
+ end
fGear[i] = AddVisualGear(fSpawnX[i],fSpawnY[i],vgtCircle,0,true)
fCirc[i] = AddVisualGear(fSpawnX[i],fSpawnY[i],vgtCircle,0,true)
@@ -420,11 +429,11 @@
fIsMissing[i] = false
fNeedsRespawn[i] = false
fCaptures[i] = 0
-
- --SetVisualGearValues(zxc, 1000,1000, 20, 100, 0, 10, 1, 100, 5, GetClanColor(0))
-
+
+ --SetVisualGearValues(zxc, 1000,1000, 20, 100, 0, 10, 1, 100, 5, GetClanColor(0))
+
SetVisualGearValues(fSpawnC[i], fSpawnX[i],fSpawnY[i], 20, 100, 0, 10, 0, 75, 5, fCol[i])
-
+
end
end
@@ -436,8 +445,9 @@
function onGameInit()
GameFlags = band(bor(GameFlags, gfDivideTeams), bnot(gfKing + gfForts))
- SuddenDeathTurns = 999 -- suddendeath is off, effectively
- Delay = 10
+ --SuddenDeathTurns = 999 -- suddendeath is off, effectively
+ WaterRise = 0
+ Delay = 10
end
@@ -448,8 +458,8 @@
ShowMission(loc("CAPTURE THE FLAG"), loc("Flags, and their home base will be placed where each team ends their first turn."), "", 0, 0)
RebuildTeamInfo()
-
- -- should gfDivideTeams do this automatically?
+
+ -- should gfDivideTeams do this automatically?
--[[for i = 0, (TeamsCount-1) do
for g = teamIndex[i], (teamIndex[i]+teamSize[i]-1) do
if GetHogClan(hhs[g]) == 0 then
@@ -465,7 +475,7 @@
--zxc = AddVisualGear(fSpawnX[i],fSpawnY[i],vgtCircle,0,true)
-
+
--SetVisualGearValues(zxc, 1000,1000, 20, 255, 1, 10, 0, 200, 1, GetClanColor(0))
--minO,max0 -glowyornot --pulsate timer -- fuckall -- radius -- width -- colour
end
@@ -474,7 +484,7 @@
function onNewTurn()
gameTurns = gameTurns + 1
-
+
if lastTeam ~= GetHogTeamName(CurrentHedgehog) then
lastTeam = GetHogTeamName(CurrentHedgehog)
end
@@ -482,14 +492,14 @@
--AddCaption("Handling respawns")
if gameStarted == true then
HandleRespawns()
- --new method of placing starting flags
+ --new method of placing starting flags
elseif gameTurns == 1 then
ShowMission(loc("CAPTURE THE FLAG"), loc("Flags, and their home base will be placed where each team ends their first turn."), "", 0, 0)
elseif gameTurns == 2 then
fPlaced[0] = true
ShowMission(loc("CAPTURE THE FLAG"), loc("RULES OF THE GAME [Press ESC to view]"), loc(" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"), 0, 0)
elseif gameTurns == 3 then
- fPlaced[1] = true
+ fPlaced[1] = true
StartTheGame()
end
@@ -525,16 +535,16 @@
CheckFlagProximity()
end
elseif CurrentHedgehog ~= nil then -- if the game hasn't started yet, keep track of where we are gonna put the flags on turn end
-
+
if GetHogClan(CurrentHedgehog) == 0 then
- i = 0
+ i = 0
elseif GetHogClan(CurrentHedgehog) == 1 then
- i = 1
- end
-
+ i = 1
+ end
+
fSpawnX[i] = GetX(CurrentHedgehog)
fSpawnY[i] = GetY(CurrentHedgehog)
-
+
end
end
@@ -562,18 +572,48 @@
end
+function InABetterPlaceNow(gear)
+ for i = 0, (numhhs-1) do
+ if gear == hhs[i] then
+
+ for i = 0,1 do
+ if gear == fThief[i] then
+ FlagThiefDead(gear)
+ end
+ end
+ hhs[i] = nil
+ end
+ end
+end
+
+function onHogHide(gear)
+ InABetterPlaceNow(gear)
+end
+
+function onHogRestore(gear)
+ match = false
+ for i = 0, (numhhs-1) do
+ if (hhs[i] == nil) and (match == false) then
+ hhs[i] = gear
+ --AddCaption(GetHogName(gear) .. " has reappeared it seems!")
+ match = true
+ end
+ end
+end
+
+
function onGearAdd(gear)
if GetGearType(gear) == gtHedgehog then
hhs[numhhs] = gear
numhhs = numhhs + 1
SetEffect(gear, heResurrectable, true)
-
+
elseif GetGearType(gear) == gtPiano then
for i = 0, 1 do
if CurrentHedgehog == fThief[i] then
- FlagThiefDead(gear)
+ FlagThiefDead(gear)
end
end
@@ -584,17 +624,7 @@
function onGearDelete(gear)
if GetGearType(gear) == gtHedgehog then
- for i = 0, (numhhs-1) do
- if gear == hhs[i] then
-
- for i = 0,1 do
- if gear == fThief[i] then
- FlagThiefDead(gear)
- end
- end
- hhs[i] = nil
- end
- end
+ InABetterPlaceNow(gear)
end
end
--- a/share/hedgewars/Data/Scripts/Multiplayer/GaudyRacer.cfg Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Default
-Default
--- a/share/hedgewars/Data/Scripts/Multiplayer/GaudyRacer.lua Sat Oct 08 16:45:52 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,730 +0,0 @@
-
-------------------------------------------
--- RACER
--- a crazy, map-independant racing script
--- by mikade
------------------------------------------
-
------------------------------------
---0.1: with apologies to tumbler
------------------------------------
--- added tumbler movement system
--- added weapon systems
--- added timer to stop tumbler
--- added racer circle arrays
--- added changing of circs on contact
--- added a "track complete" etc
-
------------------------------------
---0.2: for your racing convenience
------------------------------------
-
--- added resurrection
--- added team tracking
--- added proper scoring (hopefully, finally)
--- changed showmission icons to match feedback
--- changed circles to be netural colours, and then change to team col
--- cleaned up code
--- cleaned up gameplay: removing control on resurrect, trackcomplete, maxpointset etc
--- improved player feedback: race record, clan record, no record etc.
-
------------------------------------
---0.3: user-requested features
------------------------------------
-
--- hogs now start at the location of the first waypoint \o/
--- added sticky camera. Hog will no longer lose focus on explosions etc.
--- increased maximum complexity for tracks
-
------------------------------------
---0.4: user-requested features
------------------------------------
-
--- added movement trail
--- removed exploder weapon
--- removed mortar weapon
-
------------------------------------
--- 0.5 gaudy feature experimentation
------------------------------------
--- added a booster
--- added flame trail for booster
--- added and removed dx/dy on mortar launch
--- added and removed keypress-based mortar fire
--- changed mortar for a gtShell, probably more useful for tunneling
--- added dx/dy *2 shell fire
-
-----------------------------------
--- 0.6 modesty / display mod
-----------------------------------
--- author branding removed
--- version numbers removed
-
------------------------------
--- SCRIPT BEGINS
------------------------------
-
--- enable awesome translaction support so we can use loc() wherever we want
-loadfile(GetDataPath() .. "Scripts/Locale.lua")()
-
-------------------
--- Got Variables?
-------------------
-
-local roundLimit = 3
-local roundNumber = 0
-local firstClan = 10
-
-local versionNo = loc("v.06")
-
---------------------------
--- hog and team tracking variales
---------------------------
-
-local numhhs = 0 -- store number of hedgehogs
-local hhs = {} -- store hedgehog gears
-
-local numTeams -- store the number of teams in the game
-local teamNameArr = {} -- store the list of teams
-local teamClan = {}
-local teamSize = {} -- store how many hogs per team
-local teamIndex = {} -- at what point in the hhs{} does each team begin
-
-local teamComment = {}
-local teamScore = {}
-
----------
--- tumbler stuff
----------
-
-local moveTimer = 0
-local leftOn = false
-local rightOn = false
-local upOn = false
-local downOn = false
-
-local shotsMax = 30 --10
-local shotsLeft = 10
-
-local TimeLeftCounter = 0
-local TimeLeft = 60
-local stopMovement = false
-local tumbleStarted = false
-
--------
--- racer vars
---------
-
-local boosterOn = false
-local boosterFuel = 75
-local boosterPower = 0.3
-local boosterTimer = 0
-
-local bestClan = nil
-local bestTime = nil
-
-local gameBegun = false
-local gameOver = false
-local racerActive = false
-local trackTime = 0
-local wpCheckCounter = 0
-
-local wpCirc = {}
-local wpX = {}
-local wpY = {}
-local wpCol = {}
-local wpActive = {}
-local wpRad = 75
-local wpCount = 0
-local wpLimit = 20
-
--------------------
--- general methods
--------------------
-
-function RebuildTeamInfo()
-
-
- -- make a list of individual team names
- for i = 0, 7 do
- teamNameArr[i] = " " -- = i
- teamSize[i] = 0
- teamIndex[i] = 0
- teamScore[i] = 100000
- end
- numTeams = 0
-
- for i = 0, (numhhs-1) do
-
- z = 0
- unfinished = true
- while(unfinished == true) do
-
- newTeam = true
- tempHogTeamName = GetHogTeamName(hhs[i]) -- this is the new name
-
- if tempHogTeamName == teamNameArr[z] then
- newTeam = false
- unfinished = false
- end
-
- z = z + 1
-
- if z == TeamsCount then
- unfinished = false
- if newTeam == true then
- teamNameArr[numTeams] = tempHogTeamName
- numTeams = numTeams + 1
- end
- end
-
- end
-
- end
-
- -- find out how many hogs per team, and the index of the first hog in hhs
- for i = 0, (numTeams-1) do
- for z = 0, (numhhs-1) do
- if GetHogTeamName(hhs[z]) == teamNameArr[i] then
- teamClan[i] = GetHogClan(hhs[z])
- if teamSize[i] == 0 then
- teamIndex[i] = z -- should give starting index
- end
- teamSize[i] = teamSize[i] + 1
- --add a pointer so this hog appears at i in hhs
- end
- end
-
- end
-
-end
-
-
------------------
--- RACER METHODS
------------------
-
-function GetSpeed()
-
- dx, dy = GetGearVelocity(CurrentHedgehog)
-
- x = dx*dx
- y = dy*dy
- z = x+y
-
- z = z*100
-
- k = z%1
-
- if k ~= 0 then
- z = z - k
- end
-
- return(z)
-
-end
-
-function CheckWaypoints()
-
- trackFinished = true
-
- for i = 0, (wpCount-1) do
-
- g1X, g1Y = GetGearPosition(CurrentHedgehog)
- g2X, g2Y = wpX[i], wpY[i]
-
- g1X = g1X - g2X
- g1Y = g1Y - g2Y
- dist = (g1X*g1X) + (g1Y*g1Y)
-
- --if i == 0 then
- -- AddCaption(dist .. "/" .. (wpRad*wpRad) )
- --end
-
- if dist < (wpRad*wpRad) then
- --AddCaption("howdy")
- wpActive[i] = true
- wpCol[i] = GetClanColor(GetHogClan(CurrentHedgehog)) -- new --GetClanColor(1)
- SetVisualGearValues(wpCirc[i], wpX[i], wpY[i], 20, 100, 0, 10, 0, wpRad, 5, wpCol[i])
- end
-
- if wpActive[i] == false then
- trackFinished = false
- end
-
- end
-
- return(trackFinished)
-
-end
-
-function AdjustScores()
-
- --[[if bestTime == nil then
- bestTime = 100000
- bestClan = 10
- bestTimeComment = "N/A"
- else
- bestTimeComment = (bestTime/1000) ..loc("s")
- end]]
-
- if bestTime == nil then
- bestTime = 100000
- bestClan = 10
- bestTimeComment = "N/A"
- end
-
- newScore = false
-
- -- update this clan's time if the new track is better
- for i = 0, (numTeams-1) do
- if teamClan[i] == GetHogClan(CurrentHedgehog) then
- if trackTime < teamScore[i] then
- teamScore[i] = trackTime
- newScore = true
- else
- newScore = false
- end
- end
- end
-
- --bestTime = 100000
- --bestClan = 10
-
- -- find the best time out of those so far
- for i = 0, (numTeams-1) do
- if teamScore[i] < bestTime then
- bestTime = teamScore[i]
- bestClan = teamClan[i]
- end
- end
-
- if bestTime ~= 100000 then
- bestTimeComment = (bestTime/1000) ..loc("s")
- end
-
- if newScore == true then
- if trackTime == bestTime then -- best time of the race
- ShowMission("RACER", loc("TRACK COMPLETED"), loc("NEW RACE RECORD: ") .. (trackTime/1000) ..loc("s") .. "|" .. loc("WINNING TIME: ") .. bestTimeComment, 0, 4000)
- else -- best time for the clan
- ShowMission("RACER", loc("TRACK COMPLETED"), loc("NEW CLAN RECORD: ") .. (trackTime/1000) ..loc("s") .. "|" .. loc("WINNING TIME: ") .. bestTimeComment, 4, 4000)
- end
- else -- not any kind of new score
- ShowMission("RACER", loc("TRACK COMPLETED"), loc("TIME: ") .. (trackTime/1000) ..loc("s") .. "|" .. loc("WINNING TIME: ") .. bestTimeComment, -amSkip, 4000)
- end
-
-end
-
-function CheckForNewRound()
-
- if GetHogClan(CurrentHedgehog) == firstClan then
-
- roundNumber = roundNumber + 1
-
- for i = 0, 7 do
- if teamNameArr[i] ~= " " then -- teamScore[teamClan[i]]
- teamComment[i] = teamNameArr[i] .. ": " .. (teamScore[i]/1000) .. loc("s|")
- elseif teamNameArr[i] == " " then
- teamComment[i] = "|"
- end
- end
- ShowMission("RACER", loc("STATUS UPDATE"), loc("Rounds Complete") .. ": " .. roundNumber .. "/" .. roundLimit .. "|" .. " " .. "|" .. loc("Best Team Times: ") .. "|" .. teamComment[0] .. teamComment[1] .. teamComment[2] .. teamComment[3] .. teamComment[4] .. teamComment[5] .. teamComment[6] .. teamComment[7], 0, 1600)
-
- -- end game if its at round limit
- if roundNumber == roundLimit then
- for i = 0, (numhhs-1) do
- if GetHogClan(hhs[i]) ~= bestClan then
- SetEffect(hhs[i], heResurrectable, false)
- SetHealth(hhs[i],0)
- end
- end
- gameOver = true
- TurnTimeLeft = 1
- end
-
- end
-
-end
-
-function DisableTumbler()
- stopMovement = true
- upOn = false
- down = false
- leftOn = false
- rightOn = false
- boosterOn = false
-end
-
-----------------------------------
--- GAME METHODS / EVENT HANDLERS
-----------------------------------
-
-function onGameInit()
- --Theme = "Hell"
- --GameFlags
- --GameFlags = gfDisableWind
-end
-
-
-function onGameStart()
- RebuildTeamInfo()
- ShowMission("RACER", "", "", 4, 4000)
-end
-
-function onHJump()
- if (shotsLeft > 0) and (CurrentHedgehog ~= nil) and (stopMovement == false) and (tumbleStarted == true) then -- seems to not work with a hedgehog nil chek
-
- shotsLeft = shotsLeft - 1
- morte = AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), gtShell, 0, 0, 0, 1)
- AddCaption(loc("Shots Left: ") .. shotsLeft)
-
-
- -- based on player movement already
- CopyPV(CurrentHedgehog, morte) -- new addition
-
- --x2
- x,y = GetGearVelocity(morte)
- x = x*2
- y = y*2
- SetGearVelocity(morte, x, y)
-
- --- or based on keys?
- --[[x = 0
- y = 0
-
- launchPower = 0.5
-
- if leftOn == true then
- x = x - launchPower
- end
- if rightOn == true then
- x = x + launchPower
- end
-
- if upOn == true then
- y = y - launchPower
- end
- if downOn == true then
- y = y + launchPower
- end
-
- SetGearVelocity(morte, x, y)]]
-
-
- end
-end
-
-function onLJump()
-
-
- if (wpCount < wpLimit) and (CurrentHedgehog ~= nil) and (stopMovement == false) and (tumbleStarted == true) and (gameBegun == false) then -- seems to not work with a hedgehog nil chek
-
- wpX[wpCount] = GetX(CurrentHedgehog)
- wpY[wpCount] = GetY(CurrentHedgehog)
- wpCol[wpCount] = 0xffffffff
- wpCirc[wpCount] = AddVisualGear(wpX[wpCount],wpY[wpCount],vgtCircle,0,true)
- --100 --0 --75 --wpCol[wpCount]
- SetVisualGearValues(wpCirc[wpCount], wpX[wpCount], wpY[wpCount], 20, 100, 0, 10, 0, wpRad, 5, wpCol[wpCount])
-
- wpCount = wpCount + 1
-
- AddCaption(loc("Waypoint placed.") .. " " .. loc("Available points remaining: ") .. (wpLimit-wpCount))
-
- if wpCount == wpLimit then
- AddCaption(loc("Race complexity limit reached."))
- DisableTumbler()
- end
-
- end
-
-
- if (boosterFuel > 0) and (CurrentHedgehog ~= nil) and (stopMovement == false) and (tumbleStarted == true) and (gameBegun == true) then
-
- if boosterOn == false then
- boosterOn = true
- else
- boosterOn = false
- end
-
- end
-
-end
-
-function onLeft()
- if (CurrentHedgehog ~= nil) and (stopMovement == false) then
- leftOn = true
- end
-end
-
-function onRight()
- if (CurrentHedgehog ~= nil) and (stopMovement == false) then
- rightOn = true
- end
-end
-
-function onUp()
- if (CurrentHedgehog ~= nil) and (stopMovement == false) then
- upOn = true
- end
-end
-
-function onDown()
- if (CurrentHedgehog ~= nil) and (stopMovement == false) then
- downOn = true
- end
-end
-
-function onDownUp()
- downOn = false
-end
-function onUpUp()
- upOn = false
-end
-function onLeftUp()
- leftOn = false
-end
-function onRightUp()
- rightOn = false
-end
-
-function onNewTurn()
-
- CheckForNewRound()
-
- --if gameOver == false then
- shotsLeft = shotsMax
- stopMovement = false
- tumbleStarted = false
- boosterOn = false
- boosterFuel = 75
- SetTag(AddGear(0, 0, gtATSmoothWindCh, 0, 0, 0, 1), boosterFuel)
- --SetInputMask(band(0xFFFFFFFF, bnot(gmAnimate+gmAttack+gmDown+gmHJump+gmLeft+gmLJump+gmPrecise+gmRight+gmSlot+gmSwitch+gmTimer+gmUp+gmWeapon)))
- --AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), gtGrenade, 0, 0, 0, 1)
- --end
-
-
-
- -- Set the waypoints to unactive on new round
- for i = 0,(wpCount-1) do
- wpActive[i] = false
- wpCol[i] = 0xffffffff
- SetVisualGearValues(wpCirc[i], wpX[i], wpY[i], 20, 100, 0, 10, 0, wpRad, 5, wpCol[i])
- end
-
- -- Handle Starting Stage of Game
- if (gameOver == false) and (gameBegun == false) then
- if wpCount >= 3 then
- gameBegun = true
- racerActive = true
- roundNumber = 0 -- 0
- firstClan = GetHogClan(CurrentHedgehog)
- ShowMission("RACER", loc("GAME BEGUN!!!"), loc("Complete the track as fast as you can!"), 2, 4000)
- else
- ShowMission("RACER", loc("NOT ENOUGH WAYPOINTS"), loc("Place more waypoints using [ENTER]"), 2, 4000)
- end
- end
-
- if gameOver == true then
- gameBegun = false
- stopMovement = true
- tumbleStarted = false
- end
-
-end
-
-function onGameTick()
-
- -- start the player tumbling with a boom once their turn has actually begun
- if tumbleStarted == false then
- if (TurnTimeLeft > 0) and (TurnTimeLeft ~= TurnTime) then
- AddCaption("Good to go!")
- tumbleStarted = true
- racerActive = true
- trackTime = 0
- TimeLeft = 60
-
- -- if the gamehas started put the player in the middle of the first
- --waypoint that was placed
- if gameBegun == true then
- SetGearPosition(CurrentHedgehog, wpX[0], wpY[0])
- AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), gtGrenade, 0, 0, 0, 1)
- FollowGear(CurrentHedgehog)
- else -- otherwise just start him tumbling from wherever he is
- AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), gtGrenade, 0, 0, 0, 1)
- end
-
- end
- end
-
- -- has the player started his tumbling spree?
- if (CurrentHedgehog ~= nil) and (tumbleStarted == true) then
-
- --AddCaption(LOC_NOT("Speed: ") .. GetSpeed())
-
- -- if the RACE has started, show tracktimes and keep tabs on waypoints
- if (racerActive == true) and (gameBegun == true) then
-
- trackTime = trackTime + 1
-
- wpCheckCounter = wpCheckCounter + 1
- if (wpCheckCounter == 100) then
-
- AddCaption(loc("Track Time: ") .. (trackTime/1000) .. loc("s") )
- wpCheckCounter = 0
- if (CheckWaypoints() == true) then
- AdjustScores()
- racerActive = false
- DisableTumbler()
- end
-
- end
-
- end
-
- if boosterOn == true then
- boosterTimer = boosterTimer + 1
- if boosterTimer == 150 then --200
- boosterTimer = 0
- boosterFuel = boosterFuel - 1
- SetTag(AddGear(0, 0, gtATSmoothWindCh, 0, 0, 0, 1), boosterFuel)
- if boosterFuel == 0 then
- boosterOn = false
- end
- end
- end
-
- -- Calculate and display turn time
- TimeLeftCounter = TimeLeftCounter + 1
- if TimeLeftCounter == 1000 then
- TimeLeftCounter = 0
- TimeLeft = TimeLeft - 1
-
- if TimeLeft >= 0 then
- --TurnTimeLeft = TimeLeft
- --AddCaption(LOC_NOT("Time Left: ") .. TimeLeft)
- end
-
- end
-
- -- if the player has expended his tunbling time, stop him tumbling
- if TimeLeft == 0 then
- DisableTumbler()
- end
-
-
- -- handle movement based on IO
- moveTimer = moveTimer + 1
- if moveTimer == 100 then -- 100
- moveTimer = 0
-
- -- keep in mind gravity is acting on the hog
- -- so his down is more powerful than his up
-
- dx, dy = GetGearVelocity(CurrentHedgehog)
-
- dxlimit = 0.4 --0.4
- dylimit = 0.4 --0.4
-
- if boosterOn == true then
-
- --flame trail, now removed
- AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), gtFlame, 0, 0, 0, 0)
- --tempE = AddVisualGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), vgtDust, 0, false)
-
- dxlimit = dxlimit + boosterPower
- dylimit = dylimit + boosterPower
- else
- tempE = AddVisualGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), vgtDust, 0, false)
- g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(tempE)
- SetVisualGearValues(tempE, g1, g2, g3, g4, g5, g6, g7, g8, g9, GetClanColor(GetHogClan(CurrentHedgehog)) )
- end
-
- if dx > dxlimit then
- dx = dxlimit
- end
- if dy > dylimit then
- dy = dylimit
- end
- if dx < -dxlimit then
- dx = -dxlimit
- end
- if dy < -dylimit then
- dy = -dylimit
- end
-
-
- dxPower = 0.1 --0.1
- dyPower = 0.1 --0.1
-
- if leftOn == true then
- dx = dx - dxPower
- end
- if rightOn == true then
- dx = dx + dxPower
- end
-
- if upOn == true then
- dy = dy - dyPower -- -0.1 -- new addition
- end
- if downOn == true then
- dy = dy + dyPower
- end
-
- --if leftOn == true then
- -- dx = dx - 0.04
- --end
- --if rightOn == true then
- -- dx = dx + 0.04
- --end
-
- --if upOn == true then
- -- dy = dy - 0.1
- --end
- --if downOn == true then
- -- dy = dy + 0.06
- --end
-
- SetGearVelocity(CurrentHedgehog, dx, dy)
-
- end
-
- end
-
-end
-
-function onGearDamage(gear, damage)
- --if gear == CurrentHedgehog then
- -- You are now tumbling
- --end
-end
-
-function onGearResurrect(gear)
-
- AddVisualGear(GetX(gear), GetY(gear), vgtBigExplosion, 0, false)
-
- -- if the player stops and "dies" or flies into water, stop him tumbling
- if gear == CurrentHedgehog then
- DisableTumbler()
- end
-
-end
-
-function onGearAdd(gear)
-
- if GetGearType(gear) == gtHedgehog then
- hhs[numhhs] = gear
- numhhs = numhhs + 1
- SetEffect(gear, heResurrectable, true)
- end
-
-end
-
-function onGearDelete(gear)
- --not needed today, yet
-
- --sticky camera
- if CurrentHedgehog ~= nil then
- FollowGear(CurrentHedgehog)
- end
-
-end
--- a/share/hedgewars/Data/Scripts/Multiplayer/No_Jumping.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/No_Jumping.lua Sat Oct 08 16:54:56 2011 +0200
@@ -15,7 +15,7 @@
end
function onGearAdd(gear)
-
+
if (GetGearType(gear) == gtJetpack) or (GetGearType(gear) == gtRope) or (GetGearType(gear) == gtParachute) then
specialGear = gear
SetInputMask(band(0xFFFFFFFF, bnot(gmHJump)))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Racer.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,2 @@
+Shoppa
+Shoppa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,625 @@
+
+------------------------------------------
+-- RACER 0.4
+-- map-independant racing script
+-- by mikade
+-----------------------------------------
+
+-----------------------------------
+--0.1: took all the code from crazy racer and scrapped most of it
+-----------------------------------
+
+-- Removed tumbler system
+-- Removed extra adds like boosters etc
+-- Added experimental waypoint placement system
+-- More user feedback
+-- Reduced race complexity limit to 5 waypoints
+-- stop placement at complexity limit reached and end turn
+-- guys dont keep racing after dying
+-- invulnerable feasibility
+-- reverted time keeping method
+-- reduced feedback display time
+-- colour-coded addcaptions
+-- cleaned up code
+-- support for more players properly added
+-- tardis fix
+-- remove airstrikes
+
+-- i think the remainder 0 .456 sec of the tracktime isnt getting reset on newturn
+
+-- update feedback
+
+-------
+-- 0.2
+-------
+
+-- allow gameflags
+-- extend time to 90s
+-- remove other air-attack based weps
+-- turn off water rise for sd
+
+-------
+-- 0.3
+-------
+
+-- prevent WP being placed in land
+-- prevent waypoints being placed outside border
+
+-------
+-- 0.4
+-------
+
+-- update user feedback
+-- add more sounds
+
+-----------------------------
+-- SCRIPT BEGINS
+-----------------------------
+
+loadfile(GetDataPath() .. "Scripts/Locale.lua")()
+
+------------------
+-- Got Variables?
+------------------
+
+local fMod = 1000000 -- 1
+local roundLimit = 3
+local roundNumber = 0
+local firstClan = 10
+
+local fastX = {}
+local fastY = {}
+local fastCount = 0
+local fastIndex = 0
+local fastColour
+
+local currX = {}
+local currY = {}
+local currCount = 0
+
+--------------------------
+-- hog and team tracking variales
+--------------------------
+
+local numhhs = 0 -- store number of hedgehogs
+local hhs = {} -- store hedgehog gears
+
+local numTeams -- store the number of teams in the game
+local teamNameArr = {} -- store the list of teams
+local teamClan = {}
+local teamSize = {} -- store how many hogs per team
+local teamIndex = {} -- at what point in the hhs{} does each team begin
+
+local teamComment = {}
+local teamScore = {}
+
+-------
+-- racer vars
+--------
+
+local cGear = nil
+local gTimer = 0
+
+local bestClan = nil
+local bestTime = nil
+
+local gameBegun = false
+local gameOver = false
+local racerActive = false
+local trackTime = 0
+local wpCheckCounter = 0
+
+local wpCirc = {}
+local wpX = {}
+local wpY = {}
+local wpCol = {}
+local wpActive = {}
+local wpRad = 450 --75
+local wpCount = 0
+local wpLimit = 5
+
+-------------------
+-- general methods
+-------------------
+
+function RebuildTeamInfo()
+
+
+ -- make a list of individual team names
+ for i = 0, (TeamsCount-1) do
+ teamNameArr[i] = " " -- = i
+ teamSize[i] = 0
+ teamIndex[i] = 0
+ teamScore[i] = 100000
+ end
+ numTeams = 0
+
+ for i = 0, (numhhs-1) do
+
+ z = 0
+ unfinished = true
+ while(unfinished == true) do
+
+ newTeam = true
+ tempHogTeamName = GetHogTeamName(hhs[i]) -- this is the new name
+
+ if tempHogTeamName == teamNameArr[z] then
+ newTeam = false
+ unfinished = false
+ end
+
+ z = z + 1
+
+ if z == TeamsCount then
+ unfinished = false
+ if newTeam == true then
+ teamNameArr[numTeams] = tempHogTeamName
+ numTeams = numTeams + 1
+ end
+ end
+
+ end
+
+ end
+
+ -- find out how many hogs per team, and the index of the first hog in hhs
+ for i = 0, (numTeams-1) do
+ for z = 0, (numhhs-1) do
+ if GetHogTeamName(hhs[z]) == teamNameArr[i] then
+ teamClan[i] = GetHogClan(hhs[z])
+ if teamSize[i] == 0 then
+ teamIndex[i] = z -- should give starting index
+ end
+ teamSize[i] = teamSize[i] + 1
+ --add a pointer so this hog appears at i in hhs
+ end
+ end
+
+ end
+
+end
+
+
+-----------------
+-- RACER METHODS
+-----------------
+
+function CheckWaypoints()
+
+ trackFinished = true
+
+ for i = 0, (wpCount-1) do
+
+ g1X, g1Y = GetGearPosition(CurrentHedgehog)
+ g2X, g2Y = wpX[i], wpY[i]
+
+ g1X = g1X - g2X
+ g1Y = g1Y - g2Y
+ dist = (g1X*g1X) + (g1Y*g1Y)
+
+ --if i == 0 then
+ -- AddCaption(dist .. "/" .. (wpRad*wpRad) )
+ --end
+
+ NR = (48/100*wpRad)/2
+
+ if dist < (NR*NR) then
+ --if dist < (wpRad*wpRad) then
+ --AddCaption("howdy")
+ wpActive[i] = true
+ wpCol[i] = GetClanColor(GetHogClan(CurrentHedgehog)) -- new --GetClanColor(1)
+ SetVisualGearValues(wpCirc[i], wpX[i], wpY[i], 20, 100, 1, 10, 0, wpRad, 5, wpCol[i])
+
+ wpRem = 0
+ for k = 0, (wpCount-1) do
+ if wpActive[k] == false then
+ wpRem = wpRem + 1
+ end
+ end
+
+ AddCaption(loc("Way-Points Remaining") .. ": " .. wpRem,0xffba00ff,capgrpAmmoinfo)
+
+ end
+
+ if wpActive[i] == false then
+ trackFinished = false
+ end
+
+ end
+
+ return(trackFinished)
+
+end
+
+function AdjustScores()
+
+ if bestTime == nil then
+ bestTime = 100000
+ bestClan = 10
+ bestTimeComment = "N/A"
+ end
+
+ newScore = false
+
+ -- update this clan's time if the new track is better
+ for i = 0, (numTeams-1) do
+ if teamClan[i] == GetHogClan(CurrentHedgehog) then
+ if trackTime < teamScore[i] then
+ teamScore[i] = trackTime
+ newScore = true
+ else
+ newScore = false
+ end
+ end
+ end
+
+ --bestTime = 100000
+ --bestClan = 10
+
+ -- find the best time out of those so far
+ for i = 0, (numTeams-1) do
+ if teamScore[i] < bestTime then
+ bestTime = teamScore[i]
+ bestClan = teamClan[i]
+ end
+ end
+
+ if bestTime ~= 100000 then
+ bestTimeComment = (bestTime/1000) ..loc("s")
+ end
+
+ if newScore == true then
+ if trackTime == bestTime then -- best time of the race
+ ShowMission(loc("RACER"),
+ loc("TRACK COMPLETED"),
+ loc("NEW RACE RECORD: ") .. (trackTime/1000) ..loc("s") .. "|" ..
+ loc("WINNING TIME: ") .. bestTimeComment, 0, 4000)
+ PlaySound(sndHomerun)
+ else -- best time for the clan
+ ShowMission(loc("RACER"),
+ loc("TRACK COMPLETED"),
+ loc("NEW CLAN RECORD: ") .. (trackTime/1000) ..loc("s") .. "|" ..
+ loc("WINNING TIME: ") .. bestTimeComment, 4, 4000)
+ end
+ else -- not any kind of new score
+ ShowMission(loc("RACER"),
+ loc("TRACK COMPLETED"),
+ loc("TIME: ") .. (trackTime/1000) ..loc("s") .. "|" ..
+ loc("WINNING TIME: ") .. bestTimeComment, -amSkip, 4000)
+ PlaySound(sndHellish)
+ end
+
+
+ --------
+ --new
+ --------
+
+ if bestTime == trackTime then
+ --AddCaption("wooooooooooooooooooooooooooooo")
+
+ fastColour = GetClanColor(GetHogClan(CurrentHedgehog))
+
+ for i = 0, (currCount-1) do
+ fastX[i] = currX[i]
+ fastY[i] = currY[i]
+ end
+
+ fastCount = currCount
+ fastIndex = 0
+
+ --currCount = 0 -- is this needed?
+
+ else
+ currCount = 0
+ fastIndex = 0
+ end
+
+
+end
+
+function CheckForNewRound()
+
+ if GetHogClan(CurrentHedgehog) == firstClan then
+
+ roundNumber = roundNumber + 1
+
+ totalComment = ""
+ for i = 0, (TeamsCount-1) do
+ if teamNameArr[i] ~= " " then -- teamScore[teamClan[i]]
+ teamComment[i] = teamNameArr[i] .. ": " .. (teamScore[i]/1000) .. loc("s|")
+ totalComment = totalComment .. teamComment[i]
+ elseif teamNameArr[i] == " " then
+ teamComment[i] = "|"
+ end
+ end
+
+ ShowMission( loc("RACER"),
+ loc("STATUS UPDATE"),
+ loc("Rounds Complete: ") .. roundNumber .. "/" .. roundLimit .. "|" .. " " .. "|" ..
+ loc("Best Team Times: ") .. "|" .. totalComment, 0, 4000)
+
+ -- end game if its at round limit
+ if roundNumber == roundLimit then
+ for i = 0, (numhhs-1) do
+ if GetHogClan(hhs[i]) ~= bestClan then
+ SetEffect(hhs[i], heResurrectable, false)
+ SetHealth(hhs[i],0)
+ end
+ end
+ gameOver = true
+ TurnTimeLeft = 1
+ end
+
+ end
+
+end
+
+function DisableTumbler()
+ currCount = 0
+ fastIndex = 0
+ TurnTimeLeft = 0
+ racerActive = false -- newadd
+end
+
+function HandleGhost()
+
+ -- get the current xy of the racer at this point
+ currX[currCount] = GetX(CurrentHedgehog)
+ currY[currCount] = GetY(CurrentHedgehog)
+ currCount = currCount + 1
+
+ -- draw a ping of smoke where the fastest player was at this point
+ if (fastCount ~= 0) and (fastIndex < fastCount) then
+
+ fastIndex = fastIndex + 1
+
+ tempE = AddVisualGear(fastX[fastIndex], fastY[fastIndex], vgtSmoke, 0, false)
+ g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(tempE)
+ SetVisualGearValues(tempE, g1, g2, g3, g4, g5, g6, g7, g8, g9, fastColour )
+
+ --AddCaption("fC: " .. fastIndex .. " / " .. fastCount)
+
+ else
+
+ --AddCaption("excep fC: " .. fastIndex .. " / " .. fastCount)
+
+ end
+
+
+
+end
+
+----------------------------------
+-- GAME METHODS / EVENT HANDLERS
+----------------------------------
+
+function onGameInit()
+ GameFlags = GameFlags + gfInfAttack + gfInvulnerable
+ CaseFreq = 0
+ TurnTime = 90000
+ WaterRise = 0
+end
+
+
+function onGameStart()
+ RebuildTeamInfo()
+
+ ShowMission (
+ loc("RACER"),
+ loc("a Hedgewars mini-game"),
+
+ loc("Build a track and race.") .. "|" ..
+ loc("Round Limit:") .. " " .. roundLimit .. "|" ..
+
+ "", 4, 4000
+ )
+
+
+end
+
+function PlaceWayPoint(x,y)
+
+ if (wpCount < wpLimit) then -- seems to not work with a hedgehog nil chek
+
+ wpX[wpCount] = x
+ wpY[wpCount] = y
+ wpCol[wpCount] = 0xffffffff
+ wpCirc[wpCount] = AddVisualGear(wpX[wpCount],wpY[wpCount],vgtCircle,0,true)
+ --100
+ SetVisualGearValues(wpCirc[wpCount], wpX[wpCount], wpY[wpCount], 20, 100, 1, 10, 0, wpRad, 5, wpCol[wpCount])
+
+ wpCount = wpCount + 1
+
+ AddCaption(loc("Waypoint placed.") .. " " .. loc("Available points remaining: ") .. (wpLimit-wpCount))
+
+ end
+
+end
+
+function onNewTurn()
+
+ CheckForNewRound()
+
+ racerActive = false
+
+ trackTime = 0
+
+ currCount = 0 -- hopefully this solves problem
+ AddAmmo(CurrentHedgehog, amAirAttack, 0)
+ gTimer = 0
+
+ -- Set the waypoints to unactive on new round
+ for i = 0,(wpCount-1) do
+ wpActive[i] = false
+ wpCol[i] = 0xffffffff
+ SetVisualGearValues(wpCirc[i], wpX[i], wpY[i], 20, 100, 1, 10, 0, wpRad, 5, wpCol[i])
+ end
+
+ -- Handle Starting Stage of Game
+ if (gameOver == false) and (gameBegun == false) then
+ if wpCount >= 3 then
+ gameBegun = true
+ roundNumber = 0
+ firstClan = GetHogClan(CurrentHedgehog)
+ ShowMission(loc("RACER"),
+ loc("GAME BEGUN!!!"),
+ loc("Complete the track as fast as you can!"), 2, 4000)
+ else
+ ShowMission(loc("RACER"),
+ loc("NOT ENOUGH WAYPOINTS"),
+ loc("Place more waypoints using the 'Air Attack' weapon."), 2, 4000)
+ AddAmmo(CurrentHedgehog, amAirAttack, 4000)
+ end
+ end
+
+ if gameOver == true then
+ gameBegun = false
+ racerActive = false -- newadd
+ end
+
+ AddAmmo(CurrentHedgehog, amTardis, 0)
+ AddAmmo(CurrentHedgehog, amDrillStrike, 0)
+ AddAmmo(CurrentHedgehog, amMineStrike, 0)
+ AddAmmo(CurrentHedgehog, amNapalm, 0)
+ AddAmmo(CurrentHedgehog, amPiano, 0)
+
+end
+
+function onGameTick()
+
+ -- airstrike detected, convert this into a potential waypoint spot
+ if cGear ~= nil then
+ x,y = GetGearTarget(cGear)
+
+ DeleteGear(cGear)
+
+ if TestRectForObstacle(x-20, y-20, x+20, y+20, true) then
+ AddCaption(loc("Please place the way-point in the open, within the map boundaries."))
+ PlaySound(sndDenied)
+ elseif (y > WaterLine-50) then
+ AddCaption(loc("Please place the way-point further from the waterline."))
+ PlaySound(sndDenied)
+ else
+ PlaceWayPoint(x, y)
+ if wpCount == wpLimit then
+ AddCaption(loc("Race complexity limit reached."))
+ DisableTumbler()
+ end
+ end
+
+ end
+
+
+ -- start the player tumbling with a boom once their turn has actually begun
+ if racerActive == false then
+
+ if (TurnTimeLeft > 0) and (TurnTimeLeft ~= TurnTime) then
+
+ -- if the gamehas started put the player in the middle of the first
+ --waypoint that was placed
+ if gameBegun == true then
+ AddCaption(loc("Good to go!"))
+ racerActive = true
+ trackTime = 0
+
+ SetGearPosition(CurrentHedgehog, wpX[0], wpY[0])
+ AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), gtGrenade, 0, 0, 0, 1)
+ FollowGear(CurrentHedgehog)
+ ShowMission("...", "...", "...", 2, 1)
+
+ else
+ -- still in placement mode
+ end
+
+ end
+ end
+
+
+
+ -- has the player started his tumbling spree?
+ if (CurrentHedgehog ~= nil) then
+
+ --airstrike conversion used to be here
+
+ -- if the RACE has started, show tracktimes and keep tabs on waypoints
+ if (racerActive == true) and (gameBegun == true) then
+
+ --ghost
+ gTimer = gTimer + 1
+ if gTimer == 15 then
+ gTimer = 0
+ HandleGhost()
+ end
+
+ trackTime = trackTime + 1
+
+ wpCheckCounter = wpCheckCounter + 1
+ if (wpCheckCounter == 100) then
+
+ wpCheckCounter = 0
+ AddCaption(trackTime/1000,GetClanColor(GetHogClan(CurrentHedgehog)),capgrpMessage2)
+
+ if (CheckWaypoints() == true) then
+ AdjustScores()
+ racerActive = false
+ DisableTumbler()
+ end
+
+ end
+
+ end
+
+
+
+ -- if the player has expended his tunbling time, stop him tumbling
+ if TurnTimeLeft <= 1 then
+ DisableTumbler()
+ end
+
+ end
+
+end
+
+function onGearResurrect(gear)
+
+ AddVisualGear(GetX(gear), GetY(gear), vgtBigExplosion, 0, false)
+
+ -- if the player stops and "dies" or flies into water, stop him racing
+ --[[if gear == CurrentHedgehog then
+ DisableTumbler()
+ ShowMission(loc("RACER"),
+ loc("TRACK FAILED!"),
+ loc("WINNING TIME: ") .. bestTimeComment, -amSkip, 4000)
+ end]]
+
+end
+
+function onGearAdd(gear)
+
+ if GetGearType(gear) == gtHedgehog then
+ hhs[numhhs] = gear
+ numhhs = numhhs + 1
+ SetEffect(gear, heResurrectable, true)
+ end
+
+ if GetGearType(gear) == gtAirAttack then
+ cGear = gear
+ end
+
+end
+
+function onGearDelete(gear)
+
+ if GetGearType(gear) == gtAirAttack then
+ cGear = nil
+ end
+
+end
+
+--[[function onAmmoStoreInit()
+ SetAmmo(amRope, 9, 0, 0, 0)
+ SetAmmo(amJetpack, 9, 0, 0, 0)
+ SetAmmo(amSkip, 9, 0, 0, 0)
+end]]
+
+
--- a/share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua Sat Oct 08 16:54:56 2011 +0200
@@ -5,7 +5,7 @@
---------------------------------------------------
---------------------------------------------------
---------------------------------------------------
---- Space Invasion Code Follows (0.8)
+--- Space Invasion Code Follows (0.9)
---------------------------------------------------
---------------------------------------------------
-- VERSION HISTORY
@@ -73,7 +73,7 @@
-- delete explosives in DeleteFarFlungBarrel rather than explode them on map boundaries to save on performance
-- utilized the improved AddCaption to tint / prevent overrides
-- temporarily disabled bugged sort that displays teams according to their score
--- reluctantly changed the colour of the bonus circ to purple
+-- reluctantly changed the colour of the bonus circ to purple
-- standarized point notation
-- added some missing locs
-- commented out remaining WriteLnToConsoles for the meanwhile with the prefix "nw"
@@ -86,13 +86,13 @@
-- Boss Slayer (Destroy 2 blue circles for +25 points)
-- Shield Master (disolve 5 shells for +10 points)
--- Shield Miser (don't use your shield at all +20 points)
+-- Shield Miser (don't use your shield at all (2.5*roundkills)+2 points)
-- Depleted Kamikaze! (kamikaze into a blue/red circ when you are out of ammo) 5pts
-- Timed Kamikaze! (kamikaze into a blue/red circ when you only have 5s left) 10pts
-- Kamikaze Expert (combination of the above two) 15pts
--- Multi-shot (destroy more than 1 invader with a single bullet) 5pts
+-- Multi-shot (destroy more than 1 invader with a single bullet) 15pts
-- X-Hit Combo (destroy another invader in less than 3 seconds) chainLength*2 points
-- Accuracy Bonus (80% accuracy at the end of your turn with more than 5 shots fired) 15pts
@@ -106,6 +106,22 @@
-- added a HUD for turntimeleft, ammo, shield
-- shieldhealth hits 0 properly
+------------------------
+-- version 0.8.1
+------------------------
+
+-- stop hiding non-existant 4th Tag
+-- redraw HUD on screen resolution change
+
+------------------------
+-- version 0.9
+------------------------
+-- time for more 'EXPERIMENTS' mwahahahahahaha D:
+-- (hopefully) balanced Shield Miser
+-- bosses are no longer a redunkulous 50 points, but toned down to 30
+-- experimental radar (it's INTERACTIVE and math-heavy :D) (visual gears are safe... right? D:)
+-- bugfix and balance for multishot
+
--------------------------
--notes for later
--------------------------
@@ -121,7 +137,7 @@
capgrpAmmostate
-----------------
AddCaption( chainLength .. LOC_NOT("-chain! +") .. chainLength*2 .. LOC_NOT(" points!"),0xffba00ff,capgrpAmmostate)
-AddCaption(LOC_NOT("Multi-shot! +5 points!"),0xffba00ff,capgrpAmmostate)
+AddCaption(LOC_NOT("Multi-shot! +15 points!"),0xffba00ff,capgrpAmmostate)
-----------------
capgrpAmmoinfo
@@ -138,7 +154,7 @@
AddCaption(LOC_NOT("Accuracy Bonus! +15 points!"),0xffba00ff,capgrpVolume)
-----------------
-capgrpMessage
+capgrpMessage
-----------------
AddCaption(LOC_NOT("Ammo Depleted!"),0xff0000ff,capgrpMessage)
AddCaption(LOC_NOT("Ammo: ") .. primShotsLeft)
@@ -158,7 +174,7 @@
AddCaption(LOC_NOT("Timed Kamikaze! +10 points!"),0xffba00ff,capgrpMessage)
-----------------
-capgrpMessage2
+capgrpMessage2
-----------------
AddCaption(LOC_NOT("Drone Hunter! +10 points!"),0xffba00ff,capgrpMessage2)
AddCaption(LOC_NOT("Ammo Maniac! +5 points!"),0xffba00ff,capgrpMessage2)
@@ -213,6 +229,7 @@
--local teamBlue = {}
--local teamOrange = {}
--local teamGreen = {}
+local roundKills = 0
local RK = 0
local GK = 0
local BK = 0
@@ -220,7 +237,7 @@
local SK = 0
local shieldMiser = true
local chainCounter = 0
-local chainLength = 0
+local chainLength = 0
local shotsFired = 0
local shotsHit = 0
@@ -267,6 +284,13 @@
local vCirc = {}
local vCCount = 0
+local rCirc = {}
+local rCircX = {}
+local rCircY = {}
+local rAlpha = 255
+local rPingTimer = 0
+local radShotsLeft = 0
+
local vCircActive = {}
local vCircHealth = {}
local vType = {}
@@ -301,31 +325,31 @@
function HideTags()
- for i = 0, 3 do
+ for i = 0, 2 do
SetVisualGearValues(vTag[i],0,0,0,0,0,1,0, 0, 240000, 0xffffff00)
end
end
function DrawTag(i)
-
+
zoomL = 1.3
xOffset = 40
if i == 0 then
- yOffset = 40
+ yOffset = 40
tCol = 0xffba00ff
tValue = TimeLeft
elseif i == 1 then
- zoomL = 1.1
- yOffset = 70
+ zoomL = 1.1
+ yOffset = 70
tCol = 0x00ff00ff
tValue = primShotsLeft
elseif i == 2 then
- zoomL = 1.1
+ zoomL = 1.1
xOffset = 40 + 35
- yOffset = 70
+ yOffset = 70
tCol = 0xa800ffff
tValue = shieldHealth - 80
end
@@ -333,7 +357,7 @@
DeleteVisualGear(vTag[i])
vTag[i] = AddVisualGear(0, 0, vgtHealthTag, 0, false)
g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(vTag[i])
- SetVisualGearValues (
+ SetVisualGearValues (
vTag[i], --id
-(ScreenWidth/2) + xOffset, --xoffset
ScreenHeight - yOffset, --yoffset
@@ -420,6 +444,8 @@
function AwardKills(t)
+ roundKills = roundKills + 1
+
for i = 0,(TeamsCount-1) do
if teamClan[i] == GetHogClan(CurrentHedgehog) then
teamCircsKilled[i] = teamCircsKilled[i] + 1
@@ -621,8 +647,8 @@
(GetX(gear) > 6200) or
(GetY(gear) < -3400)
then
- AddVisualGear(GetX(gear), GetY(gear), vgtBigExplosion, 0, false)
- DeleteGear(gear)
+ AddVisualGear(GetX(gear), GetY(gear), vgtBigExplosion, 0, false)
+ DeleteGear(gear)
--SetHealth(gear, 0)
--WriteLnToConsole("I'm setting barrel ID " .. getGearValue(gear,"ID") .. " to 0 health because it's been flung too close to the map edges. at Game Time: " .. GameTime .. "; luaTicks: " .. luaGameTicks)
end
@@ -644,8 +670,8 @@
-- Fire Barrel
if (primShotsLeft > 0) and (CurrentHedgehog ~= nil) and (stopMovement == false) and (tumbleStarted == true) then
- shotsFired = shotsFired +1
-
+ shotsFired = shotsFired +1
+
morte = AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), gtExplosives, 0, 0, 0, 1)
primShotsLeft = primShotsLeft - 1
@@ -702,6 +728,18 @@
end
end
+function onHJump()
+
+ if (CurrentHedgehog ~= nil) and (stopMovement == false) and (tumbleStarted == true) and
+ (rAlpha == 255) and (radShotsLeft > 0) then
+ rPingTimer = 0
+ rAlpha = 0
+ radShotsLeft = radShotsLeft -1
+ AddCaption(loc("Pings left:") .. " " .. radShotsLeft,GetClanColor(GetHogClan(CurrentHedgehog)),capgrpMessage)
+ end
+
+end
+
-----------------
-- movement keys
-----------------
@@ -750,8 +788,8 @@
MinesNum = 0
Explosives = 0
- for i = 0, 3 do
- vTag[0] = AddVisualGear(0, 0, vgtHealthTag, 0, false)
+ for i = 0, 3 do
+ vTag[0] = AddVisualGear(0, 0, vgtHealthTag, 0, false)
end
HideTags()
@@ -780,6 +818,7 @@
loc("Movement: [Up], [Down], [Left], [Right]") .. "|" ..
loc("Fire") .. ": " .. loc("[Left Shift]") .. "|" ..
loc("Toggle Shield") .. ": " .. loc("[Enter]") .. "|" ..
+ loc("Radar Ping") .. ": " .. loc("[Backspace]") .. "|" ..
--" " .. "|" ..
--LOC_NOT("Invaders List: ") .. "|" ..
@@ -797,10 +836,21 @@
end
+function onScreenResize()
+
+ -- redraw Tags so that their screen locations are updated
+ if (CurrentHedgehog ~= nil) and (tumbleStarted == true) then
+ DrawTag(0)
+ DrawTag(1)
+ DrawTag(2)
+ end
+
+end
function onNewTurn()
primShotsLeft = primShotsMax
+ radShotsLeft = 2
stopMovement = false
tumbleStarted = false
beam = false
@@ -811,6 +861,7 @@
BK = 0
OK = 0
SK = 0
+ roundKills = 0
shieldMiser = true
shotsFired = 0
shotsHit = 0
@@ -835,7 +886,7 @@
tumbleStarted = false
SetMyCircles(false)
end
-
+
HideTags()
---------------
@@ -862,8 +913,8 @@
function onGameTick()
-
- --WriteLnToConsole("Start of GameTick")
+
+ --WriteLnToConsole("Start of GameTick")
luaGameTicks = luaGameTicks + 1 -- GameTime
HandleCircles()
@@ -919,6 +970,7 @@
tumbleStarted = true
TimeLeft = (TurnTime/1000) --45
FadeAlpha = 0
+ rAlpha = 255
AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), gtGrenade, 0, 0, 0, 1)
DrawTag(0)
DrawTag(1)
@@ -955,9 +1007,9 @@
if PlayerIsFine() == false then
TimeLeft = 0
end
-
+
--WriteLnToConsole("successfully checked playerIsFine")
-
+
if (TimeLeft == 0) then
if (stopMovement == false) then --time to stop the player
stopMovement = true
@@ -968,11 +1020,19 @@
rightOn = false
SetMyCircles(false)
HideTags()
+ rAlpha = 255
--nw WriteLnToConsole("Player is out of luck")
if shieldMiser == true then
- AddCaption(loc("Shield Miser!") .. " +20 " .. loc("points") .. "!",0xffba00ff,capgrpAmmoinfo)
- AwardPoints(20)
+
+ p = (roundKills*2.5) - ((roundKills*2.5)%1) + 2
+ --p = (roundKills*2.5) + 2
+ --if (p%2 ~= 0) then
+ -- p = p -0.5
+ --end
+
+ AddCaption(loc("Shield Miser!") .." +" .. p .." ".. loc("points") .. "!",0xffba00ff,capgrpAmmoinfo)
+ AwardPoints(p)
end
if ((shotsHit / shotsFired * 100) >= 80) and (shotsFired > 4) then
@@ -985,16 +1045,16 @@
-------------------------------
-- Player is still in luck
-------------------------------
-
+
--WriteLnToConsole("about to do chainCounter checks")
if chainCounter > 0 then
- chainCounter = chainCounter -1
+ chainCounter = chainCounter -1
if chainCounter == 0 then
chainLength = 0
end
end
-
+
-- handle movement based on IO
moveTimer = moveTimer + 1
if moveTimer == 100 then -- 100
@@ -1063,7 +1123,7 @@
end
--WriteLnToConsole("End of GameTick")
-
+
end
function onGearResurrect(gear)
@@ -1149,8 +1209,47 @@
------------------------------------------------------------
------------------------------------------------------------
-
-
+function DoHorribleThings(cUID)
+
+ -- maybe
+ -- add a check to draw it inside the circ and not past it if
+ -- it is closer than 150 or w/e
+
+ -- work out the distance to the target
+ g1X, g1Y = GetGearPosition(CurrentHedgehog)
+ g2X, g2Y = vCircX[cUID], vCircY[cUID]
+ q = g1X - g2X
+ w = g1Y - g2Y
+ r = math.sqrt( (q*q) + (w*w) ) --alternate
+
+
+ opp = w
+ if opp < 0 then
+ opp = opp*-1
+ end
+
+ -- work out the angle (theta) to the target
+ t = math.deg ( math.asin(opp / r) )
+
+ -- based on the radius of the radar, calculate what x/y displacement should be
+ NR = 150 -- radius at which to draw circs
+ NX = math.cos( math.rad(t) ) * NR
+ NY = math.sin( math.rad(t) ) * NR
+
+ -- displace xy based on where this thing actually is
+ if q > 0 then
+ rCircX[cUID] = g1X - NX
+ else
+ rCircX[cUID] = g1X + NX
+ end
+
+ if w > 0 then
+ rCircY[cUID] = g1Y - NY
+ else
+ rCircY[cUID] = g1Y + NY
+ end
+
+end
function PlayerIsFine()
return (playerIsFine)
@@ -1213,6 +1312,10 @@
vCCount = vCCount +1
vCirc[i] = AddVisualGear(0,0,vgtCircle,0,true)
+ rCirc[i] = AddVisualGear(0,0,vgtCircle,0,true)
+ rCircX[i] = 0
+ rCircY[i] = 0
+
vCircDX[i] = 0
vCircDY[i] = 0
@@ -1240,6 +1343,9 @@
vCircCol[i] = 0xff00ffff
SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], vCircCol[i])
+
+ SetVisualGearValues(rCirc[i], 0, 0, 100, 255, 1, 10, 0, 40, 3, vCircCol[i])
+
end
pShield = AddVisualGear(0,0,vgtCircle,0,true)
@@ -1340,7 +1446,7 @@
elseif (vType[i] == "blueboss") then
PlaySound(sndHellishImpact3)
- AddCaption(loc("Boss defeated!") .. " +50 " .. loc("points") .. "!", 0x0050ffff,capgrpMessage)
+ AddCaption(loc("Boss defeated!") .. " +30 " .. loc("points") .. "!", 0x0050ffff,capgrpMessage)
morte = AddGear(vCircX[i], vCircY[i], gtExplosives, 0, 0, 0, 1)
SetHealth(morte, 0)
@@ -1431,7 +1537,7 @@
vCircRadMax[i] = 180*5
vCircWidth[i] = 1
vCounterLim[i] = 2000
- vCircScore[i] = 50
+ vCircScore[i] = 30
vCircHealth[i] = 3
else
--elseif r == 1 then
@@ -1464,6 +1570,11 @@
g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(vCirc[i])
SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], g3, g4, g5, g6, g7, vCircRadius[i], vCircWidth[i], vCircCol[i]-0x000000ff)
-- - -0x000000ff
+
+ g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(rCirc[i])
+ SetVisualGearValues(rCirc[i], 0, 0, g3, g4, g5, g6, g7, g8, g9, vCircCol[i]-0x000000ff)
+
+
vCircActive[i] = true -- new
--nw WriteLnToConsole("CIRC " .. i .. ": X: " .. vCircX[i] .. "; Y: " .. vCircY[i])
@@ -1565,7 +1676,9 @@
circsHit = circsHit + 1
if circsHit > 1 then
- AddCaption(loc("Multi-shot!") .. " +5 " .. loc("points") .. "!",0xffba00ff,capgrpAmmostate)
+ AddCaption(loc("Multi-shot!") .. " +15 " .. loc("points") .. "!",0xffba00ff,capgrpAmmostate)
+ AwardPoints(15)
+ circsHit = 0
end
shotsHit = shotsHit + 1
@@ -1638,6 +1751,8 @@
g1Y = g1Y - g2Y
dist = (g1X*g1X) + (g1Y*g1Y)
+ --DoHorribleThings(i, g1X, g1Y, g2X, g2Y, dist)
+
--nw WriteLnToConsole("Calcs done. Dist to CurrentHedgehog is " .. dist)
-- calculate my real radius if I am an aura
@@ -1688,7 +1803,6 @@
function HandleCircles()
-
--[[if CirclesAreGo == true then
--CheckDistances()
@@ -1702,8 +1816,27 @@
end]]
+
+ if rAlpha ~= 255 then
+
+ rPingTimer = rPingTimer + 1
+ if rPingTimer == 100 then
+ rPingTimer = 0
+
+ rAlpha = rAlpha + 5
+ if rAlpha >= 255 then
+ rAlpha = 255
+ end
+ end
+
+ end
+
for i = 0,(vCCount-1) do
+ --if (vCircActive[i] == true) then
+ SetVisualGearValues(rCirc[i], rCircX[i], rCircY[i], 100, 255, 1, 10, 0, 40, 3, vCircCol[i]-rAlpha)
+ --end
+
vCounter[i] = vCounter[i] + 1
if vCounter[i] >= vCounterLim[i] then
@@ -1853,6 +1986,11 @@
for i = 0,(vCCount-1) do
vCircX[i] = vCircX[i] + vCircDX[i]
vCircY[i] = vCircY[i] + vCircDY[i]
+
+ if (CurrentHedgehog ~= nil) and (rAlpha ~= 255) then
+ DoHorribleThings(i)--(i, g1X, g1Y, g2X, g2Y, dist)
+ end
+
end
if (TimeLeft == 0) and (tumbleStarted == true) then
@@ -1862,12 +2000,12 @@
FadeAlpha = 255
end
- --new
+ --new
--if FadeAlpha == 1 then
- -- AddCaption("GOT IT")
+ -- AddCaption("GOT IT")
-- for i = 0,(vCCount-1) do
-- g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(vCirc[i])
- -- vCircCol[i] = g10
+ -- vCircCol[i] = g10
-- end
--end
--- a/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua Sat Oct 08 16:54:56 2011 +0200
@@ -1,5 +1,5 @@
----------------------------------
--- THE SPECIALISTS MODE 0.5
+-- THE SPECIALISTS MODE 0.6
-- by mikade
----------------------------------
@@ -35,6 +35,11 @@
-- provision for variable minetimer / demo mines set to 5000ms
-- don't autoswitch if player only has 1 hog on his team
+----------------
+-- version 0.6
+----------------
+-- for the meanwhile, don't drop any crates except health crates
+
--------------------
--TO DO
--------------------
@@ -214,6 +219,7 @@
function onGameInit()
GameFlags = gfRandomOrder + gfResetWeps + gfInfAttack + gfPlaceHog
Delay = 10
+ HealthCaseProb = 100
end
function onGameStart()
@@ -253,42 +259,42 @@
if (CurrentHedgehog ~= nil) then
currName = GetHogName(CurrentHedgehog)
-
+
if (currName ~= lastName) and (switchStage > 100) then
AddCaption(loc("Switched to ") .. currName .. "!")
- AssignAmmo()
+ AssignAmmo()
end
- if (TurnTimeLeft > 0) and (TurnTimeLeft ~= TurnTime) and (switchStage < 100) then
-
- AddCaption(loc("Prepare yourself") .. ", " .. currName .. "!")
+ if (TurnTimeLeft > 0) and (TurnTimeLeft ~= TurnTime) and (switchStage < 100) then
+
+ AddCaption(loc("Prepare yourself") .. ", " .. currName .. "!")
hogCounter = 0
runOnHogsInTeam(CountHog, GetHogTeamName(CurrentHedgehog) )
if hogCounter > 1 then
- switchStage = switchStage + 1
-
+ switchStage = switchStage + 1
+
if switchStage == 1 then
AddAmmo(CurrentHedgehog, amSwitch, 1)
-
+
elseif switchStage == 2 then
ParseCommand("setweap " .. string.char(amSwitch))
elseif switchStage == 3 then
- SetGearMessage(CurrentHedgehog,gmAttack)
+ SetGearMessage(CurrentHedgehog,gmAttack)
elseif switchStage == 4 then
switchStage = 110
AddAmmo(CurrentHedgehog, amSwitch, 0)
end
-
+
else
switchStage = 110
end
- end
-
+ end
+
lastName = currName
end
@@ -301,12 +307,12 @@
hhs[numhhs] = gear
numhhs = numhhs + 1
elseif (GetGearType(gear) == gtMine) and (started == true) then
- SetTimer(gear,5000)
+ SetTimer(gear,5000)
end
-
+
if (GetGearType(gear) == gtHedgehog) or (GetGearType(gear) == gtResurrector) then
trackGear(gear)
- end
+ end
end
@@ -314,7 +320,7 @@
function onGearDelete(gear)
if (GetGearType(gear) == gtHedgehog) or (GetGearType(gear) == gtResurrector) then
trackDeletion(gear)
- end
+ end
end
function onAmmoStoreInit()
--- a/share/hedgewars/Data/Scripts/Multiplayer/Tumbler.lua Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Tumbler.lua Sat Oct 08 16:54:56 2011 +0200
@@ -1,6 +1,6 @@
------------------------------------
-- TUMBLER
--- v.0.7
+-- v.0.7.1
------------------------------------
loadfile(GetDataPath() .. "Scripts/Locale.lua")()
@@ -110,6 +110,12 @@
-- Performance tweaks
-- Variety of small gameplay changes
+------------------------
+-- version 0.7.1
+------------------------
+
+-- redraw HUD on screen resolution change
+
---------------------------
-- some other ideas/things
---------------------------
@@ -194,37 +200,37 @@
function HideTags()
- for i = 0, 3 do
+ for i = 0, 3 do
SetVisualGearValues(vTag[i],0,0,0,0,0,1,0, 0, 240000, 0xffffff00)
end
end
function DrawTag(i)
-
+
zoomL = 1.3
xOffset = 40
if i == 0 then
- yOffset = 40
+ yOffset = 40
tCol = 0xffba00ff --0xffed09ff --0xffba00ff
tValue = TimeLeft
elseif i == 1 then
- zoomL = 1.1
- yOffset = 70
+ zoomL = 1.1
+ yOffset = 70
tCol = wepCol[0]
tValue = wepAmmo[0]
elseif i == 2 then
- zoomL = 1.1
+ zoomL = 1.1
xOffset = 40 + 35
- yOffset = 70
+ yOffset = 70
tCol = wepCol[1]
tValue = wepAmmo[1]
elseif i == 3 then
- zoomL = 1.1
+ zoomL = 1.1
xOffset = 40 + 70
- yOffset = 70
+ yOffset = 70
tCol = wepCol[2]
tValue = wepAmmo[2]
end
@@ -232,7 +238,7 @@
DeleteVisualGear(vTag[i])
vTag[i] = AddVisualGear(0, 0, vgtHealthTag, 0, false)
g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(vTag[i])
- SetVisualGearValues (
+ SetVisualGearValues (
vTag[i], --id
-(ScreenWidth/2) + xOffset, --xoffset
ScreenHeight - yOffset, --yoffset
@@ -272,19 +278,19 @@
DeleteGear(gear)
AddCaption(wep[0] .. " " .. loc("ammo extended!"), wepCol[0], capgrpAmmoinfo )
DrawTag(1)
-
+
barrelsEaten = barrelsEaten + 1
if barrelsEaten == 5 then
AddCaption(loc("Achievement Unlocked") .. ": " .. loc("Barrel Eater!"),0xffba00ff,capgrpMessage2)
end
-
+
elseif (GetGearType(gear) == gtMine) then
wepAmmo[1] = wepAmmo[1] + 1
PlaySound(sndShotgunReload)
DeleteGear(gear)
AddCaption(wep[1] .. " " .. loc("ammo extended!"), wepCol[1], capgrpAmmoinfo )
DrawTag(2)
-
+
minesEaten = minesEaten + 1
if minesEaten == 5 then
AddCaption(loc("Achievement Unlocked") .. ": " .. loc("Mine Eater!"),0xffba00ff,capgrpMessage2)
@@ -308,7 +314,7 @@
if GetHealth(gear) > 0 then
AddCaption(loc("Tumbling Time Extended!"), 0xffba00ff, capgrpMessage2 )
-
+
TimeLeft = TimeLeft + HealthCaseAmount --5 --5s
DrawTag(0)
--PlaySound(sndShotgunReload)
@@ -436,31 +442,31 @@
mineSpawn = MinesNum
if mineSpawn > 4 then
- mineSpawn = 4
+ mineSpawn = 4
end
barrelSpawn = Explosives
if barrelSpawn > 4 then
- barrelSpawn = 4
+ barrelSpawn = 4
end
--MinesNum = 0
--Explosives = 0
- for i = 0, 3 do
- vTag[0] = AddVisualGear(0, 0, vgtHealthTag, 0, false)
+ for i = 0, 3 do
+ vTag[0] = AddVisualGear(0, 0, vgtHealthTag, 0, false)
end
HideTags()
wep[0] = loc("Barrel Launcher")
- wep[1] = loc("Mine Deployer")
+ wep[1] = loc("Mine Deployer")
wep[2] = loc("Flamer")
wepCol[0] = 0x78818eff
wepCol[1] = 0xa12a77ff
wepCol[2] = 0xf49318ff
-
+
wepCount = 3
end
@@ -493,6 +499,16 @@
end
+function onScreenResize()
+
+ -- redraw Tags so that their screen locations are updated
+ if (CurrentHedgehog ~= nil) and (tumbleStarted == true) then
+ for i = 0, 3 do
+ DrawTag(i)
+ end
+ end
+
+end
function onNewTurn()
@@ -528,7 +544,7 @@
--reset ammo counts
wepAmmo[0] = 2
- wepAmmo[1] = 1
+ wepAmmo[1] = 1
wepAmmo[2] = 50 -- 50000 -- 50
wepIndex = 2
ChangeWeapon()
@@ -563,7 +579,7 @@
SetHealth(CurrentHedgehog, GetHealth(CurrentHedgehog) + 47) -- new
for i = 0, 3 do
DrawTag(i)
- end
+ end
end
end
Binary file share/hedgewars/Data/Themes/Art/LandBackTex.png has changed
Binary file share/hedgewars/Data/Themes/Blox/LandBackTex.png has changed
--- a/share/hedgewars/Data/Themes/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Themes/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -5,6 +5,7 @@
Blox
Brick
Cake
+ Cave
Castle
Cheese
Christmas
Binary file share/hedgewars/Data/Themes/Cake/LandBackTex.png has changed
Binary file share/hedgewars/Data/Themes/Castle/LandBackTex.png has changed
Binary file share/hedgewars/Data/Themes/Cave/Border.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/Border.svg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.1 r9760"
+ width="128"
+ height="32"
+ version="1.0"
+ sodipodi:docname="Border.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="Border.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective9" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-height="824"
+ inkscape:window-width="1434"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="4.3515626"
+ inkscape:cx="55.91344"
+ inkscape:cy="46.958919"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="layer2"
+ inkscape:window-maximized="0"
+ borderlayer="true" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="main">
+ <path
+ style="fill:#727793;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999000000002;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;color:#000000"
+ d="M -2.59375,-1.96875 C -2.59375,-1.96875 -3.7460784,4.1342238 -2.59375,6.5 C -1.4414216,8.8657761 1.5584341,11.901014 4.5625,12.09375 C 7.5665658,12.286486 10.837582,4.0363139 13.875,4.0625 C 16.912418,4.0886863 18.928062,11.200773 21.875,11.375 C 24.821937,11.549227 28.399078,6.9222753 31.3125,6.96875 C 34.225922,7.0152249 37.85079,11.035782 41.21875,10.9375 C 44.586709,10.839219 44.047277,4.2333587 47.3125,4.28125 C 50.57772,4.3291416 55.852262,9.8771199 58.1875,9.9375 C 60.522739,9.99788 61.46392,7.8985345 64.3125,8.0625 C 67.161075,8.2264652 70.453946,10.710593 73.5625,10.53125 C 76.671055,10.351907 77.4329,3.0705724 80,2.5625 C 82.567104,2.0544274 88.175909,9.3244251 91.1875,9.0625 C 94.199093,8.8005746 95.328865,5.2437183 98.84375,5.71875 C 102.35863,6.1937815 102.50329,10.095946 105.93129,9.9063008 C 109.35928,9.7166558 108.63365,4.9181377 111.68758,4.4624542 C 114.74151,4.0067709 115.26237,5.5365773 117.90951,6.0203882 C 120.01052,6.6249959 122.26856,2.9387625 124.0016,3.5672695 C 124.77127,3.8744963 125.36087,6.4068273 125.40625,6.5 C 126.55858,8.8657761 129.55844,11.901014 132.5625,12.09375 C 135.19106,12.262394 138.01676,5.9652068 140.71875,4.40625 L 140.71875,-1.96875 L -2.59375,-1.96875 z"
+ id="rect2389"
+ sodipodi:nodetypes="csssssssssssssssccssccc" />
+ <path
+ sodipodi:nodetypes="csssssssssssssssccssccc"
+ id="path2418"
+ d="M 140.2066,33.708898 C 140.2066,33.708898 141.35893,27.605924 140.2066,25.240148 C 139.05428,22.874371 136.05442,19.839134 133.05035,19.646398 C 130.04629,19.453662 126.77527,27.703834 123.73785,27.677648 C 120.70044,27.651461 118.68479,20.539375 115.73785,20.365148 C 112.79092,20.190921 109.21378,24.817872 106.30035,24.771398 C 103.38693,24.724923 99.762064,20.704366 96.394104,20.802648 C 93.026145,20.900929 93.565577,27.506789 90.300354,27.458898 C 87.035134,27.411006 81.760592,21.863028 79.425354,21.802648 C 77.090115,21.742268 76.148934,23.841613 73.300354,23.677648 C 70.451779,23.513682 67.158908,21.029555 64.050354,21.208898 C 60.941799,21.388241 60.179954,28.669575 57.612854,29.177648 C 55.04575,29.68572 49.436945,22.415722 46.425354,22.677648 C 43.413761,22.939573 42.283989,26.496429 38.769104,26.021398 C 35.254224,25.546366 35.109564,21.644202 31.681564,21.833847 C 28.253574,22.023492 28.979204,26.82201 25.925274,27.277693 C 22.871344,27.733377 22.350484,26.20357 19.703344,25.719759 C 17.602334,25.115152 15.344294,28.801385 13.611254,28.172878 C 12.841584,27.865651 12.251984,25.33332 12.206604,25.240148 C 11.054274,22.874371 8.054414,19.839134 5.050354,19.646398 C 2.421794,19.477754 -0.40390596,25.774941 -3.105896,27.333898 L -3.105896,33.708898 L 140.2066,33.708898 z"
+ style="fill:#2f3140;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988000000006;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;color:#000000;stroke-dasharray:none" />
+ <path
+ style="fill:#626780;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999000000002;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;color:#000000"
+ d="M 139.90625 -1.96875 L 139.90625 3.9375 C 137.20426 5.4964568 134.37856 11.793644 131.75 11.625 C 130.99899 11.576816 130.25294 11.348622 129.53125 11 C 130.49405 11.602732 131.52212 12.027001 132.5625 12.09375 C 135.19106 12.262394 138.01676 5.9652068 140.71875 4.40625 L 140.71875 -1.96875 L 139.90625 -1.96875 z M 79.1875 2.09375 C 76.6204 2.6018224 75.858555 9.883157 72.75 10.0625 C 69.641446 10.241843 66.348575 7.7577152 63.5 7.59375 C 60.65142 7.4297845 59.710239 9.52913 57.375 9.46875 C 56.983702 9.4586326 56.50182 9.2978257 55.96875 9.03125 C 56.84265 9.5606122 57.60369 9.922405 58.1875 9.9375 C 60.522739 9.99788 61.46392 7.8985345 64.3125 8.0625 C 67.161075 8.2264652 70.453946 10.710593 73.5625 10.53125 C 76.671055 10.351907 77.4329 3.0705724 80 2.5625 C 80.448643 2.4737061 80.989401 2.6328831 81.59375 2.9375 C 80.659869 2.331478 79.829276 1.9667318 79.1875 2.09375 z M 122.875 3.03125 C 121.19125 2.9161437 119.06345 6.1293197 117.09375 5.5625 C 114.44661 5.0786891 113.92893 3.5443167 110.875 4 C 107.82107 4.4556835 108.55299 9.247855 105.125 9.4375 C 104.49456 9.4723773 103.98097 9.3513914 103.53125 9.15625 C 104.1531 9.6429793 104.89625 9.9638547 105.9375 9.90625 C 109.36549 9.716605 108.63357 4.9244335 111.6875 4.46875 C 114.74143 4.0130667 115.25911 5.5474391 117.90625 6.03125 C 119.86295 6.5943283 121.94683 3.4288796 123.625 3.5 C 123.49426 3.3129666 123.33374 3.1521231 123.1875 3.09375 C 123.07918 3.0544683 122.98725 3.0389238 122.875 3.03125 z M 13.0625 3.59375 C 10.025081 3.5675639 6.7540658 11.817736 3.75 11.625 C 2.9989835 11.576816 2.2529384 11.348622 1.53125 11 C 2.4940544 11.602732 3.5221169 12.027001 4.5625 12.09375 C 7.5665658 12.286486 10.837582 4.0363139 13.875 4.0625 C 14.12999 4.0646983 14.383256 4.1249722 14.625 4.21875 C 14.135258 3.839934 13.606587 3.5984407 13.0625 3.59375 z M 46.5 3.8125 C 43.234777 3.7646087 43.774209 10.37047 40.40625 10.46875 C 39.1639 10.505004 37.88866 9.9909291 36.625 9.3125 C 38.150245 10.194382 39.709547 10.981541 41.21875 10.9375 C 44.586709 10.839219 44.047277 4.2333587 47.3125 4.28125 C 48.076042 4.292449 48.954989 4.6215411 49.875 5.09375 C 48.662148 4.3816043 47.483494 3.8269252 46.5 3.8125 z M 97.40625 5.21875 C 94.374925 5.219063 93.198368 8.3481949 90.375 8.59375 C 89.850725 8.6393475 89.245697 8.4551528 88.59375 8.125 C 89.559676 8.739133 90.450179 9.1266265 91.1875 9.0625 C 94.199093 8.8005746 95.328865 5.2437183 98.84375 5.71875 C 99.272126 5.7766445 99.659698 5.8851569 100 6.03125 C 99.469976 5.6554717 98.83304 5.3583612 98.03125 5.25 C 97.81157 5.2203105 97.608338 5.2187291 97.40625 5.21875 z M 30.5 6.5 C 27.586578 6.4535253 24.009437 11.080477 21.0625 10.90625 C 20.888823 10.895982 20.730107 10.868092 20.5625 10.8125 C 20.984936 11.124989 21.414541 11.347777 21.875 11.375 C 24.821937 11.549227 28.399078 6.9222753 31.3125 6.96875 C 32.313154 6.9847124 33.401977 7.4993199 34.53125 8.125 C 33.108388 7.2895369 31.739811 6.5197775 30.5 6.5 z "
+ id="path3753" />
+ <path
+ style="fill:#45495f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988000000006;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;color:#000000;stroke-dasharray:none"
+ d="M 5.0625 19.65625 C 2.43394 19.487606 -0.39175996 25.784793 -3.09375 27.34375 L -3.09375 33.71875 L -2.28125 33.71875 L -2.28125 27.75 C 0.42074001 26.191043 3.24644 19.893856 5.875 20.0625 C 6.4382613 20.098638 6.980435 20.224649 7.53125 20.4375 C 6.7306193 20.014311 5.9043596 19.710262 5.0625 19.65625 z M 133.0625 19.65625 C 130.05844 19.463514 126.78742 27.713686 123.75 27.6875 C 123.57042 27.685952 123.39159 27.641936 123.21875 27.59375 C 123.64778 27.886143 124.09163 28.08969 124.5625 28.09375 C 127.59992 28.119936 130.87094 19.869764 133.875 20.0625 C 134.43826 20.098638 134.98043 20.224649 135.53125 20.4375 C 134.73062 20.014311 133.90436 19.710262 133.0625 19.65625 z M 115.1875 20.375 C 112.35564 20.739603 109.04384 24.824819 106.3125 24.78125 C 105.67112 24.771019 104.98126 24.559091 104.28125 24.25 C 105.27221 24.772041 106.2385 25.17336 107.125 25.1875 C 110.03843 25.233974 113.61557 20.607023 116.5625 20.78125 C 116.71331 20.790166 116.85381 20.800375 117 20.84375 C 116.59958 20.561171 116.18467 20.400698 115.75 20.375 C 115.56582 20.364111 115.37629 20.350693 115.1875 20.375 z M 96.40625 20.8125 C 93.038291 20.910781 93.577723 27.516641 90.3125 27.46875 C 89.737072 27.46031 89.0794 27.289934 88.40625 27 C 89.382273 27.516494 90.319308 27.863183 91.125 27.875 C 94.390223 27.922891 93.850791 21.31703 97.21875 21.21875 C 98.060741 21.19418 98.891028 21.417417 99.75 21.78125 C 98.623876 21.212565 97.511265 20.780254 96.40625 20.8125 z M 64.0625 21.21875 C 60.953945 21.398093 60.1921 28.679427 57.625 29.1875 C 57.266306 29.258491 56.837081 29.159706 56.375 28.96875 C 57.160939 29.434613 57.880417 29.704006 58.4375 29.59375 C 61.0046 29.085677 61.766445 21.804343 64.875 21.625 C 67.983554 21.445657 71.276425 23.929784 74.125 24.09375 C 76.97358 24.257715 77.914761 22.15837 80.25 22.21875 C 80.53427 22.2261 80.856295 22.318585 81.21875 22.46875 C 80.528177 22.084067 79.920431 21.824987 79.4375 21.8125 C 77.102261 21.75212 76.16108 23.851465 73.3125 23.6875 C 70.463925 23.523534 67.171054 21.039407 64.0625 21.21875 z M 31.6875 21.84375 C 28.25951 22.033395 28.99143 26.825567 25.9375 27.28125 C 24.410535 27.509092 23.499099 27.229718 22.65625 26.84375 C 23.802857 27.400639 24.736549 27.987932 26.75 27.6875 C 29.80393 27.231817 29.07201 22.439645 32.5 22.25 C 33.02152 22.221148 33.450789 22.272166 33.84375 22.40625 C 33.272655 22.021736 32.59592 21.793494 31.6875 21.84375 z M 46.4375 22.6875 C 43.425907 22.949425 42.296135 26.506281 38.78125 26.03125 C 38.428466 25.983572 38.104109 25.890375 37.8125 25.78125 C 38.300042 26.091645 38.888696 26.342213 39.59375 26.4375 C 43.108635 26.912531 44.238407 23.355675 47.25 23.09375 C 47.626449 23.061009 48.022152 23.13977 48.46875 23.3125 C 47.709622 22.890014 47.03582 22.635463 46.4375 22.6875 z M 19.3125 25.65625 C 17.507013 25.569412 15.61176 28.213244 14.0625 28.25 C 14.179089 28.403228 14.309222 28.542545 14.4375 28.59375 C 16.17054 29.222257 18.43024 25.520393 20.53125 26.125 C 21.193035 26.245953 21.718698 26.420665 22.1875 26.625 C 21.496959 26.284378 20.80222 25.916773 19.71875 25.71875 C 19.587437 25.680962 19.444873 25.662617 19.3125 25.65625 z "
+ id="path3758" />
+ </g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,6 @@
+file(GLOB images *.png)
+
+install(FILES
+ theme.cfg
+ ${images}
+ DESTINATION ${SHAREPATH}Data/Themes/Cave)
Binary file share/hedgewars/Data/Themes/Cave/Chunk.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/Chunk.svg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.1 r9760"
+ width="64"
+ height="64"
+ version="1.0"
+ sodipodi:docname="Chunk.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="Chunk.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ style="display:inline">
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5" />
+ <sodipodi:namedview
+ inkscape:window-height="824"
+ inkscape:window-width="1434"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="3.2821541"
+ inkscape:cx="38.186952"
+ inkscape:cy="-3.5465054"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="layer2"
+ inkscape:window-maximized="0"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-global="false"
+ borderlayer="true">
+ <sodipodi:guide
+ orientation="0,1"
+ position="792.81865,32"
+ id="guide3379" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="32,-130.98743"
+ id="guide3519" />
+ </sodipodi:namedview>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="main"
+ style="display:inline"
+ transform="translate(0,-448)">
+ <g
+ id="layer3"
+ inkscape:label="tmp"
+ style="display:inline"
+ transform="translate(552.95262,83.18474)" />
+ <g
+ transform="matrix(0.18941945,0,0,0.18941945,-14.061602,422.8167)"
+ id="g5276">
+ <path
+ sodipodi:nodetypes="ccscc"
+ id="path5280"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccssc"
+ id="path5282"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5284"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.17951347,-0.03074518,0.03862245,0.22550696,-53.192472,403.15821)"
+ id="g5446">
+ <path
+ sodipodi:nodetypes="csscs"
+ id="path5450"
+ d="m 243.63725,475.53826 c 12.9435,21.35883 64.26938,33.94433 84.97334,13.90422 11.50298,-11.13415 12.48793,-41.13512 6.78977,-55.3278 -5.3055,-13.21469 -49.32089,-37.72308 -53.89546,-8.29108 -1.33885,30.88373 -52.06321,26.28971 -37.86765,49.71466 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.16941404px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscsssc"
+ id="path5452"
+ d="m 329.27294,428.10418 c 3.97839,15.27871 -3.66772,38.85733 -15.72789,46.88936 -24.66247,16.42512 -54.10128,12.53437 -71.11036,-5.81693 0.26702,1.78905 0.58083,3.88932 1.94412,6.13897 12.9435,21.35884 63.21884,33.19232 83.9228,13.15221 11.50299,-11.13416 12.04853,-39.82718 6.35037,-54.01986 -0.77867,-1.93948 -3.17977,-4.12396 -5.37904,-6.34375 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.16941404px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscccc"
+ id="path5454"
+ d="m 297.03102,413.12219 c -7.71909,0.0194 -13.09698,2.68055 -14.66949,12.7978 -1.33885,30.88374 -52.93232,26.18608 -38.73676,49.61103 1.70396,2.8118 4.09184,5.48421 6.96875,7.9375 -12.94598,-22.73439 36.89168,-18.51323 38.21875,-49.125 3.62785,-23.34099 32.05306,-12.75253 46.3125,-0.78125 -4.08474,-8.68205 -23.66687,-20.47625 -38.09375,-20.44008 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.16941404px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.30640534,-0.0509375,0.0509375,0.30640534,-51.923411,330.05156)"
+ id="g5656">
+ <path
+ id="path5660"
+ d="m 97.237597,464.03444 c -6.583689,21.92585 29.889873,37.59204 47.670463,30.4465 11.84983,-12.7263 28.84862,-16.95632 42.81079,-26.43948 15.12676,-14.00658 -3.94987,-31.5007 -17.34866,-37.17032 -19.62084,-9.61397 -33.91006,12.78283 -50.94253,18.65341 -7.77355,4.20984 -15.53226,8.63248 -22.190063,14.50989 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cczcccc"
+ id="path5662"
+ d="m 183.28133,439.09413 c 2.57499,5.87507 -0.99651,12.53148 -7.21763,18.29191 -13.96217,9.48316 -28.32573,13.83891 -39.5809,22.34414 -11.25517,8.50524 -26.19024,4.37815 -36.981264,-4.17061 6.255224,15.43676 30.898314,24.02242 44.219874,18.5864 11.84984,-12.7263 28.85033,-17.38522 42.8125,-26.86838 10.43773,-9.66478 5.77747,-20.2282 -3.25258,-28.18346 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ id="path5664"
+ d="m 159.84383,429.60883 c -14.54811,0.5555 -26.24421,16.23015 -40.08309,21 -7.77355,4.20984 -14.56022,7.76083 -21.218024,13.63824 -2.918588,9.71986 1.33231,17.99824 9.957364,23.81581 -2.7158,-4.4121 -3.75617,-9.44267 -2.125,-14.875 6.6578,-5.87741 14.41395,-10.32142 22.1875,-14.53125 17.03247,-5.87058 29.05454,-28.70111 48.67538,-19.08713 3.13796,1.32781 7.457,4.07581 10.70551,6.50404 -4.6172,-6.57778 -11.27636,-11.90596 -17.78383,-14.65956 -3.67891,-1.80262 -6.95855,-1.93334 -10.31581,-1.80515 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <path
+ sodipodi:nodetypes="ccccccc"
+ inkscape:connector-curvature="0"
+ id="path4608"
+ d="m 55.793457,500.9665 c -0.143979,-0.15462 -6.768345,-12.42428 -6.768345,-12.42428 l -11.747013,-2.777 1.047192,12.44515 13.769244,7.52993 3.144342,-0.17798 z"
+ style="display:inline;color:#000000;fill:#a6c2df;fill-opacity:0.51263535000000005;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4610"
+ d="m 48.655723,488.65049 -10.858641,-2.50493 6.493917,10.42694 z"
+ style="display:inline;color:#000000;fill:#ffffff;fill-opacity:0.27797833999999999;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4612"
+ d="m 53.541204,497.89318 -4.506984,-9.14344 -3.296484,5.7159 2.108381,-2.65938 2.362351,8.38628 -5.418836,-3.1258 10.192872,7.43823 0.960956,-2.7135 -1.214269,-2.00261 -0.249768,1.38505 -0.518357,1.7068 -1.52498,-1.30927 -1.361663,-8.48525 z"
+ style="display:inline;color:#000000;fill:#ffffff;fill-opacity:0.71480144000000001;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ style="display:inline;color:#000000;fill:#ffffff;fill-opacity:0.71480144000000001;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;overflow:visible;enable-background:accumulate"
+ d="m 48.936328,488.64189 -7.71052,0.9085 -0.967533,-1.69115 1.579939,-0.67653 -3.573981,-0.69996 5.888384,8.69806 -1.670175,-3.73219 4.094398,-1.39608 -0.791368,3.88811 z"
+ id="path4615"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="display:inline;color:#000000;fill:#98b8da;fill-opacity:0.18411553999999999;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;overflow:visible;enable-background:accumulate"
+ d="m 43.819569,497.2395 -6.240563,-10.19991 0.982586,11.13138 z"
+ id="path4617"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4620"
+ d="m 54.38621,505.02933 -2.361496,0.59255 -13.12158,-7.37203 5.449535,-0.85039 z"
+ style="display:inline;color:#000000;fill:#6696c8;fill-opacity:0.19494586999999999;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;overflow:visible;enable-background:accumulate" />
+ <path
+ style="display:inline;color:#000000;fill:#ffffff;fill-opacity:0.71480144000000001;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;overflow:visible;enable-background:accumulate"
+ d="m 50.523396,505.19112 -1.56151,-4.0387 4.025973,2.70678 -8.533896,-6.4313 1.463421,1.42445 1.249192,4.07578 -6.348112,-3.63814 1.088208,-1.40012 -2.898377,0.44133 z"
+ id="path4622"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4625"
+ d="m 43.496901,496.97439 -3.952158,-0.31781 -0.684765,-5.678 1.186539,-0.11908 -2.520855,-4.29956 1.108513,11.26671 z"
+ style="display:inline;color:#000000;fill:#ffffff;fill-opacity:0.71480144000000001;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="ccccccccccccc"
+ inkscape:connector-curvature="0"
+ d="m 49.000722,488.58212 -4.793997,8.54504 -5.831727,1.05193 m -1.050142,-12.37049 6.890595,11.24957 10.08809,7.95222 m 1.109077,-3.73921 C 55.268639,501.11656 49.02511,488.54221 49.02511,488.54221 l -11.747003,-2.777 1.047192,12.44515 13.509586,7.11369 3.217376,0.0337 z"
+ style="display:inline;color:#000000;fill:none;stroke:#a5c3e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;overflow:visible;enable-background:accumulate"
+ id="path4627" />
+ </g>
+</svg>
Binary file share/hedgewars/Data/Themes/Cave/Crystal01.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/Crystal01.svg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,461 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.1 r9760"
+ width="165"
+ height="260"
+ version="1.0"
+ sodipodi:docname="Crystal01.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="Crystal01.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5" />
+ <sodipodi:namedview
+ inkscape:window-height="824"
+ inkscape:window-width="1434"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="2.8284271"
+ inkscape:cx="56.597117"
+ inkscape:cy="65.615904"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="layer2"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-global="false"
+ inkscape:window-maximized="0">
+ <sodipodi:guide
+ orientation="1,0"
+ position="134,-0.8125"
+ id="guide2693" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="11.75,2"
+ id="guide2695" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="173,15"
+ id="guide2701" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="21,22.75"
+ id="guide3852" />
+ </sodipodi:namedview>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="main"
+ style="display:inline">
+ <g
+ id="g3913"
+ transform="matrix(0.99309071,-0.11734926,0.11734926,0.99309071,-25.579298,9.397104)">
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path3144"
+ d="m 50.999997,264.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 101.18807,269.67873 z"
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3808"
+ d="M 19.758101,97.868268 78.85608,10.482759 101.09441,124.62132 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3765"
+ d="m 43.999999,220.25 -26.224871,-119.25305 59.706232,18.35338 -31.761315,-4.8332 36.21331,116.54881 18.892745,-99.8037 -23.299766,133.9308 -25.034815,-2.43546 -4.499441,-21.70912 12.879079,21.59631 14.378596,1.149 5.631446,-25.40982 -48.17554,-84.75836 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 17.758101,99.618268 79.60608,8.9827591 101.84441,125.62132 83.323607,51.946862 25.650105,93.611728 73.762449,116.01724 z"
+ id="path3842"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ d="M 16.926368,99.619347 105.25535,127.92179 152.45381,97.603801 M 79.955804,5.1022591 104.75,127.5 78.734507,267.76311 M 50.999997,264.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 101.93059,269.51473 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3762" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 17,99.000004 47.75,-18.749999 87,16.499999 M 79.5,4.5000067 65,81.000005 71,266.5"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.09025269;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3803" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 106.68934,123.53553 84.159381,12.604079 149.13478,96.082738 z"
+ id="path3806"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path3827"
+ d="M 81.234507,265.26311 100.96308,266.87902 149.25,101.5 106,130.75 z"
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 113.48338,224.5417 -15.223555,-38.05879 -10.444982,44.72126 17.666517,-99.60384 -0.9558,19.30911 17.6271,36.30165 20.53151,-66.15097 -16.57072,-2.68541 22.93224,-15.63272 z"
+ id="path3850"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3865"
+ d="M 109.18934,122.28553 138.83406,94.692743 95.448629,31.511489 89.576819,43.112678 83.409381,11.60408 148.38478,96.832738 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ </g>
+ <g
+ id="g3925"
+ transform="matrix(0.35812573,0.12426305,-0.14951633,0.42540169,123.17437,144.01309)">
+ <path
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 50.999997,264.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ id="path3927"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 19.758101,97.868268 78.85608,10.482759 101.09441,124.62132 z"
+ id="path3929"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 43.999999,220.25 17.775128,100.99695 77.48136,119.35033 45.720045,114.51713 85.59877,232.00255 103.69021,128.32807 83.703813,266.17475 l -31.212294,-3.41717 -4.499441,-21.70912 12.879079,21.59631 20.556075,2.13071 3.119382,-25.45492 -51.840955,-85.69497 z"
+ id="path3931"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3933"
+ d="M 17.758101,99.618268 79.60608,8.9827591 101.84441,125.62132 83.323607,51.946862 25.650105,93.611728 73.762449,116.01724 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ id="path3935"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:4.83754587;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 16.926368,99.619347 105.25535,127.92179 152.45381,97.603801 M 79.955804,5.1022591 104.75,127.5 84.999998,268 m -34.000001,-3.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
+ <path
+ id="path3937"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:4.83754587;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.09025269;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 17,99.000004 47.75,-18.749999 87,16.499999 M 79.5,4.5000067 65,81.000005 71,266.5"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3939"
+ d="M 106.68934,123.53553 84.159381,12.604079 149.13478,96.082738 z"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 87.499998,265.5 111.5,268.25 149.25,101.5 106,130.75 z"
+ id="path3941"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3943"
+ d="m 122.68414,225.50305 -21.47438,-38.41982 -7.725368,38.74914 11.996968,-94.23204 -0.9558,19.30911 22.59825,40.03581 17.10867,-70.20565 -18.11903,-2.36489 22.93224,-15.63272 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 109.18934,122.28553 138.83406,94.692743 95.448629,31.511489 89.576819,43.112678 83.409381,11.60408 148.38478,96.832738 z"
+ id="path3945"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.25422969,-0.09121302,0.07834536,0.28778697,-5.9840916,197.55067)"
+ id="g3947">
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path3949"
+ d="m 50.999997,264.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3951"
+ d="M 19.758101,97.868268 78.85608,10.482759 101.09441,124.62132 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3953"
+ d="M 43.999999,220.25 17.775128,100.99695 77.48136,119.35033 45.720045,114.51713 85.59877,232.00255 103.69021,128.32807 83.703813,266.17475 l -31.212294,-3.41717 -4.499441,-21.70912 12.879079,21.59631 20.556075,2.13071 3.119382,-25.45492 -51.840955,-85.69497 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 17.758101,99.618268 79.60608,8.9827591 101.84441,125.62132 83.323607,51.946862 25.650105,93.611728 73.762449,116.01724 z"
+ id="path3955"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ d="M 16.926368,99.619347 105.25535,127.92179 152.45381,97.603801 M 79.955804,5.1022591 104.75,127.5 84.999998,268 m -34.000001,-3.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:7.05740213;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3957" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 17,99.000004 47.75,-18.749999 87,16.499999 M 79.5,4.5000067 65,81.000005 71,266.5"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:7.05740213;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.09025269;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3959" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 106.68934,123.53553 84.159381,12.604079 149.13478,96.082738 z"
+ id="path3961"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path3963"
+ d="M 87.499998,265.5 111.5,268.25 149.25,101.5 106,130.75 z"
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 122.68414,225.50305 -21.47438,-38.41982 -7.725368,38.74914 11.996968,-94.23204 -0.9558,19.30911 22.59825,40.03581 17.10867,-70.20565 -18.11903,-2.36489 22.93224,-15.63272 z"
+ id="path3965"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3967"
+ d="M 109.18934,122.28553 138.83406,94.692743 95.448629,31.511489 89.576819,43.112678 83.409381,11.60408 148.38478,96.832738 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ </g>
+ <g
+ transform="matrix(0.24846027,0.06454771,-0.05057394,0.20812091,87.927552,211.70647)"
+ id="g3991">
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path3993"
+ d="m 50.999997,264.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3995"
+ d="M 19.758101,97.868268 78.85608,10.482759 101.09441,124.62132 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3997"
+ d="M 43.999999,220.25 17.775128,100.99695 77.48136,119.35033 45.720045,114.51713 85.59877,232.00255 103.69021,128.32807 83.703813,266.17475 l -31.212294,-3.41717 -4.499441,-21.70912 12.879079,21.59631 20.556075,2.13071 3.119382,-25.45492 -51.840955,-85.69497 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 17.758101,99.618268 79.60608,8.9827591 101.84441,125.62132 83.323607,51.946862 25.650105,93.611728 73.762449,116.01724 z"
+ id="path3999"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ d="M 16.926368,99.619347 105.25535,127.92179 152.45381,97.603801 M 79.955804,5.1022591 104.75,127.5 84.999998,268 m -34.000001,-3.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:8.5300293;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4001" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 17,99.000004 47.75,-18.749999 87,16.499999 M 79.5,4.5000067 65,81.000005 71,266.5"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:8.5300293;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.09025269;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4003" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 106.68934,123.53553 84.159381,12.604079 149.13478,96.082738 z"
+ id="path4005"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4007"
+ d="M 87.499998,265.5 111.5,268.25 149.25,101.5 106,130.75 z"
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 122.68414,225.50305 -21.47438,-38.41982 -7.725368,38.74914 11.996968,-94.23204 -0.9558,19.30911 22.59825,40.03581 17.10867,-70.20565 -18.11903,-2.36489 22.93224,-15.63272 z"
+ id="path4009"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4011"
+ d="M 109.18934,122.28553 138.83406,94.692743 95.448629,31.511489 89.576819,43.112678 83.409381,11.60408 148.38478,96.832738 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ </g>
+ <g
+ id="g4013"
+ transform="matrix(0.23525591,-0.10273057,0.08879905,0.19490194,14.27571,224.50321)">
+ <path
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 50.999997,264.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ id="path4015"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 19.758101,97.868268 78.85608,10.482759 101.09441,124.62132 z"
+ id="path4017"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 43.999999,220.25 17.775128,100.99695 77.48136,119.35033 45.720045,114.51713 85.59877,232.00255 103.69021,128.32807 83.703813,266.17475 l -31.212294,-3.41717 -4.499441,-21.70912 12.879079,21.59631 20.556075,2.13071 3.119382,-25.45492 -51.840955,-85.69497 z"
+ id="path4019"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4021"
+ d="M 17.758101,99.618268 79.60608,8.9827591 101.84441,125.62132 83.323607,51.946862 25.650105,93.611728 73.762449,116.01724 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ id="path4023"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:8.5300293;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 16.926368,99.619347 105.25535,127.92179 152.45381,97.603801 M 79.955804,5.1022591 104.75,127.5 84.999998,268 m -34.000001,-3.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
+ <path
+ id="path4025"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:8.5300293;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.09025269;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 17,99.000004 47.75,-18.749999 87,16.499999 M 79.5,4.5000067 65,81.000005 71,266.5"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4027"
+ d="M 106.68934,123.53553 84.159381,12.604079 149.13478,96.082738 z"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 87.499998,265.5 111.5,268.25 149.25,101.5 106,130.75 z"
+ id="path4029"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4031"
+ d="m 122.68414,225.50305 -21.47438,-38.41982 -7.725368,38.74914 11.996968,-94.23204 -0.9558,19.30911 22.59825,40.03581 17.10867,-70.20565 -18.11903,-2.36489 22.93224,-15.63272 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 109.18934,122.28553 138.83406,94.692743 95.448629,31.511489 89.576819,43.112678 83.409381,11.60408 148.38478,96.832738 z"
+ id="path4033"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g3969"
+ transform="matrix(0.36224638,4.3552761e-4,0.03288198,0.30216477,40.678026,187.1825)">
+ <path
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 50.999997,264.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ id="path3971"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 19.758101,97.868268 78.85608,10.482759 101.09441,124.62132 z"
+ id="path3973"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 43.999999,220.25 17.775128,100.99695 77.48136,119.35033 45.720045,114.51713 85.59877,232.00255 103.69021,128.32807 83.703813,266.17475 l -31.212294,-3.41717 -4.499441,-21.70912 12.879079,21.59631 20.556075,2.13071 3.119382,-25.45492 -51.840955,-85.69497 z"
+ id="path3975"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3977"
+ d="M 17.758101,99.618268 79.60608,8.9827591 101.84441,125.62132 83.323607,51.946862 25.650105,93.611728 73.762449,116.01724 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ id="path3979"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:6.04553127;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 16.926368,99.619347 105.25535,127.92179 152.45381,97.603801 M 79.955804,5.1022591 104.75,127.5 84.999998,268 m -34.000001,-3.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
+ <path
+ id="path3981"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:6.04553127;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.09025269;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 17,99.000004 47.75,-18.749999 87,16.499999 M 79.5,4.5000067 65,81.000005 71,266.5"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3983"
+ d="M 106.68934,123.53553 84.159381,12.604079 149.13478,96.082738 z"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 87.499998,265.5 111.5,268.25 149.25,101.5 106,130.75 z"
+ id="path3985"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3987"
+ d="m 122.68414,225.50305 -21.47438,-38.41982 -7.725368,38.74914 11.996968,-94.23204 -0.9558,19.30911 22.59825,40.03581 17.10867,-70.20565 -18.11903,-2.36489 22.93224,-15.63272 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 109.18934,122.28553 138.83406,94.692743 95.448629,31.511489 89.576819,43.112678 83.409381,11.60408 148.38478,96.832738 z"
+ id="path3989"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>
Binary file share/hedgewars/Data/Themes/Cave/Crystal02.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/Crystal02.svg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,411 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.1 r9760"
+ width="84"
+ height="132"
+ version="1.0"
+ sodipodi:docname="Crystal02.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="Crystal02.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5" />
+ <sodipodi:namedview
+ inkscape:window-height="824"
+ inkscape:window-width="1434"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="7.6"
+ inkscape:cx="37.699473"
+ inkscape:cy="21.181726"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="layer1"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-maximized="0"
+ inkscape:snap-global="false">
+ <sodipodi:guide
+ orientation="1,0"
+ position="16,-3.1168523"
+ id="guide2415" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="73,-8.4868421"
+ id="guide2417" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="113.02632,3"
+ id="guide3059" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="109.47368,8"
+ id="guide3061" />
+ </sodipodi:namedview>
+ <g
+ inkscape:groupmode="layer"
+ id="layer1"
+ inkscape:label="main"
+ style="display:inline"
+ transform="translate(0,-43)">
+ <g
+ id="layer3"
+ inkscape:label="tmp"
+ style="display:inline"
+ transform="translate(-6.2794864,-14.44835)" />
+ <g
+ style="display:inline"
+ id="g3969"
+ transform="matrix(0.19698415,0.07609454,-0.04538697,0.17127454,56.305723,125.20883)">
+ <path
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 50.999997,264.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ id="path3971"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 19.758101,97.868268 78.85608,10.482759 101.09441,124.62132 z"
+ id="path3973"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 43.999999,220.25 -26.224871,-119.25305 92.885202,26.27856 -69.805507,5.65917 41.793993,95.48948 22.733764,-84.55128 -21.678767,122.30187 -31.212294,-3.41717 -4.499441,-21.70912 12.879079,21.59631 20.556075,2.13071 2.133481,-12.01209 -49.081455,-76.44488 z"
+ id="path3975"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3977"
+ d="M 17.758101,99.618268 80.665954,25.85162 109.19596,122.73926 83.323607,51.946862 30.184737,95.570755 73.762449,116.01724 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ id="path3981"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:10.37062359;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.09025269;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 17,99.000004 47.75,-18.749999 87,16.499999 M 79.5,4.5000067 65,81.000005 71,266.5"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3983"
+ d="M 106.68934,123.53553 84.159381,12.604079 149.13478,96.082738 z"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 87.499998,265.5 111.5,268.25 149.25,101.5 106,130.75 z"
+ id="path3985"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3987"
+ d="m 122.68414,225.50305 -14.9757,-30.71422 -14.224048,31.04354 25.517658,-97.70493 -8.41578,54.14953 17.0148,6.65002 16.63141,-68.18739 -18.11903,-2.36489 22.93224,-15.63272 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 115.58522,121.34522 135.59857,98.144776 109.95736,84.325661 117.43646,117.39654 106.76983,80.833268 84.896154,9.857084 106.056,62.667086 151.51042,97.073739 z"
+ id="path3989"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path3979"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:10.37062359;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 16.926368,99.619347 115.33363,123.82829 152.45381,97.603801 M 79.955804,5.1022591 114.52531,123.5411 84.999998,268 m -34.000001,-3.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
+ </g>
+ <g
+ id="g3048"
+ transform="matrix(0.10024758,-0.08722347,0.07408418,0.08247954,4.5769237,161.85289)"
+ style="display:inline">
+ <path
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 50.999997,264.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ id="path3050"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 19.758101,97.868268 78.85608,10.482759 101.09441,124.62132 z"
+ id="path3052"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 43.999999,220.25 17.775128,100.99695 77.48136,119.35033 45.720045,114.51713 85.59877,232.00255 103.69021,128.32807 83.703813,266.17475 l -31.212294,-3.41717 -4.499441,-21.70912 12.879079,21.59631 20.556075,2.13071 3.119382,-25.45492 -51.840955,-85.69497 z"
+ id="path3054"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3056"
+ d="M 17.758101,99.618268 79.60608,8.9827591 101.84441,125.62132 83.323607,51.946862 25.650105,93.611728 73.762449,116.01724 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ id="path3058"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:16.47877312;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 16.926368,99.619347 105.25535,127.92179 152.45381,97.603801 M 79.955804,5.1022591 104.75,127.5 84.999998,268 m -34.000001,-3.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
+ <path
+ id="path3060"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:16.47877312;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.09025269;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 17,99.000004 47.75,-18.749999 87,16.499999 M 79.5,4.5000067 65,81.000005 71,266.5"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3062"
+ d="M 106.68934,123.53553 84.159381,12.604079 149.13478,96.082738 z"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 87.499998,265.5 111.5,268.25 149.25,101.5 106,130.75 z"
+ id="path3064"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3066"
+ d="m 122.68414,225.50305 -21.47438,-38.41982 -7.725368,38.74914 11.996968,-94.23204 -0.9558,19.30911 22.59825,40.03581 17.10867,-70.20565 -18.11903,-2.36489 22.93224,-15.63272 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 109.18934,122.28553 138.83406,94.692743 95.448629,31.511489 89.576819,43.112678 83.409381,11.60408 148.38478,96.832738 z"
+ id="path3068"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ style="display:inline"
+ id="g3913"
+ transform="matrix(0.46081107,0.0225293,-0.0225293,0.46081107,14.409333,41.005723)">
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path3144"
+ d="m 56.672144,289.6628 c 0,-2 -40.172145,-190.162789 -40.172145,-190.162789 L 79.999996,4.5000128 152.99999,97.500011 95.560766,294.99015 z"
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3808"
+ d="M 19.758101,97.868268 78.85608,10.482759 101.09441,124.62132 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3765"
+ d="m 43.999999,220.25 -26.224871,-119.25305 59.706232,18.35338 -31.761315,-4.8332 36.21331,116.54881 18.892745,-99.8037 -23.299766,133.9308 -25.034815,-2.43546 -4.499441,-21.70912 12.879079,21.59631 14.378596,1.149 5.631446,-25.40982 -48.17554,-84.75836 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="cccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 17.758101,99.618268 79.60608,8.9827591 101.84441,125.62132 77.691118,118.89877 94.052118,102.86337 83.323607,51.946862 67.461921,36.121651 z"
+ id="path3842"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ d="M 16.926368,99.619347 105.25535,127.92179 152.45381,97.603801 M 79.955804,5.1022591 104.75,127.5 72.380289,294.72532 m -20.621107,-6.43757 c 0,-2 -35.259183,-188.787739 -35.259183,-188.787739 L 79.999996,4.5000128 152.99999,97.500011 95.114437,295.28809 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:4.33499575;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3762" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 17,99.000004 47.75,-18.749999 87,16.499999 M 79.7764,4.9912575 65,81.000005 71,266.5"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:4.33499575;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.09025269;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3803"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 106.68934,123.53553 84.159381,12.604079 149.13478,96.082738 z"
+ id="path3806"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path3827"
+ d="M 81.234507,265.26311 100.96308,266.87902 149.25,101.5 106,130.75 z"
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 113.48338,224.5417 -15.223555,-38.05879 -10.444982,44.72126 17.666517,-99.60384 -0.9558,19.30911 17.6271,36.30165 20.53151,-66.15097 -16.57072,-2.68541 22.93224,-15.63272 z"
+ id="path3850"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3865"
+ d="M 109.18934,122.28553 138.83406,94.692743 95.448629,31.511489 89.576819,43.112678 83.409381,11.60408 148.38478,96.832738 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ </g>
+ <g
+ style="display:inline"
+ transform="matrix(0.14483936,0.03762794,-0.02948197,0.12132362,41.953914,142.54094)"
+ id="g3991">
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path3993"
+ d="m 50.999997,264.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3995"
+ d="M 19.758101,97.868268 78.85608,10.482759 101.09441,124.62132 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3997"
+ d="M 43.999999,220.25 17.775128,100.99695 77.48136,119.35033 45.720045,114.51713 85.59877,232.00255 103.69021,128.32807 83.703813,266.17475 l -31.212294,-3.41717 -4.499441,-21.70912 12.879079,21.59631 20.556075,2.13071 3.119382,-25.45492 -51.840955,-85.69497 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 17.758101,99.618268 79.60608,8.9827591 101.84441,125.62132 83.323607,51.946862 25.650105,93.611728 73.762449,116.01724 z"
+ id="path3999"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ d="M 16.926368,99.619347 105.25535,127.92179 152.45381,97.603801 M 79.955804,5.1022591 104.75,127.5 84.999998,268 m -34.000001,-3.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:14.63257885;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4001" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 17,99.000004 47.75,-18.749999 87,16.499999 M 79.5,4.5000067 65,81.000005 71,266.5"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:14.63257885;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.09025269;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4003" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 106.68934,123.53553 84.159381,12.604079 149.13478,96.082738 z"
+ id="path4005"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4007"
+ d="M 87.499998,265.5 111.5,268.25 149.25,101.5 106,130.75 z"
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 122.68414,225.50305 -21.47438,-38.41982 -7.725368,38.74914 11.996968,-94.23204 -0.9558,19.30911 22.59825,40.03581 17.10867,-70.20565 -18.11903,-2.36489 22.93224,-15.63272 z"
+ id="path4009"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4011"
+ d="M 109.18934,122.28553 138.83406,94.692743 95.448629,31.511489 89.576819,43.112678 83.409381,11.60408 148.38478,96.832738 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ </g>
+ <g
+ style="display:inline"
+ id="g3925"
+ transform="matrix(0.30855158,-0.07490646,0.08763321,0.36738086,-12.338863,96.004624)">
+ <path
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 50.999997,264.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ id="path3927"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 19.758101,97.868268 78.85608,10.482759 102.06297,137.44984 z"
+ id="path3929"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 28.173988,156.16756 -9.142836,-54.12407 7.673222,22.23799 62.763703,77.85868 14.222133,-73.81209 -19.986397,137.84668 -2.276581,-1.39927 7.305185,-56.43168 -47.737189,-23.89243 z"
+ id="path3931"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3933"
+ d="M 17.758101,99.618268 39.62789,65.382043 84.522932,58.117123 83.800395,33.752716 101.84441,125.62132 85.490305,69.735262 25.650105,93.611728 74.689301,121.93229 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccccc" />
+ <path
+ id="path3937"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:5.7754221;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.09025269;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 17,99.000004 64.663074,73.495728 151.75,96.750004 M 79.5,4.5000067 64.913074,74.245728 71,266.5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3939"
+ d="M 106.68934,123.53553 84.159381,12.604079 149.13478,96.082738 z"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 87.499998,265.5 111.5,268.25 149.25,101.5 106,130.75 z"
+ id="path3941"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3943"
+ d="m 112.72317,270.45954 8.66826,-48.70168 -17.9071,-34.21086 -9.999938,38.28537 12.165628,-88.47158 14.29681,-11.09534 -10.82841,18.8329 18.00539,45.8469 18.00775,-81.13765 -19.54504,15.36464 23.45917,-22.43025 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 150.03088,97.098485 108.58805,124.22952 92.954926,36.055456 109.09328,42.881606 83.409381,11.60408 106.27376,133.54991 z"
+ id="path3945"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path3935"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:5.7754221;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 16.926368,99.619347 105.304,139.04702 152.45381,97.603801 M 79.955804,5.1022591 105.26818,138.38414 84.999998,268 m -34.000001,-3.5 c 0,-2 -34.499998,-164.999989 -34.499998,-164.999989 L 79.999996,4.5000128 152.99999,97.500011 114.49999,271 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
+ </g>
+ </g>
+</svg>
Binary file share/hedgewars/Data/Themes/Cave/CrystalSpray01.png has changed
Binary file share/hedgewars/Data/Themes/Cave/CrystalSpray02.png has changed
Binary file share/hedgewars/Data/Themes/Cave/Flake.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/Flake.svg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2440"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ width="64"
+ height="64"
+ version="1.0"
+ sodipodi:docname="Flake.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/usr/share/games/hedgewars/Data/Themes/Olympics/Flake.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata2445">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs2443">
+ <filter
+ inkscape:collect="always"
+ id="filter3510">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="1.206159"
+ id="feGaussianBlur3512" />
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-height="1125"
+ inkscape:window-width="1600"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="2.0703125"
+ inkscape:cx="-100.45676"
+ inkscape:cy="46.336571"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="layer2" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="main"
+ style="display:inline">
+ <g
+ id="g3373"
+ style="opacity:0.33000003999999999;filter:url(#filter3510)"
+ transform="matrix(0.7488143,0,0,0.7488143,8.0404612,8.2318109)">
+ <path
+ sodipodi:nodetypes="ccccccccccc"
+ id="path2550"
+ d="M 19.926737,13.778107 C 14.10704,11.552508 6.6905586,17.551705 7.8353047,23.744995 C -2.0784822,28.138346 1.470417,38.597828 8.5510038,41.211688 C 6.6774867,50.188118 15.189369,52.235434 21.766446,50.467488 C 24.572652,56.727493 34.782679,59.772855 40.342412,52.134579 C 46.656073,54.409568 54.163622,50.348868 52.52462,44.686034 C 57.985673,45.172377 61.705462,40.299948 59.654841,34.807923 C 64.706836,30.993878 61.69305,22.942585 57.204283,20.642723 C 58.862993,16.170682 51.049879,10.914442 45.92901,13.99652 C 44.442865,9.2335917 40.008191,8.898709 35.357902,10.285558 C 33.158207,7.2992492 21.823885,8.0825791 19.926737,13.778107 z"
+ style="opacity:0.5427729;fill:#d7d5c5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.78921092px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccccccccccc"
+ id="path3339"
+ d="M 54.543523,15.714362 C 55.316048,18.559006 55.448566,21.185809 52.849948,23.147658 C 54.305224,28.639682 50.477528,33.523589 45.719667,33.037249 C 46.64214,37.930898 40.084059,44.77591 34.516709,43.302077 C 31.153832,48.451036 18.264516,44.522411 14.958499,38.828756 C 10.650841,39.986673 5.5388676,39.481931 3.0326305,36.491832 C 4.2401919,38.59134 6.1936702,40.328262 8.5538658,41.199548 C 6.6803492,50.175979 15.561944,51.462215 22.139022,49.69427 C 24.945226,55.954274 34.430707,58.730354 39.990441,51.092079 C 46.304101,53.367067 53.076229,49.17298 51.437226,43.510144 C 56.89828,43.99649 60.496214,40.290434 58.445594,34.798409 C 63.49759,30.984363 60.717295,23.464746 56.228527,21.164884 C 56.928295,19.278242 56.301982,17.195184 54.543523,15.714362 z"
+ style="opacity:0.5427729;fill:#8b8660;fill-opacity:0.19018405;fill-rule:evenodd;stroke:none;stroke-width:0.78921092px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#c3c1a8;stroke-width:0.82532275;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 20.303482,47.326539 C 22.655473,57.487302 37.359355,61.65977 41.866333,48.862758 M 40.342412,52.134579 C 46.656073,54.409568 54.895104,50.087123 51.915052,42.91925 M 52.585578,44.816906 C 58.046631,45.303248 61.705462,40.299948 59.654841,34.807923 M 59.654841,34.807923 C 64.706836,30.993878 61.69305,22.942585 57.204283,20.642723 M 56.838542,21.820578 C 59.10682,14.913302 49.708829,10.271013 44.58796,14.716321 M 45.807096,13.669337 C 43.71436,7.7126022 37.642389,9.2485508 33.346327,11.332542 M 35.053118,10.481867 C 32.853422,7.4955584 21.823885,8.0825791 19.926737,13.778107 M 24.010844,15.217709 C 15.287249,10.370682 4.8788608,17.493671 8.2620024,27.605743 M 8.5510038,41.211688 C 6.6774867,50.188118 14.640757,52.169997 21.217835,50.402051 M 7.408607,24.072177 C -1.8956117,28.26922 1.1046762,39.448502 10.196838,41.866052"
+ id="path3351"
+ sodipodi:nodetypes="cccccccccccccccccccc" />
+ </g>
+ </g>
+</svg>
Binary file share/hedgewars/Data/Themes/Cave/Girder.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/Girder.svg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg4233"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.1 r9760"
+ width="321"
+ height="25"
+ version="1.0"
+ sodipodi:docname="Girder.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="Girder.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata4238">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs4236" />
+ <sodipodi:namedview
+ inkscape:window-height="824"
+ inkscape:window-width="1434"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="1.2269735"
+ inkscape:cx="118.16047"
+ inkscape:cy="93.99375"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="layer1"
+ borderlayer="true"
+ inkscape:window-maximized="0" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer1"
+ inkscape:label="main">
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 289.28125,1.3760994 c -2.357,0.02612 -4.58418,0.1026466 -6.40625,0.062171 -0.31859,-0.00734 -0.68929,-0.015318 -1.09375,0 -6.06692,0.2297652 -21.18371,2.8447108 -26.96875,2.797678 C 246.82712,4.1710266 228.56542,3.9624009 219.375,3.9872662 197.09922,4.0475341 181.85273,5.1197885 159.21875,5.4482761 150.9881,5.5677278 148.03662,4.5313844 141.40625,4.3913753 116.99827,3.8759679 99.06519,3.0407316 97.25,2.9614506 90.23717,2.6551563 87.43138,4.5627543 78.84375,4.0183514 70.256114,3.4739515 40.257036,6.2426656 29.875,5.4482761 19.250046,4.6353004 7.083165,4.0508353 -2.96875,2.5573415 -8.84196,1.6847077 -18.338826,2.1143403 -24.53125,1.5626113 L -28.0625,23.975126 c 11.965668,0.238419 13.624444,-0.61742 26.40625,-1.025815 6.56891,-0.209886 24.221186,0.07867 30.78125,-0.155427 7.02249,-0.250607 15.78201,-1.387551 22.8125,-1.616436 8.79584,-0.286361 16.083398,-0.525114 24.78125,-1.025816 7.963849,-0.458446 20.56495,0.850532 28.4375,0.248683 4.27551,-0.326861 24.74823,-1.936294 35.0625,-3.295045 14.32262,-1.886788 13.74314,1.544982 47.875,3.512642 20.87852,1.20362 28.83989,-1.361324 51.3125,0.248682 10.49187,0.751669 26.54958,2.143993 35.6875,0.963645 5.43879,-0.70253 10.45519,1.633863 17.84375,2.144887 11.96567,0.238419 13.62444,-0.61742 26.40625,-1.025815 6.56891,-0.209886 24.22118,0.07867 30.78125,-0.155427 0.82747,-0.02953 1.69247,-0.07314 2.5625,-0.124342 l 0,-17.12801 C 352.04,5.5184715 351.42024,5.4899953 350.875,5.4482761 340.25005,4.6353004 328.08317,4.0508353 318.03125,2.5573415 312.15804,1.6847077 302.66577,2.0606246 296.46875,1.5626113 c -2.3437,-0.1883473 -4.8305,-0.2126326 -7.1875,-0.1865119 z"
+ id="path3039"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M -31.71875 1.375 C -34.07575 1.40112 -36.30293 1.4779756 -38.125 1.4375 C -38.44359 1.43016 -38.81429 1.422182 -39.21875 1.4375 C -40.828795 1.4984753 -43.115046 1.72711 -45.65625 2.03125 L -45.65625 8.40625 C -45.428094 8.6688406 -45.16024 8.9296261 -44.75 9.125 C -42.52672 10.061803 -43.48905 11.194415 -43.125 12.28125 C -43.34974 13.221112 -40.92274 12.981621 -40.28125 12.34375 C -38.69778 11.575679 -37.63058 10.673233 -37.28125 9.71875 C -37.68909 8.737217 -36.04889 7.914415 -35.875 6.96875 C -34.18518 8.198922 -33.38495 9.5613093 -33.3125 10.90625 C -33.05426 11.766089 -33.3553 12.943087 -31.84375 13.59375 C -30.18252 12.55699 -29.60008 11.342526 -28.25 10.25 C -27.00363 9.3858093 -25.96793 8.464958 -25.1875 7.53125 C -24.26511 6.162218 -21.64883 7.694839 -19.5625 7.9375 C -16.61432 7.90604 -14.93312 8.719477 -14.90625 9.71875 C -14.54644 10.955828 -13.8294 12.162811 -12.96875 13.375 C -13.19057 14.127714 -12.02484 13.594726 -11.84375 13.21875 C -10.44563 12.342805 -10.25753 11.379547 -10.125 10.375 C -10.1498 9.4805523 -8.82983 8.711829 -8.0625 7.875 C -5.4489 7.488665 -1.81134 8.737258 -0.6875 9.65625 C 0.24279 10.58805 0.41982 9.419343 0.4375 9.0625 C 1.84786 8.536253 3.68082 10.011718 3.78125 10.5625 C 4.78252 11.484846 4.1145 12.486956 4.5625 13.4375 C 6.12153 13.44792 7.6536 11.905408 7.6875 11.1875 C 8.9649842 10.133214 7.9984158 7.2632434 11.40625 9.46875 C 9.7967357 7.3331983 16.434422 7.3660474 15.9375 8.5 C 16.01349 8.790168 17.03622 10.561659 17.0625 9.5625 C 17.804587 9.976612 17.94737 11.001662 19.125 11.5625 C 21.348281 12.499303 20.385953 13.631915 20.75 14.71875 C 20.525258 15.658612 22.952258 15.419121 23.59375 14.78125 C 25.177218 14.013179 26.213169 13.141983 26.5625 12.1875 C 26.154663 11.205967 27.794865 10.351915 27.96875 9.40625 C 29.658576 10.636422 30.490051 11.998809 30.5625 13.34375 C 30.820745 14.203589 30.5197 15.380587 32.03125 16.03125 C 33.692487 14.99449 34.243666 13.780026 35.59375 12.6875 C 36.840114 11.823309 37.87582 10.933708 38.65625 10 C 39.578647 8.630968 42.226167 10.132339 44.3125 10.375 C 47.260679 10.34354 48.910625 11.156977 48.9375 12.15625 C 49.297308 13.393328 50.045597 14.600311 50.90625 15.8125 C 50.68443 16.565214 51.850163 16.032226 52.03125 15.65625 C 53.42937 14.780305 53.617474 13.848297 53.75 12.84375 C 53.7252 11.949302 55.045176 11.149329 55.8125 10.3125 C 58.4261 9.926165 62.063666 11.174758 63.1875 12.09375 C 64.117795 13.02555 64.294818 11.856843 64.3125 11.5 C 65.722854 10.973753 67.555828 12.480468 67.65625 13.03125 C 68.65752 13.953596 67.958246 14.924456 68.40625 15.875 C 69.965279 15.88542 71.528602 14.342908 71.5625 13.625 C 71.82323 12.771636 72.320576 11.103957 75.75 11.78125 C 77.108225 12.044105 80.50494 10.597708 81 9.375 C 81.9232 9.155515 83.90159 10.11139 84.28125 10.53125 C 85.58686 11.253577 84.2694 12.746918 86.09375 13.1875 C 87.53817 12.200492 88.40415 11.092474 88.5 9.96875 C 89.1784 9.936 90.67247 9.559978 91.78125 9.59375 C 94.29734 10.733274 94.38295 9.4659045 97.09375 10.1875 C 100.07921 10.632165 98.547732 13.03492 101.34375 13.3125 C 103.13588 13.940968 109.93456 9.60255 111.71875 9.75 C 114.70425 10.359279 114.35875 11.678601 115.125 12.6875 C 115.56282 13.510773 115.7707 12.800554 116.375 12.375 C 116.70512 11.403449 118.37905 10.677406 119.9375 11.03125 C 122.16867 11.795427 124.61829 12.135438 127.09375 12.03125 C 127.51544 11.909739 130.21835 12.415221 129.6875 13.28125 C 130.67634 12.1384 130.13671 9.8584807 130.71875 11.28125 C 130.76695 12.249155 130.10479 11.567731 131.75 12.375 C 134.26968 11.188591 134.0464 9.601785 135.21875 8.21875 C 136.4711 7.335642 136.27303 9.476542 136.4375 8.5 C 136.91373 7.414915 137.88316 10.548687 137.90625 9.4375 C 138.63904 8.487468 137.48898 7.329114 139.1875 6.5 C 142.34574 5.754759 144.63689 7.256214 144.125 8.21875 C 144.201 8.508918 145.19247 10.28041 145.21875 9.28125 C 145.96084 9.695362 145.91612 6.532912 147.09375 7.09375 C 149.31703 8.030553 148.3547 9.1631654 148.71875 10.25 C 148.49401 11.189862 150.92101 10.950371 151.5625 10.3125 C 153.14597 9.5444294 154.18192 8.641983 154.53125 7.6875 C 154.12341 6.705967 155.76361 8.6331647 155.9375 7.6875 C 157.62732 8.917672 158.42755 7.498809 158.5 8.84375 C 158.75824 9.703589 158.4572 10.880587 159.96875 11.53125 C 161.62998 10.49449 162.21242 9.280026 163.5625 8.1875 C 164.80887 7.323309 165.84457 9.1837077 166.625 8.25 C 167.54739 6.880968 170.19492 8.413589 172.28125 8.65625 C 175.22943 8.62479 176.87938 6.688227 176.90625 7.6875 C 177.26606 8.924578 178.01435 10.131561 178.875 11.34375 C 178.65318 12.096464 179.78766 11.563476 179.96875 11.1875 C 181.36687 10.311555 181.58622 9.348297 181.71875 8.34375 C 181.69395 7.449302 183.01392 6.680579 183.78125 5.84375 C 186.39485 5.457415 190.00116 6.706008 191.125 7.625 C 192.05529 8.5568 192.26357 7.388093 192.28125 7.03125 C 193.69161 6.505003 195.49332 7.980468 195.59375 8.53125 C 196.59502 9.453596 195.927 10.455706 196.375 11.40625 C 197.93403 11.41667 199.49735 9.874158 199.53125 9.15625 C 199.79198 8.302886 200.28933 6.635207 203.71875 7.3125 C 205.07697 7.575355 208.16119 9.285208 208.65625 8.0625 C 209.57945 7.843015 211.58909 8.79889 211.96875 9.21875 C 213.27436 9.941077 211.92565 11.403168 213.75 11.84375 C 215.19442 10.856742 216.09165 9.748724 216.1875 8.625 C 216.8659 8.59225 218.35997 8.247478 219.46875 8.28125 C 221.98484 9.420774 222.63295 7.309655 225.34375 8.03125 C 228.32921 8.475915 231.23523 8.003673 234.03125 8.28125 C 235.82338 8.909718 237.62206 8.29001 239.40625 8.4375 C 242.39175 9.046779 242.04625 10.366101 242.8125 11.375 C 243.25032 12.198273 243.42695 11.4568 244.03125 11.03125 C 244.36137 10.059699 246.06655 9.364906 247.625 9.71875 C 249.85617 10.482927 252.30579 10.791688 254.78125 10.6875 C 255.23105 10.557888 258.27023 11.152693 257.21875 12.125 C 257.43929 12.10937 257.64392 11.863091 257.84375 11.4375 C 258.88407 12.442411 260.21005 13.476186 260.34375 14.53125 C 260.39195 15.499155 259.01104 16.786481 260.65625 17.59375 C 263.17593 16.407341 262.95265 14.789285 264.125 13.40625 C 265.37735 12.523142 265.46053 11.507792 265.625 10.53125 C 266.10123 9.4461653 266.85191 8.392437 266.875 7.28125 C 267.60779 6.331218 266.45773 5.172864 268.15625 4.34375 C 271.31449 3.598509 273.60564 5.099964 273.09375 6.0625 C 273.16975 6.352668 274.16122 8.124159 274.1875 7.125 C 274.92959 7.539112 275.07237 8.564162 276.25 9.125 C 278.47328 10.061803 277.51095 11.194415 277.875 12.28125 C 277.65026 13.221112 280.07726 12.981621 280.71875 12.34375 C 282.30222 11.575679 283.36942 10.673233 283.71875 9.71875 C 283.31091 8.737217 284.95111 7.914415 285.125 6.96875 C 286.81482 8.198922 287.61505 9.5613093 287.6875 10.90625 C 287.94574 11.766089 287.6447 12.943087 289.15625 13.59375 C 290.81748 12.55699 291.39992 11.342526 292.75 10.25 C 293.99637 9.3858093 295.03207 8.464958 295.8125 7.53125 C 296.73489 6.162218 299.35117 7.694839 301.4375 7.9375 C 304.38568 7.90604 306.06688 8.719477 306.09375 9.71875 C 306.45356 10.955828 307.1706 12.162811 308.03125 13.375 C 307.80943 14.127714 308.97516 13.594726 309.15625 13.21875 C 310.55437 12.342805 310.74247 11.379547 310.875 10.375 C 310.8502 9.4805523 312.17017 8.711829 312.9375 7.875 C 315.5511 7.488665 319.18866 8.737258 320.3125 9.65625 C 321.24279 10.58805 321.41982 9.419343 321.4375 9.0625 C 322.84786 8.536253 324.68082 10.011718 324.78125 10.5625 C 325.78252 11.484846 325.1145 12.486956 325.5625 13.4375 C 327.12153 13.44792 328.6536 11.905408 328.6875 11.1875 C 328.94823 10.334136 329.47683 8.666457 332.90625 9.34375 C 334.26447 9.606605 337.34869 11.316458 337.84375 10.09375 C 338.76695 9.8742653 340.77659 10.83014 341.15625 11.25 C 342.46186 11.972327 341.11315 13.434418 342.9375 13.875 C 344.38192 12.887992 345.27915 11.811224 345.375 10.6875 C 346.0534 10.65475 347.51622 10.278728 348.625 10.3125 C 350.4546 11.141118 351.31299 10.27 352.6875 10 L 352.6875 5.53125 C 352.04 5.5081895 351.42024 5.4792192 350.875 5.4375 C 340.25005 4.6245243 328.08317 4.0559938 318.03125 2.5625 C 312.15804 1.6898662 302.66577 2.0605133 296.46875 1.5625 C 294.12505 1.3741527 291.63825 1.3488793 289.28125 1.375 C 286.92425 1.40112 284.69707 1.4779756 282.875 1.4375 C 282.55641 1.43016 282.18571 1.422182 281.78125 1.4375 C 275.71433 1.6672652 260.59754 4.2970328 254.8125 4.25 C 246.82712 4.1850782 228.56542 3.9751347 219.375 4 C 197.09922 4.0602679 181.85273 5.1090124 159.21875 5.4375 C 150.9881 5.5569517 148.03662 4.5462591 141.40625 4.40625 C 116.99827 3.8908426 99.06519 3.048031 97.25 2.96875 C 90.23717 2.6624557 87.43138 4.5756529 78.84375 4.03125 C 70.256114 3.4868501 40.257036 6.2318895 29.875 5.4375 C 23.836438 4.9754553 17.301121 4.5811446 10.9375 4.0625 C 6.1065099 3.6685558 1.3684897 3.2069182 -2.96875 2.5625 C -8.84196 1.6898662 -18.33423 2.0605133 -24.53125 1.5625 C -26.87495 1.3741527 -29.36175 1.3488793 -31.71875 1.375 z "
+ id="path3053" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;stroke:none;stroke-width:1.99999976;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 160.8125,9.40625 c -0.0499,0.00355 -0.13541,0.030335 -0.21875,0.15625 -0.65707,1.076268 -1.64892,2.525881 -3.75,3.5 -1.57775,0.668984 -1.66805,1.967823 -5.9375,1.59375 -3.00101,-0.547138 -2.04635,-1.727522 -3.1875,-2.5625 -0.002,0.0055 -0.0296,-0.0058 -0.0312,0 -0.16539,0.581939 -0.81782,2.327784 -2.09375,1.6875 -2.08338,-0.911408 -3.70608,-3.8599571 -7.625,-4.34375 -1.38683,-0.067599 -2.0559,1.777297 -2.84375,1.96875 l -1.40625,4.1875 c -0.4559,0.03567 -0.93372,0.07811 -1.65625,0.1875 -4.49795,0.169374 -3.21903,-1.073591 -4.15625,-1.65625 -0.62529,0.537488 -1.58041,1.31834 -4.5,1.59375 -2.12286,0.08335 -2.76521,-0.793725 -5.3125,-0.75 -5.1554,-0.422268 -10.06119,0.238956 -14.96875,0.5 -4.012699,0.1887 -3.32701,-1.980625 -4,-2.3125 -0.60406,1.006027 -1.55267,1.966129 -2.3125,2.375 -1.20057,0.755992 -3.213956,1.017304 -6.71875,1.125 -3.338788,-0.08279 -5.942834,0.943836 -9.1875,0.46875 -1.831549,-0.537041 0.833254,-1.261199 0.5625,-1.90625 0.187976,-0.623827 1.541803,-1.904554 1.03125,-2.15625 -0.648264,0.656699 -1.459137,2.452156 -4.28125,2.71875 -1.924076,0.730243 -7.151191,0.148339 -9,0.875 -1.47661,0.622627 -4.507036,0.277529 -4.65625,-0.34375 0.737877,-1.258459 0.03693,-3.541148 -0.5,-4.1875 -1.140376,0.700333 -0.979812,2.084314 -2.09375,2.78125 -1.037373,0.80089 -2.409217,1.967751 -6.1875,2.03125 -2.417752,0.01812 -5.590033,-0.776005 -6.15625,0.25 -0.399004,0.656716 -1.823287,2.495852 -4.875,1.28125 C 43.192099,17.682175 44.749284,16.823751 44.625,16 c 0.241148,-0.800105 2.858772,-2.433535 1.15625,-3.21875 -0.835894,0.620667 -3.084181,2.013702 -3.625,2.625 -1.29257,0.843019 -2.17036,1.762564 -5.40625,2.15625 -2.758144,-0.286855 -0.03084,-1.47306 -0.5625,-2.125 0.169274,-1.076275 -0.562502,-2.445495 -0.9375,-3.15625 -0.512928,0.38699 -1.26376,1.368956 -1.96875,1.59375 -1.791015,0.780581 -1.39448,1.025981 -3.125,1.8125 -1.085588,0.799507 -3.093088,1.437205 -5.21875,2.0625 -1.24718,0.52433 -4.709159,0.593388 -3.46875,-0.25 0.450965,-1.426994 0.874783,-2.853865 1.3125,-4.28125 C 21.637907,12.612307 22.456493,11.118038 21,11.03125 c -0.890201,0.993803 -0.864527,1.992684 -1.53125,3 -0.65707,1.076268 -1.680172,2.525881 -3.78125,3.5 C 14.109742,18.200234 14.019453,19.499073 9.75,19.125 6.7304311,18.574478 7.7056658,17.367089 6.53125,16.53125 6.7935756,15.598012 6.7300839,14.649432 5,13.78125 2.9166255,12.869842 1.2939247,9.9212929 -2.625,9.4375 c -0.086677,-0.00423 -0.1686138,-0.00986 -0.25,0 -1.2207933,0.1478925 -1.8551414,1.789263 -2.59375,1.96875 l -4,11.90625 c 2.1336457,-0.133315 4.6311479,-0.273352 7.8125,-0.375 6.56891,-0.209886 24.221186,0.07785 30.78125,-0.15625 7.02249,-0.250607 15.78201,-1.364865 22.8125,-1.59375 8.79584,-0.286361 16.083398,-0.530548 24.78125,-1.03125 7.963849,-0.458446 20.56495,0.851849 28.4375,0.25 4.27551,-0.326861 24.74823,-1.953749 35.0625,-3.3125 14.32262,-1.886788 13.74314,1.56359 47.875,3.53125 20.87852,1.20362 28.83989,-1.360006 51.3125,0.25 10.49187,0.751669 26.54958,2.149098 35.6875,0.96875 5.43879,-0.70253 10.45519,1.613976 17.84375,2.125 8.86477,0.176633 12.31667,-0.283403 18.59375,-0.6875 l 0,0.03125 c 2.13365,-0.133315 4.63115,-0.273352 7.8125,-0.375 6.56891,-0.209886 24.22119,0.07785 30.78125,-0.15625 0.89723,-0.03202 1.83454,-0.06843 2.78125,-0.125 l 0,-8.03125 c -0.43045,0.310529 -0.72312,0.595783 -1.75,1.0625 -1.08559,0.799507 -3.09309,1.437205 -5.21875,2.0625 -1.24718,0.52433 -4.70916,0.593388 -3.46875,-0.25 0.45096,-1.426994 0.87478,-2.853865 1.3125,-4.28125 -1.14334,-0.606443 -0.32476,-2.100712 -1.78125,-2.1875 -0.8902,0.993803 -0.86453,1.992684 -1.53125,3 -0.65707,1.076268 -1.68017,2.525881 -3.78125,3.5 -1.57776,0.668984 -1.66805,1.967823 -5.9375,1.59375 -3.01957,-0.550522 -2.04433,-1.757911 -3.21875,-2.59375 0.26233,-0.933238 0.19883,-1.881818 -1.53125,-2.75 -2.08337,-0.911408 -3.70608,-3.8599571 -7.625,-4.34375 -1.72974,-0.1133508 -2.39348,1.138087 -2.84375,1.96875 l -2.35783,4.16999 c -1.04321,1.845003 -3.70882,0.639468 -4.82967,1.08001 -1.47661,0.622627 -4.50703,0.277529 -4.65625,-0.34375 0.73788,-1.258459 0.0369,-3.541148 -0.5,-4.1875 -1.14037,0.700333 -0.97981,2.084314 -2.09375,2.78125 -1.03738,0.80089 -2.37797,1.967751 -6.15625,2.03125 -2.41775,0.01812 -5.62128,-0.776005 -6.1875,0.25 -0.399,0.656716 -1.82329,2.495852 -4.875,1.28125 -1.5579,-0.786575 -7.2e-4,-1.644999 -0.125,-2.46875 0.24114,-0.800105 2.85877,-2.433535 1.15625,-3.21875 -0.8359,0.620667 -3.05293,2.013702 -3.59375,2.625 -1.131,0.737642 -1.95679,1.547835 -4.3125,2 -0.0993,-0.948333 -0.13313,-1.670549 -0.0312,-1.6875 -0.68893,-0.08841 -1.17328,-0.101606 -1.59375,-0.125 -0.007,-0.05278 -0.0237,-0.10871 -0.0625,-0.15625 0.16928,-1.076275 -0.53125,-2.445495 -0.90625,-3.15625 -0.51293,0.38699 -1.29501,1.368956 -2,1.59375 -1.62846,0.709733 -1.52501,0.961733 -2.78125,1.59375 -0.80436,-0.373764 -0.53924,-0.979588 -1.125,-1.34375 -0.62529,0.537488 -1.58041,1.31834 -4.5,1.59375 -1.16315,0.04567 -1.88961,-0.185768 -2.71875,-0.40625 0.20795,-0.702054 0.40986,-1.392159 0.625,-2.09375 -1.14334,-0.606443 -0.32475,-2.100712 -1.78125,-2.1875 -0.8902,0.993803 -0.86453,1.992684 -1.53125,3 -0.16736,0.274129 -0.3362,0.598284 -0.5625,0.90625 -4.21943,-0.271475 -8.27324,0.153048 -12.3125,0.4375 -0.14035,-0.55167 -0.55329,-1.087311 -1.5625,-1.59375 -2.08338,-0.911408 -3.70608,-3.8599571 -7.625,-4.34375 -1.38683,-0.067599 -2.08715,1.777297 -2.875,1.96875 l -1.75,5.15625 c -0.41143,0.01975 -0.78857,0.07957 -1.25,0.09375 -3.33879,-0.08279 -5.91158,0.943836 -9.15625,0.46875 -1.83155,-0.537041 0.83325,-1.261199 0.5625,-1.90625 0.18802,-0.623827 1.5418,-1.904554 1.03125,-2.15625 -0.64826,0.656699 -1.45913,2.452156 -4.28125,2.71875 -1.92407,0.730243 -7.15119,0.148339 -9,0.875 -1.47661,0.622627 -4.50703,0.277529 -4.65625,-0.34375 0.73788,-1.258459 0.0369,-3.541148 -0.5,-4.1875 -1.14037,0.700333 -1.01106,2.084314 -2.125,2.78125 -1.03738,0.80089 -2.37797,1.967751 -6.15625,2.03125 -2.41775,0.01812 -5.62128,-0.776005 -6.1875,0.25 -0.399,0.656716 -1.79204,2.495852 -4.84375,1.28125 -1.5579,-0.786575 -7.2e-4,-1.644999 -0.125,-2.46875 0.24114,-0.800105 2.85877,-2.433535 1.15625,-3.21875 -0.8359,0.620667 -3.08418,2.013702 -3.625,2.625 -1.29257,0.843019 -2.17036,1.762564 -5.40625,2.15625 -2.75815,-0.286855 -0.0309,-1.47306 -0.5625,-2.125 0.16928,-1.076275 -0.5625,-2.445495 -0.9375,-3.15625 -0.51293,0.38699 -1.26376,1.368956 -1.96875,1.59375 -1.79102,0.780581 -1.39448,1.025981 -3.125,1.8125 -1.08559,0.799507 -2.81184,0.437205 -4.9375,1.0625 -1.24718,0.52433 -4.99041,-3.55e-4 -3.75,-0.84375 0.45096,-1.426994 0.87479,-1.260115 1.3125,-2.6875 -1.14334,-0.606443 -0.32475,-2.100712 -1.78125,-2.1875 -0.77892,0.869578 -0.43167,-1.6498301 -0.78125,-1.625 z"
+ id="path3834"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sccccccccccccccccccccccccccccccccccccccccccccccsccssssssssscccssccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccs" />
+ <path
+ id="path3788"
+ d="m 289.28125,1.3760993 c -2.357,0.02612 -4.58418,0.1026467 -6.40625,0.062171 -0.31859,-0.00734 -0.68929,-0.015318 -1.09375,0 -6.06692,0.2297656 -21.18371,2.844711 -26.96875,2.7976782 C 246.82712,4.1710265 228.56542,3.9624008 219.375,3.987266 197.09922,4.0475341 181.85273,5.1197883 159.21875,5.448276 150.9881,5.5677277 148.03662,4.5313843 141.40625,4.3913751 116.99827,3.8759679 99.06519,3.0407315 97.25,2.9614505 90.23717,2.6551562 87.43138,4.5627541 78.84375,4.0183513 70.256114,3.4739514 40.257036,6.2426653 29.875,5.448276 19.250046,4.6353004 7.083165,4.0508353 -2.96875,2.5573414 -8.84196,1.6847076 -18.338826,2.1143402 -24.53125,1.5626112 L -28.0625,23.975125 c 11.965668,0.238419 13.624444,-0.61742 26.40625,-1.025815 6.56891,-0.209885 24.221186,0.07867 30.78125,-0.155427 7.02249,-0.250606 15.78201,-1.38755 22.8125,-1.616436 8.79584,-0.28636 16.083398,-0.525113 24.78125,-1.025816 7.963849,-0.458446 20.56495,0.850532 28.4375,0.248683 4.27551,-0.326861 24.74823,-1.936293 35.0625,-3.295044 14.32262,-1.886789 13.74314,1.544982 47.875,3.512641 20.87852,1.203621 28.83989,-1.361324 51.3125,0.248683 10.49187,0.75167 26.54958,2.143992 35.6875,0.963645 5.43879,-0.702531 10.45519,1.633862 17.84375,2.144886 11.96567,0.238419 13.62444,-0.61742 26.40625,-1.025815 6.56891,-0.209885 24.22118,0.07867 30.78125,-0.155427 0.82747,-0.02954 1.69247,-0.07313 2.5625,-0.124341 l 0,-17.1280101 C 352.04,5.5184713 351.42024,5.4899951 350.875,5.448276 340.25005,4.6353004 328.08317,4.0508353 318.03125,2.5573414 312.15804,1.6847076 302.66577,2.0606245 296.46875,1.5626112 c -2.3437,-0.1883472 -4.8305,-0.2126325 -7.1875,-0.1865119 z"
+ style="color:#000000;fill:none;stroke:#2d2f3c;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
Binary file share/hedgewars/Data/Themes/Cave/LandBackTex.png has changed
Binary file share/hedgewars/Data/Themes/Cave/LandTex.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/LandTex.svg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,3813 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.1 r9760"
+ width="512"
+ height="512"
+ version="1.0"
+ sodipodi:docname="LandTex.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="LandTex.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <sodipodi:namedview
+ inkscape:window-height="824"
+ inkscape:window-width="1434"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="1.1604167"
+ inkscape:cx="337.09675"
+ inkscape:cy="230.54908"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="layer2"
+ inkscape:window-maximized="0"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-global="false">
+ <sodipodi:guide
+ orientation="0,1"
+ position="623.98047,128"
+ id="guide3377" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="699.54061,384"
+ id="guide3379" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="bg"
+ style="display:inline"
+ sodipodi:insensitive="true">
+ <rect
+ style="fill:#43465a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect2387"
+ width="512"
+ height="512"
+ x="0"
+ y="1.5258789e-05" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer1"
+ inkscape:label="bg2"
+ style="display:inline">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5701"
+ d="m 332.77174,360.17581 c -0.15785,0.94814 -0.50508,1.9226 0.17049,2.75491 0.69161,0.88004 -0.4751,1.6959 -0.74027,2.55253 -0.59595,0.92107 -0.93136,2.13088 -0.70315,3.18442 0.69266,0.95162 0.66362,1.72824 -0.47525,2.23574 -0.82207,0.68136 -0.5094,2.06629 -1.36706,2.8028 -0.80515,0.90397 -0.59567,2.32625 -1.65538,3.05981 -0.50103,0.93926 -2.19617,0.69157 -2.10407,1.96617 -0.13568,1.43102 -1.47891,2.31057 -1.98881,3.61686 -0.94881,0.84986 -2.31393,1.04797 -3.56434,1.1621 -0.87213,-0.47956 -1.68358,-1.23652 -2.74348,-0.8576 -1.46336,0.11072 -2.64264,1.19429 -4.01384,1.66904 -1.18823,1.35594 -2.88917,2.0027 -4.29608,3.08356 -0.25701,0.89593 -0.95629,1.78487 -0.36641,2.69417 0.59734,0.91382 -0.0526,1.80944 -0.33031,2.71049 -1.54211,1.05839 -2.56518,2.6374 -3.63591,4.11883 -0.96483,0.65475 -1.7052,1.61588 -2.59706,2.31306 -0.90885,0.28575 -1.83429,0.78913 -2.66461,0.0448 -0.79586,-0.70018 -1.69506,0.0402 -2.55357,0.21331 -0.55872,0.70488 -0.81327,1.98043 -1.96316,1.57618 -1.51911,0.0281 -3.19392,0.19457 -4.50309,0.98827 -0.73407,1.02958 -1.50074,0.61465 -2.27461,-0.11985 -0.97712,-0.33327 -2.13286,-0.18871 -3.00207,-0.90473 -1.71801,-1.10104 -3.57227,-2.0782 -5.56811,-2.54369 -0.96253,-0.31276 -1.83013,-0.14645 -2.60002,0.51288 -1.04065,0.58487 -1.84561,1.62106 -3.14025,1.59552 -1.21772,0.29048 -2.37341,-0.57769 -3.60013,-0.64543 -1.08651,-0.41858 -1.4206,1.30121 -2.46177,1.42284 -0.90632,0.64744 -1.92717,0.38901 -2.93891,0.20259 -0.96354,0.13069 -2.03332,0.0523 -2.56862,1.02577 -1.45694,1.42346 -2.42344,3.24414 -3.09411,5.13864 -0.77267,0.87762 -1.2305,1.91442 -1.51075,3.04099 -1.03529,0.59076 -1.98337,1.29845 -2.8451,2.12193 1.03491,0.3729 1.39075,1.27362 1.77695,2.17249 0.49653,0.93763 1.99885,0.60477 2.31113,1.30686 -0.30278,1.0786 0.79513,1.63939 0.9135,2.59092 0.10233,1.65393 0.92778,3.11201 2.04515,4.29889 -0.23158,1.31144 -0.0896,2.76094 -1.05304,3.80732 -0.31251,1.33179 -0.42229,2.78661 -1.0085,4.01018 -1.04602,0.63111 -0.18265,1.79616 -0.77586,2.56231 -0.88996,1.15214 -1.97323,2.36952 -1.75025,3.94252 0.25757,0.84831 0.90893,1.60306 0.80747,2.58703 -0.3973,1.23066 0.0395,2.45834 0.69882,3.51909 0.61602,0.66435 1.18749,1.30071 0.98209,2.2881 -0.0588,1.23853 0.95809,2.13329 0.86142,3.36967 -0.24219,0.94479 -1.00809,1.67697 -1.8107,2.22452 -0.26946,1.35348 -0.24373,2.79292 0.4728,4.00954 -0.0904,1.29548 -0.72841,2.62639 0.008,3.83803 -0.22287,1.18231 -1.69302,1.74719 -1.78032,3.01417 -0.27175,0.98073 -0.97234,1.74127 -1.81362,2.28461 -0.72922,1.16369 -0.32671,2.54561 -0.88128,3.76563 -0.76666,1.09088 -1.23848,2.52837 -0.58218,3.7908 0.24757,0.84793 0.90495,1.65487 0.3626,2.53041 -0.30731,1.0113 0.10295,2.12298 0.90269,2.79988 0.31423,0.81972 0.0375,1.92952 1.27045,2.04228 1.19607,0.8043 2.49371,1.69362 2.96366,3.12954 0.8372,0.45266 1.70942,0.82289 2.61638,1.11131 0.18922,0.95809 0.58411,2.06615 1.4364,2.5413 0.98829,0.13192 2.18924,-0.17912 3.03644,0.33219 0.96962,0.66273 1.47704,2.07673 2.78726,2.06251 1.03919,0.1825 2.04624,0.6295 2.52642,1.62544 0.68241,0.5864 1.6478,0.90859 2.5331,0.54908 0.95189,-0.18232 1.70266,0.86397 2.71826,0.69688 0.99687,-0.22472 1.50995,1.80099 2.29426,0.56693 0.8209,-0.88884 2.21031,-0.56693 3.19347,-1.24347 0.73677,-0.14073 1.96616,0.20634 2.05268,1.12891 0.42596,0.97104 0.60618,2.20805 1.78349,2.51833 1.27373,0.94325 2.55073,2.0378 3.2237,3.51301 1.25766,0.33872 2.50646,1.34639 3.82211,0.73223 0.91589,-0.22453 1.71639,0.82042 2.69203,0.37187 1.37407,-0.056 2.63142,0.84116 4.0046,1.0103 1.26249,0.14669 2.12638,1.56289 3.38983,1.55928 1.04437,0.052 1.7128,-0.58194 2.299,-1.36593 0.1136,-0.90147 0.089,-1.87457 1.05805,-2.30456 0.72287,-0.70233 1.88515,-0.0777 2.79068,-0.41173 1.2243,-0.21238 2.2693,-1.06074 3.42323,-1.52705 1.12499,-0.93295 2.64281,-0.62392 3.99672,-0.7553 0.78054,0.66402 1.65341,0.97794 2.67188,0.73984 0.89372,0.40311 1.73227,0.57244 2.42303,-0.28275 0.83751,-0.32196 1.88418,0.0864 2.74853,-0.39759 0.87342,-0.21099 1.68142,-0.91204 2.57931,-0.37564 0.8984,0.073 1.61258,1.25847 2.48496,0.51458 1.07291,-0.57436 2.31217,0.12285 3.27117,0.65936 0.9706,-0.42098 1.82946,-0.29602 2.55084,0.50066 1.44219,0.38876 2.97605,0.0666 4.45805,0.23851 1.18815,-0.94813 2.75266,-0.80708 4.07085,-1.47443 0.65076,-0.85375 1.69463,-1.36044 2.38473,-2.09497 0.40635,-0.91892 0.397,-1.82186 -0.0934,-2.70629 -0.0319,-1.08443 0.59338,-2.08683 1.35783,-2.84671 -0.27847,-1.46773 0.20324,-2.88441 0.67832,-4.25737 1.4679,-0.54042 2.92075,-1.51346 3.58947,-2.93592 -0.12363,-1.00375 0.1702,-1.85004 0.93875,-2.51727 0.92046,-0.58571 2.02532,-1.29135 2.23036,-2.42651 -0.33338,-1.16321 0.59232,-1.64747 1.30555,-2.31211 0.23948,-1.06163 0.99087,-1.57341 2.01187,-1.79559 0.64335,-0.88409 1.64634,-1.42532 2.39553,-2.14024 0.3171,-1.45417 1.50012,-2.48854 2.87926,-2.93328 1.53615,-0.42024 3.0748,-1.19886 4.6815,-1.09194 0.88626,0.54559 1.84828,0.60434 2.84999,0.40807 0.734,-0.53575 1.25689,-1.58056 2.34687,-1.05622 1.08305,0.13971 2.08324,0.74375 3.20301,0.4075 0.92346,-0.12211 1.88859,-0.27733 2.38625,-1.162 0.6,-0.76104 2.05676,-0.33171 2.11706,-1.60289 0.49696,-1.05517 1.19534,-2.00489 1.378,-3.1909 0.83237,-0.67793 1.78934,-0.99812 2.86033,-0.99093 0.68937,-0.83078 1.64539,-1.45774 2.32015,-2.25238 0.0816,-1.08299 0.72096,-1.65656 1.75501,-1.86958 1.424,0.0692 2.90304,0.58902 4.22343,-0.18375 0.89069,-0.28443 1.86804,-0.45611 2.19205,-1.46282 0.67346,-0.8232 0.0706,-2.115 1.03487,-2.80351 0.47198,-1.08445 1.89632,-0.17019 2.62125,-1.00019 1.0208,-0.38851 1.56547,-1.66366 2.77953,-1.49778 1.15545,0.16178 0.67929,-1.45605 1.39312,-2.00372 1.1708,-1.62186 1.75744,-3.54477 2.48204,-5.37211 0.91717,-0.8769 -0.33142,-1.60226 -0.38142,-2.51677 -0.29863,-1.03954 0.24376,-1.77579 0.98939,-2.43875 1.36752,-0.92118 2.9821,-1.93712 3.39376,-3.61678 -0.25942,-0.98489 -0.23499,-1.93576 0.30102,-2.82532 0.68123,-2.0641 2.30187,-3.58256 3.26183,-5.5083 0.52822,-0.87257 1.53282,-1.48301 1.36882,-2.63501 0.21866,-1.87105 1.60939,-3.27774 2.72311,-4.69984 0.96806,-0.24881 1.91033,-0.53426 2.36899,-1.50644 1.1528,-1.07155 2.21128,-2.24972 2.93394,-3.672 0.65299,-1.38174 1.6576,-2.6945 3.2139,-3.07599 0.90727,-0.27343 1.27127,-1.4331 1.46258,-2.28668 -0.004,-1.46223 1.4381,-2.23621 2.15781,-3.37092 0.71407,-0.73765 1.53369,-1.39493 1.58286,-2.506 0.1879,-0.88374 1.30364,-1.31073 2.08587,-1.59224 1.60401,-0.17269 2.88947,-1.25578 4.25133,-1.96499 1.59957,-0.29076 3.22324,-0.14256 4.83545,-0.0668 0.88877,-0.96372 2.09883,-1.32916 3.27135,-1.80651 0.8194,-0.57014 1.78036,-0.6035 2.74304,-0.63037 1.2636,-1.23554 2.59016,-2.61943 4.26151,-3.22983 1.40841,-0.18256 2.77413,-0.93142 3.38227,-2.25899 0.64995,-0.6509 2.00026,-0.28315 2.38449,-1.37096 0.49947,-0.98944 1.78839,-0.66337 2.72105,-0.74445 1.02255,0.28655 1.83142,-0.15974 2.57359,-0.83477 0.79963,-0.52381 1.38668,-1.54944 2.47345,-1.29549 1.29641,-0.34232 1.91459,1.27867 3.18471,1.27016 1.25663,0.28234 2.3019,1.17635 3.64988,1.08427 0.93717,-0.0136 2.12683,0.32968 2.62241,-0.70307 0.89036,-1.16736 2.54863,-1.3855 3.92871,-1.43547 1.53904,0.28584 3.10838,0.36706 4.66907,0.25056 0.28716,-1.49407 1.20374,-3.04875 0.42399,-4.53763 -0.11365,-0.99134 0.70763,-1.5975 1.07784,-2.27664 -0.3097,-1.10985 -0.49532,-2.3039 0.0447,-3.37288 -0.33692,-1.07984 -0.92222,-2.36942 0.0214,-3.29936 0.56571,-1.00801 -0.23157,-1.79314 -0.49736,-2.66507 0.0556,-1.08006 -0.40761,-2.13603 0.119,-3.16718 0.26946,-1.23686 0.77003,-2.46465 1.12817,-3.62573 -0.49572,-0.87781 0.0478,-1.90136 -0.2743,-2.72975 -0.34005,-1.12129 -1.72287,-1.17591 -2.11976,-2.22847 -0.70867,-0.98563 -0.53173,-2.22015 0.0328,-3.22984 0.48457,-0.94651 0.47275,-2.08218 1.34278,-2.8135 0.81942,-1.34953 -0.13306,-2.72175 -0.49317,-4.04247 0.17497,-1.32382 -1.38209,-0.74276 -1.87327,-1.56277 -1.02194,-0.54081 -0.25503,-1.77122 -0.9548,-2.42303 -1.04325,-0.74067 -0.75376,-2.2622 -1.2949,-3.20645 -1.24459,-0.68733 -2.29829,-1.65997 -3.68855,-2.07763 -1.04612,-0.36706 -1.78871,-1.349 -1.76361,-2.46999 -0.66939,-0.44284 -1.7496,-0.6111 -2.39417,-1.31686 0.55631,-1.47131 -0.0749,-2.98825 -0.26567,-4.47602 -0.43928,-0.99003 0.76537,-1.64999 1.01697,-2.55086 0.46309,-0.89987 1.4269,-1.88451 1.12402,-2.92524 -0.68291,-0.69063 -0.35216,-1.77373 -0.6658,-2.47728 -1.39291,-0.46539 -1.96957,-1.88119 -2.57863,-3.09339 0.33681,-0.92952 0.52306,-1.8881 0.55599,-2.87627 1.07699,-0.77827 1.21404,-1.24954 -0.2434,-0.91542 -0.9695,0.38755 -1.4887,-0.79873 -2.36478,-1.02707 -0.70808,-0.7733 -1.64647,-1.23505 -2.67378,-1.31522 -0.79915,-0.51238 -1.88297,-0.39609 -2.38433,-1.32815 -0.93285,-0.32857 -1.96175,-0.59857 -2.44174,-1.55436 -1.05866,-0.33309 -2.16373,-0.15184 -3.20967,0.0178 -1.15003,0.048 -1.81092,-1.05086 -1.92212,-2.0764 -0.29906,-0.99697 -0.96911,-1.87367 -1.9793,-2.21433 -0.13937,-0.81431 -1.04101,-2.15043 -1.80738,-1.16074 -0.7313,0.42411 -1.72889,-0.0321 -2.53365,0.40987 -1.27959,-0.74279 -2.47274,-1.6629 -3.8494,-2.19442 -0.51605,-0.91752 -1.72177,-0.64749 -2.34221,0.0216 -0.69774,0.30944 -1.9098,0.0615 -2.54731,-0.32016 -0.55965,-1.00699 -1.84287,-0.79543 -2.82109,-0.96837 -1.13664,0.67695 -2.26241,1.4813 -3.66411,1.27365 -0.97476,0.18387 -1.825,1.3565 -2.93562,0.88397 -0.76239,-0.0847 -1.19769,1.7813 -2.12219,1.19227 -1.06537,-1.16961 -2.67096,-0.3199 -3.96616,-0.10846 -0.86864,-1.49812 -2.27824,-2.82933 -3.95737,-3.33596 -0.91435,-1.69017 -3.10208,-1.59367 -4.49256,-2.69903 -0.7942,-0.58872 -1.89718,-0.52591 -2.4278,0.36601 -0.98821,1.02113 -2.16449,1.81903 -3.58864,2.04782 -1.50933,1.11237 -3.30035,1.73749 -4.94639,2.56239 -2.45396,1.96573 -5.39937,3.29055 -8.46675,3.95317 -1.52662,0.30835 -2.82044,1.33232 -3.50551,2.72541 -1.10993,1.40309 -1.63499,3.22729 -3.11913,4.30876 -0.7828,0.82064 -2.20683,-0.10857 -3.05255,0.74425 -1.06931,0.28785 -1.40142,1.22813 -1.71706,2.183 -0.26617,1.25486 -0.24064,2.58166 -0.82721,3.77321 -0.54598,0.87829 -1.64497,1.43347 -1.66928,2.60301 -0.10851,1.28718 -1.63016,1.56514 -2.37583,2.44216 -1.03577,0.46017 -0.96515,1.47892 -0.99037,2.44929 -0.35452,1.27122 -0.87577,2.51 -0.84228,3.86951 -0.3866,1.65616 0.14149,3.37608 -0.47456,4.98244 -0.22238,0.96848 -1.73256,0.0809 -2.38616,0.73183 -1.56763,0.76778 -3.02902,1.73028 -4.33074,2.87533 -1.75388,0.52255 -2.95017,1.95751 -3.94326,3.41907 -0.91524,0.60796 -1.85262,1.13809 -2.99068,0.96301 -0.99695,-0.12524 -1.58782,0.92293 -2.3286,1.43071 -1.251,1.30185 -2.3311,2.88803 -2.35854,4.75321 -0.18322,1.84932 -0.9755,3.60523 -2.35781,4.86671 -0.7502,0.79584 -0.57618,2.27338 -1.79032,2.64698 -2.02517,1.18543 -3.53098,3.13801 -5.79554,3.9233 -1.64905,-0.5097 -3.53517,-0.79441 -5.09763,0.11266 -1.16688,0.62246 -2.51843,-0.15824 -3.78452,-0.017 -1.20398,0.21316 -1.91004,-0.94086 -2.72438,-1.62465 -0.61841,-0.72547 -1.1689,-1.7924 -2.12287,-0.83114 -2.02891,1.12379 -4.42594,0.52093 -6.62658,0.82593"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M142.85633 315.86567L141.708014096 315.945736014L140.810051819 316.665946908L139.829738387 317.21286002L139.152165759 318.107859298L138.198012039 318.726632916L137.062059824 318.672756419L136.031822518 319.00647704L134.985156342 319.28441278L133.885213345 318.806317828L132.727109311 319.118158219L131.643720138 319.522969565L130.813198705 320.327853704L129.588043093 320.441165446L128.763979257 321.354819987L127.547825545 321.497735893L126.539118554 320.803498893L125.95777486 321.897595045L124.865721201 322.482766547L123.669217915 322.366243913L122.500893728 322.649468619L121.364377399 323.016938597L120.547999909 323.888851061L120.042550975 324.929196615L119.57011274 325.984942613L119.044235177 327.026343293L118.044025808 327.626879559L117.112073974 328.266418975L116.375079874 329.123381391L116.033228915 330.336487502L116.502658259 331.506156091L115.522313356 332.258828329L115.054980751 333.403027553L113.962704423 333.79688218L112.805597749 333.700480999L112.199996359 334.715590895L111.142771293 335.244246076L110.791680254 336.291732265L110.048161111 337.108843956L109.617997505 338.115232446L108.898696638 338.940135339L107.938387343 339.456749395L107.369969174 340.387332444L106.282311233 340.625482623L105.572890107 341.483641683L104.607426045 341.954927619L103.757932281 342.612644605L102.684401239 342.661184606L101.644483017 342.932099948L101.1766457 343.918500711L100.499329266 344.774713691L99.8279000703 345.638441754L98.9566472344 346.300077474L97.835523407 346.404617035L96.7099624085 346.373639711L95.7811252502 347.006668643L94.8690410872 347.663605912L94.6886471248 348.754411913L94.2307406604 349.760752504L93.7942154368 350.811443624L92.8774911059 351.485329817L91.7854226142 351.731811937L90.7027248153 352.016649613L89.718897656 352.617289894L89.125646 353.60559L87.7179995707 353.17712491L86.2473296039 353.130427458L85.2080785535 351.99213771L83.6896580563 351.727287774L82.6815393337 350.547100472L82.3540298227 349.029904722L81.2188692701 347.977496243L79.7291657781 347.556857929L78.3018510255 347.155587695L77.2622585362 346.098472441L76.4157072392 344.823571256L74.9395248934 344.419952857L73.4381625296 343.992335643L72.2516460954 342.977878064L70.8592405516 343.755568147L69.2700236203 343.621461436L68.3703519907 342.352255002L67.0900410487 341.468457567L67.2435353491 339.840535058L66.2931272109 338.509965043L65.6802607629 337.045038462L64.8560275756 335.687741581L65.3994370499 334.193771623L65.6716716509 332.627525023L64.8008736621 331.402493997L64.1863688044 330.030862148L62.7496135433 329.370419226L62.0207932593 327.967111874L60.5154435237 327.713421303L59.2916733657 326.800829756L58.1406415096 325.838672203L56.7597140445 325.252446286L55.322136715 324.785007387L53.8449138634 325.105850572L52.7918885052 326.15321559L51.4287055599 326.742764692L49.9096579462 326.622631107L48.6427264561 325.775977499L47.1393184609 325.978163729L45.8942400496 326.844705489L44.4440094949 326.489713467L43.0070348005 326.895042624L41.6593985096 326.319710327L40.5836815558 325.324741051L39.1869435599 325.121254207L37.8574682037 324.647145357L36.4027213854 324.330930404L35.0697988857 324.993952132L33.6501644582 325.418246441L32.3372587873 326.105026078L30.9973152894 326.935681119L29.4427524391 326.673439398L28.2342124906 325.698718251L26.6979771861 325.47370445L25.2066233971 324.981028687L23.7027185107 325.433947691L23.1156357653 324.015600641L21.7918776414 323.238401225L20.6397319191 322.283942455L19.1808165287 321.952284208L17.7359466304 321.664698828L16.6006027006 320.72589718L15.4328056135 319.895910305L14.151109 319.25569L14.1311724911 318.079882676L13.5660596512 317.048588438L13.4878286427 315.89931827L13.1089109392 314.8114932L13.3838974548 313.553086323L12.7678611121 312.421845997L13.6600234234 311.542438077L13.9701620695 310.328714098L13.0301576862 309.620318498L12.6726206431 308.498890913L12.5038002946 307.312918276L11.5965520432 306.530657439L10.6550123985 305.845740168L10.2066442662 304.771228842L9.56794306057 303.829265017L8.64764707005 303.159720121L9.09059781298 302.121168716L9.87163754263 301.305833618L10.2672990857 300.267836074L10.634786546 299.219532718L10.5952325246 298.11035078L10.6805792806 297.003750118L10.1448984776 295.970461933L10.3111305986 294.818504782L10.336949743 293.725816926L10.3863374319 292.633940452L10.3487035778 291.539094014L10.1620514126 290.459619142L10.1387460956 289.316417979L10.5729740774 288.258638183L11.4903353622 287.546682762L11.9136127708 286.465355575L11.1354732159 285.566756202L10.5277594207 284.545156503L10.7570335734 283.334830225L10.309444289 282.187171666L9.21737684765 281.465929254L8.85964027194 280.207030348L7.69863973468 279.747543081L6.45003466541 279.741528308L5.48262872773 279.118235074L5.09182447201 278.035811526L4.46451546396 277.121473162L3.55078179067 276.493283691L3.52833034549 275.324764009L2.79718948905 274.412966136L2.28966067711 273.391505206L1.35999963118 272.730673711L0.59897732216 271.764166047L-0.218176211396 270.844626966L-0.15001565917 269.613168961L-0.273450622872 268.386018405L0.372079744366 267.385681543L1.07034220112 266.421413513L1.34087398187 265.258864009L1.43080116526 264.068644746L1.51136799569 262.97754316L1.71186491972 261.901999266L1.63200081099 260.802264641L1.85124044111 259.721649767L1.66163541789 258.61245854L1.11476329159 257.629002328L1.18631271858 256.520797241L1.1512021 255.41084L1.39044472934 254.119127951L1.12632293675 252.832272586L0.135124400411 251.942048653L-0.296433609917 250.681599973L-0.526053208144 249.394807537L-0.461436700501 248.089286706L-1.64417176775 247.37881991L-2.10611991598 246.078731753L-2.9366842965 244.912904217L-2.81927105598 243.486298047L-4.22112664838 243.161593566L-5.05009968681 241.985398087L-4.59409454614 240.694798871L-5.00437503121 239.388943999L-5.81981444751 238.345921418L-6.17324417174 237.070019785L-5.29375966143 236.070717612L-5.0227454123 234.767395275L-4.04904494609 233.908533604L-3.33369691518 232.825014725L-2.31304920038 231.932482811L-2.07028752738 230.59854063L-1.37321542794 229.519664088L-0.506091747461 228.572045691L-0.634016176672 227.249773769L-0.242683269364 225.980275344L-0.883278131289 224.78487034L-0.784932110484 223.4322126L-0.556022051322 222.155191077L-0.534493487719 220.857993981L-0.63930483138 219.47453278L0.217663561245 218.383406991L-0.455771141924 217.232036236L-1.2139642999 216.134624713L-2.51799998037 215.853279815L-3.79445544441 215.465561546L-4.9444888115 214.956892618L-6.13225255527 214.543930014L-7.38267544128 214.398181296L-8.64151966227 214.40873165L-9.68333125412 213.721620874L-10.3977864201 212.698368008L-11.4731019215 212.084969448L-12.3359174823 211.197213553L-12.8957007164 210.062118792L-13.2233497294 208.839644453L-13.9702590821 207.786886613L-15.0951610542 207.153824053L-16.187036593 206.315188124L-17.5305470662 206.014385827L-18.166072609 204.827640697L-18.6749033725 203.581306885L-19.2408805956 202.391481109L-19.103553308 201.081077809L-18.7203228269 199.808469215L-19.1312156015 198.544520892L-19.234465989 197.283347261L-19.8472452195 196.176224329L-19.9167827529 194.9197529L-20.4343387642 193.772716852L-20.8408675542 192.511597523L-21.7304813783 191.529622542L-22.7929957629 190.746924132L-24.071629 190.42035L-23.1922153403 189.785991428L-22.138906449 189.52846558L-21.5440453597 188.644992802L-20.8832804935 187.80966433L-20.7419663601 186.697276709L-19.88055425 185.979401316L-19.5389831329 184.98126593L-19.5028597886 183.926922446L-18.6106738024 183.465270511L-17.8279599707 182.835605997L-17.0091593954 182.167930918L-15.9529540942 182.142342733L-15.0338179735 181.764762102L-14.0988765695 181.428216543L-13.2682965222 180.840849054L-12.2677302038 180.65718952L-11.2420602876 180.387322693L-10.2357376378 180.722198201L-9.42884661456 180.084235951L-8.46682453051 179.720117198L-7.64879247696 179.159507392L-6.78327891776 178.675414349L-5.89906459014 178.126140232L-4.86055079195 178.197035389L-3.84783809831 178.391138862L-2.85809889138 178.680412885L-1.90749083304 178.282463489L-0.932740982035 177.947975626L0.0597881713465 177.493917661L1.14836270215 177.573216128L2.11269354671 178.028326772L2.92718024812 178.71656444L3.10558720362 177.752603958L3.72428601935 176.992169458L4.14371516837 176.109802402L4.91869290188 175.514905818L5.6134230383 174.792729013L6.6041353895 174.642135729L7.15996963427 173.832835691L8.04374699204 173.405219225L8.94428401159 172.909264047L9.56207980811 172.087517847L9.86097482733 171.108926604L9.77969730243 170.088939831L10.4849635076 169.456699967L11.3051313205 168.982935865L11.8804003349 168.234986486L12.5360009546 167.556347745L13.3549906017 167.104067725L14.1549259461 166.618882499L14.7858974057 165.927629889L15.3683645516 165.195040525L16.2066898214 164.738768404L16.7043389768 163.92432453L17.3098371675 163.224056658L18.0323730945 162.645312339L18.7785607619 161.930771173L19.4078273924 161.1113881L19.4188986841 160.078006981L19.5942129467 159.059545386L20.5338433713 158.680987739L21.2099461043 157.926603009L22.0314651911 157.293024561L23.068496 157.26332L23.074593029 158.799444812L22.6220147666 160.267399011L22.0203733977 161.766746973L22.5209496029 163.302793883L23.386139849 164.695624246L24.8597380981 165.414678336L25.4859183644 166.873086579L25.7450917222 168.438936349L27.3766782588 169.02528203L28.2598301808 170.517233292L29.8827637767 170.931796427L31.5215217061 170.585027774L32.5418261875 171.91175848L33.9652933377 172.792086188L34.3266468507 174.407730979L34.3432910828 176.063208982L34.9475013736 177.396654275L34.7438086542 178.846363107L35.9545774748 179.728384999L36.305391985 181.184699846L36.85492094 182.557783504L37.9492001825 183.552717545L38.2332229566 184.99999886L37.8916266998 186.434782517L38.2287349227 187.850894784L39.3053258784 188.830674259L39.5551532111 190.199027516L39.8239986569 191.563771615L40.5854160718 192.858331833L40.2574468607 194.323964404L41.0765424433 195.460696744L41.7130229989 196.708883624L41.5086970185 198.161275492L41.3647697994 199.620890579L40.9799156605 201.149112695L41.7402195894 202.529516071L41.5371384879 204.013640205L41.338584418 205.498376767L40.4968877842 206.737754515L39.6135258264 207.947788431L40.2200651121 209.268974112L40.7855873927 210.608229898L40.9665361596 212.128642858L42.0188565647 213.240856772L42.7527100853 214.580066653L42.8993029581 216.100110936L42.5078190078 217.549502597L42.3681279633 219.044321075L43.2093791307 220.322892455L43.7834944875 221.74163833L44.0378019772 223.284194599L44.944425111 224.557845506L44.1188002232 225.95495652L44.3827747543 227.556172647L43.8085507807 229.057656641L44.2488937611 230.603711431L44.864800249 232.089360864L45.8875784914 233.330497321L47.5557195668 233.282305087L48.9463505972 234.204889759L50.1710733819 235.200483023L51.5417255914 235.983084051L51.4920343205 237.633033962L52.404606 239.00854L53.6931039164 238.467898941L54.6572323411 237.456476173L56.0211471529 237.289238877L57.391871186 237.385921617L58.6786469846 236.838021754L59.397105424 235.638103554L60.7944248114 235.551307776L61.8678141616 234.652491732L62.9149945357 233.733550422L63.216518782 232.373358157L64.0216738124 231.260082425L65.2846322031 230.719163222L65.7862052041 229.434596579L66.4343974966 228.217413895L67.7846759826 227.829409947L68.8756236405 226.944179886L70.2709103854 226.702653426L71.5319485765 227.346813974L72.866930401 226.886563567L74.2181477119 227.296708283L75.5090668319 226.854522554L76.5361828696 225.956172378L77.6847251982 225.262828884L78.912054114 224.721037028L80.1330851287 223.973396714L81.563746302 224.028996948L82.9820955138 224.232334242L84.0443146678 225.193973993L85.3476607412 225.133848605L86.634255372 225.350644143L87.9188464805 225.165169827L89.1901355439 224.903637505L90.6022985295 224.9962477L91.8463730726 225.670828665L93.2366560112 225.614798113L94.5784136687 225.246406391L95.0921797045 223.883006568L96.1446173496 222.875440382L97.3708100767 222.093100242L98.8118226248 221.895394563L100.059640099 221.571239601L101.335348963 221.75749691L102.549863987 221.389588994L103.811201496 221.250195055L105.078961286 221.39606833L106.352673312 221.317636362L107.498235268 220.645300847L108.824301434 220.722084728L109.659963644 219.487094872L111.100941007 219.103538468L112.556777674 219.458433329L113.870129051 218.736963353L115.148407681 219.270285814L116.440540164 219.769107175L117.823489195 219.68293522L119.209120128 219.683672123L120.236634002 220.675556833L121.645039287 220.912230849L122.69589501 221.812191033L123.391483987 223.008176842L124.645154768 223.585040569L126.022271262 223.495528855L127.332363763 223.785455072L128.5821 224.27388L129.082695707 225.392876486L130.056332024 226.137713059L131.257865484 226.334122233L132.261603545 227.023157155L133.284371454 227.722179133L133.810613798 228.843675864L133.627663316 230.077511851L134.151266553 231.209616868L134.071891183 232.35630734L134.040978507 233.505326006L134.695749178 234.472496393L134.968740298 235.608110341L135.679733435 236.500547132L136.044356414 237.581752362L136.725725852 238.546311946L136.714604407 239.727208138L137.915708171 239.773975149L139.104799198 239.598191383L140.278997349 239.211296135L141.493424564 239.442803733L141.988609963 240.637951444L142.756659413 241.678954167L143.900561072 242.313503054L145.198789593 242.474020974L146.015755102 243.304746715L147.134835811 243.629086458L147.901569722 244.455363825L148.666042789 245.283733373L149.627548585 245.88955448L150.575182657 246.516852077L151.468305948 247.27720775L151.886734143 248.372985013L153.067869229 248.197048443L154.144474004 248.71372622L155.219086551 249.110219103L156.343654246 249.327810997L157.483902393 248.858219178L158.260052379 247.899953292L159.44278075 247.460730188L160.648900139 247.830918458L161.744663406 248.10237036L162.66688665 248.753436841L163.691433772 249.185997986L164.766078674 249.472257105L165.444833882 250.441678513L166.591505951 250.734303984L167.487892386 251.39375126L168.274064123 252.181351L169.335910714 252.79493518L169.889952458 253.889029086L171.054382961 254.117968011L172.237208801 254.021871915L173.224899587 254.565449675L174.337528641 254.747291528L175.443616593 254.58326288L176.558305336 254.671608565L177.615049713 254.253377472L178.735843142 254.441653908L179.833055933 254.383096768L180.924402112 254.510644271L182.009206903 254.288447163L183.108691855 254.15689553L184.246903617 253.94707785L185.07108 253.1345L184.147353189 254.034249615L182.898227133 254.354413146L181.815623617 254.98086026L180.859506847 255.787276455L180.209900283 256.884235381L179.760779294 258.077381605L178.568530323 258.644467019L177.852323368 259.753561729L176.793157843 260.631309986L176.504421344 261.976265319L175.368633778 262.709512635L174.792712893 263.932615311L175.320376605 265.180919115L175.644838384 266.496751907L175.297326029 267.802306542L174.955666246 269.109404983L174.089907457 270.183472731L174.1062585 271.562926409L172.844596354 271.976067626L171.862468474 272.869321154L171.679213928 274.089320225L171.132001645 275.195004934L170.712931254 276.353708033L170.647864586 277.584146651L170.109218344 278.710042413L169.33994934 279.692898578L168.651041867 280.783142287L168.637178825 282.072728526L167.333276385 282.234028136L166.220537183 282.932591382L165.578568268 284.056105927L164.663483677 284.970998932L164.067925162 286.114657169L163.91048245 287.394444613L163.045025624 288.326241286L162.3116855 289.365218098L162.131958185 290.662306908L162.156028469 291.971566969L161.702838368 293.275656523L160.543249421 294.024912357L160.925846118 295.314284269L160.794448634 296.652788979L161.438130976 297.881665209L161.24025046 299.254730046L160.883962047 300.56866119L159.945975612 301.555341448L159.273587966 302.69295783L158.491919141 303.75844834L157.889820327 305.14927388L156.516533514 305.790368251L155.033655555 305.812218568L153.821589378 306.666794519L154.142042182 308.099356258L153.580182892 309.455541081L153.399440315 310.926964659L152.341973457 311.965963729L151.646190549 313.207163399L150.410635858 313.912921915L149.031625783 313.844855892L147.674585057 314.099300853L146.569502953 314.782615344L145.398713827 315.345978435L144.139365691 315.663765178L142.85633 315.86567"
+ id="path5708"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M293.09492 107.91929L292.167429583 109.190397988L291.693466999 110.690835743L291.234987831 112.181371076L290.511602266 113.562896339L289.501749845 114.793806219L288.056224833 115.461188032L287.088804967 116.731254531L285.647897247 117.418826385L285.163597614 118.884188736L284.932398933 120.410091787L284.881018047 121.948488727L284.697307613 123.476741198L284.973936365 125.174876217L284.137023811 126.678127156L283.316402765 128.205753903L281.696384222 128.824302449L280.312126672 129.876217121L280.015741498 131.5893573L280.348392002 133.198943784L280.101927974 134.823960859L278.870226105 135.834217318L278.130505547 137.245075605L277.176571939 138.554266276L275.685076218 139.186255246L274.433830836 140.281659066L273.896055158 141.855292395L273.293288389 143.360386085L273.113490216 144.971692204L271.559466685 145.397692L270.045567241 145.949573722L268.863430796 147.048792622L267.535088075 147.965980923L266.27860852 148.939657289L265.375729776 150.24793727L264.743607017 151.687092507L264.009467068 153.076979379L262.716519978 154.137873012L262.435012145 155.786496929L260.998678658 156.556726492L260.187539065 157.970360116L259.739100833 159.575755078L259.120862611 161.123712226L258.045753118 162.426901135L256.593770667 163.290561204L257.203626217 164.879309226L256.762790072 166.522996411L256.841447034 168.192358722L256.10410166 169.692118451L256.364945079 171.329585888L256.90077398 172.898734155L257.825879337 174.276629364L258.996204085 175.453385546L258.748061131 177.057634131L258.886131136 178.675078138L258.537428279 180.285358737L258.872070914 181.898619905L258.919211718 183.498399004L258.513228827 185.046524746L258.884093914 186.61560797L258.655413864 188.21162442L257.963811035 189.695118434L256.959252388 190.987376491L256.711154564 192.601151L256.74797 194.23347L256.509159151 195.541760331L256.645795333 196.864630228L255.518741006 197.676884494L255.11277506 199.005492825L255.199578472 200.264394933L255.24370301 201.525514426L254.966410528 202.827215787L255.530743726 204.032556234L256.057331674 205.248325371L255.782009749 206.544314297L256.816579721 207.40651579L257.035605285 208.735332648L257.37251161 210.028549515L258.411753964 210.868722751L258.631685714 212.12215946L258.671582467 213.394119289L259.064211761 214.65951593L259.037261382 215.984151766L258.715786146 217.252364865L258.462276472 218.535892673L257.839977299 219.829277761L258.264062539 221.200500921L258.710858399 222.472362178L259.478337963 223.580618789L260.168103524 224.753513035L260.451670244 226.084320066L261.506776977 226.921403243L262.674133869 227.593144526L263.593563709 228.491996278L264.483444131 229.420111861L265.31460339 230.451798584L266.532345558 230.973629229L267.012145862 232.340295764L266.78486237 233.770794966L267.653777393 234.875783606L268.618941273 235.897777684L269.801591173 236.567752799L270.693999615 237.593001361L271.731283159 238.455936454L272.535673819 239.539250718L273.512696865 240.551937484L274.904721144 240.757794044L276.09714475 241.477084L277.488036402 241.408728254L278.718227764 241.962507119L279.869462048 242.665857274L280.969538178 243.494097019L281.633606686 244.700397804L282.0913983 246.021172673L283.109798182 246.978711757L282.977651129 248.403842721L283.72929187 249.621831762L284.094466769 250.979222685L285.114511261 251.946369032L284.950933763 253.375348771L285.737203358 254.579724465L285.569567057 256.100592609L284.642870305 257.318120832L285.191900571 258.68657395L285.73755882 260.05637512L285.342295142 261.391591153L284.502040971 262.502000157L284.201792116 263.861902208L283.44029 265.02792L284.869773478 264.032869818L285.642810493 262.472113062L286.854471201 261.298353041L288.059460326 260.117744949L289.837284428 260.290848816L291.49368745 260.95939389L293.111881902 260.243231537L294.785963509 259.669739972L296.265008602 259.035232433L297.856112288 258.793233949L299.557680955 258.761255099L300.829757376 257.630688801L302.371413638 257.032113247L303.837168485 256.266241553L304.607193641 254.787221196L305.755143773 253.577820332L305.942489018 251.919802814L306.395194473 250.31382084L306.959391331 248.648807863L306.383863408 246.987677549L308.10866025 246.434159138L309.30447388 245.073520855L310.394828461 243.608441632L310.476128052 241.783963456L311.512831733 240.284448694L311.250832145 238.480382382L312.78501899 237.682828342L313.902843579 236.363627861L314.348467347 234.673676782L315.699085004 233.564466641L317.094193753 232.635568577L318.675853572 232.08101267L320.24224377 231.450801991L321.911888917 231.701857439L323.433447951 232.284099734L324.965518274 232.838092975L326.576032952 232.899262333L328.166692811 232.639839066L329.495243874 231.639294186L331.148576153 231.458655438L332.478741379 230.536653454L333.920988401 229.802248448L335.529500163 229.658342317L337.133252521 229.468612407L338.323184335 228.352861922L339.89601117 227.920366123L341.0646613 226.849381248L342.326452985 225.889884779L343.885428586 225.563411289L345.469872798 225.726280579L346.941735398 226.284926947L348.384320923 226.915333387L349.873130351 227.320204504L351.41136806 227.439782454L353.022852867 227.191674274L354.428694825 228.017537061L355.928399648 227.54509199L357.490193156 227.727080831L359.050993553 228.241925475L360.562685915 227.596984322L362.097346811 227.191179969L363.63712991 227.577093486L365.173112538 227.651675877L366.71089 227.64492L368.398095724 227.492383228L369.869368875 228.332196263L371.342166239 227.465760083L373.036605875 227.686481734L374.634055893 227.228643252L376.289051302 227.078800565L377.664681929 228.062994811L379.321926922 228.401427923L380.298568025 226.922157774L381.829613488 226.028867335L383.524283806 225.609521889L385.018714193 224.707060862L386.691345602 225.061119347L388.400963289 225.077262503L389.936238392 225.95610398L391.70413837 225.893162364L393.450801362 225.533687913L394.513846727 224.101909985L395.916111418 223.149414338L397.56835703 222.770364662L398.035154252 221.117571237L399.208117412 219.863066085L399.157336644 218.089224378L400.252313732 216.692758028L401.236880498 215.291574023L401.612918167 213.6208604L402.643835927 212.293958041L403.735034104 211.016167825L405.189703165 210.141947404L406.867531262 209.886572588L408.484728186 209.467303321L410.011012913 208.7879157L410.893582231 207.312540506L412.033831967 206.025881614L411.874031251 204.261208145L412.616207254 202.652238443L413.106275912 201.023809401L413.523440232 199.375197147L414.058773841 197.631198333L415.632029072 196.707628134L414.697827868 195.21827878L413.808909218 193.701467315L413.448874967 191.916849962L412.2410511 190.554629252L412.490886529 188.702953275L413.60264171 187.201246885L412.742892926 185.469262067L413.238834083 183.600310021L414.432654709 182.403922997L415.024420736 180.820773425L415.935845102 179.353155649L417.512920939 178.64786981L418.49696898 177.325493781L419.616251238 176.115437527L419.891280807 174.411053407L421.096693985 173.175114266L422.5638513 172.398215643L423.784504873 171.272992593L425.528391702 171.236674324L426.869200065 170.121016122L428.15842978 168.989313411L429.41239529 167.818657706L431.121814144 167.670229533L432.82127 167.4336L433.661236685 166.000211036L435.04494317 165.080697947L436.590642241 164.336902273L438.262354479 164.72134449L438.920599468 163.326250685L439.773470755 162.040877683L440.325858575 160.583474885L440.390110404 159.026225091L441.548590828 157.950030547L442.0311977 156.44425427L442.589735664 155.018081478L443.001371204 153.542788398L442.703182085 151.909956271L441.423238778 150.853167439L441.912191412 149.254759953L441.199523382 147.742779315L442.58157801 147.470799012L443.903567429 146.984597143L444.478728479 145.638602988L445.691386521 144.818864632L446.957278219 144.294036431L447.901691935 143.301056488L448.878706523 142.374810666L450.008225815 141.642229614L451.224863505 140.950400622L452.022632169 139.800444197L453.333608128 139.284815749L454.235624015 138.202735346L455.588157723 137.980769586L456.878418089 137.518336437L458.303774361 137.412744216L459.418696942 136.518463579L460.599030751 135.747221475L461.101140326 134.429690352L461.113191475 133.030688932L461.8875726 131.865491918L462.785424324 130.786357376L464.118506591 130.346401983L464.366996089 128.926682825L465.487811439 128.020524742L466.001271648 126.731712718L466.991389015 125.759938351L467.5259279 124.469055185L467.406858251 123.076958353L467.882455986 121.78909529L468.12951365 120.438633524L468.317622049 118.990048458L467.506910277 117.774922997L467.864113192 116.409727942L468.848709567 115.398826643L469.683667867 114.314568606L470.67587514 113.372074268L470.405175166 111.941137664L471.0398132 110.630377347L471.213725436 109.152202127L470.324360803 107.958770941L470.1795365 106.639482511L470.290466199 105.316912799L470.154267917 103.917231741L470.951770586 102.758937078L471.416666924 101.503875703L472.350073119 100.544677843L473.251594879 99.5684406645L473.77309 98.34622L472.396929602 97.85785935L470.937195987 97.8964772083L469.449593525 98.0272343393L468.118156133 97.3509703482L466.582514629 97.3591387511L465.424174128 96.3509181232L464.067568126 95.8655515633L462.653852778 95.5873979092L462.149390068 94.0472298442L462.284285445 92.4321745724L461.134162776 91.3327475712L460.119115915 90.1075121834L458.507114016 90.1319336444L457.065545423 89.4101119729L455.946155806 88.3147147414L454.804311551 87.2427446355L453.669384356 86.2371584584L452.303222811 85.5792329829L450.851473477 85.1800766146L449.358067207 84.9886617605L448.199818972 84.0173837717L446.852211198 83.3326406156L446.364215614 81.8477278186L445.160320175 80.8508619926L443.625943906 81.2044701016L442.051388299 81.2155997169L440.747927606 82.0824449084L439.476794857 82.9960377587L437.968653213 82.5113043484L436.401473938 82.7424034878L434.883451095 82.3468083921L433.605286224 81.4373121606L432.26774915 80.6087301115L430.696870003 80.6975689898L429.212707244 80.9385720549L427.771591815 81.3675334653L426.841396945 82.712573573L425.256142751 83.1142756124L423.720080147 83.5156389579L422.19390684 83.0781736506L421.038124051 82.041860522L419.926933728 80.9578702898L418.755049843 79.8735844146L418.206671174 78.3741616811L416.785818306 77.6126127429L415.284257396 77.0260170643L413.703872108 77.3378298978L412.101721873 77.5050409146L410.689921399 78.0223362132L409.226064672 77.6789727173L407.769343114 77.5081225628L406.479180094 76.8104787765L405.006006728 76.7969321792L403.717369712 76.082902827L402.442267642 75.4367985418L401.230068211 74.6792310037L399.63488488 74.6539930127L398.368576768 73.6835752788L396.926431371 74.236406568L395.382481136 74.1961145213L394.225212489 75.2047348008L392.704695385 75.4159534624L391.346984568 76.0291922926L390.24666 77.033546L389.457687814 75.9491235572L388.411102909 75.1106074984L387.57462484 74.0367191101L387.268288223 72.7104123172L387.060413526 71.3609570735L387.053056162 69.9956046599L386.654850407 68.6077259947L385.474057718 67.7767605078L384.737155646 66.5601136013L383.423133576 66.0155033174L382.146664304 65.4575204409L380.757664996 65.5642894218L379.551864136 64.9090735168L378.615650213 63.9056956771L377.291590395 63.5388794906L375.920661145 63.6296622345L374.65524322 62.7989447685L373.16266152 63.0510834281L372.024622092 63.9458922522L370.606646952 64.2377193842L369.699439631 63.1292136404L368.866703709 61.9637261924L367.51880268 61.3869286338L366.053346138 61.4313102839L365.161208921 60.3646793456L364.124753794 59.4376566152L362.706671255 59.6436207945L361.367679474 59.1332480471L360.811301187 57.9362220657L360.192117195 56.7704437063L359.381154101 55.7204158361L358.370590815 54.8607754968L357.337702345 53.8010145271L357.319227754 52.3212812424L357.133555829 50.92683626L356.382687785 49.737236305L355.839233698 48.3334449963L356.218715535 46.8767480756L356.698856055 45.5017402018L357.635203079 44.3861973644L357.770488986 43.0102057633L357.478425525 41.6587790734L357.267308753 40.282045317L356.544501587 39.0914505372L355.293770556 38.4208382128L354.201758877 37.5144390199L353.93009214 36.0992876493L353.126871668 34.9029210286L352.26738512 33.730803642L351.477024839 32.5110057406L351.20072877 31.0813594916L351.116994959 29.6276688215L350.369217368 28.3874444711L349.177775744 27.5641616387L347.7240652 27.1317678596L346.93335535 25.8375435135L345.647901085 25.0613086988L344.147188547 25.1141767664L343.218575085 23.9856394712L341.959946174 23.2428254611L340.724023007 22.3668866294L339.20959666 22.3310014077L337.701782238 22.1556505194L336.36273 22.870627L335.626930004 23.9583706311L334.606931695 24.7855291946L333.379449348 25.2108541809L332.161387348 25.662450486L331.218418015 26.5393395227L330.630081014 27.6847587117L330.252689567 28.9078378485L329.562680052 29.9859073027L329.015650758 31.1435178045L328.142018921 32.0795042024L328.024479629 33.339843323L327.820159974 34.5890525377L327.36698749 35.8376685961L326.348401237 36.6902466892L326.494466781 37.9795012704L326.249721495 39.2537117175L325.065571891 39.9434395121L323.708136814 39.755543998L322.91504908 40.8840582189L321.580902141 41.234178834L321.140523109 42.4590273617L320.801918849 43.7158227961L320.069968034 44.8122913435L319.022882446 45.6132951142L317.876173256 46.0915761399L316.992911269 46.9653855972L315.708346379 47.1749156837L314.874561876 48.1743221144L314.037553996 49.1654012608L312.830563313 49.6407890574L312.30225922 50.7824506288L311.738716035 51.9071352232L311.705959573 53.2616685031L311.292828474 54.5520777743L310.694566907 55.7884010312L310.672803725 57.1616957783L309.307654881 57.6876167484L308.340982338 58.7856916219L307.729582769 60.0867796765L307.538302719 61.5115784343L307.510895475 62.8990295752L308.318796042 64.0273329467L309.038270183 65.2266868763L308.834597795 66.6103813678L308.783076537 68.0009524637L309.207509342 69.3261691277L310.054703898 70.4051084745L310.988018192 71.4104806247L310.085505447 72.4716955207L309.489264371 73.7307439273L309.065543917 75.0519577163L308.397584878 76.2680891325L309.574715058 77.2624777503L309.924259437 78.7632318641L310.17667894 80.2764439836L309.512245833 81.6592148147L308.055584726 81.713111799L306.605296266 81.859501171L305.586945785 82.9017895174L304.609424184 83.982462557L303.801163229 85.2288305541L303.912462723 86.7101581269L303.215660304 88.007995319L301.90898 88.68807L301.902808915 89.0638552379L301.96640025 89.4342722587L301.842442536 89.7954201976L301.587529834 90.0796962307L301.750209704 90.4186966041L301.919439519 90.7544751962L301.794454498 91.1138913378L301.784681344 91.4942933668L301.490953352 91.701860698L301.305598987 92.0100880331L301.162443439 92.3397173465L300.900659368 92.5859247701L300.615941153 92.8084720689L300.342032046 93.044195557L300.114357432 93.339193527L300.054218267 93.7069472667L300.004385368 94.0539126481L299.936859369 94.3978727233L299.659809881 94.6295453955L299.52403406 94.9641998034L299.526717312 95.3238672642L299.372596223 95.6488512213L299.166646075 95.9332944681L298.929568194 96.192364926L298.860156784 96.5290563996L298.839269044 96.872193099L298.938074663 97.2084017607L298.89284001 97.5558965675L298.918353048 97.908179557L298.78308416 98.2344563533L298.720431294 98.5851683727L298.844660596 98.9190716263L298.52594511 99.1220790611L298.149577141 99.1558241496L297.906909564 99.4365477522L297.593895659 99.6358354577L297.224578421 99.7059099496L296.859288402 99.7946165403L296.497748147 99.9648683531L296.328820841 100.327029368L296.152991718 100.662182154L296.156588356 101.040639992L296.059843554 101.416306861L295.753306781 101.654046971L295.76457389 102.022387717L295.676261936 102.380162578L295.564733068 102.728821688L295.403866967 103.057643769L295.125631551 103.318293389L294.999471695 103.678066737L295.007741599 104.060101059L294.832172455 104.399503609L294.515377565 104.580466983L294.205692533 104.773344993L293.927236359 105.012992896L293.600045712 105.180071436L293.479218092 105.512588426L293.481389131 105.866371055L293.41574044 106.20855219L293.37226812 106.554251246L293.344756874 106.903420001L293.244199376 107.238925407L293.084430589 107.560429455L293.09492 107.91929"
+ id="path5714"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M253.36048 71.799171L252.476148614 71.1996134833L251.448109226 70.9086732237L250.41286848 70.706452544L249.374356299 70.5217661758L248.43711163 71.1727936976L247.296987243 71.1240004043L246.330276133 70.5057722775L245.190085569 70.6350079748L244.116677789 70.1841417089L243.486193345 69.205380237L242.38898706 69.5143916234L241.265143735 69.3237982079L240.538573405 68.5204870717L239.707186558 67.8262182943L238.718871534 67.2225127643L237.581159954 67.4389366865L236.52576081 66.9220966524L235.46021561 66.4265117459L235.325141684 65.2093451699L234.553817072 64.2581365801L233.588996547 63.5580922183L232.441980144 63.2336016575L231.394339362 63.8468158458L230.180526875 63.8623751683L229.516096366 62.9525422363L228.524695132 62.4173904299L227.428981104 62.3239125476L226.344067417 62.1442193738L226.286530885 60.9628028401L225.559660642 60.029681665L224.645420589 59.3409942181L223.552315995 59.0015128165L223.794680175 57.8221648277L224.055261172 56.646707632L224.254882099 55.4168428904L225.039966308 54.4493416855L224.338514653 53.4208592108L224.280369979 52.1773038958L224.068400123 50.9711970313L223.384139161 49.9556125084L222.961285832 48.8669398104L222.576761934 47.7641458349L221.426688734 47.2870834208L220.864074646 46.1763528946L220.553245351 45.0039208027L219.718638418 44.1237826733L218.795112384 43.3787545211L217.703374798 42.9139144114L216.539750802 43.1275772397L215.40466631 42.7940269409L214.234583077 43.044127666L213.107903266 42.6413401916L212.639014193 41.520845861L211.841188222 40.6049647396L210.949993373 39.6882781291L209.676788735 39.5721206845L208.727438983 38.8592267189L207.546598314 38.7363525017L206.420695088 38.4116539826L205.536729638 37.6424386134L204.80354148 36.7237088853L204.55423941 35.5750236951L204.088241202 34.5125709157L203.30399 33.657638L202.378062975 33.0348761828L201.932349618 32.0118841294L200.888380037 31.7156259208L199.80428513 31.7644075151L198.773536646 31.3895976622L197.681331957 31.4896665308L197.2582977 30.4527512759L196.325380239 29.8332222302L195.349100241 30.1335159946L194.458608496 30.6338393218L193.451578481 30.7741654891L192.462467354 31.0096650936L191.431538626 31.2221334484L190.417780901 31.5054215013L189.373498661 31.3068007636L188.428874214 30.8192966612L187.423216234 30.7237710463L186.50489799 31.1446804438L185.530244413 31.1001642544L184.555087938 31.068523545L183.532183193 31.1544736514L182.670860795 31.712904725L181.694951781 31.490576055L180.694227016 31.4711239631L179.772222781 32.1592057052L178.622955294 32.1069320212L177.593253949 31.7695019182L176.578958913 31.388254606L176.085740849 30.4384856738L175.238276283 29.7849346853L174.239907207 29.4239184242L173.428991754 28.7387252547L172.537966925 29.278556434L171.51025937 29.4493198058L170.438908367 29.5939216235L169.502929753 29.0529533313L168.554130599 29.374867042L167.64584943 29.7978015414L166.649204657 29.9586974674L165.64562115 29.849114408L164.633990265 30.2844078168L163.588944032 29.9369085068L162.607587963 29.5851787087L161.785870667 28.94365375L160.773458718 28.5988077135L160.207362299 27.6913763993L159.233142187 27.4301742524L158.288571028 27.0764558429L157.244614859 27.275111765L156.596201133 28.1170549318L155.628257885 28.5619177545L154.613226825 28.2386082897L153.810412516 28.8552784724L152.812493092 29.0254247378L151.826964616 28.8801605184L150.847727588 29.0630892297L150.09674285 29.8662147985L148.99912164 29.9311488947L147.973963005 29.8457854485L146.958349827 30.0093917391L145.916033494 29.7202277019L145.215965253 28.8956407519L144.186710709 28.7862804533L143.15177 28.77137L141.860617439 28.5521302359L140.654815341 29.0631902232L139.811038689 29.9977365892L138.864556119 30.8281019866L137.777654071 31.4040061532L136.554359898 31.5327424641L135.861299795 32.6164477611L134.631791015 32.9946773711L133.351306761 32.7845758344L132.232395866 33.4417067134L131.035669586 32.9527524768L129.7949584 33.3158857687L128.570891889 32.9753458613L127.64594978 32.1042612801L126.491560526 31.4497643232L125.202414979 31.7645413492L123.956033961 31.5592842068L122.756803195 31.9560734535L121.815686531 32.8397546044L120.533922844 32.9936207978L119.454070527 33.7116795755L119.087592797 34.9556182839L118.293639973 35.9220035268L117.1567404 36.4432720612L116.108892084 37.2308477837L115.800430902 38.5048624265L115.531097243 39.7130893348L115.459049792 40.9488733153L114.319649175 41.4172395204L113.341676063 42.1663518362L112.411073006 42.9768492521L111.749897362 44.0188544733L111.183635581 45.0831619266L110.183514059 45.7563333009L109.13259801 46.26993811L108.072358855 46.7640103503L106.921769822 47.0350694037L105.76012014 46.8162129448L104.569284466 46.8532322254L103.533604135 47.4421518137L102.503290485 47.9000876338L101.591029428 48.5626819275L100.696709726 49.251509302L99.9842779774 50.12714158L98.807919327 50.3300194832L97.71035051 50.7994039841L97.1959045627 51.8793662732L96.4149889642 52.7855362387L95.8910125234 53.9240003524L94.7820145451 54.5077600056L93.709799525 55.1251241035L93.1445248956 56.2256912628L92.9799187253 57.4726798583L92.1864955794 58.4486693357L92.073733236 59.6578324281L92.1602359513 60.8691573268L91.6746167794 62.0708713515L90.5473935942 62.7106451147L89.3971543402 63.350464402L88.1204441647 63.0304172343L87.068261534 63.7718531337L86.753616554 65.0199773334L85.515561945 65.1277724318L84.468117 65.796546L83.3365196588 66.5412677676L82.8974189796 67.8227956243L81.7412280829 68.3848042632L80.6829316896 69.114626052L79.6802109403 69.891005952L78.7130351576 70.711241074L77.6671645629 71.5107404765L77.1875358539 72.7367098468L77.148208836 74.1610993897L76.6393153 75.4920612798L77.5334615103 76.6301015351L77.7918168774 78.054140008L76.8287476039 79.138030943L75.5181028108 79.7581375556L75.7038980483 81.2670956586L74.8383129609 82.5169904075L75.7125499342 83.5494532074L75.9089765778 84.8879920721L75.914895423 86.1910385043L75.7664802182 87.4856187314L74.8562777176 88.4653416905L74.7316004974 89.796800011L74.0594333819 90.9158046786L73.9949230876 92.2195755553L73.8695287847 93.528091949L74.5534029948 94.6507027224L74.1236938574 95.8550274446L74.2537389164 97.1270872946L74.9250803524 98.2566608165L75.8588322 99.1811840192L75.4025973017 100.476721661L75.8126178725 101.787618756L74.4783060041 101.524358524L73.1434581416 101.784887401L71.9240476751 102.384241001L71.0116701559 103.391094459L69.6568548991 103.635483865L68.5060564635 102.879895669L67.2281344776 102.943175041L65.9583691892 103.100607545L65.2625211242 104.270386518L64.1495880169 105.053947156L63.4910572336 106.211980792L62.9281999946 107.419414608L61.6511169571 107.840156824L60.5042755432 108.542096899L59.167777543 108.613206291L57.8512904616 108.85433948L57.8954414387 110.33153141L57.1657313955 111.616665083L56.0347738971 112.481155097L54.8614993462 113.287278335L54.6318410045 114.61603138L54.6837568396 115.963485406L54.5123325895 117.326698984L54.9359830015 118.633702373L53.9743907415 119.603754315L53.1317900708 120.678782014L52.8544892274 122.078102932L51.8391577742 123.080149253L50.7087726115 123.930663728L49.442690771 124.561680574L48.0349428692 124.121805004L46.625254 124.55542L47.829807401 125.046721215L48.5459668768 126.13274211L49.0300415735 127.319239526L48.8947388535 128.593522698L48.7942383085 129.762937952L48.7967135149 130.936661202L48.8756758468 132.132407889L49.4304888416 133.194588537L50.4720280339 133.788058531L51.6596313079 133.951181144L52.8379051531 134.055468847L53.9722574973 134.390804409L54.9944231921 135.179017868L56.2656827503 135.402629812L56.7524491749 136.558803303L57.3346188822 137.669999561L57.4349847019 138.770082734L57.1221765387 139.829520007L56.7993440535 140.876599297L56.1994281752 141.793494488L55.9627320651 142.941591562L56.5520341766 143.954939951L56.6222045765 145.111773735L55.9612041561 146.063754161L55.8155335192 147.207529203L55.1604498617 148.156374124L54.8491904739 149.237208832L54.734476096 150.35610413L54.9589592087 151.486647699L54.9731478078 152.639175405L55.8791064361 153.419627281L56.2221893392 154.565122934L55.8927580415 155.62808651L55.3764429435 156.613903564L55.2075812843 157.7488636L54.4931740759 158.646789479L54.6447228137 159.783021725L55.2963006944 160.726121403L55.3530791 161.845338259L55.6412309583 162.92831502L55.4337285929 164.054219398L55.9038395388 165.098112879L56.7256453058 165.865131038L57.1075699144 166.922398822L56.7406731642 167.955925699L56.772240865 169.052189585L56.7484558864 170.150111067L57.1375809822 171.177038019L57.5677682244 172.256411772L58.3648448091 173.101857028L59.2780010303 173.790616591L60.2723934083 174.355796047L59.9547506501 175.489590457L60.2193670706 176.636919894L60.9751320244 177.558210898L61.0955419509 178.743731555L62.2198630317 179.113214934L63.1647179753 179.825861408L64.3157151567 180.13845474L65.4956548542 179.964525407L66.148792517 180.905094969L66.8702537425 181.794338248L67.6263396272 182.68354767L67.980032 183.79587L69.4545279035 183.630497382L70.9040928687 183.313878236L71.9282784373 182.211248059L73.2693117379 181.528328538L74.7045397575 181.426674004L76.1409913045 181.344090317L77.5605256067 181.057432258L79.008117816 181.09899274L80.3544336201 181.563651578L81.6624736843 182.127127638L82.8501870724 182.950973878L84.2487775152 183.31611836L85.5468616133 183.940323437L86.9729353803 184.142728761L88.3556068927 184.481337181L89.7467674947 184.783178783L91.0488847121 184.189311299L92.3257294332 183.542893946L93.6404791381 182.758118466L95.1441387459 183.046990625L96.3902651746 182.299893819L97.2060072676 181.09758373L97.9697718549 179.878111245L99.0920817447 178.977628044L100.508780989 178.606641114L101.910787385 179.029779524L103.395888488 178.94488645L104.526530717 177.978252976L106.001909346 178.148266297L107.470117935 177.924636766L108.627348288 177.011178515L109.676231119 175.975112458L111.089259676 176.30324275L112.539886832 176.303030826L113.832850491 175.640410728L115.250764224 175.323644149L116.378472136 174.366059463L117.056821129 173.051321387L118.269967353 172.178168133L119.749866854 171.968363859L121.08111561 171.507303919L122.477844541 171.323054604L123.824243833 170.933460733L125.171579643 170.547118073L126.613879566 170.716636017L127.806650829 171.545045407L129.13528377 172.171023962L130.591089158 171.976742419L132.041487831 172.194160782L133.433840352 171.733420606L134.845309554 171.37093439L136.283999464 171.602910475L137.097946942 172.910509131L138.571276282 173.359536297L139.936228354 173.826551982L141.270870465 174.374209034L142.511580715 173.712417575L143.917196505 173.67274254L145.286011226 173.531660336L146.597533019 173.115164815L148.01904221 173.408699791L149.363294588 172.861126317L150.668664018 172.375068582L151.88281 171.69236L152.890107787 170.747370174L154.207096703 170.331203385L155.34792124 169.539527032L155.979142907 168.302679718L157.342538802 168.382881802L158.598889574 167.847285425L159.967561371 168.057271285L161.235140577 167.499956739L162.587612024 167.747630459L163.899371515 167.335552405L165.314224312 167.16854058L166.27328206 166.115018097L167.649327282 166.453230542L168.752371019 167.342715013L170.003996367 166.580648518L171.457754159 166.764767049L172.724637599 166.221205301L174.098427189 166.106509248L175.510041538 165.853777073L176.791743916 166.497024799L177.915063345 165.758846257L179.177660847 165.297758796L180.25535098 164.471906578L181.556856131 164.085212573L183.011977738 164.355558275L184.122351875 165.334095432L185.628429952 165.386548644L186.853942596 164.509541647L188.024721434 165.216675921L189.002177905 166.173410374L190.42477611 166.07065907L191.643327901 166.811924888L193.060512874 166.463424227L194.201338506 165.553268836L195.601559345 164.981578374L196.328750267 163.655440467L197.747486929 163.276381342L199.172353285 162.921056978L200.098308246 161.774632397L201.203164185 160.799452792L201.852654856 159.332868236L201.87692537 157.729085416L201.501195698 156.186147216L200.704146506 154.812632142L201.035892591 153.24999855L202.280980314 152.249180999L203.0593477 150.944525773L204.163403505 149.900954104L205.623061671 149.529533279L206.47248825 148.285736722L207.629335959 147.411304209L208.254609553 146.102884639L209.714348245 146.211516522L210.998942673 145.509765078L212.403776261 145.267426497L213.806615667 145.521054171L215.212273005 145.373614808L216.602865129 145.626329004L217.915609914 146.18046013L219.340277988 146.206557132L220.760080881 145.970496377L221.958202595 145.172956853L223.015744403 144.238908147L224.19678 143.4669L224.341762406 142.112142552L224.901611627 140.869984554L226.031178177 140.009794462L226.409549316 138.641334428L227.876564278 138.36373627L228.83359213 137.217747035L229.806646955 136.08683415L229.846599414 134.595457791L230.08983845 133.147921322L230.987811917 131.986813785L231.38491258 130.587271859L231.184920369 129.146296615L230.131100751 128.1569029L229.488361129 126.862174554L228.922924379 125.548613581L228.635832748 124.147635514L229.543464228 122.998089963L229.889342428 121.574847837L230.631669421 120.234572219L232.079052094 119.732106802L233.231272899 118.798056303L234.614219572 118.261845882L236.043727775 118.795423681L237.536709939 118.480458246L238.52088139 117.434803734L238.59360846 116.000684641L238.410310634 114.647329318L238.667712695 113.30609373L238.773093776 111.892208151L239.790181546 110.904427774L240.543044072 109.766792268L240.689036288 108.410435826L240.222450627 106.947424235L239.313286812 105.70987575L239.378019684 104.176612749L239.917419931 102.73990361L238.992102536 101.473065929L237.504142567 100.976009473L237.169299967 99.5066313704L236.471562982 98.1708339774L236.862006509 96.7499773814L237.532701312 95.4379377113L236.849253698 94.0528641283L237.129910801 92.5340616191L236.983226691 90.9603856115L237.815153305 89.6165587949L239.07574969 88.7911512625L240.136061145 87.7205717647L241.060636101 86.4236852592L241.201403819 84.8371992342L242.748548445 84.4884314876L243.940583761 83.4423209571L245.294956305 82.9205123716L246.744916203 82.8555086397L248.180198193 82.6559818676L249.49083864 82.037866227L250.62701377 81.0765446162L251.87175398 80.2606678024L252.450178418 78.8923723894L253.034168189 77.5264429936L252.475161563 76.1227096832L252.368102736 74.615562039L253.221286887 73.3331566642L253.36048 71.799171"
+ id="path5717"
+ sodipodi:nodetypes="ccccccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M108.46536 -25.451935L107.669576125 -24.0720448984L106.715489015 -22.7964719078L105.383536463 -21.9270843239L104.09622911 -20.9928615712L102.468689133 -21.3047685884L101.001717737 -20.5339461141L99.3429937312 -20.6411377298L97.9956963335 -19.6676670869L97.2934852624 -18.3106831064L96.8217870988 -16.8574086126L95.6297794371 -15.7527559724L95.4517272646 -14.1373807389L94.8442274366 -12.6217705189L93.3788150515 -11.9015643529L92.3025440707 -10.8142388953L91.0587085736 -9.9234476005L89.8667118096 -8.82452044301L89.220699786 -7.33752157007L89.2640140164 -5.75025487971L89.4479516875 -4.17308697425L88.7180059236 -2.80450030915L87.3891344437 -2.0045310174L86.4922672815 -0.808238194067L85.5761574267 0.373383555745L84.837524899 1.72456328307L84.8281417083 3.26442581662L83.4470943275 4.07963418017L82.9877334919 5.61613805802L81.575435151 6.30566642483L80.530679555 7.4797710697L79.5634371365 8.8096042737L79.6962960549 10.4486170114L78.1395174495 10.7721023952L76.6724460934 10.1589922455L75.1066357193 9.96022372129L73.6685307981 10.6107045357L72.878329105 12.0613931351L71.4860968496 12.9505531181L69.8821865675 13.0310941316L68.3165446959 13.3885582246L66.7493654913 13.3908152852L65.358564544 14.1131230301L64.3388891502 15.2699657695L63.0091580509 16.0508871712L62.3143636227 17.4286637204L61.0236863307 18.2743348415L59.8940963116 19.2495790124L58.6723462069 20.1065512905L58.0085121135 21.5624448589L56.7947071803 22.6050278868L55.7606108757 23.8322609245L55.3778016725 25.3907580242L53.8193771273 25.9079788937L52.2101538663 25.5814747015L50.6184973632 25.9335913223L49.3514712699 26.9592625257L47.8936558689 27.4366064223L46.368379154 27.5997440382L45.5359832274 28.932098226L44.1805375786 29.7263385885L43.6949217914 31.2149302457L42.9684342786 32.6019932248L41.4261502392 33.0137490905L40.191215 34.025242L38.863371666 34.7155072619L37.3889783307 34.9720191417L35.910254296 34.7591831967L34.4311228266 34.9691689262L33.3217199237 36.175731685L33.2950015367 37.814589403L32.2990407087 39.0972752875L30.7193622765 39.4738879526L29.3646171215 40.1035138985L27.9189143163 39.7270744403L26.5355797519 40.0339593602L25.2709968236 40.6731955359L23.8603830305 41.2686021932L22.4100357841 40.7778545739L21.2959928618 39.7591225916L19.7930972194 39.6169565888L18.4680495337 39.0936833599L17.5063132099 38.0426698087L16.1693146075 37.5943730754L14.7598083282 37.63711968L13.2867395337 37.4370634732L11.9915135047 38.1666823415L10.7600535923 37.4517310313L9.37633461183 37.1156199263L8.33850965188 35.9612204429L8.19617229891 34.4154329761L6.88699378906 33.7375416763L5.53457963975 33.1506337163L4.08182321604 33.1808081009L2.62881333313 33.1676171839L1.15206850454 32.7273555297L0.279902737908 31.4569491032L-1.22631197775 31.5400305255L-2.44453514615 32.4297032768L-3.90742875578 32.0901253913L-5.3345948797 32.5576376459L-6.22519577959 33.6984056823L-7.30577321388 34.6611486824L-8.29059244004 35.7635882772L-8.70116465761 37.1836841974L-10.1234605428 37.4242616753L-11.3521226272 36.6684888322L-12.7853789656 36.9100760647L-13.9921589852 36.0999710672L-15.39956581 36.1028262317L-16.7624218048 35.7515063489L-18.2540378622 35.7930653462L-19.3461333859 36.8099099657L-20.6323784548 35.9384683753L-22.1825349716 35.8342973807L-23.6803087737 36.0104658067L-25.1081874329 36.4957741737L-26.246976059 35.5051522688L-27.6425435285 34.9302064177L-28.7908552355 33.868478294L-29.1090152895 32.3372498443L-30.4428325813 31.7330718312L-31.8800261239 32.0133830167L-33.2781230093 31.9361695234L-34.6684895301 32.1020543111L-35.9053550245 32.7717371707L-37.2573702889 33.1595078611L-38.1662526309 34.3152230007L-39.580985 34.715569L-39.4100880975 33.5075873093L-39.0289311585 32.3486460234L-38.590298478 31.1467499502L-37.5233041038 30.4407217605L-37.7429083539 29.1500032444L-37.1222847658 27.9971777259L-37.9548340975 27.0127187881L-38.1303362682 25.7354182057L-38.4346965181 24.5519850256L-38.9476902202 23.4429373643L-38.4468249474 22.2513501006L-38.816149676 21.0126631048L-38.0128129622 20.0439461139L-37.0488437084 19.2349184494L-36.4365544153 18.0639581697L-36.6505553668 16.7600219183L-37.5415345374 15.8534245948L-38.5684131581 15.1042364423L-38.8510165291 13.8625119398L-39.379171548 12.7037208969L-40.1646376195 11.7211033744L-40.5531221805 10.5246194043L-40.5920583108 9.27417092551L-40.9911509507 8.08848020481L-40.3419228118 6.99984949206L-40.0744367347 5.76087200899L-40.2999504287 4.52461957744L-40.284281758 3.26806436837L-40.0477843026 2.06463549257L-39.7267779907 0.880943364808L-39.3058625969 -0.277420959492L-38.6527012392 -1.32258023802L-39.0989324607 -2.41722103789L-39.8901047763 -3.29551890917L-40.5153081466 -4.34664854396L-41.6356176141 -4.83721908975L-42.6974698564 -5.47121389434L-43.2905959561 -6.55642402452L-43.6165160723 -7.70493993087L-43.8633802912 -8.87300275739L-44.0975463469 -10.0436271786L-43.8584955632 -11.2132638743L-44.1280405759 -12.3645098862L-44.0593658164 -13.5448935828L-43.7896532063 -14.8168076726L-44.4218040642 -15.9529835556L-45.5030581982 -16.6260037569L-46.0209443893 -17.7895589068L-45.9984604685 -19.1385966506L-46.8231456339 -20.2064462368L-47.7003850639 -21.2576087743L-49.0592407758 -21.4249493017L-50.1125553279 -22.0917194573L-50.9870816827 -22.9801211913L-51.1512250438 -24.2255375361L-51.717260512 -25.3469691049L-51.9234251719 -26.6455101418L-52.8723052343 -27.5556416261L-52.5691206001 -28.83372722L-53.0929370497 -30.0383184514L-52.6748348838 -31.1963793539L-52.5463791921 -32.4208848093L-51.8413177821 -33.515385865L-52.011651 -34.806134L-50.9530486294 -35.6462622009L-49.783050341 -36.3226928169L-49.8800346587 -37.7343790454L-49.1402248943 -38.9405902534L-48.1700721932 -39.7681211845L-47.0235934798 -40.3263238942L-45.9201382407 -41.0106182997L-45.2297173113 -42.1102506193L-44.0255958626 -42.6499964443L-43.3678853745 -43.793959264L-42.1316550579 -44.1960004021L-41.2652145449 -45.1651151062L-40.0611587682 -45.542651373L-38.9829337167 -46.1981776382L-38.135340323 -47.2403411833L-36.8068498282 -47.4394201144L-36.1101323589 -48.6029116112L-34.8791048468 -49.1718570915L-34.3569986447 -50.3617234106L-33.667247231 -51.4629135535L-33.204189422 -52.7821791618L-32.0319505387 -53.5442423353L-30.8700530395 -54.210174834L-29.5612217617 -54.4937812128L-29.3257976491 -55.8690842535L-28.7899777632 -57.1574087532L-27.8272783514 -58.2048184715L-26.5040186015 -58.7271602273L-26.6725424047 -60.054443009L-26.2620926822 -61.3278678714L-25.8141830076 -62.5814813582L-25.8768354678 -63.9112349144L-24.5847301993 -64.7079877817L-23.074659556 -64.5529464681L-22.0314500345 -65.6954192698L-20.48845924 -65.8081562054L-19.2172691605 -66.5926789965L-18.2935556291 -67.7666268403L-17.8498400111 -69.1711057974L-17.2593833598 -70.5204781083L-16.3760160198 -71.7875113586L-14.9770335521 -72.4421556666L-15.061511203 -73.9960888129L-14.2839931653 -75.3441653677L-14.223684053 -76.887650222L-15.1055834351 -78.155812737L-14.2686271422 -79.4652912021L-14.4443321289 -81.0094276743L-13.0915275367 -81.4357770931L-12.394464883 -82.6710737168L-11.5094432949 -83.7170456301L-10.2098700674 -84.1511307387L-8.81737789688 -83.8720039223L-7.40806499337 -83.6965520354L-6.48991464669 -84.8692160319L-5.06292073461 -85.2956304813L-3.69125885917 -85.2540910526L-2.38630382411 -84.8295039812L-1.03572629484 -85.0940333429L0.161780187393 -85.7722764193L1.32984317244 -86.573131626L2.10459094732 -87.7586720447L3.52216848716 -87.6192247773L4.861603 -88.103876L6.38479484546 -88.3791407696L7.73787458062 -89.1308450477L9.00336177754 -89.9904676059L10.156178976 -90.99616204L11.2759660598 -92.1936450295L11.3128162833 -93.8327089954L12.4106991784 -94.9046861807L13.3718172667 -96.1008190987L14.9587712362 -96.6812339378L15.9633248814 -98.039974627L17.5800554657 -98.1164274722L19.1983619304 -98.1437588831L20.5240469373 -97.3089182616L22.0337819115 -96.8904688517L23.5074872278 -96.3879084267L25.0495611212 -96.1725425806L26.4179676738 -96.0568373346L27.7719345988 -95.8272774012L29.0800518791 -96.3685051102L30.4878881802 -96.2198605636L31.8072012545 -96.7324359834L33.2125459987 -96.5641306096L34.5235556084 -96.0602674656L35.9258258992 -96.1394021388L37.3238275246 -96.1322592609L38.7189594745 -96.2220724453L40.1043614408 -95.9215436303L41.3101729208 -95.1761076158L42.674852763 -95.4898539839L44.0459722329 -95.2055667096L45.4117148144 -95.2845419864L46.7759943215 -95.3856919717L47.9822500308 -96.1037567329L49.0482841881 -97.0171246833L50.3047640707 -97.6882616333L51.2210194372 -98.7789690204L52.2150655424 -99.7820407479L53.4469243401 -100.472551032L54.6527405371 -101.211622776L55.586890247 -102.273500388L57.0101563958 -102.216273236L58.4339789303 -102.257393394L59.6481851312 -103.125147799L61.1405126875 -103.141049677L62.446988051 -103.665530947L63.7200016006 -104.266692306L65.0089574692 -104.857947426L66.4036300914 -105.11461477L66.6124705962 -106.562216781L66.7539995753 -108.017941855L67.5838394209 -109.232411715L68.1316638323 -110.597497656L69.4587009529 -111.247004694L70.8311076126 -111.794167258L71.5525589036 -113.113603568L72.7142051049 -114.068581181L72.7033208104 -115.561914506L73.588142348 -116.764933098L74.1174912612 -118.085943101L74.8774101033 -119.28918915L75.5958880626 -120.605539083L76.4481380016 -121.839499279L77.8936792607 -122.24446363L79.269552 -122.84493L80.3281656478 -123.292395736L81.4684059742 -123.436411146L82.6241053079 -123.516369198L83.6718241025 -124.010656127L84.8082039444 -124.392899623L85.6590427128 -125.237614146L86.4338859858 -126.128163862L86.917683724 -127.204918543L87.6074774015 -128.168337688L88.523308809 -128.920165194L89.7800674753 -128.863420886L90.75292723 -129.661046211L91.9496775166 -129.597934114L93.0591265963 -129.144814787L94.2800064374 -129.218458765L95.3014036674 -129.891302521L96.250274006 -130.585424216L96.8841662804 -131.575545639L98.0691804642 -131.694887312L99.0594017719 -132.356674901L100.193135758 -132.332375636L101.292662939 -132.609834075L102.395663898 -132.833305967L103.516288326 -132.936996335L104.581437501 -133.395930145L105.740601183 -133.357167192L106.892175389 -133.63825285L107.999853708 -133.216137889L109.215007829 -133.226343074L110.386971673 -133.547597541L110.909084289 -134.679504021L111.922861601 -135.404810456L113.065637177 -136.025643819L114.363563314 -136.107849825L115.451491712 -136.770997031L116.418833712 -137.600214659L117.425790594 -136.716889346L118.618872853 -136.107971869L119.898303422 -136.697658979L121.265482119 -136.35781213L122.450182495 -135.943303889L123.639397727 -136.344675529L124.662106926 -135.594047887L125.925782299 -135.705853587L127.09041877 -135.953803643L128.280250266 -135.907345589L129.459697453 -135.827076148L130.63132439 -135.669503403L131.941383155 -135.677011061L133.249214817 -135.75373576L134.309740774 -134.969656905L135.524892489 -134.456917921L136.843432981 -133.860248029L138.228082546 -134.28132946L139.468443757 -133.58939524L140.086854543 -132.310787794L140.38919692 -130.873193372L141.597117428 -130.037121196L142.703438839 -129.220358765L143.975285984 -128.697431641L144.521328389 -127.376386026L145.378126322 -126.232174015L144.956008786 -124.871212488L144.80412 -123.45441L145.745676326 -122.519819844L146.596478776 -121.501918933L147.713234058 -120.734772497L149.045541748 -120.488576984L150.349249678 -120.402448149L151.632626289 -120.647431855L152.944479927 -120.914708691L154.220995059 -120.511092547L155.123688561 -119.529053567L155.630217531 -118.29508253L156.064390003 -116.990187823L155.681149518 -115.669437028L156.642130969 -114.766338616L157.076168891 -113.521074318L158.039222177 -112.674516995L159.078607804 -111.923645201L160.142661001 -111.042614507L160.485714835 -109.704429783L160.022689114 -108.428608608L160.237487726 -107.088469047L159.453459128 -106.079178433L159.056061737 -104.864499998L158.54771884 -103.673574311L158.635075729 -102.381643482L159.460887038 -101.502623157L160.188704159 -100.540893835L160.794621304 -99.4990588385L161.321092005 -98.4149073979L161.346503445 -97.1424628827L161.587022334 -95.892698325L162.322072224 -94.8376707185L163.361340156 -94.0805024703L163.196080736 -92.9103441957L163.125041029 -91.7307110225L162.444246706 -90.7653373829L161.710625463 -89.8394718165L161.211365067 -88.7923473193L160.950218479 -87.6620672145L160.542312143 -86.5122369247L160.931046037 -85.3557840575L160.916215001 -84.1180816795L160.152773626 -83.1437694072L159.730047443 -81.9787804105L158.681903454 -81.3175006164L158.894063159 -80.1042497983L158.281772448 -79.0355639823L158.530347765 -77.8677876368L158.200808199 -76.7202272002L157.487408439 -75.6841514802L157.3994674 -74.4292975088L157.972062578 -73.3122945167L157.917793594 -72.0582547247L158.560112082 -71.036107914L158.679581831 -69.8348235509L159.110305386 -68.6981608729L158.922974867 -67.497147925L158.583311353 -66.2679872085L158.934346076 -65.0420255482L159.535304857 -63.9716060351L160.14193099 -62.9043880986L161.128434004 -62.1978527663L162.079629065 -61.4444549111L162.423051772 -60.2441553528L163.27959 -59.33586L162.945959227 -58.2076773603L162.385724032 -57.1731523067L161.420888491 -56.5048380125L160.36340126 -55.9956500599L159.706630799 -55.0473883456L158.716675999 -54.4553265146L157.584180481 -54.2478996891L156.627171899 -53.6078164437L155.36507631 -53.3539212969L154.188922975 -53.8773822362L153.193172756 -53.1611788903L152.19057484 -52.4545933331L151.018503625 -52.4915095158L149.927705925 -52.9219443146L148.740830363 -53.1269661528L147.854895324 -53.9429481754L146.596304809 -54.1859431711L145.770085952 -55.1659733006L144.51214915 -55.3460206178L143.388709196 -54.7521311491L142.306917945 -54.3142582151L141.140554574 -54.2742394106L140.277082927 -53.4732779079L139.154192353 -53.1179761004L138.838914746 -51.9956842457L138.252765413 -50.9880295742L137.395167545 -50.1102632455L137.283233058 -48.8882082139L136.050991192 -48.8055155882L135.166975867 -47.9430916842L134.306396171 -47.1312835014L133.195465646 -46.7245116914L132.011086583 -46.4311098902L130.798644865 -46.5683085122L129.916680631 -45.7483534551L128.923618457 -45.067167194L127.923376201 -45.7933915435L126.698918602 -45.9624772166L125.45246944 -46.046461725L124.35719003 -45.4455857602L123.976250911 -44.3258443991L122.990354612 -43.6724350211L122.304832098 -42.7822126155L121.782225137 -41.787567446L121.462176131 -40.6373948537L120.858935283 -39.6071381683L119.916063558 -38.8642035812L118.782647655 -38.4688211294L117.717899829 -38.0377375751L116.99718375 -37.143260466L116.659952674 -36.0716676142L116.033289381 -35.1392893892L114.979034382 -34.5278512374L113.780505642 -34.748846878L113.242090051 -33.6972062183L112.258505383 -33.0426830109L111.718176188 -32.0304807525L111.886989798 -30.8955750222L111.307861186 -29.9392908845L111.20491532 -28.8260651884L110.32847613 -28.0787575822L110.056020684 -26.9596586849L109.041887119 -26.4366360124L108.46536 -25.451935"
+ id="path5720"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M233.83822 355.62913L233.018833641 355.538339935L232.340571071 356.006951424L231.608796349 356.371874497L230.808572964 356.203631732L230.136589914 355.81467126L229.391793937 355.595284796L228.662013572 355.34291145L227.965671536 355.009175845L227.166966852 354.732443716L226.322164592 354.76106163L225.6416569 354.255961687L225.207364483 353.528220823L224.865145206 352.82033935L224.470721734 352.140162654L224.446327852 351.322381022L223.987827886 350.644782586L223.190924751 350.497615128L222.714606314 349.841998157L222.356327942 349.16868884L221.80128374 348.64558774L220.96634705 348.632729936L220.364703934 348.053670215L219.560668833 348.01996278L218.849101595 348.39583603L218.159958417 348.119495157L217.424269113 348.219714142L216.736477338 348.42850797L216.030905988 348.565699286L215.320800496 348.362170555L214.703005851 347.95719706L213.971067214 347.972361919L213.248229735 348.088422769L212.482962758 347.920905636L211.706228011 347.81902989L210.991393872 347.486907306L210.218512096 347.33215907L209.43867374 347.033877678L208.627035622 347.22974298L207.836089921 347.38692835L207.12675561 347.770526026L206.502237854 348.22362318L205.956204994 348.768753966L205.394316147 349.304010241L204.711640312 349.673025229L204.026695477 350.118477909L203.58266709 350.804346926L202.767173064 350.828154498L202.027181309 351.171679619L201.19291584 351.385263654L200.400147572 351.048907462L199.653931076 351.380553617L198.881818589 351.646392927L198.073890609 351.412557059L197.580317721 350.731519147L196.87753525 350.354081593L196.239697636 349.874993413L196.01567086 349.09966126L195.384754941 348.596398857L194.769174175 348.133475342L194.208332909 347.605559691L193.605999735 347.110242797L192.876593708 346.834360709L192.124357129 346.671520495L191.38032 346.47458L191.076228727 345.764894342L190.732195245 345.073688006L190.158368997 344.479806168L189.334876991 344.417894003L188.605231791 344.442327516L187.875597153 344.417580585L187.192307248 344.130837117L186.452087589 344.096460253L186.322417216 343.376823087L185.923646027 342.763900909L185.858319431 342.046878466L185.929337272 341.330397334L185.274225448 340.972656727L184.682851383 340.517215668L184.577946728 339.766439148L184.19943587 339.109628748L183.923596319 338.493546707L183.471450019 337.992339899L183.586778497 337.295181662L183.241140248 336.678850203L183.21517169 336.018684387L183.333645912 335.368717366L183.116080299 334.735619799L183.156097482 334.067378862L183.229273295 333.393427406L183.09999721 332.727955424L182.940345867 332.050508595L182.452495102 331.554097083L182.33295159 330.855080393L182.722308037 330.26236078L182.836329872 329.589150647L182.600469981 328.94838316L182.28738626 328.230110079L181.595460231 327.862447181L181.469066172 327.125595499L181.558014093 326.383292241L181.706288831 325.694539233L182.054731498 325.082204511L182.328453608 324.418745536L182.258275217 323.70447906L182.502852283 323.072254121L182.975921852 322.58673224L183.594884862 322.273759542L183.938209059 321.671102415L184.341526614 321.041916276L184.20611017 320.306931491L184.756035593 319.878862179L185.239351337 319.376799238L185.210963178 318.730417264L185.490087481 318.146717711L185.330885169 317.519781416L185.484103379 316.891355864L185.553989747 316.238188643L185.273866243 315.644014977L185.192348321 314.991416265L185.467232882 314.393947665L185.505193198 313.76176061L185.510539641 313.128457465L185.278360553 312.53820021L185.119246412 311.924202289L185.067647383 311.299883769L184.899427375 310.696445203L184.656325163 310.100975979L184.7248 309.46145L185.13857385 309.075377991L185.443986374 308.598950048L185.953496005 308.361110061L186.435037014 308.070789241L186.995748074 308.100233043L187.526327295 307.916522616L188.063585204 307.779409799L188.617845774 307.763878981L188.573491041 307.196590513L188.626375583 306.630033566L188.780116009 306.083966967L188.972202335 305.550180781L189.430721013 305.219310099L189.88814495 304.886927598L190.24615399 304.449254384L190.598256319 304.006815388L190.940555839 303.596310893L191.333016609 303.23346458L191.660161378 302.763880913L192.218628102 302.638791189L192.805965145 302.555111601L193.179595969 302.094278569L193.739288587 301.966313125L194.282607888 302.151880145L194.698090789 301.817852265L194.899064156 301.324080688L195.033280328 300.797189746L195.455814132 300.455000866L195.998806601 300.285765187L196.348793702 299.837445474L196.580840757 299.343162353L196.701548932 298.81062956L197.164704092 298.461285485L197.744827731 298.458037495L198.210736265 298.157910446L198.732341973 297.970628592L199.302293809 297.852466881L199.7036883 297.430934264L200.113952502 297.054593556L200.473137107 296.629228464L200.867418342 296.132940345L201.465032904 295.921714343L201.859914376 295.399258686L201.791628995 294.747930506L201.708978588 294.159945866L201.487165991 293.609168054L201.579548411 293.026719954L201.711729226 292.451995208L202.16530398 292.078768787L202.445512973 291.562521812L203.030224001 291.586301684L203.588636528 291.411293344L203.784131032 290.909664316L204.051032293 290.44210309L204.169417913 289.890888166L204.585997357 289.511000533L205.129709418 289.595100035L205.644247108 289.400301432L206.170747045 289.303630225L206.663076176 289.093488529L206.873605492 288.567268525L207.349537801 288.259504779L207.784952607 287.927956807L208.30337 287.75259L208.941911752 287.67006863L209.567947999 287.820481275L210.190252613 287.700141783L210.799320655 287.524697364L211.459183446 287.497895515L212.016178919 287.852709952L212.63677857 288.057431636L213.274863073 287.916353423L213.716353292 288.398514392L214.221501014 288.813506673L214.831815619 289.0439123L215.453824041 289.240574937L216.114612651 289.111346288L216.718051261 289.410015793L217.359022594 289.386694353L217.990452894 289.499317246L218.666843845 289.630450823L219.261946178 289.283242028L219.900488153 289.02411886L220.551259983 289.250783138L221.244516019 289.213745653L221.811786894 288.81352139L222.34709724 288.39218471L222.671269029 287.793023282L223.361785157 287.880982715L224.036051259 287.708024315L224.599659814 287.320396627L225.186117069 286.968291934L225.62898502 286.388012012L226.303922447 286.109953958L226.376183934 285.404575993L226.602615459 284.732632127L227.184774177 284.867331663L227.764747909 285.01114824L228.368042744 285.060716072L228.924748541 285.298413955L229.542964108 285.340499602L230.161982755 285.312614054L230.68998981 284.989422017L231.24009466 284.70546921L231.750889755 285.068659781L232.360546029 285.214049767L232.961092572 285.348982227L233.552382258 285.519977627L234.198329839 285.773732235L234.86383653 285.576906107L235.348412962 285.132832891L235.877502681 284.74285929L236.371899577 284.240284839L236.588852221 283.569508482L237.183220536 283.180551576L237.892458757 283.141279238L238.557710084 283.237947576L239.185191904 282.996761628L239.83138833 283.078613819L240.464848352 283.230264745L240.949173167 283.625932909L241.548857199 283.803423429L242.175047844 283.787912327L242.754921778 284.024769962L243.287356972 284.383704105L243.928843261 284.355133183L244.53731282 284.395805422L245.14672 284.41844L245.411269054 284.922734333L245.741542603 285.386650661L245.93377787 285.926905569L245.974142856 286.498919933L246.503511152 286.75251029L246.809065074 287.253684574L247.059801616 287.76718379L247.471131819 288.163867193L247.793092306 288.655854206L248.053107403 289.183207906L248.314210676 289.738307235L248.840197756 290.053977592L249.332191991 290.398268693L249.915300414 290.541723414L250.495959889 290.656433582L251.087157861 290.684873109L251.13948251 291.29005175L251.0819242 291.894755063L251.320486835 292.460531902L251.735962765 292.9126329L252.09472464 293.393336515L252.321395908 293.948679819L252.164153878 294.555259651L252.399176105 295.136145787L252.876215774 295.595451573L252.991243713 296.247599734L253.543009129 296.566917146L253.969134955 297.041074782L254.590722813 297.08658374L255.213836643 297.099686616L255.769789566 297.40167638L256.395544812 297.495013625L256.966987689 297.730377363L257.401002457 298.17034808L257.995988114 298.056243798L258.596304495 297.974708763L258.979129169 298.436471628L259.152140049 299.010794629L259.675014387 299.279784059L260.186389808 299.570039231L260.672746186 299.845926079L261.111200064 300.192933683L261.648158627 300.416360205L261.976065581 300.896694401L262.566555472 300.939459656L263.04412348 301.289368183L263.600807433 301.066943759L264.180045567 301.221387384L264.447255477 301.762788647L264.9144319 302.145231654L265.500244807 302.226175749L266.070276328 302.383632957L266.669770383 302.458040623L267.228853028 302.229225814L267.821298464 302.366350277L268.250336798 302.797303663L268.613079492 303.274889809L269.198078906 303.406974912L269.642620959 303.794073984L269.793042692 304.364018395L270.367833086 304.479000658L270.943394134 304.590060999L271.264707735 305.083163607L271.66902 305.51086L272.200294961 305.020268599L272.884624445 304.78654619L273.593197326 304.733036076L274.279641006 304.549368075L274.91811583 304.217609654L275.620415783 304.061121552L276.045631815 303.479354007L276.615893065 303.038826756L277.387974639 303.107502454L278.131089675 303.327970941L278.819299769 302.979786528L279.510232472 302.637036594L280.153207526 302.993143544L280.726447122 303.453171202L281.478876888 303.579360361L282.045074384 304.090725839L282.808824335 304.15589145L283.480773453 304.524734138L284.204380834 304.324266527L284.944331383 304.196720104L285.659233441 304.59335717L285.928317073 305.365367476L286.692608152 305.452861222L287.414864625 305.71770381L287.831899505 305.083040854L288.539355122 304.806958059L289.271530781 304.786281785L289.96179277 304.541236704L290.589084295 304.112926057L291.007263125 303.478835264L291.72818988 303.206114667L292.48980629 303.324657291L293.214698252 303.150526331L293.864488327 303.515988785L294.412255899 303.943750394L294.910120971 304.428683047L295.607414538 304.578339802L296.212452319 304.955890789L296.483603787 305.611244668L296.92299678 306.167972269L297.493657036 306.50570529L298.044293583 306.87518616L298.423448362 307.467247984L299.090494011 307.689386795L299.697973577 308.003625706L300.208812957 308.458401084L300.636504515 308.994825999L300.889754163 309.632428049L301.459219858 310.101403515L301.748777434 310.779920706L302.497368635 310.811859734L303.100816737 311.255998535L303.821501082 311.199662807L304.505038593 310.964426522L305.195411956 311.170745705L305.832391021 311.507555229L306.269711511 312.128398946L306.98358286 312.387404407L307.455967219 312.978230268L307.524495669 313.731573504L308.066636717 314.246482164L308.808203212 314.342017381L309.529364806 314.22851948L310.22573 314.44768L310.14036206 314.95931998L309.762535871 315.314721901L309.388534471 315.645819111L308.922164449 315.824708499L308.472824277 316.005869586L307.989701361 316.042176304L307.641804798 316.401024558L307.153854405 316.509230393L306.805028016 316.937419738L306.257822451 317.012199641L306.00892404 317.470295031L305.927715095 317.985277469L305.865074345 318.465595326L305.699143351 318.920673354L305.480246526 319.388015966L305.632050168 319.881250789L305.400284058 320.286356964L305.123280712 320.661984026L304.865195818 321.064734978L304.455986736 321.3124527L304.145508433 321.711279285L303.650984791 321.81571007L303.159589431 321.699973529L302.708008093 321.925669434L302.276551316 322.175125033L302.096582054 322.639876699L301.605777668 322.617126717L301.185355639 322.87139395L300.854830372 323.204822985L300.420808112 323.383838492L299.981075038 323.569276235L299.50830656 323.504143301L299.001781614 323.550701059L298.493773331 323.576444581L298.042420144 323.869073612L297.506618096 323.821454151L296.966051907 323.93730528L296.535490576 324.284076428L296.461023328 324.843854419L296.075419285 325.256415072L295.999097096 325.774210248L295.601752738 326.114877803L295.397696216 326.573090137L295.401464963 327.074671042L294.952723775 327.342609349L294.806993634 327.844527984L294.697170248 328.338383686L294.342388172 328.699055711L294.034188289 329.136729841L293.756427097 329.594326315L293.71697421 330.134756982L293.849002301 330.660295201L293.99168735 331.168226839L294.372478243 331.533400588L294.712827718 331.959222117L294.681303146 332.503435256L294.578755183 332.994504807L294.21173526 333.336501539L294.170436088 333.840478236L293.827744442 334.212312296L293.402877199 334.501548556L293.043676702 334.869169L293.003287373 335.380000659L292.89952 335.88181L291.900292156 336.180761637L290.912869072 336.516654507L290.275445414 337.426723118L289.200268478 337.706952228L288.167065147 337.884400741L287.121937293 337.966283986L286.133080243 337.593365698L285.080582337 337.497686694L284.304797434 338.294830517L283.193949469 338.352252566L282.420021112 339.072057572L281.990042891 340.037564216L281.01282111 340.33489713L280.218048115 340.976539676L279.484675895 341.672210915L278.600061192 342.161342916L277.571749123 342.256495467L276.73326316 342.859339566L275.889997356 343.51223457L274.826106622 343.438034779L273.814213639 343.274701559L272.831551614 343.566215696L271.863620489 343.200359058L270.842655628 343.368800429L269.891686031 343.715383242L269.109761085 344.358077726L268.132137861 344.56273625L267.139545298 344.674056876L266.187987132 345.17733797L265.135029717 344.953651842L264.401124339 345.664829504L263.499295646 346.145553729L262.486983812 346.230392074L261.517544066 346.533969702L260.606717015 346.97211518L259.738485808 347.489562715L259.469568424 348.578994384L258.567327731 349.246182253L257.511456021 349.416571343L256.564241688 349.913242779L255.459112534 349.898822998L254.509972272 350.46508366L253.679147014 351.129990372L252.894002643 351.848265987L251.849711791 352.184413082L250.791256251 351.895951432L249.702811511 351.848072963L248.787160253 351.257660333L247.843488819 351.618880735L247.070026161 352.269074146L246.202703479 352.770869116L245.459941763 353.443440197L244.526781675 353.793873235L243.590454435 354.135753861L242.605518372 354.305374098L241.655678997 354.616300508L240.688997541 354.115031069L239.615144685 354.295541823L238.598835707 354.566743468L237.756549693 355.196813737L236.783504552 355.489783611L235.785019889 355.300901184L234.828181517 355.563246054L233.83822 355.62913"
+ id="path5729"
+ sodipodi:nodetypes="ccccccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path15533"
+ d="m 620.46536,-25.451935 -0.79578,1.37989 -0.95409,1.275573 -1.33195,0.869388 -1.28731,0.934222 -1.62754,-0.311907 -1.46697,0.770823 -1.65873,-0.107192 -1.34729,0.973471 -0.70221,1.356984 -0.4717,1.453274 -1.19201,1.104653 -0.17805,1.615375 -0.6075,1.51561 -1.46541,0.720207 -1.07628,1.087325 -1.24383,0.8907914 -1.192,1.0989272 -0.64601,1.4869988 0.0433,1.5872667 0.18394,1.5771679 -0.72994,1.3685867 -1.32888,0.7999693 -0.89686,1.19629281 -0.91611,1.18162175 -0.73864,1.35117974 -0.009,1.5398625 -1.38105,0.8152084 -0.45936,1.5365039 -1.41229,0.6895283 -1.04476,1.1741047 -0.96724,1.3298332 0.13286,1.6390127 -1.55678,0.323485 -1.46707,-0.61311 -1.56581,-0.1987683 -1.43811,0.6504813 -0.7902,1.450688 -1.39223,0.88916 -1.60391,0.08054 -1.56565,0.357464 -1.56717,0.0023 -1.39081,0.722308 -1.01967,1.156843 -1.32973,0.780921 -0.6948,1.377777 -1.29067,0.845671 -1.12959,0.975244 -1.22175,0.856972 -0.66384,1.455894 -1.2138,1.042583 -1.0341,1.227233 -0.38281,1.558497 -1.55842,0.517221 -1.60923,-0.326504 -1.59165,0.352116 -1.26703,1.025672 -1.45781,0.477343 -1.52528,0.163138 -0.8324,1.332354 -1.35544,0.794241 -0.48562,1.488591 -0.72649,1.387063 -1.54228,0.411756 -1.23493,1.011493 -1.32785,0.690265 -1.47439,0.256512 -1.47873,-0.212836 -1.47913,0.209986 -1.1094,1.206563 -0.0267,1.638857 -0.99596,1.282686 -1.57968,0.376613 -1.35474,0.629626 -1.44571,-0.37644 -1.38333,0.306885 -1.26458,0.639237 -1.41062,0.595406 -1.45034,-0.490747 -1.11405,-1.018732 -1.50289,-0.142166 -1.32505,-0.523274 -0.96174,-1.051013 -1.337,-0.448297 -1.4095,0.04275 -1.47307,-0.200057 -1.29523,0.729619 -1.23146,-0.714951 -1.38372,-0.336111 -1.03782,-1.1544 -0.14234,-1.545787 -1.30918,-0.677891 -1.35241,-0.586908 -1.45276,0.03017 -1.45301,-0.01319 -1.47674,-0.440261 -0.87217,-1.270407 -1.50621,0.08308 -1.21823,0.889672 -1.46289,-0.339578 -1.42716,0.467513 -0.89061,1.140768 -1.08057,0.962743 -0.98482,1.102439 -0.41057,1.420096 -1.4223,0.240578 -1.22866,-0.755773 -1.43326,0.241587 -1.20678,-0.810105 -1.40741,0.0029 -1.36285,-0.35132 -1.49162,0.04156 -1.09209,1.016845 -1.28625,-0.871442 -1.55015,-0.104171 -1.49778,0.176169 -1.42788,0.485308 -1.13879,-0.990622 -1.39556,-0.574946 -1.14832,-1.061728 -0.31816,-1.531228 -1.33381,-0.604178 -1.4372,0.280311 -1.39809,-0.07721 -1.39037,0.165884 -1.23687,0.669683 -1.35201,0.387771 -0.90888,1.155715 -1.41474,0.400346 0.1709,-1.207982 0.38116,-1.158941 0.43863,-1.201896 1.067,-0.706028 -0.21961,-1.290719 0.62063,-1.152825 -0.83255,-0.984459 -0.17551,-1.277301 -0.30436,-1.183433 -0.51299,-1.109048 0.50087,-1.191587 -0.36933,-1.238687 0.80334,-0.968717 0.96397,-0.809028 0.61229,-1.17096 -0.21401,-1.303936 -0.89097,-0.906597 -1.02688,-0.749189 -0.28261,-1.241724 -0.52815,-1.158791 -0.78547,-0.982618 -0.38848,-1.196484 -0.0389,-1.2504481 -0.39909,-1.1856907 0.64923,-1.0886307 0.26748,-1.2389775 -0.22551,-1.2362524 0.0157,-1.2565552 0.2365,-1.2034289 0.321,-1.18369214 0.42092,-1.15836432 0.65316,-1.04515924 -0.44623,-1.0946408 -0.79117,-0.8782979 -0.62521,-1.0511296 -1.12031,-0.4905706 -1.06185,-0.6339948 -0.59313,-1.0852101 -0.32592,-1.1485159 -0.24686,-1.1680629 -0.23417,-1.1706242 0.23905,-1.169637 -0.26954,-1.151246 0.0687,-1.180384 0.26972,-1.271914 -0.63215,-1.136176 -1.08126,-0.67302 -0.51788,-1.163555 0.0225,-1.349038 -0.82469,-1.067849 -0.87724,-1.051163 -1.35885,-0.16734 -1.05332,-0.66677 -0.87452,-0.888402 -0.16415,-1.245417 -0.56603,-1.121431 -0.20617,-1.298541 -0.94888,-0.910132 0.30319,-1.278085 -0.52382,-1.204591 0.41811,-1.158061 0.12845,-1.224506 0.70506,-1.094501 -0.17033,-1.290748 1.0586,-0.840128 1.17,-0.676431 -0.097,-1.411686 0.73981,-1.206211 0.97015,-0.827531 1.14648,-0.558203 1.10345,-0.684294 0.69042,-1.099633 1.20412,-0.539745 0.65771,-1.143963 1.23623,-0.402041 0.86645,-0.969115 1.20405,-0.377536 1.07823,-0.655527 0.84759,-1.042163 1.32849,-0.199079 0.69672,-1.163492 1.23103,-0.568945 0.5221,-1.189866 0.68975,-1.101191 0.46306,-1.319265 1.17224,-0.762063 1.1619,-0.665933 1.30883,-0.283606 0.23542,-1.375303 0.53582,-1.288325 0.9627,-1.047409 1.32326,-0.522342 -0.16852,-1.327283 0.41045,-1.273425 0.44791,-1.253613 -0.0627,-1.329754 1.29211,-0.796753 1.51007,0.155042 1.04321,-1.142473 1.54299,-0.112737 1.27119,-0.784523 0.92371,-1.173948 0.44372,-1.404479 0.59046,-1.349372 0.88336,-1.267033 1.39899,-0.654645 -0.0845,-1.553933 0.77752,-1.348076 0.0603,-1.543485 -0.8819,-1.268163 0.83695,-1.309478 -0.1757,-1.544137 1.3528,-0.426349 0.69707,-1.235297 0.88502,-1.045972 1.29957,-0.434085 1.39249,0.279127 1.40932,0.175452 0.91815,-1.172664 1.42699,-0.426414 1.37166,0.04154 1.30496,0.424587 1.35057,-0.264529 1.19751,-0.678243 1.16806,-0.800856 0.77475,-1.18554 1.41758,0.139447 1.33943,-0.484651 1.52319,-0.275265 1.35308,-0.751704 1.26549,-0.859623 1.15282,-1.005694 1.11979,-1.197483 0.0368,-1.639064 1.09788,-1.071977 0.96112,-1.196133 1.58695,-0.580415 1.00455,-1.358741 1.61674,-0.07645 1.6183,-0.02733 1.32569,0.834841 1.50973,0.418449 1.47371,0.502561 1.54207,0.215365 1.36841,0.115706 1.35396,0.22956 1.30812,-0.541228 1.40784,0.148644 1.31931,-0.512575 1.40535,0.168305 1.31101,0.503864 1.40227,-0.07914 1.398,0.0071 1.39513,-0.08981 1.3854,0.300528 1.20581,0.745436 1.36468,-0.313746 1.37112,0.284287 1.36574,-0.07897 1.36428,-0.10115 1.20626,-0.718065 1.06603,-0.913368 1.25648,-0.671137 0.91626,-1.090707 0.99405,-1.003072 1.23185,-0.690509 1.20582,-0.73907 0.93415,-1.06188 1.42327,0.0572 1.42382,-0.0411 1.21421,-0.86776 1.49232,-0.0159 1.30648,-0.52448 1.27301,-0.60116 1.28896,-0.59126 1.39467,-0.25666 0.20884,-1.44761 0.14153,-1.45572 0.82984,-1.21447 0.54782,-1.36509 1.32704,-0.6495 1.37241,-0.54717 0.72145,-1.31943 1.16165,-0.95498 -0.0109,-1.49333 0.88482,-1.20302 0.52935,-1.32101 0.75992,-1.20325 0.71848,-1.31635 0.85225,-1.23396 1.44554,-0.40496 1.37587,-0.60047 1.05862,-0.44747 1.14024,-0.14401 1.1557,-0.08 1.04771,-0.49429 1.13638,-0.38224 0.85084,-0.84471 0.77485,-0.89055 0.48379,-1.07676 0.6898,-0.96342 0.91583,-0.75183 1.25676,0.0568 0.97286,-0.79763 1.19675,0.0631 1.10945,0.45312 1.22088,-0.0736 1.02139,-0.67284 0.94887,-0.69412 0.6339,-0.99013 1.18501,-0.11934 0.99022,-0.66178 1.13374,0.0243 1.09952,-0.27745 1.103,-0.22348 1.12063,-0.10369 1.06515,-0.45893 1.15916,0.0388 1.15158,-0.28108 1.10767,0.42211 1.21516,-0.0102 1.17196,-0.32126 0.52211,-1.1319 1.01378,-0.72531 1.14278,-0.62083 1.29792,-0.0822 1.08793,-0.66315 0.96734,-0.82921 1.00696,0.88332 1.19308,0.60892 1.27943,-0.58969 1.36718,0.33985 1.1847,0.41451 1.18922,-0.40138 1.02271,0.75063 1.26367,-0.1118 1.16464,-0.24795 1.18983,0.0464 1.17945,0.0803 1.17162,0.15758 1.31006,-0.008 1.30783,-0.0767 1.06053,0.78408 1.21515,0.51274 1.31854,0.59667 1.38465,-0.42108 1.24036,0.69193 0.61841,1.27861 0.30235,1.4376 1.20792,0.83607 1.10632,0.81676 1.27185,0.52293 0.54604,1.32104 0.8568,1.14422 -0.42212,1.36096 -0.15189,1.4168 0.94156,0.93459 0.8508,1.0179 1.11675,0.76715 1.33231,0.24619 1.30371,0.0861 1.28338,-0.24498 1.31185,-0.26728 1.27652,0.40362 0.90269,0.98204 0.50653,1.23397 0.43417,1.30489 -0.38324,1.32075 0.96098,0.9031 0.43404,1.24527 0.96305,0.84655 1.03939,0.75087 1.06405,0.88104 0.34305,1.33818 -0.46302,1.27582 0.2148,1.34014 -0.78403,1.00929 -0.3974,1.21468 -0.50834,1.19093 0.0874,1.29193 0.82581,0.87902 0.72781,0.96173 0.60592,1.041831 0.52647,1.084152 0.0254,1.272444 0.24052,1.249765 0.73505,1.055027 1.03927,0.757169 -0.16526,1.170158 -0.071,1.179633 -0.68079,0.965374 -0.73362,0.925865 -0.49926,1.047125 -0.26115,1.13028 -0.40791,1.14983 0.38874,1.156453 -0.0148,1.237702 -0.76345,0.974313 -0.42272,1.164989 -1.04815,0.661279 0.21216,1.213251 -0.61229,1.068686 0.24858,1.167776 -0.32954,1.147561 -0.7134,1.036076 -0.0879,1.254853 0.57259,1.117003 -0.0543,1.25404 0.64232,1.022147 0.11947,1.201284 0.43073,1.136663 -0.18734,1.201013 -0.33966,1.229161 0.35104,1.225961 0.60095,1.07042 0.60663,1.067218 0.9865,0.706535 0.9512,0.753398 0.34342,1.2003 0.85654,0.908295 -0.33363,1.128183 -0.56024,1.034525 -0.96483,0.668314 -1.05749,0.509188 -0.65677,0.948262 -0.98995,0.592061 -1.1325,0.207427 -0.95701,0.640084 -1.26209,0.253895 -1.17616,-0.523461 -0.99575,0.716203 -1.0026,0.706586 -1.17207,-0.03692 -1.09079,-0.430434 -1.18688,-0.205022 -0.88593,-0.815982 -1.2586,-0.242995 -0.82621,-0.98003 -1.25794,-0.180048 -1.12344,0.59389 -1.08179,0.437873 -1.16637,0.04002 -0.86347,0.800961 -1.12289,0.355302 -0.31528,1.122292 -0.58614,1.007654 -0.8576,0.877767 -0.11194,1.222055 -1.23224,0.08269 -0.88401,0.862424 -0.86058,0.811808 -1.11093,0.406772 -1.18438,0.293402 -1.21245,-0.137199 -0.88196,0.819956 -0.99306,0.681186 -1.00024,-0.726225 -1.22446,-0.169085 -1.24645,-0.08398 -1.09528,0.600876 -0.38094,1.119742 -0.9859,0.653409 -0.68552,0.890222 -0.5226,0.994646 -0.32005,1.150172 -0.60324,1.030257 -0.94288,0.742934 -1.13341,0.395383 -1.06475,0.431083 -0.72072,0.894478 -0.33723,1.071592 -0.62666,0.932379 -1.05426,0.611438 -1.19852,-0.220996 -0.53842,1.051641 -0.98358,0.654523 -0.54033,1.012202 0.16881,1.134906 -0.57913,0.956284 -0.10294,1.113226 -0.87644,0.747307 -0.27246,1.119099 -1.01413,0.523023 -0.57653,0.984701"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path15535"
+ d="m 108.46536,486.54806 -0.79578,1.3799 -0.95409,1.27557 -1.33195,0.86939 -1.28731,0.93422 -1.62754,-0.31191 -1.46697,0.77082 -1.658726,-0.10719 -1.347298,0.97347 -0.702211,1.35699 -0.471698,1.45327 -1.192008,1.10465 -0.178052,1.61538 -0.6075,1.51561 -1.465412,0.72021 -1.076271,1.08732 -1.243835,0.89079 -1.191997,1.09893 -0.646012,1.487 0.04331,1.58727 0.183938,1.57716 -0.729946,1.36859 -1.328872,0.79997 -0.896867,1.19629 -0.91611,1.18162 -0.738632,1.35118 -0.0094,1.53987 -1.381048,0.8152 -0.459361,1.53651 -1.412298,0.68953 -1.044755,1.1741 -0.967243,1.32983 0.132859,1.63902 -1.556779,0.32348 -1.467071,-0.61311 -1.56581,-0.19877 -1.438105,0.65048 -0.790202,1.45069 -1.392232,0.88916 -1.60391,0.0805 -1.565642,0.35747 -1.56718,0.002 -1.3908,0.7223 -1.019676,1.15685 -1.329731,0.78092 -0.694794,1.37777 -1.290678,0.84567 -1.12959,0.97525 -1.22175,0.85697 -0.663834,1.45589 -1.213805,1.04259 -1.034096,1.22723 -0.382809,1.5585 -1.558425,0.51722 -1.609223,-0.32651 -1.591657,0.35212 -1.267026,1.02567 -1.457815,0.47735 -1.525277,0.16313 -0.832396,1.33236 -1.355445,0.79424 -0.485616,1.48859 -0.726488,1.38706 -1.542284,0.41176 -1.234935,1.01149 -1.327843,0.69027 -1.474394,0.25651 -1.478724,-0.21284 -1.479131,0.20999 -1.109403,1.20656 -0.02672,1.63886 -0.995961,1.28269 -1.579679,0.37661 -1.354745,0.62962 -1.445703,-0.37644 -1.383334,0.30689 -1.264583,0.63924 -1.410614,0.5954 -1.450347,-0.49075 -1.114043,-1.01873 -1.502896,-0.14216 -1.325047,-0.52328 -0.961737,-1.05101 -1.336998,-0.4483 -1.409507,0.0427 -1.473068,-0.20006 -1.295226,0.72962 -1.23146,-0.71495 -1.3837194,-0.33611 -1.0378249,-1.1544 -0.1423374,-1.54579 -1.3091785,-0.67789 -1.3524142,-0.58691 -1.4527564,0.0302 -1.4530099,-0.0132 -1.4767448,-0.44026 -0.87216576,-1.27041 -1.50621474,0.0831 -1.2182231,0.88967 -1.4628937,-0.33957 -1.4271661,0.46751 -0.8906009,1.14077 -1.0805774,0.96274 -0.9848192,1.10244 -0.4105723,1.42009 -1.4222963,0.24058 -1.228662,-0.75577 -1.433256,0.24159 -1.20678,-0.81011 -1.407407,0.003 -1.362856,-0.35132 -1.491616,0.0416 -1.092095,1.01684 -1.286245,-0.87144 -1.550157,-0.10417 -1.497774,0.17617 -1.427878,0.4853 -1.138789,-0.99062 -1.395568,-0.57494 -1.148311,-1.06173 -0.31816,-1.53123 -1.333818,-0.60418 -1.437193,0.28031 -1.398097,-0.0772 -1.390367,0.16588 -1.236865,0.66969 -1.352015,0.38777 -0.908883,1.15571 -1.414732,0.40035 0.170897,-1.20798 0.381157,-1.15894 0.438633,-1.2019 1.066994,-0.70603 -0.219604,-1.29072 0.620623,-1.15282 -0.832549,-0.98446 -0.175502,-1.2773 -0.304361,-1.18343 -0.512993,-1.10905 0.500865,-1.19159 -0.369325,-1.23869 0.803337,-0.96871 0.963969,-0.80903 0.61229,-1.17096 -0.214001,-1.30394 -0.89098,-0.9066 -1.026878,-0.74918 -0.282604,-1.24173 -0.528155,-1.15879 -0.785466,-0.98262 -0.388484,-1.19648 -0.03894,-1.25045 -0.399093,-1.18569 0.649228,-1.08863 0.267486,-1.23898 -0.225513,-1.23625 0.01567,-1.25656 0.236498,-1.20342 0.321006,-1.1837 0.420915,-1.15836 0.653162,-1.04516 -0.446231,-1.09464 -0.791173,-0.8783 -0.625203,-1.05113 -1.12031,-0.49057 -1.061852,-0.63399 -0.593126,-1.08521 -0.32592,-1.14852 -0.246864,-1.16806 -0.234166,-1.17063 0.23905,-1.16963 -0.269545,-1.15125 0.06868,-1.18038 0.269713,-1.27192 -0.632151,-1.13617 -1.081254,-0.67302 -0.517886,-1.16356 0.02248,-1.34904 -0.824686,-1.06785 -0.877239,-1.05116 -1.358856,-0.16734 -1.053314,-0.66677 -0.874527,-0.8884 -0.164143,-1.24542 -0.566036,-1.12143 -0.206164,-1.29854 -0.94888,-0.91013 0.303184,-1.27809 -0.523816,-1.20459 0.418102,-1.15806 0.128456,-1.2245 0.705061,-1.09451 -0.170333,-1.29074 1.058602,-0.84013 1.169999,-0.67643 -0.09698,-1.41169 0.73981,-1.20621 0.970153,-0.82753 1.146479,-0.5582 1.103455,-0.6843 0.690421,-1.09963 1.204121,-0.53975 0.657711,-1.14396 1.23623,-0.40204 0.86644,-0.96912 1.204056,-0.37753 1.078225,-0.65553 0.847594,-1.04216 1.32849,-0.19908 0.696718,-1.16349 1.231027,-0.56895 0.522106,-1.18986 0.689752,-1.10119 0.463058,-1.31927 1.172238,-0.76206 1.161898,-0.66593 1.308831,-0.28361 0.235424,-1.3753 0.53582,-1.28833 0.9627,-1.04741 1.323259,-0.52234 -0.168523,-1.32728 0.410449,-1.27343 0.44791,-1.25361 -0.06265,-1.32975 1.292105,-0.79676 1.51007,0.15504 1.04321,-1.14247 1.542991,-0.11274 1.27119,-0.78452 0.923713,-1.17395 0.443716,-1.40448 0.590457,-1.34937 0.883367,-1.26703 1.398982,-0.65465 -0.08448,-1.55393 0.777518,-1.34808 0.06031,-1.54348 -0.881899,-1.26816 0.836956,-1.30948 -0.175705,-1.54414 1.352804,-0.42635 0.697063,-1.23529 0.885022,-1.04598 1.299573,-0.43408 1.3924921,0.27913 1.4093129,0.17545 0.9181504,-1.17267 1.4269939,-0.42641 1.3716618,0.0415 1.3049551,0.42459 1.3505775,-0.26453 1.19750649,-0.67825 1.16806301,-0.80085 0.7747477,-1.18554 1.4175776,0.13945 1.3394345,-0.48466 1.5231918,-0.27526 1.3530798,-0.75171 1.2654872,-0.85962 1.1528172,-1.00569 1.119787,-1.19749 0.03685,-1.63906 1.097883,-1.07198 0.961118,-1.19613 1.586954,-0.58041 1.004554,-1.35874 1.61673,-0.0765 1.618307,-0.0273 1.325685,0.83484 1.509735,0.41845 1.473705,0.50256 1.542074,0.21537 1.368407,0.1157 1.353967,0.22956 1.308117,-0.54123 1.407836,0.14865 1.319313,-0.51258 1.405345,0.16831 1.31101,0.50386 1.40227,-0.0791 1.398002,0.007 1.395131,-0.0898 1.385402,0.30053 1.205812,0.74543 1.36468,-0.31374 1.371119,0.28428 1.365743,-0.079 1.364279,-0.10115 1.206256,-0.71807 1.066034,-0.91336 1.25648,-0.67114 0.916255,-1.09071 0.994047,-1.00307 1.231858,-0.69051 1.205817,-0.73907 0.934149,-1.06188 1.423266,0.0572 1.423823,-0.0411 1.214206,-0.86776 1.492328,-0.0159 1.306475,-0.52448 1.273014,-0.60116 1.288955,-0.59126 1.394673,-0.25666 0.208841,-1.44761 0.141529,-1.45572 0.829839,-1.21447 0.547825,-1.36509 1.327037,-0.6495 1.372407,-0.54717 0.721451,-1.31943 1.161646,-0.95498 -0.01088,-1.49333 0.884821,-1.20302 0.529349,-1.32101 0.759919,-1.20325 0.718478,-1.31635 0.85225,-1.23396 1.445541,-0.40496 1.375873,-0.60047 1.058614,-0.44747 1.14024,-0.14401 1.155699,-0.08 1.047719,-0.49429 1.13638,-0.38224 0.850839,-0.84471 0.774843,-0.89055 0.483798,-1.07676 0.689793,-0.96342 0.915832,-0.75183 1.256758,0.0567 0.97286,-0.79763 1.196751,0.0631 1.109449,0.45312 1.220879,-0.0736 1.021398,-0.67284 0.94887,-0.69412 0.633892,-0.99013 1.185014,-0.11934 0.990222,-0.66178 1.133738,0.0243 1.09952,-0.27745 1.103,-0.22348 1.12063,-0.10369 1.06515,-0.45893 1.15916,0.0388 1.15158,-0.28108 1.10767,0.42211 1.21516,-0.0102 1.17196,-0.32126 0.52211,-1.1319 1.01378,-0.72531 1.14278,-0.62083 1.29792,-0.0822 1.08793,-0.66315 0.96734,-0.82921 1.00696,0.88332 1.19308,0.60892 1.27943,-0.58969 1.36718,0.33985 1.1847,0.41451 1.18922,-0.40138 1.02271,0.75063 1.26367,-0.1118 1.16464,-0.24795 1.18983,0.0464 1.17945,0.0803 1.17162,0.15758 1.31006,-0.008 1.30783,-0.0767 1.06053,0.78408 1.21515,0.51274 1.31854,0.59667 1.38465,-0.42108 1.24036,0.69193 0.61841,1.27861 0.30235,1.4376 1.20792,0.83607 1.10632,0.81676 1.27185,0.52293 0.54604,1.32104 0.8568,1.14422 -0.42212,1.36096 -0.15189,1.4168 0.94156,0.93459 0.8508,1.0179 1.11675,0.76715 1.33231,0.24619 1.30371,0.0861 1.28338,-0.24498 1.31185,-0.26728 1.27652,0.40362 0.90269,0.98204 0.50653,1.23397 0.43417,1.30489 -0.38324,1.32075 0.96098,0.9031 0.43404,1.24527 0.96305,0.84655 1.03939,0.75087 1.06405,0.88104 0.34305,1.33818 -0.46302,1.27582 0.2148,1.34014 -0.78403,1.00929 -0.3974,1.21468 -0.50834,1.19093 0.0874,1.29193 0.82581,0.87902 0.72781,0.96173 0.60592,1.04183 0.52647,1.08415 0.0254,1.27245 0.24052,1.24976 0.73505,1.05503 1.03927,0.75717 -0.16526,1.17016 -0.071,1.17963 -0.68079,0.96537 -0.73362,0.92587 -0.49926,1.04712 -0.26115,1.13028 -0.40791,1.14983 0.38874,1.15646 -0.0148,1.2377 -0.76345,0.97431 -0.42272,1.16499 -1.04815,0.66128 0.21216,1.21325 -0.61229,1.06869 0.24858,1.16777 -0.32954,1.14756 -0.7134,1.03608 -0.0879,1.25485 0.57259,1.11701 -0.0543,1.25404 0.64232,1.02214 0.11947,1.20129 0.43073,1.13666 -0.18734,1.20101 -0.33966,1.22916 0.35104,1.22596 0.60095,1.07042 0.60663,1.06722 0.9865,0.70654 0.9512,0.7534 0.34342,1.20029 0.85654,0.9083 -0.33363,1.12818 -0.56024,1.03453 -0.96483,0.66831 -1.05749,0.50919 -0.65677,0.94826 -0.98995,0.59206 -1.1325,0.20743 -0.95701,0.64008 -1.26209,0.2539 -1.17616,-0.52346 -0.99575,0.7162 -1.0026,0.70659 -1.17207,-0.0369 -1.09079,-0.43043 -1.18688,-0.20503 -0.88593,-0.81598 -1.2586,-0.24299 -0.82621,-0.98003 -1.25794,-0.18005 -1.12344,0.59389 -1.08179,0.43787 -1.16637,0.04 -0.86347,0.80096 -1.12289,0.3553 -0.31528,1.1223 -0.58614,1.00765 -0.8576,0.87777 -0.11194,1.22205 -1.23224,0.0827 -0.88401,0.86243 -0.86058,0.81181 -1.11093,0.40677 -1.18438,0.2934 -1.21245,-0.1372 -0.88196,0.81996 -0.99306,0.68118 -1.00024,-0.72622 -1.22446,-0.16909 -1.24645,-0.084 -1.09528,0.60087 -0.38094,1.11975 -0.9859,0.6534 -0.68552,0.89023 -0.5226,0.99464 -0.32005,1.15018 -0.60324,1.03025 -0.94288,0.74294 -1.13341,0.39538 -1.06475,0.43108 -0.72072,0.89448 -0.33723,1.07159 -0.62666,0.93238 -1.05426,0.61144 -1.19852,-0.221 -0.53842,1.05164 -0.98358,0.65453 -0.54033,1.0122 0.16881,1.1349 -0.57913,0.95629 -0.10294,1.11322 -0.87644,0.74731 -0.27246,1.1191 -1.01413,0.52302 -0.57653,0.9847"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 620.46536,486.54806 -0.79578,1.37989 -0.95409,1.27558 -1.33195,0.86939 -1.28731,0.93422 -1.62754,-0.31191 -1.46697,0.77082 -1.65873,-0.10719 -1.34729,0.97347 -0.70221,1.35699 -0.4717,1.45327 -1.19201,1.10465 -0.17805,1.61538 -0.6075,1.51561 -1.46541,0.72021 -1.07628,1.08732 -1.24383,0.89079 -1.192,1.09893 -0.64601,1.487 0.0433,1.58727 0.18394,1.57716 -0.72994,1.36859 -1.32888,0.79997 -0.89686,1.19629 -0.91611,1.18162 -0.73864,1.35118 -0.009,1.53987 -1.38105,0.8152 -0.45936,1.53651 -1.41229,0.68953 -1.04476,1.1741 -0.96724,1.32983 0.13286,1.63902 -1.55678,0.32348 -1.46707,-0.61311 -1.56581,-0.19877 -1.43811,0.65049 -0.7902,1.45068 -1.39223,0.88916 -1.60391,0.0805 -1.56565,0.35747 -1.56717,0.002 -1.39081,0.7223 -1.01967,1.15685 -1.32973,0.78092 -0.6948,1.37778 -1.29067,0.84567 -1.12959,0.97524 -1.22175,0.85697 -0.66384,1.4559 -1.2138,1.04258 -1.0341,1.22723 -0.38281,1.5585 -1.55842,0.51722 -1.60923,-0.3265 -1.59165,0.35211 -1.26703,1.02567 -1.45781,0.47735 -1.52528,0.16314 -0.8324,1.33235 -1.35544,0.79424 -0.48562,1.48859 -0.72649,1.38706 -1.54228,0.41176 -1.23493,1.01149 -1.32785,0.69027 -1.47439,0.25651 -1.47873,-0.21283 -1.47913,0.20998 -1.1094,1.20656 -0.0267,1.63886 -0.99596,1.28269 -1.57968,0.37661 -1.35474,0.62963 -1.44571,-0.37644 -1.38333,0.30688 -1.26458,0.63924 -1.41062,0.5954 -1.45034,-0.49074 -1.11405,-1.01874 -1.50289,-0.14216 -1.32505,-0.52328 -0.96174,-1.05101 -1.337,-0.44829 -1.4095,0.0427 -1.47307,-0.20005 -1.29523,0.72962 -1.23146,-0.71495 -1.38372,-0.33611 -1.03782,-1.1544 -0.14234,-1.54579 -1.30918,-0.67789 -1.35241,-0.58691 -1.45276,0.0302 -1.45301,-0.0132 -1.47674,-0.44026 -0.87217,-1.27041 -1.50621,0.0831 -1.21823,0.88967 -1.46289,-0.33958 -1.42716,0.46752 -0.89061,1.14077 -1.08057,0.96274 -0.98482,1.10244 -0.41057,1.42009 -1.4223,0.24058 -1.22866,-0.75577 -1.43326,0.24159 -1.20678,-0.81011 -1.40741,0.003 -1.36285,-0.35132 -1.49162,0.0416 -1.09209,1.01685 -1.28625,-0.87145 -1.55015,-0.10417 -1.49778,0.17617 -1.42788,0.48531 -1.13879,-0.99062 -1.39556,-0.57495 -1.14832,-1.06173 -0.31816,-1.53122 -1.33381,-0.60418 -1.4372,0.28031 -1.39809,-0.0772 -1.39037,0.16588 -1.23687,0.66969 -1.35201,0.38777 -0.90888,1.15571 -1.41474,0.40035 0.1709,-1.20798 0.38116,-1.15895 0.43863,-1.20189 1.067,-0.70603 -0.21961,-1.29072 0.62063,-1.15282 -0.83255,-0.98446 -0.17551,-1.2773 -0.30436,-1.18344 -0.51299,-1.10904 0.50087,-1.19159 -0.36933,-1.23869 0.80334,-0.96872 0.96397,-0.80902 0.61229,-1.17096 -0.21401,-1.30394 -0.89097,-0.9066 -1.02688,-0.74918 -0.28261,-1.24173 -0.52815,-1.15879 -0.78547,-0.98262 -0.38848,-1.19648 -0.0389,-1.25045 -0.39909,-1.18569 0.64923,-1.08863 0.26748,-1.23898 -0.22551,-1.23625 0.0157,-1.25656 0.2365,-1.20343 0.321,-1.18369 0.42092,-1.15836 0.65316,-1.04516 -0.44623,-1.09464 -0.79117,-0.8783 -0.62521,-1.05113 -1.12031,-0.49057 -1.06185,-0.63399 -0.59313,-1.08522 -0.32592,-1.14851 -0.24686,-1.16806 -0.23417,-1.17063 0.23905,-1.16964 -0.26954,-1.15124 0.0687,-1.18039 0.26972,-1.27191 -0.63215,-1.13618 -1.08126,-0.67302 -0.51788,-1.16355 0.0225,-1.34904 -0.82469,-1.06785 -0.87724,-1.05116 -1.35885,-0.16734 -1.05332,-0.66677 -0.87452,-0.8884 -0.16415,-1.24542 -0.56603,-1.12143 -0.20617,-1.29854 -0.94888,-0.91013 0.30319,-1.27809 -0.52382,-1.20459 0.41811,-1.15806 0.12845,-1.22451 0.70506,-1.0945 -0.17033,-1.29075 1.0586,-0.84012 1.17,-0.67643 -0.097,-1.41169 0.73981,-1.20621 0.97015,-0.82753 1.14648,-0.55821 1.10345,-0.68429 0.69042,-1.09963 1.20412,-0.53975 0.65771,-1.14396 1.23623,-0.40204 0.86645,-0.96912 1.20405,-0.37753 1.07823,-0.65553 0.84759,-1.04216 1.32849,-0.19908 0.69672,-1.16349 1.23103,-0.56895 0.5221,-1.18986 0.68975,-1.1012 0.46306,-1.31926 1.17224,-0.76206 1.1619,-0.66594 1.30883,-0.2836 0.23542,-1.37531 0.53582,-1.28832 0.9627,-1.04741 1.32326,-0.52234 -0.16852,-1.32728 0.41045,-1.27343 0.44791,-1.25361 -0.0627,-1.32976 1.29211,-0.79675 1.51007,0.15504 1.04321,-1.14247 1.54299,-0.11274 1.27119,-0.78452 0.92371,-1.17395 0.44372,-1.40448 0.59046,-1.34937 0.88336,-1.26703 1.39899,-0.65465 -0.0845,-1.55393 0.77752,-1.34808 0.0603,-1.54348 -0.8819,-1.26816 0.83695,-1.30948 -0.1757,-1.54414 1.3528,-0.42635 0.69707,-1.2353 0.88502,-1.04597 1.29957,-0.43408 1.39249,0.27912 1.40932,0.17546 0.91815,-1.17267 1.42699,-0.42641 1.37166,0.0415 1.30496,0.42459 1.35057,-0.26453 1.19751,-0.67825 1.16806,-0.80085 0.77475,-1.18554 1.41758,0.13944 1.33943,-0.48465 1.52319,-0.27526 1.35308,-0.75171 1.26549,-0.85962 1.15282,-1.00569 1.11979,-1.19749 0.0368,-1.63906 1.09788,-1.07198 0.96112,-1.19613 1.58695,-0.58041 1.00455,-1.35875 1.61674,-0.0764 1.6183,-0.0273 1.32569,0.83485 1.50973,0.41844 1.47371,0.50257 1.54207,0.21536 1.36841,0.11571 1.35396,0.22956 1.30812,-0.54123 1.40784,0.14864 1.31931,-0.51257 1.40535,0.1683 1.31101,0.50387 1.40227,-0.0791 1.398,0.007 1.39513,-0.0898 1.3854,0.30052 1.20581,0.74544 1.36468,-0.31375 1.37112,0.28429 1.36574,-0.079 1.36428,-0.10115 1.20626,-0.71806 1.06603,-0.91337 1.25648,-0.67114 0.91626,-1.09071 0.99405,-1.00307 1.23185,-0.69051 1.20582,-0.73907 0.93415,-1.06188 1.42327,0.0572 1.42382,-0.0411 1.21421,-0.86776 1.49232,-0.0159 1.30648,-0.52448 1.27301,-0.60116 1.28896,-0.59126 1.39467,-0.25666 0.20884,-1.44761 0.14153,-1.45572 0.82984,-1.21447 0.54782,-1.36509 1.32704,-0.6495 1.37241,-0.54717 0.72145,-1.31943 1.16165,-0.95498 -0.0109,-1.49333 0.88482,-1.20302 0.52935,-1.32101 0.75992,-1.20325 0.71848,-1.31635 0.85225,-1.23396 1.44554,-0.40496 1.37587,-0.60047 1.05862,-0.44747 1.14024,-0.14401 1.1557,-0.08 1.04771,-0.49429 1.13638,-0.38224 0.85084,-0.84471 0.77485,-0.89055 0.48379,-1.07676 0.6898,-0.96342 0.91583,-0.75183 1.25676,0.0568 0.97286,-0.79763 1.19675,0.0631 1.10945,0.45312 1.22088,-0.0736 1.02139,-0.67284 0.94887,-0.69412 0.6339,-0.99013 1.18501,-0.11934 0.99022,-0.66178 1.13374,0.0243 1.09952,-0.27745 1.103,-0.22348 1.12063,-0.10369 1.06515,-0.45893 1.15916,0.0388 1.15158,-0.28108 1.10767,0.42211 1.21516,-0.0102 1.17196,-0.32126 0.52211,-1.1319 1.01378,-0.72531 1.14278,-0.62083 1.29792,-0.0822 1.08793,-0.66315 0.96734,-0.82921 1.00696,0.88332 1.19308,0.60892 1.27943,-0.58969 1.36718,0.33985 1.1847,0.41451 1.18922,-0.40138 1.02271,0.75063 1.26367,-0.1118 1.16464,-0.24795 1.18983,0.0464 1.17945,0.0803 1.17162,0.15758 1.31006,-0.008 1.30783,-0.0767 1.06053,0.78408 1.21515,0.51274 1.31854,0.59667 1.38465,-0.42108 1.24036,0.69193 0.61841,1.27861 0.30235,1.4376 1.20792,0.83607 1.10632,0.81676 1.27185,0.52293 0.54604,1.32104 0.8568,1.14422 -0.42212,1.36096 -0.15189,1.4168 0.94156,0.93459 0.8508,1.0179 1.11675,0.76715 1.33231,0.24619 1.30371,0.0861 1.28338,-0.24498 1.31185,-0.26728 1.27652,0.40362 0.90269,0.98204 0.50653,1.23397 0.43417,1.30489 -0.38324,1.32075 0.96098,0.9031 0.43404,1.24527 0.96305,0.84655 1.03939,0.75087 1.06405,0.88104 0.34305,1.33818 -0.46302,1.27582 0.2148,1.34014 -0.78403,1.00929 -0.3974,1.21468 -0.50834,1.19093 0.0874,1.29193 0.82581,0.87902 0.72781,0.96173 0.60592,1.04184 0.52647,1.08415 0.0254,1.27244 0.24052,1.24977 0.73505,1.05502 1.03927,0.75717 -0.16526,1.17016 -0.071,1.17963 -0.68079,0.96538 -0.73362,0.92586 -0.49926,1.04713 -0.26115,1.13028 -0.40791,1.14983 0.38874,1.15645 -0.0148,1.2377 -0.76345,0.97431 -0.42272,1.16499 -1.04815,0.66128 0.21216,1.21325 -0.61229,1.06869 0.24858,1.16778 -0.32954,1.14756 -0.7134,1.03607 -0.0879,1.25486 0.57259,1.117 -0.0543,1.25404 0.64232,1.02215 0.11947,1.20128 0.43073,1.13666 -0.18734,1.20102 -0.33966,1.22916 0.35104,1.22596 0.60095,1.07042 0.60663,1.06722 0.9865,0.70653 0.9512,0.7534 0.34342,1.2003 0.85654,0.90829 -0.33363,1.12819 -0.56024,1.03452 -0.96483,0.66832 -1.05749,0.50918 -0.65677,0.94827 -0.98995,0.59206 -1.1325,0.20742 -0.95701,0.64009 -1.26209,0.25389 -1.17616,-0.52346 -0.99575,0.7162 -1.0026,0.70659 -1.17207,-0.0369 -1.09079,-0.43043 -1.18688,-0.20502 -0.88593,-0.81599 -1.2586,-0.24299 -0.82621,-0.98003 -1.25794,-0.18005 -1.12344,0.59389 -1.08179,0.43787 -1.16637,0.04 -0.86347,0.80096 -1.12289,0.35531 -0.31528,1.12229 -0.58614,1.00765 -0.8576,0.87777 -0.11194,1.22205 -1.23224,0.0827 -0.88401,0.86243 -0.86058,0.81181 -1.11093,0.40677 -1.18438,0.2934 -1.21245,-0.1372 -0.88196,0.81996 -0.99306,0.68118 -1.00024,-0.72622 -1.22446,-0.16909 -1.24645,-0.084 -1.09528,0.60088 -0.38094,1.11974 -0.9859,0.65341 -0.68552,0.89022 -0.5226,0.99465 -0.32005,1.15017 -0.60324,1.03026 -0.94288,0.74293 -1.13341,0.39538 -1.06475,0.43109 -0.72072,0.89448 -0.33723,1.07159 -0.62666,0.93238 -1.05426,0.61143 -1.19852,-0.22099 -0.53842,1.05164 -0.98358,0.65452 -0.54033,1.0122 0.16881,1.13491 -0.57913,0.95628 -0.10294,1.11323 -0.87644,0.74731 -0.27246,1.1191 -1.01413,0.52302 -0.57653,0.9847"
+ id="path15537"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc"
+ id="path15539"
+ d="m 654.85633,315.86567 -1.14832,0.0801 -0.89796,0.72021 -0.98031,0.54691 -0.67757,0.895 -0.95416,0.61877 -1.13595,-0.0539 -1.03024,0.33372 -1.04666,0.27793 -1.09995,-0.47809 -1.1581,0.31184 -1.08339,0.40481 -0.83052,0.80488 -1.22516,0.11332 -0.82406,0.91365 -1.21615,0.14292 -1.00871,-0.69424 -0.58135,1.0941 -1.09205,0.58517 -1.1965,-0.11653 -1.16833,0.28323 -1.13651,0.36747 -0.81638,0.87191 -0.50545,1.04035 -0.47244,1.05574 -0.52587,1.0414 -1.00021,0.60054 -0.93196,0.63954 -0.73699,0.85696 -0.34185,1.21311 0.46943,1.16967 -0.98035,0.75267 -0.46733,1.1442 -1.09228,0.39385 -1.1571,-0.0964 -0.6056,1.01511 -1.05723,0.52866 -0.35109,1.04748 -0.74352,0.81711 -0.43016,1.00639 -0.7193,0.82491 -0.96031,0.51661 -0.56842,0.93058 -1.08766,0.23815 -0.70942,0.85816 -0.96546,0.47129 -0.8495,0.65771 -1.07353,0.0485 -1.03992,0.27092 -0.46783,0.9864 -0.67732,0.85621 -0.67143,0.86373 -0.87125,0.66164 -1.12113,0.10454 -1.12556,-0.031 -0.92883,0.63303 -0.91209,0.65694 -0.18039,1.0908 -0.45791,1.00634 -0.43652,1.05069 -0.91673,0.67389 -1.09207,0.24648 -1.0827,0.28484 -0.98382,0.60064 -0.59325,0.9883 -1.40765,-0.42847 -1.47067,-0.0467 -1.03925,-1.13829 -1.51842,-0.26485 -1.00812,-1.18019 -0.32751,-1.5172 -1.13516,-1.0524 -1.4897,-0.42064 -1.42732,-0.40127 -1.03959,-1.05712 -0.84655,-1.2749 -1.47619,-0.40362 -1.50136,-0.42761 -1.18651,-1.01446 -1.39241,0.77769 -1.58922,-0.13411 -0.89967,-1.2692 -1.28031,-0.8838 0.1535,-1.62792 -0.95041,-1.33057 -0.61287,-1.46493 -0.82423,-1.3573 0.54341,-1.49397 0.27223,-1.56624 -0.8708,-1.22504 -0.6145,-1.37163 -1.43676,-0.66044 -0.72882,-1.40331 -1.50535,-0.25369 -1.22377,-0.91259 -1.15103,-0.96216 -1.38093,-0.58622 -1.43757,-0.46744 -1.47723,0.32084 -1.05302,1.04737 -1.36318,0.58954 -1.51905,-0.12013 -1.26693,-0.84665 -1.50341,0.20218 -1.24508,0.86655 -1.45023,-0.355 -1.43698,0.40533 -1.34763,-0.57533 -1.07572,-0.99497 -1.39674,-0.20349 -1.32947,-0.4741 -1.45475,-0.31622 -1.33292,0.66302 -1.41964,0.4243 -1.3129,0.68678 -1.33994,0.83065 -1.55457,-0.26224 -1.20854,-0.97472 -1.53623,-0.22502 -1.49136,-0.49267 -1.5039,0.45292 -0.58708,-1.41835 -1.32376,-0.7772 -1.15215,-0.95446 -1.45891,-0.33166 -1.44487,-0.28758 -1.13535,-0.9388 -1.16779,-0.82999 -1.2817,-0.64022 -0.0199,-1.17581 -0.56511,-1.03129 -0.0782,-1.14927 -0.37892,-1.08783 0.27499,-1.2584 -0.61604,-1.13124 0.89216,-0.87941 0.31014,-1.21373 -0.94,-0.70839 -0.35754,-1.12143 -0.16882,-1.18597 -0.90725,-0.78226 -0.94154,-0.68492 -0.44837,-1.07451 -0.6387,-0.94196 -0.92029,-0.66955 0.44295,-1.03855 0.78104,-0.81534 0.39566,-1.03799 0.36749,-1.04831 -0.0396,-1.10918 0.0853,-1.1066 -0.53568,-1.03329 0.16623,-1.15196 0.0258,-1.09268 0.0494,-1.09188 -0.0376,-1.09485 -0.18665,-1.07947 -0.0233,-1.1432 0.43422,-1.05778 0.91737,-0.71196 0.42327,-1.08132 -0.77814,-0.8986 -0.60771,-1.0216 0.22927,-1.21033 -0.44759,-1.14766 -1.09206,-0.72124 -0.35774,-1.2589 -1.161,-0.45949 -1.24861,-0.006 -0.9674,-0.62329 -0.39081,-1.08243 -0.6273,-0.91434 -0.91374,-0.62819 -0.0225,-1.16852 -0.73114,-0.91179 -0.50753,-1.02146 -0.92966,-0.66084 -0.76102,-0.9665 -0.81716,-0.91954 0.0682,-1.23146 -0.12343,-1.22715 0.64553,-1.00034 0.69826,-0.96427 0.27053,-1.16255 0.0899,-1.19022 0.0806,-1.0911 0.20049,-1.07554 -0.0799,-1.09974 0.21924,-1.08061 -0.1896,-1.10919 -0.54688,-0.98346 0.0716,-1.1082 -0.0351,-1.10996 0.23924,-1.29171 -0.26412,-1.28686 -0.9912,-0.89022 -0.43155,-1.26045 -0.22962,-1.28679 0.0646,-1.30552 -1.18273,-0.71047 -0.46195,-1.30009 -0.83056,-1.16583 0.11741,-1.4266 -1.40186,-0.32471 -0.82897,-1.17619 0.45601,-1.2906 -0.41029,-1.30586 -0.81543,-1.04302 -0.35343,-1.2759 0.87948,-0.9993 0.27101,-1.30332 0.97371,-0.85887 0.71534,-1.08352 1.02065,-0.89253 0.24276,-1.33394 0.69707,-1.07888 0.86713,-0.94761 -0.12793,-1.32228 0.39134,-1.26949 -0.6406,-1.19541 0.0984,-1.35266 0.22891,-1.27702 0.0215,-1.2972 -0.10481,-1.38346 0.85696,-1.09112 -0.67343,-1.15137 -0.75819,-1.09742 -1.30404,-0.28134 -1.27646,-0.38772 -1.15003,-0.50867 -1.18776,-0.41296 -1.25043,-0.14575 -1.25884,0.0105 -1.04181,-0.68711 -0.71446,-1.02325 -1.07531,-0.6134 -0.86282,-0.88776 -0.55978,-1.13509 -0.32765,-1.22248 -0.74691,-1.05275 -1.1249,-0.63307 -1.09188,-0.83863 -1.34351,-0.3008 -0.63552,-1.18675 -0.50883,-1.24633 -0.56598,-1.18983 0.13733,-1.3104 0.38323,-1.27261 -0.4109,-1.26395 -0.10325,-1.26117 -0.61278,-1.10713 -0.0695,-1.25647 -0.51756,-1.14703 -0.40653,-1.26112 -0.88961,-0.98198 -1.06252,-0.7827 -1.27863,-0.32657 0.87941,-0.63436 1.05331,-0.25752 0.59486,-0.88348 0.66077,-0.83533 0.14131,-1.11238 0.86142,-0.71788 0.34157,-0.99813 0.0361,-1.05435 0.89219,-0.46165 0.78271,-0.62966 0.8188,-0.66768 1.05621,-0.0256 0.91913,-0.37758 0.93494,-0.33654 0.83058,-0.58737 1.00057,-0.18366 1.02567,-0.26987 1.00632,0.33488 0.80689,-0.63796 0.96203,-0.36412 0.81803,-0.56061 0.86551,-0.4841 0.88422,-0.54927 1.03851,0.0709 1.01271,0.1941 0.98974,0.28927 0.95061,-0.39795 0.97475,-0.33448 0.99253,-0.45406 1.08857,0.0793 0.96433,0.45511 0.81449,0.68823 0.17841,-0.96396 0.6187,-0.76043 0.41943,-0.88237 0.77497,-0.59489 0.69473,-0.72218 0.99072,-0.15059 0.55583,-0.8093 0.88378,-0.42762 0.90053,-0.49596 0.6178,-0.82174 0.29889,-0.97859 -0.0813,-1.01999 0.70526,-0.63224 0.82017,-0.47376 0.57527,-0.74795 0.6556,-0.67864 0.81899,-0.45228 0.79994,-0.48519 0.63097,-0.69125 0.58246,-0.73259 0.83833,-0.45627 0.49765,-0.81445 0.6055,-0.70026 0.72253,-0.57875 0.74619,-0.71454 0.62927,-0.81938 0.0111,-1.03338 0.17531,-1.01846 0.93963,-0.37856 0.67611,-0.75439 0.82152,-0.63358 1.03703,-0.0297 0.006,1.53612 -0.45258,1.46796 -0.60164,1.49935 0.50058,1.53604 0.86519,1.39283 1.4736,0.71906 0.62618,1.45841 0.25917,1.56585 1.63159,0.58634 0.88315,1.49195 1.62293,0.41457 1.63876,-0.34677 1.02031,1.32673 1.42346,0.88033 0.36136,1.61564 0.0166,1.65548 0.60421,1.33344 -0.20369,1.44971 1.21077,0.88202 0.35081,1.45632 0.54953,1.37308 1.09428,0.99494 0.28402,1.44728 -0.34159,1.43478 0.3371,1.41611 1.0766,0.97978 0.24982,1.36836 0.26885,1.36474 0.76142,1.29456 -0.32797,1.46563 0.81909,1.13674 0.63648,1.24818 -0.20432,1.4524 -0.14393,1.45961 -0.38485,1.52822 0.7603,1.38041 -0.20308,1.48412 -0.19856,1.48474 -0.84169,1.23937 -0.88336,1.21004 0.60654,1.32118 0.56552,1.33926 0.18095,1.52041 1.05232,1.11222 0.73385,1.33921 0.14659,1.52004 -0.39148,1.44939 -0.13969,1.49482 0.84125,1.27857 0.57411,1.41875 0.25431,1.54255 0.90663,1.27366 -0.82563,1.39711 0.26397,1.60121 -0.57422,1.50149 0.44034,1.54605 0.61591,1.48565 1.02278,1.24114 1.66814,-0.0482 1.39063,0.92258 1.22472,0.99559 1.37066,0.7826 -0.0497,1.64995 0.91258,1.37551 1.28849,-0.54064 0.96413,-1.01142 1.36392,-0.16724 1.37072,0.0967 1.28678,-0.5479 0.71846,-1.19992 1.39731,-0.0868 1.07339,-0.89882 1.04718,-0.91894 0.30153,-1.36019 0.80515,-1.11328 1.26296,-0.54092 0.50158,-1.28456 0.64819,-1.21719 1.35028,-0.388 1.09094,-0.88523 1.39529,-0.24153 1.26104,0.64416 1.33498,-0.46025 1.35122,0.41015 1.29092,-0.44219 1.02711,-0.89835 1.14855,-0.69334 1.22732,-0.54179 1.22104,-0.74764 1.43066,0.0556 1.41835,0.20333 1.06221,0.96164 1.30335,-0.0601 1.2866,0.21679 1.28459,-0.18547 1.27129,-0.26153 1.41216,0.0926 1.24407,0.67458 1.39029,-0.056 1.34175,-0.36839 0.51377,-1.3634 1.05244,-1.00757 1.22619,-0.78234 1.44101,-0.19771 1.24782,-0.32415 1.27571,0.18626 1.21451,-0.36791 1.26134,-0.13939 1.26776,0.14587 1.27371,-0.0784 1.14557,-0.67234 1.32606,0.0768 0.83566,-1.23499 1.44098,-0.38355 1.45584,0.35489 1.31335,-0.72147 1.27828,0.53333 1.29213,0.49882 1.38295,-0.0862 1.38563,7.3e-4 1.02751,0.99189 1.40841,0.23667 1.05086,0.89996 0.69558,1.19599 1.25367,0.57686 1.37712,-0.0895 1.31009,0.28993 1.24974,0.48842 0.5006,1.119 0.97363,0.74483 1.20154,0.19641 1.00373,0.68904 1.02277,0.69902 0.52624,1.1215 -0.18295,1.23383 0.52361,1.13211 -0.0794,1.14669 -0.0309,1.14902 0.65477,0.96717 0.27299,1.13561 0.71099,0.89244 0.36463,1.0812 0.68137,0.96456 -0.0111,1.1809 1.20111,0.0468 1.18909,-0.17579 1.1742,-0.38689 1.21442,0.2315 0.49519,1.19515 0.76805,1.041 1.1439,0.63455 1.29823,0.16052 0.81697,0.83073 1.11908,0.32434 0.76673,0.82627 0.76447,0.82837 0.96151,0.60582 0.94763,0.6273 0.89313,0.76036 0.41842,1.09578 1.18114,-0.17594 1.0766,0.51668 1.07462,0.39649 1.12456,0.21759 1.14025,-0.46959 0.77615,-0.95827 1.18273,-0.43922 1.20612,0.37019 1.09576,0.27145 0.92223,0.65107 1.02454,0.43256 1.07465,0.28626 0.67875,0.96942 1.14668,0.29262 0.89638,0.65945 0.78617,0.7876 1.06185,0.61359 0.55404,1.09409 1.16443,0.22894 1.18283,-0.0961 0.98769,0.54358 1.11263,0.18184 1.10609,-0.16403 1.11469,0.0883 1.05674,-0.41823 1.12079,0.18827 1.09722,-0.0585 1.09134,0.12754 1.08481,-0.22219 1.09948,-0.13155 1.13821,-0.20982 0.82418,-0.81258 -0.92373,0.89975 -1.24912,0.32016 -1.08261,0.62645 -0.95611,0.80642 -0.64961,1.09696 -0.44912,1.19314 -1.19225,0.56709 -0.71621,1.10909 -1.05916,0.87775 -0.28874,1.34496 -1.13579,0.73324 -0.57592,1.22311 0.52767,1.2483 0.32446,1.31583 -0.34751,1.30556 -0.34166,1.30709 -0.86576,1.07407 0.0163,1.37946 -1.26166,0.41314 -0.98213,0.89325 -0.18326,1.22 -0.54721,1.10568 -0.41907,1.15871 -0.0651,1.23044 -0.53864,1.12589 -0.76927,0.98286 -0.68891,1.09024 -0.0139,1.28959 -1.3039,0.1613 -1.11274,0.69856 -0.64197,1.12352 -0.91509,0.91489 -0.59555,1.14366 -0.15745,1.27978 -0.86545,0.9318 -0.73334,1.03898 -0.17973,1.29709 0.0241,1.30926 -0.45319,1.30409 -1.15959,0.74925 0.3826,1.28937 -0.1314,1.33851 0.64368,1.22888 -0.19788,1.37306 -0.35629,1.31393 -0.93798,0.98668 -0.67239,1.13762 -0.78167,1.06549 -0.6021,1.39082 -1.37329,0.6411 -1.48287,0.0219 -1.21207,0.85457 0.32045,1.43257 -0.56186,1.35618 -0.18074,1.47142 -1.05747,1.039 -0.69578,1.2412 -1.23555,0.70576 -1.37901,-0.0681 -1.35704,0.25444 -1.10509,0.68332 -1.17079,0.56336 -1.25934,0.31779 -1.28304,0.2019"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="strata"
+ style="display:inline">
+ <path
+ style="color:#000000;fill:#606480;fill-opacity:0.60784316;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m -333.1875,72.751445 c -7.03306,-0.09544 -13.20073,1.31587 -17.75,4.864967 -0.47736,32.325518 -5.16733,73.476068 -1.28125,98.403158 59.63124,-36.676 110.68948,-9.68016 129.28125,-3.47498 39.22729,13.09248 66.02403,-13.235 87.84375,-12.67344 50.89307,1.30979 41.93028,2.59476 86.28125,3.6385 20.28407,0.47736 85.77747,-16.7044 139.21875,-19.33722 23.5781,-1.16159 47.57649,7.32394 67.90625,12.10109 22.11005,5.19551 36.47051,4.05336 53.07788,1.90104 40.12308,-5.19995 63.83734,9.75254 77.67212,14.37003 39.22729,13.09248 66.02403,-13.235 87.84375,-12.67344 50.89307,1.30979 41.93028,2.59476 86.28125,3.6385 20.28407,0.47736 85.77747,-16.7044 139.21875,-19.33722 53.29176,-2.62545 110.9375,31.84714 110.9375,31.84714 0,-31.2738 26.28572,-62.55057 0,-93.824366 -17.26966,-3.397162 -38.7233,-6.817879 -84,-0.245292 C 583.09141,88.664129 538.07169,118.53455 517.5,118.90731 466.66575,119.82839 415.23016,101.31051 364.53125,97.444218 343.53577,95.843106 286.23795,131.10178 252.5625,103.08594 236.55352,89.767496 183.68054,66.307173 161.0625,77.616412 147.08569,84.604949 109.62328,87.352993 97.235004,89.124491 50.982664,95.838711 26.07169,118.53455 5.5,118.90731 c -50.83425,0.92108 -102.26984,-17.5968 -152.96875,-21.463092 -20.99548,-1.601112 -78.2933,33.657562 -111.96875,5.641722 -12.50702,-10.405039 -48.63195,-29.993643 -73.75,-30.334495 z"
+ id="rect3366"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sccssssssssssccssssscssss" />
+ <path
+ style="color:#000000;fill:#2e323e;fill-opacity:0.62341774;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 22.40625,322.7855 c -39.698855,0.48589 -79.65884,12.25079 -118.8125,19.82549 -41.30524,7.99095 -84.22551,50.47503 -121.875,32.27891 -23.88652,-11.54443 -70.84789,-43.32561 -109.6875,-34.61132 0,0 -25.23007,68.21251 0,89.13143 39.61395,4.72813 70.37316,-14.91556 106.03125,-15.24397 42.57552,-0.39216 84.29649,18.36788 126.75,15.24397 42.95298,-3.16067 81.45057,-29.58936 124.28125,-34.02821 45.32521,-4.69741 41.03579,0.24318 86.53125,-2.54067 18.23877,-1.11604 38.02079,17.81237 62,28.44709 37.44368,3.86005 84.88255,-6.33793 112.4375,-7.12218 42.57552,-0.39216 84.29649,18.36788 126.75,15.24397 42.95298,-3.16067 81.45057,-29.58936 124.28125,-34.02821 45.32521,-4.69741 41.03579,0.24318 86.53125,-2.54067 25.7309,-1.57448 54.5017,36.8312 93.84375,35.40267 l 0,-89.13142 c -22.43897,0 -20.442,15.59136 -51.625,15.53552 -38.12971,-0.0684 -66.46119,-24.36016 -108.03125,-30.19639 -48.63845,-6.8286 -98.02963,8.83677 -146.21875,18.15948 -41.30524,7.99095 -84.22551,50.47503 -121.875,32.27891 -27.68678,-6.45184 -49.82979,-26.69492 -76.17292,-31.36271 -26.79093,-4.74715 -71.55679,3.76459 -81.02954,3.81133 -38.129708,-0.0684 -45.13373,-17.05078 -86.70379,-22.88701 -9.119709,-1.28037 -18.244976,-1.77814 -27.40625,-1.66601 z"
+ id="path3375"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssccssssccsssccssscacss" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="main"
+ style="display:inline">
+ <g
+ id="layer3"
+ inkscape:label="tmp"
+ style="display:inline"
+ transform="translate(552.95262,83.18474)" />
+ <g
+ id="g5112">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 243.54945,483.28613 c 14.08566,23.24358 69.94066,36.93966 92.47158,15.13116 12.51803,-12.11665 13.5899,-44.76498 7.38892,-60.21006 -5.77367,-14.38078 -53.67308,-41.05185 -58.65132,-9.0227 -1.457,33.60898 -56.65739,28.60958 -41.20918,54.1016 z"
+ id="path4967"
+ sodipodi:nodetypes="csscs"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csscs"
+ id="path2409"
+ d="m 243.63725,475.53826 c 12.9435,21.35883 64.26938,33.94433 84.97334,13.90422 11.50298,-11.13415 12.48793,-41.13512 6.78977,-55.3278 -5.3055,-13.21469 -49.32089,-37.72308 -53.89546,-8.29108 -1.33885,30.88373 -52.06321,26.28971 -37.86765,49.71466 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscsssc"
+ id="path4574"
+ d="m 329.27294,428.10418 c 3.97839,15.27871 -3.66772,38.85733 -15.72789,46.88936 -24.66247,16.42512 -54.10128,12.53437 -71.11036,-5.81693 0.26702,1.78905 0.58083,3.88932 1.94412,6.13897 12.9435,21.35884 63.21884,33.19232 83.9228,13.15221 11.50299,-11.13416 12.04853,-39.82718 6.35037,-54.01986 -0.77867,-1.93948 -3.17977,-4.12396 -5.37904,-6.34375 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscccc"
+ id="path4676"
+ d="m 297.03102,413.12219 c -7.71909,0.0194 -13.09698,2.68055 -14.66949,12.7978 -1.33885,30.88374 -52.93232,26.18608 -38.73676,49.61103 1.70396,2.8118 4.09184,5.48421 6.96875,7.9375 -12.94598,-22.73439 36.89168,-18.51323 38.21875,-49.125 3.62785,-23.34099 32.05306,-12.75253 46.3125,-0.78125 -4.08474,-8.68205 -23.66687,-20.47625 -38.09375,-20.44008 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5118">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 98.81336,470.11932 c -6.918783,23.04182 31.41119,39.50538 50.09677,31.99615 12.45296,-13.37404 30.31695,-17.81936 44.98976,-27.78519 15.89667,-14.71948 -4.15091,-33.104 -18.23167,-39.06219 -20.61949,-10.1033 -35.636,13.43344 -53.53538,19.60282 -8.1692,4.42411 -16.32281,9.07185 -23.31948,15.24841 z"
+ id="path4962"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path3189"
+ d="m 97.237597,464.03444 c -6.583689,21.92585 29.889873,37.59204 47.670463,30.4465 11.84983,-12.7263 28.84862,-16.95632 42.81079,-26.43948 15.12676,-14.00658 -3.94987,-31.5007 -17.34866,-37.17032 -19.62084,-9.61397 -33.91006,12.78283 -50.94253,18.65341 -7.77355,4.20984 -15.53226,8.63248 -22.190063,14.50989 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cczcccc"
+ id="path4579"
+ d="m 183.28133,439.09413 c 2.57499,5.87507 -0.99651,12.53148 -7.21763,18.29191 -13.96217,9.48316 -28.32573,13.83891 -39.5809,22.34414 -11.25517,8.50524 -26.19024,4.37815 -36.981264,-4.17061 6.255224,15.43676 30.898314,24.02242 44.219874,18.5864 11.84984,-12.7263 28.85033,-17.38522 42.8125,-26.86838 10.43773,-9.66478 5.77747,-20.2282 -3.25258,-28.18346 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ id="path4681"
+ d="m 159.84383,429.60883 c -14.54811,0.5555 -26.24421,16.23015 -40.08309,21 -7.77355,4.20984 -14.56022,7.76083 -21.218024,13.63824 -2.918588,9.71986 1.33231,17.99824 9.957364,23.81581 -2.7158,-4.4121 -3.75617,-9.44267 -2.125,-14.875 6.6578,-5.87741 14.41395,-10.32142 22.1875,-14.53125 17.03247,-5.87058 29.05454,-28.70111 48.67538,-19.08713 3.13796,1.32781 7.457,4.07581 10.70551,6.50404 -4.6172,-6.57778 -11.27636,-11.90596 -17.78383,-14.65956 -3.67891,-1.80262 -6.95855,-1.93334 -10.31581,-1.80515 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g4947">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 153.59545,325.33608 c -26.19673,9.35369 -59.746556,10.06149 -77.027534,34.66971 -11.833855,25.7314 27.631694,42.37949 44.362644,24.76657 15.76674,-35.99146 48.41417,17.31305 66.93781,-13.68617 21.12032,-22.54634 -8.42316,-54.23981 -34.27292,-45.75011 z"
+ id="path4919"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path3217"
+ d="m 148.60577,322.76996 c -24.34489,8.69248 -55.52308,9.35025 -71.58247,32.21892 -10.997322,23.91245 25.67841,39.38369 41.22666,23.01583 14.65219,-33.44724 44.99178,16.08919 62.20599,-12.7187 19.62733,-20.95255 -7.82773,-50.40561 -31.85018,-42.51605 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cssccsc"
+ id="path4599"
+ d="m 175.4729,329.06052 c 5.57272,8.67906 3.97278,18.54559 -7.05549,25.06289 -9.53815,5.63671 -28.22611,-10.36828 -55.75555,12.07243 -10.94791,8.92422 -24.784054,12.1112 -34.660294,5.42645 6.906913,13.11437 27.838124,17.14114 39.279794,5.09633 14.65219,-33.44723 43.27155,15.26748 62.43419,-12.07243 9.8771,-14.09196 7.06622,-26.81672 -4.24265,-35.58567 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccc"
+ id="path4686"
+ d="m 157.68834,322.12633 c -3.01141,-0.0912 -6.84498,0.40277 -9.84779,1.38897 -24.34489,8.69248 -53.564154,8.70376 -69.623544,31.57243 -5.626659,12.23454 0.687368,21.93296 10.805151,26.61434 -3.313134,-4.99176 -4.901043,-11.11378 -1.64632,-18.19081 16.059393,-22.86867 47.248873,-23.52626 71.593753,-32.21875 7.61426,-2.50071 15.55463,-1.23031 22.25,2.3125 -5.5452,-6.95863 -14.32063,-11.19966 -23.53125,-11.47868 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g4953"
+ transform="matrix(0.996898,-0.07870497,0.07870497,0.996898,-31.147293,-4.6451223)">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 23.614453,423.05879 c -3.569625,-21.75537 -3.996086,-45.57257 5.06812,-65.93591 21.163929,-17.57014 18.32793,18.9004 14.047616,30.88672 -2.502601,27.12323 47.852315,43.45388 21.433318,72.36563 -31.175776,18.10786 -29.181672,-20.52556 -40.549054,-37.31644 z"
+ id="path4934"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path3239"
+ d="m 21.017662,418.18389 c -3.351217,-20.42427 -3.751585,-42.78421 4.758027,-61.90162 19.869014,-16.49511 17.206535,17.74398 13.188112,28.99691 -2.349479,25.4637 44.92447,40.79516 20.12192,67.93794 -29.268285,16.99993 -27.39619,-19.2697 -38.068059,-35.03323 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csccccsccc"
+ id="path4594"
+ d="m 35.521194,351.93522 c 1.585155,7.91809 -0.995074,19.71741 -2.188055,25.73958 -1.695132,8.55703 3.576638,16.30199 9.5531,23.55192 -3.121787,-4.96353 -5.19862,-10.32134 -4.668777,-16.06379 3.172634,-8.88445 6.242974,-31.96773 -2.696268,-33.22771 z m 21.010835,65.58894 c 5.239849,8.41477 6.363604,15.53061 -4.683621,24.78312 -8.621377,7.22076 -14.339041,7.96883 -18.799177,4.44935 4.522513,9.22686 9.858744,14.17412 24.761897,5.51791 12.832666,-14.04349 7.621446,-23.9913 -1.279099,-34.75038 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccssccccc"
+ id="path4691"
+ d="m 35.273918,351.89842 c -2.354076,-0.21815 -5.460651,1.01776 -9.496544,4.36832 -8.509612,19.11742 -7.578285,41.56635 -4.227068,61.99063 6.268014,9.25854 7.683976,25.49427 14.148491,33.95277 -3.457034,-8.52085 -6.084938,-18.27092 -8.352239,-26.02376 -5.699627,-19.48935 -6.798194,-44.03422 3.540216,-61.76613 3.281264,-5.62785 7.959865,-5.22056 10.449451,-4.00534 -0.778438,-4.70815 -2.614578,-8.19699 -6.062307,-8.51649 z m 9.507292,51.17593 c 3.819536,10.06227 13.900009,18.76832 20.298835,27.91743 -3.482068,-9.66983 -13.695292,-18.3514 -20.298835,-27.91743 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g4941">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 64.059207,304.10953 C 48.577824,298.83697 14.78163,275.2373 27.917609,262.34117 c 9.704193,-9.527 32.493002,-8.10072 49.144088,-10.45178 16.643327,-0.9642 47.834633,2.64559 44.810403,22.73516 -3.32179,22.0662 -39.008531,35.88925 -57.812893,29.48498 z"
+ id="path4929"
+ sodipodi:nodetypes="cscss"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscss"
+ id="path3227"
+ d="m 59.616826,297.41386 c -14.794601,-5.03866 -47.091533,-27.5914 -34.53829,-39.91543 9.273697,-9.10437 31.051552,-7.74136 46.963966,-9.98812 15.904998,-0.92143 45.712598,2.52822 42.822528,21.72658 -3.17443,21.0873 -37.278039,34.29714 -55.248204,28.17697 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscssc"
+ id="path4614"
+ d="m 108.3415,256.10205 c -1.18195,26.26297 -32.475414,29.45447 -52.820966,25.70444 -9.207346,-1.69706 -25.212565,-7.46472 -33.202199,-17.13863 0.905097,12.43256 25.938163,27.29006 38.174259,31.45736 17.970165,6.12017 50.105356,-6.023 53.279786,-27.1103 0.8691,-5.77335 -1.65338,-9.67852 -5.43088,-12.91287 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscsccc"
+ id="path4696"
+ d="m 75.377525,248.46381 c -1.091299,0.0207 -2.130938,0.0674 -3.125,0.125 -15.912414,2.24676 -36.617854,-0.18157 -45.891551,8.9228 -5.295899,5.1992 -3.873507,12.21163 2.113611,18.96875 -1.371454,-3.82185 -0.969133,-7.43054 2.09375,-10.4375 9.273697,-9.10436 29.548257,-4.95252 45.460671,-7.19928 10.885775,-0.63066 28.279744,-2.00676 37.249994,5.10553 -2.65381,-13.54745 -23.273144,-15.76226 -37.901475,-15.4853 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5131">
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 168.58782,286.39964 c -18.13365,-14.75335 1.98121,-37.9864 20.70134,-27.05725 14.82974,-6.62963 31.51866,-34.31735 46.67223,-11.35128 13.77361,14.35676 19.0125,41.40772 0.8538,54.45599 -20.93911,14.21706 -46.33877,-2.83336 -65.21908,-12.57599 -1.06649,-1.09714 -1.99341,-2.32627 -3.00829,-3.47147 z"
+ id="path4939"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path3250"
+ d="m 166.11717,279.85585 c -17.3715,-14.13327 1.89794,-36.38985 19.83127,-25.92005 14.20646,-6.35099 30.19395,-32.87501 44.71063,-10.87419 13.19471,13.75335 18.21341,39.66738 0.81791,52.16723 -20.05905,13.61953 -44.39118,-2.71427 -62.47796,-12.04742 -1.02166,-1.05103 -1.90962,-2.2285 -2.88185,-3.32557 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path4604"
+ d="m 236.09303,250.15697 c 3.62678,12.37291 -0.85155,18.6966 -12.08528,26.76879 -20.05905,11.862 -40.82721,4.62686 -58.91399,-4.70629 -1.94187,-1.68373 -2.4259,-3.19662 -4.2739,-4.98603 0.23117,6.73558 3.32898,11.96156 8.93346,15.20074 17.82475,9.68657 41.00933,25.54306 61.06839,11.92353 14.73084,-10.5851 14.04077,-29.90742 5.27132,-44.20074 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccscccc"
+ id="path4701"
+ d="m 217.47796,235.36248 c -10.84363,-0.10042 -20.89941,14.87272 -31.1103,19.4375 -17.7627,-10.37018 -37.23113,10.48999 -20.71213,24.63824 -2.30958,-12.23372 10.66838,-16.56761 24.97464,-15.2114 13.7503,1.30352 29.61086,-20.46929 46.1191,-11.4136 0.6688,0.69712 1.31258,1.43124 1.93751,2.1875 -2.04266,-4.46044 -5.44043,-7.70153 -8.67757,-11.07574 -4.08283,-6.18772 -8.2881,-8.52321 -12.53125,-8.5625 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5042">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 76.352636,196.18158 c 13.258725,-1.43048 36.815714,-12.73591 15.93394,-24.33165 -23.154226,-14.8425 -49.968777,-35.24726 -79.043359,-26.25715 -29.139741,9.55882 -20.6864931,39.75739 -8.714574,58.7739 25.226647,16.51112 47.01227,2.2174 71.823993,-8.1851 z"
+ id="path5013"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path3265"
+ d="m 68.211515,188.56943 c 12.60855,-1.36032 35.010355,-12.11136 15.15258,-23.13848 -22.018802,-14.11466 -47.518433,-33.51882 -75.167271,-24.96957 -27.7108,9.09009 -19.672079,37.80779 -8.287233,55.89178 23.989596,15.70145 44.706907,2.10866 68.301924,-7.78373 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscccc"
+ id="path4619"
+ d="m 84.538095,166.1043 c -0.05766,7.22209 -19.35778,9.28809 -27.878647,12.10626 -23.126052,7.64865 -37.803594,24.20179 -60.590103,11.33124 1.198417,2.38401 3.037014,4.35237 4.38235,6.48934 23.989598,15.70145 43.317124,1.68026 66.91214,-8.21213 12.34239,-1.33161 34.889065,-10.93575 17.17426,-21.71471 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccc"
+ id="path4706"
+ d="m 21.006845,139.03187 c -4.21011,0.0977 -7.846049,0.94212 -12.16618,2.27794 -27.710801,9.09008 -20.312416,36.9605 -8.92757,55.04449 0.143196,0.0937 0.294536,0.15836 0.4375,0.25 -7.454439,-17.14722 -3.254457,-31.60578 19.431216,-39.04746 27.585553,-8.03338 47.612064,5.94572 70.234964,19.43974 1.60532,-3.54876 0.69856,-7.4901 -6.66618,-11.57978 -18.57836,-11.90924 -39.609158,-26.91261 -62.34375,-26.38493 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <path
+ id="path5018"
+ d="m 180.30774,201.6402 c 23.35892,-19.73126 62.42481,-7.2478 80.81689,-34.29538 15.22207,-28.30585 -21.27325,-46.96912 -45.25948,-42.66859 -33.9203,-9.60925 -47.18916,30.24418 -52.36597,55.78348 -10.5555,12.75646 -16.91044,48.24074 10.35932,34.43322 3.3873,-3.85804 3.05696,-9.39371 6.44924,-13.25273 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 178.91694,193.7562 c 21.55177,-18.20476 57.59535,-6.68708 74.56454,-31.64214 14.04442,-26.11598 -19.62746,-43.33538 -41.75801,-39.36756 -31.29608,-8.86583 -43.5384,27.90436 -48.31471,51.46783 -9.73888,11.76956 -15.60217,44.50862 9.55788,31.76931 3.12524,-3.55956 2.82046,-8.66697 5.9503,-12.22744 z"
+ id="path3280"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 248.46909,133.06315 c 2.24225,5.64435 -4.79294,11.4858 -10.06172,17.83898 -20.65251,24.90314 -44.9637,15.14707 -66.37578,33.37977 -3.12984,3.56047 -5.85967,7.79742 -8.98491,11.35699 -4.66662,2.36285 -3.95463,2.9393 -6.65995,2.59706 0.47268,8.04488 2.72624,12.69437 15.28972,6.33309 3.12525,-3.55956 3.88486,-8.33512 7.0147,-11.89559 21.55177,-18.20476 56.62383,-6.23906 73.59302,-31.19412 6.4204,-11.93891 4.04723,-21.37001 -3.81508,-28.41618 z"
+ id="path4624"
+ sodipodi:nodetypes="csccccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 202.55622,122.91498 c -24.2844,0.36794 -33.81853,30.3182 -38.07243,51.30442 -7.60121,9.18616 -13.91829,29.8478 -3.8897,32.98861 -0.48616,-8.06856 7.04512,-16.74942 9.3897,-23.86361 7.35471,-22.31646 20.02612,-51.84692 47.2353,-51.46875 12.82571,0.17826 29.67851,2.60638 38.6875,12.25 -4.75779,-15.51582 -27.24931,-22.82654 -43.75662,-19.86692 -3.42301,-0.9697 -6.61146,-1.38894 -9.59375,-1.34375 z"
+ id="path4711"
+ sodipodi:nodetypes="cccssccc"
+ inkscape:connector-curvature="0" />
+ <g
+ id="g5156">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 231.17733,341.55425 c -19.80953,-13.06288 -21.43048,15.01309 -15.50131,30.69545 4.35735,11.52494 -21.3869,42.11622 8.42655,42.6912 18.21045,5.28821 42.461,-6.98854 41.1185,-27.94385 2.7342,-21.37225 -11.15786,-44.2048 -34.04374,-45.4428 z"
+ id="path4924"
+ sodipodi:nodetypes="csccc"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csccc"
+ id="path3200"
+ d="m 229.31612,340.90684 c -18.03103,-11.8901 -19.50645,13.66522 -14.1096,27.93962 3.96614,10.49024 -19.4668,38.33506 7.67,38.85842 16.57554,4.81344 38.64889,-6.36111 37.42691,-25.43507 2.48873,-19.45346 -10.15611,-40.23612 -30.98731,-41.36297 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscccsc"
+ id="path4722"
+ d="m 241.57997,345.51158 c 7.92523,8.09629 10.587,18.94311 10.48272,30.67611 -0.16914,19.02994 -20.83071,30.25092 -37.40625,25.4375 -1.72326,-0.0332 -2.39662,-0.59498 -3.73199,-0.83713 1.19585,3.77916 4.13974,6.02204 12.16618,6.17684 16.57554,4.81345 36.81974,-5.6609 37.22206,-24.68346 0.32302,-15.27297 -5.47726,-29.97373 -18.73272,-36.76986 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscscccc"
+ id="path4727"
+ d="m 220.73622,338.49026 c -9.88253,0.35661 -9.14818,18.75573 -4.76324,30.35368 3.6397,9.62681 -15.88762,33.42676 1.86103,37.75662 -3.23323,-8.93066 7.21296,-24.77663 4.38493,-32.25662 -5.39685,-14.2744 -3.93728,-39.82759 14.09375,-27.9375 5.09085,0.27539 9.49171,2.57606 13.50331,4.89301 -5.27819,-5.44928 -12.12302,-9.18564 -20.50331,-9.63897 -3.38082,-2.22939 -6.29589,-3.25251 -8.57647,-3.17022 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5100">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 400.99505,322.10323 c 7.76038,17.86046 10.89505,41.86369 30.2968,50.90426 26.38786,4.45559 19.67376,-43.11216 50.49306,-36.48737 15.81388,2.63656 39.75625,-19.40635 12.51894,-22.81542 -28.36194,-8.83432 -56.93481,-22.47229 -87.25265,-19.95287 -14.89339,0.90923 -5.81285,19.52479 -6.05615,28.3514 z"
+ id="path4984"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4508"
+ d="m 402.75488,318.67813 c 6.76221,15.56319 9.49368,36.47905 26.39993,44.35679 22.99376,3.8825 17.14326,-37.56693 43.99847,-31.79424 13.77986,2.29743 34.64268,-16.91025 10.90872,-19.88084 -24.71394,-7.69802 -49.61168,-19.58183 -76.02993,-17.38646 -12.97776,0.79228 -5.06519,17.01344 -5.27719,24.70475 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csccccc"
+ id="path4666"
+ d="m 481.54919,311.89917 c -3.6146,5.22453 -14.38627,5.66331 -21.66433,6.87354 -23.88975,3.97249 -19.06729,28.76968 -38.39856,31.35037 -2.40288,-1.11966 -4.30834,-0.77661 -6.19081,-2.37023 3.42512,6.37669 8.19524,11.17413 15.15294,14.41618 22.99376,3.88251 13.26687,-37.98482 40.12208,-32.21213 13.63243,2.27284 33.52059,-14.7795 10.97868,-18.05773 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccsccccc"
+ id="path4738"
+ d="m 413.39917,295.01093 c -1.63959,0.0317 -3.28636,0.11279 -4.9375,0.25 -12.97776,0.79227 -3.99205,15.51936 -4.20405,23.21067 5.85328,13.47129 7.18426,31.1503 18.80442,40.71544 -6.35844,-9.69435 -5.85551,-19.7531 -8.42319,-30.53641 -1.74141,-7.31327 -1.87962,-17.43202 11.09813,-18.2243 26.41825,-2.19537 40.29862,0.84393 65.01256,8.54196 1.45675,0.18233 2.77357,0.42281 3.90625,0.71875 1.00459,-3.7365 -1.5971,-7.18646 -10.59375,-8.3125 -23.16933,-7.21688 -46.06905,-16.83875 -70.66287,-16.36361 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5088">
+ <path
+ sodipodi:nodetypes="ccscc"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ id="path4989"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscc"
+ id="path4488"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccssc"
+ id="path4629"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path4743"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5106">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 421.18271,436.17142 c -11.16147,18.32846 -14.41657,50.24995 14.46856,46.97211 17.94094,-2.03592 39.66066,6.00096 53.08036,-2.32822 9.27612,-5.75739 7.59744,-38.68848 -12.68783,-34.49797 -10.43657,-13.10641 25.83273,-39.60867 -3.25371,-41.38059 -4.13074,-1.04845 -7.33292,-4.00828 -14.215,-0.24189 -19.1296,12.95412 -23.65816,8.92335 -37.39238,31.47656 z"
+ id="path4972"
+ sodipodi:nodetypes="csscccs"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csscccs"
+ id="path4503"
+ d="m 419.45862,432.96729 c -10.49665,17.23675 -13.55786,47.25687 13.60676,44.17427 16.87231,-1.91465 37.29832,5.64352 49.91869,-2.18954 8.7236,-5.41446 7.14491,-36.38404 -11.93209,-32.44314 -9.81493,-12.32574 24.29403,-37.24942 -3.05991,-38.9158 -3.8847,-0.986 -6.89614,-3.76953 -13.3683,-0.22748 -17.99017,12.18252 -22.24899,8.39184 -35.16515,29.60169 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscsccsscssc"
+ id="path4671"
+ d="m 468.08309,404.59513 c 3.02835,8.67716 -10.59888,25.32343 -5.4228,32.6121 1.97424,2.78001 4.81528,4.21317 7.05442,5.2257 -4.32999,-12.11159 7.07193,-22.75328 7.89316,-30.20597 0.4534,-4.11464 -2.26044,-7.1337 -9.52478,-7.63183 z m 5.04892,38.16618 c 1.15065,7.14612 2.80191,17.20087 -1.88162,19.04376 -14.32754,5.63767 -30.14778,1.73217 -47.12539,2.50808 -5.31121,0.24273 -7.76801,0.46881 -11.12023,-1.0625 2.09049,9.06023 7.17661,14.3118 20.27648,13.25 16.92252,-1.37164 35.11396,5.29222 48.09487,-2.0772 7.76951,-4.41084 9.86109,-28.82551 -8.24411,-31.66214 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscscccccccc"
+ id="path4748"
+ d="m 461.02794,402.17822 c -1.64441,-0.0414 -3.54169,0.39048 -5.96875,1.71875 -17.99016,12.18252 -22.8572,7.94708 -35.05919,29.61434 -7.18032,12.7502 -12.69213,29.71583 -2.98934,38.38089 -4.41753,-10.03699 5.1078,-20.3231 10.77682,-30.87612 11.7835,-21.93529 12.19037,-15.7083 30.18054,-27.89082 6.64519,-3.46343 13.4222,-3.74464 20.44485,-1.49888 0.13112,-3.8498 -1.81104,-6.87477 -10.19743,-7.38566 -2.42793,-0.61625 -4.44681,-1.99355 -7.1875,-2.0625 z m 10.83898,40.44081 c -0.11219,2.22617 0.34764,4.32464 1.78125,6.125 4.56349,-0.94272 8.82395,-0.39427 11.29926,1.47206 -2.07573,-5.30486 -7.35297,-8.11775 -13.08051,-7.59706 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5094">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 444.97362,137.04779 c -13.27903,-2.12414 -41.81047,12.83362 -20.5646,25.20802 21.14798,16.05649 -8.90255,36.26025 -1.11855,55.45191 11.14989,14.25831 41.69565,19.6363 50.88544,0.58383 5.60783,-20.0215 6.34384,-44.20353 -10.97394,-55.48888 0.15091,-9.9477 -8.15192,-24.83137 -18.22835,-25.75488 z"
+ id="path4994"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4496"
+ d="m 442.10081,137.63339 c -12.26923,-1.87561 -38.63102,11.33206 -19.00078,22.25862 19.53981,14.17784 -8.22556,32.01772 -1.03349,48.96391 10.30201,12.59005 38.52494,17.3388 47.01589,0.51552 5.1814,-17.67894 5.86143,-39.03161 -10.13943,-48.99655 0.13943,-8.7838 -7.53201,-21.92604 -16.84219,-22.7415 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscccccccccc"
+ id="path4661"
+ d="m 446.74985,139.09447 c 3.41263,4.626 3.94356,11.40716 5.5,15.1875 1.05425,2.56062 4.34583,3.66415 6.1489,5.90625 0.0257,-7.24947 -4.63442,-17.33354 -11.6489,-21.09375 z m -30.03125,14.96875 c 0.77154,1.59319 2.27263,3.20791 4.65625,4.78125 -1.06451,-1.63889 -2.57626,-3.2236 -4.65625,-4.78125 z m 43.90036,8.54668 c 8.6297,11.13037 0.85064,23.9644 -3.41467,38.51767 -8.78607,12.39305 -22.42161,9.26061 -33.95702,7.50146 10.30202,12.59006 36.3859,17.03136 44.87685,0.20809 4.59189,-17.41328 6.82529,-35.79366 -7.50516,-46.22722 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccccccccc"
+ id="path4753"
+ d="m 439.6561,137.46947 c -12.87893,-0.0542 -34.76566,12.09564 -16.78125,22.3125 -3.10176,-8.95841 15.83171,-15.90152 25.6875,-14.39486 1.93392,0.16939 3.79407,-0.40748 5.53125,0.67611 -3.06711,-4.51276 -7.3253,-8.02805 -12,-8.4375 -0.76683,-0.11722 -1.57524,-0.15261 -2.4375,-0.15625 z m -11.09375,28.28125 c 7.27188,13.06398 -12.7334,28.40642 -6.5,43.09375 1.62286,1.98331 3.6974,3.77205 6.0625,5.3125 -5.45276,-16.28794 21.48379,-29.68425 1.4375,-47.8125 -0.35593,-0.19812 -0.67395,-0.39424 -1,-0.59375 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5137">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 280.5597,63.430376 c -21.6581,4.239134 -8.10201,30.694561 6.82249,35.530244 23.94044,8.96476 -11.44287,41.92048 17.04386,42.26164 16.56164,6.47085 41.32506,5.86435 38.10592,-18.46251 C 343.6953,104.90838 336.60346,86.692204 327.01823,72.02951 314.98581,59.48727 296.22415,61.049062 280.5597,63.430376 z"
+ id="path4999"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4513"
+ d="m 276.57352,59.678177 c -20.38485,3.989922 -7.6257,28.890075 6.42141,33.441475 22.53302,8.437748 -10.77016,39.456048 16.04188,39.777148 15.588,6.09044 38.89562,5.5196 35.86573,-17.37712 1.09494,-16.801918 -5.57999,-33.947202 -14.60171,-47.747899 -11.32506,-11.8049 -28.98375,-10.334924 -43.72731,-8.093604 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csccccccccc"
+ id="path4650"
+ d="m 314.00103,62.844322 c 7.85526,13.124329 12.64465,29.26952 9.1434,44.156248 -6.43048,27.34133 -17.23156,18.3756 -35.1434,17.21875 -0.155,5.00001 2.15072,7.93354 11.13897,8.04118 15.58801,6.09045 37.82769,6.06032 34.7978,-16.8364 1.09493,-16.801908 -4.60255,-33.841581 -13.62427,-47.642278 -1.92746,-2.009127 -4.06371,-3.635775 -6.3125,-4.9375 z m -44.0625,19.5625 c 3.12049,4.72643 11.07323,9.8428 15.87057,11.5772 -0.13326,-4.89069 -6.36505,-7.52703 -11.33932,-9.3897 -1.5364,-0.49781 -3.06734,-1.25682 -4.53125,-2.1875 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ id="path4758"
+ d="m 293.90728,58.156822 c -5.86099,-0.03581 -11.81491,0.690755 -17.34375,1.53125 -18.47376,3.615867 -9.72635,24.40248 2.53125,31.65625 -5.54635,-8.80876 -3.86309,-17.727832 9.01543,-20.248541 12.01578,-1.826642 23.91531,-5.061546 34.79707,0.904791 -0.84574,-1.435552 -1.69621,-2.845773 -2.59375,-4.21875 -7.07817,-7.378063 -16.63794,-9.565314 -26.40625,-9.625 z m -2.78125,43.937498 c 2.03112,11.99449 -11.80992,29.56164 6.375,30.71875 2.25382,-11.47742 7.94767,-25.25194 -6.375,-30.71875 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5143">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 394.41802,29.511445 c -24.33094,-2.372993 -42.37819,38.315367 -24.52102,50.778736 21.76694,15.192179 49.18061,5.116888 73.90181,15.672028 18.1956,7.768911 30.80807,-38.146124 20.66121,-45.580654 -9.59667,-7.031405 -28.02351,-0.646227 -24.50155,-18.700484 -3.79288,-17.170263 -25.58383,-22.0551092 -29.61234,-3.536558 -4.70689,3.810284 -10.61753,1.202468 -15.92811,1.366932 z"
+ id="path5004"
+ sodipodi:nodetypes="csssccc"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csssccc"
+ id="path4524"
+ d="m 392.90083,26.612694 c -22.55566,-2.19985 -39.28612,35.519738 -22.73187,47.073733 20.17874,14.083702 45.59221,4.743542 68.50966,14.52854 16.86798,7.202069 28.5602,-35.362843 19.15369,-42.254922 -8.89646,-6.518368 -25.97881,-0.599076 -22.71383,-17.336028 -3.51614,-15.917458 -23.71713,-20.4458881 -27.45171,-3.278518 -4.36346,3.532272 -9.84284,1.114731 -14.76594,1.267195 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccssczssc"
+ id="path4656"
+ d="m 429.07763,18.239089 c -0.49401,5.84967 1.13521,14.05791 4.9202,15.419083 2.66942,-4.0541 -2.24751,-13.109659 -4.9202,-15.419083 z m 26.36133,26.314883 c -0.47961,14.55212 -8.65051,27.198608 -25.00356,25.562789 -24.79524,-2.480303 -45.81596,4.828377 -65.99471,-9.255325 -0.32814,-0.22902 -0.61696,-0.458644 -0.91916,-0.707712 0.21178,5.528976 -1.34697,6.619821 10.94303,15.197594 12.28999,8.577773 41.44547,2.238565 64.36292,12.023563 16.86798,7.202071 28.39575,-34.510286 18.98924,-41.402365 -0.74818,-0.548189 -1.53076,-1.025416 -2.37776,-1.418544 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccsc"
+ id="path4763"
+ d="m 421.48839,14.567352 c -5.95658,-0.975869 -11.94973,2.205386 -13.81703,10.78907 -4.36347,3.532269 -9.85247,1.090809 -14.77557,1.243273 -22.07884,-2.153347 -38.57191,33.972848 -23.73311,46.336568 0.81198,-35.433817 24.95782,-24.934799 41.64127,-37.147859 4.9952,-11.402497 16.28238,-16.513817 23.63819,-9.518589 C 432.1363,19.661641 426.835,15.443287 421.48839,14.567352 z m 17.99603,25.678141 c 0.27756,10.771153 13.1337,7.748581 21.40027,12.06813 -0.44634,-2.888464 -1.43938,-5.14785 -3.06797,-6.341107 -5.22153,-3.825775 -13.23995,-3.374898 -18.3323,-5.727023 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5036">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 139.49219,53.310783 c 7.72437,24.866042 50.17839,39.81396 59.1167,22.557291 C 210.09914,53.68453 222.71463,33.777355 248.40188,31.425002 269.51226,17.82539 249.26997,-9.6399047 227.76933,0.13335984 202.92242,3.7785696 180.21881,25.997032 153.04117,10.872046 128.89093,4.422499 141.11979,40.889504 139.49219,53.310783 z"
+ id="path5023"
+ sodipodi:nodetypes="cscccc"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscccc"
+ id="path4518"
+ d="m 141.80976,46.316303 c 7.17296,23.090963 46.59637,36.971813 54.89661,20.947023 10.67001,-20.599956 22.38494,-39.086043 46.23849,-41.270472 19.6034,-12.628794 0.80612,-38.13346 -19.15968,-29.057867 -23.0732,3.384994 -44.1561,24.017376 -69.39364,9.972098 -22.42626,-5.989142 -11.07037,27.874641 -12.58178,39.409218 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cszcscc"
+ id="path4639"
+ d="m 243.31856,0.206855 c 2.06979,6.137125 -1.16573,14.451514 -10.05403,16.481262 -22.81135,5.209246 -38.08158,29.055698 -46.97279,37.403332 -8.99944,8.449247 -28.8771,11.361257 -42.83679,-3.701133 10.17491,20.58787 44.48003,30.85775 52.28052,15.7978 10.67001,-20.599954 21.85785,-39.31226 45.7114,-41.496689 11.85732,-7.638654 9.87343,-17.926135 1.87169,-24.484572 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccccsccc"
+ id="path4768"
+ d="m 231.25017,-3.983955 c -2.38649,0.146504 -4.84803,0.740551 -7.34375,1.875 -23.0732,3.384995 -44.27643,24.476158 -69.51397,10.43088 -22.42625,-5.989142 -10.00514,26.255874 -11.51655,37.790451 1.68627,5.428391 4.73526,10.111815 9.16287,14.25331 -1.32799,-2.13406 -3.0426,-3.941992 -3.77132,-6.28787 1.51141,-11.534577 -4.44305,-35.083569 11.83971,-33.373934 28.50873,2.99332 47.05584,-12.616073 70.12904,-16.001066 7.29698,-3.316893 13.27282,-1.687395 18.44008,1.91691 -2.91879,-6.626734 -8.94429,-11.12437 -17.42611,-10.603681 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5030">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 11.565497,-11.57212 C 4.7232923,-9.6623195 -3.3260383,-12.801951 -8.3287763,-9.7036625 -21.278135,-1.6838851 -24.173562,20.345108 -23.681024,36.37459 -35.834604,68.381862 12.088762,80.839539 22.948108,52.272586 25.701964,37.061785 36.898362,27.868369 48.623407,20.309331 c 5.591619,-3.60487 10.937409,-9.601752 16.277207,-10.174876 5.902932,-0.6335658 11.200996,2.794501 14.802434,2.300204 9.91186,-1.360401 9.74522,-11.49705829 -0.366191,-24.006779 -12.007814,-9.894977 -34.747146,-15.985974 -51.652405,-11.110457 -6.5842,1.898899 -10.737392,9.608352 -16.118955,11.110457 z"
+ id="path5028"
+ sodipodi:nodetypes="csccssscss"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csccssscss"
+ id="path4552"
+ d="m 9.760203,-13.968212 c -6.398148,1.785856 -13.9250798,-1.150015 -18.603142,1.747196 -12.10895,7.4992964 -14.816465,28.098615 -14.355892,43.087789 -11.364817,29.930011 33.448339,41.579189 43.602917,14.866221 2.575132,-14.223625 13.044887,-22.820391 24.008981,-29.88885 5.228725,-3.370915 10.227575,-8.9786015 15.220822,-9.51453 5.519833,-0.5924474 10.474055,2.6131387 13.841761,2.1509219 9.268583,-1.2721112 9.112758,-10.7509033 -0.342426,-22.4487479 -11.228511,-9.252796 -32.492068,-14.94849 -48.300181,-10.389392 -6.156888,1.775661 -10.040539,8.984773 -15.07284,10.389392 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csscssscc"
+ id="path4644"
+ d="m 71.320075,-14.172408 c 4.76023,10.9449346 -3.795801,7.983078 -20.34117,9.889531 C 35.531266,-2.502911 16.222819,10.075182 10.682956,30.599136 5.98025,48.02161 -11.934613,54.433868 -23.084717,45.641382 -17.796601,63.815964 13.456949,66.038566 19.771544,43.796173 23.745797,29.79735 34.620992,20.727784 45.345488,13.300304 50.367162,9.8224361 55.160105,5.6974929 60.067494,5.3594029 c 6.339923,-0.436783 11.402713,2.677915 14.789869,2.134406 10.235546,-3.5679734 2.788847,-17.09157 -3.537288,-21.6662169 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cssccssccc"
+ id="path4773"
+ d="m 32.592516,-24.982889 c -10.609156,0.242509 -15.180976,8.179798 -22.400022,12.07647 -4.8555336,2.620904 -12.4718309,-0.9042 -16.6954893,0.811027 -14.1323667,5.7391505 -16.1185307,26.956965 -15.6269417,42.955524 -4.510721,11.879291 -1.242802,20.885897 6.266551,25.75 -1.88941,-4.564778 -2.635546,-11.157464 -2.179028,-17.980139 1.367919,-20.443612 12.556659,-35.065455 34.261389,-45.05919 13.505959,-6.21869 44.357887,-11.518712 61.125729,-0.3821817 -1.14422,-2.105606 -2.81056,-4.2510533 -4.69283,-6.5797803 -8.775986,-7.231805 -26.419014,-11.903528 -40.059358,-11.59173 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g3574">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 289.20753,305.67593 c -0.43168,8.56103 0.0564,17.35372 3.16203,25.42874 1.9361,7.20888 3.0682,14.61 3.79263,22.03165 2.11705,8.49967 9.63855,14.75737 17.84555,17.10126 11.44883,2.02963 23.43903,1.52291 35.0516,0.96304 8.67644,-3.10978 9.51469,-13.27503 9.7177,-21.27079 -0.55166,-6.18224 -5.33008,-11.20112 -10.78452,-13.68752 -6.74868,-3.32503 -14.30374,-4.54416 -21.07168,-7.82244 -15.85749,-3.34287 -2.65006,-21.20471 -1.3883,-30.52074 0.43731,-14.1619 -13.35151,-20.29546 -24.39764,-11.98201 -4.88334,6.01362 -8.28553,12.94137 -11.92737,19.75881 z"
+ id="path4979"
+ sodipodi:nodetypes="ccccccccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccccccccc"
+ id="path3272"
+ d="m 287.09768,302.83302 c -0.40818,8.09493 0.0533,16.40891 2.98988,24.04429 1.83069,6.8164 2.90115,13.81457 3.58614,20.83216 2.00179,8.03691 9.11379,13.95391 16.87396,16.17019 10.82551,1.91913 22.16292,1.44 33.14325,0.91061 8.20406,-2.94047 8.99667,-12.55228 9.18863,-20.11272 -0.52163,-5.84565 -5.03989,-10.59128 -10.19737,-12.94231 -6.38125,-3.144 -13.52498,-4.29676 -19.92445,-7.39656 -14.99414,-3.16087 -2.50578,-20.05023 -1.31271,-28.85906 0.4135,-13.39087 -12.6246,-19.19049 -23.06934,-11.32966 -4.61747,5.68621 -7.83443,12.23679 -11.27799,18.68306 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccczccccccc"
+ id="path4589"
+ d="m 307.55611,281.62607 c 2.54891,2.56936 3.41424,5.43523 2.94541,10.18677 -7.20532,23.37246 -0.555,29.84765 5.99776,29.4301 -4.49977,-6.27564 2.80723,-18.78698 3.75353,-25.77385 -0.10011,-8.44541 -3.80768,-14.35676 -12.6967,-13.84302 z m 31.74377,59.40552 c -0.19196,7.56044 -4.04511,15.15479 -13.06542,16.86215 -9.0203,1.70736 -12.6401,3.39701 -22.42504,2.10256 2.16229,1.36714 4.5437,2.43241 6.96875,3.125 10.82552,1.91912 19.99027,1.97424 30.9706,1.44485 8.20407,-2.94046 10.9345,-12.31787 11.12646,-19.87831 -0.52162,-5.84566 -5.03002,-10.58647 -10.1875,-12.9375 -8.96714,-3.76881 -8.49028,-1.98657 -10.89032,-2.43189 1.37015,1.92452 6.52432,4.09242 7.50247,11.71314 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 308.33001,281.24041 c -3.28084,-0.0263 -6.47536,1.96775 -9.73934,4.42426 -4.61746,5.6862 -6.76049,10.73315 -10.20405,17.17942 -0.40817,8.09494 -1.22921,16.39587 1.70736,24.03125 1.83068,6.81639 3.44736,13.503 4.13235,20.52059 1.47745,5.93174 5.71782,10.7009 10.96875,13.6875 -7.32213,-8.36434 -4.89705,-19.80909 -7.07905,-29.99007 -3.99164,-14.37142 -0.88191,-48.65772 21.10295,-44.53052 -2.36182,-3.77441 -6.45534,-5.28685 -10.88897,-5.32243 z m 7.50224,40.25443 c 0.75552,2.52821 2.15205,6.97842 6.10699,8.46763 6.6085,2.48839 21.74298,5.95452 28.12422,9.09852 -1.92439,-5.32596 -5.53158,-6.36847 -7.37573,-7.31065 -6.68717,-2.92008 -20.20732,-5.25683 -26.85548,-10.2555 z"
+ id="path4977"
+ sodipodi:nodetypes="ccccccccccsccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5048"
+ transform="translate(0,512)">
+ <path
+ sodipodi:nodetypes="csccssscss"
+ id="path5050"
+ d="M 11.565497,-11.57212 C 4.7232923,-9.6623195 -3.3260383,-12.801951 -8.3287763,-9.7036625 -21.278135,-1.6838851 -24.173562,20.345108 -23.681024,36.37459 -35.834604,68.381862 12.088762,80.839539 22.948108,52.272586 25.701964,37.061785 36.898362,27.868369 48.623407,20.309331 c 5.591619,-3.60487 10.937409,-9.601752 16.277207,-10.174876 5.902932,-0.6335658 11.200996,2.794501 14.802434,2.300204 9.91186,-1.360401 9.74522,-11.49705829 -0.366191,-24.006779 -12.007814,-9.894977 -34.747146,-15.985974 -51.652405,-11.110457 -6.5842,1.898899 -10.737392,9.608352 -16.118955,11.110457 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 9.760203,-13.968212 c -6.398148,1.785856 -13.9250798,-1.150015 -18.603142,1.747196 -12.10895,7.4992964 -14.816465,28.098615 -14.355892,43.087789 -11.364817,29.930011 33.448339,41.579189 43.602917,14.866221 2.575132,-14.223625 13.044887,-22.820391 24.008981,-29.88885 5.228725,-3.370915 10.227575,-8.9786015 15.220822,-9.51453 5.519833,-0.5924474 10.474055,2.6131387 13.841761,2.1509219 9.268583,-1.2721112 9.112758,-10.7509033 -0.342426,-22.4487479 -11.228511,-9.252796 -32.492068,-14.94849 -48.300181,-10.389392 -6.156888,1.775661 -10.040539,8.984773 -15.07284,10.389392 z"
+ id="path5052"
+ sodipodi:nodetypes="csccssscss"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 71.320075,-14.172408 c 4.76023,10.9449346 -3.795801,7.983078 -20.34117,9.889531 C 35.531266,-2.502911 16.222819,10.075182 10.682956,30.599136 5.98025,48.02161 -11.934613,54.433868 -23.084717,45.641382 -17.796601,63.815964 13.456949,66.038566 19.771544,43.796173 23.745797,29.79735 34.620992,20.727784 45.345488,13.300304 50.367162,9.8224361 55.160105,5.6974929 60.067494,5.3594029 c 6.339923,-0.436783 11.402713,2.677915 14.789869,2.134406 10.235546,-3.5679734 2.788847,-17.09157 -3.537288,-21.6662169 z"
+ id="path5054"
+ sodipodi:nodetypes="csscssscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 32.592516,-24.982889 c -10.609156,0.242509 -15.180976,8.179798 -22.400022,12.07647 -4.8555336,2.620904 -12.4718309,-0.9042 -16.6954893,0.811027 -14.1323667,5.7391505 -16.1185307,26.956965 -15.6269417,42.955524 -4.510721,11.879291 -1.242802,20.885897 6.266551,25.75 -1.88941,-4.564778 -2.635546,-11.157464 -2.179028,-17.980139 1.367919,-20.443612 12.556659,-35.065455 34.261389,-45.05919 13.505959,-6.21869 44.357887,-11.518712 61.125729,-0.3821817 -1.14422,-2.105606 -2.81056,-4.2510533 -4.69283,-6.5797803 -8.775986,-7.231805 -26.419014,-11.903528 -40.059358,-11.59173 z"
+ id="path5056"
+ sodipodi:nodetypes="cssccssccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5058"
+ transform="translate(0,512)">
+ <path
+ sodipodi:nodetypes="cscccc"
+ id="path5060"
+ d="m 139.49219,53.310783 c 7.72437,24.866042 50.17839,39.81396 59.1167,22.557291 C 210.09914,53.68453 222.71463,33.777355 248.40188,31.425002 269.51226,17.82539 249.26997,-9.6399047 227.76933,0.13335984 202.92242,3.7785696 180.21881,25.997032 153.04117,10.872046 128.89093,4.422499 141.11979,40.889504 139.49219,53.310783 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 141.80976,46.316303 c 7.17296,23.090963 46.59637,36.971813 54.89661,20.947023 10.67001,-20.599956 22.38494,-39.086043 46.23849,-41.270472 19.6034,-12.628794 0.80612,-38.13346 -19.15968,-29.057867 -23.0732,3.384994 -44.1561,24.017376 -69.39364,9.972098 -22.42626,-5.989142 -11.07037,27.874641 -12.58178,39.409218 z"
+ id="path5062"
+ sodipodi:nodetypes="cscccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 243.31856,0.206855 c 2.06979,6.137125 -1.16573,14.451514 -10.05403,16.481262 -22.81135,5.209246 -38.08158,29.055698 -46.97279,37.403332 -8.99944,8.449247 -28.8771,11.361257 -42.83679,-3.701133 10.17491,20.58787 44.48003,30.85775 52.28052,15.7978 10.67001,-20.599954 21.85785,-39.31226 45.7114,-41.496689 11.85732,-7.638654 9.87343,-17.926135 1.87169,-24.484572 z"
+ id="path5064"
+ sodipodi:nodetypes="cszcscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 231.25017,-3.983955 c -2.38649,0.146504 -4.84803,0.740551 -7.34375,1.875 -23.0732,3.384995 -44.27643,24.476158 -69.51397,10.43088 -22.42625,-5.989142 -10.00514,26.255874 -11.51655,37.790451 1.68627,5.428391 4.73526,10.111815 9.16287,14.25331 -1.32799,-2.13406 -3.0426,-3.941992 -3.77132,-6.28787 1.51141,-11.534577 -4.44305,-35.083569 11.83971,-33.373934 28.50873,2.99332 47.05584,-12.616073 70.12904,-16.001066 7.29698,-3.316893 13.27282,-1.687395 18.44008,1.91691 -2.91879,-6.626734 -8.94429,-11.12437 -17.42611,-10.603681 z"
+ id="path5066"
+ sodipodi:nodetypes="ccccccsccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5068"
+ transform="translate(512,0)">
+ <path
+ sodipodi:nodetypes="csccssscss"
+ id="path5070"
+ d="M 11.565497,-11.57212 C 4.7232923,-9.6623195 -3.3260383,-12.801951 -8.3287763,-9.7036625 -21.278135,-1.6838851 -24.173562,20.345108 -23.681024,36.37459 -35.834604,68.381862 12.088762,80.839539 22.948108,52.272586 25.701964,37.061785 36.898362,27.868369 48.623407,20.309331 c 5.591619,-3.60487 10.937409,-9.601752 16.277207,-10.174876 5.902932,-0.6335658 11.200996,2.794501 14.802434,2.300204 9.91186,-1.360401 9.74522,-11.49705829 -0.366191,-24.006779 -12.007814,-9.894977 -34.747146,-15.985974 -51.652405,-11.110457 -6.5842,1.898899 -10.737392,9.608352 -16.118955,11.110457 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 9.760203,-13.968212 c -6.398148,1.785856 -13.9250798,-1.150015 -18.603142,1.747196 -12.10895,7.4992964 -14.816465,28.098615 -14.355892,43.087789 -11.364817,29.930011 33.448339,41.579189 43.602917,14.866221 2.575132,-14.223625 13.044887,-22.820391 24.008981,-29.88885 5.228725,-3.370915 10.227575,-8.9786015 15.220822,-9.51453 5.519833,-0.5924474 10.474055,2.6131387 13.841761,2.1509219 9.268583,-1.2721112 9.112758,-10.7509033 -0.342426,-22.4487479 -11.228511,-9.252796 -32.492068,-14.94849 -48.300181,-10.389392 -6.156888,1.775661 -10.040539,8.984773 -15.07284,10.389392 z"
+ id="path5072"
+ sodipodi:nodetypes="csccssscss"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 71.320075,-14.172408 c 4.76023,10.9449346 -3.795801,7.983078 -20.34117,9.889531 C 35.531266,-2.502911 16.222819,10.075182 10.682956,30.599136 5.98025,48.02161 -11.934613,54.433868 -23.084717,45.641382 -17.796601,63.815964 13.456949,66.038566 19.771544,43.796173 23.745797,29.79735 34.620992,20.727784 45.345488,13.300304 50.367162,9.8224361 55.160105,5.6974929 60.067494,5.3594029 c 6.339923,-0.436783 11.402713,2.677915 14.789869,2.134406 10.235546,-3.5679734 2.788847,-17.09157 -3.537288,-21.6662169 z"
+ id="path5074"
+ sodipodi:nodetypes="csscssscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 32.592516,-24.982889 c -10.609156,0.242509 -15.180976,8.179798 -22.400022,12.07647 -4.8555336,2.620904 -12.4718309,-0.9042 -16.6954893,0.811027 -14.1323667,5.7391505 -16.1185307,26.956965 -15.6269417,42.955524 -4.510721,11.879291 -1.242802,20.885897 6.266551,25.75 -1.88941,-4.564778 -2.635546,-11.157464 -2.179028,-17.980139 1.367919,-20.443612 12.556659,-35.065455 34.261389,-45.05919 13.505959,-6.21869 44.357887,-11.518712 61.125729,-0.3821817 -1.14422,-2.105606 -2.81056,-4.2510533 -4.69283,-6.5797803 -8.775986,-7.231805 -26.419014,-11.903528 -40.059358,-11.59173 z"
+ id="path5076"
+ sodipodi:nodetypes="cssccssccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="translate(512,512)"
+ id="g5078">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 11.565497,-11.57212 C 4.7232923,-9.6623195 -3.3260383,-12.801951 -8.3287763,-9.7036625 -21.278135,-1.6838851 -24.173562,20.345108 -23.681024,36.37459 -35.834604,68.381862 12.088762,80.839539 22.948108,52.272586 25.701964,37.061785 36.898362,27.868369 48.623407,20.309331 c 5.591619,-3.60487 10.937409,-9.601752 16.277207,-10.174876 5.902932,-0.6335658 11.200996,2.794501 14.802434,2.300204 9.91186,-1.360401 9.74522,-11.49705829 -0.366191,-24.006779 -12.007814,-9.894977 -34.747146,-15.985974 -51.652405,-11.110457 -6.5842,1.898899 -10.737392,9.608352 -16.118955,11.110457 z"
+ id="path5080"
+ sodipodi:nodetypes="csccssscss"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csccssscss"
+ id="path5082"
+ d="m 9.760203,-13.968212 c -6.398148,1.785856 -13.9250798,-1.150015 -18.603142,1.747196 -12.10895,7.4992964 -14.816465,28.098615 -14.355892,43.087789 -11.364817,29.930011 33.448339,41.579189 43.602917,14.866221 2.575132,-14.223625 13.044887,-22.820391 24.008981,-29.88885 5.228725,-3.370915 10.227575,-8.9786015 15.220822,-9.51453 5.519833,-0.5924474 10.474055,2.6131387 13.841761,2.1509219 9.268583,-1.2721112 9.112758,-10.7509033 -0.342426,-22.4487479 -11.228511,-9.252796 -32.492068,-14.94849 -48.300181,-10.389392 -6.156888,1.775661 -10.040539,8.984773 -15.07284,10.389392 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csscssscc"
+ id="path5084"
+ d="m 71.320075,-14.172408 c 4.76023,10.9449346 -3.795801,7.983078 -20.34117,9.889531 C 35.531266,-2.502911 16.222819,10.075182 10.682956,30.599136 5.98025,48.02161 -11.934613,54.433868 -23.084717,45.641382 -17.796601,63.815964 13.456949,66.038566 19.771544,43.796173 23.745797,29.79735 34.620992,20.727784 45.345488,13.300304 50.367162,9.8224361 55.160105,5.6974929 60.067494,5.3594029 c 6.339923,-0.436783 11.402713,2.677915 14.789869,2.134406 10.235546,-3.5679734 2.788847,-17.09157 -3.537288,-21.6662169 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cssccssccc"
+ id="path5086"
+ d="m 32.592516,-24.982889 c -10.609156,0.242509 -15.180976,8.179798 -22.400022,12.07647 -4.8555336,2.620904 -12.4718309,-0.9042 -16.6954893,0.811027 -14.1323667,5.7391505 -16.1185307,26.956965 -15.6269417,42.955524 -4.510721,11.879291 -1.242802,20.885897 6.266551,25.75 -1.88941,-4.564778 -2.635546,-11.157464 -2.179028,-17.980139 1.367919,-20.443612 12.556659,-35.065455 34.261389,-45.05919 13.505959,-6.21869 44.357887,-11.518712 61.125729,-0.3821817 -1.14422,-2.105606 -2.81056,-4.2510533 -4.69283,-6.5797803 -8.775986,-7.231805 -26.419014,-11.903528 -40.059358,-11.59173 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2407307,0,0,0.2407307,219.11532,331.96478)"
+ id="g5336">
+ <path
+ sodipodi:nodetypes="ccscc"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ id="path5338"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscc"
+ id="path5340"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccssc"
+ id="path5342"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5344"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5226"
+ transform="matrix(0.2407307,0,0,0.2407307,393.51796,312.4383)">
+ <path
+ id="path5228"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ id="path5230"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ id="path5232"
+ sodipodi:nodetypes="ccccssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ id="path5234"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2407307,0,0,0.2407307,411.69716,148.46113)"
+ id="g5236">
+ <path
+ sodipodi:nodetypes="ccscc"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ id="path5238"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscc"
+ id="path5240"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccssc"
+ id="path5242"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5244"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5246"
+ transform="matrix(0.2407307,0,0,0.2407307,338.89988,355.66316)">
+ <path
+ id="path5248"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ id="path5250"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ id="path5252"
+ sodipodi:nodetypes="ccccssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ id="path5254"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2245917,0,0,0.1927486,162.18635,27.239055)"
+ id="g5256">
+ <path
+ sodipodi:nodetypes="ccscc"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.80626297px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ id="path5258"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscc"
+ id="path5260"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.80626297px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccssc"
+ id="path5262"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.80626297px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5264"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.80626297px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5266"
+ transform="matrix(0.2407307,0,0,0.2407307,416.88911,42.413607)">
+ <path
+ id="path5268"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ id="path5270"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ id="path5272"
+ sodipodi:nodetypes="ccccssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ id="path5274"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2407307,0,0,0.2407307,66.432073,249.86226)"
+ id="g5276">
+ <path
+ sodipodi:nodetypes="ccscc"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ id="path5278"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscc"
+ id="path5280"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccssc"
+ id="path5282"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5284"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5286"
+ transform="matrix(0.1976934,0,0,0.2887128,26.034868,160.69908)">
+ <path
+ id="path5288"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.18572712px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.18572712px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ id="path5290"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.18572712px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ id="path5292"
+ sodipodi:nodetypes="ccccssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.18572712px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ id="path5294"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2578916,0.06540561,-0.07280693,0.2316752,191.00426,144.754)"
+ id="g5296">
+ <path
+ sodipodi:nodetypes="ccscc"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.93721938px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ id="path5298"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscc"
+ id="path5300"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.93721938px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccssc"
+ id="path5302"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.93721938px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5304"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.93721938px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5306"
+ transform="matrix(0.2407307,0,0,0.2407307,126.47619,433.2215)">
+ <path
+ id="path5308"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ id="path5310"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ id="path5312"
+ sodipodi:nodetypes="ccccssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ id="path5314"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5316"
+ transform="matrix(0.258854,0.04405617,-0.04405617,0.258854,24.115585,340.23608)">
+ <path
+ id="path5318"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.80841613px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.80841613px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ id="path5320"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.80841613px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ id="path5322"
+ sodipodi:nodetypes="ccccssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.80841613px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ id="path5324"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2407307,0,0,0.2407307,288.67285,423.43821)"
+ id="g5326">
+ <path
+ sodipodi:nodetypes="ccscc"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ id="path5328"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscc"
+ id="path5330"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccssc"
+ id="path5332"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5334"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5346"
+ transform="matrix(0.2921472,-0.035634,0.035634,0.2921472,45.139959,69.427247)">
+ <path
+ id="path5348"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:3.39775062px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.39775062px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ id="path5350"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.39775062px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ id="path5352"
+ sodipodi:nodetypes="ccccssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.39775062px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ id="path5354"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2407307,0,0,0.2407307,214.25532,-35.61637)"
+ id="g5356">
+ <path
+ sodipodi:nodetypes="ccscc"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ id="path5358"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscc"
+ id="path5360"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccssc"
+ id="path5362"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5364"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5366"
+ transform="matrix(0.2945273,0,0,0.220167,297.74511,66.270713)">
+ <path
+ id="path5368"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:3.92700195px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.92700195px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ id="path5370"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.92700195px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ id="path5372"
+ sodipodi:nodetypes="ccccssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.92700195px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ id="path5374"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2407307,0,0,0.2407307,-59.819676,255.26602)"
+ id="g5376">
+ <path
+ sodipodi:nodetypes="ccscc"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ id="path5378"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscc"
+ id="path5380"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccssc"
+ id="path5382"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5384"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.15401936px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5386"
+ transform="matrix(0.2945273,0,0,0.2945273,290.41491,194.86151)">
+ <path
+ id="path5388"
+ d="m 329.14805,198.13977 c -20.82798,-0.93114 -42.1476,19.96569 -33.7535,41.24245 8.1608,13.8389 27.56918,17.45834 41.18564,17.85324 15.94762,0.4625 42.146,-13.98473 34.78735,-36.43177 -0.79854,-22.90142 -25.73289,-21.7376 -42.21949,-22.66392 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.39527106px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.39527106px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 325.45146,194.41382 c -19.22421,-0.85945 -38.90221,18.42832 -31.15446,38.06675 7.53242,12.7733 25.44634,16.11404 38.01432,16.47853 14.71965,0.42689 38.90074,-12.90789 32.10871,-33.6265 -0.73705,-21.138 -23.75144,-20.06379 -38.96857,-20.91878 z"
+ id="path5390"
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.39527106px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 353.76366,201.14597 c 6.12754,23.5358 -13.97417,27.54922 -33.52454,29.80673 -8.97297,0.34677 -18.4574,1.31547 -27.22468,-2.98113 0.28415,1.49305 0.66972,3.0195 1.26391,4.52561 7.53244,12.7733 25.47163,14.42062 38.03961,14.78511 14.71966,0.42689 37.12199,-10.91907 32.087,-31.94982 -2.06929,-8.64327 -4.61886,-11.36909 -10.6413,-14.1865 z"
+ id="path5392"
+ sodipodi:nodetypes="ccccssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.39527106px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 323.63368,195.78143 c -18.62456,0.36852 -36.86095,17.69102 -29.35533,36.71575 1.42916,2.42353 3.25429,4.28689 5.34104,5.78952 -2.96661,-32.82788 42.43567,-38.34233 63.92937,-28.5399 -7.24659,-15.65518 -24.83547,-13.70831 -39.91508,-13.96537 z"
+ id="path5394"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5396"
+ transform="matrix(0.1725946,0,0,0.1725946,126.02645,153.65023)">
+ <path
+ sodipodi:nodetypes="csscs"
+ id="path5398"
+ d="m 243.54945,483.28613 c 14.08566,23.24358 69.94066,36.93966 92.47158,15.13116 12.51803,-12.11665 13.5899,-44.76498 7.38892,-60.21006 -5.77367,-14.38078 -53.67308,-41.05185 -58.65132,-9.0227 -1.457,33.60898 -56.65739,28.60958 -41.20918,54.1016 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:5.79392385px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.79392385px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 243.63725,475.53826 c 12.9435,21.35883 64.26938,33.94433 84.97334,13.90422 11.50298,-11.13415 12.48793,-41.13512 6.78977,-55.3278 -5.3055,-13.21469 -49.32089,-37.72308 -53.89546,-8.29108 -1.33885,30.88373 -52.06321,26.28971 -37.86765,49.71466 z"
+ id="path5400"
+ sodipodi:nodetypes="csscs"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.79392385px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 329.27294,428.10418 c 3.97839,15.27871 -3.66772,38.85733 -15.72789,46.88936 -24.66247,16.42512 -54.10128,12.53437 -71.11036,-5.81693 0.26702,1.78905 0.58083,3.88932 1.94412,6.13897 12.9435,21.35884 63.21884,33.19232 83.9228,13.15221 11.50299,-11.13416 12.04853,-39.82718 6.35037,-54.01986 -0.77867,-1.93948 -3.17977,-4.12396 -5.37904,-6.34375 z"
+ id="path5402"
+ sodipodi:nodetypes="cscsssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.79392385px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 297.03102,413.12219 c -7.71909,0.0194 -13.09698,2.68055 -14.66949,12.7978 -1.33885,30.88374 -52.93232,26.18608 -38.73676,49.61103 1.70396,2.8118 4.09184,5.48421 6.96875,7.9375 -12.94598,-22.73439 36.89168,-18.51323 38.21875,-49.125 3.62785,-23.34099 32.05306,-12.75253 46.3125,-0.78125 -4.08474,-8.68205 -23.66687,-20.47625 -38.09375,-20.44008 z"
+ id="path5404"
+ sodipodi:nodetypes="ccscccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.1780253,-0.06492772,0.06456873,0.1790151,303.1691,287.84738)"
+ id="g5406">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:5.26596546px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 243.54945,483.28613 c 14.08566,23.24358 69.94066,36.93966 92.47158,15.13116 12.51803,-12.11665 13.5899,-44.76498 7.38892,-60.21006 -5.77367,-14.38078 -53.67308,-41.05185 -58.65132,-9.0227 -1.457,33.60898 -56.65739,28.60958 -41.20918,54.1016 z"
+ id="path5408"
+ sodipodi:nodetypes="csscs"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csscs"
+ id="path5410"
+ d="m 243.63725,475.53826 c 12.9435,21.35883 64.26938,33.94433 84.97334,13.90422 11.50298,-11.13415 12.48793,-41.13512 6.78977,-55.3278 -5.3055,-13.21469 -49.32089,-37.72308 -53.89546,-8.29108 -1.33885,30.88373 -52.06321,26.28971 -37.86765,49.71466 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.26596546px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscsssc"
+ id="path5412"
+ d="m 329.27294,428.10418 c 3.97839,15.27871 -3.66772,38.85733 -15.72789,46.88936 -24.66247,16.42512 -54.10128,12.53437 -71.11036,-5.81693 0.26702,1.78905 0.58083,3.88932 1.94412,6.13897 12.9435,21.35884 63.21884,33.19232 83.9228,13.15221 11.50299,-11.13416 12.04853,-39.82718 6.35037,-54.01986 -0.77867,-1.93948 -3.17977,-4.12396 -5.37904,-6.34375 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.26596546px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscccc"
+ id="path5414"
+ d="m 297.03102,413.12219 c -7.71909,0.0194 -13.09698,2.68055 -14.66949,12.7978 -1.33885,30.88374 -52.93232,26.18608 -38.73676,49.61103 1.70396,2.8118 4.09184,5.48421 6.96875,7.9375 -12.94598,-22.73439 36.89168,-18.51323 38.21875,-49.125 3.62785,-23.34099 32.05306,-12.75253 46.3125,-0.78125 -4.08474,-8.68205 -23.66687,-20.47625 -38.09375,-20.44008 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.26596546px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5416"
+ transform="matrix(0.1725946,0,0,0.1725946,291.48426,-41.969162)">
+ <path
+ sodipodi:nodetypes="csscs"
+ id="path5418"
+ d="m 243.54945,483.28613 c 14.08566,23.24358 69.94066,36.93966 92.47158,15.13116 12.51803,-12.11665 13.5899,-44.76498 7.38892,-60.21006 -5.77367,-14.38078 -53.67308,-41.05185 -58.65132,-9.0227 -1.457,33.60898 -56.65739,28.60958 -41.20918,54.1016 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:5.79392385px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.79392385px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 243.63725,475.53826 c 12.9435,21.35883 64.26938,33.94433 84.97334,13.90422 11.50298,-11.13415 12.48793,-41.13512 6.78977,-55.3278 -5.3055,-13.21469 -49.32089,-37.72308 -53.89546,-8.29108 -1.33885,30.88373 -52.06321,26.28971 -37.86765,49.71466 z"
+ id="path5420"
+ sodipodi:nodetypes="csscs"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.79392385px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 329.27294,428.10418 c 3.97839,15.27871 -3.66772,38.85733 -15.72789,46.88936 -24.66247,16.42512 -54.10128,12.53437 -71.11036,-5.81693 0.26702,1.78905 0.58083,3.88932 1.94412,6.13897 12.9435,21.35884 63.21884,33.19232 83.9228,13.15221 11.50299,-11.13416 12.04853,-39.82718 6.35037,-54.01986 -0.77867,-1.93948 -3.17977,-4.12396 -5.37904,-6.34375 z"
+ id="path5422"
+ sodipodi:nodetypes="cscsssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.79392385px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 297.03102,413.12219 c -7.71909,0.0194 -13.09698,2.68055 -14.66949,12.7978 -1.33885,30.88374 -52.93232,26.18608 -38.73676,49.61103 1.70396,2.8118 4.09184,5.48421 6.96875,7.9375 -12.94598,-22.73439 36.89168,-18.51323 38.21875,-49.125 3.62785,-23.34099 32.05306,-12.75253 46.3125,-0.78125 -4.08474,-8.68205 -23.66687,-20.47625 -38.09375,-20.44008 z"
+ id="path5424"
+ sodipodi:nodetypes="ccscccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.1725946,0,0,0.1725946,-29.952009,31.280389)"
+ id="g5426">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:5.79392385px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 243.54945,483.28613 c 14.08566,23.24358 69.94066,36.93966 92.47158,15.13116 12.51803,-12.11665 13.5899,-44.76498 7.38892,-60.21006 -5.77367,-14.38078 -53.67308,-41.05185 -58.65132,-9.0227 -1.457,33.60898 -56.65739,28.60958 -41.20918,54.1016 z"
+ id="path5428"
+ sodipodi:nodetypes="csscs"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csscs"
+ id="path5430"
+ d="m 243.63725,475.53826 c 12.9435,21.35883 64.26938,33.94433 84.97334,13.90422 11.50298,-11.13415 12.48793,-41.13512 6.78977,-55.3278 -5.3055,-13.21469 -49.32089,-37.72308 -53.89546,-8.29108 -1.33885,30.88373 -52.06321,26.28971 -37.86765,49.71466 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.79392385px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscsssc"
+ id="path5432"
+ d="m 329.27294,428.10418 c 3.97839,15.27871 -3.66772,38.85733 -15.72789,46.88936 -24.66247,16.42512 -54.10128,12.53437 -71.11036,-5.81693 0.26702,1.78905 0.58083,3.88932 1.94412,6.13897 12.9435,21.35884 63.21884,33.19232 83.9228,13.15221 11.50299,-11.13416 12.04853,-39.82718 6.35037,-54.01986 -0.77867,-1.93948 -3.17977,-4.12396 -5.37904,-6.34375 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.79392385px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscccc"
+ id="path5434"
+ d="m 297.03102,413.12219 c -7.71909,0.0194 -13.09698,2.68055 -14.66949,12.7978 -1.33885,30.88374 -52.93232,26.18608 -38.73676,49.61103 1.70396,2.8118 4.09184,5.48421 6.96875,7.9375 -12.94598,-22.73439 36.89168,-18.51323 38.21875,-49.125 3.62785,-23.34099 32.05306,-12.75253 46.3125,-0.78125 -4.08474,-8.68205 -23.66687,-20.47625 -38.09375,-20.44008 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.79392385px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5436"
+ transform="matrix(0.1523228,0,0,0.1902829,211.48288,236.84838)">
+ <path
+ sodipodi:nodetypes="csscs"
+ id="path5438"
+ d="m 243.54945,483.28613 c 14.08566,23.24358 69.94066,36.93966 92.47158,15.13116 12.51803,-12.11665 13.5899,-44.76498 7.38892,-60.21006 -5.77367,-14.38078 -53.67308,-41.05185 -58.65132,-9.0227 -1.457,33.60898 -56.65739,28.60958 -41.20918,54.1016 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:5.87377977px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.87377977px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 243.63725,475.53826 c 12.9435,21.35883 64.26938,33.94433 84.97334,13.90422 11.50298,-11.13415 12.48793,-41.13512 6.78977,-55.3278 -5.3055,-13.21469 -49.32089,-37.72308 -53.89546,-8.29108 -1.33885,30.88373 -52.06321,26.28971 -37.86765,49.71466 z"
+ id="path5440"
+ sodipodi:nodetypes="csscs"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.87377977px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 329.27294,428.10418 c 3.97839,15.27871 -3.66772,38.85733 -15.72789,46.88936 -24.66247,16.42512 -54.10128,12.53437 -71.11036,-5.81693 0.26702,1.78905 0.58083,3.88932 1.94412,6.13897 12.9435,21.35884 63.21884,33.19232 83.9228,13.15221 11.50299,-11.13416 12.04853,-39.82718 6.35037,-54.01986 -0.77867,-1.93948 -3.17977,-4.12396 -5.37904,-6.34375 z"
+ id="path5442"
+ sodipodi:nodetypes="cscsssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.87377977px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 297.03102,413.12219 c -7.71909,0.0194 -13.09698,2.68055 -14.66949,12.7978 -1.33885,30.88374 -52.93232,26.18608 -38.73676,49.61103 1.70396,2.8118 4.09184,5.48421 6.96875,7.9375 -12.94598,-22.73439 36.89168,-18.51323 38.21875,-49.125 3.62785,-23.34099 32.05306,-12.75253 46.3125,-0.78125 -4.08474,-8.68205 -23.66687,-20.47625 -38.09375,-20.44008 z"
+ id="path5444"
+ sodipodi:nodetypes="ccscccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.1725946,0,0,0.2168154,22.615311,374.14112)"
+ id="g5446">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:5.16941404px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 243.54945,483.28613 c 14.08566,23.24358 69.94066,36.93966 92.47158,15.13116 12.51803,-12.11665 13.5899,-44.76498 7.38892,-60.21006 -5.77367,-14.38078 -53.67308,-41.05185 -58.65132,-9.0227 -1.457,33.60898 -56.65739,28.60958 -41.20918,54.1016 z"
+ id="path5448"
+ sodipodi:nodetypes="csscs"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csscs"
+ id="path5450"
+ d="m 243.63725,475.53826 c 12.9435,21.35883 64.26938,33.94433 84.97334,13.90422 11.50298,-11.13415 12.48793,-41.13512 6.78977,-55.3278 -5.3055,-13.21469 -49.32089,-37.72308 -53.89546,-8.29108 -1.33885,30.88373 -52.06321,26.28971 -37.86765,49.71466 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.16941404px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscsssc"
+ id="path5452"
+ d="m 329.27294,428.10418 c 3.97839,15.27871 -3.66772,38.85733 -15.72789,46.88936 -24.66247,16.42512 -54.10128,12.53437 -71.11036,-5.81693 0.26702,1.78905 0.58083,3.88932 1.94412,6.13897 12.9435,21.35884 63.21884,33.19232 83.9228,13.15221 11.50299,-11.13416 12.04853,-39.82718 6.35037,-54.01986 -0.77867,-1.93948 -3.17977,-4.12396 -5.37904,-6.34375 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.16941404px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccscccc"
+ id="path5454"
+ d="m 297.03102,413.12219 c -7.71909,0.0194 -13.09698,2.68055 -14.66949,12.7978 -1.33885,30.88374 -52.93232,26.18608 -38.73676,49.61103 1.70396,2.8118 4.09184,5.48421 6.96875,7.9375 -12.94598,-22.73439 36.89168,-18.51323 38.21875,-49.125 3.62785,-23.34099 32.05306,-12.75253 46.3125,-0.78125 -4.08474,-8.68205 -23.66687,-20.47625 -38.09375,-20.44008 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.16941404px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5456"
+ transform="matrix(0.2443125,-0.08211815,0.06549837,0.1948664,416.42601,244.75447)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5458"
+ d="m 76.352636,196.18158 c 13.258725,-1.43048 36.815714,-12.73591 15.93394,-24.33165 -23.154226,-14.8425 -49.968777,-35.24726 -79.043359,-26.25715 -29.139741,9.55882 -20.6864931,39.75739 -8.714574,58.7739 25.226647,16.51112 47.01227,2.2174 71.823993,-8.1851 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.34425926px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.34425926px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 68.211515,188.56943 c 12.60855,-1.36032 35.010355,-12.11136 15.15258,-23.13848 -22.018802,-14.11466 -47.518433,-33.51882 -75.167271,-24.96957 -27.7108,9.09009 -19.672079,37.80779 -8.287233,55.89178 23.989596,15.70145 44.706907,2.10866 68.301924,-7.78373 z"
+ id="path5460"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.34425926px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 84.538095,166.1043 c -0.05766,7.22209 -19.35778,9.28809 -27.878647,12.10626 -23.126052,7.64865 -37.803594,24.20179 -60.590103,11.33124 1.198417,2.38401 3.037014,4.35237 4.38235,6.48934 23.989598,15.70145 43.317124,1.68026 66.91214,-8.21213 12.34239,-1.33161 34.889065,-10.93575 17.17426,-21.71471 z"
+ id="path5462"
+ sodipodi:nodetypes="cscccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.34425926px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 21.006845,139.03187 c -4.21011,0.0977 -7.846049,0.94212 -12.16618,2.27794 -27.710801,9.09008 -20.312416,36.9605 -8.92757,55.04449 0.143196,0.0937 0.294536,0.15836 0.4375,0.25 -7.454439,-17.14722 -3.254457,-31.60578 19.431216,-39.04746 27.585553,-8.03338 47.612064,5.94572 70.234964,19.43974 1.60532,-3.54876 0.69856,-7.4901 -6.66618,-11.57978 -18.57836,-11.90924 -39.609158,-26.91261 -62.34375,-26.38493 z"
+ id="path5464"
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.1956079,0,0,0.2421112,345.76948,262.26841)"
+ id="g5466">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.59514666px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 76.352636,196.18158 c 13.258725,-1.43048 36.815714,-12.73591 15.93394,-24.33165 -23.154226,-14.8425 -49.968777,-35.24726 -79.043359,-26.25715 -29.139741,9.55882 -20.6864931,39.75739 -8.714574,58.7739 25.226647,16.51112 47.01227,2.2174 71.823993,-8.1851 z"
+ id="path5468"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5470"
+ d="m 68.211515,188.56943 c 12.60855,-1.36032 35.010355,-12.11136 15.15258,-23.13848 -22.018802,-14.11466 -47.518433,-33.51882 -75.167271,-24.96957 -27.7108,9.09009 -19.672079,37.80779 -8.287233,55.89178 23.989596,15.70145 44.706907,2.10866 68.301924,-7.78373 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.59514666px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscccc"
+ id="path5472"
+ d="m 84.538095,166.1043 c -0.05766,7.22209 -19.35778,9.28809 -27.878647,12.10626 -23.126052,7.64865 -37.803594,24.20179 -60.590103,11.33124 1.198417,2.38401 3.037014,4.35237 4.38235,6.48934 23.989598,15.70145 43.317124,1.68026 66.91214,-8.21213 12.34239,-1.33161 34.889065,-10.93575 17.17426,-21.71471 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.59514666px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccc"
+ id="path5474"
+ d="m 21.006845,139.03187 c -4.21011,0.0977 -7.846049,0.94212 -12.16618,2.27794 -27.710801,9.09008 -20.312416,36.9605 -8.92757,55.04449 0.143196,0.0937 0.294536,0.15836 0.4375,0.25 -7.454439,-17.14722 -3.254457,-31.60578 19.431216,-39.04746 27.585553,-8.03338 47.612064,5.94572 70.234964,19.43974 1.60532,-3.54876 0.69856,-7.4901 -6.66618,-11.57978 -18.57836,-11.90924 -39.609158,-26.91261 -62.34375,-26.38493 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.59514666px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5476"
+ transform="matrix(0.2304854,0,0,0.2910464,282.27957,126.99572)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5478"
+ d="m 76.352636,196.18158 c 13.258725,-1.43048 36.815714,-12.73591 15.93394,-24.33165 -23.154226,-14.8425 -49.968777,-35.24726 -79.043359,-26.25715 -29.139741,9.55882 -20.6864931,39.75739 -8.714574,58.7739 25.226647,16.51112 47.01227,2.2174 71.823993,-8.1851 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:3.8609767px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.8609767px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 68.211515,188.56943 c 12.60855,-1.36032 35.010355,-12.11136 15.15258,-23.13848 -22.018802,-14.11466 -47.518433,-33.51882 -75.167271,-24.96957 -27.7108,9.09009 -19.672079,37.80779 -8.287233,55.89178 23.989596,15.70145 44.706907,2.10866 68.301924,-7.78373 z"
+ id="path5480"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.8609767px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 84.538095,166.1043 c -0.05766,7.22209 -19.35778,9.28809 -27.878647,12.10626 -23.126052,7.64865 -37.803594,24.20179 -60.590103,11.33124 1.198417,2.38401 3.037014,4.35237 4.38235,6.48934 23.989598,15.70145 43.317124,1.68026 66.91214,-8.21213 12.34239,-1.33161 34.889065,-10.93575 17.17426,-21.71471 z"
+ id="path5482"
+ sodipodi:nodetypes="cscccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.8609767px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 21.006845,139.03187 c -4.21011,0.0977 -7.846049,0.94212 -12.16618,2.27794 -27.710801,9.09008 -20.312416,36.9605 -8.92757,55.04449 0.143196,0.0937 0.294536,0.15836 0.4375,0.25 -7.454439,-17.14722 -3.254457,-31.60578 19.431216,-39.04746 27.585553,-8.03338 47.612064,5.94572 70.234964,19.43974 1.60532,-3.54876 0.69856,-7.4901 -6.66618,-11.57978 -18.57836,-11.90924 -39.609158,-26.91261 -62.34375,-26.38493 z"
+ id="path5484"
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2049038,-0.03098801,0.0362033,0.2393891,155.60128,366.6461)"
+ id="g5486">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.46439219px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 76.352636,196.18158 c 13.258725,-1.43048 36.815714,-12.73591 15.93394,-24.33165 -23.154226,-14.8425 -49.968777,-35.24726 -79.043359,-26.25715 -29.139741,9.55882 -20.6864931,39.75739 -8.714574,58.7739 25.226647,16.51112 47.01227,2.2174 71.823993,-8.1851 z"
+ id="path5488"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5490"
+ d="m 68.211515,188.56943 c 12.60855,-1.36032 35.010355,-12.11136 15.15258,-23.13848 -22.018802,-14.11466 -47.518433,-33.51882 -75.167271,-24.96957 -27.7108,9.09009 -19.672079,37.80779 -8.287233,55.89178 23.989596,15.70145 44.706907,2.10866 68.301924,-7.78373 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.46439219px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscccc"
+ id="path5492"
+ d="m 84.538095,166.1043 c -0.05766,7.22209 -19.35778,9.28809 -27.878647,12.10626 -23.126052,7.64865 -37.803594,24.20179 -60.590103,11.33124 1.198417,2.38401 3.037014,4.35237 4.38235,6.48934 23.989598,15.70145 43.317124,1.68026 66.91214,-8.21213 12.34239,-1.33161 34.889065,-10.93575 17.17426,-21.71471 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.46439219px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccc"
+ id="path5494"
+ d="m 21.006845,139.03187 c -4.21011,0.0977 -7.846049,0.94212 -12.16618,2.27794 -27.710801,9.09008 -20.312416,36.9605 -8.92757,55.04449 0.143196,0.0937 0.294536,0.15836 0.4375,0.25 -7.454439,-17.14722 -3.254457,-31.60578 19.431216,-39.04746 27.585553,-8.03338 47.612064,5.94572 70.234964,19.43974 1.60532,-3.54876 0.69856,-7.4901 -6.66618,-11.57978 -18.57836,-11.90924 -39.609158,-26.91261 -62.34375,-26.38493 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.46439219px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5496"
+ transform="matrix(0.2149843,0,0,0.2421112,102.60229,-26.3139)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5498"
+ d="m 76.352636,196.18158 c 13.258725,-1.43048 36.815714,-12.73591 15.93394,-24.33165 -23.154226,-14.8425 -49.968777,-35.24726 -79.043359,-26.25715 -29.139741,9.55882 -20.6864931,39.75739 -8.714574,58.7739 25.226647,16.51112 47.01227,2.2174 71.823993,-8.1851 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.38317871px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.38317871px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 68.211515,188.56943 c 12.60855,-1.36032 35.010355,-12.11136 15.15258,-23.13848 -22.018802,-14.11466 -47.518433,-33.51882 -75.167271,-24.96957 -27.7108,9.09009 -19.672079,37.80779 -8.287233,55.89178 23.989596,15.70145 44.706907,2.10866 68.301924,-7.78373 z"
+ id="path5500"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.38317871px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 84.538095,166.1043 c -0.05766,7.22209 -19.35778,9.28809 -27.878647,12.10626 -23.126052,7.64865 -37.803594,24.20179 -60.590103,11.33124 1.198417,2.38401 3.037014,4.35237 4.38235,6.48934 23.989598,15.70145 43.317124,1.68026 66.91214,-8.21213 12.34239,-1.33161 34.889065,-10.93575 17.17426,-21.71471 z"
+ id="path5502"
+ sodipodi:nodetypes="cscccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.38317871px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 21.006845,139.03187 c -4.21011,0.0977 -7.846049,0.94212 -12.16618,2.27794 -27.710801,9.09008 -20.312416,36.9605 -8.92757,55.04449 0.143196,0.0937 0.294536,0.15836 0.4375,0.25 -7.454439,-17.14722 -3.254457,-31.60578 19.431216,-39.04746 27.585553,-8.03338 47.612064,5.94572 70.234964,19.43974 1.60532,-3.54876 0.69856,-7.4901 -6.66618,-11.57978 -18.57836,-11.90924 -39.609158,-26.91261 -62.34375,-26.38493 z"
+ id="path5504"
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2421112,0,0,0.2421112,474.97205,97.446594)"
+ id="g5506">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.13033342px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 76.352636,196.18158 c 13.258725,-1.43048 36.815714,-12.73591 15.93394,-24.33165 -23.154226,-14.8425 -49.968777,-35.24726 -79.043359,-26.25715 -29.139741,9.55882 -20.6864931,39.75739 -8.714574,58.7739 25.226647,16.51112 47.01227,2.2174 71.823993,-8.1851 z"
+ id="path5508"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5510"
+ d="m 68.211515,188.56943 c 12.60855,-1.36032 35.010355,-12.11136 15.15258,-23.13848 -22.018802,-14.11466 -47.518433,-33.51882 -75.167271,-24.96957 -27.7108,9.09009 -19.672079,37.80779 -8.287233,55.89178 23.989596,15.70145 44.706907,2.10866 68.301924,-7.78373 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.13033342px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscccc"
+ id="path5512"
+ d="m 84.538095,166.1043 c -0.05766,7.22209 -19.35778,9.28809 -27.878647,12.10626 -23.126052,7.64865 -37.803594,24.20179 -60.590103,11.33124 1.198417,2.38401 3.037014,4.35237 4.38235,6.48934 23.989598,15.70145 43.317124,1.68026 66.91214,-8.21213 12.34239,-1.33161 34.889065,-10.93575 17.17426,-21.71471 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.13033342px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccc"
+ id="path5514"
+ d="m 21.006845,139.03187 c -4.21011,0.0977 -7.846049,0.94212 -12.16618,2.27794 -27.710801,9.09008 -20.312416,36.9605 -8.92757,55.04449 0.143196,0.0937 0.294536,0.15836 0.4375,0.25 -7.454439,-17.14722 -3.254457,-31.60578 19.431216,-39.04746 27.585553,-8.03338 47.612064,5.94572 70.234964,19.43974 1.60532,-3.54876 0.69856,-7.4901 -6.66618,-11.57978 -18.57836,-11.90924 -39.609158,-26.91261 -62.34375,-26.38493 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.13033342px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5516"
+ transform="matrix(0.2421112,0,0,0.2421112,10.459102,429.02283)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5518"
+ d="m 76.352636,196.18158 c 13.258725,-1.43048 36.815714,-12.73591 15.93394,-24.33165 -23.154226,-14.8425 -49.968777,-35.24726 -79.043359,-26.25715 -29.139741,9.55882 -20.6864931,39.75739 -8.714574,58.7739 25.226647,16.51112 47.01227,2.2174 71.823993,-8.1851 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.13033342px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.13033342px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 68.211515,188.56943 c 12.60855,-1.36032 35.010355,-12.11136 15.15258,-23.13848 -22.018802,-14.11466 -47.518433,-33.51882 -75.167271,-24.96957 -27.7108,9.09009 -19.672079,37.80779 -8.287233,55.89178 23.989596,15.70145 44.706907,2.10866 68.301924,-7.78373 z"
+ id="path5520"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.13033342px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 84.538095,166.1043 c -0.05766,7.22209 -19.35778,9.28809 -27.878647,12.10626 -23.126052,7.64865 -37.803594,24.20179 -60.590103,11.33124 1.198417,2.38401 3.037014,4.35237 4.38235,6.48934 23.989598,15.70145 43.317124,1.68026 66.91214,-8.21213 12.34239,-1.33161 34.889065,-10.93575 17.17426,-21.71471 z"
+ id="path5522"
+ sodipodi:nodetypes="cscccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.13033342px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 21.006845,139.03187 c -4.21011,0.0977 -7.846049,0.94212 -12.16618,2.27794 -27.710801,9.09008 -20.312416,36.9605 -8.92757,55.04449 0.143196,0.0937 0.294536,0.15836 0.4375,0.25 -7.454439,-17.14722 -3.254457,-31.60578 19.431216,-39.04746 27.585553,-8.03338 47.612064,5.94572 70.234964,19.43974 1.60532,-3.54876 0.69856,-7.4901 -6.66618,-11.57978 -18.57836,-11.90924 -39.609158,-26.91261 -62.34375,-26.38493 z"
+ id="path5524"
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5526"
+ transform="matrix(0.2488688,0.07946678,-0.07946678,0.2488688,130.78961,51.386272)">
+ <path
+ id="path5528"
+ d="m 98.81336,470.11932 c -6.918783,23.04182 31.41119,39.50538 50.09677,31.99615 12.45296,-13.37404 30.31695,-17.81936 44.98976,-27.78519 15.89667,-14.71948 -4.15091,-33.104 -18.23167,-39.06219 -20.61949,-10.1033 -35.636,13.43344 -53.53538,19.60282 -8.1692,4.42411 -16.32281,9.07185 -23.31948,15.24841 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 97.237597,464.03444 c -6.583689,21.92585 29.889873,37.59204 47.670463,30.4465 11.84983,-12.7263 28.84862,-16.95632 42.81079,-26.43948 15.12676,-14.00658 -3.94987,-31.5007 -17.34866,-37.17032 -19.62084,-9.61397 -33.91006,12.78283 -50.94253,18.65341 -7.77355,4.20984 -15.53226,8.63248 -22.190063,14.50989 z"
+ id="path5530"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 183.28133,439.09413 c 2.57499,5.87507 -0.99651,12.53148 -7.21763,18.29191 -13.96217,9.48316 -28.32573,13.83891 -39.5809,22.34414 -11.25517,8.50524 -26.19024,4.37815 -36.981264,-4.17061 6.255224,15.43676 30.898314,24.02242 44.219874,18.5864 11.84984,-12.7263 28.85033,-17.38522 42.8125,-26.86838 10.43773,-9.66478 5.77747,-20.2282 -3.25258,-28.18346 z"
+ id="path5532"
+ sodipodi:nodetypes="cczcccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 159.84383,429.60883 c -14.54811,0.5555 -26.24421,16.23015 -40.08309,21 -7.77355,4.20984 -14.56022,7.76083 -21.218024,13.63824 -2.918588,9.71986 1.33231,17.99824 9.957364,23.81581 -2.7158,-4.4121 -3.75617,-9.44267 -2.125,-14.875 6.6578,-5.87741 14.41395,-10.32142 22.1875,-14.53125 17.03247,-5.87058 29.05454,-28.70111 48.67538,-19.08713 3.13796,1.32781 7.457,4.07581 10.70551,6.50404 -4.6172,-6.57778 -11.27636,-11.90596 -17.78383,-14.65956 -3.67891,-1.80262 -6.95855,-1.93334 -10.31581,-1.80515 z"
+ id="path5534"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2488688,0.07946678,-0.07946678,0.2488688,273.98953,151.91642)"
+ id="g5536">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 98.81336,470.11932 c -6.918783,23.04182 31.41119,39.50538 50.09677,31.99615 12.45296,-13.37404 30.31695,-17.81936 44.98976,-27.78519 15.89667,-14.71948 -4.15091,-33.104 -18.23167,-39.06219 -20.61949,-10.1033 -35.636,13.43344 -53.53538,19.60282 -8.1692,4.42411 -16.32281,9.07185 -23.31948,15.24841 z"
+ id="path5538"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path5540"
+ d="m 97.237597,464.03444 c -6.583689,21.92585 29.889873,37.59204 47.670463,30.4465 11.84983,-12.7263 28.84862,-16.95632 42.81079,-26.43948 15.12676,-14.00658 -3.94987,-31.5007 -17.34866,-37.17032 -19.62084,-9.61397 -33.91006,12.78283 -50.94253,18.65341 -7.77355,4.20984 -15.53226,8.63248 -22.190063,14.50989 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cczcccc"
+ id="path5542"
+ d="m 183.28133,439.09413 c 2.57499,5.87507 -0.99651,12.53148 -7.21763,18.29191 -13.96217,9.48316 -28.32573,13.83891 -39.5809,22.34414 -11.25517,8.50524 -26.19024,4.37815 -36.981264,-4.17061 6.255224,15.43676 30.898314,24.02242 44.219874,18.5864 11.84984,-12.7263 28.85033,-17.38522 42.8125,-26.86838 10.43773,-9.66478 5.77747,-20.2282 -3.25258,-28.18346 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ id="path5544"
+ d="m 159.84383,429.60883 c -14.54811,0.5555 -26.24421,16.23015 -40.08309,21 -7.77355,4.20984 -14.56022,7.76083 -21.218024,13.63824 -2.918588,9.71986 1.33231,17.99824 9.957364,23.81581 -2.7158,-4.4121 -3.75617,-9.44267 -2.125,-14.875 6.6578,-5.87741 14.41395,-10.32142 22.1875,-14.53125 17.03247,-5.87058 29.05454,-28.70111 48.67538,-19.08713 3.13796,1.32781 7.457,4.07581 10.70551,6.50404 -4.6172,-6.57778 -11.27636,-11.90596 -17.78383,-14.65956 -3.67891,-1.80262 -6.95855,-1.93334 -10.31581,-1.80515 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5546"
+ transform="matrix(0.2488688,0.07946678,-0.07946678,0.2488688,395.49761,66.602237)">
+ <path
+ id="path5548"
+ d="m 98.81336,470.11932 c -6.918783,23.04182 31.41119,39.50538 50.09677,31.99615 12.45296,-13.37404 30.31695,-17.81936 44.98976,-27.78519 15.89667,-14.71948 -4.15091,-33.104 -18.23167,-39.06219 -20.61949,-10.1033 -35.636,13.43344 -53.53538,19.60282 -8.1692,4.42411 -16.32281,9.07185 -23.31948,15.24841 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 97.237597,464.03444 c -6.583689,21.92585 29.889873,37.59204 47.670463,30.4465 11.84983,-12.7263 28.84862,-16.95632 42.81079,-26.43948 15.12676,-14.00658 -3.94987,-31.5007 -17.34866,-37.17032 -19.62084,-9.61397 -33.91006,12.78283 -50.94253,18.65341 -7.77355,4.20984 -15.53226,8.63248 -22.190063,14.50989 z"
+ id="path5550"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 183.28133,439.09413 c 2.57499,5.87507 -0.99651,12.53148 -7.21763,18.29191 -13.96217,9.48316 -28.32573,13.83891 -39.5809,22.34414 -11.25517,8.50524 -26.19024,4.37815 -36.981264,-4.17061 6.255224,15.43676 30.898314,24.02242 44.219874,18.5864 11.84984,-12.7263 28.85033,-17.38522 42.8125,-26.86838 10.43773,-9.66478 5.77747,-20.2282 -3.25258,-28.18346 z"
+ id="path5552"
+ sodipodi:nodetypes="cczcccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 159.84383,429.60883 c -14.54811,0.5555 -26.24421,16.23015 -40.08309,21 -7.77355,4.20984 -14.56022,7.76083 -21.218024,13.63824 -2.918588,9.71986 1.33231,17.99824 9.957364,23.81581 -2.7158,-4.4121 -3.75617,-9.44267 -2.125,-14.875 6.6578,-5.87741 14.41395,-10.32142 22.1875,-14.53125 17.03247,-5.87058 29.05454,-28.70111 48.67538,-19.08713 3.13796,1.32781 7.457,4.07581 10.70551,6.50404 -4.6172,-6.57778 -11.27636,-11.90596 -17.78383,-14.65956 -3.67891,-1.80262 -6.95855,-1.93334 -10.31581,-1.80515 z"
+ id="path5554"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2113482,0.180649,-0.1535662,0.2486213,495.11512,-138.94404)"
+ id="g5556">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:3.52920365px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 98.81336,470.11932 c -6.918783,23.04182 31.41119,39.50538 50.09677,31.99615 12.45296,-13.37404 30.31695,-17.81936 44.98976,-27.78519 15.89667,-14.71948 -4.15091,-33.104 -18.23167,-39.06219 -20.61949,-10.1033 -35.636,13.43344 -53.53538,19.60282 -8.1692,4.42411 -16.32281,9.07185 -23.31948,15.24841 z"
+ id="path5558"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path5560"
+ d="m 97.237597,464.03444 c -6.583689,21.92585 29.889873,37.59204 47.670463,30.4465 11.84983,-12.7263 28.84862,-16.95632 42.81079,-26.43948 15.12676,-14.00658 -3.94987,-31.5007 -17.34866,-37.17032 -19.62084,-9.61397 -33.91006,12.78283 -50.94253,18.65341 -7.77355,4.20984 -15.53226,8.63248 -22.190063,14.50989 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.52920365px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cczcccc"
+ id="path5562"
+ d="m 183.28133,439.09413 c 2.57499,5.87507 -0.99651,12.53148 -7.21763,18.29191 -13.96217,9.48316 -28.32573,13.83891 -39.5809,22.34414 -11.25517,8.50524 -26.19024,4.37815 -36.981264,-4.17061 6.255224,15.43676 30.898314,24.02242 44.219874,18.5864 11.84984,-12.7263 28.85033,-17.38522 42.8125,-26.86838 10.43773,-9.66478 5.77747,-20.2282 -3.25258,-28.18346 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.52920365px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ id="path5564"
+ d="m 159.84383,429.60883 c -14.54811,0.5555 -26.24421,16.23015 -40.08309,21 -7.77355,4.20984 -14.56022,7.76083 -21.218024,13.63824 -2.918588,9.71986 1.33231,17.99824 9.957364,23.81581 -2.7158,-4.4121 -3.75617,-9.44267 -2.125,-14.875 6.6578,-5.87741 14.41395,-10.32142 22.1875,-14.53125 17.03247,-5.87058 29.05454,-28.70111 48.67538,-19.08713 3.13796,1.32781 7.457,4.07581 10.70551,6.50404 -4.6172,-6.57778 -11.27636,-11.90596 -17.78383,-14.65956 -3.67891,-1.80262 -6.95855,-1.93334 -10.31581,-1.80515 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.52920365px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5566"
+ transform="matrix(0.2488688,0.07946678,-0.07946678,0.2488688,509.39771,301.5056)">
+ <path
+ id="path5568"
+ d="m 98.81336,470.11932 c -6.918783,23.04182 31.41119,39.50538 50.09677,31.99615 12.45296,-13.37404 30.31695,-17.81936 44.98976,-27.78519 15.89667,-14.71948 -4.15091,-33.104 -18.23167,-39.06219 -20.61949,-10.1033 -35.636,13.43344 -53.53538,19.60282 -8.1692,4.42411 -16.32281,9.07185 -23.31948,15.24841 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 97.237597,464.03444 c -6.583689,21.92585 29.889873,37.59204 47.670463,30.4465 11.84983,-12.7263 28.84862,-16.95632 42.81079,-26.43948 15.12676,-14.00658 -3.94987,-31.5007 -17.34866,-37.17032 -19.62084,-9.61397 -33.91006,12.78283 -50.94253,18.65341 -7.77355,4.20984 -15.53226,8.63248 -22.190063,14.50989 z"
+ id="path5570"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 183.28133,439.09413 c 2.57499,5.87507 -0.99651,12.53148 -7.21763,18.29191 -13.96217,9.48316 -28.32573,13.83891 -39.5809,22.34414 -11.25517,8.50524 -26.19024,4.37815 -36.981264,-4.17061 6.255224,15.43676 30.898314,24.02242 44.219874,18.5864 11.84984,-12.7263 28.85033,-17.38522 42.8125,-26.86838 10.43773,-9.66478 5.77747,-20.2282 -3.25258,-28.18346 z"
+ id="path5572"
+ sodipodi:nodetypes="cczcccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 159.84383,429.60883 c -14.54811,0.5555 -26.24421,16.23015 -40.08309,21 -7.77355,4.20984 -14.56022,7.76083 -21.218024,13.63824 -2.918588,9.71986 1.33231,17.99824 9.957364,23.81581 -2.7158,-4.4121 -3.75617,-9.44267 -2.125,-14.875 6.6578,-5.87741 14.41395,-10.32142 22.1875,-14.53125 17.03247,-5.87058 29.05454,-28.70111 48.67538,-19.08713 3.13796,1.32781 7.457,4.07581 10.70551,6.50404 -4.6172,-6.57778 -11.27636,-11.90596 -17.78383,-14.65956 -3.67891,-1.80262 -6.95855,-1.93334 -10.31581,-1.80515 z"
+ id="path5574"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2488688,0.07946678,-0.07946678,0.2488688,250.42143,307.59916)"
+ id="g5576">
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 98.81336,470.11932 c -6.918783,23.04182 31.41119,39.50538 50.09677,31.99615 12.45296,-13.37404 30.31695,-17.81936 44.98976,-27.78519 15.89667,-14.71948 -4.15091,-33.104 -18.23167,-39.06219 -20.61949,-10.1033 -35.636,13.43344 -53.53538,19.60282 -8.1692,4.42411 -16.32281,9.07185 -23.31948,15.24841 z"
+ id="path5578"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path5580"
+ d="m 97.237597,464.03444 c -6.583689,21.92585 29.889873,37.59204 47.670463,30.4465 11.84983,-12.7263 28.84862,-16.95632 42.81079,-26.43948 15.12676,-14.00658 -3.94987,-31.5007 -17.34866,-37.17032 -19.62084,-9.61397 -33.91006,12.78283 -50.94253,18.65341 -7.77355,4.20984 -15.53226,8.63248 -22.190063,14.50989 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cczcccc"
+ id="path5582"
+ d="m 183.28133,439.09413 c 2.57499,5.87507 -0.99651,12.53148 -7.21763,18.29191 -13.96217,9.48316 -28.32573,13.83891 -39.5809,22.34414 -11.25517,8.50524 -26.19024,4.37815 -36.981264,-4.17061 6.255224,15.43676 30.898314,24.02242 44.219874,18.5864 11.84984,-12.7263 28.85033,-17.38522 42.8125,-26.86838 10.43773,-9.66478 5.77747,-20.2282 -3.25258,-28.18346 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ id="path5584"
+ d="m 159.84383,429.60883 c -14.54811,0.5555 -26.24421,16.23015 -40.08309,21 -7.77355,4.20984 -14.56022,7.76083 -21.218024,13.63824 -2.918588,9.71986 1.33231,17.99824 9.957364,23.81581 -2.7158,-4.4121 -3.75617,-9.44267 -2.125,-14.875 6.6578,-5.87741 14.41395,-10.32142 22.1875,-14.53125 17.03247,-5.87058 29.05454,-28.70111 48.67538,-19.08713 3.13796,1.32781 7.457,4.07581 10.70551,6.50404 -4.6172,-6.57778 -11.27636,-11.90596 -17.78383,-14.65956 -3.67891,-1.80262 -6.95855,-1.93334 -10.31581,-1.80515 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5600"
+ transform="matrix(0.7000555,0,0,0.7000555,-183.93534,254.80861)">
+ <path
+ sodipodi:nodetypes="csccc"
+ id="path5588"
+ d="m 281.33797,-46.165926 c -4.31788,-10.210649 -12.22141,0.285329 -13.9788,7.918608 -1.29149,5.609688 -19.22574,10.834278 -7.78327,18.781245 5.71025,6.773613 18.31922,8.282731 23.2259,-0.212449 6.59971,-7.601185 7.11345,-20.077299 -1.46383,-26.487404 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1.42845821px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.42845821px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 278.84309,-47.33068 c -3.93021,-9.293938 -11.12417,0.259715 -12.72378,7.207679 -1.17555,5.106052 -17.49967,9.861586 -7.0845,17.095075 5.19758,6.165487 16.67453,7.539118 21.14069,-0.193375 6.00719,-6.918752 6.47481,-18.27477 -1.33241,-24.109379 z"
+ id="path5590"
+ sodipodi:nodetypes="csccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.42845821px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 282.41836,-42.363313 c 0.98391,5.200921 -0.79115,10.107702 -3.87123,14.642462 -4.99562,7.354997 -15.93569,6.365151 -21.13329,0.199672 -0.66139,-0.459344 -0.77766,-0.852191 -1.23412,-1.292277 -0.51408,1.779127 0.0495,3.413794 3.13003,5.553294 5.19758,6.165491 15.78197,7.337502 20.86634,0.04578 4.08217,-5.854429 5.63538,-13.072673 2.24227,-19.148933 z"
+ id="path5592"
+ sodipodi:nodetypes="cscccsc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.42845821px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 276.13327,-50.492935 c -3.9347,-2.4215 -8.41562,4.922291 -9.71531,10.567512 -1.07879,4.685784 -14.83656,8.880461 -9.05759,15.161836 1.05648,-4.309822 9.22298,-7.764543 10.06119,-11.405377 1.59961,-6.947964 8.78685,-16.504895 12.71707,-7.210961 1.90797,1.425898 3.02301,3.460473 3.98249,5.400538 -0.64047,-3.486031 -2.3338,-6.711931 -5.4746,-9.059167 -0.73692,-1.742612 -1.60525,-2.895573 -2.51325,-3.454381 z"
+ id="path5594"
+ sodipodi:nodetypes="cscscccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.5616196,0,0,0.5616196,201.82465,175.33483)"
+ id="g5606">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1.78056467px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 281.33797,-46.165926 c -4.31788,-10.210649 -12.22141,0.285329 -13.9788,7.918608 -1.29149,5.609688 -19.22574,10.834278 -7.78327,18.781245 5.71025,6.773613 18.31922,8.282731 23.2259,-0.212449 6.59971,-7.601185 7.11345,-20.077299 -1.46383,-26.487404 z"
+ id="path5608"
+ sodipodi:nodetypes="csccc"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csccc"
+ id="path5610"
+ d="m 278.84309,-47.33068 c -3.93021,-9.293938 -11.12417,0.259715 -12.72378,7.207679 -1.17555,5.106052 -17.49967,9.861586 -7.0845,17.095075 5.19758,6.165487 16.67453,7.539118 21.14069,-0.193375 6.00719,-6.918752 6.47481,-18.27477 -1.33241,-24.109379 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.78056467px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscccsc"
+ id="path5612"
+ d="m 282.41836,-42.363313 c 0.98391,5.200921 -0.79115,10.107702 -3.87123,14.642462 -4.99562,7.354997 -15.93569,6.365151 -21.13329,0.199672 -0.66139,-0.459344 -0.77766,-0.852191 -1.23412,-1.292277 -0.51408,1.779127 0.0495,3.413794 3.13003,5.553294 5.19758,6.165491 15.78197,7.337502 20.86634,0.04578 4.08217,-5.854429 5.63538,-13.072673 2.24227,-19.148933 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.78056467px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscscccc"
+ id="path5614"
+ d="m 276.13327,-50.492935 c -3.9347,-2.4215 -8.41562,4.922291 -9.71531,10.567512 -1.07879,4.685784 -14.83656,8.880461 -9.05759,15.161836 1.05648,-4.309822 9.22298,-7.764543 10.06119,-11.405377 1.59961,-6.947964 8.78685,-16.504895 12.71707,-7.210961 1.90797,1.425898 3.02301,3.460473 3.98249,5.400538 -0.64047,-3.486031 -2.3338,-6.711931 -5.4746,-9.059167 -0.73692,-1.742612 -1.60525,-2.895573 -2.51325,-3.454381 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.78056467px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5616"
+ transform="matrix(0.5319913,0.2173328,-0.2173328,0.5319913,249.38379,454.68555)">
+ <path
+ sodipodi:nodetypes="csccc"
+ id="path5618"
+ d="m 281.33797,-46.165926 c -4.31788,-10.210649 -12.22141,0.285329 -13.9788,7.918608 -1.29149,5.609688 -19.22574,10.834278 -7.78327,18.781245 5.71025,6.773613 18.31922,8.282731 23.2259,-0.212449 6.59971,-7.601185 7.11345,-20.077299 -1.46383,-26.487404 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1.74012208px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.74012208px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 278.84309,-47.33068 c -3.93021,-9.293938 -11.12417,0.259715 -12.72378,7.207679 -1.17555,5.106052 -17.49967,9.861586 -7.0845,17.095075 5.19758,6.165487 16.67453,7.539118 21.14069,-0.193375 6.00719,-6.918752 6.47481,-18.27477 -1.33241,-24.109379 z"
+ id="path5620"
+ sodipodi:nodetypes="csccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.74012208px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 282.41836,-42.363313 c 0.98391,5.200921 -0.79115,10.107702 -3.87123,14.642462 -4.99562,7.354997 -15.93569,6.365151 -21.13329,0.199672 -0.66139,-0.459344 -0.77766,-0.852191 -1.23412,-1.292277 -0.51408,1.779127 0.0495,3.413794 3.13003,5.553294 5.19758,6.165491 15.78197,7.337502 20.86634,0.04578 4.08217,-5.854429 5.63538,-13.072673 2.24227,-19.148933 z"
+ id="path5622"
+ sodipodi:nodetypes="cscccsc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.74012208px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 276.13327,-50.492935 c -3.9347,-2.4215 -8.41562,4.922291 -9.71531,10.567512 -1.07879,4.685784 -14.83656,8.880461 -9.05759,15.161836 1.05648,-4.309822 9.22298,-7.764543 10.06119,-11.405377 1.59961,-6.947964 8.78685,-16.504895 12.71707,-7.210961 1.90797,1.425898 3.02301,3.460473 3.98249,5.400538 -0.64047,-3.486031 -2.3338,-6.711931 -5.4746,-9.059167 -0.73692,-1.742612 -1.60525,-2.895573 -2.51325,-3.454381 z"
+ id="path5624"
+ sodipodi:nodetypes="cscscccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5626"
+ transform="matrix(0.2759451,0,0,0.2759451,13.839815,320.88404)">
+ <path
+ sodipodi:nodetypes="cscccc"
+ id="path5628"
+ d="m 139.49219,53.310783 c 7.72437,24.866042 50.17839,39.81396 59.1167,22.557291 C 210.09914,53.68453 222.71463,33.777355 248.40188,31.425002 269.51226,17.82539 249.26997,-9.6399047 227.76933,0.13335984 202.92242,3.7785696 180.21881,25.997032 153.04117,10.872046 128.89093,4.422499 141.11979,40.889504 139.49219,53.310783 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:3.62390924px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.62390924px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 141.80976,46.316303 c 7.17296,23.090963 46.59637,36.971813 54.89661,20.947023 10.67001,-20.599956 22.38494,-39.086043 46.23849,-41.270472 19.6034,-12.628794 0.80612,-38.13346 -19.15968,-29.057867 -23.0732,3.384994 -44.1561,24.017376 -69.39364,9.972098 -22.42626,-5.989142 -11.07037,27.874641 -12.58178,39.409218 z"
+ id="path5630"
+ sodipodi:nodetypes="cscccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.62390924px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 243.31856,0.206855 c 2.06979,6.137125 -1.16573,14.451514 -10.05403,16.481262 -22.81135,5.209246 -38.08158,29.055698 -46.97279,37.403332 -8.99944,8.449247 -28.8771,11.361257 -42.83679,-3.701133 10.17491,20.58787 44.48003,30.85775 52.28052,15.7978 10.67001,-20.599954 21.85785,-39.31226 45.7114,-41.496689 11.85732,-7.638654 9.87343,-17.926135 1.87169,-24.484572 z"
+ id="path5632"
+ sodipodi:nodetypes="cszcscc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.62390924px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 231.25017,-3.983955 c -2.38649,0.146504 -4.84803,0.740551 -7.34375,1.875 -23.0732,3.384995 -44.27643,24.476158 -69.51397,10.43088 -22.42625,-5.989142 -10.00514,26.255874 -11.51655,37.790451 1.68627,5.428391 4.73526,10.111815 9.16287,14.25331 -1.32799,-2.13406 -3.0426,-3.941992 -3.77132,-6.28787 1.51141,-11.534577 -4.44305,-35.083569 11.83971,-33.373934 28.50873,2.99332 47.05584,-12.616073 70.12904,-16.001066 7.29698,-3.316893 13.27282,-1.687395 18.44008,1.91691 -2.91879,-6.626734 -8.94429,-11.12437 -17.42611,-10.603681 z"
+ id="path5634"
+ sodipodi:nodetypes="ccccccsccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5636"
+ transform="matrix(0.3050651,0,0,0.3050651,402.83155,255.76494)">
+ <path
+ id="path5638"
+ d="m 280.5597,63.430376 c -21.6581,4.239134 -8.10201,30.694561 6.82249,35.530244 23.94044,8.96476 -11.44287,41.92048 17.04386,42.26164 16.56164,6.47085 41.32506,5.86435 38.10592,-18.46251 C 343.6953,104.90838 336.60346,86.692204 327.01823,72.02951 314.98581,59.48727 296.22415,61.049062 280.5597,63.430376 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:3.27798891px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.27798891px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 276.57352,59.678177 c -20.38485,3.989922 -7.6257,28.890075 6.42141,33.441475 22.53302,8.437748 -10.77016,39.456048 16.04188,39.777148 15.588,6.09044 38.89562,5.5196 35.86573,-17.37712 1.09494,-16.801918 -5.57999,-33.947202 -14.60171,-47.747899 -11.32506,-11.8049 -28.98375,-10.334924 -43.72731,-8.093604 z"
+ id="path5640"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.27798891px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 314.00103,62.844322 c 7.85526,13.124329 12.64465,29.26952 9.1434,44.156248 -6.43048,27.34133 -17.23156,18.3756 -35.1434,17.21875 -0.155,5.00001 2.15072,7.93354 11.13897,8.04118 15.58801,6.09045 37.82769,6.06032 34.7978,-16.8364 1.09493,-16.801908 -4.60255,-33.841581 -13.62427,-47.642278 -1.92746,-2.009127 -4.06371,-3.635775 -6.3125,-4.9375 z m -44.0625,19.5625 c 3.12049,4.72643 11.07323,9.8428 15.87057,11.5772 -0.13326,-4.89069 -6.36505,-7.52703 -11.33932,-9.3897 -1.5364,-0.49781 -3.06734,-1.25682 -4.53125,-2.1875 z"
+ id="path5642"
+ sodipodi:nodetypes="csccccccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.27798891px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 293.90728,58.156822 c -5.86099,-0.03581 -11.81491,0.690755 -17.34375,1.53125 -18.47376,3.615867 -9.72635,24.40248 2.53125,31.65625 -5.54635,-8.80876 -3.86309,-17.727832 9.01543,-20.248541 12.01578,-1.826642 23.91531,-5.061546 34.79707,0.904791 -0.84574,-1.435552 -1.69621,-2.845773 -2.59375,-4.21875 -7.07817,-7.378063 -16.63794,-9.565314 -26.40625,-9.625 z m -2.78125,43.937498 c 2.03112,11.99449 -11.80992,29.56164 6.375,30.71875 2.25382,-11.47742 7.94767,-25.25194 -6.375,-30.71875 z"
+ id="path5644"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5646"
+ transform="matrix(0.2330141,-0.0848001,0.0848001,0.2330141,103.96309,41.378201)">
+ <path
+ sodipodi:nodetypes="csscccs"
+ id="path5648"
+ d="m 421.18271,436.17142 c -11.16147,18.32846 -14.41657,50.24995 14.46856,46.97211 17.94094,-2.03592 39.66066,6.00096 53.08036,-2.32822 9.27612,-5.75739 7.59744,-38.68848 -12.68783,-34.49797 -10.43657,-13.10641 25.83273,-39.60867 -3.25371,-41.38059 -4.13074,-1.04845 -7.33292,-4.00828 -14.215,-0.24189 -19.1296,12.95412 -23.65816,8.92335 -37.39238,31.47656 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:4.03282785px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.03282785px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 419.45862,432.96729 c -10.49665,17.23675 -13.55786,47.25687 13.60676,44.17427 16.87231,-1.91465 37.29832,5.64352 49.91869,-2.18954 8.7236,-5.41446 7.14491,-36.38404 -11.93209,-32.44314 -9.81493,-12.32574 24.29403,-37.24942 -3.05991,-38.9158 -3.8847,-0.986 -6.89614,-3.76953 -13.3683,-0.22748 -17.99017,12.18252 -22.24899,8.39184 -35.16515,29.60169 z"
+ id="path5650"
+ sodipodi:nodetypes="csscccs"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.03282785px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 468.08309,404.59513 c 3.02835,8.67716 -10.59888,25.32343 -5.4228,32.6121 1.97424,2.78001 4.81528,4.21317 7.05442,5.2257 -4.32999,-12.11159 7.07193,-22.75328 7.89316,-30.20597 0.4534,-4.11464 -2.26044,-7.1337 -9.52478,-7.63183 z m 5.04892,38.16618 c 1.15065,7.14612 2.80191,17.20087 -1.88162,19.04376 -14.32754,5.63767 -30.14778,1.73217 -47.12539,2.50808 -5.31121,0.24273 -7.76801,0.46881 -11.12023,-1.0625 2.09049,9.06023 7.17661,14.3118 20.27648,13.25 16.92252,-1.37164 35.11396,5.29222 48.09487,-2.0772 7.76951,-4.41084 9.86109,-28.82551 -8.24411,-31.66214 z"
+ id="path5652"
+ sodipodi:nodetypes="cscsccsscssc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.03282785px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 461.02794,402.17822 c -1.64441,-0.0414 -3.54169,0.39048 -5.96875,1.71875 -17.99016,12.18252 -22.8572,7.94708 -35.05919,29.61434 -7.18032,12.7502 -12.69213,29.71583 -2.98934,38.38089 -4.41753,-10.03699 5.1078,-20.3231 10.77682,-30.87612 11.7835,-21.93529 12.19037,-15.7083 30.18054,-27.89082 6.64519,-3.46343 13.4222,-3.74464 20.44485,-1.49888 0.13112,-3.8498 -1.81104,-6.87477 -10.19743,-7.38566 -2.42793,-0.61625 -4.44681,-1.99355 -7.1875,-2.0625 z m 10.83898,40.44081 c -0.11219,2.22617 0.34764,4.32464 1.78125,6.125 4.56349,-0.94272 8.82395,-0.39427 11.29926,1.47206 -2.07573,-5.30486 -7.35297,-8.11775 -13.08051,-7.59706 z"
+ id="path5654"
+ sodipodi:nodetypes="ccscscccccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.2488688,0.07946678,-0.07946678,0.2488688,-2.60229,301.5056)"
+ id="g5656">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 98.81336,470.11932 c -6.918783,23.04182 31.41119,39.50538 50.09677,31.99615 12.45296,-13.37404 30.31695,-17.81936 44.98976,-27.78519 15.89667,-14.71948 -4.15091,-33.104 -18.23167,-39.06219 -20.61949,-10.1033 -35.636,13.43344 -53.53538,19.60282 -8.1692,4.42411 -16.32281,9.07185 -23.31948,15.24841 z"
+ id="path5658"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path5660"
+ d="m 97.237597,464.03444 c -6.583689,21.92585 29.889873,37.59204 47.670463,30.4465 11.84983,-12.7263 28.84862,-16.95632 42.81079,-26.43948 15.12676,-14.00658 -3.94987,-31.5007 -17.34866,-37.17032 -19.62084,-9.61397 -33.91006,12.78283 -50.94253,18.65341 -7.77355,4.20984 -15.53226,8.63248 -22.190063,14.50989 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cczcccc"
+ id="path5662"
+ d="m 183.28133,439.09413 c 2.57499,5.87507 -0.99651,12.53148 -7.21763,18.29191 -13.96217,9.48316 -28.32573,13.83891 -39.5809,22.34414 -11.25517,8.50524 -26.19024,4.37815 -36.981264,-4.17061 6.255224,15.43676 30.898314,24.02242 44.219874,18.5864 11.84984,-12.7263 28.85033,-17.38522 42.8125,-26.86838 10.43773,-9.66478 5.77747,-20.2282 -3.25258,-28.18346 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ id="path5664"
+ d="m 159.84383,429.60883 c -14.54811,0.5555 -26.24421,16.23015 -40.08309,21 -7.77355,4.20984 -14.56022,7.76083 -21.218024,13.63824 -2.918588,9.71986 1.33231,17.99824 9.957364,23.81581 -2.7158,-4.4121 -3.75617,-9.44267 -2.125,-14.875 6.6578,-5.87741 14.41395,-10.32142 22.1875,-14.53125 17.03247,-5.87058 29.05454,-28.70111 48.67538,-19.08713 3.13796,1.32781 7.457,4.07581 10.70551,6.50404 -4.6172,-6.57778 -11.27636,-11.90596 -17.78383,-14.65956 -3.67891,-1.80262 -6.95855,-1.93334 -10.31581,-1.80515 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.82777691px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0.7000555,0,0,0.7000555,328.06466,254.80861)"
+ id="g5666">
+ <path
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:1.42845821px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 281.33797,-46.165926 c -4.31788,-10.210649 -12.22141,0.285329 -13.9788,7.918608 -1.29149,5.609688 -19.22574,10.834278 -7.78327,18.781245 5.71025,6.773613 18.31922,8.282731 23.2259,-0.212449 6.59971,-7.601185 7.11345,-20.077299 -1.46383,-26.487404 z"
+ id="path5668"
+ sodipodi:nodetypes="csccc"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="csccc"
+ id="path5670"
+ d="m 278.84309,-47.33068 c -3.93021,-9.293938 -11.12417,0.259715 -12.72378,7.207679 -1.17555,5.106052 -17.49967,9.861586 -7.0845,17.095075 5.19758,6.165487 16.67453,7.539118 21.14069,-0.193375 6.00719,-6.918752 6.47481,-18.27477 -1.33241,-24.109379 z"
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.42845821px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscccsc"
+ id="path5672"
+ d="m 282.41836,-42.363313 c 0.98391,5.200921 -0.79115,10.107702 -3.87123,14.642462 -4.99562,7.354997 -15.93569,6.365151 -21.13329,0.199672 -0.66139,-0.459344 -0.77766,-0.852191 -1.23412,-1.292277 -0.51408,1.779127 0.0495,3.413794 3.13003,5.553294 5.19758,6.165491 15.78197,7.337502 20.86634,0.04578 4.08217,-5.854429 5.63538,-13.072673 2.24227,-19.148933 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.42845821px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cscscccc"
+ id="path5674"
+ d="m 276.13327,-50.492935 c -3.9347,-2.4215 -8.41562,4.922291 -9.71531,10.567512 -1.07879,4.685784 -14.83656,8.880461 -9.05759,15.161836 1.05648,-4.309822 9.22298,-7.764543 10.06119,-11.405377 1.59961,-6.947964 8.78685,-16.504895 12.71707,-7.210961 1.90797,1.425898 3.02301,3.460473 3.98249,5.400538 -0.64047,-3.486031 -2.3338,-6.711931 -5.4746,-9.059167 -0.73692,-1.742612 -1.60525,-2.895573 -2.51325,-3.454381 z"
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.42845821px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5676"
+ transform="translate(512,0)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path5678"
+ d="m 76.352636,196.18158 c 13.258725,-1.43048 36.815714,-12.73591 15.93394,-24.33165 -23.154226,-14.8425 -49.968777,-35.24726 -79.043359,-26.25715 -29.139741,9.55882 -20.6864931,39.75739 -8.714574,58.7739 25.226647,16.51112 47.01227,2.2174 71.823993,-8.1851 z"
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 68.211515,188.56943 c 12.60855,-1.36032 35.010355,-12.11136 15.15258,-23.13848 -22.018802,-14.11466 -47.518433,-33.51882 -75.167271,-24.96957 -27.7108,9.09009 -19.672079,37.80779 -8.287233,55.89178 23.989596,15.70145 44.706907,2.10866 68.301924,-7.78373 z"
+ id="path5680"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 84.538095,166.1043 c -0.05766,7.22209 -19.35778,9.28809 -27.878647,12.10626 -23.126052,7.64865 -37.803594,24.20179 -60.590103,11.33124 1.198417,2.38401 3.037014,4.35237 4.38235,6.48934 23.989598,15.70145 43.317124,1.68026 66.91214,-8.21213 12.34239,-1.33161 34.889065,-10.93575 17.17426,-21.71471 z"
+ id="path5682"
+ sodipodi:nodetypes="cscccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 21.006845,139.03187 c -4.21011,0.0977 -7.846049,0.94212 -12.16618,2.27794 -27.710801,9.09008 -20.312416,36.9605 -8.92757,55.04449 0.143196,0.0937 0.294536,0.15836 0.4375,0.25 -7.454439,-17.14722 -3.254457,-31.60578 19.431216,-39.04746 27.585553,-8.03338 47.612064,5.94572 70.234964,19.43974 1.60532,-3.54876 0.69856,-7.4901 -6.66618,-11.57978 -18.57836,-11.90924 -39.609158,-26.91261 -62.34375,-26.38493 z"
+ id="path5684"
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g5686"
+ transform="matrix(0.2113482,0.180649,-0.1535662,0.2486213,495.11512,373.05596)">
+ <path
+ id="path5688"
+ d="m 98.81336,470.11932 c -6.918783,23.04182 31.41119,39.50538 50.09677,31.99615 12.45296,-13.37404 30.31695,-17.81936 44.98976,-27.78519 15.89667,-14.71948 -4.15091,-33.104 -18.23167,-39.06219 -20.61949,-10.1033 -35.636,13.43344 -53.53538,19.60282 -8.1692,4.42411 -16.32281,9.07185 -23.31948,15.24841 z"
+ style="color:#000000;fill:#262833;fill-opacity:0.31046932;fill-rule:evenodd;stroke:none;stroke-width:3.52920365px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.52920365px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 97.237597,464.03444 c -6.583689,21.92585 29.889873,37.59204 47.670463,30.4465 11.84983,-12.7263 28.84862,-16.95632 42.81079,-26.43948 15.12676,-14.00658 -3.94987,-31.5007 -17.34866,-37.17032 -19.62084,-9.61397 -33.91006,12.78283 -50.94253,18.65341 -7.77355,4.20984 -15.53226,8.63248 -22.190063,14.50989 z"
+ id="path5690"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.52920365px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 183.28133,439.09413 c 2.57499,5.87507 -0.99651,12.53148 -7.21763,18.29191 -13.96217,9.48316 -28.32573,13.83891 -39.5809,22.34414 -11.25517,8.50524 -26.19024,4.37815 -36.981264,-4.17061 6.255224,15.43676 30.898314,24.02242 44.219874,18.5864 11.84984,-12.7263 28.85033,-17.38522 42.8125,-26.86838 10.43773,-9.66478 5.77747,-20.2282 -3.25258,-28.18346 z"
+ id="path5692"
+ sodipodi:nodetypes="cczcccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.52920365px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 159.84383,429.60883 c -14.54811,0.5555 -26.24421,16.23015 -40.08309,21 -7.77355,4.20984 -14.56022,7.76083 -21.218024,13.63824 -2.918588,9.71986 1.33231,17.99824 9.957364,23.81581 -2.7158,-4.4121 -3.75617,-9.44267 -2.125,-14.875 6.6578,-5.87741 14.41395,-10.32142 22.1875,-14.53125 17.03247,-5.87058 29.05454,-28.70111 48.67538,-19.08713 3.13796,1.32781 7.457,4.07581 10.70551,6.50404 -4.6172,-6.57778 -11.27636,-11.90596 -17.78383,-14.65956 -3.67891,-1.80262 -6.95855,-1.93334 -10.31581,-1.80515 z"
+ id="path5694"
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3470"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,80.546393,93.783789)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,87.706325,87.080874)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4267"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4269"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,96.084969,98.506298)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,107.51039,87.080874)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4271"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4273"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,102.4832,72.151654)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-36.754623,188.84332)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4303"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4305"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-22.765574,186.56009)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-29.984122,198.29019)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4307"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4309"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-17.057731,195.05859)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-7.3629375,178.68516)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4311"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,80.09296,314.18152)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4313"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4315"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,68.902771,308.16451)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,85.70708,304.93291)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4317"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4319"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,75.581407,294.16092)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4321"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,91.739396,320.01371)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,270.2762,322.50975)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4323"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4325"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,256.47908,314.62772)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,266.38931,313.11964)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4327"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4329"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,263.3515,331.62582)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,244.62988,329.06219)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4331"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4333"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,228.04101,149.70851)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,224.37853,158.11066)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4335"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4337"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,234.5042,166.94369)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,240.9674,158.3261)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4339"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4341"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,245.70708,174.69953)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,260.14155,165.00474)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4343"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4345"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,340.14155,-14.99526)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,329.55399,-16.975667)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4347"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4349"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,323.23192,-2.6558026)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,334.65734,7.3985703)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4351"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4353"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,343.95002,0.84799406)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,336.02839,-24.287938)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4355"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4357"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,313.32988,-21.241158)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,75.32988,-43.241158)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4359"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4361"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,93.730321,-36.005056)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,85.32988,-27.241158)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4363"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-89.121049,93.920952)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4365"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4367"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-94.722485,102.96943)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-82.873293,102.10767)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4369"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4652"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-5.3004048,186.68892)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-31.953905,192.57043)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4654"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-14.072398,176.62788)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-86.891067,108.54889)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4683"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-4"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-77.04761,93.89774)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-43"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-68.645455,107.03957)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-7"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,72.898526,88.942622)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-3"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,77.853642,99.714615)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-47"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,11.282729,122.12036)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-2"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-3.79806,116.9498)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-1"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,6.9739322,106.39325)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-5"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,82.37788,-37.520569)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-6"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,89.487395,-46.138164)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-8"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,190.95956,-97.197408)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-9"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,205.17859,-99.782686)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-55"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,196.99188,-91.165093)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-21"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,333.36531,-4.9891528)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-59"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,317.85364,-8.4361901)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-91"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,330.34915,-28.902976)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-62"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,248.05112,165.20833)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-10"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,228.01522,167.57817)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-53"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,310.74412,118.88876)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-219"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,315.26836,128.36811)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-76"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,324.31683,119.75052)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-82"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,80.008042,323.9875)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-0"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,66.866211,302.01264)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-64"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,84.963158,294.90311)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-33"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-78.124808,355.65716)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-69"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-89.758561,351.34836)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-04"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-75.97041,344.23884)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-85"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,252.7908,333.89773)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-12"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,255.42201,323.34118)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-97"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-7.2450979,-93.534929)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-14.354613,-87.933493)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4888"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4890"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,3.0960149,-77.37694)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4663-38"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-5.2105348,278.60906)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,1.1877023,286.68303)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4899"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4901"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,5.9102107,273.58188)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,9.4905691,291.25488)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4903"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4905"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,0.80724729,280.74349)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-13.664956,296.4344)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4907"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,65.205318,211.96822)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4909"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4911"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,79.068165,209.5308)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,58.197725,200.84748)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4913"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,67.517627,197.80967)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4915"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4917"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,73.00183,216.6997)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4920"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-4.0223078,126.45237)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,11.273922,111.15614)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4922"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4925"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-24.058213,27.996358)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-9.8391829,17.224365)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4927"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4930"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-11.562702,27.350038)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-22.110448,37.883378)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4932"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4935"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-36.114038,28.404025)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4937"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-4.2930977,-82.39376)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-114.58652,-39.891185)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4940"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4942"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,-103.00876,-31.512541)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,-106.81723,-42.785625)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4944"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,193.69441,-106.88477)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4946"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4948"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,196.92601,-81.462868)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4950"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,324.12719,127.73365)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,130.23133,171.25249)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4952"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,125.89673,178.99648)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4954"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4956"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,135.61733,179.00832)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4958"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,356.87866,254.31679)" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,348.95703,261.93374)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4960"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,360.84058,263.92898)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4963"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,152.88857,251.55938)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4965"
+ style="color:#000000;fill:#333645;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.58208955,0,0,0.58208955,155.29385,243.71305)"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ sodipodi:ry="2.5516779"
+ sodipodi:rx="2.5516779"
+ sodipodi:cy="215.6626"
+ sodipodi:cx="219.71089"
+ id="path4968"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#e6e7ec;fill-opacity:0.20938625;fill-rule:evenodd;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4970"
+ sodipodi:cx="219.71089"
+ sodipodi:cy="215.6626"
+ sodipodi:rx="2.5516779"
+ sodipodi:ry="2.5516779"
+ d="m 222.26257,215.6626 a 2.5516779,2.5516779 0 1 1 -5.10336,0 2.5516779,2.5516779 0 1 1 5.10336,0 z"
+ transform="matrix(0.58208955,0,0,0.58208955,161.38741,249.50193)" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer6"
+ inkscape:label="cristals"
+ style="display:inline">
+ <g
+ id="g4542">
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path3144"
+ d="M 79.259775,72.990284 C 79.27692,72.639608 74.625058,43.763781 74.625058,43.763781 L 86.573391,27.651023 98.575828,44.583234 88.015254,74.328543 z"
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3808"
+ d="M 75.210315,43.505604 86.321533,28.69022 89.242318,48.893674 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3765"
+ d="m 78.411737,65.171574 -3.575933,-21.134392 10.311435,3.729868 -5.527531,-1.119713 5.350467,20.745861 4.168169,-17.337419 -5.233437,23.283415 -4.368675,-0.641636 -0.602824,-3.845003 2.07306,3.897056 2.511263,0.324722 1.205229,-4.40703 -7.72042,-15.274334 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 74.844637,43.795301 11.374945,-7.369165 -0.616918,-4.894657 -3.304278,2.805196 3.790489,-4.718114 3.276374,19.45688 -2.831275,-9.037197 -8.63828,3.256276 6.628051,3.856233 z"
+ id="path3842"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 90.555788,49.235995 87.556377,29.592368 98.233424,44.786337 z"
+ id="path3806"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path3827"
+ d="m 84.55449,73.383268 3.445315,0.452451 9.884218,-28.583282 -7.834107,4.75788 z"
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 90.558019,66.519709 -2.343012,-6.803651 -2.214769,7.751795 3.951452,-17.312887 -0.333113,3.377426 2.779508,6.516162 4.167023,-11.422771 -2.882456,-0.612904 4.154901,-2.544425 z"
+ id="path3850"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3865"
+ d="m 90.681689,48.553514 4.68034,-4.637797 -5.1804,-8.595408 -1.6676,1.768353 -1.403742,-8.1628 10.66204,15.50081 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ d="m 74.698793,43.78836 15.244802,5.719681 8.535578,-4.911291 M 86.56048,27.756241 89.858604,49.429753 84.094714,73.800182 M 79.259775,72.990284 C 79.27692,72.639608 74.625058,43.763781 74.625058,43.763781 L 86.573391,27.651023 98.575828,44.583234 88.146852,74.306153 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3762" />
+ <path
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 91.489171,69.725153 c 0.275525,0.07545 24.032339,1.472035 24.032339,1.472035 L 126.21332,83.529093 110.6474,90.077199 88.882328,76.443805 z"
+ id="path4252"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 103.33052,70.819695 12.21503,0.691319 9.88672,11.634784 -16.56296,-1.242419 z"
+ id="path4254"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4256"
+ d="m 114.56779,71.72722 -6.88223,10.63865 -7.08052,-3.763189 4.22646,0.185488 -5.491907,-7.215773 -6.608265,-1.281587 16.136312,1.616704 -6.66358,-0.128983 6.58846,6.395897 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4258"
+ d="m 115.45776,71.366046 10.15286,11.939663 -16.90737,-1.336735 10.84829,0.227994 -3.56404,-9.517097 -4.90174,5.782793 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4264"
+ d="m 108.59237,83.092132 14.73179,1.296691 -12.55113,5.263224 z"
+ style="color:#000000;fill:#5388c1;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 90.243407,73.86154 -0.966897,2.656893 20.96132,12.891254 -2.39789,-7.061715 z"
+ id="path4266"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4268"
+ d="m 94.636654,79.840488 5.817396,-0.661416 -5.766855,-3.126092 13.055165,6.191463 -2.62401,-0.860134 -5.666003,1.058824 8.338533,5.324099 0.9951,-2.18151 1.28845,3.748963 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 110.67568,88.933642 -1.43029,-5.843508 13.88265,1.129224 -5.87068,2.295297 2.85956,-1.831768 -9.6605,-0.62435 z"
+ id="path4270"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4260"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 115.48899,71.251424 -7.23134,11.100661 2.39606,7.645955 m 15.47831,-6.497756 -17.7972,-1.201905 -18.341503,-8.87556 m 1.495854,-3.697666 c 0.275525,0.07545 24.032339,1.472035 24.032339,1.472035 L 126.21332,83.529093 110.6474,90.077199 88.876908,76.552283 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path4274"
+ d="m 87.959931,66.472916 c 0.115145,0.388881 16.207649,30.09646 16.207649,30.09646 l -6.877599,22.127714 -19.548403,-13.8802 0.161599,-36.461481 z"
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4278"
+ d="m 83.249805,71.284156 1.345327,21.774876 18.769368,2.501445 -13.72829,-3.537484 0.887735,-17.752945 8.25784,14.13069 -11.708081,-22.070129 1.041218,3.808034 -2.798184,13.875118 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4276"
+ d="M 103.62802,97.07423 97.167963,117.46794 85.874293,93.81746 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 103.91615,96.618814 97.108491,117.80278 86.069291,96.403816 93.912105,109.66284 102.72743,98.241092 92.082497,96.654493 z"
+ id="path4280"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#3f6083;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 84.870304,93.748995 96.984136,118.70728 77.982268,105.1931 z"
+ id="path4286"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4288"
+ d="m 82.037179,68.06521 -3.929069,0.821623 0.132329,34.936407 6.725566,-8.177401 z"
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 78.22537,77.611246 4.084842,6.752228 0.408338,-9.296975 1.385311,19.660531 -0.925827,-3.314401 -4.184433,-5.700919 -0.602621,13.930232 3.376628,-0.431863 -3.558947,4.359901 z"
+ id="path4290"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4292"
+ d="m 84.757019,94.733192 -3.71854,9.356958 11.997221,10.01571 -1.201919,-4.65036 4.384278,8.05655 -17.54068,-12.83112 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ d="m 104.07781,96.570719 -19.288928,-3.757149 -6.94708,11.9517 M 97.2639,118.57744 84.642126,92.866487 82.379349,67.435178 m 5.580582,-0.962262 c 0.115145,0.388881 16.207649,30.09646 16.207649,30.09646 l -6.877599,22.127714 -19.548403,-13.8802 0.02666,-36.386844 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4282" />
+ <path
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 80.801805,75.271306 C 80.626157,75.429268 69.035664,91.333102 69.035664,91.333102 l -13.358588,1.92636 0.463076,-14.348855 21.152567,-8.456047 z"
+ id="path4296"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 56.658266,79.243366 56.292853,92.887402 64.293978,81.995733 z"
+ id="path4298"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 77.468453,79.380984 -8.402033,11.721901 -3.103787,-6.693218 2.676528,2.524822 6.592755,-10.634766 -8.989721,5.091968 12.525399,-8.504775 1.763383,2.391017 -1.551215,2.109767 0.879475,-2.836792 -1.034726,-1.353537 -1.571915,2.388264 -4.743338,10.049327 z"
+ id="path4300"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4302"
+ d="M 68.946683,91.21327 56.101881,92.940006 64.58916,81.774714 59.581554,89.22017 67.795846,90.994564 65.96363,84.999528 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4308"
+ d="M 68.631573,90.958967 56.060296,92.2541 64.77241,81.782531 z"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 78.480873,72.555715 -1.416266,-1.860272 -20.189985,7.983505 4.082169,6.967921 3.754578,-4.642184 z"
+ id="path4310"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4312"
+ d="m 72.357501,72.939702 -2.140109,4.342917 4.752562,-2.614808 -10.627683,5.695873 3.063936,-2.033569 0.09937,-2.745567 -6.542564,2.963696 2.338637,1.667406 -5.607839,-1.694936 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 63.716087,81.393116 -4.764683,-0.424217 0.543852,4.62626 1.859646,-1.208487 -3.061076,4.457519 -1.012933,-8.990815 z"
+ id="path4314"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4304"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 69.012469,91.286231 -4.490672,-9.992773 -6.390433,-1.750621 m -2.397906,13.67294 8.791209,-11.844624 14.373219,-8.79333 m 1.903919,2.693483 C 80.626157,75.429268 69.035664,91.333102 69.035664,91.333102 l -13.358588,1.92636 1.055536,-14.860524 20.487059,-7.996637 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path4318"
+ d="M 82.721345,74.78197 C 82.318005,74.671247 47.535863,72.604939 47.535863,72.604939 L 31.892686,54.539571 54.689361,44.966293 86.544222,64.947255 z"
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4320"
+ d="M 49.591049,55.367968 33.949931,53.882765 54.162392,45.510132 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4332"
+ d="M 82.49249,74.820389 84.367591,69.71248 58.259044,57.369421 48.205332,72.357301 z"
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="cccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4322"
+ d="m 73.140627,73.151454 -25.232283,-0.720798 2.428648,-15.926129 -0.147785,12.87022 22.546897,-2.897498 -16.226883,-7.665714 27.820425,10.659243 -1.877122,4.913935 -4.950329,-0.779188 4.475868,-1.509438 1.404758,-1.974358 -4.974208,-1.465217 -17.875168,3.138105 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 47.702588,71.742708 33.300283,55.596621 57.769521,56.711903 z"
+ id="path4330"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 47.629362,72.357764 -14.854449,-17.490581 16.997784,1.433881 -12.920952,0.46426 9.518453,11.567791 1.742227,-9.001003 z"
+ id="path4324"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 74.890536,58.191432 -9.756885,1.771041 8.440677,4.582271 -21.425018,-8.753857 6.965026,1.315597 11.420686,-0.521802 -11.665398,-8.233678 -6.683361,2.762265 2.479572,-5.32861 z"
+ id="path4334"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4336"
+ d="m 49.183435,54.4197 1.677981,-5.836363 -9.919214,3.743646 5.353855,2.418885 L 33.514111,54.245292 54.299288,45.8601 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ d="m 47.583534,72.52556 2.141753,-17.431341 4.954768,-10.012032 m -22.66836,9.499637 17.654413,0.644817 35.24873,14.142767 M 82.721345,74.78197 C 82.318005,74.671247 47.535863,72.604939 47.535863,72.604939 L 31.892686,54.539571 54.689361,44.966293 86.552256,64.788432 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4326" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path4396"
+ d="M 90.325434,66.950754 C 90.487391,66.87533 102.38586,57.93455 102.38586,57.93455 l 10.08767,1.559528 -4.77806,9.418635 -15.896722,2.297503 z"
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4398"
+ d="m 97.766012,62.630851 5.068468,-3.898053 0.31385,6.835487 -10.003696,3.515434 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4400"
+ d="m 93.644758,64.715158 8.667962,-6.620897 0.7654,5.527069 -0.80639,-2.754257 -8.072299,7.327766 8.794449,-2.233864 -11.724213,3.163982 -0.746886,-2.119131 1.588293,-1.183048 -1.263147,1.857365 0.449198,1.207691 2.270025,-0.502223 5.046834,-7.097577 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 102.42373,58.040889 7.40981,2.102012 -6.34446,5.687806 3.35557,-4.305113 -3.23295,-1.941079 -0.40392,3.609966 z"
+ id="path4402"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 103.84069,66.144384 8.13344,-6.007866 -4.30966,8.409748 z"
+ id="path4408"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4410"
+ d="m 91.403835,69.427882 0.613145,1.658532 15.21316,-2.326523 -3.99966,-2.399258 z"
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 95.917562,70.503677 2.507843,-2.668047 -4.015367,0.840696 8.732022,-2.325625 -1.59967,0.650781 -2.274911,2.796418 6.131091,-0.832055 -0.40745,-1.443146 2.13074,1.267485 z"
+ id="path4412"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4414"
+ d="m 104.03619,66.299691 3.35239,1.360017 3.48019,-5.89597 -1.16089,-0.03799 2.31894,-1.687676 -4.45136,8.475744 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ d="m 102.39227,57.973578 1.03915,8.220097 4.23505,2.678723 m 4.75662,-9.359187 -8.97657,6.623635 -12.339411,3.182869 M 90.325434,66.950754 C 90.487391,66.87533 102.38586,57.93455 102.38586,57.93455 l 10.08767,1.559528 -4.77806,9.418635 -15.85544,2.351446 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4404" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect4478"
+ d="M 75.736071,56.883306 94.712734,62.664275 96.615786,81.38959 72.719914,77.493719 z"
+ style="color:#000000;fill:#76869e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#9ca8b9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 85.923896,72.506103 73.329558,76.885951 76.251544,58.382776 z"
+ id="path4512"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4514"
+ d="m 85.797131,72.672954 8.636624,7.545841 -19.22608,-2.396146 z"
+ style="color:#000000;fill:#7389a6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#5b718f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 86.374622,72.377497 8.134316,-8.691901 1.053447,16.802349 z"
+ id="path4516"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 74.721867,76.820259 6.749797,-4.815496 -4.3423,-9.674527 -2.745327,7.830794 1.094585,-12.700726 9.91877,14.847026 z"
+ id="path4519"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4521"
+ d="m 87.24211,61.251495 -7.877593,-1.661421 6.95278,8.531596 6.743839,-5.101068 -6.452384,9.683747 -10.111589,-15.416363 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 84.654589,72.977632 9.779166,7.241163 -13.208691,-1.634451 7.700423,-0.634147 z"
+ id="path4523"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccccccccc"
+ inkscape:connector-curvature="0"
+ d="m 76.157989,57.421906 9.587073,15.296229 9.748653,7.917415 M 73.572711,77.242372 85.960502,72.394975 93.931777,62.915622 M 75.736071,56.883306 94.712734,62.664275 96.292626,81.06643 72.719914,77.493719 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4509" />
+ </g>
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path4608"
+ d="m 360.17618,405.31718 c -0.006,-0.21119 -4.14372,-17.31795 -4.14372,-17.31795 l 6.41674,-10.22396 7.99048,9.59847 -4.94833,18.33793 z"
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4610"
+ d="m 356.37154,387.81704 5.97504,-9.40658 2.69461,11.98462 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4612"
+ d="m 359.30273,400.66598 -3.13108,-12.51256 6.3602,1.75675 -3.36841,-0.41394 4.17758,12.19669 1.69199,-10.59581 -2.05376,14.21273 -2.65086,-0.18118 -0.541,-2.27865 1.42548,2.2413 1.52175,0.0777 0.51751,-2.70016 -5.3442,-8.80357 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 356.16566,388.00789 6.48057,-4.9516 -0.59841,-2.90771 -1.85153,1.83706 2.05401,-3.00738 2.87312,11.52013 -2.12011,-5.28971 -5.03056,2.35647 4.15629,2.00436 z"
+ id="path4615"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 365.84516,390.53918 -2.71568,-11.64508 7.11425,8.61746 z"
+ id="path4617"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4620"
+ d="m 363.37102,405.30599 2.08808,0.11075 4.59676,-17.60925 -4.47808,3.21984 z"
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 366.65264,400.90825 -1.723,-3.97249 -0.96716,4.75391 1.56312,-10.57098 -0.0423,2.04178 1.97146,3.77966 1.96718,-7.04733 -1.75788,-0.23325 2.37401,-1.7203 z"
+ id="path4622"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4625"
+ d="m 365.88886,390.12387 2.5916,-3.0007 -3.50882,-4.9151 -0.91799,1.13869 -1.22288,-4.83171 7.11956,8.80224 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ d="m 356.07784,388.01053 9.41273,2.72042 4.89176,-3.34459 m -7.93597,-9.54737 2.98957,12.84895 -2.3213,14.88961 m -2.93845,-0.26037 c -0.006,-0.21119 -4.14372,-17.31795 -4.14372,-17.31795 l 6.41674,-10.22396 7.99048,9.59847 -4.87042,18.31837 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4627" />
+ <path
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 364.90949,401.97556 c 0.21659,-0.10951 16.00462,-12.83769 16.00462,-12.83769 l 13.7187,1.81631 -6.12737,13.15101 -21.44524,3.69709 z"
+ id="path4630"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 373.00403,395.88814 8.10258,-6.56173 12.8165,1.82874 -11.15907,8.70074 z"
+ id="path4632"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4634"
+ d="m 380.61149,390.02669 1.66653,10.80645 -6.59678,1.63591 2.7732,-2.30503 -7.54476,-1.50117 -4.89631,2.96478 11.10119,-8.21471 -4.27991,3.73957 7.77378,0.34357 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4636"
+ d="m 380.96926,389.28331 13.15682,1.87263 -11.42983,8.83752 6.9779,-6.07638 -7.62802,-4.09069 0.173,6.5399 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4638"
+ d="m 383.26092,400.78112 10.03364,-7.61529 -4.95004,10.59321 z"
+ style="color:#000000;fill:#5388c1;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 366.46034,405.3568 0.8909,2.26747 20.51842,-3.71443 -5.50429,-3.17682 z"
+ id="path4640"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4642"
+ d="m 372.61257,406.69088 3.29906,-3.76364 -5.40738,1.29301 11.74101,-3.49799 -2.1427,0.95084 -2.97892,3.93298 8.27304,-1.35132 -0.60447,-1.97719 2.93191,1.67765 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 387.87711,403.35177 -4.20504,-2.94654 9.40291,-7.23612 -2.40944,4.84752 0.77029,-2.82132 -6.45194,5.13945 z"
+ id="path4645"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4647"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 380.92423,389.19149 1.70719,11.30457 5.83329,3.55447 m 6.10049,-13.06829 -11.91541,9.43492 -16.59524,4.80026 m -1.14505,-3.24186 c 0.21659,-0.10951 16.00461,-12.83769 16.00461,-12.83769 l 13.7187,1.81631 -6.12736,13.15101 -21.38737,3.77012 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
+ <g
+ id="g4444"
+ transform="matrix(0.58907526,-0.25674163,0.25674163,0.58907526,43.130778,255.94976)">
+ <path
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 367.78373,414.55337 c 0.0693,0.234 9.75295,18.11052 9.75295,18.11052 l -4.1386,13.31534 -11.76323,-8.3524 0.0972,-21.94068 z"
+ id="path4649"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 364.94942,417.44853 0.80955,13.10301 11.29445,1.50525 -8.26099,-2.12868 0.5342,-10.68283 4.96915,8.50314 -7.04533,-13.28069 0.62655,2.29148 -1.68381,8.34935 z"
+ id="path4651"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 377.212,432.96769 -3.88734,12.2719 -6.79596,-14.23166 z"
+ id="path4653"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4655"
+ d="m 377.38538,432.69364 -4.09651,12.74744 -6.64283,-12.87681 4.71941,7.9786 5.30462,-6.87302 -6.40559,-0.95474 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4657"
+ d="m 365.92455,430.96673 7.28949,15.01863 -11.43436,-8.13215 z"
+ style="color:#000000;fill:#3f6083;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 364.21972,415.51153 -2.36431,0.49441 0.0796,21.02296 4.04711,-4.92075 z"
+ id="path4659"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4662"
+ d="m 361.92597,421.25585 2.45805,4.06315 0.24572,-5.59445 0.83361,11.83071 -0.55712,-1.99444 -2.51798,-3.43052 -0.36263,8.38251 2.03189,-0.25988 -2.1416,2.62357 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 365.85638,431.55897 -2.23763,5.63054 7.21932,6.02695 -0.72325,-2.79835 2.63824,4.84802 -10.5551,-7.72112 z"
+ id="path4664"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4667"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:3.11238933;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 377.48266,432.6647 -11.6071,-2.26086 -4.1804,7.19193 m 11.68723,8.31146 -7.59514,-15.47155 -1.36163,-15.30327 m 3.35811,-0.57904 c 0.0693,0.234 9.75295,18.11052 9.75295,18.11052 l -4.1386,13.31534 -11.76323,-8.3524 0.016,-21.89576 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
+ </g>
+ <g
+ id="g4455"
+ transform="matrix(1.5592223,-0.6416662,0.6416662,1.5592223,-449.84421,-16.880284)">
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path4669"
+ d="m 351.66729,415.80052 c -0.1057,0.095 -7.08027,9.66518 -7.08027,9.66518 l -8.03852,1.15918 0.27865,-8.63441 12.72854,-5.08842 z"
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4672"
+ d="m 337.13893,418.19071 -0.21989,8.21029 4.81467,-6.55406 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4674"
+ d="m 349.66144,418.27352 -5.05592,7.05364 -1.8677,-4.02764 1.6106,1.51931 3.96719,-6.39946 -5.40956,3.06409 7.53715,-5.11774 1.06111,1.43879 -0.93344,1.26955 0.52923,-1.70704 -0.62265,-0.81449 -0.9459,1.43714 -2.8543,6.04717 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 344.53347,425.39359 -7.72935,1.03906 5.10722,-6.71871 -3.01333,4.4803 4.94295,1.06774 -1.10254,-3.60751 z"
+ id="path4677"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 344.34386,425.24056 -7.56476,0.77935 5.24251,-6.30126 z"
+ id="path4679"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path4682"
+ d="m 350.27067,414.16642 -0.85224,-1.11942 -12.14931,4.80407 2.45644,4.19294 2.25932,-2.79343 z"
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 346.58593,414.39748 -1.28781,2.61335 2.85985,-1.57346 -6.3952,3.42749 1.84372,-1.2237 0.0598,-1.65215 -3.93699,1.78341 1.40728,1.00336 -3.37452,-1.01993 z"
+ id="path4684"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4687"
+ d="m 341.38597,419.48432 -2.86715,-0.25528 0.32726,2.78385 1.11904,-0.7272 -1.842,2.68231 -0.60953,-5.41022 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ d="m 344.57306,425.43749 -2.70226,-6.01314 -3.84544,-1.05344 m -1.44294,8.22769 5.29011,-7.1275 8.64907,-5.29138 m 1.14569,1.6208 c -0.1057,0.095 -7.08027,9.66518 -7.08027,9.66518 l -8.03852,1.15918 0.63516,-8.94231 12.32808,-4.81197 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:1.18617427;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4689" />
+ </g>
+ <g
+ id="g4433"
+ transform="matrix(0.98107752,-0.08625524,0.07950857,0.97408876,2.8631181,41.86797)">
+ <path
+ style="color:#000000;fill:#a6c2df;fill-opacity:0.51263535;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 330.30465,403.33371 c -0.17595,-0.0474 -15.34922,-0.93249 -15.34922,-0.93249 l -6.82414,-7.73797 9.94476,-4.10054 13.89628,8.55848 z"
+ id="path4692"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.27797834;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 315.85198,395.01808 -6.82324,-0.63616 8.81743,-3.58627 z"
+ id="path4694"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#6696c8;fill-opacity:0.19494587;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 330.20481,403.35017 0.81799,-2.18788 -11.38952,-5.28693 -4.3858,6.41979 z"
+ id="path4697"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 326.12519,402.63531 -11.00727,-0.30874 1.05947,-6.82167 -0.0645,5.51273 9.83579,-1.2411 -7.07876,-3.28347 12.1363,4.5657 -0.81887,2.10479 -2.15952,-0.33374 1.95254,-0.64655 0.61281,-0.84567 -2.16994,-0.62761 -7.79781,1.34416 z"
+ id="path4699"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4702"
+ d="m 315.02816,402.0319 -6.28282,-6.91588 10.67439,0.47771 z"
+ style="color:#000000;fill:#98b8da;fill-opacity:0.18411554;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4704"
+ d="m 314.99622,402.29535 -6.48007,-7.49178 7.41507,0.61418 -5.6366,0.19886 4.15231,4.95485 0.76002,-3.85541 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4707"
+ d="m 326.88856,396.22746 -4.25632,0.75859 3.68214,1.96273 -9.34639,-3.74955 3.0384,0.56351 4.98213,-0.2235 -5.08888,-3.52675 -2.91553,1.18317 1.08168,-2.28242 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 315.67416,394.6119 0.732,-2.4999 -4.32713,1.60353 2.33555,1.03608 -5.57596,-0.21441 9.06727,-3.59164 z"
+ id="path4709"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4712"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:2.03857327;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 314.97623,402.36723 0.93431,-7.4664 2.16145,-4.28847 m -9.88878,4.06899 7.70151,0.2762 15.37681,6.0578 m -0.95688,2.31837 c -0.17595,-0.0474 -15.34922,-0.93249 -15.34922,-0.93249 l -6.82414,-7.73798 9.94476,-4.10054 13.89979,8.49046 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc" />
+ </g>
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4734"
+ d="m 357.31091,395.81832 11.65449,2.58313 2.01509,11.14528 -14.51778,-1.22273 z"
+ style="color:#000000;fill:#76869e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#9ca8b9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 364.15167,404.71587 -7.35155,3.21506 0.88999,-11.23706 z"
+ id="path4736"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4739"
+ d="m 364.0834,404.82188 5.53339,4.12422 -11.64623,-0.5408 z"
+ style="color:#000000;fill:#7389a6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ style="color:#000000;fill:#5b718f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 364.41607,404.61769 4.47469,-5.59401 1.41569,10.03125 z"
+ id="path4741"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 357.63236,407.82658 3.82485,-3.20383 -3.05634,-5.60159 -1.28179,4.82605 0.0643,-7.67072 6.64316,8.44468 z"
+ id="path4744"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4746"
+ d="m 364.41758,397.90231 -4.80357,-0.62933 4.56918,4.79415 3.80797,-3.37487 -3.41938,6.11061 -6.78538,-8.77726 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ style="color:#000000;fill:#ffffff;fill-opacity:0.71480144;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 363.41216,405.05796 6.20463,3.88814 -8.00064,-0.36449 4.59021,-0.73962 z"
+ id="path4749"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccccccccc"
+ inkscape:connector-curvature="0"
+ d="m 357.58916,396.12177 6.46511,8.72964 6.21787,4.29528 m -13.30953,-1.01327 7.20584,-3.48593 4.34014,-6.05882 m -11.19768,-2.77035 11.65449,2.58313 1.80614,10.96647 -14.30883,-1.04392 z"
+ style="color:#000000;fill:none;stroke:#a5c3e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4751" />
+ </g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/README Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,4 @@
+Theme "Cave"
+Copyright 2011 Guillaume Englert <genglert@hybird.org>
+Distributed under the terms of the GNU FDL licence.
+
Binary file share/hedgewars/Data/Themes/Cave/Sky.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/Sky.svg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,1130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.1 r9760"
+ width="2048"
+ height="1024"
+ version="1.0"
+ sodipodi:docname="Sky.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="Sky.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <sodipodi:namedview
+ inkscape:window-height="824"
+ inkscape:window-width="1434"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="0.19231372"
+ inkscape:cx="812.89662"
+ inkscape:cy="503.17372"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="layer1"
+ borderlayer="true"
+ inkscape:window-maximized="0"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-global="false" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5">
+ <linearGradient
+ id="linearGradient3906">
+ <stop
+ style="stop-color:#16171f;stop-opacity:1;"
+ offset="0"
+ id="stop3908" />
+ <stop
+ id="stop3914"
+ offset="0.5"
+ style="stop-color:#1b1c25;stop-opacity:1;" />
+ <stop
+ style="stop-color:#16171f;stop-opacity:1;"
+ offset="1"
+ id="stop3910" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3893"
+ inkscape:collect="always">
+ <stop
+ id="stop3895"
+ offset="0"
+ style="stop-color:#5f8db9;stop-opacity:1;" />
+ <stop
+ id="stop3897"
+ offset="1"
+ style="stop-color:#c9d9e8;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3159">
+ <stop
+ id="stop3161"
+ offset="0"
+ style="stop-color:#373a4f;stop-opacity:1;" />
+ <stop
+ id="stop3163"
+ offset="1"
+ style="stop-color:#16171f;stop-opacity:1;" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective9"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ gradientTransform="translate(1174.5063,298)"
+ gradientUnits="userSpaceOnUse"
+ y2="372.81586"
+ x2="258.55612"
+ y1="48.890488"
+ x1="258.55612"
+ id="linearGradient3899"
+ xlink:href="#linearGradient3893"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="matrix(1.0934923,0,0,1.0938767,306.09857,327.30667)"
+ y2="98.983925"
+ x2="58.121521"
+ y1="82.656166"
+ x1="53.007065"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4085"
+ xlink:href="#linearGradient4835"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4835"
+ inkscape:collect="always">
+ <stop
+ id="stop4837"
+ offset="0"
+ style="stop-color:#648e37;stop-opacity:1" />
+ <stop
+ id="stop4839"
+ offset="1"
+ style="stop-color:#456226;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(1.0934923,0,0,1.0938767,306.09857,327.30667)"
+ y2="94.281784"
+ x2="115.93511"
+ y1="66.624557"
+ x1="20.18494"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4089"
+ xlink:href="#linearGradient4741"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4741"
+ inkscape:collect="always">
+ <stop
+ id="stop4743"
+ offset="0"
+ style="stop-color:#bd897f;stop-opacity:1" />
+ <stop
+ id="stop4745"
+ offset="1"
+ style="stop-color:#a05f52;stop-opacity:0.98770493" />
+ </linearGradient>
+ <filter
+ inkscape:collect="always"
+ id="filter4854"
+ x="-0.8109796"
+ width="2.6219592"
+ y="-0.90108979"
+ height="2.8021796">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="107.27663"
+ id="feGaussianBlur4856" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3906"
+ id="linearGradient3912"
+ x1="974.36267"
+ y1="-10.111302"
+ x2="974.36267"
+ y2="1017.0178"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3893"
+ id="linearGradient4018"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.83446344,0,0,1,1260.5826,284)"
+ x1="258.55612"
+ y1="48.890488"
+ x2="258.55612"
+ y2="372.81586" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4741"
+ id="linearGradient4024"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0934923,0,0,1.0938767,306.09857,327.30667)"
+ x1="20.18494"
+ y1="66.624557"
+ x2="115.93511"
+ y2="94.281784" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4835"
+ id="linearGradient4026"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0934923,0,0,1.0938767,306.09857,327.30667)"
+ x1="53.007065"
+ y1="82.656166"
+ x2="58.121521"
+ y2="98.983925" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4835"
+ id="linearGradient4125"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.803577,0,0,3.8049141,1282.6499,252.43687)"
+ x1="53.007065"
+ y1="82.656166"
+ x2="58.121521"
+ y2="98.983925" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4741"
+ id="linearGradient4128"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.803577,0,0,3.8049141,1282.6499,252.43687)"
+ x1="20.18494"
+ y1="66.624557"
+ x2="115.93511"
+ y2="94.281784" />
+ <filter
+ inkscape:collect="always"
+ id="filter9928">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="3.6334673"
+ id="feGaussianBlur9930" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter10235">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="2.9201177"
+ id="feGaussianBlur10237" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter10321">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="6.5272507"
+ id="feGaussianBlur10323" />
+ </filter>
+ <mask
+ maskUnits="userSpaceOnUse"
+ id="mask10327">
+ <path
+ sodipodi:nodetypes="scccccccccccccccccccccccccssccccccss"
+ inkscape:connector-curvature="0"
+ id="path10329"
+ d="m 373.5,644.71875 c -1.09587,0.0267 -1.99124,0.654 -2.59375,1.96875 -7.1354,54.14246 2.20765,113.3855 -28.28125,160.75 -32.4702,46.472 -67.4361,105.62635 -131.3125,90.65625 C 165.78967,892.37416 104.5259,911.10792 66.03125,884.40625 46.444733,871.65719 40.759754,847.74653 34.25,826.90625 13.647549,763.42201 -21.62941,680.63034 -37.3125,682.3125 c -8.7219,5.35177 2.137,89.50601 -2.1875,134 7.073,60.4018 -21.78,91.92925 -83.625,68.78125 -16.01508,1.04471 -40.92539,-10.90601 -64.0625,-26.625 l 0,181.15625 c 738.87129,-11.3451 1529.9187,-3.0115 2302.625,1.4688 L 2114.5,884.75 c -9.081,-6.1831 -16.9098,-14.8699 -23,-26.9375 -16.965,-62.9373 -62.3945,-177.47551 -80.8125,-175.5 -8.7219,5.35177 2.137,89.50601 -2.1875,134 7.073,60.4018 -21.78,91.92925 -83.625,68.78125 -33.9201,2.2127 -107.7801,-53.91345 -120.0625,-80.53125 -21.3197,-20.82759 -23.3073,-130.99234 -60.0937,-74.90625 -26.5399,42.37048 -60.4248,76.414 -88.0938,115.5625 -10.1487,55.6226 -140.4326,45.13585 -170.9375,10.09375 -30.4747,-57.3187 -62.248,-176.41448 -77.25,-177.0625 -20.708,-2.00453 -57.2281,86.18578 -67.8125,134.0625 -9.2473,33.1449 -11.1728,81.67295 -56.5312,67.59375 -58.6566,-2.2609 -119.0384,6.07955 -176.2188,-5.78125 -59.7825,-0.053 -74.0118,-66.48491 -90.0312,-111.34375 -2.2183,-20.30411 -8.9538,-50.6385 -17.93755,-51.46875 -7.15213,-0.66098 -28.70175,25.03916 -40.625,50.0625 -5.31863,11.16223 -6.85501,27.93875 -7.875,30.6875 -15.6845,33.10519 -28.3531,82.6356 -73.75,69.625 -61.4404,-2.0078 -123.83335,4.8164 -184.40625,-5.1875 -30.20322,-4.20268 -42.05978,-89.03136 -65.40625,-89.40625 -4.77978,-0.0768 -10.0661,8.45875 -16.0625,16.34375 -12.4327,50.18009 -40.9817,108.40555 -102,73.78125 -74.3648,1.6048 -93.92985,-77.17931 -94.53125,-139.125 -0.17926,-18.46638 -31.15657,-73.63293 -41.75,-73.375 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ </mask>
+ <filter
+ inkscape:collect="always"
+ id="filter3953">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="1.9978304"
+ id="feGaussianBlur3955" />
+ </filter>
+ <mask
+ maskUnits="userSpaceOnUse"
+ id="mask3957">
+ <path
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 1495.2188,188.34375 c -139.9995,50.59427 -258.3086,100.6513 -328.9688,277.5625 l 76.5312,1.96875 a 7.5066683,7.5066683 0 0 0 8.0938,7.65625 c 4.6184,-0.35807 8.9513,-1.87552 13.5312,-2.96875 4.5801,-1.09323 9.3922,-1.2257 9.0626,-1.3125 l 15.6874,4.15625 -7.0312,-14.65625 c -1.6135,-3.36196 -2.7702,-5.34182 -3.4688,-6.59375 -0.6983,-1.25193 -0.9328,-1.63986 -1.5,-3.40625 l -0.125,-0.375 -0.1562,-0.375 c -0.258,-0.58195 -0.3006,-1.35104 0.094,-3.96875 0.3526,-2.34389 1.0269,-6.1362 -0.1563,-10.4375 -0.2104,-4.27876 -1.546,-7.19555 -1.9063,-8.90625 -0.033,-0.157 -0.011,-0.0599 -0.031,-0.1875 0.6172,-0.0768 1.6047,-0.12471 3.25,0.125 2.8542,0.43318 6.3956,1.54847 9.8438,2.34375 l 8.6562,2 0.5,-8.875 c 0.3779,-6.77048 2.5726,-14.65812 4.0938,-21.0625 l 0,-0.0625 0.031,-0.0625 c 0.016,-0.0731 0.017,-0.11577 0.031,-0.1875 3.1063,1.16131 6.2557,2.43746 9.5,3.90625 3.7785,2.74467 7.651,5.45104 11.5626,8.09375 4.8106,5.87307 10.819,11.07715 18.0312,14.46875 l 14.1875,6.65625 -3.7187,-15.21875 c -1.6477,-6.76306 -3.4851,-10.85629 -4.6563,-14.875 l 0,-0.0312 c -0.4984,-2.19879 1.2102,-7.99272 -1.9375,-15.6875 l -0.094,-0.2813 -0.1562,-0.28125 c -0.8463,-1.66927 -0.6096,-5.62053 0.2188,-7.6875 l 0.625,-1.53125 -0.094,-1.625 c -0.041,-0.82682 0.2199,-2.42005 0.5,-4.71875 0.2117,-1.73762 0.4628,-4.14543 -0.25,-6.84375 0.4976,-3.86677 -0.1,-6.94384 -0.2188,-8.96875 -0.089,-1.51525 -0.067,-2.05 0.031,-2.375 0.7869,0.0369 1.8538,0.12043 3.375,0.46875 3.7724,0.86382 8.0461,2.48853 10.4375,3.3125 l 13.875,4.75 -4.25,-14 c -0.2971,-0.98564 -0.5994,-3.5259 -0.4375,-5.71875 0.1619,-2.19285 0.9965,-4.16307 0.9063,-4.03125 1.7491,-2.5211 3.4531,-4.99726 5.1562,-7.46875 2.5766,-1.73989 5.6814,-3.76573 9.1875,-6.46875 1.654,-0.28786 3.676,-0.62224 6.1563,-1.53125 2.5605,-0.93847 5.5992,-2.88814 7.75,-5.84375 0.9625,-0.61764 1.7551,-1.21084 2.375,-1.8125 0.1581,0.35839 0.2453,0.63586 0.5312,1.1875 0.2218,0.42801 0.2727,1.06629 1.8438,2.40625 4.1784,6.43084 9.4858,11.20021 14.125,15.46875 3.1502,3.91709 5.6816,5.98691 7.7187,8.71875 l 0.031,0.0312 0.031,0.0625 c 0.7461,0.96537 2.9819,4.24491 5.3125,7.46875 2.3306,3.22384 4.5595,6.35888 7.5,8.96875 l 17,15.09375 -4.6875,-22.25 c -0.7896,-3.75332 -2.3353,-10.42567 -3.1875,-16.8125 -0.4261,-3.19342 -0.6579,-6.30477 -0.5937,-8.625 0.056,-2.0302 0.5473,-3.41696 0.4687,-3.40625 2.6512,-4.31 5.2907,-8.08506 8.2813,-10.625 l 1.5937,-1.34375 0.6563,-1.96875 c 1.5889,-4.72751 5.1226,-9.26642 9.375,-13.40625 0.022,-0.0212 0.041,-0.0413 0.062,-0.0625 2.4101,-2.23789 6.5834,-3.32451 11.9376,-7.4375 0.072,0.0252 -0.062,0.0182 0.125,0.0625 0.8877,0.21055 2.907,0.87118 5.125,1.4375 2.4567,1.23962 4.6246,1.87382 6,2.34375 1.6007,0.547 2.1793,0.86602 2.75,1.4375 l 0.5,0.5 0.625,0.40625 c 1.3123,0.88246 2.5452,1.71881 3.6874,2.53125 a 7.50075,7.50075 0 0 0 11.5938,-3.40625 c 1.6613,0.39417 3.2536,0.80238 4.9375,1.1875 l 12.1875,3.90625 c -8.1469,-22.45833 -21.5092,-88.4479 -29.6562,-110.90625 z m -17.125,99.9375 0.031,0.0312 c -0.039,0.0293 -0.083,0.006 -0.125,0.0312 0.032,-0.0258 0.062,-0.0365 0.094,-0.0625 z M 1294.375,398.25 c 0.052,0.007 0.1418,0.0401 0.25,0.0937 l 0.1875,0.0937 c -0.3064,-0.0405 -0.492,-0.11601 -0.5,-0.15625 -0.01,-0.0181 0.01,-0.038 0.062,-0.0312 z"
+ id="path3959"
+ inkscape:connector-curvature="0" />
+ </mask>
+ <filter
+ inkscape:collect="always"
+ id="filter3979">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="4.2373666"
+ id="feGaussianBlur3981" />
+ </filter>
+ <mask
+ maskUnits="userSpaceOnUse"
+ id="mask3983">
+ <path
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 1725.5,330.4375 c -15.9672,11.45594 -63.1579,48.26276 -79.125,59.71875 l 10.0938,3 c 0.9666,0.38211 1.8952,0.73886 2.8437,1.09375 a 7.5010416,7.5010416 0 0 0 7.3437,9.4375 c 1.1238,-0.0198 2.3522,-0.0113 3.6563,0 l 0.7187,0 0.7188,-0.125 c 0.3687,-0.0692 0.6348,-0.0732 1.9062,0.28125 1.0481,0.29213 2.8347,0.85309 5.0938,1.1875 1.6075,0.58433 3.0173,1.01318 3.6562,1.21875 1.7672,5.11299 3.8768,7.67937 4.3438,9.875 0.929,4.67179 1.1605,9.17212 0.125,12.8125 l -0.5625,2 0.5625,2 c 0.7842,2.89371 0.8357,6.57423 0.625,10.71875 l 0,0.0312 c -0.02,0.45592 -0.8585,2.63718 -2.75,5.1875 -1.8915,2.55032 -4.4547,5.29044 -6.6875,8.4375 l -7.9375,11.1875 13.6875,0.625 c 2.1016,0.0997 3.4776,0.27719 5.2813,0.25 1.8034,-0.0272 3.8923,-0.41107 5.8124,-1.03125 l 0.063,0 0.062,-0.0312 c 2.4934,-0.85311 5.1732,-1.06562 9.2813,-2.3125 5.0516,-0.72453 10.8514,-1.481 16.7813,-3.9375 0.9672,-0.13083 1.7444,-0.27382 2,-0.46875 0.058,0.15314 0.1837,0.34085 0.25,0.5 0.1576,3.2164 1.4242,6.12013 2.7812,8.03125 1.2614,1.77651 2.4125,2.9363 3.375,3.875 1.0811,3.28422 2.1816,5.97495 3.0625,8.1875 0,2.38399 -0.012,4.77216 0,7.21875 10e-5,0.0106 -10e-5,0.0208 0,0.0312 -0.01,1.22541 -0.3272,3.61039 0.094,6.78125 0.3693,2.78308 2.0591,6.6635 5.25,9.1875 l -0.031,0.0312 c 1.8568,1.72159 3.2946,2.87325 3.75,3.40625 l -0.062,0.65625 0.1875,1.0625 c 0,0.025 0.3023,-0.42438 -0.875,1.09375 -0.9512,1.22655 -2.8522,3.0384 -4.4062,6.03125 -1.7746,1.61749 -2.7173,3.42322 -3.375,4.6875 -0.9115,1.75179 -1.4678,2.87871 -1.75,3.25 l -1,1.28125 L 1730,528.5 c -0.333,1.48663 -1.9277,4.00105 -2.7812,4.46875 l -0.2813,0.15625 -0.25,0.15625 c -6.2065,4.08478 -7.7634,8.97667 -8.7813,9.90625 -1.0687,0.89512 -2.0981,1.82255 -3,3.6875 -0.2203,0.45596 -0.2228,0.92062 -0.3437,1.40625 -0.034,0.0321 -0.024,0.0278 -0.062,0.0625 l -11.6562,10.46875 15.4687,2.5 c 1.9059,0.31017 1.693,0.53684 4.0313,1.34375 1.88,0.64882 4.8476,0.57522 7.75,0.0312 4.0824,0.0368 8.1571,-0.0153 12.1874,-0.125 2.2643,0.40346 4.4683,0.83554 6.5626,1.3125 -1.8635,4.89701 -3.8715,10.59231 -6.4688,14.875 l -4.625,7.59375 8.2812,3.28125 c 2.7975,1.09983 5.6581,1.97034 7.6563,2.9375 0.3026,0.14647 0.3361,0.20908 0.5625,0.34375 -1.0574,0.80588 -2.3952,2.08049 -3.9688,4.03125 -3.166,2.60989 -4.6096,5.76039 -5.4687,7.53125 -0.9447,1.9473 -1.1925,2.16398 -1.2813,2.21875 l -0.3437,0.1875 -0.3125,0.25 c -1.145,0.88802 -1.3487,0.98956 -2.375,1.5 -1.0263,0.51044 -2.8037,1.32063 -5.5,2.875 l -14.0312,8.09375 15.125,5.4375 c -0.3299,0.004 2.691,2.12077 5.0937,4.78125 2.5629,2.83784 4.7481,5.83763 7.9687,8.4375 a 7.50075,7.50075 0 0 0 10.9376,-0.9375 l 60.1874,47.09375 C 1869.3553,522.78082 1819.4398,406.57752 1725.5,330.4375 z m -43.625,74.4375 0.031,0 c 0.01,0.0349 0.021,0.0591 0.031,0.0937 -0.016,-0.0391 -0.05,-0.0535 -0.062,-0.0937 z m 73.6562,160.84375 0.5313,0.0625 c 0.3257,0.0462 0.051,0.21383 -0.5313,-0.0625 z"
+ id="path3985"
+ inkscape:connector-curvature="0" />
+ </mask>
+ <filter
+ inkscape:collect="always"
+ id="filter4005">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="3.96481"
+ id="feGaussianBlur4007" />
+ </filter>
+ <mask
+ maskUnits="userSpaceOnUse"
+ id="mask4009">
+ <path
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:15;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 1193.375,636.28125 c -14.4683,22.45801 -59.4693,85.22935 -73.9375,107.6875 137.1703,63.97399 267.7009,82.07583 450.4375,82.15625 l -36.6875,-52.84375 a 7.50075,7.50075 0 0 0 1.125,-11.40625 c -3.2897,-3.71086 -7.5704,-6.63788 -11.6563,-10 -4.0857,-3.36212 -7.519,-7.47048 -7.5312,-7.5 l -6.1875,-15.0625 -7.4063,14.5 c -1.886,3.68572 -2.8494,6.0412 -3.5,7.53125 -0.6504,1.49005 -0.9075,2.0379 -2.125,3.78125 l -0.2187,0.3125 -0.1875,0.34375 c -0.4801,0.87248 -1.3674,1.54425 -3.9688,2.96875 -2.34,1.28151 -6.0116,3.18025 -8.9062,7 -3.5751,2.97872 -5.2627,6.1424 -6.625,7.71875 -0.4964,0.57438 -0.6046,0.60822 -0.7812,0.75 -0.368,-0.26985 -1.4762,-1.20052 -2.8438,-3.71875 -1.5891,-2.92617 -3.001,-6.88594 -4.5938,-10.4375 l -3.6562,-8.125 -7.4062,5 c -6.3895,4.32207 -14.9071,7.69343 -21.5938,10.65625 l -0.062,0.0312 -0.062,0.0312 c -0.4247,0.19869 -0.6711,0.41867 -1.0312,0.625 -1.2335,-3.95529 -2.3277,-8.03734 -3.3126,-12.375 -0.1105,-5.29577 -0.3286,-10.62679 -0.625,-15.96875 1.9704,-8.18215 2.5448,-16.95883 0.7188,-25.5625 l -3.2812,-15.375 -9.9063,12.21875 c -4.8776,6.01603 -7.2806,10.41546 -10.125,14.25 -1.8338,2.16819 -8.0217,4.55864 -12.5313,12.21875 l -0.1562,0.28125 -0.125,0.25 c -1.0801,2.22899 -4.9725,4.75518 -7.5625,5.46875 l -1.5625,0.4375 -1.25,1.0625 c -0.8168,0.68762 -2.4631,1.56119 -4.6562,2.84375 -1.6772,0.98074 -3.8984,2.35123 -5.7188,4.71875 -3.7426,2.11404 -6.1093,4.73842 -7.9062,6.28125 -2.1528,1.84813 -2.4526,1.99941 -3.4688,1.875 l -1.0625,-0.125 -1.0625,0.1875 c -0.7341,0.12101 -0.4348,0.19667 -1.5312,-0.65625 -1.0967,-0.85292 -2.7577,-2.79566 -5.0626,-5.0625 l -0.031,0.0312 c -3.075,-3.72059 -7.6827,-5.48592 -11.1562,-5.78125 -3.8806,-0.32993 -7.009,0.21828 -8.875,0.3125 -0.01,4e-4 -0.024,-3.8e-4 -0.031,0 -3.4643,0.14825 -6.8866,0.34419 -10.2813,0.5 -3.4079,-1.15165 -7.3531,-2.62155 -12.25,-3.9375 -1.3974,-1.29868 -3.0863,-2.9078 -5.5624,-4.5 -2.5167,-1.61825 -6.1987,-2.9516 -10.1563,-2.8125 -1.647,-0.60554 -3.1496,-1.00251 -4.3437,-1.09375 0.01,-0.0107 -0.01,-0.0205 0,-0.0312 0.3522,-0.67739 0.7089,-1.23607 1.2187,-2.3125 0.223,-0.47079 0.7175,-0.86851 0.8125,-3.125 2.8603,-7.93048 3.554,-15.77531 4.2188,-22.8125 1.402,-5.5293 1.4881,-9.18777 2.5937,-13.03125 l 0,-0.0625 0.031,-0.0625 c 0.6661,-2.47603 0.9495,-4.92566 0.875,-7.15625 -0.075,-2.23059 -0.347,-4.09954 -0.625,-7 l -1.3126,-13.6875 -10.8124,8.5 c -3.884,3.05691 -7.4513,6.75982 -10.9376,9.625 -3.4861,2.86518 -6.6921,4.4817 -8.25,4.625 l -0.031,0 -0.031,0 c -5.6755,0.56126 -10.9257,0.7669 -15.375,-0.21875 l -2.0313,-0.4375 -2,0.65625 c -5.4969,1.85715 -12.0332,1.76454 -18.6875,0.75 -3.9471,-0.67647 -7.8259,-3.80564 -15.25,-5.75 0.012,-0.0459 0.075,-0.047 -0.125,-0.5 -0.4745,-1.07567 -1.203,-3.39461 -2.2812,-5.875 -0.5394,-2.86656 -1.389,-5.15385 -1.9063,-6.71875 -0.6088,-1.84188 -0.7746,-2.72261 -0.625,-3.8125 l 0.094,-0.71875 -0.031,-0.71875 c -0.1005,-1.76637 -0.2008,-3.44519 -0.25,-5.03125 a 7.50075,7.50075 0 0 0 -7.8438,-7.375 7.50075,7.50075 0 0 0 -1.6874,0.28125 c -0.9534,-2.09391 -1.7787,-4.10161 -2.7188,-6.1875 l -4.75,-13.5 z"
+ id="path4011"
+ inkscape:connector-curvature="0" />
+ </mask>
+ <filter
+ inkscape:collect="always"
+ id="filter3966">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="3.076"
+ id="feGaussianBlur3968" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter3978">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.86059225"
+ id="feGaussianBlur3980" />
+ </filter>
+ </defs>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="outside"
+ style="display:inline">
+ <g
+ id="g10152"
+ style="filter:url(#filter10235)">
+ <rect
+ style="color:#000000;fill:url(#linearGradient4018);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect3891"
+ width="375.3299"
+ height="296.39072"
+ x="1319.1602"
+ y="335.63043" />
+ <g
+ style="filter:url(#filter9928)"
+ id="g9898">
+ <path
+ sodipodi:nodetypes="cccccccccccccc"
+ id="path4728"
+ d="m 1677.3449,413.19657 c -6.2517,0.10888 -12.5084,0.33358 -18.6963,0.7609 -1.9922,0.59786 -4.0297,0.85168 -6.0871,1.08699 -40.0351,0.4725 -80.0777,-1.38832 -120.1127,-0.76089 4.0853,17.33935 35.3798,5.63448 34.6751,26.63131 -15.1968,6.64937 -34.1575,0.76611 -50.8713,2.93488 -25.6539,0.007 -51.4138,-0.0971 -77.0677,0 -3.1292,17.23643 25.2124,9.01512 35.3272,16.41359 28.2538,1.32296 56.6799,0.21357 85.0028,0.54349 l 127.0694,0 c 18.31,-9.1076 -21.1105,-10.56863 -26.1965,-16.41358 1.8306,-13.49506 29.3299,-11.32159 41.9579,-14.5657 19.1147,-5.72186 13.4779,-16.49881 -4.1959,-16.66566 -6.9455,-0.0588 -13.8816,-0.0859 -20.8049,0.0348 z"
+ style="fill:#fbfdfe;fill-opacity:0.78688528;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4852"
+ d="m 1704.1936,422.21861 c -6.2725,0.1134 -12.5084,0.33358 -18.6963,0.7609 -1.9922,0.59786 -14.7909,3.02566 -16.8483,3.26097 -40.0351,0.47251 -71.1643,-4.5406 -111.1994,-3.91317 16.5942,8.53882 37.254,7.64791 62.6108,15.43529 2.5664,0.78817 -25.634,7.89574 -26.0878,12.06562 -15.1968,6.64937 -34.1575,0.76611 -50.8713,2.93488 -25.6539,0.007 -51.4138,-0.0971 -77.0677,0 -0.312,1.7195 -0.2644,3.20316 0,4.45667 3.3197,0.55528 11.219,-0.26888 13.37,1.30439 28.2537,1.32296 51.7884,2.06153 80.1113,2.39138 l 121.6345,-1.84789 c 4.3587,-2.16807 8.0037,-1.14549 7.0654,-2.60878 -1.7217,-0.66131 -0.2883,-2.25085 -0.9783,-3.04358 -9.4616,-0.54207 -19.6369,-6.8029 -27.827,-11.19602 1.8307,-13.49505 30.9604,-10.99549 43.5884,-14.2396 3.1993,0.0647 6.432,0.007 9.6742,0 l 0,-5.76106 c -2.8341,0.0104 -5.6505,-0.0511 -8.4785,0 z"
+ style="fill:#bad3f2;fill-opacity:0.78688528;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#f4f8fd;fill-opacity:0.78688528;stroke:none"
+ d="m 1453.2367,501.56335 c 0.668,2.7538 -16.3159,8.37753 -32.0763,5.20587 -17.8236,-3.58687 -27.7025,2.97963 -46.05,1.71247 -0.9597,-0.28801 -28.6093,-0.0844 -49.7482,0.16863 l 1.7463,-36.69332 c 23.6625,1.60164 48.2853,2.91912 65.1225,5.83231 14.1207,2.4432 -15.372,5.17111 -16.2471,10.37013 -1.5379,9.13704 22.1895,6.19504 31.5502,8.59978 15.0849,1.82551 44.5802,0.17712 45.7026,4.80413 z"
+ id="path4823"
+ sodipodi:nodetypes="cscccsscs"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccscsccc"
+ id="path4872"
+ d="m 1327.3965,507.32475 c 20.137,-0.44993 46.7404,-1.08666 47.7279,-0.79031 10.6025,0.73226 18.3922,-1.11164 26.5061,-2.14026 -6.6117,-0.73761 38.5807,2.72215 39.3261,-1.70602 0.2543,-1.51108 -48.6638,-0.87475 -45.348,-2.02201 -10.235,-0.55087 -32.1569,-4.13799 -31.059,-10.66061 0.1342,-0.79744 16.5642,-10.00934 20.9529,-7.21175 -16.6721,1.78458 -38.5097,3.54144 -57.6703,2.07335 l -0.4357,22.45761 z"
+ style="color:#000000;fill:#ccdef6;fill-opacity:0.78688528;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:url(#linearGradient4128);fill-opacity:1;stroke:none"
+ d="m 1572.7915,451.51203 c -3.2912,0.19653 -6.059,2.51803 -6.1808,6.7845 -5.1963,5.95599 -7.2398,15.95375 -16.0463,18.53081 -7.352,2.09109 -17.0454,2.38018 -20.2065,-4.9618 -7.4529,-9.39868 -12.4079,3.09568 -17.235,7.49332 -7.2196,9.40807 -13.8314,19.33222 -17.2349,30.27714 -4.1901,9.19561 -12.6204,14.61864 -23.6535,16.40433 -9.0076,3.86145 -10.1628,14.5009 -18.3047,19.54343 -8.3406,2.27803 -14.8551,7.1017 -23.2969,9.11352 -8.655,3.4055 -17.8139,5.21485 -25.4365,-1.62019 -4.3877,-7.09161 -18.0268,-11.25992 -18.5424,0.10122 -1.0526,7.75803 -10.1799,12.04307 -18.6613,11.44253 -8.0699,1.00637 -15.3892,-3.86092 -23.5347,-2.12647 -3.8872,0.0376 -7.7697,-0.22331 -11.6484,-0.50631 l 0,54.1748 362.2907,0 0,-101.26129 c -4.6323,-5.48109 -10.1509,-10.48351 -15.9275,-15.08794 -8.458,-4.8699 -11.7071,7.51763 -13.5502,12.55641 -0.9783,8.08976 -6.9835,16.53359 -16.5218,17.92323 -9.4946,3.71025 -18.1328,-3.82043 -20.5631,-11.13873 -3.2079,-6.64255 -11.376,-12.74626 -11.2919,-20.35354 -4.2521,-8.23745 -14.055,-13.34256 -18.1858,-21.87241 -6.2569,-7.28869 -9.9273,-16.17417 -18.6613,-21.77119 -2.1798,-2.63994 -5.0473,-3.79824 -7.6072,-3.6454 z"
+ id="path4721" />
+ <path
+ sodipodi:nodetypes="cccccccccccccccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path7550"
+ d="m 1594.875,509.03125 c -7.6119,7.3962 -5.972,30.88537 -16.119,28.70547 -7.1346,-1.23749 -26.4517,-28.37093 -33.1678,-31.06176 -1.0727,7.04665 -0.8418,17.82384 -1.9956,24.87646 -1.038,7.53463 -2.7334,18.62806 -8.3012,24.16054 -6.9648,7.57979 -18.259,7.08728 -28.2125,5.38177 -4.204,-0.56709 -8.2771,-1.80816 -12.2655,-3.21898 -2.3872,11.22141 -10.7308,21.78504 -22.1814,24.56124 -5.0293,1.71325 -9.885,3.94946 -15.0681,5.21991 -8.8412,4.28656 -18.8525,7.40745 -28.7253,5.34282 -6.6577,-1.23568 -13.0261,-4.17692 -18.1497,-8.62407 -4.3789,8.04167 -11.9685,14.42349 -21.0046,16.42479 -8.3066,2.17722 -17.0871,1.52214 -25.3079,-0.73729 -3.1853,-1.04756 -5.9767,0.10196 -9.0226,-0.0999 -6.7246,0.3281 -13.484,0.24927 -20.1826,0.93258 -2.4455,1.30984 -7.3581,-0.39959 -8.4947,1.62884 0.2819,12.15764 0.5638,24.31529 0.8457,36.47293 126.7812,-0.28609 253.5624,-0.57219 380.3436,-0.85828 -3.3193,-30.18165 -10.5386,-76.28779 -13.8579,-106.46944 0.4402,15.47406 -13.0171,28.65882 -22.1371,34.01349 -13.2805,5.50419 -29.8074,4.87508 -41.4235,-4.24493 -3.192,-2.66829 -6.1042,-5.55991 -9.571,-7.87541 -5.7298,-5.27372 -9.8824,-12.13266 -13.3491,-18.98169 -1.6764,-2.61199 -1.7756,-5.93035 -3.225,-8.52239 -4.0201,-5.12532 -7.6247,-10.70793 -9.4272,-17.02672 z"
+ style="fill:#75483e;fill-opacity:0.28158845;stroke:none" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:url(#linearGradient4125);fill-opacity:1;stroke:none"
+ d="m 1678.5785,559.56478 c -0.903,0.13357 -1.3917,1.13663 -0.7132,3.686 -1.2324,8.94997 3.9593,24.13582 -6.6562,28.18017 -7.6534,-0.63641 -9.8492,-20.54861 -17.5916,-11.89038 0.9935,5.36279 -0.901,18.93743 -7.8448,10.58244 -5.7071,-5.60332 -9.2949,-14.91399 -18.899,-13.31721 -6.0479,1.62934 -14.8408,-7.22497 -17.5916,-5.58846 5.2579,6.37332 -1.0514,18.09569 -9.1523,11.77145 -7.1743,-5.30814 -12.2777,-13.02986 -21.6329,-14.98185 -7.7358,-5.8371 -15.6284,-0.89388 -13.0748,8.20434 -1.182,6.15043 0.4831,14.22419 -8.4392,13.19831 -5.7367,1.2206 -12.6785,-2.57626 -14.3822,4.39942 -6.8647,4.33158 -11.0929,-2.99989 -12.0051,-8.32323 -5.7434,-2.58812 -15.1377,-1.67961 -13.3125,-10.70133 -5.7244,-6.87091 -11.758,2.96462 -14.5011,7.49092 -1.9691,7.29294 -10.5083,9.57208 -16.7596,6.89641 -6.675,-4.31566 -14.942,-3.1311 -22.1082,-6.5397 -6.996,-0.21635 -14.0337,-9.09964 -20.4443,-4.39945 -6.145,4.56586 7.648,8.65702 -0.5943,12.00927 -9.1441,2.08434 -18.1856,-2.74267 -26.625,-5.58847 -8.5199,-1.80642 -18.6353,-4.4576 -25.3176,2.97259 -6.8948,6.87358 -17.8517,10.2163 -26.9816,6.0641 -4.4179,-5.59622 -13.6758,-3.57877 -16.5218,3.84367 -4.8542,-0.4045 -9.4095,0.99683 -14.62,-3.24915 l 0,37.87825 362.2907,0 0,-59.87543 c -3.4508,-3.23298 -7.3035,-5.96872 -11.0541,-8.79886 -1.1773,-1.83394 -3.9627,-4.14657 -5.4677,-3.92382 z"
+ id="path4825"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#b7d696;fill-opacity:0.23104691;stroke:none"
+ d="m 1678.5785,559.56478 c -0.903,0.13357 -1.3917,1.13663 -0.7132,3.686 -1.2324,8.94997 3.9593,24.13582 -6.6562,28.18017 -7.6534,-0.63641 -9.8492,-20.54861 -17.5916,-11.89038 0.683,3.6869 0.014,11.30535 -2.7338,12.9605 4.1381,2.7659 6.9961,7.89946 10.6976,11.53367 6.9439,8.35498 8.8383,-5.21966 7.8449,-10.58244 7.7423,-8.65823 9.9381,11.25394 17.5915,11.89037 10.6155,-4.04434 5.4238,-19.2302 6.6563,-28.18016 -0.6786,-2.54937 -0.19,-3.55233 0.7131,-3.686 0.2188,-0.0313 0.4494,0.0536 0.7132,0.11896 l 0,-1.30794 c -3.4508,-3.23301 -7.3035,-5.96875 -11.0541,-8.79886 -1.1773,-1.83394 -3.9627,-4.14661 -5.4677,-3.92382 z m -107.0944,5.94517 c -4.6739,0.17427 -7.8176,4.4463 -6.062,10.70133 -1.182,6.15043 0.4831,14.22419 -8.4392,13.19831 -5.7367,1.2206 -12.6785,-2.57626 -14.3822,4.39942 -4.2551,2.68495 -7.5606,0.88121 -9.6278,-2.14025 0.6539,5.90534 8.4058,5.46415 13.4313,7.72871 0.9123,5.32338 5.1405,12.65485 12.0051,8.32327 1.7038,-6.97568 8.6455,-3.17882 14.3822,-4.39945 8.9223,1.02591 7.2572,-7.04789 8.4392,-13.19828 -2.5536,-9.09822 5.339,-14.04144 13.0748,-8.20434 9.3552,1.95199 14.4586,9.67367 21.6329,14.98185 8.1009,6.32421 14.4102,-5.39816 9.1523,-11.77145 2.7509,-1.63654 11.5438,7.2178 17.5916,5.58846 1.2881,-0.21427 2.4745,-0.26192 3.5658,-0.11896 -0.1593,-0.17427 -0.3106,-0.27723 -0.4754,-0.47563 -5.7071,-5.60332 -9.2949,-14.91399 -18.899,-13.31721 -6.0479,1.62938 -14.8408,-7.22497 -17.5916,-5.58846 5.2579,6.37332 -1.0514,18.09569 -9.1523,11.77145 -7.1743,-5.30814 -12.2777,-13.02986 -21.6329,-14.98185 -2.4174,-1.82406 -4.8883,-2.57623 -7.0128,-2.49695 z m -58.48,6.89644 c -4.2406,0.0797 -8.1648,6.47426 -10.2221,9.86898 -1.9691,7.29294 -10.5083,9.57208 -16.7596,6.89641 -6.675,-4.31566 -14.942,-3.1311 -22.1082,-6.5397 -6.996,-0.21635 -14.0337,-9.09964 -20.4443,-4.39945 -6.145,4.56586 7.648,8.65702 -0.5943,12.00927 -9.1441,2.08434 -18.1856,-2.74267 -26.625,-5.58847 -8.5199,-1.80642 -18.6353,-4.4576 -25.3176,2.97259 -6.8948,6.87358 -17.8517,10.2163 -26.9816,6.0641 -4.4179,-5.59622 -13.6758,-3.61755 -16.5218,3.80489 -4.8542,-0.40447 -9.4095,1.03561 -14.62,-3.21037 l 0,21.87825 15.8086,0 0,-7.96656 c 5.2105,4.24602 9.7659,2.92483 14.62,3.32933 2.846,-7.42244 12.1039,-9.52004 16.5218,-3.92385 9.1299,4.15224 20.0869,0.80949 26.9816,-6.06406 6.6823,-7.43023 16.7978,-4.77901 25.3176,-2.97259 8.4394,2.8458 17.4809,7.67281 26.625,5.58847 8.2423,-3.35229 -5.5507,-7.44341 0.5943,-12.00927 6.4106,-4.70019 13.4483,4.18292 20.4443,4.39945 7.1662,3.40856 15.4332,2.22404 22.1083,6.53969 6.2512,2.67564 14.7904,0.3965 16.7595,-6.89643 2.4002,-3.96052 7.3343,-11.93295 12.3616,-9.27447 -0.1322,-0.49323 -0.2758,-0.95557 -0.3566,-1.42682 -5.7434,-2.58812 -15.1377,-1.67961 -13.3125,-10.70133 -1.4311,-1.71773 -2.8655,-2.40467 -4.279,-2.37806 z"
+ id="path4889" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4833"
+ d="m 1689.3516,577.94892 c -0.9029,0.13367 3.3612,12.54747 4.0397,15.09686 -1.2325,8.94996 3.0087,16.84553 -7.6068,20.88988 -7.6534,-0.63641 -15.2358,-18.6468 -26.1467,-23.93514 0.9934,5.36277 3.8518,26.86161 -3.092,18.50662 -5.7071,-5.60332 -12.7804,-21.57031 -22.3845,-19.97353 -2.162,10.69931 -10.3053,-5.19689 -13.7892,-5.2715 5.2578,6.37331 -1.3683,24.43504 -9.4693,18.11081 -7.1742,-5.30815 -20.5159,-25.3916 -29.8711,-27.3436 -2.3492,7.79253 -1.6867,12.10182 0.8669,21.20003 -1.182,6.15042 -6.1709,1.54547 -15.0932,0.51958 -5.7367,1.22061 -11.7279,9.46854 -13.4317,16.44422 -6.8646,4.33158 -11.0928,-2.99989 -12.005,-8.32325 -5.7434,-2.58811 -22.4254,-7.38502 -20.6002,-16.40675 -5.7244,-6.87089 -4.4703,8.67005 -7.2135,13.19635 -1.969,7.29293 -7.0228,19.71504 -13.274,17.03938 -6.6751,-4.31564 -22.2298,-16.12679 -29.396,-19.53538 -6.996,-0.2165 -7.6966,-10.3675 -14.1071,-5.6673 -6.1451,4.56585 5.1131,12.77756 -3.1292,16.12984 -9.1441,2.08434 -18.1856,-2.74268 -26.625,-5.58847 -4.8256,-1.02314 -8.1365,6.83266 -13.5129,5.84189 -4.1158,-0.75849 -10.4915,-11.16257 -13.389,-7.94079 1.7291,14.1732 -15.0097,16.35244 -25.3973,11.13557 -4.4179,-5.5962 -13.9927,-3.26178 -16.8387,4.16065 -2.2317,-0.18598 -10.8505,-9.60231 -16.5637,-10.14503 -6.7135,-0.63775 -10.3047,4.74484 -12.9485,4.67709 l 1.2674,19.97644 373.0638,0.83033 3.1686,-40.90212 c -2.8775,-10.28717 -5.1875,-12.5116 -16.5218,-12.72268 z"
+ style="fill:#212f12;fill-opacity:0.38934428;stroke:none"
+ sodipodi:nodetypes="ccccccccccccccccccccscccsccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#e7d5d2;fill-opacity:0.27459017;stroke:none"
+ d="m 1572.7915,451.48146 c -3.2912,0.19652 -6.059,2.511 -6.1808,6.77747 -5.1963,5.95599 -7.2398,15.9719 -16.0463,18.54896 -7.352,2.0911 -17.0454,2.34801 -20.2065,-4.99394 -7.4529,-9.39867 -12.4079,3.09325 -17.235,7.49093 -7.2196,9.40807 -13.8314,19.37549 -17.2349,30.32041 -4.1901,9.19561 -12.6204,14.62299 -23.6535,16.40868 -9.0076,3.86145 -10.1628,14.45766 -18.3047,19.50019 -8.3406,2.27802 -14.8551,7.14375 -23.2969,9.15557 -8.655,3.40551 -18.2161,4.76821 -25.8387,-2.06679 -4.3877,-7.09161 -17.6246,-10.84014 -18.1402,0.52111 -1.0526,7.75803 -10.1799,12.13417 -18.6613,11.53366 -8.0699,1.00633 -15.3892,-3.87473 -23.5347,-2.14027 -3.8872,0.0376 -7.7697,-0.31167 -11.6484,-0.59453 l 0.4402,13.75308 c 3.8787,0.28279 20.7524,0.31514 24.6396,0.27758 8.1455,-1.73446 15.4648,3.1466 23.5347,2.14024 8.4813,0.60054 12.539,-12.9677 13.5916,-20.72569 0.5156,-11.36121 26.8289,1.78346 31.2167,8.87511 7.6225,6.83501 14.2466,2.41549 22.9015,-0.99002 8.4418,-2.01182 9.8867,-3.90594 18.2272,-6.18396 8.142,-5.04253 3.5938,-25.58366 12.6013,-29.44507 11.0332,-1.78573 34.3558,14.34071 38.5458,5.1451 3.4035,-10.94491 -0.1242,-34.26457 7.0955,-43.67264 3.8781,-3.53312 2.5701,-9.68137 7.1329,-8.90117 6.2659,1.07144 14.8611,19.00625 18.6662,25.60353 1.7369,-6.06951 -14.3046,-26.82398 -13.256,-26.17231 8.3892,4.64774 31.1712,13.22423 38.5232,11.13314 8.8066,-2.57706 -3.7253,-21.78503 1.471,-27.74102 0.1217,-4.26647 4.7907,0.0755 8.0819,-0.12105 14.456,19.46196 2.7726,-1.67651 -5.8242,-9.7501 -2.1798,-2.63991 -5.0473,-3.83884 -7.6072,-3.686 z m 102.1023,47.20468 c -5.3937,0.59849 -7.7737,9.57994 -9.2712,13.67392 -0.9783,8.08976 -6.9835,16.56479 -16.5218,17.95443 -1.2495,0.48829 -6.1852,1.91063 -10.2674,0.24749 -5.1537,-2.09972 -12.9866,-10.80793 -15.3643,-11.31454 3.0098,5.01587 15.53,19.86492 18.9469,22.63865 5.987,4.86 10.6215,5.57478 20.1162,1.86453 9.5383,-1.38964 14.5929,-10.34013 15.5712,-18.42989 1.8431,-5.03874 -2.4331,-23.45639 6.0249,-18.58653 6.5352,6.23541 -1.7201,-4.32505 -4.9555,-6.9779 -1.5858,-0.91311 -3.0343,-1.20825 -4.279,-1.07016 z"
+ id="path4843"
+ sodipodi:nodetypes="ccccccccccccccccccccccccscccccccccccscsccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4850"
+ d="m 1695.1003,514.9016 c -4.6323,-5.48108 -10.1509,-10.48351 -15.9275,-15.08794 -8.458,-4.8699 -11.7071,7.51764 -13.5502,12.55638 -0.9783,8.08976 -6.9835,16.53362 -16.5218,17.92327 -2.6501,1.03559 -7.6464,0.96564 -10.0467,0.49881 m 7.8133,4.48115 c -8.1527,-2.92923 -16.5777,-10.84308 -18.3297,-16.11873 -3.2079,-6.64251 -11.376,-12.74623 -11.2919,-20.3535 -4.2521,-8.23749 -14.055,-13.34257 -18.1858,-21.87245 -6.2569,-7.28866 -9.9273,-16.17413 -18.6613,-21.77115 -2.1798,-2.63995 -5.0473,-3.79825 -7.6072,-3.64541 -3.2912,0.19653 -6.059,2.51803 -6.1808,6.7845 -5.1963,5.95599 -7.2398,15.95375 -16.0463,18.53081 -5.4155,1.5403 -12.0439,2.27522 -16.4537,-0.4696 m 14.1903,22.11849 c -3.0498,-8.36657 -15.9121,-24.27737 -17.9431,-26.61069 -7.4529,-9.39868 -12.4079,3.09568 -17.235,7.49332 -7.2196,9.40807 -13.8314,19.33222 -17.2349,30.27714 -4.1901,9.19561 -12.6204,14.61864 -23.6535,16.40433 -9.0076,3.86145 -10.1628,14.5009 -18.3047,19.54343 -8.3406,2.27803 -14.8551,7.1017 -23.2969,9.11352 -8.655,3.4055 -17.8139,5.21485 -25.4365,-1.62019 -4.3877,-7.09161 -18.0268,-11.25992 -18.5424,0.10122 -0.7862,7.06698 -10.6861,12.19887 -19.0377,11.36348 -1.8352,-0.18357 -2.5369,0.002 -6.9773,3.64099 m 4.8833,-3.44704 c -8.0699,1.00637 -12.9188,-3.97582 -21.0643,-2.24137 -3.8872,0.0376 -7.7697,-0.22331 -11.6484,-0.50631"
+ style="fill:none;stroke:#53312b;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ sodipodi:nodetypes="cccccccccccccccccccccccscccc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4993"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1433.4873,510.72526)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1421.1299,515.79676)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path4995"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4997"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1419.0703,509.29891)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1451.3897,520.07582)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path4999"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5001"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1460.5785,512.62706)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1487.1945,518.49097)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5003"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5005"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1453.4493,499.47288)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1511.5924,494.87687)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5007"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5009"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1514.4441,504.86134)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1506.5227,511.20071)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5011"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5013"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1408.6141,519.60037)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1397.0488,502.16713)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5015"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5017"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1386.4341,509.61586)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1375.1857,518.96643)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5019"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5021"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1367.898,509.77437)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1357.2833,518.17402)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5023"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5025"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1349.2035,507.2386)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1346.5102,518.01551)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5027"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5029"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1344.609,503.11801)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1328.2909,505.81226)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5031"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5033"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1327.8157,518.3325)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1316.4088,515.00432)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5035"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5037"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1304.0514,522.45309)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1295.3378,512.15163)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5039"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5041"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1285.04,518.17402)" />
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccccccccccccccc"
+ id="path5067"
+ d="m 1695.1003,572.28746 c -3.4508,-3.23298 -7.3035,-5.96872 -11.0541,-8.79886 -1.1773,-1.83394 -3.9627,-4.14657 -5.4677,-3.92382 -0.903,0.13357 -1.3917,1.13663 -0.7132,3.686 -1.2324,8.94997 3.9593,24.13582 -6.6562,28.18017 -7.6534,-0.63641 -9.8492,-20.54861 -17.5916,-11.89038 0.9935,5.36279 -0.901,18.93743 -7.8448,10.58244 -5.7071,-5.60332 -9.2949,-14.91399 -18.899,-13.31721 -6.0479,1.62934 -14.8408,-7.22497 -17.5916,-5.58846 5.2579,6.37332 -1.0514,18.09569 -9.1523,11.77145 -7.1743,-5.30814 -12.2777,-13.02986 -21.6329,-14.98185 -7.7358,-5.8371 -15.6284,-0.89388 -13.0748,8.20434 -1.182,6.15043 0.4831,14.22419 -8.4392,13.19831 -5.7367,1.2206 -12.6785,-2.57626 -14.3822,4.39942 -6.8647,4.33158 -11.0929,-2.99989 -12.0051,-8.32323 -5.7434,-2.58812 -15.1377,-1.67961 -13.3125,-10.70133 -5.7244,-6.87091 -11.758,2.96462 -14.5011,7.49092 -1.9691,7.29294 -10.5083,9.57208 -16.7596,6.89641 -6.675,-4.31566 -14.942,-3.1311 -22.1082,-6.5397 -6.996,-0.21635 -14.0337,-9.09964 -20.4443,-4.39945 -6.145,4.56586 7.648,8.65702 -0.5943,12.00927 -9.1441,2.08434 -18.1856,-2.74267 -26.625,-5.58847 -8.5199,-1.80642 -18.6353,-4.4576 -25.3176,2.97259 -6.8948,6.87358 -17.8517,10.2163 -26.9816,6.0641 -4.4179,-5.59622 -13.6758,-3.57877 -16.5218,3.84367 -4.8542,-0.4045 -9.4095,0.99683 -14.62,-3.24915"
+ style="fill:none;stroke:#2f441a;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1272.5242,514.68737)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5043"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5045"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1516.6621,521.34369)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1531.5544,509.61586)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5047"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5049"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1534.4061,515.63825)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1539.4758,505.17832)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5051"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1552.9422,519.44189)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5055"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5057"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1558.1704,506.92165)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1562.7648,498.04654)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5059"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5061"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1569.894,514.52886)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1582.093,510.09132)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5063"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5065"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1587.638,518.80796)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1597.1437,507.08013)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5069"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5071"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1621.5417,497.57108)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1625.6608,500.74079)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5073"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5075"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1614.8877,518.80796)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1626.6114,521.34369)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5077"
+ style="color:#000000;fill:#263615;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5079"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1527.1184,497.88807)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1520.4644,490.91476)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5081"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5083"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1502.7205,503.59347)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1508.7407,517.2231)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5085"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5087"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1488.7788,510.56678)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1472.6191,513.10252)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5089"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5091"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1462.1628,502.64259)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1443.4683,508.03104)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5093"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5095"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1446.0031,494.40141)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1409.8815,502.64259)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5097"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5099"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1397.2072,516.90612)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1388.9689,499.78987)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5101"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5103"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1372.1756,515.95524)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1356.6496,503.59347)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5105"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5107"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1341.7573,507.08013)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1334.4696,517.2231)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5109"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5111"
+ sodipodi:cx="77.283951"
+ sodipodi:cy="74.04261"
+ sodipodi:rx="2.5918398"
+ sodipodi:ry="1.6493526"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ transform="matrix(0.80984715,0,0,1.1971287,1320.8448,511.51766)" />
+ <path
+ transform="matrix(0.80984715,0,0,1.1971287,1296.13,520.70976)"
+ d="m 79.875791,74.04261 a 2.5918398,1.6493526 0 1 1 -5.18368,0 2.5918398,1.6493526 0 1 1 5.18368,0 z"
+ sodipodi:ry="1.6493526"
+ sodipodi:rx="2.5918398"
+ sodipodi:cy="74.04261"
+ sodipodi:cx="77.283951"
+ id="path5113"
+ style="color:#000000;fill:#9cc76f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ </g>
+ </g>
+ <g
+ style="display:inline"
+ inkscape:label="main"
+ id="layer2"
+ inkscape:groupmode="layer">
+ <g
+ id="g3925"
+ style="filter:url(#filter3966)">
+ <path
+ style="fill:url(#linearGradient3912);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m -1640,0 c 0,341.33333 0,682.66667 0,1024 682.66667,0 4445.3333,0 5128,0 0,-341.33333 0,-682.66667 0,-1024 -682.6667,0 -4445.33333,0 -5128,0 z m 3165.6875,397.125 c 10.1973,-3.50781 22.1809,4.61438 33.5093,7.81419 21.4952,6.07153 41.9538,14.83997 52.2225,29.46116 14.1212,8.06254 28.6978,24.18945 36.7716,42.38667 5.9838,13.48676 -1.4515,28.81756 4.4029,41.43173 5.7308,12.34785 -10.3014,39.7237 -8.7801,56.72272 -15.6945,32.28603 -43.1098,19.84591 -71.1887,35.21395 -31.2729,10.63151 -64.1186,10.75802 -97.7499,7.00388 -23.3193,-8.29782 -54.2602,-19.47636 -60.4768,-45.30861 -1.526,-6.34087 2.8492,-13.71187 0.3696,-21.84549 -4.6066,-15.11078 -10.4774,-27.30455 -8.9718,-41.31115 2.1119,-19.6467 9.2071,-40.18143 18.3211,-57.11686 1.9292,-3.58487 6.7023,-4.49749 9.7801,-6.98184 12.8012,-10.33298 22.8164,-22.85264 34.6198,-30.94033 8.9123,-6.10674 18.749,-7.0198 31.7646,-7.89072 8.7512,-0.58558 16.1483,-5.45479 25.4058,-8.6393 z"
+ id="rect2387"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccsscsscccssssssss" />
+ <path
+ inkscape:connector-curvature="0"
+ style="color:#000000;fill:#191a22;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:50;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 3468.2188,567.125 c -1.4845,0.0418 -2.7099,2.12499 -2.7813,7.5 -0.2854,21.50003 2.5319,-7.36174 2.7813,10.34375 0.01,0.36894 -0.024,0.7098 -0.031,1.0625 10.3351,-3.57247 4.1474,-19.02222 0.031,-18.90625 z"
+ id="path5186" />
+ <path
+ inkscape:connector-curvature="0"
+ mask="url(#mask3983)"
+ id="path5607"
+ d="m 1654.5938,392.59375 a 12.501914,12.501914 0 0 0 12.1562,16.09375 c 1.0197,-0.0179 2.1795,-0.0115 3.5,0 l 1.2188,0 0.5937,-0.125 c 0.06,0.0189 -0.026,0.0168 0.25,0.0937 0.7862,0.21914 2.6995,0.79844 5.2187,1.21875 0.3905,0.13032 0.6055,0.22491 0.9063,0.3125 1.7135,4.38013 3.2247,6.16957 3.4063,6.9375 0,0.006 0.03,0.0254 0.031,0.0312 0.8382,4.2447 0.8949,7.91917 0.1875,10.40625 l -0.9375,3.34375 0.9062,3.34375 c 0.5287,1.9507 0.649,4.99551 0.4688,8.84375 -0.027,-0.44471 -0.337,0.90731 -1.75,2.8125 -1.6667,2.24732 -4.2269,4.89972 -6.7812,8.5 l -13.2188,18.65625 22.8438,1.0625 c 2.0133,0.0955 3.3812,0.28335 5.5937,0.25 2.2125,-0.0333 5.0436,-0.52728 7.2813,-1.25 l 0.094,-0.0312 0.094,-0.0625 c 1.7673,-0.60465 4.3649,-0.90248 8.4688,-2.09375 4.1464,-0.59031 9.0917,-1.15103 14.4688,-2.90625 0.6974,1.95478 1.5439,3.74156 2.4374,5 1.1631,1.63787 2.2376,2.81287 3.125,3.71875 0.902,2.57527 1.7067,4.71281 2.4063,6.40625 5e-4,2.04542 -0.01,4.09643 0,6.21875 1e-4,0.032 -2e-4,0.0618 0,0.0937 -0.015,0.86652 -0.3699,3.44025 0.1563,7.40625 0.4546,3.42764 2.7298,8.65107 6.875,12.15625 l -0.094,0.0937 c 0.7136,0.66165 0.5923,0.5514 1.0938,1 -0.9611,1.05497 -2.0352,2.33606 -3.3126,4.71875 -1.8849,1.97567 -2.9744,3.9684 -3.625,5.21875 -0.9033,1.73623 -1.3766,2.59426 -1.3437,2.59375 l -1.5937,2.09375 -0.5938,2.65625 c -0.077,0.3426 -1.3241,1.7417 -0.3125,1.1875 l -0.4375,0.25 -0.4375,0.25 c -8.0103,5.27191 -9.6943,10.66935 -9.4063,10.40625 -1.3101,1.09191 -2.7543,2.35286 -4.125,5.1875 -0.1316,0.27253 -0.1742,0.58774 -0.2812,0.875 l -18.4062,16.5 25.7812,4.1875 c 1.2854,0.20919 0.1329,0.0601 3.2188,1.125 2.2152,0.76452 5.7572,0.73129 9.125,0.3125 4.0135,0.0393 7.9639,-0.0237 11.9062,-0.125 0.098,0.0176 0.1839,0.0448 0.2812,0.0625 -1.2596,3.18036 -2.538,6.22354 -3.9374,8.53125 l -7.6876,12.6875 13.7813,5.40625 c 0.47,0.18478 0.6466,0.26937 1.0937,0.4375 -2.9112,3.01288 -4.2604,6.13371 -4.9687,7.59375 -0.3509,0.72338 -0.3555,0.75563 -0.375,0.8125 l -0.125,0.0937 c -0.9151,0.70975 -0.6146,0.48166 -1.5313,0.9375 -0.9165,0.45584 -2.9374,1.4231 -5.7812,3.0625 l -23.4062,13.5 24.5937,8.8125 c -1.3086,-0.34971 1.6394,1.28473 3.7813,3.65625 2.4476,2.71031 4.3485,5.62359 8.5312,9 a 12.511124,12.511124 0 0 0 17.7188,-2.03125 l -9.875,-7.71875 c -1.7778,-1.43505 -2.7331,-3.55832 -3.8438,-5.53125 -1.1108,-1.97293 -4.6433,-1.42644 -7.0312,-2.28125 -2.3186,-1.50809 -7.7019,-3.62174 -6.9376,-5.25 2.9865,0.0381 11.1214,-4.24575 11.4376,-6.28125 3.9355,-0.68732 3.7533,-3.07876 4.0937,-5.3125 0.9803,-2.02046 1.9232,-4.08303 3.9063,-5.46875 3.5733,0.99363 4.4394,-2.11229 5.1874,-4.9375 1.7328,-1.65583 2.9642,-3.46415 2.1876,-6 -0.7552,-2.45818 -1.4634,-4.06796 -4.75,-3.65625 0.2908,-4.28641 -6.716,-3.89408 -9.6563,-4 -0.075,-2.01331 7.1099,-5.78203 4.75,-9.34375 3.7785,-1.84953 2.0724,-2.9071 3,-5.3125 2.3917,-0.62784 3.5085,-3.27991 3.3437,-5.03125 0.8014,-1.30551 0.3998,-3.11075 -2.5624,-3.53125 -2.3124,-0.76791 1.4979,-5.09536 -0.875,-5.625 -1.2898,-0.28784 -1.9549,-2.79572 -3.0626,-3 -0.9303,-0.1716 -2.3007,1.94438 -3.4062,1.75 -2.1505,0.0627 -4.0106,-0.30078 -5.8438,-1.65625 0.8075,2.30062 -3.2497,4.77767 -5.9374,2.15625 -0.074,0.77143 -1.418,1.21528 -3.125,1.46875 -0.5885,0.0874 -1.5202,-2.70482 -2.1563,-2.65625 -0.5366,0.041 -0.7912,2.94774 -1.3125,2.96875 -1.2781,0.0515 -2.4373,0.0583 -3.1562,0.0625 -3.064,-3.17964 -8.7676,-0.20739 -11.5938,-0.46875 -0.2531,-1.8186 4.2581,-7.3274 7.0312,-7.65625 1.2601,-0.14943 1.6383,0.11616 2.4063,0.71875 -0.1497,-1.19195 -0.3588,-1.8425 0.2813,-2.5 0.5956,-0.61185 1.7882,-2.60179 3,-2.15625 1.0904,0.40092 1.5823,-0.31068 2.7812,1.375 -0.3083,-1.8104 -0.4273,-2.7175 -0.125,-3.4375 0.3857,-0.91872 1.9769,0.34161 2.625,-0.59375 0.4872,-0.70303 1.1805,-3.73 2.2188,-3.5625 1.4257,0.23001 2.3001,-0.0786 3.125,0.3125 -0.2518,-2.22224 -3.5258,-6.94932 1.5,-6.40625 -1.7574,-2.07124 0.4306,-0.85813 1.9062,-2.3125 0.1553,-1.61355 -0.7594,-3.67051 2.4062,-4.3125 -1.8522,-4.81822 1.0498,-3.27257 2.75,-3.3125 -1.0704,-3.85938 -2.8207,-4.29111 -0.062,-5.375 1.5708,-2.02565 1.2557,-4.15249 0.7812,-6.9375 0.2563,-2.21194 -0.5691,-3.88855 -1.8125,-5.34375 -2.4676,-0.29906 -5.4536,-0.27903 -4.3125,-4.03125 -3.2323,-0.79943 -4.5508,-2.39339 -2.9062,-4.6875 -0.254,-1.9144 -0.033,-4.02181 -0.031,-5.84375 -0.01,-1.4428 0,-2.90091 0,-4.34375 5e-4,-1.44283 0,-2.86968 0,-4.3125 -0.6288,-1.70262 -1.3569,-3.34037 -2.0625,-5.09375 -0.7055,-1.75339 -1.3958,-3.61768 -2,-5.75 -1.2336,-1.2907 -2.7116,-2.61866 -3.7812,-4.125 -1.0697,-1.50635 -1.719,-3.19197 -1.3438,-5.25 -0.8766,-1.45501 -0.8542,-3.94054 -1.25,-5.84375 -0.3958,-1.90321 -1.2279,-3.24493 -3.8125,-2.40625 -1.3974,-0.11883 -2.9927,0.68878 -4.2187,1.40625 -2.3371,-1.13414 -3.4619,1.9462 -2.875,2.21875 -4.1915,0.0284 -5.7481,2.36504 -7.5626,3.78125 -2.5142,-2.22032 -5.182,-4.25615 -8.375,-1.03125 -2.2257,-1.14998 -4.2264,-1.20821 -5.7812,1.03125 -1.9364,-0.39422 -2.9896,0.0831 -4.9062,2.75 -3.0812,-1.59244 -5.9671,0.42172 -7.1563,0.625 -1.2476,0.1472 0.6035,-1.03039 2.2187,-2.6875 4.0472,-1.99332 6.934,-4.15642 4.0313,-7.75 3.0511,-2.20179 5.2154,-4.96982 3.7813,-8.59375 2.9706,-2.48674 1.1301,-4.47505 0.094,-6.5625 3.0373,-3.14826 -0.066,-4.48802 -0.9687,-6.5 0.083,-2.73659 2.8143,-5.45092 0,-8.1875 0,-2.73659 0.01,-5.48216 0,-8.21875 -0.4958,-2.33081 -1.4445,-4.24163 -2.4376,-6.125 -0.9929,-1.88338 -2.0208,-3.74938 -2.6562,-5.96875 -0.5456,-1.62178 -1.8648,-2.45539 -3.4375,-3.0625 -0.3226,-0.96431 0.3846,-2.05188 -4.9063,-1.625 -0.814,-2.18646 -3.3499,-0.70617 -5,-1.15625 -1.6461,-0.45885 -3.3239,-0.80502 -5.2812,-0.4375 -0.6398,-0.006 -0.954,-0.4971 -1.5938,-0.5 -0.6397,-0.003 -4.454,0.363 -5.0937,0.375 -2.5895,-1.23578 -4.8212,-1.95857 -7.2187,-2.90625 l -1.875,-0.5625 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#5c5f7d;fill-opacity:0.11913356;stroke:none;stroke-width:25;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3979);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ mask="url(#mask3957)"
+ inkscape:connector-curvature="0"
+ id="path5641"
+ d="m 1480.6875,280.65625 c -0.7588,-0.0207 -1.0063,0.56542 -1.5,0.9375 -1.9965,-0.47347 -3.9302,-0.53068 -5.5937,0.71875 -2.1649,1.78633 -4.4573,2.92121 -6.75,4.125 -2.2928,1.20371 -4.5861,2.47476 -6.6876,4.46875 -1.8925,2.73489 -3.7421,5.47726 -5.625,8.21875 -4.7081,0.80587 -3.8566,5.42017 -5.6562,8.21875 -2.2907,1.39459 -6.2892,0.60086 -5.4062,5.84375 -2.4767,1.37838 -5.7087,2.09069 -4.4376,6.625 -3.9331,2.64401 -2.061,6.69576 0.4063,11 -3.2065,2.86855 -0.766,9.52354 1.4687,11.46875 -0.4952,2.77104 1.7522,11.12413 1.75,14.3125 -1.0539,-1.02155 -6.3425,-11.94493 -10.5312,-12.46875 -0.089,-3.98989 -3.6911,-9.06311 -5.9062,-10 -0.02,-3.31283 -2.7556,-6.24618 -5.7813,-6.625 -0.9865,-5.42675 -3.7921,-6.15134 -7.8437,-5.65625 -0.8472,-2.66672 -1.4056,-3.55748 -5.5938,-6.46875 0.7766,0.13055 1.7828,-3.68502 -1.3438,-4.15625 -0.7371,-1.56197 -1.7966,-3.50169 -3.2812,-4.34375 -2.0176,-2.61781 -3.7619,-1.85315 -5.4688,-0.21875 -1.7068,1.6344 -3.4001,4.14529 -5.2812,5 -1.0394,2.31977 -2.8586,3.57035 -4.9688,4.34375 -2.1101,0.77339 -4.4985,1.05543 -6.625,1.5 -2.0736,1.72059 -4.0541,3.1037 -5.9687,4.375 -1.9147,1.27123 -3.7598,2.44555 -5.5625,3.71875 -0.9927,1.4454 -1.9765,2.89799 -2.9688,4.34375 -0.9927,1.44542 -2.5597,2.65524 -3.5624,4.09375 -1.2516,1.82658 -1.9279,5.81937 -3.5,7.5625 0.072,3.42934 2.5113,5.98055 3.3124,9.84375 -2.2106,-0.10544 -6.0154,-3.92997 -10.0312,-6.0625 -2.3502,-1.24801 -5.5407,-1.01529 -6.5312,-1.53125 -2.2495,0.60262 -4.2042,1.73282 -5.4688,4.125 -2.3926,2.46365 -2.6208,5.45279 -2.4375,8.5625 2.0232,2.98293 3.73,6.1199 0,9.25 1.6794,1.20943 5.6745,1.63455 0.5,5.1875 2.7362,2.82037 0.3918,4.27675 -0.5625,6 0.4807,2.47186 1.8143,5.79 -1.375,6.65625 5.419,2.91259 -1.1246,5.38439 -2.9062,7.4375 1.0971,0.17545 1.7541,1.09354 3.3437,1.84375 1.1576,0.54632 -0.2241,4.05438 -0.2187,5.09375 0.01,1.38278 2.4636,1.22061 2.2187,2.40625 -0.1919,0.92921 -0.9136,1.7109 -2.4687,3.3125 2.3633,-0.86412 2.3482,0.21419 3.7187,0.5625 1.523,0.38704 1.3543,3.19616 1.5313,4.21875 0.1901,1.09892 -0.4672,1.62762 -1.4376,2.71875 1.1856,-0.0755 2.951,-0.63699 2.9063,0.90625 -0.138,4.7694 2.5544,11.42373 1.7813,12.5 -3.0171,-1.68197 -6.674,-8.57805 -11.9376,-7.5 -0.4131,-7.52995 -9.0878,-7.8605 -8.5312,-8.53125 2.5928,-8.51866 -6.0213,-5.60268 -4.4688,-6.25 -2.7728,0.0971 -4.9155,-0.83312 -7.0312,-2.375 -3.1997,-5.75851 -4.6758,-2.83355 -7.3438,-3.1875 -2.7465,-1.10144 -5.5253,-2.11644 -8.375,-2.9375 -3.2631,-1.61615 -4.8749,-0.10897 -4.9687,1.75 -0.094,1.85897 0.2478,5.47463 -0.1563,7.34375 -0.7238,3.04769 -2.3116,2.08969 -0.625,7.40625 -4.8196,1.94501 -0.148,10.45005 0,12.875 -3.0245,-1.91616 -11.4365,-7.40041 -14.0937,-2.90625 -3.0271,0.31189 -4.8319,-1.56824 -7.2813,0.375 -2.5243,2.00627 -2.5376,4.71199 -1.9374,7.5625 -1.193,3.34473 -2.4897,7.03771 1.7812,8.5 1.0373,2.75207 0.5936,5.45794 0.1875,8.15625 -1.1952,2.47186 -3.0091,4.7297 0.4687,8.125 -1.083,2.25662 4.1321,12.14044 7.1563,14.15625 -0.3529,2.15691 -7.2286,0.58382 -10.5937,0.5 -2.9854,-0.786 -6.1525,-3.74373 -8.625,-2.53125 -2.4725,1.21255 -4.9156,2.69129 -7.6876,2.90625 l -13,-0.34375 A 12.50125,12.50125 0 0 0 1251.25,480.5 c 5.8492,-0.45351 9.8994,-2.00913 14.3125,-3.0625 4.4131,-1.05337 9.1647,-0.67508 6.625,-1.34375 l 26.1563,6.875 -11.6876,-24.375 c -1.6871,-3.51548 -3.0175,-5.73016 -3.6562,-6.875 -0.6387,-1.14484 -0.6155,-1.01076 -1.0938,-2.5 l -0.1874,-0.625 -0.031,-0.0312 c 0.024,-0.1267 0.066,-0.59248 0.25,-1.8125 0.3315,-2.20257 1.0884,-6.57851 -0.1875,-11.8125 -0.044,-0.79416 -0.034,-1.65952 -0.125,-2.34375 1.7268,0.43981 3.1213,0.76625 5.2188,1.25 l 14.4687,3.34375 0.8125,-14.8125 c 0.2477,-4.43808 1.4458,-9.71926 2.6875,-14.875 1.1898,0.51147 2.3588,1.00519 3.5937,1.5625 3.5098,2.54235 7.08,5.06555 10.7188,7.53125 5.1101,6.06145 11.414,11.4676 19.125,15.09375 l 23.6562,11.125 -6.1874,-25.375 c -1.722,-7.06847 -3.5884,-11.3145 -4.6563,-14.90625 -0.069,-0.56954 1.748,-6.78558 -2.1875,-16.40625 l -0.1875,-0.46875 -0.2187,-0.4375 c 0.1157,0.22832 0.015,-2.61669 0.4062,-3.59375 l 1,-2.53125 -0.125,-2.71875 c -6e-4,-0.013 0.1568,-1.31563 0.4688,-3.875 0.2074,-1.70243 0.4634,-4.33625 -0.125,-7.4375 0.226,-1.9877 0.2346,-3.56125 0.125,-5 2.4109,0.74477 4.9717,1.53279 6.7812,2.15625 l 23.0938,7.96875 -7.0626,-23.40625 c -0.036,-0.1183 -0.3405,-2.22497 -0.2187,-3.875 0.088,-1.18631 0.5287,-2.1705 0.4063,-2.09375 1.4324,-2.07052 2.7993,-4.10628 4.1874,-6.125 2.0909,-1.37667 4.6664,-3.15279 7.6563,-5.375 1.5596,-0.28027 3.4292,-0.69732 5.875,-1.59375 2.2704,-0.83213 5.0192,-2.47489 7.4687,-4.75 4.3713,6.31707 9.4799,10.89691 13.75,14.8125 3.3271,4.10147 5.7673,6.18769 7.375,8.34375 l 0.063,0.0937 0.062,0.0937 c 0.4911,0.63542 2.8626,4.00997 5.25,7.3125 2.3876,3.30253 4.4786,6.49285 8.2188,9.8125 l 28.3125,25.15625 -7.7813,-37.0625 c -0.8166,-3.88173 -2.3157,-10.40384 -3.125,-16.46875 -0.4046,-3.03245 -0.6148,-5.91908 -0.5624,-7.8125 0.025,-0.89967 0.2169,-1.51318 0.2812,-1.75 2.366,-3.76091 4.5923,-6.81897 6.7188,-8.625 l 2.6562,-2.25 1.0938,-3.28125 c 1.2047,-3.58437 4.1275,-7.53575 8.0624,-11.375 0.01,-0.005 0.026,0.005 0.031,0 1.223,-1.14561 4.4753,-2.14021 9.5,-5.65625 0.5907,0.21032 1.4289,0.41136 2.5313,0.71875 2.7429,1.31715 5.0663,2.03383 6.1562,2.40625 0.6146,0.21 0.8196,0.27962 0.9062,0.3125 l 0.75,0.75 1,0.6875 c 1.3259,0.89149 2.536,1.68515 3.5938,2.4375 a 12.50125,12.50125 0 0 0 19.5938,-6.21875 l -0.1563,-0.0625 c -3.0589,-0.69957 -5.8002,-1.51949 -9.25,-2.0625 -2.33,-1.71071 -4.1107,-3.97874 -6.7813,-4.46875 -1.712,-1.71437 -3.6566,-2.5462 -5.625,-3.21875 -1.9661,-0.68402 -3.4909,-3.88053 -5.8124,-2.25 -2.5089,-2.0333 -3.7725,-2.66679 -4.5313,-2.6875 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#5c5f7d;fill-opacity:0.11913356;stroke:none;stroke-width:25;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3953);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5194"
+ d="m 1431.1875,419.09375 c -1.2464,0.0134 -2.436,0.17013 -3.5625,0.5 -24.6147,10.34418 -31.6942,-3.77423 -61.6562,2.4375 -13.7276,2.84599 -21.9602,7.20747 -43.1876,15.625 -29.6235,8.60694 -27.4269,7.08054 -52.3124,8 -18.034,0.66632 -50.6906,19.1481 -79.8438,20.34375 -25.0107,1.02575 -55.815,-5.91235 -72.6562,-0.9375 -36.6345,4.52898 -67.7761,13.89083 -84.75,1.625 -20.9023,0.4755 -42.92573,17.31911 -73.62505,8.25 -25.40904,9.9161 -34.73402,-1.68002 -52.21875,-8.875 -19.22498,-9.1037 -49.04749,8.80547 -82.375,7.03125 -39.0758,11.20103 -70.81245,-4.33621 -108.59375,-4.78125 -42.22906,6.32569 -64.54708,11.23967 -84.28125,-1.21875 -36.20541,-2.66774 -60.77217,-21.31823 -101.59375,-8.1875 -33.68441,18.948 -60.25579,-4.9504 -85.8125,-3.1875 -29.71493,19.81515 -73.91502,-10.44454 -96.875,5.6875 -30.82893,-1.1545 -60.10813,-1.76463 -79.65625,2.84375 -35.73721,-5.38656 -41.93264,36.90832 -76.46875,27.28125 -19.52306,-10.46872 -71.46579,-13.24171 -91.375,-11.125 -25.422413,-8.3006 -58.579857,19.39646 -76.8125,13.125 -22.3153092,12.92246 -43.716309,-16.10802 -57.6875,-15 -13.159141,4.73689 -37.991063,-1.12589 -41.84375,-7.375 -2.845748,2.02509 -4.69395,2.53604 -0.125,1 -15.279837,5.93406 -5.150904,0.38436 -25.625,6.59375 -27.85318,-8.04566 -45.97176,-3.49184 -72.78125,-1.90625 -17.47852,18.96595 -14.14285,33.42095 -13.71875,45.34375 -9.80762,2.92202 65.03557,-4.47084 98.0625,-3.65625 21.145199,-7.40863 15.176026,0.88921 47,-5.96875 32.384983,0.96644 78.235731,3.14736 102.625,-1.34375 19.287433,2.94882 43.09656,13.2264 82.40625,10.59375 23.26389,1.67529 59.38533,4.50847 94.28125,-3.40625 33.85716,-6.84253 52.95799,-13.47394 77.125,1.9375 36.40296,11.97492 54.87661,-25.61794 73.25,-22.21875 19.13389,1.78907 50.59941,5.07828 69.21875,10.78125 23.86754,20.28599 68.6162,-0.52563 103.6875,5.15625 36.4594,-3.96395 23.16521,-5.59997 57.21875,-9.5 21.27934,-0.60607 63.15388,15.102 83.65625,18.4375 33.39738,-10.05935 53.52962,4.74256 89.09375,-14 18.75232,-7.96931 53.33443,3.72595 87.5,1 19.18459,-15.49458 41.0613,-16.55032 81.46875,-14.625 20.84712,0.99332 40.58298,-10.96719 75.34375,0.25 33.5937,13.75329 45.1568,-5.77924 78,-0.34375 20.991,3.47398 30.0606,-4.24535 53.8437,-1.125 30.1446,3.95498 35.0297,-6.97012 59.9376,-13.5 16.2916,-4.27106 42.7689,-14.97461 62.5,-17.65625 33.5829,-4.56424 26.9432,-4.9948 55.3124,-21.375 16.3886,-9.46263 40.6079,-5.82136 52.5938,-9.9375 8.4068,-2.88704 30.1435,0.34141 45.9062,6 4.307,-3.99732 8.3886,-8.05705 12.4376,-11.9375 -7.9836,-2.68529 -16.2891,-6.7288 -23.0313,-6.65625 z M -76,471.15625 c 3.058001,-2.17613 7.274826,-6.09674 6.03125,-11.125 L -76.5,469.25 c -0.0791,0.63482 0.106917,1.26866 0.5,1.90625 z M 1664.9062,424.6875 c -3.9317,0.0716 -8.5879,0.42605 -14.7812,1.0625 -14.3344,1.47304 -33.6555,-1.35569 -41.9688,0.90625 -0.7378,0.15852 -1.6255,0.5094 -2.5937,1 2.1984,2.10146 4.1555,4.34616 5.8437,6.75 2.8843,1.64675 5.7934,3.63774 8.6563,5.90625 1.3129,-0.58723 2.9407,-1.37065 5.0937,-2.46875 17.2317,-7.35757 58.5757,12.21419 76.7188,4.71875 27.1039,2.03375 23.1383,4.58412 48.9375,13.5625 17.0353,5.92848 39.8981,11.12669 64.3437,16.96875 13.383,3.19823 35.2827,6.05068 49.8126,16.3125 26.9465,19.0313 43.5701,30.06137 92.8437,29.125 21.1452,-7.40863 15.2075,0.88921 47.0313,-5.96875 32.3849,0.96644 78.2357,3.14736 102.625,-1.34375 19.2874,2.94882 43.0965,13.2264 82.4062,10.59375 11.6319,0.83764 26.4548,1.97865 42.75,1.90625 7.2916,-0.0324 14.8773,-0.32303 22.5938,-0.96875 l 0,-30.3125 c -4.5307,0.88591 -9.5745,0.73682 -15.4688,-0.90625 -19.523,-10.46872 -71.4968,-13.24171 -91.4062,-11.125 -25.4223,-8.3006 -58.5798,19.39646 -76.8126,13.125 -22.3153,12.92246 -43.685,-16.10802 -57.6562,-15 -8.3127,2.64845 -34.9615,-3.44775 -42,-6.375 -7.6698,-3.18977 -5.1509,0.38436 -25.625,6.59375 -12.9604,-3.64982 -21.2745,0.65296 -40.1562,-9.90625 -5.9865,-3.34779 -11.8029,-8.1101 -25.4063,-8.9375 -10.6253,-0.64627 -29.3405,-10.86058 -38.7187,-14.3125 -18.3344,-6.74849 -41.5025,-5.69578 -56.7188,-6.90625 -22.1613,-9.67425 -16.1963,1.41933 -46.5312,-6.84375 -33.4254,-5.70274 -37.5198,0.0953 -48.9376,-3.03125 -10.9867,-3.00854 -16.2251,-4.28248 -24.875,-4.125 z"
+ style="color:#000000;fill:#474a61;fill-opacity:0.05054154;fill-rule:evenodd;stroke:none;stroke-width:50;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ mask="url(#mask4009)"
+ id="path5645"
+ d="m 1202.2812,650.625 a 12.50125,12.50125 0 0 0 -3.5,0.6875 c 1.1437,2.64527 2.2017,5.23612 3.75,8.125 0.026,0.87092 -0.2337,6.06741 -0.1874,6.9375 0.046,0.87009 0.7309,1.25511 0.7812,2.125 -0.3688,2.6861 0.2072,4.97787 0.9375,7.1875 0.7187,2.2155 -1.1099,5.75254 1.9063,6.71875 -0.2294,7.22443 1.2034,6.18589 2.5312,6.5625 0.9263,2.10009 2.1729,3.83121 4.4062,4.46875 3.049,0.72114 5.6327,2.02076 8.25,3.25 2.6173,1.22937 5.2468,2.41343 8.4376,2.9375 3.7084,-0.16346 7.4171,-0.35474 11.125,-0.53125 3.8934,3.65161 7.4226,-0.24184 11.125,-0.53125 2.7855,1.09839 4.7785,5.20952 8.8437,0.875 2.8967,1.27511 5.733,3.66988 8.9063,-0.53125 5.0046,1.71711 8.593,-1.4265 11.375,-5.71875 5.0604,3.71658 7.8162,-0.33502 10.25,-5.96875 2.1386,-2.30408 3.6171,-4.89403 3.5,-3.1875 -0.197,1.63071 -2.7672,5.66168 -0.4063,9.75 -3.4869,2.77919 -4.0369,4.23521 -3.375,6.84375 -2.9317,2.25935 -2.7362,5.0153 -1.0313,7.96875 -4.1587,4.55126 -1.2366,8.0358 1.9376,11.3125 -1.7992,2.5595 -4.8319,4.82797 -4.5938,10.53125 -0.408,-0.78061 -4.5033,0.95664 -2.8125,4.0625 -0.8912,1.71393 -1.8782,3.95062 -1.625,5.84375 -0.9658,3.56977 0.8952,4.58438 3.5,5 2.6048,0.41562 5.9708,0.21396 8,1.3125 2.7637,-0.64311 5.1072,0.1735 7.2187,1.53125 2.1116,1.35775 3.9824,3.24901 5.8126,4.84375 2.9289,0.68432 5.484,1.52845 7.9062,2.375 2.4222,0.84669 4.7141,1.72325 7.0625,2.46875 1.9549,-0.0931 3.9201,-0.18751 5.875,-0.28125 1.9549,-0.0931 3.8882,-0.20179 5.8437,-0.28125 2.4685,-0.12024 5.2957,-0.56577 7.9063,-0.34375 2.9998,-2.38502 5.2973,-0.72014 6.5937,3.625 5.0086,-1.79419 5.1508,2.31901 5.7188,5.65625 2.0537,1.59746 4.3637,2.6163 7.3438,2.125 3.8047,0.4658 6.6403,-1.38879 9.2812,-3.65625 1.2866,-3.82186 2.9191,-7.45707 8.2188,-6.25 -0.058,-2.31539 -2.3692,-6.17741 4.2812,-3.96875 0.661,-4.34738 3.5115,-3.24718 5.6875,-3.5625 1.8732,-2.10098 3.9215,-5.50689 6.8437,-3.25 -1.0673,-6.80127 5.535,-2.66779 8.5626,-2.46875 -0.5844,-1.0967 -0.2193,-2.29416 -0.625,-4.21875 -0.2955,-1.40153 3.7671,-2.54194 4.6874,-3.25 1.2246,-0.9419 -0.563,-3.0411 0.6563,-3.625 0.9556,-0.45764 2.1518,-0.30259 4.625,0 -2.363,-1.52206 -1.3849,-2.2614 -2,-3.71875 -0.6836,-1.61946 1.8978,-3.40038 2.6875,-4.25 0.8486,-0.9131 1.7502,-0.62675 3.375,-0.5 -0.8671,-1.0058 -1.2443,-1.52632 -1.125,-3.25 0.2626,-3.79343 7.3943,-10.25822 9.875,-10.03125 0.5406,3.82745 -3.104,11.7562 1.4062,15.71875 -0.1766,3.93808 0.6125,13.06255 -1.8124,13.375 3.729,3.48683 0.6391,9.16875 -2.5313,8.21875 1.9575,2.40603 2.5681,4.94576 2.625,7.875 0.7367,3.26649 1.2196,5.49381 2.0937,8.6875 0.8742,3.19355 1.8696,6.373 3.0626,9.46875 0.7651,4.00232 3.1902,4.42417 4.9062,3.25 1.716,-1.17417 4.6907,-3.93923 6.625,-4.84375 3.1979,-1.41691 3.4117,0.66331 7,-4.4375 4.9815,2.9803 11.986,-9.90966 14.7188,-9.9375 0.3375,3.99268 -2.1323,16.42217 3.6562,15.75 2.3199,2.48734 1.8696,5.35019 5.25,6.21875 3.4871,0.8928 5.9021,-0.88006 8.0312,-3.34375 3.7786,-1.19969 7.9258,-2.57841 6.3438,-7.375 1.7467,-2.78674 4.4522,-4.22373 7.125,-5.6875 3.004,-0.6071 6.2659,-0.50869 6.9375,-5.90625 2.737,-0.5614 7.9987,-11.90899 7.75,-15.96875 2.1557,-1.14479 5.3975,6.03731 7.5937,9.09375 1.3158,3.19298 0.8161,8.0538 3.5626,9.4375 2.7463,1.38356 5.6883,2.54946 7.75,4.875 l 7.4687,10.78125 a 12.50125,12.50125 0 0 0 1.875,-19.0625 c -4.1084,-4.63436 -8.2658,-7.27827 -12.2187,-10.53125 -3.9531,-3.25298 -6.9507,-7.64196 -6.0938,-5.5625 l -10.3125,-25.09375 -12.375,24.15625 c -1.9636,3.83706 -3.0234,6.4346 -3.625,7.8125 -0.6016,1.3779 -0.5741,1.40132 -1.625,2.90625 l -0.375,0.5625 -0.1563,0.28125 c -0.076,0.0219 -0.5602,0.37601 -2.1562,1.25 -2.2059,1.208 -6.4466,3.41967 -10.0312,7.875 -1.4169,1.19988 -2.5481,2.32748 -3.4376,3.375 -1.0222,-2.26638 -2.0067,-4.6509 -3.3124,-7.5625 l -6.0938,-13.5625 -12.3438,8.3125 c -4.663,3.15438 -10.8839,5.89596 -16.7812,8.46875 -0.5059,-1.96124 -1.0226,-3.94056 -1.5,-6.03125 -0.1078,-4.92718 -0.2946,-9.88866 -0.5625,-14.875 1.9707,-8.58121 2.5163,-17.79421 0.5625,-27 l -5.4375,-25.625 -16.5,20.34375 c -5.0824,6.2686 -7.5638,10.7659 -10.125,14.25 -0.7833,0.83895 -7.3974,3.37965 -12.9687,12.84375 l -0.25,0.4375 -0.2188,0.4375 c -0.1539,0.31754 -2.9196,2.44278 -4.375,2.84375 l -2.6562,0.71875 -2.0626,1.78125 c -0.193,0.1626 -1.5486,0.92849 -3.9687,2.34375 -1.6565,0.96868 -4.1217,2.48415 -6.375,5.0625 -4.193,2.47929 -6.5163,5.22168 -7.9687,6.46875 -0.598,0.5134 -0.49,0.49733 -0.5313,0.59375 l -0.8437,-0.0937 -0.031,0 c -0.6545,-0.62587 -1.7873,-1.85562 -4.0313,-4.0625 l -0.094,0.0937 c -4.0991,-4.58769 -10.0859,-6.90128 -14.1875,-7.25 -4.7132,-0.40072 -8.0202,0.23239 -9.5,0.3125 -0.013,7e-4 -0.051,-6.2e-4 -0.062,0 -3.1415,0.1346 -6.2024,0.26351 -9.25,0.40625 -2.7924,-0.97879 -6.2891,-2.13813 -10.5,-3.34375 -1.3097,-1.21825 -2.9291,-2.65721 -5.4063,-4.25 -2.461,-1.58259 -6.1265,-2.99577 -10.1562,-3.4375 0.023,-0.25708 0.018,-0.63092 0.031,-0.9375 2.8778,-8.41361 3.5505,-16.3966 4.1876,-23.15625 1.3148,-5.47978 1.5007,-9.05443 2.375,-12.09375 l 0.031,-0.0937 0.031,-0.0937 c 0.7528,-2.79729 1.1507,-6.01861 1.0626,-8.65625 -0.088,-2.63764 -0.3865,-4.49962 -0.6563,-7.3125 L 1303,659.09375 1285,673.25 c -4.3215,3.40137 -7.8059,7.06233 -11,9.6875 -3.1941,2.62517 -5.7929,3.55244 -5.5625,3.53125 l -0.031,0 -0.062,0 c -5.5348,0.54737 -10.2327,0.66109 -13.7813,-0.125 l -3.4063,-0.75 -3.3124,1.125 c -4.3434,1.46741 -10.0599,1.47348 -16.2813,0.53125 -2.2441,-0.39566 -5.4983,-2.78763 -12.125,-4.875 -0.3056,-0.9462 -0.8399,-2.26872 -1.5937,-4 -0.6476,-3.00762 -1.4959,-5.35202 -1.9063,-6.59375 -0.5278,-1.59673 -0.4097,-1.53675 -0.4063,-1.5625 l 0.1563,-1.21875 -0.062,-1.1875 c -0.1015,-1.78413 -0.2041,-3.42409 -0.25,-4.90625 a 12.50125,12.50125 0 0 0 -13.095,-12.28125 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#5c5f7d;fill-opacity:0.11913356;stroke:none;stroke-width:25;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4005);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5184"
+ d="m 1613.4375,598.78125 c -5.1934,1.23246 -10.6934,2.07531 -16.3437,3.1875 2.6188,3.23284 6.2341,6.70823 9.8437,10.71875 12.9692,14.40974 31.2765,31.77338 40.5625,41.9375 14.4031,15.76517 19.0437,23.14316 40.0938,32.59375 21.0499,9.45059 34.2724,13.40681 54.8124,34.96875 8.4017,8.81964 60.0642,36.58744 81.875,39.5625 20.0732,2.738 38.6657,14.94245 56.5938,19.71875 43.8347,11.67819 36.3381,17.87055 63.5,23.71875 27.3915,0.4006 41.9144,4.38165 64.8438,2.09375 22.9293,-2.2879 55.3638,-12.02628 84.5624,-7.75 10.176,1.4903 20.738,2.77385 31.4376,3.59375 l 0,-32.5625 c -22.1396,0.0325 -44.443,0.0516 -59.6876,2.0625 -22.1631,2.92362 -43.4889,-2.91908 -64.75,-8.65625 -7.651,-2.06457 -18.524,1.61809 -26.1874,0 -20.1133,3.25001 -23.9386,-0.7653 -40.5626,-4.46875 -15.7826,-3.63643 -31.1031,0.94842 -48.5,-3.90625 -12.1105,-3.37951 -29.5209,-26.44933 -40.375,-24.53125 -26.4456,4.67341 -37.2479,-20.49105 -62.4062,-20.625 -25.1583,-0.13395 -28.4323,-16.15482 -54.0625,-15.59375 -25.6302,0.56107 -47.9883,-29.89983 -60.4375,-43.78125 -9.1476,-10.20004 -24.457,-26.53721 -40.1562,-40.34375 -4.9033,-4.31213 -9.8994,-8.46015 -14.6563,-11.9375 z m -174.4375,2.75 c -6.877,10.44961 -15.7921,26.67998 -21.6875,31.125 -10.8387,8.17215 -24.377,18.47761 -46.9375,26.84375 -22.5605,8.36614 -30.2448,35.90482 -55.875,35.34375 -25.6302,-0.56107 -28.9042,15.4598 -54.0625,15.59375 -25.1583,0.13395 -35.9605,25.29841 -62.4063,20.625 -26.4457,-4.67341 -59.1052,13.55089 -85.875,19.71875 -26.7697,6.16786 -34.1266,22.52864 -60.1874,14.4375 -26.0609,-8.09114 -57.33847,14.30739 -87.0313,15.1875 -29.69283,0.88011 -55.62989,-12.62543 -81.3125,-14.09375 -25.68261,-1.46832 -35.89697,2.9325 -65.65625,10.5 -29.75928,7.5675 -77.69895,-18.86644 -110.0625,-10.90625 -32.36355,7.96019 -55.87864,20.71364 -85.3125,10.6875 -29.43386,-10.02614 -58.8243,-10.81453 -90.46875,-1.65625 -31.64445,9.15828 -53.81622,-32.31798 -85.125,-22.375 -31.30878,9.94298 -65.94184,-4.13041 -95.6875,4.65625 -29.74566,8.78666 -48.58159,-1.9528 -77.84375,0.28125 -29.26216,2.23405 -53.4451,30.56862 -80.84375,13.9375 -27.39865,-16.63112 -56.22475,-1.7809 -86.03125,-1.09375 -29.806496,0.68715 -66.899155,-0.64237 -89.0625,2.28125 -22.1633448,2.92362 -43.488861,-2.91908 -64.75,-8.65625 -7.651026,-2.06457 -15.305249,-4.13197 -22.96875,-5.75 -7.771548,-0.67091 -27.273093,-0.93496 -39.15625,0.15625 -26.19989,1.81673 -41.11997,-9.30902 -61.8125,0.1875 -20.69254,9.49652 -2.97375,33.89445 -12.5,46.8125 -9.52625,12.91806 37.00604,-0.81674 80.03125,-0.1875 27.391473,0.4006 41.914415,4.38165 64.84375,2.09375 22.929335,-2.2879 55.363566,-12.02628 84.5625,-7.75 29.198934,4.27628 61.53175,7.0117 91.375,1.15625 29.84325,-5.85545 58.56684,17.72366 85.78125,3.40625 27.21441,-14.31741 56.92779,-11.07203 85.125,-4.8125 28.19721,6.25953 54.52139,-4.31674 82.28125,2.53125 27.75986,6.84799 50.21577,4.61451 77.40625,15.46875 27.19048,10.85424 56.28443,-16.86511 83.40625,-17.25 27.12182,-0.38489 42.33529,5.09362 68.125,-4.4375 25.78971,-9.53112 56.64586,15.27546 86.25,14.46875 29.60414,-0.80671 43.06543,6.09468 70.53125,-6.78125 27.46582,-12.87593 65.67672,9.80116 93.5,-0.65625 27.82328,-10.45741 56.76088,-23.93865 82.75,-8.71875 25.98912,15.2199 45.59919,-10.62664 70.7813,-2.28125 25.182,8.34539 48.4764,3.55461 77.6562,5.8125 29.1798,2.25789 48.0764,-26.07925 70.9375,-18.1875 22.8611,7.89175 25.4078,-14.52494 47.2187,-17.5 21.811,-2.97506 34.633,-29.82101 64.4063,-29.21875 29.7733,0.60226 30.3563,-15.92441 51.4063,-25.375 21.05,-9.45059 42.0031,-28.32857 56.4062,-44.09375 14.4031,-15.76518 27.9634,-14.85168 36.9062,-30.71875 7.5262,-13.35351 17.0118,-13.43599 20,-25.9375 -3.0918,-1.5014 -6.134,-3.12398 -9.0312,-4.875 z"
+ style="color:#000000;fill:#000000;fill-opacity:0.08664258;fill-rule:evenodd;stroke:none;stroke-width:50;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="light effect"
+ style="display:inline">
+ <path
+ transform="matrix(1.3588291,0,0,1.0727572,993.316,281.1721)"
+ inkscape:connector-curvature="0"
+ id="path3921"
+ d="m 410.1875,71.6875 c -14.92121,1.389029 -29.05118,11.074914 -44.36154,6.728644 -16.35744,-0.75165 -27.72854,13.381322 -42.14123,18.63586 -9.18177,8.892916 -15.14801,20.927286 -27.54652,26.164706 -15.47509,12.16199 -23.40886,30.90645 -30.98836,48.46621 -5.01813,14.79229 -3.76916,30.76041 -8.34801,45.63346 -3.23971,14.95439 -1.3388,31.13691 7.13288,44.07502 3.88973,13.63806 2.02879,28.93106 11.27859,40.7614 6.26101,13.31085 13.58496,28.67276 28.99829,33.02362 15.46178,4.22574 29.18731,12.68573 44.2291,17.50826 14.4643,6.0795 30.01112,4.57218 45.24169,4.53728 15.15316,-0.6626 29.92831,-2.84837 45.11645,-0.79326 14.68403,-1.93487 26.2329,-14.14157 41.55015,-14.75168 13.49749,0.40951 25.6807,-7.30404 39.14286,-8.13339 15.36022,-2.90144 21.72583,-17.50024 28.66848,-29.20552 10.45308,-9.21696 12.92111,-22.36026 14.27962,-35.38304 2.8995,-13.22149 9.98757,-25.70249 10.34538,-39.33999 -3.33867,-21.51246 -2.30394,-45.04082 -15.79116,-63.46256 -9.4313,-14.11719 -15.14946,-31.25703 -27.80975,-42.91835 C 518.25758,112.40388 508.38564,99.094489 491.88869,97.309337 479.07651,89.986048 465.97452,83.436817 451.75403,79.3974 441.06001,76.777223 429.97785,77.315162 419.72106,72.936959 416.60435,72.166561 413.40414,71.671917 410.1875,71.6875 z m 17.5625,6.34375 c -0.38872,1.177191 -0.7782,-0.856468 0,0 z M 324,337.8125 324.21875,338.09375 324,337.8125 z"
+ style="fill:#ffffff;fill-opacity:0.43354432;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4854);enable-background:accumulate" />
+ <path
+ style="fill:#ffffff;fill-opacity:0.43354432;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4854);enable-background:accumulate"
+ d="m 410.1875,71.6875 c -14.92121,1.389029 -29.05118,11.074914 -44.36154,6.728644 -16.35744,-0.75165 -27.72854,13.381322 -42.14123,18.63586 -9.18177,8.892916 -15.14801,20.927286 -27.54652,26.164706 -15.47509,12.16199 -23.40886,30.90645 -30.98836,48.46621 -5.01813,14.79229 -3.76916,30.76041 -8.34801,45.63346 -3.23971,14.95439 -1.3388,31.13691 7.13288,44.07502 3.88973,13.63806 2.02879,28.93106 11.27859,40.7614 6.26101,13.31085 13.58496,28.67276 28.99829,33.02362 15.46178,4.22574 29.18731,12.68573 44.2291,17.50826 14.4643,6.0795 30.01112,4.57218 45.24169,4.53728 15.15316,-0.6626 29.92831,-2.84837 45.11645,-0.79326 14.68403,-1.93487 26.2329,-14.14157 41.55015,-14.75168 13.49749,0.40951 25.6807,-7.30404 39.14286,-8.13339 15.36022,-2.90144 21.72583,-17.50024 28.66848,-29.20552 10.45308,-9.21696 12.92111,-22.36026 14.27962,-35.38304 2.8995,-13.22149 9.98757,-25.70249 10.34538,-39.33999 -3.33867,-21.51246 -2.30394,-45.04082 -15.79116,-63.46256 -9.4313,-14.11719 -15.14946,-31.25703 -27.80975,-42.91835 C 518.25758,112.40388 508.38564,99.094489 491.88869,97.309337 479.07651,89.986048 465.97452,83.436817 451.75403,79.3974 441.06001,76.777223 429.97785,77.315162 419.72106,72.936959 416.60435,72.166561 413.40414,71.671917 410.1875,71.6875 z m 17.5625,6.34375 c -0.38872,1.177191 -0.7782,-0.856468 0,0 z M 324,337.8125 324.21875,338.09375 324,337.8125 z"
+ id="path4013"
+ inkscape:connector-curvature="0"
+ transform="matrix(1.3588291,0,0,1.0727572,-1054.684,281.1721)" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer1"
+ inkscape:label="rocks"
+ style="display:inline">
+ <g
+ id="g3970"
+ style="filter:url(#filter3978)">
+ <path
+ sodipodi:nodetypes="scccccccccccccccccccccccccssccccccss"
+ inkscape:connector-curvature="0"
+ id="path5678"
+ d="m 373.5,644.71875 c -1.09587,0.0267 -1.99124,0.654 -2.59375,1.96875 -7.1354,54.14246 2.20765,113.3855 -28.28125,160.75 -32.4702,46.472 -67.4361,105.62635 -131.3125,90.65625 C 165.78967,892.37416 104.5259,911.10792 66.03125,884.40625 46.444733,871.65719 40.759754,847.74653 34.25,826.90625 13.647549,763.42201 -21.62941,680.63034 -37.3125,682.3125 c -8.7219,5.35177 2.137,89.50601 -2.1875,134 7.073,60.4018 -21.78,91.92925 -83.625,68.78125 -16.01508,1.04471 -40.92539,-10.90601 -64.0625,-26.625 l 0,181.15625 c 738.87129,-11.3451 1529.9187,-3.0115 2302.625,1.4688 L 2114.5,884.75 c -9.081,-6.1831 -16.9098,-14.8699 -23,-26.9375 -16.965,-62.9373 -62.3945,-177.47551 -80.8125,-175.5 -8.7219,5.35177 2.137,89.50601 -2.1875,134 7.073,60.4018 -21.78,91.92925 -83.625,68.78125 -33.9201,2.2127 -107.7801,-53.91345 -120.0625,-80.53125 -21.3197,-20.82759 -23.3073,-130.99234 -60.0937,-74.90625 -26.5399,42.37048 -60.4248,76.414 -88.0938,115.5625 -10.1487,55.6226 -140.4326,45.13585 -170.9375,10.09375 -30.4747,-57.3187 -62.248,-176.41448 -77.25,-177.0625 -20.708,-2.00453 -57.2281,86.18578 -67.8125,134.0625 -9.2473,33.1449 -11.1728,81.67295 -56.5312,67.59375 -58.6566,-2.2609 -119.0384,6.07955 -176.2188,-5.78125 -59.7825,-0.053 -74.0118,-66.48491 -90.0312,-111.34375 -2.2183,-20.30411 -8.9538,-50.6385 -17.93755,-51.46875 -7.15213,-0.66098 -28.70175,25.03916 -40.625,50.0625 -5.31863,11.16223 -6.85501,27.93875 -7.875,30.6875 -15.6845,33.10519 -28.3531,82.6356 -73.75,69.625 -61.4404,-2.0078 -123.83335,4.8164 -184.40625,-5.1875 -30.20322,-4.20268 -42.05978,-89.03136 -65.40625,-89.40625 -4.77978,-0.0768 -10.0661,8.45875 -16.0625,16.34375 -12.4327,50.18009 -40.9817,108.40555 -102,73.78125 -74.3648,1.6048 -93.92985,-77.17931 -94.53125,-139.125 -0.17926,-18.46638 -31.15657,-73.63293 -41.75,-73.375 z"
+ style="color:#000000;fill:#111218;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ mask="url(#mask10327)"
+ sodipodi:nodetypes="cccccscccccccsccccscccscccsccccccccccccccccccscccsscccccccscsscccscccsccscscccccsscscscsccccccccccccccccscscccccssccsccccccccccccccccccccscccccccssccccscscccscccscccccssccccccsscscsccccccssccccccccccscssssssssccssccccccsssscscccsscccssssssccc"
+ inkscape:connector-curvature="0"
+ id="path5680"
+ d="m 373.25,634.71875 c -4.77603,0.11636 -9.7737,4.18189 -11.4375,7.8125 l -0.625,1.34375 -0.1875,1.5 c -7.40662,56.20041 1.15024,113.26468 -26.78125,156.65625 -16.34107,23.40438 -32.93147,49.02295 -52.15625,66.34375 -19.30941,17.39705 -39.77422,26.69361 -68.46875,19.96875 l -0.5,-0.0937 -0.53125,-0.0937 c -24.65185,-3.09731 -51.63422,0.35436 -76.78125,0.96875 -27.54663,-5.57758 -54.518755,-2.84707 -70.875,-18.5625 C 56.62149,861.9605 51.896437,849.47494 47.5625,835.9375 35.447649,799.96785 23.71053,766.10951 10.40625,736.25 3.2017939,720.08997 -3.9984928,705.74208 -10.8125,694.78125 c -3.787,-6.09158 -7.40635,-11.15134 -11.34375,-15.125 -6.582974,-4.94749 -9.428396,-7.81026 -16.21875,-7.28125 -6.911642,0.45893 -10.20139,8.12063 -11.1875,13.5625 -0.7214,3.83037 -1.00985,8.08756 -1.15625,13.03125 -0.2923,9.88739 0.11255,22.38454 0.65625,36.0625 1.0874,27.35591 2.6506,59.4718 0.625,80.3125 l -0.125,1.0625 0.125,1.0625 c 3.3304,28.4412 -2.2007,47.74157 -12.6875,57.09375 -10.4868,9.35218 -28.4515,12.02881 -57.5,1.15625 l -2,-0.75 -2.15625,0.15625 c -11.0091,0.71815 -38.30605,-11.15732 -61.71875,-27.65625 -2.33382,-1.64464 -4.63271,-3.36219 -6.90625,-5.09375 l 0,43.8125 c 23.52317,7.96686 43.81545,22.53103 68.84375,23.84375 26.2264,29.0507 40.01965,31.19565 67.46875,3.28125 4.7326,-2.6422 10.77045,-5.22325 16.90625,-7.90625 8.0994,-0.1451 18.523,3.18185 27,-4.59375 l 0.875,-11.90625 c 3.7243,-4.418 4.75605,-9.45975 1.15625,-15.46875 l 0.03125,-0.3125 c -0.072,-7e-4 -0.14625,7e-4 -0.21875,0 -2.1715,-3.4922 -5.892,-7.3041 -11.5625,-11.5 3.8985,-7.5511 6.147,-18.26755 4.875,-30.15625 -1.6549,-15.4604 16.18505,-14.1609 16.28125,-15.75 0.3978,-6.5643 -18.0698,-10.8803 -18.75,-17.5625 -2.009,-19.74005 -4.04455,-38.93321 -0.84375,-51.3125 2.1923,3.59552 3.5072,6.27275 8.1875,16.125 0.997,2.09921 7.0346,11.85735 3.5,18.5 -1.7779,3.34038 8.3886,2.26465 9,3.625 4.3685,9.72534 7.77795,26.7559 11.65625,37.375 7.2634,19.8878 -10.0666,17.65325 -20.0625,27.78125 9.9431037,2.77475 16.5256113,6.83265 21.40625,11.0625 7.309002,5.63006 9.808875,12.92744 16.96875,17.125 -14.476931,31.17196 20.761522,15.64196 28.03125,23.3125 0.12754,0.13457 0.265105,0.25702 0.375,0.40625 0.659368,0.8954 0.987822,2.07537 0.90625,3.59375 30.0185,22.83316 69.12551,20.81682 93,13 32.1269,-8.4926 63.67175,-5.94225 94.96875,9.28125 40.8454,14.5471 38.32545,-40.71835 66.84375,-53.21875 2.163,-30.2345 42.4869,-21.8266 65.6875,-35.1875 -26.8994,-0.1579 -35.63755,-30.26935 -6.09375,-21.21875 -14.8322,-11.8178 12.2637,-85.19091 10.625,-116.40625 7.7637,14.82705 16.3449,69.74788 21.1875,83.09375 1.2702,3.50066 -8.94965,13.3908 -19.90625,18.125 9.4827,5.7887 29.86795,4.27905 35.53125,11.90625 11.7483,15.8225 7.2428,27.5965 -19,40.0625 -6.345,3.0141 64.1449,13.63305 70.125,16.15625 20.8979,8.167 42.62985,-2.99885 42.28125,24.15625 18.1143,11.819 45.70415,-38.3934 67.78125,-9.8125 4.2732,-6.349 7.4596,-13.7794 10.3125,-21.1875 1.3208,-3.4298 32.15485,-1.97005 33.40625,-5.28125 1.097,-2.9018 -27.4007,-10.597 -26.25,-13.25 4.6191,-10.6479 10.0899,-18.70915 19.625,-19.40625 0.01,-10.605 3.8062,-36.17637 7.625,-36.34375 3.1359,-0.13744 11.7008,16.9394 12.0625,25.625 0.2906,6.9841 -2.135,3.1523 -6.625,8.6875 6.8107,3.6636 6.67425,0.9608 13.71875,2.75 8.5952,2.183 15.1661,34.6471 2.125,48.375 12.8454,8.3436 30.2022,-1.86975 41.25,5.90625 19.1313,13.4656 63.1694,5.0102 119.75,-3.6875 36.5951,-20.7372 71.28755,19.74525 100.78125,12.84375 20.9447,-11.6989 33.82915,-22.46245 69.90625,-27.09375 1.7689,-5.3932 -41.31355,-4.12275 -31.53125,-25.90625 3.1041,-6.9131 21.8103,-10.0191 32.9375,-13.375 -4.0247,-3.0125 -22.99345,-9.37435 -23.78125,-12.46875 -2.538,-9.969 8.2894,-19.84346 10.5625,-26.34375 1.2739,-3.64284 21.93897,-4.91605 19.15625,-5.875 -3.4779,-1.19836 -16.1204,-8.12182 -10.8125,-11.78125 6.5545,-4.51883 10.89805,-8.4953 15.5625,-13 6.26386,5.58466 13.0715,20.61417 12.4375,29.90625 -0.6401,9.38054 -24.4583,10.59925 -23.875,11.65625 1.9996,3.6226 28.7071,15.7436 26.5625,17.625 -11.04759,9.6916 -10.01165,14.5437 -18.5625,19.6875 4.2633,5.705 19.7515,9.27855 32.75,9.65625 13.1603,40.5489 44.9645,29.94445 77.8125,47.21875 41.1394,12.0532 85.0247,4.7859 127.5313,6.0625 25.0133,-0.8945 72.0885,31.26135 79.4687,12.96875 10.5231,-25.794 59.736,-34.29995 42.7813,-68.03125 1.35,-3.5366 53.8113,-12.94445 48.25,-19.78125 -1.7499,-2.1507 -39.9117,-13.5145 -35.875,-23.5625 3.8872,-9.67749 6.6356,-18.6624 10.1562,-22.5625 18.3456,-1.88875 19.0193,-2.46325 31.875,-8.46875 -8.9756,-0.72004 -16.5508,-7.06597 -20,-6.375 5.8417,-27.09395 3.5016,-29.07158 17.875,-47.75 0.4103,7.65868 2.2189,14.69377 4.875,21.34375 0.8734,2.18678 -9.6592,10.32531 -8.625,12.4375 1.329,2.71453 14.2638,-0.59228 15.7812,2.03125 6.4978,11.23032 14.341,21.77863 20.125,33.09375 2.187,4.27751 -21.2623,15.8056 -19.8437,20.375 1.614,5.1989 27.9485,3.49205 28.0625,9.28125 17.1269,17.3667 1.4751,49.349 -23.375,57.4375 -12.9084,4.2016 57.8503,0.9053 59.9062,15.4375 11.8361,31.2718 46.4653,-3.49315 58.8126,25.15625 35.5344,14.3344 72.4876,15.42945 106.8124,-1.09375 18.0204,-13.3697 32.9614,-1.86305 20.2813,-30.59375 15.9934,-30.6629 50.8275,-22.8295 72.1563,-30.125 -22.8705,-5.3456 -44.8033,-22.3955 -37.6563,-30.0625 2.9348,-3.1484 12.8027,-22.39835 19.875,-23.28125 10.1504,-1.26707 29.3821,4.67175 35.1875,1.71875 -9.9741,-6.96055 -16.8152,-18.23814 -9.8125,-29.34375 4.5388,-9.51279 15.622,-25.2004 17.375,-22.65625 12.9095,18.736 2.8563,48.73774 18.9375,53.625 5.7417,8.8625 -22.8843,11.7914 -37.625,22.25 27.9831,14.7983 45.5831,14.50155 47.5625,22.21875 3.2665,12.736 17.6049,36.339 37.4375,38.6875 36.9416,0.5635 62.3105,27.17225 96.5625,28.96875 26.2264,29.0507 40.0197,31.19565 67.4687,3.28125 4.7327,-2.6422 10.7705,-5.22325 16.9063,-7.90625 8.0994,-0.1451 18.523,3.18185 27,-4.59375 l 0.875,-11.90625 c 3.7243,-4.418 4.756,-9.45975 1.1563,-15.46875 l 0.031,-0.3125 c -0.072,-7e-4 -0.1463,7e-4 -0.2188,0 -2.1714,-3.4922 -5.892,-7.3041 -11.5624,-11.5 3.8984,-7.5511 6.1469,-18.26755 4.875,-30.15625 -1.6549,-15.4604 16.185,-14.1609 16.2812,-15.75 0.3978,-6.5643 -18.0698,-10.8803 -18.75,-17.5625 -2.009,-19.74005 -4.0445,-38.93321 -0.8438,-51.3125 2.1924,3.59552 3.5073,6.27275 8.1876,16.125 0.9969,2.09921 7.0345,11.85735 3.5,18.5 -1.778,3.34038 8.3885,2.26465 9,3.625 4.3685,9.72534 7.7779,26.7559 11.6562,37.375 7.2634,19.8878 -10.0666,17.65325 -20.0625,27.78125 25.9924,7.2535 29.1718,23.2883 38.375,28.1875 -16.2547,35.0001 30.1825,11.1164 29.3125,27.3125 2.422,1.7793 4.7515,3.42195 7.0312,4.96875 L 2114.5,884.75 l 5.625,-8.28125 c -7.5449,-5.13717 -14.0257,-12.20976 -19.375,-22.59375 -8.7348,-32.05963 -24.1344,-75.84895 -39.9375,-112.15625 -8.0047,-18.39057 -16.0511,-34.75433 -23.625,-46.9375 -3.787,-6.09158 -7.4064,-11.15134 -11.3437,-15.125 -3.9378,-3.97366 -8.6056,-8.09784 -16.2188,-7.28125 l -2.25,0.25 -1.9062,1.15625 c -6.4633,3.96579 -6.3099,8.32588 -7.0313,12.15625 -0.7214,3.83037 -1.0098,8.08756 -1.1563,13.03125 -0.2922,9.88739 0.1126,22.38454 0.6563,36.0625 1.0874,27.35591 2.6506,59.4718 0.625,80.3125 l -0.125,1.0625 0.125,1.0625 c 3.3304,28.4412 -2.2007,47.74157 -12.6875,57.09375 -10.4868,9.35218 -28.4515,12.02881 -57.5,1.15625 l -2,-0.75 -2.1562,0.15625 c -11.0091,0.71815 -38.3061,-11.15732 -61.7188,-27.65625 -23.4127,-16.49893 -44.527,-38.28108 -48.5938,-47.09375 l -0.7812,-1.6875 -1.3125,-1.28125 c -2.2334,-2.18183 -7.0178,-12.14327 -10.6563,-24.125 -3.6378,-11.98173 -7.0323,-25.98716 -11.125,-38.1875 -2.046,-6.10017 -4.2317,-11.75357 -7.0312,-16.75 -2.7995,-4.99643 -6.153,-9.72117 -12,-12.5625 -5.847,-2.84133 -13.7874,-1.87754 -19.4062,1.71875 -5.6195,3.59629 -10.2288,9.00053 -15.25,16.65625 l -0.031,0.0937 -0.062,0.0937 c -25.7864,41.16755 -59.4686,75.03418 -87.7812,115.09375 -7.1261,14.22645 -9.7736,20.73344 -22.625,26.625 -12.212,5.44178 -29.208,8.21075 -47.0313,8.1875 -17.8233,-0.0232 -36.4635,-2.74871 -52.0625,-7.46875 -15.108,-4.57148 -27.1213,-11.30601 -32.8438,-17.4375 -14.3848,-27.46951 -29.7826,-70.6984 -43.25,-107.28125 -6.8324,-18.56002 -13.1831,-35.39149 -19,-48.09375 -2.9081,-6.35113 -5.627,-11.63246 -8.5937,-15.9375 -2.8934,-4.19863 -5.7328,-9.10907 -13.6563,-9.6875 l 0,-0.0625 c -0.1194,-0.0116 -0.2248,0.009 -0.3437,0 -0.072,-0.004 -0.1144,-0.0281 -0.1875,-0.0312 l 0,0.0312 c -5.9803,-0.39871 -10.957,2.18923 -14.9688,5.28125 -4.1341,3.18666 -7.7496,7.26532 -11.3437,12.09375 -7.1881,9.65685 -14.1791,22.39233 -20.875,36.65625 -13.3047,28.3421 -25.1054,62.31523 -30.6875,87.3125 -0.037,0.16383 -0.089,0.3682 -0.125,0.53125 -4.8303,17.48863 -7.8926,37.20971 -13.9062,49.15625 -3.0372,6.03263 -6.339,9.70353 -10.375,11.5625 -4.0364,1.85897 -9.7642,2.50046 -19.5313,-0.53125 l -1.25,-0.375 -1.3437,-0.0625 c -59.8667,-2.30753 -119.6657,5.82459 -174.5626,-5.5625 l -1,-0.21875 -1.0312,0 c -26.1879,-0.0232 -40.7686,-13.40136 -52.8125,-33.9375 -11.8781,-20.25355 -19.3793,-46.96725 -27.4687,-69.78125 -1.205,-10.46546 -3.3617,-22.84637 -6.5938,-33.5625 -1.6784,-5.56466 -3.5701,-10.61597 -6.1875,-15.0625 -2.6174,-4.44653 -6.3118,-9.72698 -14,-10.4375 -8.15925,-0.75406 -11.09236,3.02398 -15.03125,6.34375 -3.93889,3.31977 -7.96712,7.62093 -12.125,12.6875 -8.31577,10.13315 -17.01015,23.26401 -23.40625,36.6875 -3.33531,6.99984 -5.06694,14.59331 -6.3125,20.875 -0.62278,3.14085 -1.1063,5.94429 -1.46875,8.03125 -0.26022,1.49833 -0.69423,2.98297 -0.6875,3.125 3e-4,0.006 -0.002,0.0619 0,0.0625 -7.96077,17.04512 -14.98515,36.4679 -24.1875,49.15625 -4.7214,6.50995 -9.7553,11.04263 -15.375,13.4375 -5.6197,2.39487 -12.19705,3.06826 -21.8125,0.3125 l -1.1875,-0.34375 -1.25,-0.0312 C 815.56693,849.64862 753.63729,856.32987 694.875,846.625 l -0.125,0 -0.125,-0.0312 c -3.091,-0.4301 -7.72343,-3.83547 -12.75,-11.34375 -5.02657,-7.50828 -9.95451,-18.12322 -14.75,-28.9375 -4.79549,-10.81428 -9.45184,-21.79777 -14.90625,-30.84375 -2.72721,-4.52299 -5.63641,-8.62709 -9.40625,-12.03125 -3.76984,-3.40416 -8.87426,-6.2484 -14.8125,-6.34375 -8.39934,-0.13496 -12.07956,4.91993 -15.3125,8.6875 -3.23294,3.76757 -6.07214,7.90811 -8.875,11.59375 l -1.25,1.65625 -0.5,2 c -6.00378,24.23209 -16.21557,49.96616 -30.15625,64.0625 -6.97034,7.04817 -14.45326,11.27354 -23.375,12.34375 -8.92174,1.07021 -19.89534,-1.00908 -33.8125,-8.90625 l -2.40625,-1.375 -2.75,0.0625 c -33.63453,0.72584 -52.77388,-15.41324 -65.84375,-40.375 C 430.64888,781.88189 425.54088,747.96134 425.25,718 c -0.0715,-7.3637 -2.5024,-14.60156 -5.8125,-22.90625 -3.3101,-8.30469 -7.72008,-17.23198 -12.46875,-25.625 -4.74867,-8.39302 -9.77716,-16.1848 -14.71875,-22.28125 -2.47079,-3.04823 -4.8876,-5.69644 -7.59375,-7.90625 -2.70615,-2.20981 -5.68697,-4.70175 -11.40625,-4.5625 z m 0.78125,183.6875 c -3.0015,5.4719 1.8292,1.3339 0,0 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8288a8;fill-opacity:0.03971121;fill-rule:evenodd;stroke:none;stroke-width:50;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter10321);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ style="color:#000000;fill:#111218;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 1618.5635,371.97585 c 1.0959,-0.0267 1.9912,-0.654 2.5938,-1.96875 7.1353,-54.14246 -2.2077,-113.3855 28.2812,-160.75 32.4702,-46.472 67.4361,-105.62635 131.3125,-90.65625 45.5228,5.71959 106.7866,-13.01417 145.2813,13.6875 19.5865,12.74906 25.2714,36.65972 31.7812,57.5 20.6025,63.48424 55.8794,146.27591 71.5625,144.59375 8.7219,-5.35177 -2.137,-89.50601 2.1875,-134 -7.073,-60.4018 21.78,-91.92925 83.625,-68.78125 16.0151,-1.04471 40.9254,10.90601 64.0625,26.625 l 0,-181.15625 c -738.8713,11.3451 -1529.9187,3.0115 -2302.625,-1.4688 l 0.9375,156.3438 c 9.081,6.1831 16.9098,14.8699 23,26.9375 16.965,62.9373 62.3945,177.47551 80.8125,175.5 8.7219,-5.35177 -2.137,-89.50601 2.1875,-134 -7.073,-60.4018 21.78,-91.92925 83.625,-68.78125 33.9201,-2.2127 107.7801,53.91345 120.0625,80.53125 21.3197,20.82759 23.3073,130.99234 60.0937,74.90625 26.5399,-42.37048 60.4248,-76.414 88.0938,-115.5625 10.1487,-55.6226 140.4326,-45.13585 170.9375,-10.09375 30.4747,57.3187 62.248,176.41448 77.25,177.0625 20.708,2.00453 57.2281,-86.18578 67.8125,-134.0625 9.2473,-33.1449 11.1728,-81.67295 56.5312,-67.59375 58.6566,2.2609 119.0384,-6.07955 176.2188,5.78125 59.7825,0.053 74.0118,66.48491 90.0312,111.34375 2.2183,20.30411 8.9538,50.6385 17.93755,51.46875 7.15213,0.66098 28.70175,-25.03916 40.62505,-50.0625 5.3186,-11.16223 6.855,-27.93875 7.875,-30.6875 15.6845,-33.10519 28.3531,-82.6356 73.75,-69.625 61.4404,2.0078 123.8333,-4.8164 184.4062,5.1875 30.2032,4.20268 42.0598,89.03136 65.4063,89.40625 4.7797,0.0768 10.0661,-8.45875 16.0625,-16.34375 12.4327,-50.18009 40.9817,-108.40555 102,-73.78125 74.3648,-1.6048 93.9298,77.17931 94.5312,139.125 0.1793,18.46638 31.1566,73.63293 41.75,73.375 z"
+ id="path10337"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="scccccccccccccccccccccccccssccccccss" />
+ <path
+ transform="matrix(-1,0,0,-1,1992.0635,1016.6946)"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8288a8;fill-opacity:0.03971121;fill-rule:evenodd;stroke:none;stroke-width:50;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter10321);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 373.25,634.71875 c -4.77603,0.11636 -9.7737,4.18189 -11.4375,7.8125 l -0.625,1.34375 -0.1875,1.5 c -7.40662,56.20041 1.15024,113.26468 -26.78125,156.65625 -16.34107,23.40438 -32.93147,49.02295 -52.15625,66.34375 -19.30941,17.39705 -39.77422,26.69361 -68.46875,19.96875 l -0.5,-0.0937 -0.53125,-0.0937 c -24.65185,-3.09731 -51.63422,0.35436 -76.78125,0.96875 -27.54663,-5.57758 -54.518755,-2.84707 -70.875,-18.5625 C 56.62149,861.9605 51.896437,849.47494 47.5625,835.9375 35.447649,799.96785 23.71053,766.10951 10.40625,736.25 3.2017939,720.08997 -3.9984928,705.74208 -10.8125,694.78125 c -3.787,-6.09158 -7.40635,-11.15134 -11.34375,-15.125 -6.582974,-4.94749 -9.428396,-7.81026 -16.21875,-7.28125 -6.911642,0.45893 -10.20139,8.12063 -11.1875,13.5625 -0.7214,3.83037 -1.00985,8.08756 -1.15625,13.03125 -0.2923,9.88739 0.11255,22.38454 0.65625,36.0625 1.0874,27.35591 2.6506,59.4718 0.625,80.3125 l -0.125,1.0625 0.125,1.0625 c 3.3304,28.4412 -2.2007,47.74157 -12.6875,57.09375 -10.4868,9.35218 -28.4515,12.02881 -57.5,1.15625 l -2,-0.75 -2.15625,0.15625 c -11.0091,0.71815 -38.30605,-11.15732 -61.71875,-27.65625 -2.33382,-1.64464 -4.63271,-3.36219 -6.90625,-5.09375 l 0,43.8125 c 23.52317,7.96686 43.81545,22.53103 68.84375,23.84375 26.2264,29.0507 40.01965,31.19565 67.46875,3.28125 4.7326,-2.6422 10.77045,-5.22325 16.90625,-7.90625 8.0994,-0.1451 18.523,3.18185 27,-4.59375 l 0.875,-11.90625 c 3.7243,-4.418 4.75605,-9.45975 1.15625,-15.46875 l 0.03125,-0.3125 c -0.072,-7e-4 -0.14625,7e-4 -0.21875,0 -2.1715,-3.4922 -5.892,-7.3041 -11.5625,-11.5 3.8985,-7.5511 6.147,-18.26755 4.875,-30.15625 -1.6549,-15.4604 16.18505,-14.1609 16.28125,-15.75 0.3978,-6.5643 -18.0698,-10.8803 -18.75,-17.5625 -2.009,-19.74005 -4.04455,-38.93321 -0.84375,-51.3125 2.1923,3.59552 3.5072,6.27275 8.1875,16.125 0.997,2.09921 7.0346,11.85735 3.5,18.5 -1.7779,3.34038 8.3886,2.26465 9,3.625 4.3685,9.72534 7.77795,26.7559 11.65625,37.375 7.2634,19.8878 -10.0666,17.65325 -20.0625,27.78125 9.9431037,2.77475 16.5256113,6.83265 21.40625,11.0625 7.309002,5.63006 9.808875,12.92744 16.96875,17.125 -14.476931,31.17196 20.761522,15.64196 28.03125,23.3125 0.12754,0.13457 0.265105,0.25702 0.375,0.40625 0.659368,0.8954 0.987822,2.07537 0.90625,3.59375 30.0185,22.83316 69.12551,20.81682 93,13 32.1269,-8.4926 63.67175,-5.94225 94.96875,9.28125 40.8454,14.5471 38.32545,-40.71835 66.84375,-53.21875 2.163,-30.2345 42.4869,-21.8266 65.6875,-35.1875 -26.8994,-0.1579 -35.63755,-30.26935 -6.09375,-21.21875 -14.8322,-11.8178 12.2637,-85.19091 10.625,-116.40625 7.7637,14.82705 16.3449,69.74788 21.1875,83.09375 1.2702,3.50066 -8.94965,13.3908 -19.90625,18.125 9.4827,5.7887 29.86795,4.27905 35.53125,11.90625 11.7483,15.8225 7.2428,27.5965 -19,40.0625 -6.345,3.0141 64.1449,13.63305 70.125,16.15625 20.8979,8.167 42.62985,-2.99885 42.28125,24.15625 18.1143,11.819 45.70415,-38.3934 67.78125,-9.8125 4.2732,-6.349 7.4596,-13.7794 10.3125,-21.1875 1.3208,-3.4298 32.15485,-1.97005 33.40625,-5.28125 1.097,-2.9018 -27.4007,-10.597 -26.25,-13.25 4.6191,-10.6479 10.0899,-18.70915 19.625,-19.40625 0.01,-10.605 3.8062,-36.17637 7.625,-36.34375 3.1359,-0.13744 11.7008,16.9394 12.0625,25.625 0.2906,6.9841 -2.135,3.1523 -6.625,8.6875 6.8107,3.6636 6.67425,0.9608 13.71875,2.75 8.5952,2.183 15.1661,34.6471 2.125,48.375 12.8454,8.3436 30.2022,-1.86975 41.25,5.90625 19.1313,13.4656 63.1694,5.0102 119.75,-3.6875 36.5951,-20.7372 71.28755,19.74525 100.78125,12.84375 20.9447,-11.6989 33.82915,-22.46245 69.90625,-27.09375 1.7689,-5.3932 -41.31355,-4.12275 -31.53125,-25.90625 3.1041,-6.9131 21.8103,-10.0191 32.9375,-13.375 -4.0247,-3.0125 -22.99345,-9.37435 -23.78125,-12.46875 -2.538,-9.969 8.2894,-19.84346 10.5625,-26.34375 1.2739,-3.64284 21.93897,-4.91605 19.15625,-5.875 -3.4779,-1.19836 -16.1204,-8.12182 -10.8125,-11.78125 6.5545,-4.51883 10.89805,-8.4953 15.5625,-13 6.26386,5.58466 13.0715,20.61417 12.4375,29.90625 -0.6401,9.38054 -24.4583,10.59925 -23.875,11.65625 1.9996,3.6226 28.7071,15.7436 26.5625,17.625 -11.04759,9.6916 -10.01165,14.5437 -18.5625,19.6875 4.2633,5.705 19.7515,9.27855 32.75,9.65625 13.1603,40.5489 44.9645,29.94445 77.8125,47.21875 41.1394,12.0532 85.0247,4.7859 127.5313,6.0625 25.0133,-0.8945 72.0885,31.26135 79.4687,12.96875 10.5231,-25.794 59.736,-34.29995 42.7813,-68.03125 1.35,-3.5366 53.8113,-12.94445 48.25,-19.78125 -1.7499,-2.1507 -39.9117,-13.5145 -35.875,-23.5625 3.8872,-9.67749 6.6356,-18.6624 10.1562,-22.5625 18.3456,-1.88875 19.0193,-2.46325 31.875,-8.46875 -8.9756,-0.72004 -16.5508,-7.06597 -20,-6.375 5.8417,-27.09395 3.5016,-29.07158 17.875,-47.75 0.4103,7.65868 2.2189,14.69377 4.875,21.34375 0.8734,2.18678 -9.6592,10.32531 -8.625,12.4375 1.329,2.71453 14.2638,-0.59228 15.7812,2.03125 6.4978,11.23032 14.341,21.77863 20.125,33.09375 2.187,4.27751 -21.2623,15.8056 -19.8437,20.375 1.614,5.1989 27.9485,3.49205 28.0625,9.28125 17.1269,17.3667 1.4751,49.349 -23.375,57.4375 -12.9084,4.2016 57.8503,0.9053 59.9062,15.4375 11.8361,31.2718 46.4653,-3.49315 58.8126,25.15625 35.5344,14.3344 72.4876,15.42945 106.8124,-1.09375 18.0204,-13.3697 32.9614,-1.86305 20.2813,-30.59375 15.9934,-30.6629 50.8275,-22.8295 72.1563,-30.125 -22.8705,-5.3456 -44.8033,-22.3955 -37.6563,-30.0625 2.9348,-3.1484 12.8027,-22.39835 19.875,-23.28125 10.1504,-1.26707 29.3821,4.67175 35.1875,1.71875 -9.9741,-6.96055 -16.8152,-18.23814 -9.8125,-29.34375 4.5388,-9.51279 15.622,-25.2004 17.375,-22.65625 12.9095,18.736 2.8563,48.73774 18.9375,53.625 5.7417,8.8625 -22.8843,11.7914 -37.625,22.25 27.9831,14.7983 45.5831,14.50155 47.5625,22.21875 3.2665,12.736 17.6049,36.339 37.4375,38.6875 36.9416,0.5635 62.3105,27.17225 96.5625,28.96875 26.2264,29.0507 40.0197,31.19565 67.4687,3.28125 4.7327,-2.6422 10.7705,-5.22325 16.9063,-7.90625 8.0994,-0.1451 18.523,3.18185 27,-4.59375 l 0.875,-11.90625 c 3.7243,-4.418 4.756,-9.45975 1.1563,-15.46875 l 0.031,-0.3125 c -0.072,-7e-4 -0.1463,7e-4 -0.2188,0 -2.1714,-3.4922 -5.892,-7.3041 -11.5624,-11.5 3.8984,-7.5511 6.1469,-18.26755 4.875,-30.15625 -1.6549,-15.4604 16.185,-14.1609 16.2812,-15.75 0.3978,-6.5643 -18.0698,-10.8803 -18.75,-17.5625 -2.009,-19.74005 -4.0445,-38.93321 -0.8438,-51.3125 2.1924,3.59552 3.5073,6.27275 8.1876,16.125 0.9969,2.09921 7.0345,11.85735 3.5,18.5 -1.778,3.34038 8.3885,2.26465 9,3.625 4.3685,9.72534 7.7779,26.7559 11.6562,37.375 7.2634,19.8878 -10.0666,17.65325 -20.0625,27.78125 25.9924,7.2535 29.1718,23.2883 38.375,28.1875 -16.2547,35.0001 30.1825,11.1164 29.3125,27.3125 2.422,1.7793 4.7515,3.42195 7.0312,4.96875 L 2114.5,884.75 l 5.625,-8.28125 c -7.5449,-5.13717 -14.0257,-12.20976 -19.375,-22.59375 -8.7348,-32.05963 -24.1344,-75.84895 -39.9375,-112.15625 -8.0047,-18.39057 -16.0511,-34.75433 -23.625,-46.9375 -3.787,-6.09158 -7.4064,-11.15134 -11.3437,-15.125 -3.9378,-3.97366 -8.6056,-8.09784 -16.2188,-7.28125 l -2.25,0.25 -1.9062,1.15625 c -6.4633,3.96579 -6.3099,8.32588 -7.0313,12.15625 -0.7214,3.83037 -1.0098,8.08756 -1.1563,13.03125 -0.2922,9.88739 0.1126,22.38454 0.6563,36.0625 1.0874,27.35591 2.6506,59.4718 0.625,80.3125 l -0.125,1.0625 0.125,1.0625 c 3.3304,28.4412 -2.2007,47.74157 -12.6875,57.09375 -10.4868,9.35218 -28.4515,12.02881 -57.5,1.15625 l -2,-0.75 -2.1562,0.15625 c -11.0091,0.71815 -38.3061,-11.15732 -61.7188,-27.65625 -23.4127,-16.49893 -44.527,-38.28108 -48.5938,-47.09375 l -0.7812,-1.6875 -1.3125,-1.28125 c -2.2334,-2.18183 -7.0178,-12.14327 -10.6563,-24.125 -3.6378,-11.98173 -7.0323,-25.98716 -11.125,-38.1875 -2.046,-6.10017 -4.2317,-11.75357 -7.0312,-16.75 -2.7995,-4.99643 -6.153,-9.72117 -12,-12.5625 -5.847,-2.84133 -13.7874,-1.87754 -19.4062,1.71875 -5.6195,3.59629 -10.2288,9.00053 -15.25,16.65625 l -0.031,0.0937 -0.062,0.0937 c -25.7864,41.16755 -59.4686,75.03418 -87.7812,115.09375 -7.1261,14.22645 -9.7736,20.73344 -22.625,26.625 -12.212,5.44178 -29.208,8.21075 -47.0313,8.1875 -17.8233,-0.0232 -36.4635,-2.74871 -52.0625,-7.46875 -15.108,-4.57148 -27.1213,-11.30601 -32.8438,-17.4375 -14.3848,-27.46951 -29.7826,-70.6984 -43.25,-107.28125 -6.8324,-18.56002 -13.1831,-35.39149 -19,-48.09375 -2.9081,-6.35113 -5.627,-11.63246 -8.5937,-15.9375 -2.8934,-4.19863 -5.7328,-9.10907 -13.6563,-9.6875 l 0,-0.0625 c -0.1194,-0.0116 -0.2248,0.009 -0.3437,0 -0.072,-0.004 -0.1144,-0.0281 -0.1875,-0.0312 l 0,0.0312 c -5.9803,-0.39871 -10.957,2.18923 -14.9688,5.28125 -4.1341,3.18666 -7.7496,7.26532 -11.3437,12.09375 -7.1881,9.65685 -14.1791,22.39233 -20.875,36.65625 -13.3047,28.3421 -25.1054,62.31523 -30.6875,87.3125 -0.037,0.16383 -0.089,0.3682 -0.125,0.53125 -4.8303,17.48863 -7.8926,37.20971 -13.9062,49.15625 -3.0372,6.03263 -6.339,9.70353 -10.375,11.5625 -4.0364,1.85897 -9.7642,2.50046 -19.5313,-0.53125 l -1.25,-0.375 -1.3437,-0.0625 c -59.8667,-2.30753 -119.6657,5.82459 -174.5626,-5.5625 l -1,-0.21875 -1.0312,0 c -26.1879,-0.0232 -40.7686,-13.40136 -52.8125,-33.9375 -11.8781,-20.25355 -19.3793,-46.96725 -27.4687,-69.78125 -1.205,-10.46546 -3.3617,-22.84637 -6.5938,-33.5625 -1.6784,-5.56466 -3.5701,-10.61597 -6.1875,-15.0625 -2.6174,-4.44653 -6.3118,-9.72698 -14,-10.4375 -8.15925,-0.75406 -11.09236,3.02398 -15.03125,6.34375 -3.93889,3.31977 -7.96712,7.62093 -12.125,12.6875 -8.31577,10.13315 -17.01015,23.26401 -23.40625,36.6875 -3.33531,6.99984 -5.06694,14.59331 -6.3125,20.875 -0.62278,3.14085 -1.1063,5.94429 -1.46875,8.03125 -0.26022,1.49833 -0.69423,2.98297 -0.6875,3.125 3e-4,0.006 -0.002,0.0619 0,0.0625 -7.96077,17.04512 -14.98515,36.4679 -24.1875,49.15625 -4.7214,6.50995 -9.7553,11.04263 -15.375,13.4375 -5.6197,2.39487 -12.19705,3.06826 -21.8125,0.3125 l -1.1875,-0.34375 -1.25,-0.0312 C 815.56693,849.64862 753.63729,856.32987 694.875,846.625 l -0.125,0 -0.125,-0.0312 c -3.091,-0.4301 -7.72343,-3.83547 -12.75,-11.34375 -5.02657,-7.50828 -9.95451,-18.12322 -14.75,-28.9375 -4.79549,-10.81428 -9.45184,-21.79777 -14.90625,-30.84375 -2.72721,-4.52299 -5.63641,-8.62709 -9.40625,-12.03125 -3.76984,-3.40416 -8.87426,-6.2484 -14.8125,-6.34375 -8.39934,-0.13496 -12.07956,4.91993 -15.3125,8.6875 -3.23294,3.76757 -6.07214,7.90811 -8.875,11.59375 l -1.25,1.65625 -0.5,2 c -6.00378,24.23209 -16.21557,49.96616 -30.15625,64.0625 -6.97034,7.04817 -14.45326,11.27354 -23.375,12.34375 -8.92174,1.07021 -19.89534,-1.00908 -33.8125,-8.90625 l -2.40625,-1.375 -2.75,0.0625 c -33.63453,0.72584 -52.77388,-15.41324 -65.84375,-40.375 C 430.64888,781.88189 425.54088,747.96134 425.25,718 c -0.0715,-7.3637 -2.5024,-14.60156 -5.8125,-22.90625 -3.3101,-8.30469 -7.72008,-17.23198 -12.46875,-25.625 -4.74867,-8.39302 -9.77716,-16.1848 -14.71875,-22.28125 -2.47079,-3.04823 -4.8876,-5.69644 -7.59375,-7.90625 -2.70615,-2.20981 -5.68697,-4.70175 -11.40625,-4.5625 z m 0.78125,183.6875 c -3.0015,5.4719 1.8292,1.3339 0,0 z"
+ id="path10339"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccscccccccsccccscccscccsccccccccccccccccccscccsscccccccscsscccscccsccscscccccsscscscsccccccccccccccccscscccccssccsccccccccccccccccccccscccccccssccccscscccscccscccccssccccccsscscsccccccssccccccccccscssssssssccssccccccsssscscccsscccssssssccc"
+ mask="url(#mask10327)" />
+ <path
+ style="color:#000000;fill:none;stroke:#1c1d26;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 2114.5,884.75 c -9.081,-6.1831 -16.9098,-14.8699 -23,-26.9375 -16.965,-62.9373 -62.3945,-177.47551 -80.8125,-175.5 -8.7219,5.35177 2.137,89.50601 -2.1875,134 7.073,60.4018 -21.78,91.92925 -83.625,68.78125 -33.9201,2.2127 -107.7801,-53.91345 -120.0625,-80.53125 -21.3197,-20.82759 -23.3073,-130.99234 -60.0937,-74.90625 -26.5399,42.37048 -60.4248,76.414 -88.0938,115.5625 -10.1487,55.6226 -140.4326,45.13585 -170.9375,10.09375 -30.4747,-57.3187 -62.248,-176.41448 -77.25,-177.0625 -20.708,-2.00453 -57.2281,86.18578 -67.8125,134.0625 -9.2473,33.1449 -11.1728,81.67295 -56.5312,67.59375 -58.6566,-2.2609 -119.0384,6.07955 -176.2188,-5.78125 -59.7825,-0.053 -74.0118,-66.48491 -90.0312,-111.34375 -2.2183,-20.30411 -8.9538,-50.6385 -17.93755,-51.46875 -7.15213,-0.66098 -28.70175,25.03916 -40.625,50.0625 -5.31863,11.16223 -6.85501,27.93875 -7.875,30.6875 -15.6845,33.10519 -28.3531,82.6356 -73.75,69.625 -61.4404,-2.0078 -123.83335,4.8164 -184.40625,-5.1875 -30.20322,-4.20268 -42.05978,-89.03136 -65.40625,-89.40625 -4.77978,-0.0768 -10.0661,8.45875 -16.0625,16.34375 -12.4327,50.18009 -40.9817,108.40555 -102,73.78125 -74.3648,1.6048 -93.92985,-77.17931 -94.53125,-139.125 -0.17926,-18.46638 -31.15657,-73.63293 -41.75,-73.375 -1.09587,0.0267 -1.99124,0.654 -2.59375,1.96875 -7.1354,54.14246 2.20765,113.3855 -28.28125,160.75 -32.4702,46.472 -67.4361,105.62635 -131.3125,90.65625 C 165.78967,892.37416 104.5259,911.10792 66.03125,884.40625 46.444733,871.65719 40.759754,847.74653 34.25,826.90625 13.647549,763.42201 -21.62941,680.63034 -37.3125,682.3125 c -8.7219,5.35177 2.137,89.50601 -2.1875,134 7.073,60.4018 -21.78,91.92925 -83.625,68.78125 -16.01508,1.04471 -40.92539,-10.90601 -64.0625,-26.625"
+ id="path3128"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccssccccccssccccccccc" />
+ <path
+ sodipodi:nodetypes="ccccccccccccccssccccccssccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3917"
+ d="m -122.4365,131.9446 c 9.081,6.1831 16.9098,14.8699 23,26.9375 16.965,62.9373 62.3945,177.47551 80.8125,175.5 8.7219,-5.35177 -2.137,-89.50601 2.1875,-134 -7.073,-60.4018 21.78,-91.92925 83.625,-68.78125 33.9201,-2.2127 107.7801,53.91345 120.0625,80.53125 21.3197,20.82759 23.3073,130.99234 60.0937,74.90625 26.5399,-42.37048 60.4248,-76.414 88.0938,-115.5625 10.1487,-55.6226 140.4326,-45.13585 170.9375,-10.09375 30.4747,57.3187 62.248,176.41448 77.25,177.0625 20.708,2.00453 57.2281,-86.18578 67.8125,-134.0625 9.2473,-33.1449 11.1728,-81.67295 56.5312,-67.59375 58.6566,2.2609 119.0384,-6.07955 176.2188,5.78125 59.7825,0.053 74.0118,66.48491 90.0312,111.34375 2.2183,20.30411 8.9538,50.6385 17.93755,51.46875 7.15213,0.66098 28.70175,-25.03916 40.62505,-50.0625 5.3186,-11.16223 6.855,-27.93875 7.875,-30.6875 15.6845,-33.10519 28.3531,-82.6356 73.75,-69.625 61.4404,2.0078 123.8333,-4.8164 184.4062,5.1875 30.2032,4.20268 42.0598,89.03136 65.4063,89.40625 4.7797,0.0768 10.0661,-8.45875 16.0625,-16.34375 12.4327,-50.18009 40.9817,-108.40555 102,-73.78125 74.3648,-1.6048 93.9298,77.17931 94.5312,139.125 0.1793,18.46638 31.1566,73.63293 41.75,73.375 1.0959,-0.0267 1.9912,-0.654 2.5938,-1.96875 7.1353,-54.14246 -2.2077,-113.3855 28.2812,-160.75 32.4702,-46.472 67.4361,-105.62635 131.3125,-90.65625 45.5228,5.71959 106.7866,-13.01417 145.2813,13.6875 19.5865,12.74906 25.2714,36.65972 31.7812,57.5 20.6025,63.48424 55.8794,146.27591 71.5625,144.59375 8.7219,-5.35177 -2.137,-89.50601 2.1875,-134 -7.073,-60.4018 21.78,-91.92925 83.625,-68.78125 16.0151,-1.04471 40.9254,10.90601 64.0625,26.625"
+ style="color:#000000;fill:none;stroke:#1c1d26;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ </g>
+ </g>
+</svg>
Binary file share/hedgewars/Data/Themes/Cave/Stalactite.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/Stalactite.svg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.1 r9760"
+ width="55"
+ height="140"
+ version="1.0"
+ sodipodi:docname="Stalactite .svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="Stalactite.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 130 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="240 : 130 : 1"
+ inkscape:persp3d-origin="120 : 86.666667 : 1"
+ id="perspective45" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-height="824"
+ inkscape:window-width="1434"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="5.3740116"
+ inkscape:cx="-29.695726"
+ inkscape:cy="57.383838"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="layer2"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-maximized="0"
+ inkscape:snap-global="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <sodipodi:guide
+ orientation="1,0"
+ position="12,57.763157"
+ id="guide2457" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="139.18839,135.09461"
+ id="guide2461" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="9.7924984,140.00249"
+ id="guide3045" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="0,136.53674"
+ id="guide3047" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="44,58.289473"
+ id="guide3049" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="67.105262,79"
+ id="guide3010" />
+ </sodipodi:namedview>
+ <g
+ inkscape:groupmode="layer"
+ id="layer1"
+ inkscape:label="tmp"
+ style="display:inline"
+ transform="translate(-1.90625,-96.829468)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="main"
+ transform="translate(-1.90625,-96.829468)">
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 2.9064941,93.380823 c 0.7299794,6.004013 2.5435758,11.699027 4.0453097,17.469557 2.5701904,9.8762 5.7794152,19.05669 6.7221942,29.3293 0.921223,10.03775 2.546616,21.10561 3.047535,29.38394 0.500919,8.27832 0.26695,13.45839 0.355648,20.18855 0.07922,6.01114 -0.587718,12.08768 0.157674,18.03463 1.101103,8.78497 2.862554,23.39094 6.312031,25.5766 6.109748,3.4565 6.326761,-13.60285 7.462626,-17.59427 2.091476,-7.34944 4.270392,-14.6731 6.037705,-22.1405 1.930207,-8.15564 3.143058,-15.02693 4.585337,-23.32233 1.152809,-6.63048 2.910658,-11.53306 4.113079,-18.15122 1.12324,-6.18235 3.317819,-15.42803 4.385736,-21.62407 2.077956,-12.05625 4.508809,-24.20315 5.015916,-35.624657"
+ id="path3039"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csszsacsssssc" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 23.574861,233.26194 c -3.318224,-4.17231 -5.414372,-18.13144 -6.335753,-25.48251 -0.745393,-5.94696 -0.08482,-12.02131 -0.164042,-18.03244 -0.0887,-6.73016 0.140026,-11.90639 -0.360893,-20.18471 -0.500919,-8.27834 -2.113556,-19.3377 -3.034779,-29.37545 C 12.736616,129.91422 9.5238582,120.72636 6.9536672,110.85017 6.3963648,108.70869 3.990983,96.721593 3.4191027,94.581253 c 1.8941844,1e-5 5.5458695,-1.26753 7.9141683,1.31108 2.14431,2.334717 2.144394,8.539847 3.85943,8.539847 2.909357,0.19304 3.926665,3.55431 6.741755,4.62428 1.074087,0.91803 6.218744,-1.39051 6.244325,2.21269 -5.599418,0.28083 -9.978875,0.90921 -14.020305,2.70905 -0.326902,2.97068 6.736156,0.53473 7.214665,2.17918 -2.25438,0.49065 -3.350511,-0.2337 -5.411731,1.20076 -1.010325,1.39223 -0.64886,2.27245 0.167417,1.9944 0.662011,0.13501 2.640682,-0.89621 5.527452,0.0949 -3.044517,1.11007 -5.432267,1.50535 -4.243998,2.7457 1.962154,2.31531 5.546437,3.9762 8.018984,4.55735 2.815271,0.54171 9.435776,1.13949 7.908888,1.61097 -1.910348,1.33834 -6.490705,1.51264 -8.721394,1.63797 -2.225986,-0.59997 -4.695974,3.53944 -5.640805,4.48681 -0.04827,3.65839 4.535053,5.95776 7.575466,7.11204 1.958767,0.43149 6.529547,0.79538 7.895259,2.3725 -4.575942,-0.29066 -5.91054,-1.19953 -8.547975,-0.15316 -2.102028,0.99722 -3.434192,0.80818 -5.65517,1.34764 -1.70891,0.30628 -1.635636,1.51608 -0.944899,2.8265 3.600034,-0.9711 4.224214,0.22226 5.549269,0.46806 -4.087991,1.03099 -5.187817,3.16405 -5.084548,3.72518 -0.333549,2.79451 0.407044,5.96335 2.70765,6.20518 2.819183,0.60964 7.736435,-0.70977 10.453908,0.37039 1.754389,-0.0478 0.32162,1.40993 -0.56091,1.50061 -2.142548,1.1389 -4.366046,1.11917 -6.69292,1.02767 -2.059203,-0.21714 -3.092883,0.78865 -5.089425,1.33661 -1.125382,2.40198 -1.581167,7.6977 3.877535,6.8751 3.009077,0.45503 -2.563276,1.52293 -3.38724,1.46248 -1.337702,1.2262 -1.263945,2.29017 -0.0035,2.5048 2.391023,0.24452 7.288426,-0.49598 9.439441,0.13546 -0.114048,1.48362 -4.070072,2.10988 -5.727607,1.9867 -1.989801,0.063 -5.814915,1.40592 -4.557644,4.81112 0.233692,0.64855 -0.291343,1.90028 0.273331,2.92253 0.603158,1.09191 3.77708,0.66777 3.78576,1.3193 -0.239582,0.48457 -3.048757,0.50176 -3.567952,1.13466 -1.265225,1.54232 -1.228051,4.89033 -0.562102,5.21376 1.549114,1.39692 7.48138,-0.34441 8.335234,1.48443 -2.590905,0.17345 -9.200802,-0.18646 -8.344464,1.21983 0.05676,0.0932 -0.213804,1.30324 0.280936,1.52335 0.858225,0.38181 2.434387,1.05069 2.774033,1.26071 -0.174875,1.11049 -2.301605,1.56859 -2.321946,2.62945 2.403429,2.63741 -2.38768,0.22224 -0.964682,2.95421 0.760457,2.93299 -0.539597,4.64742 -0.147466,7.36424 1.289718,1.8389 0.163639,3.42452 0.345696,5.15178 1.139834,2.96866 2.544714,2.96438 4.802034,3.91084 1.858594,0.59421 -0.203709,0.86813 -1.327304,1.06732 -2.235816,0.39636 -1.970638,1.51705 -1.293141,3.07446 1.563607,2.28544 2.585831,3.18987 2.126523,5.51947 -1.051622,3.99586 0.291891,3.73 0.241223,5.93288 z"
+ id="path3053"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssssscscccccccccccccccccccccccccccccccscsccssccccccscccc" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 24.72515,230.25659 c -0.19103,-0.62294 1.493474,-1.28924 1.436685,-1.68069 -0.140331,-0.96731 0.0025,-1.59306 0.715589,-2.76871 0.364408,-1.6836 0.786536,-3.0864 0.06638,-3.59743 -1.087257,-0.77153 -3.041449,-0.54495 -4.048433,-1.68777 1.064465,-1.42563 3.908437,-0.0615 5.006475,-2.75684 0.442042,-1.99326 -2.163299,-2.84673 -1.804464,-5.25463 -0.263586,-1.59269 -2.355457,-3.2585 -1.189377,-4.24371 1.525896,-1.28922 3.016523,-3.20937 2.472068,-4.87108 -0.547805,-1.67192 0.747166,-3.58107 1.193228,-5.2447 0.776682,-1.77529 1.703065,-2.19256 1.045323,-2.87708 -1.7294,-1.79982 -8.255962,-1.3479 -9.264456,-1.48401 4.850698,-0.92065 7.1612,-1.10214 10.21545,-0.98475 1.705567,-1.62602 2.418688,-3.15204 3.057303,-6.45141 0.04326,-3.19619 3.473886,-5.3512 2.312993,-8.57027 -1.474873,-1.89405 -3.92351,0.42629 -5.865826,-0.0157 -1.918243,7e-5 -3.607972,0.38721 -4.330009,-0.16997 2.059203,-0.42797 5.819443,-1.02762 6.881973,-3.63286 0.4692,-0.29823 -8.144998,-0.62691 -10.51304,-0.6373 3.477819,-1.94866 11.894821,-2.70236 11.971597,-3.09797 0.36234,-1.8671 -1.286876,-2.64981 0.314454,-3.69236 2.02868,-1.2248 2.507405,-7.43259 0.626789,-7.75224 -3.901457,-0.28978 -9.461044,-0.47555 -12.524385,-0.0672 2.23578,-0.88308 6.143105,-1.96045 8.366188,-2.81937 2.533188,-0.75642 6.151766,1.52983 6.679872,-2.04207 0.269328,-2.29213 -3.267735,-4.41969 -0.09006,-4.66397 1.901492,-0.3473 3.540643,-2.18195 -0.927754,-2.71467 -2.262923,-0.59203 -5.55539,-2.33251 -15.085819,-1.20502 1.749649,-2.25226 12.888963,-2.09578 19.800255,-0.59254 2.684202,-0.98684 -1.52507,-5.7779 -0.03849,-8.73991 -0.630195,-2.70287 -4.707537,-1.99966 -6.647754,-2.69148 -3.295767,-0.14728 -7.323386,-1.2072 -9.456758,-1.767 1.225066,-0.37659 4.240302,-0.82555 4.987962,-1.43107 2.538008,-1.47832 4.787255,0.21667 7.338007,-1.20249 2.533236,-0.80262 2.979327,-1.18305 5.073613,-3.0238 1.708731,-1.03495 2.005503,-1.97712 -0.360547,-2.53769 -4.22078,-0.77582 -8.425685,-1.61673 -13.054587,-1.18242 -2.143372,0.2011 -10.214445,-0.55959 -11.294002,-0.6283 3.108206,-1.31021 10.809101,-2.09423 13.93871,-2.43935 3.338936,-0.31623 6.920977,2.06072 10.076396,0.34317 1.384544,-0.83091 3.400851,-1.95533 4.254753,-3.00503 0.832524,-1.02342 -13.469071,-4.82473 -18.451386,-4.1548 3.743447,-2.324 14.696089,-0.42978 19.711774,1.60573 -1.410772,-3.02677 -4.08241,-5.5179 -6.526286,-6.8731 -2.867992,-0.018 -5.856478,-0.35676 -8.349745,-2.24921 -2.593755,-2.24053 -11.43162,-4.63019 -12.559352,-8.492397 -0.08326,-1.3371 5.60677,-1.45877 6.260136,-2.15257 l 27.968858,0.847951 c -0.507109,11.421566 -3.5575,23.526586 -5.63546,35.582856 -1.067911,6.19604 -2.957158,15.31012 -4.080403,21.49248 -1.202415,6.6182 -2.88286,11.29656 -4.035665,17.92704 -1.44228,8.29539 -2.960172,15.65744 -4.890378,23.81309 -1.767314,7.4674 -3.980145,15.00667 -6.071627,22.35612 -0.858657,3.01733 -1.883798,13.97805 -4.64388,16.514 z"
+ id="path3834"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscscccsscsccccccccsccccccccccccccccscccscccccccssssscc" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3799"
+ d="m 26.500609,119.60377 c 11.540376,-1.19807 18.98427,1.77075 24.710855,4.619"
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 9.5081422,115.98645 c 2.2840628,-1.37069 5.0400318,-2.28706 7.6323908,-2.90268 m 27.261987,0.0876 c 2.771691,0.71495 5.447061,1.70867 7.654002,3.10501"
+ id="path3029"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 17.30579,194.40162 c 9.000772,-3.38543 15.131673,-1.34767 19.290943,1.11588"
+ id="path3805"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path3803"
+ d="m 16.952826,175.04707 c 0.877419,-0.47409 1.760875,-0.8288 2.62454,-1.08797 m 7.559719,-0.73474 c 3.67747,0.0385 6.604257,0.54086 9.140306,1.38303 m 2.301678,0.89772 c 0.670069,0.30115 1.317141,0.62728 1.949834,0.97542"
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 14.518526,147.41453 c 6.157938,-2.65755 11.199543,-3.57256 15.419029,-3.70102"
+ id="path3801"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ sodipodi:nodetypes="csszsacsssssc"
+ inkscape:connector-curvature="0"
+ id="path3828"
+ d="m 2.9064941,93.380813 c 0.7299794,6.004013 2.5435767,11.699027 4.0453097,17.469557 2.5701914,9.8762 5.7794162,19.05669 6.7221942,29.3293 0.921224,10.03775 2.546616,21.10561 3.047535,29.38395 0.500919,8.27832 0.26695,13.45839 0.355648,20.18855 0.07922,6.01113 -0.69822,12.0841 0.157675,18.03463 1.321543,9.18791 3.513836,24.87959 7.614596,26.78611 3.830258,-2.35851 5.024196,-14.81236 6.160061,-18.80378 2.091476,-7.34945 4.270391,-14.67311 6.037704,-22.1405 1.930207,-8.15565 3.143058,-15.02693 4.585338,-23.32233 1.152809,-6.63049 2.910658,-11.53306 4.113079,-18.15123 1.123239,-6.18235 3.317819,-15.42803 4.385736,-21.62407 2.077956,-12.05625 5.100914,-24.20315 5.608021,-35.624657"
+ style="color:#000000;fill:none;stroke:#2d2f3c;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3809"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.55140088,0,0,-0.55255119,19.669911,247.5528)" />
+ <path
+ transform="matrix(0.36760058,0,0,-0.36836745,27.803075,197.25852)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path3811"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3813"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.55140088,0,0,-0.55255119,15.609376,245.49042)" />
+ <path
+ transform="matrix(0.55140088,0,0,-0.55255119,12.105079,272.41275)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path3815"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3817"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.36760058,0,0,-0.36836745,19.848875,223.17753)" />
+ <path
+ transform="matrix(0.55140088,0,0,-0.55255119,15.275634,268.67818)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path3819"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3821"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.40436064,0,0,-0.4052042,16.620278,274.41696)" />
+ <path
+ transform="matrix(0.55140088,0,0,-0.55255119,7.4883065,308.47641)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path3823"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3825"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.34345458,0,0,-0.34417108,10.373531,296.01192)" />
+ <path
+ transform="matrix(0.34345458,0,0,-0.34417108,12.654783,294.27771)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path3827"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3829"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.34345458,0,0,-0.34417108,11.396161,291.00635)" />
+ </g>
+</svg>
Binary file share/hedgewars/Data/Themes/Cave/Stalagmite01.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/Stalagmite01.svg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg3962"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.1 r9760"
+ width="110"
+ height="260"
+ version="1.0"
+ sodipodi:docname="Stalagmite01.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="Stalagmite01.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata3967">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs3965" />
+ <sodipodi:namedview
+ inkscape:window-height="826"
+ inkscape:window-width="1440"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="2.5600001"
+ inkscape:cx="13.103579"
+ inkscape:cy="120.1365"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="layer4"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ borderlayer="true"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <sodipodi:guide
+ orientation="1,0"
+ position="5,-11.60097"
+ id="guide2451" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="105,-19.058737"
+ id="guide2453" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="10,2"
+ id="guide2455" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="25.292968,87"
+ id="guide2461" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="19,94.628904"
+ id="guide3055" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="86,73.472812"
+ id="guide3057" />
+ </sodipodi:namedview>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="tmp"
+ style="display:inline" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="main"
+ style="opacity:1;display:inline">
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 63.03125 1.96875 C 62.625786 1.9763293 62.246074 2.0682472 61.875 2.1875 C 61.85263 2.194689 61.834749 2.2111739 61.8125 2.21875 C 61.599902 2.2911249 61.389229 2.3619819 61.1875 2.46875 C 60.737249 2.7070519 60.305318 3.0424188 59.90625 3.4375 C 59.502805 3.8369141 59.13659 4.3047578 58.78125 4.84375 C 58.512267 5.2517526 58.243547 5.678724 58 6.15625 C 57.954476 6.2455091 57.919673 6.3459986 57.875 6.4375 C 57.810343 6.5696852 57.750406 6.7070249 57.6875 6.84375 C 57.618434 6.9941867 57.535751 7.1255582 57.46875 7.28125 C 57.420633 7.3925298 57.390825 7.5111197 57.34375 7.625 C 57.05527 8.3249999 56.782943 9.0576134 56.53125 9.84375 C 56.282843 10.619623 56.060282 11.472161 55.84375 12.3125 C 55.62383 13.16599 55.409877 14.037584 55.21875 14.9375 C 55.02738 15.838559 54.854135 16.728941 54.6875 17.65625 C 54.521502 18.579132 54.36429 19.508655 54.21875 20.4375 C 54.150491 20.873544 54.095672 21.284646 54.03125 21.71875 C 53.9571 22.217526 53.882164 22.725416 53.8125 23.21875 C 53.638289 24.455511 53.465751 25.739169 53.3125 26.90625 C 53.244191 27.426307 53.159372 28.001139 53.09375 28.5 C 52.916348 29.847975 52.732954 31.214656 52.5625 32.34375 C 52.533313 32.535989 52.498053 32.784476 52.46875 32.96875 C 52.382124 33.512311 52.276721 34.065197 52.1875 34.53125 C 52.062768 35.182794 51.947739 35.745376 51.8125 36.21875 C 50.816434 39.705265 49.814533 43.202077 48.8125 46.6875 C 46.808435 53.658346 44.818432 60.62945 42.96875 67.65625 C 42.043909 71.16965 41.154183 74.707531 40.3125 78.25 C 39.393241 82.118969 38.557871 85.824121 37.78125 89.46875 C 35.451387 100.40264 33.623154 110.6942 31.5625 122.5 C 31.287988 124.07272 30.993713 125.57948 30.6875 127.0625 C 30.074617 130.02824 29.407145 132.86527 28.71875 135.625 C 28.031332 138.38539 27.318325 141.08483 26.625 143.84375 C 25.930698 146.60201 25.255604 149.41365 24.625 152.375 C 24.309926 153.85583 24.005076 155.3677 23.71875 156.9375 C 23.349156 158.96382 22.937997 161.1867 22.46875 163.5 C 22.461869 163.53392 22.444398 163.55978 22.4375 163.59375 C 22.231486 164.60755 22.031695 165.60412 21.8125 166.65625 C 21.517741 168.07358 21.217265 169.44034 20.90625 170.90625 C 20.904134 170.91621 20.908366 170.92754 20.90625 170.9375 C 19.406884 173.57975 17.601465 181.9297 17.40625 187.375 C 12.961981 203.93256 10.011425 223.62992 8.78125 236.15625 C 8.1731344 240.32074 7.6331188 244.71547 7.15625 249.09375 C 7.0351748 250.20538 6.921589 251.29868 6.8125 252.40625 C 6.6329374 254.16744 6.4545652 255.90931 6.3125 257.65625 C 6.2394285 258.56804 6.187097 259.47887 6.125 260.375 C 6.0873366 260.91661 6.0335302 261.45995 6 262 C 5.99873 262.0204 6.0012636 262.04211 6 262.0625 C 5.9274098 263.23723 5.8645168 264.39551 5.8125 265.5625 L 10.25 265.6875 L 105.34375 268.46875 C 103.95314 257.07572 99.517046 240.60622 96.65625 229.65625 C 93.343229 212.49678 88.881036 201.16884 85.625 183.90625 C 85.272552 179.53232 84.083273 171.83392 83.46875 166.46875 C 83.250904 158.88026 82.262624 152.5882 81.09375 146 C 80.112542 138.06524 79.432475 130.51114 79.03125 123.90625 C 78.630025 117.30136 78.512721 98.364671 78.34375 85.59375 C 78.192831 74.18722 79.451216 62.65974 78.03125 51.375 C 75.933648 34.704954 72.602501 6.9911709 66.03125 2.84375 C 64.940089 2.2288485 63.935777 1.9518417 63.03125 1.96875 z "
+ id="path3039" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 61.875,2.1875 c -7.631069,2.4524148 -8.192471,27.485618 -10.0625,34.03125 -3.984266,13.946059 -8.133267,27.861373 -11.5,42.03125 -3.677036,15.475876 -6.002461,28.50894 -8.75,44.25 -2.196098,12.58178 -5.553141,21.87911 -7.84375,34.4375 -0.750027,4.11207 -1.749443,8.93809 -2.818879,13.97868 -1.501737,2.61961 -3.292514,11.01441 -3.488228,16.47363 -4.444269,16.55756 -7.403652,36.25409 -8.6338274,48.78042 -1.3933467,9.54191 -2.556675,20.22443 -2.9653156,29.39227 l 4.4375,0.125 C 25.787436,260.91938 25.396039,247.5 30.875,247.5 c 5.542318,-0.36632 13.106005,0.28033 18.46875,-1.75 3.80233,-0.24269 18.80862,-1.81039 27.287803,-4.55394 -2.972674,-5.38351 -40.429522,-0.77572 -41.181128,-3.04891 -0.79009,-3.75844 22.037406,-2.8892 25.862075,-6.4284 -5.633785,-4.05581 -12.636459,-2.98549 -18.90625,-4.53125 -8.259178,-4.47263 -10.021785,-2.12697 -14.5625,-5.03125 -3.804605,-5.38834 3.925686,-5.09916 8.237925,-4.57154 2.633674,0.36768 4.08732,-3.52298 -8.122148,-6.71378 1.692925,-1.50811 18.677303,1.55126 19.68665,-1.80946 0.675184,-2.24809 -9.836382,-3.22842 -9.006434,-5.56586 1.144756,-3.22406 20.85376,4.19682 21.266507,0.78564 0.232986,-1.92553 -18.370382,-5.96107 -18.65625,-7.21875 -0.129085,-0.56791 0.69247,-2.63672 2.3125,-2.47555 4.241312,0.42197 12.304364,0.67932 20.25,-0.27445 -3.639213,-2.5396 -10.750542,-3.23092 -15,-3.46875 -4.374651,0.61018 -14.973079,-2.57781 -10.03125,-4.65625 11.096122,-4.28585 0.985178,-4.73874 2.21875,-6.625 1.620932,-2.47856 4.175383,-2.40289 10.567779,-2.08392 3.73145,-0.81878 16.656391,-1.33068 19.258071,-4.32336 -2.151867,-1.89023 -11.866076,1.29588 -16.821845,0.76262 -4.955769,-0.53326 -8.259982,-2.30034 -12.629005,-3.35534 -6.166143,-1.10083 -3.470922,-6.76087 -3.4375,-10.6875 0.04546,-5.34052 -3.564691,-5.66107 0.817961,-6.11996 4.127583,0.43139 10.755257,3.13838 15.932039,1.08871 -0.429099,-2.16517 -11.477175,-4.97722 -15.625,-7.65625 -4.595056,-2.57972 -0.174857,-10.014 3.875,-10.65625 -2.13701,-4.55376 -4.470141,-8.22123 -0.625,-10.625 3.93403,-2.06008 -1.211602,-1.92718 -2.78125,-1.8125 -2.548322,-2.32678 6.161299,-6.78021 8.5625,-7.1875 -1.258831,-4.86256 -8.746359,-3.34494 -7.610862,-7.44606 0.257858,-0.93132 10.624745,0.42888 16.573119,1.00856 -0.217258,-2.81527 -9.502088,-3.95018 -12.806007,-4.3125 -3.769854,-0.41341 -3.398078,-1.88726 -2.591202,-3.92943 0.206201,-0.57003 0.04657,-4.47943 2.125,-3.71875 5.508399,2.016 12.269375,1.92606 19.406493,-0.04284 C 53.409328,98.567929 45.550397,94.539042 44.174939,94.440534 43.651918,88.331623 54.962858,88.35387 55.65625,84.375 c 0.480587,-2.757734 1.177869,-5.117926 1.90625,-5.46875 1.777155,-0.233884 3.339066,1.358935 9.9375,-0.9375 -4.784133,-1.094113 -15.290807,-1.602188 -16.718811,-3.454126 -0.258211,-1.209739 0.03475,-6.782829 -0.004,-8.795874 C 51.419667,63.545293 55.036151,64.250583 58.4375,61 58.29794,59.094278 52.346743,58.124097 53.09375,52.96875 54.115015,51.518295 51.70631,47.506543 54.1875,46 61.93447,41.296152 61.927905,38.849856 56.160801,38.568265 53.9485,38.460245 54.715973,35.900912 54.83216,34.802913 59.485398,34.242905 67.805344,36.680193 69.973847,34.188774 66.071945,33.106579 59.38042,32.489155 57.906493,30.893386 56.063668,28.898224 55.77187,26.36155 57.0625,23.40625 60.04117,19.069489 60.031224,14.295569 59.15625,9.875 58.511341,9.1172267 62.75373,3.5737318 67.199879,5.0702518 66.152319,3.1532732 64.378031,1.446731 61.875,2.1875 z"
+ id="path3053"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssssccccccccccccccssssscccscczcscccccccscscsccsccccccssccscccc" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 65.644903,7.2482403 c -1.981623,1.8946436 -0.395053,4.4929307 0.208749,7.1076567 0.21582,0.934595 -0.928657,1.991752 -0.680776,2.851263 1.007122,3.492129 5.378898,12.496428 4.726092,17.008131 -0.414078,2.861795 -8.291474,0.701038 -12.992961,0.718204 4.789139,3.667457 10.886318,3.527371 13.75933,3.759102 1.211816,14.686235 -10.637395,12.956624 -2.876017,18.561529 -1.582496,9.524798 -4.318963,11.301504 -1.975303,20.008253 -7.618629,0.91777 -9.87978,0.891593 -18.875,-0.0625 5.805734,3.235692 15.341286,3.852108 17.84375,5 4.592512,1.753985 5.370352,1.190356 6.381296,7.487621 0.228136,1.421083 -0.135642,5.604093 -1.38788,7.081288 -0.439894,0.518918 -9.822302,2.603482 -9.985649,3.227207 -0.314607,1.201315 7.907356,0.256755 9.057122,-0.04287 2.682706,-0.69911 1.889158,4.207695 0.722657,7.429685 -3.845427,2.28209 0.697338,0.70426 -3.002777,1.54286 -3.550667,0.89756 -8.887317,1.56978 -12.437985,1.3841 2.472657,5.64584 5.815077,2.62165 7.839199,7.56523 4.565039,3.07249 1.562214,8.84252 6.09375,11.78125 1.166634,0.7016 -7.935167,4.42641 -7.25,7.375 0.49649,2.13662 10.927283,3.18718 11.09375,5.5625 0.364811,5.20549 -0.157591,8.74098 -1.875,9.03174 -7.432265,2.32253 -11.536746,3.59406 -21,3.18701 1.289855,2.78055 10.932872,6.46442 15.375,5.125 17.55536,-3.17094 0.614812,4.90662 7.068507,5.53125 3.880833,0.36267 5.724605,1.44514 -0.813774,7.60734 -12.609353,3.6455 -5.618552,2.2541 -12.804187,3.9554 1.507529,0.47095 4.782565,1.3037 8.432057,1.42177 5.416998,0.17525 7.48773,0.57354 8.4873,1.63849 1.440739,1.48727 0.809876,5.46045 -1.063947,8.605 -6.657309,3.91572 -20.70625,7.28435 -26.983869,6.38844 1.505109,4.09822 5.097371,2.8283 6.521663,3.97731 4.834895,2.80523 11.649861,0.66593 16.509041,3.35886 4.825814,1.52303 2.878294,-0.46075 6.867901,3.03222 3.255126,1.96388 4.16924,8.15334 -0.9375,6.375 -8.347527,-0.068 -11.930812,0.35679 -21.64108,3.03835 26.088001,5.56741 -10.258812,6.81168 -10.517112,9.48495 5.921132,1.06519 12.861698,0.6082 18.823604,1.26311 6.360671,0.60005 13.82158,-4.01529 19.832646,-0.75613 4.150895,2.48134 6.425842,3.33111 4.973786,11.23234 -5.636528,3.05389 -12.216424,7.07523 -23.661286,8.33823 -11.380767,1.25592 -26.977795,0.36664 -35.55091,-2.00856 -0.01502,4.78549 32.946414,6.74659 32.92591,8.11038 -0.09655,6.4217 -20.946749,6.51747 -22.71875,12.5625 -0.1441,2.30499 8.774065,2.70871 11.34375,3.75 L 55.40625,267 l 45.2409,-1.5625 C 99.455582,253.53554 98.036116,242.99559 94.762334,230.90121 90.253792,211.57381 84.638751,194.2439 83.553291,184.2703 81.483752,165.25463 77.361469,139.96018 76.407221,124.25151 75.452973,108.54284 76.233959,98.640885 76.064988,85.869964 75.914069,74.463434 77.241507,62.590687 75.821541,51.305947 74.347907,39.594693 72.934237,23.105779 69.540049,12.493204 68.361052,9.7643765 67.326035,5.6408984 65.644903,7.2482403 z"
+ id="path3834"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssssccccccsssscccccssccccccsccccccccccccscscccccsssscs" />
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="path3171"
+ d="m 52.42614,33.77387 c 3.331067,0.911292 6.237256,1.408491 8.806854,1.578597 m 8.594721,-0.828846 c 1.832401,-0.538654 3.445408,-1.288935 4.926674,-2.164467"
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 41.443093,76.164495 c 2.871562,0.761873 5.631599,1.297466 8.271899,1.646348 M 72.955565,76.23331 c 1.967252,-0.558235 3.731689,-1.179264 5.280256,-1.800195"
+ id="path3173"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3175"
+ d="m 48.59575,98.539577 c 10.700964,1.535263 20.698198,0.05717 29.845543,-5.868281"
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 44.447187,154.71909 c 7.482891,0.96752 14.04059,0.30006 19.78499,-1.29577"
+ id="path3233"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3243"
+ d="m 51.464962,177.48511 c 12.804328,-0.32945 22.632446,-5.15672 30.566491,-10.4624"
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 17.919568,187.98627 c 14.80936,6.33393 27.381392,7.8603 38.047895,6.67818 m 26.979078,-9.80233 c 0.667453,-0.42291 1.32118,-0.85084 1.961452,-1.28207"
+ id="path3245"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path3247"
+ d="m 9.2315288,236.28094 c 2.3202282,1.00856 4.5981102,1.92464 6.8344032,2.75312 m 8.697248,2.85033 c 10.917305,3.10134 20.765639,4.06579 29.647578,3.55287 m 13.329924,-1.96395 c 11.196041,-2.68947 20.553737,-7.65195 28.366647,-12.99998"
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 35.048045,106.14809 c 9.389307,3.91463 17.367844,4.87418 24.14369,4.16184"
+ id="path3249"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ id="path4033"
+ d="M 63.03125 1.96875 C 62.625786 1.9763293 62.246074 2.0682472 61.875 2.1875 C 61.85263 2.194689 61.834749 2.2111739 61.8125 2.21875 C 61.599902 2.2911249 61.389229 2.3619819 61.1875 2.46875 C 60.737249 2.7070519 60.305318 3.0424188 59.90625 3.4375 C 59.502805 3.8369141 59.13659 4.3047578 58.78125 4.84375 C 58.512267 5.2517526 58.243547 5.678724 58 6.15625 C 57.954476 6.2455091 57.919673 6.3459986 57.875 6.4375 C 57.810343 6.5696852 57.750406 6.7070249 57.6875 6.84375 C 57.618434 6.9941867 57.535751 7.1255582 57.46875 7.28125 C 57.420633 7.3925298 57.390825 7.5111197 57.34375 7.625 C 57.05527 8.3249999 56.782943 9.0576134 56.53125 9.84375 C 56.282843 10.619623 56.060282 11.472161 55.84375 12.3125 C 55.62383 13.16599 55.409877 14.037584 55.21875 14.9375 C 55.02738 15.838559 54.854135 16.728941 54.6875 17.65625 C 54.521502 18.579132 54.36429 19.508655 54.21875 20.4375 C 54.150491 20.873544 54.095672 21.284646 54.03125 21.71875 C 53.9571 22.217526 53.882164 22.725416 53.8125 23.21875 C 53.638289 24.455511 53.465751 25.739169 53.3125 26.90625 C 53.244191 27.426307 53.159372 28.001139 53.09375 28.5 C 52.916348 29.847975 52.732954 31.214656 52.5625 32.34375 C 52.533313 32.535989 52.498053 32.784476 52.46875 32.96875 C 52.382124 33.512311 52.276721 34.065197 52.1875 34.53125 C 52.062768 35.182794 51.947739 35.745376 51.8125 36.21875 C 50.816434 39.705265 49.814533 43.202077 48.8125 46.6875 C 46.808435 53.658346 44.818432 60.62945 42.96875 67.65625 C 42.043909 71.16965 41.154183 74.707531 40.3125 78.25 C 39.393241 82.118969 38.557871 85.824121 37.78125 89.46875 C 35.451387 100.40264 33.623154 110.6942 31.5625 122.5 C 31.287988 124.07272 30.993713 125.57948 30.6875 127.0625 C 30.074617 130.02824 29.407145 132.86527 28.71875 135.625 C 28.031332 138.38539 27.318325 141.08483 26.625 143.84375 C 25.930698 146.60201 25.255604 149.41365 24.625 152.375 C 24.309926 153.85583 24.005076 155.3677 23.71875 156.9375 C 23.349156 158.96382 22.937997 161.1867 22.46875 163.5 C 22.461869 163.53392 22.444398 163.55978 22.4375 163.59375 C 22.231486 164.60755 22.031695 165.60412 21.8125 166.65625 C 21.517741 168.07358 21.217265 169.44034 20.90625 170.90625 C 20.904134 170.91621 20.908366 170.92754 20.90625 170.9375 C 19.406884 173.57975 17.601465 181.9297 17.40625 187.375 C 12.961981 203.93256 10.011425 223.62992 8.78125 236.15625 C 8.1731344 240.32074 7.6331188 244.71547 7.15625 249.09375 C 7.0351748 250.20538 6.921589 251.29868 6.8125 252.40625 C 6.6329374 254.16744 6.4545652 255.90931 6.3125 257.65625 C 6.2394285 258.56804 6.187097 259.47887 6.125 260.375 C 6.0873366 260.91661 6.0335302 261.45995 6 262 C 5.99873 262.0204 6.0012636 262.04211 6 262.0625 C 5.9274098 263.23723 5.8645168 264.39551 5.8125 265.5625 L 10.25 265.6875 L 105.34375 268.46875 C 103.95314 257.07572 99.517046 240.60622 96.65625 229.65625 C 93.343229 212.49678 88.881036 201.16884 85.625 183.90625 C 85.272552 179.53232 84.083273 171.83392 83.46875 166.46875 C 83.250904 158.88026 82.262624 152.5882 81.09375 146 C 80.112542 138.06524 79.432475 130.51114 79.03125 123.90625 C 78.630025 117.30136 78.512721 98.364671 78.34375 85.59375 C 78.192831 74.18722 79.451216 62.65974 78.03125 51.375 C 75.933648 34.704954 72.602501 6.9911709 66.03125 2.84375 C 64.940089 2.2288485 63.935777 1.9518417 63.03125 1.96875 z "
+ style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2d2f3c;stroke-width:1.99999988000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <path
+ transform="matrix(0.65217391,0,0,0.65217391,56.761729,88.004023)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path4052"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4054"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.4347826,0,0,0.4347826,47.826602,140.53021)" />
+ <path
+ transform="matrix(0.65217391,0,0,0.65217391,33.404412,83.602295)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path4056"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4058"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.65217391,0,0,0.65217391,60.082041,85.171992)" />
+ <path
+ transform="matrix(0.58763587,0,0,0.58763587,63.406599,106.19356)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path4060"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4062"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.52309782,0,0,0.52309782,64.582721,113.83622)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4064"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.65217391,0,0,0.65217391,42.503917,29.800899)" />
+ <path
+ transform="matrix(0.46963275,0,0,0.46963275,50.531869,56.181457)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path4066"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4068"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.58763587,0,0,0.58763587,49.148787,47.990436)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4070"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.83471506,0,0,0.83471506,35.863434,-35.872725)" />
+ <path
+ transform="matrix(0.45073,0,0,0.45073,50.815075,83.054549)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path4072"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.65217391,0,0,0.65217391,32.836442,-52.682475)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path4074"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4076"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.45073,0,0,0.45073,41.1476,0.57117523)" />
+ <path
+ transform="matrix(0.45073,0,0,0.45073,46.188498,2.0903499)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path4078"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4080"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.35945942,0,0,0.35945942,53.583216,27.952348)" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4082"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.42399747,0,0,0.42399747,47.628881,-54.871167)" />
+ <path
+ transform="matrix(0.42399747,0,0,0.42399747,50.66723,-56.252235)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path4084"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4086"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ transform="matrix(0.42399747,0,0,0.42399747,50.529123,-52.868619)" />
+ <path
+ transform="matrix(0.74344449,0,0,0.74344449,31.587476,-132.19896)"
+ d="m 53.026315,253.0921 a 1.5131578,1.5131578 0 1 1 -3.026316,0 1.5131578,1.5131578 0 1 1 3.026316,0 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path4088"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ </g>
+</svg>
Binary file share/hedgewars/Data/Themes/Cave/Stalagmite02.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/Stalagmite02.svg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.1 r9760"
+ width="64"
+ height="162"
+ version="1.0"
+ sodipodi:docname="Stalactite02.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="Stalagmite02.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 130 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="240 : 130 : 1"
+ inkscape:persp3d-origin="120 : 86.666667 : 1"
+ id="perspective45" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-height="824"
+ inkscape:window-width="1434"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="2.6870058"
+ inkscape:cx="-88.785874"
+ inkscape:cy="73.963999"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="layer2"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-maximized="0"
+ inkscape:snap-global="false">
+ <sodipodi:guide
+ orientation="1,0"
+ position="1,-6.3157894"
+ id="guide2457" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="63,-11.723086"
+ id="guide2459" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="13.223684,3.0921052"
+ id="guide2461" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="97.631578,43"
+ id="guide3045" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="11,41.842105"
+ id="guide3047" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="56,23.68421"
+ id="guide3049" />
+ </sodipodi:namedview>
+ <g
+ inkscape:groupmode="layer"
+ id="layer1"
+ inkscape:label="tmp"
+ style="display:inline"
+ transform="translate(0,-98)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="main"
+ transform="translate(0,-98)">
+ <path
+ style="color:#000000;fill:#4b4e64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 0.36574672,265.60261 C 1.2291358,258.51609 3.3741818,251.7943 5.1503698,244.98336 8.1902838,233.32653 11.986021,222.49083 13.1011,210.36611 c 1.089584,-11.84751 3.012031,-24.91086 3.604497,-34.68174 0.592466,-9.77087 0.315737,-15.88489 0.420646,-23.82847 0.0937,-7.09492 -0.695128,-14.26704 0.18649,-21.2862 1.302339,-10.36886 3.385709,-27.60823 7.465607,-30.18795 7.226354,-4.079707 7.483028,16.05538 8.826481,20.76644 2.473711,8.67452 5.050841,17.3186 7.141145,26.13234 2.282968,9.62607 3.717478,17.73623 5.423345,27.52725 1.363495,7.82593 3.442605,13.61243 4.864778,21.42382 1.328521,7.297 3.924178,18.20964 5.187265,25.5228 2.45772,14.22994 5.332831,28.56687 5.932616,42.04764"
+ id="path3039"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csszsacsssssc" />
+ <path
+ style="color:#000000;fill:#636885;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 24.811427,100.5015 c -3.924656,4.92456 -6.403893,21.40046 -7.493664,30.0769 -0.881619,7.01917 -0.10032,14.1887 -0.194022,21.28362 -0.104909,7.94358 0.165617,14.05306 -0.426849,23.82393 -0.592466,9.77089 -2.499825,22.8242 -3.58941,34.67172 -1.115078,12.12472 -4.9149932,22.96911 -7.9549082,34.62594 -0.659154,2.52758 -3.504139,16.67591 -4.18053508,19.20214 2.24036208,-10e-6 6.55942208,1.49606 9.36054728,-1.54746 2.5362,-2.75566 2.5363,-10.07955 4.564773,-10.07955 3.441065,-0.22785 4.333043,-1.86561 7.662613,-3.1285 1.270386,-1.08354 7.936977,1.01209 7.696779,-0.63152 -0.670072,-4.58512 -19.344941,-3.89677 -18.216705,-7.35182 0.22791,-0.69794 21.338924,3.68485 23.002498,3.18111 4.842369,-1.00139 12.657083,0.15319 15.82165,-2.8255 -3.49785,-2.52274 -8.776014,0.47254 -12.668744,-0.48893 -2.538375,-1.1789 -4.364774,-1.77054 -7.043907,-1.70551 -3.00766,-0.25688 -5.990672,-2.38892 -9.022031,-2.13095 -2.666386,-0.57912 -3.885032,1.51825 -6.322957,-0.17484 -2.362165,-3.35157 0.711004,-6.72001 3.388349,-6.39183 0.782999,-0.15936 3.43454,-0.80584 6.848891,-1.97565 -3.600927,-1.31022 -6.269432,-1.93206 -4.863997,-3.39605 2.320753,-2.73275 3.91445,-3.06241 6.838875,-3.74834 3.329785,-0.63938 11.160242,-1.34494 9.354302,-1.90142 -2.259479,-1.57964 -7.676934,-1.78537 -10.3153,-1.9333 -2.632803,0.70815 -5.087323,-0.91623 -7.683277,-0.86965 -0.05709,-4.31798 6.842319,-2.52816 10.438392,-3.89055 2.316748,-0.50929 5.54411,-0.47287 7.159417,-2.33434 -3.000029,-1.59822 -6.368235,-1.9232 -9.487683,-3.15822 -2.48619,-1.17702 -5.734799,-1.22567 -8.361679,-1.86239 -2.021227,-0.36151 -1.934562,-1.01292 -1.117587,-2.5596 4.25797,1.14618 8.381091,2.57217 14.461466,2.90302 -9.503886,-3.15815 -12.283162,-6.99587 -12.16102,-7.65816 -0.394508,-3.29836 0.481435,-9.36805 3.202495,-9.65348 3.334412,-0.71956 9.150332,0.83774 12.364445,-0.43717 2.075018,0.0564 0.380399,-1.66414 -0.663421,-1.77117 -2.534116,-1.34423 -5.163976,-1.32095 -7.916105,-1.21295 -2.43554,0.25629 -3.658133,-0.93084 -6.01956,-1.5776 -1.331054,-2.83504 -1.870138,-9.08556 4.586187,-8.11465 3.55901,-0.53707 -3.031736,-1.7975 -4.006286,-1.72616 -1.582178,-1.44728 -1.494941,-2.70307 -0.0041,-2.9564 2.828002,-0.28861 8.620446,0.5854 11.164576,-0.15988 -0.134891,-1.75111 -4.813911,-2.49029 -6.774373,-2.3449 -2.353454,-0.0744 -6.877639,-1.6594 -5.390591,-5.67854 0.574262,-1.59041 4.917539,-5.50144 1.532775,-5.7443 -0.694971,-0.9793 1.713921,-3.46566 2.818636,-3.99871 1.832227,-1.64879 5.96958,-0.52532 6.979483,-2.68389 -2.841708,-1.36777 -9.371979,-2.45125 -4.583211,-2.08559 -0.206835,-1.3107 -5.873672,-2.78322 -5.897731,-4.03535 2.842676,-3.11292 -2.824048,-2.66948 -1.140985,-5.89401 0.899437,-3.4618 -0.716026,-6.61128 -0.252229,-9.81793 1.525424,-2.17045 -0.351146,-4.00313 -0.135816,-6.0418 1.348147,-3.5039 4.994013,-3.46002 7.663876,-4.57712 2.198267,-0.70135 0.198114,-0.72957 -1.025188,-1.29858 -2.682877,-0.12202 -4.781899,-1.82939 -3.980584,-3.6676 1.849369,-2.69749 3.525291,-3.76499 2.982041,-6.51461 -0.400405,-0.47133 1.101258,-3.70034 3.861743,-2.7695 -0.840871,-3.1148 -4.879696,-3.07506 -4.860349,-3.26241 z"
+ id="path3053"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssssscsccssccccccccccccccccccccccccccccccccccccccccccccc" />
+ <path
+ style="color:#000000;fill:#3a3d4e;fill-opacity:1;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 28.700865,104.20401 c -0.784266,2.55211 -0.623383,2.91419 0.561387,4.86334 0.431006,1.98715 0.38559,3.87582 -0.46618,4.47899 -1.285962,0.91063 -3.597299,0.6432 -4.788317,1.99207 1.259005,1.68266 4.622735,0.0726 5.921449,3.25389 0.522829,2.35263 -2.558659,3.35998 -2.134244,6.20201 -0.311759,1.87985 -2.785937,3.846 -1.406746,5.00884 1.804766,1.52166 3.567817,3.78801 2.923859,5.74931 -0.647921,1.97337 1.3895,3.91612 1.917084,5.87969 0.918627,2.09537 1.950317,5.69551 0.925113,6.15244 -2.239995,0.99838 -11.826852,-0.58332 -13.019657,-0.42267 3.98641,4.58094 11.550652,2.95998 13.132884,3.6083 2.824998,1.15755 3.677759,1.00255 4.433086,4.89679 0.05116,3.77245 4.108768,6.316 2.735712,10.11545 -1.744418,2.23554 -4.640564,-0.50315 -6.937854,0.0185 -2.268817,-8e-5 -4.267358,-0.45702 -5.121354,0.20061 2.43554,0.50513 6.882994,1.2129 8.13971,4.28785 0.554951,0.352 -9.633563,0.73994 -12.434384,0.75221 4.113419,2.29999 14.068697,3.18958 14.159504,3.65652 0.428561,2.20373 -1.522063,3.12756 0.371924,4.35807 2.399437,1.44563 2.965653,8.77266 0.74134,9.14994 -4.614481,0.34203 -11.190128,0.56129 -14.81332,0.0793 2.644388,1.0423 7.265808,2.31392 9.895178,3.3277 2.996149,0.8928 7.276052,-1.80566 7.900673,2.41024 0.31855,2.70539 -1.841801,8.08963 1.916623,8.37796 2.409494,0.22559 8.352027,-3.31055 4.292537,0.52238 -2.672737,2.01298 -5.545457,2.72991 -8.502367,3.14764 -2.909929,-9e-5 -13.262604,-0.58595 -16.520055,-1.2955 2.069412,2.65833 12.521071,4.64786 14.781668,5.04783 3.174761,1.16476 6.600019,1.84996 8.358288,5.346 -0.745368,3.19019 -5.256626,4.53443 -7.551433,5.35098 -3.898095,0.17384 -8.661795,1.42485 -11.185058,2.08558 1.448957,0.44449 5.015252,0.9744 5.899553,1.68909 3.001849,1.74486 5.662165,-0.25573 8.679088,1.41929 2.996205,0.94733 3.601636,0.46453 6.078669,2.63717 2.021016,1.22154 2.216399,4.04191 -0.582066,4.70354 -4.992162,0.9157 -9.965547,1.90822 -15.440419,1.39561 -2.535091,-0.23736 -14.41561,-1.35845 -15.692465,-1.27735 3.676257,1.54643 15.118944,4.49074 18.820515,4.89809 3.949154,0.37324 9.586477,-0.18039 13.318575,1.84683 1.637581,0.98072 3.711132,-0.17697 4.721091,1.06199 0.984675,1.20794 -17.331287,3.90864 -23.224161,3.11792 4.427592,2.74301 19.405058,1.90498 24.55927,0.82256 -1.668603,3.57248 -5.9957,2.86315 -8.886214,4.46269 -3.392141,0.0212 -6.926797,0.42108 -9.875729,2.65473 -3.067785,2.64449 -13.520842,5.46499 -14.854677,10.02355 -0.09848,1.57817 6.631453,1.72177 7.404227,2.54066 l 32.302265,-1.07848 c -0.599787,-13.48083 -3.429531,-27.69069 -5.887255,-41.92065 -1.263081,-7.31316 -3.497603,-18.07047 -4.82613,-25.36749 -1.422167,-7.81143 -3.409727,-13.33328 -4.773216,-21.15921 -1.705868,-9.79102 -3.189915,-18.48041 -5.472883,-28.10649 -2.090304,-8.81374 -4.629736,-17.78997 -7.103453,-26.46449 -1.015584,-3.56134 -1.41104,-13.50867 -3.391635,-16.50184 z"
+ id="path3834"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccscccsscscsccccccscccccccccccccccccscccscccccccsssssc" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3799"
+ d="m 28.271879,234.65177 c 13.649475,1.41408 22.453801,-2.09001 29.226967,-5.45179"
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 8.1738998,238.92128 c 2.7014942,1.61782 5.9611392,2.69941 9.0272732,3.42602 m 32.244338,-0.1034 c 3.27824,-0.84386 6.442556,-2.01674 9.052834,-3.66484"
+ id="path3029"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 17.396632,146.36817 c 10.645737,3.99582 17.89711,1.59066 22.816521,-1.31706"
+ id="path3805"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path3803"
+ d="m 16.979161,169.21227 c 1.037775,0.55957 2.082689,0.97823 3.104196,1.28413 m 8.94132,0.86721 c 4.349558,-0.0455 7.811239,-0.63838 10.810772,-1.63239 m 2.722328,-1.05957 c 0.79253,-0.35545 1.557859,-0.74038 2.306182,-1.15129"
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="color:#000000;fill:none;stroke:#323442;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 14.099973,201.82684 c 7.283351,3.1367 13.246351,4.21668 18.236983,4.36831"
+ id="path3801"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ sodipodi:nodetypes="csszsacsssssc"
+ inkscape:connector-curvature="0"
+ id="path3828"
+ d="M 0.36574672,265.60262 C 1.2291358,258.5161 3.3741828,251.79431 5.1503698,244.98337 8.1902848,233.32654 11.986022,222.49084 13.1011,210.36612 c 1.089585,-11.84752 3.012031,-24.91086 3.604497,-34.68175 0.592466,-9.77087 0.315738,-15.88489 0.420646,-23.82847 0.0937,-7.09491 -0.695127,-14.26703 0.186491,-21.2862 1.302339,-10.36886 3.385708,-27.60823 7.465607,-30.18794 7.226353,-4.079711 7.483028,16.05537 8.826481,20.76643 2.473711,8.67453 5.05084,17.31861 7.141145,26.13234 2.282968,9.62608 3.717477,17.73623 5.423345,27.52725 1.363495,7.82594 3.442605,13.61243 4.864778,21.42382 1.328521,7.29701 3.924178,18.20965 5.187265,25.52281 2.45772,14.22994 5.332831,28.56687 5.932616,42.04764"
+ style="color:#000000;fill:none;stroke:#2d2f3c;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3809"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 c 0,0.8357 -0.677464,1.51316 -1.513158,1.51316 -0.835694,0 -1.513158,-0.67746 -1.513158,-1.51316 0,-0.83569 0.677464,-1.51316 1.513158,-1.51316 0.835694,0 1.513158,0.67747 1.513158,1.51316 z"
+ transform="matrix(0.65217391,0,0,0.65217391,20.192816,83.634061)" />
+ <path
+ transform="matrix(0.4347826,0,0,0.4347826,29.812382,142.99619)"
+ d="m 53.026315,253.0921 c 0,0.8357 -0.677464,1.51316 -1.513158,1.51316 -0.835694,0 -1.513158,-0.67746 -1.513158,-1.51316 0,-0.83569 0.677464,-1.51316 1.513158,-1.51316 0.835694,0 1.513158,0.67747 1.513158,1.51316 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path3811"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3813"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 c 0,0.8357 -0.677464,1.51316 -1.513158,1.51316 -0.835694,0 -1.513158,-0.67746 -1.513158,-1.51316 0,-0.83569 0.677464,-1.51316 1.513158,-1.51316 0.835694,0 1.513158,0.67747 1.513158,1.51316 z"
+ transform="matrix(0.65217391,0,0,0.65217391,15.390185,86.068271)" />
+ <path
+ transform="matrix(0.65217391,0,0,0.65217391,11.245448,54.291956)"
+ d="m 53.026315,253.0921 c 0,0.8357 -0.677464,1.51316 -1.513158,1.51316 -0.835694,0 -1.513158,-0.67746 -1.513158,-1.51316 0,-0.83569 0.677464,-1.51316 1.513158,-1.51316 0.835694,0 1.513158,0.67747 1.513158,1.51316 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path3815"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3817"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 c 0,0.8357 -0.677464,1.51316 -1.513158,1.51316 -0.835694,0 -1.513158,-0.67746 -1.513158,-1.51316 0,-0.83569 0.677464,-1.51316 1.513158,-1.51316 0.835694,0 1.513158,0.67747 1.513158,1.51316 z"
+ transform="matrix(0.4347826,0,0,0.4347826,20.404487,112.40409)" />
+ <path
+ transform="matrix(0.65217391,0,0,0.65217391,14.995448,58.69985)"
+ d="m 53.026315,253.0921 c 0,0.8357 -0.677464,1.51316 -1.513158,1.51316 -0.835694,0 -1.513158,-0.67746 -1.513158,-1.51316 0,-0.83569 0.677464,-1.51316 1.513158,-1.51316 0.835694,0 1.513158,0.67747 1.513158,1.51316 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path3819"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3821"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 c 0,0.8357 -0.677464,1.51316 -1.513158,1.51316 -0.835694,0 -1.513158,-0.67746 -1.513158,-1.51316 0,-0.83569 0.677464,-1.51316 1.513158,-1.51316 0.835694,0 1.513158,0.67747 1.513158,1.51316 z"
+ transform="matrix(0.47826086,0,0,0.47826086,16.585837,51.926396)" />
+ <path
+ transform="matrix(0.65217391,0,0,0.65217391,5.7849228,11.726166)"
+ d="m 53.026315,253.0921 c 0,0.8357 -0.677464,1.51316 -1.513158,1.51316 -0.835694,0 -1.513158,-0.67746 -1.513158,-1.51316 0,-0.83569 0.677464,-1.51316 1.513158,-1.51316 0.835694,0 1.513158,0.67747 1.513158,1.51316 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path3823"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3825"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 c 0,0.8357 -0.677464,1.51316 -1.513158,1.51316 -0.835694,0 -1.513158,-0.67746 -1.513158,-1.51316 0,-0.83569 0.677464,-1.51316 1.513158,-1.51316 0.835694,0 1.513158,0.67747 1.513158,1.51316 z"
+ transform="matrix(0.40622372,0,0,0.40622372,9.1974458,26.437947)" />
+ <path
+ transform="matrix(0.40622372,0,0,0.40622372,11.895616,28.484835)"
+ d="m 53.026315,253.0921 c 0,0.8357 -0.677464,1.51316 -1.513158,1.51316 -0.835694,0 -1.513158,-0.67746 -1.513158,-1.51316 0,-0.83569 0.677464,-1.51316 1.513158,-1.51316 0.835694,0 1.513158,0.67747 1.513158,1.51316 z"
+ sodipodi:ry="1.5131578"
+ sodipodi:rx="1.5131578"
+ sodipodi:cy="253.0921"
+ sodipodi:cx="51.513157"
+ id="path3827"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#2d2f3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3829"
+ sodipodi:cx="51.513157"
+ sodipodi:cy="253.0921"
+ sodipodi:rx="1.5131578"
+ sodipodi:ry="1.5131578"
+ d="m 53.026315,253.0921 c 0,0.8357 -0.677464,1.51316 -1.513158,1.51316 -0.835694,0 -1.513158,-0.67746 -1.513158,-1.51316 0,-0.83569 0.677464,-1.51316 1.513158,-1.51316 0.835694,0 1.513158,0.67747 1.513158,1.51316 z"
+ transform="matrix(0.40622372,0,0,0.40622372,10.40697,32.34601)" />
+ </g>
+</svg>
Binary file share/hedgewars/Data/Themes/Cave/horizont.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/horizont.svg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,492 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ enable-background="new"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.1 r9760"
+ width="2048"
+ height="1024"
+ version="1.0"
+ sodipodi:docname="horizont.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="horizont.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ style="display:inline">
+ <sodipodi:namedview
+ inkscape:window-height="824"
+ inkscape:window-width="1434"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="0.27197264"
+ inkscape:cx="1294.0194"
+ inkscape:cy="607.43297"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="layer2"
+ inkscape:window-maximized="0"
+ inkscape:snap-global="false" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5">
+ <filter
+ inkscape:collect="always"
+ id="filter4015-4"
+ color-interpolation-filters="sRGB">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="5.1957342"
+ id="feGaussianBlur4017-8" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter3823">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.76025"
+ id="feGaussianBlur3825" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter3831">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.72375496"
+ id="feGaussianBlur3833" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter3992">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.14056446"
+ id="feGaussianBlur3994" />
+ </filter>
+ <filter
+ color-interpolation-filters="sRGB"
+ inkscape:collect="always"
+ id="filter3992-5">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.14056446"
+ id="feGaussianBlur3994-7" />
+ </filter>
+ <filter
+ color-interpolation-filters="sRGB"
+ inkscape:collect="always"
+ id="filter3992-2">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.14056446"
+ id="feGaussianBlur3994-9" />
+ </filter>
+ <filter
+ color-interpolation-filters="sRGB"
+ inkscape:collect="always"
+ id="filter3992-4">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.14056446"
+ id="feGaussianBlur3994-1" />
+ </filter>
+ <filter
+ color-interpolation-filters="sRGB"
+ inkscape:collect="always"
+ id="filter3992-9">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.14056446"
+ id="feGaussianBlur3994-3" />
+ </filter>
+ <filter
+ color-interpolation-filters="sRGB"
+ inkscape:collect="always"
+ id="filter3992-21">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.14056446"
+ id="feGaussianBlur3994-2" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter4075">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.13936479"
+ id="feGaussianBlur4077" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter4093">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.1063772"
+ id="feGaussianBlur4095" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter4111">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.09131917"
+ id="feGaussianBlur4113" />
+ </filter>
+ <filter
+ color-interpolation-filters="sRGB"
+ inkscape:collect="always"
+ id="filter4111-2">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.09131917"
+ id="feGaussianBlur4113-9" />
+ </filter>
+ <filter
+ color-interpolation-filters="sRGB"
+ inkscape:collect="always"
+ id="filter4111-9">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.09131917"
+ id="feGaussianBlur4113-4" />
+ </filter>
+ <filter
+ color-interpolation-filters="sRGB"
+ inkscape:collect="always"
+ id="filter4111-7">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.09131917"
+ id="feGaussianBlur4113-3" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter4284">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.8339424"
+ id="feGaussianBlur4286" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter4288">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.8339424"
+ id="feGaussianBlur4290" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter3884">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="1.6668516"
+ id="feGaussianBlur3886" />
+ </filter>
+ </defs>
+ <g
+ style="display:inline"
+ inkscape:label="main"
+ id="layer2"
+ inkscape:groupmode="layer">
+ <g
+ id="g4328"
+ mask="none"
+ style="filter:url(#filter3884)">
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m -242.84375,1322.4062 c -4.85509,0.2256 -9.73424,1.7368 -13.59375,4.75 4.99587,-2.2421 10.28385,-3.832 15.6875,-4.7187 l -1.03125,-0.031 z"
+ id="path4265" />
+ <path
+ id="path2418"
+ d="M 1423.9688 578.5 C 1419.1407 581.75415 1413.561 584.24486 1409.3125 588.21875 C 1406.5054 593.08003 1403.9587 607.52698 1399.125 610.84375 C 1395.139 615.14715 1393.5754 620.66128 1389.8438 625.25 C 1386.716 631.02767 1384.3012 637.1848 1381.2188 642.96875 C 1379.1859 649.90349 1382.861 658.85831 1379.2812 665.5 L 1380.75 666.40625 C 1380.0406 676.29574 1372.6909 681.76587 1371.8438 691.625 C 1366.8117 701.18568 1359.2858 710.89851 1358.6562 722.0625 C 1352.5994 733.39936 1350.3417 746.23205 1344.9375 757.84375 C 1341.6958 767.09695 1341.6587 777.32879 1336.875 786.0625 C 1333.4822 795.53216 1333.6626 805.74264 1332.3125 815.59375 C 1324.9493 826.71998 1318.2445 838.28131 1311.9688 850.03125 C 1308.9852 857.73366 1310.2441 866.63844 1305.8438 873.875 C 1299.3465 890.28292 1286.4188 902.77481 1275.5 916.21875 C 1270.9826 923.31499 1263.6536 927.72886 1256.8125 932.28125 C 1249.8649 935.52906 1242.6451 938.09553 1235.6562 941.25 C 1228.4663 941.52391 1221.3019 942.39105 1214.25 943.75 C 1207.5126 944.76921 1200.8177 946.00541 1194 946.375 C 1183.4418 947.76884 1172.8514 948.98312 1162.2188 949.625 C 1156.3353 950.14959 1150.4795 950.93043 1144.625 951.6875 C 1143.8788 949.46212 1143.1744 947.16092 1142.5938 944.71875 C 1141.2655 939.13817 1138.4082 934.31489 1137.0625 929.21875 C 1135.355 922.75308 1135.0957 916.05088 1132.6562 909.03125 C 1130.5267 902.9011 1126.1266 900.05052 1123.5625 893.96875 C 1121.3193 888.64817 1120.9393 880.09305 1118.6562 874.78125 C 1117.3157 871.66113 1114.6976 864.94049 1112.5 858.25 C 1110.3433 851.68364 1108.6753 845.09807 1100.2188 847.03125 C 1094.9305 848.42774 1092.5464 855.77539 1089.0625 863.96875 C 1086.1786 870.75124 1081.9312 878.01482 1080.125 883.84375 C 1078.7673 888.22559 1080.0026 893.71165 1079.8438 898.25 C 1079.686 902.73553 1078.1287 906.27267 1077.6875 910.71875 C 1076.6938 920.73326 1078.3856 929.13068 1074.4688 940.71875 C 1072.6644 946.05506 1071.7015 952.62906 1069.7812 959.28125 C 1065.7897 959.58518 1061.8193 959.89113 1057.8438 960.34375 C 1045.5813 962.13128 1033.1453 961.95039 1020.8438 963.375 C 1010.7133 963.83386 1000.5533 964.32186 990.40625 964 C 980.64872 963.85786 971.21649 961.06272 962.15625 957.65625 C 955.91198 955.55789 950.66175 951.31787 944.59375 948.8125 C 940.0959 945.79008 938.17846 940.0038 933.15625 937.625 C 928.13268 931.7918 921.64219 927.59612 915.78125 922.71875 C 912.53709 918.31171 908.72504 914.32313 904.25 911.09375 C 899.26701 907.47951 894.91192 903.14075 891.15625 898.28125 C 887.67779 894.32949 884.04188 890.31371 882.15625 885.3125 C 876.44636 879.77023 872.27935 872.7329 869.8125 865.1875 C 863.28808 859.76538 864.83755 849.70787 858.65625 844 C 853.37103 836.73426 850.23969 827.92378 843.5625 821.6875 C 839.68702 816.96157 837.39868 811.00353 836.84375 804.9375 C 833.06372 799.26666 829.9619 793.13779 827.75 786.6875 C 821.37786 779.13686 811.49429 774.30945 808.21875 764.40625 C 806.4411 759.05037 803.80778 753.698 798.375 751.28125 C 793.17927 748.97106 792.47535 742.04405 786.4375 740.96875 C 779.16728 738.40032 770.9924 736.04246 763.40625 738.59375 C 760.26883 739.46239 759.21036 740.92123 758.21875 745 C 756.35424 747.47982 755.26345 748.28025 754.625 752.5 C 754.6047 757.50717 751.88011 761.39718 749.4375 765.375 C 745.30697 769.10732 745.51564 774.1361 745.71875 779.0625 C 743.08903 784.4673 738.54313 788.62501 736.9375 794.625 C 733.19231 799.72583 734.14496 806.00427 731.375 811.46875 C 729.42522 816.19149 725.08336 819.34778 723.25 824.1875 C 720.69343 828.01847 718.743 832.34682 718.53125 837.03125 C 718.2576 841.58711 719.04504 846.65358 715.59375 850.3125 C 711.58305 854.60172 707.08006 858.67074 705.90625 864.75 C 702.31096 869.50872 705.83195 876.89273 700.75 880.71875 C 695.21494 883.37682 696.24152 890.69452 692.6875 894.78125 C 686.97748 898.05646 684.08872 904.41679 678.84375 907.65625 C 673.53838 910.15711 669.70688 914.18933 666.3125 918.71875 C 661.28355 922.29496 654.71411 922.11527 649.09375 924.40625 C 642.23111 925.88177 635.82798 929.26209 628.71875 929.5625 C 618.1894 930.68135 607.74737 932.48662 597.28125 934.03125 C 572.75911 936.48291 548.08807 936.49103 523.46875 936.78125 C 509.90051 936.80385 496.2931 936.83105 482.75 937.28125 C 477.54242 937.88432 472.31041 938.04953 467.125 938.875 C 457.85579 939.37284 447.94979 938.34095 439.96875 933.25 C 436.70935 930.32169 433.96759 926.8161 431.3125 923.3125 C 429.36377 920.23721 426.60124 917.65687 424.46875 914.875 C 422.38238 908.36503 416.74899 902.93323 417.125 895.71875 C 415.81786 886.16644 407.77763 879.19979 406.4375 869.625 C 404.1901 862.12537 401.57284 854.57128 401.34375 846.6875 C 397.91858 833.46174 406.06738 819.91316 401.3125 806.8125 C 399.42628 800.60207 397.67142 794.08102 398.84375 787.5625 C 398.68366 777.46332 392.59926 768.01949 394.8125 757.78125 C 395.13044 748.64388 391.15967 739.70654 392.90625 730.5625 C 390.11851 721.78752 387.62931 712.42479 389.4375 703.1875 C 387.29894 694.30864 381.30039 685.79965 383.6875 676.3125 C 384.15009 669.74369 379.97254 663.69003 381.03125 657.09375 C 377.5713 651.49128 382.18799 644.61105 378.9375 638.875 C 377.01264 633.67089 370.06715 632.99697 368.59375 627.65625 C 366.85631 621.00539 358.54217 624.76057 354.5 626.9375 C 348.60418 629.90526 346.4879 636.52439 343.46875 641.9375 C 341.71099 647.43112 340.10191 653.04751 337.25 658.21875 C 336.19046 664.82609 335.52602 671.68028 332.03125 677.5625 C 329.67184 682.31754 326.96316 687.10578 326.34375 692.46875 C 319.89002 701.21201 314.70714 710.81871 309.65625 720.40625 C 306.7713 728.31192 307.9522 737.68628 302.34375 744.53125 C 297.10638 752.55347 299.66019 763.28395 293.9375 771.09375 C 290.4112 780.34381 287.91773 790.17997 282.1875 798.40625 C 281.36762 808.26249 274.81082 816.13923 270.84375 824.84375 C 269.33061 833.38849 268.97625 842.53027 264.78125 850.28125 C 259.07366 857.24063 251.52898 863.33629 249.15625 872.40625 C 246.677 877.11526 245.80493 882.30023 245.0625 887.5 C 244.24977 893.33079 240.80179 898.22002 236.53125 902.09375 C 233.57622 905.32911 230.5048 908.46699 226.5625 910.5 C 221.78186 913.07439 217.37031 916.4537 212.03125 917.78125 C 201.82571 921.60787 190.75341 920.42968 180.09375 921.25 C 155.41922 922.23527 130.70959 922.3616 106.03125 921.5 C 93.597063 921.10488 81.286942 919.27368 68.9375 917.90625 C 64.76547 917.40238 60.439692 915.96361 58.3125 912.6875 C 55.005747 912.31863 51.268851 910.72346 51.65625 907.3125 C 47.37669 903.9963 47.871496 898.22176 47.28125 893.4375 C 46.16139 888.39977 45.982813 883.01412 42.9375 878.625 C 41.109321 875.15333 38.124659 871.6867 38.125 867.65625 C 39.905177 861.00552 43.498431 853.5779 39.84375 846.90625 C 38.468308 840.81289 35.847866 835.07739 34 829.15625 C 33.894612 823.50601 31.539454 818.56255 28.40625 814 C 25.439994 808.85739 22.686676 803.1602 23.0625 797.0625 C 18.678424 789.05944 20.310214 779.32526 16.3125 771.1875 C 17.134576 762.26804 16.22055 752.71625 11.1875 745.0625 C 7.3731867 735.19617 5.0682888 724.6363 -0.8125 715.6875 C -3.9847033 709.13078 -4.6785127 701.74044 -4.96875 694.5625 C -9.7673474 687.30647 -13.050802 679.1734 -15.75 670.9375 C -15.493143 663.52171 -15.434413 655.03412 -20.9375 649.3125 C -24.275062 641.04237 -31.30278 634.92244 -34.78125 626.71875 C -37.577219 622.26818 -41.720742 618.50814 -43.03125 613.25 C -44.023736 612.17439 -45.011544 611.07282 -45.96875 609.96875 C -46.012745 609.91801 -46.049852 609.86331 -46.09375 609.8125 C -46.709004 609.10041 -47.31204 608.38245 -47.90625 607.65625 C -48.112541 607.40412 -48.327934 607.16016 -48.53125 606.90625 C -48.927374 606.41163 -49.303574 605.90825 -49.6875 605.40625 C -49.965668 605.04253 -50.228901 604.68033 -50.5 604.3125 C -51.033623 603.58847 -51.559485 602.86612 -52.0625 602.125 C -52.302966 601.77093 -52.548438 601.42085 -52.78125 601.0625 C -52.995525 600.73247 -53.198895 600.3962 -53.40625 600.0625 C -53.715305 599.56526 -54.019601 599.06862 -54.3125 598.5625 C -59.781973 595.68791 -64.717436 592.01185 -70.125 589.21875 C -70.780422 588.99327 -71.491897 588.75214 -72.21875 588.53125 C -72.360787 588.48742 -72.512234 588.44914 -72.65625 588.40625 C -73.101121 588.27619 -73.572339 588.14695 -74.03125 588.03125 C -74.48869 587.91421 -74.940624 587.81294 -75.40625 587.71875 C -76.647075 587.46775 -77.907408 587.29352 -79.125 587.3125 C -81.4985 587.3495 -83.71395 588.05276 -85.34375 589.96875 C -85.61815 590.36745 -85.8471 590.74771 -86.0625 591.125 C -90.19 593.78319 -90.32655 599.55272 -93.28125 603.3125 C -99.09075 610.34476 -104.8345 617.49512 -109.8125 625.15625 C -112.5369 630.38067 -113.0202 636.40218 -113.3125 642.1875 C -119.7765 651.32595 -113.72845 663.72781 -120.09375 672.9375 C -124.89015 681.49165 -132.2729 689.85587 -131.25 700.34375 C -130.9467 709.60568 -128.8353 719.35411 -132.8125 728.15625 C -135.7969 739.46587 -141.5093 749.7872 -145.9375 760.53125 C -148.935 772.42276 -147.42725 784.81046 -149.21875 796.84375 C -151.76455 807.37019 -157.81955 816.60116 -161.15625 826.84375 C -165.96035 837.17599 -164.0033 849.28147 -169.0625 859.53125 C -172.278 869.14734 -168.05935 879.57705 -171.65625 889.15625 C -173.93225 897.39712 -179.27305 904.82142 -179.46875 913.59375 C -181.86635 923.2512 -190.86095 929.20775 -194.46875 938.28125 C -197.60585 943.53048 -199.20485 949.90336 -203.71875 954.15625 C -206.60545 957.61064 -208.60465 962.25022 -213.03125 964.03125 C -212.54785 967.44505 -217.1976 968.68117 -216 972.09375 C -219.2784 975.55554 -224.64995 975.82319 -229.03125 977.09375 C -233.74325 978.37652 -238.7984 979.5045 -242.8125 981.625 C -247.8505 983.50973 -253.2067 983.09775 -258.375 984.125 C -264.817 985.42629 -271.437 984.63021 -277.9375 985.5 C -282.5863 986.08112 -287.3845 985.82105 -291.9375 986.6875 C -295.54886 987.4894 -298.65948 987.49896 -301.5 987.625 L -301.5 1084.9062 C -232.82292 1084.9022 -164.14588 1084.9113 -95.46875 1084.9062 C -89.38535 1084.9072 -83.30205 1084.9059 -77.21875 1084.9062 C -76.61458 1084.9063 -76.010419 1084.9062 -75.40625 1084.9062 C -65.593716 1084.907 -55.781302 1084.9053 -45.96875 1084.9062 C 620.19928 1084.9643 1286.3642 1084.9545 1952.5312 1084.9062 C 1958.6146 1084.907 1964.6979 1084.9057 1970.7812 1084.9062 C 2074.7609 1084.9162 2178.7408 1084.9325 2282.7188 1084.9375 L 2282.7188 904.03125 C 2280.2967 906.55123 2277.7111 908.87632 2274.5625 910.5 C 2269.7819 913.07439 2265.3702 916.4537 2260.0312 917.78125 C 2249.8257 921.60787 2238.7532 920.42968 2228.0938 921.25 C 2203.419 922.23527 2178.7097 922.3616 2154.0312 921.5 C 2141.5972 921.10488 2129.2869 919.27368 2116.9375 917.90625 C 2112.7655 917.40238 2108.4397 915.96361 2106.3125 912.6875 C 2103.0057 912.31863 2099.2688 910.72346 2099.6562 907.3125 C 2095.3767 903.9963 2095.8717 898.22176 2095.2812 893.4375 C 2094.1615 888.39977 2093.9828 883.01412 2090.9375 878.625 C 2089.1093 875.15333 2086.1247 871.6867 2086.125 867.65625 C 2087.9052 861.00552 2091.4983 853.5779 2087.8438 846.90625 C 2086.4684 840.81289 2083.8479 835.07739 2082 829.15625 C 2081.8946 823.50601 2079.5395 818.56255 2076.4062 814 C 2073.4399 808.85739 2070.6867 803.1602 2071.0625 797.0625 C 2066.6784 789.05944 2068.3102 779.32526 2064.3125 771.1875 C 2065.1346 762.26804 2064.2205 752.71625 2059.1875 745.0625 C 2055.3732 735.19617 2053.0683 724.6363 2047.1875 715.6875 C 2044.0153 709.13078 2043.3218 701.74044 2043.0312 694.5625 C 2038.2327 687.30647 2034.9492 679.1734 2032.25 670.9375 C 2032.5069 663.52171 2032.5656 655.03412 2027.0625 649.3125 C 2023.7249 641.04237 2016.6967 634.92244 2013.2188 626.71875 C 2010.4226 622.26818 2006.2792 618.50814 2004.9688 613.25 C 2000.7387 608.66617 1996.7491 603.8529 1993.6875 598.5625 C 1988.218 595.68791 1983.2826 592.01185 1977.875 589.21875 C 1975.2372 588.31127 1971.9267 587.26493 1968.875 587.3125 C 1966.5015 587.3495 1964.2861 588.05276 1962.6562 589.96875 C 1962.3818 590.36745 1962.1529 590.74771 1961.9375 591.125 C 1957.81 593.78319 1957.6735 599.55272 1954.7188 603.3125 C 1948.9092 610.34476 1943.1655 617.49512 1938.1875 625.15625 C 1935.4631 630.38067 1934.9798 636.40218 1934.6875 642.1875 C 1928.2235 651.32595 1934.2716 663.72781 1927.9062 672.9375 C 1923.1099 681.49165 1915.7271 689.85587 1916.75 700.34375 C 1917.0533 709.60568 1919.1647 719.35411 1915.1875 728.15625 C 1912.2031 739.46587 1906.4907 749.7872 1902.0625 760.53125 C 1899.065 772.42276 1900.5728 784.81046 1898.7812 796.84375 C 1896.2354 807.37019 1890.1805 816.60116 1886.8438 826.84375 C 1882.0396 837.17599 1883.9967 849.28147 1878.9375 859.53125 C 1875.722 869.14734 1879.9407 879.57705 1876.3438 889.15625 C 1874.0677 897.39712 1868.7269 904.82142 1868.5312 913.59375 C 1866.1336 923.2512 1857.139 929.20775 1853.5312 938.28125 C 1850.3942 943.53048 1848.7951 949.90336 1844.2812 954.15625 C 1841.3945 957.61064 1839.3954 962.25022 1834.9688 964.03125 C 1835.4522 967.44505 1830.8024 968.68117 1832 972.09375 C 1828.7216 975.55554 1823.3501 975.82319 1818.9688 977.09375 C 1814.2568 978.37652 1809.2016 979.5045 1805.1875 981.625 C 1800.1495 983.50973 1794.7933 983.09775 1789.625 984.125 C 1783.183 985.42629 1776.563 984.63021 1770.0625 985.5 C 1765.4137 986.08112 1760.6155 985.82105 1756.0625 986.6875 C 1748.9472 988.26744 1743.7455 986.79915 1738.8125 989.125 C 1733.0438 990.28757 1727.2025 991.04767 1721.5938 992.90625 C 1716.0618 994.44607 1710.5773 996.23501 1704.7812 996.78125 C 1694.2262 998.92241 1683.5758 1000.5294 1672.9688 1002.3438 C 1659.5658 1005.9774 1645.5368 1005.3691 1631.7812 1005.8438 C 1620.4524 1005.8537 1609.0781 1005.0127 1598 1002.625 C 1592.8394 1001.9153 1590.3411 996.42761 1584.7188 996.15625 C 1579.8166 994.71173 1573.2341 994.16617 1571.2812 988.53125 C 1570.6164 982.44823 1565.7226 978.0988 1562.6562 973.09375 C 1558.0188 966.32881 1552.9414 959.06055 1552.8125 950.53125 C 1550.9414 939.32427 1542.32 931.03926 1538.2188 920.78125 C 1535.3782 911.50355 1536.8165 901.57821 1534.1562 892.25 C 1531.9751 879.80572 1530.4149 867.00156 1524.75 855.53125 C 1521.5541 847.99677 1518.2321 840.52284 1514.9375 833.03125 C 1514.9785 820.43389 1506.6663 809.26625 1507.875 796.53125 C 1508.07 786.68894 1508.101 776.45068 1503.8438 767.34375 C 1500.8066 756.61741 1501.0611 745.17314 1497.2812 734.625 C 1495.1678 723.71333 1495.5015 711.84053 1489.1562 702.21875 C 1485.2141 694.71159 1480.7429 687.11361 1479.75 678.53125 C 1474.5307 670.00776 1476.0546 658.82201 1469.5312 650.90625 C 1465.7803 643.93153 1469.1758 634.83332 1463.6875 628.53125 C 1460.8892 623.4443 1461.6675 616.54989 1456.8125 612.625 C 1456.0645 606.61346 1453.827 601.51493 1451.9062 596.09375 C 1450.0892 590.74618 1448.7584 590.65959 1446.2188 587.71875 C 1443.2578 579.75872 1427.7598 578.49913 1423.9688 578.5 z "
+ style="color:#000000;fill:#2b2d3a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ style="color:#000000;fill:#000000;fill-opacity:0.18037976999999999;fill-rule:nonzero;stroke:#444759;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 38.4375,841.84375 c -0.9838,0.73323 -1.9439,1.42913 -2.8437,2.03125 -11.6761,7.81259 -14.2877,10.64622 -26.4376,14.1875 -13.3294,3.88508 -29.2999,16.3506 -41.2812,19.40625 -11.9814,3.05567 -25.1411,6.78534 -37.2812,7.21875 -12.1401,0.43336 -15.541,-3.39865 -27.8438,-5.75 -12.3028,-2.35137 -28.124,-6.79509 -40.5938,-12.09375 -12.4696,-5.29869 -14.734,-13.40399 -27.375,-21.8125 -0.011,-0.008 -0.02,-0.0236 -0.031,-0.0312 -0.6881,4.99727 -1.5519,9.95125 -3.8125,14.53125 -2.4694,7.38486 -0.5488,15.25292 -1.1563,22.84375 10.7631,5.13527 18.4914,7.95403 29.7813,11.5 12.2575,3.84983 26.3917,5.33765 38.5937,7.09375 12.202,1.7561 18.6023,1.18304 30.75,0.9375 12.1477,-0.24555 32.2178,-1.15737 44.3126,-3.3125 12.0946,-2.15511 19.426,-5.55865 31.4687,-9.53125 11.6372,-3.8388 23.6332,-10.00857 35.25,-15.5625 -1.0165,-1.85315 -1.8127,-3.76947 -1.8125,-5.84375 1.7802,-6.65073 5.3733,-14.07835 1.7188,-20.75 -0.3874,-1.71616 -0.8665,-3.39097 -1.4063,-5.0625 z"
+ id="path4266" />
+ <path
+ id="path3997"
+ d="m 1081.2188,880.84375 c -0.4126,1.0286 -0.7965,2.04059 -1.0938,3 -1.3577,4.38184 -0.1224,9.8679 -0.2812,14.40625 -0.028,0.80727 -0.1144,1.58709 -0.2188,2.34375 9.6527,0.76452 19.9405,1.16348 27.3125,1.3125 8.7731,0.17733 14.5661,0.51328 21.6875,0.0312 -1.7916,-2.39719 -3.6928,-4.71993 -5.0625,-7.96875 -1.3447,-3.18956 -2.0268,-7.53745 -2.8437,-11.65625 -4.4768,1.452 -8.6273,2.62034 -15.5,2.375 -7.7815,-0.2778 -15.9675,-1.89947 -24,-3.84375 z"
+ style="color:#000000;fill:#000000;fill-opacity:0.18037976999999999;fill-rule:nonzero;stroke:#444759;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-dasharray:none"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ style="color:#000000;fill:#c9c9c9;fill-opacity:0.05415165000000000;fill-rule:nonzero;stroke:#444759;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-dasharray:none"
+ d="m 3.3438,723.40625 c -1.6308,0.95138 -3.464,1.84308 -5.5938,2.65625 -12.296,4.69465 -27.8998,8.63542 -40.0312,10.71875 -12.1315,2.08331 -15.4979,5.4777 -27.4688,5.09375 -11.9708,-0.384 -24.9043,-3.69891 -36.7188,-6.40625 -7.3492,-1.68412 -16.2393,-6.60351 -25.0624,-10.90625 -0.3336,1.21222 -0.7474,2.41216 -1.2813,3.59375 -1.688,6.3968 -4.2613,12.48022 -6.9687,18.5 10.1476,3.12494 17.1575,5.82157 28.0312,7.5625 11.9261,1.90944 31.709,2.6887 43.6875,2.90625 11.9785,0.21755 18.2806,0.71218 30.3125,-0.84375 12.0321,-1.55591 25.9759,-2.83903 38.0625,-6.25 4.3266,-1.221 8.1129,-2.35065 11.75,-3.53125 -0.2767,-0.47997 -0.5683,-0.97106 -0.875,-1.4375 -2.7617,-7.14363 -4.7344,-14.66022 -7.8437,-21.65625 z"
+ id="path4268" />
+ <path
+ id="path4004"
+ d="m 2086.4375,841.84375 c -0.9838,0.73323 -1.9439,1.42913 -2.8437,2.03125 -11.6761,7.81259 -14.2877,10.64622 -26.4376,14.1875 -13.3294,3.88508 -29.2999,16.3506 -41.2812,19.40625 -11.9814,3.05567 -25.1411,6.78534 -37.2812,7.21875 -12.1401,0.43336 -15.541,-3.39865 -27.8438,-5.75 -12.3028,-2.35137 -28.124,-6.79509 -40.5938,-12.09375 -12.4696,-5.29869 -14.734,-13.40399 -27.375,-21.8125 -0.011,-0.008 -0.02,-0.0236 -0.031,-0.0312 -0.6881,4.99727 -1.5519,9.95125 -3.8125,14.53125 -2.4694,7.38486 -0.5488,15.25292 -1.1563,22.84375 10.7631,5.13527 18.4914,7.95403 29.7813,11.5 12.2575,3.84983 26.3917,5.33765 38.5937,7.09375 12.202,1.7561 18.6023,1.18304 30.75,0.9375 12.1477,-0.24555 32.2178,-1.15737 44.3126,-3.3125 12.0946,-2.15511 19.426,-5.55865 31.4687,-9.53125 11.6372,-3.8388 23.6332,-10.00857 35.25,-15.5625 -1.0165,-1.85315 -1.8127,-3.76947 -1.8125,-5.84375 1.7802,-6.65073 5.3733,-14.07835 1.7188,-20.75 -0.3874,-1.71616 -0.8665,-3.39097 -1.4063,-5.0625 z"
+ style="color:#000000;fill:#000000;fill-opacity:0.18037976999999999;fill-rule:nonzero;stroke:#444759;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4015"
+ d="m 2051.3438,723.40625 c -1.6308,0.95138 -3.464,1.84308 -5.5938,2.65625 -12.296,4.69465 -27.8998,8.63542 -40.0312,10.71875 -12.1315,2.08331 -15.4979,5.4777 -27.4688,5.09375 -11.9708,-0.384 -24.9043,-3.69891 -36.7188,-6.40625 -7.3492,-1.68412 -16.2393,-6.60351 -25.0624,-10.90625 -0.3336,1.21222 -0.7474,2.41216 -1.2813,3.59375 -1.688,6.3968 -4.2613,12.48022 -6.9687,18.5 10.1476,3.12494 17.1575,5.82157 28.0312,7.5625 11.9261,1.90944 31.709,2.6887 43.6875,2.90625 11.9785,0.21755 18.2806,0.71218 30.3125,-0.84375 12.0321,-1.55591 25.9759,-2.83903 38.0625,-6.25 4.3266,-1.221 8.1129,-2.35065 11.75,-3.53125 -0.2767,-0.47997 -0.5683,-0.97106 -0.875,-1.4375 -2.7617,-7.14363 -4.7344,-14.66022 -7.8437,-21.65625 z"
+ style="color:#000000;fill:#c9c9c9;fill-opacity:0.05415162;fill-rule:nonzero;stroke:#444759;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-dasharray:none"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path3978"
+ d="m 392.6875,729.8125 c -5.14838,2.49552 -10.3354,11.08372 -14.7298,12.09072 -11.81441,2.70734 -19.69225,5.56265 -31.6631,5.94665 -11.97092,0.38395 -19.04531,-3.24025 -31.17684,-5.32356 -2.36029,-0.40533 -6.01351,-6.64534 -8.58651,-7.18256 -0.76549,3.29734 -1.94048,6.44507 -4.1875,9.1875 -2.06918,3.16941 -2.90344,6.76975 -3.53125,10.4375 3.65019,0.45688 7.92073,2.93783 11.34566,3.38072 12.03197,1.55593 22.47041,4.96795 34.44894,4.7504 11.97846,-0.21755 26.70572,-2.37563 38.63185,-4.28507 4.11276,-0.65848 7.88015,-6.07287 11.26105,-6.97105 -0.84088,-7.09597 -2.96026,-14.12701 -1.59375,-21.28125 -0.0785,-0.24696 -0.14085,-0.50212 -0.21875,-0.75 z"
+ style="color:#000000;fill:#c9c9c9;fill-opacity:0.05415165000000000;fill-rule:nonzero;stroke:#444759;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-dasharray:none"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssscccsssccc" />
+ <path
+ id="path3918"
+ d="m 258.90625,856.90625 c -4.16652,4.59934 -8.14574,9.36757 -9.75,15.5 -1.35134,2.56669 -2.2081,5.28768 -2.84375,8.0625 6.92929,3.26633 13.89258,6.34198 20.71875,8.59375 12.04272,3.9726 19.37418,7.37614 31.46875,9.53125 12.09465,2.15513 32.1649,3.06695 44.3125,3.3125 12.14777,0.24554 18.51677,0.8186 30.71875,-0.9375 12.20205,-1.7561 26.36755,-3.24392 38.625,-7.09375 1.47971,-0.46475 2.8795,-0.92912 4.25,-1.375 -2.37635,-7.97622 -8.78402,-14.41052 -9.96875,-22.875 -0.13695,-0.45702 -0.26717,-0.91752 -0.40625,-1.375 -11.83696,4.66414 -25.88009,8.55028 -37.0625,10.6875 -12.3028,2.35135 -15.73501,6.18336 -27.875,5.75 -12.14008,-0.43341 -25.26864,-4.16308 -37.25,-7.21875 -11.98136,-3.05565 -27.95178,-15.52117 -41.28125,-19.40625 -1.32709,-0.3868 -2.53223,-0.77943 -3.65625,-1.15625 z"
+ style="color:#000000;fill:#000000;fill-opacity:0.18037975;fill-rule:nonzero;stroke:#444759;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path3937"
+ d="m 760.3125,740.28125 c -0.94915,0.99729 -1.53892,2.43658 -2.09375,4.71875 -1.86451,2.47982 -2.9553,3.28025 -3.59375,7.5 -0.006,1.35847 -0.21852,2.62568 -0.5625,3.84375 9.75403,0.43393 15.28011,2.97434 22.6448,3.07928 9.73732,0.13875 20.67463,-1.9057 28.2927,-2.14178 -1.60497,-2.54313 -3.70206,-4.69974 -6.625,-6 -4.62061,-2.05447 -5.69854,-7.75573 -10.125,-9.75 -2.74431,0.28548 -9.93548,2.7357 -13.6677,2.64178 -5.99301,-0.15083 -9.77852,-2.41906 -14.2698,-3.89178 z"
+ style="color:#000000;fill:#c9c9c9;fill-opacity:0.05415165000000000;fill-rule:nonzero;stroke:#444759;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccscccsc" />
+ <path
+ id="path3887"
+ d="m 867,861.90625 c -13.90297,5.30107 -27.96476,15.49058 -39.69377,17.83743 -15.2714,3.05567 -31.05133,8.73528 -46.52503,9.16869 -15.4736,0.43336 -21.76884,-1.44871 -37.44994,-3.80006 -11.89409,-1.7835 -26.03606,-10.96327 -39.26876,-14.61231 -0.34123,3.77616 -0.0278,7.74579 -3.3125,10.21875 -5.53506,2.65807 -4.50848,9.97577 -8.0625,14.0625 -0.0203,0.0116 -0.0423,0.0195 -0.0625,0.0312 14.64,3.17067 31.93212,6.82439 46.16247,8.43118 15.5526,1.7561 24.32273,3.13298 39.80623,2.88744 15.4833,-0.24555 41.05295,-5.38224 56.46875,-7.53737 15.4157,-2.15511 23.15045,-5.55865 38.50005,-9.53125 3.00261,-0.77709 6.0287,-1.68011 9.0625,-2.625 -0.16287,-0.36948 -0.3253,-0.74452 -0.46875,-1.125 -5.70989,-5.54227 -9.8769,-12.5796 -12.34375,-20.125 -1.1624,-0.96601 -2.07328,-2.07178 -2.8125,-3.28125 z"
+ style="color:#000000;fill:#000000;fill-opacity:0.18037977;fill-rule:nonzero;stroke:#444759;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csssccccssssccccc" />
+ <path
+ id="path3897"
+ d="m 1496.2812,728.40625 c -13.9591,3.64034 -21.0339,10.55759 -33.8299,12.28164 -15.4629,2.08331 -19.7419,5.4777 -35,5.09375 -15.2581,-0.384 -31.7852,-3.69891 -46.8438,-6.40625 -5.171,-0.92967 -19.683,-6.74827 -25.7013,-9.00039 -2.6623,6.81892 -4.6605,13.88394 -7.2187,20.75 5.3493,1.20707 19.1048,6.39653 25.7416,7.2302 15.2011,1.90944 40.4198,2.6887 55.6876,2.90625 15.2678,0.21755 23.7486,0.48237 39.0846,-1.07356 13.0323,-1.3222 19.0955,-6.37495 32.7049,-8.78164 -0.8072,-5.68718 -1.6783,-11.34896 -3.625,-16.78125 -0.3964,-2.04665 -0.7155,-4.12567 -1,-6.21875 z"
+ style="color:#000000;fill:#c9c9c9;fill-opacity:0.05415165000000000;fill-rule:nonzero;stroke:#444759;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csssccsssccc" />
+ <path
+ id="path3883"
+ d="m 1310.7812,854.0625 c -1.5131,6.65957 -1.2876,13.81026 -4.9374,19.8125 -1.6471,4.15943 -3.6952,8.07708 -6.0313,11.8125 9.4386,3.21708 17.7733,5.47496 28.7813,8.1875 15.6232,3.84983 33.666,5.33765 49.2187,7.09375 15.5526,1.7561 23.6727,1.18304 39.1563,0.9375 15.4833,-0.24555 41.0529,-1.15737 56.4687,-3.3125 15.4157,-2.15511 24.7754,-5.55865 40.125,-9.53125 6.2785,-1.62492 12.6554,-3.66571 19.0313,-5.90625 -1.5703,-9.10949 -3.4279,-18.19076 -7.375,-26.59375 -1.7848,0.49237 -3.727,0.9945 -5.9376,1.5 -16.9896,3.88508 -37.3535,16.3506 -52.625,19.40625 -15.2714,3.05567 -32.0262,6.78534 -47.5,7.21875 -15.4736,0.43336 -19.8188,-3.39865 -35.5,-5.75 -15.6811,-2.35137 -35.8561,-6.79509 -51.75,-12.09375 -10.0343,-3.34524 -14.8642,-7.82512 -21.125,-12.78125 z"
+ style="color:#000000;fill:#000000;fill-opacity:0.18037976999999999;fill-rule:nonzero;stroke:#444759;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m -54.09375,750.3125 c 0.234641,0.38958 0.518459,0.83663 0.59375,0.9375 -0.03137,-0.0884 -0.154463,-0.3812 -0.46875,-0.96875 -0.05436,-0.008 -0.08246,0.0235 -0.125,0.0312 z"
+ id="path4374"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 1766.4375,1049.3125 c 1.6204,-0.2739 0.9605,-0.3176 0,0 z"
+ id="path4370"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m -80.84375,718.46875 -0.09375,0.1875 z"
+ id="path4366"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 1491.0625,725 c -0.1465,0.68738 -0.3758,1.33337 -0.6563,1.9375 1.001,-0.33913 0.6675,-0.96698 0.6563,-1.9375 z"
+ id="path4364"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m -46.84375,765.375 c -0.06003,0.93045 -0.101259,1.56952 0,0 z"
+ id="path4356"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 2014.9062,809.28125 c -0.3243,1.55829 0.23,1.27585 0.094,0 z"
+ id="path4350"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m -142.78125,845.875 c -0.29127,0.14427 -0.4054,0.39047 -0.46875,0.65625 0.16101,-0.21659 0.32648,-0.43796 0.46875,-0.65625 z"
+ id="path4346"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m -143.25,846.5625 c -1.34588,1.80463 -3.04208,3.29656 -0.21875,0.75 0.13542,-0.22443 0.1603,-0.4927 0.21875,-0.75 z"
+ id="path4344"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 782.5625,846.6562 c -0.87581,1.28549 -1.75511,5.39336 -0.59375,1.71875 l 0.25,-0.8125 z"
+ id="path4342"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 798.28125,866.2187 c 0.23959,0.25847 0.47618,0.52553 0.71875,0.78125 2.5025,2.62784 0.91936,0.64036 -0.71875,-0.78125 z"
+ id="path4340"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 803.03125,872.56245 c 0.80485,2.65637 1.38736,3.05523 0,0 z"
+ id="path4338"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 767.125,881.1562 c -0.0254,0.0632 -0.19776,0.71245 -0.4375,1.78125 0.34134,-1.32152 0.4629,-1.84443 0.4375,-1.78125 z"
+ id="path4334"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 2027.7188,889.31245 c 0.6806,1.96033 4.2061,9.16286 1.9062,3.75 -0.716,-1.03745 -0.9072,-3.12562 -1.9062,-3.75 z"
+ id="path4332"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 762.21875,893.21875 c -1.61029,1.66512 -2.51064,3.37799 -0.5,0.6875 z"
+ id="path4328"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 308.59375,894.5625 c -1.07937,2.30041 -0.79357,3.33019 -0.0625,0.25 z"
+ id="path4326"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 2030.3125,895 c -0.2574,0.0178 -0.2517,1.306 0.4687,1.03125 -0.1925,-0.77718 -0.3517,-1.03932 -0.4687,-1.03125 z"
+ id="path4324"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m -16.875,900.03125 c 0.904385,2.9954 1.280811,3.07099 0,0 z"
+ id="path4322"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 356.6875,914.15625 c 0.21425,0.44943 0.15528,0.32574 0,0 z"
+ id="path4320"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4525"
+ d="m 1422.8438,578.0625 c -4.57,0.37473 -8.2175,5.4287 -13.3126,10.375 -2.807,4.86128 -5.5725,19.08948 -10.4062,22.40625 -3.986,4.3034 -5.5501,9.81753 -9.2812,14.40625 -3.1278,5.77767 -5.5426,11.9348 -8.625,17.71875 -2.0328,6.93474 1.6422,15.88956 -1.9376,22.53125 l 1.4688,0.90625 c -0.7094,9.88949 -8.0593,15.35962 -8.9062,25.21875 -5.032,9.56068 -12.558,19.27351 -13.1876,30.4375 -6.0569,11.33686 -8.3145,24.16955 -13.7187,35.78125 -3.2417,9.2532 -3.2788,19.48504 -8.0625,28.21875 -3.3928,9.46966 -3.2124,19.68014 -4.5625,29.53125 -7.3632,11.12623 -14.0685,22.68756 -20.3437,34.4375 -2.9837,7.70241 -1.7247,16.60719 -6.125,23.84375 -6.4973,16.40792 -19.425,28.89981 -30.3438,42.34375 -4.5174,7.09624 -11.8464,11.51011 -18.6875,16.0625 -6.9476,3.24781 -14.1669,5.81428 -21.1563,8.96875 -7.19,0.27391 -14.3543,1.14105 -21.4062,2.5 -6.7374,1.01921 -13.4323,2.25541 -20.25,2.625 -10.5582,1.39384 -21.1491,2.60812 -31.7812,3.25 -3.0164,-0.0147 -16.8924,2.24977 -17.875,1.3125 -2.8607,-11.02137 -5.5016,-17.0393 -8.2188,-26.59375 -2.0133,-6.6417 -2.6999,-8.72155 -3.8438,-15.65625 -1.7336,-5.7841 -7.9596,-12.87855 -9.7187,-18.65625 -1.6115,-4.5887 -3.1335,-16.43337 -5.7813,-20.5 -2.3396,-3.59414 -2.8795,-10.80594 -5.5624,-15.15625 -6.2482,-10.13033 -4.1979,-8.71747 -9.375,-7.3125 -11.0299,2.47193 -6.8914,2.85095 -9.3126,8.4375 -1.7364,3.68813 -5.173,8.14475 -5.5937,14.15625 -2.7306,3.9249 -5.6137,11.00685 -7.1875,16.09375 -3.0869,6.3022 0.2972,14.99415 -1.8125,21.96875 -3.6689,7.9158 0.4355,19.6015 -2.5,28.125 -2.2049,9.78351 -3.2955,14.86244 -5.9063,23.21875 -1.6756,0.14949 -10.012,1.09049 -11.6874,1.28125 -12.2622,1.78753 -24.6985,1.60664 -37,3.03125 -10.1305,0.45886 -20.2905,0.94686 -30.43755,0.625 -9.75753,-0.14214 -19.18976,-2.93728 -28.25,-6.34375 -6.24427,-2.09836 -11.4945,-6.33838 -17.5625,-8.84375 -4.49785,-3.02242 -6.41529,-8.8087 -11.4375,-11.1875 -5.02357,-5.8332 -11.51406,-10.02888 -17.375,-14.90625 -4.49939,-6.32261 -9.84726,-10.00492 -15.09375,-14.4375 -8.02897,-7.33353 -15.35234,-17.2522 -18.4375,-21.9375 -6.86075,-11.6118 -7.07919,-9.20063 -12.65625,-21.59375 -4.21156,-7.34537 -12.76814,-23.53305 -19.15625,-33.09375 -9.64459,-14.15735 -10.06725,-13.62165 -13.5,-26.5625 -4.54438,-6.6417 -6.48194,-10.65905 -9.0625,-17.59375 -3.91318,-5.7841 -9.97309,-9.15354 -14.59375,-14.6875 -3.80736,-5.21298 -8.12027,-15.69538 -9.03125,-16.8125 -5.39357,-3.9739 -7.43312,-9.96455 -13.5625,-13.21875 -6.28635,-0.84793 -14.81732,-6.51634 -19.4375,-5.375 -7.04064,0.7472 -13.58997,2.4487 -13.65625,7.96875 -3.5362,3.22739 -3.6129,6.3635 -4.5625,12.375 -3.64486,7.09355 -8.24111,14.23192 -7.40625,21.59375 -5.26132,7.27717 -6.08177,12.61915 -10.84375,19.59375 -2.84208,2.71668 -1.77877,8.81251 -3.375,12.5625 -3.05484,7.17668 -7.8355,12.71424 -12.1875,18.3125 -1.26051,8.5824 -4.30904,19.16573 -9.31413,26.67303 -5.47662,6.54152 -4.43801,14.52911 -7.65462,22.10822 -1.51459,3.56875 -5.89093,4.38189 -6.75,7.875 -2.58556,5.68345 -5.36782,11.10809 -10,14.78125 -3.96492,3.14405 -7.12047,6.32896 -11.65625,9.4375 -4.89346,8.24532 -13.80723,2.76806 -13.875,10.84375 -3.6013,0.99218 -7.41196,1.46339 -10.875,2.875 -6.86264,1.47552 -13.26577,4.85584 -20.375,5.15625 -10.52935,1.11885 -20.97138,2.92412 -31.4375,4.46875 -24.52214,2.45166 -49.19318,2.45978 -73.8125,2.75 -13.56824,0.0226 -27.17565,0.0498 -40.71875,0.5 -5.20758,0.60307 -10.43959,0.76828 -15.625,1.59375 -6.85372,0.36811 -14.04807,-0.11045 -20.5625,-2.4375 l 0.125,-0.21875 c -3.22687,-1.72037 -8.04292,-4.86672 -12.71875,-9.46875 -0.90736,-1.13217 -1.78298,-2.28515 -2.65625,-3.4375 -1.52224,-2.40225 -3.54781,-4.4948 -5.375,-6.625 4.77012,-2.17245 1.35535,-1.47403 -1.1875,-2.125 -4.36781,-8.22329 -5.85327,-16.28674 -8,-21.0625 -0.0632,-0.16377 -0.12289,-0.33607 -0.1875,-0.5 -0.86231,-3.14606 -2.39635,-6.04261 -4,-8.90625 -2.03519,-5.2154 -5.31022,-9.48497 -6.125,-14.46875 -2.2474,-7.49963 -4.52091,-12.39747 -4.75,-20.28125 -0.35826,-8.14899 -0.19066,-16.96393 0.34375,-24.0625 0.74783,-8.1142 0.40771,-12.75737 -1.0625,-19.625 -0.92182,-6.84579 -3.18997,-12.09887 -2.125,-18.09375 -0.0656,-4.1411 -1.14143,-8.16682 -2.21875,-12.1875 -1.89746,-7.90778 -2.79509,-12.00533 -1.8125,-17.59375 0.12144,-3.48997 -0.39642,-6.95198 -0.96875,-10.40625 -1.10268,-5.84708 -1.60013,-11.74603 -0.9375,-16.8125 -2.9552,-10.20524 -6.36246,-19.26439 -4.4375,-29 0.0571,-3.36881 -3.09808,-9.63742 -4.28125,-13.78125 -0.68723,-4.7069 -1.37635,-9.13255 0.0625,-13.40625 -1.04048,-3.90569 -2.4882,-9.14788 -3.34375,-14.28125 -0.049,-0.99302 -0.0379,-1.98515 0.125,-3 -0.20368,-0.32981 -0.38029,-0.66183 -0.53125,-1 -0.0515,-5.73509 0.29117,-10.93875 -0.875,-15.8125 -1.90871,-4.55812 -5.62914,-8.70086 -9.53125,-9.875 -1.42643,-4.94134 -0.16753,-6.05665 -5.0625,-6.78125 -1.25971,-0.35008 -4.03043,0.41266 -6.875,1.5625 -4.26528,1.71615 -7.69384,3.71814 -9.71875,7.46875 -1.98441,3.04631 -3.44391,6.51966 -4.96875,9.28125 -0.97835,3.05769 -1.90508,6.15166 -3.03125,9.1875 -0.0181,0.0436 -0.0442,0.0813 -0.0625,0.125 -0.86722,2.07378 -1.85882,4.24713 -3.1875,6.71875 -0.39484,3.37159 -0.94467,6.96394 -1.5625,9.84375 -1.79265,7.66923 -3.89822,7.90517 -5.96875,15.03125 -0.7524,1.6931 -3.36474,8.79128 -3.6875,9.6875 -9.18133,13.13122 -9.51879,14.98893 -16.3125,27.875 -1.41411,3.87512 -1.85498,8.10874 -2.59375,12.21875 -1.02381,3.69118 -2.29202,7.29501 -3.90625,10.8125 -4.35017,9.62381 -5.82274,19.33827 -9.65625,28.21875 -5.34521,12.19797 -8.19295,21.26739 -11.75,26.625 -2.27362,10.39774 -5.80296,18.0556 -11.5,26.1875 -1.34184,9.48275 -1.20857,16.23505 -5.5625,24.96875 -4.92181,8.96396 -12.19334,14.67684 -15.53125,22.96875 -2.9888,7.87572 -3.23873,15.34219 -6.46875,22 -0.0258,0.0731 -0.0659,0.14551 -0.0937,0.21875 -5.15582,9.00379 -15.27336,14.0475 -23.40625,20.125 -2.27195,1.26172 -4.60165,2.39605 -7.15625,3.03125 -10.20554,3.82662 -21.27784,2.64843 -31.9375,3.46875 -24.67453,0.98527 -49.38416,1.1116 -74.0625,0.25 -8.779512,-0.27899 -17.505429,-1.27038 -26.21875,-2.3125 -8.907587,-1.60812 -18.036501,-3.54522 -21.34375,-6.9375 -3.905614,-0.70433 -5.850043,-3.09118 -6.8125,-4.9375 -0.04928,-0.0945 -0.112074,-0.18985 -0.15625,-0.28125 -1.488045,-6.25292 -3.154238,-11.84223 -4.84375,-16.875 -0.699337,-4.02233 -1.32875,-8.08661 -3.71875,-11.53125 -0.494733,-0.93949 -1.074208,-1.89373 -1.65625,-2.84375 -1.152945,-2.81498 -2.223862,-5.33091 -3.125,-7.5 -0.0031,-0.0413 0.0025,-0.0836 0,-0.125 0.484762,-1.9855 1.017061,-3.78036 1.5,-5.59375 0.0026,-0.01 -0.0026,-0.0217 0,-0.0312 1.357931,-4.44662 2.517847,-9.03933 1.125,-13.40625 -10e-4,-0.01 10e-4,-0.0213 0,-0.0312 -0.05969,-0.56785 -0.13248,-1.14283 -0.21875,-1.75 -0.3761,-3.24731 1.2208,-6.9989 -6.5,-18.125 -0.01877,-0.13065 -0.06688,-0.29298 -0.09375,-0.4375 -0.168867,-4.57819 -1.808406,-8.7051 -4.125,-12.53125 -2.283249,-6.1661 -4.942642,-13.24196 -6.5625,-19.1875 -2.1835,-8.01427 -5.05405,-21.40233 -6.78125,-26 0.95875,-9.3083 -1.81955,-16.30955 -5.21875,-25.5625 -3.2736345,-9.83167 -4.1666442,-13.32352 -6.09375,-18.34375 -0.040889,-0.10652 -0.083801,-0.23584 -0.125,-0.34375 -0.289142,-0.74481 -0.5888625,-1.53239 -0.9375,-2.375 -1.486825,-2.51278 -2.7542438,-4.90265 -3.8125,-7.25 -0.26456602,-0.58684 -0.50958269,-1.16598 -0.75,-1.75 -2.6445676,-6.42417 -3.8554875,-12.7661 -4.34375,-21.03125 C -5.1108625,693.93654 -5.4410823,693.47316 -5.75,693 c -0.3089177,-0.47316 -0.5849753,-0.961 -0.875,-1.4375 -4.060346,-6.67095 -6.369025,-13.65799 -9.375,-20.8125 0.538594,-4.57617 0.309109,-8.76495 -0.75,-12.625 -0.11768,-0.42889 -0.236354,-0.8604 -0.375,-1.28125 -0.83187,-2.52512 -2.038312,-4.90044 -3.65625,-7.15625 -3.2321,-5.7841 -10.3455,-16.87855 -13.625,-22.65625 -6.6939,-13.38144 -6.5964,-11.12321 -8.5625,-13.96875 1.4269,1.32583 -9.40775,-12.08895 -11.59375,-14.96875 -0.488127,-0.15729 -0.974391,-0.3336 -1.46875,-0.53125 -0.296075,-0.11838 -0.608173,-0.2441 -0.90625,-0.375 -0.166837,-0.0732 -0.332589,-0.17325 -0.5,-0.25 -0.569754,-0.26164 -1.143015,-0.5162 -1.71875,-0.8125 -0.217604,-0.11179 -0.43792,-0.22802 -0.65625,-0.34375 -0.506272,-0.26877 -1.021603,-0.55858 -1.53125,-0.84375 -0.75878,-0.42397 -1.517284,-0.87118 -2.28125,-1.3125 -0.206007,-0.11921 -0.418737,-0.22431 -0.625,-0.34375 -1.334098,-0.77117 -2.663233,-1.53814 -4,-2.25 -0.315608,-0.16838 -0.622243,-0.33904 -0.9375,-0.5 -0.01255,-0.006 -0.0187,-0.0249 -0.03125,-0.0312 -0.700846,-0.35711 -1.427422,-0.69244 -2.125,-1 -0.104173,-0.0459 -0.208426,-0.0804 -0.3125,-0.125 -0.818801,-0.35014 -1.626456,-0.65368 -2.4375,-0.90625 -1.614085,-0.5026 -3.218854,-0.80215 -4.78125,-0.75 -0.522841,0.0175 -1.047469,0.06 -1.5625,0.15625 -5.3365,2.9024 -9.45965,8.33228 -12.84375,15.15625 -16.4814,19.00892 -17.9306,24.22857 -20.8125,40.375 -2.3586,9.06482 -2.47535,17.11979 -4.15625,26.5625 -5.5223,8.3526 -9.14735,17.46145 -13.28125,24.96875 0.4706,10.65582 1.49765,21.8384 -0.71875,32.75 -3.9634,10.5482 -10.97185,24.27355 -14.15625,35 -1.3616,10.71542 -1.5029,20.17408 -2.5625,31.625 1.2673,12.735 -12.88665,22.87135 -12.84375,35.46875 -3.4545,7.4917 -3.49275,20.5906 -6.84375,28.125 -1.3442,12.50441 -1.44775,25.4087 -5.34375,38.3125 -2.789,9.3282 -4.5215,13.50357 -7.5,22.78125 -4.3006,10.25806 -15.163,15.48049 -17.125,26.6875 -3.0076,7.72497 -8.6997,11.07865 -13.5625,17.84375 -3.2151,5.005 -3.39665,2.667 -4.09375,8.75 -0.2202,0.45997 -6.6125,2.96791 -6.8125,3.40625 -1.9975,0.50604 -4.0608,0.86203 -5.9375,1.40625 -4.712,1.28277 -9.76705,2.41075 -13.78125,4.53125 -5.038,1.88473 -10.3942,1.47275 -15.5625,2.5 -6.442,1.30129 -13.0619,0.50521 -19.5625,1.375 -4.6487,0.58112 -9.4469,0.32105 -14,1.1875 -3.65159,0.81084 -6.79028,0.80748 -9.65625,0.9375 l 0,21.5625 c 10.84964,3.9751 23.65091,9.9761 27.53125,9.25 11.4447,-2.1416 -25.49045,-13.0188 8.40625,-16.5313 7.693,-0.7971 15.7506,-1.1539 26.875,2 9.7412,2.6419 21.55525,4.6384 16.90625,-11.5312 3.9676,2.38768 12.6516,7.02576 12.875,7.03125 2.0819,-0.18293 -6.6688,-8.74789 -6.0625,-9.28125 2.877,-1.95995 10.58615,-5.32261 12.34375,-6.5 9.2419,-6.19031 0.7198,-1.08307 19.375,-2.6875 0.4648,-3.0777 -7.4912,-7.02505 -7.625,-11.59375 -0.073,-5.00759 24.81865,2.37598 27.15625,-2.25 1.9144,-1.32162 -16.42395,-9.4134 -17.53125,-10.4375 -0.1286,-6.28585 6.80495,-3.59238 2.40625,-5 4.7395,0.43221 11.178,5.17178 16.0625,1.90625 -2.5893,-3.35394 -8.8077,-5.0727 -13,-6.46875 -0.584,-3.26357 -0.6367,-6.38275 3.3125,-8.4375 5.3513,4.78882 33.20245,14.00091 27.21875,8.6875 -4.6694,-4.14648 -12.4616,-7.33825 -19.5625,-9.9375 -6.522,-2.38735 -1.21615,-10.6676 0.46875,-12.3125 2.1935,-2.1412 32.30265,13.46526 34.34375,10.59375 9.0961,-9.34797 -10.20355,-13.4326 -11.78125,-15.4375 -3.0598,-3.88798 -17.11485,-5.9101 -15.40625,-8.5 -0.9258,-4.7673 -6.91635,-5.65805 -3.53125,-8.34375 3.1904,-0.981 19.57365,6.12545 26.71875,3.90625 0.9106,-2.1264 -13.2985,-6.30075 -18.6875,-10.21875 -5.3831,-3.9136 -7.74115,-8.3515 -7.65625,-9 0.288,-1.8614 3.5608,-0.4774 1.625,-8 1.6092,0.3427 6.55225,1.1061 9.21875,-0.25 -2.8248,-0.044 -10.1334,-4.9947 -9.625,-6.0625 3.5526,-11.27574 16.9695,3.00419 21.0625,0.5 0.5815,-1.0273 -13.57215,-6.05525 -18.09375,-7.40625 -3.6176,-1.0808 -6.75685,-5.07915 -7.03125,-7.03125 -1.4257,-3.711 35.837,10.404 43.4375,10 4.6669,-3.74874 -17.16135,-7.86205 -22.09375,-13.53125 -4.069,-3.58406 -12.1772,-7.38455 -9.25,-12.125 13.5342,-21.91787 25.5332,-5.89346 26.5625,-7.3125 -6.9173,-3.9646 -20.9573,-11.9635 -16.0625,-17.84375 3.5233,-3.0301 3.2683,-3.8686 6.4375,-7.8125 -1.7814,-3.9252 -6.9641,0.40515 -5.6875,-4.40625 6.5317,-0.116 2.363,-2.4573 5.8125,-3.6875 2.4185,0.0214 -3.16805,-1.67325 -3.65625,-1.65625 -2.1462,-5.47095 -3.3827,-11.7673 3.25,-10.125 1.4032,0.3475 10.5271,3.4466 11.25,2.25 0.5968,-0.9881 -12.845,-9.13975 -11,-14.90625 5.3888,-0.9127 28.7754,13.9348 34.6875,6.96875 -0.1622,-3.7385 -33.01005,-17.01875 -30.28125,-16.96875 -0.3697,-2.35773 2.2464,-11.06377 5.8125,-10.53125 6.7676,1.01058 15.40715,11.65872 15.46875,8.09375 -2.7653,-2.33745 -19.25065,-10.72205 -21.59375,-13.03125 1.349,0.68637 21.23315,10.67113 27.53125,12.46875 0.9835,-0.0135 -2.00395,-9.72 -5.84375,-12.125 -7.4203,-4.6478 -12.872,-8.767 -14.875,-8.75 0.1949,-4.01379 3.12835,-5.76265 6.65625,-9.125 10.0556,3.25755 37.95895,6.7125 38.03125,6.8125 -1.7865,-6.5868 -41.29925,-12.12895 -39.96875,-17.71875 3.6702,0.9767 15.3234,2.2427 15.4375,1.3125 0.1415,-1.1524 -7.8352,-2.97495 -11.3125,-4.96875 -2.5028,-1.4349 -4.2102,-4.13755 -4.25,-4.78125 0.3622,-0.0398 7.4735,0.56625 8.75,-0.65625 -1.4332,-0.0612 -8.27005,-2.31325 -9.21875,-2.84375 -3.1169,-0.0135 6.6013,-1.56565 9.625,-1.59375 2.8094,-2.7269 -17.8319,-9.7032 -14.6875,-13.0625 1.5895,-1.2142 23.73655,5.6594 26.71875,4.3125 0,-1.2238 -8.05665,-3.65095 -14.09375,-7.65625 -6.0314,-4.0019 -1.1681,-4.3442 -0.25,-6.75 0.763,-1.9994 9.5771,0.2003 8.875,-1.75 -0.6188,-1.851 -8.28925,-4.2208 -10.59375,-8.3125 -1.5035,-2.6657 3.67175,-6.0933 3.09375,-7.125 0.1053,-2.5878 12.384,2.679 9.875,0.75 2.3493,-2.1718 -7.979,-4.3655 -9.9375,-8.0625 1.9509,-1.0798 12.0307,-1.13765 12.875,-1.65625 2.4941,-0.0281 13.33555,0.94515 14.96875,1.28125 0.6659,-2.0673 -25.4036,-5.55165 -23.5625,-5.59375 0.4123,-0.0782 4.19755,-6.6134 2.71875,-6.6875 -1.523,-2.339 11.68615,-1.97867 12.65625,-1.71875 4.8968,-3.71053 -11.69355,-5.1624 -11.71875,-8.03125 0.2257,-3.7477 -0.9211,-1.74735 -0.25,-3.53125 1.889,-0.679 4.58385,0.32055 4.96875,0.65625 10.6812,-0.9761 23.0994,-1.69443 10.1875,-4.71875 8.0215,-1.9848 -8.4984,-5.66015 -11.125,-6.65625 -0.816,-0.359 6.44405,-0.6466 10.09375,-0.8125 3.6495,-0.166 -8.0357,-2.55475 -5.125,-2.65625 2.1479,-1.40226 14.0211,2.31998 19.1875,2.28125 -0.2944,-3.31164 -16.6363,-5.69543 -19.125,-7.4375 1.853,-2.33443 4.3239,-3.76938 6.75,-3.84375 -0.631,-3.01625 2.1528,-2.08477 4,-2.0625 -1.219576,-0.0694 5.374816,-0.2379 9.03125,-1.03125 0.05121,-0.0111 0.10622,-0.0199 0.15625,-0.0312 0.03505,-0.008 0.05931,-0.0231 0.09375,-0.0312 0.36261,-0.0847 0.654304,-0.18242 0.9375,-0.28125 0.01863,-0.006 0.04427,0.007 0.0625,0 0.141457,-0.0501 0.25852,-0.10229 0.375,-0.15625 0.03404,-0.0157 0.06198,-0.0153 0.09375,-0.0312 0.136652,-0.0683 0.252159,-0.14428 0.34375,-0.21875 0.0891,-0.16162 0.142423,-0.32201 0.1875,-0.46875 0.0075,-0.0236 0.02485,-0.0393 0.03125,-0.0625 0.03296,-0.1216 0.05828,-0.23177 0.0625,-0.34375 0.0023,-0.0436 0.0018,-0.0828 0,-0.125 -0.0012,-0.024 -0.02871,-0.0389 -0.03125,-0.0625 -0.01012,-0.10876 -0.02612,-0.21237 -0.0625,-0.3125 -0.0032,-0.009 0.0034,-0.0226 0,-0.0312 -0.0053,-0.0127 -0.02554,-0.0187 -0.03125,-0.0312 -0.05219,-0.12294 -0.129272,-0.23286 -0.21875,-0.34375 -0.09622,-0.11924 -0.20858,-0.23686 -0.34375,-0.34375 -0.02142,-0.0166 -0.04019,-0.0462 -0.0625,-0.0625 -0.397279,-0.29496 -0.959821,-0.5256 -1.59375,-0.75 -4.40286,-1.55852 -13.316307,-1.87149 -10.71875,-7.03125 2.810332,-2.20118 6.956447,-1.9357 10.71875,-0.78125 0.105584,0.0324 0.207564,0.06 0.3125,0.0937 0.389948,0.1254 0.777666,0.26419 1.15625,0.40625 0.09087,0.0341 0.191176,0.0588 0.28125,0.0937 0.382167,0.14836 0.759749,0.30767 1.125,0.46875 0.07216,0.0319 0.147346,0.0614 0.21875,0.0937 0.375591,0.16966 0.741928,0.35275 1.09375,0.53125 0.275141,0.1401 0.523255,0.29426 0.78125,0.4375 0.134074,0.0742 0.277256,0.14411 0.40625,0.21875 0.03921,0.0228 0.08628,0.0397 0.125,0.0625 0.332526,0.19525 0.644224,0.39962 0.9375,0.59375 0.02964,0.0196 0.06454,0.0429 0.09375,0.0625 0.291996,0.19605 0.567131,0.40458 0.8125,0.59375 0.01707,0.0132 0.04567,0.0181 0.0625,0.0312 0.0931,0.0727 0.164498,0.14771 0.25,0.21875 0.152491,0.12675 0.310507,0.25472 0.4375,0.375 0.199077,0.18845 0.369756,0.36392 0.5,0.53125 -1.1183,0.8341 -2.6578,1.9756 -3,2.5625 -0.2431,0.44745 0.457136,0.7741 1.625,1.0625 0.583932,0.1442 1.271609,0.2771 2.03125,0.40625 1.519282,0.25829 3.298512,0.51561 4.8125,0.8125 0.378497,0.0742 0.721216,0.13697 1.0625,0.21875 0.682569,0.16356 1.273548,0.35635 1.71875,0.5625 0.222601,0.10307 0.421369,0.19569 0.5625,0.3125 0.282261,0.23362 0.382137,0.51159 0.25,0.8125 -0.01214,1.25866 -3.489386,4.38638 -5.59375,7.34375 -0.233811,0.3286 -0.463246,0.64678 -0.65625,0.96875 -1.158074,1.93185 -1.458912,3.68939 0.53125,4.6875 0.0235,-0.60745 1.630589,-2.44567 5.03125,-2.3125 2.541,0.0994 4.624,0.3113 6.5,2.625 0.462288,0.26219 0.680928,0.54365 0.6875,0.84375 0.0033,0.15005 -0.06712,0.31034 -0.15625,0.46875 -0.802109,1.42568 -5.054323,3.16918 -7.53125,4.96875 -0.275213,0.19995 -0.525844,0.39292 -0.75,0.59375 -0.672475,0.60248 -1.076512,1.21561 -1.03125,1.8125 0.439763,0.24036 0.900566,0.40673 1.375,0.53125 0.237217,0.0623 0.474337,0.11632 0.71875,0.15625 3.177373,0.51907 6.923556,-0.65911 10.15625,1.3125 2.8369,2.389 4.4868,6.1499 2.8125,8.875 -6.6893,2.9878 -10.72915,5.24035 -8.15625,6.90625 0.3955,1.32532 1.221705,1.67614 2.46875,1.40625 0.249409,-0.054 0.497439,-0.15048 0.78125,-0.25 2.838113,-0.99524 7.40925,-4.11071 13.75,-6.3125 3.7562,-1.30431 3.70825,1.19351 1.28125,6.03125 -3.1091,1.6661 -9.22975,6.266 -11.28125,8.6875 -1.9548,2.4243 10.5737,-4.90375 12.9375,-2.03125 0.788175,0.32981 0.180442,0.88906 -1.34375,1.59375 -1.016131,0.46979 -2.457891,1.00505 -4.125,1.59375 -5.001314,1.7661 -12.252484,3.97561 -17.6875,6.125 -0.905836,0.35823 -1.745228,0.71032 -2.53125,1.0625 -1.572047,0.70437 -2.883248,1.41095 -3.75,2.0625 -0.216686,0.16289 -0.401668,0.31065 -0.5625,0.46875 -0.482501,0.47429 -0.698703,0.92332 -0.59375,1.34375 2.2824,0.0488 25.8411,-5.30075 27.25,-5.65625 3.2346,4.1071 0.5944,5.97303 2.375,9.875 1.0959,3.202 -19.50435,4.079 -15.65625,6.0625 0.4453,0.21434 1.166454,0.28159 2.09375,0.21875 0.463648,-0.0314 0.974109,-0.10242 1.53125,-0.1875 7.242832,-1.10606 21.630725,-6.30856 23.375,-4.15625 1.87845,2.31779 7.440381,7.20116 7.125,10.65625 -0.03379,0.37019 -0.13224,0.72984 -0.3125,1.0625 -0.06009,0.11089 -0.14065,0.20651 -0.21875,0.3125 -7.9544,4.65297 -29.5088,10.59849 -28.875,16.875 0.308869,0.45296 1.351594,0.58567 2.875,0.5 1.015608,-0.0571 2.23778,-0.21837 3.59375,-0.4375 6.101863,-0.98608 14.859032,-3.30557 18.96875,-4.125 0.456634,-0.091 0.855174,-0.1372 1.1875,-0.1875 0.332327,-0.0503 0.593175,-0.0919 0.78125,-0.0937 1.787975,3.98741 1.616757,4.57925 2.625,6.75 0.144035,0.31011 0.298,0.64168 0.5,1.03125 -5.3964,2.5262 -17.12365,6.46345 -16.59375,6.96875 1.9352,1.84475 6.791663,1.27693 11.25,0.3125 1.114584,-0.24111 2.207701,-0.52225 3.21875,-0.78125 3.033147,-0.77701 5.373287,-1.47846 5.59375,-1.28125 1.7853,0.0825 5.87875,10.1295 3.53125,10.0625 -4.7563,9.35702 -29.85345,5.28826 -33.53125,12.53125 0.201209,0.0647 0.422166,0.13417 0.65625,0.1875 1.638584,0.37333 4.042365,0.47109 6.8125,0.40625 1.582938,-0.0371 3.294011,-0.12351 5.03125,-0.25 5.211705,-0.37948 10.747809,-1.08013 14.53125,-1.5625 1.261145,-0.16079 2.335553,-0.31204 3.125,-0.40625 0.7894539,-0.0942 1.3074875,-0.13638 1.46875,-0.125 7.5984,12.87228 -23.53895,11.95034 -24.34375,20.4375 -0.1446,1.52493 8.225722,0.7398 12.3125,2.125 0.340565,0.11543 0.663901,0.25825 0.9375,0.40625 0.820797,0.444 1.298713,1.04502 1.25,1.875 -0.07678,1.19923 0.483309,1.52919 1.40625,1.40625 0.230735,-0.0307 0.476088,-0.10867 0.75,-0.1875 3.013032,-0.86713 8.4001188,-4.21921 11.03125,-0.875 -0.5366,3.31155 -11.02005,10.211 -11.84375,10.125 -0.393,0.53507 -0.138902,0.69082 0.53125,0.625 0.223384,-0.0219 0.503611,-0.0591 0.8125,-0.125 3.706664,-0.79064 12.967025,-4.34233 13.71875,-0.78125 1.1113,5.73919 -24.7518,3.35731 -25.5625,12 9.0561,0.407 20.15815,4.37205 29.15625,4.65625 0.3512,0.9055 -6.2484,7.62735 -12.875,9.78125 -2.8349,0.9215 -7.66485,8.14775 -4.65625,8.09375 1.430878,-0.0255 2.774296,-0.0203 4.0625,0 0.714443,0.0113 1.422165,0.0379 2.09375,0.0625 0.5164112,0.0192 1.0712947,0.0358 1.5625,0.0625 0.1030618,0.006 0.2105367,0.0253 0.3125,0.0312 1.0157137,0.0594 1.9986129,0.12837 2.90625,0.21875 0.0097,9.7e-4 0.021559,-9.7e-4 0.03125,0 0.1113364,0.0112 0.2340168,0.0196 0.34375,0.0312 0.6143254,0.0652 1.1856921,0.14004 1.75,0.21875 0.1511973,0.021 0.3210844,0.0406 0.46875,0.0625 0.088414,0.0132 0.194105,0.0177 0.28125,0.0312 0.5901318,0.0915 1.1547914,0.20646 1.6875,0.3125 0.25183636,0.0504 0.54215621,0.10274 0.78125,0.15625 0.08435485,0.019 0.16722548,0.0432 0.25,0.0625 0.48119693,0.11228 0.915378,0.21932 1.34375,0.34375 0.2533785,0.0733 0.5147517,0.17272 0.75,0.25 0.5238631,0.17209 1.0019521,0.34112 1.4375,0.53125 0.2545409,0.11113 0.4936962,0.22702 0.71875,0.34375 0.1204497,0.0627 0.2629718,0.12329 0.375,0.1875 0.085814,0.0494 0.169107,0.10594 0.25,0.15625 1.7435393,1.08428 2.3613022,2.36667 1.96875,3.6875 -0.3411203,1.14775 -1.0285702,2.16579 -1.96875,3.09375 -0.073947,0.073 -0.14163,0.14698 -0.21875,0.21875 -0.1592959,0.14856 -0.3276268,0.29402 -0.5,0.4375 -0.1145552,0.0952 -0.2236824,0.18821 -0.34375,0.28125 -0.1449764,0.11251 -0.2847946,0.20308 -0.4375,0.3125 -0.2788288,0.19978 -0.5720757,0.40385 -0.875,0.59375 -0.2218256,0.13918 -0.4537266,0.27213 -0.6875,0.40625 -0.091541,0.0526 -0.187964,0.10439 -0.28125,0.15625 -0.6418399,0.35679 -1.31634925,0.70757 -2.03125,1.03125 -0.008772,0.004 -0.0224685,-0.004 -0.03125,0 -0.56228989,0.254 -1.1519296,0.48275 -1.75,0.71875 -0.508291,0.20025 -1.0338068,0.40509 -1.5625,0.59375 -0.2001451,0.0714 -0.3911709,0.14887 -0.59375,0.21875 -0.2515676,0.0869 -0.4951461,0.16537 -0.75,0.25 -0.6810319,0.22611 -1.3646462,0.44443 -2.0625,0.65625 -0.1462676,0.0444 -0.2907583,0.0811 -0.4375,0.125 -1.6899356,0.50523 -3.416136,0.98675 -5.09375,1.4375 -0.476437,0.12801 -0.906722,0.24952 -1.375,0.375 -0.590308,0.15793 -1.209551,0.31336 -1.78125,0.46875 -0.625705,0.17049 -1.279872,0.36167 -1.875,0.53125 -0.671499,0.19109 -1.316291,0.3696 -1.9375,0.5625 -0.04422,0.0137 -0.08107,0.0487 -0.125,0.0625 -0.473262,0.14809 -0.938027,0.28658 -1.375,0.4375 -0.39103,0.1353 -0.76719,0.26763 -1.125,0.40625 -0.302289,0.11711 -0.599045,0.25483 -0.875,0.375 -0.155433,0.0677 -0.32223,0.11871 -0.46875,0.1875 -0.02014,0.009 -0.04254,0.0218 -0.0625,0.0312 -0.164479,0.0781 -0.316367,0.17025 -0.46875,0.25 -0.236323,0.12368 -0.450939,0.24696 -0.65625,0.375 -0.153983,0.096 -0.30208,0.18247 -0.4375,0.28125 -0.09849,0.0716 -0.192946,0.14557 -0.28125,0.21875 -0.09855,0.0822 -0.196054,0.16568 -0.28125,0.25 -0.04429,0.0433 -0.08434,0.0811 -0.125,0.125 -0.07385,0.0806 -0.157458,0.16739 -0.21875,0.25 -0.117838,0.15909 -0.212326,0.33275 -0.28125,0.5 0.504423,0.0307 1.019739,0.0372 1.5625,0.0312 0.25961,-0.003 0.513463,-0.0204 0.78125,-0.0312 0.03102,-0.001 0.06262,0.001 0.09375,0 0.259793,-0.0113 0.545529,-0.0128 0.8125,-0.0312 0.171668,-0.0118 0.356781,-0.0166 0.53125,-0.0312 0.40765,-0.0343 0.827908,-0.076 1.25,-0.125 0.0411,-0.005 0.08377,-0.0263 0.125,-0.0312 0.928333,-0.11024 1.888995,-0.26531 2.875,-0.4375 0.911241,-0.15913 1.832547,-0.32796 2.78125,-0.53125 0.510898,-0.10947 1.043266,-0.2546 1.5625,-0.375 0.622868,-0.14458 1.242872,-0.27927 1.875,-0.4375 0.891062,-0.22284 1.78547,-0.47421 2.6875,-0.71875 0.1767985,-0.048 0.3542256,-0.0764 0.53125,-0.125 0.2832517,-0.0778 0.5601361,-0.17061 0.84375,-0.25 0.2817343,-0.0789 0.5619204,-0.13845 0.84375,-0.21875 0.5115517,-0.14565 1.0205741,-0.28816 1.53125,-0.4375 0.1365005,-0.0399 0.2698848,-0.0848 0.40625,-0.125 2.5788093,-0.75886 5.04257989,-1.52493 7.46875,-2.28125 0.5133402,-0.16003 1.0614138,-0.31286 1.5625,-0.46875 0.4574107,-0.14239 0.8355862,-0.26841 1.28125,-0.40625 5.34563,-1.65341 9.855581,-2.97005 12.15625,-2.96875 1.2981,1.2802 0.90305,5.73605 -2.84375,8.34375 -1.566083,1.0901 -5.3660506,2.90675 -9.3125,4.8125 -0.1551934,0.0749 -0.3130358,0.14345 -0.46875,0.21875 -1.2387132,0.59915 -2.380051,1.17298 -3.59375,1.78125 -0.95590735,0.47777 -1.90563839,0.94115 -2.78125,1.40625 -0.6362221,0.33926 -1.2440684,0.67408 -1.8125,1 -0.050411,0.0288 -0.1064658,0.0651 -0.15625,0.0937 -0.429469,0.24841 -0.8415071,0.51283 -1.21875,0.75 -0.4177451,0.26241 -0.7846788,0.5048 -1.125,0.75 -0.049524,0.0355 -0.1084778,0.0586 -0.15625,0.0937 -0.3113241,0.2301 -0.6155109,0.47644 -0.84375,0.6875 -0.1304288,0.12061 -0.2433535,0.23012 -0.34375,0.34375 -0.00585,0.007 0.00575,0.0247 0,0.0312 -0.09042,0.1037 -0.1865529,0.18388 -0.25,0.28125 -0.028465,0.0425 -0.039357,0.0838 -0.0625,0.125 -0.021547,0.0394 -0.045948,0.0868 -0.0625,0.125 -0.051664,0.11867 -0.092963,0.23745 -0.09375,0.34375 2.8995645,0.1186 5.3948623,0.23933 7.53125,0.34375 0.32869984,0.0155 0.75043268,0.0473 1.0625,0.0625 1.6128998,0.0816 3.149196,0.14738 4.375,0.21875 18.838615,1.09726 -7.9423304,1.58321 4.8125,8.28125 4.2498,1.2276 0.5906,3.218 1.375,6.375 0.2707,1.09 5.6106,0.17605 8.875,1.90625 2.7506,1.4583 1.99515,5.10285 1.40625,7.21875 -0.115288,0.41399 -7.831572,3.02427 -16.46875,5.96875 -3.7243847,1.26967 -7.6242827,2.59664 -11.15625,3.84375 -1.1597584,0.40926 -2.1881258,0.80205 -3.25,1.1875 -0.7182234,0.2609 -1.528577,0.53528 -2.1875,0.78125 -0.06827,0.0255 -0.151195,0.0684 -0.21875,0.0937 -1.534051,0.57506 -2.914256,1.10337 -4,1.5625 -7.183487,3.03765 -10.268659,5.49285 -8.59375,8.09375 0.119636,0.18578 0.237669,0.37496 0.40625,0.5625 0.168581,0.18754 0.375725,0.37267 0.59375,0.5625 0.17054,0.10664 0.389059,0.2238 0.65625,0.3125 0.01037,0.003 0.02075,-0.003 0.03125,0 0.03338,0.0109 0.05899,0.0207 0.09375,0.0312 0.259886,0.0802 0.540649,0.12261 0.875,0.1875 0.325277,0.064 0.704189,0.10672 1.09375,0.15625 0.122046,0.0153 0.247161,0.0486 0.375,0.0625 0.108172,0.0119 0.200305,0.0204 0.3125,0.0312 0.05048,0.005 0.104976,-0.005 0.15625,0 0.489582,0.0449 1.006035,0.0985 1.5625,0.125 0.292667,0.0139 0.566079,0.0223 0.875,0.0312 0.374816,0.0112 0.728594,0.0274 1.125,0.0312 0.240332,0.002 0.471279,4e-4 0.71875,0 1.272974,-0.001 2.619596,-0.0534 4.03125,-0.125 2.0886852,-0.10591 4.2752316,-0.27719 6.4375,-0.53125 0.020729,-0.002 0.041777,0.002 0.0625,0 0.1766582,-0.021 0.3551131,-0.0406 0.53125,-0.0625 0.5541442,-0.0688 1.1103208,-0.14052 1.65625,-0.21875 0.2630073,-0.0378 0.5209485,-0.0851 0.78125,-0.125 0.4567486,-0.0699 0.897523,-0.14221 1.34375,-0.21875 0.68289955,-0.11713 1.35009053,-0.24248 2,-0.375 0.6681219,-0.13624 1.3150636,-0.28525 1.9375,-0.4375 0.022462,-0.005 0.040105,-0.0257 0.0625,-0.0312 0.4352694,-0.10717 0.841915,-0.1976 1.25,-0.3125 0.1548514,-0.0434 0.2869159,-0.0805 0.4375,-0.125 1.1058732,-0.32714 2.1080339,-0.67692 2.9375,-1.0625 8.1763,-3.8007 9.31655,-7.71545 12.78125,-4.59375 8.6267,-3.6737 1.7735,6.36665 2.3125,9.40625 0.872137,4.92086 -13.2603957,7.47976 -18.03125,14.9375 -0.1748459,0.27332 -0.3515417,0.55693 -0.5,0.84375 -0.096725,0.18688 -0.1914373,0.36217 -0.3125,0.53125 -0.1210625,0.16908 -0.2626358,0.34756 -0.40625,0.5 -4.30843616,4.57318 -18.36925,1.90534 -18.0625,7.75 0.0091,0.17363 0.04528,0.32495 0.09375,0.46875 0.01466,0.0444 0.04424,0.0834 0.0625,0.125 0.04669,0.10316 0.08786,0.22582 0.15625,0.3125 0.01937,0.0237 0.04152,0.04 0.0625,0.0625 0.105312,0.11763 0.228384,0.19507 0.375,0.28125 0.01366,0.008 0.01725,0.0235 0.03125,0.0312 0.03941,0.0223 0.08283,0.0422 0.125,0.0625 0.134683,0.0636 0.307359,0.11307 0.46875,0.15625 0.207846,0.0556 0.438406,0.101 0.6875,0.125 0.249364,0.0232 0.525633,0.0368 0.8125,0.0312 0.145722,-0.003 0.314053,-0.0213 0.46875,-0.0312 0.299693,-0.0191 0.606545,-0.0505 0.9375,-0.0937 0.1625199,-0.0213 0.330498,-0.0358 0.5,-0.0625 0.096239,-0.0152 0.2141254,-0.0456 0.3125,-0.0625 0.5600265,-0.0967 1.1595966,-0.22991 1.78125,-0.375 0.058414,-0.0136 0.1286042,-0.0172 0.1875,-0.0312 0.4576855,-0.10884 0.9536918,-0.24527 1.4375,-0.375 1.2149343,-0.32642 2.4875946,-0.67588 3.8125,-1.09375 1.25706623,-0.39605 2.52664553,-0.8226 3.8125,-1.25 1.0626689,-0.35339 2.1153036,-0.71846 3.15625,-1.0625 6.06024,-2.00297 11.452721,-3.61537 12.3125,-2.0625 1.063601,0.94626 -5.934582,4.49118 -12.3125,8.21875 -1.7401454,1.01703 -3.4398089,2.03301 -4.90625,3.03125 -0.30716516,0.20799 -0.58907781,0.42043 -0.875,0.625 -0.15138475,0.10888 -0.2928,0.20475 -0.4375,0.3125 -0.2853272,0.21115 -0.5557668,0.41901 -0.8125,0.625 -0.2483658,0.20094 -0.5009356,0.39864 -0.71875,0.59375 -0.095011,0.0844 -0.1924513,0.1668 -0.28125,0.25 -0.267593,0.2528 -0.5132359,0.5098 -0.71875,0.75 -0.031238,0.0363 -0.064049,0.089 -0.09375,0.125 -0.073948,0.0905 -0.1547342,0.19285 -0.21875,0.28125 -0.1230671,0.17043 -0.2292652,0.33793 -0.3125,0.5 -0.078636,0.15311 -0.1471083,0.32381 -0.1875,0.46875 -0.043234,0.15515 -0.066185,0.29253 -0.0625,0.4375 0.00293,0.1153 0.027594,0.21294 0.0625,0.3125 0.029789,0.0888 0.071178,0.17315 0.125,0.25 0.00811,0.0114 0.022616,0.0201 0.03125,0.0312 0.045916,0.0598 0.095742,0.10375 0.15625,0.15625 0.1132715,0.10002 0.2434956,0.20599 0.40625,0.28125 0.1217963,0.0563 0.2585007,0.0818 0.40625,0.125 0.1167425,0.0338 0.2429126,0.0678 0.375,0.0937 0.034025,0.007 0.058739,0.025 0.09375,0.0312 0.039025,0.007 0.084755,-0.006 0.125,0 0.176453,0.0278 0.3635073,0.0463 0.5625,0.0625 0.4392926,0.0373 0.9310423,0.0454 1.46875,0.0312 0.3296951,-0.01 0.66962832,-0.004 1.03125,-0.0312 0.7270217,-0.0517 1.5093409,-0.13859 2.34375,-0.25 0.7697148,-0.10405 1.6008718,-0.23183 2.4375,-0.375 9.07557,-1.55308 21.380753,-5.10886 22.03125,-3.875 4.0118,7.61068 10e-5,18.58471 2.5625,21.65625 7.6597,2.0439 10.6168,-7.64347 18.5,-6.9375 4.3776,0.39202 17.905,6.25827 18.9375,8.75 0.9452,2.28129 -13.0389,9.28718 -14.3125,12.15625 3.2467,7.32457 25.5108,-4.80075 26.875,-4.84375 1.3201,4.8871 -3.40765,5.2522 3.71875,8.3125 -1.811406,4.57858 56.09387,9.7495 42.09375,1.625 -40.690925,-23.61364 -27.35129,-27.34668 -8.34375,-25.71875 5.63331,0.48248 29.69297,24.42714 35.0625,25.46875 5.60661,1.08761 -11.1997,-20.23661 2.34375,-19.84375 18.97876,-0.16481 31.65671,12.42711 38.46875,14.46875 16.41786,4.92058 34.42286,11.57559 12.40625,-10.1875 -3.68473,-3.6423 -5.40113,-11.45749 8.15625,-16.0625 0.97098,-1.56552 6.45846,-0.32527 6.59375,-0.3125 5.45864,-1.28998 6.1428,-2.83886 6.3125,-4.40625 3.82145,-1.21812 7.63023,-2.32901 9.34375,-3.21875 6.43169,0.32519 16.38199,5.69121 22.09375,8.75 6.54423,3.5047 40.40866,10.63575 43.15625,8.65625 3.0281,-3.0373 -30.78016,-8.99715 -37.90625,-12.46875 -7.95716,-3.8765 -19.02789,-9.3975 -19.21875,-10.1875 -0.22558,-0.93346 -0.088,-3.28967 0.34375,-5.75 1.58509,-0.15507 2.38885,-0.21139 0.3125,-0.40625 2.98843,-0.13844 3.41318,-0.3313 0.59375,-0.5 3.96473,-1.82522 4.46602,-4.01239 6.0625,-6.40625 0.94816,0.36949 1.60951,0.75669 1.71875,0.25 0.17022,-0.78925 0.12561,-1.56608 0,-2.3125 -0.002,-0.0105 0.002,-0.0208 0,-0.0312 0.44182,-0.42663 0.95862,-0.84448 1.5625,-1.28125 -0.20746,-1.20114 0.17003,-2.45363 0.6875,-3.75 3.27134,0.5765 12.96069,6.11611 24.0625,9.21875 11.27533,3.1512 28.17685,5.40355 28.28125,4.09375 -0.44953,-3.0404 -12.62272,-4.90655 -23.53125,-7.78125 -10.07555,-2.6552 -18.93565,-6.3776 -19.71875,-8 -1.03867,-2.1521 16.32552,-1.96905 16.3125,-3.96875 -0.0181,-2.7952 -10.8093,-1.03455 -14.3125,-3.84375 -3.25209,-2.6077 0.46697,-5.43855 1.59375,-6.71875 6.60428,0.39757 26.30942,5.33958 37.34375,5.28125 -1.82569,-5.6684 -25.33849,-15.68515 -29.6875,-19.90625 -0.45794,-0.44451 -1.11954,-1.15062 -1.8125,-2.03125 2.58634,-1.61341 4.80998,-3.40326 5.15625,-5.34375 1.44213,0.0877 -5.18079,-0.43556 -2.3125,-0.40625 -1.12527,-0.0927 5.28538,-0.69941 3.28125,-0.625 -1.86447,0.0783 1.33462,-0.59087 0.5625,-0.6875 1.94582,-0.0761 -0.70444,-0.63076 -1,-0.53125 0.19233,-1.25357 0.52216,-2.48125 0.90625,-3.6875 1.48829,-0.22321 1.791,-1.11144 0.65625,-1.875 1.23109,-3.27939 3.22864,-8.48557 4.0625,-11.53125 6.48104,0.58791 12.53956,4.77361 19.03125,4.4375 2.33046,-2.6157 -1.01522,-5.2262 -6.15625,-7.4375 -3.61628,-0.5134 -14.3075,-5.9258 -15.25,-7.71875 1.53542,-1.4691 4.0332,-3.03143 6.03125,-4.78125 4.02723,-0.15327 7.40786,-0.2544 6.59375,-1.53125 -0.36137,0.0435 -2.41579,-0.18238 -4.4375,-0.8125 0.69579,-1.03804 1.06613,-2.13697 0.84375,-3.3125 1.33698,-4.36289 4.4885,-9.30341 5.21875,-15.71875 1.31335,-1.6145 1.60252,-3.26571 1.59375,-4.90625 1.31518,-0.29244 2.37355,-0.50411 1.8125,-1 -0.85054,-0.75179 -1.47463,-1.40027 -1.96875,-2 -0.0981,-1.71292 -0.0124,-3.39905 1.09375,-5.03125 1.88331,-0.8387 4.40341,-1.45152 5.75,-2.625 1.11995,-0.091 14.66117,9.60205 20.25,7.53125 7.50171,-5.7831 7.9172,-3.8572 -17.59375,-12.4375 -1.34907,-1.10082 -3.28683,-1.19213 -4.8125,-2.03125 0.20265,-1.32285 0.70219,-2.59486 2.15625,-3.8125 0.94632,-0.82604 2.06078,-1.63228 3.1875,-2.4375 3.62108,0.95663 8.82158,2.04566 10.96875,-0.3125 0.35821,-0.39341 -2.93438,-1.45305 -6.625,-3.09375 1.20547,-1.1964 1.82971,-2.35629 1.15625,-3.46875 -0.22435,-0.39026 -0.34351,-0.77274 -0.40625,-1.15625 3.19272,-2.38084 5.66536,-4.70798 1.625,-8.1875 0.089,-0.43956 0.0553,-0.8339 -0.0937,-1.21875 3.90487,0.44521 15.44467,3.73451 16.65625,1.6875 1.47311,-3.95255 -13.77253,-7.37574 -17.1875,-8.34375 0.77031,-2.49356 -0.11608,-4.63838 2.90625,-7 -0.51487,-0.87694 -0.23561,-1.75793 0.4375,-2.625 1.51948,0.43013 3.24241,1.33572 5.03125,0.34375 1.88938,-1.12197 0.28218,-2.17815 -1.3125,-3.46875 1.21954,-0.84874 2.39547,-1.64836 3.09375,-2.375 0.16671,-1.30498 -1.92704,-2.41308 -3.53125,-3.40625 -0.19827,-0.39298 -0.43102,-0.95013 0.90625,-2.90625 1.2228,0.3555 10.80011,1.9863 12.78125,1.9375 0.97178,-4.4846 -15.96124,-6.14725 -12.3125,-7.90625 0.95258,-1.33362 1.86571,-2.58932 2.40625,-3.78125 2.66311,-2.18568 6.0413,-4.32435 8.6875,-6.4375 0.0892,-1.16331 0.6197,-2.30917 1.375,-3.40625 4.72098,-2.12756 14.39515,-4.76413 14.3125,-5.625 1.23232,-0.91928 -2.55775,-2.7986 -6.90625,-3.75 0.4853,-0.29804 0.71328,-0.529 0,-0.5 -1.62282,-0.0841 -4.3092,-1.71406 -1.3125,-1.71875 2.83243,-0.033 0.45188,-1.7424 -1.6875,-1.8125 -0.90066,-0.0954 2.96503,-2.02794 3.6875,-2.125 0.56202,-4.36932 -5.18637,-0.62728 -0.53125,-3.875 1.02676,-0.0592 2.01838,-0.25343 2.90625,-0.8125 0.0755,-1.14813 -1.6189,-2.34658 -3.65625,-3.5 0.16143,-0.53383 0.35068,-1.10758 0.59375,-1.71875 1.63648,-1.79402 -2.45321,-4.01703 3.84375,-5.625 1.95894,0.26891 4.94307,0.42718 4.5,0.25 3.48492,-1.65845 -9.87979,-7.43776 3.53125,-12.59375 2.63205,-2.3938 -3.61769,-5.51065 -3.6875,-5.71875 3.03397,-2.87334 1.51088,-5.72414 1.0625,-8.09375 0.6668,-2.75085 6.54362,-7.29998 7.53125,-7.3125 1.81619,-0.78156 10.00571,3.32902 12.90625,3.4375 -0.0779,0.54632 -15.61102,9.42307 -10.71875,12.8125 6.70887,4.64798 11.59749,0.21864 11.625,4.84375 0.015,2.51967 -11.02478,4.15606 -11.625,4.21875 1.32719,0.087 4.11053,-0.24845 4.9375,-0.34375 1.45434,0.085 -1.51301,6.573 -3.84375,6.625 2.52651,0.1015 -7.60531,2.49025 -4.4375,2.65625 3.16799,0.1659 9.4581,0.4535 8.75,0.8125 -2.27995,0.9961 -16.61906,4.67145 -9.65625,6.65625 13.92164,7.45648 4.33558,2.80497 13.25,3.6875 -0.46336,1.55184 -1.15027,3.01301 -1.78125,4.25 -2.12186,2.32247 5.24092,4.05268 3.1875,5.59375 -2.16133,1.63003 2.86741,3.00149 3.15625,4.125 -0.41665,0.83208 -0.75641,1.64986 -1.03125,2.46875 -1.9833,-0.0886 -3.88719,-0.16636 -3.84375,-0.125 -1.20954,0.0698 2.31752,3.47441 3.03125,3.9375 -0.006,0.0639 -0.0265,0.12364 -0.0312,0.1875 -2.07321,0.55336 -20.80897,3.61326 -20.28125,5.5 1.41757,-0.3361 10.8351,-1.30935 13,-1.28125 0.493,0.34887 4.58923,0.49179 7.75,0.875 0.2532,1.02915 0.59931,2.05561 1.03125,3.0625 -0.0249,0.10359 -0.042,0.2094 -0.0625,0.3125 -3.13813,2.23744 -7.66788,3.85883 -6.15625,5.46875 -0.99867,0.88456 2.34588,-0.65153 6.125,-2.28125 0.44091,3.24612 1.96617,6.26402 0.65625,9.125 0.17144,6.18195 2.55011,11.53971 5.84375,15.8125 -5.98767,3.53016 -15.34577,7.14116 -15.34375,8.1875 1.50931,0.78527 8.6662,-1.20993 14.65625,-2.78125 -1.33911,1.75332 -3.17074,3.20584 -3.09375,4.34375 -0.53179,3.73544 -1.42557,7.33179 0.21875,10.65625 -1.39024,2.0269 1.04746,3.84774 2.8125,5.5625 -1.62948,0.68415 -2.86418,1.29686 -2.8125,1.78125 0.0421,0.39494 1.92581,0.39412 4.28125,0.1875 0.0991,0.29282 0.14335,0.58657 0.0625,0.875 0.85957,1.17258 0.60519,2.25372 0.21875,3.25 -10.95384,3.91231 -28.27154,8.01598 -29.3125,12.4375 0.0587,-0.0934 25.10884,-6.08487 32.46875,-5.53125 -0.0728,0.44144 -0.5275,0.83719 -1.5,1.1875 -2.61851,20.62128 -1.93939,13.16973 -26.96875,21.28125 -3.333,2.405 9.89999,5.20584 10.75,5.125 8.02131,-0.76289 14.93314,-5.31562 24.21875,-0.59375 5.68435,2.79003 -11.55209,3.95365 -19.09375,10.90625 5.87385,0.93722 7.79445,-0.97261 12.28125,-0.0625 -1.53854,1.81979 -1.59713,3.92522 -1.40625,6.25 -1.98002,2.04955 -3.54731,3.98647 -3.59375,5.21875 2.62363,4.7482 1.1982,-0.521 3.21875,-0.25 0.35875,0.24307 0.73627,0.39699 1.09375,0.46875 0.76802,2.17747 1.19173,4.53531 1.1875,7 -2e-5,0.0104 3e-5,0.0209 0,0.0312 -3.027,1.7981 -5.65292,3.1203 -5.4375,3.53125 0.34732,0.66236 2.84155,0.35576 5.125,0.125 -0.0867,0.51635 -0.18868,1.04281 -0.3125,1.5625 1.03407,1.99338 1.64334,3.89852 1.9375,5.71875 -0.81889,0.80829 -1.74725,1.70693 -2.90625,2.78125 -0.42395,-0.017 -10.56803,2.92765 -8.46875,2.90625 2.91823,1.19897 5.91464,-0.13271 11.3125,-0.0937 -0.16203,0.95879 -0.36993,1.91101 -0.65625,2.84375 -0.087,0.39093 -0.0833,0.77668 -0.0312,1.15625 -2.75528,4.53707 -9.51731,9.93573 -10.6875,12.90625 2.75087,3.9439 6.09802,-6.0301 9.15625,-3 7.54012,1.1693 2.62923,9.62915 -3.375,13.59375 1.90433,1.5431 6.31944,-0.40685 7.78125,-1.15625 2.43322,0.034 3.75502,2.4876 3.3125,4.6875 -0.42594,2.27061 4.65784,-0.15345 7.59375,-0.78125 0.0179,0.0307 0.0469,0.063 0.0625,0.0937 -0.6598,0.78222 -0.85879,1.52034 -0.71875,2.21875 0.002,0.009 -0.002,0.0222 0,0.0312 -6.74995,4.76254 -19.21125,6.52355 -16.625,10.6875 0.77333,1.07127 10.32867,-2.3443 17.34375,-4.8125 -0.32138,2.92159 4.61898,5.72909 2.5625,8.09375 0.6738,0.43926 1.18112,0.85905 1.625,1.28125 -4.32602,5.45471 -11.27673,10.03741 -8.3125,10.21875 6.59738,0.404 16.70602,-5.086 15.46875,-1.375 -0.58164,2.33592 -0.99315,4.40524 -3.5625,4.375 3.08335,0.41791 -1.51485,3.20826 -1.875,3.34375 -3.92479,1.351 -16.19227,6.37895 -15.6875,7.40625 0.39601,0.8061 12.72772,-1.4747 16.375,-2.0625 2.32054,-0.3739 6.65042,-0.595 7.1875,-0.9375 0.44134,1.0678 -6.79803,6.581 -9.25,6.625 2.31463,1.3561 6.60327,0.5927 8,0.25 -1.68025,7.5226 9.87507,2.91985 10.125,4.78125 2.43426,3.0202 14.06574,7.01106 16.5,10.03125 l 0.34375,-0.625 c 2.10001,1.60232 4.04863,2.69544 8,3.4375 10.07638,0.91967 31.76002,9.3438 36.78125,9.15625 1.58391,-0.0592 -12.32218,-8.22386 -10.9375,-8.53125 7.21315,-1.60129 12.85204,-1.65654 27.25,-1.6875 5.27972,-0.21908 12.95321,5.65912 17.375,5.8125 21.87203,0.75868 -4.09289,-5.57941 12.1875,-6.0625 5.65288,-0.20556 23.85023,-0.13428 32.46875,-0.3125 -12.27733,14.01295 39.20692,-1.39231 54.5,-4.75 2.82759,-0.41316 -11.77535,10.83398 10.90625,10.03125 22.6816,-0.80273 -7.11083,-10.63946 21.59375,-10.8125 24.7106,-2.43894 -3.9537,-6.00205 15.15625,-8.65625 2.62732,-0.43951 4.44015,-1.00309 5.9375,-1.875 4.05826,0.89969 7.74094,1.83503 7.4375,1.84375 -3.0674,-2.03845 -4.35468,-3.48788 -4.40625,-4.46875 0.35141,-0.39879 0.72777,-0.81014 1.09375,-1.28125 3.70257,-1.54308 16.07371,0.38458 21.375,1.46875 1.69913,0.3475 17.06229,1.8216 17.9375,0.625 0.72249,-0.9881 -21.48372,-7.13975 -19.25,-12.90625 4.17394,-3.7533 9.47492,4.4678 14.8125,1.875 2.81834,-0.271 0.87173,4.9982 4.53125,0.25 -0.19652,-3.7385 -19.77255,-14.01875 -16.46875,-13.96875 4.52208,-7.85334 37.51466,6.04276 39.0625,0.5 -2.67146,-1.86491 -18.51281,-7.94742 -26.3125,-11.53125 0.2725,-0.18204 0.54681,-0.38904 0.8125,-0.5625 3.50207,-2.05758 -2.05647,-3.67671 -2,-4.75 0.0754,-0.0519 0.14448,-0.10368 0.21875,-0.15625 0.40335,-0.0127 0.79119,-0.0385 1.25,-0.0312 8.87574,0.1412 29.70519,9.7969 33.375,10.375 1.19081,-0.0135 1.86774,-5.00125 -2.78125,-7.40625 -5.67023,-2.93344 -16.95385,-6.8256 -25.125,-9.3125 1.09186,-1.13911 2.23889,-2.28408 3.59375,-3.40625 -1.65662,-3.44641 -1.49666,-6.53205 -3.25,-8.21875 -1.74352,-0.64239 7.57467,-1.11859 5.3125,-1.46875 -1.36384,-0.34767 -3.6409,-0.46077 -2.65625,-0.625 20.41427,3.42085 48.97159,9.58814 49.03125,9.65625 -1.74921,-5.32668 -36.54137,-10.18849 -48.9375,-14.8125 0.52357,-0.30746 1.46739,-0.70321 3.125,-1.21875 0.34262,-0.29042 0.60091,-0.58861 0.84375,-0.90625 5.09546,0.49874 10.32226,0.75262 10.40625,0.1875 0.11428,-0.76784 -4.14685,-1.84719 -8.25,-3.0625 0.35544,-0.39447 0.76591,-0.80782 1.28125,-1.28125 0.17369,0.0243 0.19026,0.0326 0.1875,0.0312 -0.0298,-0.0221 0.0432,-0.0758 1.875,-0.0625 -1.1259,-0.0269 -0.56651,-0.0362 0.0625,-0.0312 0.024,-2.44274 -1.01216,-4.97726 2.625,-7.625 1.22331,-2.69746 -0.0864,-5.0963 3.125,-7.125 1.08682,-0.87609 -0.0607,-1.73339 -1.4375,-2.53125 7.45118,1.40846 15.1503,2.8033 16.96875,2.125 0.003,-0.96144 -11.01452,-4.07198 -19.28125,-7.3125 0.17515,-0.04 0.33317,-0.0875 0.53125,-0.125 1.93658,-0.008 -0.10299,-0.0598 -1.03125,-0.0937 -0.0213,-0.008 -0.0412,-0.0228 -0.0625,-0.0312 0.11212,-0.004 -0.0111,0.002 0.34375,0 1.85132,0.0258 3.03089,0.0136 4.03125,-0.0312 0.11482,0.0128 0.76513,0.006 1.78125,-0.0312 -0.27518,0.016 -0.80844,-4.7e-4 -1.3125,0 -0.0402,0.002 -0.0839,-0.002 -0.125,0 -2.24163,-0.003 -5.62939,-0.11102 -3.65625,-0.15625 0.68814,-0.57246 1.23009,-1.07187 4.1875,-1.90625 1.98936,-0.79971 1.08229,-2.03041 0.3125,-3.15625 -2.99984,-10e-4 -1.22354,-0.65239 -1.875,-0.75 -2.69834,-0.0437 0.34268,-0.58777 0.5625,-0.6875 -2.59601,-0.0501 6.90699,-0.79234 5.21875,-0.875 0.28013,-0.0946 2.52773,-0.63908 0.875,-0.75 0.52071,-0.0807 0.94707,-0.81751 1.46875,-2.46875 3.94672,-1.73927 3.21585,-4.51798 5.03125,-8.75 -1.8703,-0.004 -3.52512,-0.0485 -3.90625,-0.0937 0.0936,-0.0184 0.32383,-0.0582 1,-0.0625 1.40481,-0.0126 0.22731,0.0252 -1,0.0625 1.34194,4.2e-4 2.9911,-0.002 3.3125,-0.0312 -0.0341,-0.006 -0.0819,-0.0227 -0.1875,-0.0312 2.30379,0.006 0.90223,-0.24872 0.96875,-0.21875 -1.13952,-0.041 -0.15734,-0.3654 0.875,-0.375 -0.32393,-0.20335 -8.55225,-0.19428 -5.78125,-0.375 0.6856,0.0974 0.29976,0.0258 2.5,0.0937 0.15831,-0.0897 2.11268,-0.19612 -0.59375,-0.1875 1.17554,-0.79702 1.57589,-1.56792 1.65625,-2.3125 0.61184,0.13777 0.82724,0.0997 0.375,-0.1875 0.78037,-0.59584 0.3779,-1.18276 -0.625,-1.8125 -0.16925,-0.84071 -0.20724,-1.62132 0.71875,-2.34375 -0.39448,-2.02914 1.45827,-3.30393 -0.0937,-4.53125 -0.41875,-0.22053 -0.15593,-0.44565 0.4375,-0.65625 1.58902,-0.10594 2.83751,-0.22915 3.125,-0.375 3.01969,-0.0281 16.17897,0.94515 18.15625,1.28125 0.5175,-1.32645 -11.87391,-3.13415 -20.53125,-4.34375 1.34224,-0.30015 3.80679,-0.641 5.4375,-0.65625 -1.65155,0.0835 -2.56042,-1.31528 -3.34375,-1.21875 -0.8549,-0.0959 -2.90213,-1.51649 -1.0625,-1.4375 2.77425,-0.46702 1.72915,-1.63852 4.4375,-3.5625 1.19905,-2.11348 4.02504,-4.90574 8.3125,-9.375 1.32197,0.0898 -3.34093,-1.49535 -3.875,-1.59375 -2.86614,0.0295 5.4061,-1.7674 3.46875,-1.84375 1.79908,-0.08 1.29319,-1.76238 -1.40625,-1.71875 0.44071,0.0989 1.60341,-2.01171 4.3125,-1.96875 1.32789,-0.54068 -1.18089,-0.93776 -3.34375,-1.3125 0.68332,-0.26364 0.71261,-0.2914 1.5,-0.59375 4.85599,-0.9924 2.30371,-2.39606 -1.875,-3.6875 1.81891,-1.502 0.27393,-3.78428 4.21875,-6.59375 -1.48715,-2.99044 3.04404,-6.70566 6.125,-11.1875 0.99117,-0.61212 4.13135,-1.05049 1.96875,-1.8125 0.63551,0.12125 3.31123,-3.40143 4.0625,-3.25 4.39848,0.3876 7.1683,4.29291 5.9375,4.90625 0.87058,1.04566 -1.0367,2.57117 0.125,4.53125 4.5324,1.90073 5.67658,4.11014 11.59375,5.625 -0.96847,-0.10131 -4.90666,0.23876 -3.5,0.75 0.48259,0.70425 2.45491,1.42117 1.40625,3.25 -0.1748,8.00779 3.80561,13.6214 10.15625,17.625 0.28549,0.16369 0.58392,0.30997 0.875,0.46875 -2.52999,0.82029 -3.91017,1.65059 -2.90625,2.1875 -0.10035,0.74938 10.01215,2.87287 17,4.8125 0.4755,0.42027 0.71769,0.83345 0.625,1.21875 3.02896,2.63504 -1.63652,5.15666 -1.375,7.5 -0.72848,2.36204 5.48127,4.9831 4.21875,7.25 0.58294,0.62196 0.93453,1.23524 1.15625,1.84375 -5.13059,1.3733 -16.3529,3.11798 -15.40625,6.25 2.26576,0.04 11.31801,-1.00422 15.5625,-1.59375 -0.0564,1.48646 0.18727,2.9539 1.96875,4.4375 0.93524,0.79338 1.62155,1.57397 2.15625,2.34375 -5.13875,2.86547 -20.11572,6.08165 -16.34375,7.6875 2.39317,0.95143 10.85747,-1.07641 18.40625,-2.625 4.23395,2.823 4.98956,3.99279 4.96875,4.40625 0.2895,-0.0727 0.8349,-0.14192 1.875,-0.125 1.75419,1.03144 2.05365,1.88616 0.84375,3.15625 1.44624,0.0925 -6.09291,1.3514 -4.15625,1.4375 14.11341,1.4746 -19.36438,1.83855 -16.4375,7.46875 1.99442,2.4158 16.54423,0.24775 20.1875,0.21875 -12.47801,5.857 2.82741,6.93975 8.71875,11.03125 -6.5336,2.5262 -19.73549,5.96345 -19.09375,6.46875 4.35868,3.43193 22.47623,-2.0188 25.5625,-2.375 1.16531,1.20881 1.34885,2.63466 3.03125,4.15625 0.30256,1.7208 0.0432,3.31247 -1.28125,3.28125 2.45792,0.0763 -9.45501,1.6586 -5.8125,1.6875 -35.58356,8.5803 -50.33866,-0.68935 -39.875,5.09375 7.7955,2.0708 42.00035,-0.2785 43.5625,-0.1875 4.47786,2.7976 2.53573,5.7753 -9.0625,13.125 -1.69196,1.07214 19.05432,-1.04579 24.59375,1.1875 0.5314,0.66019 0.97845,1.29901 1.34375,1.9375 9.9e-4,1.30261 0.35769,2.71139 1,4.15625 -0.007,1.084 0.78116,2.13422 1.75,3.125 1.83789,2.8318 4.32759,5.6788 6.6875,8.15625 -0.64961,3.31155 -19.09654,11.2735 -20.09375,11.1875 9.841,4.90267 25.84396,0.17647 32.21875,-0.34375 3.79691,2.04952 3.34062,2.94768 6.125,6.4375 1.69296,-0.0826 0.49221,0.13748 3.46875,0.125 -2.44917,0.0578 -4.27536,-0.0908 -5.53125,0 -1.37613,1.111 8.50285,2.12436 7.65625,3.59375 3.05023,1.31915 5.41096,2.95064 3.71875,4.65625 2.85313,0.0309 -0.20406,0.75797 -2.71875,0.8125 -2.92373,0.0224 5.64421,0.71651 3.25,0.65625 -1.96617,-0.0571 -0.92207,0.46966 0.875,0.5625 -1.79295,0.1142 -2.30294,0.74559 0.0937,0.78125 2.41802,2.92191 3.33887,4.94887 8.5,7.125 0.15462,2.1767 3.17031,14.85915 14.0625,13.84375 -4.59725,6.14197 8.72496,1.54445 9.78125,5.0625 0.94113,3.13451 -12.82775,7.69038 -4.78125,8.5625 10.12064,1.09693 25.22868,-7.68469 20.03125,0.3125 -5.19742,7.9972 -13.57952,5.19087 -20.375,11.78125 -8.31132,8.06045 28.16528,-4.21794 36.84375,-3.5625 5.38397,0.40662 -5.5922,17.70195 5.375,14.40625 17.60996,-5.29187 20.54048,-16.64216 30.96875,-9.0625 31.3158,-10.08393 14.4937,3.24556 29.1875,1.75 9.1756,-0.35589 17.7858,-8.48013 26.5313,-9.375 -1.0773,-0.17835 -4.3817,-0.34846 0.5,-0.5 3.9755,-0.19928 2.7914,-0.20275 5.375,-0.375 1.6068,0.0969 3.5016,-0.0345 5.6562,-0.46875 0.243,-0.0108 0.4443,-0.046 0.6562,-0.0625 l 0,-0.0937 c 2.5635,-0.56798 5.4757,-1.51123 8.75,-2.84375 0.1948,-0.0398 4.0028,0.56625 4.6876,-0.65625 -0.7691,-0.0612 -4.4285,-2.31325 -4.9376,-2.84375 -1.6719,-0.0135 6.1907,-0.5344 7.8126,-0.5625 1.5069,-2.7269 -10.9366,-4.35421 -9.25,-8.21875 0.8523,-1.2142 9.3064,3.7219 10.9062,2.375 0,-1.2238 -4.4799,-4.02595 -7.7188,-8.03125 -3.2352,-4.0019 -0.6175,-4.3442 -0.125,-6.75 0.4095,-1.9994 15.1579,1.8253 14.7813,-0.125 4.0343,-4.14902 -14.1081,-4.3458 -15.3437,-8.4375 -0.8064,-2.6657 1.6538,-9.4058 1.3437,-10.4375 0.056,-2.5878 1.649,3.3564 11.2187,1.3125 -2.9909,-2.0569 -9.1992,-3.303 -10.25,-7 10.2247,-1.49462 13.9012,0.0141 16.7813,-5.90625 -5.9623,-0.91828 -19.0501,-0.48915 -18.0625,-0.53125 0.2212,-0.0782 2.7613,-3.95715 1.9688,-4.03125 0.053,-0.0818 -4.3198,0.24822 -5.1876,0.34375 2.6876,-3.7099 3.3573,-4.69199 3.3438,-7.5625 0.1212,-3.7477 -2.1798,-7.38245 0.5938,-9.28125 1.0132,-0.679 3.106,1.69555 3.3124,2.03125 2.627,-0.43032 9.2754,-0.5742 5.9376,-5.53125 4.3025,-1.9848 -4.5598,-5.66015 -5.9688,-6.65625 -0.4376,-0.359 3.4488,-0.6466 5.4062,-0.8125 1.9576,-0.166 -4.3112,-2.55475 -2.75,-2.65625 -1.4402,-0.052 0.1326,-1.25875 1.0313,-1.34375 0.511,0.0953 2.2106,0.43075 3.0313,0.34375 -0.5412,-0.0915 -8.0021,-5.53005 -7.4688,-5.9375 -0.9716,-0.15698 6.4384,-2.1781 7.25,-2.09375 -0.3924,0.0671 -0.1386,-0.0811 0.062,-0.71875 -1.0051,-0.6036 -0.043,-1.32075 -0.3437,-1.84375 1.5942,0.0327 1.4548,-1.325 2.5624,-1.25 -0.8233,-0.0873 2.325,-0.0504 3.2813,-1.5 1.5019,-5.0805 -5.5398,-8.54775 -4.5,-8.46875 3.0995,-4.5259 9.002,1.8104 10.125,4.5 -0.5999,0.8341 -0.8474,1.56935 -1.0313,2.15625 -0.5216,1.7898 4.7546,3.18645 4.1876,5.59375 -0.012,2.28 -3.525,5.9395 -0.2813,8.4375 -0.021,0.0136 -0.023,0.0223 -0.031,0.0312 0.4531,-0.0175 3.9109,-1.02296 5.9376,-0.875 1.3629,0.0994 2.4624,0.3113 3.4687,2.625 1.9837,2.0975 -4.817,5.5041 -4.6875,8.6875 1.887,1.9229 2.5847,0.3859 4.7188,2.8125 1.5217,2.389 3.836,5.86865 2.9374,8.59375 -2.6292,-3.3495 -11.4114,1.5216 -10.0312,3.1875 -0.064,1.0779 9.3108,4.9892 10.3125,7.125 -1.6677,1.6661 -0.2441,3.67225 -1.3437,6.09375 -1.049,2.4243 0.1383,4.8775 1.4062,7.75 2.2546,1.759 -8.2256,3.42165 -7.625,7.90625 1.2243,0.0488 7.1508,-1.582 7.9062,-1.9375 1.7356,4.1071 -0.8184,2.098 1.5313,5.1875 0.5878,3.202 -10.0336,7.6415 -7.9687,9.625 1.9108,1.7147 12.6297,-6.274 13.7812,-3.625 1.1513,2.6489 -0.222,3.6707 -1.5625,7.0625 -7.6386,4.2205 -13.6669,0.6279 -13.2187,6.53125 0.8831,2.4158 20.5063,-3.90973 13.3124,0.90625 -11.4193,7.64495 7.2496,8.39392 15.0626,5.9375 4.3188,-1.96466 -2.9206,5.86884 -5.625,9.90625 5.0885,-1.84866 11.3535,-1.13297 18.5312,-3.90625 8.0334,-3.10387 15.668,-6.65127 21.9062,-2.5625 4.3334,4.41721 -7.2228,10.93121 -4.0624,9.25 12.9556,-2.12129 21.5409,-9.77373 28.9062,-10.5625 26.7366,-1.4855 4.0824,7.24991 18.4375,7.5 5.5786,-0.67319 -5.8039,-11.48916 11.5,-14.90625 13.2675,-2.5067 28.9479,13.24554 18.0937,-6.46875 10.308,-8.48425 7.5037,5.97941 15.5938,-6 26.0998,6.82129 5.4916,-2.26913 6.75,-7.15625 1.3016,0.0431 13.4702,-6.21463 14.375,-6.875 -0.6491,4.38728 31.2319,10.47008 36.6875,9.71875 -3.0308,-7.20799 -19.1387,-20.95186 -15.3125,-28.5625 0.9854,-1.96015 10.5668,3.07268 10.6875,-1.90625 0.111,-4.57934 -3.2511,-9.46438 -1.4375,-11.15625 2.0119,-3.81018 35.7045,15.94922 36.0312,9.40625 0.3126,-6.2342 -20.8605,-7.39476 -23.8124,-13.375 -4.0048,-8.11311 -12.4249,-5.18 -11.5626,-10.28125 0.514,-3.03962 -6.0083,-13.07995 2.2188,-9.40625 3.3044,-3.12184 4.3898,0.79302 12.1875,4.59375 7.1902,3.50465 44.4187,10.63581 47.4375,8.65625 3.327,-3.03738 -33.8274,-8.99714 -41.6562,-12.46875 -8.7428,-3.87651 -20.9158,-9.39748 -21.125,-10.1875 -0.5619,-2.1159 0.9393,-11.51063 3.5624,-12.96875 3.1133,-1.73036 6.1169,1.21507 6.375,0.125 0.7482,-3.15695 -2.5218,-6.14736 1.5313,-7.375 2.2022,-0.66707 13.847,5.80903 27.375,9.25 12.3883,3.15109 30.9477,5.40349 31.0625,4.09375 -0.4939,-3.04043 -13.8576,-4.90659 -25.8438,-7.78125 -11.0697,-2.65522 -20.7959,-6.37743 -21.6562,-8 -1.1413,-2.15196 17.9207,-1.96904 17.9062,-3.96875 -0.02,-2.79515 -11.8698,-1.06582 -15.7187,-3.875 -3.5732,-2.60781 0.7619,-9.81363 2,-11.09375 1.3646,-0.98256 4.9102,-2.49282 4,-2.84375 4.242,1.23809 22.8831,7.48131 28.6875,7.21875 -2.006,-5.66836 -27.0648,-11.99764 -31.8438,-16.21875 -2.8124,-2.48489 -12.5171,-13.41173 4.4688,-13.09375 2.869,0.0537 3.3911,-1.48479 0.6875,-2.40625 -6.3198,-2.15391 0.1025,-8.25082 0.4375,-9.15625 8.5814,-0.28428 17.3006,2.93828 25.9375,2.53125 2.5605,-2.61568 -8.2265,-5.00737 -13.875,-7.21875 -7.3482,-2.87682 -10.3464,-5.48184 -8.4375,-8.1875 0.9557,-4.74816 16.374,-3.36503 14.375,-6.21875 -0.7855,0.0859 -11.707,-2.25085 -12.2188,-5.5625 3.6499,-4.86424 7.7301,-9.57811 7.4376,-14.375 -0.2477,-4.42674 17.2641,-2.94428 15.7187,-4.1875 -9.1359,-7.34969 -10.6522,-10.32744 -7.125,-13.125 1.2304,-0.0912 28.6095,13.03958 34.75,10.96875 8.2422,-5.78312 -3.8154,-7.29475 -31.8437,-15.875 2.8686,-0.0292 -6.5299,-1.61111 -4.5938,-1.6875 -2.2388,0.0666 -0.6704,-7.35516 1.0312,-7.4375 0.5609,-0.5259 16.8091,6.06447 20.5,2.375 0.5056,-0.50534 -9.9159,-3.94258 -15.0624,-6.46875 4.6403,-4.09152 16.7038,-5.1742 6.875,-11.03125 2.8695,0.0291 14.3352,2.19698 15.9062,-0.21875 2.3055,-5.63025 -24.0546,-5.9941 -12.9375,-7.46875 1.5255,-0.0861 -4.4197,-1.34499 -3.2813,-1.4375 -2.3831,-3.39181 -5.9849,-5.78852 -3.9374,-8.4375 2.0471,-2.64897 21.1023,5.30856 24.5,3.59375 3.6693,-1.9834 -15.2015,-6.39165 -14.1563,-9.59375 4.1776,-3.08948 -0.3349,-1.08047 2.75,-5.1875 1.3435,0.35531 11.8538,1.98632 14.0313,1.9375 1.0676,-4.48446 -17.5402,-6.14725 -13.5313,-7.90625 2.2543,-2.87245 4.3338,-5.32567 2.4687,-7.75 -1.9565,-2.42153 0.5906,-4.42768 -2.375,-6.09375 1.7808,-2.13574 18.4575,-6.04699 18.3438,-7.125 2.4536,-1.66589 -13.1682,-6.53695 -17.8438,-3.1875 -1.5967,-2.72504 -0.7682,-7.01723 1.9376,-9.40625 3.7943,-2.42661 8.3324,-0.0769 11.6874,-2 0.2301,-3.18342 -11.9019,-6.58998 -8.375,-8.6875 1.7892,-2.31367 3.7642,-2.52554 6.1876,-2.625 4.1177,-0.16903 11.5305,1.20733 10.5312,0.84375 5.7672,-2.49797 -0.4786,-6.15741 -0.5,-8.4375 -1.0082,-2.40712 8.3649,-3.80395 7.4375,-5.59375 -0.3264,-0.58686 -1.3084,-6.75968 -2.375,-7.59375 -5.6149,-7.55602 6.9856,-12.56443 18.0313,-4.5 1.8487,-0.0787 -3.0206,9.15077 -7.5,13.90625 1.7001,1.44963 7.2764,1.41271 5.8124,1.5 1.9695,-0.0754 1.7274,1.28273 4.5626,1.25 -0.5354,0.52297 1.1933,1.24003 -0.5938,1.84375 0.3637,0.63762 0.7894,0.78582 0.094,0.71875 1.4882,-0.0868 15.527,2.05594 12.75,2.09375 1.9547,0.0758 -12.1632,5.84314 -13.1563,5.9375 1.4582,0.0874 4.4969,-0.24845 5.4063,-0.34375 1.5978,0.0846 4.4045,1.29166 1.8437,1.34375 2.7759,0.10147 -8.386,2.45907 -4.9063,2.625 3.481,0.16592 10.4031,0.48471 9.625,0.84375 -2.5045,0.99609 -18.2438,4.67151 -10.5937,6.65625 15.413,7.51358 4.5635,2.71143 14.75,3.6875 0.3671,-0.33569 2.9485,-1.3353 4.75,-0.65625 0.6401,1.78391 0.8473,5.53372 1.0625,9.28125 -0.024,2.87313 -1.92,4.31381 2.875,8.03125 -1.5421,-0.0954 -9.313,-0.42546 -9.2188,-0.34375 -1.4103,0.0738 3.0756,3.95306 3.4688,4.03125 1.7604,0.0417 -23.2369,3.52837 -22.4688,5.59375 1.5472,-0.33547 11.9012,-1.34067 14.2813,-1.3125 0.8052,0.51858 10.4199,0.5763 12.2813,1.65625 -1.8678,3.69701 -11.7093,5.92198 -9.4688,8.09375 -2.3928,1.92894 17.2121,-7.46272 17.3125,-4.875 -0.5512,1.03179 1.4005,5.58434 -0.031,8.25 -2.1974,4.09181 -7.9723,6.7115 -8.5624,8.5625 -0.6696,1.95023 7.6161,0.18818 8.3437,2.1875 0.8756,2.4059 5.5331,2.74822 -0.2187,6.75 -5.7575,4.00539 -19.8151,8.74492 -19.8126,9.96875 2.8444,1.34684 23.9847,-5.52669 25.5,-4.3125 2.9991,3.35933 -9.1168,6.30431 -6.4374,9.03125 2.8831,0.0276 12.1603,1.58024 9.1874,1.59375 -0.9047,0.53049 -7.4456,2.78272 -8.8124,2.84375 1.2173,1.2225 7.9984,0.61647 8.3437,0.65625 -0.038,0.64367 -1.6445,3.34628 -4.0313,4.78125 -3.3161,1.99383 -10.9476,3.81636 -10.8124,4.96875 0.1086,0.93024 11.2186,-0.33583 14.7187,-1.3125 1.2688,5.58981 -40.2337,11.47565 -41.9375,18.0625 0.069,-0.1 48.5702,-13.3997 54.0312,-11.75 3.2222,3.2039 -9.8593,13.47855 -10.25,13.46875 1.2636,-0.0133 3.8979,-0.0354 4.5938,-0.0937 -1.9101,-0.017 -20.1108,7.10226 -27.1875,11.75 -3.662,2.40502 -3.1255,7.39265 -2.1875,7.40625 2.8907,-0.57819 19.2903,-10.23385 26.2812,-10.375 4.2645,-0.0861 5.4955,1.25053 3.5,3.3125 -2.2346,2.30926 -21.3623,11.38129 -24,13.71875 0.09,5.44348 31.803,-7.36334 30.7813,-0.53125 2.6024,-0.0498 -12.8147,10.26143 -12.9687,14 2.8822,4.74807 1.3425,-0.5523 3.5624,-0.28125 4.2048,2.59289 8.3685,-5.59698 11.6563,-1.84375 1.7595,5.76653 -15.7251,11.91817 -15.1563,12.90625 0.6895,1.19668 12.7872,-0.2775 14.125,-0.625 6.3256,-1.6423 16.7828,-2.24254 5.5313,7.25 -0.4658,-0.0172 -11.619,2.92765 -9.3125,2.90625 3.2898,1.23033 6.6458,-0.24127 12.875,-0.125 1.2175,4.81142 -11.2695,12.98093 -12.9688,16.90625 3.0227,3.9438 6.7337,-5.99897 10.0938,-2.96875 8.2844,1.16914 2.8789,9.62916 -3.7188,13.59375 2.0792,1.53336 6.8633,-0.39635 8.5,-1.15625 2.8741,-0.0287 -11.2298,5.66289 -11.7187,7.875 -0.6058,2.93925 8.9585,-1.99622 10.375,-0.6875 -5.8591,6.57396 -24.284,8.20192 -21.0313,12.96875 1.2745,1.60689 24.8333,-7.05477 26.9688,-7.125 1.0346,1.67247 0.72,6.85467 -2.875,11.1875 -4.7039,5.66919 -12.9173,10.53181 -9.5625,10.71875 7.2486,0.40392 18.3594,-5.08602 17,-1.375 -0.2619,1.95212 -3.2694,5.91915 -6.7187,7 -4.3126,1.35093 -17.8047,6.41023 -17.25,7.4375 0.4347,0.80612 13.9926,-1.47483 18,-2.0625 2.5495,-0.37391 7.2844,-0.59488 7.875,-0.9375 0.4846,1.06786 -7.4623,6.581 -10.1563,6.625 2.5431,1.35618 7.2459,0.5927 8.7813,0.25 -1.8462,7.52258 1.288,6.13874 1.5624,8 0.081,0.64856 -2.0225,5.24263 -7.1562,9.15625 -5.1395,3.91799 -18.681,8.09245 -17.8125,10.21875 6.8144,2.21923 27.5518,-10.63726 30.5937,-9.65625 3.2283,2.68584 -2.3359,6.35766 -3.2187,11.125 1.6295,2.58986 7.8236,6.20564 4.9063,10.09375 -1.5048,2.00488 -8.8923,2.91429 -13.3126,6.25 -2.0824,1.57163 14.1586,-0.54747 16.25,1.59375 1.6069,1.64488 -3.41,5.14414 -9.9062,6.5 -8.3263,1.73783 -18.6245,1.28401 -15.7812,3.0625 9.5362,5.96517 30.4963,-1.33957 33,0.3125 1.5578,1.02825 -0.5345,4.53562 -4.0938,5.71875 -3.6759,1.22185 -12.1754,5.24428 -10.5625,6.375 6.0162,4.21766 12.3304,-5.20302 17.875,-1 0.9651,4.13671 -5.0965,4.57174 -1.6563,7.0625 2.8787,6.33932 5.7943,11.7704 5.1876,16.375 -0.1278,4.56865 9.8379,3.00376 -1.0938,12.90625 1.7572,0.51195 11.3608,-0.92435 13.7812,-0.65625 9.5336,7.31541 -22.757,7.14366 -16.4374,12.1875 6.1602,2.70127 19.4313,-0.7559 22.75,-1.03125 -2.1196,0.4441 -3.4459,4.40606 -3.625,4.3125 -1.3904,3.7585 5.3922,3.5682 8.2187,5.875 4.3464,2.3248 1.0658,3.9674 4.9375,5 21.7653,2.9842 17.7759,6.2006 27.7188,9.9688 6.4517,2.1073 2.2173,11.4201 24,15.2812 21.7826,3.8612 -5.8066,-12.2582 5.2812,-12.2812 7.9019,-0.017 12.4199,-2.6541 19.25,-2.875 7.8351,-0.4797 11.8606,5.5783 21.6875,5.25 12.6583,-2.2012 3.2479,-7.8322 11.9375,-8.8438 11.271,-0.046 9.8339,-1.3363 20.8125,-2.8438 3.4325,-0.3392 20.5985,10.9729 23.1563,10.125 3.6736,-7.8337 -4.6654,-12.4037 9.3124,-15.7187 8.299,-1.5217 35.8784,13.628 41.9063,12.5 11.4447,-2.1416 -25.4905,-13.0188 8.4063,-16.5313 7.6929,-0.7971 15.7506,-1.1539 26.875,2 9.7411,2.6419 21.5552,4.6384 16.9062,-11.5312 3.9676,2.38768 12.6516,7.02576 12.875,7.03125 2.0819,-0.18293 -6.6688,-8.74789 -6.0625,-9.28125 2.877,-1.95995 10.5862,-5.32261 12.3437,-6.5 9.2419,-6.19031 0.7199,-1.08307 19.375,-2.6875 0.4648,-3.0777 -7.4911,-7.02505 -7.625,-11.59375 -0.073,-5.00759 24.8187,2.37598 27.1563,-2.25 1.9144,-1.32162 -16.4239,-9.4134 -17.5313,-10.4375 -0.1286,-6.28585 6.805,-3.59238 2.4063,-5 4.7395,0.43221 11.178,5.17178 16.0625,1.90625 -2.5893,-3.35394 -8.8077,-5.0727 -13,-6.46875 -0.584,-3.26357 -0.6367,-6.38275 3.3125,-8.4375 5.3513,4.78882 33.2024,14.00091 27.2187,8.6875 -4.6693,-4.14648 -12.4615,-7.33825 -19.5624,-9.9375 -6.522,-2.38735 -1.2162,-10.6676 0.4687,-12.3125 2.1935,-2.1412 32.3027,13.46526 34.3437,10.59375 9.0961,-9.34797 -10.2035,-13.4326 -11.7812,-15.4375 -3.0598,-3.88798 -17.1149,-5.9101 -15.4062,-8.5 -0.9258,-4.7673 -6.9164,-5.65805 -3.5313,-8.34375 3.1904,-0.981 19.5737,6.12545 26.7187,3.90625 0.9106,-2.1264 -13.2984,-6.30075 -18.6874,-10.21875 -5.3832,-3.9136 -7.7412,-8.3515 -7.6563,-9 0.288,-1.8614 3.5608,-0.4774 1.625,-8 1.6092,0.3427 6.5523,1.1061 9.2187,-0.25 -2.8248,-0.044 -10.1333,-4.9947 -9.625,-6.0625 3.5526,-11.27574 16.9695,3.00419 21.0626,0.5 0.5815,-1.0273 -13.5722,-6.05525 -18.0938,-7.40625 -3.6176,-1.0808 -6.7569,-5.07915 -7.0312,-7.03125 -1.4258,-3.711 35.8369,10.404 43.4374,10 4.6669,-3.74874 -17.1613,-7.86205 -22.0937,-13.53125 -4.069,-3.58406 -12.1772,-7.38455 -9.25,-12.125 13.5342,-21.91787 25.5332,-5.89346 26.5625,-7.3125 -6.9173,-3.9646 -20.9573,-11.9635 -16.0625,-17.84375 3.5233,-3.0301 3.2683,-3.8686 6.4375,-7.8125 -1.7814,-3.9252 -6.9641,0.40515 -5.6875,-4.40625 6.5317,-0.116 2.363,-2.4573 5.8125,-3.6875 2.4185,0.0214 -3.168,-1.67325 -3.6562,-1.65625 -2.1462,-5.47095 -3.3827,-11.7673 3.25,-10.125 1.4031,0.3475 10.5271,3.4466 11.25,2.25 0.5968,-0.9881 -12.8451,-9.13975 -11,-14.90625 5.3887,-0.9127 28.7753,13.9348 34.6874,6.96875 -0.1621,-3.7385 -33.01,-17.01875 -30.2812,-16.96875 -0.3697,-2.35773 2.2464,-11.06377 5.8125,-10.53125 6.7676,1.01058 15.4072,11.65872 15.4687,8.09375 -2.7653,-2.33745 -19.2506,-10.72205 -21.5937,-13.03125 1.349,0.68637 21.2331,10.67113 27.5313,12.46875 0.9835,-0.0135 -2.004,-9.72 -5.8438,-12.125 -7.4203,-4.6478 -12.872,-8.767 -14.875,-8.75 0.1949,-4.01379 3.1284,-5.76265 6.6562,-9.125 10.0556,3.25755 37.959,6.7125 38.0313,6.8125 -1.7865,-6.5868 -41.2993,-12.12895 -39.9687,-17.71875 3.6702,0.9767 15.3233,2.2427 15.4374,1.3125 0.1415,-1.1524 -7.8351,-2.97495 -11.3124,-4.96875 -2.5028,-1.4349 -4.2102,-4.13755 -4.25,-4.78125 0.3622,-0.0398 7.4735,0.56625 8.75,-0.65625 -1.4332,-0.0612 -8.2701,-2.31325 -9.2188,-2.84375 -3.1169,-0.0135 6.6013,-1.56565 9.625,-1.59375 2.8094,-2.7269 -17.8319,-9.7032 -14.6875,-13.0625 1.5895,-1.2142 23.7366,5.6594 26.7187,4.3125 0,-1.2238 -8.0566,-3.65095 -14.0937,-7.65625 -6.0314,-4.0019 -1.1681,-4.3442 -0.25,-6.75 0.763,-1.9994 9.5771,0.2003 8.875,-1.75 -0.6188,-1.851 -8.2893,-4.2208 -10.5937,-8.3125 -1.5036,-2.6657 3.6717,-6.0933 3.0937,-7.125 0.1053,-2.5878 12.384,2.679 9.875,0.75 2.3493,-2.1718 -7.979,-4.3655 -9.9375,-8.0625 1.9509,-1.0798 12.0307,-1.13765 12.875,-1.65625 2.4941,-0.0281 13.3355,0.94515 14.9688,1.28125 0.6658,-2.0673 -25.4037,-5.55165 -23.5626,-5.59375 0.4123,-0.0782 4.1976,-6.6134 2.7188,-6.6875 -1.523,-2.339 11.6861,-1.97867 12.6562,-1.71875 4.8968,-3.71053 -11.6935,-5.1624 -11.7187,-8.03125 0.2257,-3.7477 -0.9211,-1.74735 -0.25,-3.53125 1.889,-0.679 4.5839,0.32055 4.9687,0.65625 10.6812,-0.9761 23.0995,-1.69443 10.1876,-4.71875 8.0215,-1.9848 -8.4984,-5.66015 -11.125,-6.65625 -0.8161,-0.359 6.444,-0.6466 10.0937,-0.8125 3.6495,-0.166 -8.0357,-2.55475 -5.125,-2.65625 2.1479,-1.40226 14.0211,2.31998 19.1875,2.28125 -0.2944,-3.31164 -16.6363,-5.69543 -19.125,-7.4375 1.853,-2.33443 4.3239,-3.76938 6.75,-3.84375 -0.631,-3.01625 2.1528,-2.08477 4,-2.0625 -1.535,-0.0873 9.3107,-0.33165 11.0938,-1.78125 2.7994,-5.07818 -16.4386,-2.70393 -12.7813,-9.96875 5.7784,-4.5259 17.219,1.34165 19.3125,4.03125 -1.1183,0.8341 -2.6578,1.9756 -3,2.5625 -0.9724,1.7898 13.1196,1.7802 12.0625,4.1875 -0.022,2.23761 -11.0258,10.33838 -5.7187,13 0.023,-0.60745 1.6305,-2.44567 5.0312,-2.3125 2.541,0.0994 4.624,0.3113 6.5,2.625 3.6983,2.0975 -9.0228,5.5041 -8.7812,8.6875 3.5181,1.9229 8.2713,-0.4266 12.25,2 2.8369,2.389 4.4867,6.1499 2.8124,8.875 -6.6893,2.9878 -10.7291,5.24035 -8.1562,6.90625 1.2656,4.24103 6.8548,-1.63338 17,-5.15625 3.7562,-1.30431 3.7084,1.19351 1.2812,6.03125 -3.1089,1.6661 -9.2297,6.266 -11.2812,8.6875 -1.9548,2.4243 10.5737,-4.90375 12.9375,-2.03125 4.2036,1.759 -31.7133,9.7654 -30.5937,14.25 2.2824,0.0488 25.8409,-5.30075 27.25,-5.65625 3.2346,4.1071 0.5942,5.97303 2.375,9.875 1.0959,3.202 -19.5044,4.079 -15.6563,6.0625 3.5624,1.7147 24.8532,-6.774 27,-4.125 2.1468,2.6489 9.093,8.63945 6.5937,12.03125 -7.9544,4.65297 -29.5087,10.59849 -28.875,16.875 1.6475,2.4158 24.3971,-4.31475 27.4063,-4.34375 2.0434,4.55704 1.509,4.66472 3.125,7.78125 -5.3964,2.5262 -17.1236,6.46345 -16.5937,6.96875 3.8704,3.6895 19.4746,-2.2759 20.0624,-1.75 1.7854,0.0825 5.8788,10.1295 3.5313,10.0625 -4.7563,9.35702 -29.8534,5.28826 -33.5313,12.53125 6.4387,2.0708 30.3351,-1.841 31.625,-1.75 7.5986,12.87228 -23.5389,11.95034 -24.3437,20.4375 -0.1928,2.03324 14.7598,-0.0203 14.5,4.40625 -0.3071,4.7969 9.3604,-4.52055 13.1875,0.34375 -0.5366,3.31155 -11.0199,10.211 -11.8438,10.125 -2.096,2.8537 14.0603,-5.02935 15.0626,-0.28125 1.1113,5.73919 -24.7519,3.35731 -25.5626,12 9.0562,0.407 20.1582,4.37205 29.1563,4.65625 0.3512,0.9055 -6.2484,7.62735 -12.875,9.78125 -2.8349,0.9215 -7.6648,8.14775 -4.6563,8.09375 17.8106,-0.318 24.4739,3.05318 23.375,6.75 -2.9436,9.90414 -31.1626,10.85012 -33.375,16.21875 12.3433,0.75117 36.9158,-10.00376 43.5626,-10 1.2979,1.2802 0.903,5.73605 -2.8438,8.34375 -4.0358,2.8092 -22.2606,10.04855 -22.2812,12.84375 41.6624,1.704 2.9953,1.12513 17.8124,8.90625 4.2499,1.2276 0.5594,3.218 1.3438,6.375 0.2707,1.09 5.6106,0.17605 8.875,1.90625 2.7506,1.4583 1.9952,5.10285 1.4062,7.21875 -0.2199,0.79 -28.1141,9.561 -37.2812,13.4375 -8.2097,3.4716 -11.0821,6.18145 -7.5938,9.21875 3.1657,1.9795 23.8045,0.84845 31.3438,-2.65625 8.1763,-3.8007 9.3167,-7.71545 12.7812,-4.59375 8.6267,-3.6737 1.7734,6.36665 2.3126,9.40625 0.9041,5.1012 -14.332,7.66815 -18.5313,15.78125 -3.0952,5.9802 -19.1083,2.54695 -18.7813,8.78125 0.3436,6.543 29.4842,-8.65395 31.5938,-4.84375 1.9017,1.6919 -22.0539,11.63925 -21.9375,16.21875 0.1266,4.9789 30.6228,-5.1164 31.6563,-3.15625 4.0118,7.61068 2e-4,18.58471 2.5624,21.65625 7.6598,2.0439 10.6169,-7.64347 18.5,-6.9375 4.3776,0.39202 17.905,6.25827 18.9376,8.75 0.9452,2.28129 -13.039,9.28718 -14.3126,12.15625 3.2468,7.32457 25.511,-4.80075 26.875,-4.84375 1.3201,4.8871 -3.4076,5.2522 3.7188,8.3125 1.3107,1.9368 4.1706,-0.30975 6.25,1.15625 l 0,-21 c -1.6013,-1.55376 -0.4972,-19.99822 -1.75,-21.875 -10.7287,-1.975 -25.18,-3.94318 -29.5312,-8.40625 -4.1056,-0.74039 -6.0619,-3.34246 -6.9688,-5.21875 -4.2412,-17.82198 -9.9686,-30.60855 -13.375,-38.8125 1.5904,-6.54719 3.8421,-10.98948 2.4375,-20.875 -0.3761,-3.24731 1.2208,-6.9989 -6.5,-18.125 -0.7283,-5.06836 -7.6768,-20.76148 -10.7813,-32.15625 -2.1835,-8.01427 -5.054,-21.40233 -6.7812,-26 0.9588,-9.3082 -1.8194,-16.30955 -5.2188,-25.5625 -3.8281,-11.49689 -4.3671,-14.32165 -7.1562,-21.0625 -5.9473,-10.0511 -8.1961,-18.00922 -8.9062,-30.03125 -5.2738,-7.51544 -7.7834,-15.47967 -11.2188,-23.65625 0.9575,-8.13542 -0.4669,-15.04701 -4.7812,-21.0625 -3.2321,-5.7841 -10.3455,-16.87855 -13.625,-22.65625 -6.6939,-13.38144 -6.5965,-11.12321 -8.5626,-13.96875 1.4269,1.32583 -9.4077,-12.08895 -11.5937,-14.96875 -8.3307,-2.68442 -17.6345,-11.75824 -25.875,-10.21875 -5.3365,2.9024 -9.4597,8.33228 -12.8437,15.15625 -16.4814,19.00892 -17.9307,24.22857 -20.8126,40.375 -2.3586,9.06482 -2.4753,17.11979 -4.1562,26.5625 -5.5223,8.3526 -9.1474,17.46145 -13.2812,24.96875 0.4706,10.65582 1.4976,21.8384 -0.7188,32.75 -3.9634,10.5482 -10.9719,24.27355 -14.1562,35 -1.3616,10.71542 -1.5029,20.17408 -2.5626,31.625 1.2673,12.735 -12.8866,22.87135 -12.8437,35.46875 -3.4545,7.4917 -3.4928,20.5906 -6.8437,28.125 -1.3443,12.50441 -1.4478,25.4087 -5.3438,38.3125 -2.789,9.3282 -4.5215,13.50357 -7.5,22.78125 -4.3006,10.25806 -15.163,15.48049 -17.125,26.6875 -3.0076,7.72497 -8.6997,11.07865 -13.5625,17.84375 -3.2151,5.005 -3.3967,2.667 -4.0937,8.75 -0.2202,0.45997 -6.6125,2.96791 -6.8126,3.40625 -1.9974,0.50604 -4.0607,0.86203 -5.9374,1.40625 -4.712,1.28277 -9.7671,2.41075 -13.7813,4.53125 -5.038,1.88473 -10.3942,1.47275 -15.5625,2.5 -6.442,1.30129 -13.0619,0.50521 -19.5625,1.375 -4.6487,0.58112 -9.4469,0.32105 -14,1.1875 -7.1152,1.57994 -12.317,0.11165 -17.25,2.4375 -5.7687,1.16257 -11.6106,1.92267 -17.2187,3.78125 -5.5318,1.53982 -11.017,3.32876 -16.8126,3.875 -10.5552,2.14116 -21.205,3.74815 -31.8124,5.56255 -13.4031,3.6336 -27.4321,3.0253 -41.1876,3.5 -11.3288,0.01 -22.7031,-0.8311 -33.7812,-3.2188 -5.1606,-0.7097 -7.6594,-6.19739 -13.2812,-6.46875 -4.9022,-1.44452 -11.4847,-1.99008 -13.4376,-7.625 -0.6648,-6.08302 -5.5587,-10.43245 -8.625,-15.4375 -4.6375,-6.76494 -9.7148,-14.0332 -9.8437,-22.5625 -1.8711,-11.20698 -10.4923,-19.49199 -14.5937,-29.75 -2.8406,-9.2777 -1.4022,-19.20304 -4.0626,-28.53125 -2.1811,-12.44428 -3.7413,-25.24844 -9.4062,-36.71875 -3.1959,-7.53448 -6.518,-15.00841 -9.8125,-22.5 0.041,-12.59736 -8.2712,-23.765 -7.0625,-36.5 0.1949,-9.84231 0.226,-20.08057 -4.0312,-29.1875 -3.0372,-10.72634 -2.7827,-22.17061 -6.5626,-32.71875 -2.1137,-10.91167 -1.7797,-22.78447 -8.125,-32.40625 -3.942,-7.50716 -8.4133,-15.10514 -9.4062,-23.6875 -5.2193,-8.52349 -3.6952,-19.70924 -10.2188,-27.625 -3.7509,-6.97472 -0.3554,-16.07293 -5.8437,-22.375 -2.7983,-5.08695 -2.02,-11.98136 -6.875,-15.90625 -0.7901,-8.87183 -3.1941,-23.62446 -10.7187,-24.875 -2.5245,-5.66021 -14.7568,-9.25314 -22.3438,-9.6875 -0.3135,-0.018 -0.6017,-0.025 -0.9062,0 z m 563,46.375 c -0.01,0.16391 0.09,0.23354 0.3124,0.15625 -0.1123,-0.0464 -0.2119,-0.10583 -0.3124,-0.15625 z m -28.8126,24.78125 c -0.013,0.01 -0.018,0.0217 -0.031,0.0312 0.099,-0.006 0.096,-0.014 0.031,-0.0312 z m 8.1876,14 c -0.014,0.044 -0.024,0.0824 -0.063,0.125 0.4765,-0.005 0.3689,-0.0616 0.063,-0.125 z m -528.0626,-0.0625 c -0.2904,0.063 -0.3937,0.12027 0.063,0.125 -0.033,-0.0375 -0.048,-0.0865 -0.063,-0.125 z m 19.5313,-25.9375 c -0.1224,0.1119 -0.011,0.15663 0.4687,0.0312 -0.1784,-0.0192 -0.3016,-0.0154 -0.4687,-0.0312 z M 832.96875,832.875 c -0.60312,0.15151 -0.0181,0.35918 0,0 z M 767.9375,806.15625 c -0.0173,0.044 -0.0466,0.0824 -0.0937,0.125 0.57662,-0.005 0.46678,-0.0616 0.0937,-0.125 z M 352.875,716.46875 c -0.26722,0.0634 -0.35089,0.1203 0.0625,0.125 -0.0339,-0.0426 -0.0501,-0.081 -0.0625,-0.125 z M -62.15625,624.4375 c -0.0063,0.16391 0.0898,0.23354 0.3125,0.15625 -0.112423,-0.0464 -0.211969,-0.10583 -0.3125,-0.15625 z m -28.8125,24.78125 c -0.013,0.01 -0.01825,0.0217 -0.03125,0.0312 0.099,-0.006 0.09625,-0.014 0.03125,-0.0312 z m 8.1875,14 c -0.014,0.044 -0.0235,0.0824 -0.0625,0.125 0.4765,-0.005 0.3689,-0.0616 0.0625,-0.125 z m 824.25,155 c 0.27876,-0.0102 0.87209,-1.5e-4 1.53125,0 -0.48237,0.0146 -0.8469,0.0515 -1.1875,0.0625 -0.58671,-0.022 -0.62251,-0.0523 -0.34375,-0.0625 z m 605.71875,2.71875 c 0.038,-0.0158 0.3573,0.087 0.7187,0.1875 -0.1141,-0.01 -0.241,-10e-4 -0.4062,0 -0.2578,-0.11494 -0.3425,-0.17507 -0.3125,-0.1875 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e1e1e8;fill-opacity:0.05776173000000000;fill-rule:nonzero;stroke:none;stroke-width:30;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccsccscscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccsccsscsscsscccccccccccccccsccscccccccccccccccccccccccssccccccccccccccsccccccccccccccccscccccccccccscccccccccccccccccsccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccsssscsccccccsssscsscccscscccssssscccccsscssccsssscsccssccccsssscsssccsccsscccccccccccccccccccsccccscccccccccccscccssccccccscccssccccccsccccccscccccccccscscccccccccccscccccccccccccsccccssscccccccccscccscccccssccccsccscssccccccccccccccccccccscscccccccccccsccccsccccccccsccsccccssscssccccccsccccccccccscscccccccccccccccccccccccccccccccccsccccccccccccccccccccccccccccccccccccssccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccscscccsccccccsccccccccccsccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccsssssscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccsccsccsccccccscccccccccssccsccccsccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccscscccccccccccccccccccssccccccccsccccccsccsscccccccccccscccccccssccccccccccccccsccccccccccccccccscccccccccccscccccccccccccccccscccccccccccccccccccccccccccccccccscccccccccccccccccscccccccccccccccccscccccccsccsccccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccscccc" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 2282.5625,963.15625 c -1.5825,0.56867 -5.2894,2.10021 -1.6875,0.78125 0.4878,-0.38598 1.2996,-0.22728 1.6875,-0.78125 z"
+ id="path4318"
+ inkscape:connector-curvature="0" />
+ <path
+ style="color:#000000;fill:#20222b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4015-4);enable-background:accumulate"
+ d="m 2242.0625,973.75 c -0.3603,1.81312 7.4099,0.20501 1.6563,0.15625 -0.5541,-0.0614 -1.0998,-0.12102 -1.6563,-0.15625 z"
+ id="path4316"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4459"
+ d="m -42.09375,620.1875 c -0.551656,0.15383 -1.792158,0.54117 -3.40625,1.0625 -0.326552,0.10532 -0.391284,0.13379 -0.75,0.25 -1.484234,0.48063 -3.127111,1.00862 -4.9375,1.59375 -1.290834,0.4172 -2.555068,0.84072 -3.84375,1.25 -1.701584,0.54021 -3.464424,1.07813 -4.875,1.5 -0.08784,0.0263 -0.195209,0.0682 -0.28125,0.0937 -0.615668,0.18266 -1.150779,0.32867 -1.65625,0.46875 -0.175004,0.0485 -0.402989,0.11363 -0.5625,0.15625 -0.750414,0.2004 -1.323757,0.33321 -1.65625,0.375 -2.6149,0.0476 -3.80645,1.05145 -0.65625,2.96875 0.617974,0.3553 1.412847,0.50721 2.3125,0.53125 0.457249,0.0122 0.934985,-0.0107 1.4375,-0.0625 0.375108,-0.0387 0.764936,-0.0889 1.15625,-0.15625 0.122646,-0.0211 0.251259,-0.039 0.375,-0.0625 0.165114,-0.0313 0.333414,-0.0898 0.5,-0.125 1.677768,-0.35638 3.398301,-0.89953 4.90625,-1.40625 0.0092,-0.003 0.0221,0.003 0.03125,0 0.270409,-0.091 0.433647,-0.13161 0.6875,-0.21875 0.900317,-0.30751 1.704564,-0.58853 2.3125,-0.78125 3.24,0.1376 10.32115,-5.5581 8.90625,-7.4375 z m 2047.99995,0 c -2.535,0.7069 -19.4026,6.42745 -21.9687,6.75 -2.6149,0.0476 -3.8064,1.05145 -0.6563,2.96875 3.1107,1.7885 10.6842,-1.31925 13.7188,-2.28125 3.24,0.1376 10.3211,-5.5581 8.9062,-7.4375 z m -600.5,0.71875 c -1.6259,1.87937 -3.5673,3.98132 0.1563,3.84375 3.4872,0.96198 7.3302,2.851 10.9063,1.0625 3.6202,-1.91736 0.8795,-4.45239 -2.125,-4.5 -2.9493,-0.32266 -6.0235,0.30071 -8.9376,-0.40625 z M -101.1875,629.875 c -0.5521,-0.006 -1.01365,0.006 -1.34375,0.0312 -0.3779,0.0289 -0.60355,0.1079 -0.59375,0.1875 0.4245,3.4606 30.57965,3.7743 19.28125,4.8125 -2.1365,0.1963 -14.22935,2.34578 -5.71875,3.8125 -8.0632,2.25483 -0.6339,7.89893 3.1875,10 0.7983,0.19495 -14.82525,-1.31688 -14.59375,2.0625 0.2375,3.45653 18.78305,5.217 20.96875,4.96875 5.0935,-0.57852 1.1287,-7.23812 10.6875,-6.125 2.54173,-0.0742 4.776264,-0.50857 6.90625,-1.125 0.558503,-0.16163 1.105709,-0.3499 1.65625,-0.53125 0.0407,-0.0135 0.08432,-0.0177 0.125,-0.0312 0.0092,-0.003 0.02206,0.003 0.03125,0 1.805853,-0.60281 3.608038,-1.29746 5.53125,-1.9375 0.205738,-0.0685 0.415951,-0.15155 0.625,-0.21875 0.727887,-0.23261 1.472775,-0.44709 2.25,-0.65625 6.1008,-1.6417 10.7489,-5.7523 11.3125,-8.125 -1.2254,0.1799 -3.103198,0.49778 -5.3125,0.875 -1.415561,0.24288 -2.865041,0.50605 -4.46875,0.78125 -0.960869,0.16407 -1.832288,0.30407 -2.8125,0.46875 -2.539781,0.42669 -5.095661,0.82793 -7.3125,1.15625 -0.520836,0.0767 -1.145553,0.18428 -1.625,0.25 -1.477049,0.20247 -2.811221,0.34619 -3.71875,0.40625 -2.0016,0.0192 -5.17075,0.2071 -7.40625,0.5625 -1.3411,-0.28033 -2.34235,0.3783 -2.40625,-1 0.5887,-2.7097 4.2776,-2.5524 4.625,-2.6875 1.8689,0.005 1.09235,-2.9717 0.78125,-2.9375 -5.5799,-3.18903 6.2899,-5.03196 0.5,-5 -0.8273,0.005 -2.0375,0.0427 -3.6875,0.125 -0.5705,0.0284 -9.90665,0.76145 -14.09375,0.65625 -1.0684,-0.0269 -9.5101,-0.73986 -13.375,-0.78125 z m 2048,0 c -0.5521,-0.006 -1.0137,0.006 -1.3437,0.0312 -0.3779,0.0289 -0.6036,0.1079 -0.5938,0.1875 0.4245,3.4606 30.5797,3.7743 19.2812,4.8125 -2.1365,0.1963 -14.2293,2.34578 -5.7187,3.8125 -8.0632,2.25483 -0.6339,7.89893 3.1875,10 0.7983,0.19495 -14.8252,-1.31688 -14.5938,2.0625 0.2375,3.45653 18.7831,5.217 20.9688,4.96875 5.0935,-0.57852 1.1287,-7.23812 10.6875,-6.125 6.515,-0.1901 10.9072,-2.8267 17.125,-4.5 6.1008,-1.6417 10.7489,-5.7523 11.3125,-8.125 -4.9016,0.7196 -20.2881,3.6091 -25.25,3.9375 -2.0016,0.0192 -5.1707,0.2071 -7.4062,0.5625 -1.3412,-0.28033 -2.3424,0.3783 -2.4063,-1 0.5887,-2.7097 4.2776,-2.5524 4.625,-2.6875 1.8689,0.005 1.0923,-2.9717 0.7813,-2.9375 -5.5799,-3.18903 6.2898,-5.03196 0.5,-5 -0.8273,0.005 -2.0376,0.0427 -3.6876,0.125 -0.5705,0.0284 -9.9066,0.76145 -14.0937,0.65625 -1.0684,-0.0269 -9.5101,-0.73986 -13.375,-0.78125 z m -553.8437,0.8125 c 0.6476,2.37271 2.5198,4.20193 9.5312,5.84375 7.1458,1.67328 11.8248,1.30983 19.3125,1.5 16.1928,-2.58373 1.7474,-3.57653 -4.0625,-3.625 -5.7025,-0.32845 -19.149,-2.9991 -24.7812,-3.71875 z m 62.9687,1 c -4.8118,0.10522 -14.8138,2.46596 -15.4687,2.4375 -15.1694,-0.65806 3.9538,1.98043 -3.375,5.625 -0.3584,-0.0335 -0.563,-0.0264 -0.6563,-0.0312 0.3989,0.13515 4.5421,1.04029 5.2187,3.75 -0.4266,3.4696 3.3052,3.75795 5.7188,4.875 3.1408,-0.17555 6.3825,0.27412 9.4375,-0.375 2.169,-0.98878 5.3277,-0.51438 5,-3.5625 -0.9389,-2.73992 -1.0231,-5.4436 -2.9375,-7.78125 -0.6771,1.15441 -1.3711,1.8689 -2.75,1.625 -0.7176,0.0272 -0.1695,-0.17867 -2.625,-0.375 -12.9843,-1.03815 4.4799,-1.91433 4.9688,-5.375 0.089,-0.63676 -0.9274,-0.84757 -2.5313,-0.8125 z M 1418.0312,646.5 c -3.2237,-0.0965 -5.4384,4.49454 -8.7187,4.59375 -1.9682,0.0596 -3.9208,0.29252 -5.8125,0.9375 -2.2544,0.40678 -6.0713,3.37422 -8.4688,2.96875 2.0169,3.76765 4.8711,2.5792 8.6876,4.9375 3.1449,1.2299 7.6892,1.98764 11.6562,1.03125 3.279,-1.54687 7.1379,-5.26232 8,-7.46875 2.6435,-5.37694 -2.6789,-5.72444 -5.3438,-7 z M -66.375,653.03125 c -2.318,1.2756 -6.95725,1.6231 -4.65625,7 0.75,2.2065 4.11555,5.92175 6.96875,7.46875 0.780462,0.21624 1.283393,0.15169 1.65625,-0.0625 0.04101,-0.0236 0.08742,-0.035 0.125,-0.0625 0.0377,-0.0274 0.05926,-0.0626 0.09375,-0.0937 0.465956,-0.4203 0.673216,-1.16625 0.9375,-1.9375 0.01046,-0.0298 0.02053,-0.0639 0.03125,-0.0937 0.0045,-0.0128 0.02669,-0.0184 0.03125,-0.0312 0.09748,-0.27448 0.205567,-0.55056 0.34375,-0.8125 0.06569,-0.12452 0.107289,-0.25789 0.1875,-0.375 0.0083,-0.012 0.02275,-0.0193 0.03125,-0.0312 0.105785,-0.15015 0.237823,-0.2746 0.375,-0.40625 0.06834,-0.0652 0.141353,-0.12797 0.21875,-0.1875 0.05174,-0.0402 0.100058,-0.0877 0.15625,-0.125 0.123566,-0.0815 0.25933,-0.15273 0.40625,-0.21875 3.3207,-2.3583 14.7455,-2.7949 16.5,-6.5625 -2.0851,0.4054 -8.788,2.4693 -10.75,2.0625 -1.6458,-0.6449 -3.3507,-0.8775 -5.0625,-0.9375 -0.168061,-0.006 -0.337954,-0.0274 -0.5,-0.0625 -0.0098,-0.002 -0.0215,0.002 -0.03125,0 -0.15211,-0.0346 -0.290045,-0.0992 -0.4375,-0.15625 -0.1575,-0.0612 -0.315827,-0.13558 -0.46875,-0.21875 -0.02699,-0.0147 -0.06689,-0.016 -0.09375,-0.0312 -0.12862,-0.073 -0.249079,-0.16425 -0.375,-0.25 -0.0301,-0.0204 -0.06379,-0.0414 -0.09375,-0.0625 -0.09485,-0.067 -0.187657,-0.14592 -0.28125,-0.21875 -0.214493,-0.16647 -0.415478,-0.34282 -0.625,-0.53125 -0.237384,-0.21389 -0.484468,-0.4308 -0.71875,-0.65625 -1.256083,-1.20875 -2.491212,-2.45682 -3.96875,-2.40625 z m 2048,0 c -2.318,1.2756 -6.9573,1.6231 -4.6562,7 0.75,2.2065 4.1155,5.92175 6.9687,7.46875 3.4518,0.9564 1.8568,-3.2076 4.5937,-4.4375 3.3207,-2.3583 14.7455,-2.7949 16.5,-6.5625 -2.0851,0.4054 -8.788,2.4693 -10.75,2.0625 -1.6458,-0.6449 -3.3506,-0.8775 -5.0624,-0.9375 -2.8546,-0.0992 -4.7888,-4.68975 -7.5938,-4.59375 z m -2008.46875,4.6875 c -0.403842,0.26602 -0.933242,0.57814 -1.53125,0.90625 -0.04687,0.0257 -0.07701,0.0364 -0.125,0.0625 -0.194811,0.106 -0.380854,0.20104 -0.59375,0.3125 -0.52699,0.27655 -1.056065,0.53729 -1.6875,0.84375 -0.09324,0.0454 -0.185824,0.079 -0.28125,0.125 -0.77919,0.37477 -1.589265,0.77976 -2.5,1.1875 -0.0093,0.004 -0.02192,-0.004 -0.03125,0 -0.894973,0.4013 -1.777968,0.79536 -2.78125,1.21875 -0.173879,0.0734 -0.32321,0.14487 -0.5,0.21875 -0.989633,0.41386 -2.054331,0.8261 -3.125,1.25 -0.183002,0.0724 -0.3462,0.14621 -0.53125,0.21875 -0.184816,0.0725 -0.344469,0.14616 -0.53125,0.21875 -1.107036,0.43018 -2.241215,0.85345 -3.40625,1.28125 -0.57883,0.21267 -1.128971,0.41466 -1.71875,0.625 -0.226194,0.0807 -0.45993,0.13852 -0.6875,0.21875 -1.350624,0.47608 -2.710364,0.92322 -4.09375,1.375 -0.202622,0.0662 -0.390758,0.15327 -0.59375,0.21875 -0.426633,0.13773 -0.853568,0.27186 -1.28125,0.40625 -1.107937,0.34814 -2.207044,0.67912 -3.3125,1 -0.292902,0.085 -0.582873,0.16727 -0.875,0.25 -0.02194,0.006 -0.04056,0.025 -0.0625,0.0312 -0.885791,0.25037 -1.782496,0.49135 -2.65625,0.71875 -0.08286,0.0216 -0.167287,0.0412 -0.25,0.0625 -0.809753,0.20887 -1.613375,0.408 -2.40625,0.59375 -7.798352,1.82723 -14.65895,2.4713 -17.8125,0.53125 -5.5942,-0.8092 -22.89605,-5.37305 -24.15625,-3.03125 -0.4492,0.8348 9.7617,5.50485 16.6875,6.96875 9.612734,2.03172 16.158951,0.56807 25.28125,-0.5625 0.663969,-0.0823 1.306156,-0.17283 2,-0.25 10.0336,-1.1159 42.7838,-12.05544 33.5625,-17 z m 2047.99995,0 c -6.9679,4.58994 -44.5587,19.29875 -53.375,13.875 -5.5942,-0.8092 -22.896,-5.37305 -24.1562,-3.03125 -0.4492,0.8348 9.7617,5.50485 16.6875,6.96875 10.3124,2.1796 17.0546,0.3249 27.2813,-0.8125 10.0335,-1.1159 42.7837,-12.05544 33.5624,-17 z m -1684.43745,0.46875 -2,6.34375 c 6.21777,3.66504 17.35973,2.0832 23.875,0.59375 -7.88413,-2.62811 -17.14609,-3.17902 -21.875,-6.9375 z m 1050.06245,2.75 c 1.5417,3.64456 12.0944,8.7278 23.625,9.84375 11.7531,1.13733 20.2736,0.3984 32.125,-1.78125 7.9603,-1.46384 19.7034,-6.13395 19.1876,-6.96875 -1.4484,-2.3419 -21.3521,2.22204 -27.7813,3.03125 -9.5073,3.79509 -38.2858,-1.78503 -47.1563,-4.125 z m 80.875,6.5625 c -2.298,3.39847 -6.1423,4.90786 -9.7812,6.34375 -3.3632,0.838 -6.7707,1.50614 -10.2812,1.75 -3.5803,0.0742 -2.443,2.27332 -0.4376,3.1875 1.6643,0.79158 5.3035,-0.29802 8.4376,-0.21875 3.4922,0.19923 6.9387,-0.11755 9.9687,-1.3125 2.048,-1.11522 3.4267,-2.54318 4.625,-4.4375 1.1193,-2.96924 0.4268,-4.62449 -2.5313,-5.3125 z m -39.3437,4.53125 -2.4375,4.375 c -4.043,0.22964 -18.9152,-0.71473 -20,1.96875 -0.2978,0.73671 18.7332,3.30515 18.4062,4.15625 -0.9452,2.46528 -2.0163,5.34567 -3.25,8.1875 -3.8123,0.14007 -15.2894,-0.9009 -18.5,-1.78125 -3.0344,-0.90197 -5.7601,-0.72553 -8.4062,-1.28125 -1.0457,-0.18398 -12.1876,-3.52938 -12.9375,-2.71875 -1.7332,1.8735 4.2411,8.89793 9.875,7.9375 3.5303,0.7915 7.0486,1.08268 10.7187,1.25 3.4611,-0.003 11.55,0.45929 17.3438,0.6875 -1.111,2.14822 -0.3951,6.43168 -1.75,8.0625 -1.9609,2.36038 -26.2939,0.0424 -28.875,0.21875 0.7505,0.68083 2.7822,4.3334 7.7188,5.59375 9.9165,2.53235 25.6754,3.27275 25.0937,5.90625 -1.8503,8.37625 1.5602,16.3871 -3.2187,26.53125 -0.2366,2.9139 -29.8116,-2.85553 -31.5938,-2.8125 -10.2242,0.24686 4.1004,7.58897 10.5312,9.3125 4.4596,1.1949 18.8935,3.26175 18.5938,3.875 -1.2418,2.54127 -3.1814,6.59719 -4.625,12.28125 -0.6153,1.74163 -1.47,4.75493 -2.1562,6.46875 -2.3107,-0.62232 -17.1712,-3.36589 -30,-6.375 -7.4783,-1.75383 -14.1115,-4.80462 -17.5626,-4.40625 -4.5132,2.15426 8.5327,9.75563 15.2813,11.25 5.5518,1.22934 13.652,2.34612 14.0313,4.875 -9.702,0.4392 -10.2881,-1.78858 -17.9376,-1.34375 -3.5085,0.33535 -6.8079,0.93124 -10.3124,1.125 -4.9357,0.73981 2.7513,2.0404 3.5624,2.5625 3.2402,0.57165 6.4443,1.3625 9.7813,1.65625 3.4156,0.0732 6.707,0.70483 10.125,1.09375 3.6577,0.23382 7.1148,0.42575 10.75,0.53125 3.0093,-0.0674 6.0442,-0.46037 8.875,-1.40625 0.044,3.27531 -0.5371,5.55029 -1,7.96875 -0.5636,2.94457 14.2477,5.09742 13.3437,7.65625 -3.4909,0.75304 -45.9123,-3.34891 -47.0624,-3.4375 -3.1368,-0.66354 -17.0286,-5.19558 -21.1876,-5.96875 -2.5534,5.60491 29.7464,11.37255 30,14.34375 0.2542,2.9712 -18.0262,-2.7193 -24.8124,-2.75 -3.3317,1.16022 10.653,5.51702 7.3124,6.25 -2.4306,0.0738 -18.634,-3.88316 -20.3124,-1.90625 -2.1799,2.56628 1.2708,4.90436 4.125,7.21875 2.352,2.37074 5.4484,4.5461 8.6562,5.40625 2.9332,0.66332 6.6097,1.08218 9.9375,1.09375 4.0082,0.0174 16.2921,1.26421 21.7187,1.125 5.4277,-0.13921 -10.0899,-10.83699 10.6563,-4.59375 -0.8635,7.22526 -0.7495,11.07432 -2.9687,18.0625 -0.2446,0.77 -40.7659,-6.43213 -44.3126,-7.0625 -1.1307,-0.20107 1.1025,6.80131 7.9063,9.3125 12.2538,4.52264 30.968,6.5551 32.0313,10.21875 1.1775,4.06248 -2.6666,6.00615 -5.2813,9.4375 -1.5727,1.78517 5.7404,5.47627 11.8125,7.53125 -5.2517,0.43434 -11.5243,1.58028 -13.3125,1.4375 -3.7432,0.19676 -25.1161,-3.76136 -29.2187,-5.0625 -6.5808,-2.0864 -22.6169,-9.64417 -27.8438,-10.78125 -3.403,0.25619 24.3763,14.87248 11.9375,12.1875 -3.249,-0.70131 -14.2389,-3.26727 -17.4687,-2.4375 -0.6292,3.11229 14.5602,4.43148 14.5937,7.6875 -15.3189,-1.926 14.1071,9.23483 17.0625,9.5625 3.2754,-0.32471 22.309,7.71726 25.3438,6.25 -5.9973,4.80034 -28.3977,1.67725 -8.0938,6 -2.8846,2.40566 -2.2015,2.44204 -4.4062,3.46875 -6.5716,3.05959 -49.3198,-14.75711 -51.6876,-17.34375 -2.3179,0.48174 12.1842,15.17145 20.8438,19.15625 13.5319,6.2269 39.9398,10.83447 39.3438,11.875 1.5806,5.29433 -17.0831,4.18989 -18.4688,9.1875 -0.7542,1.89577 -10.8111,-0.99622 -19.3125,-5.0625 -9.0499,-4.32866 -19.9514,-13.03598 -19.9375,-8.8125 0.055,16.81838 38.234,25.33238 35.25,31.625 -6.1269,11.50613 -7.8872,7.21037 -16.4062,17.03125 l -20.9376,0 c -1.9007,0.40776 -5.2685,0.88776 -5.8124,2.1875 -1.5236,2.54363 -1.8377,6.29066 -1.6563,9.5 0.1403,3.22036 1.2547,8.63141 1.4375,10.4375 0.613,1.72829 1.4973,3.33184 2.5625,4.8125 -3.1221,2.74482 -6.4449,5.27645 -9.9687,7.53125 -11.0779,7.62548 -35.9774,-9.78293 -48.5,-5 -6.8353,2.9461 22.914,29.57765 -7.1563,15.6875 -30.0703,-13.89018 -8.5487,6.7538 -16.2813,8.25 -3.7308,0.52959 -17.8438,-11.2318 -23.4062,-10.125 -4.5511,0.90556 -8.4138,8.16075 -10.8125,8.78125 -3.3336,0.1702 -16.1188,7.1617 -20.7187,1.96875 -4.0562,-4.57818 10.039,-18.89908 3.9374,-17.90625 -11.0521,1.79842 -9.8656,9.52439 -28.3124,2.8125 -3.9604,-1.44096 3.4864,-6.18049 1.9687,-9.1875 -1.0303,-2.04151 -12.2121,8.7346 -16.1563,5.125 -1.4532,-1.33 7.9604,-3.91137 8.0938,-15.25 -8.8038,3.25713 -12.5395,7.14169 -22.1875,1.125 -1.7898,-1.9409 -1.0716,-2.87858 -3.4687,-5.15625 -4.4859,-5.14582 -4.2271,-10.03151 1.4374,-11.125 6.9259,-1.4639 13.793,-8.13395 13.3438,-8.96875 -5.5389,-0.13591 -13.096,2.3096 -18.2188,3.8125 -2.1538,-1.48329 -3.2423,-4.41246 -3.2812,-6.5 -0.022,-1.17433 17.5336,-1.01862 17.5,-7.34375 1.5825,-5.71675 -16.7273,0.35433 -14.5312,-3.96875 9.2462,0.58466 -4.6098,-5.46265 14,-8.3125 6.4491,-7.59119 -12.2687,-8.67183 -14.2813,-8.9375 -0.8249,-0.0411 -1.553,-0.0609 -2.1563,-0.0625 -9.0458,-0.0238 5.4157,4.23944 -0.5624,7.65625 -0.3116,-0.034 -7.332,1.105 -0.063,1.34375 0.4635,0.11574 6.9658,2.92448 1.75,3.75 -12.2918,1.94554 -15.5672,1.4748 -12.1874,2.6875 5.7074,2.04784 8.0299,4.9215 4.375,8.40625 -1.8831,-1.59674 -4.5976,-0.20495 -7.4376,-0.1875 -4.6496,-0.66137 -9.5862,1.98684 -12.5312,1.59375 1.7545,3.7676 4.4609,0.98545 7.7812,3.34375 1.9539,0.87789 8.4656,2.08903 12.1876,1.5625 l 0,7.40625 c -8.3723,1.15178 -19.7077,-2.41052 -26.1876,-4.375 1.3415,3.6446 7.7474,5.35285 17.7813,6.46875 4.2303,0.47051 6.4742,0.8275 8.4063,0.9375 5.1437,2.88526 2.6458,5.18271 0,7.46875 -6.0112,-0.45464 -28.8722,-4.96554 -29.75,-2.46875 -4.0779,7.72408 20.4719,10.0864 20.1874,10.9375 -4.3786,6.07094 -4.9631,8.08859 -6.2187,13.4375 -1.7062,2.3604 -18.2849,0.042 -20.5313,0.21875 0.6531,0.6808 2.424,4.33345 6.7188,5.59375 8.6291,2.5324 6.9436,0.27285 6.4375,2.90625 -1.3932,7.24797 -11.0981,0.71155 -13.2187,9.03125 -1.8511,0.98588 -6.1979,3.06725 -8.9063,3.43745 -7.9592,-0.7123 -16.4837,-0.4931 -17.375,-0.4687 -6.2226,0.1726 -1.9877,3.8293 3.0313,6.5937 -2.8104,0.3551 -5.6132,0.5903 -8.4063,0.7188 -15.2012,3.7739 8.7999,29.4486 -29.5625,2.7188 -7.23747,25.3557 -23.61005,11.6276 -29.03125,-10.2813 -10.7837,-3.50352 -23.29926,15.8386 -33.21875,10.2813 -2.44804,-1.8651 13.69608,-12.21145 10.28125,-13.43755 -4.6762,-2.141 -37.90485,13.92215 -42.03125,10.87495 1.83315,-0.6642 8.91225,-5.2787 19.09375,-13.4687 10.1815,-8.19006 -26.30735,1.97406 -28.6875,2.21875 -13.87483,3.17345 -15.10489,0.89588 -6.25,-5.6875 3.83952,-2.20866 10.88983,-4.8803 9.53125,-4.96875 -1.66488,0.3132 -8.36563,1.96109 -11.4375,3 -1.22878,-1.33131 0.85304,-4.99288 -0.28125,-6.40625 -1.98265,-1.89464 -7.13277,-1.56858 -9.09375,-3.53125 2.60477,0.88499 30.50206,-16.67939 -4.75,-3.3125 -2.08939,0.79226 -4.67198,-2.37767 -7.625,-9.15625 17.16906,-0.51206 30.25386,-7.37585 39.1875,-11.3125 8.93363,-3.93665 13.60776,-10.72781 6.90625,-11.375 -7.84555,-0.70577 -69.13593,9.2537 -71.65625,6.6875 -1.94153,-1.9769 15.40515,-5.14475 12.59375,-5.21875 -3.86248,-0.733 12.32059,-5.0898 8.46875,-6.25 -5.1816,0.0203 -16.13083,2.4796 -22.90625,3.3125 -0.74688,-0.82907 -1.48368,-1.66025 -2.21875,-2.5 9.32012,-3.18158 37.55608,-13.72711 35.15625,-18.28125 -4.80913,0.7733 -28.46626,4.74275 -32.09375,5.40625 -0.38601,0.0257 -5.1881,0.42149 -11.34375,0.90625 -3.41047,-3.76158 -3.43331,-4.05875 -6,-7.96875 0.87607,-0.0452 1.73238,-0.0757 2.625,-0.125 8.65164,0.93661 33.86655,-6.43943 26.46875,-8.0625 -11.39496,1.4841 -24.9246,3.1934 -32,2.96875 0.43748,-2.529 -1.76402,-5.4583 4.65625,-6.6875 7.80428,-1.4945 38.15716,-9.56455 32.9375,-11.71875 -3.99026,-0.3983 -16.60268,-0.0975 -25.25,1.65625 -6.65155,1.34906 -13.64256,2.6124 -19.71875,3.6875 -3.60522,-6.03998 -7.3509,-11.14387 -11.0625,-17.125 3.61989,-0.56319 12.99784,-0.52654 14.90625,-0.96875 7.43793,-1.7235 21.82357,-7.1281 10,-7.375 -1.26818,-0.0265 -18.34835,-0.40406 -28.5625,0.59375 -0.67055,-7.00455 -6.2345,-5.59979 -7.1875,-11.8125 0.40411,0.15024 0.93396,0.57007 1.46875,1.03125 -2.30592,-2.49009 -4.44856,-5.11758 -6.46875,-7.84375 -0.10354,-0.70892 0.30705,-6.22483 0.125,-6.9375 -0.6727,-2.6334 9.53168,-1.2176 21,-3.75 -1.35354,-3.19197 -13.43361,-0.0661 -17,-3.15625 -1.56685,-1.6309 0.28479,-3.7268 -1,-5.875 10.45417,-0.85023 21.96067,-2.26068 31.4375,-4.125 6.51521,0.9604 13.41057,-6.064 11.40625,-7.9375 -0.86721,-0.8106 -13.72822,2.53495 -14.9375,2.71875 -3.06003,0.5559 -6.2091,0.37925 -9.71875,1.28125 -3.71237,0.8804 -16.99655,1.92135 -21.40625,1.78125 -1.42623,-2.8418 -2.65648,-5.7221 -3.75,-8.1875 -0.37746,-0.8511 15.76567,-0.43202 21.28125,-4.15625 -3.55253,-0.73008 -17.76109,0.54517 -22.78125,-0.71875 l -3.1875,-5.625 c -1.19367,5.4598 -8.33445,11.97935 -6.5,17.34375 0.1804,0.5273 -24.14582,-2.3322 -25.09375,-2.125 -3.63443,0.7941 -23.62535,-4.24425 -23.90625,-3.28125 -1.27254,6.0908 18.29646,9.2626 21.78125,10 7.58063,1.6038 22.82232,1.21685 28.28125,1.03125 4.45353,-0.1515 0.11909,8.17 -1.8125,9.5 -5.24164,3.6096 -42.95221,-7.4212 -45.5625,-6.25 -0.42429,3.3531 8.31499,6.3472 13.3125,8.25 10.51311,4.0031 31.4274,4.0429 33.71875,6.1875 1.72225,1.61196 2.30385,2.72862 2.5,3.9375 -0.79166,2.17347 -1.42993,4.41104 -1.84375,6.71875 -0.0661,0.21089 -0.151,0.41459 -0.21875,0.625 -2.95205,0.61354 -7.98194,0.52215 -11.4375,0.8125 4.09405,1.73065 7.75805,2.21601 9.875,3.53125 -1.29015,3.35328 -2.79524,6.63691 -4.53125,9.78125 -6.10777,-0.51721 -13.09162,-0.85916 -14.75,-1.34375 -3.60945,-1.3858 -8.82683,-1.88355 -12.5,-2.71875 -3.60066,-1.2711 -7.29813,-2.23885 -11.25,-2.53125 -4.45688,-0.2858 -8.41335,-2.73605 -12.84375,-2.90625 -3.18793,-0.6205 -14.20388,-7.157 -14.6875,-4.875 -0.78279,3.6938 7.96323,8.7688 10.75,11.625 2.97237,1.499 8.12605,3.37435 10.1875,3.71875 3.59869,1.8812 7.61574,2.9324 11.71875,3.625 4.21634,0.8437 8.55671,0.83375 12.9375,0.84375 2.23083,-0.01 9.66792,1.28883 16.21875,2.03125 -0.94873,1.46553 -2.55148,2.27626 -2.9375,3.8125 -4.6667,-0.0169 -9.67918,-0.1118 -13.40625,1.03125 -1.74458,0.53507 5.49193,1.91322 12.09375,3.375 -0.83371,2.51747 -1.79923,4.9806 -2.875,7.40625 -5.32089,-0.60697 -11.07256,-1.65153 -16.59375,-3.59375 -20.50709,-7.214 -39.79141,-15.6049 -39.21875,-14 1.23484,8.2192 35.12624,20.55565 42.625,22.59375 2.91611,0.79258 6.26656,1.25043 10,1.6875 -0.41636,0.80745 -3.3854,7.01177 -3.8125,7.8125 -10.3552,-2.10296 -40.10375,-9.00325 -40.34375,-8.0625 -3.35844,7.10247 29.75594,11.57635 35.96875,13.09375 -2.72944,8.22095 -2.44376,6.38069 -3.34375,7.65625 -9.69049,-1.50749 -40.78714,-15.33011 -44.0625,-17.5 -0.69478,-0.0418 -4.25155,1.6074 -1.84375,4.6875 1.79247,2.293 7.94395,5.94915 11.0625,7.59375 5.32027,2.8057 14.48543,6.3046 12.71875,8.1875 -1.17586,1.2532 -5.86412,0.48185 -7.375,0.34375 -3.97766,-0.3637 -12.22613,-3.8589 -14.65625,-2.1875 -1.33174,0.916 1.3099,2.89025 6.3125,4.90625 7.70287,3.1042 18.58202,2.2908 18.125,6.3125 -0.71282,3.2955 -30.26596,-1.71585 -28.0625,-0.0937 2.88206,2.1212 6.11451,5.2459 9.59375,6.1875 3.47623,0.94359 7.00526,1.43165 10.625,1.96875 3.30204,0.39395 6.6102,0.66851 9.96875,0.75 -1.90541,1.38083 -3.86385,2.68345 -5.84375,3.96875 -1.83868,-0.2096 -5.57621,0.1175 -4.8125,1.125 1.35856,2.11732 12.60714,4.28339 10.875,5.65625 -4.52574,0.96437 -14.22784,-0.35495 -18.46875,-2.1875 -9.52391,-4.11539 -42.0502,-13.80149 -41.3125,-12.34375 -0.38646,3.00264 20.5661,23.5082 27.40625,27.4375 -5.83823,5.16822 4.06918,-0.25887 -2.84375,3.375 -0.90416,-0.46053 -40.42867,-23.94359 -36.1875,-13.0625 1.86511,4.7851 8.73487,14.92648 11.4375,20.25 3.5711,7.0342 -0.94224,13.43077 -5.875,8.625 -37.3005,-36.34027 -4.93481,11.9551 -45.3125,4.46875 -31.92503,-5.91912 12.66685,-18.58896 -28.5,-23.6875 -7.18798,0.20024 -19.93579,-4.40292 -23.90625,-1.125 -27.95875,23.08207 -16.34041,19.96426 -2.875,26 -8.91111,24.86205 -24.6468,0.38745 -36.9375,0.53125 -7.99311,-3.6797 22.37585,-25.29443 -36.1875,3.7813 -4.72563,0.5665 10.7508,-30.05455 -8.46875,-20.4688 -16.53092,8.24481 -55.6528,27.336 -44.875,15.96875 19.45465,-13.29481 27.84539,-28.84388 23.75,-30 -8.0411,-2.26999 -51.27237,20.32393 -62.75,9.96875 0.93624,-0.33742 9.92171,-1.34904 11.0625,-1.78125 8.13806,-2.2138 -27.2833,-6.0664 -1.1875,-8.625 14.43022,-1.355 39.70171,-23.27115 34.96875,-26.65625 -1.28431,-1.1199 -24.65076,16.47065 -26.625,15.90625 -2.22257,-1.2045 -14.49726,2.9265 -16.59375,1.6875 -19.36369,0.7856 5.32738,-8.278 12.8125,-11.9375 1.73095,-0.8463 -17.59577,-2.6435 -18.53125,-3.375 -0.6412,-0.5012 5.39799,-4.0592 4.3125,-4.5625 -3.32076,-0.2863 -7.10915,-0.084 -10.625,-0.125 -4.44201,-1.0327 -9.00718,-0.57075 -13.53125,-0.65625 -0.70837,-0.357 3.00362,-2.61595 7.3125,-5.71875 -2.45751,-7.0058 -8.9326,1.0893 -11.5,-5.875 5.06146,-3.387 15.31846,-2.95785 13.65625,-6.90625 -0.99438,-2.3618 -13.50175,-2.1996 -13.3125,-2.9375 12.08203,-3.26076 21.38468,-5.91282 31.34375,-14.1875 3.6535,-3.7989 8.17935,-8.27055 10.6875,-13.34375 -9.30264,6.70542 -20.39996,11.92255 -30.5625,15.46875 -4.7214,1.1918 -16.95399,3.00585 -25.71875,4.46875 -0.7783,-1.2946 -1.53816,-2.62735 -2.21875,-3.96875 4.81274,-2.01435 10.28366,-3.69011 6.96875,-6.5625 -0.22627,-1.86302 -7.28325,-1.68208 -10.875,-2.5625 -0.16896,-2.7051 8.21798,-4.17773 12.28125,-5.875 8.72114,-3.8016 3.02094,4.37825 8.65625,1.96875 1.17415,-0.5019 34.59142,-17.28025 33.75,-25.96875 1.27396,-3.3457 -33.12561,16.8579 -34.21875,15.125 -1.50071,-4.356 14.88713,-11.2348 16.5,-14.0625 1.14927,-2.015 -3.11203,-1.3382 -6.84375,1 -1.12969,0.7078 -29.74223,11.4587 -30.125,10.1875 -1.5323,-5.6316 6.72817,-3.0761 6.34375,-8.9375 -16.31363,2.1429 1.03848,-6.708 4.125,-7.625 2.1045,1.2614 5.12901,-0.70465 7.34375,-0.0937 2.93582,0.8786 6.30431,0.91245 9.375,0.34375 3.83675,0.1811 7.58965,-0.12845 11.3125,-0.71875 2.72359,-0.5371 5.35314,-1.02516 7.96875,-1.96875 2.61787,-0.9416 5.05021,-4.0663 7.21875,-6.1875 1.65795,-1.6218 -20.5574,3.38955 -21.09375,0.0937 -0.34388,-4.0217 7.82915,-3.2083 13.625,-6.3125 3.76409,-2.016 5.75204,-3.99025 4.75,-4.90625 -1.82849,-1.6714 -8.03835,1.8238 -11.03125,2.1875 -1.13682,0.1381 -4.67775,0.90945 -5.5625,-0.34375 -1.3293,-1.8829 5.59063,-5.3818 9.59375,-8.1875 2.34648,-1.6446 6.9638,-5.30075 8.3125,-7.59375 1.8117,-3.0801 -0.88348,-4.7293 -1.40625,-4.6875 -2.68357,2.3628 -30.18632,18.54295 -34.6875,17.59375 -1.88992,0.6831 -11.25845,-0.4269 -15.25,0.125 -1.37324,-5.338 17.92527,-4.6318 15.84375,-7 -0.9909,-1.1276 -12.62126,0.34565 -13.0625,-2.15625 -0.94835,-2.8577 3.80703,-1.9188 10.21875,-4 4.67468,-1.5174 12.63749,-8.7594 12.53125,-9.3125 -0.27592,-1.4374 -14.00579,6.32165 -20.9375,6.03125 -2.52155,-0.1056 -0.86128,-13.3921 -0.9375,-13.8125 7.08268,-1.5502 19.76122,-1.8334 24.375,-3.5 5.64227,-2.0381 18.88338,-3.0308 19.8125,-11.25 0.43089,-1.6049 -12.19378,2.52646 -28.71875,6.65625 -7.8859,1.97078 -11.36028,0.52146 -17.0625,0.71875 -0.38831,-2.3459 -0.81501,-8.12285 0,-10.46875 16.28976,0.91505 59.43451,-15.80453 24.8125,-7.25 -8.12436,1.93526 -17.11062,1.99347 -24.75,1.8125 0.14,-0.9553 -1.40765,-2.0663 0.5625,-5.5 1.25577,-2.1886 0.73095,-2.66375 4.5,-4.78125 -3.95535,-0.4417 -6.51939,0.20875 -6.25,-2.28125 0.54035,-5.0003 -1.03066,-1.6272 1.78125,-5.125 1.72407,-2.1446 24.6834,-3.3094 32.59375,-7.3125 3.76027,-1.9028 10.3505,-4.8969 10.03125,-8.25 0.33782,0.65113 -30.29904,11.54354 -39.09375,4.09375 -1.45338,-1.33 -1.00725,-11.36409 1.125,-14.21875 7.39759,0.62817 32.29207,-1.26623 32,-7.8125 -0.21135,-0.963 -16.29661,3.63785 -19.03125,2.84375 -0.71325,-0.2072 -13.99055,0.006 -13.625,-0.40625 0.77189,-1.64569 -0.0448,-3.54839 0.3125,-9.3125 5.09435,0.0972 26.50445,-8.77892 23.0625,-9.84375 -4.39127,-1.35852 -17.45924,5.73462 -23.71875,4.3125 -0.44912,-3.7906 -0.89372,-4.56903 -0.75,-9.5625 0.0376,-1.30633 10.15559,-2.48338 10.1875,-3.65625 0.0724,-2.65991 -9.78819,-0.77839 -9.90625,-2 -0.58322,-9.81839 -2.00767,-21.27889 -4.21875,-16.28125 -1.7119,3.5967 -3.16058,11.49649 -3.875,15.375 -4.16333,0.98678 -17.26241,-0.83064 -18.53125,-1 1.75453,3.7676 4.242,2.5792 7.5625,4.9375 2.50899,1.12741 6.02257,1.84147 9.25,1.21875 -1.92402,9.38976 -3.61675,19.81313 -5.25,19.6875 -3.51793,0.2298 -12.89983,-0.8084 -13.84375,1.875 -0.25912,0.7368 12.81526,3.2739 12.53125,4.125 -0.82279,2.4654 0.79191,5.81445 -0.28125,8.65625 -6.50676,-3.61964 -34.59429,-2.26575 -23.75,-0.71875 3.01161,0 18.33364,3.99055 23.375,4.21875 -0.96671,2.1482 -0.75856,3.96285 -1.9375,5.59375 -1.70624,2.3604 -30.75411,-1.0205 -33,-0.84375 0.65303,0.6808 2.42396,4.33345 6.71875,5.59375 8.62908,2.5324 25.0999,3.27285 24.59375,5.90625 -1.61,8.3762 1.56538,18.7934 -2.59375,28.9375 -0.25476,1.78393 -34.65542,-6.18434 -18.75,1.4375 3.88008,1.1949 17.54203,2.5743 17.28125,3.1875 -1.08053,2.5413 -6.43138,9.9411 -7.6875,15.625 -0.53539,1.7418 -1.27705,4.75495 -1.875,6.46875 -2.01009,-0.6223 -14.93042,-3.3659 -26.09375,-6.375 -6.50648,-1.7538 -12.27887,-4.80455 -15.28125,-4.40625 -3.92742,2.1542 7.44034,9.7555 13.3125,11.25 4.83079,1.2292 11.85833,2.346 12.1875,4.875 -8.44139,0.4392 -8.93778,-1.78855 -15.59375,-1.34375 -3.05328,0.3353 -5.91903,0.9312 -8.96875,1.125 -4.29426,0.7398 2.38764,2.0404 3.09375,2.5625 2.8187,0.5716 5.59638,1.36255 8.5,1.65625 2.97201,0.073 5.8384,0.70485 8.8125,1.09375 3.18267,0.2338 6.18065,0.42575 9.34375,0.53125 2.61848,-0.067 5.28684,-0.46035 7.75,-1.40625 0.0383,3.2753 -0.47222,5.55035 -0.875,7.96875 -0.49041,2.9446 12.37991,5.09735 11.59375,7.65625 -3.03754,0.753 -39.93642,-3.3489 -40.9375,-3.4375 -2.72942,-0.6635 -14.81898,-5.19545 -18.4375,-5.96875 -2.2224,5.6051 25.87291,11.37255 26.09375,14.34375 0.22075,2.9712 -15.68844,-2.7193 -21.59375,-2.75 -2.89823,1.1602 9.28123,5.517 6.375,6.25 -2.11537,0.074 -16.22664,-3.88315 -17.6875,-1.90625 -1.89636,2.5662 1.11084,4.90436 3.59375,7.21875 2.04689,2.3707 4.74005,4.54615 7.53125,5.40625 2.55226,0.6633 5.76063,1.08215 8.65625,1.09375 3.48765,0.017 14.18432,1.2643 18.90625,1.125 4.72202,-0.1392 -8.80188,-10.83714 9.25,-4.59375 -0.75136,7.2252 -1.19366,14.6368 -3.125,21.625 -0.21283,0.77 -36.88301,-5.8697 -39.96875,-6.5 -0.98429,-0.2011 2.92356,2.6764 8.84375,5.1875 10.66239,4.5227 26.95066,6.55505 27.875,10.21875 1.02475,4.0625 -2.31862,6.0062 -4.59375,9.4375 -0.91709,1.19638 1.65547,3.22025 5.03125,5.0625 -0.25268,0.77117 -0.54111,1.53768 -0.875,2.28125 -0.12412,0.35005 -0.27681,0.68381 -0.40625,1.03125 -2.30275,0.35037 -4.23808,0.66941 -5.0625,0.59375 -3.25707,0.1968 -21.83559,-3.7614 -25.40625,-5.0625 -5.7258,-2.0864 -19.70192,-9.64415 -24.25,-10.78125 -2.96105,0.2562 21.22962,14.8725 10.40625,12.1875 -2.82705,-0.7013 -12.40754,-3.2673 -15.21875,-2.4375 -0.54705,3.1123 12.6896,4.4315 12.71875,7.6875 -13.32943,-1.926 12.27217,9.2348 14.84375,9.5625 2.85002,-0.3247 19.39145,7.7173 22.03125,6.25 -5.21791,4.8003 -24.69828,1.6772 -7.03125,6 -2.50998,2.4057 -1.9252,2.44215 -3.84375,3.46875 -5.71814,3.0597 -42.90846,-14.75715 -44.96875,-17.34375 -2.01687,0.4817 10.59003,15.17145 18.125,19.15625 5.83742,3.0871 14.44594,5.75876 21.5625,7.8125 -0.54623,0.53064 -1.07392,1.07083 -1.625,1.59375 -3.87365,3.51408 -8.04482,6.69465 -12.4375,9.53125 -2.01706,-0.85803 -4.11856,-1.83459 -6.125,-2.9375 -7.87459,-4.32884 -32.94959,-21.161 -32.9375,-16.9375 0.0213,7.49165 15.72452,26.98495 22.8125,31.71875 -6.48453,4.37182 -28.48581,-4.55081 -35.84375,-2.0625 -5.7733,13.55259 29.35641,55.1154 -21.78125,12.4375 -9.39955,-0.45743 -31.14997,-7.28398 -40.5625,-7.28125 -29.68274,12.75789 6.83717,66.32405 -44.09375,6.21875 -8.104077,-9.56443 -21.429564,-0.27938 -24.5,-0.59375 -0.621838,-4.60879 -1.29339,-9.27272 -4.25,-10.875 1.7365,1.75175 -18.73815,13.23497 -20.53125,13.46875 -2.6324,-0.71061 -11.20575,-5.23446 -13.78125,-6.1875 0.3312,-2.40661 15.0267,-9.55863 15.125,-12.15625 0.158,-3.2093 -20.61,8.39062 -30.4375,5.6875 -7.1183,-1.95791 11.43145,-13.39659 9.90625,-14.15625 -5.973,-2.97495 -10.14185,5.34091 -16.59375,1.375 -10.8281,-6.65603 20.687,-31.10409 18.4375,-34.1875 -2.180708,-2.98922 -39.0799763,9.54967 -47.46875,7.1875 -0.034339,-0.01 -0.060334,-0.0211 -0.09375,-0.0312 -0.1522373,-0.0463 -0.305696,-0.0993 -0.4375,-0.15625 -0.130074,-0.0556 -0.265422,-0.12145 -0.375,-0.1875 -0.03345,-0.0209 -0.06233,-0.0405 -0.09375,-0.0625 -0.06651,-0.0442 -0.129882,-0.0762 -0.1875,-0.125 -0.03259,-0.0288 -0.06416,-0.0634 -0.09375,-0.0937 -0.0491,-0.0485 -0.08414,-0.10334 -0.125,-0.15625 -0.06269,-0.0823 -0.113334,-0.15753 -0.15625,-0.25 -0.08113,-0.19664 -0.128962,-0.40178 -0.15625,-0.59375 -0.02729,-0.19197 -0.02401,-0.37426 0,-0.5625 0.01864,-0.14616 0.04554,-0.29309 0.09375,-0.4375 0.02472,-0.074 0.0615,-0.14509 0.09375,-0.21875 0.148091,-0.3306 0.366237,-0.6737 0.65625,-1 0.108444,-0.12176 0.248084,-0.25331 0.375,-0.375 0.06152,-0.0589 0.1218623,-0.12863 0.1875,-0.1875 0.096598,-0.0866 0.2070802,-0.16327 0.3125,-0.25 5.6774342,-4.67069 23.933845,-9.63833 33.6875,-22.6875 0.012,-4.2235 -11.09485,0.79616 -18.96875,5.125 -4.56712589,2.51035 -10.6027487,4.48632 -14.71875,5.1875 -0.057467,0.01 -0.099532,0.022 -0.15625,0.0312 -0.572715,0.0938 -1.108293,0.14672 -1.59375,0.1875 -0.213753,0.018 -0.430935,0.0554 -0.625,0.0625 -0.304871,0.0114 -0.561524,-0.0147 -0.8125,-0.0312 -0.01169,-7.2e-4 -0.01968,7.8e-4 -0.03125,0 -0.199122,-0.0142 -0.370463,-0.0295 -0.53125,-0.0625 -0.129356,-0.0258 -0.240606,-0.0869 -0.34375,-0.125 -0.01884,-0.007 -0.04462,0.008 -0.0625,0 -0.02461,-0.01 -0.03961,-0.0204 -0.0625,-0.0312 -0.06305,-0.0313 -0.138561,-0.0561 -0.1875,-0.0937 -0.0512,-0.0384 -0.08942,-0.0797 -0.125,-0.125 -0.04085,-0.0504 -0.07323,-0.097 -0.09375,-0.15625 -0.5,-2.07376 -0.593,-1.50946 -3.9375,-2.375 -0.6531,-2.57436 -1.24325,-5.15827 -1.78125,-7.75 1.889551,-0.53308 4.070013,-1.1505 6.34375,-1.8125 0.07074,-0.0205 0.147766,-0.0418 0.21875,-0.0625 1.087931,-0.31746 2.183632,-0.62539 3.3125,-0.96875 0.1563469,-0.0475 0.3118947,-0.1082 0.46875,-0.15625 5.8213502,-1.7833 11.9559965,-3.90782 16.5625,-6.34375 7.5349,-3.9848 29.11595,-12.22712 25.03125,-20.0625 -3.205878,1.64664 -26.1125644,10.24873 -41.59375,14.25 -0.707603,0.18289 -1.38864,0.33751 -2.0625,0.5 -0.122575,0.0296 -0.253623,0.0649 -0.375,0.0937 -0.283537,0.0674 -0.598396,0.15542 -0.875,0.21875 -0.471965,0.10803 -0.955927,0.21683 -1.40625,0.3125 -0.338319,0.0715 -0.675116,0.12358 -1,0.1875 -0.367477,0.0727 -0.744425,0.15608 -1.09375,0.21875 -0.580904,0.10422 -1.130148,0.20671 -1.65625,0.28125 -0.07884,0.0112 -0.172461,0.0208 -0.25,0.0312 -0.07682,0.0103 -0.143235,0.0217 -0.21875,0.0312 -0.507026,0.0649 -0.992424,0.0928 -1.4375,0.125 -0.42211,0.0305 -0.794861,0.0636 -1.15625,0.0625 -0.156,-7e-4 -0.324713,-0.0244 -0.46875,-0.0312 -0.07759,-0.004 -0.144755,0.006 -0.21875,0 -0.178742,-0.0127 -0.311014,-0.0391 -0.46875,-0.0625 -0.139887,-0.0206 -0.283569,-0.0332 -0.40625,-0.0625 -0.239197,-0.0572 -0.453968,-0.12723 -0.625,-0.21875 -1.2758,-2.60565 -2.0091,-3.8619 0.875,-7.65625 0.181836,-0.23921 0.440085,-0.523 0.75,-0.84375 0.309915,-0.32075 0.674103,-0.68097 1.09375,-1.0625 0.304972,-0.27727 0.676688,-0.5751 1.03125,-0.875 0.395677,-0.33467 0.801843,-0.67889 1.25,-1.03125 0.654185,-0.51423 1.353881,-1.03983 2.09375,-1.5625 0.739869,-0.52267 1.517328,-1.03452 2.3125,-1.53125 0.06377,-0.0398 0.123479,-0.0855 0.1875,-0.125 0.04454,-0.0275 0.08034,-0.0664 0.125,-0.0937 0.515092,-0.31565 1.036412,-0.58363 1.5625,-0.875 0.190029,-0.10525 0.371754,-0.21124 0.5625,-0.3125 0.525394,-0.27958 1.037105,-0.538 1.5625,-0.78125 0.1038901,-0.048 0.2087923,-0.10982 0.3125,-0.15625 1.0062462,-0.45047 2.0113959,-0.83238 2.96875,-1.09375 7.7220706,-2.10821 5.4108629,-3.92766 -2.96875,-3.90625 -0.821518,0.002 -1.690246,0.0237 -2.625,0.0625 -0.185783,0.008 -0.341168,0.022 -0.53125,0.0312 -1.086243,0.0521 -2.247821,0.14562 -3.46875,0.25 -0.04094,0.004 -0.08392,-0.004 -0.125,0 -0.09869,0.009 -0.212977,0.0222 -0.3125,0.0312 -0.690878,0.062 -1.395115,0.13926 -2.125,0.21875 -0.776568,0.0849 -1.556054,0.17569 -2.375,0.28125 -1.17519,0.15148 -2.367895,0.30379 -3.625,0.5 -0.3464,-1.00911 -3.6837,-3.8723 0.6875,-7 0.175067,-0.12526 0.406296,-0.269 0.65625,-0.40625 0.04331,-0.0237 0.110866,-0.0385 0.15625,-0.0625 0.111635,-0.0588 0.251009,-0.12666 0.375,-0.1875 0.142369,-0.0701 0.279493,-0.14611 0.4375,-0.21875 0.621258,-0.28532 1.346013,-0.58191 2.1875,-0.90625 0.452433,-0.17439 0.991434,-0.37742 1.5,-0.5625 2.536573,-0.92182 5.723811,-1.98033 9.1875,-3.125 15.7099374,-5.19178 37.875413,-12.56535 36.71875,-20.5 -0.907369,-2.71667 -20.2199762,1.31319 -36.71875,4.34375 -4.587129,0.84258 -8.962074,1.60429 -12.65625,2.125 -1.141862,0.16095 -2.189611,0.29764 -3.1875,0.40625 -0.0832,0.009 -0.167918,0.0228 -0.25,0.0312 -0.05681,0.006 -0.09997,-0.006 -0.15625,0 -1.522767,0.15708 -2.86054,0.25544 -3.9375,0.25 -0.135241,-6.8e-4 -0.247723,0.004 -0.375,0 -0.271274,-0.007 -0.484474,-0.0104 -0.71875,-0.0312 -0.283723,-0.0242 -0.554492,-0.08 -0.78125,-0.125 -0.169697,-0.0337 -0.301402,-0.0478 -0.4375,-0.0937 -0.03404,-0.0113 -0.06182,-0.0192 -0.09375,-0.0312 -0.0446,-0.0169 -0.0846,-0.044 -0.125,-0.0625 -0.160538,-0.0731 -0.2823,-0.15212 -0.375,-0.25 -0.04361,-0.0446 -0.0964,-0.0749 -0.125,-0.125 -0.0052,-0.009 0.0047,-0.0223 0,-0.0312 -0.03017,-0.0579 -0.05238,-0.12224 -0.0625,-0.1875 5.7856,-1.67435 13.32375,-3.40617 19.21875,-5.90625 0.373354,-0.15837 0.722035,-0.33974 1.0625,-0.53125 0.04156,-0.0232 0.0839,-0.0389 0.125,-0.0625 0.07883,-0.0457 0.141665,-0.10902 0.21875,-0.15625 0.295436,-0.17944 0.572757,-0.363 0.84375,-0.5625 0.339861,-0.2502 0.666666,-0.50688 0.96875,-0.78125 0.300704,-0.27311 0.5797429,-0.55481 0.84375,-0.84375 2.6991666,-2.95412 3.5187696,-6.5194 2.8125,-6.375 -0.3857569,0.32299 -1.3951001,0.86513 -2.8125,1.46875 -0.1953575,0.0832 -0.3822712,0.16415 -0.59375,0.25 -0.236853,0.0966 -0.493764,0.18217 -0.75,0.28125 -0.220051,0.0849 -0.422843,0.16391 -0.65625,0.25 -0.04733,0.0175 -0.07713,0.045 -0.125,0.0625 -0.462411,0.16919 -0.928511,0.32983 -1.4375,0.5 -0.08173,0.0274 -0.167137,0.0351 -0.25,0.0625 -0.483475,0.15933 -0.9812,0.31288 -1.5,0.46875 -0.603768,0.18139 -1.23027,0.35984 -1.875,0.53125 -0.474066,0.12603 -0.976011,0.25704 -1.46875,0.375 -0.177386,0.0425 -0.351703,0.0838 -0.53125,0.125 -0.521996,0.11978 -1.024397,0.23625 -1.5625,0.34375 -0.168562,0.0338 -0.33008,0.0613 -0.5,0.0937 -0.383084,0.0729 -0.767078,0.15347 -1.15625,0.21875 -0.330809,0.0557 -0.665607,0.10664 -1,0.15625 -0.229175,0.0338 -0.45692,0.063 -0.6875,0.0937 -0.09334,0.0125 -0.187712,0.0193 -0.28125,0.0312 -0.475171,0.0605 -0.958308,0.1103 -1.4375,0.15625 -0.270518,0.0259 -0.54121,0.0416 -0.8125,0.0625 -0.389991,0.0302 -0.765644,0.0747 -1.15625,0.0937 -0.488901,0.0239 -0.980818,0.0263 -1.46875,0.0312 -0.250721,0.002 -0.499936,0.003 -0.75,0 -0.735017,-0.008 -1.463349,-0.0358 -2.1875,-0.0937 -0.724151,-0.0579 -1.450369,-0.13656 -2.15625,-0.25 -0.2394,-3.93671 -0.27495,-7.90023 -0.15625,-11.84375 1.350369,-0.0756 2.869016,-0.20459 4.46875,-0.34375 0.188825,-0.0164 0.370798,-0.0139 0.5625,-0.0312 0.08124,-0.007 0.168264,-0.0238 0.25,-0.0312 0.383158,-0.0353 0.793961,-0.0858 1.1875,-0.125 0.587381,-0.058 1.173515,-0.0895 1.78125,-0.15625 0.844234,-0.0936 1.717777,-0.20101 2.59375,-0.3125 0.175143,-0.0221 0.355051,-0.0397 0.53125,-0.0625 0.206313,-0.027 0.417344,-0.0657 0.625,-0.0937 0.86146,-0.11517 1.714214,-0.24167 2.59375,-0.375 1.084148,-0.16435 2.18334,-0.33772 3.28125,-0.53125 0.01004,-0.002 0.02121,0.002 0.03125,0 0.02007,-0.004 0.04243,0.004 0.0625,0 1.085204,-0.19207 2.166452,-0.43395 3.25,-0.65625 1.102738,-0.22624 2.195489,-0.45944 3.28125,-0.71875 7.9663582,-1.90261 15.2773382,-4.70049 18.875,-8.78125 2.4829,-2.31439 6.4592,-5.46505 4.5625,-8.03125 -1.008826,-1.36543 -14.40321055,2.66735 -23.4375,5.3125 -0.011021,0.003 -0.02024,-0.003 -0.03125,0 -2.009994,0.58845 -3.860897,1.11606 -5.28125,1.5 -0.687551,0.18585 -1.255969,0.33228 -1.71875,0.4375 -0.01785,0.004 -0.04503,0.0273 -0.0625,0.0312 -0.0088,0.002 -0.02256,-0.002 -0.03125,0 -0.447247,0.0992 -0.779096,0.16179 -0.9375,0.15625 -2.9069,-0.733 9.2726,-5.0898 6.375,-6.25 -5.9058,0.0307 -24.4082,4.25245 -24.1875,1.28125 0.0062,-0.0828 0.04161,-0.16518 0.09375,-0.25 0.03861,-0.0624 0.09411,-0.12399 0.15625,-0.1875 0.03876,-0.0398 0.07734,-0.0848 0.125,-0.125 0.02475,-0.0205 0.06674,-0.0418 0.09375,-0.0625 0.03831,-0.0292 0.08227,-0.0644 0.125,-0.0937 0.08737,-0.0604 0.175864,-0.1261 0.28125,-0.1875 0.238491,-0.13918 0.519542,-0.26221 0.84375,-0.40625 0.179607,-0.0798 0.390272,-0.16871 0.59375,-0.25 0.256785,-0.10312 0.489279,-0.20695 0.78125,-0.3125 0.541428,-0.19523 1.136081,-0.39025 1.78125,-0.59375 0.285146,-0.0901 0.666572,-0.18948 0.96875,-0.28125 0.367609,-0.11107 0.766906,-0.2303 1.15625,-0.34375 1.055169,-0.30903 2.080023,-0.6108 3.25,-0.9375 1.618015,-0.45032 3.32138,-0.92211 5,-1.40625 0.927748,-0.26834 1.847267,-0.56513 2.75,-0.84375 0.911045,-0.28054 1.802353,-0.55262 2.65625,-0.84375 0.04238,-0.0145 0.0828,-0.0168 0.125,-0.0312 0.797327,-0.27341 1.562544,-0.561 2.28125,-0.84375 0.66411,-0.26127 1.268297,-0.51199 1.84375,-0.78125 0.09419,-0.0441 0.189758,-0.0807 0.28125,-0.125 0.241807,-0.11654 0.465433,-0.22576 0.6875,-0.34375 2.1363228,-1.13509 3.3156712,-2.35567 2.8125,-3.625 -0.6664916,0.14243 -1.6827357,0.43147 -2.8125,0.78125 -0.751459,0.23265 -1.594396,0.52322 -2.46875,0.8125 -1.393344,0.46044 -2.789479,0.92411 -4.28125,1.4375 -0.70532,0.24273 -1.410317,0.48303 -2.09375,0.71875 -1.12154,0.38653 -2.292528,0.80239 -3.25,1.125 -0.260731,0.0878 -0.601658,0.20098 -0.84375,0.28125 -0.429056,0.14193 -0.892822,0.29357 -1.25,0.40625 -0.588015,0.18531 -1.099782,0.32416 -1.4375,0.40625 -0.4009,0.0355 -6.96005,0.74601 -14.40625,1.5 -1.009625,-2.56718 -0.44286,-2.09809 -0.21875,-2.40625 0.02241,-0.0308 0.01734,-0.0748 0.03125,-0.125 0.06952,-0.25107 0.02112,-0.78515 -0.40625,-2.09375 0.207746,0.0369 0.47624,0.0515 0.78125,0.0625 0.02466,8.6e-4 0.03724,-7e-4 0.0625,0 0.339297,0.0104 0.744028,0.0184 1.1875,0 0.734775,-0.0318 1.65074,-0.11652 2.625,-0.21875 0.188318,-0.0198 0.428954,-0.0402 0.625,-0.0625 0.281874,-0.0322 0.640739,-0.088 0.9375,-0.125 0.977899,-0.1218 1.97995,-0.26807 3.09375,-0.4375 0.02963,-0.005 0.06404,0.005 0.09375,0 0.958796,-0.14643 2.000492,-0.32352 3.03125,-0.5 0.05046,-0.009 0.105648,-0.0225 0.15625,-0.0312 0.979467,-0.16857 1.947723,-0.33972 2.96875,-0.53125 0.890749,-0.16736 1.780215,-0.31775 2.6875,-0.5 0.311822,-0.0626 0.624846,-0.1233 0.9375,-0.1875 0.834552,-0.1711 1.667133,-0.35038 2.5,-0.53125 0.886073,-0.19277 1.753452,-0.39209 2.625,-0.59375 0.688601,-0.15893 1.3278,-0.30558 2,-0.46875 0.370317,-0.09 0.698604,-0.19024 1.0625,-0.28125 1.062679,-0.26532 2.073061,-0.54158 3.0625,-0.8125 0.06238,-0.0171 0.1254678,-0.0142 0.1875,-0.0312 1.0037941,-0.27659 2.0400358,-0.5666 2.9375,-0.84375 10.322,-3.18762 15.10725,-8.01899 13.28125,-8.375 -1.4763654,-0.0938 -8.7722912,1.08195 -16.21875,2.25 -0.2453021,0.0385 -0.441997,0.0553 -0.6875,0.0937 -1.753689,0.2746 -3.508068,0.55752 -5.1875,0.8125 -0.16143,0.0247 -0.339983,0.0381 -0.5,0.0625 -1.706142,0.25762 -3.35481,0.51752 -4.8125,0.71875 -0.283685,0.0397 -0.510555,0.057 -0.78125,0.0937 -1.938678,0.25919 -3.633748,0.47266 -4.65625,0.53125 -0.03481,0.002 -0.09151,-0.002 -0.125,0 -0.0085,4.4e-4 -0.02284,-4.3e-4 -0.03125,0 -0.36808,0.0177 -0.653878,0.0208 -0.84375,0 -6.656,-0.4448 -7.65235,0.002 -16.09375,-0.4375 0.3291,-2.529 -3.98715,-9.3333 0.84375,-10.5625 0.834727,-0.21244 2.486816,-0.56851 4.71875,-1.0625 1.243913,-0.27531 2.701189,-0.61234 4.25,-0.96875 1.263492,-0.28916 2.4602,-0.56515 3.875,-0.90625 3.111112,-0.75007 6.4906,-1.61127 9.9375,-2.59375 2.34755,-0.66913 4.677629,-1.38936 6.96875,-2.15625 0.219888,-0.0736 0.437749,-0.14429 0.65625,-0.21875 0.692575,-0.23616 1.387007,-0.47418 2.0625,-0.71875 0.1387639,-0.0502 0.268331,-0.10568 0.40625,-0.15625 C 0.18243834,762.13421 7.7948581,757.6828 5.75,752.6875 c -3.3639288,0.87758 -9.0468792,2.24762 -15.34375,3.75 -6.18862,1.47655 -12.997823,3.07622 -19.375,4.53125 -2.900737,0.65924 -5.85628,1.3139 -8.40625,1.875 -0.464636,0.10224 -1.083005,0.2459 -1.53125,0.34375 -1.274774,0.2787 -2.792282,0.60756 -3.90625,0.84375 -0.733502,0.15467 -1.632648,0.33606 -2.28125,0.46875 -1.761597,0.36038 -3.191538,0.64747 -4.1875,0.8125 -0.9585,-4.3839 -0.1973,0.10492 -0.5625,-4.40625 -0.1357,-2.06188 -0.59175,-4.06236 -1.15625,-6.03125 1.1427,-0.25946 3.9236,-1.65884 4.625,-1.875 5.5969,-1.7235 16.3338,-7.90935 7.4375,-8.15625 -0.7828,-0.0217 -7.724,1.42408 -14.4375,2.5 -5.4925,-8.62788 -4.4878,-16.58271 -5,-25 4.6351,-2.55791 3.8471,-1.11884 12.4375,-3.5625 4.2943,-1.2603 27.1971,-7.17562 26.875,-13.21875 -0.962955,0.2063 -2.215109,0.44245 -3.6875,0.6875 -1.472391,0.24505 -3.156024,0.48626 -5,0.75 -1.62095,0.23184 -3.410745,0.48702 -5.21875,0.71875 -0.248763,0.0319 -0.467454,0.062 -0.71875,0.0937 -0.291985,0.037 -0.579895,0.057 -0.875,0.0937 -1.812559,0.22508 -3.654198,0.44816 -5.53125,0.65625 -4.325281,0.47951 -8.704835,0.91146 -12.59375,1.1875 -0.01969,0.001 -0.04283,-0.001 -0.0625,0 -2.927707,0.207 -5.552092,0.33155 -7.6875,0.34375 -0.66662,0.004 -1.284089,-0.0118 -1.84375,-0.0312 -0.04402,-0.002 -0.08169,0.002 -0.125,0 -1.855465,-0.0711 -3.125703,-0.26813 -3.40625,-0.65625 -1.1789,-1.6309 0.37255,-2.2268 -0.59375,-4.375 1.355725,-0.28591 2.647547,-0.40422 4,-0.625 0.289916,-0.0473 0.577981,-0.0962 0.875,-0.15625 0.06273,-0.0126 0.124387,-0.0179 0.1875,-0.0312 0.05001,-0.0106 0.105981,-0.0201 0.15625,-0.0312 0.240862,-0.053 0.502484,-0.12178 0.75,-0.1875 0.17658,-0.0471 0.350691,-0.10138 0.53125,-0.15625 0.120633,-0.0365 0.252417,-0.0847 0.375,-0.125 0.636835,-0.21155 1.329641,-0.4713 2.03125,-0.8125 0.266855,-0.12931 0.534279,-0.28512 0.8125,-0.4375 0.07184,-0.0393 0.146107,-0.084 0.21875,-0.125 0.28402,-0.16091 0.577987,-0.34378 0.875,-0.53125 0.0774,-0.0489 0.171666,-0.10546 0.25,-0.15625 0.462155,-0.30032 0.940574,-0.6281 1.4375,-1 0.326006,-0.24384 0.6888,-0.53466 1.03125,-0.8125 0.254878,-0.2074 0.547978,-0.42886 0.8125,-0.65625 0.109273,-0.094 0.232773,-0.21492 0.34375,-0.3125 0.536941,-0.47236 1.077214,-0.97127 1.65625,-1.53125 -0.461188,0.23465 -0.908944,0.4361 -1.375,0.625 -0.466056,0.1889 -0.962692,0.35245 -1.4375,0.5 -0.474808,0.14755 -0.950056,0.29564 -1.4375,0.40625 -0.236971,0.0545 -0.478118,0.10969 -0.71875,0.15625 -0.251649,0.0478 -0.493836,0.0853 -0.75,0.125 -0.503965,0.0781 -1.03813,0.13753 -1.5625,0.1875 -0.493713,0.0471 -0.984855,0.0991 -1.5,0.125 -0.03199,0.002 -0.06167,-0.002 -0.09375,0 -0.06111,0.003 -0.126058,-0.003 -0.1875,0 -1.041926,0.0451 -2.1311,0.0462 -3.28125,0.0312 -1.935636,-0.0252 -4.022694,-0.0942 -6.375,-0.1875 -1.0734,-2.8418 -0.3646,-1.81585 -1.1875,-4.28125 -0.07967,-0.23883 3.139743,-0.67452 7.5625,-1.3125 0.226094,-0.0326 0.485935,-0.0599 0.71875,-0.0937 2.313327,-0.33605 4.78805,-0.7237 7.5,-1.1875 0.47565,-0.0814 0.958291,-0.16444 1.4375,-0.25 1.717166,-0.30659 3.438572,-0.63684 5.125,-1 0.199703,-0.0428 0.395407,-0.0813 0.59375,-0.125 0.652696,-0.14416 1.272938,-0.28427 1.90625,-0.4375 0.513788,-0.12369 1.003042,-0.24519 1.5,-0.375 1.091544,-0.28512 2.143757,-0.59059 3.125,-0.90625 0.690601,-0.22287 1.349888,-0.44903 1.96875,-0.6875 0.275842,-0.10609 0.521641,-0.20322 0.78125,-0.3125 0.349698,-0.14689 0.68217,-0.28482 1,-0.4375 0.06472,-0.031 0.124172,-0.0625 0.1875,-0.0937 0.211956,-0.1047 0.397994,-0.20507 0.59375,-0.3125 0.155594,-0.085 0.292579,-0.16326 0.4375,-0.25 0.08926,-0.0534 0.164936,-0.10217 0.25,-0.15625 0.219451,-0.13911 0.43458,-0.29392 0.625,-0.4375 0.191074,-0.14468 0.371579,-0.28828 0.53125,-0.4375 0.0708,-0.0657 0.123055,-0.12085 0.1875,-0.1875 0.08444,-0.0867 0.145399,-0.1618 0.21875,-0.25 0.102198,-0.12315 0.201464,-0.24882 0.28125,-0.375 0.01973,-0.0312 0.04418,-0.0623 0.0625,-0.0937 0.04974,-0.085 0.08579,-0.16361 0.125,-0.25 0.03339,-0.0723 0.06795,-0.14553 0.09375,-0.21875 0.01006,-0.0294 -0.0088,-0.0642 0,-0.0937 0.04238,-0.13587 0.0783,-0.26707 0.09375,-0.40625 0.0176,-0.15846 0.01882,-0.30596 0,-0.46875 -0.0012,-0.0105 0.0014,-0.0207 0,-0.0312 -0.0067,-0.0501 -0.02098,-0.1057 -0.03125,-0.15625 -0.02473,-0.12046 -0.04841,-0.25218 -0.09375,-0.375 -0.0278,-0.079 -0.101802,-0.15268 -0.1875,-0.21875 -0.09299,-0.0717 -0.217968,-0.13034 -0.375,-0.1875 -0.158861,-0.0578 -0.342514,-0.11248 -0.5625,-0.15625 -0.212738,-0.042 -0.45301,-0.0641 -0.71875,-0.0937 -0.538158,-0.0622 -1.140359,-0.11 -1.875,-0.125 -0.723709,-0.0148 -1.528597,-0.0236 -2.40625,0 -0.873974,0.0235 -1.817364,0.0692 -2.8125,0.125 -0.753682,0.0422 -1.536498,0.0988 -2.34375,0.15625 -0.267439,0.0188 -0.508884,0.0422 -0.78125,0.0625 -2.194699,0.16462 -4.507776,0.36347 -6.875,0.59375 -1.470241,0.14302 -2.951477,0.28599 -4.40625,0.4375 -0.853919,0.0883 -1.731695,0.19344 -2.5625,0.28125 -1.114232,0.11843 -2.266502,0.23209 -3.3125,0.34375 -5.21718,0.55691 -9.473913,1.0086 -10.5625,0.9375 l -2.34375,-6.90625 c -0.8981,5.4598 -2.9423,21.41685 -1.5625,26.78125 0.1359,0.5273 -19.00525,-1.98845 -19.71875,-1.78125 -2.7346,0.7941 -22.5756,-3.95068 -23.9375,-2.59375 -4.3804,4.36385 7.62785,8.35764 17.09375,11.9375 8.2923,3.13605 22.24505,6.82415 23.96875,8.96875 2.812,3.4978 1.36585,1.9372 1.90625,6.9375 0.2694,2.49 -6.45005,2.0583 -10.40625,2.5 3.7694,2.1175 7.056,2.3739 8.3125,4.5625 1.9701,3.4337 1.39125,5.45095 1.53125,6.40625 -4.6036,-0.9893 -13.08465,-0.72305 -14.84375,-1.40625 -11.9317,-1.99847 -37.44795,-10.26007 -37.78125,-9.25 -0.589,3.6938 0.7152,4.17505 2.8125,7.03125 8.3171,5.22652 18.71,6.04896 29.4375,9.4375 2.694,-0.0161 13.9698,4.7646 18.75,4.4375 -1.2177,5.758 -13.11735,1.74085 -19.65625,4.40625 -2.2935,0.9348 16.0569,4.45435 16.375,6.46875 0.3368,2.1427 5e-5,2.9697 -0.28125,5.125 -5.7022,-0.1973 -13.98595,-0.82035 -21.65625,-4.40625 -15.4293,-7.214 -25.71215,-13.38615 -25.28125,-11.78125 0.9291,8.2192 22.20075,18.3369 27.84375,20.375 4.6132,1.6666 10.69855,1.8873 17.78125,3.4375 -0.076,0.4204 1.7715,2.42565 -0.75,2.53125 -6.9317,0.2904 -26.63115,-7.46865 -26.90625,-6.03125 -0.1069,0.5531 7.85655,7.7951 12.53125,9.3125 6.4117,2.0812 11.04125,2.98605 10.09375,5.84375 -0.3125,1.77 -9.1446,0.49171 -12.5,0.0937 0.8998,-1.44553 -25.57635,-6.26261 -36.15625,-14.28125 -0.5228,-0.0418 -1.59195,5.38865 0.21875,8.46875 1.3491,2.293 5.99715,5.94915 8.34375,7.59375 4.003,2.8057 10.8918,6.3046 9.5625,8.1875 -0.8848,1.2532 -4.4257,0.48185 -5.5625,0.34375 -2.9929,-0.3637 -9.20365,-3.8589 -11.03125,-2.1875 -1.0029,0.916 0.9855,2.89025 4.75,4.90625 5.7951,3.1042 13.9681,2.2908 13.625,6.3125 -0.5367,3.2955 -20.3402,-2.62386 -24.3125,-0.3125 -7.8361,5.59302 14.6675,19.28865 26.5625,18.1875 5.1964,-0.6092 17.5086,6.38957 21.75,8.875 -4.6087,3.2023 -2.9096,7.10735 -4.875,11.34375 -8.2222,4.43693 -45.2545,-19.91987 -43.1875,-16.875 -3.2161,10.27167 36.32255,30.77111 41.46875,28.625 1.141,2.8862 1.27695,-1.17299 -0.40625,4.40625 -6.5752,-1.05716 -13.117,-2.11529 -16.25,-2.90625 -4.5074,-1.4986 -8.52675,-4.15815 -13.09375,-5.34375 -2.3557,-1.2648 -5.12815,-2.08785 -7.71875,-3.71875 -2.8232,-0.8727 -6.9275,-5.28245 -9.75,-6.40625 2.5082,5.0732 8.6589,8.2636 12.3125,12.0625 3.877,3.2414 10.98095,8.6848 15.40625,10.125 2.5661,1.7417 10.75405,5.7397 11.09375,7.0625 0.1889,0.7379 -9.09935,-1.14305 -10.09375,1.21875 -14.0652,-2.09745 -28.1223,-6.73238 -42.1875,-10.09375 -11.0879,9.65217 52.36455,28.23675 51.65625,28.59375 -4.5245,0.0855 -8.8703,-1.06396 -13.3125,-0.0312 -11.1646,-2.50865 -12.33545,-4.4113 -15.65625,-4.125 -1.0855,0.5033 20.79765,14.28005 20.15625,14.78125 -0.9354,0.7315 -23.26215,-6.30153 -21.53125,-2.8125 3.4636,5.95753 24.14585,13.62935 4.78125,12.84375 -2.096,1.239 -6.30875,-3.0795 -8.53125,-1.875 -1.9743,0.5644 -15.24735,-7.15115 -16.53125,-6.03125 -0.7058,3.3851 34.29695,20.66372 37.28125,22.5625 23.0664,14.67633 -46.5323,-14.0011 -48.0625,-5.53125 -0.2517,13.69981 31.61515,18.02002 47.21875,26.3125 -0.8242,1.75599 -1.03385,0.14147 -1.96875,1.84375 -9.0943,0.12053 -16.76455,1.11772 -17.46875,2.96875 -0.7394,1.94478 3.42125,4.3448 10.46875,8.03125 -1.4021,1.91171 -2.8576,3.75887 -4.375,5.5625 -5.6093,2.4302 -24.2258,5.96534 -26.625,4.90625 1.2543,5.38431 20.90785,8.55875 18.09375,13.09375 -3.8315,4.49177 -47.64975,-0.45829 -49.90625,4.9375 -5.0429,5.80905 30.2314,21.06745 25.25,26.93755 -7.4389,7.9719 -50.1747,-5.7161 -60.125,-1.1876 -4.5932,1.8769 22.2301,18.7673 26.3125,23 8.5249,8.2403 2.4866,12.4481 -11.4375,11.2813 -6.8367,-0.6352 -9.9142,-5.0619 -26.875,-2.5313 -1.8513,0.5399 -20.8812,-19.705 -23.3125,-19.4374 -7.8732,0.8654 18.0932,29.0138 6.3125,29.5312 -2.9942,-0.6435 -14.65615,-16.2665 -18.53125,-16.2812 -2.4013,-0.01 -1.40615,7.5671 -3.15625,8.4687 -1.96836,1.014 -6.34409,-2.3695 -9.625,-5.2813 l 0,43.4376 c 857.89583,0 1715.7917,0 2573.6875,0 -0.585,-118.69785 -0.2472,-3.396 0.031,-122.0938 -8.1603,4.73901 -17.4307,6.98311 -26.5312,9 -8.6284,3.61181 -17.122,7.82272 -26.4375,9.375 -2.3053,0.43325 -10.2344,2.24566 -4.0625,0.59375 1.8758,-0.49744 4.38,-1.4022 0.9688,-0.46875 -8.8835,2.45734 -18.1777,2.95803 -27.3126,3.9375 -28.5778,2.4454 -37.928,11.20434 -66.1562,6.15625 -6.9766,-1.28911 -3.0009,-18.36341 -9.25,-21.75 1.7365,1.75175 -18.7382,13.23497 -20.5312,13.46875 -2.6324,-0.71061 -11.2058,-5.23446 -13.7813,-6.1875 0.3312,-2.40661 15.0267,-9.55863 15.125,-12.15625 0.158,-3.2093 -20.61,8.39062 -30.4375,5.6875 -7.1183,-1.95791 11.4316,-13.39659 9.9062,-14.15625 -5.9728,-2.97495 -10.1418,5.34091 -16.5937,1.375 -10.8281,-6.65603 20.687,-31.10409 18.4375,-34.1875 -2.3843,-3.2683 -46.2849,12.04289 -49.0312,6.125 -2.5962,-6.2926 23.0225,-9.95377 35.25,-26.3125 0.012,-4.2235 -11.0949,0.79616 -18.9688,5.125 -7.3977,4.0662 -18.6868,6.73955 -19.3438,4.84375 -0.5,-2.07376 -0.593,-1.50946 -3.9374,-2.375 -0.6531,-2.57436 -1.2433,-5.15827 -1.7813,-7.75 7.6109,-2.14716 19.3372,-5.34125 26.9063,-9.34375 7.5349,-3.9848 29.1159,-12.22712 25.0312,-20.0625 -4.5885,2.3568 -49.5944,18.9972 -55.3125,15.9375 -1.2758,-2.60565 -2.0091,-3.8619 0.875,-7.65625 1.7188,-2.26115 9.5821,-8.64275 15.8125,-10.34375 11.3055,-3.08652 1.1376,-5.54261 -18.1562,-2.53125 -0.3464,-1.00911 -3.6838,-3.8723 0.6874,-7 5.8169,-4.16187 52.8855,-14.53528 51.2188,-25.96875 -1.5801,-4.73083 -59.2391,11.12355 -60,6.21875 5.7856,-1.67435 13.3237,-3.40617 19.2188,-5.90625 5.9197,-2.5111 7.8585,-9.5136 6.875,-9.3125 -1.7558,1.47004 -15.8622,7.12758 -27.1563,5.3125 -0.2394,-3.93671 -0.2749,-7.90023 -0.1563,-11.84375 12.1173,-0.67829 35.85,-3.68318 43.375,-12.21875 2.4829,-2.31439 6.4591,-5.46505 4.5626,-8.03125 -1.4606,-1.9769 -29.385,7.5115 -31.5,7.4375 -2.9069,-0.733 9.2726,-5.0898 6.375,-6.25 -5.9058,0.0307 -24.4083,4.25245 -24.1876,1.28125 0.2212,-2.9712 30.9095,-7.2699 28.6876,-12.875 -3.6187,0.7733 -15.7077,5.30525 -18.4376,5.96875 -0.4009,0.0355 -6.96,0.74601 -14.4062,1.5 -1.6154,-4.10749 0.7739,-0.43748 -0.5938,-4.625 3.6287,0.64507 22.8735,-2.79281 33.5626,-6.09375 10.322,-3.18762 15.1072,-8.01899 13.2812,-8.375 -3.05,-0.1938 -30.7906,4.8978 -33.8438,4.5625 -6.6559,-0.4448 -7.6523,0.002 -16.0937,-0.4375 0.3291,-2.529 -3.9871,-9.3333 0.8437,-10.5625 5.8723,-1.4945 52.9587,-10.23359 48.2188,-21.8125 -11.3361,2.95737 -47.0638,11.30477 -55.0312,12.625 -0.9585,-4.3839 -0.1974,0.10492 -0.5626,-4.40625 -0.1357,-2.06188 -0.5917,-4.06236 -1.1562,-6.03125 1.1427,-0.25946 3.9236,-1.65884 4.625,-1.875 5.5969,-1.7235 16.3338,-7.90935 7.4375,-8.15625 -0.7828,-0.0217 -7.724,1.42408 -14.4375,2.5 -5.4925,-8.62788 -4.4878,-16.58271 -5,-25 4.6351,-2.55791 3.8471,-1.11884 12.4375,-3.5625 4.2943,-1.2603 27.1971,-7.17562 26.875,-13.21875 -9.2196,1.97521 -45.0438,6.20415 -46.75,3.84375 -1.1789,-1.6309 0.3725,-2.2268 -0.5937,-4.375 4.556,-0.96082 8.3595,0.0339 16.3437,-7.6875 -5.1556,2.62315 -10.4468,2.29693 -18.7187,1.96875 -1.0734,-2.8418 -0.3647,-1.81585 -1.1876,-4.28125 -0.2838,-0.8511 39.6832,-3.85807 36.7813,-11.71875 -0.9439,-2.6834 -36.2629,2.38605 -39.7813,2.15625 l -2.3437,-6.90625 c -0.8981,5.4598 -2.9423,21.41685 -1.5625,26.78125 0.1359,0.5273 -19.0052,-1.98845 -19.7188,-1.78125 -2.7346,0.7941 -22.5755,-3.95068 -23.9374,-2.59375 -4.3805,4.36385 7.6278,8.35764 17.0937,11.9375 8.2923,3.13605 22.245,6.82415 23.9687,8.96875 2.812,3.4978 1.3659,1.9372 1.9063,6.9375 0.2694,2.49 -6.45,2.0583 -10.4063,2.5 3.7694,2.1175 7.0561,2.3739 8.3126,4.5625 1.9701,3.4337 1.3912,5.45095 1.5312,6.40625 -4.6036,-0.9893 -13.0847,-0.72305 -14.8438,-1.40625 -11.9317,-1.99847 -37.4479,-10.26007 -37.7812,-9.25 -0.589,3.6938 0.7152,4.17505 2.8125,7.03125 8.3171,5.22652 18.71,6.04896 29.4375,9.4375 2.694,-0.0161 13.9698,4.7646 18.75,4.4375 -1.2177,5.758 -13.1173,1.74085 -19.6562,4.40625 -2.2935,0.9348 16.0569,4.45435 16.375,6.46875 0.3368,2.1427 0,2.9697 -0.2813,5.125 -5.7022,-0.1973 -13.986,-0.82035 -21.6563,-4.40625 -15.4293,-7.214 -25.7121,-13.38615 -25.2812,-11.78125 0.9291,8.2192 22.2007,18.3369 27.8438,20.375 4.6132,1.6666 10.6985,1.8873 17.7812,3.4375 -0.076,0.4204 1.7715,2.42565 -0.75,2.53125 -6.9317,0.2904 -26.6312,-7.46865 -26.9062,-6.03125 -0.1069,0.5531 7.8565,7.7951 12.5312,9.3125 6.4117,2.0812 11.0412,2.98605 10.0938,5.84375 -0.3126,1.77 -9.1447,0.49171 -12.5,0.0937 0.8997,-1.44553 -25.5764,-6.26261 -36.1563,-14.28125 -0.5228,-0.0418 -1.5919,5.38865 0.2187,8.46875 1.3491,2.293 5.9972,5.94915 8.3438,7.59375 4.003,2.8057 10.8918,6.3046 9.5625,8.1875 -0.8848,1.2532 -4.4257,0.48185 -5.5625,0.34375 -2.9929,-0.3637 -9.2037,-3.8589 -11.0312,-2.1875 -1.0029,0.916 0.9855,2.89025 4.75,4.90625 5.7951,3.1042 13.9681,2.2908 13.625,6.3125 -0.5368,3.2955 -20.3403,-2.62386 -24.3126,-0.3125 -7.836,5.59302 14.6676,19.28865 26.5626,18.1875 5.1964,-0.6092 17.5086,6.38957 21.75,8.875 -4.6087,3.2023 -2.9096,7.10735 -4.875,11.34375 -8.2222,4.43693 -45.2546,-19.91987 -43.1876,-16.875 -3.2161,10.27167 36.3226,30.77111 41.4688,28.625 1.141,2.8862 1.2769,-1.17299 -0.4062,4.40625 -6.5752,-1.05716 -13.117,-2.11529 -16.25,-2.90625 -4.5074,-1.4986 -8.5268,-4.15815 -13.0938,-5.34375 -2.3557,-1.2648 -5.1282,-2.08785 -7.7188,-3.71875 -2.8232,-0.8727 -6.9275,-5.28245 -9.75,-6.40625 2.5082,5.0732 8.659,8.2636 12.3126,12.0625 3.8769,3.2414 10.9809,8.6848 15.4062,10.125 2.5661,1.7417 10.7541,5.7397 11.0938,7.0625 0.1889,0.7379 -9.0994,-1.14305 -10.0938,1.21875 -14.0652,-2.09745 -28.1223,-6.73238 -42.1875,-10.09375 -11.0879,9.65217 52.3646,28.23675 51.6563,28.59375 -4.5245,0.0855 -8.8704,-1.06396 -13.3126,-0.0312 -11.1646,-2.50865 -12.3354,-4.4113 -15.6562,-4.125 -1.0855,0.5033 20.7977,14.28005 20.1562,14.78125 -0.9354,0.7315 -23.2621,-6.30153 -21.5312,-2.8125 3.4636,5.95753 24.1459,13.62935 4.7812,12.84375 -2.096,1.239 -6.3087,-3.0795 -8.5312,-1.875 -1.9743,0.5644 -15.2474,-7.15115 -16.5312,-6.03125 -0.7058,3.3851 34.2969,20.66372 37.2812,22.5625 23.0664,14.67633 -46.5323,-14.0011 -48.0625,-5.53125 -0.2517,13.69981 31.6152,18.02002 47.2187,26.3125 -0.8242,1.75599 -1.0338,0.14147 -1.9687,1.84375 -9.0943,0.12053 -16.7646,1.11772 -17.4687,2.96875 -0.7394,1.94478 3.4212,4.3448 10.4687,8.03125 -1.4021,1.91171 -2.8576,3.75887 -4.375,5.5625 -5.6093,2.4302 -24.2258,5.96534 -26.625,4.90625 1.2543,5.38431 20.9079,8.55875 18.0937,13.09375 -3.8315,4.49177 -47.6497,-0.45829 -49.9062,4.9375 -5.0429,5.80905 30.2314,21.06745 25.25,26.93755 -7.4389,7.9719 -50.1747,-5.7161 -60.125,-1.1876 -4.5932,1.8769 22.2301,18.7671 26.3125,23 8.5249,8.2401 2.4866,12.4481 -11.4375,11.2813 -6.8367,-0.6352 -9.9142,-5.0621 -26.875,-2.5313 -1.8513,0.5399 -20.8812,-19.7048 -23.3125,-19.4374 -7.8732,0.8656 18.0932,29.0138 6.3125,29.5312 -2.9942,-0.6435 -14.6562,-16.2663 -18.5312,-16.2812 -2.4013,-0.01 -1.4062,7.5671 -3.1563,8.4687 -3.3137,1.7071 -13.4837,-9.0589 -13.6875,-9.0313 -7.4602,1.1134 -1.6903,10.7019 -9.0312,12.5313 -4.0707,0.948 -6.1459,-11.8868 -10.1876,-10.8125 -4.7346,1.2585 -11.4409,16.4015 -16.3124,17.0625 -20.2772,9.9196 13.7598,-22.5801 -4.4376,-26.9375 -4.1639,-0.9972 -16.5123,5.8466 -25.5312,6.625 -6.7521,0.8577 -7.781,-9.2742 -12.9688,-8.3125 -6.2215,1.1535 -17.7948,18.1746 -20.6562,14.6563 -17.0023,-20.908 -22.9561,15.0366 -35.9375,14.8437 -5.4693,-0.2779 2.8843,-14.0738 -3.8437,-13.5937 -5.3344,0.3804 -25.8086,15.1711 -30.0938,14.375 -7.1498,-1.3289 -9.6451,-7.0926 -16.4375,-9.75 -5.224,-2.0441 13.8972,-18.407 8.5313,-20.0938 3.9193,-12.4676 -29.2152,0.6833 -43.3438,4.5 8.0797,-8.323 16.6145,-12.5349 -16.3125,-13.9375 -1.512,-2.0531 22.4581,-4.1848 32.1875,-16.3437 -15.4172,-1.121 -29.1012,3.8313 -38.9062,2.5937 -1.622,-2.6245 15.7581,-12.08848 14.1874,-14.34375 -1.1286,-1.62084 -21.846,1.73105 -23.75,1.28125 -7.8404,-1.85268 -16.0158,-2.63627 -2.9687,-7.6875 -2.7954,-6.44437 -7.1981,-12.31329 0.094,-18.65625 -11.3096,3.04159 -10.0568,-6.01888 -11,-7.65625 -1.6941,-3.80369 28.0245,-12.54918 26.625,-15.75 -1.0768,-2.46509 -26.6484,-0.57899 -34.25,-1.84375 -7.6005,-1.26476 21.9738,-8.27966 1.9063,-10.3125 -13.74,-1.39184 -17.764,-7.35332 -3.2187,-9.125 21.1964,-2.58194 -5.3831,10.05834 22.0937,1 9.3526,-2.21373 -22.1158,-6.7539 7.875,-9.3125 3.7555,-1.35503 24.0606,-22.36488 23.25,-25.75 -1.4761,-1.12 -15.6363,12.12688 -17.9063,11.5625 -2.5543,-1.20454 -12.4343,6.36406 -14.8437,5.125 -22.2538,0.78558 -3.1024,-9.18426 5.5,-12.84375 1.9892,-0.84628 -10.9874,-1.73733 -12.0625,-2.46875 -0.737,-0.50132 6.2152,-4.05919 4.9688,-4.5625 -3.8172,-0.28627 -8.1782,-0.084 -12.2188,-0.125 -5.1051,-1.03261 -10.3633,-0.57078 -15.5625,-0.65625 -0.8142,-0.35702 3.4543,-2.616 8.4063,-5.71875 -2.8243,-7.00577 -10.2682,1.08944 -13.2188,-5.875 5.8169,-3.387 17.6291,-2.95784 15.7188,-6.90625 -1.1433,-2.36173 -11.843,-0.48075 -11.625,-1.21875 0.3893,-1.3228 12.8633,-2.44586 15.8124,-4.1875 5.0854,-1.44023 13.2629,-6.88371 17.7188,-10.125 4.1988,-3.79884 8.2105,-9.86423 11.0938,-14.9375 -3.2437,1.12379 -7.9735,5.53358 -11.2188,6.40625 -2.9765,1.63094 -6.1677,2.45411 -8.875,3.71875 -5.2487,1.1856 -9.8524,3.84514 -15.0312,5.34375 -7.5473,1.65761 -32.0461,4.53592 -38.8438,5.96875 -2.1535,-5.62516 21.2876,-7.07797 14.7188,-12.03125 -0.5308,-3.79779 -33.7414,0.89923 0.8437,-12.21875 10.0228,-3.80159 4.2736,8.12811 10.75,5.71875 1.3494,-0.50203 39.7473,-17.24901 38.7813,-25.9375 1.4636,-3.34574 -38.0875,16.85797 -39.3438,15.125 -1.7247,-4.35601 17.1146,-11.23488 18.9688,-14.0625 1.3204,-2.01506 -3.5551,-1.33819 -7.8438,1 -1.2983,0.70786 -34.1851,11.4587 -34.625,10.1875 -1.761,-5.63167 7.724,-3.07611 7.2812,-8.9375 -18.748,2.14293 1.1716,-6.70804 4.7188,-7.625 2.4186,1.26142 5.9235,-0.70528 8.4688,-0.0937 3.3735,0.87854 7.221,0.9125 10.75,0.34375 4.4094,0.1811 8.721,-0.1286 13,-0.71875 3.1295,-0.53724 6.182,-1.02507 9.1874,-1.96875 3.0091,-0.94159 5.7891,-4.06624 8.2813,-6.1875 1.9054,-1.62179 -23.6336,3.38983 -24.25,0.0937 -0.3952,-4.0216 8.9944,-3.20842 15.6563,-6.3125 4.325,-2.01596 6.6203,-3.99031 5.4687,-4.90625 -2.1014,-1.67142 -9.2479,1.82386 -12.6875,2.1875 -1.3065,0.13812 -5.3582,0.9094 -6.375,-0.34375 -1.5277,-1.8828 6.3994,-5.38185 11,-8.1875 2.6967,-1.64455 8.0125,-5.30074 9.5625,-7.59375 2.0821,-3.08008 -0.9932,-4.72939 -1.5937,-4.6875 -3.0845,2.36276 -34.702,18.54302 -39.875,17.59375 -2.1724,0.68323 -12.944,-0.42681 -17.5313,0.125 -1.5782,-5.33797 20.6119,-4.63177 18.2187,-7 -1.1384,-1.12758 -14.5241,0.34574 -15.0312,-2.15625 -1.0899,-2.85764 4.3813,-1.91881 11.75,-4 5.3724,-1.51741 14.5285,-8.75944 14.4062,-9.3125 -0.317,-1.43738 -22.9399,6.32167 -30.9062,6.03125 -2.8979,-0.10564 -0.7874,-2.11079 -0.875,-2.53125 8.1398,-1.55023 15.1351,-1.77097 20.4375,-3.4375 6.4844,-2.03808 36.1822,-18.49942 37.25,-26.71875 0.4952,-1.60482 -16.5794,10.91102 -34.3125,18.125 -8.8148,3.58592 -18.3217,4.20899 -24.875,4.40625 -0.318,-2.15522 -0.7306,-2.98228 -0.3438,-5.125 0.3652,-2.0144 21.4794,-5.534 18.8438,-6.46875 -7.5153,-2.66538 -21.1938,1.35181 -22.5938,-4.40625 5.4937,0.3271 19.3727,-2.48497 22.4688,-2.46875 3.7882,-0.009 7.5415,0.005 11.1875,-0.84375 3.548,-0.69252 7.0434,-1.74377 10.1563,-3.625 1.7826,-0.34434 6.2427,-2.21978 8.8124,-3.71875 2.4105,-2.85618 9.9582,-7.93106 9.2813,-11.625 -0.4182,-2.28204 -9.9308,4.25458 -12.6875,4.875 -3.8311,0.17015 -7.271,2.62053 -11.125,2.90625 -3.4173,0.29244 -6.6042,1.26007 -9.7188,2.53125 -3.1757,0.83516 -7.6917,1.33297 -10.8124,2.71875 -2.0223,0.68328 -13.2098,1.10441 -18.5,2.09375 0.1603,-0.95523 -1.451,-6.0663 0.8124,-9.5 1.444,-2.18857 5.2306,-2.4451 9.5626,-4.5625 -4.5462,-0.44169 -12.2784,-0.007 -11.9688,-2.5 0.621,-5.00037 -0.7941,-6.09588 2.4375,-9.59375 1.9814,-2.14455 20.0648,-2.18449 29.1563,-6.1875 4.321,-1.90289 11.8981,-4.89688 11.5312,-8.25 -2.2572,-1.17118 -34.8736,9.85968 -39.4062,6.25 -1.6703,-1.32998 -5.4131,-9.65144 -1.5626,-9.5 4.7212,0.18563 17.8823,0.57254 24.4376,-1.03125 3.0125,-0.73726 19.9441,-3.90915 18.8437,-10 -0.2429,-0.96303 -17.5125,4.07541 -20.6563,3.28125 -0.8197,-0.20714 -21.8747,2.65237 -21.7187,2.125 1.5863,-5.36432 -4.5928,-11.88396 -5.625,-17.34375 z m 455.5,299.46875 c -0.05,-0.21568 -0.074,-0.43323 -0.062,-0.65625 -0.2916,0.30072 -0.2449,0.51989 0.062,0.65625 z m -2048,0 c -0.05,-0.21568 -0.0745,-0.43323 -0.0625,-0.65625 -0.2916,0.30072 -0.2449,0.51989 0.0625,0.65625 z m 61.53125,-294.8125 c -2.5734,0.688 -3.1612,2.3433 -2.1875,5.3125 1.0428,1.8943 2.24955,3.3223 4.03125,4.4375 2.6368,1.1949 5.61675,1.5117 8.65625,1.3125 2.7264,-0.0793 5.89635,1.01045 7.34375,0.21875 1.7455,-0.9141 2.7401,-3.1135 -0.375,-3.1875 -3.0552,-0.2438 -6.0113,-0.9121 -8.9375,-1.75 -3.1667,-1.4358 -6.53185,-2.94525 -8.53125,-6.34375 z m 2048.00005,0 c -2.5734,0.688 -3.1613,2.3433 -2.1876,5.3125 1.0428,1.8943 2.2496,3.3223 4.0313,4.4375 2.6368,1.1949 5.6167,1.5117 8.6563,1.3125 2.7264,-0.0793 5.8963,1.01045 7.3437,0.21875 1.7455,-0.9141 2.7401,-3.1135 -0.375,-3.1875 -3.0552,-0.2438 -6.0113,-0.9121 -8.9375,-1.75 -3.1667,-1.4358 -6.5319,-2.94525 -8.5312,-6.34375 z m -1602.75005,5.125 c -1.41474,1.8794 -3.11501,3.98135 0.125,3.84375 3.03432,0.962 6.38885,2.851 9.5,1.0625 3.15039,-1.9173 0.77073,-4.4524 -1.84375,-4.5 -2.56627,-0.3226 -5.24613,0.30065 -7.78125,-0.40625 z m 40.46875,6.78125 c -4.18689,0.1052 -12.89803,2.4659 -13.46875,2.4375 -16.00813,1.68823 2.65243,3.98243 4.625,10.40625 -0.37163,3.4695 -9.47514,5.53925 -7.375,6.65625 2.7329,-0.1756 14.3105,-2.56955 16.96875,-3.21875 1.88731,-0.9888 4.62889,-0.5143 4.34375,-3.5625 -0.81696,-2.7399 -0.89672,-5.44365 -2.5625,-7.78125 -0.58916,1.1544 -1.17518,1.8689 -2.375,1.625 -0.62441,0.027 -0.14465,-0.1787 -2.28125,-0.375 -11.29802,-1.0382 3.88796,-1.9144 4.3125,-5.375 0.0783,-0.6368 -0.7919,-0.8476 -2.1875,-0.8125 z m 1020.5625,24.875 c -2.6641,0.4058 -5.2287,2.18908 -7.1562,2.9375 -0.9866,0.16426 -1.6024,2.42094 -3.25,2.9375 -1.606,0.67077 -4.0271,0.76851 -7.1876,1.40625 -3.1594,0.63773 -11.0184,-2.70457 -14.1562,-0.40625 -2.3796,1.74294 14.0615,7.65362 16.5938,7.96875 4.1639,0.34151 11.4931,2.45836 15.5,1.125 3.3232,-0.67533 3.4354,-8.57193 3.875,-11.28125 0.2047,-2.64207 -1.8761,-4.89745 -4.2188,-4.6875 z M -39.59375,718.1875 c -1.8777,0.0845 -3.44825,2.24178 -3.28125,4.71875 0.3822,2.7093 0.483,10.60585 3.375,11.28125 3.4861,1.3333 9.84465,-0.7835 13.46875,-1.125 2.2018,-0.3152 16.5082,-6.22595 14.4375,-7.96875 -2.047425,-1.72373 -6.415366,-0.282 -9.625,0.28125 -0.534938,0.0939 -1.013477,0.16163 -1.46875,0.1875 -0.455269,0.0259 -0.875138,0.0172 -1.21875,-0.0625 -2.75,-0.6377 -4.8529,-0.73545 -6.25,-1.40625 -1.4348,-0.5165 -1.98565,-2.7732 -2.84375,-2.9375 -1.6776,-0.7483 -3.89975,-2.5318 -6.21875,-2.9375 -0.1268,-0.0131 -0.2495,-0.0371 -0.375,-0.0312 z m 2047.99995,0 c -1.8777,0.0845 -3.4482,2.24178 -3.2812,4.71875 0.3822,2.7093 0.483,10.60585 3.375,11.28125 3.4861,1.3333 9.8447,-0.7835 13.4688,-1.125 2.2018,-0.3152 16.5081,-6.22595 14.4374,-7.96875 -2.7299,-2.2983 -9.5635,1.04395 -12.3124,0.40625 -2.75,-0.6377 -4.853,-0.73545 -6.25,-1.40625 -1.4348,-0.5165 -1.9857,-2.7732 -2.8438,-2.9375 -1.6776,-0.7483 -3.8997,-2.5318 -6.2188,-2.9375 -0.1268,-0.0131 -0.2494,-0.0371 -0.375,-0.0312 z m -631.5,30.9375 c -9.3608,2.50107 -9.8731,12.77794 -0.5624,10.53125 4.8839,-0.0819 11.854,3.55589 15.5,-2.125 2.7923,-2.13185 6.4831,-8.88286 0.031,-7.78125 -4.9249,-0.55972 -10.2659,0.54452 -14.9688,-0.625 z m -617.56245,13.84375 c -1.8548,-0.0351 -3.04158,0.1757 -2.9375,0.8125 0.56422,3.4606 20.76544,4.3368 5.75,5.375 -2.83961,0.1963 -2.2014,0.402 -3.03125,0.375 -1.5946,0.2439 -2.40448,-0.4706 -3.1875,-1.625 -2.21387,2.3376 -2.28923,5.04135 -3.375,7.78125 -0.37896,3.0482 3.27295,2.5737 5.78125,3.5625 3.53289,0.6492 7.27413,0.1994 10.90625,0.375 2.79116,-1.117 7.11891,-1.4055 6.625,-4.875 0.78244,-2.7097 5.56995,-3.6149 6.03125,-3.75 -0.10789,0.005 -0.36736,-0.003 -0.78125,0.0312 -8.47524,-3.6446 13.66712,-6.2831 -3.875,-5.625 -0.7585,0.0284 -12.34174,-2.3323 -17.90625,-2.4375 z M 806.1875,764.5 c -3.36926,0.7069 -6.93309,0.0837 -10.34375,0.40625 -3.47473,0.0476 -6.62447,2.5827 -2.4375,4.5 4.13482,1.7885 8.56105,-0.1005 12.59375,-1.0625 4.30608,0.1376 2.06774,-1.96435 0.1875,-3.84375 z m 7.46875,8.71875 c -6.5144,0.7196 -11.59296,2.4841 -18.1875,2.8125 -6.71874,0.0486 -23.41334,1.0414 -4.6875,3.625 8.659,-0.1901 14.08013,0.1733 22.34375,-1.5 8.10819,-1.6417 -0.21777,-2.5648 0.53125,-4.9375 z m -18.5,14.90625 c -3.08073,1.2756 -9.24452,1.6231 -6.1875,7 0.99696,2.2065 5.45807,5.92175 9.25,7.46875 4.58756,0.9564 9.86233,0.19865 13.5,-1.03125 4.41305,-2.3583 7.69942,-1.1699 10.03125,-4.9375 -2.77138,0.4054 -7.17419,-2.56195 -9.78125,-2.96875 -2.18762,-0.6449 -4.44266,-0.8775 -6.71875,-0.9375 -3.79344,-0.0992 -6.36577,-4.68975 -10.09375,-4.59375 z m -46,10.25 c -4.90962,-0.002 -9.22636,0.9062 -12.46875,3.3125 -0.59695,0.8348 12.42039,6.56735 21.625,8.03125 20.79551,3.55655 42.07605,-1.9567 38.28125,-2.21875 -12.59978,-0.87008 -32.70864,-9.1191 -47.4375,-9.125 z m -18.5,18.21875 -4.1875,3.34375 c 1.38575,1.8943 6.06913,2.29105 8.4375,3.40625 3.50398,1.1949 6.89844,2.10545 10.9375,1.90625 3.62402,-0.0793 19.79457,-0.0208 21.71875,-0.8125 2.31922,-0.9141 3.63979,-3.1135 -0.5,-3.1875 -4.0608,-0.2438 -20.20444,0.55665 -24.09375,-0.28125 -4.20813,-1.4358 -9.65479,-0.9765 -12.3125,-4.375 z m 111.75,35.84375 c -8.90019,0.20743 -38.71051,3.01124 -41.40625,2.65625 -2.72854,0.29446 5.82291,2.60916 5.9375,4.6875 0.5079,2.7093 0.62524,10.60585 4.46875,11.28125 4.63312,1.3333 13.12213,-0.7835 17.9375,-1.125 2.92727,-0.3152 21.93934,-6.22595 19.1875,-7.96875 -3.62865,-2.2983 -12.72068,1.04395 -16.375,0.40625 -3.65443,-0.6377 -6.45527,-0.73545 -8.3125,-1.40625 -1.90603,-0.5165 21.53471,-4.25166 20.96875,-8.4375 -0.2787,-0.0935 -1.13479,-0.12363 -2.40625,-0.0937 z m -86.5625,1.3125 c -5.43823,1.1695 -11.6172,0.0653 -17.3125,0.625 -7.46001,-1.1016 -3.19801,5.64935 0.0312,7.78125 4.21565,5.6809 12.28869,2.043 17.9375,2.125 10.76717,2.2467 10.16944,-8.03015 -0.65625,-10.53125 z m 340.21875,18.96875 c -1.8001,0.0399 -3.6575,0.55736 -5.4375,3.65625 3.6232,0.3414 10.0139,2.4583 13.5,1.125 2.892,-0.6754 -2.5566,-4.67941 -6.2812,-4.75 -0.5776,-0.0109 -1.1813,-0.0445 -1.7813,-0.0312 z m -7.9375,25.84375 c -2.8138,0.71349 -5.2259,3.4931 0.25,5.21875 3.0343,0.962 12.2321,6.2885 15.3438,4.5 -8.9145,-3.52591 6.6055,-6.96687 -7.8438,-9.3125 -2.5663,-0.3226 -5.2149,0.30065 -7.75,-0.40625 z m -10.8438,9.78125 c 0.5637,2.3727 2.2116,4.20205 8.3126,5.84375 6.2172,1.6733 10.2659,1.3099 16.7812,1.5 14.0898,-2.5836 1.5234,-3.5764 -3.5312,-3.625 -4.962,-0.3284 -16.6608,-2.99915 -21.5626,-3.71875 z m 64.5313,38.375 c -1.9997,3.3985 -4.8646,3.34545 -8.0313,4.78125 -2.9263,0.8379 -5.9132,1.5062 -8.9687,1.75 -3.1149,0.074 -2.12,2.2734 -0.375,3.1875 1.4478,0.7917 4.6173,-0.29805 7.3437,-0.21875 3.0393,0.1992 5.4888,-0.27385 8.125,-1.46875 1.7821,-1.1152 2.9576,-1.4182 4,-3.3125 z"
+ style="color:#000000;fill:#0f1015;fill-opacity:0.24909745999999999;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccscccccccsscccccccccccccccccccccscccscscccscccccscsccccccccccccscccscccccccccccccscccscccccccccscsccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccscscccccccccsscccccscccccccccccccccccccccccccccccccccccsccccccsccccccccsccccccccccscccsccccccscccccccsccsccccccccccscsccssccccccccccccccccssccccccccccccccccccccccccccsccccccscscscccccccccccccsccscccccsccccscccccccccccccccsccccccccccscccccccccscsccccccsssccsccccccccscccsssscscccscscccccccccccccccccccccccccccccccccccscsccssscccccscccscsccccsccsccccccccscscccccccccccccsccscccccsccccccccccsccccccsccccccccccccccscscccccscscccccccccccccccsssccccccccccssscccccccscccccccccccccccccsccscccccscccscccccccssscscccccccssccscccsccccccccscssccccccscccccccccccsssccccccccccccccccccscsccsccccccccccscccssccccscccccccccccccccccccccccsccscscsccccccccccccccccccccscccccscscscccccccccccscsssccscscsccscccccccccsscccsccscsscsccccccccccccccccsscccscccscccssscccscccccccccccccccccsccccscccccsccsccscccscscccccccccccccccccccsccccccccccccccccccccccccccccccccccsccccccccccccccccccccccccccccccccscscccccccccccscccccccccccccccccsccccccccccccccsccccccccccscccccccccccccccccccsccccccccccccccccccccccccccccccccccscccccccccccccccccsccscccccccccccccccccccccssccccccccccccccccccccccsccccccccccccscccsssccccccscscscsccscccccccccccccsccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccsscccccccccccccccccccccccccccccccccccccccccccccccccccsccssccccccccccccccsccccccccscccscccccccccccccccccc" />
+ <path
+ sodipodi:nodetypes="cscscccsscccscccccccsccccsscsccccscccsccccsccccsscsscccscccccccccccccsccccccsccccsccssccczczccccsccccc"
+ inkscape:connector-curvature="0"
+ d="m 1530.829,877.28631 c -5.5744,4.98747 -22.284,19.05264 -29.7695,21.62662 -7.8921,2.71376 -26.7755,10.48929 -26.1738,11.66105 0.6016,1.17175 15.779,-1.28482 25.6748,-5.48604 9.8958,-4.20122 25.4998,-15.47288 31.731,-21.35891 z m -230.3138,8.25956 c 2.4567,1.67867 8.5796,5.36431 22.3282,11.26816 3.9832,1.71045 10.8305,6.54681 14.3946,7.98758 8.1916,3.3115 30.9475,8.45329 37.3995,9.96224 0.7654,0.17898 22.2732,2.2338 22.3738,1.45417 12.9373,-0.29219 -16.2395,-1.97289 -22.8456,-4.24916 -6.0031,-2.06841 -25.7665,-8.364 -31.6483,-10.50794 -3.1685,-1.15493 -19.1956,-11.50411 -23.6997,-13.4382 -13.4786,-5.78803 -12.6211,-5.68554 -14.9858,-7.30138 z m 9.5042,-19.07874 c 6.888,5.141 20.5088,12.26285 34.8625,15.63745 10.7842,1.87083 14.2566,4.34978 31.0475,5.28931 -7.6091,-2.68156 -20.1752,-7.45075 -34.1902,-10.73977 -5.281,-1.24156 -12.2621,-6.08404 -16.6126,-8.03719 -7.2689,-3.26338 -10.9789,-5.37348 -14.8615,-8.27132 z m 197.2242,-70.167 c -3.6553,8.08607 -11.6143,12.70556 -18.2749,17.46863 -8.4007,5.45621 -9.5802,5.98012 -16.0969,9.13111 -4.3524,2.10446 -15.6307,6.54983 -15.4092,7.36498 0.2215,0.81516 7.604,-1.16414 8.3873,-1.48045 8.4115,-2.24109 16.0362,-4.84964 24.6371,-10.43588 4.3005,-2.79312 9.0969,-7.40955 12.0442,-10.03602 2.9474,-2.62647 5.1435,-3.78924 5.8407,-6.10003 z m -174.4749,19.79359 c 6.888,5.14102 17.9089,9.82544 32.2626,13.20001 14.3537,3.37457 29.8778,5.79638 44.5938,4.86248 0.7855,-0.0489 8.9305,-0.48331 8.8814,-1.26883 -8.1197,-2.02927 -17.0653,-2.86837 -25.193,-3.72748 -9.435,-0.95494 -16.4254,-0.97324 -27.1885,-3.50365 -14.1047,-3.31603 -26.1,-8.63655 -32.3063,-13.26873 z m 181.2925,11.55827 c -20.1125,15.03955 -26.891,17.45933 -39.3113,20.74178 -0.8494,0.0988 -15.0624,3.72247 -14.8465,4.54994 0.2159,0.82746 11.1509,-0.61501 11.9404,-0.94371 12.127,-3.20495 22.0406,-2.81263 42.5265,-18.13128 z M 1358.149,722.59661 c 2.7537,3.26309 8.2375,4.99478 14.9384,8.04716 6.701,3.05238 12.9873,6.00248 20.3002,7.53121 5.7407,1.2001 17.4178,2.61035 17.4996,1.82488 0.082,-0.78547 -11.7299,-3.69918 -17.6748,-5.47486 -6.6167,-1.97636 -11.4348,-4.54871 -17.9,-7.4937 -6.4651,-2.94499 -13.2075,-7.36421 -15.3,-9.84372 z m 119.0293,-49.0528 c -8.7299,5.61802 -21.5942,9.72115 -27.5189,10.70307 -3.9898,0.66123 -13.8937,2.45827 -13.8528,3.24367 0.041,0.7854 12.9392,-0.32466 13.7246,-0.36555 10.6967,-0.63873 20.1407,-2.0368 29.4751,-8.04378 z m -22.1532,-65.58124 c -6.3425,4.06563 -18.0196,8.65903 -25.475,8.66238 -0.7925,-0.0112 -7.9806,0.38246 -8.9555,1.09377 -0.6403,0.46711 13.2004,0.57686 13.9929,0.56565 7.6526,0.0151 15.4845,-0.51196 22.6313,-5.59687 z m -75.1658,60.08426 c 12.111,8.01982 21.7453,10.42305 36.6719,9.74062 0.7854,-0.0327 11.9511,-0.005 11.9184,-0.79064 -0.033,-0.7854 -9.045,-1.91386 -12.5309,-1.84374 -12.1034,0.24343 -22.9996,-4.89342 -34.6562,-12.6124 z m 121.7594,91.0721 c -5.8288,6.49373 -14.3262,12.20952 -21.1875,15.65609 -7.9812,3.92676 -15.5557,7.52656 -20.6125,8.98125 -0.7609,0.21274 -14.5842,3.77974 -14.3714,4.54059 0.2127,0.76086 14.262,-0.76663 15.0215,-0.98436 5.4618,-1.56582 14.1636,-5.30276 22.25,-9.28125 7.2017,-3.77522 14.1891,-6.87818 20.1405,-12.6437 z M 1340,778.6875 c 2.7051,1.23919 13.8888,6.19279 28.4375,9.6875 13.903,3.33954 20.9834,4.3372 30.4753,4.90625 0.7847,0.047 19.8321,1.17284 19.7994,0.38744 -0.033,-0.7854 -13.841,-1.93581 -20.7369,-3.06245 -9.642,-1.57532 -13.9365,-2.87365 -27.5503,-6.14371 -14.2631,-3.42609 -25.9211,-9.49465 -28.525,-10.68746 z m 49.7188,-151.28125 c 7.2015,2.22439 12.4357,4.05557 18.6625,4.91251 6.2269,0.85693 18.4289,1.08356 18.4126,0.29704 -0.016,-0.78657 -12.1662,-2.35359 -15.4684,-3.05325 -3.9035,-0.82706 -6.3489,-1.80376 -10.6064,-3.02185 -3.1798,-0.85427 -6.6852,-2.30307 -9.7937,-3.20936 z m 55.5495,-41.26218 c -2.0722,-0.81702 -3.7474,0.76295 -4.7936,1.09374 -1.0462,0.33079 -4.2771,1.88281 -7.2781,1.94684 -0.7868,0.0142 -12.0108,2.40992 -11.9946,3.19664 0.016,0.78672 11.798,0.67478 12.5847,0.65598 2.6418,-0.67501 11.264,-0.7847 12.7156,-3.29374 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#3b3d4b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.11134505000000017;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;"
+ id="path4903" />
+ <path
+ sodipodi:nodetypes="cssccccccsscccccccsccccccccccccsccccccscsccccccccccccscscsccccscccccccscscsscccccccsccccccccscsccccccccsccccsccccccsccsccccccccczsccccczcccccsccccccccccccccccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4463"
+ d="m 1444.9375,589.53775 c -5.328,2.4941 -6.7419,2.87204 -10.6566,3.3757 -1.3632,0.17539 -8.2423,-0.68823 -12.5213,-0.13936 -1.3633,0.17486 11.306,2.43598 12.6483,2.14039 3.1765,0.16677 7.2105,0.2881 10.0232,-0.53294 1.1632,-0.36089 3.6636,-1.08044 4.6776,-2.18846 1.2333,-1.78838 -2.1159,-2.55292 -4.1712,-2.65533 z m 11.3312,24.23097 c -8.4262,3.07806 -13.3366,4.16359 -22.9738,4.63701 -1.309,0.0655 -13.8883,-0.99022 -13.8229,0.31881 0.065,1.309 13.9395,3.16659 15.2486,3.10214 9.7031,-0.47766 16.1678,-0.34172 25.2341,-3.65363 z m -68.6625,17.31254 c 2.6109,0.59696 5.6922,1.83143 7.8626,2.73124 2.1482,0.89065 4.6886,1.71138 8.0624,1.78125 0.035,7.2e-4 0.059,-5.6e-4 0.094,0 4.9714,0.24349 4.5042,-0.30825 9.6575,0.23199 1.3262,0.19174 10.8406,-0.42079 10.983,-1.75322 0.1425,-1.33243 -9.852,-1.37694 -11.1888,-1.4699 -8.7669,-0.15848 -15.1567,-2.92386 -23.645,-5.09635 z m 75.3783,-3.68702 c -1.3882,0.58569 -4.9448,1.66003 -7.178,2.27306 -3.8064,2.7434 -19.781,3.49658 -20.253,4.48276 0.033,1.30883 11.8266,1.51369 13.1356,1.48908 2.3143,-0.24621 6.0611,-0.60589 8.4362,-1.32669 1.0916,-0.93233 6.2929,-1.66995 7.7969,-2.29321 z m -81.2595,33.12452 c 11.1161,3.93155 24.233,11.07048 57.3062,6.88749 1.301,-0.1634 11.5576,-3.60839 11.3939,-4.90936 -0.1636,-1.30098 -10.4307,0.86828 -11.7316,1.03216 -32.2851,4.08333 -45.179,-4.70784 -56.9372,-8.86651 z m -0.8125,8.1999 -1.9062,2.78129 c 4.4251,2.81845 9.8006,5.02231 14.8063,6.40627 2.8497,0.99488 13.2979,3.29703 21.8445,3.15062 6.4849,-0.11108 11.944,-1.50881 11.7605,-2.78923 -0.253,-1.32427 -8.6778,-0.15208 -11.9462,-0.40257 -6.1047,-0.46786 -14.3131,-1.57075 -21.0777,-3.42136 -4.602,-1.6646 -8.8791,-4.06042 -13.4812,-5.72502 z m 96.6812,11.48133 c -5.8966,2.53659 -13.651,5.58774 -19.9312,6.11251 -0.9067,0.26773 -27.1204,1.52522 -27.5175,2.46568 9.1973,2.69176 21.3959,2.97874 27.73,2.50307 2.4059,-0.18722 4.8423,-0.72774 10.6562,-2.6875 l 0.063,-0.0312 0.094,-0.0312 c 3.6221,-1.49002 6.9749,-1.10539 10.5562,-3.46252 z M 1370.5312,695.125 c 0,0 8.6178,7.248 16.25,7.875 19.1165,1.57045 29.179,9.32445 65.7377,2.76873 1.2926,-0.22907 16.7766,-5.33467 16.5475,-6.6273 -0.229,-1.29263 -15.7852,2.49484 -17.0778,2.72393 -35.75,6.4107 -44.633,-2.20849 -64.8011,-3.86534 -5.8332,-0.4792 -13.5,-6.75 -13.5,-6.75 z m 124.2576,23.31878 c -6.1275,3.44725 -10.0837,6.18871 -16.2888,8.14997 -13.7489,3.15899 -11.6647,4.222 -22.0004,5.71885 -1.372,0.0823 -15.9221,4.72905 -15.7325,6.09043 0.1895,1.36138 15.0776,-0.85729 16.4199,-1.15293 13.5555,-1.74411 12.5587,-3.39997 22.5632,-5.81255 6.0027,-1.85652 10.8871,-4.98784 14.719,-7.1562 z m -135.32,4.24372 -3.0751,5.06871 c 2.3289,2.35031 6.0809,3.96647 10.2938,6.08754 4.2129,2.12107 9.4313,3.99106 15.1875,5.59375 11.5125,3.20538 15.4722,3.4657 24.0816,4.50627 1.3102,0.15836 14.6306,-0.54602 14.6224,-1.86572 -0.01,-1.31969 -17.0186,-2.45539 -18.318,-2.68623 -7.8339,-1.39171 -7.9834,-1.68781 -19.0419,-4.76682 -5.5293,-1.5395 -8.8719,-3.34464 -12.6564,-5.25 -3.7097,-1.51532 -7.831,-6.92862 -11.0936,-6.6875 z m 136.9748,10.10006 c -4.1734,4.03569 -8.258,7.88906 -13.0686,10.93119 l -0.062,0.0312 -0.031,0.0312 c -13.862,9.81617 -26.6222,17.81207 -44.9912,17.70523 -1.3195,-0.0249 -12.9001,-0.77547 -12.9083,0.54422 -0.01,1.3197 11.8826,2.35194 13.2023,2.34335 19.4727,0.11326 32.7621,-6.07526 47.4788,-16.4678 l 0,0.0312 c 5.0484,-3.19249 7.8104,-5.57579 12.0625,-9.6875 z m -117.6292,30.16385 c -1.309,0.0573 -15.5682,-4.9196 -15.5109,-3.6106 0.057,1.309 13.7682,7.03281 15.0403,7.34669 8.9671,2.21258 22.9592,5.83334 33.625,6.40625 19.6694,1.05653 30.1785,5.07279 49.4764,-2.31306 1.2688,-0.43717 12.4009,-5.58225 11.914,-6.83281 -0.4868,-1.25055 -11.1962,3.02205 -12.4266,3.55777 -18.0979,6.92663 -29.1629,1.63827 -48.7138,0.5881 -12.4397,-0.71008 -22.3682,-2.8527 -33.4044,-5.14234 z m 123.3236,3.05869 c -1.7644,1.11566 -7.3702,5.06205 -12.1068,7.98987 -4.7365,2.92782 -9.8549,5.04877 -11.0937,5.53128 l 0,0.0312 c -11.4196,4.45938 -15.6076,7.69327 -27.1943,8.2853 -1.3111,0.067 -15.5154,1.41956 -15.4172,2.72863 0.098,1.30907 15.0518,0.74472 16.3609,0.64642 16.9743,-1.28069 16.3802,-3.32163 27.9381,-6.97285 l 0.062,-0.0312 0.062,-0.0312 c 2.6151,-1.01854 7.694,-3.21669 12.4807,-6.17549 4.7868,-2.9588 8.9684,-5.52341 10.6755,-6.6029 z m -161.6692,13.02115 c -1.2162,-0.002 -2.3514,1.0088 -2.4891,2.21719 -0.1377,1.20838 0.7409,2.44902 1.9265,2.72031 11.2629,2.99113 22.362,9.04009 35.6563,10.65625 9.3562,1.13741 32.3611,5.25485 43.9222,0.61492 0.1554,-1.30094 -22.0017,-3.47214 -23.3027,-3.6274 -10.6264,-1.29398 -9.5391,-1.59942 -20.0506,-2.50458 -12.4145,-1.069 -24.4145,-6.9146 -34.9438,-9.98294 -0.2333,-0.0659 -0.4763,-0.0975 -0.7187,-0.0937 z m 166.7782,24.65337 c -5.8973,6.2956 -16.0623,15.09487 -21.2114,17.43296 -2.1791,1.29137 -14.1533,5.78941 -13.6039,7.02342 0.5494,1.234 13.8139,-2.54235 15.0189,-3.15272 7.257,-3.34645 16.4335,-5.01228 21.7936,-13.46867 z m -110.9144,29.09511 c -14.0018,-0.63473 -31.2238,-2.15234 -43.6993,-6.82153 -6.1041,-2.28458 -11.6774,-6.29008 -18.9352,-8.75297 -1.9997,1.11824 -4.1017,3.39054 -5.0023,5.40431 5.7997,2.54985 14.3548,6.63184 22.9168,8.59679 14.1263,3.59615 32.4173,4.78659 43.0438,4.78834 8.3677,-0.49373 32.4868,3.76439 41.4626,-5.77475 -23.3291,5.87988 -25.7845,3.19453 -39.7864,2.55981 z m 117.4735,1.5328 c -7.8434,5.33152 -15.7582,9.57933 -23.4293,12.31154 -21.4818,7.49346 -43.5008,7.05101 -66.9706,10.15718 -24.0522,3.4857 -43.0515,3.50815 -63.0445,-0.67077 -1.3008,-0.17182 -16.4289,-4.77476 -16.6007,-3.47394 15.6538,9.10912 30.4033,10.88813 45.3977,10.68591 11.232,-0.15147 22.6015,-1.41466 34.5914,-1.54125 l 0.1562,0 0.1563,-0.0312 c 23.0071,-3.04495 46.4481,-0.26545 69.2624,-8.38346 8.084,-2.97293 19.1183,-7.42836 24.6956,-11.66944 z m -206.3498,37.17494 c 8.7071,3.31429 16.2598,7.42194 25.6687,11.48128 16.5201,5.79359 34.8433,7.57646 51.0938,10.9687 16.3004,2.99575 30.3119,1.46822 46.2187,-0.0312 7.952,-0.7666 33.7056,-3.5494 32.3373,-8.06032 -0.4006,-0.94676 -23.5448,2.17514 -32.8373,3.09157 -15.1716,1.23482 -30.6543,2.95468 -44.6875,0.0937 -16.1013,-4.39046 -33.9647,-3.93981 -50.1562,-10.65625 -8.8167,-3.80382 -15.6862,-8.87592 -25.125,-12.46875 z m 224.5623,12.08133 c -5.3597,3.21819 -12.6443,8.30449 -16.0498,11.3687 -30.839,20.2752 -83.0957,22.11694 -115.688,21.2812 -22.0296,-3.83033 -59.1607,-7.55985 -73.974,-17.79369 -6.2959,-4.59464 -17.3021,-11.67545 -25.995,-14.06583 l -4.1562,7.03743 c 7.415,2.03899 19.3728,8.13288 25.8325,12.84709 21.6772,9.21565 55.8168,17.35168 78.2215,18.46877 39.1486,-8.86414 89.1166,4.44112 119.4492,-22.6773 3.5621,-3.20508 9.4762,-5.61277 14.2519,-8.4803 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#1f202b;fill-opacity:1;stroke:none;stroke-width:5.20267820000000025;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;fill-rule:nonzero" />
+ <path
+ transform="matrix(0.77060963,0,0,1,251.17862,-31.199024)"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#1f202b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.92665637999999984;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 1121.3432,911.48031 c -5.328,2.4941 -6.8165,1.66554 -10.7312,2.16924 -1.3632,0.1754 -10.7427,-0.82281 -15.0217,-0.27401 -1.3633,0.1749 13.3935,4.10207 14.7358,3.80647 3.1765,0.1668 7.8431,0.77558 10.6558,-0.0454 1.1632,-0.3609 5.9434,-2.05538 6.9574,-3.16348 1.2333,-1.7883 -4.5408,-2.3904 -6.5961,-2.4928 z m 11.2777,16.10455 c -8.4262,3.078 -6.9052,1.40119 -16.5424,1.87459 -1.309,0.065 -13.8883,-0.9902 -13.8229,0.3188 0.065,1.309 13.9395,3.1666 15.2486,3.1021 9.7031,-0.4776 9.631,1.03951 18.6973,-2.27239 z m -46.0952,19.63132 c 0.7692,0.5276 8.0546,0.38539 9.7515,0.55699 1.3262,0.1917 10.6297,-1.31452 10.7721,-2.64692 0.1425,-1.3325 -9.852,-1.377 -11.1888,-1.4699 -8.7669,-0.1585 -13.4698,-2.84265 -21.9581,-5.01515 -2.791,7.23539 5.8245,8.31427 12.6233,8.57498 z m 59.9253,10.17485 c -3.9604,4.21035 -22.6775,4.00315 -25.2809,6.48418 0.033,1.3088 12.2739,0.53704 13.5829,0.51244 4.5575,-0.59968 10.1033,-0.74756 13.8466,-2.20913 z m -78.2778,16.12321 c 11.1161,3.9316 20.5684,9.12873 53.6416,4.94573 1.301,-0.1634 11.5576,-3.6084 11.3939,-4.9094 -0.1636,-1.3009 -10.4307,0.8683 -11.7316,1.0322 -32.2851,4.0833 -39.4239,-1.0483 -51.1821,-5.207 z m -1.7358,8.20807 -1.9062,2.7813 c 4.4251,2.8185 6.3213,4.12858 11.327,5.51258 2.8497,0.9949 14.0359,3.21575 22.5825,3.06935 6.4849,-0.1111 11.944,-2.48377 11.7605,-3.76417 -0.253,-1.3243 -8.6778,0.0916 -11.9462,-0.15886 -6.1047,-0.4679 -14.3131,-1.81454 -21.0777,-3.66514 -4.602,-1.6646 -6.1378,-2.11046 -10.7399,-3.77506 z"
+ id="path5019"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssccccccssccccsccccccccccsccccccscsccc" />
+ <path
+ transform="matrix(0.76481263,0,0,1,850.41363,168.29908)"
+ id="path5027"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#3b3d4b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.55771088000000013;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 371.54273,750.87953 c -8.7299,5.618 -21.96979,7.94023 -27.89449,8.92213 -3.9898,0.6612 -13.59323,3.26251 -13.55233,4.04791 0.041,0.7854 12.63873,-0.6693 13.42413,-0.7102 10.6967,-0.6387 20.51629,-0.71544 29.85069,-6.72244 z m -15.39264,-28.18087 c -6.3425,4.06563 -12.08534,5.95885 -19.54074,5.9622 -0.7925,-0.0112 -7.9806,0.38246 -8.9555,1.09377 -0.6403,0.46711 13.2004,0.57686 13.9929,0.56565 7.6526,0.0151 11.87887,0.63705 16.69704,-2.89669 z m -66.0015,59.22247 c 12.111,8.0199 18.51526,8.58468 33.44186,7.90228 0.7854,-0.033 11.9511,0 11.9184,-0.7907 -0.033,-0.7854 -9.045,-1.9138 -12.5309,-1.8437 -12.1034,0.2434 -19.76956,-3.05498 -31.42616,-10.77398 z m 6.62946,-42.47897 c 7.2015,2.22439 12.4357,4.05557 18.6625,4.91251 6.2269,0.85693 18.4289,1.08356 18.4126,0.29704 -0.016,-0.78657 -12.1662,-2.35359 -15.4684,-3.05325 -3.9035,-0.82706 -6.3489,-1.80376 -10.6064,-3.02185 -3.1798,-0.85427 -6.2345,-2.87758 -9.343,-3.78387 z m 52.89749,-31.34829 c -6.02747,4.84606 -15.82183,2.52344 -22.47049,5.91054 0.016,0.78672 13.53,1.29744 14.2909,1.14346 2.69267,-0.5449 9.17451,-0.36571 10.62611,-2.87475 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscccccccccccccsccczczcccccscc" />
+ <path
+ transform="matrix(-1.2977566,0,0,1,1770.2072,-265.42827)"
+ sodipodi:nodetypes="cssccccccsscccccccccccccccsccccccscscccccccccscscscccssczzccccscscssccccccccsccc"
+ inkscape:connector-curvature="0"
+ id="path5017"
+ d="m 782.85863,1051.947 c -5.328,2.4941 -6.7419,2.872 -10.6566,3.3757 -1.3632,0.1754 -16.4549,-3.1517 -13.0088,0.1856 4.21462,4.0816 11.39454,3.8148 12.73684,3.5192 3.1765,0.1668 7.12196,-1.0907 9.93466,-1.9117 1.1632,-0.3609 4.151,-1.5679 5.165,-2.676 1.2333,-1.7883 -2.1158,-2.3904 -4.1711,-2.4928 z m 12.69567,8.2291 c -8.4262,3.078 -17.05521,9.449 -26.69241,9.9224 -1.309,0.065 -14.33099,1.3079 -14.26559,2.6169 0.065,1.309 14.38219,0.8685 15.69129,0.804 9.7031,-0.4776 17.85003,-3.6738 26.91633,-6.9857 z m -77.87049,15.9337 c 3.90239,2.5634 26.31383,8.0017 32.76382,2.6466 -12.02321,0.4045 -21.45215,-3.5872 -31.1152,-6.2216 z m 84.23214,3.7816 c -1.3882,0.5857 -4.9448,1.66 -7.178,2.2731 -3.8064,2.7434 -19.781,3.4965 -20.253,4.4827 0.033,1.3088 11.8266,1.5137 13.1356,1.4891 2.3143,-0.2462 6.0611,-0.6059 8.4362,-1.3267 1.0916,-0.9323 6.2929,-1.6699 7.7969,-2.2932 z m -102.33164,33.699 c 11.1161,3.9316 26.535,11.5301 59.6082,7.3471 1.301,-0.1634 11.5576,-3.6084 11.3939,-4.9094 -0.1636,-1.3009 -10.4307,0.8683 -11.7316,1.0322 -32.2851,4.0833 -45.179,-4.7078 -56.9372,-8.8665 z m -4.53111,17.392 -1.9062,2.7813 c 4.4251,2.8185 9.8006,5.0223 14.8063,6.4063 2.8497,0.9949 13.2979,3.297 21.8445,3.1506 6.4849,-0.1111 11.944,-1.5088 11.7605,-2.7892 -0.253,-1.3243 -8.6778,-0.1521 -11.9462,-0.4026 -6.1047,-0.4679 -14.3131,-1.5708 -21.0777,-3.4214 -4.602,-1.6646 -8.8791,-4.0604 -13.4812,-5.725 z m 125.10202,-1.6174 c -5.8966,2.5366 -13.73954,6.8517 -20.01974,7.3765 -0.9067,0.2677 -32.25562,7.3851 -32.65272,8.3255 9.1973,2.6918 26.79674,-2.0768 33.13084,-2.5525 7.53668,-2.6238 13.89992,-2.2712 21.10378,-6.6717 z m -137.5197,25.9556 c 0,0 7.28972,6.4437 14.92192,7.0707 19.1165,1.5704 29.179,9.3244 65.7377,2.7687 1.2926,-0.2291 16.7766,-5.3347 16.5475,-6.6273 -0.229,-1.2926 -15.7852,2.4948 -17.0778,2.7239 -35.75,6.4107 -44.633,-2.2085 -64.8011,-3.8653 -5.8332,-0.4792 -13.5,-6.75 -13.5,-6.75 z m 147.72027,4.4749 c -6.1275,3.4473 -10.52114,7.615 -16.55442,10.3331 -11.21762,5.0538 -13.08131,6.0604 -22.17747,8.0169 -1.35497,0.2915 -15.65649,2.5459 -15.46689,3.9073 0.1895,1.3614 9.52689,1.8498 16.15429,1.0302 6.6274,-0.8195 16.00222,-4.3483 23.09443,-7.3063 7.09221,-2.958 15.57963,-7.9752 19.41153,-10.1436 z m -160.81905,12.9763 -4.13756,5.0687 c 2.3289,2.3503 7.14336,3.9664 11.35626,6.0875 4.2129,2.1211 9.4313,3.9911 15.1875,5.5938 11.5125,3.2053 15.4722,3.4657 24.0816,4.5062 1.3102,0.1584 14.6306,-0.546 14.6224,-1.8657 -0.01,-1.3197 -17.0186,-2.4554 -18.318,-2.6862 -7.8339,-1.3917 -7.9834,-1.6878 -19.0419,-4.7668 -5.5293,-1.5395 -8.8719,-3.3447 -12.6564,-5.25 -3.7097,-1.5154 -7.831,-6.9287 -11.0936,-6.6875 z m -22.71861,29.9164 c -1.2162,0 -2.3514,1.0088 -2.4891,2.2172 -0.1377,1.2084 0.7409,2.449 1.9265,2.7203 11.2629,2.9911 22.362,9.0401 35.6563,10.6563 20.58882,3.4844 87.54445,3.0744 58.24831,0.7792 -10.6264,-1.294 -47.16791,-5.3911 -57.67941,-6.2963 -12.4145,-1.069 -24.4145,-6.9146 -34.9438,-9.9829 2.95408,-8.7985 -0.4763,-0.098 -0.7187,-0.094 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#1f202b;fill-opacity:1;stroke:none;stroke-width:4.56699295000000038;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;fill-rule:nonzero;" />
+ <path
+ sodipodi:nodetypes="csscsscccscscccccccccccscccsccssccczcscccsccccc"
+ inkscape:connector-curvature="0"
+ d="m 240.91589,832.90899 c 2.7537,3.2631 10.09255,6.25871 16.79345,9.31111 6.701,3.0523 13.16397,5.08319 20.47687,6.61199 5.7407,1.2001 17.4178,2.6103 17.4996,1.8249 0.082,-0.7855 -11.7299,-3.6992 -17.6748,-5.4749 -6.6167,-1.9764 -11.4348,-4.5487 -17.9,-7.4937 -6.4651,-2.945 -13.2075,-7.3642 -15.3,-9.8437 z m 147.56178,-48.823 c -8.7299,5.618 -20.6225,10.98512 -26.5472,11.96702 -3.9898,0.6612 -17.16213,4.75622 -17.12123,5.54162 0.041,0.7854 15.33807,-2.0375 16.72802,-2.31882 10.58063,-2.14152 19.43401,-3.64542 28.76841,-9.65242 z m -24.44993,-68.68356 c -6.3425,4.06563 -17.31291,10.95706 -24.76831,10.96041 -0.7925,-0.0112 -9.30564,2.79538 -10.28054,3.50669 -0.6403,0.46711 13.02372,-1.03176 13.81622,-1.04297 7.6526,0.0151 16.27953,-3.61429 23.42633,-8.6992 z m -90.53624,52.96035 c 12.111,8.0199 21.7453,10.4231 36.6719,9.7407 0.7854,-0.033 11.9511,0 11.9184,-0.7907 -0.033,-0.7854 -9.045,-1.9138 -12.5309,-1.8437 -12.1034,0.2434 -22.9996,-4.8934 -34.6562,-12.6124 z m -53.99305,93.40551 c 2.7051,1.2392 13.8888,6.1928 28.4375,9.6875 13.903,3.3395 20.9834,4.3372 30.4753,4.9062 0.7847,0.047 19.8321,1.1729 19.7994,0.3875 -0.033,-0.7854 -13.841,-1.9358 -20.7369,-3.0625 -9.642,-1.5753 -13.9365,-2.8736 -27.5503,-6.1437 -14.2631,-3.4261 -25.9211,-9.4946 -28.525,-10.6874 z m 70.12439,-130.71392 c 7.2015,2.22439 9.43228,4.63007 15.65908,5.48701 6.2269,0.85693 14.63046,1.65807 14.61416,0.87155 -0.016,-0.78657 -12.85694,-3.87101 -16.08675,-5.00657 -6.28139,-2.20845 -6.02817,-3.36648 -12.97989,-5.4269 z m 69.35504,-27.8438 c -0.041,0.0767 -1.7975,1.90041 -2.8437,2.2312 -1.0462,0.33079 -4.2771,1.88281 -7.2781,1.94684 -0.7868,0.0142 -13.717,1.92244 -13.7008,2.70916 0.016,0.78672 13.5042,1.16226 14.2909,1.14346 2.6418,-0.67501 10.4515,-0.82532 11.9031,-3.33436 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#3b3d4b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.72806280999999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ id="path5025"
+ transform="matrix(-1.3007314,0,0,1,1213.3496,75.375224)" />
+ <path
+ transform="matrix(0.88834126,0,0,1,33.188806,5.1998373)"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#1f202b;fill-opacity:1;stroke:none;stroke-width:5.51997420000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;fill-rule:nonzero;"
+ d="m 405.60182,725.58761 c -8.4262,3.078 -11.65513,6.80633 -21.29233,7.27973 -1.309,0.065 -13.24159,1.65253 -13.17619,2.96153 0.065,1.309 13.29279,0.52387 14.60189,0.45937 9.7031,-0.4776 9.73042,-1.76572 18.79672,-5.07762 z m -95.85604,-5.09085 c 8.03643,1.9839 25.98384,6.35791 31.87378,2.41679 -12.59973,-1.70909 -19.32268,-3.80699 -29.91874,-6.5663 z m 97.65678,30.09157 c -0.86028,1.4064 -11.00198,8.68281 -18.56023,9.28207 -7.55826,0.59926 -20.55707,2.922 -21.02907,3.9082 0.033,1.3088 11.8266,1.5137 13.1356,1.4891 2.3143,-0.2462 6.83717,-0.72079 9.21227,-1.44159 1.3513,0.45191 15.53398,-5.15416 16.98029,-6.08495 z M 292.12569,771.9929 c 6.2582,3.58811 6.21629,8.53193 42.173,13.89648 1.301,-0.1634 14.01513,0.75785 13.85143,-0.54315 -0.1636,-1.3009 -12.88823,-3.49795 -14.18913,-3.33405 -27.04671,-3.50921 -31.50352,-11.33956 -40.51056,-16.22018 z m -11.28932,21.52845 -1.77686,4.27502 c 4.4251,2.8185 9.92995,4.67759 14.93565,6.06159 5.59943,2.0212 32.73353,8.28822 32.82894,3.57864 -10.84278,-0.45714 -22.43586,-4.41777 -32.24784,-7.04124 -4.602,-1.6646 -9.13779,-5.20941 -13.73989,-6.87401 z m 130.56922,-6.2135 c -5.8966,2.5366 -13.52166,6.50701 -19.80186,7.03181 -0.9067,0.2677 -27.37908,4.97224 -27.77618,5.91264 9.1973,2.6918 21.65458,-0.46824 27.98868,-0.94394 2.4059,-0.1872 4.71296,-1.64691 10.52686,-3.60671 l 0.063,-0.031 0.094,-0.031 c 3.6221,-1.49 6.9749,-1.1054 10.5562,-3.4625 z m -144.96017,39.05437 c 17.63839,12.57623 39.93504,15.87919 57.02438,15.35466 1.2926,-0.2291 16.25923,-0.39395 16.03013,-1.68655 -0.229,-1.2926 -15.26783,-2.44595 -16.56043,-2.21685 -27.17098,-2.77514 -36.85507,-3.37632 -55.92465,-16.59017 z M 415.8226,814.46455 c -6.1275,3.4473 -10.0837,6.1887 -16.2888,8.15 -13.7489,3.159 -11.6647,4.222 -22.0004,5.7189 -1.372,0.082 -15.9221,4.729 -15.7325,6.0904 0.1895,1.3614 15.0776,-0.8573 16.4199,-1.1529 13.5555,-1.7442 12.5587,-3.4 22.5632,-5.8126 6.0027,-1.8565 10.8871,-4.9878 14.719,-7.1562 z m -150.86816,21.30577 -3.0751,5.0687 c 2.3289,2.3503 6.0809,3.9664 10.2938,6.0875 4.2129,2.1211 9.4313,3.9911 15.1875,5.5938 11.5125,3.2053 15.4722,3.4657 24.0816,4.5062 1.3102,0.1584 14.6306,-0.546 14.6224,-1.8657 -0.01,-1.3197 -17.0186,-2.4554 -18.318,-2.6862 -7.8339,-1.3917 -7.9834,-1.6878 -19.0419,-4.7668 -5.5293,-1.5395 -8.8719,-3.3447 -12.6564,-5.25 -3.7097,-1.5154 -7.831,-6.9287 -11.0936,-6.6875 z m 149.18872,8.11401 c -13.67011,13.24057 -40.36244,25.82344 -56.099,25.97204 -1.3195,-0.025 -12.9001,-0.7754 -12.9083,0.5443 -0.01,1.3197 11.8826,2.3519 13.2023,2.3433 21.43602,-0.64717 23.92969,0.19474 35.59284,-7.56013 5.0484,-3.1925 17.71182,-9.70308 21.96392,-13.81478 z m -130.31372,35.88599 c 8.9671,2.2125 22.9592,6.63761 33.625,7.21051 19.6694,1.0565 30.30784,4.9579 49.60574,-2.428 1.2688,-0.4371 12.27156,-6.27161 11.78466,-7.52221 -0.4868,-1.2505 -11.1962,3.0221 -12.4266,3.5578 -18.0979,6.9266 -29.24618,3.767 -48.7138,1.85201 -11.61298,-1.14234 -18.07043,-1.44693 -33.875,-2.67011 z m 149.22001,12.97217 c -1.7644,1.1156 -7.3702,5.062 -12.1068,7.9898 -4.7365,2.9278 -9.8549,5.0488 -11.0937,5.5313 l 0,0.031 c -3.35503,12.85055 -33.72123,13.31334 -41.18872,16.18446 17.32835,5.44809 34.93383,-5.21686 44.94572,-8.50953 8.41432,-3.86834 13.7708,-10.8686 21.2107,-15.82783 z M 236.0791,890.84685 c 11.2629,2.9911 22.362,9.0401 35.6563,10.6563 9.3562,1.1374 32.3611,5.2548 43.9222,0.6149 0.1554,-1.301 -22.0017,-3.4722 -23.3027,-3.6274 -10.6264,-1.294 -9.5391,-1.5994 -20.0506,-2.5046 -12.4145,-1.069 -24.4145,-6.9146 -34.9438,-9.9829 -1.66217,0.16784 -1.11195,3.35657 -1.2814,4.8437 z m 204.9146,19.42077 c -5.8973,6.2956 -15.23916,12.98237 -20.38826,15.32047 -2.1791,1.2914 -14.1533,5.78936 -13.6039,7.02346 0.5494,1.234 13.8139,-2.5424 15.0189,-3.1528 7.257,-3.34636 16.4335,-5.01216 21.7936,-13.46856 z"
+ id="path5015"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccssccccccczcccccccsccccccccccccccccccccscccccscccccccscscssccccccccccccsccsccccccccccsccscccccccc" />
+ <path
+ transform="matrix(0.90746726,0,0,1,23.956015,2.7576302)"
+ id="path5023"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#3b3d4b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.26612419000000020;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 432.38834,888.02414 c -3.6553,8.0861 -11.6143,12.7056 -18.2749,17.4687 -8.4007,5.4562 -9.5802,5.9801 -16.0969,9.1311 -4.3524,2.1044 -15.6307,6.5498 -15.4092,7.365 0.2215,0.8151 9.12341,-0.58969 9.90671,-0.90599 8.4115,-2.2411 14.51679,-5.42411 23.11769,-11.01041 4.3005,-2.7931 9.0969,-7.4095 12.0442,-10.036 2.9474,-2.6265 5.1435,-3.7892 5.8407,-6.1 z m 8.96637,20.30225 c -12.23213,14.20844 -27.02859,20.14236 -41.76047,25.35422 20.22422,2.00983 34.87033,-13.7616 42.06957,-19.13752 z M 270.14633,840.14777 c 2.7537,3.2631 8.2375,4.9948 14.9384,8.0472 6.701,3.0523 12.9873,6.0024 20.3002,7.5312 5.7407,1.2001 17.4178,2.6103 17.4996,1.8249 0.082,-0.7855 -11.7299,-3.6992 -17.6748,-5.4749 -6.6167,-1.9764 -11.4348,-4.5487 -17.9,-7.4937 -6.4651,-2.945 -13.2075,-7.3642 -15.3,-9.8437 z m 143.34541,-56.55981 c -8.7299,5.618 -22.82593,12.83747 -28.75063,13.81937 -3.9898,0.6612 -13.8937,2.4582 -13.8528,3.2436 0.041,0.7854 12.9392,-0.3246 13.7246,-0.3655 10.6967,-0.6387 18.86553,-4.66559 28.19993,-10.67259 z m -8.41025,-60.61557 c -6.3425,4.06563 -16.88004,11.76136 -24.33544,11.76471 -0.7925,-0.0112 -8.48707,2.22088 -9.46197,2.93219 -0.6403,0.46711 15.09966,-1.26156 15.89216,-1.27277 7.6526,0.0151 12.95215,-3.61429 20.09895,-8.6992 z M 285.39914,797.0881 c 11.1263,6.81631 39.01505,15.75888 49.98309,11.13312 -19.39188,-2.99778 -33.57229,-6.42062 -47.9468,-15.83491 z m 128.9766,45.6861 c -5.8288,6.4938 -14.3262,12.2095 -21.1875,15.6561 -7.9812,3.9268 -15.5557,7.5266 -20.6125,8.9813 -0.7609,0.2127 -14.5842,3.7797 -14.3714,4.5406 0.2127,0.7608 14.262,-0.7667 15.0215,-0.9844 5.4618,-1.5658 14.1636,-5.3028 22.25,-9.2813 7.2017,-3.7752 14.1891,-6.8781 20.1405,-12.6437 z m -172.38119,45.53628 c 2.7051,1.2392 13.8888,6.1928 28.4375,9.6875 13.903,3.3395 20.9834,4.3372 30.4753,4.9062 0.7847,0.047 19.8321,1.1729 19.7994,0.3875 -0.033,-0.7854 -13.841,-1.9358 -20.7369,-3.0625 -9.642,-1.5753 -13.9365,-2.8736 -27.5503,-6.1437 -14.2631,-3.4261 -25.9211,-9.4946 -28.525,-10.6874 z m 72.67102,-169.41593 c 9.42691,2.87525 25.78772,7.23815 34.68891,4.14995 -12.30151,-1.8223 -21.51165,-5.94116 -31.87073,-9.04888 z m 87.12679,-20.63332 c -3.27455,2.63745 -7.75415,4.75742 -11.64385,4.90927 -0.7868,0.0142 -13.717,1.92244 -13.7008,2.70916 0.016,0.78672 13.5042,1.16226 14.2909,1.14346 2.6418,-0.67501 8.42562,-0.30826 9.87722,-2.8173 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccsscsccccccccsscsscccsccccccccccccccccccsccccsccsscccccccccccc" />
+ <path
+ transform="matrix(-1.0827144,0,0,1,4118.9429,-108.46679)"
+ sodipodi:nodetypes="cczcccscccccccsccccczcccczcsccscsccczszcccscccccscscssccccccccccccsccscccccccczscccsczccscsccccccccccccccscccsscc"
+ inkscape:connector-curvature="0"
+ id="path5021"
+ d="m 2001.0546,715.51106 c -8.8725,5.61528 -17.2856,2.80495 -27.1499,3.91587 -1.3633,0.1749 7.1261,3.30211 12.3481,3.6841 5.222,0.38199 15.3567,0.44582 18.2815,-2.48993 z m -48.9901,7.1986 c 4.6023,7.2725 21.089,8.87213 21.1346,11.69934 0.052,3.21489 -19.7217,0.73854 -23.0767,-6.97005 z m -10.6562,19.18119 c 8.2386,4.13409 31.2211,13.34084 34.1081,7.9474 -11.7296,-1.06835 -23.3923,-7.34789 -32.2824,-11.5224 z m 75.3783,9.23135 c -1.3882,0.5857 -4.5636,2.04168 -6.6132,3.18076 -4.068,2.2608 -22.8928,2.35904 -23.3648,3.34524 4.5526,1.51794 18.4054,4.54283 24.3439,1.28592 1.2724,-0.3101 6.0678,-1.81965 7.5718,-3.18692 z m -87.5629,12.16265 c 2.8825,3.30292 21.2658,9.3989 18.2729,6.20297 -2.993,-3.19593 -12.4964,-6.86315 -15.8403,-11.24669 z m -2.1632,17.13712 -1.456,3.75627 c 8.7803,5.18681 12.6389,7.16303 20.1419,8.90692 7.5029,1.74388 23.5002,2.39109 23.3167,1.11069 -0.253,-1.3243 -19.4351,-3.55435 -22.6019,-4.46498 -11.4457,-3.2913 -9.6434,-4.08377 -19.4007,-9.3089 z m 105.1896,21.0671 c -5.8966,2.5366 -13.036,6.93854 -19.2483,8.06593 -9.4977,1.72363 -23.8459,1.3537 -27.8358,7.98086 8.4544,-1.67445 21.8304,-1.73561 28.0483,-3.12706 6.7941,-1.52038 15.004,-3.74974 21.2633,-7.70572 z m -115.0817,7.22672 c 26.6625,12.16512 21.6043,10.2227 30.8072,11.79271 9.2029,1.57001 23.4298,-0.0492 23.2007,-1.34184 -0.229,-1.2926 -14.5389,-0.65128 -23.5809,-3.21154 -9.0421,-2.56026 -16.9171,-5.95509 -30.2421,-12.95275 z m 117.2016,25.14913 c -12.4754,5.22722 -14.2117,8.35844 -24.5474,9.85534 -1.372,0.082 -15.9221,4.729 -15.7325,6.0904 0.1895,1.3614 15.0776,-0.8573 16.4199,-1.1529 13.5555,-1.7442 19.4567,-4.43411 25.8531,-9.02983 z m -134.9473,24.60236 c 2.3289,2.3503 6.0809,3.9664 10.2938,6.0875 4.2129,2.1211 7.5211,3.30169 13.2773,4.90439 11.5125,3.20535 17.3824,4.15516 25.9918,5.19566 1.3102,0.1584 14.6306,-0.546 14.6224,-1.8657 -0.01,-1.3197 -17.0186,-2.45545 -18.318,-2.68625 -7.8339,-1.3917 -7.9834,-1.6878 -19.0419,-4.7668 -5.5293,-1.5395 -8.8719,-3.3447 -12.6564,-5.25 -3.6978,-2.22917 -7.3957,-4.45834 -11.0936,-6.6875 z m 147.6908,11.12106 c -11.5063,18.49518 -49.0936,25.44123 -58.2202,27.40433 28.337,7.55551 59.0145,-14.80906 59.9027,-21.94263 z m -149.0674,10.03652 -2.1966,4.95481 c 15.3295,9.66271 34.1417,12.83235 55.7445,8.99219 -24.9636,-1.15113 -43.8489,-7.76845 -53.5479,-13.947 z m -6.9394,30.40146 c 11.2629,2.9911 23.3171,8.52305 36.6114,10.13925 9.3562,1.1374 32.3611,5.2548 43.9222,0.6149 0.1554,-1.301 -22.0017,-3.4722 -23.3027,-3.6274 -10.6264,-1.294 -9.5391,-1.5994 -20.0506,-2.5046 -12.4145,-1.069 -25.3696,-6.39755 -35.8989,-9.46585 z m 158.5326,-7.22844 c -5.8973,6.2956 -16.699,17.62263 -21.8481,19.96073 -2.1791,1.2914 -16.9125,5.7894 -16.3631,7.0235 0.5494,1.234 16.5731,-2.5424 17.7781,-3.1528 7.257,-3.3464 17.0702,-7.54003 22.4303,-15.99643 z m -116.5389,53.68397 c -14.2141,-2.12842 -21.036,-5.13984 -33.5115,-9.80894 -6.1041,-2.2846 -11.7835,-7.55401 -17.9801,-11.74043 -1.9997,1.1182 -0.918,5.91833 -1.8186,7.93213 4.9507,3.69881 10.0037,8.12551 18.5657,10.09051 14.1263,3.5961 22.1264,7.93601 33.1744,8.58005 8.368,0.4878 19.0091,0.20246 36.687,-1.29356 -23.223,-1.93338 -20.9029,-1.63135 -35.1169,-3.75976 z m 133.7574,3.83363 c -7.8434,5.3315 -18.0094,10.22928 -25.6805,12.96148 -17.4315,4.82586 -37.5491,8.86023 -55.7683,11.81303 -18.4909,2.99683 -40.2263,3.38586 -50.5437,3.27674 12.7823,4.57031 32.4863,6.53483 44.7942,5.10476 23.9317,-2.78067 46.4331,-7.29477 64.466,-13.45184 8.084,-2.9729 19.1183,-7.4284 24.6956,-11.6694 z m -190.9029,22.92434 c 8.7071,3.3143 16.2598,7.422 25.6687,11.4813 16.5201,5.79358 34.8433,7.57648 51.0938,10.96868 16.3004,2.9958 30.3119,1.4682 46.2187,-0.031 7.952,-0.7666 33.7056,-3.5494 32.3373,-8.06025 -0.4006,-0.9468 -23.5448,2.1751 -32.8373,3.09155 -15.1716,1.2348 -30.6543,2.9546 -44.6875,0.094 -16.1013,-4.39045 -33.9647,-3.93985 -50.1562,-10.65628 -8.8167,-3.8038 -15.6862,-8.8759 -25.125,-12.4687 z m 201.3716,33.21528 c -30.839,20.2752 -73.7119,37.0429 -106.2124,34.2665 -22.2427,-1.9001 -76.7771,-16.0626 -91.5904,-26.2964 -6.2959,-4.5947 -7.6449,-2.8281 -13.4724,-9.6996 0.1352,5.5593 -4.1067,5.9844 -7.1276,7.8418 5.5047,5.486 13.43,9.4057 19.5778,12.3725 17.8704,8.624 70.1134,22.431 92.5414,22.2754 34.2946,-0.238 77.6899,-4.9693 108.0225,-32.0877 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#1f202b;fill-opacity:1;stroke:none;stroke-width:5.00000003999999976;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;fill-rule:nonzero" />
+ <path
+ sodipodi:nodetypes="cscscccsscccssccccscscsccccsscscccccccccccsccccsscsscccscccccccccccccscccsccsscccccccccscc"
+ inkscape:connector-curvature="0"
+ d="m 427.99299,1003.8655 c -5.5744,4.9875 -21.4531,20.4338 -28.9386,23.0078 -7.8921,2.7138 -26.7755,10.4893 -26.1738,11.6611 0.6016,1.1717 15.779,-1.2848 25.6748,-5.4861 9.8958,-4.2012 25.4998,-15.4728 31.731,-21.3589 z m -210.85618,7.3002 c 2.4567,1.6786 6.61566,6.7455 20.36426,12.6493 3.9832,1.7105 13.70088,6.0593 17.26498,7.5001 8.1916,3.3115 30.9475,8.4533 37.3995,9.9622 0.7654,0.179 22.12213,4.2462 22.22273,3.4666 12.9373,-0.2922 -16.08843,-3.9853 -22.69453,-6.2615 -6.0031,-2.0685 -25.7665,-8.364 -31.6483,-10.508 -3.1685,-1.1549 -17.07404,-8.7966 -21.43361,-11.082 -10.54284,-5.5267 -16.2424,-9.9335 -18.6071,-11.5494 z m 14.25633,-38.86733 c 6.888,5.141 24.14083,13.18211 38.49453,16.55671 5.64143,0.97866 5.63769,1.92492 27.39811,5.91011 10.89455,1.99523 40.50844,2.63858 48.51568,0.98781 -4.46334,-1.37098 -35.31621,-1.50151 -47.05275,-4.66131 -12.21149,-3.28767 -25.15397,-6.07962 -32.00374,-7.68711 -5.281,-1.2415 -15.89413,-7.00321 -20.24463,-8.95641 -7.2689,-3.2633 -10.9789,-5.37343 -14.8615,-8.27133 z m 171.05219,-79.70384 c -3.6553,8.0861 -12.78937,13.28011 -19.44997,18.04321 -8.4007,5.4562 -9.5802,5.9801 -16.0969,9.1311 -4.3524,2.1044 -15.6307,6.5498 -15.4092,7.365 0.2215,0.8151 7.604,-1.1642 8.3873,-1.4805 8.4115,-2.2411 16.0362,-4.8496 24.6371,-10.4359 4.3005,-2.7931 10.37879,-6.14559 13.32609,-8.77209 2.9474,-2.6265 5.03668,-5.62762 5.73388,-7.93842 z m -169.2405,36.9139 c 6.888,5.141 17.45124,15.24359 31.80494,18.61809 8.68488,1.01258 37.86716,7.34857 43.95762,3.43121 -21.75148,-3.01555 -29.4351,-5.54203 -42.86392,-8.36857 -14.1047,-3.3161 -23.07855,-13.67394 -29.28485,-18.30614 z m 185.8006,20.74165 c -20.1125,15.0395 -26.891,17.4593 -39.3113,20.7418 -0.8494,0.099 -14.66252,3.71352 -14.8465,4.5499 -0.53946,2.45245 11.1509,-0.615 11.9404,-0.9437 12.127,-3.205 22.0406,-2.8126 42.5265,-18.1313 z M 255.70087,848.76537 c 2.7537,3.2631 7.78428,5.80727 14.48518,8.85967 6.701,3.0523 13.44052,5.18993 20.75342,6.71873 5.7407,1.2001 17.4178,2.6103 17.4996,1.8249 0.082,-0.7855 -11.7299,-3.6992 -17.6748,-5.4749 -6.6167,-1.9764 -11.88802,-3.73623 -18.35322,-6.68123 -6.4651,-2.945 -12.75428,-8.17667 -14.84678,-10.65617 z m 127.57526,-57.2108 c -8.7299,5.618 -19.35089,9.4914 -25.27559,10.4733 -3.9898,0.6612 -16.24383,5.21583 -16.20293,6.00123 0.041,0.7854 15.28933,-1.47361 16.07473,-1.51451 10.6967,-0.6387 18.87936,-3.82186 28.21376,-9.82886 z m -21.19178,-71.55609 c -6.3425,4.06563 -18.0196,8.65903 -25.475,8.66238 -0.7925,-0.0112 -5.03468,0.54495 -6.00958,1.25626 -0.6403,0.46711 10.25448,0.41437 11.04698,0.40316 7.6526,0.0151 15.4845,-0.51196 22.6313,-5.59687 z m -91.02843,78.93364 c 12.111,8.0199 30.50751,15.78543 45.43411,15.10303 0.7854,-0.033 11.9511,0 11.9184,-0.7907 -0.033,-0.7854 -9.045,-1.9138 -12.5309,-1.8437 -12.1034,0.2434 -31.76181,-10.25573 -43.41841,-17.97473 z m -27.62241,100.24103 c 2.7051,1.2392 15.5506,7.16777 30.0993,10.66247 13.903,3.3395 20.9834,4.3372 30.4753,4.9062 0.7847,0.047 19.8321,1.1729 19.7994,0.3875 -0.033,-0.7854 -13.841,-1.9358 -20.7369,-3.0625 -9.642,-1.5753 -13.9365,-2.8736 -27.5503,-6.1437 -14.2631,-3.4261 -26.97861,-10.14458 -29.58251,-11.33738 z m 51.68274,-165.33706 c 9.6774,2.87946 25.70651,13.81116 39.19012,10.57188 -12.95434,-1.73183 -26.54266,-11.25582 -37.98352,-14.64679 z m 56.39211,-27.17849 c -2.89096,2.91729 -7.13643,4.50234 -10.60251,4.63765 -0.7868,0.0142 -13.717,1.92244 -13.7008,2.70916 0.016,0.78672 13.51757,1.29995 14.2909,1.14346 2.6685,-0.54001 11.67998,-1.45728 13.13158,-3.96632 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#3b3d4b;fill-opacity:1;stroke:none;stroke-width:2.99999993999999992;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;fill-rule:nonzero"
+ id="path5029"
+ transform="matrix(-1.0756076,0,0,1,2333.0381,-103.55491)" />
+ <path
+ sodipodi:nodetypes="ccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccsccsccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccc"
+ inkscape:connector-curvature="0"
+ d="m -5.5375,694.96844 c 0.2904,7.17794 1.5528,14.16204 4.725,20.71876 5.8808,8.9488 8.1857,19.50867 12,29.375 5.033,7.65375 5.9471,17.20554 5.125,26.125 3.9977,8.13776 2.2371,16.07872 6.6212,24.08178 -2.2811,1.18705 -5.2052,1.77457 -8.3044,2.78183 M -13.0761,697.79145 c 2.9584,-0.67521 5.7702,-2.52891 7.8636,-4.28547 -4.7985,-7.25603 -7.8383,-14.33288 -10.5375,-22.56878 0.2569,-7.41579 0.3156,-15.90338 -5.1875,-21.625 -3.3376,-8.27013 -7.9282,-11.5464 -11.4063,-19.75009 -2.7962,-4.45057 -9.377,-11.05427 -10.6874,-16.31241 -4.23,-4.58383 -8.2197,-9.3971 -11.2813,-14.6875 -5.4695,-2.87459 -10.4049,-6.55065 -15.8125,-9.34375 -2.6378,-0.90748 -5.9483,-1.95385 -9,-1.90625 -2.3735,0.037 -4.5316,1.54457 -6.1784,3.44461 -5.1935,2.877 -4.6577,8.33116 -7.9778,12.55569 -5.8092,7.03226 -11.5533,14.18262 -16.5313,21.84375 m 2392.5313,278.8747 c -2.4221,2.51998 -5.0077,4.84507 -8.1563,6.46875 -4.7806,2.57439 -9.1923,5.9537 -14.5313,7.28125 -10.2055,3.82662 -21.278,2.64843 -31.9374,3.46875 -24.6748,0.98527 -49.3841,1.1116 -74.0626,0.25 -12.434,-0.39512 -24.7443,-2.22632 -37.0937,-3.59375 -4.172,-0.50387 -8.4978,-1.94264 -10.625,-5.21875 -3.3068,-0.36887 -7.0437,-1.96404 -6.6563,-5.375 -4.2795,-3.3162 -3.7845,-9.09074 -4.375,-13.875 -1.1197,-5.03773 -1.2984,-10.42338 -4.3437,-14.8125 -1.8282,-3.47167 -4.8128,-6.9383 -4.8125,-10.96875 1.7802,-6.65073 5.3733,-14.07835 1.7188,-20.75 -1.3754,-6.09336 -3.9959,-11.82886 -5.8438,-17.75 -0.1054,-5.65024 -2.4605,-10.5937 -5.5938,-15.15625 -2.9663,-5.14261 -6.3358,-11.5768 -5.96,-17.6745 M 1446.3795,589.3248 c -1.7258,0.46468 -2.8255,1.4551 -8.2288,1.99223 m -38.6626,37.68522 c -4.4835,-1.26504 -8.2973,-2.65587 -9.4126,-2.93087 m -40.0849,154.31121 c -4.1379,-1.57061 -8.0111,-2.78091 -9.2044,-3.3275 m 150.4756,-5.71211 c 4.4817,-2.61176 8.8686,-5.47431 10.4601,-7.04981 m -168.4902,51.18568 c -7.3632,11.12623 -14.9867,22.80246 -21.2629,34.5524 -2.9832,7.70241 -1.7242,16.60719 -6.125,23.84375 -6.4973,16.40792 -19.425,28.89981 -30.3438,42.34375 -4.5174,7.09624 -11.8464,11.51011 -18.6875,16.0625 -6.9476,3.24781 -14.1679,5.81428 -21.1563,8.96875 -7.1901,0.27391 -14.3543,1.14105 -21.4062,2.5 -6.7374,1.01921 -13.4323,2.25541 -20.25,2.625 -10.5582,1.39384 -21.1481,2.60812 -31.7812,3.25 -5.8833,0.52459 -11.7393,1.30543 -17.5938,2.0625 -0.7462,-2.22538 -2.1395,-4.41168 -2.7206,-6.85385 -1.3281,-5.58058 -5.4576,-13.62859 -6.8033,-18.72473 m 255.724,-254.69967 c -3.7527,-1.47339 -7.7013,-3.35856 -11.5438,-5.90304 3.5794,-6.64169 -0.095,-15.60272 1.9375,-22.53746 3.0825,-5.78395 5.4975,-11.94108 8.625,-17.71875 3.7321,-4.58872 5.2952,-10.10285 9.2812,-14.40625 4.8337,-3.31677 7.3602,-17.99812 10.1673,-22.8594 4.2485,-3.97389 9.3594,-6.9646 14.1875,-10.21875 l 1.3125,0 c 3.3276,0.0293 6.5789,1.0337 9.7813,1.84375 5.5459,0.74716 10.3081,4.46493 12.125,9.8125 5.0896,2.90251 8.9597,16.13539 9.7077,22.14693 -3.7387,2.39661 -7.6977,3.69213 -11.7802,4.36965 m 12.1864,-3.31343 c 4.855,3.92489 4.0767,10.8193 6.875,15.90625 5.4883,6.30207 2.0925,15.40028 5.8437,22.375 6.5229,7.91576 4.9182,17.63906 10.1375,26.16255 -3.7114,2.38843 -7.6939,4.17633 -11.8297,5.49762 m -87.8265,-16.32899 c -0.7094,9.88949 -7.3274,15.52845 -8.175,25.38758 -5.0319,9.56068 -13.0691,17.95214 -13.6984,29.11613 1.6348,1.9372 8.0851,4.66515 11.9104,6.83879 m 108.6443,-49.37367 c 0.9929,8.58236 6.5199,16.50533 10.4624,24.01249 6.345,9.62178 6.0112,21.49458 8.125,32.40625 3.7799,10.54814 3.5258,21.99241 6.5626,32.71875 4.2575,9.10693 4.2262,19.34519 4.0312,29.1875 -1.2087,12.735 7.3472,22.19644 7.3062,34.7938 -3.3999,2.5423 -6.5427,4.68549 -9.4768,6.50717 M 1358.4838,722.46465 c -6.057,11.33686 -8.1421,23.7674 -13.5463,35.3791 -3.2417,9.2532 -3.2788,19.48504 -8.0625,28.21875 -3.3928,9.46966 -2.7528,18.30132 -4.1029,28.15243 1.73,1.29125 3.8574,2.57625 6.3138,3.82988 m 167.7292,-17.18305 c -0.6415,2.12596 -3.6534,5.28906 -7.9859,8.74593 M 270.8438,824.84375 c -1.51314,8.54474 -1.8675,17.68652 -6.0625,25.4375 -5.70759,6.95938 -13.25227,13.05504 -15.625,22.125 -2.47925,4.70901 -3.35132,9.89398 -4.09375,15.09375 -0.81273,5.83079 -4.26071,10.72002 -8.53125,14.59375 -2.95503,3.23536 -6.02645,6.37324 -9.96875,8.40625 -4.78064,2.57439 -9.19219,5.9537 -14.53125,7.28125 -10.20554,3.82662 -21.27784,2.64843 -31.9375,3.46875 -24.67453,0.98527 -49.38416,1.1116 -74.06255,0.24985 -12.43405,-0.39527 -24.74435,-2.22647 -37.09375,-3.5939 -4.172,-0.50387 -8.4978,-1.94264 -10.625,-5.21875 -3.3068,-0.36887 -7.0437,-1.96404 -6.6563,-5.375 -4.2795,-3.3162 -3.7845,-9.09074 -4.375,-13.875 -1.1197,-5.03773 -1.2984,-10.42338 -4.3437,-14.8125 -1.8282,-3.47167 -4.8128,-6.9383 -4.8125,-10.96875 1.7802,-6.65073 5.3733,-14.07835 1.7188,-20.75 -1.3754,-6.09336 -3.9959,-11.82886 -5.8438,-17.75 -0.1054,-5.65024 -2.4605,-10.5937 -5.5938,-15.15625 -2.9663,-5.14261 -6.3358,-11.5768 -5.96,-17.6745 m 1102.0364,98.79693 c 2.5641,6.08177 6.0438,7.77897 8.1737,13.90912 2.439,7.01963 1.5992,9.63535 3.3067,16.10102 -2.893,1.29656 -5.3127,2.66424 -8.839,3.38479 m -9.4456,-31.46324 c 4.2022,-0.89462 3.9326,-0.72848 7.02,-2.58048 -2.2431,-5.32058 -3.7596,-14.38029 -6.0422,-19.69209 -1.3408,-3.12012 -3.9507,-9.85307 -6.1483,-16.54356 -2.1567,-6.56636 -3.8326,-13.13962 -12.2891,-11.20644 -5.288,1.39649 -7.6607,8.75637 -11.1446,16.94973 -2.8839,6.78249 -7.143,14.03384 -8.9492,19.86277 -1.3577,4.38184 -0.1169,9.86641 -0.2761,14.40476 -0.1575,4.48553 -1.7202,8.02416 -2.1614,12.47024 -0.9937,10.01451 1.2156,14.10313 -2.7017,25.6912 2.1659,1.18536 3.925,2.56543 6.9245,3.19507 m -5.8904,-2.50566 c -1.8039,5.33631 -4.3188,15.5297 -6.2387,22.18189 -3.9917,0.30393 -7.9619,0.60988 -11.9374,1.0625 -12.2621,1.78753 -24.6985,1.60664 -37,3.03125 -10.1304,0.45886 -20.2905,0.94686 -30.4375,0.625 -9.75753,-0.14214 -19.18976,-2.93728 -28.25,-6.34375 -6.24427,-2.09836 -11.4945,-6.33838 -17.5625,-8.84375 -4.49785,-3.02242 -6.41529,-8.8087 -11.4375,-11.1875 -5.02357,-5.8332 -11.51406,-10.02888 -17.375,-14.90625 -3.24416,-4.40704 -7.05621,-8.39562 -11.53125,-11.625 -4.98299,-3.61424 -9.33808,-7.953 -13.09375,-12.8125 -3.47846,-3.95176 -7.11437,-7.96754 -9,-12.96875 -5.70989,-5.54227 -10.60813,-12.7421 -13.07498,-20.2875 M 737.51206,795.19951 c -3.74519,5.10083 -3.36705,10.80476 -6.13701,16.26924 -1.94978,4.72274 -6.29164,7.87903 -8.125,12.71875 -2.55657,3.83097 -4.507,8.15932 -4.71875,12.84375 -0.27365,4.55586 0.51379,9.62233 -2.9375,13.28125 -4.0107,4.28922 -8.59494,6.97703 -9.76875,13.05629 3.80918,2.24873 7.61835,3.44527 11.42753,4.63609 m 119.41886,-61.22896 c 0.55493,6.06603 3.01563,10.18565 6.89111,14.91158 6.67719,6.23628 9.80853,15.04676 15.09375,22.3125 6.1813,5.70787 3.81936,14.22167 10.34378,19.64379 l -8.02074,2.65489 m -111.99542,-67.4477 c -4.55107,-0.83999 -8.22064,-3.22259 -12.21873,-5.03029 1.60563,-5.99999 6.32389,-9.35339 8.95361,-14.75819 -0.20311,-4.9264 -0.41178,-9.95518 3.71875,-13.6875 2.44261,-3.97782 5.1672,-7.86783 5.1875,-12.875 1.03619,-3.18564 1.29276,-5.53724 3.375,-7.5 1.07377,-3.43166 2.35265,-5.27927 5.40625,-6.40625 7.58615,-2.55129 15.76103,-0.19343 23.03125,2.375 6.03785,1.0753 6.74177,8.00231 11.9375,10.3125 5.43278,2.41675 8.0661,7.76912 9.84375,13.125 3.27554,9.9032 13.15911,14.73061 19.53125,22.28125 2.2119,6.45029 5.83078,12.63661 9.61081,18.30745 -3.23223,1.98824 -6.40131,1.74774 -9.49728,2.64598 m -121.46985,57.51531 c -3.59529,4.75872 -0.56178,11.73649 -5.64373,15.56251 -5.53506,2.65807 -4.50848,9.97577 -8.0625,14.0625 -5.71002,3.27521 -8.59878,9.63554 -13.84375,12.875 -5.30537,2.50086 -9.13687,6.53308 -12.53125,11.0625 -5.02895,3.57621 -11.59839,3.39652 -17.21875,5.6875 -6.86264,1.47552 -13.26577,4.85584 -20.375,5.15625 -10.52935,1.11885 -20.97138,2.92412 -31.4375,4.46875 -24.52214,2.45166 -49.19318,2.45978 -73.8125,2.75 -13.56824,0.0226 -27.17565,0.0498 -40.71875,0.5 -5.20758,0.60307 -10.43959,0.76828 -15.625,1.59375 -9.26921,0.49784 -19.17521,-0.53405 -27.15625,-5.625 -3.2594,-2.92831 -6.00116,-6.4339 -8.65625,-9.9375 -1.94873,-3.07529 -4.71126,-5.65563 -6.84375,-8.4375 -2.08637,-6.50997 -7.71976,-11.94177 -7.34375,-19.15625 -1.30714,-9.55231 -9.34737,-16.51896 -10.6875,-26.09375 -2.2474,-7.49963 -4.78341,-11.39758 -5.0125,-19.28136 M 282.4273,832.34469 c -3.23554,-0.29186 -9.53184,-5.23117 -12.158,-7.96055 3.96707,-8.70452 11.09837,-16.12165 11.91825,-25.97789 5.73023,-8.22628 8.2237,-18.06244 11.75,-27.3125 5.72269,-7.8098 3.16888,-18.54028 8.40625,-26.5625 5.60845,-6.84497 4.42755,-16.21933 7.3125,-24.125 5.05089,-9.58754 10.23377,-19.19424 16.6875,-27.9375 0.61941,-5.36297 3.32809,-10.15121 5.6875,-14.90625 3.49477,-5.88222 4.15921,-12.73641 5.21875,-19.34375 2.85191,-5.17124 4.46099,-10.78763 6.21875,-16.28125 3.01915,-5.41311 5.13543,-12.03224 11.03125,-15 4.04217,-2.17693 12.35631,-5.93211 14.09375,0.71875 1.4734,5.34072 8.41889,6.01464 10.34375,11.21875 3.25049,5.73605 -1.3662,12.61628 2.09375,18.21875 -1.05871,6.59628 3.11884,12.64994 2.65625,19.21875 -2.38711,9.48715 3.15183,15.35341 5.29039,24.23227 l -5.60988,2.59346 m 4.80558,-0.98484 c -1.80819,9.23729 1.94492,19.63413 4.73266,28.40911 -1.74658,9.14404 2.22419,18.08138 1.90625,27.21875 -2.21324,10.23824 3.87116,19.68207 4.03125,29.78125 -1.17233,6.51852 0.58253,13.03957 2.46875,19.25 4.75498,13.10066 -2.09402,28.59918 1.33115,41.82494 -2.14104,1.99169 -4.32532,3.36419 -7.04981,5.9616 m 1118.77491,-21.4053 c 3.2946,7.49159 6.6166,14.96552 9.8125,22.5 5.6649,11.47031 7.7934,24.11198 9.9749,36.55626 2.6599,9.32821 1.222,19.25355 4.0626,28.53125 4.1014,10.25801 12.7226,18.54302 14.5937,29.75 0.1289,8.5293 5.2061,15.79756 9.8437,22.5625 3.0662,5.00505 7.9599,9.35448 8.625,15.4375 1.9528,5.63492 8.5355,6.18048 13.4376,7.625 5.6228,0.27136 8.1206,5.75905 13.2812,6.46875 11.0781,2.3877 22.4521,3.2288 33.7812,3.2188 13.7553,-0.4747 27.785,0.1336 41.1876,-3.5 10.6074,-1.8144 21.2571,-3.42139 31.8124,-5.56255 5.7957,-0.54624 11.2809,-2.33518 16.8126,-3.875 5.6092,-1.85858 11.45,-2.61868 17.2187,-3.78125 6.4553,-2.85833 22.3362,-2.08533 31.25,-3.625 6.5005,-0.86979 13.1205,-0.0737 19.5625,-1.375 5.1683,-1.02725 10.5245,-0.61527 15.5625,-2.5 8.1343,-4.18366 18.7661,-3.9062 26.8125,-9.53125 -1.1976,-3.41258 3.4524,-4.6487 2.9688,-8.0625 4.4268,-1.78103 6.4253,-6.42061 9.3124,-9.875 4.5137,-4.25289 6.1126,-10.62577 9.25,-15.875 3.6076,-9.0735 12.6022,-15.03005 15,-24.6875 0.1956,-8.77233 5.5369,-16.19663 7.8126,-24.4375 3.5973,-9.5792 -0.6218,-20.00891 2.5937,-29.625 5.0592,-10.24978 3.1025,-22.35526 7.9063,-32.6875 3.3369,-10.24259 9.3914,-19.47356 11.9374,-30 1.7911,-12.03329 0.365,-24.66473 3.3625,-36.55624 4.4282,-10.74405 10.0594,-20.82164 13.0438,-32.13126 3.9772,-8.80214 1.8658,-18.55057 1.5625,-27.8125 -0.3167,-3.2473 0.6599,-4.74731 1.6285,-7.6561 m 124.084,2.28079 c 0.2904,7.17794 1.5528,14.16204 4.725,20.71876 5.8808,8.9488 8.1857,19.50867 12,29.375 5.033,7.65375 5.9471,17.20554 5.125,26.125 3.9977,8.13776 2.2371,16.07872 6.6212,24.08178 -2.2811,1.18705 -5.2052,1.77457 -8.3044,2.78183 m -27.7054,-100.25936 c 2.9584,-0.67521 5.7702,-2.52891 7.8636,-4.28547 -4.7985,-7.25603 -7.8383,-14.33288 -10.5375,-22.56878 0.2569,-7.41579 0.3156,-15.90338 -5.1875,-21.625 -3.3376,-8.27013 -7.9282,-11.5464 -11.4063,-19.75009 -2.7962,-4.45057 -9.377,-11.05427 -10.6874,-16.31241 -4.23,-4.58383 -8.2197,-9.3971 -11.2813,-14.6875 -5.4695,-2.87459 -10.4049,-6.55065 -15.8125,-9.34375 -2.6378,-0.90748 -5.9483,-1.95385 -9,-1.90625 -2.3735,0.037 -4.5316,1.54457 -6.1784,3.44461 -5.1935,2.877 -4.6577,8.33116 -7.9778,12.55569 -5.8092,7.03226 -11.5533,14.18262 -16.5313,21.84375 -2.7244,5.22442 -3.2077,11.24593 -3.5,17.03125 -6.464,9.13845 -0.4164,21.54031 -6.7813,30.75 -3.3115,5.90558 -7.8554,12.53311 -10.0152,19.01892 3.7074,2.29103 7.4877,4.29961 11.0862,5.59129"
+ style="color:#000000;fill:none;stroke:#444759;stroke-width:2;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3862" />
+ <path
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#1f202b;fill-opacity:1;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;"
+ d="m 2001.0546,715.51106 c -8.8725,5.61528 -17.2856,2.80495 -27.1499,3.91587 -1.3633,0.1749 7.1261,3.30211 12.3481,3.6841 5.222,0.38199 15.3567,0.44582 18.2815,-2.48993 z m -48.9901,7.1986 c 4.6023,7.2725 21.089,8.87213 21.1346,11.69934 0.052,3.21489 -19.7217,0.73854 -23.0767,-6.97005 z m -10.6562,19.18119 c 8.2386,4.13409 31.2211,13.34084 34.1081,7.9474 -11.7296,-1.06835 -23.3923,-7.34789 -32.2824,-11.5224 z m 75.3783,9.23135 c -1.3882,0.5857 -4.5636,2.04168 -6.6132,3.18076 -4.068,2.2608 -22.8928,2.35904 -23.3648,3.34524 4.5526,1.51794 18.4054,4.54283 24.3439,1.28592 1.2724,-0.3101 6.0678,-1.81965 7.5718,-3.18692 z m -87.5629,12.16265 c 2.8825,3.30292 21.2658,9.3989 18.2729,6.20297 -2.993,-3.19593 -12.4964,-6.86315 -15.8403,-11.24669 z m -2.1632,17.13712 -1.456,3.75627 c 8.7803,5.18681 12.6389,7.16303 20.1419,8.90692 7.5029,1.74388 23.5002,2.39109 23.3167,1.11069 -0.253,-1.3243 -19.4351,-3.55435 -22.6019,-4.46498 -11.4457,-3.2913 -9.6434,-4.08377 -19.4007,-9.3089 z m 105.1896,21.0671 c -5.8966,2.5366 -13.036,6.93854 -19.2483,8.06593 -9.4977,1.72363 -23.8459,1.3537 -27.8358,7.98086 8.4544,-1.67445 21.8304,-1.73561 28.0483,-3.12706 6.7941,-1.52038 15.004,-3.74974 21.2633,-7.70572 z m -115.0817,7.22672 c 26.6625,12.16512 21.6043,10.2227 30.8072,11.79271 9.2029,1.57001 23.4298,-0.0492 23.2007,-1.34184 -0.229,-1.2926 -14.5389,-0.65128 -23.5809,-3.21154 -9.0421,-2.56026 -16.9171,-5.95509 -30.2421,-12.95275 z m 117.2016,25.14913 c -12.4754,5.22722 -14.2117,8.35844 -24.5474,9.85534 -1.372,0.082 -15.9221,4.729 -15.7325,6.0904 0.1895,1.3614 15.0776,-0.8573 16.4199,-1.1529 13.5555,-1.7442 19.4567,-4.43411 25.8531,-9.02983 z m -134.9473,24.60236 c 2.3289,2.3503 6.0809,3.9664 10.2938,6.0875 4.2129,2.1211 7.5211,3.30169 13.2773,4.90439 11.5125,3.20535 17.3824,4.15516 25.9918,5.19566 1.3102,0.1584 14.6306,-0.546 14.6224,-1.8657 -0.01,-1.3197 -17.0186,-2.45545 -18.318,-2.68625 -7.8339,-1.3917 -7.9834,-1.6878 -19.0419,-4.7668 -5.5293,-1.5395 -8.8719,-3.3447 -12.6564,-5.25 -3.6978,-2.22917 -7.3957,-4.45834 -11.0936,-6.6875 z m 147.6908,11.12106 c -11.5063,18.49518 -49.0936,25.44123 -58.2202,27.40433 28.337,7.55551 59.0145,-14.80906 59.9027,-21.94263 z m -149.0674,10.03652 -2.1966,4.95481 c 15.3295,9.66271 34.1417,12.83235 55.7445,8.99219 -24.9636,-1.15113 -43.8489,-7.76845 -53.5479,-13.947 z m -6.9394,30.40146 c 11.2629,2.9911 23.3171,8.52305 36.6114,10.13925 9.3562,1.1374 32.3611,5.2548 43.9222,0.6149 0.1554,-1.301 -22.0017,-3.4722 -23.3027,-3.6274 -10.6264,-1.294 -9.5391,-1.5994 -20.0506,-2.5046 -12.4145,-1.069 -25.3696,-6.39755 -35.8989,-9.46585 z m 158.5326,-7.22844 c -5.8973,6.2956 -16.699,17.62263 -21.8481,19.96073 -2.1791,1.2914 -16.9125,5.7894 -16.3631,7.0235 0.5494,1.234 16.5731,-2.5424 17.7781,-3.1528 7.257,-3.3464 17.0702,-7.54003 22.4303,-15.99643 z m -116.5389,53.68397 c -14.2141,-2.12842 -21.036,-5.13984 -33.5115,-9.80894 -6.1041,-2.2846 -11.7835,-7.55401 -17.9801,-11.74043 -1.9997,1.1182 -0.918,5.91833 -1.8186,7.93213 4.9507,3.69881 10.0037,8.12551 18.5657,10.09051 14.1263,3.5961 22.1264,7.93601 33.1744,8.58005 8.368,0.4878 19.0091,0.20246 36.687,-1.29356 -23.223,-1.93338 -20.9029,-1.63135 -35.1169,-3.75976 z m 133.7574,3.83363 c -7.8434,5.3315 -18.0094,10.22928 -25.6805,12.96148 -17.4315,4.82586 -37.5491,8.86023 -55.7683,11.81303 -18.4909,2.99683 -40.2263,3.38586 -50.5437,3.27674 12.7823,4.57031 32.4863,6.53483 44.7942,5.10476 23.9317,-2.78067 46.4331,-7.29477 64.466,-13.45184 8.084,-2.9729 19.1183,-7.4284 24.6956,-11.6694 z m -190.9029,22.92434 c 8.7071,3.3143 16.2598,7.422 25.6687,11.4813 16.5201,5.79358 34.8433,7.57648 51.0938,10.96868 16.3004,2.9958 30.3119,1.4682 46.2187,-0.031 7.952,-0.7666 33.7056,-3.5494 32.3373,-8.06025 -0.4006,-0.9468 -23.5448,2.1751 -32.8373,3.09155 -15.1716,1.2348 -30.6543,2.9546 -44.6875,0.094 -16.1013,-4.39045 -33.9647,-3.93985 -50.1562,-10.65628 -8.8167,-3.8038 -15.6862,-8.8759 -25.125,-12.4687 z m 201.3716,33.21528 c -30.839,20.2752 -73.7119,37.0429 -106.2124,34.2665 -22.2427,-1.9001 -76.7771,-16.0626 -91.5904,-26.2964 -6.2959,-4.5947 -7.6449,-2.8281 -13.4724,-9.6996 0.1352,5.5593 -4.1067,5.9844 -7.1276,7.8418 5.5047,5.486 13.43,9.4057 19.5778,12.3725 17.8704,8.624 70.1134,22.431 92.5414,22.2754 34.2946,-0.238 77.6899,-4.9693 108.0225,-32.0877 z"
+ id="path4226"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cczcccscccccccsccccczcccczcsccscsccczszcccscccccscscssccccccccccccsccscccccccczscccsczccscsccccccccccccccscccsscc"
+ transform="matrix(-1.0827144,0,0,1,2070.9429,-108.46679)" />
+ <path
+ transform="matrix(-1.0756076,0,0,1,285.0381,-103.55491)"
+ id="path4228"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#3b3d4b;fill-opacity:1;stroke:none;stroke-width:2.99999993999999992;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;fill-rule:nonzero"
+ d="m 427.99299,1003.8655 c -5.5744,4.9875 -21.4531,20.4338 -28.9386,23.0078 -7.8921,2.7138 -26.7755,10.4893 -26.1738,11.6611 0.6016,1.1717 15.779,-1.2848 25.6748,-5.4861 9.8958,-4.2012 25.4998,-15.4728 31.731,-21.3589 z m -210.85618,7.3002 c 2.4567,1.6786 6.61566,6.7455 20.36426,12.6493 3.9832,1.7105 13.70088,6.0593 17.26498,7.5001 8.1916,3.3115 30.9475,8.4533 37.3995,9.9622 0.7654,0.179 22.12213,4.2462 22.22273,3.4666 12.9373,-0.2922 -16.08843,-3.9853 -22.69453,-6.2615 -6.0031,-2.0685 -25.7665,-8.364 -31.6483,-10.508 -3.1685,-1.1549 -17.07404,-8.7966 -21.43361,-11.082 -10.54284,-5.5267 -16.2424,-9.9335 -18.6071,-11.5494 z m 14.25633,-38.86733 c 6.888,5.141 24.14083,13.18211 38.49453,16.55671 5.64143,0.97866 5.63769,1.92492 27.39811,5.91011 10.89455,1.99523 40.50844,2.63858 48.51568,0.98781 -4.46334,-1.37098 -35.31621,-1.50151 -47.05275,-4.66131 -12.21149,-3.28767 -25.15397,-6.07962 -32.00374,-7.68711 -5.281,-1.2415 -15.89413,-7.00321 -20.24463,-8.95641 -7.2689,-3.2633 -10.9789,-5.37343 -14.8615,-8.27133 z m 171.05219,-79.70384 c -3.6553,8.0861 -12.78937,13.28011 -19.44997,18.04321 -8.4007,5.4562 -9.5802,5.9801 -16.0969,9.1311 -4.3524,2.1044 -15.6307,6.5498 -15.4092,7.365 0.2215,0.8151 7.604,-1.1642 8.3873,-1.4805 8.4115,-2.2411 16.0362,-4.8496 24.6371,-10.4359 4.3005,-2.7931 10.37879,-6.14559 13.32609,-8.77209 2.9474,-2.6265 5.03668,-5.62762 5.73388,-7.93842 z m -169.2405,36.9139 c 6.888,5.141 17.45124,15.24359 31.80494,18.61809 8.68488,1.01258 37.86716,7.34857 43.95762,3.43121 -21.75148,-3.01555 -29.4351,-5.54203 -42.86392,-8.36857 -14.1047,-3.3161 -23.07855,-13.67394 -29.28485,-18.30614 z m 185.8006,20.74165 c -20.1125,15.0395 -26.891,17.4593 -39.3113,20.7418 -0.8494,0.099 -14.66252,3.71352 -14.8465,4.5499 -0.53946,2.45245 11.1509,-0.615 11.9404,-0.9437 12.127,-3.205 22.0406,-2.8126 42.5265,-18.1313 z M 255.70087,848.76537 c 2.7537,3.2631 7.78428,5.80727 14.48518,8.85967 6.701,3.0523 13.44052,5.18993 20.75342,6.71873 5.7407,1.2001 17.4178,2.6103 17.4996,1.8249 0.082,-0.7855 -11.7299,-3.6992 -17.6748,-5.4749 -6.6167,-1.9764 -11.88802,-3.73623 -18.35322,-6.68123 -6.4651,-2.945 -12.75428,-8.17667 -14.84678,-10.65617 z m 127.57526,-57.2108 c -8.7299,5.618 -19.35089,9.4914 -25.27559,10.4733 -3.9898,0.6612 -16.24383,5.21583 -16.20293,6.00123 0.041,0.7854 15.28933,-1.47361 16.07473,-1.51451 10.6967,-0.6387 18.87936,-3.82186 28.21376,-9.82886 z m -21.19178,-71.55609 c -6.3425,4.06563 -18.0196,8.65903 -25.475,8.66238 -0.7925,-0.0112 -5.03468,0.54495 -6.00958,1.25626 -0.6403,0.46711 10.25448,0.41437 11.04698,0.40316 7.6526,0.0151 15.4845,-0.51196 22.6313,-5.59687 z m -91.02843,78.93364 c 12.111,8.0199 30.50751,15.78543 45.43411,15.10303 0.7854,-0.033 11.9511,0 11.9184,-0.7907 -0.033,-0.7854 -9.045,-1.9138 -12.5309,-1.8437 -12.1034,0.2434 -31.76181,-10.25573 -43.41841,-17.97473 z m -27.62241,100.24103 c 2.7051,1.2392 15.5506,7.16777 30.0993,10.66247 13.903,3.3395 20.9834,4.3372 30.4753,4.9062 0.7847,0.047 19.8321,1.1729 19.7994,0.3875 -0.033,-0.7854 -13.841,-1.9358 -20.7369,-3.0625 -9.642,-1.5753 -13.9365,-2.8736 -27.5503,-6.1437 -14.2631,-3.4261 -26.97861,-10.14458 -29.58251,-11.33738 z m 51.68274,-165.33706 c 9.6774,2.87946 25.70651,13.81116 39.19012,10.57188 -12.95434,-1.73183 -26.54266,-11.25582 -37.98352,-14.64679 z m 56.39211,-27.17849 c -2.89096,2.91729 -7.13643,4.50234 -10.60251,4.63765 -0.7868,0.0142 -13.717,1.92244 -13.7008,2.70916 0.016,0.78672 13.51757,1.29995 14.2909,1.14346 2.6685,-0.54001 11.67998,-1.45728 13.13158,-3.96632 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscscccsscccssccccscscsccccsscscccccccccccsccccsscsscccscccccccccccccscccsccsscccccccccscc" />
+ </g>
+ </g>
+</svg>
Binary file share/hedgewars/Data/Themes/Cave/icon.png has changed
Binary file share/hedgewars/Data/Themes/Cave/icon.xcf has changed
Binary file share/hedgewars/Data/Themes/Cave/icon@2x.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cave/theme.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -0,0 +1,15 @@
+sky = 17, 18, 24
+border = 129, 135, 173
+water-top = $54, $5C, $9D
+water-bottom = $34, $3C, $7D
+water-opacity = $60
+music = snow.ogg
+clouds = 0
+object = Stalagmite01, 3, 5, 258, 100, 2, 1, 19, 0, 67, 173
+object = Stalagmite02, 3, 1, 159, 62, 3, 1, 11, 0, 45, 119
+object = Stalactite, 3, 0, 0, 55, 2, 1, 12, 61, 32, 79
+object = Crystal01, 3, 21, 258, 113, 2, 1, 0, 0, 165, 245
+object = Crystal02, 3, 16, 129, 57, 3, 1, 0, 0, 84, 124
+spray = CrystalSpray01, 2
+spray = CrystalSpray02, 3
+flakes = 8, 2, 99999999, 0, 1700
--- a/share/hedgewars/Data/Themes/Deepspace/theme.cfg Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Themes/Deepspace/theme.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -4,6 +4,6 @@
water-bottom = $2A, $2A, $2A
water-opacity = $CC
music = hell.ogg
-clouds = 9
+clouds = 0
flakes = 50, 1, 1000, 50, 50
;1, 1000, 50, 50 are copied from bamboo theme, as these numbers are required
Binary file share/hedgewars/Data/Themes/Digital/LandTex.png has changed
Binary file share/hedgewars/Data/Themes/Digital/Sky.png has changed
Binary file share/hedgewars/Data/Themes/Golf/Bag.png has changed
Binary file share/hedgewars/Data/Themes/Golf/Ball.png has changed
Binary file share/hedgewars/Data/Themes/Golf/BlueWater.png has changed
Binary file share/hedgewars/Data/Themes/Golf/Car.png has changed
Binary file share/hedgewars/Data/Themes/Golf/Chunk.png has changed
Binary file share/hedgewars/Data/Themes/Golf/Clouds.png has changed
Binary file share/hedgewars/Data/Themes/Golf/Club2.png has changed
Binary file share/hedgewars/Data/Themes/Golf/Flake.png has changed
Binary file share/hedgewars/Data/Themes/Golf/LandBackTex.png has changed
Binary file share/hedgewars/Data/Themes/Golf/LandTex.png has changed
Binary file share/hedgewars/Data/Themes/Golf/Sky.png has changed
Binary file share/hedgewars/Data/Themes/Golf/SkyL.png has changed
Binary file share/hedgewars/Data/Themes/Golf/SkyR.png has changed
Binary file share/hedgewars/Data/Themes/Golf/Tee.png has changed
Binary file share/hedgewars/Data/Themes/Golf/horizont.png has changed
--- a/share/hedgewars/Data/Themes/Golf/theme.cfg Sat Oct 08 16:45:52 2011 +0200
+++ b/share/hedgewars/Data/Themes/Golf/theme.cfg Sat Oct 08 16:54:56 2011 +0200
@@ -1,13 +1,14 @@
sky = 34, 67, 135
border = 38, 114, 35
-water-top = $54, $5C, $9D
-water-bottom = $34, $3C, $7D
-water-opacity = $80
+water-top = 72, 105, 127
+water-bottom = 37, 76, 91
+water-opacity = 128
music = Golf.ogg
clouds = 9
object = Hole, 2, 0, 31, 123, 1, 1, 31, 0, 40, 27
object = Car, 1, 78, 320, 80, 30, 1, 0, 0, 330, 220
-object = Club, 2, 180, 175, 5, 1, 2, 189, 155, 15, 20, 0, 0, 100, 100
+object = Club, 3, 180, 175, 5, 1, 2, 189, 155, 15, 20, 0, 0, 100, 100
+object = Club2, 1, 126, 26, 1, 1, 2, 0, 0, 20, 30, 240, 23, 15, 10
object = Flag1, 1, 0, 305, 15, 5, 1, 20, 0, 103, 260
object = Flag2, 1, 40, 305, 10, 4, 1, 0, 0, 53, 270
object = Flag3, 1, 0, 280, 12, 7, 1, 30, 0, 112, 260
--- a/tools/CMakeLists.txt Sat Oct 08 16:45:52 2011 +0200
+++ b/tools/CMakeLists.txt Sat Oct 08 16:54:56 2011 +0200
@@ -32,9 +32,11 @@
string(REGEX REPLACE "(.*);-.*" "\\1" sdl_dir "${SDL_LIBRARY}")
#this tool is present in qt 4.5 but only if you compile from sources; from qt 4.6 is present also in the binary version
- find_program(macdeployqt_EXE NAMES macdeployqt macdeployqt-mac PATHS ${qt_base_dir}/bin NO_DEFAULT_PATH)
+ find_program(macdeployqt_EXE NAMES macdeployqt macdeployqt-mac PATHS ${qt_base_dir}/bin)
if(NOT macdeployqt_EXE)
- message(FATAL_ERROR "The utility macdeployqt is required to create the bundle!")
+ message(FATAL_ERROR "The utility macdeployqt is required to create the bundle (seached: ${qt_base_dir})")
+ else()
+ message(STATUS "macdeployqt found in ${macdeployqt_EXE}")
endif()
#dummy target, we're interested in the postscript file
