summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog9
-rw-r--r--overworld/overworld.pro25
-rw-r--r--pokebattle/Arena.cpp5
-rw-r--r--pokebattle/Arena.h25
-rw-r--r--pokebattle/TeamMember.h3
-rw-r--r--pokegen.spec16
-rw-r--r--pokegen/Audio.h4
-rw-r--r--pokegen/PokeGen.h46
-rw-r--r--pokegen/pokegen.pro38
-rw-r--r--pokemod/CoinListObject.cpp2
-rw-r--r--pokemodr/Pokemodr.cpp4
-rw-r--r--pokemodr/PokemodrPreferences.cpp2
-rw-r--r--pokemodr/PokemodrUI.cpp20
-rw-r--r--pokemodr/gui/rules.ui2
-rw-r--r--pokemodr/pokemodr.tex6
15 files changed, 117 insertions, 90 deletions
diff --git a/Changelog b/Changelog
index 5db3c2a7..5ad38ce9 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,13 @@
-----------------
+Rev: 204
+Date: 9 June 2008
+User: MathStuf
+-----------------
+[FIX] Added some signals to Arena
+[FIX] Cleaned up some stuff in other .pro files
+[FIX] Renamed everywhere to use "Pokémodr" and "Pokégen"
+
+-----------------
Rev: 203
Date: 8 June 2008
User: MathStuf
diff --git a/overworld/overworld.pro b/overworld/overworld.pro
index 31799577..98fbc111 100644
--- a/overworld/overworld.pro
+++ b/overworld/overworld.pro
@@ -1,13 +1,18 @@
-OBJECTS_DIR = .obj
-DESTDIR = ../../lib
+include(../version.pri)
TEMPLATE = lib
-LIBS += -L../../lib -lgeneral -lpokemod
+OBJECTS_DIR = .obj
+MOC_DIR = .moc
+DOC_DIR = ../doc
+DESTDIR = ../bin
+INSTALLDIR = lib$$system(kde4-config --libsuffix)
+LIBS += -L../../lib \
+ -lpokemod
CONFIG += qt \
-warn_on \
-dll \
-exceptions
-INCLUDEPATH += ../pokemod \
-../general
-TARGETDEPS += ../../lib/libpokemod.so \
-../../lib/libgeneral.so
+ warn_on \
+ dll
+
+include(../install.pri)
+include(../kde4.pri)
+
+include(../headers.pri)
diff --git a/pokebattle/Arena.cpp b/pokebattle/Arena.cpp
index fe70d7ff..eda64717 100644
--- a/pokebattle/Arena.cpp
+++ b/pokebattle/Arena.cpp
@@ -18,3 +18,8 @@
// Header include
#include "Arena.h"
+void Pokebattle::Arena::cleanUp()
+{
+ delete m_arena;
+ m_arena = 0;
+}
diff --git a/pokebattle/Arena.h b/pokebattle/Arena.h
index be2dc1a2..40f9e738 100644
--- a/pokebattle/Arena.h
+++ b/pokebattle/Arena.h
@@ -27,6 +27,9 @@
namespace Pokebattle
{
+// Forward declarations
+class TeamMember;
+
class Arena : public QObject
{
Q_OBJECT
@@ -42,17 +45,27 @@ class Arena : public QObject
void setTeams(QList<Team*> teams);
signals:
- // TODO: What signals need to be done here?
void battleStart();
- void battleEnd();
void roundStart();
- void roundEnd();
- void turnStart();
- void turnEnd();
+ void turnStart(TeamMember* teamMember);
+
+ void sentOut(TeamMember* teamMember);
+ void actionChosen(TeamMember* teamMember);
+ void itemExecuted(TeamMember* teamMember);
+ void attackExecuted(TeamMember* teamMember);
+ void itemUsed(TeamMember* teamMember);
+ void attackUsed(TeamMember* teamMember);
+ void attackMissed(TeamMember* teamMember);
+ void attackHit(TeamMember* teamMember);
+ void faint(TeamMember* teamMember);
- void action();
+ void turnEnd(TeamMember* teamMember);
+
+ void roundEnd();
+
+ void battleEnd();
public slots:
protected slots:
void cleanUp();
diff --git a/pokebattle/TeamMember.h b/pokebattle/TeamMember.h
index 15c08361..79b7b324 100644
--- a/pokebattle/TeamMember.h
+++ b/pokebattle/TeamMember.h
@@ -26,6 +26,9 @@ namespace Pokebattle
class TeamMember : public QObject
{
Q_OBJECT
+
+ public:
+ TeamMember();
};
}
diff --git a/pokegen.spec b/pokegen.spec
index c8d9897a..d89b5746 100644
--- a/pokegen.spec
+++ b/pokegen.spec
@@ -1,7 +1,7 @@
Name: pokegen
Version: 0.0.2
-Release: 1%{?dist}
-Summary: PokéGen is a game aiming to be a customizable Pokémon-like game
+Release: 1%{?dist}-svn202
+Summary: Pokégen is a game aiming to be a customizable Pokémon-like game
Group: Amusements/Games
License: GPLv3+
@@ -12,10 +12,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdelibs4-devel tetex-latex desktop-file-utils
%description
-PokéGen is a game engine that is meant to be a customizable
+Pokégen is a game engine that is meant to be a customizable
Pokémon-like game. The following is provided:
-PokéMod - library for interfacing with PokéMod files
-PokéModr - modding program
+Pokémod - library for interfacing with Pokémod files
+Pokémodr - modding program
%package devel
Summary: Files needed to develop programs which use PokéGen
@@ -25,7 +25,7 @@ Requires: qt4-devel
%description devel
Development files used for creating apps based on the PokéMod
-library, PokéModr modding program, or the PokéGen game engine.
+library, Pokémodr modding program, or the Pokégen game engine.
%prep
@@ -124,6 +124,10 @@ rm -rf ${buildroot}
%changelog
+* Sun Jun 08 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-2
+- New SVN revision
+- Fixes for name change
+
* Sun Jun 08 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-1
- Rebuild for version 0.0.2
diff --git a/pokegen/Audio.h b/pokegen/Audio.h
index 115d2590..3edbfa49 100644
--- a/pokegen/Audio.h
+++ b/pokegen/Audio.h
@@ -15,8 +15,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __AUDIO__
-#define __AUDIO__
+#ifndef __POKEGEN_AUDIO__
+#define __POKEGEN_AUDIO__
// Qt includes
// #include <Phonon>
diff --git a/pokegen/PokeGen.h b/pokegen/PokeGen.h
index 537f2656..3ceb5bc7 100644
--- a/pokegen/PokeGen.h
+++ b/pokegen/PokeGen.h
@@ -1,39 +1,35 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: pokegen/PokeGen.h
-// Purpose: Main window for PokéGen
-// Author: Ben Boeckel
-// Modified by: Ben Boeckel
-// Created: Thu Jan 16 16:14:22 2007
-// Copyright: ©2007-2008 Ben Boeckel and Nerdy Productions
-// Licence:
-// 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, either version 3 of the License, or
-// (at your option) any later version.
-//
-// 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, see <http://www.gnu.org/licenses/>.
-/////////////////////////////////////////////////////////////////////////////
+/*
+ * Copyright 2007-2008 Ben Boeckel <MathStuf@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, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
#ifndef __POKEGEN_MAIN__
#define __POKEGEN_MAIN__
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+// KDE includes
+#include <KApplication>
+#include <KCmdLineArgs>
int main(int argc, char* argv[])
{
KApplication app;
// TODO
- KAboutData about("pokegen", "", ki18n("PokéGen"), VERSION_STRING, ki18n(""), License_Unknown, ki18n("©2007-2008 Ben Boeckel and Nerdy Productions"), ki18n(""), "http://sourceforge.net/projects/pokegen");
+ KAboutData about("pokegen", "", ki18n("Pokégen"), "0.0.2", ki18n(""), License_Unknown, ki18n("©2007-2008 Ben Boeckel and Nerdy Productions"), ki18n(""), "http://sourceforge.net/projects/pokegen");
about.setLicenseTextFile(ki18n("LICENSE"));
// TODO
- about.setProgramName(ki18n(""));
+ about.setProgramName(ki18n("Pokégen"));
about.addAuthor("Ben Boeckel", ki18n("Lead Programmer"), "MathStuf@gmail.com", "http://nerdyproductions.sobertillnoon.com");
about.addCredit("Peter Fernandes", ki18n("Ideas"), "supersonicandtails@gmail.com", "http://www.hypersonicsoft.org");
about.addCredit("Kevin Kofler", ki18n("Qt and KDE help"), "kevin.kofler@chello.at", "http://www.tigen.org/kevin.kofler");
diff --git a/pokegen/pokegen.pro b/pokegen/pokegen.pro
index ec811fb4..3fd503fd 100644
--- a/pokegen/pokegen.pro
+++ b/pokegen/pokegen.pro
@@ -1,32 +1,24 @@
-include(../version.pro)
+include(../version.pri)
+TEMPLATE = app
OBJECTS_DIR = .obj
+MOC_DIR = .moc
+DOC_DIR = ../doc
DESTDIR = ../bin
-TEMPLATE = app
-LIBS += -L../bin -lgeneral -lpokemod -loverworld -lbattle -laudio -lmenus
+INSTALLDIR = bin
+LIBS += -L../bin \
+ -lpokemod \
+ -lpokebattle \
+ -lpokeworld
CONFIG += qt \
gui \
- warn_on \
- exceptions
-TARGETDEPS += ../bin/libpokemod.so \
- ../lib/liboverworld.so \
- ../lib/libmenus.so \
- ../lib/libgeneral.so \
- ../lib/libbattle.so
+ warn_on
-include(../latex.pro)
-include(../kde4.pro)
+include(../install.pri)
+include(../latex.pri)
+include(../kde4.pri)
+include(../readme.pri)
LATEX += pokegen.tex
-isEmpty(PREFIX) {
- PREFIX = $$(PREFIX)
-}
-isEmpty(PREFIX) {
- PREFIX = /usr
-}
-target.path = $$PREFIX/bin
-documentation.path = $$PREFIX/share/doc/pokegen/pokegen-$${VERSION}
-documentation.files = ../doc/pokegen.pdf
-documentation.depends = ../doc/pokegen.pdf
-INSTALLS += target documentation
+include(../headers.pri)
diff --git a/pokemod/CoinListObject.cpp b/pokemod/CoinListObject.cpp
index 9720884d..38aafdda 100644
--- a/pokemod/CoinListObject.cpp
+++ b/pokemod/CoinListObject.cpp
@@ -22,7 +22,7 @@
#include "CoinList.h"
#include "Pokemod.h"
-const QStringList Pokemod::CoinListObject::TypeStr = QStringList() << "Item" << QString::fromUtf8("Pokémon");
+const QStringList Pokemod::CoinListObject::TypeStr = QStringList() << "Item" << "Team Member";
Pokemod::CoinListObject::CoinListObject(const CoinListObject& object) :
Object("CoinListObject", object.parent(), object.id())
diff --git a/pokemodr/Pokemodr.cpp b/pokemodr/Pokemodr.cpp
index 62e579bf..0c5aabfc 100644
--- a/pokemodr/Pokemodr.cpp
+++ b/pokemodr/Pokemodr.cpp
@@ -57,9 +57,9 @@ int main(int argc, char* argv[])
qInstallMsgHandler(messageHandler);
QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale());
- KAboutData about("pokemodr", "pokemodr", ki18n("PokéModr"), VERSION_STRING, ki18n(""), KAboutData::License_Custom, ki18n("©2007-2008 Ben Boeckel and Nerdy Productions"), ki18n("This program offers an easy interface so that PokéMods can be easily created."), "http://sourceforge.net/projects/pokegen");
+ KAboutData about("pokemodr", "pokemodr", ki18n("Pokémodr"), VERSION_STRING, ki18n(""), KAboutData::License_Custom, ki18n("©2007-2008 Ben Boeckel and Nerdy Productions"), ki18n("This program offers an easy interface so that PokéMods can be easily created."), "http://sourceforge.net/projects/pokegen");
about.setLicenseTextFile("LICENSE");
- about.setProgramName(ki18n("PokéModr"));
+ about.setProgramName(ki18n("Pokémodr"));
about.addAuthor(ki18n("Ben Boeckel"), ki18n("Lead Programmer"), "MathStuf@gmail.com", "");
about.addCredit(ki18n("Peter Fernandes"), ki18n("Ideas"), "supersonicandtails@gmail.com", "http://www.hypersonicsoft.org");
about.addCredit(ki18n("Kevin Kofler"), ki18n("Qt, KDE, debugging help"), "kevin.kofler@chello.at", "http://www.tigen.org/kevin.kofler");
diff --git a/pokemodr/PokemodrPreferences.cpp b/pokemodr/PokemodrPreferences.cpp
index 5c7ef7f5..4a5e04c7 100644
--- a/pokemodr/PokemodrPreferences.cpp
+++ b/pokemodr/PokemodrPreferences.cpp
@@ -28,7 +28,7 @@ Pokemodr::PokemodrPreferences::PokemodrPreferences(QWidget* parent, KConfigGroup
KDialog(parent),
m_config(config)
{
- setCaption(QString::fromUtf8("PokéModr Preferences"));
+ setCaption(QString::fromUtf8("Pokémodr Preferences"));
setButtons(KDialog::Ok | KDialog::Cancel);
varReloadOnOpen = new QCheckBox("Reload files on open");
varReloadOnOpen->setChecked(m_config.readEntry("reloadOnStart", false) ? Qt::Checked : Qt::Unchecked);
diff --git a/pokemodr/PokemodrUI.cpp b/pokemodr/PokemodrUI.cpp
index 423daf82..0cc15987 100644
--- a/pokemodr/PokemodrUI.cpp
+++ b/pokemodr/PokemodrUI.cpp
@@ -94,7 +94,7 @@ void Pokemodr::PokemodrUI::closeEvent(QCloseEvent* event)
void Pokemodr::PokemodrUI::setChangedTitle(const bool changed)
{
- setWindowTitle(QString::fromUtf8("%1%2 - PokéModr").arg(treePokemod->description(treePokemod->currentIndex()), changed ? "*" : ""));
+ setWindowTitle(QString::fromUtf8("%1%2 - Pokémodr").arg(treePokemod->description(treePokemod->currentIndex()), changed ? "*" : ""));
}
void Pokemodr::PokemodrUI::setDirty(const bool dirty)
@@ -110,7 +110,7 @@ void Pokemodr::PokemodrUI::newPokemod()
void Pokemodr::PokemodrUI::openPokemod()
{
- KUrl::List urls = KFileDialog::getOpenUrls(KUrl("kfiledialog:///pokemod"), QString::fromUtf8("*.pmod|PokéMod files"), this);
+ KUrl::List urls = KFileDialog::getOpenUrls(KUrl("kfiledialog:///pokemod"), QString::fromUtf8("*.pmod|Pokémod files"), this);
foreach (KUrl url, urls)
{
if (!url.isEmpty())
@@ -123,7 +123,7 @@ bool Pokemodr::PokemodrUI::openPokemod(const KUrl& url)
bool opened = false;
if (treePokemod->isOpen(url))
{
- KMessageBox::error(this, "File is already opened", QString::fromUtf8("PokéMod error"));
+ KMessageBox::error(this, "File is already opened", QString::fromUtf8("Pokémod error"));
return false;
}
if (url.isLocalFile())
@@ -158,10 +158,10 @@ bool Pokemodr::PokemodrUI::openPokemod(const QString& path, const bool isRemote)
return true;
}
else
- KMessageBox::error(this, QString::fromUtf8("The file is not a PokéMod."), QString::fromUtf8("Invalid PokéMod"));
+ KMessageBox::error(this, QString::fromUtf8("The file is not a Pokémod."), QString::fromUtf8("Invalid Pokémod"));
}
else
- KMessageBox::error(this, "The file is not a valid XML file.", QString::fromUtf8("Invalid PokéMod"));
+ KMessageBox::error(this, "The file is not a valid XML file.", QString::fromUtf8("Invalid Pokémod"));
file.close();
}
else
@@ -198,7 +198,7 @@ bool Pokemodr::PokemodrUI::savePokemod(const Pokemod::Pokemod* pokemod, const KU
return true;
}
else
- KMessageBox::error(this, QString::fromUtf8("Error saving the PokéMod!"), "Save error");
+ KMessageBox::error(this, QString::fromUtf8("Error saving the Pokémod!"), "Save error");
}
else
{
@@ -215,7 +215,7 @@ bool Pokemodr::PokemodrUI::savePokemod(const Pokemod::Pokemod* pokemod, const KU
KMessageBox::error(this, KIO::NetAccess::lastErrorString(), "KIO Error");
}
else
- KMessageBox::error(this, QString::fromUtf8("Error saving the PokéMod!"), "Save error");
+ KMessageBox::error(this, QString::fromUtf8("Error saving the Pokémod!"), "Save error");
}
}
return false;
@@ -230,7 +230,7 @@ void Pokemodr::PokemodrUI::saveAsPokemod(const Pokemod::Pokemod* pokemod)
{
if (pokemod)
{
- KUrl url = KFileDialog::getSaveUrl(KUrl("kfiledialog:///pokemod"), QString::fromUtf8("*.pmod|PokéMod files"), this, QString::fromUtf8("Open PokéMod"));
+ KUrl url = KFileDialog::getSaveUrl(KUrl("kfiledialog:///pokemod"), QString::fromUtf8("*.pmod|Pokémod files"), this, QString::fromUtf8("Open Pokémod"));
if (!url.isEmpty())
{
if (savePokemod(pokemod, url))
@@ -252,9 +252,9 @@ bool Pokemodr::PokemodrUI::closePokemod(const Pokemod::Pokemod* pokemod, const b
{
int result;
if (force)
- result = KMessageBox::questionYesNo(this, "You have unsaved changes, would you like to save them?", QString::fromUtf8("Unsaved PokéMod"));
+ result = KMessageBox::questionYesNo(this, "You have unsaved changes, would you like to save them?", QString::fromUtf8("Unsaved Pokémod"));
else
- result = KMessageBox::questionYesNoCancel(this, "You have unsaved changes, would you like to save them?", QString::fromUtf8("Unsaved PokéMod"));
+ result = KMessageBox::questionYesNoCancel(this, "You have unsaved changes, would you like to save them?", QString::fromUtf8("Unsaved PokémMod"));
switch (result)
{
case KMessageBox::Yes:
diff --git a/pokemodr/gui/rules.ui b/pokemodr/gui/rules.ui
index a88ab5e0..5c0e8a51 100644
--- a/pokemodr/gui/rules.ui
+++ b/pokemodr/gui/rules.ui
@@ -243,7 +243,7 @@
</attribute>
<layout class="QVBoxLayout" >
<item>
- <widget class="QGroupBox" name="boxPokemonBoxes" >
+ <widget class="QGroupBox" name="boxBoxes" >
<property name="title" >
<string>Storage</string>
</property>
diff --git a/pokemodr/pokemodr.tex b/pokemodr/pokemodr.tex
index a429ead6..f7810970 100644
--- a/pokemodr/pokemodr.tex
+++ b/pokemodr/pokemodr.tex
@@ -2,7 +2,7 @@
\newcommand{\version}{0.0.1}
-\title{Pok\'eModr v\version}
+\title{Pok\'emodr v\version}
\author{Ben Boeckel $<$\texttt{\href{mailto:mathStuf@gmail.com}%
{MathStuf@gmail.com}}$>$}
@@ -14,7 +14,7 @@
filecolor=red,%
linkcolor=red,%
pdfauthor={Ben Boeckel},%
- pdftitle={Pok\'eModr Documentation},%
+ pdftitle={Pok\'emodr Documentation},%
}
\usepackage{listings}
\usepackage{color}
@@ -117,7 +117,7 @@ Abilities add an extra dimension to the battle system. Abilities can help turn t
Abilities are responsible for keeping track of any information they change during their execution and restoring it if necessary. Changing anything that is not local to the battle will persist after the battle is over (this allows status afflictions and moves that are permanently overwritten to persist). Take note that anything that is species-wide will not persist no matter what happens during the battle (i.e. types, base stats, effort values) since these are copied for the battle so that they can be modified for strategic purposes.
-The APIs for the battle system will be under development in the near future with the beta release of Pok\'eModr.
+The APIs for the battle system will be under development in the near future with the beta release of Pok\'emodr.
\subsection{Variables}
\label{ability-variables}
generated by cgit (git 2.34.1) at 2024-10-07 16:30:36 +0000