summaryrefslogtreecommitdiff
path: root/data/help
diff options
context:
space:
mode:
Diffstat (limited to 'data/help')
-rw-r--r--data/help/about.txt49
-rw-r--r--data/help/changes.txt5
-rw-r--r--data/help/commands.txt14
-rw-r--r--data/help/header.txt8
-rw-r--r--data/help/index.txt2
-rw-r--r--data/help/skills.txt2
-rw-r--r--data/help/support.txt6
-rw-r--r--data/help/team.txt180
8 files changed, 122 insertions, 144 deletions
diff --git a/data/help/about.txt b/data/help/about.txt
index 812aad84..79840ad6 100644
--- a/data/help/about.txt
+++ b/data/help/about.txt
@@ -1,17 +1,40 @@
<- @@index|Back to Index@@
-##3 === ABOUT THE MANA WORLD ===
+##3 === ABOUT Aethyra ===
- ##2The Mana World (TMW)##P is a serious effort to create an innovative free
- and open source MMORPG. TMW uses 2D graphics and aims to create a
- large and diverse interactive world. It is licensed under the GPL,
- making sure this game can't ever run away from you.
-
- The project includes the development of both a client and a server,
- as well as the development of an online world. At the moment we're
- making alpha releases of the client, while our server is in early
- development. The eAthena free software Ragnarok Online server is used
- until our own server has matured enough to replace it. Once ready,
- we'll be making releases of our server too so anybody will be free to
- set up their own server and start building their own online world.
+ ##2Aethyra (Ae)##P Aethyra is a 2D MMORPG, using the eAthena server
+ (an open-source clone of the commercial Ragnarok Online server). It
+ features expanding lands and community-made graphics, making for a
+ fun, free, open source community project.
+
+ ##PAethyra started out as "The Mana Experiment," an experimental
+ test-server for community-developed content designed for The Mana
+ World which was put into action by Blame, Sanga, and Sertaline.
+ ##PSoon thereafter, it became evident that it was taking far too
+ long for the elitist development team at The Mana World to
+ implement good tested-content. They made excuses and treated the
+ long-awaited custom server TMWServ as the answer to all the problems,
+ and left the eAthena server (which The Mana World still runs on)
+ to rot. Many development team members lost interest in helping, and
+ the programmers forsook the eAthena server saying that it would
+ simply delay TMWServ progress for months to fix the simplest of
+ errors. In response to this, The Mana Experiment became a fork
+ project, and an official game server.
+ ##PTime passed, and more and more content was tested and implemented.
+ Soon, discussion began for a name. Aethyra was chosen, and the Game
+ you see now was setup. Content development has never been better, and
+ the staff never more motivated! Stay on the lookout for more exciting
+ Aethyra developments!
+
+##3 === Aethyra's Goal ===
+
+ ##PAethyra is a community driven experiment that utilizes eAthena at
+ its core with the end goal of getting its players as involved in the
+ process as much as possible. It's originally forked from The Mana
+ World when its developers came up with the idea of "Why should we
+ have to wait for an MMORPG game in development when we've already got
+ a great server setup here that does everything we've been promised
+ and more?" ##P As such, we are trying to implement as many functions
+ of eAthena as possible while creating our own in the process based
+ on what our players want to see.
diff --git a/data/help/changes.txt b/data/help/changes.txt
index d05dd5cb..e679e928 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -3,6 +3,10 @@
##3 === RECENT CHANGES ===
+<<<<<<< HEAD:data/help/changes.txt
+Go to http://gitorious.org/projects/tmw/repos/aethyra for a detailed
+list of changes.
+=======
0.0.26 (29 August 2008)
- Added support for a newer version of eAthena server
- Added support for showing custom being effects
@@ -68,4 +72,5 @@
- Fixed a crash in equipment window on failure to load an item icon
- Fixed a crash on filling up your inventory
- Fixed item list in shops not to scroll back when selling
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/changes.txt
diff --git a/data/help/commands.txt b/data/help/commands.txt
index e98cb677..e80c537e 100644
--- a/data/help/commands.txt
+++ b/data/help/commands.txt
@@ -27,11 +27,9 @@
##2Alt + T##P toggle ignore of incoming trades
##2A##P target nearest monster
##2H##P hide all non-sticky windows
- ##2G or Z##P pick up item
+ ##2Z##P pick up item
##2Enter##P focus chat window / send message
- ##2Shift##P hold it when attacking to lock target for auto
- attack
-
+
##2MOUSE:
@@ -50,10 +48,18 @@
/whisper <name> <message>
+<<<<<<< HEAD:data/help/commands.txt
+ This will send <message> to player <name>, if that player is logged in.
+ to whisper to users with spaces in there name you must incase the user name in qoutes
+ (e.g. /whisper "user name" <message>)
+
+ For further help type /help in the chat console.
+=======
This will send <message> to player <name>, if that player is logged in. If the
name has a space in it, put double quotes around it like this:
/whisper "<name>" <message>
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/commands.txt
##2IGNORING COMMUNICATION
diff --git a/data/help/header.txt b/data/help/header.txt
index 462deaa2..a560895c 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -1,9 +1,13 @@
-##1 T H E M A N A W O R L D
+##1 AETHYRA
##1 ==========================================
+<<<<<<< HEAD:data/help/header.txt
+ ##2Version:##6 Aethyra GIT 0.0.27 ##2Date:##5 December 2008
+=======
##2Version:##6 0.0.26 ##2Date:##329 August 2008
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/header.txt
-##2 Website: http://themanaworld.org
+##2 Website: http://www.aethyra.org
diff --git a/data/help/index.txt b/data/help/index.txt
index b7262f85..4dcc2332 100644
--- a/data/help/index.txt
+++ b/data/help/index.txt
@@ -1,6 +1,6 @@
##3 === INDEX ===
- -> @@about|About The Mana World@@
+ -> @@about|About Aethyra@@
-> @@team|Development Team@@
-> @@changes|Recent Changes@@
diff --git a/data/help/skills.txt b/data/help/skills.txt
index 84d5bc5a..3a075ee0 100644
--- a/data/help/skills.txt
+++ b/data/help/skills.txt
@@ -11,5 +11,7 @@
##2Level 1:##P enables the ability to trade with others
##2Level 2:##P enables the ability to express emotions
##2Level 3:##P enables character to sit
+ ##2Level 5:##P enables a char to join a party.
+ ##2Level 7:##P enables a char to create a party
Other levels are still not implemented.
\ No newline at end of file
diff --git a/data/help/support.txt b/data/help/support.txt
index dfbd588d..819516de 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -7,11 +7,15 @@
can't find a solution to your problem, feel free to check our
Bugs/Support section of the forum:
+<<<<<<< HEAD:data/help/support.txt
+##2 http://forums.aethyra.com
+=======
##2 http://forums.themanaworld.org/viewforum.php?f=3
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/support.txt
or come visit us on our IRC channel:
-##2 #themanaworld ##P@##2 irc.freenode.net
+##2 #aethyra ##P@##2 irc.freenode.net
Otherwise see the @@team|Development Team@@ section to have a list of
developers and how to contact them.
diff --git a/data/help/team.txt b/data/help/team.txt
index e17771d5..dfd00d4b 100644
--- a/data/help/team.txt
+++ b/data/help/team.txt
@@ -2,131 +2,65 @@
##3 === DEVELOPMENT TEAM ===
-
-##2 Project Leader:
-
- ##9Eugenio Favalli (aka ElvenProgrammer)
- elvenprogrammer@gmail.com
-
-
+
+##2 Administration:
+
+ ##9Blua Server Administrator/Content Development
+
+ ##9MrDan Forum Administrator/GM
+
+ ##9Slinker Game Server Host
+
+ ##9Tametomo Project Head/Artist/Client Developer/Ubuntu Package Maintainer/Misc.
+
##2 Programmers:
-
- ##9Bjorn Lindeijer (aka Hammerbear)
- b_lindeijer@users.sourceforge.net
- (various parts, GUI, graphics, A* and map rewrites)
-
- ##9Björn Steinbrink (aka Doener)
- der_doener@users.sourceforge.net
- (various parts)
-
- ##9Eric Scrivner (aka zenogais)
- bitshift2002@users.sourceforge.net
- (resource manager)
-
- ##9J. Avila (aka Javila)
- javila@users.sourceforge.net
- (various parts, GUI)
-
- ##9Jan-Fabian Humann (aka Mra)
- malastare@users.sourceforge.net
- (some GUI parts)
-
- ##9Kiyoshi Kyokai (aka Kiokay)
- kyokai@users.sourceforge.net
- (game systems designer)
-
- ##9Mateusz Kaduk (aka Usiu)
- usiu@users.sourceforge.net
- (several GUI parts)
-
- ##9Aaron Marks (aka nym)
- nymacro@users.sourceforge.net
- (several GUI parts)
-
- ##9Shura
- kth5@users.sourceforge.net
- (configuration, sound, misc. ports)
-
- ##9Yohann Ferreira (aka Bertram)
- bertram25@users.sourceforge.net
- (SDL input, progress bar drawing, Debian package)
-
+
+ ##9Kraant Developer
+ <kraant@gmail.com>
##2 Artists:
-
- ##9Clef
- (tiles, concepts)
-
- ##9Frode Lindeijer (aka Modanung)
- f.lindeijer@xs4all.nl
- (arts)
-
- ##9Gnulia
- (conceptual art)
-
- ##9Magick
- (music and sound effects)
-
- ##9Neko-mon
- (player sprites, various things)
-
- ##9Neorice
- (monster sprites, tiles)
-
- ##9Pajarico
- pajarico@users.sourceforge.net
- (conceptual arts)
-
- ##9Romulo Fernandes
- razor85@users.sourceforge.net
- (arts)
-
- ##9Rotonen
- rotonen@users.sourceforge.net
- (backstory, art director, music, sound)
-
- ##9Talaroc
- talaroc@users.sourceforge.net
- (sprites)
-
- ##9Ti Sing Hao
- (music)
-
+
+ ##9Angeliex Artist
+
+ ##9Bawabawa/Kyron/Pyrestriker Artist/SuSe Package Contributor
+
+ ##9Frictor Head Artist
+
+##2 Mappers:
+
+ ##9Arkyan Mapper
+
+ ##9GonzoDark Mapper
+
+##2 Content Development:
+
+ ##9Moose
+
+##2 GMs
+
+ ##9Grimmjow
+
+ ##9SoftLace1
+
+ ##9Srauls
##2 Misc. thanks:
-
- ##9David Smith (aka catfish_man)
- catfish_man@users.sourceforge.net
- (Mac package)
-
- ##9Igor Morgado (aka imorgado)
- imorgado@users.sourceforge.net
- (tester)
-
- ##9maci
- maci321@users.sourceforge.net
- (technical support)
-
- ##9Rodney Dawes (aka dobey)
- dobey@users.sourceforge.net
- (Mac package)
-
- ##9Ultramichy
- (hosting test server)
-
-
-##2 Inactive/retired:
-
- ##9Chetic
- chetic@users.sourceforge.net
- (maps)
-
- ##9Simon Edwardsson (aka SimEdw)
- simonedw@users.sourceforge.net
- (network code, Mac package)
-
- ##9Sull
- (hosting CVS and related services)
-
- ##9Vlady
- (several items)
+
+ ##9doorsman Testing
+
+ ##9Snoopy Testing
+
+ ##9Tarax Testing
+
+##2 Leave of Absence
+
+ ##9Blame Developer/GM
+ <blame@aethyra.com>
+
+ ##9Sanga Head Developer/GM ("Sanga")
+ <sanga@aethyra.com>
+
+ ##9Scraggy Client Developer
+ <DougABoffey@netscape.net>
+
+ ##9Sert Head Artist/GM