tmw-damasca-commit Mailing List for The Mana World: Damasca
Status: Planning
Brought to you by:
crush_tmw
Menu
▾
▴
tmw-damasca-commit — commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(6) |
Dec
(4) |
|---|
|
From: <cru...@us...> - 2007-12-09 17:26:16
|
Revision: 29
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=29&view=rev
Author: crush_tmw
Date: 2007-12-09 09:26:20 -0800 (Sun, 09 Dec 2007)
Log Message:
-----------
Wrapped kingdom descriptions properly.
Modified Paths:
--------------
server/trunk/data/kingdoms.xml
Modified: server/trunk/data/kingdoms.xml
===================================================================
--- server/trunk/data/kingdoms.xml 2007-12-09 17:25:59 UTC (rev 28)
+++ server/trunk/data/kingdoms.xml 2007-12-09 17:26:20 UTC (rev 29)
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<!--
-Temporary test file - the attribute values are set to values that optimize testing.
+This file is assumed to be the same on the client and the server. Please always keep both versions sync.
-->
<kingdoms>
<kingdom id="1">
@@ -8,11 +8,17 @@
<smallimage>graphics/images/crests/alkemiacrest100100.png</smallimage>
<largeimage>graphics/images/crests/alkemiacrest200200.png</largeimage>
<description>
- Wheras Delthians concentrate on defensive magic and Cleric skills, Alkemia prefers to study offensive magic.
+ Wheras Delthians concentrate on defensive magic and Cleric skills, Alkemia prefers to
+ study offensive magic.
- Their training is almost completely centered around the study of magic for attack. A well-trained mage can be devastating in combat, as long as his magic power holds out. As a result, however, they tend to suffer in defensive powers, relying instead on magical equipment to make up for it.
+ Their training is almost completely centered around the study of magic for attack. A
+ well-trained mage can be devastating in combat, as long as his magic power holds
+ out. As a result, however, they tend to suffer in defensive powers, relying instead on
+ magical equipment to make up for it.
- After being driven out of Dureign by Arnoth, Alkemia has been repopulating on Dachtura. They battle with Keldor over the lands, each one convinced that the continent belongs to them and no other.
+ After being driven out of Dureign by Arnoth, Alkemia has been repopulating on Dachtura.
+ They battle with Keldor over the lands, each one convinced that the continent belongs
+ to them and no other.
</description>
<attributes
str="1"
@@ -29,7 +35,13 @@
<smallimage>graphics/images/crests/arnothcrest100100.png</smallimage>
<largeimage>graphics/images/crests/arnothcrest200200.png</largeimage>
<description>
- Arnothians are durable warriors with a knack for taking a beating. They have the highest defensive capability of anyone, able to withstand blow after blow as they use brute force to smash through groups of enemies with a greater chance of survival than most fighters. Nevertheless, no Arnothian is unkillable, and their preference to slow, heavy weaponry to balance out their damaging power makes them vulnerable to "death by a thousand stings". Reckless combat against dangerous mobs of enemies will almost always result in an ironic defeat.
+ Arnothians are durable warriors with a knack for taking a beating. They have the highest
+ defensive capability of anyone, able to withstand blow after blow as they use brute
+ force to smash through groups of enemies with a greater chance of survival than most
+ fighters. Nevertheless, no Arnothian is unkillable, and their preference to slow, heavy
+ weaponry to balance out their damaging power makes them vulnerable to "death by a
+ thousand stings". Reckless combat against dangerous mobs of enemies will almost
+ always result in an ironic defeat.
</description>
<attributes
str="4"
@@ -46,11 +58,16 @@
<smallimage>graphics/images/crests/delthiacrest100100.png</smallimage>
<largeimage>graphics/images/crests/delthiacrest200200.png</largeimage>
<description>
- Delthia began as a political offshoot of Alkemia. While Alkemia is obsessed with using magic to advance their status and conquer anything in their way, Delthians are more peaceful and prefer to use it to benefit others.
+ Delthia began as a political offshoot of Alkemia. While Alkemia is obsessed with using
+ magic to advance their status and conquer anything in their way, Delthians are more
+ peaceful and prefer to use it to benefit others.
- Delthian training consists primarily of Cleric skills such as magical defensive powers, healing spells, and general aid. They also specialize in teleportation.
+ Delthian training consists primarily of Cleric skills such as magical defensive powers,
+ healing spells, and general aid. They also specialize in teleportation.
- Delthians are generally more strategic than anyone else, as their powers have to be carefully applied in order to win in a fight. They are most effective in Parties, where they can keep members alive and healthy.
+ Delthians are generally more strategic than anyone else, as their powers have to be
+ carefully applied in order to win in a fight. They are most effective in Parties, where
+ they can keep members alive and healthy.
</description>
<attributes
str="1"
@@ -67,7 +84,15 @@
<smallimage>graphics/images/crests/ganiadacrest100100.png</smallimage>
<largeimage>graphics/images/crests/ganiadacrest200200.png</largeimage>
<description>
- Ganiada, situated in the badlands of Dureign, is a land filled with merchants, thieves and assassins, all of whom are interdependent. To say Ganiada brings to mind images of stealth, trickery, salesmanship, and deadly speed. Their preferred weaponry are concealed in nature, a class that includes daggers, blackjacks, and thrown darts, married with a compliment of loose-fitting brown leather cloaks and black fatigues, topped off with loose-fitting turbans to further conceal their identities. At times, to further enhance this effect, they also wear black paint on their faces. Unfortunately, their choice in clothing means that if a Ganiadan is caught with the edge of a blade, they have no armour to protect them.
+ Ganiada, situated in the badlands of Dureign, is a land filled with merchants, thieves
+ and assassins, all of whom are interdependent. To say Ganiada brings to mind images
+ of stealth, trickery, salesmanship, and deadly speed. Their preferred weaponry are
+ concealed in nature, a class that includes daggers, blackjacks, and thrown darts,
+ married with a compliment of loose-fitting brown leather cloaks and black fatigues,
+ topped off with loose-fitting turbans to further conceal their identities. At times,
+ to further enhance this effect, they also wear black paint on their faces. Unfortunately,
+ their choice in clothing means that if a Ganiadan is caught with the edge of a blade,
+ they have no armour to protect them.
</description>
<attributes
str="2"
@@ -84,7 +109,12 @@
<smallimage>graphics/images/crests/keldorcrest100100.png</smallimage>
<largeimage>graphics/images/crests/keldorcrest200200.png</largeimage>
<description>
- Keldor is a very honour bound kingdom; a person is only as good as his word. They also hold healers in very high regard and as such think very highly of Delthia. Keldarii Aspect Warriors are figures of awe to the people and are treated with hospitality and respect, in turn the Warriors are often found policing the countryside, trying to rid the kingdom of monsters and bandits. The hope is, a Keldarii Warrior is never too busy to help someone in need.
+ Keldor is a very honour bound kingdom; a person is only as good as his word. They also
+ hold healers in very high regard and as such think very highly of Delthia. Keldarii Aspect
+ Warriors are figures of awe to the people and are treated with hospitality and respect, in
+ turn the Warriors are often found policing the countryside, trying to rid the kingdom of
+ monsters and bandits. The hope is, a Keldarii Warrior is never too busy to help someone
+ in need.
</description>
<attributes
str="3"
@@ -101,11 +131,22 @@
<smallimage>graphics/images/crests/kiyandacrest100100.png</smallimage>
<largeimage>graphics/images/crests/kiyandacrest200200.png</largeimage>
<description>
- Kiyanda has a long history of valiant fighters who use their amazing skill for the furtherment of peace and justice, making Kiyanda's name synonymous with honour. Its fighters posess unmatched speed and agility in combat, with a strict moral code that keeps them from becoming disoriented during stressful situations.
+ Kiyanda has a long history of valiant fighters who use their amazing skill for they
+ furthermentof peace and justice, making Kiyanda's name synonymous with honour.
+ Its fighters posess unmatched speed and agility in combat, with a strict moral code
+ that keeps them from becoming disoriented during stressful situations.
- Kiyandan armor is exceptionally light, and are formed so that it provides the greatest amount of freedom of movement as possible. While the armor will not stop many blows, it enables the soldier to move faster and outmaneuver their opponents, crushing them with a devastating flurry of light attacks with either light melee weaponry such as long rapiers or katanas, or unarmed combat.
+ Kiyandan armor is exceptionally light, and are formed so that it provides the greatest
+ amount of freedom of movement as possible. While the armor will not stop many
+ blows, ut enables the soldier to move faster and outmaneuver their opponents, crushing
+ them with a devastating flurry of light attacks with either light melee weaponry such
+ as long rapiers or katanas, or unarmed combat.
- Since this has been largely ineffective against most higher levels of armor, Kiyandans are also trained to be proficient with archery, with the intent to slow down their enemies' advance while weakening their armor and morale before arriving at melee range. This tactic balances it out against the brute force policy other kingdoms such as Arnoth adopt for their armies.
+ Since this has been largely ineffective against most higher levels of armor,
+ Kiyandans are also trained to be proficient with archery, with the intent to slow
+ down their enemies' advance while weakening their armor and morale before arriving at
+ melee range. This tactic balances it out against the brute force policy other kingdoms
+ such as Arnoth adopt for their armies.
</description>
<attributes
str="4"
@@ -122,9 +163,18 @@
<smallimage>graphics/images/crests/halkonascrest100100.png</smallimage>
<largeimage>graphics/images/crests/halkonascrest100100.png</largeimage>
<description>
- Citizens of this fallen kingdom tend to think in very limited terms, i.e. their own survival first and the rest of Damasca second. Those who manage to overcome this tunnel vision and see the planet as a whole are few. Practice with a favored weapon, as well as sharpening one's skills to make the most use and profit from them, is the rule, not the exception. This kingdom is populated only by those who have suffered to make a living; everyone else has died.
+ Citizens of this fallen kingdom tend to think in very limited terms, i.e. their own
+ survival first and the rest of Damasca second. Those who manage to overcome this
+ tunnel vision and see the planet as a whole are few. Practice with a favored weapon,
+ as well as sharpening one's skills to make the most use and profit from them, is the
+ rule, not the exception. This kingdom is populated only by those who have suffered to
+ make a living; everyone else has died.
- Compassion and mercy are rare qualities in any Halkonas citizen, as they are of no use in day-to-day survival. The citizens of Halkonas are somewhat akin to fencers; Not the strongest on the battlefield, but with a flurry of pinpoint-accurate strikes, they emerge victorious in the end. Halkonas' training regimen focuses on skill, rather than brute force, as the great equalizer.
+ Compassion and mercy are rare qualities in any Halkonas citizen, as they are of no use
+ in day-to-day survival. The citizens of Halkonas are somewhat akin to fencers; Not the
+ strongest on the battlefield, but with a flurry of pinpoint-accurate strikes, they
+ emerge victorious in the end. Halkonas' training regimen focuses on skill, rather than
+ brute force, as the great equalizer.
</description>
<attributes
str="3"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-12-09 17:25:58
|
Revision: 28
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=28&view=rev
Author: crush_tmw
Date: 2007-12-09 09:25:59 -0800 (Sun, 09 Dec 2007)
Log Message:
-----------
Wrapped kingdom descriptions properly.
Modified Paths:
--------------
client/trunk/data/kingdoms.xml
Modified: client/trunk/data/kingdoms.xml
===================================================================
--- client/trunk/data/kingdoms.xml 2007-12-09 16:56:39 UTC (rev 27)
+++ client/trunk/data/kingdoms.xml 2007-12-09 17:25:59 UTC (rev 28)
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<!--
-Temporary test file - the attribute values are set to values that optimize testing.
+This file is assumed to be the same on the client and the server. Please always keep both versions sync.
-->
<kingdoms>
<kingdom id="1">
@@ -8,11 +8,17 @@
<smallimage>graphics/images/crests/alkemiacrest100100.png</smallimage>
<largeimage>graphics/images/crests/alkemiacrest200200.png</largeimage>
<description>
- Wheras Delthians concentrate on defensive magic and Cleric skills, Alkemia prefers to study offensive magic.
+ Wheras Delthians concentrate on defensive magic and Cleric skills, Alkemia prefers to
+ study offensive magic.
- Their training is almost completely centered around the study of magic for attack. A well-trained mage can be devastating in combat, as long as his magic power holds out. As a result, however, they tend to suffer in defensive powers, relying instead on magical equipment to make up for it.
+ Their training is almost completely centered around the study of magic for attack. A
+ well-trained mage can be devastating in combat, as long as his magic power holds
+ out. As a result, however, they tend to suffer in defensive powers, relying instead on
+ magical equipment to make up for it.
- After being driven out of Dureign by Arnoth, Alkemia has been repopulating on Dachtura. They battle with Keldor over the lands, each one convinced that the continent belongs to them and no other.
+ After being driven out of Dureign by Arnoth, Alkemia has been repopulating on Dachtura.
+ They battle with Keldor over the lands, each one convinced that the continent belongs
+ to them and no other.
</description>
<attributes
str="1"
@@ -29,7 +35,13 @@
<smallimage>graphics/images/crests/arnothcrest100100.png</smallimage>
<largeimage>graphics/images/crests/arnothcrest200200.png</largeimage>
<description>
- Arnothians are durable warriors with a knack for taking a beating. They have the highest defensive capability of anyone, able to withstand blow after blow as they use brute force to smash through groups of enemies with a greater chance of survival than most fighters. Nevertheless, no Arnothian is unkillable, and their preference to slow, heavy weaponry to balance out their damaging power makes them vulnerable to "death by a thousand stings". Reckless combat against dangerous mobs of enemies will almost always result in an ironic defeat.
+ Arnothians are durable warriors with a knack for taking a beating. They have the highest
+ defensive capability of anyone, able to withstand blow after blow as they use brute
+ force to smash through groups of enemies with a greater chance of survival than most
+ fighters. Nevertheless, no Arnothian is unkillable, and their preference to slow, heavy
+ weaponry to balance out their damaging power makes them vulnerable to "death by a
+ thousand stings". Reckless combat against dangerous mobs of enemies will almost
+ always result in an ironic defeat.
</description>
<attributes
str="4"
@@ -46,11 +58,16 @@
<smallimage>graphics/images/crests/delthiacrest100100.png</smallimage>
<largeimage>graphics/images/crests/delthiacrest200200.png</largeimage>
<description>
- Delthia began as a political offshoot of Alkemia. While Alkemia is obsessed with using magic to advance their status and conquer anything in their way, Delthians are more peaceful and prefer to use it to benefit others.
+ Delthia began as a political offshoot of Alkemia. While Alkemia is obsessed with using
+ magic to advance their status and conquer anything in their way, Delthians are more
+ peaceful and prefer to use it to benefit others.
- Delthian training consists primarily of Cleric skills such as magical defensive powers, healing spells, and general aid. They also specialize in teleportation.
+ Delthian training consists primarily of Cleric skills such as magical defensive powers,
+ healing spells, and general aid. They also specialize in teleportation.
- Delthians are generally more strategic than anyone else, as their powers have to be carefully applied in order to win in a fight. They are most effective in Parties, where they can keep members alive and healthy.
+ Delthians are generally more strategic than anyone else, as their powers have to be
+ carefully applied in order to win in a fight. They are most effective in Parties, where
+ they can keep members alive and healthy.
</description>
<attributes
str="1"
@@ -67,7 +84,15 @@
<smallimage>graphics/images/crests/ganiadacrest100100.png</smallimage>
<largeimage>graphics/images/crests/ganiadacrest200200.png</largeimage>
<description>
- Ganiada, situated in the badlands of Dureign, is a land filled with merchants, thieves and assassins, all of whom are interdependent. To say Ganiada brings to mind images of stealth, trickery, salesmanship, and deadly speed. Their preferred weaponry are concealed in nature, a class that includes daggers, blackjacks, and thrown darts, married with a compliment of loose-fitting brown leather cloaks and black fatigues, topped off with loose-fitting turbans to further conceal their identities. At times, to further enhance this effect, they also wear black paint on their faces. Unfortunately, their choice in clothing means that if a Ganiadan is caught with the edge of a blade, they have no armour to protect them.
+ Ganiada, situated in the badlands of Dureign, is a land filled with merchants, thieves
+ and assassins, all of whom are interdependent. To say Ganiada brings to mind images
+ of stealth, trickery, salesmanship, and deadly speed. Their preferred weaponry are
+ concealed in nature, a class that includes daggers, blackjacks, and thrown darts,
+ married with a compliment of loose-fitting brown leather cloaks and black fatigues,
+ topped off with loose-fitting turbans to further conceal their identities. At times,
+ to further enhance this effect, they also wear black paint on their faces. Unfortunately,
+ their choice in clothing means that if a Ganiadan is caught with the edge of a blade,
+ they have no armour to protect them.
</description>
<attributes
str="2"
@@ -84,7 +109,12 @@
<smallimage>graphics/images/crests/keldorcrest100100.png</smallimage>
<largeimage>graphics/images/crests/keldorcrest200200.png</largeimage>
<description>
- Keldor is a very honour bound kingdom; a person is only as good as his word. They also hold healers in very high regard and as such think very highly of Delthia. Keldarii Aspect Warriors are figures of awe to the people and are treated with hospitality and respect, in turn the Warriors are often found policing the countryside, trying to rid the kingdom of monsters and bandits. The hope is, a Keldarii Warrior is never too busy to help someone in need.
+ Keldor is a very honour bound kingdom; a person is only as good as his word. They also
+ hold healers in very high regard and as such think very highly of Delthia. Keldarii Aspect
+ Warriors are figures of awe to the people and are treated with hospitality and respect, in
+ turn the Warriors are often found policing the countryside, trying to rid the kingdom of
+ monsters and bandits. The hope is, a Keldarii Warrior is never too busy to help someone
+ in need.
</description>
<attributes
str="3"
@@ -101,11 +131,22 @@
<smallimage>graphics/images/crests/kiyandacrest100100.png</smallimage>
<largeimage>graphics/images/crests/kiyandacrest200200.png</largeimage>
<description>
- Kiyanda has a long history of valiant fighters who use their amazing skill for the furtherment of peace and justice, making Kiyanda's name synonymous with honour. Its fighters posess unmatched speed and agility in combat, with a strict moral code that keeps them from becoming disoriented during stressful situations.
+ Kiyanda has a long history of valiant fighters who use their amazing skill for they
+ furthermentof peace and justice, making Kiyanda's name synonymous with honour.
+ Its fighters posess unmatched speed and agility in combat, with a strict moral code
+ that keeps them from becoming disoriented during stressful situations.
- Kiyandan armor is exceptionally light, and are formed so that it provides the greatest amount of freedom of movement as possible. While the armor will not stop many blows, it enables the soldier to move faster and outmaneuver their opponents, crushing them with a devastating flurry of light attacks with either light melee weaponry such as long rapiers or katanas, or unarmed combat.
+ Kiyandan armor is exceptionally light, and are formed so that it provides the greatest
+ amount of freedom of movement as possible. While the armor will not stop many
+ blows, ut enables the soldier to move faster and outmaneuver their opponents, crushing
+ them with a devastating flurry of light attacks with either light melee weaponry such
+ as long rapiers or katanas, or unarmed combat.
- Since this has been largely ineffective against most higher levels of armor, Kiyandans are also trained to be proficient with archery, with the intent to slow down their enemies' advance while weakening their armor and morale before arriving at melee range. This tactic balances it out against the brute force policy other kingdoms such as Arnoth adopt for their armies.
+ Since this has been largely ineffective against most higher levels of armor,
+ Kiyandans are also trained to be proficient with archery, with the intent to slow
+ down their enemies' advance while weakening their armor and morale before arriving at
+ melee range. This tactic balances it out against the brute force policy other kingdoms
+ such as Arnoth adopt for their armies.
</description>
<attributes
str="4"
@@ -122,9 +163,18 @@
<smallimage>graphics/images/crests/halkonascrest100100.png</smallimage>
<largeimage>graphics/images/crests/halkonascrest100100.png</largeimage>
<description>
- Citizens of this fallen kingdom tend to think in very limited terms, i.e. their own survival first and the rest of Damasca second. Those who manage to overcome this tunnel vision and see the planet as a whole are few. Practice with a favored weapon, as well as sharpening one's skills to make the most use and profit from them, is the rule, not the exception. This kingdom is populated only by those who have suffered to make a living; everyone else has died.
+ Citizens of this fallen kingdom tend to think in very limited terms, i.e. their own
+ survival first and the rest of Damasca second. Those who manage to overcome this
+ tunnel vision and see the planet as a whole are few. Practice with a favored weapon,
+ as well as sharpening one's skills to make the most use and profit from them, is the
+ rule, not the exception. This kingdom is populated only by those who have suffered to
+ make a living; everyone else has died.
- Compassion and mercy are rare qualities in any Halkonas citizen, as they are of no use in day-to-day survival. The citizens of Halkonas are somewhat akin to fencers; Not the strongest on the battlefield, but with a flurry of pinpoint-accurate strikes, they emerge victorious in the end. Halkonas' training regimen focuses on skill, rather than brute force, as the great equalizer.
+ Compassion and mercy are rare qualities in any Halkonas citizen, as they are of no use
+ in day-to-day survival. The citizens of Halkonas are somewhat akin to fencers; Not the
+ strongest on the battlefield, but with a flurry of pinpoint-accurate strikes, they
+ emerge victorious in the end. Halkonas' training regimen focuses on skill, rather than
+ brute force, as the great equalizer.
</description>
<attributes
str="3"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-12-09 16:56:35
|
Revision: 27
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=27&view=rev
Author: crush_tmw
Date: 2007-12-09 08:56:39 -0800 (Sun, 09 Dec 2007)
Log Message:
-----------
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/data/kingdoms.xml
client/trunk/src/net/protocol.h
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2007-12-08 21:43:23 UTC (rev 26)
+++ client/trunk/ChangeLog 2007-12-09 16:56:39 UTC (rev 27)
@@ -1,5 +1,10 @@
-2007-11-22 Philipp Sehmisch <tm...@cr...>
+2007-12-09 Philipp Sehmisch <tm...@cr...>
+ * data/kingdoms.xml: Synchronized client- and server kingdom list.
+ * src/net/protocol.h: Updated a protocol Comment.
+
+2007-11-22 Philipp Sehmisch <tm...@cr...>
+
* src/gui/char_select.cpp, src/gui/char_select.h,
src/accountserver.cpp, src/accountserver.h, src/gui/icon.cpp,
src/gui/icon.h, data/kingdoms.xml,
Modified: client/trunk/data/kingdoms.xml
===================================================================
--- client/trunk/data/kingdoms.xml 2007-12-08 21:43:23 UTC (rev 26)
+++ client/trunk/data/kingdoms.xml 2007-12-09 16:56:39 UTC (rev 27)
@@ -1,20 +1,26 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0"?>
+<!--
+Temporary test file - the attribute values are set to values that optimize testing.
+-->
<kingdoms>
<kingdom id="1">
<name>Alkemia</name>
<smallimage>graphics/images/crests/alkemiacrest100100.png</smallimage>
<largeimage>graphics/images/crests/alkemiacrest200200.png</largeimage>
<description>
- Enter Alkemia description here.
+ Wheras Delthians concentrate on defensive magic and Cleric skills, Alkemia prefers to study offensive magic.
+
+ Their training is almost completely centered around the study of magic for attack. A well-trained mage can be devastating in combat, as long as his magic power holds out. As a result, however, they tend to suffer in defensive powers, relying instead on magical equipment to make up for it.
+
+ After being driven out of Dureign by Arnoth, Alkemia has been repopulating on Dachtura. They battle with Keldor over the lands, each one convinced that the continent belongs to them and no other.
</description>
<attributes
- str="10"
- end="8"
- agi="5"
+ str="1"
+ end="1"
+ agi="2"
apt="4"
cha="2"
- spr="1"
+ spr="4"
luk="1"
/>
</kingdom>
@@ -23,16 +29,16 @@
<smallimage>graphics/images/crests/arnothcrest100100.png</smallimage>
<largeimage>graphics/images/crests/arnothcrest200200.png</largeimage>
<description>
- Enter Arnoth description here.
+ Arnothians are durable warriors with a knack for taking a beating. They have the highest defensive capability of anyone, able to withstand blow after blow as they use brute force to smash through groups of enemies with a greater chance of survival than most fighters. Nevertheless, no Arnothian is unkillable, and their preference to slow, heavy weaponry to balance out their damaging power makes them vulnerable to "death by a thousand stings". Reckless combat against dangerous mobs of enemies will almost always result in an ironic defeat.
</description>
<attributes
- str="10"
- end="8"
- agi="5"
- apt="4"
- cha="2"
+ str="4"
+ end="5"
+ agi="1"
+ apt="1"
+ cha="1"
spr="1"
- luk="1"
+ luk="2"
/>
</kingdom>
<kingdom id="3">
@@ -40,15 +46,19 @@
<smallimage>graphics/images/crests/delthiacrest100100.png</smallimage>
<largeimage>graphics/images/crests/delthiacrest200200.png</largeimage>
<description>
- Enter Delthia description here.
+ Delthia began as a political offshoot of Alkemia. While Alkemia is obsessed with using magic to advance their status and conquer anything in their way, Delthians are more peaceful and prefer to use it to benefit others.
+
+ Delthian training consists primarily of Cleric skills such as magical defensive powers, healing spells, and general aid. They also specialize in teleportation.
+
+ Delthians are generally more strategic than anyone else, as their powers have to be carefully applied in order to win in a fight. They are most effective in Parties, where they can keep members alive and healthy.
</description>
<attributes
- str="10"
- end="8"
- agi="5"
+ str="1"
+ end="1"
+ agi="2"
apt="4"
- cha="2"
- spr="1"
+ cha="4"
+ spr="2"
luk="1"
/>
</kingdom>
@@ -57,16 +67,16 @@
<smallimage>graphics/images/crests/ganiadacrest100100.png</smallimage>
<largeimage>graphics/images/crests/ganiadacrest200200.png</largeimage>
<description>
- Enter Ganiada description here.
+ Ganiada, situated in the badlands of Dureign, is a land filled with merchants, thieves and assassins, all of whom are interdependent. To say Ganiada brings to mind images of stealth, trickery, salesmanship, and deadly speed. Their preferred weaponry are concealed in nature, a class that includes daggers, blackjacks, and thrown darts, married with a compliment of loose-fitting brown leather cloaks and black fatigues, topped off with loose-fitting turbans to further conceal their identities. At times, to further enhance this effect, they also wear black paint on their faces. Unfortunately, their choice in clothing means that if a Ganiadan is caught with the edge of a blade, they have no armour to protect them.
</description>
<attributes
- str="10"
- end="8"
+ str="2"
+ end="1"
agi="5"
- apt="4"
- cha="2"
- spr="1"
- luk="1"
+ apt="1"
+ cha="1"
+ spr="2"
+ luk="3"
/>
</kingdom>
<kingdom id="5">
@@ -74,16 +84,16 @@
<smallimage>graphics/images/crests/keldorcrest100100.png</smallimage>
<largeimage>graphics/images/crests/keldorcrest200200.png</largeimage>
<description>
- Enter Keldor description here.
+ Keldor is a very honour bound kingdom; a person is only as good as his word. They also hold healers in very high regard and as such think very highly of Delthia. Keldarii Aspect Warriors are figures of awe to the people and are treated with hospitality and respect, in turn the Warriors are often found policing the countryside, trying to rid the kingdom of monsters and bandits. The hope is, a Keldarii Warrior is never too busy to help someone in need.
</description>
<attributes
- str="10"
- end="8"
- agi="5"
- apt="4"
- cha="2"
+ str="3"
+ end="3"
+ agi="2"
+ apt="1"
+ cha="3"
spr="1"
- luk="1"
+ luk="2"
/>
</kingdom>
<kingdom id="6">
@@ -91,34 +101,39 @@
<smallimage>graphics/images/crests/kiyandacrest100100.png</smallimage>
<largeimage>graphics/images/crests/kiyandacrest200200.png</largeimage>
<description>
- Enter Kiyanda description here.
+ Kiyanda has a long history of valiant fighters who use their amazing skill for the furtherment of peace and justice, making Kiyanda's name synonymous with honour. Its fighters posess unmatched speed and agility in combat, with a strict moral code that keeps them from becoming disoriented during stressful situations.
+
+ Kiyandan armor is exceptionally light, and are formed so that it provides the greatest amount of freedom of movement as possible. While the armor will not stop many blows, it enables the soldier to move faster and outmaneuver their opponents, crushing them with a devastating flurry of light attacks with either light melee weaponry such as long rapiers or katanas, or unarmed combat.
+
+ Since this has been largely ineffective against most higher levels of armor, Kiyandans are also trained to be proficient with archery, with the intent to slow down their enemies' advance while weakening their armor and morale before arriving at melee range. This tactic balances it out against the brute force policy other kingdoms such as Arnoth adopt for their armies.
</description>
<attributes
- str="10"
- end="8"
- agi="5"
- apt="4"
+ str="4"
+ end="2"
+ agi="3"
+ apt="1"
cha="2"
- spr="1"
- luk="1"
+ spr="2"
+ luk="2"
/>
</kingdom>
<kingdom id="7">
- <name></name>
- <smallimage></smallimage>
- <largeimage></largeimage>
+ <name>Halkonas</name>
+ <smallimage>graphics/images/crests/halkonascrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/halkonascrest100100.png</largeimage>
<description>
- Enter description of 7th kingdom here....
- And while you are on it, enter the name and the image paths, too and add the graphics :)
+ Citizens of this fallen kingdom tend to think in very limited terms, i.e. their own survival first and the rest of Damasca second. Those who manage to overcome this tunnel vision and see the planet as a whole are few. Practice with a favored weapon, as well as sharpening one's skills to make the most use and profit from them, is the rule, not the exception. This kingdom is populated only by those who have suffered to make a living; everyone else has died.
+
+ Compassion and mercy are rare qualities in any Halkonas citizen, as they are of no use in day-to-day survival. The citizens of Halkonas are somewhat akin to fencers; Not the strongest on the battlefield, but with a flurry of pinpoint-accurate strikes, they emerge victorious in the end. Halkonas' training regimen focuses on skill, rather than brute force, as the great equalizer.
</description>
<attributes
- str="10"
- end="8"
- agi="5"
- apt="4"
- cha="2"
+ str="3"
+ end="3"
+ agi="4"
+ apt="1"
+ cha="1"
spr="1"
- luk="1"
+ luk="2"
/>
</kingdom>
Modified: client/trunk/src/net/protocol.h
===================================================================
--- client/trunk/src/net/protocol.h 2007-12-08 21:43:23 UTC (rev 26)
+++ client/trunk/src/net/protocol.h 2007-12-09 16:56:39 UTC (rev 27)
@@ -45,7 +45,7 @@
APMSG_LOGIN_RESPONSE = 0x0012, // B error
PAMSG_LOGOUT = 0x0013, // -
APMSG_LOGOUT_RESPONSE = 0x0014, // B error
- PAMSG_CHAR_CREATE = 0x0020, // S name, B hair style, B hair color, B gender, W*6 stats
+ PAMSG_CHAR_CREATE = 0x0020, // S name, B hair style, B hair color, B kingdom, B gender
APMSG_CHAR_CREATE_RESPONSE = 0x0021, // B error
PAMSG_CHAR_DELETE = 0x0022, // B index
APMSG_CHAR_DELETE_RESPONSE = 0x0023, // B error
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-12-08 21:43:18
|
Revision: 26
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=26&view=rev
Author: therunefox
Date: 2007-12-08 13:43:23 -0800 (Sat, 08 Dec 2007)
Log Message:
-----------
Modified Paths:
--------------
server/trunk/data/kingdoms.xml
Added Paths:
-----------
client/trunk/data/graphics/images/crests/halkonascrest100100.png
client/trunk/data/graphics/images/crests/halkonascrest200200.png
Added: client/trunk/data/graphics/images/crests/halkonascrest100100.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/halkonascrest100100.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/images/crests/halkonascrest200200.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/halkonascrest200200.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: server/trunk/data/kingdoms.xml
===================================================================
--- server/trunk/data/kingdoms.xml 2007-11-22 04:45:16 UTC (rev 25)
+++ server/trunk/data/kingdoms.xml 2007-12-08 21:43:23 UTC (rev 26)
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<!--
Temporary test file - the attribute values are set to values that optimize testing.
-->
@@ -8,16 +8,20 @@
<smallimage>graphics/images/crests/alkemiacrest100100.png</smallimage>
<largeimage>graphics/images/crests/alkemiacrest200200.png</largeimage>
<description>
- Enter Alkemia description here.
+ Wheras Delthians concentrate on defensive magic and Cleric skills, Alkemia prefers to study offensive magic.
+
+ Their training is almost completely centered around the study of magic for attack. A well-trained mage can be devastating in combat, as long as his magic power holds out. As a result, however, they tend to suffer in defensive powers, relying instead on magical equipment to make up for it.
+
+ After being driven out of Dureign by Arnoth, Alkemia has been repopulating on Dachtura. They battle with Keldor over the lands, each one convinced that the continent belongs to them and no other.
</description>
<attributes
- str="11"
- end="12"
- agi="13"
- apt="14"
- cha="15"
- spr="16"
- luk="17"
+ str="1"
+ end="1"
+ agi="2"
+ apt="4"
+ cha="2"
+ spr="4"
+ luk="1"
/>
</kingdom>
<kingdom id="2">
@@ -25,16 +29,16 @@
<smallimage>graphics/images/crests/arnothcrest100100.png</smallimage>
<largeimage>graphics/images/crests/arnothcrest200200.png</largeimage>
<description>
- Enter Arnoth description here.
+ Arnothians are durable warriors with a knack for taking a beating. They have the highest defensive capability of anyone, able to withstand blow after blow as they use brute force to smash through groups of enemies with a greater chance of survival than most fighters. Nevertheless, no Arnothian is unkillable, and their preference to slow, heavy weaponry to balance out their damaging power makes them vulnerable to "death by a thousand stings". Reckless combat against dangerous mobs of enemies will almost always result in an ironic defeat.
</description>
<attributes
- str="21"
- end="22"
- agi="23"
- apt="24"
- cha="25"
- spr="26"
- luk="27"
+ str="4"
+ end="5"
+ agi="1"
+ apt="1"
+ cha="1"
+ spr="1"
+ luk="2"
/>
</kingdom>
<kingdom id="3">
@@ -42,16 +46,20 @@
<smallimage>graphics/images/crests/delthiacrest100100.png</smallimage>
<largeimage>graphics/images/crests/delthiacrest200200.png</largeimage>
<description>
- Enter Delthia description here.
+ Delthia began as a political offshoot of Alkemia. While Alkemia is obsessed with using magic to advance their status and conquer anything in their way, Delthians are more peaceful and prefer to use it to benefit others.
+
+ Delthian training consists primarily of Cleric skills such as magical defensive powers, healing spells, and general aid. They also specialize in teleportation.
+
+ Delthians are generally more strategic than anyone else, as their powers have to be carefully applied in order to win in a fight. They are most effective in Parties, where they can keep members alive and healthy.
</description>
<attributes
- str="31"
- end="32"
- agi="33"
- apt="34"
- cha="35"
- spr="36"
- luk="37"
+ str="1"
+ end="1"
+ agi="2"
+ apt="4"
+ cha="4"
+ spr="2"
+ luk="1"
/>
</kingdom>
<kingdom id="4">
@@ -59,16 +67,16 @@
<smallimage>graphics/images/crests/ganiadacrest100100.png</smallimage>
<largeimage>graphics/images/crests/ganiadacrest200200.png</largeimage>
<description>
- Enter Ganiada description here.
+ Ganiada, situated in the badlands of Dureign, is a land filled with merchants, thieves and assassins, all of whom are interdependent. To say Ganiada brings to mind images of stealth, trickery, salesmanship, and deadly speed. Their preferred weaponry are concealed in nature, a class that includes daggers, blackjacks, and thrown darts, married with a compliment of loose-fitting brown leather cloaks and black fatigues, topped off with loose-fitting turbans to further conceal their identities. At times, to further enhance this effect, they also wear black paint on their faces. Unfortunately, their choice in clothing means that if a Ganiadan is caught with the edge of a blade, they have no armour to protect them.
</description>
<attributes
- str="41"
- end="42"
- agi="43"
- apt="44"
- cha="45"
- spr="46"
- luk="47"
+ str="2"
+ end="1"
+ agi="5"
+ apt="1"
+ cha="1"
+ spr="2"
+ luk="3"
/>
</kingdom>
<kingdom id="5">
@@ -76,16 +84,16 @@
<smallimage>graphics/images/crests/keldorcrest100100.png</smallimage>
<largeimage>graphics/images/crests/keldorcrest200200.png</largeimage>
<description>
- Enter Keldor description here.
+ Keldor is a very honour bound kingdom; a person is only as good as his word. They also hold healers in very high regard and as such think very highly of Delthia. Keldarii Aspect Warriors are figures of awe to the people and are treated with hospitality and respect, in turn the Warriors are often found policing the countryside, trying to rid the kingdom of monsters and bandits. The hope is, a Keldarii Warrior is never too busy to help someone in need.
</description>
<attributes
- str="51"
- end="52"
- agi="53"
- apt="54"
- cha="55"
- spr="56"
- luk="57"
+ str="3"
+ end="3"
+ agi="2"
+ apt="1"
+ cha="3"
+ spr="1"
+ luk="2"
/>
</kingdom>
<kingdom id="6">
@@ -93,34 +101,39 @@
<smallimage>graphics/images/crests/kiyandacrest100100.png</smallimage>
<largeimage>graphics/images/crests/kiyandacrest200200.png</largeimage>
<description>
- Enter Kiyanda description here.
+ Kiyanda has a long history of valiant fighters who use their amazing skill for the furtherment of peace and justice, making Kiyanda's name synonymous with honour. Its fighters posess unmatched speed and agility in combat, with a strict moral code that keeps them from becoming disoriented during stressful situations.
+
+ Kiyandan armor is exceptionally light, and are formed so that it provides the greatest amount of freedom of movement as possible. While the armor will not stop many blows, it enables the soldier to move faster and outmaneuver their opponents, crushing them with a devastating flurry of light attacks with either light melee weaponry such as long rapiers or katanas, or unarmed combat.
+
+ Since this has been largely ineffective against most higher levels of armor, Kiyandans are also trained to be proficient with archery, with the intent to slow down their enemies' advance while weakening their armor and morale before arriving at melee range. This tactic balances it out against the brute force policy other kingdoms such as Arnoth adopt for their armies.
</description>
<attributes
- str="61"
- end="62"
- agi="63"
- apt="64"
- cha="65"
- spr="66"
- luk="67"
+ str="4"
+ end="2"
+ agi="3"
+ apt="1"
+ cha="2"
+ spr="2"
+ luk="2"
/>
</kingdom>
<kingdom id="7">
- <name></name>
- <smallimage></smallimage>
- <largeimage></largeimage>
+ <name>Halkonas</name>
+ <smallimage>graphics/images/crests/halkonascrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/halkonascrest100100.png</largeimage>
<description>
- Enter description of 7th kingdom here....
- And while you are on it, enter the name and the image paths, too and add the graphics :)
+ Citizens of this fallen kingdom tend to think in very limited terms, i.e. their own survival first and the rest of Damasca second. Those who manage to overcome this tunnel vision and see the planet as a whole are few. Practice with a favored weapon, as well as sharpening one's skills to make the most use and profit from them, is the rule, not the exception. This kingdom is populated only by those who have suffered to make a living; everyone else has died.
+
+ Compassion and mercy are rare qualities in any Halkonas citizen, as they are of no use in day-to-day survival. The citizens of Halkonas are somewhat akin to fencers; Not the strongest on the battlefield, but with a flurry of pinpoint-accurate strikes, they emerge victorious in the end. Halkonas' training regimen focuses on skill, rather than brute force, as the great equalizer.
</description>
<attributes
- str="71"
- end="72"
- agi="73"
- apt="74"
- cha="75"
- spr="76"
- luk="77"
+ str="3"
+ end="3"
+ agi="4"
+ apt="1"
+ cha="1"
+ spr="1"
+ luk="2"
/>
</kingdom>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-11-22 04:45:12
|
Revision: 25
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=25&view=rev
Author: crush_tmw
Date: 2007-11-21 20:45:16 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Implemented kingdom selection and start attributes based on kingdom.
Modified Paths:
--------------
server/trunk/ChangeLog
server/trunk/accountserver.exe
server/trunk/src/account-server/accounthandler.cpp
server/trunk/src/account-server/character.cpp
server/trunk/src/account-server/character.hpp
server/trunk/src/defines.h
server/trunk/tmw.db
Added Paths:
-----------
server/trunk/data/kingdoms.xml
Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog 2007-11-22 03:15:52 UTC (rev 24)
+++ server/trunk/ChangeLog 2007-11-22 04:45:16 UTC (rev 25)
@@ -1,5 +1,27 @@
-2007-19-28 Philipp Sehmisch <tm...@cr...>
+2007-11-22 Philipp Sehmisch <tm...@cr...>
+ * src/account-server/accounthandler.cpp,
+ src/account-server/character.cpp,
+ src/account-server/character.hpp,
+ src/defines.h, data/kingdoms.xml: Implemented kingdom selection and
+ start attributes based on kingdom.
+
+2007-11-04 Philipp Sehmisch <tm...@cr...>
+
+ * src/account-server/character.hpp,
+ src/account-server/dalstorage.cpp,
+ src/account-server/dalstorage.hpp,
+ src/defines.h,
+ src/game-server/being.cpp,
+ src/game-server/being.hpp,
+ src/game-server/character.cpp,
+ src/game-server/itemmanager.cpp,
+ src/game-server/monster.cpp:
+ Replaced TMWs basic attributes with the Damasca basic attributes,
+ removed dodging and added kingdom to character properties.
+
+2007-10-28 Philipp Sehmisch <tm...@cr...>
+
* src/game-server/movingobject.hpp,
src/game-server/accountconnection.cpp
src/game-server/movingobject.cpp,
@@ -10,7 +32,7 @@
knockback and stun after getting hit.
*
-2007-19-26 Philipp Sehmisch <tm...@cr...>
+2007-10-26 Philipp Sehmisch <tm...@cr...>
* data/maps/beta-test1.tmx.gz, data/maps/beta-test1.tmx: Using
uncompressed map for more efficient version control. Added monster
@@ -19,7 +41,7 @@
* src/game-server/being.cpp, src/game-server/monster.cpp: Made
combat a bit more fair for the player.
-2007-19-25 Philipp Sehmisch <tm...@cr...>
+2007-10-25 Philipp Sehmisch <tm...@cr...>
* data/items.xml, data/monsters.xml: Added required resource
files.
Modified: server/trunk/accountserver.exe
===================================================================
(Binary files differ)
Added: server/trunk/data/kingdoms.xml
===================================================================
--- server/trunk/data/kingdoms.xml (rev 0)
+++ server/trunk/data/kingdoms.xml 2007-11-22 04:45:16 UTC (rev 25)
@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+<!--
+Temporary test file - the attribute values are set to values that optimize testing.
+-->
+<kingdoms>
+ <kingdom id="1">
+ <name>Alkemia</name>
+ <smallimage>graphics/images/crests/alkemiacrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/alkemiacrest200200.png</largeimage>
+ <description>
+ Enter Alkemia description here.
+ </description>
+ <attributes
+ str="11"
+ end="12"
+ agi="13"
+ apt="14"
+ cha="15"
+ spr="16"
+ luk="17"
+ />
+ </kingdom>
+ <kingdom id="2">
+ <name>Arnoth</name>
+ <smallimage>graphics/images/crests/arnothcrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/arnothcrest200200.png</largeimage>
+ <description>
+ Enter Arnoth description here.
+ </description>
+ <attributes
+ str="21"
+ end="22"
+ agi="23"
+ apt="24"
+ cha="25"
+ spr="26"
+ luk="27"
+ />
+ </kingdom>
+ <kingdom id="3">
+ <name>Delthia</name>
+ <smallimage>graphics/images/crests/delthiacrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/delthiacrest200200.png</largeimage>
+ <description>
+ Enter Delthia description here.
+ </description>
+ <attributes
+ str="31"
+ end="32"
+ agi="33"
+ apt="34"
+ cha="35"
+ spr="36"
+ luk="37"
+ />
+ </kingdom>
+ <kingdom id="4">
+ <name>Ganiada</name>
+ <smallimage>graphics/images/crests/ganiadacrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/ganiadacrest200200.png</largeimage>
+ <description>
+ Enter Ganiada description here.
+ </description>
+ <attributes
+ str="41"
+ end="42"
+ agi="43"
+ apt="44"
+ cha="45"
+ spr="46"
+ luk="47"
+ />
+ </kingdom>
+ <kingdom id="5">
+ <name>Keldor</name>
+ <smallimage>graphics/images/crests/keldorcrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/keldorcrest200200.png</largeimage>
+ <description>
+ Enter Keldor description here.
+ </description>
+ <attributes
+ str="51"
+ end="52"
+ agi="53"
+ apt="54"
+ cha="55"
+ spr="56"
+ luk="57"
+ />
+ </kingdom>
+ <kingdom id="6">
+ <name>Kiyanda</name>
+ <smallimage>graphics/images/crests/kiyandacrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/kiyandacrest200200.png</largeimage>
+ <description>
+ Enter Kiyanda description here.
+ </description>
+ <attributes
+ str="61"
+ end="62"
+ agi="63"
+ apt="64"
+ cha="65"
+ spr="66"
+ luk="67"
+ />
+ </kingdom>
+ <kingdom id="7">
+ <name></name>
+ <smallimage></smallimage>
+ <largeimage></largeimage>
+ <description>
+ Enter description of 7th kingdom here....
+ And while you are on it, enter the name and the image paths, too and add the graphics :)
+ </description>
+ <attributes
+ str="71"
+ end="72"
+ agi="73"
+ apt="74"
+ cha="75"
+ spr="76"
+ luk="77"
+ />
+ </kingdom>
+
+</kingdoms>
\ No newline at end of file
Modified: server/trunk/src/account-server/accounthandler.cpp
===================================================================
--- server/trunk/src/account-server/accounthandler.cpp 2007-11-22 03:15:52 UTC (rev 24)
+++ server/trunk/src/account-server/accounthandler.cpp 2007-11-22 04:45:16 UTC (rev 25)
@@ -23,6 +23,8 @@
#include "account-server/accounthandler.hpp"
+#include <vector>
+
#include "defines.h"
#include "point.h"
#include "account-server/account.hpp"
@@ -42,6 +44,7 @@
#include "utils/stringfilter.h"
#include "utils/tokencollector.hpp"
#include "utils/tokendispenser.hpp"
+#include "utils/xml.hpp"
class AccountHandler : public ConnectionHandler
{
@@ -74,6 +77,14 @@
*/
TokenCollector< AccountHandler, AccountClient *, int > mTokenCollector;
+ /**
+ * Returns the number of registred kingdoms
+ */
+ int getNumberOfKingdoms() { return mStartAttributes.size(); }
+
+ std::vector<int> getStartAttributes(int kingdom)
+ { return mStartAttributes.at(kingdom); }
+
protected:
/**
* Processes account related messages.
@@ -83,6 +94,8 @@
NetComputer *computerConnected(ENetPeer *peer);
void computerDisconnected(NetComputer *comp);
+
+ std::vector < std::vector < int > > mStartAttributes;
};
static AccountHandler *accountHandler;
@@ -90,6 +103,59 @@
AccountHandler::AccountHandler():
mTokenCollector(this)
{
+ //load start attributes from XML
+ xmlDocPtr doc = xmlParseFile("data/kingdoms.xml");
+
+ if (!doc)
+ {
+ LOG_ERROR("Error while parsing kingdoms.xml!");
+ return;
+ }
+
+ xmlNodePtr node = xmlDocGetRootElement(doc);
+ if (!node || !xmlStrEqual(node->name, BAD_CAST "kingdoms"))
+ {
+ LOG_ERROR("kingdoms.xml is not a valid kingdom file!");
+ xmlFreeDoc(doc);
+ return;
+ }
+
+ LOG_INFO("Loading kingdom data...");
+
+ int kingdomNum = 0;
+
+ for (node = node->xmlChildrenNode; node != NULL; node = node->next)
+ {
+ if (!xmlStrEqual(node->name, BAD_CAST "kingdom")) continue;
+
+ for ( xmlNodePtr attribNode = node->xmlChildrenNode;
+ attribNode != NULL;
+ attribNode = attribNode->next
+ )
+ {
+ if (!xmlStrEqual(attribNode->name, BAD_CAST "attributes")) continue;
+
+ AccountHandler::mStartAttributes.resize(kingdomNum + 1);
+ AccountHandler::mStartAttributes.at(kingdomNum).resize(NB_CHARACTER_ATTRIBUTES, 0);
+
+ int str = XML::getProperty(attribNode, "str", 0);
+ int end = XML::getProperty(attribNode, "end", 0);
+ int agi = XML::getProperty(attribNode, "agi", 0);
+ int apt = XML::getProperty(attribNode, "apt", 0);
+ int cha = XML::getProperty(attribNode, "cha", 0);
+ int spr = XML::getProperty(attribNode, "spr", 0);
+ int luk = XML::getProperty(attribNode, "luk", 0);
+ AccountHandler::mStartAttributes.at(kingdomNum).at(CHAR_ATTR_STRENGTH) = str;
+ AccountHandler::mStartAttributes.at(kingdomNum).at(CHAR_ATTR_ENDURANCE) = end;
+ AccountHandler::mStartAttributes.at(kingdomNum).at(CHAR_ATTR_AGILITY) = agi;
+ AccountHandler::mStartAttributes.at(kingdomNum).at(CHAR_ATTR_APTITUDE) = apt;
+ AccountHandler::mStartAttributes.at(kingdomNum).at(CHAR_ATTR_CHARISMA) = cha;
+ AccountHandler::mStartAttributes.at(kingdomNum).at(CHAR_ATTR_SPIRIT) = spr;
+ AccountHandler::mStartAttributes.at(kingdomNum).at(CHAR_ATTR_LUCK) = luk;
+
+ kingdomNum++;
+ }
+ }
}
bool AccountClientHandler::initialize(int port)
@@ -469,6 +535,7 @@
std::string name = msg.readString();
int hairStyle = msg.readByte();
int hairColor = msg.readByte();
+ int kingdom = msg.readByte();
int gender = msg.readByte();
MessageOut reply(APMSG_CHAR_CREATE_RESPONSE);
@@ -503,6 +570,10 @@
{
reply.writeByte(ERRMSG_INVALID_ARGUMENT);
}
+ else if (kingdom > accountHandler->getNumberOfKingdoms())
+ {
+ reply.writeByte(CREATE_INVALID_KINGDOM);
+ }
else
{
if (storage->doesCharacterNameExist(name))
@@ -523,62 +594,31 @@
// LATER_ON: Add race, face and maybe special attributes.
- // Customization of character's attributes...
- int attributes[CHAR_ATTR_NB];
- for (int i = 0; i < CHAR_ATTR_NB; ++i)
- attributes[i] = msg.readShort();
+ Character *newCharacter = new Character(name);
+ newCharacter->setAttributes(accountHandler->getStartAttributes(kingdom));
+ newCharacter->setAccount(acc);
+ newCharacter->setLevel(1);
+ newCharacter->setGender(gender);
+ newCharacter->setKingdom(kingdom);
+ newCharacter->setHairStyle(hairStyle);
+ newCharacter->setHairColor(hairColor);
+ newCharacter->setMapId(Configuration::getValue("defaultMap", 1));
+ Point startingPos(Configuration::getValue("startX", 256),
+ Configuration::getValue("startY", 256));
+ newCharacter->setPosition(startingPos);
+ acc->addCharacter(newCharacter);
- unsigned int totalAttributes = 0;
- bool validNonZeroAttributes = true;
- for (int i = 0; i < CHAR_ATTR_NB; ++i)
- {
- // For good total attributes check.
- totalAttributes += attributes[i];
+ LOG_INFO("Character " << name << " was created for "
+ << acc->getName() << "'s account.");
- // For checking if all stats are at least > 0
- if (attributes[i] <= 0) validNonZeroAttributes = false;
- }
+ storage->flush(acc); // flush changes
+ reply.writeByte(ERRMSG_OK);
+ computer.send(reply);
- if (totalAttributes > POINTS_TO_DISTRIBUTES_AT_LVL1)
- {
- reply.writeByte(CREATE_ATTRIBUTES_TOO_HIGH);
- }
- else if (totalAttributes < POINTS_TO_DISTRIBUTES_AT_LVL1)
- {
- reply.writeByte(CREATE_ATTRIBUTES_TOO_LOW);
- }
- else if (!validNonZeroAttributes)
- {
- reply.writeByte(CREATE_ATTRIBUTES_EQUAL_TO_ZERO);
- }
- else
- {
- Character *newCharacter = new Character(name);
- for (int i = CHAR_ATTR_BEGIN; i < CHAR_ATTR_END; ++i)
- newCharacter->setAttribute(i, attributes[i - CHAR_ATTR_BEGIN]);
- newCharacter->setAccount(acc);
- newCharacter->setLevel(1);
- newCharacter->setGender(gender);
- newCharacter->setHairStyle(hairStyle);
- newCharacter->setHairColor(hairColor);
- newCharacter->setMapId(Configuration::getValue("defaultMap", 1));
- Point startingPos(Configuration::getValue("startX", 256),
- Configuration::getValue("startY", 256));
- newCharacter->setPosition(startingPos);
- acc->addCharacter(newCharacter);
-
- LOG_INFO("Character " << name << " was created for "
- << acc->getName() << "'s account.");
-
- storage->flush(acc); // flush changes
- reply.writeByte(ERRMSG_OK);
- computer.send(reply);
-
- // Send new characters infos back to client
- int slot = chars.size() - 1;
- sendCharacterData(computer, slot, *chars[slot]);
- return;
- }
+ // Send new characters infos back to client
+ int slot = chars.size() - 1;
+ sendCharacterData(computer, slot, *chars[slot]);
+ return;
}
computer.send(reply);
Modified: server/trunk/src/account-server/character.cpp
===================================================================
--- server/trunk/src/account-server/character.cpp 2007-11-22 03:15:52 UTC (rev 24)
+++ server/trunk/src/account-server/character.cpp 2007-11-22 04:45:16 UTC (rev 25)
@@ -28,10 +28,7 @@
mName(name), mDatabaseID(id), mAccountID(-1), mAccount(NULL), mPos(0,0), mMapId(0),
mGender(0), mHairStyle(0), mHairColor(0), mLevel(0), mAccountLevel(0)
{
- for (int i = 0; i < CHAR_ATTR_NB; ++i)
- {
- mAttributes[i] = 0;
- }
+ mAttributes.resize(NB_CHARACTER_ATTRIBUTES);
}
void Character::setAccount(Account *acc)
Modified: server/trunk/src/account-server/character.hpp
===================================================================
--- server/trunk/src/account-server/character.hpp 2007-11-22 03:15:52 UTC (rev 24)
+++ server/trunk/src/account-server/character.hpp 2007-11-22 04:45:16 UTC (rev 25)
@@ -127,12 +127,15 @@
/** Gets the value of a base attribute of the character. */
int getAttribute(int n) const
- { return mAttributes[n - CHAR_ATTR_BEGIN]; }
+ { return mAttributes.at(n); }
/** Sets the value of a base attribute of the character. */
void setAttribute(int n, int value)
- { mAttributes[n - CHAR_ATTR_BEGIN] = value; }
+ { mAttributes.at(n) = value; }
+ void setAttributes(std::vector<int> attributes)
+ { mAttributes = attributes; }
+
/** Gets the Id of the map that the character is on. */
int
getMapId() const { return mMapId; }
@@ -178,7 +181,7 @@
int mAccountID; //!< Account ID of the owner.
Account *mAccount; //!< Account owning the character.
Point mPos; //!< Position the being is at.
- unsigned short mAttributes[CHAR_ATTR_NB]; //!< Attributes.
+ std::vector<int> mAttributes; //!< Attributes.
unsigned short mMapId; //!< Map the being is on.
unsigned char mGender; //!< Gender of the being.
unsigned char mHairStyle; //!< Hair style of the being.
Modified: server/trunk/src/defines.h
===================================================================
--- server/trunk/src/defines.h 2007-11-22 03:15:52 UTC (rev 24)
+++ server/trunk/src/defines.h 2007-11-22 04:45:16 UTC (rev 25)
@@ -68,11 +68,6 @@
MAX_HAIRCOLOR_VALUE = 9,
MAX_GENDER_VALUE = 2,
-/**
- * Points to give to a brand new character
- */
- POINTS_TO_DISTRIBUTES_AT_LVL1 = 70,
-
// Screen Related
/**
* Determine the area in which a character is aware of other beings
@@ -101,7 +96,7 @@
APMSG_LOGIN_RESPONSE = 0x0012, // B error
PAMSG_LOGOUT = 0x0013, // -
APMSG_LOGOUT_RESPONSE = 0x0014, // B error
- PAMSG_CHAR_CREATE = 0x0020, // S name, B hair style, B hair color, B gender, W*6 stats
+ PAMSG_CHAR_CREATE = 0x0020, // S name, B hair style, B hair color, B kingdom, B gender
APMSG_CHAR_CREATE_RESPONSE = 0x0021, // B error
PAMSG_CHAR_DELETE = 0x0022, // B index
APMSG_CHAR_DELETE_RESPONSE = 0x0023, // B error
@@ -285,9 +280,7 @@
CREATE_INVALID_HAIRSTYLE = 0x40,
CREATE_INVALID_HAIRCOLOR,
CREATE_INVALID_GENDER,
- CREATE_ATTRIBUTES_TOO_HIGH,
- CREATE_ATTRIBUTES_TOO_LOW,
- CREATE_ATTRIBUTES_EQUAL_TO_ZERO,
+ CREATE_INVALID_KINGDOM,
CREATE_EXISTS_NAME,
CREATE_TOO_MUCH_CHARACTERS
};
Modified: server/trunk/tmw.db
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-11-22 03:15:48
|
Revision: 24
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=24&view=rev
Author: crush_tmw
Date: 2007-11-21 19:15:52 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Some bugfixes for the last commit.
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/damasca.exe
client/trunk/src/gui/char_select.cpp
client/trunk/src/gui/char_select.h
client/trunk/src/net/accountserver/account.cpp
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2007-11-21 23:52:00 UTC (rev 23)
+++ client/trunk/ChangeLog 2007-11-22 03:15:52 UTC (rev 24)
@@ -1,4 +1,4 @@
-2007-11-04 Philipp Sehmisch <tm...@cr...>
+2007-11-22 Philipp Sehmisch <tm...@cr...>
* src/gui/char_select.cpp, src/gui/char_select.h,
src/accountserver.cpp, src/accountserver.h, src/gui/icon.cpp,
Modified: client/trunk/damasca.exe
===================================================================
(Binary files differ)
Modified: client/trunk/src/gui/char_select.cpp
===================================================================
--- client/trunk/src/gui/char_select.cpp 2007-11-21 23:52:00 UTC (rev 23)
+++ client/trunk/src/gui/char_select.cpp 2007-11-22 03:15:52 UTC (rev 24)
@@ -330,7 +330,7 @@
if (getName().length() >= 4) {
//Proceed to kingdom selection
mPlayer->setName(getName());
- new KingdomSelectDialog(this, mSlot, mPlayer);
+ mKingdomSelectDialog = new KingdomSelectDialog(this, mSlot, mPlayer);
// Attempt to create the character
mCreateButton->setEnabled(false);
}
@@ -369,20 +369,12 @@
void
CharCreateDialog::unlock()
{
- mCreateButton->setEnabled(true);
+ if (mKingdomSelectDialog)
+ mKingdomSelectDialog->scheduleDelete();
+ mCreateButton->setEnabled(true); //Huh? How does this close the dialog?
}
-int CharCreateDialog::getDistributedPoints()
-{
- int points = 0;
- for (int i = 0; i < 7; i++)
- {
- points += (int) mAttributeSlider[i]->getValue();
- }
- return points;
-}
-
KingdomSelectDialog::KingdomSelectDialog(Window *parent, int slot, Player *player):
Window(_("Select Kingdom"), true, parent), mSlot(slot), mPlayer(player), mLargeKingdomIcon(NULL)
{
Modified: client/trunk/src/gui/char_select.h
===================================================================
--- client/trunk/src/gui/char_select.h 2007-11-21 23:52:00 UTC (rev 23)
+++ client/trunk/src/gui/char_select.h 2007-11-22 03:15:52 UTC (rev 24)
@@ -42,6 +42,7 @@
class Icon;
class BrowserBox;
class ScrollArea;
+class KingdomSelectDialog;
/**
* Character selection dialog.
@@ -146,11 +147,6 @@
gcn::Button *mPrevHairStyleButton;
gcn::Label *mHairStyleLabel;
- gcn::Slider *mAttributeSlider[7];
- gcn::Label *mAttributeLabel[7];
- gcn::Label *mAttributeValue[7];
- gcn::Label *mAttributesLeft;
-
gcn::Button *mCreateButton;
gcn::Button *mCancelButton;
@@ -159,8 +155,7 @@
int mSlot;
- static const int mMaxPoints = 70;
- int mUsedPoints;
+ KingdomSelectDialog *mKingdomSelectDialog;
};
/**
Modified: client/trunk/src/net/accountserver/account.cpp
===================================================================
--- client/trunk/src/net/accountserver/account.cpp 2007-11-21 23:52:00 UTC (rev 23)
+++ client/trunk/src/net/accountserver/account.cpp 2007-11-22 03:15:52 UTC (rev 24)
@@ -38,6 +38,7 @@
msg.writeString(name);
msg.writeByte(hairStyle);
msg.writeByte(hairColor);
+ msg.writeByte(kingdom);
msg.writeByte(gender);
Net::AccountServer::connection->send(msg);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-11-21 23:51:57
|
Revision: 23
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=23&view=rev
Author: crush_tmw
Date: 2007-11-21 15:52:00 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Removed attribute selection and added kingdom selection during char creation.
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/damasca.exe
client/trunk/data/graphics/images/CMakeLists.txt
client/trunk/data/graphics/images/Makefile.am
client/trunk/src/gui/char_select.cpp
client/trunk/src/gui/char_select.h
client/trunk/src/net/accountserver/account.cpp
client/trunk/src/net/accountserver/account.h
client/trunk/tmw-client.cbp
Added Paths:
-----------
client/trunk/data/graphics/images/crests/
client/trunk/data/graphics/images/crests/CMakeLists.txt
client/trunk/data/graphics/images/crests/Makefile.am
client/trunk/data/graphics/images/crests/alkemiacrest100100.png
client/trunk/data/graphics/images/crests/alkemiacrest200200.png
client/trunk/data/graphics/images/crests/arnothcrest100100.png
client/trunk/data/graphics/images/crests/arnothcrest200200.png
client/trunk/data/graphics/images/crests/delthiacrest100100.png
client/trunk/data/graphics/images/crests/delthiacrest200200.png
client/trunk/data/graphics/images/crests/ganiadacrest100100.png
client/trunk/data/graphics/images/crests/ganiadacrest200200.png
client/trunk/data/graphics/images/crests/keldorcrest100100.png
client/trunk/data/graphics/images/crests/keldorcrest200200.png
client/trunk/data/graphics/images/crests/kiyandacrest100100.png
client/trunk/data/graphics/images/crests/kiyandacrest200200.png
client/trunk/data/kingdoms.xml
client/trunk/src/gui/icon.cpp
client/trunk/src/gui/icon.h
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2007-11-04 02:43:20 UTC (rev 22)
+++ client/trunk/ChangeLog 2007-11-21 23:52:00 UTC (rev 23)
@@ -1,5 +1,25 @@
2007-11-04 Philipp Sehmisch <tm...@cr...>
+ * src/gui/char_select.cpp, src/gui/char_select.h,
+ src/accountserver.cpp, src/accountserver.h, src/gui/icon.cpp,
+ src/gui/icon.h, data/kingdoms.xml,
+ data/graphics/images/crests/alkemiacrest100100.png
+ data/graphics/images/crests/alkemiacrest200200.png
+ data/graphics/images/crests/arnothcrest100100.png
+ data/graphics/images/crests/arnothcrest200200.png
+ data/graphics/images/crests/delthiacrest100100.png
+ data/graphics/images/crests/delthiacrest200200.png
+ data/graphics/images/crests/ganiadacrest100100.png
+ data/graphics/images/crests/ganiadacrest200200.png
+ data/graphics/images/crests/keldorcrest100100.png
+ data/graphics/images/crests/keldorcrest200200.png
+ data/graphics/images/crests/kiyandacrest100100.png
+ data/graphics/images/crests/kiyandacrest200200.png:
+ Removed attribute selection and added kingdom selection during
+ char creation.
+
+2007-11-04 Philipp Sehmisch <tm...@cr...>
+
* src/gui/char-select.cpp, src/gui/status.cpp,
src/localplayer.h, src/net/accountserver/account.cpp,
src/net/accountserver/account.h, src/net/beinghandler.cpp,
Modified: client/trunk/damasca.exe
===================================================================
(Binary files differ)
Modified: client/trunk/data/graphics/images/CMakeLists.txt
===================================================================
--- client/trunk/data/graphics/images/CMakeLists.txt 2007-11-04 02:43:20 UTC (rev 22)
+++ client/trunk/data/graphics/images/CMakeLists.txt 2007-11-21 23:52:00 UTC (rev 23)
@@ -1,8 +1,9 @@
ADD_SUBDIRECTORY(ambient)
+ADD_SUBDIRECTORY(crests)
SET(FILES
error.png
login_wallpaper.png
)
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/images)
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/images)
\ No newline at end of file
Modified: client/trunk/data/graphics/images/Makefile.am
===================================================================
--- client/trunk/data/graphics/images/Makefile.am 2007-11-04 02:43:20 UTC (rev 22)
+++ client/trunk/data/graphics/images/Makefile.am 2007-11-21 23:52:00 UTC (rev 23)
@@ -1,4 +1,4 @@
-SUBDIRS = ambient
+SUBDIRS = ambient crests
imagesdir = $(pkgdatadir)/data/graphics/images
@@ -7,4 +7,4 @@
login_wallpaper.png
EXTRA_DIST = \
- $(images_DATA)
+ $(images_DATA)
\ No newline at end of file
Added: client/trunk/data/graphics/images/crests/CMakeLists.txt
===================================================================
--- client/trunk/data/graphics/images/crests/CMakeLists.txt (rev 0)
+++ client/trunk/data/graphics/images/crests/CMakeLists.txt 2007-11-21 23:52:00 UTC (rev 23)
@@ -0,0 +1,16 @@
+SET(FILES
+ alkemiacrest100100.png
+ alkemiacrest200200.png
+ arnothcrest100100.png
+ arnothcrest200200.png
+ delthiacrest100100.png
+ delthiacrest200200.png
+ ganiadacrest100100.png
+ ganiadacrest200200.png
+ keldorcrest100100.png
+ keldorcrest200200.png
+ kiyandacrest100100.png
+ kiyandacrest200200.png
+ )
+
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/images/ambient)
\ No newline at end of file
Added: client/trunk/data/graphics/images/crests/Makefile.am
===================================================================
--- client/trunk/data/graphics/images/crests/Makefile.am (rev 0)
+++ client/trunk/data/graphics/images/crests/Makefile.am 2007-11-21 23:52:00 UTC (rev 23)
@@ -0,0 +1,17 @@
+ambientdir = $(pkgdatadir)/data/graphics/images/ambient
+
+ambient_DATA = alkemiacrest100100.png /
+ alkemiacrest200200.png /
+ arnothcrest100100.png /
+ arnothcrest200200.png /
+ delthiacrest100100.png /
+ delthiacrest200200.png /
+ ganiadacrest100100.png /
+ ganiadacrest200200.png /
+ keldorcrest100100.png /
+ keldorcrest200200.png /
+ kiyandacrest100100.png /
+ kiyandacrest200200.png
+
+
+EXTRA_DIST = $(ambient_DATA)
Added: client/trunk/data/graphics/images/crests/alkemiacrest100100.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/alkemiacrest100100.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/images/crests/alkemiacrest200200.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/alkemiacrest200200.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/images/crests/arnothcrest100100.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/arnothcrest100100.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/images/crests/arnothcrest200200.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/arnothcrest200200.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/images/crests/delthiacrest100100.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/delthiacrest100100.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/images/crests/delthiacrest200200.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/delthiacrest200200.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/images/crests/ganiadacrest100100.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/ganiadacrest100100.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/images/crests/ganiadacrest200200.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/ganiadacrest200200.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/images/crests/keldorcrest100100.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/keldorcrest100100.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/images/crests/keldorcrest200200.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/keldorcrest200200.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/images/crests/kiyandacrest100100.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/kiyandacrest100100.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/images/crests/kiyandacrest200200.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/images/crests/kiyandacrest200200.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/kingdoms.xml
===================================================================
--- client/trunk/data/kingdoms.xml (rev 0)
+++ client/trunk/data/kingdoms.xml 2007-11-21 23:52:00 UTC (rev 23)
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+
+<kingdoms>
+ <kingdom id="1">
+ <name>Alkemia</name>
+ <smallimage>graphics/images/crests/alkemiacrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/alkemiacrest200200.png</largeimage>
+ <description>
+ Enter Alkemia description here.
+ </description>
+ <attributes
+ str="10"
+ end="8"
+ agi="5"
+ apt="4"
+ cha="2"
+ spr="1"
+ luk="1"
+ />
+ </kingdom>
+ <kingdom id="2">
+ <name>Arnoth</name>
+ <smallimage>graphics/images/crests/arnothcrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/arnothcrest200200.png</largeimage>
+ <description>
+ Enter Arnoth description here.
+ </description>
+ <attributes
+ str="10"
+ end="8"
+ agi="5"
+ apt="4"
+ cha="2"
+ spr="1"
+ luk="1"
+ />
+ </kingdom>
+ <kingdom id="3">
+ <name>Delthia</name>
+ <smallimage>graphics/images/crests/delthiacrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/delthiacrest200200.png</largeimage>
+ <description>
+ Enter Delthia description here.
+ </description>
+ <attributes
+ str="10"
+ end="8"
+ agi="5"
+ apt="4"
+ cha="2"
+ spr="1"
+ luk="1"
+ />
+ </kingdom>
+ <kingdom id="4">
+ <name>Ganiada</name>
+ <smallimage>graphics/images/crests/ganiadacrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/ganiadacrest200200.png</largeimage>
+ <description>
+ Enter Ganiada description here.
+ </description>
+ <attributes
+ str="10"
+ end="8"
+ agi="5"
+ apt="4"
+ cha="2"
+ spr="1"
+ luk="1"
+ />
+ </kingdom>
+ <kingdom id="5">
+ <name>Keldor</name>
+ <smallimage>graphics/images/crests/keldorcrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/keldorcrest200200.png</largeimage>
+ <description>
+ Enter Keldor description here.
+ </description>
+ <attributes
+ str="10"
+ end="8"
+ agi="5"
+ apt="4"
+ cha="2"
+ spr="1"
+ luk="1"
+ />
+ </kingdom>
+ <kingdom id="6">
+ <name>Kiyanda</name>
+ <smallimage>graphics/images/crests/kiyandacrest100100.png</smallimage>
+ <largeimage>graphics/images/crests/kiyandacrest200200.png</largeimage>
+ <description>
+ Enter Kiyanda description here.
+ </description>
+ <attributes
+ str="10"
+ end="8"
+ agi="5"
+ apt="4"
+ cha="2"
+ spr="1"
+ luk="1"
+ />
+ </kingdom>
+ <kingdom id="7">
+ <name></name>
+ <smallimage></smallimage>
+ <largeimage></largeimage>
+ <description>
+ Enter description of 7th kingdom here....
+ And while you are on it, enter the name and the image paths, too and add the graphics :)
+ </description>
+ <attributes
+ str="10"
+ end="8"
+ agi="5"
+ apt="4"
+ cha="2"
+ spr="1"
+ luk="1"
+ />
+ </kingdom>
+
+</kingdoms>
\ No newline at end of file
Modified: client/trunk/src/gui/char_select.cpp
===================================================================
--- client/trunk/src/gui/char_select.cpp 2007-11-04 02:43:20 UTC (rev 22)
+++ client/trunk/src/gui/char_select.cpp 2007-11-21 23:52:00 UTC (rev 23)
@@ -25,12 +25,17 @@
#include <string>
+#include <libxml/tree.h>
+
#include <guichan/widgets/label.hpp>
#include "button.h"
+#include "browserbox.h"
#include "confirm_dialog.h"
+#include "icon.h"
#include "ok_dialog.h"
#include "playerbox.h"
+#include "scrollarea.h"
#include "slider.h"
#include "textfield.h"
@@ -41,16 +46,20 @@
#include "../game.h"
#include "../localplayer.h"
#include "../main.h"
+#include "../log.h"
#include "../logindata.h"
#include "../net/accountserver/account.h"
#include "../net/charserverhandler.h"
#include "../net/messageout.h"
+#include "../resources/resourcemanager.h"
+
#include "../utils/gettext.h"
#include "../utils/strprintf.h"
#include "../utils/tostring.h"
#include "../utils/trim.h"
+#include "../utils/xml.h"
// Defined in main.cpp, used here for setting the char create dialog
extern CharServerHandler charServerHandler;
@@ -159,7 +168,7 @@
// Start new character dialog
CharCreateDialog *charCreateDialog =
new CharCreateDialog(this, mCharInfo->getPos());
- charServerHandler.setCharCreateDialog(charCreateDialog);
+ charServerHandler.setCharCreateDialog(charCreateDialog); //What's this line for??
}
}
else if (event.getId() == "delete")
@@ -264,26 +273,11 @@
mCreateButton = new Button(_("Create"), "create", this);
mCancelButton = new Button(_("Cancel"), "cancel", this);
mPlayerBox = new PlayerBox(mPlayer);
- mAttributeLabel[0] = new gcn::Label(_("Strength:"));
- mAttributeLabel[1] = new gcn::Label(_("Endurance:"));
- mAttributeLabel[2] = new gcn::Label(_("Agility:"));
- mAttributeLabel[3] = new gcn::Label(_("Aptitude:"));
- mAttributeLabel[4] = new gcn::Label(_("Charisma:"));
- mAttributeLabel[5] = new gcn::Label(_("Spirit:"));
- mAttributeLabel[6] = new gcn::Label(_("Luck:"));
- for (int i=0; i<7; i++)
- {
- mAttributeLabel[i]->setWidth(70);
- mAttributeSlider[i] = new Slider(1, 20);
- mAttributeValue[i] = new gcn::Label("1");
- };
- mAttributesLeft = new gcn::Label(strprintf(_("Please distribute %d points"), 99));
-
mNameField->setActionEventId("create");
int w = 200;
- int h = 330;
+ int h = 150;
setContentSize(w, h);
mPlayerBox->setDimension(gcn::Rectangle(80, 30, 110, 85));
mNameLabel->setPosition(5, 5);
@@ -295,18 +289,6 @@
mPrevHairStyleButton->setPosition(90, 64);
mNextHairStyleButton->setPosition(165, 64);
mHairStyleLabel->setPosition(5, 70);
- for (int i=0; i<7; i++)
- {
- mAttributeSlider[i]->setValue(10);
- mAttributeSlider[i]->setDimension(gcn::Rectangle( 75, 140 + i*20,
- 100, 10));
- mAttributeSlider[i]->setActionEventId("statslider");
- mAttributeSlider[i]->addActionListener(this);
- mAttributeValue[i]->setPosition(180, 140 + i*20);
- mAttributeLabel[i]->setPosition(5, 140 + i*20);
- };
- mAttributesLeft->setPosition(15, 280);
- UpdateSliders();
mCancelButton->setPosition(
w - 5 - mCancelButton->getWidth(),
h - 5 - mCancelButton->getHeight());
@@ -325,13 +307,6 @@
add(mNextHairStyleButton);
add(mPrevHairStyleButton);
add(mHairStyleLabel);
- for (int i=0; i<7; i++)
- {
- add(mAttributeSlider[i]);
- add(mAttributeValue[i]);
- add(mAttributeLabel[i]);
- };
- add(mAttributesLeft);
add(mCreateButton);
add(mCancelButton);
@@ -353,22 +328,11 @@
{
if (event.getId() == "create") {
if (getName().length() >= 4) {
+ //Proceed to kingdom selection
+ mPlayer->setName(getName());
+ new KingdomSelectDialog(this, mSlot, mPlayer);
// Attempt to create the character
mCreateButton->setEnabled(false);
- Net::AccountServer::Account::createCharacter(
- getName(),
- mPlayer->getHairStyle(),
- mPlayer->getHairColor(),
- mPlayer->getKingdom(),
- 0, // gender
- (int) mAttributeSlider[0]->getValue(), // STR
- (int) mAttributeSlider[1]->getValue(), // AGI
- (int) mAttributeSlider[2]->getValue(), // DEX
- (int) mAttributeSlider[3]->getValue(), // VIT
- (int) mAttributeSlider[4]->getValue(), // INT
- (int) mAttributeSlider[5]->getValue(), // WILL
- (int) mAttributeSlider[6]->getValue() // CHAR
- );
}
else {
new OkDialog(_("Error"),
@@ -392,9 +356,6 @@
int prevStyle = mPlayer->getHairStyle() + NR_HAIR_STYLES - 1;
mPlayer->setHairStyle(prevStyle % NR_HAIR_STYLES);
}
- else if (event.getId() == "statslider") {
- UpdateSliders();
- }
}
std::string
@@ -405,52 +366,162 @@
return name;
}
-void CharCreateDialog::UpdateSliders()
+void
+CharCreateDialog::unlock()
{
+ mCreateButton->setEnabled(true);
+}
+
+int CharCreateDialog::getDistributedPoints()
+{
+ int points = 0;
+
for (int i = 0; i < 7; i++)
{
- // Update captions
- mAttributeValue[i]->setCaption(
- toString((int) (mAttributeSlider[i]->getValue())));
- mAttributeValue[i]->adjustSize();
+ points += (int) mAttributeSlider[i]->getValue();
}
+ return points;
+}
- // Update distributed points
- int pointsLeft = 70 - getDistributedPoints();
- if (pointsLeft == 0)
+KingdomSelectDialog::KingdomSelectDialog(Window *parent, int slot, Player *player):
+ Window(_("Select Kingdom"), true, parent), mSlot(slot), mPlayer(player), mLargeKingdomIcon(NULL)
+{
+ // Read kingdom information
+ ResourceManager *resman = ResourceManager::getInstance();
+ int size;
+ char *data = (char*) resman->loadFile("kingdoms.xml", size);
+ if (!data) logger->error("Could not find kingdoms.xml!");
+ xmlDocPtr doc = xmlParseMemory(data, size);
+ free(data);
+ if (!doc) logger->error("Error while parsing kingdom database (kingdoms.xml)!");
+ xmlNodePtr rootNode = xmlDocGetRootElement(doc);
+ if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "kingdoms"))
+ logger->error("kingdoms.xml is not a valid kingdom database file!");
+
+ int kingdomId = 0;
+ for_each_xml_child_node(kingdomNode, rootNode)
{
- mAttributesLeft->setCaption(_("Character stats OK"));
- mCreateButton->setEnabled(true);
- }
- else
- {
- mCreateButton->setEnabled(false);
- if (pointsLeft > 0)
+ if (!xmlStrEqual(kingdomNode->name, BAD_CAST "kingdom")) continue;
+
+ std::string name = "<name>";
+ std::string smallIcon = "graphics/images/error.png";
+ std::string largeIcon = "graphics/images/error.png";
+ std::string description = "<description>";
+
+ for_each_xml_child_node(propNode, kingdomNode)
{
- mAttributesLeft->setCaption(strprintf(_("Please distribute %d points"), pointsLeft));
+ logger->log("Found %s node", propNode->name);
+
+ if (xmlStrEqual(propNode->name, BAD_CAST "name"))
+ {
+ if (propNode->xmlChildrenNode)
+ name = (const char*) propNode->xmlChildrenNode->content;
+ }
+ else if (xmlStrEqual(propNode->name, BAD_CAST "smallimage"))
+ {
+ if (propNode->xmlChildrenNode)
+ smallIcon = (const char*) propNode->xmlChildrenNode->content;
+ }
+ else if (xmlStrEqual(propNode->name, BAD_CAST "largeimage"))
+ {
+ if (propNode->xmlChildrenNode)
+ largeIcon = (const char*) propNode->xmlChildrenNode->content;
+ }
+ else if (xmlStrEqual(propNode->name, BAD_CAST "description"))
+ {
+ if (propNode->xmlChildrenNode)
+ {
+ description = (const char*) propNode->xmlChildrenNode->content;
+ //remove tabs
+ size_t i = 0;
+ while (true)
+ {
+ i = description.find(0x09, i);
+ if (i == std::string::npos) break;
+ description.erase(i, 1);
+ }
+ }
+ }
}
- else
- {
- mAttributesLeft->setCaption(strprintf(_("Please remove %d points"), -pointsLeft));
- }
+
+ mKingdomIcons.push_back(new Icon(smallIcon, "kingdom" + toString(kingdomId), this));
+ mKingdomNameLabels.push_back(new gcn::Label(name));
+ mKingdomNames.push_back(name);
+ mKingdomDescriptions.push_back(description);
+ mKingdomIconsLarge.push_back(new Icon(largeIcon, "nil", this));
+ kingdomId ++;
}
- mAttributesLeft->adjustSize();
-}
+ // Initialize gui elements
+ setContentSize(700, 500);
+ setPosition (50 ,50);
-void
-CharCreateDialog::unlock()
-{
- mCreateButton->setEnabled(true);
+ mSelectButton = new Button(_("Select"), "select", this);
+ mSelectButton->setPosition(600, 470);
+ mSelectButton->setEnabled(false);
+ add (mSelectButton);
+
+ for (size_t i = 0; i<mKingdomIcons.size(); i++)
+ {
+ mKingdomIcons[i]->setPosition(i*100,20);
+ add(mKingdomIcons[i]);
+
+ mKingdomNameLabels[i]->setPosition(i*100,120);
+ add(mKingdomNameLabels[i]);
+
+ mKingdomIconsLarge[i]->setPosition(5, 155);
+ }
+
+ mDescriptionBox= new BrowserBox(BrowserBox::AUTO_SIZE);
+ mDescriptionArea = new ScrollArea(mDescriptionBox);
+ mDescriptionArea->setDimension(gcn::Rectangle(210, 150, 485, 320));
+ add (mDescriptionArea);
+
+ setVisible(true);
}
-int CharCreateDialog::getDistributedPoints()
+void KingdomSelectDialog::action(const gcn::ActionEvent &event)
{
- int points = 0;
+ if (event.getId() == "select")
+ {
+ Net::AccountServer::Account::createCharacter(
+ mPlayer->getName(),
+ mPlayer->getHairStyle(),
+ mPlayer->getHairColor(),
+ mPlayer->getKingdom(),
+ 0 // gender
+ );
+ }
- for (int i = 0; i < 7; i++)
+ for (size_t i = 0; i<mKingdomNames.size(); i++)
{
- points += (int) mAttributeSlider[i]->getValue();
+ if (event.getId() == "kingdom" + toString(i))
+ {
+ mPlayer->setKingdom(i);
+ mDescriptionBox->clearRows();
+ mDescriptionBox->addRow(mKingdomNames[i]);
+ size_t pos1 = 0;
+ size_t pos2 = 0;
+ std::string description = mKingdomDescriptions[i];
+ while (pos1 <= description.length())
+ {
+ pos2 = description.find(0x0A, pos1);
+ if (pos2 == std::string::npos) pos2 = description.length();
+ mDescriptionBox->addRow(description.substr(pos1, pos2 - pos1));
+ pos1 = pos2 + 1;
+ }
+
+ if (mLargeKingdomIcon) remove(mLargeKingdomIcon);
+ mLargeKingdomIcon = mKingdomIconsLarge[i];
+ add(mLargeKingdomIcon);
+
+ mSelectButton->setEnabled(true);
+ }
}
- return points;
+
+ mSelectButton->setEnabled(true);
}
+
+KingdomSelectDialog::~KingdomSelectDialog()
+{
+}
Modified: client/trunk/src/gui/char_select.h
===================================================================
--- client/trunk/src/gui/char_select.h 2007-11-04 02:43:20 UTC (rev 22)
+++ client/trunk/src/gui/char_select.h 2007-11-21 23:52:00 UTC (rev 23)
@@ -24,6 +24,9 @@
#ifndef _CHAR_SELECT_H
#define _CHAR_SELECT_H
+#include <vector>
+#include <string>
+
#include "window.h"
#include "../guichanfwd.h"
@@ -36,6 +39,9 @@
class Player;
class LocalPlayer;
class PlayerBox;
+class Icon;
+class BrowserBox;
+class ScrollArea;
/**
* Character selection dialog.
@@ -157,4 +163,40 @@
int mUsedPoints;
};
+/**
+ * Kingdom selection dialog.
+ *
+ * \ingroup Interface
+ */
+class KingdomSelectDialog : public Window, public gcn::ActionListener
+{
+ public:
+ /**
+ * Constructor.
+ */
+ KingdomSelectDialog(Window *parent, int slot, Player *player);
+
+ /**
+ * Destructor.
+ */
+ ~KingdomSelectDialog();
+
+ void action(const gcn::ActionEvent &event);
+
+ private:
+ gcn::Button *mSelectButton;
+
+ int mSlot;
+ Player* mPlayer;
+
+ std::vector<Icon *> mKingdomIcons;
+ std::vector<gcn::Label *> mKingdomNameLabels;
+ std::vector<std::string> mKingdomNames;
+ std::vector<std::string> mKingdomDescriptions;
+ std::vector<Icon *> mKingdomIconsLarge;
+
+ Icon *mLargeKingdomIcon;
+ BrowserBox *mDescriptionBox;
+ ScrollArea *mDescriptionArea;
+};
#endif
Added: client/trunk/src/gui/icon.cpp
===================================================================
--- client/trunk/src/gui/icon.cpp (rev 0)
+++ client/trunk/src/gui/icon.cpp 2007-11-21 23:52:00 UTC (rev 23)
@@ -0,0 +1,79 @@
+/*
+ * The Mana World
+ * Copyright 2004-2005 The Mana World Development Team
+ *
+ * This file is part of The Mana World.
+ *
+ * The Mana World 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 2 of the License, or
+ * any later version.
+ *
+ * The Mana World 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 The Mana World; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id: minimap.cpp 10 2007-10-18 20:22:32Z crush_tmw $
+ */
+
+#include "icon.h"
+
+#include "../graphics.h"
+#include "../log.h"
+
+#include "../resources/image.h"
+#include "../resources/resourcemanager.h"
+
+Icon::Icon(const std::string& imageName):
+ mImage(NULL)
+{
+ setImage(imageName);
+}
+
+Icon::Icon(const std::string& imageName, const std::string &actionEventId,
+ gcn::ActionListener *listener):
+ mImage(NULL)
+{
+ setActionEventId(actionEventId);
+ if (listener) {
+ addActionListener(listener);
+ }
+ setImage(imageName);
+}
+
+void Icon::setImage(const std::string& imageName)
+{
+ ResourceManager *resman = ResourceManager::getInstance();
+ Image* image = resman->getImage(imageName);
+ if (image)
+ {
+ setImage(image);
+ } else {
+ logger->log("Warning: Icon image \"%s\" not found", imageName.c_str());
+ }
+}
+
+void Icon::setImage(Image* image)
+{
+ mImage = image;
+ setWidth(image->getWidth());
+ setHeight(image->getHeight());
+}
+
+void Icon::draw(gcn::Graphics* graphics)
+{
+ if (!mImage) return;
+
+ static_cast<Graphics*>(graphics)->
+ drawImage(mImage, 0, 0);
+}
+
+Icon::~Icon()
+{
+ if (mImage) mImage->decRef();
+}
Added: client/trunk/src/gui/icon.h
===================================================================
--- client/trunk/src/gui/icon.h (rev 0)
+++ client/trunk/src/gui/icon.h 2007-11-21 23:52:00 UTC (rev 23)
@@ -0,0 +1,55 @@
+/*
+ * The Mana World
+ * Copyright 2004-2005 The Mana World Development Team
+ *
+ * This file is part of The Mana World.
+ *
+ * The Mana World 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 2 of the License, or
+ * any later version.
+ *
+ * The Mana World 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 The Mana World; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id: minimap.cpp 10 2007-10-18 20:22:32Z crush_tmw $
+ */
+
+#include <string>
+
+#include <guichan/widgets/button.hpp>
+
+class Image;
+class Graphics;
+
+class Icon : public gcn::Button
+{
+ public:
+ Icon (const std::string& imageName);
+
+ Icon (const std::string& imageName, const std::string &actionEventId,
+ gcn::ActionListener *listener);
+
+ ~Icon();
+
+ void setImage(const std::string& imageName);
+
+ void setImage(Image* image);
+
+ void draw(gcn::Graphics* graphics);
+
+ /**
+ * don't draw a border, guichan. When I want a border around my icon
+ * I draw it on my graphic.
+ */
+ void drawBorder(gcn::Graphics* graphics) {};
+
+ protected:
+ Image* mImage;
+};
Modified: client/trunk/src/net/accountserver/account.cpp
===================================================================
--- client/trunk/src/net/accountserver/account.cpp 2007-11-04 02:43:20 UTC (rev 22)
+++ client/trunk/src/net/accountserver/account.cpp 2007-11-21 23:52:00 UTC (rev 23)
@@ -31,8 +31,7 @@
void Net::AccountServer::Account::createCharacter(
const std::string &name, char hairStyle, char hairColor, char kingdom,
- char gender, short strength, short endurance, short agility,
- short aptitude, short charisma, short spirit, short luck)
+ char gender)
{
MessageOut msg(PAMSG_CHAR_CREATE);
@@ -40,13 +39,6 @@
msg.writeByte(hairStyle);
msg.writeByte(hairColor);
msg.writeByte(gender);
- msg.writeShort(strength);
- msg.writeShort(endurance);
- msg.writeShort(agility);
- msg.writeShort(aptitude);
- msg.writeShort(charisma);
- msg.writeShort(spirit);
- msg.writeShort(luck);
Net::AccountServer::connection->send(msg);
}
Modified: client/trunk/src/net/accountserver/account.h
===================================================================
--- client/trunk/src/net/accountserver/account.h 2007-11-04 02:43:20 UTC (rev 22)
+++ client/trunk/src/net/accountserver/account.h 2007-11-21 23:52:00 UTC (rev 23)
@@ -33,9 +33,7 @@
namespace Account
{
void createCharacter(const std::string &name,
- char hairStyle, char hairColor, char kingdom, char gender,
- short strength, short endurance, short agility,
- short aptitude, short charisma, short spirit, short luck);
+ char hairStyle, char hairColor, char kingdom, char gender);
void deleteCharacter(char slot);
Modified: client/trunk/tmw-client.cbp
===================================================================
--- client/trunk/tmw-client.cbp 2007-11-04 02:43:20 UTC (rev 22)
+++ client/trunk/tmw-client.cbp 2007-11-21 23:52:00 UTC (rev 23)
@@ -400,6 +400,16 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
+ <Unit filename="src\gui\icon.cpp">
+ <Option compilerVar="CPP"/>
+ <Option target="default"/>
+ </Unit>
+ <Unit filename="src\gui\icon.h">
+ <Option compilerVar=""/>
+ <Option compile="0"/>
+ <Option link="0"/>
+ <Option target="default"/>
+ </Unit>
<Unit filename="src\gui\inttextbox.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-11-04 02:43:17
|
Revision: 22
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=22&view=rev
Author: crush_tmw
Date: 2007-11-03 19:43:20 -0700 (Sat, 03 Nov 2007)
Log Message:
-----------
oops, forgot something.
Modified Paths:
--------------
client/trunk/damasca.exe
client/trunk/src/player.h
Modified: client/trunk/damasca.exe
===================================================================
(Binary files differ)
Modified: client/trunk/src/player.h
===================================================================
--- client/trunk/src/player.h 2007-11-04 02:33:59 UTC (rev 21)
+++ client/trunk/src/player.h 2007-11-04 02:43:20 UTC (rev 22)
@@ -84,7 +84,8 @@
/**
* Sets kingdom by number
*/
- void setKingdom(int kingdom);
+ void setKingdom(int kingdom)
+ { mKingdom = kingdom; }
/**
* Sets visible equipments for this player.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-11-04 02:33:55
|
Revision: 21
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=21&view=rev
Author: crush_tmw
Date: 2007-11-03 19:33:59 -0700 (Sat, 03 Nov 2007)
Log Message:
-----------
Renamed attributes. Added kingdom handling (internal only).
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/data/graphics/sprites/monster-maggot.xml
client/trunk/data/maps/beta-test1.tmx
client/trunk/src/gui/char_select.cpp
client/trunk/src/gui/status.cpp
client/trunk/src/localplayer.h
client/trunk/src/net/accountserver/account.cpp
client/trunk/src/net/accountserver/account.h
client/trunk/src/net/beinghandler.cpp
client/trunk/src/net/charserverhandler.cpp
client/trunk/src/player.cpp
client/trunk/src/player.h
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2007-11-04 02:25:01 UTC (rev 20)
+++ client/trunk/ChangeLog 2007-11-04 02:33:59 UTC (rev 21)
@@ -1,5 +1,13 @@
-2007-10-26 Philipp Sehmisch <tm...@cr...>
+2007-11-04 Philipp Sehmisch <tm...@cr...>
+ * src/gui/char-select.cpp, src/gui/status.cpp,
+ src/localplayer.h, src/net/accountserver/account.cpp,
+ src/net/accountserver/account.h, src/net/beinghandler.cpp,
+ src/net/accounthandler.cpp, src/player.cpp, src/player.h:
+ Renamed attributes. Added kingdom handling (only internal).
+
+2007-10-26 Philipp Sehmisch <tm...@cr...>
+
* data/graphics/sprites/monster-maggot.xml: Made the attack
animation finite. This looks better with the attack behavior on
the new server.
Modified: client/trunk/data/graphics/sprites/monster-maggot.xml
===================================================================
--- client/trunk/data/graphics/sprites/monster-maggot.xml 2007-11-04 02:25:01 UTC (rev 20)
+++ client/trunk/data/graphics/sprites/monster-maggot.xml 2007-11-04 02:33:59 UTC (rev 21)
@@ -51,19 +51,19 @@
<action name="attack" imageset="base">
<animation direction="down">
<sequence start="5" end="8" delay="150" offsetY ="-8" />
- <frame index="8" delay="32000" offsetY ="-8"/>
+ <end/>
</animation>
<animation direction="left">
<sequence start="15" end="18" delay="150" offsetY ="-11" />
- <frame index="18" delay="32000" offsetY ="-11" />
+ <end/>
</animation>
<animation direction="up">
<sequence start="25" end="28" delay="150" offsetY ="-10" />
- <frame index="28" delay="32000" offsetY ="-10" />
+ <end/>
</animation>
<animation direction="right">
<sequence start="35" end="38" delay="150" offsetY ="-11" />
- <frame index="38" delay="32000" offsetY ="-11" />
+ <end/>
</animation>
</action>
Modified: client/trunk/data/maps/beta-test1.tmx
===================================================================
--- client/trunk/data/maps/beta-test1.tmx 2007-11-04 02:25:01 UTC (rev 20)
+++ client/trunk/data/maps/beta-test1.tmx 2007-11-04 02:33:59 UTC (rev 21)
@@ -13,20 +13,30 @@
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAAGNiYGBgGsVDAl8G4isDaP9jIH5CJ7t8gNgXj7wYlTAu82OAOJZMu3GppSQ80M0h5A9q2InPXmLVk2I+reOUXH9Ty0xyw3wg7EYWmwjEkwbIbhBeCMSLBiAsRjEq3gjEmwbQ/oNAfGgQhMMoHsWjeBSP4lE81DEAqYwWKAAQAAA=
</data>
+ <tileproperties/>
</layer>
<layer name="Layer 1" width="32" height="32">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAAO3BAQ0AAADCoPdPbQ8HFAAAAPBuEQAcxwAQAAA=
</data>
+ <tileproperties/>
</layer>
<layer name="Layer 2" width="32" height="32">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAAO3BAQ0AAADCoPdPbQ8HFAAAAPBuEQAcxwAQAAA=
</data>
+ <tileproperties/>
</layer>
<layer name="Layer 3" width="32" height="32">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAAO3U0QnAIAxF0by6gV2h3aBuovuvYqAjCL4W7oF8349EI/AXlyJu+foj231TX3rHxd0HvsL97zzZbrxFuyN3UIx7qNk+uQMAAJZNrXUR7QAQAAA=
</data>
+ <tileproperties/>
</layer>
+ <objectgroup name="Gruppo di Oggetti 4" width="0" height="0">
+ <object name="Maggot spawn area" type="SPAWN" x="128" y="128" width="128" height="128"/>
+ <object name="npc1" type="NPC" x="128" y="32" width="0" height="0"/>
+ <object name="npc2" type="NPC" x="256" y="128" width="0" height="0"/>
+ <object name="Other npcs" type="SCRIPT" x="0" y="0" width="0" height="0"/>
+ </objectgroup>
</map>
Modified: client/trunk/src/gui/char_select.cpp
===================================================================
--- client/trunk/src/gui/char_select.cpp 2007-11-04 02:25:01 UTC (rev 20)
+++ client/trunk/src/gui/char_select.cpp 2007-11-04 02:33:59 UTC (rev 21)
@@ -251,6 +251,7 @@
mPlayer = new Player(0, 0, NULL);
mPlayer->setHairStyle(rand() % NR_HAIR_STYLES);
mPlayer->setHairColor(rand() % NR_HAIR_COLORS);
+ mPlayer->setKingdom(1);
mNameField = new TextField("");
mNameLabel = new gcn::Label(_("Name:"));
@@ -264,12 +265,12 @@
mCancelButton = new Button(_("Cancel"), "cancel", this);
mPlayerBox = new PlayerBox(mPlayer);
mAttributeLabel[0] = new gcn::Label(_("Strength:"));
- mAttributeLabel[1] = new gcn::Label(_("Agility:"));
- mAttributeLabel[2] = new gcn::Label(_("Dexterity:"));
- mAttributeLabel[3] = new gcn::Label(_("Vitality:"));
- mAttributeLabel[4] = new gcn::Label(_("Intelligence:"));
- mAttributeLabel[5] = new gcn::Label(_("Willpower:"));
- mAttributeLabel[6] = new gcn::Label(_("Charisma:"));
+ mAttributeLabel[1] = new gcn::Label(_("Endurance:"));
+ mAttributeLabel[2] = new gcn::Label(_("Agility:"));
+ mAttributeLabel[3] = new gcn::Label(_("Aptitude:"));
+ mAttributeLabel[4] = new gcn::Label(_("Charisma:"));
+ mAttributeLabel[5] = new gcn::Label(_("Spirit:"));
+ mAttributeLabel[6] = new gcn::Label(_("Luck:"));
for (int i=0; i<7; i++)
{
mAttributeLabel[i]->setWidth(70);
@@ -358,6 +359,7 @@
getName(),
mPlayer->getHairStyle(),
mPlayer->getHairColor(),
+ mPlayer->getKingdom(),
0, // gender
(int) mAttributeSlider[0]->getValue(), // STR
(int) mAttributeSlider[1]->getValue(), // AGI
Modified: client/trunk/src/gui/status.cpp
===================================================================
--- client/trunk/src/gui/status.cpp 2007-11-04 02:25:01 UTC (rev 20)
+++ client/trunk/src/gui/status.cpp 2007-11-04 02:33:59 UTC (rev 21)
@@ -226,12 +226,12 @@
// ----------
const std::string attrNames[7] = {
"Strength",
+ "Endurance",
"Agility",
- "Dexterity",
- "Vitality",
- "Intelligence",
- "Willpower",
- "Charisma"
+ "Aptitude",
+ "Charisma",
+ "Spirit",
+ "Luck"
};
int statusPoints = mPlayer->getAttributeIncreasePoints();
Modified: client/trunk/src/localplayer.h
===================================================================
--- client/trunk/src/localplayer.h 2007-11-04 02:25:01 UTC (rev 20)
+++ client/trunk/src/localplayer.h 2007-11-04 02:33:59 UTC (rev 21)
@@ -45,7 +45,6 @@
BASE_ATTR_MAG_ATK,
BASE_ATTR_PHY_RES,
BASE_ATTR_MAG_RES,
- BASE_ATTR_EVADE,
BASE_ATTR_HP,
BASE_ATTR_END,
BASE_ATTR_NB = BASE_ATTR_END - BASE_ATTR_BEGIN,
@@ -71,12 +70,12 @@
{
CHAR_ATTR_BEGIN = NB_BEING_ATTRIBUTES,
CHAR_ATTR_STRENGTH = CHAR_ATTR_BEGIN,
+ CHAR_ATTR_ENDURANCE,
CHAR_ATTR_AGILITY,
- CHAR_ATTR_DEXTERITY,
- CHAR_ATTR_VITALITY,
- CHAR_ATTR_INTELLIGENCE,
- CHAR_ATTR_WILLPOWER,
+ CHAR_ATTR_APTITUDE,
CHAR_ATTR_CHARISMA,
+ CHAR_ATTR_SPIRIT,
+ CHAR_ATTR_LUCK,
CHAR_ATTR_END,
CHAR_ATTR_NB = CHAR_ATTR_END - CHAR_ATTR_BEGIN,
Modified: client/trunk/src/net/accountserver/account.cpp
===================================================================
--- client/trunk/src/net/accountserver/account.cpp 2007-11-04 02:25:01 UTC (rev 20)
+++ client/trunk/src/net/accountserver/account.cpp 2007-11-04 02:33:59 UTC (rev 21)
@@ -30,9 +30,9 @@
#include "../protocol.h"
void Net::AccountServer::Account::createCharacter(
- const std::string &name, char hairStyle, char hairColor, char gender,
- short strength, short agility, short vitality,
- short intelligence, short dexterity, short willpower, short charisma)
+ const std::string &name, char hairStyle, char hairColor, char kingdom,
+ char gender, short strength, short endurance, short agility,
+ short aptitude, short charisma, short spirit, short luck)
{
MessageOut msg(PAMSG_CHAR_CREATE);
@@ -41,12 +41,12 @@
msg.writeByte(hairColor);
msg.writeByte(gender);
msg.writeShort(strength);
+ msg.writeShort(endurance);
msg.writeShort(agility);
- msg.writeShort(vitality);
- msg.writeShort(intelligence);
- msg.writeShort(dexterity);
- msg.writeShort(willpower);
+ msg.writeShort(aptitude);
msg.writeShort(charisma);
+ msg.writeShort(spirit);
+ msg.writeShort(luck);
Net::AccountServer::connection->send(msg);
}
Modified: client/trunk/src/net/accountserver/account.h
===================================================================
--- client/trunk/src/net/accountserver/account.h 2007-11-04 02:25:01 UTC (rev 20)
+++ client/trunk/src/net/accountserver/account.h 2007-11-04 02:33:59 UTC (rev 21)
@@ -33,9 +33,9 @@
namespace Account
{
void createCharacter(const std::string &name,
- char hairStyle, char hairColor, char gender,
- short strength, short agility, short vitality,
- short intelligence, short dexterity, short willpower, short charisma);
+ char hairStyle, char hairColor, char kingdom, char gender,
+ short strength, short endurance, short agility,
+ short aptitude, short charisma, short spirit, short luck);
void deleteCharacter(char slot);
Modified: client/trunk/src/net/beinghandler.cpp
===================================================================
--- client/trunk/src/net/beinghandler.cpp 2007-11-04 02:25:01 UTC (rev 20)
+++ client/trunk/src/net/beinghandler.cpp 2007-11-04 02:33:59 UTC (rev 21)
@@ -474,6 +474,7 @@
Player *p = static_cast< Player * >(being);
p->setHairStyle(msg.readByte());
p->setHairColor(msg.readByte());
+ p->setKingdom(msg.readByte());
p->setGender(msg.readByte());
handleLooks(p, msg);
} break;
Modified: client/trunk/src/net/charserverhandler.cpp
===================================================================
--- client/trunk/src/net/charserverhandler.cpp 2007-11-04 02:25:01 UTC (rev 20)
+++ client/trunk/src/net/charserverhandler.cpp 2007-11-04 02:33:59 UTC (rev 21)
@@ -219,6 +219,7 @@
tempPlayer->setGender(msg.readByte());
tempPlayer->setHairStyle(msg.readByte());
tempPlayer->setHairColor(msg.readByte());
+ tempPlayer->setKingdom(msg.readByte());
tempPlayer->setLevel(msg.readByte());
tempPlayer->setMoney(msg.readLong());
Modified: client/trunk/src/player.cpp
===================================================================
--- client/trunk/src/player.cpp 2007-11-04 02:25:01 UTC (rev 20)
+++ client/trunk/src/player.cpp 2007-11-04 02:33:59 UTC (rev 21)
@@ -38,7 +38,7 @@
Player::Player(int id, int job, Map *map):
Being(id, job, map),
mEquipmentSpriteIDs(VECTOREND_SPRITE, 0),
- mGender(2), mHairStyle(0), mHairColor(0)
+ mGender(2), mHairStyle(0), mHairColor(0), mKingdom(0)
{
}
Modified: client/trunk/src/player.h
===================================================================
--- client/trunk/src/player.h 2007-11-04 02:25:01 UTC (rev 20)
+++ client/trunk/src/player.h 2007-11-04 02:33:59 UTC (rev 21)
@@ -76,6 +76,17 @@
void setHairStyle(int style);
/**
+ * Gets kingdom number of character
+ */
+ int getKingdom() const
+ { return mKingdom; }
+
+ /**
+ * Sets kingdom by number
+ */
+ void setKingdom(int kingdom);
+
+ /**
* Sets visible equipments for this player.
*/
void setVisibleEquipment(int slot, int id);
@@ -83,7 +94,7 @@
private:
std::vector<int> mEquipmentSpriteIDs;
- Uint8 mGender, mHairStyle, mHairColor;
+ Uint8 mGender, mHairStyle, mHairColor, mKingdom;
};
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-11-04 02:24:58
|
Revision: 20
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=20&view=rev
Author: crush_tmw
Date: 2007-11-03 19:25:01 -0700 (Sat, 03 Nov 2007)
Log Message:
-----------
Replaced TMWs basic attributes with the Damasca basic attributes, removed dodging and added kingdom to character properties.
Modified Paths:
--------------
server/trunk/accountserver.exe
server/trunk/gameserver.exe
server/trunk/src/account-server/character.hpp
server/trunk/src/account-server/dalstorage.cpp
server/trunk/src/account-server/dalstoragesql.hpp
server/trunk/src/defines.h
server/trunk/src/game-server/being.cpp
server/trunk/src/game-server/being.hpp
server/trunk/src/game-server/character.cpp
server/trunk/src/game-server/itemmanager.cpp
server/trunk/src/game-server/monster.cpp
server/trunk/tmw.db
Modified: server/trunk/accountserver.exe
===================================================================
(Binary files differ)
Modified: server/trunk/gameserver.exe
===================================================================
(Binary files differ)
Modified: server/trunk/src/account-server/character.hpp
===================================================================
--- server/trunk/src/account-server/character.hpp 2007-10-28 16:29:58 UTC (rev 19)
+++ server/trunk/src/account-server/character.hpp 2007-11-04 02:25:01 UTC (rev 20)
@@ -98,6 +98,14 @@
void
setHairColor(int color) { mHairColor = color; }
+ /** Gets kingdom number */
+ int
+ getKingdom() const { return mKingdom; }
+
+ /** Sets kingdom by number */
+ void
+ setKingdom(int kingdom) { mKingdom = kingdom; }
+
/** Gets the account level of the user. */
int getAccountLevel() const
{ return mAccountLevel; }
@@ -175,6 +183,7 @@
unsigned char mGender; //!< Gender of the being.
unsigned char mHairStyle; //!< Hair style of the being.
unsigned char mHairColor; //!< Hair color of the being.
+ signed char mKingdom; //!< Kingdom the character belongs to
unsigned char mLevel; //!< Level of the being.
unsigned char mAccountLevel; //!< Level of the associated account.
Modified: server/trunk/src/account-server/dalstorage.cpp
===================================================================
--- server/trunk/src/account-server/dalstorage.cpp 2007-10-28 16:29:58 UTC (rev 19)
+++ server/trunk/src/account-server/dalstorage.cpp 2007-11-04 02:25:01 UTC (rev 20)
@@ -254,7 +254,7 @@
Character *DALStorage::getCharacterBySQL(std::string const &query, Account *owner)
{
- Character *character;
+ Character *character;
// specialize the string_to functor to convert
// a string to an unsigned int.
@@ -278,17 +278,18 @@
character->setGender(toUshort(charInfo(0, 3)));
character->setHairStyle(toUshort(charInfo(0, 4)));
character->setHairColor(toUshort(charInfo(0, 5)));
- character->setLevel(toUshort(charInfo(0, 6)));
- character->getPossessions().money = toUint(charInfo(0, 7));
- Point pos(toUshort(charInfo(0, 8)), toUshort(charInfo(0, 9)));
+ character->setKingdom(toUshort(charInfo(0, 6)));
+ character->setLevel(toUshort(charInfo(0, 7)));
+ character->getPossessions().money = toUint(charInfo(0, 8));
+ Point pos(toUshort(charInfo(0, 9)), toUshort(charInfo(0, 10)));
character->setPosition(pos);
for (int i = 0; i < CHAR_ATTR_NB; ++i)
{
character->setAttribute(CHAR_ATTR_BEGIN + i,
- toUshort(charInfo(0, 11 + i)));
+ toUshort(charInfo(0, 12 + i)));
}
- int mapId = toUint(charInfo(0, 10));
+ int mapId = toUint(charInfo(0, 11));
if (mapId > 0)
{
character->setMapId(mapId);
@@ -521,23 +522,19 @@
<< "gender = '" << character->getGender() << "', "
<< "hair_style = '" << character->getHairStyle() << "', "
<< "hair_color = '" << character->getHairColor() << "', "
+ << "kingdom = '" << character->getKingdom() << "', "
<< "level = '" << character->getLevel() << "', "
<< "money = '" << character->getPossessions().money << "', "
<< "x = '" << character->getPosition().x << "', "
<< "y = '" << character->getPosition().y << "', "
<< "map_id = '" << character->getMapId() << "', "
<< "str = '" << character->getAttribute(CHAR_ATTR_STRENGTH) << "', "
+ << "end = '" << character->getAttribute(CHAR_ATTR_ENDURANCE) << "', "
<< "agi = '" << character->getAttribute(CHAR_ATTR_AGILITY) << "', "
- << "dex = '" << character->getAttribute(CHAR_ATTR_DEXTERITY) << "', "
- << "vit = '" << character->getAttribute(CHAR_ATTR_VITALITY) << "', "
-#if defined(MYSQL_SUPPORT) || defined(POSTGRESQL_SUPPORT)
- << "`int` = '"
-#else
- << "int = '"
-#endif
- << character->getAttribute(CHAR_ATTR_INTELLIGENCE) << "', "
- << "will = '" << character->getAttribute(CHAR_ATTR_WILLPOWER) << "', "
- << "charisma = '" << character->getAttribute(CHAR_ATTR_CHARISMA) << "' "
+ << "apt = '" << character->getAttribute(CHAR_ATTR_APTITUDE) << "', "
+ << "cha = '" << character->getAttribute(CHAR_ATTR_CHARISMA) << "', "
+ << "spr = '" << character->getAttribute(CHAR_ATTR_SPIRIT) << "', "
+ << "luk = '" << character->getAttribute(CHAR_ATTR_LUCK) << "' "
<< "where id = '" << character->getDatabaseID() << "';";
mDb->execSql(sqlUpdateCharacterInfo.str());
@@ -824,25 +821,26 @@
// uniqueness
sqlInsertCharactersTable
<< "insert into " << CHARACTERS_TBL_NAME
- << " (user_id, name, gender, hair_style, hair_color, level, money,"
- << " x, y, map_id, str, agi, dex, vit, int, will, charisma) values ("
+ << " (user_id, name, gender, hair_style, hair_color, kingdom, level, money,"
+ << " x, y, map_id, str, end, agi, apt, cha, spr, luk) values ("
<< account->getID() << ", \""
<< (*it)->getName() << "\", "
<< (*it)->getGender() << ", "
<< (int)(*it)->getHairStyle() << ", "
<< (int)(*it)->getHairColor() << ", "
+ << (int)(*it)->getKingdom() << ", "
<< (int)(*it)->getLevel() << ", "
<< (*it)->getPossessions().money << ", "
<< (*it)->getPosition().x << ", "
<< (*it)->getPosition().y << ", "
<< (*it)->getMapId() << ", "
<< (*it)->getAttribute(CHAR_ATTR_STRENGTH) << ", "
+ << (*it)->getAttribute(CHAR_ATTR_ENDURANCE) << ", "
<< (*it)->getAttribute(CHAR_ATTR_AGILITY) << ", "
- << (*it)->getAttribute(CHAR_ATTR_DEXTERITY) << ", "
- << (*it)->getAttribute(CHAR_ATTR_VITALITY) << ", "
- << (*it)->getAttribute(CHAR_ATTR_INTELLIGENCE) << ", "
- << (*it)->getAttribute(CHAR_ATTR_WILLPOWER) << ", "
- << (*it)->getAttribute(CHAR_ATTR_CHARISMA) << ");";
+ << (*it)->getAttribute(CHAR_ATTR_APTITUDE) << ", "
+ << (*it)->getAttribute(CHAR_ATTR_CHARISMA) << ", "
+ << (*it)->getAttribute(CHAR_ATTR_SPIRIT) << ", "
+ << (*it)->getAttribute(CHAR_ATTR_LUCK) << ");";
mDb->execSql(sqlInsertCharactersTable.str());
@@ -982,7 +980,7 @@
void DALStorage::addGuildMember(int guildId, const std::string &memberName)
{
std::ostringstream sql;
-
+
try
{
sql << "insert into " << GUILD_MEMBERS_TBL_NAME
@@ -995,7 +993,7 @@
catch (const dal::DbSqlQueryExecFailure& e) {
// TODO: throw an exception.
LOG_ERROR("SQL query failure: " << e.what());
- }
+ }
}
/**
@@ -1004,7 +1002,7 @@
void DALStorage::removeGuildMember(int guildId, const std::string &memberName)
{
std::ostringstream sql;
-
+
try
{
sql << "delete from " << GUILD_MEMBERS_TBL_NAME
@@ -1016,7 +1014,7 @@
catch (const dal::DbSqlQueryExecFailure& e) {
// TODO: throw an exception.
LOG_ERROR("SQL query failure: " << e.what());
- }
+ }
}
// Guild members should not be stored by name in the database.
@@ -1033,18 +1031,18 @@
/**
* Get the guilds stored in the db.
*/
-
+
try
{
sql << "select id, name from " << GUILDS_TBL_NAME << ";";
const dal::RecordSet& guildInfo = mDb->execSql(sql.str());
-
+
// check that at least 1 guild was returned
if(guildInfo.isEmpty())
{
return guilds;
}
-
+
// loop through every row in the table and assign it to a guild
for ( unsigned int i = 0; i < guildInfo.rows(); ++i)
{
@@ -1052,11 +1050,11 @@
guild->setId(toShort(guildInfo(i,0)));
guilds.push_back(guild);
}
-
+
/**
* Add the members to the guilds.
*/
-
+
for (std::list<Guild*>::iterator itr = guilds.begin();
itr != guilds.end();
++itr)
@@ -1065,7 +1063,7 @@
memberSql << "select member_name from " << GUILD_MEMBERS_TBL_NAME
<< " where guild_id = '" << (*itr)->getId() << "';";
const dal::RecordSet& memberInfo = mDb->execSql(memberSql.str());
-
+
for (unsigned int j = 0; j < memberInfo.rows(); ++j)
{
Character *character = getCharacter(memberInfo(j,0));
@@ -1078,7 +1076,7 @@
// TODO: throw an exception.
LOG_ERROR("SQL query failure: " << e.what());
}
-
+
return guilds;
}
#endif
@@ -1151,5 +1149,5 @@
catch (dal::DbSqlQueryExecFailure const &e)
{
LOG_ERROR("(DALStorage::banAccount) SQL query failure: " << e.what());
- }
+ }
}
Modified: server/trunk/src/account-server/dalstoragesql.hpp
===================================================================
--- server/trunk/src/account-server/dalstoragesql.hpp 2007-10-28 16:29:58 UTC (rev 19)
+++ server/trunk/src/account-server/dalstoragesql.hpp 2007-11-04 02:25:01 UTC (rev 20)
@@ -115,6 +115,7 @@
"gender TINYINT UNSIGNED NOT NULL,"
"hair_style TINYINT UNSIGNED NOT NULL,"
"hair_color TINYINT UNSIGNED NOT NULL,"
+ "kingdom TINYINT UNSIGNED NOT NULL,"
"level TINYINT UNSIGNED NOT NULL,"
"money INTEGER UNSIGNED NOT NULL,"
// location on the map
@@ -122,14 +123,13 @@
"y SMALLINT UNSIGNED NOT NULL,"
"map_id TINYINT NOT NULL,"
// attributes
- "str SMALLINT UNSIGNED NOT NULL,"
- "agi SMALLINT UNSIGNED NOT NULL,"
- "dex SMALLINT UNSIGNED NOT NULL,"
- "vit SMALLINT UNSIGNED NOT NULL,"
- // note: int must be backquoted as it's a MySQL keyword
- "`int` SMALLINT UNSIGNED NOT NULL,"
- "will SMALLINT UNSIGNED NOT NULL,"
- "charisma SMALLINT UNSIGNED NOT NULL,"
+ "str SMALLINT NOT NULL,"
+ "end SMALLINT NOT NULL,"
+ "agi SMALLINT NOT NULL,"
+ "apt SMALLINT NOT NULL,"
+ "cha SMALLINT NOT NULL,"
+ "spr SMALLINT NOT NULL,"
+ "luk SMALLINT NOT NULL,"
"FOREIGN KEY (user_id) REFERENCES tmw_accounts(id),"
"FOREIGN KEY (map_id) REFERENCES tmw_maps(id),"
"INDEX (id)"
@@ -141,6 +141,7 @@
"gender INTEGER NOT NULL,"
"hair_style INTEGER NOT NULL,"
"hair_color INTEGER NOT NULL,"
+ "kingdom INTEGER NOT NULL,"
"level INTEGER NOT NULL,"
"money INTEGER NOT NULL,"
// location on the map
@@ -149,12 +150,12 @@
"map_id INTEGER NOT NULL,"
// attributes
"str INTEGER NOT NULL,"
+ "end INTEGER NOT NULL,"
"agi INTEGER NOT NULL,"
- "dex INTEGER NOT NULL,"
- "vit INTEGER NOT NULL,"
- "int INTEGER NOT NULL,"
- "will INTEGER NOT NULL,"
- "charisma INTEGER NOT NULL,"
+ "apt INTEGER NOT NULL,"
+ "cha INTEGER NOT NULL,"
+ "spr INTEGER NOT NULL,"
+ "luk INTEGER NOT NULL,"
"FOREIGN KEY (user_id) REFERENCES tmw_accounts(id),"
"FOREIGN KEY (map_id) REFERENCES tmw_maps(id)"
#elif defined (POSTGRESQL_SUPPORT)
@@ -165,6 +166,7 @@
"gender INTEGER NOT NULL,"
"hair_style INTEGER NOT NULL,"
"hair_color INTEGER NOT NULL,"
+ "kingdom INTEGER NOT NULL,"
"level INTEGER NOT NULL,"
"money INTEGER NOT NULL,"
// location on the map
@@ -173,12 +175,12 @@
"map_id INTEGER NOT NULL,"
// attributes
"str INTEGER NOT NULL,"
+ "end INTEGER NOT NULL,"
"agi INTEGER NOT NULL,"
- "dex INTEGER NOT NULL,"
- "vit INTEGER NOT NULL,"
- "int INTEGER NOT NULL,"
- "will INTEGER NOT NULL,"
- "charisma INTEGER NOT NULL,"
+ "apt INTEGER NOT NULL,"
+ "cha INTEGER NOT NULL,"
+ "spr INTEGER NOT NULL,"
+ "luk INTEGER NOT NULL,"
"FOREIGN KEY (user_id) REFERENCES tmw_accounts(id),"
"FOREIGN KEY (map_id) REFERENCES tmw_maps(id)"
#endif
Modified: server/trunk/src/defines.h
===================================================================
--- server/trunk/src/defines.h 2007-10-28 16:29:58 UTC (rev 19)
+++ server/trunk/src/defines.h 2007-11-04 02:25:01 UTC (rev 20)
@@ -362,7 +362,6 @@
BASE_ATTR_MAG_ATK, /**< Magical attack power. */
BASE_ATTR_PHY_RES, /**< Resistance to physical damage. */
BASE_ATTR_MAG_RES, /**< Resistance to magical damage. */
- BASE_ATTR_EVADE, /**< Ability to avoid hits. */
BASE_ATTR_HP, /**< Remaining Hit Points. */
BASE_ATTR_END,
BASE_ATTR_NB = BASE_ATTR_END - BASE_ATTR_BEGIN,
@@ -389,12 +388,12 @@
{
CHAR_ATTR_BEGIN = NB_BEING_ATTRIBUTES,
CHAR_ATTR_STRENGTH = CHAR_ATTR_BEGIN,
+ CHAR_ATTR_ENDURANCE,
CHAR_ATTR_AGILITY,
- CHAR_ATTR_DEXTERITY,
- CHAR_ATTR_VITALITY,
- CHAR_ATTR_INTELLIGENCE,
- CHAR_ATTR_WILLPOWER,
+ CHAR_ATTR_APTITUDE,
CHAR_ATTR_CHARISMA,
+ CHAR_ATTR_SPIRIT,
+ CHAR_ATTR_LUCK,
CHAR_ATTR_END,
CHAR_ATTR_NB = CHAR_ATTR_END - CHAR_ATTR_BEGIN,
Modified: server/trunk/src/game-server/being.cpp
===================================================================
--- server/trunk/src/game-server/being.cpp 2007-10-28 16:29:58 UTC (rev 19)
+++ server/trunk/src/game-server/being.cpp 2007-11-04 02:25:01 UTC (rev 20)
@@ -53,34 +53,6 @@
HPloss += rand() / (RAND_MAX / (damage.delta + 1));
}
- /* Damage can either be avoided, or applied, or critical (applied twice).
- This is decided by comparing CTH and Evade. If they are equal, the
- probabilities are 10%, 80%, 10%. Otherwise, the bigger the CTH, the
- higher the chance to do a critical, up to 50%; and the bigger the Evade,
- the higher the chance to do evade the hit, up to 50% again. */
-
- int avoidChance = 10, criticalChance = 10;
- int diff = damage.cth - getModifiedAttribute(BASE_ATTR_EVADE);
- if (diff > 0)
- {
- // CTH - Evade >= 200 => 50% critical
- criticalChance += diff * diff / 1000;
- if (criticalChance > 50) criticalChance = 50;
- }
- else if (diff < 0)
- {
- // Evade - CTH >= 200 => 50% avoid
- avoidChance += diff * diff / 10000;
- if (avoidChance > 50) avoidChance = 50;
- }
- int chance = rand() / (RAND_MAX / 100);
- if (chance <= avoidChance)
- {
- mHitsTaken.push_back(0);
- return 0;
- }
- if (chance >= 100 - criticalChance) HPloss *= 2;
-
/* Elemental modifier at 100 means normal damage. At 0, it means immune.
And at 200, it means vulnerable (double damage). */
int mod1 = getModifiedAttribute(BASE_ELEM_BEGIN + damage.element);
Modified: server/trunk/src/game-server/being.hpp
===================================================================
--- server/trunk/src/game-server/being.hpp 2007-10-28 16:29:58 UTC (rev 19)
+++ server/trunk/src/game-server/being.hpp 2007-11-04 02:25:01 UTC (rev 20)
@@ -61,7 +61,6 @@
{
unsigned short base; /**< Base amount of damage. */
unsigned short delta; /**< Additional damage when lucky. */
- unsigned short cth; /**< Chance to hit. Opposes the evade attribute. */
unsigned char element; /**< Elemental damage. */
unsigned char type; /**< Damage type: Physical or magical? */
};
Modified: server/trunk/src/game-server/character.cpp
===================================================================
--- server/trunk/src/game-server/character.cpp 2007-10-28 16:29:58 UTC (rev 19)
+++ server/trunk/src/game-server/character.cpp 2007-11-04 02:25:01 UTC (rev 20)
@@ -75,14 +75,12 @@
{
ItemModifiers const &mods = ic->getModifiers();
damage.delta = mods.getValue(MOD_WEAPON_DAMAGE);
- damage.cth = getModifiedAttribute(CHAR_SKILL_WEAPON_BEGIN + type);
damage.element = mods.getValue(MOD_ELEMENT_TYPE);
}
else
{
// No-weapon fighting.
damage.delta = 1;
- damage.cth = getModifiedAttribute(CHAR_SKILL_WEAPON_NONE);
damage.element = ELEMENT_NEUTRAL;
}
performAttack(damage);
@@ -181,11 +179,10 @@
{
/* FIXME: The following formulas are for testing purpose only. They
should be replaced by a real system once designed. */
- setAttribute(BASE_ATTR_HP, getModifiedAttribute(CHAR_ATTR_VITALITY));
+ setAttribute(BASE_ATTR_HP, getModifiedAttribute(CHAR_ATTR_ENDURANCE));
setAttribute(BASE_ATTR_PHY_ATK, getModifiedAttribute(CHAR_ATTR_STRENGTH));
- setAttribute(BASE_ATTR_PHY_RES, getModifiedAttribute(CHAR_ATTR_VITALITY));
- setAttribute(BASE_ATTR_MAG_RES, getModifiedAttribute(CHAR_ATTR_WILLPOWER));
- setAttribute(BASE_ATTR_EVADE, getModifiedAttribute(CHAR_ATTR_DEXTERITY));
+ setAttribute(BASE_ATTR_PHY_RES, getModifiedAttribute(CHAR_ATTR_ENDURANCE));
+ setAttribute(BASE_ATTR_MAG_RES, getModifiedAttribute(CHAR_ATTR_SPIRIT));
// We have just modified the computed attributes. Mark them as such.
for (int i = BASE_ATTR_BEGIN; i < BASE_ATTR_END; ++i)
{
Modified: server/trunk/src/game-server/itemmanager.cpp
===================================================================
--- server/trunk/src/game-server/itemmanager.cpp 2007-10-28 16:29:58 UTC (rev 19)
+++ server/trunk/src/game-server/itemmanager.cpp 2007-11-04 02:25:01 UTC (rev 20)
@@ -118,12 +118,12 @@
modifiers.setAttributeValue(BASE_ATTR_HP, XML::getProperty(node, "hp", 0));
modifiers.setAttributeValue(BASE_ATTR_PHY_RES, XML::getProperty(node, "defense", 0));
modifiers.setAttributeValue(CHAR_ATTR_STRENGTH, XML::getProperty(node, "strength", 0));
+ modifiers.setAttributeValue(CHAR_ATTR_ENDURANCE, XML::getProperty(node, "endurance", 0));
modifiers.setAttributeValue(CHAR_ATTR_AGILITY, XML::getProperty(node, "agility", 0));
- modifiers.setAttributeValue(CHAR_ATTR_DEXTERITY, XML::getProperty(node, "dexterity", 0));
- modifiers.setAttributeValue(CHAR_ATTR_VITALITY, XML::getProperty(node, "vitality", 0));
- modifiers.setAttributeValue(CHAR_ATTR_INTELLIGENCE, XML::getProperty(node, "intelligence", 0));
- modifiers.setAttributeValue(CHAR_ATTR_WILLPOWER, XML::getProperty(node, "willpower", 0));
+ modifiers.setAttributeValue(CHAR_ATTR_APTITUDE, XML::getProperty(node, "aptitude", 0));
modifiers.setAttributeValue(CHAR_ATTR_CHARISMA, XML::getProperty(node, "charisma", 0));
+ modifiers.setAttributeValue(CHAR_ATTR_SPIRIT, XML::getProperty(node, "spirit", 0));
+ modifiers.setAttributeValue(CHAR_ATTR_LUCK, XML::getProperty(node, "luck", 0));
if (maxPerSlot == 0)
{
Modified: server/trunk/src/game-server/monster.cpp
===================================================================
--- server/trunk/src/game-server/monster.cpp 2007-10-28 16:29:58 UTC (rev 19)
+++ server/trunk/src/game-server/monster.cpp 2007-11-04 02:25:01 UTC (rev 20)
@@ -101,7 +101,6 @@
Damage damage;
damage.base = getModifiedAttribute(BASE_ATTR_PHY_ATK) / 10;
damage.delta = 2;
- damage.cth = 50;
damage.element = ELEMENT_NEUTRAL;
damage.type = DAMAGE_PHYSICAL;
performAttack(damage);
Modified: server/trunk/tmw.db
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-10-28 16:30:03
|
Revision: 19
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=19&view=rev
Author: crush_tmw
Date: 2007-10-28 09:29:58 -0700 (Sun, 28 Oct 2007)
Log Message:
-----------
Implemented pathblocking by moving object and knockback/stun of hit enemies.
Modified Paths:
--------------
server/trunk/ChangeLog
server/trunk/gameserver.cbp
server/trunk/gameserver.exe
server/trunk/src/game-server/accountconnection.cpp
server/trunk/src/game-server/being.hpp
server/trunk/src/game-server/map.cpp
server/trunk/src/game-server/map.hpp
server/trunk/src/game-server/monster.cpp
server/trunk/src/game-server/monster.hpp
server/trunk/src/game-server/movingobject.cpp
server/trunk/src/game-server/movingobject.hpp
server/trunk/src/game-server/object.hpp
Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog 2007-10-26 19:54:25 UTC (rev 18)
+++ server/trunk/ChangeLog 2007-10-28 16:29:58 UTC (rev 19)
@@ -1,3 +1,15 @@
+2007-19-28 Philipp Sehmisch <tm...@cr...>
+
+ * src/game-server/movingobject.hpp,
+ src/game-server/accountconnection.cpp
+ src/game-server/movingobject.cpp,
+ src/game-server/map.cpp,
+ src/game-server/map.h,
+ src/object.h: Implemented pathblocking by moving objects.
+ * src/monster.cpp, src/monster.hpp, src/being.cpp: Implemented
+ knockback and stun after getting hit.
+
+ *
2007-19-26 Philipp Sehmisch <tm...@cr...>
* data/maps/beta-test1.tmx.gz, data/maps/beta-test1.tmx: Using
Modified: server/trunk/gameserver.cbp
===================================================================
--- server/trunk/gameserver.cbp 2007-10-26 19:54:25 UTC (rev 18)
+++ server/trunk/gameserver.cbp 2007-10-28 16:29:58 UTC (rev 19)
@@ -237,6 +237,12 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
+ <Unit filename="src\game-server\object.hpp">
+ <Option compilerVar=""/>
+ <Option compile="0"/>
+ <Option link="0"/>
+ <Option target="default"/>
+ </Unit>
<Unit filename="src\game-server\quest.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
Modified: server/trunk/gameserver.exe
===================================================================
(Binary files differ)
Modified: server/trunk/src/game-server/accountconnection.cpp
===================================================================
--- server/trunk/src/game-server/accountconnection.cpp 2007-10-26 19:54:25 UTC (rev 18)
+++ server/trunk/src/game-server/accountconnection.cpp 2007-10-28 16:29:58 UTC (rev 19)
@@ -76,7 +76,7 @@
{
std::string token = msg.readString(MAGIC_TOKEN_LENGTH);
Character *ptr = new Character(msg);
- ptr->setSpeed(250); // TODO
+ ptr->setBaseSpeed(250); // TODO
// FIXME: for testing purpose.
ptr->setAttribute(CHAR_SKILL_WEAPON_NONE, 10);
gameHandler->addPendingCharacter(token, ptr);
@@ -112,10 +112,10 @@
if(msg.readByte() == ERRMSG_OK)
{
int playerId = msg.readLong();
-
+
MessageOut result(GPMSG_GUILD_CREATE_RESPONSE);
result.writeByte(ERRMSG_OK);
-
+
/* Create a message that the player has joined the guild
* Output the guild ID and guild name
* Send a 1 if the player has rights
@@ -125,7 +125,7 @@
out.writeShort(msg.readShort());
out.writeString(msg.readString());
out.writeShort(msg.readShort());
-
+
Character *player = gameHandler->messageMap[playerId];
if(player)
{
@@ -134,33 +134,33 @@
}
}
} break;
-
+
case AGMSG_GUILD_INVITE_RESPONSE:
{
if(msg.readByte() == ERRMSG_OK)
{
int playerId = msg.readLong();
-
+
MessageOut result(GPMSG_GUILD_INVITE_RESPONSE);
result.writeByte(ERRMSG_OK);
-
+
Character *player = gameHandler->messageMap[playerId];
if(player)
{
gameHandler->sendTo(player, result);
- }
+ }
}
} break;
-
+
case AGMSG_GUILD_ACCEPT_RESPONSE:
{
if(msg.readByte() == ERRMSG_OK)
{
int playerId = msg.readLong();
-
+
MessageOut result(GPMSG_GUILD_ACCEPT_RESPONSE);
result.writeByte(ERRMSG_OK);
-
+
/* Create a message that the player has joined the guild
* Output the guild ID and guild name
* Send a 0 for invite rights, since player has been invited
@@ -170,23 +170,23 @@
out.writeShort(msg.readShort());
out.writeString(msg.readString());
out.writeShort(0);
-
+
Character *player = gameHandler->messageMap[playerId];
if(player)
{
gameHandler->sendTo(player, result);
gameHandler->sendTo(player, out);
- }
+ }
}
} break;
-
+
case AGMSG_GUILD_GET_MEMBERS_RESPONSE:
{
if(msg.readByte() != ERRMSG_OK)
break;
int playerId = msg.readLong();
short guildId = msg.readShort();
-
+
MessageOut result(GPMSG_GUILD_GET_MEMBERS_RESPONSE);
result.writeByte(ERRMSG_OK);
result.writeShort(guildId);
@@ -194,25 +194,25 @@
{
result.writeString(msg.readString());
}
-
+
Character *player = gameHandler->messageMap[playerId];
if(player)
{
gameHandler->sendTo(player, result);
}
} break;
-
+
case AGMSG_GUILD_QUIT_RESPONSE:
{
if(msg.readByte() != ERRMSG_OK)
break;
int playerId = msg.readLong();
short guildId = msg.readShort();
-
+
MessageOut result(GPMSG_GUILD_QUIT_RESPONSE);
result.writeByte(ERRMSG_OK);
result.writeShort(guildId);
-
+
Character *player = gameHandler->messageMap[playerId];
if(player)
{
Modified: server/trunk/src/game-server/being.hpp
===================================================================
--- server/trunk/src/game-server/being.hpp 2007-10-26 19:54:25 UTC (rev 18)
+++ server/trunk/src/game-server/being.hpp 2007-10-28 16:29:58 UTC (rev 19)
@@ -214,6 +214,7 @@
protected:
Action mAction;
std::vector< Attribute > mAttributes;
+ int mStunTime; /**< time the being is stunned */
private:
Being(Being const &rhs);
Modified: server/trunk/src/game-server/map.cpp
===================================================================
--- server/trunk/src/game-server/map.cpp 2007-10-26 19:54:25 UTC (rev 18)
+++ server/trunk/src/game-server/map.cpp 2007-10-28 16:29:58 UTC (rev 19)
@@ -77,6 +77,16 @@
metaTiles[x + y * width].walkable = walkable;
}
+void Map::occupyTile(int x, int y)
+{
+ metaTiles[x + y * width].walkable--;
+}
+
+void Map::freeTile(int x, int y)
+{
+ metaTiles[x + y * width].walkable++;
+}
+
bool Map::getWalk(int x, int y) const
{
// You can't walk outside of the map
Modified: server/trunk/src/game-server/map.hpp
===================================================================
--- server/trunk/src/game-server/map.hpp 2007-10-26 19:54:25 UTC (rev 18)
+++ server/trunk/src/game-server/map.hpp 2007-10-28 16:29:58 UTC (rev 19)
@@ -57,7 +57,7 @@
int whichList; /**< No list, open list or closed list */
int parentX; /**< X coordinate of parent tile */
int parentY; /**< Y coordinate of parent tile */
- bool walkable; /**< Can beings normally walk on this tile */
+ int walkable; /**< Can beings normally walk on this tile */
};
/**
@@ -119,6 +119,16 @@
void setWalk(int x, int y, bool walkable);
/**
+ * marks a tile as occupied by one object more
+ */
+ void occupyTile(int x, int y);
+
+ /**
+ * marks the tile as occupied by one object less
+ */
+ void freeTile(int x, int y);
+
+ /**
* Gets walkability for a tile.
*/
bool getWalk(int x, int y) const;
Modified: server/trunk/src/game-server/monster.cpp
===================================================================
--- server/trunk/src/game-server/monster.cpp 2007-10-26 19:54:25 UTC (rev 18)
+++ server/trunk/src/game-server/monster.cpp 2007-10-28 16:29:58 UTC (rev 19)
@@ -68,7 +68,7 @@
mAgressionRange = 10; // TODO: Get from monster database
// Some bogus stats for testing.
- setSpeed(500);
+ setBaseSpeed(500);
setSize(8);
setAttribute(BASE_ATTR_HP, 10);
setAttribute(BASE_ATTR_PHY_ATK, 10);
@@ -123,6 +123,13 @@
return;
}
+ //If stunned do nothing either
+ if (mStunTime)
+ {
+ mStunTime--;
+ return;
+ }
+
// If currently attacking finish attack;
if (mAttackTime)
{
@@ -266,6 +273,25 @@
ib.first->second += HPLoss;
}
}
+
+ //knockback
+ if (source)
+ {
+ Point ownPos = getPosition();
+ Point attPos = source->getPosition();
+
+ float dX = (float)ownPos.x - (float)attPos.x;
+ float dY = (float)ownPos.y - (float)attPos.y;
+ float hyp = sqrt((dX * dX) + (dY * dY));
+
+ ownPos.x += (int)(dX / hyp * 64);
+ ownPos.y += (int)(dY / hyp * 64);
+
+ setDestination(ownPos, 100);
+ }
+ mStunTime = 10;
+ mAttackTime = 0;
+
return HPLoss;
}
Modified: server/trunk/src/game-server/monster.hpp
===================================================================
--- server/trunk/src/game-server/monster.hpp 2007-10-26 19:54:25 UTC (rev 18)
+++ server/trunk/src/game-server/monster.hpp 2007-10-28 16:29:58 UTC (rev 19)
@@ -25,6 +25,7 @@
#include <map>
#include <vector>
+#include <cmath>
#include "game-server/being.hpp"
#include "game-server/eventlistener.hpp"
Modified: server/trunk/src/game-server/movingobject.cpp
===================================================================
--- server/trunk/src/game-server/movingobject.cpp 2007-10-26 19:54:25 UTC (rev 18)
+++ server/trunk/src/game-server/movingobject.cpp 2007-10-28 16:29:58 UTC (rev 19)
@@ -24,16 +24,39 @@
#include "game-server/mapcomposite.hpp"
#include "game-server/movingobject.hpp"
-void MovingObject::setDestination(Point const &dst)
+MovingObject::MovingObject(int type, int id) :
+ Object(type),
+ mPublicID(id),
+ mActionTime(0),
+ mDirection(0)
{
+}
+
+MovingObject::~MovingObject()
+{
+ Point p = getPosition();
+ Map *map = getMap()->getMap();
+ map->freeTile(p.x / 32, p.y / 32);
+}
+
+void MovingObject::setDestination(Point const &dst, short speed)
+{
+ if (speed != 0)
+ {
+ setCurrentSpeed(speed);
+ } else {
+ setCurrentSpeed(mBaseSpeed);
+ }
mDst = dst;
raiseUpdateFlags(UPDATEFLAG_NEW_DESTINATION);
mPath.clear();
+ mActionTime = 0;
}
void MovingObject::move()
{
mOld = getPosition();
+
if (mActionTime > 100)
{
// Current move has not yet ended
@@ -107,3 +130,12 @@
mActionTime = mActionTime > 100 ? mActionTime - 100 : 0;
}
+
+void MovingObject::setPosition(const Point &p)
+{
+ Map *map = getMap()->getMap();
+ Point oldPos = getPosition();
+ map->freeTile(oldPos.x / 32, oldPos.y / 32);
+ Object::setPosition(p);
+ map->occupyTile(p.x / 32, p.y / 32);
+}
Modified: server/trunk/src/game-server/movingobject.hpp
===================================================================
--- server/trunk/src/game-server/movingobject.hpp 2007-10-26 19:54:25 UTC (rev 18)
+++ server/trunk/src/game-server/movingobject.hpp 2007-10-28 16:29:58 UTC (rev 19)
@@ -38,13 +38,10 @@
/**
* Proxy constructor.
*/
- MovingObject(int type, int id)
- : Object(type),
- mPublicID(id),
- mActionTime(0),
- mDirection(0)
- {}
+ MovingObject(int type, int id);
+ ~MovingObject();
+
/**
* Gets the destination coordinates of the object.
*/
@@ -54,7 +51,7 @@
/**
* Sets the destination coordinates of the object.
*/
- void setDestination(const Point &dst);
+ void setDestination(const Point &dst, short speed = 0);
/**
* Sets the destination coordinates of the object to the current position.
@@ -69,6 +66,11 @@
{ return mOld; }
/**
+ *
+ */
+ void setPosition(const Point &p);
+
+ /**
* Sets object direction.
*/
void setDirection(int direction)
@@ -81,18 +83,24 @@
{ return mDirection; }
/**
- * Gets object speed.
+ * Gets current object speed.
*/
int getSpeed() const
{ return mSpeed; }
/**
- * Sets object speed.
+ * Sets current object speed.
*/
- void setSpeed(int s)
+ void setCurrentSpeed(int s)
{ mSpeed = s; }
/**
+ * Sets normal object speed.
+ */
+ void setBaseSpeed(int s)
+ { mBaseSpeed = s; }
+
+ /**
* Sets object bounding circle radius.
*/
void setSize(int s)
@@ -134,7 +142,8 @@
Point mDst; /**< Target coordinates. */
Point mOld; /**< Old coordinates. */
- unsigned short mSpeed; /**< Speed. */
+ unsigned short mSpeed; /**< Current Speed. */
+ unsigned short mBaseSpeed; /**< Normal Speed. */
std::list<PATH_NODE> mPath;
protected:
Modified: server/trunk/src/game-server/object.hpp
===================================================================
--- server/trunk/src/game-server/object.hpp 2007-10-26 19:54:25 UTC (rev 18)
+++ server/trunk/src/game-server/object.hpp 2007-10-28 16:29:58 UTC (rev 19)
@@ -59,7 +59,7 @@
*
* @param p the coordinates.
*/
- void setPosition(const Point &p)
+ virtual void setPosition(const Point &p)
{ mPos = p; }
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-10-26 19:54:35
|
Revision: 18
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=18&view=rev
Author: crush_tmw
Date: 2007-10-26 12:54:25 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
Made the attack animation of the test monsters finite. This looks better with the attack behavior on the new server. Removed the old TMW maps.
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/data/graphics/sprites/monster-maggot.xml
Removed Paths:
-------------
client/trunk/data/maps/beta-test1.tmx.gz
client/trunk/data/maps/new_1-1.tmx
client/trunk/data/maps/new_10-1.tmx
client/trunk/data/maps/new_11-1.tmx
client/trunk/data/maps/new_12-1.tmx
client/trunk/data/maps/new_13-1.tmx
client/trunk/data/maps/new_14-1.tmx
client/trunk/data/maps/new_15-1.tmx
client/trunk/data/maps/new_16-1.tmx
client/trunk/data/maps/new_17-1.tmx
client/trunk/data/maps/new_18-1.tmx
client/trunk/data/maps/new_19-1.tmx
client/trunk/data/maps/new_2-1.tmx
client/trunk/data/maps/new_20-1.tmx
client/trunk/data/maps/new_3-1.tmx
client/trunk/data/maps/new_4-1.tmx
client/trunk/data/maps/new_5-1.tmx
client/trunk/data/maps/new_6-1.tmx
client/trunk/data/maps/new_7-1.tmx
client/trunk/data/maps/new_8-1.tmx
client/trunk/data/maps/new_9-1.tmx
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2007-10-26 19:52:14 UTC (rev 17)
+++ client/trunk/ChangeLog 2007-10-26 19:54:25 UTC (rev 18)
@@ -1,5 +1,11 @@
-2007-10-25 Philipp Sehmisch <tm...@cr...>
+2007-10-26 Philipp Sehmisch <tm...@cr...>
+ * data/graphics/sprites/monster-maggot.xml: Made the attack
+ animation finite. This looks better with the attack behavior on
+ the new server.
+
+2007-10-25 Philipp Sehmisch <tm...@cr...>
+
* src/main.cpp, tmw-client.cbp, tmw.exe, tmw.cbp: Did
some rebranding from TMW to Damasca.
* data/music/Magic - Real.ogg, src/main.cpp: Changed
Modified: client/trunk/data/graphics/sprites/monster-maggot.xml
===================================================================
--- client/trunk/data/graphics/sprites/monster-maggot.xml 2007-10-26 19:52:14 UTC (rev 17)
+++ client/trunk/data/graphics/sprites/monster-maggot.xml 2007-10-26 19:54:25 UTC (rev 18)
@@ -51,15 +51,19 @@
<action name="attack" imageset="base">
<animation direction="down">
<sequence start="5" end="8" delay="150" offsetY ="-8" />
+ <frame index="8" delay="32000" offsetY ="-8"/>
</animation>
<animation direction="left">
<sequence start="15" end="18" delay="150" offsetY ="-11" />
+ <frame index="18" delay="32000" offsetY ="-11" />
</animation>
<animation direction="up">
<sequence start="25" end="28" delay="150" offsetY ="-10" />
+ <frame index="28" delay="32000" offsetY ="-10" />
</animation>
<animation direction="right">
<sequence start="35" end="38" delay="150" offsetY ="-11" />
+ <frame index="38" delay="32000" offsetY ="-11" />
</animation>
</action>
Deleted: client/trunk/data/maps/beta-test1.tmx.gz
===================================================================
(Binary files differ)
Deleted: client/trunk/data/maps/new_1-1.tmx
===================================================================
--- client/trunk/data/maps/new_1-1.tmx 2007-10-26 19:52:14 UTC (rev 17)
+++ client/trunk/data/maps/new_1-1.tmx 2007-10-26 19:54:25 UTC (rev 18)
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="200" height="200" tilewidth="32" tileheight="32">
- <properties>
- <property name="overlay0parallax" value="1.0"/>
- <property name="music" value="Faith.ogg"/>
- <property name="overlay2scrollY" value="-3"/>
- <property name="overlay1image" value="graphics/images/ambient/sandstorm.png"/>
- <property name="overlay2scrollX" value="12"/>
- <property name="overlay1scrollY" value="-2"/>
- <property name="overlay1scrollX" value="8"/>
- <property name="minimap" value="graphics/images/minimap_new_1-1.png"/>
- <property name="overlay0scrollY" value="-1"/>
- <property name="overlay2image" value="graphics/images/ambient/sandstorm.png"/>
- <property name="overlay0scrollX" value="4"/>
- <property name="overlay1parallax" value="1.5"/>
- <property name="overlay2parallax" value="2.0"/>
- <property name="overlay0image" value="graphics/images/ambient/sandstorm.png"/>
- </properties>
- <tileset name="Desert1" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/desert1.png"/>
- </tileset>
- <tileset name="Desert2" firstgid="257" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/desert2.png"/>
- </tileset>
- <tileset name="Collision" firstgid="513" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
- </tileset>
- <tileset name="Desert x2" firstgid="515" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/desert_x2.png"/>
- </tileset>
- <tileset name="Desert x3" firstgid="531" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/desert_x3.png"/>
- </tileset>
- <layer name="Ground" width="200" height="200">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3dSXbjRAAGYOk9puZKCSGHAE4AnKCBA0CTNZBm1wPjrgdg3QMPWPbAdB9KL9azIiRbji1VlfQtvopile2Srd9VljWURVGUM/VFKL7s8FUZv20Qm3xAP/mAfvIB/eQD+skH9JMP6Ccf0E8+oJ98QD/5gH7yAf3kA/rJB1N7fWVo/TcjtjX3fFxrvN7XEmgP223Kxj7v4Rjvf+75gDHlno+YfS/jGjoG66p3qPUi93xs80YCbWB/scbOc88HeRh7HHDVfOWcj77X1Jhrfra9p+31f5ftY5vknA8Y2775OFROoS2F7fX6D1Iw5HO2r86Y4+lc89G1XeqV4NUE2sYwKfQPtb51J9d8MG9D+oQpxvbyQS629Tf2L2GOptoef5XnmVs+/F7Ovo7KC9X0kHzU9dtiLwfLsu2z75D90K756JqGuduUD7/9MbYx1rHXDvhY34Ti2w7flfFfO5Zt0/Yon90s3a1Q3A7uBHfLzXVT+q0RpnAvFPeDB8HDcrznkS1y9CgUj4MnwdPgrZGfb8ox2yG/I7FMz0LxPHgRvCwv8jF2RlJm/0L6LD0bAAAAAAA58Hs20HbI41d8xgAAADGcJ9AGSJV8MIarHqPh2F8AYGlcXwyAMXUdz7vvMb7HCSwX0/osuJ5AO1LjfApUqu3rMgLdvi9kBDZpZuTGiqzAWp2Rmyv6E7isysgPK+3+pBa7jZCCdn9Si90uSEWzP6nt+hi2kwIA5Md+HxDftmtUAwDM2S5jIcdckboh51Nw3k0AAMZgv2roV+9X/fkE07GXleU4SqANTfX+2V9vmI7dRugz1n4z1X7YPxbr/bM3Tcd+DQCWZt9zbbWdJrBMAABjsZ87AMBujJ9YIucaIndXva7mnLydQBvgEFzvliU6KuO3AQC6nCTQBubP+UdgGU4TaAPT+CkUP3f4pYzfthydJ9AGdncavBMm3g3eK9e3/xqK34O/Gv4IfivjtTUlxy3NeUcrx0V6x+UyXP2b9Pvhnw+CD8v1vCofzSxU20zbty3BrVDcDu4EdxvLXh1DVa37J8X/j6c6Wt123DGP/AzJR99tc3cvFPeDB8HDxrJXuaj7h67+o57n9/R81eOqm+VFPs7L9TirysI/5eXvHv+Wy8vHo1A8Dp4ETxvLXuWjzkG7j6hv68oO+aj7jbaqH/mzvPzdo/Z3Ga+9MfYHeRaK58GL4GVj2av1/6RY56R5nzob8pG366H4qMPHZfy2pa7+jlHnpD2vHl/5fg7ALk4TaAOkzvYrluqT4uJc0DdW07XmeaKr/89WYrcXpnLW8bfSPk/0WSEfuXFu7/3tsr7LR54+TaANuRuy3ssHSyUf89R1zaGmvusSbaq3yS6PMfQxd627z/3a9eVjvvquOdQ0pM62eUPrtecNfcxd6+5zv3Z9+Zgv+ZguH7Zf5Uc+DpuPoWK/78hHivkoC/nIiXxMnw/yIR/ygXzIB/IRNx/Mj3zIB/IhH8iHfCAf8oF8yAfxyYd8IB/ygXzIB/IhHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0/sPyugxawBxAgA=
- </data>
- <tileproperties/>
- </layer>
- <layer name="Fringe" width="200" height="200" opacity="0.39">
- <data encoding="base64" compression="gzip">
- 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
- </data>
- <tileproperties/>
- </layer>
- <layer name="Over" width="200" height="200" opacity="0.43">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3dSW/TQACGYZuyHtnhWHa4sS+3lp1rs3Dvgf//D/gskLCqjAMoeMHPI71KpFxGSUfJeGy3qgAAAACAvtV1VZ1Ke+l0OpPOpnPpfLpQDz1CGM7F/P1fSpfTlXQ1XUvX04100/zgH3lUj7/9dCvdTnfS3XQv3U8P0sMRjHFbTNObevw9Tk/S0/QsPU8v0sv0Kr0ewRi3xTR9qcffQTpMb9O79D59SB/Tp/R5BGPcFgAAzM0qrVt9HXY4MKiT86GtWTJ+631E83ZU/fosFq3nyyEHNSPrqjwfGN5xx2vt+bJoPZYCAAAAgF1rju86FQs2a47vmh9QZn4AAAAA/J7mOIrrP/pj72NaXP/RL3sf0M38AP4X1iBQZg0CZX4PAwAAADBm9j+gzP4HlNn/AAAAAAAAAAAAAAAAAAAAAAAAYNdWafGz9YlH905kzlYdr7l3InPWNTdgzswN2Oxo6AEAAAAAf8T/V4Mye4RQVle+Q6CL75DhNHtV6x6DqalbAQDw95q1h99UsNlxZX5AF/MDAGA3rM2nqfncmvuaLKsf1+g2e67OPdk9a/Ppqit7un3w3gIAANDm+igoc30UAAAAjEOzRl8OPQgYKffBgjLnIgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADOM73J+U/QBxAgA=
- </data>
- <tileproperties/>
- </layer>
- <layer name="Collisions" width="200" height="200">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3Y4W6jOhCA0V2//0Nf7Q90kRWCTWzGA8fSUXdbkjgwX2lbyp8/BQAAAAAAAOAh9it6L7CSTyt6T7AKfcCxv+X/LrZ/R+8JVuH+QYTt+/GZ0nDMTNtet/1G7ad0vraO8xvZQnRH20zu1wp7ib7G9FthfmbNZPQe9nuJvs7M66N8+Xw5Oe7osW/i/pFX7/0jct7r187Snj7yqvsou48z5i/LTI9+z/rIqfd32LP5rr/+xh5q/h6d1yp/45ktslN95HX19/Ny8Pk7Zzxy5vXxDke/f1z5XrxKRyMb1Me7bdcsei6z9tTTR/S1pr+Ns5+vWmb1afOsD1r7uNLDrF7q543osmXp4xnqa3rXvEXM9Z2N6OMZvl3T7ZjIOezdw9H71Aej+/h1riOeq1x83Gz6yGlkH9tzzpyz+vnLwedXo4+c9mvGjK0+t/qgtZGrc66Btj6irzPz+vhbPeZqS0/RuvSR36c+6g7qx8yau972olr8dB6/nT995NX689Vdjdw993e8lj5yu9LHnTN8dSZH/F3u2/nQxzv0zFFEG/u//+xX/f+z3wMiW42+xvzWxwpzNGs2V9hD9DVGH/rgDW2Uk48tx23vaYX3po+8Vuxj1EzqA33og3f1UU4+thzn71eMbOTbnKKPN1vhe+xKRn5f2M5v9DVGH5tZ65f9RF9jfuvjiY38+vVR50UfeY2cg5Vc6WPU/UIfz/HmPmb1oI/neGIb+/m/2s+MvURfa57ZR5nwOH3Q08fIedmeO7qrlpm987U0ks9Tf//QB9n7KDe/Xj2zd7eoj3xm99G6j97jR9AHZ+64f/TOYn38p8f/Mt/6oLePmfPxax8jXr9MfP6ePjSSyxv6uPv59fEcGfqY8b71QYsMfUTvRx/vpQ99kLuPeq/f1rf3tX/f+uApfUTvZ3QfGsmjp4/tMfrQx9PVa6V5rI/v6fLo2HomPy19ENVHz+rtaXav+nifu/tonZ1ycrw+iGgkch73e2i5f/QsfZC9j3qW6uOvvLejfXz7uj44amSVPq4cP3s/o9vQSB539dGiPnY/Y6Nmv37uyEairz2/9fFpjfr+fPeMRtJHXmez39sG+niSo/k/WtGzllHdgj7y6Ll/7I/TSl8fWw/uH7n03hvcS/TxJmb9mtJxrD7y0sc4R/fWfQv1ir7+tDUSPVtPcHQej+4fd6/oOcvq34qerZWVhmO21dJHVCfRc5ZZ9AxmtV9nx9RdRF9z9LGCugV95BM9Q5Gze8dr+Hknt+g5XWUf+mDFPp5MH/lFz9DM2VxhD9rILXqGemXatz7ymzXD0bMZ7d850Ed+0XO0glnnQR+5rfAzesa518c7bH3s/7+/htHznZ02cqv7qEXPVwbfzpM+clupj6f16Ger/Fr7iOgls+3c6iO3/e/nn7rgewNH31Oirytz+oieuWyO+vhb3C+eoP75qnUmoucyuoerfWgmn6uz8Tafzps+nm/E3ETPrj5YtY+oWY3s46iZel/6yC961rNqOZ/6yM+6d0Vfb/Sx0qrPcfT1Rid3rN5ztx0XfZ3Rx10r+poBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAArO4/czo/iwBxAgA=
- </data>
- <tileproperties/>
- </layer>
-</map>
Deleted: client/trunk/data/maps/new_10-1.tmx
===================================================================
--- client/trunk/data/maps/new_10-1.tmx 2007-10-26 19:52:14 UTC (rev 17)
+++ client/trunk/data/maps/new_10-1.tmx 2007-10-26 19:54:25 UTC (rev 18)
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="128" height="128" tilewidth="32" tileheight="32">
- <properties>
- <property name="music" value="Magick - Snow.ogg"/>
- </properties>
- <tileset name="snow" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/snowset.png" trans="000000"/>
- </tileset>
- <tileset name="walk" firstgid="81" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
- </tileset>
- <layer name="Layer 0" width="128" height="128">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3dMXPaMBiAYV+6ZuplSTK1QydaOpRcptb//1cVX+Hq42ydDCaSPz3Dc2TIIOW1FWNAPHRd9wAAAAAAAAAAAAAAALAxuwrGAJTzvYIx8LEeT4/n9X84Bp4qGFdUL5V5vWg/PD5XMK45nxcq3Xsrdt2213/9Yzh3+zOh9Niiulz/S/fvjz5NKD027u99pr3+bdC/bS31f65gDDUZrvH6mfYR+/Nfqrv+saXWfP2X+1bBGJboM9rrH1Puua9/2tbOef3RH/3bpn97xq/p9Znt9Y9hSW/9Y1my1usfT6r/j6P9yE/9w0n1f+v+vffj18nw8+UxUHr85NmNOo7l9B/rO/23aO6zRKn+vy/aT/1u6XlxW/9+pv34GEg9Lyw9L27rP3VN5/o/nmvWf/3j0L9tc/2nntPpH09qL4HhGJi7v6N/DDl7SVzzv6D0vLi9//l9SvrH5fxvm/5ty+nfL2zfYv99BWO4xuHk2vvA+scw1f+We0Cl54P+Ed3rsyNrvw5U+u/EOv2vPQZKz4f1+g9S7/XTf/uW7Cm8z1B6Ptyvf4q9/LbJnuJtOySUHhsAAETgmrttNezhjv7oT5n+7pW3q6bzf6t7km5ZTf1ZX+r53UF/AAAAaFYr9+F87zsAQCzD96W/ZHqqYLys68vR10ylx0q9cteQtb1WMHcAiOKx838WAAAAAAAAAAAiSX1WoPTYAACAj/MX34bIpAAAAQA=
- </data>
- <tileproperties/>
- </layer>
- <layer name="Layer 1" width="128" height="128">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3d3U7CQBRF4d6Z+BvEaNTERL1SHsD3fzM70Ym1lE4bWs6Zs9eXzIVgdJglhVKKTQMAAAAAAAAAAAAAAAAAAAAAAAAAAPDj0noClbuznsCRtu34dDZ2A/P8cDCvobGZtsxuba0nUDn6a6O/Nvpro7+2aP03By7HsGj9H9vx1I5ng7nUKFr/vJ89tA+OfdH6R5a2bUtv1+hfj9d2vC/8M+lfj9x/rNnc9aB/Pei/T7F/3scZGnOfH6j1t359oL/ec+aR9m12zfixxLn7PWr9rV8fyL8/H3e33n5F79+9fel70zb0rVn+efRU+b5r/XeYRe/ffaxMa+3l9SEv84jev/tYab3WHkXvr+hrxvfSP4453TP6a6O/Nvpro782+mujvzb6a6N/mfUxwzXRv8zLsZo10L/My7GaNdBfG/210V8b/bXRXxv9tdFfG/210V8b/bXRP76bdtx3xlnnOvrHdzXyNf3jU+zfP+/PwpS1PcXcFPv3z/uzQP/1HVq/fJ6v5bm+9F8f/csU+6f37KTbdvs7LJ4DjH1Oyykfm66b//t/D53rovZPrJ8DTPmfD9bvKYvcn3P//7wcuDxyf5TRXxv9tdFfG/210V8b/bXRXxv9tdFfG/210V8b/bXRXxv9tdFfG/210R81o/9xzieOi8bntiL19zivaDyvs9d5RVLqX3qf81pjV5gXlsH9Xxv94XWdvc6rZun+XsvjrNd51Wxov9rrOnudV83or43+2uivjf7a6K+N/tror43+2uivjf7a6K+N/tror43+2uivrab31dN/eUP9xz7P2BL9l8f9Xxv9tdFfG/21ze3/DdZiK1QAAAEA
- </data>
- <tileproperties/>
- </layer>
- <layer name="Layer 2" width="128" height="128">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3cQQqAIBAFULfVIer+p8wWQoRFgTGR78Hfz2ZGUTQlAAAAAAAAAAAAAAAAAAAAAKB3Q86YM0UXAgCNbGubdQ36Vva4tZgPAHXR5wPH2W1ew3v2/abXAAAAAACAIvrOEAAAgGfmnCW6CAAAAACa+MK7v6t/GqJrA4C/itoDuGcCAAAAAAAAAAAAgHN33tlIPQAAAAAAAAAAAAAAAAAA/NMKo+kSXwAAAQA=
- </data>
- <tileproperties/>
- </layer>
- <layer name="Layer 3" width="128" height="128">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3UQY6DMBBFQa6Y3P8ws0KDIjITiPFvm2qp9nY/y89lWZ4AAAAAAAAAAAAAAAAAA3id9HnQH/3RfzYPTku3019//fXXX/8W/beT3u0I0u1a9/cv6K+//jP2X0f//p0rvKd3992O/vNa7/vf6N9u3+nmZ1rpPyf9v7/vdhIN90b/fv3T/8Y359f/2H33ZuT+vc4zmrP3q7Jv/e/Tf+9cVc4xqiP3S+66onS7q/ujP/qjP/qjP/qjP/l2I/TfTrqX/v37z/zXpNvp3+Z8+t+3f6u7jSq9w5Gl2+mvf8/+S4GdV5Ju17P/OumdV5Jup7/+vfr33mv6DPqjP/qjP/rf0187S7fTX/8r+r9OYu+fjv7t+1f4I6r8X/rrr7/+d+6/dGr+WH5H/zr9e+xZ/zr99+7Wq//R3fY+15kzVla1fyXv7p9ud2V/PnsXo0vvcGTpdvof76X/fftf8Z5Gl97hyNLt9Ndff/31119//fXXX3/99de/cv9Z3l263aj9Z5Fup7/++uuvv/7663+GOT/pdgAAAAAAAAAAAAAAAAAAXOMHL8ZDZQAAAQA=
- </data>
- <tileproperties/>
- </layer>
-</map>
Deleted: client/trunk/data/maps/new_11-1.tmx
===================================================================
--- client/trunk/data/maps/new_11-1.tmx 2007-10-26 19:52:14 UTC (rev 17)
+++ client/trunk/data/maps/new_11-1.tmx 2007-10-26 19:54:25 UTC (rev 18)
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="128" height="128" tilewidth="32" tileheight="32">
- <properties>
- <property name="music" value="Magick - Snow.ogg"/>
- </properties>
- <tileset name="snow" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/snowset.png" trans="000000"/>
- </tileset>
- <tileset name="walk" firstgid="81" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
- </tileset>
- <tileset name="building" firstgid="83" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/snow_building.png"/>
- </tileset>
- <tileset name="Snow_x3" firstgid="193" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/snow_x3.png"/>
- </tileset>
- <tileset name="Snow_x2" firstgid="209" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/snow_x2.png"/>
- </tileset>
- <layer name="Layer 0" width="128" height="128">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3duW4UMQDGcSu0NCg0QJVAAIlwFICogHdIngCJChAoEtBxiYJDIIogpBRQcIO4QYC4Xg1bGWu9jsfjmfWuveP/Sj8Bm93FO5/t8Rx2ZoQQMwAAAAAAAAAAAAAAAAAAAAAAAAAAAADQwmZpeyRbe1ymPlLbeYc0H8mWjuWwM4tZptTbOGez0s6In7dNbGxvTW3ZlXXMMmEjncmOyJ87J9brQJu2TNaTNzvGbT9Hvtmx++DY7R75MTO3+2DaZP/pPp68y6OP61KXA+myb9PmFxKWd1fHstjvw8C0ZG9m2aUcug4sCOpDm7z3SHszKEtssxmUIWddz89OC/L3C+ljl6RT0nKHz989hjJflC45XHa8ln1AvS1jymfcrkrXLNcr9ms57vHnX/ezFcMZ6ax0zno+df4PhD9/su+ev9nGdH972dreqcp9W7ojrVV/Kncr5uvo+7vnr7exourCgypzc3u3/f+WKqo/sffhqm6p/mVZhI0z3knvpQ+e19D+u+dv14W1jpnb+buyd9UB3+c8lVYD8mfsHyf/kLYWwpe9XQdcmT+r6OyfSD/Jf2ryb8q+7jjObO9aU/bk3yz0/Gqs/F3jdtMVsXFsaWavMv9Racqefb9fm/N+Ov+HYtAHm54Hfo5r3G66JYbHlnb2vsy5n6WdNtdWdP516uqFy2rNe1zPh2Q/rvsW+6ztOf/vYtDvmh4Lf72IoSl7M/e+XsNKlX/TueG6ehFTaPYI57onv4uYc3LaIvvRdLnuyxirP9reW0N/2x9d2j7nUvpDz8cKHQOEtP0TltTfEc1C+oGQ7E9KmyzHM/h+8As5Dmjq9485steOVq+ZxnuMSuGrAyFtPyT/Ll5LbyJ4m8E2zl3dfkDdP7MvUf5fpK8RfMtg++auaRzg2weQ//QbJX/lkCP7AyOWifwnR58LWnT8LPS8j1kHRs2e/Cef/ebqz/1ieDzY5rzPwUqMcpH/+Jnr8qg2vljlbz+fomzkP3mu/j8V8k9jfwZlIH+Qf9nIvx+WDKfEYH7XcsP7/kh/I/iXwTYoWdf8m+j5QKH3niNt/uYc8hj5x5qTgvZWWrDnfJpzPM05fW2tkn8yrvU36vjmejfNKxllbgDyyN8313uU/Mk+HXNtiCZ1dUXN8Rwlf/r96WDmf0WQf2nMvuKWGF4/hvzT07+bYdzrgbuO18g/D/OO59rcsxtyHKeP11zzu8l/ernWZpkE8o/HnNOp/v1Ceim9Cniv7sPNtVlCjbJ+gMqfeQXj8VH6JJ0X6/XAVxdc+3XzEVJ3aP/5UG3/gljP36TqgqsO2Pm7HuSfPzXf5oYYzv609Mvw25OhHte5HuSfH3t+1U3pvhhu858DPketAWPux13Xesg/P3X319wTg3oQkr+uA3pM57rWM8n89SP19s1d0/01j4S7v29in+/3rRNel3/IsQTXfvJkXxuqWzP6iCd/+vb+Omz8nfzLpscNevyo+3369rKUci8fayVOR/6x1se0zSeS++96zi1/dU3cnAMbS+rvlaNZK/9cfh+lvi8iptTfKUe55g/yB/mD/EH+IH+QP8gf5A/yR5z89XXgn+RfHHt9WfIvC/mXjfzLRv5lI/+ykX/ZyL9s5F828i8b+ZeN/MtG/mUj/7KRf9nIv2zkX7aS8v8PQ6KN4QAAAQA=
- </data>
- <tileproperties/>
- </layer>
- <layer name="Layer 1" width="128" height="128">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3cuW7UQByAcVdAuBERKAICDUWIKHkAniKi46ookBB0UEKNgAoBD8MbcD0QY9nWOhPPeG7P+v/9pNHm8O46+dbH7trbNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbI/zmW//SubbX4N7iUaN80R/u8OlZ6A52SzlPNG/nAPDz23LZ+7HH/2n5frfHzRl+86hv2z079S0TJYkub9r7x01zi40zgXOi349E8n9XewsPQNN13Lo7nu9pr+u6fEgrf/V/tK0zOvL17Yb/w1TjwGJ/W3tW3/V+GeY5qi/fJRyphYksX+ox2o8UeOpGs/UeJ5ihhZG/47Ldv6F9v3LyHlZgr4NoL+7NfTX0d/u1ehrW//XYbMT5UN/+bG//ORwHX3fh/5uPqvxxeFnS/jaX36bmW5qv5f+br6r8aM5vqwNPyvtYcLbor8f12UthOv65Gfg7bP8x/fPaYn1Cf3TSbleLoX+6V7j910v6/vtw/rfZ38+Fv2Xo+9LDOv/HPsYpte8pfev4f29HFyPZ5Def22G3rb3sMbovx4hxy3Rfx1Cj1mT3t90THaIVOdk+I6Y4xWl94/Z/1vDMaPS+4fa1t46+qd1SY1rE+N05vsNJb3/cD6OD9Oy37a/bvjdBc/7KEV6f1+29b6tcWj/YX1yJtGlvh6ifyfF84Ac/VOvN/Tbo//G3GNg7nwA+tcv5/4f/euXs//FZrOtvanGrWaz3TXtF86hf1q2/jW+F0j/tGLO/2iVft2H/mlt2/s/9E/L9vxv6rV8089LoX9aLP/H0b9u9E+L/sfRvwz93FFX9E9r25b/8WtKU5eXtelPzUyvvw5Ff9noLxv9ywjd/udG/3jj87ZNX79xvK3favyJ+L0v+scbn7dt+vpthvtNgf7llTy/dw79y8v5GSK+6N+R9n8YSPu7bf2H4/8OLdOtDf07e2rsOkxXg18Jb4v+nXbZ3xt9fyPjPNT0OUH03yh1rEfo57flQH/Z6C8b/U96b/ndfn95P8G85HZbjTsz09wtMB81SbX8L9nf9T2Auc+Akta+Fdv/geN07yLvJzdp6/1Bzdt//XlhzueJEpf9Vs399eeFw/f7+oSRpC77rZr7l0J/2Xz6785Pgi0jdduPeiz5WZmSt3++Un4+ai3o72f8vliqsST6y0Z/2egvG/1lo79s9JeN/rLRXzb6y0Z/2egvG/1lo79s9JeN/rLRXzb6y0Z/2egvG/1lo79s9JeN/rLRXzb6y0Z/2ei/vP9CpCeRAAABAA==
- </data>
- <tileproperties/>
- </layer>
- <layer name="Layer 2" width="128" height="128">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3cy27UMBgGUG9LV8CKsoAND8FzFAm6AIaLBLSABCqFDe+ORyWKMZnMjOeSi8+R/kWnamL1cy6exA4BAAAAAAAAAAAAAAAAAAAAAAAAput5rBexLoZuCEe3zP5NrLex3gV9oCZN9ufhNv9nQR/Y1aNYj4+8z5Lz9yK02V/F+hzrS2j7wPv9NpFwmOts6fn7MrTZ/4h1E+tnaPvA1z22kfZ4a3Lax/G1y/l7mX+afVNNH5D/7l7GepVUmlP6+euCbafZp9vdtA9ch9vsuyz7wK+CNvGvD7E+JpXmlH7+acvt5tnn+W/SB35vuU+29y3W97/Vpe93qyzC/9nn929pH3AfNw7X2c+l59fmvi3Nvuv+ran8Ov60cL+nhX/HfqX5N9mn8j7gPm5e8nFbF+O46dn0vJyO2/oYx81T37gtZxwHwDaGeIYFAAAAADBl3qEBAEqYq10vc7XrZa52vRahf66fOT7zls/5yef6ecd73uQ/P/nc8HV1vmI78p+mfG74ulpF/tMk/7qlawOsq8ue7ci/bvKvmzme43AS607wjL9Wd2Pdi3V/6IZwdMtj/0Gss1gPB24Lw3MNAHbV9a5H6fptTIt3Peq1CN3venjOX4f0eW/6rNf3fHVI13hM1/WVfx3yNR7HuJbjydANmLGuNR7H9D2/7McnHxcaJ3IIjn0AqItrf/uez9gqf+Z8iHY+Kf+3AQAAAAAAAAAAAAAAAAAwY38AV8ligAAAAQA=
- </data>
- <tileproperties/>
- </layer>
- <layer name="Obstacle" width="128" height="128">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO2TWW7lMAwEfUbf/zD5fXCshVrcJFUNFDKJLYnu0tzXdd0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANVsbjXOp+vbMyHmZYNdMprM7XfltR9+uVU6Lu2SunRN2zFzx3NDpLT9Tf5qXXVj/KWGd+W1daq3bgzf/oPYmQt29RO/DsPlvwX/ea0flv8F92/MX/+R37W77z7e9qF9H8t/b5Ovhf57+U0T13xzoT/nP5vx7n9/gvrT+JUo+l7PA/O+/oeTNzZKHUT0/ux8/RzMw7c99m5shCqZ8vMzvvyHmzc2TB0s+u4N+P/90dl97Ffy7/lvzOssN/7z5qF2r/Cvc7Y71Dahf4XxeL99qa7Dy/vyfe70mv79K6k3h+/6p4+q4oM6t7mvGv/o5Z996+IZL/lQ6UUbuI7D9D1C48+Le6rL3fe66XqF1E819733Kul6hdqP3/9tDbV+1Z61zrPfjq/p9Eq+dSWu5Gzm1ldF3vfmoXXvxfnc9rwX8MLP1YnuM/BpZ+LM/xH4PebkbfWRn8f+P/7vj32++7g//v/L+907N2Z/CP/537qV148e81+Mf/zv3ULvBfD/7z+B+ZCf/4t3zPjvezoUq0mbKyMh5nskTtAv/4x////VrneZs/EivjcSZL1C6i+7ck2kxZUSXaTFnp6eGUqF149X8/nmWN2kUE/5mjduHdf5T7MDqf2oUX/29d1PqZiae7pHbhyb+1mwxRu/Dqf+U98hy1i0j+r6t/fW0PT1G78Or/rR9rdvnv3av1ntpDBP+/PY2s2eF/RdQOIvkfDf594jXP2e7C31ecczKnR92/mtOj7l/N6VH3r+bkqLuH/rupngXwD/gH/AP+Af+Af8A/4B/wD/gH/AMAAAAAAAAAAAAAAAAAAADAWfwBsqS2ZwAAAQA=
- </data>
- <tileproperties/>
- </layer>
-</map>
Deleted: client/trunk/data/maps/new_12-1.tmx
===================================================================
--- client/trunk/data/maps/new_12-1.tmx 2007-10-26 19:52:14 UTC (rev 17)
+++ client/trunk/data/maps/new_12-1.tmx 2007-10-26 19:54:25 UTC (rev 18)
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="80" height="80" tilewidth="32" tileheight="32">
- <properties>
- <property name="music" value="Magick - Snow.ogg"/>
- </properties>
- <tileset name="Untitled" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/icecave.png"/>
- </tileset>
- <tileset name="Collision" firstgid="129" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
- </tileset>
- <layer name="Layer 0" width="80" height="80">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3Zy07CQBSA4bPBuFIX4lKNENGNGvC6QQN426jv/zSehp5kglMaOyPOtP/iWzSFZPiTOdOUvoj0AQAAAAAAAAAAUGukzjzOE1hbDu7UjZqqR/VUXj8ksLYcvKpn9aE+1Vd5/Z7A2nJwoHoeQ2Ffh/S7luU+3lG7ak/Y1y47N04r+i1kuY8P1ZE6Fva1y86N24p+5kJdqqvyej+BtafAzo2Xmn5Vc7Hrc7Bq7tUp5uK9MAeb9ivm4pswB5v2M12fg6H9hgn8hpz72fNhLCcJNNlkP3s+jGWcWcPQfrHNyoa5nOup9bOGuZzrKfbr0Y9+9Gss5Hdv0y/IFv2CxJoHufWz94A+vufZgXNv4Hy27j1iW/vZe0Cf8UrLotfEuTdxPvvb94ht6bdu381WWha95s69+Zrv0u9ny7/o1ZV+m0I/+tGPfvTLA/3oRz/6xdLG/5WbtvjvdQMAAAAAAAAAAAAA2ucb6pyuxABkAAA=
- </data>
- <tileproperties/>
- </layer>
- <layer name="Layer 1" width="80" height="80">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3Wuw0AIAgFQOdy/8HsjYWJ+At3jY2FmEegFAAAAAAAAACYU28/gPRkMIZ/5LRR5uQQAPjNyv5i9wGA95jPEGNXL2Xq0dlao+8BAHdkndURddfuBAAAAAAAAAB4UQPOOyeHAGQAAA==
- </data>
- <tileproperties/>
- </layer>
- <layer name="Layer 2" width="80" height="80">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3YMQqAMAwF0K56ger9L2rn0iEEaqu8B38NScZfCgAAAAAAAAAAAAAA8Laj5epyL93o+0Y/jQYAAAAAZoh0VplesAbmjnLmT9lWphf84x8AAAAAAAAAWO8Bw29/nwBkAAA=
- </data>
- <tileproperties/>
- </layer>
- <layer name="Layer 3" width="80" height="80">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3S0QqDMBBFwXy7X158C8Vq1ZSbtbMwCCW22UOX1toCAAAAAAAA8HBbk75TJX0z/a736yd9p0reu+1N+q4z+tRJv/PdjiZ955lstTn6LH3nmdyZ9N1noJ9++tU106RbVO+3TrrHL/rd6Xzl3XSTyv+/ddJNqjdN71+9fXoH/eoaMekdKvXbeie9Q6V+W5PeYeTee+dHNvvmN2fWuufRXld6nD1fzdldR597f6eamSbdQj/9qplp0i30+89+S/esZsTed7/j6TQBAAAAAAAAgPpeIdHedgBkAAA=
- </data>
- <tileproperties/>
- </layer>
-</map>
Deleted: client/trunk/data/maps/new_13-1.tmx
===================================================================
--- client/trunk/data/maps/new_13-1.tmx 2007-10-26 19:52:14 UTC (rev 17)
+++ client/trunk/data/maps/new_13-1.tmx 2007-10-26 19:54:25 UTC (rev 18)
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="160" height="100" tilewidth="32" tileheight="32">
- <properties>
- <property name="music" value="Magick - Casino.ogg"/>
- </properties>
- <tileset name="INN Tilleset" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/inn.png"/>
- </tileset>
- <tileset name="Collision" firstgid="257" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
- </tileset>
- <layer name="Ground" width="160" height="100">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3cvW4UMRDAcV9IwmeKC99FkALiq0iR8FEALR2UdMkbJG9AAzVNqGmgTgl5AIR4AkC8SSgZC68wg317ubs9j7X/4idn7Y1uMh6tN5EyR865IwAAAAAAAAAAAAAAAAAAAAAAAPTGQCyKE2FcCuOyOClOidPRfcuGYl4IcTfj4oixi7gHic9eiD5vEMZn0b3NdekcWjEUq2E8r64viyviari+EUYLMV+I4llV48UwPlXzXeYuHps8NrbVPdsGcmjFurieGW+LO+KumrcScy7uW2F80XHcudw1Xzd21T27BnJoxWbCvnibWds0GnPs+Zzibouj8SZxXTqHVsR5uRfG9+LDiHxaijllZ05x67zlvEtcl86hFT4fH8UncZjJn14vGe9PFdtWIt69zFpX9dfmIHFdet+t8Pk4I86Kc5n8fXF/zrSvHe3jrPfd2vlr8Qyxwufim/gufmRy5dd3onULMWvxGTjv85f6m20OX4nXam7P2cld2976WFPvZLOOI3X2U3+T7eUj8Vg8qSB3VvY8rr+2dxhrObTCwj7Wiuff9OKcjMpnvFY6Ziuov+mRu/n5ZSAGa6g/lET9wRrOCQAAAAAAAAAAAAAAAAAAAAAAAACe7v8c9yvW89b6Qev+y0vub9/ltnndN7pZL70ffTN0//cw1v2Kc/2gu+qrPEnsuuey7g09VNf3xQPxUNyM1kvvR9/E/ZLj/sR+vORG94Nuvq9k7Lr/8vqY87l7Su9H36T+v/xlZj7XF8ZS7NMqvR9943O+7/7tN+77Y19TqD90tYe637jul13z82/lGD8L9VdmD7eUg8Rc3F9Rr1muv7XM/OeA+rNXf21WXD31t5GZp/5siM/Rca25euqP9z/bJqm/DWer/o7Te7l0vpHew3FrL3V/6dh5vtVrkudfTb9/UH+2UX8oifpDSTXXXwq9g+vC3yxQEvWHmnC+AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoKTf1CpYOwD6AAA=
- </data>
- <tileproperties/>
- </layer>
- <layer name="Fringe" width="160" height="100">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3duW4UQRDG8X4CCJEA+TWAwAGHZI4I7IBDQoKIIwISwCICJIxD4AmAB+DMEUfOKRFCQGYsWI6UanlbW7R6Zjze7enu2f9P+rQz22NPa12ew9bWGgMAAAAAAAAAAAAAAAAAAAAAAAAA3bguuVExtqXLiUR2M/UEEHRHcne4vCjZl3AuG7V3HeP3Iux3RnJQciiwvF9yIMI+++a+5MFweVmyoMZ2SHZKdg3Xj3Q4rzbmh4+7a8YfRtr3ccmJwPJRybFI++yTR5LHKk9ajufIr0P7e7Mn0r7OSc4Hls9IzqrtTklOSw5HmkepXnjrL1uOp/RU8kzlecV2tvYWKsa6ckFyUXIp8TxyU3L9vZK8VnlTs23TNSLSsPW1VbJNst3U199cYDylD5KPKp8qtrO1V3VtOEmXO9hH37yVvFN5XzFuKsZz5NfafOC5GG51sI8++1wzNmvyuf+18xiodb+2Zjuci3XFW1/seP+lsz8/fQ7u4ljRJ0tm7fW7atZev+W008GUup16AgX7Jfk9XP4WGOf+ETGErun+qOVNks1m9D8GIKVB8yYAAAAAAAAAAAAAAAAAAAAAAAAAABThb+oJoHfq+kb7qD9Mmu4bXTrXtxnpufeXu74H7tHS/aB13+hUBmYy74d3fZtnJvC9MJ71/jzbnH9zp/s2Iw9N9VXC+df15dP9+FbN/z3VS+inPo2a6iuH829TT66l4aPux2frT/cUzqmf8DRaUfmunvfrS/enzIXuyRXqvWyPfyfN6Phn++BTf4gh1HvZHv9sL153/LO95mz96Z7XJfSz7rNx7iHnJjmRDdK9l68Zei+XJvR3liZd9/eu43ovu2sDei+XZcVUXwMCsbU57uWm7Wd1xvoMOGycX3+r3vgXydfuptNKm890s7WXy+eXYMTdf7g68+vvh+SnWvd749MPGuNwdefqzK8/n+6Nn/OxEWVwdeeOY031F/paAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgG/wCcXA4cAPoAAA==
- </data>
- <tileproperties/>
- </layer>
- <layer name="Top" width="160" height="100">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3cMQ3AMBADwOdROuVQCIVQBIEQCOHZJfNvr7TRneTJixE4AgAAAAAAAAAAAAAAAAAA4N/O1QMAYEMt6a4ZqNKT7p6BKiPpnhnY2bF6AAAAAAAAAAAAAAAAAAAAAAAAAAB8XIv8wxcq9cg/fKHSiPzDFwAAAAAAAAAAAAAAAAAAAAAAAAAAANjXC+YJdOsA+gAA
- </data>
- <tileproperties/>
- </layer>
- <layer name="Collision" width="160" height="100" visible="0">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3cS47CMBAFQIb7HxrNDlmOPzFJd5KyVBokgnh53cMO3n+v1xsAAAAAAAAAAAAAAAAAgMP9n+/HtVNeF5l1K9f33+/nz+is9fiMPFe052TPfNa8Z/aPfbPMtn+j+c7av+x9ZVf2MzLTDJln9u+ozCsnusMsyi56fWXobmS2Z8y69769jMz1laW7maxH5u29by8j9T5afWXqrpYtYv9az9m/foez/UVnzsL+/a7DmROdOYtaLzpc67DVl+7Wu47OkNHo/6n949dmT3Re7s+eAQAAAAAAAAAAAAAAAABAjNHvl2/9FkKG7wqvnuj8Tzazf7XrIue3d9cy3stT9T4PWnOMntnIrpXX9l4XPY+nmZnb1muy5bd/1zU6lywza+1VeV3vHqPv5Yn2nPJ1GbLX7qW8tnXP0XN4uj37V841IvPsvUT3TH+mo/sXPVP7d0+z5yo57V9eK+cquaM7pj/HcqYjc86Q2+7dx8z+RWetZY/OwPoMfaYQxf6Rlb0DAAAAAAAAAAAAAAAAAAAAINIH9eb5dAD6AAA=
- </data>
- <tileproperties/>
- </layer>
-</map>
Deleted: client/trunk/data/maps/new_14-1.tmx
===================================================================
--- client/trunk/data/maps/new_14-1.tmx 2007-10-26 19:52:14 UTC (rev 17)
+++ client/trunk/data/maps/new_14-1.tmx 2007-10-26 19:54:25 UTC (rev 18)
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="150" height="124" tilewidth="32" tileheight="32">
- <properties>
- <property name="overlay0parallax" value="1.0"/>
- <property name="overlay0scrollY" value="0.1"/>
- <property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
- <property name="overlay0scrollX" value="0.2"/>
- <property name="music" value="Magick - Small grass.ogg"/>
- <property name="minimap" value="graphics/images/minimap_new_14-1.png"/>
- </properties>
- <tileset name="Woodland" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_ground.png"/>
- </tileset>
- <tileset name="Collision" firstgid="257" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
- </tileset>
- <tileset name="Untitled" firstgid="259" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/Woodland_x2.png"/>
- </tileset>
- <tileset name="Untitled" firstgid="275" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/Woodland_x3.png"/>
- </tileset>
- <layer name="Ground" width="150" height="124">
- <data encoding="base64" compression="gzip">
- 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
- </data>
- <tileproperties/>
- </layer>
- <layer name="Fringe" width="150" height="124">
- <data encoding="base64" compression="gzip">
- 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
- </data>
- <tileproperties/>
- </layer>
- <layer name="Top" width="150" height="124">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3dy27UMBQA0CC1/YK2f9APb3kUtl3Bkh0s+QAQSIgFVIgFYlnhqI2IhslMpvEryTnSlTIP1db0OrE9Y6dpqMH3ED8e4uPA8W2x2t17Vbj8pbvsHW/7rI9CHIc4yVMdVuI0xFmI84HXP4X4nK02LMnFjtd+hviVqyI9XwuUWaurEM8f4mXhusRSIq/anPqducy5+Va6AhOVyKvL/W9ZvUPGJW07vW7uz3dPmzpystR1kHg222nJsXKX43ftgyf15Dn/a/tfc+h3DfVv/jT15tbrpt66pZR7fPPYa+q+PnPNubW2udDc45tt5T1r/o1Vd8WLEX8/ZW5NaX9votWifjXkVAopcmtq3cdeCzfP5XOUe8ycs7yYuRWrPWw7L/f7AebGDtd+ZjeZyxx7fY1x/Y1Rz9TllJCyv6sdrlestl2ivQPzVOv8DfNW89wg87arr+S7NFLp8m4O3wcCAACQhjkHUhjzO0br5TjU+xHvmdvaJufg9cnxP/dd1vrkWj8gt0hFbpGK3CIVucVUQ3MicovH2rc+Y21rjpnOmh9SmNvcLUCn2+fA7/mJqX9dNBYklrcbj9u1Is5dTPVh4HlzDUzxZeD5Mb8LAojNmI8UjPnIQZ8cgBQO6R/XeB8d6jSmf9zl0+Zeovo8jLVt37ahvWnXdJ8F8lnrPYfYb+o6enNLpKKfBQAAAAAAAAAAAACkdBTiOMRJ6YqwKKchzkKcl64Ii3NRugIAAAAAAAAs0lVj717S6vYrtFc0MbzrHbd7/dorGgAAAAAAAAAAAAAAAAAAAAAAAADi+AsoPtp6oCIBAA==
- </data>
- <tileproperties/>
- </layer>
- <layer name="Collision" width="150" height="124" visible="0">
- <data encoding="base64" compression="gzip">
- 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
- </data>
- <tileproperties/>
- </layer>
-</map>
Deleted: client/trunk/data/maps/new_15-1.tmx
===================================================================
--- client/trunk/data/maps/new_15-1.tmx 2007-10-26 19:52:14 UTC (rev 17)
+++ client/trunk/data/maps/new_15-1.tmx 2007-10-26 19:54:25 UTC (rev 18)
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="190" height="200" tilewidth="32" tileheight="32">
- <properties>
- <property name="minimap" value="graphics/images/minimap_new_15-1.png"/>
- <property name="music" value="Faith.ogg"/>
- </properties>
- <tileset name="Desert1" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/desert1.png"/>
- </tileset>
- <tileset name="Desert2" firstgid="257" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/desert2.png"/>
- </tileset>
- <tileset name="Collision" firstgid="513" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
- </tileset>
- <tileset name="Desert x2" firstgid="515" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/desert_x2.png"/>
- </tileset>
- <tileset name="Desert x3" firstgid="531" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/desert_x3.png"/>
- </tileset>
- <tileset name="Unbenannt" firstgid="547" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/trans_woodland-desert.png"/>
- </tileset>
- <layer name="Ground" width="190" height="200">
- <data encoding="base64" compression="gzip">
- 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
- </data>
- <tileproperties/>
- </layer>
- <layer name="Fringe" width="190" height="200">
- <data encoding="base64" compression="gzip">
- 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
- </data>
- <tileproperties/>
- </layer>
- <layer name="Over" width="190" height="200">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3dQU7DMBAF0OQ6HIEjsIU23bPgAtxf1CqRjNUUiNs4tt+TrKo7L37AmU4mwwAAAAAAAAB5nsb8BbV5HvMX1OZlzF8AAMD2juc1RetUdjvwEGnOY+F29GPzHcH9TcNyzgEAAAAAAAAAAAC4r9CHrP+e3ui/BwBa5oxPj5zx6ZFRZwAAsC+fpTcABbyX3gAUkJN79XtqlZt79XtqlJt7qM1r6Q0AAAAAAAAAAAAAAAAAAAAAAJs4ntfb95qST7PSaFHI/NJsKLPSaNGtzEOLZJ7ehNmBMk9vzMMHAIA2/Hcevvf8ULs1dRy/XVGztbXLcfA3n3p5txsA0CLvNKQ3enHojczTI/1nAADALeFeOcxZOAyXZxXD3AU9DOzFI2v2Y7JgL9RyANqnL4EeOeNAPs+d0CPPnbDGXPOeBvVu2jPn+xR9DzlP693j8HPetuuAGs15j3Mdf79m6TrIvQbUcthKqJ+k+V4zr+MeswvUcqjV/P9iT/cDYU+H0pugeek56C/Z36InZw/XIP34LXOPfqZQDxqxLe8j4/NP+h42maRl12qiMg8AAAAALNEDRm9knt7IPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQgy/3dC7JwFECAA==
- </data>
- <tileproperties/>
- </layer>
- <layer name="Collisions" width="190" height="200">
- <data encoding="base64" compression="gzip">
- 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
- </data>
- <tileproperties/>
- </layer>
-</map>
Deleted: client/trunk/data/maps/new_16-1.tmx
===================================================================
--- client/trunk/data/maps/new_16-1.tmx 2007-10-26 19:52:14 UTC (rev 17)
+++ client/trunk/data/maps/new_16-1.tmx 2007-10-26 19:54:25 UTC (rev 18)
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="144" height="124" tilewidth="32" tileheight="32">
- <properties>
- <property name="overlay0parallax" value="1.0"/>
- <property name="overlay0scrollY" value="0.1"/>
- <property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
- <property name="overlay0scrollX" value="0.2"/>
- <property name="music" value="Magick - Small grass.ogg"/>
- <property name="minimap" value="graphics/images/minimap_new_16-1.png"/>
- </properties>
- <tileset name="Woodland" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_ground.png"/>
- </tileset>
- <tileset name="Collision" firstgid="257" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
- </tileset>
- <tileset name="Untitled" firstgid="259" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/Woodland_x2.png"/>
- </tileset>
- <tileset name="Untitled" firstgid="275" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/Woodland_x3.png"/>
- </tileset>
- <tileset name="Unbenannt" firstgid="291" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/trans_woodland-desert.png"/>
- </tileset>
- <tileset name="Unbenannt" firstgid="419" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/desert1.png"/>
- </tileset>
- <layer name="Ground" width="144" height="124">
- <data encoding="base64" compression="gzip">
- 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...
[truncated message content] |
|
From: <cru...@us...> - 2007-10-26 19:52:11
|
Revision: 17
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=17&view=rev
Author: crush_tmw
Date: 2007-10-26 12:52:14 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
Added monsters to test combat. Press Ctrl to attack.
Modified Paths:
--------------
server/trunk/ChangeLog
server/trunk/gameserver.exe
server/trunk/src/game-server/being.cpp
server/trunk/src/game-server/monster.cpp
server/trunk/tmw.db
Added Paths:
-----------
server/trunk/data/maps/beta-test1.tmx
Removed Paths:
-------------
server/trunk/data/maps/beta-test1.tmx.gz
Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog 2007-10-25 15:59:35 UTC (rev 16)
+++ server/trunk/ChangeLog 2007-10-26 19:52:14 UTC (rev 17)
@@ -1,3 +1,12 @@
+2007-19-26 Philipp Sehmisch <tm...@cr...>
+
+ * data/maps/beta-test1.tmx.gz, data/maps/beta-test1.tmx: Using
+ uncompressed map for more efficient version control. Added monster
+ spawns to the map to test combat. NPC spawns don't work yet. No idea
+ why, but I will find out.
+ * src/game-server/being.cpp, src/game-server/monster.cpp: Made
+ combat a bit more fair for the player.
+
2007-19-25 Philipp Sehmisch <tm...@cr...>
* data/items.xml, data/monsters.xml: Added required resource
Added: server/trunk/data/maps/beta-test1.tmx
===================================================================
--- server/trunk/data/maps/beta-test1.tmx (rev 0)
+++ server/trunk/data/maps/beta-test1.tmx 2007-10-26 19:52:14 UTC (rev 17)
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<map version="0.99b" orientation="orthogonal" width="32" height="32" tilewidth="32" tileheight="32">
+ <properties>
+ <property name="music" value="dureign.ogg"/>
+ </properties>
+ <tileset name="Landscape" firstgid="1" tilewidth="32" tileheight="32">
+ <image source="../graphics/tiles/zstyle-landscape1.png"/>
+ </tileset>
+ <tileset name="Collision" firstgid="257" tilewidth="32" tileheight="32">
+ <image source="../graphics/tiles/tile-collision2.png"/>
+ </tileset>
+ <layer name="Layer 0" width="32" height="32">
+ <data encoding="base64" compression="gzip">
+ H4sIAAAAAAAAAGNiYGBgGsVDAl8G4isDaP9jIH5CJ7t8gNgXj7wYlTAu82OAOJZMu3GppSQ80M0h5A9q2InPXmLVk2I+reOUXH9Ty0xyw3wg7EYWmwjEkwbIbhBeCMSLBiAsRjEq3gjEmwbQ/oNAfGgQhMMoHsWjeBSP4lE81DEAqYwWKAAQAAA=
+ </data>
+ </layer>
+ <layer name="Layer 1" width="32" height="32">
+ <data encoding="base64" compression="gzip">
+ H4sIAAAAAAAAAO3BAQ0AAADCoPdPbQ8HFAAAAPBuEQAcxwAQAAA=
+ </data>
+ </layer>
+ <layer name="Layer 2" width="32" height="32">
+ <data encoding="base64" compression="gzip">
+ H4sIAAAAAAAAAO3BAQ0AAADCoPdPbQ8HFAAAAPBuEQAcxwAQAAA=
+ </data>
+ </layer>
+ <layer name="Layer 3" width="32" height="32">
+ <data encoding="base64" compression="gzip">
+ H4sIAAAAAAAAAO3U0QnAIAxF0by6gV2h3aBuovuvYqAjCL4W7oF8349EI/AXlyJu+foj231TX3rHxd0HvsL97zzZbrxFuyN3UIx7qNk+uQMAAJZNrXUR7QAQAAA=
+ </data>
+ </layer>
+
+ <objectgroup name="Gruppo di Oggetti 4" width="0" height="0">
+ <object name="Maggot spawn area" type="SPAWN" x="128" y="128" width="128" height="128">
+ <properties>
+ <property name="MONSTER_ID">
+ 1002
+ </property>
+ </properties>
+ </object>
+ <object name="npc1" type="NPC" x="128" y="32" width="0" height="0">
+ <properties>
+ <property name="NPC_ID">
+ 107
+ </property>
+ <property name="SCRIPT">
+ local nb_times = 1
+ function npc_handler(npc, ch)
+ do_message(npc, ch, "You know what?")
+ do_message(npc, ch, string.format("I have already asked this question %d times today.", nb_times))
+ nb_times = nb_times + 1
+ end
+ </property>
+ </properties>
+ </object>
+ <object name="npc2" type="NPC" x="256" y="128" width="0" height="0">
+ <properties>
+ <property name="NPC_ID">
+ 107
+ </property>
+ <property name="SCRIPT">
+ function npc_handler(npc, ch)
+ do_message(npc, ch, "Don't you think the guy behind me is my evil twin?")
+ end
+ </property>
+ </properties>
+ </object>
+ <object name="Other npcs" type="SCRIPT" x="0" y="0" width="0" height="0">
+ <properties>
+ <property name="FILENAME">test.lua</property>
+ </properties>
+ </object>
+ </objectgroup>
+
+
+</map>
Deleted: server/trunk/data/maps/beta-test1.tmx.gz
===================================================================
(Binary files differ)
Modified: server/trunk/gameserver.exe
===================================================================
(Binary files differ)
Modified: server/trunk/src/game-server/being.cpp
===================================================================
--- server/trunk/src/game-server/being.cpp 2007-10-25 15:59:35 UTC (rev 16)
+++ server/trunk/src/game-server/being.cpp 2007-10-26 19:52:14 UTC (rev 17)
@@ -152,8 +152,6 @@
void Being::performAttack(Damage const &damage)
{
- int SHORT_RANGE = 60;
- int SMALL_ANGLE = 35;
Point ppos = getPosition();
int dir = getDirection();
@@ -177,8 +175,21 @@
break;
}
+
+ int range = 0;
+ int angle = 0;
+
+ if (getType() == OBJECT_CHARACTER) {
+ range = 64; //TODO: Get from characters weapon
+ angle = 45; //TODO: Get from characters weapon
+ }
+ if (getType() == OBJECT_MONSTER) {
+ range = 16; //TODO: Get from monster database
+ angle = 45; //TODO: Get from monster database
+ }
+
for (MovingObjectIterator
- i(getMap()->getAroundObjectIterator(this, SHORT_RANGE)); i; ++i)
+ i(getMap()->getAroundObjectIterator(this, range)); i; ++i)
{
MovingObject *o = *i;
if (o == this) continue;
@@ -191,10 +202,11 @@
if (Collision::diskWithCircleSector(
opos, o->getSize(),
- ppos, SHORT_RANGE, SMALL_ANGLE, attackAngle)
+ ppos, range, angle, attackAngle)
)
{
static_cast< Being * >(o)->damage(this, damage);
+ LOG_INFO("Attack "<<opos.x<<":"<<opos.y<<" - "<<ppos.x<<":"<<ppos.y);
}
}
}
Modified: server/trunk/src/game-server/monster.cpp
===================================================================
--- server/trunk/src/game-server/monster.cpp 2007-10-25 15:59:35 UTC (rev 16)
+++ server/trunk/src/game-server/monster.cpp 2007-10-26 19:52:14 UTC (rev 17)
@@ -60,7 +60,7 @@
mCountDown(0),
mTargetListener(&monsterTargetEventDispatch),
mAttackTime(0),
- mAttackPreDelay(5),
+ mAttackPreDelay(15),
mAttackAftDelay(10)
{
LOG_DEBUG("Monster spawned!");
@@ -68,7 +68,7 @@
mAgressionRange = 10; // TODO: Get from monster database
// Some bogus stats for testing.
- setSpeed(300);
+ setSpeed(500);
setSize(8);
setAttribute(BASE_ATTR_HP, 10);
setAttribute(BASE_ATTR_PHY_ATK, 10);
@@ -92,19 +92,20 @@
void Monster::perform()
{
- if (mAttackTime != mAttackAftDelay) return;
+ if (mAttackTime == mAttackAftDelay)
+ {
+ mAction = ATTACK;
+ raiseUpdateFlags(UPDATEFLAG_ATTACK);
- mAction = ATTACK;
- raiseUpdateFlags(UPDATEFLAG_ATTACK);
-
- // Hard-coded values for now.
- Damage damage;
- damage.base = getModifiedAttribute(BASE_ATTR_PHY_ATK) / 10;
- damage.delta = 2;
- damage.cth = 50;
- damage.element = ELEMENT_NEUTRAL;
- damage.type = DAMAGE_PHYSICAL;
- performAttack(damage);
+ // Hard-coded values for now.
+ Damage damage;
+ damage.base = getModifiedAttribute(BASE_ATTR_PHY_ATK) / 10;
+ damage.delta = 2;
+ damage.cth = 50;
+ damage.element = ELEMENT_NEUTRAL;
+ damage.type = DAMAGE_PHYSICAL;
+ performAttack(damage);
+ };
}
void Monster::update()
Modified: server/trunk/tmw.db
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-10-25 15:59:49
|
Revision: 16
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=16&view=rev
Author: crush_tmw
Date: 2007-10-25 08:59:35 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
removed TMW tilesets.
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/data/graphics/tiles/CMakeLists.txt
client/trunk/data/graphics/tiles/Makefile.am
Removed Paths:
-------------
client/trunk/data/graphics/tiles/Woodland_ground.png
client/trunk/data/graphics/tiles/Woodland_village.png
client/trunk/data/graphics/tiles/Woodland_village_x2.png
client/trunk/data/graphics/tiles/Woodland_x2.png
client/trunk/data/graphics/tiles/Woodland_x3.png
client/trunk/data/graphics/tiles/arena.png
client/trunk/data/graphics/tiles/cave.png
client/trunk/data/graphics/tiles/christmastree.png
client/trunk/data/graphics/tiles/desert1.png
client/trunk/data/graphics/tiles/desert2.png
client/trunk/data/graphics/tiles/desert_x2.png
client/trunk/data/graphics/tiles/desert_x3.png
client/trunk/data/graphics/tiles/icecave.png
client/trunk/data/graphics/tiles/inn.png
client/trunk/data/graphics/tiles/mountain.png
client/trunk/data/graphics/tiles/snow_building.png
client/trunk/data/graphics/tiles/snow_x2.png
client/trunk/data/graphics/tiles/snow_x3.png
client/trunk/data/graphics/tiles/snowset.png
client/trunk/data/graphics/tiles/trans_woodland-desert.png
client/trunk/data/graphics/tiles/woodland_indoor.png
client/trunk/data/graphics/tiles/woodland_indoor_x2.png
client/trunk/data/graphics/tiles/woodland_indoor_x3.png
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2007-10-25 15:00:12 UTC (rev 15)
+++ client/trunk/ChangeLog 2007-10-25 15:59:35 UTC (rev 16)
@@ -4,6 +4,7 @@
some rebranding from TMW to Damasca.
* data/music/Magic - Real.ogg, src/main.cpp: Changed
theme music filename.
+ * data/graphics/tiles/*: Removed TMW tilesets.
MERGED CHANGES FROM MAIN TMW TO REVISION 3680
Modified: client/trunk/data/graphics/tiles/CMakeLists.txt
===================================================================
--- client/trunk/data/graphics/tiles/CMakeLists.txt 2007-10-25 15:00:12 UTC (rev 15)
+++ client/trunk/data/graphics/tiles/CMakeLists.txt 2007-10-25 15:59:35 UTC (rev 16)
@@ -1,24 +1,11 @@
SET(FILES
- arena.png
- cave.png
collision.png
- desert1.png
- desert2.png
- desert_x2.png
- desert_x3.png
- icecave.png
- inn.png
- mountain.png
- snow_building.png
- snowset.png
- snow_x2.png
- snow_x3.png
- trans_woodland-desert.png
- Woodland_ground.png
- Woodland_village.png
- Woodland_village_x2.png
- Woodland_x2.png
- Woodland_x3.png
+ dir.txt
+ tile-collision2.png
+ zstyle-16x16.png
+ zstyle-cliffs.png
+ zstyle-landscape1.png
+ zstyle-village1.png
)
INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/tiles)
\ No newline at end of file
Modified: client/trunk/data/graphics/tiles/Makefile.am
===================================================================
--- client/trunk/data/graphics/tiles/Makefile.am 2007-10-25 15:00:12 UTC (rev 15)
+++ client/trunk/data/graphics/tiles/Makefile.am 2007-10-25 15:59:35 UTC (rev 16)
@@ -2,26 +2,13 @@
tilesdir = $(pkgdatadir)/data/graphics/tiles
tiles_DATA = \
- arena.png \
- cave.png \
- collision.png \
- desert1.png \
- desert2.png \
- desert_x2.png \
- desert_x3.png \
- icecave.png \
- inn.png \
- mountain.png \
- snow_building.png \
- snow_x2.png \
- snow_x3.png \
- snowset.png \
- trans_woodland-desert.png \
- Woodland_ground.png \
- Woodland_village.png \
- Woodland_village_x2.png \
- Woodland_x2.png \
- Woodland_x3.png
+ collision.png \
+ dir.txt \
+ tile-collision2.png \
+ zstyle-16x16.png \
+ zstyle-cliffs.png \
+ zstyle-landscape1.png \
+ zstyle-village1.png \
EXTRA_DIST = \
Deleted: client/trunk/data/graphics/tiles/Woodland_ground.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/Woodland_village.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/Woodland_village_x2.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/Woodland_x2.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/Woodland_x3.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/arena.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/cave.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/christmastree.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/desert1.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/desert2.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/desert_x2.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/desert_x3.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/icecave.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/inn.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/mountain.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/snow_building.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/snow_x2.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/snow_x3.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/snowset.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/trans_woodland-desert.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/woodland_indoor.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/woodland_indoor_x2.png
===================================================================
(Binary files differ)
Deleted: client/trunk/data/graphics/tiles/woodland_indoor_x3.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-10-25 15:00:08
|
Revision: 15
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=15&view=rev
Author: crush_tmw
Date: 2007-10-25 08:00:12 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
changed the name of the theme music
Modified Paths:
--------------
client/trunk/damasca.exe
client/trunk/src/main.cpp
Modified: client/trunk/damasca.exe
===================================================================
(Binary files differ)
Modified: client/trunk/src/main.cpp
===================================================================
--- client/trunk/src/main.cpp 2007-10-25 14:52:07 UTC (rev 14)
+++ client/trunk/src/main.cpp 2007-10-25 15:00:12 UTC (rev 15)
@@ -721,7 +721,7 @@
top->add(versionLabel, 2, 2);
#endif
- sound.playMusic(TMW_DATADIR "data/music/Login.ogg");
+ sound.playMusic(TMW_DATADIR "data/music/Theme.ogg");
// Server choice
if (options.serverName.empty()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-10-25 14:52:04
|
Revision: 14
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=14&view=rev
Author: crush_tmw
Date: 2007-10-25 07:52:07 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
Some changes to make the server runable.
Modified Paths:
--------------
server/trunk/ChangeLog
server/trunk/accountserver.exe
server/trunk/data/maps.xml
server/trunk/gameserver.exe
server/trunk/src/account-server/accounthandler.cpp
server/trunk/src/game-server/testing.cpp
server/trunk/tmw.db
Added Paths:
-----------
server/trunk/data/items.xml
server/trunk/data/monsters.xml
Removed Paths:
-------------
server/trunk/accountserver.depend
server/trunk/accountserver.layout
server/trunk/data/maps/new_1-1.tmx.gz
server/trunk/data/maps/new_10-1.tmx.gz
server/trunk/data/maps/new_11-1.tmx.gz
server/trunk/data/maps/new_12-1.tmx.gz
server/trunk/data/maps/new_13-1.tmx.gz
server/trunk/data/maps/new_14-1.tmx.gz
server/trunk/data/maps/new_15-1.tmx.gz
server/trunk/data/maps/new_16-1.tmx.gz
server/trunk/data/maps/new_17-1.tmx.gz
server/trunk/data/maps/new_18-1.tmx.gz
server/trunk/data/maps/new_19-1.tmx.gz
server/trunk/data/maps/new_2-1.tmx.gz
server/trunk/data/maps/new_3-1.tmx.gz
server/trunk/data/maps/new_4-1.tmx.gz
server/trunk/data/maps/new_5-1.tmx.gz
server/trunk/data/maps/new_6-1.tmx.gz
server/trunk/data/maps/new_7-1.tmx.gz
server/trunk/data/maps/new_8-1.tmx.gz
server/trunk/data/maps/new_9-1.tmx.gz
server/trunk/gameserver.depend
server/trunk/gameserver.layout
server/trunk/tmwserver.cbp
Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog 2007-10-25 14:28:52 UTC (rev 13)
+++ server/trunk/ChangeLog 2007-10-25 14:52:07 UTC (rev 14)
@@ -1,3 +1,13 @@
+2007-19-25 Philipp Sehmisch <tm...@cr...>
+
+ * data/items.xml, data/monsters.xml: Added required resource
+ files.
+ * data/maps.xml, data/maps/*: Removed TMW maps
+ * src/accountserver/accounthandler.cpp: Changed default insertion
+ position for new characters so that it is inside the test map.
+ * src/game-server/testing.cpp: Changed positions of test items so that
+ they are inside the test map.
+
2007-10-18 Philipp Sehmisch <tm...@cr...>
MERGED CHANGES FROM MAIN TMW TO REVISION 3630
Deleted: server/trunk/accountserver.depend
===================================================================
--- server/trunk/accountserver.depend 2007-10-25 14:28:52 UTC (rev 13)
+++ server/trunk/accountserver.depend 2007-10-25 14:52:07 UTC (rev 14)
@@ -1,380 +0,0 @@
-# depslib dependency file v1.0
-1191192679 e:\c++\damasca\server\src\common\configuration.cpp
- <cmath>
- <map>
- <libxml/xmlwriter.h>
- "common/configuration.hpp"
- "utils/logger.h"
- "utils/xml.hpp"
-
-1191192679 e:\c++\damasca\server\src\common\configuration.hpp
- <string>
-
-1184157099 e:\c++\damasca\server\src\utils\logger.h
- <iosfwd>
- <sstream>
-
-1185823582 e:\c++\damasca\server\src\utils\xml.hpp
- <string>
- <libxml/tree.h>
-
-1186759169 e:\c++\damasca\server\src\net\connectionhandler.cpp
- "defines.h"
- "net/connectionhandler.hpp"
- "net/messagein.hpp"
- "net/messageout.hpp"
- "net/netcomputer.hpp"
- "utils/logger.h"
-
-1191192682 e:\c++\damasca\server\src\defines.h
-
-1184157095 e:\c++\damasca\server\src\net\connectionhandler.hpp
- <list>
- <enet/enet.h>
-
-1184157095 e:\c++\damasca\server\src\net\messagein.hpp
- <iosfwd>
-
-1186598027 e:\c++\damasca\server\src\net\messageout.hpp
- <iosfwd>
-
-1184157095 e:\c++\damasca\server\src\net\netcomputer.hpp
- <iostream>
- <enet/enet.h>
-
-1184157095 e:\c++\damasca\server\src\net\messagein.cpp
- <string>
- <iostream>
- <iomanip>
- <enet/enet.h>
- "net/messagein.hpp"
-
-1186598027 e:\c++\damasca\server\src\net\messageout.cpp
- <cstdlib>
- <iosfwd>
- <string>
- <iostream>
- <iomanip>
- <enet/enet.h>
- "net/messageout.hpp"
-
-1184157095 e:\c++\damasca\server\src\net\netcomputer.cpp
- <iosfwd>
- <queue>
- <enet/enet.h>
- "defines.h"
- "net/messageout.hpp"
- "net/netcomputer.hpp"
- "utils/logger.h"
- "utils/processorutils.hpp"
-
-1185823582 e:\c++\damasca\server\src\utils\processorutils.hpp
-
-1184157099 e:\c++\damasca\server\src\utils\logger.cpp
- "logger.h"
- <ctime>
- <fstream>
- <iomanip>
- <iostream>
- <windows.h>
-
-1185823581 e:\c++\damasca\server\src\utils\processorutils.cpp
- "utils/processorutils.hpp"
-
-1191192678 e:\c++\damasca\server\src\utils\stringfilter.cpp
- "utils/stringfilter.h"
- "defines.h"
- "common/configuration.hpp"
- "utils/logger.h"
-
-1191192678 e:\c++\damasca\server\src\utils\stringfilter.h
- <list>
- <string>
-
-1184157099 e:\c++\damasca\server\src\utils\timer.cpp
- "timer.h"
- <time.h>
- <sys/time.h>
- "wingettimeofday.h"
-
-1184157099 e:\c++\damasca\server\src\utils\timer.h
- <stdint.h>
-
-1184157099 e:\c++\damasca\server\src\utils\wingettimeofday.h
- <windows.h>
-
-1188334611 e:\c++\damasca\server\src\utils\tokencollector.cpp
- "utils/tokencollector.hpp"
-
-1188334612 e:\c++\damasca\server\src\utils\tokencollector.hpp
- <string>
- <list>
- <time.h>
-
-1185823582 e:\c++\damasca\server\src\utils\tokendispenser.cpp
- "utils/tokendispenser.hpp"
- <cstdlib>
-
-1185823582 e:\c++\damasca\server\src\utils\tokendispenser.hpp
- <string>
-
-1184157099 e:\c++\damasca\server\src\utils\wingettimeofday.cpp
- "wingettimeofday.h"
-
-1184157099 e:\c++\damasca\server\src\utils\xml.cpp
- <cstdlib>
- "utils/xml.hpp"
-
-1189611258 e:\c++\damasca\server\src\account-server\account.cpp
- <cassert>
- "account-server/account.hpp"
-
-1189611257 e:\c++\damasca\server\src\account-server\account.hpp
- <string>
- <vector>
- "account-server/character.hpp"
-
-1189611257 e:\c++\damasca\server\src\account-server\character.hpp
- <string>
- <vector>
- "defines.h"
- "point.h"
- "common/inventorydata.hpp"
-
-1184157102 e:\c++\damasca\server\src\point.h
- <algorithm>
-
-1187104005 e:\c++\damasca\server\src\common\inventorydata.hpp
- <vector>
-
-1189611258 e:\c++\damasca\server\src\account-server\accountclient.cpp
- "account-server/accountclient.hpp"
-
-1189611257 e:\c++\damasca\server\src\account-server\accountclient.hpp
- <enet/enet.h>
- "account-server/account.hpp"
- "net/netcomputer.hpp"
-
-1191192678 e:\c++\damasca\server\src\account-server\accounthandler.cpp
- "account-server/accounthandler.hpp"
- "defines.h"
- "point.h"
- "account-server/account.hpp"
- "account-server/accountclient.hpp"
- "account-server/character.hpp"
- "account-server/dalstorage.hpp"
- "account-server/guild.hpp"
- "account-server/guildmanager.hpp"
- "account-server/serverhandler.hpp"
- "chat-server/chathandler.hpp"
- "common/configuration.hpp"
- "net/connectionhandler.hpp"
- "net/messagein.hpp"
- "net/messageout.hpp"
- "net/netcomputer.hpp"
- "utils/logger.h"
- "utils/stringfilter.h"
- "utils/tokencollector.hpp"
- "utils/tokendispenser.hpp"
-
-1191192678 e:\c++\damasca\server\src\account-server\accounthandler.hpp
- <string>
-
-1189611258 e:\c++\damasca\server\src\account-server\dalstorage.hpp
- <list>
- <map>
- "dal/dataprovider.h"
-
-1184157095 e:\c++\damasca\server\src\dal\dataprovider.h
- <string>
- "recordset.h"
-
-1184157095 e:\c++\damasca\server\src\dal\recordset.h
- <iostream>
- <vector>
-
-1189611258 e:\c++\damasca\server\src\account-server\guild.hpp
- <string>
- <list>
-
-1189611258 e:\c++\damasca\server\src\account-server\guildmanager.hpp
- <list>
-
-1191192678 e:\c++\damasca\server\src\account-server\serverhandler.hpp
- <iosfwd>
- <string>
-
-1191192679 e:\c++\damasca\server\src\chat-server\chathandler.hpp
- <iosfwd>
- "net/connectionhandler.hpp"
- "utils/tokencollector.hpp"
-
-1189611258 e:\c++\damasca\server\src\account-server\character.cpp
- "account-server/character.hpp"
- "account-server/account.hpp"
-
-1191192678 e:\c++\damasca\server\src\account-server\dalstorage.cpp
- <cassert>
- <time.h>
- "account-server/dalstorage.hpp"
- "point.h"
- "account-server/account.hpp"
- "account-server/guild.hpp"
- "account-server/guildmanager.hpp"
- "account-server/dalstoragesql.hpp"
- "chat-server/chatchannel.hpp"
- "common/configuration.hpp"
- "dal/dalexcept.h"
- "dal/dataproviderfactory.h"
- "utils/functors.h"
- "utils/logger.h"
-
-1189611258 e:\c++\damasca\server\src\account-server\dalstoragesql.hpp
- "config.h"
- <string>
-
-1185823576 e:\c++\damasca\server\src\chat-server\chatchannel.hpp
- <string>
- <vector>
-
-1184157095 e:\c++\damasca\server\src\dal\dalexcept.h
- <string>
-
-1184157095 e:\c++\damasca\server\src\dal\dataproviderfactory.h
-
-1184157099 e:\c++\damasca\server\src\utils\functors.h
- <functional>
- <sstream>
- <string>
-
-1189611258 e:\c++\damasca\server\src\account-server\guild.cpp
- "guild.hpp"
- "account-server/characterdata.hpp"
- "account-server/storage.hpp"
-
-1189611257 e:\c++\damasca\server\src\account-server\guildmanager.cpp
- "guildmanager.hpp"
- "account-server/characterdata.hpp"
- "account-server/guild.hpp"
- "account-server/storage.hpp"
-
-1191192678 e:\c++\damasca\server\src\account-server\main-account.cpp
- <cstdlib>
- <getopt.h>
- <signal.h>
- <iostream>
- <fstream>
- <physfs.h>
- <enet/enet.h>
- "../config.h"
- "account-server/accounthandler.hpp"
- "account-server/guildmanager.hpp"
- "account-server/serverhandler.hpp"
- "account-server/dalstorage.hpp"
- "chat-server/chatchannelmanager.hpp"
- "chat-server/chathandler.hpp"
- "common/configuration.hpp"
- "net/connectionhandler.hpp"
- "net/messageout.hpp"
- "utils/logger.h"
- "utils/processorutils.hpp"
- "utils/stringfilter.h"
- "utils/timer.h"
-
-1191192679 e:\c++\damasca\server\src\chat-server\chatchannelmanager.hpp
- <list>
- <map>
- "chat-server/chatchannel.hpp"
-
-1191192678 e:\c++\damasca\server\src\account-server\serverhandler.cpp
- <cassert>
- <sstream>
- "account-server/serverhandler.hpp"
- "account-server/accountclient.hpp"
- "account-server/accounthandler.hpp"
- "account-server/character.hpp"
- "account-server/dalstorage.hpp"
- "net/connectionhandler.hpp"
- "net/messagein.hpp"
- "net/messageout.hpp"
- "net/netcomputer.hpp"
- "serialize/characterdata.hpp"
- "utils/logger.h"
- "utils/tokendispenser.hpp"
-
-1188334610 e:\c++\damasca\server\src\serialize\characterdata.hpp
- "defines.h"
- "common/inventorydata.hpp"
- "net/messagein.hpp"
- "net/messageout.hpp"
- "point.h"
-
-1185823576 e:\c++\damasca\server\src\chat-server\chatchannel.cpp
- "chat-server/chatchannel.hpp"
- "chat-server/chatclient.hpp"
-
-1188334610 e:\c++\damasca\server\src\chat-server\chatclient.hpp
- <string>
- <vector>
- "net/netcomputer.hpp"
-
-1191192679 e:\c++\damasca\server\src\chat-server\chatchannelmanager.cpp
- <list>
- "chat-server/chatchannelmanager.hpp"
- "defines.h"
- "account-server/dalstorage.hpp"
- "chat-server/chatclient.hpp"
-
-1191192679 e:\c++\damasca\server\src\chat-server\chathandler.cpp
- <list>
- "defines.h"
- "account-server/guild.hpp"
- "account-server/guildmanager.hpp"
- "account-server/serverhandler.hpp"
- "chat-server/chatchannelmanager.hpp"
- "chat-server/chatclient.hpp"
- "chat-server/chathandler.hpp"
- "net/connectionhandler.hpp"
- "net/messagein.hpp"
- "net/messageout.hpp"
- "net/netcomputer.hpp"
- "utils/logger.h"
- "utils/stringfilter.h"
- "utils/tokendispenser.hpp"
-
-1184157095 e:\c++\damasca\server\src\dal\dataprovider.cpp
- "dataprovider.h"
-
-1187003585 e:\c++\damasca\server\src\dal\dataproviderfactory.cpp
- "dataproviderfactory.h"
- "config.h"
- "mysqldataprovider.h"
- "pqdataprovider.h"
- "sqlitedataprovider.h"
-
-1184157095 e:\c++\damasca\server\src\dal\mysqldataprovider.h
- <iosfwd>
- <mysql/mysql.h>
- "dataprovider.h"
-
-1184157096 e:\c++\damasca\server\src\dal\pqdataprovider.h
- <iosfwd>
- <libpq-fe.h>
- "dataprovider.h"
-
-1184157096 e:\c++\damasca\server\src\dal\sqlitedataprovider.h
- <iosfwd>
- <sqlite3.h>
- "dataprovider.h"
-
-1184157096 e:\c++\damasca\server\src\dal\recordset.cpp
- "recordset.h"
- <sstream>
- <stdexcept>
- "dalexcept.h"
-
-1187003585 e:\c++\damasca\server\src\dal\sqlitedataprovider.cpp
- "sqlitedataprovider.h"
- <stdexcept>
- "dalexcept.h"
-
Modified: server/trunk/accountserver.exe
===================================================================
(Binary files differ)
Deleted: server/trunk/accountserver.layout
===================================================================
--- server/trunk/accountserver.layout 2007-10-25 14:28:52 UTC (rev 13)
+++ server/trunk/accountserver.layout 2007-10-25 14:52:07 UTC (rev 14)
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE CodeBlocks_layout_file>
-<CodeBlocks_layout_file>
-</CodeBlocks_layout_file>
Added: server/trunk/data/items.xml
===================================================================
--- server/trunk/data/items.xml (rev 0)
+++ server/trunk/data/items.xml 2007-10-25 14:52:07 UTC (rev 14)
@@ -0,0 +1,219 @@
+<?xml version="1.0"?>
+<!--
+ Here are listed all the known items in The Mana World. This file defines
+ their name, icon, description, weight, etc. It also defines which sprite
+ to use in the case of visible equipment and which sounds to play on certain
+ events related to the item.
+-->
+<items>
+ <item id="501" image="use-potion-cactusdrink.png" name="Cactus drink" description="A fresh drink." weight="25" hp="15" type="1" max_per_slot="10"/>
+ <item id="502" image="use-potion-cactuspotion.png" name="Cactus potion" description="A fresh potion." weight="40" hp="25" mp="10" type="1" max_per_slot="10"/>
+ <item id="503" image="generic-casinocoins.png" name="Casino coins" description="Just some casino coins." weight="10" type="0" max_per_slot="10"/>
+ <item id="504" image="use-food-decorcandy.png" name="Decor candy" description="A leftover decor candy from last Christmas." weight="20" type="0" max_per_slot="10"/>
+ <item id="505" image="generic-maggotslime.png" name="Maggot slime" description="Slimy maggot slime." weight="10" type="0" max_per_slot="10"/>
+ <item id="506" image="use-food-candycane.png" name="Candy cane" description="Tasty candy cane." weight="10" hp="10" type="1" max_per_slot="10"/>
+ <item id="507" image="generic-scorpionstinger.png" name="Scorpion stinger" description="A poisoned scorpion stinger." weight="12" type="0" max_per_slot="10"/>
+ <item id="508" image="use-food-xmascake.png" name="Xmas cake" description="A sweet xmas cake." weight="20" hp="10" type="1" max_per_slot="10"/>
+ <item id="509" image="use-food-chocolatebar.png" name="Chocolate bar" description="A chocolate bar made of finest chocolate." weight="25" hp="20" type="1" max_per_slot="10"/>
+ <item id="510" image="use-food-candy.png" name="Candy" description="A sugar-free candy." weight="10" hp="5" type="1" max_per_slot="10"/>
+ <item id="511" image="armor-head-santahat.png" name="Santa hat" description="Ask Santa about this hat." weight="15" defense="2" type="6" max_per_slot="1">
+ <sprite>item010.xml</sprite>
+ </item>
+ <item id="512" image="use-food-gingerbreadman.png" name="Ginger bread man" description="A tasty ginger bread man." weight="30" hp="25" type="1" max_per_slot="10"/>
+ <item id="513" image="use-food-cake.png" name="Cake" description="A slice of cake." weight="25" hp="15" type="1" max_per_slot="10"/>
+ <item id="514" image="use-food-xmascandycane.png" name="Xmas candy cane" description="A special xmas candy cane." weight="15" hp="10" type="1" max_per_slot="10"/>
+ <item id="515" image="generic-purplepresentbox.png" name="Purple present box" description="Something mysterious inside." weight="20" type="0" max_per_slot="10"/>
+ <item id="516" image="generic-bluepresentbox.png" name="Blue present box" description="Something mysterious inside." weight="20" type="0" max_per_slot="10"/>
+ <item id="517" image="generic-redscorpionstinger.png" name="Red scorpion stinger" description="A highly poisoned red scorpion stinger." weight="35" type="0" max_per_slot="10"/>
+ <item id="518" image="generic-bugleg.png" name="Bug leg" description="A bug's leg. Mostly used for alchemy." weight="15" type="0" max_per_slot="10"/>
+ <item id="519" image="use-food-cherrycake.png" name="Cherry cake" description="A nice cherry cake." weight="50" hp="35" type="1" max_per_slot="10"/>
+ <item id="520" image="use-food-easteregg.png" name="Easter egg" description="A surprise." weight="180" hp="100" type="1" max_per_slot="10"/>
+ <item id="521" image="weapon-dagger-dagger.png" name="Dagger" description="A simple Dagger." weight="60" attack="15" range="1" type="2" weapon_type="1" max_per_slot="1">
+ <sprite>weapon-dagger.xml</sprite>
+ <sound event="strike">short-sword-miss1.ogg</sound>
+ <sound event="hit">short-sword-hit1.ogg</sound>
+ </item>
+ <item id="522" image="weapon-dagger-sharpknife.png" name="Sharp knife" description="A really sharp knife Don't hurt yourself!" weight="45" attack="10" range="1" type="2" weapon_type="1" max_per_slot="1" view="521"/>
+ <item id="523" image="armor-chest-leathershirt.png" name="Leather shirt" description="A shirt made of harded leather." weight="30" defense="4" type="4" max_per_slot="1">
+ <sprite gender="male">chest-leather-male.xml</sprite>
+ <sprite gender="female">chest-leather-female.xml</sprite>
+ </item>
+ <item id="524" image="armor-head-fancyhat.png" name="Fancy hat" description="A fancy hat." weight="25" defense="5" type="6" max_per_slot="1">
+ <sprite>item008.xml</sprite>
+ </item>
+ <item id="525" image="armor-head-minershat.png" name="Miners hat" description="A hat used by miners." weight="25" defense="4" type="6" max_per_slot="1">
+ <sprite>item009.xml</sprite>
+ </item>
+ <item id="526" image="generic-coinbag.png" name="Coin bag" description="A bag used to transport coins in it. If you own it you can take more coins with you." weight="20" type="0" max_per_slot="10"/>
+ <item id="527" image="use-food-milk.png" name="Milk" description="A fresh litre of ice cold milk. Note: Cool people drink milk!" weight="300" hp="150" type="1" max_per_slot="10"/>
+ <item id="528" image="armor-feet-boots.png" name="Boots" description="Some robust boots, ideal for traveling." weight="15" defense="2" type="11" max_per_slot="1"/>
+ <item id="529" image="weapon-arrow-iron.png" name="Iron arrow" description="A hard arrow made of iron." weight="12" attack="50" type="12" weapon_type="8" max_per_slot="10"/>
+ <item id="530" image="weapon-bow-shortbow.png" name="Short bow" description="A bow for short distances." weight="210" attack="50" range="5" type="3" weapon_type="10" max_per_slot="1" view="1200"/>
+ <item id="531" image="armor-hands-minergloves.png" name="Miner gloves" description="Gloves used by miners; very useful." weight="10" defense="2" type="5" max_per_slot="1"/>
+ <item id="532" image="armor-hands-leathergloves.png" name="Leather gloves" description="Gloves made of harded leather." weight="25" defense="3" type="5" max_per_slot="1"/>
+ <item id="533" image="use-food-roastedmaggot.png" name="Roasted maggot" description="Maggot roasted on fire." weight="290" hp="150" type="1" max_per_slot="10"/>
+ <item id="534" image="use-food-orangecupcake.png" name="Orange cupcake" description="A very soft orange cupcake." weight="185" hp="100" mp="10" type="1" max_per_slot="10"/>
+ <item id="535" image="use-food-apple.png" name="Apple" description="A healthy apple." weight="70" hp="50" type="1" max_per_slot="10"/>
+ <item id="536" image="weapon-dagger-shortsword.png" name="Short sword" description="A small but sharp sword." weight="1025" attack="100" range="1" type="2" weapon_type="2" max_per_slot="1" view="521"/>
+ <item id="537" image="generic-treasurekey.png" name="Treasure key" description="A rusty key." weight="35" type="0" max_per_slot="10"/>
+ <item id="538" image="generic-greenpresentbox.png" name="Green present box" description="Something mysterious inside." weight="25" type="0" max_per_slot="10"/>
+ <item id="539" image="use-food-beer.png" name="Beer" description="A fresh beer." weight="400" hp="200" type="1" max_per_slot="10"/>
+ <item id="540" image="generic-emptybottle.png" name="Empty bottle" description="An empty bottle." weight="20" type="0" max_per_slot="10"/>
+ <item id="541" image="use-food-bottleofwater.png" name="Bottle of water" description="A bottle of water." weight="495" hp="250" type="1" element="2" max_per_slot="10"/>
+ <item id="542" image="generic-bottleofsand.png" name="Bottle of sand" description="A bottle with sand in it." weight="365" type="0" max_per_slot="10"/>
+ <item id="543" image="armor-head-standardheadband.png" name="Standard headband" description="Just a standard headband." weight="45" defense="1" type="6" max_per_slot="1">
+ <sprite>item007.xml</sprite>
+ </item>
+ <item id="544" image="armor-head-silkheadband.png" name="Silk headband" description="A cool headband made of silk." weight="20" defense="3" type="6" max_per_slot="1">
+ <sprite>item006.xml</sprite>
+ </item>
+ <item id="545" image="weapon-bow-forestbow.png" name="Forest bow" description="A bow usually used to hunt." weight="530" attack="65" range="5" type="3" weapon_type="10" max_per_slot="1" view="1200"/>
+ <item id="546" image="armor-chest-desertshirt.png" name="Desert shirt" description="A shirt suitable for desert trips." weight="50" defense="6" type="4" max_per_slot="1">
+ <sprite>item002.xml</sprite>
+ </item>
+ <item id="547" image="weapon-polearm-bardiche.png" name="Bardiche" description="A Bardiche." weight="10" attack="100" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="548" image="weapon-polearm-halberd.png" name="Halberd" description="A weapon usually carried by guards." weight="10" attack="100" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="549" image="weapon-axe-axe.png" name="Axe" description="An axe." weight="10" attack="100" type="2" weapon_type="15" max_per_slot="1"/>
+ <item id="550" image="weapon-axe-blacksmithsaxe.png" name="Blacksmith's axe" description="An axe usually used by blacksmiths." weight="10" attack="100" type="2" weapon_type="15" max_per_slot="1"/>
+ <item id="551" image="generic-bluehint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="552" image="generic-magentahint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="553" image="generic-yellowhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="554" image="generic-greenhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="555" image="generic-tealhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="556" image="generic-purplehint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="557" image="generic-redhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="558" image="generic-otherbluehint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="559" image="generic-orangehint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="560" image="generic-greyhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="561" image="weapon-sword-sabre.png" name="Sabre" description="A sword with a very sharp, curved, single-edged blade." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="562" image="use-food-chickenleg.png" name="Chicken leg" description="A well cooked chicken leg." weight="10" type="0" max_per_slot="10"/>
+ <item id="563" image="armor-hands-wintergloves.png" name="Winter gloves" description="Soft and warm gloves." weight="15" type="5" max_per_slot="1"/>
+ <item id="564" image="armor-chest-tnecksweater.png" name="Turtleneck sweater" description="A soft and warm sweater." weight="40" type="4" max_per_slot="1">
+ <sprite gender="male">chest-tnecksweater-male.xml</sprite>
+ <sprite gender="female">chest-tnecksweater-female.xml</sprite>
+ </item>
+ <item id="565" image="generic-petal.png" name="Petal" description="A petal from an evil flower." weight="10" type="0" max_per_slot="10"/>
+ <item id="566" image="generic-smallmushroom.png" name="Small mushroom" description="A mushroom." weight="10" type="0" max_per_slot="10"/>
+ <item id="567" image="use-potion-ironpotion.png" name="Iron potion" description="Increases your attack strength." weight="295" strength="5" lifetime="60" type="1" max_per_slot="10"/>
+ <item id="568" image="use-potion-concentrationpotion.png" name="Concentration potion" description="Increases your attack speed." weight="295" accuracy="20" lifetime="60" type="1" max_per_slot="10"/>
+ <item id="569" image="generic-rawlog.png" name="Raw log" description="A raw log." weight="10" type="0" max_per_slot="10"/>
+ <item id="570" image="weapon-dagger-boneknife.png" name="Bone knife" description="A knife masterly carved out of a bone." weight="10" attack="50" type="2" weapon_type="1" max_per_slot="1"/>
+ <item id="571" image="weapon-dagger-setzer.png" name="Setzer" description="A knife named after a famous gambler." weight="10" attack="50" type="2" weapon_type="1" max_per_slot="1"/>
+ <item id="572" image="weapon-sword-scimitar.png" name="Scimitar" description="A sword with a heavy, curved, single-edged blade." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="573" image="weapon-sword-falchion.png" name="Falcion" description="A heavy one-handed, single-edged sword." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="574" image="weapon-polearm-scorpion.png" name="Scorpion" description="A well crafted glaive." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="575" image="weapon-bow-desertbow.png" name="Desert bow" description="A tonorian short bow." weight="10" attack="50" type="3" weapon_type="10" max_per_slot="1"/>
+ <item id="576" image="weapon-sword-beheader.png" name="Beheader" description="An oddly designed sword especially made for beheading enemies." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="577" image="weapon-thrown-bonedarts.png" name="Bone darts" description="Some darts made of bones." weight="10" attack="50" type="12" weapon_type="16" max_per_slot="10"/>
+ <item id="578" image="weapon-sword-sandcutter.png" name="Sand cutter" description="A sand cutter." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="579" image="weapon-dagger-rockknive.png" name="Rock knife" description="A knife made of stone." weight="10" attack="300" type="2" weapon_type="1" max_per_slot="1"/>
+ <item id="580" image="weapon-staff-staffoflife.png" name="Staff of life" description="A staff that increases healing magic." weight="10" attack="50" element="5" magic="10" type="2" weapon_type="6" max_per_slot="1"/>
+ <item id="581" image="weapon-staff-crescentrod.png" name="Crescent rod" description="A crescent rod." weight="10" attack="50" type="2" weapon_type="5" max_per_slot="1"/>
+ <item id="582" image="weapon-staff-staffoffire.png" name="Staff of fire" description="A staff that increases fire magic." weight="10" element="1" attack="50" type="2" weapon_type="6" max_per_slot="1"/>
+ <item id="583" image="weapon-staff-staffofice.png" name="Staff of ice" description="A staff that increases ice magic." weight="10" element="2" attack="50" type="2" weapon_type="6" max_per_slot="1"/>
+ <item id="584" image="weapon-sword-jackal.png" name="Jackal" description="A jackal." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="585" image="armor-hands-scarabarmlet.png" name="Scarab Armlet" description="A scarab armlet." weight="10" defense="50" type="5" max_per_slot="1"/>
+ <item id="586" image="armor-legs-cottonshorts.png" name="Cotton shorts" description="Shorts made of 100% cotton." weight="10" defense="2" type="7" max_per_slot="1">
+ <sprite gender="male">leg-cotton-male.xml</sprite>
+ <sprite gender="female">leg-cotton-female.xml</sprite>
+ </item>
+ <item id="587" image="weapon-sword-sword.png" name="Sword" description="A simple but reliable sword." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="588" image="weapon-sword-bastardsword.png" name="Bastard Sword" description="A large two handed sword." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="589" image="weapon-sword-broadsword.png" name="Broad Sword" description="A two handed sword with a very broad blade." weight="10" type="3" weapon_type="2" max_per_slot="1"/>
+ <item id="590" image="weapon-sword-baselard.png" name="Baselard" description="A short and powerful sword." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="591" image="weapon-sword-longsword.png" name="Long Sword" description="A sword with a long and agile blade." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="592" image="weapon-dagger-stiletto.png" name="Stiletto" description="A dagger with a long and thin blade." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="593" image="weapon-sword-rapier.png" name="Rapier" description="A light sword made for duels." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="594" image="weapon-polearm-spear.png" name="Spear" description="A light spear with a wooden pole." weight="10" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="595" image="weapon-polearm-heavyspear.png" name="Heavy Spear" description="A heavy spear with a wooden pole." weight="10" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="596" image="weapon-polearm-pike.png" name="Pike" description="" weight="10" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="597" image="weapon-polearm-heavypike.png" name="Heavy Pike" description="" weight="10" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="598" image="weapon-polearm-dualspear.png" name="Dual Spear" description="A spear with two tops." weight="10" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="599" image="weapon-sword-firesword.png" name="Fire Sword" description="A magical sword enchanted with the power of fire." weight="10" element="1" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="600" image="armor-shield-britshield.png" name="Brit Shield" description="Legendary shield that is said to save queens and rule waves." weight="10" type="8" max_per_slot="1"/>
+ <item id="601" image="armor-shield-steelshield.png" name="Steel Shield" description="A shield made of steel." weight="10" type="8" max_per_slot="1"/>
+ <item id="602" image="armor-shield-woodenshield.png" name="Wooden Shield" description="A shield made of wood." weight="10" type="8" max_per_slot="1"/>
+ <item id="603" image="armor-shield-leathershield.png" name="Leather Shield" description="A shield made of leather on a wooden frame." weight="10" type="8" max_per_slot="1"/>
+ <item id="604" image="armor-shield-knightshield.png" name="Knight Shield" description="A high quality shield used by knights." weight="10" type="8" max_per_slot="1"/>
+ <item id="605" image="weapon-axe-meatcleaver.png" name="Meat Cleaver" description="A butchers tool that also makes a nice one handed battleaxe." weight="10" type="2" weapon_type="15" max_per_slot="1"/>
+ <item id="606" image="weapon-axe-hatchet.png" name="Hatchet" description="A short one handed axe." weight="10" type="0" max_per_slot="1"/>
+ <item id="607" image="weapon-polearm-trident.png" name="Trident" description="A spear with three heads." weight="10" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="608" image="armor-shield-bladeshield.png" name="Blade-shield" description="A shield made of blades." weight="10" type="8" max_per_slot="1"/>
+ <item id="609" image="weapon-mace-club.png" name="Club" description="A primitive wooden club." weight="10" type="2" weapon_type="14" max_per_slot="1"/>
+ <item id="610" image="armor-legs-jeanshorts.png" name="Jeans shorts" description="Shorts made of jeans." weight="30" defense="4" type="7" max_per_slot="1">
+ <sprite gender="male">leg-jeans-male.xml</sprite>
+ <sprite gender="female">leg-jeans-female.xml</sprite>
+ </item>
+ <item id="611" image="generic-whitefur.png" name="White fur" description="A patch of white, fluffy fur." weight="10" type="0" max_per_slot="10"/>
+ <item id="612" image="generic-cavesnakelamp.png" name="Cave snake lamp" description="Feeler of a lamp snake that glows in the dark." weight="10" type="0" max_per_slot="10"/>
+ <item id="613" image="generic-hardspike.png" name="Hard spike" description="The hard spike of a slain monster." weight="10" type="0" max_per_slot="10"/>
+ <item id="614" image="generic-pinkantennae.png" name="Pink antennae" description="No-one knows why violets got these antennaes." weight="10" type="0" max_per_slot="10"/>
+ <item id="615" image="armor-head-pumpkinhelmet.png" name="Pumpkin helmet" description="A helmet made out of a pumpkin." weight="30" type="6" max_per_slot="1">
+ <sprite>item011.xml</sprite>
+ </item>
+ <item id="616" image="armor-head-axehat.png" name="Axe hat" description="A really cool joke." weight="20" type="6" max_per_slot="1">
+ <sprite>item012.xml</sprite>
+ </item>
+ <item id="617" image="armor-head-piratehat.png" name="Pirate hat" description="A pirate hat." weight="25" type="6" max_per_slot="1">
+ <sprite>item013.xml</sprite>
+ </item>
+ <item id="618" image="armor-head-goggles.png" name="Goggles" description="Goggles designed to take care of your eyes." weight="20" type="6" max_per_slot="1">
+ <sprite>item014.xml</sprite>
+ </item>
+ <item id="619" image="armor-head-leathergoggles.png" name="Leather goggles" description="Goggles designed for desert storms." weight="25" type="6" max_per_slot="1">
+ <sprite>item015.xml</sprite>
+ </item>
+ <item id="620" image="armor-head-circlet.png" name="Circlet" description="A nice piece of jewelry." weight="35" type="6" max_per_slot="1">
+ <sprite>item016.xml</sprite>
+ </item>
+ <item id="621" image="armor-head-eyepatch.png" name="Eyepatch" description="What really makes you a pirate." weight="15" type="6" max_per_slot="1">
+ <sprite>item017.xml</sprite>
+ </item>
+ <item id="622" image="armor-head-bandana.png" name="Bandana" description="A striped bandana." weight="15" type="6" max_per_slot="1">
+ <sprite>item018.xml</sprite>
+ </item>
+ <item id="623" image="weapon-polearm-scythe.png" name="Scythe" description="Usually used for farming but also useable as a weapon. Slow but deadly." weight="400" type="3" weapon_type="11" max_per_slot="1">
+ <sprite>weapon-scythe.xml</sprite>
+ </item>
+ <item id="624" image="armor-chest-vnecksweater.png" name="V-neck Sweater" description="A soft and warm sweater." weight="45" type="4" max_per_slot="1">
+ <sprite gender="male">chest-vnecksweater-male.xml</sprite>
+ <sprite gender="female">chest-vnecksweater-female.xml</sprite>
+ </item>
+ <item id="625" image="armor-chest-chainmail.png" name="Chainmail Shirt" description="A shirt made of chains. It weights a lot but offers excellent protection." weight="120" type="4" max_per_slot="1">
+ <sprite gender="male">chest-chainmail-male.xml</sprite>
+ <sprite gender="female">chest-chainmail-female.xml</sprite>
+ </item>
+ <item id="626" image="armor-chest-lightplatemail.png" name="Light Platemail" description="A light cuirass with shoulder pads made of iron. A cheap and plain but efficient armor usually worn by foot soldiers." weight="240" type="4" max_per_slot="1">
+ <sprite gender="male">chest-lightplatemail-male.xml</sprite>
+ <sprite gender="female">chest-lightplatemail-female.xml</sprite>
+ </item>
+ <item id="1199" image="weapon-arrow-arrow.png" name="Arrow" description="A standard arrow." weight="8" attack="25" type="12" weapon_type="8" max_per_slot="10"/>
+ <item id="1200" image="weapon-bow-bow.png" name="Bow" description="A distance weapon." weight="125" attack="15" range="5" type="3" weapon_type="10" max_per_slot="1">
+ <sprite>weapon-bow.xml</sprite>
+ <sound event="swing">bow_shoot_1.ogg</sound>
+ </item>
+ <item id="1201" image="weapon-dagger-knive.png" name="Knife" description="A small knife, the perfect weapon for a beginner." weight="20" attack="5" range="1" type="2" weapon_type="1" max_per_slot="1" view="521"/>
+ <item id="1202" image="armor-chest-cottonshirt.png" name="Cotton shirt" description="A shirt made of 100% cotton." weight="15" defense="2" type="4" max_per_slot="1">
+ <sprite gender="male">chest-cotton-male.xml</sprite>
+ <sprite gender="female">chest-cotton-female.xml</sprite>
+ </item>
+ <item id="1203" image="armor-head-rangerhat.png" name="Ranger hat" description="A leather hat traditionally worn by Rangers." weight="55" type="6" max_per_slot="1">
+ <sprite>head-rangerhat.xml</sprite>
+ </item>
+ <item id="1204" image="armor-head-antlerhat.png" name="Antler hat" description="A hat with antlers sticking out of it." weight="20" type="6" max_per_slot="1">
+ <sprite>head-antlerhat.xml</sprite>
+ </item>
+ <item id="1205" image="armor-head-christmastree.png" name="Christmas tree hat" description="A hat shaped like a Christmas tree." weight="25" type="6" max_per_slot="1">
+ <sprite>head-christmastree.xml</sprite>
+ </item>
+ <item id="1206" image="armor-head-santabeardhat.png" name="Santa beard hat" description="Now you will look just like Santa Claus!" weight="30" type="6" max_per_slot="1">
+ <sprite>head-santabeardhat.xml</sprite>
+ </item>
+ <item id="1207" image="generic-redstocking.png" name="Red Christmas stocking" description="Eww, it's smelly!" weight="20" type="0" max_per_slot="10"/>
+ <item id="1208" image="generic-easteregg-red.png" name="Red Easter Egg" description="A red easter egg. Find all six different easter eggs to win a prize." weight="10" type="0" max_per_slot="10"/>
+ <item id="1209" image="generic-easteregg-green.png" name="Green Easter Egg" description="A green easter egg. Find all six different easter eggs to win a prize." weight="10" type="0" max_per_slot="10"/>
+ <item id="1210" image="generic-easteregg-blue.png" name="Blue Easter Egg" description="A blue easter egg. Find all six different easter eggs to win a prize." weight="10" type="0" max_per_slot="10"/>
+ <item id="1211" image="generic-easteregg-yellow.png" name="Yellow Easter Egg" description="A yellow easter egg. Find all six different easter eggs to win a prize." weight="10" type="0" max_per_slot="10"/>
+ <item id="1212" image="generic-easteregg-pink.png" name="Pink Easter Egg" description="A pink easter egg. Find all six different easter eggs to win a prize." weight="10" type="0" max_per_slot="10"/>
+ <item id="1213" image="generic-easteregg-teal.png" name="Teal Easter Egg" description="A teal easter egg. Find all six different easter eggs to win a prize." weight="10" type="0" max_per_slot="10"/>
+</items>
Deleted: server/trunk/data/maps/new_1-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_10-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_11-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_12-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_13-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_14-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_15-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_16-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_17-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_18-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_19-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_2-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_3-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_4-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_5-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_6-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_7-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_8-1.tmx.gz
===================================================================
(Binary files differ)
Deleted: server/trunk/data/maps/new_9-1.tmx.gz
===================================================================
(Binary files differ)
Modified: server/trunk/data/maps.xml
===================================================================
--- server/trunk/data/maps.xml 2007-10-25 14:28:52 UTC (rev 13)
+++ server/trunk/data/maps.xml 2007-10-25 14:52:07 UTC (rev 14)
@@ -1,22 +1,4 @@
<?xml version="1.0"?>
<maps>
<map id="1" name="beta-test1"/>
- <map id="2" name="new_2-1"/>
- <map id="3" name="new_3-1"/>
- <map id="4" name="new_4-1"/>
- <map id="5" name="new_5-1"/>
- <map id="6" name="new_6-1"/>
- <map id="7" name="new_7-1"/>
- <map id="8" name="new_8-1"/>
- <map id="9" name="new_9-1"/>
- <map id="10" name="new_10-1"/>
- <map id="11" name="new_11-1"/>
- <map id="12" name="new_12-1"/>
- <map id="13" name="new_13-1"/>
- <map id="14" name="new_14-1"/>
- <map id="15" name="new_15-1"/>
- <map id="16" name="new_16-1"/>
- <map id="17" name="new_17-1"/>
- <map id="18" name="new_18-1"/>
- <map id="19" name="new_19-1"/>
</maps>
Added: server/trunk/data/monsters.xml
===================================================================
--- server/trunk/data/monsters.xml (rev 0)
+++ server/trunk/data/monsters.xml 2007-10-25 14:52:07 UTC (rev 14)
@@ -0,0 +1,242 @@
+<monsters>
+
+ <monster id="1002" name="Maggot" targetCursor="small">
+ <sprite>monster-maggot.xml</sprite>
+ <sound event="hit">maggot-hit1.ogg</sound>
+ <sound event="hit">maggot-hit2.ogg</sound>
+ <sound event="miss">maggot-miss1.ogg</sound>
+ <sound event="die">maggot-dying1.ogg</sound>
+ <drop item="505" percent="8"/>
+ <drop item="518" percent="4"/>
+ <drop item="501" percent="1.5"/>
+ <drop item="533" percent="1.5"/>
+ <drop item="502" percent="0.7"/>
+ <drop item="522" percent="0.1"/>
+ </monster>
+
+ <monster id="1003" name="Scorpion">
+ <sprite>monster-scorpion.xml</sprite>
+ <sound event="hit">scorpion-hit1.ogg</sound>
+ <sound event="hit">scorpion-hit2.ogg</sound>
+ <sound event="hit">scorpion-hit3.ogg</sound>
+ <sound event="hit">scorpion-hit4.ogg</sound>
+ <sound event="miss">scorpion-miss1.ogg</sound>
+ <drop item="507" percent="7"/>
+ <drop item="510" percent="1"/>
+ <drop item="509" percent="0.5"/>
+ <drop item="518" percent="7"/>
+ </monster>
+
+ <monster id="1004" name="Red scorpion">
+ <sprite>monster-scorpion-red.xml</sprite>
+ <sound event="hit">scorpion-hit1.ogg</sound>
+ <sound event="hit">scorpion-hit2.ogg</sound>
+ <sound event="hit">scorpion-hit3.ogg</sound>
+ <sound event="hit">scorpion-hit4.ogg</sound>
+ <sound event="miss">scorpion-miss1.ogg</sound>
+ <drop item="517" percent="20"/>
+ <drop item="509" percent="1"/>
+ <drop item="518" percent="5"/>
+ <drop item="1200" percent="0.1"/>
+ <drop item="1199" percent="7.6"/>
+ <drop item="1201" percent="5.4"/>
+ <drop item="524" percent="0.1"/>
+ </monster>
+
+ <monster id="1005" name="Green slime">
+ <sprite>monster-slime-green.xml</sprite>
+ <sound event="hit">slime-hit1.ogg</sound>
+ <drop item="502" percent="2"/>
+ <drop item="513" percent="1"/>
+ <drop item="501" percent="1"/>
+ <drop item="521" percent="1"/>
+ <drop item="522" percent="1.9"/>
+ <drop item="526" percent="0.1"/>
+ <drop item="503" percent="5"/>
+ <drop item="535" percent="7.5"/>
+ </monster>
+
+ <monster id="1006" name="Giant maggot" targetCursor="large">
+ <sprite>monster-maggot-giant.xml</sprite>
+ <sound event="hit">maggot-hit1.ogg</sound>
+ <sound event="hit">maggot-hit2.ogg</sound>
+ <sound event="miss">maggot-miss1.ogg</sound>
+ <sound event="die">maggot-dying1.ogg</sound>
+ <drop item="1199" percent="9"/>
+ <drop item="519" percent="1"/>
+ <drop item="518" percent="7.5"/>
+ <drop item="501" percent="50"/>
+ <drop item="502" percent="30"/>
+ <drop item="503" percent="0.1"/>
+ <drop item="526" percent="0.1"/>
+ </monster>
+
+ <monster id="1007" name="Yellow slime">
+ <sprite>monster-slime-yellow.xml</sprite>
+ <sound event="hit">slime-hit1.ogg</sound>
+ <drop item="534" percent="2"/>
+ <drop item="519" percent="1"/>
+ <drop item="501" percent="3.5"/>
+ <drop item="502" percent="2.5"/>
+ <drop item="522" percent="0.1"/>
+ </monster>
+
+ <monster id="1008" name="Red slime">
+ <sprite>monster-slime-red.xml</sprite>
+ <sound event="hit">slime-hit1.ogg</sound>
+ <drop item="1201" percent="3"/>
+ <drop item="509" percent="1.1"/>
+ <drop item="521" percent="2"/>
+ <drop item="523" percent="0.4"/>
+ <drop item="525" percent="0.8"/>
+ <drop item="535" percent="7.5"/>
+ <drop item="528" percent="2.5"/>
+ <drop item="531" percent="1.5"/>
+ </monster>
+
+ <monster id="1009" name="Black scorpion">
+ <sprite>monster-scorpion-black.xml</sprite>
+ <sound event="hit">scorpion-hit1.ogg</sound>
+ <sound event="hit">scorpion-hit2.ogg</sound>
+ <sound event="hit">scorpion-hit3.ogg</sound>
+ <sound event="hit">scorpion-hit4.ogg</sound>
+ <sound event="miss">scorpion-miss1.ogg</sound>
+ <drop item="523" percent="1.5"/>
+ <drop item="509" percent="1.0"/>
+ <drop item="518" percent="8"/>
+ </monster>
+
+ <monster id="1010" name="Snake">
+ <sprite>monster-snake.xml</sprite>
+ <drop item="524" percent="3"/>
+ </monster>
+
+ <monster id="1011" name="Fire goblin">
+ <sprite>monster-goblin-fire.xml</sprite>
+ <sound event="hit">fire-goblin-hit1.ogg</sound>
+ <sound event="hit">fire-goblin-hit2.ogg</sound>
+ <sound event="miss">fire-goblin-miss1.ogg</sound>
+ <drop item="505" percent="8"/>
+ <drop item="501" percent="1.5"/>
+ <drop item="518" percent="8"/>
+ <drop item="502" percent="1.5"/>
+ <drop item="521" percent="0.7"/>
+ <drop item="522" percent="0.1"/>
+ </monster>
+
+ <monster id="1012" name="Spider">
+ <sprite>monster-spider.xml</sprite>
+ <drop item="537" percent="5"/>
+ <drop item="535" percent="1"/>
+ </monster>
+
+ <monster id="1013" name="Evil mushroom">
+ <sprite>monster-mushroom-red.xml</sprite>
+ <sound event="hit">shroom-hit1.ogg</sound>
+ <drop item="535" percent="5"/>
+ <drop item="540" percent="0.1"/>
+ <drop item="534" percent="1"/>
+ <drop item="566" percent="5"/>
+ </monster>
+
+ <monster id="1014" name="Sleep flower">
+ <sprite>monster-flower.xml</sprite>
+ <sound event="hit">flower-hit1.ogg</sound>
+ <sound event="hit">flower-hit2.ogg</sound>
+ <sound event="miss">flower-miss1.ogg</sound>
+ <drop item="535" percent="1"/>
+ <drop item="540" percent="0.1"/>
+ <drop item="1199" percent="1"/>
+ <drop item="526" percent="4"/>
+ <drop item="565" percent="5"/>
+ </monster>
+
+ <monster id="1015" name="Santa slime">
+ <sprite>monster-slime-santa.xml</sprite>
+ <drop item="512" percent="8"/>
+ <drop item="513" percent="7"/>
+ <drop item="514" percent="6"/>
+ <drop item="519" percent="5"/>
+ <drop item="527" percent="4"/>
+ <drop item="538" percent="5"/>
+ </monster>
+
+ <monster id="1016" name="Rudolph slime">
+ <sprite>monster-slime-rudolph.xml</sprite>
+ <drop item="504" percent="8"/>
+ <drop item="506" percent="5"/>
+ <drop item="508" percent="2"/>
+ <drop item="509" percent="3"/>
+ <drop item="510" percent="6"/>
+ <drop item="515" percent="8"/>
+ <drop item="516" percent="5"/>
+ </monster>
+
+ <monster id="1017" name="Bat">
+ <sprite>monster-bat.xml</sprite>
+ <sound event="die">bat-dying1.ogg</sound>
+ <sound event="hit">bat-hit1.ogg</sound>
+ <drop item="505" percent="8"/>
+ <drop item="501" percent="1.5"/>
+ <drop item="518" percent="4"/>
+ <drop item="533" percent="1.5"/>
+ <drop item="521" percent="0.7"/>
+ <drop item="522" percent="0.1"/>
+ </monster>
+
+ <monster id="1018" name="Violet" targetCursor="small">
+ <sprite>monster-pinkie.xml</sprite>
+ <sound event="hit">pinkie-hit1.ogg</sound>
+ <sound event="miss">pinkie-miss1.ogg</sound>
+ <drop item="614" percent="8"/>
+ </monster>
+
+ <monster id="1019" name="Shroom">
+ <sprite>monster-mushroom-spiky.xml</sprite>
+ <sound event="hit">shroom-hit1.ogg</sound>
+ <drop item="567" percent="8"/>
+ <drop item="501" percent="1.5"/>
+ <drop item="518" percent="0.5"/>
+ <drop item="613" percent="1.5"/>
+ </monster>
+
+ <monster id="1020" name="Fluffy">
+ <sprite>monster-fluffy.xml</sprite>
+ <sound event="hit">fluffy-hit1.ogg</sound>
+ <sound event="hit">fluffy-hit2.ogg</sound>
+ <sound event="hit">fluffy-hit3.ogg</sound>
+ <sound event="miss">fluffy-miss1.ogg</sound>
+ <sound event="hurt">fluffy-hurt1.ogg</sound>
+ <drop item="611" percent="8"/>
+ <drop item="527" percent="1.5"/>
+ <drop item="535" percent="4"/>
+ </monster>
+
+ <monster id="1021" name="Lamp snake">
+ <sprite>monster-snake-cave.xml</sprite>
+ <drop item="612" percent="8"/>
+ <drop item="610" percent="0.1"/>
+ </monster>
+
+ <monster id="1022" name="Ghost pumpkin">
+ <sprite>monster-ghost-pumpkin.xml</sprite>
+ </monster>
+
+ <monster id="1023" name="Fire skull">
+ <sprite>monster-skull-fire.xml</sprite>
+ <drop item="621" percent="0.1"/>
+ <drop item="540" percent="1.5"/>
+ </monster>
+
+ <monster id="1024" name="Poison skull">
+ <sprite>monster-skull-poison.xml</sprite>
+ <drop item="621" percent="0.1"/>
+ <drop item="540" percent="1.5"/>
+ </monster>
+
+ <monster id="1025" name="Stumpy">
+ <sprite>monster-logmonster.xml</sprite>
+ <drop item="569" percent="20"/>
+ </monster>
+
+</monsters>
Deleted: server/trunk/gameserver.depend
===================================================================
--- server/trunk/gameserver.depend 2007-10-25 14:28:52 UTC (rev 13)
+++ server/trunk/gameserver.depend 2007-10-25 14:52:07 UTC (rev 14)
@@ -1,589 +0,0 @@
-# depslib dependency file v1.0
-1191192679 e:\c++\damasca\server\src\common\configuration.cpp
- <cmath>
- <map>
- <libxml/xmlwriter.h>
- "common/configuration.hpp"
- "utils/logger.h"
- "utils/xml.hpp"
-
-1191192679 e:\c++\damasca\server\src\common\configuration.hpp
- <string>
-
-1184157099 e:\c++\damasca\server\src\utils\logger.h
- <iosfwd>
- <sstream>
-
-1185823582 e:\c++\damasca\server\src\utils\xml.hpp
- <string>
- <libxml/tree.h>
-
-1191192682 e:\c++\damasca\server\src\game-server\accountconnection.cpp
- "game-server/accountconnection.hpp"
- "defines.h"
- "common/configuration.hpp"
- "game-server/character.hpp"
- "game-server/gamehandler.hpp"
- "game-server/map.hpp"
- "game-server/mapcomposite.hpp"
- "game-server/mapmanager.hpp"
- "game-server/quest.hpp"
- "game-server/state.hpp"
- "net/messagein.hpp"
- "net/messageout.hpp"
- "serialize/characterdata.hpp"
- "utils/logger.h"
- "utils/tokendispenser.hpp"
- "utils/tokencollector.hpp"
-
-1190319396 e:\c++\damasca\server\src\game-server\accountconnection.hpp
- "net/connection.hpp"
-
-1184157095 e:\c++\damasca\server\src\net\connection.hpp
- <string>
- <enet/enet.h>
-
-1191192682 e:\c++\damasca\server\src\defines.h
-
-1189611268 e:\c++\damasca\server\src\game-server\character.hpp
- <map>
- <string>
- <vector>
- "common/inventorydata.hpp"
- "game-server/being.hpp"
-
-1187104005 e:\c++\damasca\server\src\common\inventorydata.hpp
- <vector>
-
-1189611267 e:\c++\damasca\server\src\game-server\being.hpp
- <string>
- <vector>
- "defines.h"
- "game-server/movingobject.hpp"
-
-1188334623 e:\c++\damasca\server\src\game-server\movingobject.hpp
- "point.h"
- "game-server/map.hpp"
- "game-server/object.hpp"
-
-1184157102 e:\c++\damasca\server\src\point.h
- <algorithm>
-
-1185823590 e:\c++\damasca\server\src\game-server\map.hpp
- <list>
- <map>
- <string>
-
-1188334623 e:\c++\damasca\server\src\game-server\object.hpp
- "point.h"
- "game-server/thing.hpp"
-
-1189611267 e:\c++\damasca\server\src\game-server\thing.hpp
- <set>
-
-1189611268 e:\c++\damasca\server\src\game-server\gamehandler.hpp
- "game-server/character.hpp"
- "net/connectionhandler.hpp"
- "net/netcomputer.hpp"
- "utils/tokencollector.hpp"
-
-1184157095 e:\c++\damasca\server\src\net\connectionhandler.hpp
- <list>
- <enet/enet.h>
-
-1184157095 e:\c++\damasca\server\src\net\netcomputer.hpp
- <iostream>
- <enet/enet.h>
-
-1188334612 e:\c++\damasca\server\src\utils\tokencollector.hpp
- <string>
- <list>
- <time.h>
-
-1186759174 e:\c++\damasca\server\src\game-server\mapcomposite.hpp
- <string>
- <vector>
-
-1184157102 e:\c++\damasca\server\src\game-server\mapmanager.hpp
- <map>
- <string>
-
-1188334623 e:\c++\damasca\server\src\game-server\quest.hpp
- <string>
-
-1191192682 e:\c++\damasca\server\src\game-server\state.hpp
- <string>
-
-1184157095 e:\c++\damasca\server\src\net\messagein.hpp
- <iosfwd>
-
-1186598027 e:\c++\damasca\server\src\net\messageout.hpp
- <iosfwd>
-
-1188334610 e:\c++\damasca\server\src\serialize\characterdata.hpp
- "defines.h"
- "common/inventorydata.hpp"
- "net/messagein.hpp"
- "net/messageout.hpp"
- "point.h"
-
-1185823582 e:\c++\damasca\server\src\utils\tokendispenser.hpp
- <string>
-
-1189611267 e:\c++\damasca\server\src\game-server\being.cpp
- <cassert>
- "game-server/being.hpp"
- "defines.h"
- "game-server/collisiondetection.hpp"
- "game-server/eventlistener.hpp"
- "game-server/mapcomposite.hpp"
- "utils/logger.h"
-
-1185823589 e:\c++\damasca\server\src\game-server\collisiondetection.hpp
-
-1189611268 e:\c++\damasca\server\src\game-server\eventlistener.hpp
-
-1187104015 e:\c++\damasca\server\src\game-server\buysell.cpp
- <algorithm>
- "game-server/buysell.hpp"
- "defines.h"
- "game-server/character.hpp"
- "game-server/gamehandler.hpp"
- "game-server/inventory.hpp"
- "net/messageout.hpp"
-
-1187104015 e:\c++\damasca\server\src\game-server\buysell.hpp
- <vector>
-
-1188334622 e:\c++\damasca\server\src\game-server\inventory.hpp
- "game-server/character.hpp"
- "net/messageout.hpp"
-
-1189611268 e:\c++\damasca\server\src\game-server\character.cpp
- <algorithm>
- <cassert>
- "game-server/character.hpp"
- "defines.h"
- "game-server/buysell.hpp"
- "game-server/eventlistener.hpp"
- "game-server/inventory.hpp"
- "game-server/item.hpp"
- "game-server/itemmanager.hpp"
- "game-server/gamehandler.hpp"
- "game-server/mapcomposite.hpp"
- "game-server/mapmanager.hpp"
- "game-server/trade.hpp"
- "net/messagein.hpp"
- "net/messageout.hpp"
- "serialize/characterdata.hpp"
-
-1188334623 e:\c++\damasca\server\src\game-server\item.hpp
- <vector>
- "game-server/object.hpp"
-
-1189611266 e:\c++\damasca\server\src\game-server\itemmanager.hpp
- <string>
-
-1187104014 e:\c++\damasca\server\src\game-server\trade.hpp
- <vector>
-
-1185823591 e:\c++\damasca\server\src\game-server\collisiondetection.cpp
- "collisiondetection.hpp"
- <cmath>
- "point.h"
- "utils/mathutils.h"
-
-1184157099 e:\c++\damasca\server\src\utils\mathutils.h
-
-1191192682 e:\c++\damasca\server\src\game-server\command.cpp
- <cstddef>
- "defines.h"
- "game-server/accountconnection.hpp"
- "game-server/character.hpp"
- "game-server/gamehandler.hpp"
- "game-server/inventory.hpp"
- "game-server/item.hpp"
- "game-server/itemmanager.hpp"
- "game-server/mapmanager.hpp"
- "game-server/monster.hpp"
- "game-server/monstermanager.hpp"
- "game-server/state.hpp"
-
-1189611267 e:\c++\damasca\server\src\game-server\monster.hpp
- <map>
- <vector>
- "game-server/being.hpp"
- "game-server/eventlistener.hpp"
-
-1189611267 e:\c++\damasca\server\src\game-server\monstermanager.hpp
- <string>
-
-1191192682 e:\c++\damasca\server\src\game-server\gamehandler.cpp
- <cassert>
- <map>
- "game-server/gamehandler.hpp"
- "game-server/accountconnection.hpp"
- "game-server/buysell.hpp"
- "game-server/inventory.hpp"
- "game-server/item.hpp"
- "game-server/itemmanager.hpp"
- "game-server/map.hpp"
- "game-server/mapcomposite.hpp"
- "game-server/npc.hpp"
- "game-server/state.hpp"
- "game-server/trade.hpp"
- "net/messagein.hpp"
- "net/messageout.hpp"
- "net/netcomputer.hpp"
- "utils/logger.h"
- "utils/tokendispenser.hpp"
-
-1186759174 e:\c++\damasca\server\src\game-server\npc.hpp
- "game-server/being.hpp"
-
-1188334623 e:\c++\damasca\server\src\game-server\inventory.cpp
- <algorithm>
- <cassert>
- "defines.h"
- "game-server/gamehandler.hpp"
- "game-server/inventory.hpp"
- "game-server/item.hpp"
- "game-server/itemmanager.hpp"
- "net/messageout.hpp"
- "utils/logger.h"
-
-1188334623 e:\c++\damasca\server\src\game-server\item.cpp
- "game-server/item.hpp"
- "game-server/being.hpp"
-
-1191192682 e:\c++\damasca\server\src\game-server\itemmanager.cpp
- <map>
- "game-server/itemmanager.hpp"
- "defines.h"
- "game-server/item.hpp"
- "game-server/resourcemanager.hpp"
- "utils/logger.h"
- "utils/xml.hpp"
-
-1191192682 e:\c++\damasca\server\src\game-server\resourcemanager.hpp
- <string>
-
-1191192682 e:\c++\damasca\server\src\game-server\main-game.cpp
- <cstdlib>
- <getopt.h>
- <iostream>
- <signal.h>
- <physfs.h>
- <enet/enet.h>
- "../config.h"
- "common/configuration.hpp"
- "game-server/accountconnection.hpp"
- "game-server/gamehandler.hpp"
- "game-server/itemmanager.hpp"
- "game-server/mapmanager.hpp"
- "game-server/monstermanager.hpp"
- "game-server/resourcemanager.hpp"
- "game-server/state.hpp"
- "net/connectionhandler.hpp"
- "net/messageout.hpp"
- "utils/logger.h"
- "utils/processorutils.hpp"
- "utils/stringfilter.h"
- "utils/timer.h"
- "utils/mathutils.h"
-
-1185823582 e:\c++\damasca\server\src\utils\processorutils.hpp
-
-1191192678 e:\c++\damasca\server\src\utils\stringfilter.h
- <list>
- <string>
-
-1184157099 e:\c++\damasca\server\src\utils\timer.h
- <stdint.h>
-
-1185823590 e:\c++\damasca\server\src\game-server\map.cpp
- "game-server/map.hpp"
- <queue>
-
-1186759174 e:\c++\damasca\server\src\game-server\mapcomposite.cpp
- <algorithm>
- <cassert>
- "point.h"
- "game-server/map.hpp"
- "game-server/mapcomposite.hpp"
- "game-server/character.hpp"
- "scripting/script.hpp"
- "utils/logger.h"
-
-1188334616 e:\c++\damasca\server\src\scripting\script.hpp
- <string>
-
-1191192682 e:\c++\damasca\server\src\game-server\mapmanager.cpp
- <cassert>
- "g...
[truncated message content] |
|
From: <cru...@us...> - 2007-10-25 14:28:47
|
Revision: 13
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=13&view=rev
Author: crush_tmw
Date: 2007-10-25 07:28:52 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
updated project file
Modified Paths:
--------------
client/trunk/tmw-client.cbp
Modified: client/trunk/tmw-client.cbp
===================================================================
--- client/trunk/tmw-client.cbp 2007-10-25 14:24:50 UTC (rev 12)
+++ client/trunk/tmw-client.cbp 2007-10-25 14:28:52 UTC (rev 13)
@@ -878,6 +878,16 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
+ <Unit filename="src\gui\widgets\layout.cpp">
+ <Option compilerVar="CPP"/>
+ <Option target="default"/>
+ </Unit>
+ <Unit filename="src\gui\widgets\layout.h">
+ <Option compilerVar=""/>
+ <Option compile="0"/>
+ <Option link="0"/>
+ <Option target="default"/>
+ </Unit>
<Unit filename="src\gui\widgets\resizegrip.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-10-25 14:24:59
|
Revision: 12
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=12&view=rev
Author: crush_tmw
Date: 2007-10-25 07:24:50 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
Merged the latest TMW changes and did some rebranding.
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/data/items.xml
client/trunk/po/POTFILES.in
client/trunk/po/de.po
client/trunk/po/nl.po
client/trunk/src/CMakeLists.txt
client/trunk/src/Makefile.am
client/trunk/src/configuration.cpp
client/trunk/src/engine.cpp
client/trunk/src/engine.h
client/trunk/src/game.cpp
client/trunk/src/graphics.cpp
client/trunk/src/gui/browserbox.cpp
client/trunk/src/gui/buy.cpp
client/trunk/src/gui/buy.h
client/trunk/src/gui/char_select.cpp
client/trunk/src/gui/connection.cpp
client/trunk/src/gui/connection.h
client/trunk/src/gui/gui.cpp
client/trunk/src/gui/inventorywindow.cpp
client/trunk/src/gui/inventorywindow.h
client/trunk/src/gui/itemcontainer.cpp
client/trunk/src/gui/itemcontainer.h
client/trunk/src/gui/listbox.cpp
client/trunk/src/gui/login.cpp
client/trunk/src/gui/menuwindow.cpp
client/trunk/src/gui/playerbox.cpp
client/trunk/src/gui/quitdialog.cpp
client/trunk/src/gui/sell.cpp
client/trunk/src/gui/sell.h
client/trunk/src/gui/serverdialog.cpp
client/trunk/src/gui/serverdialog.h
client/trunk/src/gui/shoplistbox.cpp
client/trunk/src/gui/trade.cpp
client/trunk/src/gui/truetypefont.cpp
client/trunk/src/gui/window.cpp
client/trunk/src/gui/window.h
client/trunk/src/item.h
client/trunk/src/main.cpp
client/trunk/src/particle.cpp
client/trunk/src/resources/action.cpp
client/trunk/src/resources/image.cpp
client/trunk/src/resources/image.h
client/trunk/src/resources/imageloader.cpp
client/trunk/src/resources/imageset.cpp
client/trunk/src/resources/imageset.h
client/trunk/src/resources/itemdb.cpp
client/trunk/src/resources/iteminfo.cpp
client/trunk/src/resources/iteminfo.h
client/trunk/src/resources/monsterdb.cpp
client/trunk/src/resources/music.cpp
client/trunk/src/resources/music.h
client/trunk/src/resources/resource.cpp
client/trunk/src/resources/resource.h
client/trunk/src/resources/resourcemanager.cpp
client/trunk/src/resources/resourcemanager.h
client/trunk/src/resources/soundeffect.cpp
client/trunk/src/resources/soundeffect.h
client/trunk/src/resources/spritedef.cpp
client/trunk/src/resources/spritedef.h
client/trunk/src/tileset.h
client/trunk/tmw-client.cbp
Added Paths:
-----------
client/trunk/damasca.exe
client/trunk/src/gui/widgets/layout.cpp
client/trunk/src/gui/widgets/layout.h
Removed Paths:
-------------
client/trunk/data/equipment.xml
client/trunk/data/music/Magick - Real.ogg
client/trunk/tmw-client.depend
client/trunk/tmw-client.layout
client/trunk/tmw.exe
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2007-10-22 17:27:42 UTC (rev 11)
+++ client/trunk/ChangeLog 2007-10-25 14:24:50 UTC (rev 12)
@@ -1,5 +1,111 @@
-2007-10-18 Philipp Sehmisch <tm...@cr...>
+2007-10-25 Philipp Sehmisch <tm...@cr...>
+ * src/main.cpp, tmw-client.cbp, tmw.exe, tmw.cbp: Did
+ some rebranding from TMW to Damasca.
+ * data/music/Magic - Real.ogg, src/main.cpp: Changed
+ theme music filename.
+
+ MERGED CHANGES FROM MAIN TMW TO REVISION 3680
+
+2007-10-24 Bjørn Lindeijer <bj...@li...>
+
+ * po/nl.po: Completed Dutch translation.
+ * po/de.po: Some small fixes.
+
+2007-10-23 Bjørn Lindeijer <bj...@li...>
+
+ * src/CMakeLists.txt: Added Layout source files.
+
+2007-10-22 Guillaume Melquiond <gui...@gm...>
+
+ * src/particle.cpp: Plugged memory leak.
+ * src/gui/connection.cpp, src/gui/connection.h: Simplified code.
+ Plugged memory leak.
+ * src/configuration.cpp, src/main.cpp: Plugged memory leak. Cleaned
+ code.
+ * src/gui/serverdialog.cpp, src/gui/serverdialog.h: Plugged memory
+ leak. Simplified code. Removed annoying reset of text fields. Changed
+ error message and marked it as translatable.
+
+2007-10-21 Guillaume Melquiond <gui...@gm...>
+
+ * src/gui/window.cpp, src/gui/window.h: Removed redundant resizable
+ flag. Factored moving/resizing code, so that events are fired only
+ once per size change. Added automatic layout reflowing on resize.
+ * src/gui/widgets/layout.cpp: Allowed for decreasing sizes in layout.
+ * src/gui/inventorywindow.cpp, src/gui/inventorywindow.cpp: Delegated
+ resizing events to layout handler.
+ * src/gui/widgets/layout.cpp, src/gui/widgets/layout.h: Renamed padding
+ to spacing. Added margin around layout. Constified code.
+ * src/gui/window.cpp, src/gui/login.cpp, src/gui/char_select.cpp,
+ src/gui/serverdialog.cpp, src/gui/inventorywindow.cpp: Removed window
+ padding and replaced it by layout margin, so that the grip on resizable
+ window is not outside the inner clip area.
+ * src/engine.cpp, src/engine.h, src/game.cpp: Fixed current map not
+ deleted on server change.
+ * src/gui/inventorywindow.cpp, src/gui/inventorywindow.h: Removed
+ redundant destructor.
+ * src/resources/monsterdb.cpp: Plugged memory leak in database reader.
+ * src/resources/spritedef.cpp: Plugged memory leak in sprites.
+ * src/gui/quitdialog.cpp: Plugged memory leak in quit dialog.
+ * src/resources/iteminfo.cpp, src/resources/iteminfo.h: Plugged memory
+ leak in equipment sound.
+ * src/resources/action.cpp: Fixed double-free of sprite actions.
+ * data/maps/new_1-1.tmx: Added back a Lua script for testing.
+ * src/gui/trade.cpp: Added persistent positioning.
+ * src/gui/menuwindow.cpp: Fixed missing pixels at bottom and right.
+ * src/gui/window.cpp, src/gui/window.h: Changed to use default values
+ when restoring missing settings.
+ * src/gui/buy.cpp, src/gui/buy.h, src/gui/sell.cpp, src/gui/sell.h:
+ Converted to layout handler.
+ * src/gui/shoplistbox.cpp, src/gui/listbox.cpp: Fixed invisible text.
+
+2007-10-20 Guillaume Melquiond <gui...@gm...>
+
+ * src/gui/widgets/layout.h, src/gui/widgets/layout.cpp,
+ src/Makefile.am: Added a layout handler for automatically positioning
+ widgets in a window.
+ * src/gui/window.h, src/gui/window.cpp: Removed garbage-collected
+ container. Fixed dangling resize widget. Added layout handler.
+ * src/gui/login.cpp: Fixed layout of login dialog box when native
+ language is not English.
+ * src/gui/playerbox.cpp: Centered sprite inside selection box.
+ * src/gui/char_select.cpp: Reworked layout of dialog box.
+ * src/gui/serverdialog.cpp: Converted to layout handler.
+
+2007-10-19 Guillaume Melquiond <gui...@gm...>
+
+ * data/equipment.xml: Removed obsolete file.
+ * data/items.xml: Fixed equipment types.
+ * src/item.h: Fixed invalid item ID.
+ * src/gui/inventorywindow.cpp, src/gui/itemcontainer.cpp: Fixed key
+ special values.
+ * src/gui/itemcontainer.cpp: Reduced amount of spurious item
+ deselections.
+ * src/gui/itemcontainer.cpp, src/gui/itemcontainer.h: Allowed dragging
+ of already selected items.
+ * src/gui/buy.cpp, src/gui/sell.cpp, po/POTFILES.in: Marked buy and
+ sell dialog boxes as translatable.
+ * src/resources/resource.cpp, src/resources/resource.h,
+ src/resources/imageset.cpp, src/resources/imageset.h: Removed mandatory
+ identifier path.
+ * src/resources/resourcemanager.cpp, src/resources/resourcemanager.h:
+ Factored code between resource handlers.
+ * src/resources/soundeffect.h, src/resources/soundeffect.cpp,
+ src/resources/music.h, src/resources/music.cpp, src/resources/image.h,
+ src/resources/image.cpp: Reworked resource loaders.
+ * src/resources/spritedef.h, src/resources/spritedef.cpp: Implemented
+ a failure-friendly loader.
+ * src/gui/truetypefont.cpp, src/resources/imageloader.cpp,
+ src/tileset.h: Removed dummy parameter.
+
+2007-10-19 Philipp Sehmisch <tm...@cr...>
+
+ * src/gui/truetypefont.cpp: Increased text chunk cache size to improve
+ performance when a lot of text is on the screen.
+
+2007-10-18 Philipp Sehmisch <tm...@cr...>
+
MERGED CHANGES FROM MAIN TMW TO REVISION 3630
2007-10-18 Guillaume Melquiond <gui...@gm...>
Added: client/trunk/damasca.exe
===================================================================
(Binary files differ)
Property changes on: client/trunk/damasca.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: client/trunk/data/equipment.xml
===================================================================
--- client/trunk/data/equipment.xml 2007-10-22 17:27:42 UTC (rev 11)
+++ client/trunk/data/equipment.xml 2007-10-25 14:24:50 UTC (rev 12)
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<!--
- This file maps the server sided visible equipment ID numbers to the
- animation files.
--->
-<equipments>
- <equipment id="1" slot="0">
- <sprite gender="male">chest-cotton-male.xml</sprite>
- <sprite gender="female">chest-cotton-female.xml</sprite>
- </equipment>
- <equipment id="2" slot="0">
- <sprite>item002.xml</sprite>
- </equipment>
- <equipment id="3" slot="0">
- <sprite gender="male">chest-leather-male.xml</sprite>
- <sprite gender="female">chest-leather-female.xml</sprite>
- </equipment>
- <equipment id="4" slot="0">
- <sprite gender="male">leg-cotton-male.xml</sprite>
- <sprite gender="female">leg-cotton-female.xml</sprite>
- </equipment>
- <equipment id="5" slot="0">
- <sprite gender="male">leg-jeans-male.xml</sprite>
- <sprite gender="female">leg-jeans-female.xml</sprite>
- </equipment>
- <equipment id="6" slot="0">
- <sprite>item006.xml</sprite>
- </equipment>
- <equipment id="7" slot="0">
- <sprite>item007.xml</sprite>
- </equipment>
- <equipment id="524" slot="0">
- <sprite>item008.xml</sprite>
- </equipment>
- <equipment id="9" slot="0">
- <sprite>item009.xml</sprite>
- </equipment>
- <equipment id="10" slot="0">
- <sprite>item010.xml</sprite>
- </equipment>
- <equipment id="11" slot="0">
- <sprite>item011.xml</sprite>
- </equipment>
- <equipment id="12" slot="0">
- <sprite>item012.xml</sprite>
- </equipment>
- <equipment id="13" slot="0">
- <sprite>item013.xml</sprite>
- </equipment>
- <equipment id="14" slot="0">
- <sprite>item014.xml</sprite>
- </equipment>
- <equipment id="15" slot="0">
- <sprite>item015.xml</sprite>
- </equipment>
- <equipment id="16" slot="0">
- <sprite>item016.xml</sprite>
- </equipment>
- <equipment id="17" slot="0">
- <sprite>item017.xml</sprite>
- </equipment>
- <equipment id="18" slot="0">
- <sprite>item018.xml</sprite>
- </equipment>
- <equipment id="19" slot="0">
- <sprite gender="male">chest-vnecksweater-male.xml</sprite>
- <sprite gender="female">chest-vnecksweater-female.xml</sprite>
- </equipment>
- <equipment id="20" slot="0">
- <sprite gender="male">chest-tnecksweater-male.xml</sprite>
- <sprite gender="female">chest-tnecksweater-female.xml</sprite>
- </equipment>
- <equipment id="21" slot="0">
- <sprite>head-rangerhat.xml</sprite>
- </equipment>
- <equipment id="22" slot="0">
- <sprite>head-antlerhat.xml</sprite>
- </equipment>
- <equipment id="23" slot="0">
- <sprite>head-christmastree.xml</sprite>
- </equipment>
- <equipment id="24" slot="0">
- <sprite>head-santabeardhat.xml</sprite>
- </equipment>
- <equipment id="25" slot="0">
- <sprite gender="male">chest-chainmail-male.xml</sprite>
- <sprite gender="female">chest-chainmail-female.xml</sprite>
- </equipment>
- <equipment id="26" slot="0">
- <sprite gender="male">chest-lightplatemail-male.xml</sprite>
- <sprite gender="female">chest-lightplatemail-female.xml</sprite>
- </equipment>
-</equipments>
Modified: client/trunk/data/items.xml
===================================================================
--- client/trunk/data/items.xml 2007-10-22 17:27:42 UTC (rev 11)
+++ client/trunk/data/items.xml 2007-10-25 14:24:50 UTC (rev 12)
@@ -1,219 +1,219 @@
-<?xml version="1.0"?>
-<!--
- Here are listed all the known items in The Mana World. This file defines
- their name, icon, description, weight, etc. It also defines which sprite
- to use in the case of visible equipment and which sounds to play on certain
- events related to the item.
--->
-<items>
- <item id="501" image="use-potion-cactusdrink.png" name="Cactus drink" description="A fresh drink." weight="25" hp="15" type="1" max_per_slot="10"/>
- <item id="502" image="use-potion-cactuspotion.png" name="Cactus potion" description="A fresh potion." weight="40" hp="25" mp="10" type="1" max_per_slot="10"/>
- <item id="503" image="generic-casinocoins.png" name="Casino coins" description="Just some casino coins." weight="10" type="0" max_per_slot="10"/>
- <item id="504" image="use-food-decorcandy.png" name="Decor candy" description="A leftover decor candy from last Christmas." weight="20" type="0" max_per_slot="10"/>
- <item id="505" image="generic-maggotslime.png" name="Maggot slime" description="Slimy maggot slime." weight="10" type="0" max_per_slot="10"/>
- <item id="506" image="use-food-candycane.png" name="Candy cane" description="Tasty candy cane." weight="10" hp="10" type="1" max_per_slot="10"/>
- <item id="507" image="generic-scorpionstinger.png" name="Scorpion stinger" description="A poisoned scorpion stinger." weight="12" type="0" max_per_slot="10"/>
- <item id="508" image="use-food-xmascake.png" name="Xmas cake" description="A sweet xmas cake." weight="20" hp="10" type="1" max_per_slot="10"/>
- <item id="509" image="use-food-chocolatebar.png" name="Chocolate bar" description="A chocolate bar made of finest chocolate." weight="25" hp="20" type="1" max_per_slot="10"/>
- <item id="510" image="use-food-candy.png" name="Candy" description="A sugar-free candy." weight="10" hp="5" type="1" max_per_slot="10"/>
- <item id="511" image="armor-head-santahat.png" name="Santa hat" description="Ask Santa about this hat." weight="15" defense="2" type="6" max_per_slot="10">
- <sprite>item010.xml</sprite>
- </item>
- <item id="512" image="use-food-gingerbreadman.png" name="Ginger bread man" description="A tasty ginger bread man." weight="30" hp="25" type="1" max_per_slot="10"/>
- <item id="513" image="use-food-cake.png" name="Cake" description="A slice of cake." weight="25" hp="15" type="1" max_per_slot="10"/>
- <item id="514" image="use-food-xmascandycane.png" name="Xmas candy cane" description="A special xmas candy cane." weight="15" hp="10" type="1" max_per_slot="10"/>
- <item id="515" image="generic-purplepresentbox.png" name="Purple present box" description="Something mysterious inside." weight="20" type="0" max_per_slot="10"/>
- <item id="516" image="generic-bluepresentbox.png" name="Blue present box" description="Something mysterious inside." weight="20" type="0" max_per_slot="10"/>
- <item id="517" image="generic-redscorpionstinger.png" name="Red scorpion stinger" description="A highly poisoned red scorpion stinger." weight="35" type="0" max_per_slot="10"/>
- <item id="518" image="generic-bugleg.png" name="Bug leg" description="A bug's leg. Mostly used for alchemy." weight="15" type="0" max_per_slot="10"/>
- <item id="519" image="use-food-cherrycake.png" name="Cherry cake" description="A nice cherry cake." weight="50" hp="35" type="1" max_per_slot="10"/>
- <item id="520" image="use-food-easteregg.png" name="Easter egg" description="A surprise." weight="180" hp="100" type="1" max_per_slot="10"/>
- <item id="521" image="weapon-dagger-dagger.png" name="Dagger" description="A simple Dagger." weight="60" attack="15" range="1" type="2" weapon_type="1" max_per_slot="10">
- <sprite>weapon-dagger.xml</sprite>
- <sound event="strike">short-sword-miss1.ogg</sound>
- <sound event="hit">short-sword-hit1.ogg</sound>
- </item>
- <item id="522" image="weapon-dagger-sharpknife.png" name="Sharp knife" description="A really sharp knife Don't hurt yourself!" weight="45" attack="10" range="1" type="2" weapon_type="1" max_per_slot="10" view="521"/>
- <item id="523" image="armor-chest-leathershirt.png" name="Leather shirt" description="A shirt made of harded leather." weight="30" defense="4" type="4" max_per_slot="10">
- <sprite gender="male">chest-leather-male.xml</sprite>
- <sprite gender="female">chest-leather-female.xml</sprite>
- </item>
- <item id="524" image="armor-head-fancyhat.png" name="Fancy hat" description="A fancy hat." weight="25" defense="5" type="6" max_per_slot="10">
- <sprite>item008.xml</sprite>
- </item>
- <item id="525" image="armor-head-minershat.png" name="Miners hat" description="A hat used by miners." weight="25" defense="4" type="6" max_per_slot="10">
- <sprite>item009.xml</sprite>
- </item>
- <item id="526" image="generic-coinbag.png" name="Coin bag" description="A bag used to transport coins in it. If you own it you can take more coins with you." weight="20" type="0" max_per_slot="10"/>
- <item id="527" image="use-food-milk.png" name="Milk" description="A fresh litre of ice cold milk. Note: Cool people drink milk!" weight="300" hp="150" type="1" max_per_slot="10"/>
- <item id="528" image="armor-feet-boots.png" name="Boots" description="Some robust boots, ideal for traveling." weight="15" defense="2" type="11" max_per_slot="10"/>
- <item id="529" image="weapon-arrow-iron.png" name="Iron arrow" description="A hard arrow made of iron." weight="12" attack="50" type="0" weapon_type="8" max_per_slot="10"/>
- <item id="530" image="weapon-bow-shortbow.png" name="Short bow" description="A bow for short distances." weight="210" attack="50" range="5" type="3" weapon_type="10" max_per_slot="10" view="1200"/>
- <item id="531" image="armor-hands-minergloves.png" name="Miner gloves" description="Gloves used by miners; very useful." weight="10" defense="2" type="5" max_per_slot="10"/>
- <item id="532" image="armor-hands-leathergloves.png" name="Leather gloves" description="Gloves made of harded leather." weight="25" defense="3" type="5" max_per_slot="10"/>
- <item id="533" image="use-food-roastedmaggot.png" name="Roasted maggot" description="Maggot roasted on fire." weight="290" hp="150" type="1" max_per_slot="10"/>
- <item id="534" image="use-food-orangecupcake.png" name="Orange cupcake" description="A very soft orange cupcake." weight="185" hp="100" mp="10" type="1" max_per_slot="10"/>
- <item id="535" image="use-food-apple.png" name="Apple" description="A healthy apple." weight="70" hp="50" type="1" max_per_slot="10"/>
- <item id="536" image="weapon-dagger-shortsword.png" name="Short sword" description="A small but sharp sword." weight="1025" attack="100" range="1" type="2" weapon_type="2" max_per_slot="10" view="521"/>
- <item id="537" image="generic-treasurekey.png" name="Treasure key" description="A rusty key." weight="35" type="0" max_per_slot="10"/>
- <item id="538" image="generic-greenpresentbox.png" name="Green present box" description="Something mysterious inside." weight="25" type="0" max_per_slot="10"/>
- <item id="539" image="use-food-beer.png" name="Beer" description="A fresh beer." weight="400" hp="200" type="1" max_per_slot="10"/>
- <item id="540" image="generic-emptybottle.png" name="Empty bottle" description="An empty bottle." weight="20" type="0" max_per_slot="10"/>
- <item id="541" image="use-food-bottleofwater.png" name="Bottle of water" description="A bottle of water." weight="495" hp="250" type="1" element="2" max_per_slot="10"/>
- <item id="542" image="generic-bottleofsand.png" name="Bottle of sand" description="A bottle with sand in it." weight="365" type="0" max_per_slot="10"/>
- <item id="543" image="armor-head-standardheadband.png" name="Standard headband" description="Just a standard headband." weight="45" defense="1" type="6" max_per_slot="10">
- <sprite>item007.xml</sprite>
- </item>
- <item id="544" image="armor-head-silkheadband.png" name="Silk headband" description="A cool headband made of silk." weight="20" defense="3" type="6" max_per_slot="10">
- <sprite>item006.xml</sprite>
- </item>
- <item id="545" image="weapon-bow-forestbow.png" name="Forest bow" description="A bow usually used to hunt." weight="530" attack="65" range="5" type="3" weapon_type="10" max_per_slot="10" view="1200"/>
- <item id="546" image="armor-chest-desertshirt.png" name="Desert shirt" description="A shirt suitable for desert trips." weight="50" defense="6" type="4" max_per_slot="10">
- <sprite>item002.xml</sprite>
- </item>
- <item id="547" image="weapon-polearm-bardiche.png" name="Bardiche" description="A Bardiche." weight="10" attack="100" type="3" weapon_type="3" max_per_slot="10"/>
- <item id="548" image="weapon-polearm-halberd.png" name="Halberd" description="A weapon usually carried by guards." weight="10" attack="100" type="3" weapon_type="3" max_per_slot="10"/>
- <item id="549" image="weapon-axe-axe.png" name="Axe" description="An axe." weight="10" attack="100" type="2" weapon_type="15" max_per_slot="10"/>
- <item id="550" image="weapon-axe-blacksmithsaxe.png" name="Blacksmith's axe" description="An axe usually used by blacksmiths." weight="10" attack="100" type="2" weapon_type="15" max_per_slot="10"/>
- <item id="551" image="generic-bluehint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
- <item id="552" image="generic-magentahint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
- <item id="553" image="generic-yellowhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
- <item id="554" image="generic-greenhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
- <item id="555" image="generic-tealhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
- <item id="556" image="generic-purplehint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
- <item id="557" image="generic-redhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
- <item id="558" image="generic-otherbluehint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
- <item id="559" image="generic-orangehint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
- <item id="560" image="generic-greyhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
- <item id="561" image="weapon-sword-sabre.png" name="Sabre" description="A sword with a very sharp, curved, single-edged blade." weight="10" type="0" weapon_type="2" max_per_slot="10"/>
- <item id="562" image="use-food-chickenleg.png" name="Chicken leg" description="A well cooked chicken leg." weight="10" type="0" max_per_slot="10"/>
- <item id="563" image="armor-hands-wintergloves.png" name="Winter gloves" description="Soft and warm gloves." weight="15" type="0" max_per_slot="10"/>
- <item id="564" image="armor-chest-tnecksweater.png" name="Turtleneck sweater" description="A soft and warm sweater." weight="40" type="0" max_per_slot="10">
- <sprite gender="male">chest-tnecksweater-male.xml</sprite>
- <sprite gender="female">chest-tnecksweater-female.xml</sprite>
- </item>
- <item id="565" image="generic-petal.png" name="Petal" description="A petal from an evil flower." weight="10" type="0" max_per_slot="10"/>
- <item id="566" image="generic-smallmushroom.png" name="Small mushroom" description="A mushroom." weight="10" type="0" max_per_slot="10"/>
- <item id="567" image="use-potion-ironpotion.png" name="Iron potion" description="Increases your attack strength." weight="295" strength="5" lifetime="60" type="1" max_per_slot="10"/>
- <item id="568" image="use-potion-concentrationpotion.png" name="Concentration potion" description="Increases your attack speed." weight="295" accuracy="20" lifetime="60" type="1" max_per_slot="10"/>
- <item id="569" image="generic-rawlog.png" name="Raw log" description="A raw log." weight="10" type="0" max_per_slot="10"/>
- <item id="570" image="weapon-dagger-boneknife.png" name="Bone knife" description="A knife masterly carved out of a bone." weight="10" attack="50" type="2" weapon_type="1" max_per_slot="10"/>
- <item id="571" image="weapon-dagger-setzer.png" name="Setzer" description="A knife named after a famous gambler." weight="10" attack="50" type="2" weapon_type="1" max_per_slot="10"/>
- <item id="572" image="weapon-sword-scimitar.png" name="Scimitar" description="A sword with a heavy, curved, single-edged blade." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="10"/>
- <item id="573" image="weapon-sword-falchion.png" name="Falcion" description="A heavy one-handed, single-edged sword." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="10"/>
- <item id="574" image="weapon-polearm-scorpion.png" name="Scorpion" description="A well crafted glaive." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="10"/>
- <item id="575" image="weapon-bow-desertbow.png" name="Desert bow" description="A tonorian short bow." weight="10" attack="50" type="2" weapon_type="10" max_per_slot="10"/>
- <item id="576" image="weapon-sword-beheader.png" name="Beheader" description="An oddly designed sword especially made for beheading enemies." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="10"/>
- <item id="577" image="weapon-thrown-bonedarts.png" name="Bone darts" description="Some darts made of bones." weight="10" attack="50" type="2" max_per_slot="10"/>
- <item id="578" image="weapon-sword-sandcutter.png" name="Sand cutter" description="A sand cutter." weight="10" attack="50 " type="2" weapon_type="2" max_per_slot="10"/>
- <item id="579" image="weapon-dagger-rockknive.png" name="Rock knife" description="A knife made of stone." weight="10" attack="300" type="2" weapon_type="1" max_per_slot="10"/>
- <item id="580" image="weapon-staff-staffoflife.png" name="Staff of life" description="A staff that increases healing magic." weight="10" attack="50" element="5" magic="10" type="2" weapon_type="6" max_per_slot="10"/>
- <item id="581" image="weapon-staff-crescentrod.png" name="Crescent rod" description="A crescent rod." weight="10" attack="50" type="2" weapon_type="5" max_per_slot="10"/>
- <item id="582" image="weapon-staff-staffoffire.png" name="Staff of fire" description="A staff that increases fire magic." weight="10" element="1" attack="50" type="2" weapon_type="6" max_per_slot="10"/>
- <item id="583" image="weapon-staff-staffofice.png" name="Staff of ice" description="A staff that increases ice magic." weight="10" element="2" attack="50" type="2" max_per_slot="10"/>
- <item id="584" image="weapon-sword-jackal.png" name="Jackal" description="A jackal." weight="10" attack="50" type="2" max_per_slot="10"/>
- <item id="585" image="armor-hands-scarabarmlet.png" name="Scarab Armlet" description="A scarab armlet." weight="10" defense="50" type="5" max_per_slot="10"/>
- <item id="586" image="armor-legs-cottonshorts.png" name="Cotton shorts" description="Shorts made of 100% cotton." weight="10" defense="2" type="7" max_per_slot="10">
- <sprite gender="male">leg-cotton-male.xml</sprite>
- <sprite gender="female">leg-cotton-female.xml</sprite>
- </item>
- <item id="587" image="weapon-sword-sword.png" name="Sword" description="A simple but reliable sword." weight="10" type="0" weapon_type="2" max_per_slot="10"/>
- <item id="588" image="weapon-sword-bastardsword.png" name="Bastard Sword" description="A large two handed sword." weight="10" type="0" weapon_type="2" max_per_slot="10"/>
- <item id="589" image="weapon-sword-broadsword.png" name="Broad Sword" description="A two handed sword with a very broad blade." weight="10" type="0" weapon_type="2" max_per_slot="10"/>
- <item id="590" image="weapon-sword-baselard.png" name="Baselard" description="A short and powerful sword." weight="10" max_per_slot="10"/>
- <item id="591" image="weapon-sword-longsword.png" name="Long Sword" description="A sword with a long and agile blade." weight="10" type="0" weapon_type="2" max_per_slot="10"/>
- <item id="592" image="weapon-dagger-stiletto.png" name="Stiletto" description="A dagger with a long and thin blade." weight="10" type="0" weapon_type="2" max_per_slot="10"/>
- <item id="593" image="weapon-sword-rapier.png" name="Rapier" description="A light sword made for duels." weight="10" type="0" weapon_type="2" max_per_slot="10"/>
- <item id="594" image="weapon-polearm-spear.png" name="Spear" description="A light spear with a wooden pole." weight="10" type="0" weapon_type="3" max_per_slot="10"/>
- <item id="595" image="weapon-polearm-heavyspear.png" name="Heavy Spear" description="A heavy spear with a wooden pole." weight="10" type="0" weapon_type="3" max_per_slot="10"/>
- <item id="596" image="weapon-polearm-pike.png" name="Pike" description="" weight="10" type="0" weapon_type="3" max_per_slot="10"/>
- <item id="597" image="weapon-polearm-heavypike.png" name="Heavy Pike" description="" weight="10" type="0" weapon_type="3" max_per_slot="10"/>
- <item id="598" image="weapon-polearm-dualspear.png" name="Dual Spear" description="A spear with two tops." weight="10" type="0" weapon_type="3" max_per_slot="10"/>
- <item id="599" image="weapon-sword-firesword.png" name="Fire Sword" description="A magical sword enchanted with the power of fire." weight="10" element="1" type="0" weapon_type="2" max_per_slot="10"/>
- <item id="600" image="armor-shield-britshield.png" name="Brit Shield" description="Legendary shield that is said to save queens and rule waves." weight="10" type="8" max_per_slot="10"/>
- <item id="601" image="armor-shield-steelshield.png" name="Steel Shield" description="A shield made of steel." weight="10" type="8" max_per_slot="10"/>
- <item id="602" image="armor-shield-woodenshield.png" name="Wooden Shield" description="A shield made of wood." weight="10" type="8" max_per_slot="10"/>
- <item id="603" image="armor-shield-leathershield.png" name="Leather Shield" description="A shield made of leather on a wooden frame." weight="10" type="8" max_per_slot="10"/>
- <item id="604" image="armor-shield-knightshield.png" name="Knight Shield" description="A high quality shield used by knights." weight="10" type="8" max_per_slot="10"/>
- <item id="605" image="weapon-axe-meatcleaver.png" name="Meat Cleaver" description="A butchers tool that also makes a nice one handed battleaxe." weight="10" type="0" max_per_slot="10"/>
- <item id="606" image="weapon-axe-hatchet.png" name="Hatchet" description="A short one handed axe." weight="10" type="0" max_per_slot="10"/>
- <item id="607" image="weapon-polearm-trident.png" name="Trident" description="A spear with three heads." weight="10" type="0" weapon_type="3" max_per_slot="10"/>
- <item id="608" image="armor-shield-bladeshield.png" name="Blade-shield" description="A shield made of blades." weight="10" type="8" max_per_slot="10"/>
- <item id="609" image="weapon-mace-club.png" name="Club" description="A primitive wooden club." weight="10" type="0" weapon_type="14" max_per_slot="10"/>
- <item id="610" image="armor-legs-jeanshorts.png" name="Jeans shorts" description="Shorts made of jeans." weight="30" defense="4" type="7" max_per_slot="10">
- <sprite gender="male">leg-jeans-male.xml</sprite>
- <sprite gender="female">leg-jeans-female.xml</sprite>
- </item>
- <item id="611" image="generic-whitefur.png" name="White fur" description="A patch of white, fluffy fur." weight="10" type="0" max_per_slot="10"/>
- <item id="612" image="generic-cavesnakelamp.png" name="Cave snake lamp" description="Feeler of a lamp snake that glows in the dark." weight="10" type="0" max_per_slot="10"/>
- <item id="613" image="generic-hardspike.png" name="Hard spike" description="The hard spike of a slain monster." weight="10" type="0" max_per_slot="10"/>
- <item id="614" image="generic-pinkantennae.png" name="Pink antennae" description="No-one knows why violets got these antennaes." weight="10" type="0" max_per_slot="10"/>
- <item id="615" image="armor-head-pumpkinhelmet.png" name="Pumpkin helmet" description="A helmet made out of a pumpkin." weight="30" max_per_slot="10">
- <sprite>item011.xml</sprite>
- </item>
- <item id="616" image="armor-head-axehat.png" name="Axe hat" description="A really cool joke." weight="20" max_per_slot="10">
- <sprite>item012.xml</sprite>
- </item>
- <item id="617" image="armor-head-piratehat.png" name="Pirate hat" description="A pirate hat." weight="25" max_per_slot="10">
- <sprite>item013.xml</sprite>
- </item>
- <item id="618" image="armor-head-goggles.png" name="Goggles" description="Goggles designed to take care of your eyes." weight="20" max_per_slot="10">
- <sprite>item014.xml</sprite>
- </item>
- <item id="619" image="armor-head-leathergoggles.png" name="Leather goggles" description="Goggles designed for desert storms." weight="25" max_per_slot="10">
- <sprite>item015.xml</sprite>
- </item>
- <item id="620" image="armor-head-circlet.png" name="Circlet" description="A nice piece of jewelry." weight="35" max_per_slot="10">
- <sprite>item016.xml</sprite>
- </item>
- <item id="621" image="armor-head-eyepatch.png" name="Eyepatch" description="What really makes you a pirate." weight="15" max_per_slot="10">
- <sprite>item017.xml</sprite>
- </item>
- <item id="622" image="armor-head-bandana.png" name="Bandana" description="A striped bandana." weight="15" max_per_slot="10">
- <sprite>item018.xml</sprite>
- </item>
- <item id="623" image="weapon-polearm-scythe.png" name="Scythe" description="Usually used for farming but also useable as a weapon. Slow but deadly." weight="400" type="3" weapon_type="11" max_per_slot="10">
- <sprite>weapon-scythe.xml</sprite>
- </item>
- <item id="624" image="armor-chest-vnecksweater.png" name="V-neck Sweater" description="A soft and warm sweater." weight="45" max_per_slot="10">
- <sprite gender="male">chest-vnecksweater-male.xml</sprite>
- <sprite gender="female">chest-vnecksweater-female.xml</sprite>
- </item>
- <item id="625" image="armor-chest-chainmail.png" name="Chainmail Shirt" description="A shirt made of chains. It weights a lot but offers excellent protection." weight="120" max_per_slot="10">
- <sprite gender="male">chest-chainmail-male.xml</sprite>
- <sprite gender="female">chest-chainmail-female.xml</sprite>
- </item>
- <item id="626" image="armor-chest-lightplatemail.png" name="Light Platemail" description="A light cuirass with shoulder pads made of iron. A cheap and plain but efficient armor usually worn by foot soldiers." weight="240" max_per_slot="10">
- <sprite gender="male">chest-lightplatemail-male.xml</sprite>
- <sprite gender="female">chest-lightplatemail-female.xml</sprite>
- </item>
- <item id="1199" image="weapon-arrow-arrow.png" name="Arrow" description="A standard arrow." weight="8" attack="25" type="0" weapon_type="8" max_per_slot="10"/>
- <item id="1200" image="weapon-bow-bow.png" name="Bow" description="A distance weapon." weight="125" attack="15" range="5" type="3" weapon_type="10" max_per_slot="10">
- <sprite>weapon-bow.xml</sprite>
- <sound event="swing">bow_shoot_1.ogg</sound>
- </item>
- <item id="1201" image="weapon-dagger-knive.png" name="Knife" description="A small knife, the perfect weapon for a beginner." weight="20" attack="5" range="1" type="2" weapon_type="1" max_per_slot="10" view="521"/>
- <item id="1202" image="armor-chest-cottonshirt.png" name="Cotton shirt" description="A shirt made of 100% cotton." weight="15" defense="2" type="7" max_per_slot="10">
- <sprite gender="male">chest-cotton-male.xml</sprite>
- <sprite gender="female">chest-cotton-female.xml</sprite>
- </item>
- <item id="1203" image="armor-head-rangerhat.png" name="Ranger hat" description="A leather hat traditionally worn by Rangers." weight="55" max_per_slot="10">
- <sprite>head-rangerhat.xml</sprite>
- </item>
- <item id="1204" image="armor-head-antlerhat.png" name="Antler hat" description="A hat with antlers sticking out of it." weight="20" max_per_slot="10">
- <sprite>head-antlerhat.xml</sprite>
- </item>
- <item id="1205" image="armor-head-christmastree.png" name="Christmas tree hat" description="A hat shaped like a Christmas tree." weight="25" max_per_slot="10">
- <sprite>head-christmastree.xml</sprite>
- </item>
- <item id="1206" image="armor-head-santabeardhat.png" name="Santa beard hat" description="Now you will look just like Santa Claus!" weight="30" max_per_slot="10">
- <sprite>head-santabeardhat.xml</sprite>
- </item>
- <item id="1207" image="generic-redstocking.png" name="Red Christmas stocking" description="Eww, it's smelly!" weight="20" max_per_slot="10"/>
- <item id="1208" image="generic-easteregg-red.png" name="Red Easter Egg" description="A red easter egg. Find all six different easter eggs to win a prize." weight="10" max_per_slot="10"/>
- <item id="1209" image="generic-easteregg-green.png" name="Green Easter Egg" description="A green easter egg. Find all six different easter eggs to win a prize." weight="10" max_per_slot="10"/>
- <item id="1210" image="generic-easteregg-blue.png" name="Blue Easter Egg" description="A blue easter egg. Find all six different easter eggs to win a prize." weight="10" max_per_slot="10"/>
- <item id="1211" image="generic-easteregg-yellow.png" name="Yellow Easter Egg" description="A yellow easter egg. Find all six different easter eggs to win a prize." weight="10" max_per_slot="10"/>
- <item id="1212" image="generic-easteregg-pink.png" name="Pink Easter Egg" description="A pink easter egg. Find all six different easter eggs to win a prize." weight="10" max_per_slot="10"/>
- <item id="1213" image="generic-easteregg-teal.png" name="Teal Easter Egg" description="A teal easter egg. Find all six different easter eggs to win a prize." weight="10" max_per_slot="10"/>
-</items>
+<?xml version="1.0"?>
+<!--
+ Here are listed all the known items in The Mana World. This file defines
+ their name, icon, description, weight, etc. It also defines which sprite
+ to use in the case of visible equipment and which sounds to play on certain
+ events related to the item.
+-->
+<items>
+ <item id="501" image="use-potion-cactusdrink.png" name="Cactus drink" description="A fresh drink." weight="25" hp="15" type="1" max_per_slot="10"/>
+ <item id="502" image="use-potion-cactuspotion.png" name="Cactus potion" description="A fresh potion." weight="40" hp="25" mp="10" type="1" max_per_slot="10"/>
+ <item id="503" image="generic-casinocoins.png" name="Casino coins" description="Just some casino coins." weight="10" type="0" max_per_slot="10"/>
+ <item id="504" image="use-food-decorcandy.png" name="Decor candy" description="A leftover decor candy from last Christmas." weight="20" type="0" max_per_slot="10"/>
+ <item id="505" image="generic-maggotslime.png" name="Maggot slime" description="Slimy maggot slime." weight="10" type="0" max_per_slot="10"/>
+ <item id="506" image="use-food-candycane.png" name="Candy cane" description="Tasty candy cane." weight="10" hp="10" type="1" max_per_slot="10"/>
+ <item id="507" image="generic-scorpionstinger.png" name="Scorpion stinger" description="A poisoned scorpion stinger." weight="12" type="0" max_per_slot="10"/>
+ <item id="508" image="use-food-xmascake.png" name="Xmas cake" description="A sweet xmas cake." weight="20" hp="10" type="1" max_per_slot="10"/>
+ <item id="509" image="use-food-chocolatebar.png" name="Chocolate bar" description="A chocolate bar made of finest chocolate." weight="25" hp="20" type="1" max_per_slot="10"/>
+ <item id="510" image="use-food-candy.png" name="Candy" description="A sugar-free candy." weight="10" hp="5" type="1" max_per_slot="10"/>
+ <item id="511" image="armor-head-santahat.png" name="Santa hat" description="Ask Santa about this hat." weight="15" defense="2" type="6" max_per_slot="1">
+ <sprite>item010.xml</sprite>
+ </item>
+ <item id="512" image="use-food-gingerbreadman.png" name="Ginger bread man" description="A tasty ginger bread man." weight="30" hp="25" type="1" max_per_slot="10"/>
+ <item id="513" image="use-food-cake.png" name="Cake" description="A slice of cake." weight="25" hp="15" type="1" max_per_slot="10"/>
+ <item id="514" image="use-food-xmascandycane.png" name="Xmas candy cane" description="A special xmas candy cane." weight="15" hp="10" type="1" max_per_slot="10"/>
+ <item id="515" image="generic-purplepresentbox.png" name="Purple present box" description="Something mysterious inside." weight="20" type="0" max_per_slot="10"/>
+ <item id="516" image="generic-bluepresentbox.png" name="Blue present box" description="Something mysterious inside." weight="20" type="0" max_per_slot="10"/>
+ <item id="517" image="generic-redscorpionstinger.png" name="Red scorpion stinger" description="A highly poisoned red scorpion stinger." weight="35" type="0" max_per_slot="10"/>
+ <item id="518" image="generic-bugleg.png" name="Bug leg" description="A bug's leg. Mostly used for alchemy." weight="15" type="0" max_per_slot="10"/>
+ <item id="519" image="use-food-cherrycake.png" name="Cherry cake" description="A nice cherry cake." weight="50" hp="35" type="1" max_per_slot="10"/>
+ <item id="520" image="use-food-easteregg.png" name="Easter egg" description="A surprise." weight="180" hp="100" type="1" max_per_slot="10"/>
+ <item id="521" image="weapon-dagger-dagger.png" name="Dagger" description="A simple Dagger." weight="60" attack="15" range="1" type="2" weapon_type="1" max_per_slot="1">
+ <sprite>weapon-dagger.xml</sprite>
+ <sound event="strike">short-sword-miss1.ogg</sound>
+ <sound event="hit">short-sword-hit1.ogg</sound>
+ </item>
+ <item id="522" image="weapon-dagger-sharpknife.png" name="Sharp knife" description="A really sharp knife Don't hurt yourself!" weight="45" attack="10" range="1" type="2" weapon_type="1" max_per_slot="1" view="521"/>
+ <item id="523" image="armor-chest-leathershirt.png" name="Leather shirt" description="A shirt made of harded leather." weight="30" defense="4" type="4" max_per_slot="1">
+ <sprite gender="male">chest-leather-male.xml</sprite>
+ <sprite gender="female">chest-leather-female.xml</sprite>
+ </item>
+ <item id="524" image="armor-head-fancyhat.png" name="Fancy hat" description="A fancy hat." weight="25" defense="5" type="6" max_per_slot="1">
+ <sprite>item008.xml</sprite>
+ </item>
+ <item id="525" image="armor-head-minershat.png" name="Miners hat" description="A hat used by miners." weight="25" defense="4" type="6" max_per_slot="1">
+ <sprite>item009.xml</sprite>
+ </item>
+ <item id="526" image="generic-coinbag.png" name="Coin bag" description="A bag used to transport coins in it. If you own it you can take more coins with you." weight="20" type="0" max_per_slot="10"/>
+ <item id="527" image="use-food-milk.png" name="Milk" description="A fresh litre of ice cold milk. Note: Cool people drink milk!" weight="300" hp="150" type="1" max_per_slot="10"/>
+ <item id="528" image="armor-feet-boots.png" name="Boots" description="Some robust boots, ideal for traveling." weight="15" defense="2" type="11" max_per_slot="1"/>
+ <item id="529" image="weapon-arrow-iron.png" name="Iron arrow" description="A hard arrow made of iron." weight="12" attack="50" type="12" weapon_type="8" max_per_slot="10"/>
+ <item id="530" image="weapon-bow-shortbow.png" name="Short bow" description="A bow for short distances." weight="210" attack="50" range="5" type="3" weapon_type="10" max_per_slot="1" view="1200"/>
+ <item id="531" image="armor-hands-minergloves.png" name="Miner gloves" description="Gloves used by miners; very useful." weight="10" defense="2" type="5" max_per_slot="1"/>
+ <item id="532" image="armor-hands-leathergloves.png" name="Leather gloves" description="Gloves made of harded leather." weight="25" defense="3" type="5" max_per_slot="1"/>
+ <item id="533" image="use-food-roastedmaggot.png" name="Roasted maggot" description="Maggot roasted on fire." weight="290" hp="150" type="1" max_per_slot="10"/>
+ <item id="534" image="use-food-orangecupcake.png" name="Orange cupcake" description="A very soft orange cupcake." weight="185" hp="100" mp="10" type="1" max_per_slot="10"/>
+ <item id="535" image="use-food-apple.png" name="Apple" description="A healthy apple." weight="70" hp="50" type="1" max_per_slot="10"/>
+ <item id="536" image="weapon-dagger-shortsword.png" name="Short sword" description="A small but sharp sword." weight="1025" attack="100" range="1" type="2" weapon_type="2" max_per_slot="1" view="521"/>
+ <item id="537" image="generic-treasurekey.png" name="Treasure key" description="A rusty key." weight="35" type="0" max_per_slot="10"/>
+ <item id="538" image="generic-greenpresentbox.png" name="Green present box" description="Something mysterious inside." weight="25" type="0" max_per_slot="10"/>
+ <item id="539" image="use-food-beer.png" name="Beer" description="A fresh beer." weight="400" hp="200" type="1" max_per_slot="10"/>
+ <item id="540" image="generic-emptybottle.png" name="Empty bottle" description="An empty bottle." weight="20" type="0" max_per_slot="10"/>
+ <item id="541" image="use-food-bottleofwater.png" name="Bottle of water" description="A bottle of water." weight="495" hp="250" type="1" element="2" max_per_slot="10"/>
+ <item id="542" image="generic-bottleofsand.png" name="Bottle of sand" description="A bottle with sand in it." weight="365" type="0" max_per_slot="10"/>
+ <item id="543" image="armor-head-standardheadband.png" name="Standard headband" description="Just a standard headband." weight="45" defense="1" type="6" max_per_slot="1">
+ <sprite>item007.xml</sprite>
+ </item>
+ <item id="544" image="armor-head-silkheadband.png" name="Silk headband" description="A cool headband made of silk." weight="20" defense="3" type="6" max_per_slot="1">
+ <sprite>item006.xml</sprite>
+ </item>
+ <item id="545" image="weapon-bow-forestbow.png" name="Forest bow" description="A bow usually used to hunt." weight="530" attack="65" range="5" type="3" weapon_type="10" max_per_slot="1" view="1200"/>
+ <item id="546" image="armor-chest-desertshirt.png" name="Desert shirt" description="A shirt suitable for desert trips." weight="50" defense="6" type="4" max_per_slot="1">
+ <sprite>item002.xml</sprite>
+ </item>
+ <item id="547" image="weapon-polearm-bardiche.png" name="Bardiche" description="A Bardiche." weight="10" attack="100" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="548" image="weapon-polearm-halberd.png" name="Halberd" description="A weapon usually carried by guards." weight="10" attack="100" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="549" image="weapon-axe-axe.png" name="Axe" description="An axe." weight="10" attack="100" type="2" weapon_type="15" max_per_slot="1"/>
+ <item id="550" image="weapon-axe-blacksmithsaxe.png" name="Blacksmith's axe" description="An axe usually used by blacksmiths." weight="10" attack="100" type="2" weapon_type="15" max_per_slot="1"/>
+ <item id="551" image="generic-bluehint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="552" image="generic-magentahint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="553" image="generic-yellowhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="554" image="generic-greenhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="555" image="generic-tealhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="556" image="generic-purplehint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="557" image="generic-redhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="558" image="generic-otherbluehint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="559" image="generic-orangehint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="560" image="generic-greyhint.png" name="Hint" description="A hint." weight="10" type="0" max_per_slot="10"/>
+ <item id="561" image="weapon-sword-sabre.png" name="Sabre" description="A sword with a very sharp, curved, single-edged blade." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="562" image="use-food-chickenleg.png" name="Chicken leg" description="A well cooked chicken leg." weight="10" type="0" max_per_slot="10"/>
+ <item id="563" image="armor-hands-wintergloves.png" name="Winter gloves" description="Soft and warm gloves." weight="15" type="5" max_per_slot="1"/>
+ <item id="564" image="armor-chest-tnecksweater.png" name="Turtleneck sweater" description="A soft and warm sweater." weight="40" type="4" max_per_slot="1">
+ <sprite gender="male">chest-tnecksweater-male.xml</sprite>
+ <sprite gender="female">chest-tnecksweater-female.xml</sprite>
+ </item>
+ <item id="565" image="generic-petal.png" name="Petal" description="A petal from an evil flower." weight="10" type="0" max_per_slot="10"/>
+ <item id="566" image="generic-smallmushroom.png" name="Small mushroom" description="A mushroom." weight="10" type="0" max_per_slot="10"/>
+ <item id="567" image="use-potion-ironpotion.png" name="Iron potion" description="Increases your attack strength." weight="295" strength="5" lifetime="60" type="1" max_per_slot="10"/>
+ <item id="568" image="use-potion-concentrationpotion.png" name="Concentration potion" description="Increases your attack speed." weight="295" accuracy="20" lifetime="60" type="1" max_per_slot="10"/>
+ <item id="569" image="generic-rawlog.png" name="Raw log" description="A raw log." weight="10" type="0" max_per_slot="10"/>
+ <item id="570" image="weapon-dagger-boneknife.png" name="Bone knife" description="A knife masterly carved out of a bone." weight="10" attack="50" type="2" weapon_type="1" max_per_slot="1"/>
+ <item id="571" image="weapon-dagger-setzer.png" name="Setzer" description="A knife named after a famous gambler." weight="10" attack="50" type="2" weapon_type="1" max_per_slot="1"/>
+ <item id="572" image="weapon-sword-scimitar.png" name="Scimitar" description="A sword with a heavy, curved, single-edged blade." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="573" image="weapon-sword-falchion.png" name="Falcion" description="A heavy one-handed, single-edged sword." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="574" image="weapon-polearm-scorpion.png" name="Scorpion" description="A well crafted glaive." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="575" image="weapon-bow-desertbow.png" name="Desert bow" description="A tonorian short bow." weight="10" attack="50" type="3" weapon_type="10" max_per_slot="1"/>
+ <item id="576" image="weapon-sword-beheader.png" name="Beheader" description="An oddly designed sword especially made for beheading enemies." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="577" image="weapon-thrown-bonedarts.png" name="Bone darts" description="Some darts made of bones." weight="10" attack="50" type="12" weapon_type="16" max_per_slot="10"/>
+ <item id="578" image="weapon-sword-sandcutter.png" name="Sand cutter" description="A sand cutter." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="579" image="weapon-dagger-rockknive.png" name="Rock knife" description="A knife made of stone." weight="10" attack="300" type="2" weapon_type="1" max_per_slot="1"/>
+ <item id="580" image="weapon-staff-staffoflife.png" name="Staff of life" description="A staff that increases healing magic." weight="10" attack="50" element="5" magic="10" type="2" weapon_type="6" max_per_slot="1"/>
+ <item id="581" image="weapon-staff-crescentrod.png" name="Crescent rod" description="A crescent rod." weight="10" attack="50" type="2" weapon_type="5" max_per_slot="1"/>
+ <item id="582" image="weapon-staff-staffoffire.png" name="Staff of fire" description="A staff that increases fire magic." weight="10" element="1" attack="50" type="2" weapon_type="6" max_per_slot="1"/>
+ <item id="583" image="weapon-staff-staffofice.png" name="Staff of ice" description="A staff that increases ice magic." weight="10" element="2" attack="50" type="2" weapon_type="6" max_per_slot="1"/>
+ <item id="584" image="weapon-sword-jackal.png" name="Jackal" description="A jackal." weight="10" attack="50" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="585" image="armor-hands-scarabarmlet.png" name="Scarab Armlet" description="A scarab armlet." weight="10" defense="50" type="5" max_per_slot="1"/>
+ <item id="586" image="armor-legs-cottonshorts.png" name="Cotton shorts" description="Shorts made of 100% cotton." weight="10" defense="2" type="7" max_per_slot="1">
+ <sprite gender="male">leg-cotton-male.xml</sprite>
+ <sprite gender="female">leg-cotton-female.xml</sprite>
+ </item>
+ <item id="587" image="weapon-sword-sword.png" name="Sword" description="A simple but reliable sword." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="588" image="weapon-sword-bastardsword.png" name="Bastard Sword" description="A large two handed sword." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="589" image="weapon-sword-broadsword.png" name="Broad Sword" description="A two handed sword with a very broad blade." weight="10" type="3" weapon_type="2" max_per_slot="1"/>
+ <item id="590" image="weapon-sword-baselard.png" name="Baselard" description="A short and powerful sword." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="591" image="weapon-sword-longsword.png" name="Long Sword" description="A sword with a long and agile blade." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="592" image="weapon-dagger-stiletto.png" name="Stiletto" description="A dagger with a long and thin blade." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="593" image="weapon-sword-rapier.png" name="Rapier" description="A light sword made for duels." weight="10" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="594" image="weapon-polearm-spear.png" name="Spear" description="A light spear with a wooden pole." weight="10" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="595" image="weapon-polearm-heavyspear.png" name="Heavy Spear" description="A heavy spear with a wooden pole." weight="10" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="596" image="weapon-polearm-pike.png" name="Pike" description="" weight="10" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="597" image="weapon-polearm-heavypike.png" name="Heavy Pike" description="" weight="10" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="598" image="weapon-polearm-dualspear.png" name="Dual Spear" description="A spear with two tops." weight="10" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="599" image="weapon-sword-firesword.png" name="Fire Sword" description="A magical sword enchanted with the power of fire." weight="10" element="1" type="2" weapon_type="2" max_per_slot="1"/>
+ <item id="600" image="armor-shield-britshield.png" name="Brit Shield" description="Legendary shield that is said to save queens and rule waves." weight="10" type="8" max_per_slot="1"/>
+ <item id="601" image="armor-shield-steelshield.png" name="Steel Shield" description="A shield made of steel." weight="10" type="8" max_per_slot="1"/>
+ <item id="602" image="armor-shield-woodenshield.png" name="Wooden Shield" description="A shield made of wood." weight="10" type="8" max_per_slot="1"/>
+ <item id="603" image="armor-shield-leathershield.png" name="Leather Shield" description="A shield made of leather on a wooden frame." weight="10" type="8" max_per_slot="1"/>
+ <item id="604" image="armor-shield-knightshield.png" name="Knight Shield" description="A high quality shield used by knights." weight="10" type="8" max_per_slot="1"/>
+ <item id="605" image="weapon-axe-meatcleaver.png" name="Meat Cleaver" description="A butchers tool that also makes a nice one handed battleaxe." weight="10" type="2" weapon_type="15" max_per_slot="1"/>
+ <item id="606" image="weapon-axe-hatchet.png" name="Hatchet" description="A short one handed axe." weight="10" type="0" max_per_slot="1"/>
+ <item id="607" image="weapon-polearm-trident.png" name="Trident" description="A spear with three heads." weight="10" type="3" weapon_type="3" max_per_slot="1"/>
+ <item id="608" image="armor-shield-bladeshield.png" name="Blade-shield" description="A shield made of blades." weight="10" type="8" max_per_slot="1"/>
+ <item id="609" image="weapon-mace-club.png" name="Club" description="A primitive wooden club." weight="10" type="2" weapon_type="14" max_per_slot="1"/>
+ <item id="610" image="armor-legs-jeanshorts.png" name="Jeans shorts" description="Shorts made of jeans." weight="30" defense="4" type="7" max_per_slot="1">
+ <sprite gender="male">leg-jeans-male.xml</sprite>
+ <sprite gender="female">leg-jeans-female.xml</sprite>
+ </item>
+ <item id="611" image="generic-whitefur.png" name="White fur" description="A patch of white, fluffy fur." weight="10" type="0" max_per_slot="10"/>
+ <item id="612" image="generic-cavesnakelamp.png" name="Cave snake lamp" description="Feeler of a lamp snake that glows in the dark." weight="10" type="0" max_per_slot="10"/>
+ <item id="613" image="generic-hardspike.png" name="Hard spike" description="The hard spike of a slain monster." weight="10" type="0" max_per_slot="10"/>
+ <item id="614" image="generic-pinkantennae.png" name="Pink antennae" description="No-one knows why violets got these antennaes." weight="10" type="0" max_per_slot="10"/>
+ <item id="615" image="armor-head-pumpkinhelmet.png" name="Pumpkin helmet" description="A helmet made out of a pumpkin." weight="30" type="6" max_per_slot="1">
+ <sprite>item011.xml</sprite>
+ </item>
+ <item id="616" image="armor-head-axehat.png" name="Axe hat" description="A really cool joke." weight="20" type="6" max_per_slot="1">
+ <sprite>item012.xml</sprite>
+ </item>
+ <item id="617" image="armor-head-piratehat.png" name="Pirate hat" description="A pirate hat." weight="25" type="6" max_per_slot="1">
+ <sprite>item013.xml</sprite>
+ </item>
+ <item id="618" image="armor-head-goggles.png" name="Goggles" description="Goggles designed to take care of your eyes." weight="20" type="6" max_per_slot="1">
+ <sprite>item014.xml</sprite>
+ </item>
+ <item id="619" image="armor-head-leathergoggles.png" name="Leather goggles" description="Goggles designed for desert storms." weight="25" type="6" max_per_slot="1">
+ <sprite>item015.xml</sprite>
+ </item>
+ <item id="620" image="armor-head-circlet.png" name="Circlet" description="A nice piece of jewelry." weight="35" type="6" max_per_slot="1">
+ <sprite>item016.xml</sprite>
+ </item>
+ <item id="621" image="armor-head-eyepatch.png" name="Eyepatch" description="What really makes you a pirate." weight="15" type="6" max_per_slot="1">
+ <sprite>item017.xml</sprite>
+ </item>
+ <item id="622" image=...
[truncated message content] |
|
From: <Za...@us...> - 2007-10-22 17:27:39
|
Revision: 11
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=11&view=rev
Author: Zaidyer
Date: 2007-10-22 10:27:42 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Added Damasca-related content and begun removing non-critical TMW content.
Modified Paths:
--------------
client/trunk/data/graphics/sprites/player_male_base.xml
client/trunk/data/music/Magick - Real.ogg
server/trunk/data/maps.xml
Added Paths:
-----------
client/trunk/data/graphics/sprites/dtck-playerbase-m1.png
client/trunk/data/graphics/sprites/player_female_base-old.xml
client/trunk/data/graphics/sprites/player_male_base-old.xml
client/trunk/data/graphics/tiles/tile-collision2.png
client/trunk/data/graphics/tiles/zstyle-16x16.png
client/trunk/data/graphics/tiles/zstyle-cliffs.png
client/trunk/data/graphics/tiles/zstyle-landscape1.png
client/trunk/data/graphics/tiles/zstyle-village1.png
client/trunk/data/maps/beta-test1.tmx
client/trunk/data/maps/beta-test1.tmx.gz
client/trunk/data/music/Dureign.ogg
client/trunk/data/music/Theme.ogg
server/trunk/data/maps/beta-test1.tmx.gz
server/trunk/tmw.db
Removed Paths:
-------------
client/trunk/data/graphics/sprites/player_female_base.xml
client/trunk/data/music/Faith.ogg
client/trunk/data/music/Magick - Casino.ogg
client/trunk/data/music/Magick - Small grass.ogg
client/trunk/data/music/Magick - Snow.ogg
client/trunk/data/music/finalman_and_yakslem-cavesong.ogg
Added: client/trunk/data/graphics/sprites/dtck-playerbase-m1.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/sprites/dtck-playerbase-m1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/sprites/player_female_base-old.xml
===================================================================
--- client/trunk/data/graphics/sprites/player_female_base-old.xml (rev 0)
+++ client/trunk/data/graphics/sprites/player_female_base-old.xml 2007-10-22 17:27:42 UTC (rev 11)
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+ <imageset name="base" src="graphics/sprites/player_female_base.png" width="64" height="64" />
+
+ <action name="stand" imageset="base">
+ <animation direction="down">
+ <frame index="0" />
+ </animation>
+ <animation direction="left">
+ <frame index="18" />
+ </animation>
+ <animation direction="up">
+ <frame index="36" />
+ </animation>
+ <animation direction="right">
+ <frame index="54" />
+ </animation>
+ </action>
+
+ <action name="walk" imageset="base">
+ <animation direction="down">
+ <sequence start="1" end="6" delay="75" />
+ </animation>
+ <animation direction="left">
+ <sequence start="19" end="24" delay="75" />
+ </animation>
+ <animation direction="up">
+ <sequence start="37" end="42" delay="75" />
+ </animation>
+ <animation direction="right">
+ <sequence start="55" end="60" delay="75" />
+ </animation>
+ </action>
+
+ <action name="sit" imageset="base">
+ <animation direction="down">
+ <frame index="7" />
+ </animation>
+ <animation direction="left">
+ <frame index="25" />
+ </animation>
+ <animation direction="up">
+ <frame index="43" />
+ </animation>
+ <animation direction="right">
+ <frame index="61" />
+ </animation>
+ </action>
+
+ <action name="dead" imageset="base">
+ <animation direction="down">
+ <frame index="8" />
+ </animation>
+ <animation direction="left">
+ <frame index="26" />
+ </animation>
+ <animation direction="up">
+ <frame index="44" />
+ </animation>
+ <animation direction="right">
+ <frame index="62" />
+ </animation>
+ </action>
+
+ <action name="attack" imageset="base">
+ <animation direction="down">
+ <sequence start="9" end="12" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <sequence start="27" end="30" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <sequence start="45" end="48" delay="75" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <sequence start="63" end="66" delay="75" />
+ <end />
+ </animation>
+ </action>
+
+ <action name="attack_bow" imageset="base">
+ <animation direction="down">
+ <sequence start="13" end="17" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <sequence start="31" end="35" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <sequence start="49" end="53" delay="75" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <sequence start="67" end="71" delay="75" />
+ <end />
+ </animation>
+ </action>
+
+</sprite>
\ No newline at end of file
Deleted: client/trunk/data/graphics/sprites/player_female_base.xml
===================================================================
--- client/trunk/data/graphics/sprites/player_female_base.xml 2007-10-18 20:22:32 UTC (rev 10)
+++ client/trunk/data/graphics/sprites/player_female_base.xml 2007-10-22 17:27:42 UTC (rev 11)
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
- <imageset name="base" src="graphics/sprites/player_female_base.png" width="64" height="64" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" />
- </animation>
- <animation direction="left">
- <frame index="18" />
- </animation>
- <animation direction="up">
- <frame index="36" />
- </animation>
- <animation direction="right">
- <frame index="54" />
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <sequence start="1" end="6" delay="75" />
- </animation>
- <animation direction="left">
- <sequence start="19" end="24" delay="75" />
- </animation>
- <animation direction="up">
- <sequence start="37" end="42" delay="75" />
- </animation>
- <animation direction="right">
- <sequence start="55" end="60" delay="75" />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="7" />
- </animation>
- <animation direction="left">
- <frame index="25" />
- </animation>
- <animation direction="up">
- <frame index="43" />
- </animation>
- <animation direction="right">
- <frame index="61" />
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="down">
- <frame index="8" />
- </animation>
- <animation direction="left">
- <frame index="26" />
- </animation>
- <animation direction="up">
- <frame index="44" />
- </animation>
- <animation direction="right">
- <frame index="62" />
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <sequence start="9" end="12" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <sequence start="27" end="30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <sequence start="45" end="48" delay="75" />
- <end />
- </animation>
- <animation direction="right">
- <sequence start="63" end="66" delay="75" />
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <sequence start="13" end="17" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <sequence start="31" end="35" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <sequence start="49" end="53" delay="75" />
- <end />
- </animation>
- <animation direction="right">
- <sequence start="67" end="71" delay="75" />
- <end />
- </animation>
- </action>
-
-</sprite>
\ No newline at end of file
Added: client/trunk/data/graphics/sprites/player_male_base-old.xml
===================================================================
--- client/trunk/data/graphics/sprites/player_male_base-old.xml (rev 0)
+++ client/trunk/data/graphics/sprites/player_male_base-old.xml 2007-10-22 17:27:42 UTC (rev 11)
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+ <imageset name="base"
+ src= "graphics/sprites/player_male_base.png"
+ width= "64"
+ height= "64"
+ />
+
+ <action name = "stand"
+ imageset = "base"
+ >
+ <animation direction="down">
+ <frame index="0" />
+ </animation>
+ <animation direction="left">
+ <frame index="18" />
+ </animation>
+ <animation direction="up">
+ <frame index="36" />
+ </animation>
+ <animation direction="right">
+ <frame index="54" />
+ </animation>
+ </action>
+
+ <action name="walk" imageset="base">
+ <animation direction="down">
+ <sequence start="1" end="6" delay="75" />
+ </animation>
+ <animation direction="left">
+ <sequence start="19" end="24" delay="75" />
+ </animation>
+ <animation direction="up">
+ <sequence start="37" end="42" delay="75" />
+ </animation>
+ <animation direction="right">
+ <sequence start="55" end="60" delay="75" />
+ </animation>
+ </action>
+
+ <action name="sit" imageset="base">
+ <animation direction="down">
+ <frame index="7" />
+ </animation>
+ <animation direction="left">
+ <frame index="25" />
+ </animation>
+ <animation direction="up">
+ <frame index="43" />
+ </animation>
+ <animation direction="right">
+ <frame index="61" />
+ </animation>
+ </action>
+
+ <action name="dead" imageset="base">
+ <animation direction="down">
+ <frame index="8" />
+ </animation>
+ <animation direction="left">
+ <frame index="26" />
+ </animation>
+ <animation direction="up">
+ <frame index="44" />
+ </animation>
+ <animation direction="right">
+ <frame index="62" />
+ </animation>
+ </action>
+
+ <action name="attack" imageset="base">
+ <animation direction="down">
+ <sequence start="9" end="12" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <sequence start="27" end="30" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <sequence start="45" end="48" delay="75" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <sequence start="63" end="66" delay="75" />
+ <end />
+ </animation>
+ </action>
+
+ <action name="attack_bow" imageset="base">
+ <animation direction="down">
+ <sequence start="13" end="17" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <sequence start="31" end="35" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <sequence start="49" end="53" delay="75" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <sequence start="67" end="71" delay="75" />
+ <end />
+ </animation>
+ </action>
+
+</sprite>
\ No newline at end of file
Modified: client/trunk/data/graphics/sprites/player_male_base.xml
===================================================================
--- client/trunk/data/graphics/sprites/player_male_base.xml 2007-10-18 20:22:32 UTC (rev 10)
+++ client/trunk/data/graphics/sprites/player_male_base.xml 2007-10-22 17:27:42 UTC (rev 11)
@@ -2,9 +2,9 @@
<sprite name="player" action="stand">
<imageset name="base"
- src= "graphics/sprites/player_male_base.png"
+ src= "graphics/sprites/dtck-playerbase-m1.png"
width= "64"
- height= "64"
+ height= "80"
/>
<action name = "stand"
@@ -14,95 +14,95 @@
<frame index="0" />
</animation>
<animation direction="left">
- <frame index="18" />
+ <frame index="30" />
</animation>
<animation direction="up">
- <frame index="36" />
+ <frame index="15" />
</animation>
<animation direction="right">
- <frame index="54" />
+ <frame index="45" />
</animation>
</action>
<action name="walk" imageset="base">
<animation direction="down">
- <sequence start="1" end="6" delay="75" />
+ <sequence start="1" end="4" delay="150" />
</animation>
<animation direction="left">
- <sequence start="19" end="24" delay="75" />
+ <sequence start="31" end="34" delay="150" />
</animation>
<animation direction="up">
- <sequence start="37" end="42" delay="75" />
+ <sequence start="16" end="19" delay="150" />
</animation>
<animation direction="right">
- <sequence start="55" end="60" delay="75" />
+ <sequence start="46" end="49" delay="150" />
</animation>
</action>
<action name="sit" imageset="base">
<animation direction="down">
- <frame index="7" />
+ <frame index="0" />
</animation>
<animation direction="left">
- <frame index="25" />
+ <frame index="0" />
</animation>
<animation direction="up">
- <frame index="43" />
+ <frame index="0" />
</animation>
<animation direction="right">
- <frame index="61" />
+ <frame index="0" />
</animation>
</action>
<action name="dead" imageset="base">
<animation direction="down">
- <frame index="8" />
+ <frame index="43" />
</animation>
<animation direction="left">
- <frame index="26" />
+ <frame index="43" />
</animation>
<animation direction="up">
- <frame index="44" />
+ <frame index="58" />
</animation>
<animation direction="right">
- <frame index="62" />
+ <frame index="58" />
</animation>
</action>
<action name="attack" imageset="base">
<animation direction="down">
- <sequence start="9" end="12" delay="75" />
+ <sequence start="5" end="7" delay="75" />
<end />
</animation>
<animation direction="left">
- <sequence start="27" end="30" delay="75" />
+ <sequence start="30" end="32" delay="75" />
<end />
</animation>
<animation direction="up">
- <sequence start="45" end="48" delay="75" />
+ <sequence start="20" end="22" delay="75" />
<end />
</animation>
<animation direction="right">
- <sequence start="63" end="66" delay="75" />
+ <sequence start="50" end="52" delay="75" />
<end />
</animation>
</action>
<action name="attack_bow" imageset="base">
<animation direction="down">
- <sequence start="13" end="17" delay="75" />
+ <sequence start="0" end="1" delay="75" />
<end />
</animation>
<animation direction="left">
- <sequence start="31" end="35" delay="75" />
+ <sequence start="0" end="1" delay="75" />
<end />
</animation>
<animation direction="up">
- <sequence start="49" end="53" delay="75" />
+ <sequence start="0" end="1" delay="75" />
<end />
</animation>
<animation direction="right">
- <sequence start="67" end="71" delay="75" />
+ <sequence start="0" end="1" delay="75" />
<end />
</animation>
</action>
Added: client/trunk/data/graphics/tiles/tile-collision2.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/tiles/tile-collision2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/tiles/zstyle-16x16.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/tiles/zstyle-16x16.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/tiles/zstyle-cliffs.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/tiles/zstyle-cliffs.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/tiles/zstyle-landscape1.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/tiles/zstyle-landscape1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/graphics/tiles/zstyle-village1.png
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/graphics/tiles/zstyle-village1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/maps/beta-test1.tmx
===================================================================
--- client/trunk/data/maps/beta-test1.tmx (rev 0)
+++ client/trunk/data/maps/beta-test1.tmx 2007-10-22 17:27:42 UTC (rev 11)
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<map version="0.99b" orientation="orthogonal" width="32" height="32" tilewidth="32" tileheight="32">
+ <properties>
+ <property name="music" value="dureign.ogg"/>
+ </properties>
+ <tileset name="Landscape" firstgid="1" tilewidth="32" tileheight="32">
+ <image source="../graphics/tiles/zstyle-landscape1.png"/>
+ </tileset>
+ <tileset name="Collision" firstgid="257" tilewidth="32" tileheight="32">
+ <image source="../graphics/tiles/tile-collision2.png"/>
+ </tileset>
+ <layer name="Layer 0" width="32" height="32">
+ <data encoding="base64" compression="gzip">
+ H4sIAAAAAAAAAGNiYGBgGsVDAl8G4isDaP9jIH5CJ7t8gNgXj7wYlTAu82OAOJZMu3GppSQ80M0h5A9q2InPXmLVk2I+reOUXH9Ty0xyw3wg7EYWmwjEkwbIbhBeCMSLBiAsRjEq3gjEmwbQ/oNAfGgQhMMoHsWjeBSP4lE81DEAqYwWKAAQAAA=
+ </data>
+ </layer>
+ <layer name="Layer 1" width="32" height="32">
+ <data encoding="base64" compression="gzip">
+ H4sIAAAAAAAAAO3BAQ0AAADCoPdPbQ8HFAAAAPBuEQAcxwAQAAA=
+ </data>
+ </layer>
+ <layer name="Layer 2" width="32" height="32">
+ <data encoding="base64" compression="gzip">
+ H4sIAAAAAAAAAO3BAQ0AAADCoPdPbQ8HFAAAAPBuEQAcxwAQAAA=
+ </data>
+ </layer>
+ <layer name="Layer 3" width="32" height="32">
+ <data encoding="base64" compression="gzip">
+ H4sIAAAAAAAAAO3U0QnAIAxF0by6gV2h3aBuovuvYqAjCL4W7oF8349EI/AXlyJu+foj231TX3rHxd0HvsL97zzZbrxFuyN3UIx7qNk+uQMAAJZNrXUR7QAQAAA=
+ </data>
+ </layer>
+</map>
Added: client/trunk/data/maps/beta-test1.tmx.gz
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/maps/beta-test1.tmx.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: client/trunk/data/music/Dureign.ogg
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/music/Dureign.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: client/trunk/data/music/Faith.ogg
===================================================================
(Binary files differ)
Deleted: client/trunk/data/music/Magick - Casino.ogg
===================================================================
(Binary files differ)
Modified: client/trunk/data/music/Magick - Real.ogg
===================================================================
(Binary files differ)
Deleted: client/trunk/data/music/Magick - Small grass.ogg
===================================================================
(Binary files differ)
Deleted: client/trunk/data/music/Magick - Snow.ogg
===================================================================
(Binary files differ)
Added: client/trunk/data/music/Theme.ogg
===================================================================
(Binary files differ)
Property changes on: client/trunk/data/music/Theme.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: client/trunk/data/music/finalman_and_yakslem-cavesong.ogg
===================================================================
(Binary files differ)
Added: server/trunk/data/maps/beta-test1.tmx.gz
===================================================================
(Binary files differ)
Property changes on: server/trunk/data/maps/beta-test1.tmx.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: server/trunk/data/maps.xml
===================================================================
--- server/trunk/data/maps.xml 2007-10-18 20:22:32 UTC (rev 10)
+++ server/trunk/data/maps.xml 2007-10-22 17:27:42 UTC (rev 11)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<maps>
- <map id="1" name="new_1-1"/>
+ <map id="1" name="beta-test1"/>
<map id="2" name="new_2-1"/>
<map id="3" name="new_3-1"/>
<map id="4" name="new_4-1"/>
Added: server/trunk/tmw.db
===================================================================
(Binary files differ)
Property changes on: server/trunk/tmw.db
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cru...@us...> - 2007-10-18 20:22:29
|
Revision: 10
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=10&view=rev
Author: crush_tmw
Date: 2007-10-18 13:22:32 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
Merged changes from main TMW version up to revision 3630 and set svn:keyword and svn:eol-style file properties for sourcecode files.
Revision Links:
--------------
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=3630&view=rev
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/data/items.xml
client/trunk/data/monsters.xml
client/trunk/po/LINGUAS
client/trunk/src/CMakeLists.txt
client/trunk/src/Makefile.am
client/trunk/src/animatedsprite.cpp
client/trunk/src/animatedsprite.h
client/trunk/src/animationparticle.cpp
client/trunk/src/animationparticle.h
client/trunk/src/being.cpp
client/trunk/src/being.h
client/trunk/src/beingmanager.cpp
client/trunk/src/beingmanager.h
client/trunk/src/channel.cpp
client/trunk/src/channel.h
client/trunk/src/channelmanager.cpp
client/trunk/src/channelmanager.h
client/trunk/src/configlistener.h
client/trunk/src/configuration.cpp
client/trunk/src/configuration.h
client/trunk/src/engine.cpp
client/trunk/src/engine.h
client/trunk/src/equipment.cpp
client/trunk/src/equipment.h
client/trunk/src/floor_item.cpp
client/trunk/src/floor_item.h
client/trunk/src/flooritemmanager.cpp
client/trunk/src/flooritemmanager.h
client/trunk/src/game.cpp
client/trunk/src/game.h
client/trunk/src/graphics.cpp
client/trunk/src/graphics.h
client/trunk/src/gui/box.cpp
client/trunk/src/gui/box.h
client/trunk/src/gui/browserbox.cpp
client/trunk/src/gui/browserbox.h
client/trunk/src/gui/buddywindow.cpp
client/trunk/src/gui/buddywindow.h
client/trunk/src/gui/button.cpp
client/trunk/src/gui/button.h
client/trunk/src/gui/buy.cpp
client/trunk/src/gui/buy.h
client/trunk/src/gui/buysell.cpp
client/trunk/src/gui/buysell.h
client/trunk/src/gui/char_select.cpp
client/trunk/src/gui/char_select.h
client/trunk/src/gui/chargedialog.cpp
client/trunk/src/gui/chargedialog.h
client/trunk/src/gui/chat.cpp
client/trunk/src/gui/chat.h
client/trunk/src/gui/chatinput.cpp
client/trunk/src/gui/chatinput.h
client/trunk/src/gui/checkbox.cpp
client/trunk/src/gui/checkbox.h
client/trunk/src/gui/confirm_dialog.cpp
client/trunk/src/gui/confirm_dialog.h
client/trunk/src/gui/connection.cpp
client/trunk/src/gui/connection.h
client/trunk/src/gui/debugwindow.cpp
client/trunk/src/gui/debugwindow.h
client/trunk/src/gui/equipmentwindow.cpp
client/trunk/src/gui/equipmentwindow.h
client/trunk/src/gui/focushandler.cpp
client/trunk/src/gui/focushandler.h
client/trunk/src/gui/gccontainer.cpp
client/trunk/src/gui/gccontainer.h
client/trunk/src/gui/gui.cpp
client/trunk/src/gui/gui.h
client/trunk/src/gui/hbox.cpp
client/trunk/src/gui/hbox.h
client/trunk/src/gui/help.cpp
client/trunk/src/gui/help.h
client/trunk/src/gui/inttextbox.cpp
client/trunk/src/gui/inttextbox.h
client/trunk/src/gui/inventorywindow.cpp
client/trunk/src/gui/inventorywindow.h
client/trunk/src/gui/item_amount.cpp
client/trunk/src/gui/item_amount.h
client/trunk/src/gui/itemcontainer.cpp
client/trunk/src/gui/itemcontainer.h
client/trunk/src/gui/itemshortcutcontainer.cpp
client/trunk/src/gui/itemshortcutcontainer.h
client/trunk/src/gui/itemshortcutwindow.cpp
client/trunk/src/gui/itemshortcutwindow.h
client/trunk/src/gui/linkhandler.h
client/trunk/src/gui/listbox.cpp
client/trunk/src/gui/listbox.h
client/trunk/src/gui/login.cpp
client/trunk/src/gui/login.h
client/trunk/src/gui/menuwindow.cpp
client/trunk/src/gui/menuwindow.h
client/trunk/src/gui/minimap.cpp
client/trunk/src/gui/minimap.h
client/trunk/src/gui/ministatus.cpp
client/trunk/src/gui/ministatus.h
client/trunk/src/gui/newskill.cpp
client/trunk/src/gui/newskill.h
client/trunk/src/gui/npc_text.cpp
client/trunk/src/gui/npc_text.h
client/trunk/src/gui/npclistdialog.cpp
client/trunk/src/gui/npclistdialog.h
client/trunk/src/gui/ok_dialog.cpp
client/trunk/src/gui/ok_dialog.h
client/trunk/src/gui/passwordfield.cpp
client/trunk/src/gui/passwordfield.h
client/trunk/src/gui/playerbox.cpp
client/trunk/src/gui/playerbox.h
client/trunk/src/gui/popupmenu.cpp
client/trunk/src/gui/popupmenu.h
client/trunk/src/gui/progressbar.cpp
client/trunk/src/gui/progressbar.h
client/trunk/src/gui/quitdialog.cpp
client/trunk/src/gui/quitdialog.h
client/trunk/src/gui/radiobutton.cpp
client/trunk/src/gui/radiobutton.h
client/trunk/src/gui/register.cpp
client/trunk/src/gui/register.h
client/trunk/src/gui/scrollarea.cpp
client/trunk/src/gui/scrollarea.h
client/trunk/src/gui/sdlinput.cpp
client/trunk/src/gui/sdlinput.h
client/trunk/src/gui/selectionlistener.h
client/trunk/src/gui/sell.cpp
client/trunk/src/gui/sell.h
client/trunk/src/gui/serverdialog.cpp
client/trunk/src/gui/serverdialog.h
client/trunk/src/gui/setup.cpp
client/trunk/src/gui/setup.h
client/trunk/src/gui/setup_audio.cpp
client/trunk/src/gui/setup_audio.h
client/trunk/src/gui/setup_joystick.cpp
client/trunk/src/gui/setup_joystick.h
client/trunk/src/gui/setup_keyboard.cpp
client/trunk/src/gui/setup_keyboard.h
client/trunk/src/gui/setup_video.cpp
client/trunk/src/gui/setup_video.h
client/trunk/src/gui/setuptab.h
client/trunk/src/gui/shop.cpp
client/trunk/src/gui/shop.h
client/trunk/src/gui/shoplistbox.cpp
client/trunk/src/gui/shoplistbox.h
client/trunk/src/gui/skill.cpp
client/trunk/src/gui/skill.h
client/trunk/src/gui/slider.cpp
client/trunk/src/gui/slider.h
client/trunk/src/gui/status.cpp
client/trunk/src/gui/status.h
client/trunk/src/gui/tabbedcontainer.cpp
client/trunk/src/gui/tabbedcontainer.h
client/trunk/src/gui/textbox.cpp
client/trunk/src/gui/textbox.h
client/trunk/src/gui/textfield.cpp
client/trunk/src/gui/textfield.h
client/trunk/src/gui/trade.cpp
client/trunk/src/gui/trade.h
client/trunk/src/gui/truetypefont.cpp
client/trunk/src/gui/truetypefont.h
client/trunk/src/gui/unregisterdialog.cpp
client/trunk/src/gui/unregisterdialog.h
client/trunk/src/gui/updatewindow.cpp
client/trunk/src/gui/updatewindow.h
client/trunk/src/gui/vbox.cpp
client/trunk/src/gui/vbox.h
client/trunk/src/gui/viewport.cpp
client/trunk/src/gui/viewport.h
client/trunk/src/gui/widgets/dropdown.cpp
client/trunk/src/gui/widgets/dropdown.h
client/trunk/src/gui/widgets/resizegrip.cpp
client/trunk/src/gui/widgets/resizegrip.h
client/trunk/src/gui/window.cpp
client/trunk/src/gui/window.h
client/trunk/src/gui/windowcontainer.cpp
client/trunk/src/gui/windowcontainer.h
client/trunk/src/gui/windowlistener.h
client/trunk/src/guichanfwd.h
client/trunk/src/imageparticle.cpp
client/trunk/src/imageparticle.h
client/trunk/src/inventory.cpp
client/trunk/src/inventory.h
client/trunk/src/item.cpp
client/trunk/src/item.h
client/trunk/src/itemshortcut.cpp
client/trunk/src/itemshortcut.h
client/trunk/src/joystick.cpp
client/trunk/src/joystick.h
client/trunk/src/keyboardconfig.cpp
client/trunk/src/keyboardconfig.h
client/trunk/src/localplayer.cpp
client/trunk/src/localplayer.h
client/trunk/src/lockedarray.h
client/trunk/src/log.cpp
client/trunk/src/log.h
client/trunk/src/logindata.h
client/trunk/src/main.cpp
client/trunk/src/main.h
client/trunk/src/map.cpp
client/trunk/src/map.h
client/trunk/src/monster.cpp
client/trunk/src/monster.h
client/trunk/src/net/accountserver/account.cpp
client/trunk/src/net/accountserver/account.h
client/trunk/src/net/accountserver/accountserver.cpp
client/trunk/src/net/accountserver/accountserver.h
client/trunk/src/net/accountserver/internal.cpp
client/trunk/src/net/accountserver/internal.h
client/trunk/src/net/beinghandler.cpp
client/trunk/src/net/beinghandler.h
client/trunk/src/net/buysellhandler.cpp
client/trunk/src/net/buysellhandler.h
client/trunk/src/net/charserverhandler.cpp
client/trunk/src/net/charserverhandler.h
client/trunk/src/net/chathandler.cpp
client/trunk/src/net/chathandler.h
client/trunk/src/net/chatserver/chatserver.cpp
client/trunk/src/net/chatserver/chatserver.h
client/trunk/src/net/chatserver/internal.cpp
client/trunk/src/net/chatserver/internal.h
client/trunk/src/net/connection.cpp
client/trunk/src/net/connection.h
client/trunk/src/net/gameserver/gameserver.cpp
client/trunk/src/net/gameserver/gameserver.h
client/trunk/src/net/gameserver/internal.cpp
client/trunk/src/net/gameserver/internal.h
client/trunk/src/net/gameserver/player.cpp
client/trunk/src/net/gameserver/player.h
client/trunk/src/net/internal.cpp
client/trunk/src/net/internal.h
client/trunk/src/net/inventoryhandler.cpp
client/trunk/src/net/inventoryhandler.h
client/trunk/src/net/itemhandler.cpp
client/trunk/src/net/itemhandler.h
client/trunk/src/net/loginhandler.cpp
client/trunk/src/net/loginhandler.h
client/trunk/src/net/logouthandler.cpp
client/trunk/src/net/logouthandler.h
client/trunk/src/net/messagehandler.cpp
client/trunk/src/net/messagehandler.h
client/trunk/src/net/messagein.cpp
client/trunk/src/net/messagein.h
client/trunk/src/net/messageout.cpp
client/trunk/src/net/messageout.h
client/trunk/src/net/network.cpp
client/trunk/src/net/network.h
client/trunk/src/net/npchandler.cpp
client/trunk/src/net/npchandler.h
client/trunk/src/net/playerhandler.cpp
client/trunk/src/net/playerhandler.h
client/trunk/src/net/protocol.h
client/trunk/src/net/skillhandler.cpp
client/trunk/src/net/skillhandler.h
client/trunk/src/net/tradehandler.cpp
client/trunk/src/net/tradehandler.h
client/trunk/src/npc.cpp
client/trunk/src/npc.h
client/trunk/src/openglgraphics.cpp
client/trunk/src/openglgraphics.h
client/trunk/src/particle.cpp
client/trunk/src/particle.h
client/trunk/src/particleemitter.cpp
client/trunk/src/particleemitter.h
client/trunk/src/player.cpp
client/trunk/src/player.h
client/trunk/src/properties.h
client/trunk/src/resources/action.cpp
client/trunk/src/resources/action.h
client/trunk/src/resources/ambientoverlay.cpp
client/trunk/src/resources/ambientoverlay.h
client/trunk/src/resources/animation.cpp
client/trunk/src/resources/animation.h
client/trunk/src/resources/buddylist.cpp
client/trunk/src/resources/buddylist.h
client/trunk/src/resources/image.cpp
client/trunk/src/resources/image.h
client/trunk/src/resources/imageloader.cpp
client/trunk/src/resources/imageloader.h
client/trunk/src/resources/imageset.cpp
client/trunk/src/resources/imageset.h
client/trunk/src/resources/imagewriter.cpp
client/trunk/src/resources/imagewriter.h
client/trunk/src/resources/itemdb.cpp
client/trunk/src/resources/itemdb.h
client/trunk/src/resources/iteminfo.cpp
client/trunk/src/resources/iteminfo.h
client/trunk/src/resources/mapreader.cpp
client/trunk/src/resources/mapreader.h
client/trunk/src/resources/monsterdb.cpp
client/trunk/src/resources/monsterdb.h
client/trunk/src/resources/monsterinfo.cpp
client/trunk/src/resources/monsterinfo.h
client/trunk/src/resources/music.cpp
client/trunk/src/resources/music.h
client/trunk/src/resources/resource.cpp
client/trunk/src/resources/resource.h
client/trunk/src/resources/resourcemanager.cpp
client/trunk/src/resources/resourcemanager.h
client/trunk/src/resources/soundeffect.cpp
client/trunk/src/resources/soundeffect.h
client/trunk/src/resources/spritedef.cpp
client/trunk/src/resources/spritedef.h
client/trunk/src/serverinfo.h
client/trunk/src/simpleanimation.cpp
client/trunk/src/simpleanimation.h
client/trunk/src/sound.cpp
client/trunk/src/sound.h
client/trunk/src/sprite.h
client/trunk/src/textparticle.cpp
client/trunk/src/textparticle.h
client/trunk/src/tileset.h
client/trunk/src/tmw.rc
client/trunk/src/utils/base64.cpp
client/trunk/src/utils/base64.h
client/trunk/src/utils/dtor.h
client/trunk/src/utils/fastsqrt.h
client/trunk/src/utils/gettext.h
client/trunk/src/utils/minmax.h
client/trunk/src/utils/strprintf.cpp
client/trunk/src/utils/strprintf.h
client/trunk/src/utils/tostring.h
client/trunk/src/utils/trim.h
client/trunk/src/utils/wingettimeofday.h
client/trunk/src/utils/xml.cpp
client/trunk/src/utils/xml.h
client/trunk/src/vector.h
client/trunk/src/winver.h
Added Paths:
-----------
client/trunk/po/nl.po
Property Changed:
----------------
client/trunk/src/CMakeLists.txt
client/trunk/src/Makefile.am
client/trunk/src/animatedsprite.cpp
client/trunk/src/animatedsprite.h
client/trunk/src/animationparticle.cpp
client/trunk/src/animationparticle.h
client/trunk/src/being.cpp
client/trunk/src/being.h
client/trunk/src/beingmanager.cpp
client/trunk/src/beingmanager.h
client/trunk/src/channel.cpp
client/trunk/src/channel.h
client/trunk/src/channelmanager.cpp
client/trunk/src/channelmanager.h
client/trunk/src/configlistener.h
client/trunk/src/configuration.cpp
client/trunk/src/configuration.h
client/trunk/src/engine.cpp
client/trunk/src/engine.h
client/trunk/src/equipment.cpp
client/trunk/src/equipment.h
client/trunk/src/floor_item.cpp
client/trunk/src/floor_item.h
client/trunk/src/flooritemmanager.cpp
client/trunk/src/flooritemmanager.h
client/trunk/src/game.cpp
client/trunk/src/game.h
client/trunk/src/graphics.cpp
client/trunk/src/graphics.h
client/trunk/src/gui/box.cpp
client/trunk/src/gui/box.h
client/trunk/src/gui/browserbox.cpp
client/trunk/src/gui/browserbox.h
client/trunk/src/gui/buddywindow.cpp
client/trunk/src/gui/buddywindow.h
client/trunk/src/gui/button.cpp
client/trunk/src/gui/button.h
client/trunk/src/gui/buy.cpp
client/trunk/src/gui/buy.h
client/trunk/src/gui/buysell.cpp
client/trunk/src/gui/buysell.h
client/trunk/src/gui/char_select.cpp
client/trunk/src/gui/char_select.h
client/trunk/src/gui/chargedialog.cpp
client/trunk/src/gui/chargedialog.h
client/trunk/src/gui/chat.cpp
client/trunk/src/gui/chat.h
client/trunk/src/gui/chatinput.cpp
client/trunk/src/gui/chatinput.h
client/trunk/src/gui/checkbox.cpp
client/trunk/src/gui/checkbox.h
client/trunk/src/gui/confirm_dialog.cpp
client/trunk/src/gui/confirm_dialog.h
client/trunk/src/gui/connection.cpp
client/trunk/src/gui/connection.h
client/trunk/src/gui/debugwindow.cpp
client/trunk/src/gui/debugwindow.h
client/trunk/src/gui/equipmentwindow.cpp
client/trunk/src/gui/equipmentwindow.h
client/trunk/src/gui/focushandler.cpp
client/trunk/src/gui/focushandler.h
client/trunk/src/gui/gccontainer.cpp
client/trunk/src/gui/gccontainer.h
client/trunk/src/gui/gui.cpp
client/trunk/src/gui/gui.h
client/trunk/src/gui/hbox.cpp
client/trunk/src/gui/hbox.h
client/trunk/src/gui/help.cpp
client/trunk/src/gui/help.h
client/trunk/src/gui/inttextbox.cpp
client/trunk/src/gui/inttextbox.h
client/trunk/src/gui/inventorywindow.cpp
client/trunk/src/gui/inventorywindow.h
client/trunk/src/gui/item_amount.cpp
client/trunk/src/gui/item_amount.h
client/trunk/src/gui/itemcontainer.cpp
client/trunk/src/gui/itemcontainer.h
client/trunk/src/gui/itemshortcutcontainer.cpp
client/trunk/src/gui/itemshortcutcontainer.h
client/trunk/src/gui/itemshortcutwindow.cpp
client/trunk/src/gui/itemshortcutwindow.h
client/trunk/src/gui/linkhandler.h
client/trunk/src/gui/listbox.cpp
client/trunk/src/gui/listbox.h
client/trunk/src/gui/login.cpp
client/trunk/src/gui/login.h
client/trunk/src/gui/menuwindow.cpp
client/trunk/src/gui/menuwindow.h
client/trunk/src/gui/minimap.cpp
client/trunk/src/gui/minimap.h
client/trunk/src/gui/ministatus.cpp
client/trunk/src/gui/ministatus.h
client/trunk/src/gui/newskill.cpp
client/trunk/src/gui/newskill.h
client/trunk/src/gui/npc_text.cpp
client/trunk/src/gui/npc_text.h
client/trunk/src/gui/npclistdialog.cpp
client/trunk/src/gui/npclistdialog.h
client/trunk/src/gui/ok_dialog.cpp
client/trunk/src/gui/ok_dialog.h
client/trunk/src/gui/passwordfield.cpp
client/trunk/src/gui/passwordfield.h
client/trunk/src/gui/playerbox.cpp
client/trunk/src/gui/playerbox.h
client/trunk/src/gui/popupmenu.cpp
client/trunk/src/gui/popupmenu.h
client/trunk/src/gui/progressbar.cpp
client/trunk/src/gui/progressbar.h
client/trunk/src/gui/quitdialog.cpp
client/trunk/src/gui/quitdialog.h
client/trunk/src/gui/radiobutton.cpp
client/trunk/src/gui/radiobutton.h
client/trunk/src/gui/register.cpp
client/trunk/src/gui/register.h
client/trunk/src/gui/scrollarea.cpp
client/trunk/src/gui/scrollarea.h
client/trunk/src/gui/sdlinput.cpp
client/trunk/src/gui/sdlinput.h
client/trunk/src/gui/selectionlistener.h
client/trunk/src/gui/sell.cpp
client/trunk/src/gui/sell.h
client/trunk/src/gui/serverdialog.cpp
client/trunk/src/gui/serverdialog.h
client/trunk/src/gui/setup.cpp
client/trunk/src/gui/setup.h
client/trunk/src/gui/setup_audio.cpp
client/trunk/src/gui/setup_audio.h
client/trunk/src/gui/setup_joystick.cpp
client/trunk/src/gui/setup_joystick.h
client/trunk/src/gui/setup_keyboard.cpp
client/trunk/src/gui/setup_keyboard.h
client/trunk/src/gui/setup_video.cpp
client/trunk/src/gui/setup_video.h
client/trunk/src/gui/setuptab.h
client/trunk/src/gui/shop.cpp
client/trunk/src/gui/shop.h
client/trunk/src/gui/shoplistbox.cpp
client/trunk/src/gui/shoplistbox.h
client/trunk/src/gui/skill.cpp
client/trunk/src/gui/skill.h
client/trunk/src/gui/slider.cpp
client/trunk/src/gui/slider.h
client/trunk/src/gui/status.cpp
client/trunk/src/gui/status.h
client/trunk/src/gui/tabbedcontainer.cpp
client/trunk/src/gui/tabbedcontainer.h
client/trunk/src/gui/textbox.cpp
client/trunk/src/gui/textbox.h
client/trunk/src/gui/textfield.cpp
client/trunk/src/gui/textfield.h
client/trunk/src/gui/trade.cpp
client/trunk/src/gui/trade.h
client/trunk/src/gui/truetypefont.cpp
client/trunk/src/gui/truetypefont.h
client/trunk/src/gui/unregisterdialog.cpp
client/trunk/src/gui/unregisterdialog.h
client/trunk/src/gui/updatewindow.cpp
client/trunk/src/gui/updatewindow.h
client/trunk/src/gui/vbox.cpp
client/trunk/src/gui/vbox.h
client/trunk/src/gui/viewport.cpp
client/trunk/src/gui/viewport.h
client/trunk/src/gui/widgets/dropdown.cpp
client/trunk/src/gui/widgets/dropdown.h
client/trunk/src/gui/widgets/resizegrip.cpp
client/trunk/src/gui/widgets/resizegrip.h
client/trunk/src/gui/window.cpp
client/trunk/src/gui/window.h
client/trunk/src/gui/windowcontainer.cpp
client/trunk/src/gui/windowcontainer.h
client/trunk/src/gui/windowlistener.h
client/trunk/src/guichanfwd.h
client/trunk/src/imageparticle.cpp
client/trunk/src/imageparticle.h
client/trunk/src/inventory.cpp
client/trunk/src/inventory.h
client/trunk/src/item.cpp
client/trunk/src/item.h
client/trunk/src/itemshortcut.cpp
client/trunk/src/itemshortcut.h
client/trunk/src/joystick.cpp
client/trunk/src/joystick.h
client/trunk/src/keyboardconfig.cpp
client/trunk/src/keyboardconfig.h
client/trunk/src/localplayer.cpp
client/trunk/src/localplayer.h
client/trunk/src/lockedarray.h
client/trunk/src/log.cpp
client/trunk/src/log.h
client/trunk/src/logindata.h
client/trunk/src/main.cpp
client/trunk/src/main.h
client/trunk/src/map.cpp
client/trunk/src/map.h
client/trunk/src/monster.cpp
client/trunk/src/monster.h
client/trunk/src/net/accountserver/account.cpp
client/trunk/src/net/accountserver/account.h
client/trunk/src/net/accountserver/accountserver.cpp
client/trunk/src/net/accountserver/accountserver.h
client/trunk/src/net/accountserver/internal.cpp
client/trunk/src/net/accountserver/internal.h
client/trunk/src/net/beinghandler.cpp
client/trunk/src/net/beinghandler.h
client/trunk/src/net/buysellhandler.cpp
client/trunk/src/net/buysellhandler.h
client/trunk/src/net/charserverhandler.cpp
client/trunk/src/net/charserverhandler.h
client/trunk/src/net/chathandler.cpp
client/trunk/src/net/chathandler.h
client/trunk/src/net/chatserver/chatserver.cpp
client/trunk/src/net/chatserver/chatserver.h
client/trunk/src/net/chatserver/internal.cpp
client/trunk/src/net/chatserver/internal.h
client/trunk/src/net/connection.cpp
client/trunk/src/net/connection.h
client/trunk/src/net/gameserver/gameserver.cpp
client/trunk/src/net/gameserver/gameserver.h
client/trunk/src/net/gameserver/internal.cpp
client/trunk/src/net/gameserver/internal.h
client/trunk/src/net/gameserver/player.cpp
client/trunk/src/net/gameserver/player.h
client/trunk/src/net/internal.cpp
client/trunk/src/net/internal.h
client/trunk/src/net/inventoryhandler.cpp
client/trunk/src/net/inventoryhandler.h
client/trunk/src/net/itemhandler.cpp
client/trunk/src/net/itemhandler.h
client/trunk/src/net/loginhandler.cpp
client/trunk/src/net/loginhandler.h
client/trunk/src/net/logouthandler.cpp
client/trunk/src/net/logouthandler.h
client/trunk/src/net/messagehandler.cpp
client/trunk/src/net/messagehandler.h
client/trunk/src/net/messagein.cpp
client/trunk/src/net/messagein.h
client/trunk/src/net/messageout.cpp
client/trunk/src/net/messageout.h
client/trunk/src/net/network.cpp
client/trunk/src/net/network.h
client/trunk/src/net/npchandler.cpp
client/trunk/src/net/npchandler.h
client/trunk/src/net/playerhandler.cpp
client/trunk/src/net/playerhandler.h
client/trunk/src/net/protocol.h
client/trunk/src/net/skillhandler.cpp
client/trunk/src/net/skillhandler.h
client/trunk/src/net/tradehandler.cpp
client/trunk/src/net/tradehandler.h
client/trunk/src/npc.cpp
client/trunk/src/npc.h
client/trunk/src/openglgraphics.cpp
client/trunk/src/openglgraphics.h
client/trunk/src/particle.cpp
client/trunk/src/particle.h
client/trunk/src/particleemitter.cpp
client/trunk/src/particleemitter.h
client/trunk/src/player.cpp
client/trunk/src/player.h
client/trunk/src/properties.h
client/trunk/src/resources/action.cpp
client/trunk/src/resources/action.h
client/trunk/src/resources/ambientoverlay.cpp
client/trunk/src/resources/ambientoverlay.h
client/trunk/src/resources/animation.cpp
client/trunk/src/resources/animation.h
client/trunk/src/resources/buddylist.cpp
client/trunk/src/resources/buddylist.h
client/trunk/src/resources/image.cpp
client/trunk/src/resources/image.h
client/trunk/src/resources/imageloader.cpp
client/trunk/src/resources/imageloader.h
client/trunk/src/resources/imageset.cpp
client/trunk/src/resources/imageset.h
client/trunk/src/resources/imagewriter.cpp
client/trunk/src/resources/imagewriter.h
client/trunk/src/resources/itemdb.cpp
client/trunk/src/resources/itemdb.h
client/trunk/src/resources/iteminfo.cpp
client/trunk/src/resources/iteminfo.h
client/trunk/src/resources/mapreader.cpp
client/trunk/src/resources/mapreader.h
client/trunk/src/resources/monsterdb.cpp
client/trunk/src/resources/monsterdb.h
client/trunk/src/resources/monsterinfo.cpp
client/trunk/src/resources/monsterinfo.h
client/trunk/src/resources/music.cpp
client/trunk/src/resources/music.h
client/trunk/src/resources/resource.cpp
client/trunk/src/resources/resource.h
client/trunk/src/resources/resourcemanager.cpp
client/trunk/src/resources/resourcemanager.h
client/trunk/src/resources/soundeffect.cpp
client/trunk/src/resources/soundeffect.h
client/trunk/src/resources/spritedef.cpp
client/trunk/src/resources/spritedef.h
client/trunk/src/serverinfo.h
client/trunk/src/simpleanimation.cpp
client/trunk/src/simpleanimation.h
client/trunk/src/sound.cpp
client/trunk/src/sound.h
client/trunk/src/sprite.h
client/trunk/src/textparticle.cpp
client/trunk/src/textparticle.h
client/trunk/src/tileset.h
client/trunk/src/tmw.rc
client/trunk/src/utils/base64.cpp
client/trunk/src/utils/base64.h
client/trunk/src/utils/dtor.h
client/trunk/src/utils/fastsqrt.h
client/trunk/src/utils/gettext.h
client/trunk/src/utils/minmax.h
client/trunk/src/utils/strprintf.cpp
client/trunk/src/utils/strprintf.h
client/trunk/src/utils/tostring.h
client/trunk/src/utils/trim.h
client/trunk/src/utils/wingettimeofday.h
client/trunk/src/utils/xml.cpp
client/trunk/src/utils/xml.h
client/trunk/src/vector.h
client/trunk/src/winver.h
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2007-10-18 20:08:39 UTC (rev 9)
+++ client/trunk/ChangeLog 2007-10-18 20:22:32 UTC (rev 10)
@@ -1,5811 +1,5846 @@
-2007-10-01 Guillaume Melquiond <gui...@gm...>
-
- * src/item.cpp, src/gui/itemcontainer.cpp, src/resources/itemdb.cpp:
- Fixed inventory display so that empty slots are not unknown items.
- Adjusted "type" meaning to tmwserv one.
- * src/game.cpp: Fixed attacking with keyboard.
-
-2007-09-25 Björn Steinbrink <B.S...@gm...>
-
- * src/gui/browserbox.cpp: Fix wrapping of UTF-8 multi-byte characters.
-
-2007-09-25 Bjørn Lindeijer <bj...@li...>
-
- * src/inventory.h, src/inventory.cpp: Added some const qualifiers.
-
-2007-09-22 Guillaume Melquiond <gui...@gm...>
-
- * src/gui/browserbox.cpp: Removed some useless things.
- * src/logindata.h, src/gui/linkhandler.h, src/channelmanager.h,
- src/channelmanager.cpp, src/utils/minmax.h: Fixed missing includes and
- cleaned a bit.
-
-2007-09-21 Guillaume Melquiond <gui...@gm...>
-
- * src/gui/chat.cpp: Fixed resizing of chat window.
-
-2007-09-21 Björn Steinbrink <B.S...@gm...>
-
- * src/CMakeLists.txt: Added new files to build, removed old files and
- added SDL_tff to the required libraries.
- * src/gui/truetypefont.h: Remove duplicated contents.
- * src/gui/browserbox.cpp: Refactor the way in which browser box text
- is drawn and wrapped.
-
-2007-09-20 Guillaume Melquiond <gui...@gm...>
-
- * src/gui/browserbox.cpp: Fixed missing const qualifier.
- * src/gui/windowlistener.h: Reduced warning about unused parameter.
- * src/particle.h, src/particle.cpp: Moved function out of header file.
- * src/net/chathandler.cpp: Removed useless include.
- * src/utils/trim.h: Fixed storage qualifier.
- * src/Makefile.am, src/gui/sdlinput.cpp, src/gui/sdlinput.h: Modified
- Guichan SDL input handler, so that it supports high characters.
- * src/gui/textfield.cpp, src/gui/textfield.h: Took over handling of
- keypresses in textfields, so that utf8 characters are supported.
- * src/gui/browserbox.cpp: Fixed improper splitting of characters.
- * src/gui/gui.cpp, src/gui/gui.h, src/game.cpp, src/main.cpp: Changed
- the input handler. Moved away from image font so that non-latin
- characters are supported.
-
-2007-09-16 Guillaume Melquiond <gui...@gm...>
-
- * src/gui/button.cpp: Fixed improper const qualifier.
-
-2007-09-12 Bjørn Lindeijer <bj...@li...>
-
- * data/items.xml, data/equipment.xml: Added temporary weapon IDs below
- 256 to use as view-ID in eAthena's item DB.
- * src/gui/shoplistbox.cpp, src/gui/buy.h, src/gui/buy.cpp: Allowed
- selection of items that cannot be afforded, so that their descriptions
- are still accessible. Also made sure the player's money value of
- ShopItemList gets updated.
-
-2007-09-11 Eugenio Favalli <elv...@gm...>
-
- * src/gui/chat.cpp, tmw.cbp: Fixed admin commands.
-
-2007-09-10 Eugenio Favalli <elv...@gm...>
-
- * configure.ac, data/fonts/dejavusans.ttf,
- src/gui/browserbox.cpp, src/gui/browserbox.h, src/gui/gui.cpp,
- src/gui/truetypefont.cpp, src/gui/truetypefont.h, src/gui/window.cpp,
- src/main.cpp, src/Makefile.am, src/openglgraphics.cpp, tmw.cbp: Added
- support for True Type Fonts.
- * po/it.po, po/LINGUAS, po/pl.po: Added Polish translation and fixed
- Italian one.
- * src/gui/minimap.cpp: Fixed minimap coordinates and improved look.
-
-2007-09-08 Guillaume Melquiond <gui...@gm...>
-
- * po/LINGUAS: Added German to the list of available languages.
- * po/de.po: Fixed two syntax errors preventing compilation.
-
-2007-09-08 Philipp Sehmisch <tm...@cr...>
-
- * data/graphics/particles/aniblaze.png,
- data/graphics/particles/cookingfire.particle.xml,
- data/graphics/particles/fireplace.particle.xml,
- data/graphics/particles/flame.particle.xml: Improved fire effects by
- using animated particles.
-
-2007-09-06 Philipp Sehmisch <tm...@cr...>
-
- * src/animationparticle.cpp, src/imageparticle.cpp: Fixed animated
- particles.
-
-2007-09-01 Bjørn Lindeijer <bj...@li...>
-
- * src/Makefile.am: Fixed the entry for windowlistener.h.
-
-2007-08-30 Bjørn Lindeijer <bj...@li...>
-
- * src/localplayer.cpp, src/player.cpp, src/main.cpp, src/being.cpp,
- src/CMakeLists.txt, src/Makefile.am, src/resources/iteminfo.h,
- src/resources/equipmentdb.h, src/resources/equipmentinfo.h,
- src/resources/itemdb.cpp, src/resources/iteminfo.cpp,
- src/resources/equipmentdb.cpp, src/resources/equipmentinfo.cpp,
- src/resources/spritedef.h, src/being.h, data/items.xml,
- data/equipment.xml: Merged equipment database with items database and
- got rid of the unused item art attribute.
- * src/net/beinghandler.cpp, src/net/charserverhandler.cpp: Removed the
- now unnecessary multiplication of weapon IDs with 10000.
- * src/resources/iteminfo.cpp, data/graphics/items/unknown.png: Added
- fallback item icon and use it for unknown items or when item image
- fails to load.
- * NEWS: Updated with changes since last update.
- * data/items.xml, data/equipment.xml: Reverted equipment database and
- included original low-ID items in items.xml for compatibility with
- eAthena, which doesn't support View ID to come above 255.
- * src/resources/itemdb.cpp: Accept items without a name.
-
-2007-08-29 Bjørn Lindeijer <bj...@li...>
-
- * src/gui/sell.cpp, src/gui/inventorywindow.cpp, src/gui/sell.h: Made
- sell dialog resizable and tweaked inventory resize code a bit.
- * data/items.xml: Fixed typo in chainmail description.
-
-2007-08-28 Bjørn Lindeijer <bj...@li...>
-
- * src/gui/window.cpp, src/gui/inventorywindow.h,
- src/gui/selectionlistener.h, src/gui/buy.h,
- src/gui/itemshortcutwindow.cpp, src/gui/inventorywindow.cpp,
- src/gui/buy.cpp, src/gui/window.h, src/gui/windowlistener.h,
- src/gui/itemshortcutwindow.h, src/CMakeLists.txt, src/Makefile.am:
- Made buy dialog resizable and added a WindowListener class for
- listening for window resize and move events.
- * src/textparticle.h, src/particle.h, src/CMakeLists.txt,
- src/particle.cpp, src/imageparticle.cpp, src/vector.h,
- src/textparticle.cpp, src/Makefile.am: Added Vector class and used it
- in the particle engine.
-
-2007-08-27 Bjørn Lindeijer <bj...@li...>
-
- * src/engine.cpp, src/resources/mapreader.cpp: Made client search for
- both compressed and non-compressed map files.
-
-2007-08-27 Eugenio Favalli <elv...@gm...>
-
- * src/game.cpp: Assigned unused emotions to Alt +/-. (applied a patch
- by Quiche_on_a_leash).
- * data/maps/new_1-1.tmx, data/maps/new_1-1.tmx.gz,
- data/maps/new_10-1.tmx, data/maps/new_10-1.tmx.gz,
- data/maps/new_11-1.tmx, data/maps/new_11-1.tmx.gz,
- data/maps/new_12-1.tmx, data/maps/new_12-1.tmx.gz,
- data/maps/new_13-1.tmx, data/maps/new_13-1.tmx.gz,
- data/maps/new_14-1.tmx, data/maps/new_14-1.tmx.gz,
- data/maps/new_15-1.tmx, data/maps/new_15-1.tmx.gz,
- data/maps/new_16-1.tmx, data/maps/new_16-1.tmx.gz,
- data/maps/new_17-1.tmx, data/maps/new_17-1.tmx.gz,
- data/maps/new_18-1.tmx, data/maps/new_18-1.tmx.gz,
- data/maps/new_19-1.tmx, data/maps/new_19-1.tmx.gz,
- data/maps/new_2-1.tmx, data/maps/new_2-1.tmx.gz,
- data/maps/new_20-1.tmx, data/maps/new_20-1.tmx.gz,
- data/maps/new_3-1.tmx, data/maps/new_3-1.tmx.gz,
- data/maps/new_4-1.tmx, data/maps/new_4-1.tmx.gz,
- data/maps/new_5-1.tmx, data/maps/new_5-1.tmx.gz,
- data/maps/new_6-1.tmx, data/maps/new_6-1.tmx.gz,
- data/maps/new_7-1.tmx, data/maps/new_7-1.tmx.gz,
- data/maps/new_8-1.tmx, data/maps/new_8-1.tmx.gz,
- data/maps/new_9-1.tmx, data/maps/new_9-1.tmx.gz: Replaced compressed
- maps with layer compressed maps.
- * data/maps/new_1-1.tmx.gz: Added test npcs.
- * src/openglgraphics.cpp, tmw.cbp: Fixed compilation with old OpenGL
- headers.
- * po/it.po: Updated italian translation.
-
-2007-08-27 Matthias Hartmann <har...@gm...>
-
- * po/de.po: Added German translation.
-
-2007-08-27 Guillaume Melquiond <gui...@gm...>
-
- * src/gui/chat.h, src/gui/chat.cpp: Added "/admin" chat command for
- sending raw messages to the game server.
- * src/engine.cpp, src/resources/mapreader.cpp: Ported patch from 0.0,
- in order to support missing extensions and uncompressed maps.
-
-2007-08-26 Eugenio Favalli <elv...@gm...>
-
- * src/gui/updatewindow.cpp, src/main.cpp, tmw.cbp: Removed home dir
- from config file to avoid encoding issues.
-
-2007-08-26 Guillaume Melquiond <gui...@gm...>
-
- * src/gui/button.cpp: Fixed incorrect button dimensions, as they mess
- OpenGL display with rectangle textures.
- * src/graphics.cpp, src/openglgraphics.h, src/graphics.h,
- src/openglgraphics.cpp: Fixed fonts not being recolored by adding an
- explicit parameter to require it.
-
-2007-08-25 Guillaume Melquiond <gui...@gm...>
-
- * configure.ac: Removed dependency on Guichan's OpenGL library.
- * src/Makefile.am, src/resources/sdlimageloader.cpp,
- src/resources/sdlimageloader.h, src/resources/openglsdlimageloader.h,
- src/resources/openglsdlimageloader.cpp, src/resources/imageloader.cpp,
- src/resources/imageloader.h, src/gui/gui.cpp, src/gui/gui.h: Replaced
- Guichan's image loaders with our owns, so that we have control over all
- the images used as textures.
- * src/resources/image.cpp, src/openglgraphics.h, src/resources/image.h,
- src/openglgraphics.cpp, src/graphics.cpp, src/graphics.h: Added support
- for rectangle OpenGL textures when available, in order to reduce video
- memory usage.
-
-2007-08-24 Bjørn Lindeijer <bj...@li...>
-
- * src/gui/gui.h, src/gui/gui.cpp: Removed useless logic method and
- reverted mouse cursor to non-static since there can be only one Gui
- instance so there is no point in supporting a shared resource.
- * src/gui/window.cpp, src/gui/gui.h: Removed unnecessary
- Gui::isCustomCursor method.
- * src/gui/char_select.h, src/gui/char_select.cpp, src/utils/trim.h:
- Added trimming of name for new character creation.
- * src/net/chathandler.cpp: Added trimming of chat messages appearing
- above players.
- * src/gui/window.cpp, src/gui/window.h: Improved resize mouse cursor
- indication, removing duplicated code and fixing indicator above resize
- grip.
-
-2007-08-23 Bjørn Lindeijer <bj...@li...>
-
- * src/gui/viewport.h, src/gui/viewport.cpp: Removed two useless popup
- related methods.
- * src/gui/debugwindow.h, src/gui/debugwindow.cpp: Use generic close
- button functionality.
- * src/particle.h, src/particleemitter.cpp, src/particle.cpp: Renamed
- Particle::mVector to Particle::mVelocity for clarity.
- * src/localplayer.cpp, src/gui/ministatus.cpp, src/gui/status.cpp,
- src/being.cpp, src/net/charserverhandler.cpp,
- src/net/playerhandler.cpp, src/localplayer.h, src/being.h: Changed XP
- gaining effect to appear on the player instead.
- * data/graphics/gui/hits_yellow.png: Restored shadow of yellow font.
-
-2007-08-22 Bjørn Lindeijer <bj...@li...>
-
- * src/gui/itemshortcutcontainer.h: Fixed compiler warning.
- * src/CMakeLists.txt, src/Makefile.am: Updated source lists.
- * data/graphics/gui/CMakeLists.txt, data/graphics/gui/Makefile.am:
- Added close button and item shortcut backgrounds to files that will be
- installed.
- * src/gui/itemshortcutcontainer.cpp: Make sure mGridWidth and
- mGridHeight are initialized properly (fixes arithmetic exception in
- ItemShortcutContainer::draw).
- * src/keyboardconfig.cpp: Changed default sitting key back to 's'.
- * src/net/equipmenthandler.cpp: Removed a line that attempted to set
- the player's weapon sprite with each kind of equipment. Seems to work
- fine without as well.
- * src/gui/chat.cpp, src/utils/trim.h, src/CMakeLists.txt,
- src/Makefile.am: Added trimming of chat messages.
-
-2007-08-22 Philipp Sehmisch <tm...@cr...>
-
- * data/graphics/sprites/chest-lightplatemail-male.png,
- data/graphics/sprites/chest-lightplatemail-female.png,
- data/graphics/items/armor-chest-lightplatemail.png,
- data/graphics/tiles/woodland_indoor_x2.png: Another color correction
- at the light platemail (looks more metalic now)
- * data/maps/new_18-1.tmx.gz, data/maps/new_19-1.tmx.gz,
- data/images/minimap_new_18-1.png, data/images/minimap_new_19-1.png:
- Removed a tree that prevented people from sitting on one of the
- benches properly. Added correct minimap to woodland village and
- surrounding.
-
-2007-08-22 Joshua Langley <joshlangley[at]optusnet.com.au>
-
- * data/graphics/gui/item_shortcut_bgr.png, src/game.cpp,
- src/gui/gui.cpp, src/gui/itemcontainer.cpp,
- src/gui/itemshortcutcontainer.cpp, src/gui/itemshortcutcontainer.h,
- src/gui/itemshortcutwindow.cpp, src/gui/itemshortcutwindow.h,
- src/gui/menuwindow.cpp, src/gui/setup_keyboard.cpp, src/gui/window.h,
- src/itemshortcut.cpp, src/itemshortcut.h, src/keyboardconfig.cpp,
- src/keyboardconfig.h, src/localplayer.cpp, src/localplayer.h,
- src/main.cpp, src/net/inventoryhandler.cpp, src/utils/tostring.h,
- tmw.cbp: Added item shortcut bar.
-
-2007-08-20 Joshua Langley <joshlangley[at]optusnet.com.au>
-
- * data/graphics/gui/mouse.png, src/gui/equipmentwindow.cpp,
- src/gui/gui.cpp, src/gui/gui.h, src/gui/inventorywindow.cpp,
- src/gui/setup.cpp, src/gui/skill.cpp, src/gui/skill.h,
- src/gui/status.cpp, src/gui/window.cpp, src/gui/window.h,
- data/graphics/gui/close_button.png: Added close button functionality,
- resize cursor cues.
- * data/graphics/gui/hits_yellow.png, src/being.cpp, src/being.h,
- src/gui/gui.cpp, src/localplayer.cpp, src/localplayer.h,
- src/net/charserverhandler.cpp, src/net/playerhandler.cpp,
- src/particle.cpp, src/particle.h: Added monster killed xp notification
- effect.
-
-2007-08-19 Bjørn Lindeijer <bj...@li...>
-
- * data/equipment.xml: Fixed typo in female light plate mail.
- * NEWS: Updated with changes since 0.0.23.
- * src/CMakeLists.txt: Updated CMake file.
-
-2007-08-19 Joshua Langley <joshlangley[at]optusnet.com.au>
-
- * src/keyboardconfig.cpp, src/keyboardconfig.h: Minor cleanup.
- * src/gui/buy.cpp, src/gui/sell.cpp: Buy/sell fixed minimum quantity.
- * src/gui/setup_keyboard.cpp, src/gui/setup_keyboard.h: Fixed bug -
- reverts unassigned key.
-
-2007-08-19 Guillaume Melquiond <gui...@gm...>
-
- * src/localplayer.h: Fixed typo.
-
-2007-08-18 Guillaume Melquiond <gui...@gm...>
-
- * src/localplayer.cpp, src/gui/status.cpp, src/net/protocol.h,
- src/net/playerhandler.cpp, src/localplayer.h: Adapted to new server
- handling of character attributes.
-
-2007-08-17 Bjørn Lindeijer <bj...@li...>
-
- * tools/adler32.c: Added little program for calculating adler32
- checksums of files.
- * src/gui/setup_keyboard.cpp: Fixed compile issue related to array
- bound not being an integer constant.
-
-2007-08-15 Philipp Sehmisch <tm...@cr...>
-
- * data/graphics/sprites/npcs.png, data/graphics/sprites/npc.xml:
- Added farmer NPC for woodland village.
-
-2007-08-14 Eugenio Favalli <elv...@gm...>
-
- * src/gui/popupmenu.cpp, src/gui/viewport.cpp, src/gui/viewport.h,
- tmw.cbp: Fixed popup menu requiring one more click after being used.
-
-2007-08-14 Guillaume Melquiond <gui...@gm...>
-
- * src/net/messagein.h, src/net/messagein.cpp: Fixed error-prone
- interface.
- * src/net/inventoryhandler.cpp: Handled money as an inventory part.
- * src/gui/sell.cpp, src/gui/buy.cpp, src/net/gameserver/player.h,
- src/net/gameserver/player.cpp: Enabled buying and selling from NPCs.
- * src/gui/trade.cpp, src/gui/trade.h, src/net/tradehandler.cpp,
- src/net/protocol.h: Removed old code. Added support for money received
- while trading.
-
-2007-08-14 Josh Langley <joshlangley[at]optusnet.com.au>
-
- * gui/button.cpp, gui/inventorywindow.cpp, gui/inventorywindow.h,
- gui/item_amount.cpp, gui/item_amount.h, gui/itemcontainer.cpp,
- gui/itemcontainer.h, gui/popupmenu.cpp, gui/trade.cpp, inventory.cpp,
- inventory.h, localplayer.cpp, localplayer.h, net/gameserver/player.cpp,
- net/gameserver/player.h, net/protocol.h: Inventory Window Slots created.
-
-2007-08-13 Guillaume Melquiond <gui...@gm...>
-
- * po/tmw.pot, po/fr.po: Updated .po files, so that people can start
- translating the whole interface, almost.
- * po/fr.po: Updated French translation.
- * src/gui/sell.cpp, src/gui/shop.cpp, src/gui/shop.h, src/gui/buy.h,
- src/gui/buy.cpp, src/gui/sell.h, src/net/buysellhandler.cpp,
- src/net/protocol.h: Started conversion of buy/sell to new server.
-
-2007-08-13 Eugenio Favalli <elv...@gm...>
-
- * src/main.cpp, tmw.cbp: Fixed internationalization support on Windows.
- * po/it.po, po/LINGUAS: Added first draft of Italian translation.
-
-2007-08-10 Guillaume Melquiond <gui...@gm...>
-
- * src/gui/npclistdialog.cpp, src/gui/npclistdialog.h,
- src/net/npchandler.cpp: Removed colon in NPC choice messages.
-
-2007-08-09 Philipp Sehmisch <tm...@cr...>
-
- * data/graphics/sprites/chest-lightplatemail-male.png,
- data/graphics/sprites/chest-lightplatemail-female.png,
- data/graphics/items/armor-chest-lightplatemail.png,
- data/graphics/tiles/woodland_indoor_x2.png: Gave the platemail
- armor a blue tint. Looks less boring and makes recoloring through
- hue shifting possible.
-
-2007-08-09 Guillaume Melquiond <gui...@gm...>
-
- * po/POTFILES.in: Updated list of translatable source files.
-
-2007-08-08 Guillaume Melquiond <gui...@gm...>
-
- * src/gui/equipmentwindow.cpp, data/graphics/gui/Makefile.am,
- data/graphics/images/EquipBackground.png: Moved equipment background
- to the gui directory. Changed name to lowercase only.
- * src/localplayer.cpp, src/equipment.h, src/equipment.cpp: Ensured
- that equipment is cleared at the same time as the inventory.
- * src/net/beinghandler.cpp: Fixed position of the cleaning bit for
- looks, so that it actually fits into network data.
-
-2007-08-08 Josh Langley <joshlangley[at]optusnet.com.au>
-
- * src/equipment.h, src/gui/equipmentwindow.cpp,
- src/gui/equipmentwindow.h, src/localplayer.cpp,
- src/net/gameserver/player.cpp, src/net/gameserver/player.h,
- data/graphics/images/EquipBackground.png: Re-designed equipment
- window, un-equip created.
-
-2007-08-08 Philipp Sehmisch <tm...@cr...>
-
- * data/graphics/particles/cookingfire.particle.xml,
- data/graphics/particles/fireplace.particle.xml,
- data/maps/new_20-1.tmx.gz: Added particle effects and music to the
- woodland village indoor map.
- * data/maps/new_19-1.tmx.gz: Added overlay effect and music to
- woodland village outdoor map.
- * data/maps/new_18-1.tmx.gz: Fixed some collision map errors and added
- music and overlay effect to the surrounding of the woodland village.
-
-2007-08-07 Philipp Sehmisch <tm...@cr...>
-
- * data/graphics/sprites/npcs.png: Added two new NPCs and gave some
- of the older NPCs a makeover to look more like the style of the new
- playerset.
- * data/maps/new_20-1.tmx.gz: Corrected a few mapping errors in the
- new woodland village.
- * data/items.xml: Tweaked description and values of the scythe.
-
-2007-08-07 Guillaume Melquiond <gui...@gm...>
-
- * po/Makevars, src/main.cpp: Replaced PACKAGE by tmw to reduce
- preprocessing hell. Set gettext charset to utf8.
- * src/gui/menuwindow.cpp, src/gui/connection.cpp,
- src/gui/register.cpp, src/gui/equipmentwindow.cpp,
- src/gui/quitdialog.cpp, src/gui/login.cpp, src/gui/item_amount.cpp,
- src/gui/npclistdialog.cpp, src/gui/setup.cpp, src/gui/char_select.cpp,
- src/gui/setup_audio.cpp, src/gui/npc_text.cpp,
- src/gui/setup_video.cpp, src/gui/ministatus.cpp,
- src/gui/ok_dialog.cpp, src/gui/confirm_dialog.cpp,
- src/gui/setup_joystick.cpp, src/gui/serverdialog.cpp,
- src/gui/minimap.cpp, src/gui/popupmenu.cpp: Marked as translatable.
- * src/gui/trade.cpp, src/gui/equipmentwindow.cpp, src/gui/window.cpp,
- src/gui/inventorywindow.h, src/gui/chat.cpp, src/gui/debugwindow.cpp,
- src/gui/skill.cpp, src/gui/help.cpp, src/gui/inventorywindow.cpp,
- src/gui/window.h, src/gui/status.cpp, src/gui/popupmenu.cpp,
- src/gui/minimap.cpp: Fixed window dimensions not being restored at
- start time. Cleaned resizing notification. Improved access control on
- window members.
- * data/items.xml, data/equipment.xml: Modified item database, so that
- equipment can be tested.
-
-2007-08-06 Guillaume Melquiond <gui...@gm...>
-
- * src/Makefile.am, src/utils/strprintf.h, src/utils/strprintf.cpp:
- Added a helper function for printf-formatting a (gettext) C string
- into a dynamically-sized C++ string.
- * src/gui/inventory.cpp: Completed marking of translatable strings for
- inventory window.
- * po/tmw.pot: Updated with new translatable strings.
- * po/fr.po: Completed translation of inventory window in French.
- * src/resources/gettext.h, src/main.cpp: Moved header to utils
- directory.
- * src/utils/tostring.h: Fixed typo in macro guard.
- * po/Makefile.in.in, po/remove-potcdate.sin, configure.ac,
- Makefile.am, autogen.sh: Used autopoint for generating gettext
- environment, and removed conflicting files.
-
-2007-08-05 Philipp Sehmisch <tm...@cr...>
-
- * data/graphics/tiles/woodland_indoor.png,
- data/graphics/tiles/woodland_indoor_x2.png,
- data/graphics/tiles/woodland_indoor_x3.png: Added woodland
- village indoor tilesets.
- * data/maps/new_20-1.tmx.gz: Added woodland village indoor map.
-
-2007-08-05 Guillaume Melquiond <gui...@gm...>
-
- * configure.ac, Makefile.am, po, src/Makefile.am, src/main.cpp,
- src/resources/gettext.h: Added support for internationalization.
- * src/gui/inventorywindow.cpp: Marked a few strings as translatable
- for testing purpose.
- * po/tmw.pot: Generated the main template.
- * po/LINGUAS, po/fr.po: Added French translation.
-
-2007-08-01 Guillaume Melquiond <gui...@gm...>
-
- * src/item.cpp, src/item.h: Fixed update of equipment flag, so that
- items can be equipped properly.
-
-2007-07-31 Guillaume Melquiond <gui...@gm...>
-
- * src/net/equipmenthandler.cpp, src/net/equipmenthandler.h,
- src/Makefile.am, src/game.h, src/game.cpp: Deleted dead handler.
- * src/net/buysellhandler.cpp, src/net/skillhandler.cpp,
- src/net/protocol.h: No need to compile legacy handlers.
- * src/localplayer.cpp, src/item.cpp, src/inventory.h,
- src/gui/trade.cpp, src/gui/equipmentwindow.cpp, src/item.h,
- src/gui/inventorywindow.cpp, src/gui/itemcontainer.cpp,
- src/gui/trade.h, src/gui/popupmenu.cpp, src/inventory.cpp,
- src/equipment.h, src/net/tradehandler.cpp, src/equipment.cpp,
- src/localplayer.h: Removed legacy inventory code.
- * src/net/inventoryhandler.cpp: Added display of equipment.
-
-2007-07-29 Björn Steinbrink <B.S...@gm...>
-
- * CMake/Modules/FindLibXml2.cmake, CMake/Modules/FindLibcurl.cmake,
- src/CMakeLists.txt: Switch to upstream CMake modules for libxml2 and
- curl.
-
-2007-07-29 Guillaume Melquiond <gui...@gm...>
-
- * src/localplayer.cpp, src/gui/trade.cpp, src/net/tradehandler.cpp,
- src/net/gameserver/player.h, src/net/gameserver/player.cpp,
- src/net/protocol.h: Converted trading to new server.
-
-2007-07-27 Guillaume Melquiond <gui...@gm...>
-
- * src/resources/image.cpp: Added support for subimages of subimages.
- * src/gui/equipmentwindow.cpp, src/gui/button.cpp, src/gui/slider.cpp,
- src/gui/widgets/resizegrip.cpp, src/gui/widgets/dropdown.cpp,
- src/gui/progressbar.cpp, src/gui/browserbox.cpp, src/gui/gui.cpp,
- src/gui/radiobutton.cpp, src/gui/textfield.cpp, src/gui/playerbox.cpp,
- src/gui/itemcontainer.cpp, src/gui/checkbox.cpp, src/gui/minimap.cpp,
- src/gui/scrollarea.cpp, src/gui/popupmenu.cpp: Removed useless yet
- costly dynamic casts.
-
-2007-07-25 Guillaume Melquiond <gui...@gm...>
-
- * src/net/beinghandler.cpp, src/net/protocol.h: Added being speed to
- protocol.
-
-2007-07-25 Joshua Langley <joshlangley[at]optusnet.com.au>
-
- * src/gui/setup.cpp, src/gui/setup_keyboard.cpp,
- src/gui/setup_keyboard.h, src/keyboardconfig.cpp,
- src/keyboardconfig.h, src/main.cpp: Minor changes to keyboard config,
- keyboard setup gui re-designed.
-
-2007-07-24 Bjørn Lindeijer <bj...@li...>
-
- * src/CMakeLists.txt, src/Makefile.am: Added setup_keyboard.* and
- keyboardconfig.* to the list of source files.
- * src/keyboardconfig.h: Fixed initialization order.
-
-2007-07-23 Eugenio Favalli <elv...@gm...>
-
- * data/maps/new_1-1.tar.gz, data/maps/new_3-1.tar.gz: Fixed warp
- coordinates.
-
-2007-07-23 Guillaume Melquiond <gui...@gm...>
-
- * src/main.cpp, src/game.cpp: Fixed segfault on exit when OpenGL
- configuration changed.
- * src/beingmanager.cpp: Removed dead code.
- * src/npc.cpp, src/npc.h, src/net/protocol.h, src/net/npchandler.cpp,
- src/net/gameserver/player.cpp, src/net/gameserver/player.h: Converted
- to new server.
- * src/beinghandler.cpp: Added support for NPCs.
-
-2007-07-22 Eugenio Favalli <elv...@gm...>
-
- * data/maps/new_1-1.tar.gz: Fixed insecure filenames.
-
-2007-07-17 Joshua Langley <joshlangley[at]optusnet.com.au>
-
- * src/game.cpp: Only one key per function.
- * src/main.cpp: Keyboard configuration included.
- * src/gui/button.cpp, src/gui/button.h: Default constructor and
- init function added.
- * src/gui/setup.cpp: Keyboard setup tab added.
- * src/gui/setup_keyboard.cpp, src/gui/setup_keyboard.h: Add to project
- file, it is the keyboard setup tab.
- * src/keyboardconfig.cpp, src/keyboardconfig.h: Add to project file,
- the main keyboard config operations.
-
-2007-07-16 Eugenio Favalli <elv...@gm...>
-
- * data/items.xml: Fixed description of silk headband.
- * data/maps/new_1-1.tar.gz, data/maps/new_3-1.tar.gz: Added warp and
- spawn areas.
-
-2007-07-14 Guillaume Melquiond <gui...@gm...>
-
- * src/net/beinghandler.cpp, src/net/protocol.h: Reduced size of
- equipment packets.
-
-2007-07-12 Guillaume Melquiond <gui...@gm...>
-
- * src/net/beinghandler.cpp, src/net/beinghandler.h,
- src/net/protocol.h: Added support for visible equipment.
-
-2007-07-11 Philipp Sehmisch <tm...@cr...>
-
- * src/resources/monsterdb.cpp, src/resources/monsterinfo.cpp,
- src/resources/monsterinfo.h, src/monster.cpp: Renamed SoundEvent
- to MonsterSoundEvent.
- * src/resources/equipmentdb.cpp, src/resources/equipmentinfo.cpp,
- src/resources/equipmentinfo.h: EquipmentDB now holds the type of
- attack animation and the sounds of weapons.
- * src/being.cpp. src/being.h, src/localplayer.cpp,
- src/net/beinghandler.cpp, src/net/charserverhandler.cpp,
- src/net/equipmenthandler.cpp, src/player.cpp, src/player.h: The
- type of weapon player characters are using is now set using
- setVisibleEquipment() instead of setWeapon() or setWeaponById().
- * src/CMakeLists.txt, src/Makefile.AM, tmw.cbp, The Mana World.dev:
- Updated project files and buildscripts.
- * data/graphics/images/login-wallpaper.png: Replaced login wallpaper
- with a new one by Irukard.
-
-2007-07-11 Bjørn Lindeijer <bj...@li...>
-
- * src/gui/window.cpp: Fixed resizing windows by their resize grip.
-
-2007-07-08 Guillaume Melquiond <gui...@gm...>
-
- * src/player.cpp, src/player.h, src/localplayer.h, src/being.h:
- Changed signatures to prevent the wrong members to be overloaded on
- architectures with 64-bit integers and to shut some compiler warnings.
- * src/localplayer.cpp: Fixed some uninitialized variables.
-
-2007-07-07 Bjørn Lindeijer <bj...@li...>
-
- * src/gui/gui.cpp, src/gui/chatinput.h, src/gui/chatinput.cpp,
- INSTALL: Ported to Guichan 0.7.0. Unfortunately, since Guichan 0.6.x
- didn't have a FocusListener, compatibility with older versions is
- broken.
-
-2007-06-30 Philipp Sehmisch <tm...@cr...>
-
- * src/main.cpp: Changed include order to avoid a problem with guichan
- on windows.
- * src/net/beinghandler.cpp: Implemented getting the direction of
- attacks from the server.
-
-2007-06-29 Philipp Sehmisch <tm...@cr...>
-
- * src/particle.cpp, src/particleemitter.cpp: Corrected some
- perspective issues of the particle engine and fixed a crash caused by
- particles with child emitters that have an image than isn't used
- elsewhere.
- * data/maps/new-3-1.tmx.gz: Added a particle effect at the spawn point
- in Tulimshar.
-
-2007-06-21 Philipp Sehmisch <tm...@cr...>
-
- * data/monsters.xml, data/graphics/sprites/monster-logmonster.png,
- data/graphics/sprites/monster-logmonster.xml: Added logmonster by
- Enigmatik (Monster ID is 23).
- * data/items.xml, data/equipment.xml,
- data/graphics/items/armor-chest-lightplatemail.png,
- data/graphics/sprites/chest-lightplatemail-male.xml,
- data/graphics/sprites/chest-lightplatemail-male.png,
- data/graphics/sprites/chest-lightplatemail-female.png,
- data/graphics/sprites/chest-lightplatemail-female.xml:
- Added light platemail (see entry in items.xml for proposed specs).
-
-2007-06-16 Guillaume Melquiond <gui...@gm...>
-
- * src/resources/image.cpp: Set GL texture index to zero when an image
- uses the SDL backend.
-
-2007-06-15 Eugenio Favalli <elv...@gm...>
-
- * tmw.cbp: Updated Code::Blocks project file.
-
-2007-06-13 Philipp Sehmisch <tm...@cr...>
-
- * The Mana World.dev: Updated DevCpp project file.
-
-2007-06-13 Philipp Sehmisch <tm...@cr...>
-
- * src/main.cpp: Added logging of version number.
-
-2007-06-12 David Athay <ko...@gm...>
-
- * data/icons/The Mana World.icns: Added Mac OSX icon.
-
-2007-06-11 Philipp Sehmisch <tm...@cr...>
-
- * src/particle.h, src/being.cpp: Fixed a bug that prevented
- being-controlled particles from being deleted (thanks to tuchs for
- reporting).
-
-2007-06-06 Bjørn Lindeijer <bj...@li...>
-
- * data/items.xml: Fixed defense of silk headband.
-
-2007-06-04 Philipp Sehmisch <tm...@cr...>
-
- * data/graphics/maps/new_17-1.tmx.gz: Changed the minimap image of the
- lamp snake cave to the correct one.
-
-2007-06-03 David Athay <ko...@gm...>
-
- * src/main.cpp, src/game.cpp: Fixed screenshot taking on OSX.
-
-2007-06-03 Bjørn Lindeijer <bj...@li...>
-
- * src/CMakeLists.txt, src/Makefile.am, docs/Makefile.am: Added some
- files to be included with the release.
- * src/utils/fastsqrt.h: Fixed warning about strict-aliasing rules.
- * src/Makefile.am: Don't die on warnings by default.
- * src/resources/image.cpp: Fixed image loading in software mode to not
- check for alpha layer when images aren't 32-bit.
- * src/graphics.cpp, src/graphics.h, src/imageparticle.cpp: Removed
- drawImageTransparent from Graphics class, should be set on image.
- * src/imageparticle.h, src/particleemitter.h, src/particle.h,
- src/particleemitter.cpp, src/particle.cpp, src/imageparticle.cpp: Have
- ParticleEmitter load a possible particle image early on and don't
- cause a crash when the image can't be found.
-
-2007-06-02 Bjørn Lindeijer <bj...@li...>
-
- * src/winver.h, README, NEWS, CMakeLists.txt, configure.ac,
- data/help/changes.txt, data/help/header.txt: Updated version and
- release date and summarized changes.
- * src/gui/chat.h, src/gui/chat.cpp: Changed color of chat messages in
- OpenGL mode from orange to black.
- * src/gui/sell.cpp, src/gui/buy.h, src/gui/buy.cpp, src/gui/sell.h:
- Some cleanup of buy/sell dialog code.
-
-2007-06-01 Bjørn Lindeijer <bj...@li...>
-
- * data/graphics/gui/CMakeLists.txt, data/graphics/gui/Makefile.am:
- Added target cursors to installed files.
-
-2007-05-31 Philipp Sehmisch <tm...@cr...>
-
- * data/maps/new_16-1.tmx.gz: Fixed an inconsistency with the neighbor
- map (no new walkmap required).
-
-2007-05-23 Bjørn Lindeijer <bj...@li...>
-
- * src/gui/sell.cpp, src/gui/buy.cpp, src/being.cpp: A bunch of
- lingering syntactical changes.
- * src/gui/viewport.cpp: Added a missing include and fixed a bug with
- cleaning up target cursor animations.
-
-2007-05-23 Philipp Sehmisch <tm...@cr...>
-
- * src/gui/viewport.cpp,
- data/graphics/gui/target-cursor-blue-s.png,
- data/graphics/gui/target-cursor-blue-m.png,
- data/graphics/gui/target-cursor-blue-l.png,
- data/graphics/gui/target-cursor-red-s.png,
- data/graphics/gui/target-cursor-red-m.png,
- data/graphics/gui/target-cursor-red-l.png: Replaced target cursor
- graphics with higher quality ones by Pauan.
- * src/particle.cpp: Made bouncing particles immune against death by
- ground contact and removed a nonsensical debugging log message. Made
- text splash effects fade out.
- * src/textparticle.cpp: Implemented fading in and out for text
- particles.
- * src/being.cpp, src/particle.cpp, src/particle.h,
- src/textparticle.cpp, src/textparticle.h: The color values of text
- particles are now stored in 3 integers instead of a Guichan color
- structure.
-
-2007-05-20 Eugenio Favalli <elv...@gm...>
-
- * tmw.cbp: Updated Code::Blocks project file.
-
-2007-05-20 Philipp Sehmisch <tm...@cr...>
-
- * src/gui/buy.cpp, src/gui/sell.cpp: Unified some differences between
- buy and sell dialog. Money label now shows money after transaction
- instead of current money.
- * src/gui/sell.cpp: Fixed the amount-not-reset-when-using-scrollwheel
- bug.
- * src/being.h, src/gui/viewport.cpp, src/gui/viewport.h: Added 3
- different target cursor sizes.
- * src/monster.h, src/monster.cpp, src/resources/monsterdb.cpp,
- scr/resources/monsterinfo.h, data/monsters.xml: Target cursor size for
- monster is read from the monsters.xml.
- * data/graphics/gui/target-cursor-blue-s.png,
- data/graphics/gui/target-cursor-blue-m.png,
- data/graphics/gui/target-cursor-blue-l.png,
- data/graphics/gui/target-cursor-red-s.png,
- data/graphics/gui/target-cursor-red-m.png,
- data/graphics/gui/target-cursor-red-l.png: Added temporary
- placeholders for small and large target cursors until better versions
- based on the original SVG are available.
-
-2007-05-08 Philipp Sehmisch <tm...@cr...>
-
- * data/graphics/sprites/monster-bat.png,
- data/graphics/sprites/monster-bat.xml,
- data/graphics/sprites/monster-flower.xml,
- data/graphics/sprites/monster-fluffy.xml,
- data/graphics/sprites/monster-fluffy.png,
- data/graphics/sprites/monster-goblin-fire.xml,
- data/graphics/sprites/monster-maggot-giant.xml,
- data/graphics/sprites/monster-maggot.xml,
- data/graphics/sprites/monster-mountsnake.xml,
- data/graphics/sprites/monster-mushroom-red.xml,
- data/graphics/sprites/monster-mushroom-spiky.xml,
- data/graphics/sprites/monster-pinkie.xml,
- data/graphics/sprites/monster-scorpion-black.xml,
- data/graphics/sprites/monster-scorpion-red.png,
- data/graphics/sprites/monster-scorpion-red.xml,
- data/graphics/sprites/monster-skull-poison.xml,
- data/graphics/sprites/monster-slime-green.xml,
- data/graphics/sprites/monster-slime-red.xml,
- data...
[truncated message content] |
|
From: <cru...@us...> - 2007-10-18 20:08:35
|
Revision: 9
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=9&view=rev
Author: crush_tmw
Date: 2007-10-18 13:08:39 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
Merged changes from main TMW version up to revision 3630 and set svn:keyword and svn:eol-style file properties for sourcecode files.
Revision Links:
--------------
http://tmw-damasca.svn.sourceforge.net/tmw-damasca/?rev=3630&view=rev
Modified Paths:
--------------
server/trunk/ChangeLog
server/trunk/src/Makefile.am
server/trunk/src/account-server/account.cpp
server/trunk/src/account-server/account.hpp
server/trunk/src/account-server/accountclient.cpp
server/trunk/src/account-server/accountclient.hpp
server/trunk/src/account-server/accounthandler.cpp
server/trunk/src/account-server/accounthandler.hpp
server/trunk/src/account-server/character.cpp
server/trunk/src/account-server/character.hpp
server/trunk/src/account-server/dalstorage.cpp
server/trunk/src/account-server/dalstorage.hpp
server/trunk/src/account-server/dalstoragesql.hpp
server/trunk/src/account-server/guild.cpp
server/trunk/src/account-server/guild.hpp
server/trunk/src/account-server/guildmanager.cpp
server/trunk/src/account-server/guildmanager.hpp
server/trunk/src/account-server/main-account.cpp
server/trunk/src/account-server/serverhandler.cpp
server/trunk/src/account-server/serverhandler.hpp
server/trunk/src/chat-server/chatchannel.cpp
server/trunk/src/chat-server/chatchannel.hpp
server/trunk/src/chat-server/chatchannelmanager.cpp
server/trunk/src/chat-server/chatchannelmanager.hpp
server/trunk/src/chat-server/chatclient.hpp
server/trunk/src/chat-server/chathandler.cpp
server/trunk/src/chat-server/chathandler.hpp
server/trunk/src/common/configuration.cpp
server/trunk/src/common/configuration.hpp
server/trunk/src/common/inventorydata.hpp
server/trunk/src/dal/dalexcept.h
server/trunk/src/dal/dataprovider.cpp
server/trunk/src/dal/dataprovider.h
server/trunk/src/dal/dataproviderfactory.cpp
server/trunk/src/dal/dataproviderfactory.h
server/trunk/src/dal/mysqldataprovider.cpp
server/trunk/src/dal/mysqldataprovider.h
server/trunk/src/dal/pqdataprovider.cpp
server/trunk/src/dal/pqdataprovider.h
server/trunk/src/dal/recordset.cpp
server/trunk/src/dal/recordset.h
server/trunk/src/dal/sqlitedataprovider.cpp
server/trunk/src/dal/sqlitedataprovider.h
server/trunk/src/defines.h
server/trunk/src/game-server/accountconnection.cpp
server/trunk/src/game-server/accountconnection.hpp
server/trunk/src/game-server/being.cpp
server/trunk/src/game-server/being.hpp
server/trunk/src/game-server/buysell.cpp
server/trunk/src/game-server/buysell.hpp
server/trunk/src/game-server/character.cpp
server/trunk/src/game-server/character.hpp
server/trunk/src/game-server/collisiondetection.cpp
server/trunk/src/game-server/collisiondetection.hpp
server/trunk/src/game-server/command.cpp
server/trunk/src/game-server/eventlistener.hpp
server/trunk/src/game-server/gamehandler.cpp
server/trunk/src/game-server/gamehandler.hpp
server/trunk/src/game-server/inventory.cpp
server/trunk/src/game-server/inventory.hpp
server/trunk/src/game-server/item.cpp
server/trunk/src/game-server/item.hpp
server/trunk/src/game-server/itemmanager.cpp
server/trunk/src/game-server/itemmanager.hpp
server/trunk/src/game-server/main-game.cpp
server/trunk/src/game-server/map.cpp
server/trunk/src/game-server/map.hpp
server/trunk/src/game-server/mapcomposite.cpp
server/trunk/src/game-server/mapcomposite.hpp
server/trunk/src/game-server/mapmanager.cpp
server/trunk/src/game-server/mapmanager.hpp
server/trunk/src/game-server/mapreader.cpp
server/trunk/src/game-server/mapreader.hpp
server/trunk/src/game-server/monster.cpp
server/trunk/src/game-server/monster.hpp
server/trunk/src/game-server/monstermanager.cpp
server/trunk/src/game-server/monstermanager.hpp
server/trunk/src/game-server/movingobject.cpp
server/trunk/src/game-server/movingobject.hpp
server/trunk/src/game-server/npc.cpp
server/trunk/src/game-server/npc.hpp
server/trunk/src/game-server/object.hpp
server/trunk/src/game-server/quest.cpp
server/trunk/src/game-server/quest.hpp
server/trunk/src/game-server/resourcemanager.cpp
server/trunk/src/game-server/resourcemanager.hpp
server/trunk/src/game-server/spawnarea.cpp
server/trunk/src/game-server/spawnarea.hpp
server/trunk/src/game-server/state.cpp
server/trunk/src/game-server/state.hpp
server/trunk/src/game-server/testing.cpp
server/trunk/src/game-server/thing.cpp
server/trunk/src/game-server/thing.hpp
server/trunk/src/game-server/trade.cpp
server/trunk/src/game-server/trade.hpp
server/trunk/src/game-server/trigger.cpp
server/trunk/src/game-server/trigger.hpp
server/trunk/src/net/connection.cpp
server/trunk/src/net/connection.hpp
server/trunk/src/net/connectionhandler.cpp
server/trunk/src/net/connectionhandler.hpp
server/trunk/src/net/messagein.cpp
server/trunk/src/net/messagein.hpp
server/trunk/src/net/messageout.cpp
server/trunk/src/net/messageout.hpp
server/trunk/src/net/netcomputer.cpp
server/trunk/src/net/netcomputer.hpp
server/trunk/src/point.h
server/trunk/src/scripting/lua.cpp
server/trunk/src/scripting/script.cpp
server/trunk/src/scripting/script.hpp
server/trunk/src/serialize/characterdata.hpp
server/trunk/src/utils/base64.cpp
server/trunk/src/utils/base64.h
server/trunk/src/utils/cipher.cpp
server/trunk/src/utils/cipher.h
server/trunk/src/utils/functors.h
server/trunk/src/utils/logger.cpp
server/trunk/src/utils/logger.h
server/trunk/src/utils/mathutils.cpp
server/trunk/src/utils/mathutils.h
server/trunk/src/utils/processorutils.cpp
server/trunk/src/utils/processorutils.hpp
server/trunk/src/utils/singleton.h
server/trunk/src/utils/stringfilter.cpp
server/trunk/src/utils/stringfilter.h
server/trunk/src/utils/timer.cpp
server/trunk/src/utils/timer.h
server/trunk/src/utils/tokencollector.cpp
server/trunk/src/utils/tokencollector.hpp
server/trunk/src/utils/tokendispenser.cpp
server/trunk/src/utils/tokendispenser.hpp
server/trunk/src/utils/wingettimeofday.cpp
server/trunk/src/utils/wingettimeofday.h
server/trunk/src/utils/xml.cpp
server/trunk/src/utils/xml.hpp
server/trunk/src/utils/zlib.cpp
server/trunk/src/utils/zlib.hpp
Removed Paths:
-------------
server/trunk/data/items.xml
server/trunk/data/monsters.xml
Property Changed:
----------------
server/trunk/src/Makefile.am
server/trunk/src/account-server/account.cpp
server/trunk/src/account-server/account.hpp
server/trunk/src/account-server/accountclient.cpp
server/trunk/src/account-server/accountclient.hpp
server/trunk/src/account-server/accounthandler.cpp
server/trunk/src/account-server/accounthandler.hpp
server/trunk/src/account-server/character.cpp
server/trunk/src/account-server/character.hpp
server/trunk/src/account-server/dalstorage.cpp
server/trunk/src/account-server/dalstorage.hpp
server/trunk/src/account-server/dalstoragesql.hpp
server/trunk/src/account-server/guild.cpp
server/trunk/src/account-server/guild.hpp
server/trunk/src/account-server/guildmanager.cpp
server/trunk/src/account-server/guildmanager.hpp
server/trunk/src/account-server/main-account.cpp
server/trunk/src/account-server/serverhandler.cpp
server/trunk/src/account-server/serverhandler.hpp
server/trunk/src/chat-server/chatchannel.cpp
server/trunk/src/chat-server/chatchannel.hpp
server/trunk/src/chat-server/chatchannelmanager.cpp
server/trunk/src/chat-server/chatchannelmanager.hpp
server/trunk/src/chat-server/chatclient.hpp
server/trunk/src/chat-server/chathandler.cpp
server/trunk/src/chat-server/chathandler.hpp
server/trunk/src/common/configuration.cpp
server/trunk/src/common/configuration.hpp
server/trunk/src/common/inventorydata.hpp
server/trunk/src/dal/dalexcept.h
server/trunk/src/dal/dataprovider.cpp
server/trunk/src/dal/dataprovider.h
server/trunk/src/dal/dataproviderfactory.cpp
server/trunk/src/dal/dataproviderfactory.h
server/trunk/src/dal/mysqldataprovider.cpp
server/trunk/src/dal/mysqldataprovider.h
server/trunk/src/dal/pqdataprovider.cpp
server/trunk/src/dal/pqdataprovider.h
server/trunk/src/dal/recordset.cpp
server/trunk/src/dal/recordset.h
server/trunk/src/dal/sqlitedataprovider.cpp
server/trunk/src/dal/sqlitedataprovider.h
server/trunk/src/defines.h
server/trunk/src/game-server/accountconnection.cpp
server/trunk/src/game-server/accountconnection.hpp
server/trunk/src/game-server/being.cpp
server/trunk/src/game-server/being.hpp
server/trunk/src/game-server/buysell.cpp
server/trunk/src/game-server/buysell.hpp
server/trunk/src/game-server/character.cpp
server/trunk/src/game-server/character.hpp
server/trunk/src/game-server/collisiondetection.cpp
server/trunk/src/game-server/collisiondetection.hpp
server/trunk/src/game-server/command.cpp
server/trunk/src/game-server/eventlistener.hpp
server/trunk/src/game-server/gamehandler.cpp
server/trunk/src/game-server/gamehandler.hpp
server/trunk/src/game-server/inventory.cpp
server/trunk/src/game-server/inventory.hpp
server/trunk/src/game-server/item.cpp
server/trunk/src/game-server/item.hpp
server/trunk/src/game-server/itemmanager.cpp
server/trunk/src/game-server/itemmanager.hpp
server/trunk/src/game-server/main-game.cpp
server/trunk/src/game-server/map.cpp
server/trunk/src/game-server/map.hpp
server/trunk/src/game-server/mapcomposite.cpp
server/trunk/src/game-server/mapcomposite.hpp
server/trunk/src/game-server/mapmanager.cpp
server/trunk/src/game-server/mapmanager.hpp
server/trunk/src/game-server/mapreader.cpp
server/trunk/src/game-server/mapreader.hpp
server/trunk/src/game-server/monster.cpp
server/trunk/src/game-server/monster.hpp
server/trunk/src/game-server/monstermanager.cpp
server/trunk/src/game-server/monstermanager.hpp
server/trunk/src/game-server/movingobject.cpp
server/trunk/src/game-server/movingobject.hpp
server/trunk/src/game-server/npc.cpp
server/trunk/src/game-server/npc.hpp
server/trunk/src/game-server/object.hpp
server/trunk/src/game-server/quest.cpp
server/trunk/src/game-server/quest.hpp
server/trunk/src/game-server/resourcemanager.cpp
server/trunk/src/game-server/resourcemanager.hpp
server/trunk/src/game-server/spawnarea.cpp
server/trunk/src/game-server/spawnarea.hpp
server/trunk/src/game-server/state.cpp
server/trunk/src/game-server/state.hpp
server/trunk/src/game-server/testing.cpp
server/trunk/src/game-server/thing.cpp
server/trunk/src/game-server/thing.hpp
server/trunk/src/game-server/trade.cpp
server/trunk/src/game-server/trade.hpp
server/trunk/src/game-server/trigger.cpp
server/trunk/src/game-server/trigger.hpp
server/trunk/src/net/connection.cpp
server/trunk/src/net/connection.hpp
server/trunk/src/net/connectionhandler.cpp
server/trunk/src/net/connectionhandler.hpp
server/trunk/src/net/messagein.cpp
server/trunk/src/net/messagein.hpp
server/trunk/src/net/messageout.cpp
server/trunk/src/net/messageout.hpp
server/trunk/src/net/netcomputer.cpp
server/trunk/src/net/netcomputer.hpp
server/trunk/src/point.h
server/trunk/src/scripting/lua.cpp
server/trunk/src/scripting/script.cpp
server/trunk/src/scripting/script.hpp
server/trunk/src/serialize/characterdata.hpp
server/trunk/src/utils/base64.cpp
server/trunk/src/utils/base64.h
server/trunk/src/utils/cipher.cpp
server/trunk/src/utils/cipher.h
server/trunk/src/utils/functors.h
server/trunk/src/utils/logger.cpp
server/trunk/src/utils/logger.h
server/trunk/src/utils/mathutils.cpp
server/trunk/src/utils/mathutils.h
server/trunk/src/utils/processorutils.cpp
server/trunk/src/utils/processorutils.hpp
server/trunk/src/utils/singleton.h
server/trunk/src/utils/stringfilter.cpp
server/trunk/src/utils/stringfilter.h
server/trunk/src/utils/timer.cpp
server/trunk/src/utils/timer.h
server/trunk/src/utils/tokencollector.cpp
server/trunk/src/utils/tokencollector.hpp
server/trunk/src/utils/tokendispenser.cpp
server/trunk/src/utils/tokendispenser.hpp
server/trunk/src/utils/wingettimeofday.cpp
server/trunk/src/utils/wingettimeofday.h
server/trunk/src/utils/xml.cpp
server/trunk/src/utils/xml.hpp
server/trunk/src/utils/zlib.cpp
server/trunk/src/utils/zlib.hpp
Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog 2007-10-18 17:54:03 UTC (rev 8)
+++ server/trunk/ChangeLog 2007-10-18 20:08:39 UTC (rev 9)
@@ -1,2167 +1,2176 @@
-2007-09-27 Eugenio Favalli <elv...@gm...>
-
- * accountserver.cbp, data/monsters.xml, gameserver.cbp,
- src/game-server/monstermanager.cpp: Ported monster database.
-
-2007-09-23 Guillaume Melquiond <gui...@gm...>
-
- * src/game-server/state.hpp, src/game-server/state.cpp: Changed
- delayed events to an explicit interface.
- * src/scripting/lua.cpp, src/game-server/command.cpp,
- src/game-server/state.cpp, src/game-server/spawnarea.cpp,
- src/game-server/state.hpp, src/game-server/monster.cpp,
- src/game-server/trigger.cpp: Updated to new interface.
- * src/account-server/accounthandler.cpp, src/defines.h,
- src/chat-server/chathandler.cpp: Merged time-out messages with response
- to connection messages.
- * src/game-server/state.cpp, src/game-server/state.hpp: Modified
- interface to deal with failure to insert objects.
- * src/scripting/lua.cpp, src/game-server/testing.cpp,
- src/game-server/command.cpp, src/game-server/gamehandler.cpp: Taken
- insertion failures into account.
- * src/account-server/accounthandler.hpp,
- src/account-server/accounthandler.cpp,
- src/account-server/serverhandler.cpp,
- src/account-server/serverhandler.hpp: Simplified interface of
- connection handlers. Moved all the implementation details outside the
- header file.
- * src/account-server/main-account.cpp: Updated to new interface of
- connection handlers.
-
-2007-09-22 Guillaume Melquiond <gui...@gm...>
-
- * src/chat-server/chatchannelmanager.hpp,
- src/chat-server/chathandler.hpp: Fixed header dependencies.
- * src/configuration.cpp, src/configuration.h: Changed to namespace.
- Removed listeners. Simplified property handling. Moved to common/.
- * src/resourcemanager.cpp, src/resourcemanager.h: Changed to namespace.
- Removed dead code. Moved to game-server/.
- * src/account-server/dalstorage.cpp, src/utils/stringfilter.cpp,
- src/account-server/accounthandler.cpp, src/utils/stringfilter.h,
- src/game-server/accountconnection.cpp: Updated to new configuration.
- * src/scripting/script.cpp, src/game-server/mapreader.cpp,
- src/game-server/mapmanager.cpp, src/game-server/monstermanager.cpp,
- src/game-server/itemmanager.cpp: Updated to new resource manager.
- * src/Makefile.am, src/account-server/main-account.cpp,
- src/game-server/main-game.cpp: Updated.
-
-2007-09-16 Guillaume Melquiond <gui...@gm...>
-
- * src/game-server/command.cpp: Removed unused argument name.
- * src/defines.h: Added packet from for sending server statistics.
- * src/account-server/serverhandler.hpp,
- src/account-server/accounthandler.cpp: Cleaned function prototypes.
- * src/chat-server/chathandler.hpp: Fixed missing header.
- * src/account-server/serverhandler.cpp: Moved map/server data into
- connection local storage.
- * src/game-server/accountconnection.cpp, src/game-server/main-game.cpp,
- src/game-server/accountconnection.hpp: Added statistic sender to
- game server.
- * src/account-server/serverhandler.cpp,
- src/account-server/serverhandler.hpp, src/Makefile.am,
- src/account-server/main-account.cpp: Added statistic receiver and
- dumper to account server.
-
-2007-09-10 Eugenio Favalli <elv...@gm...>
-
- * accountserver.cbp, gameserver.cbp, src/game-server/spawnarea.cpp:
- Dimensionless spawn points now spawn over the whole map.
- * src/game-server/mapreader.cpp, src/game-server/spawnarea.cpp,
- src/game-server/spawnarea.hpp: Spawn rate and limit are now read from
- map files and really fixed size of spawn area.
- * docs/commands.txt: Added first draft of admin/gm commands reference.
-
-2007-08-31 Guillaume Melquiond <gui...@gm...>
-
- * configure.ac: Fixed detection of generic lua.pc file.
- * src/game-server/itemmanager.cpp, src/game-server/itemmanager.hpp,
- src/game-server/monstermanager.cpp, src/game-server/monstermanager.hpp:
- Modified loading of reference files, so that it is possible to reload
- them.
- * src/game-server/command.cpp: Implemented "reload" remote command.
- * src/account-server/account.hpp, src/account-server/account.cpp:
- Simplified character removal.
- * src/account-server/accountclient.hpp,
- src/account-server/accounthandler.cpp,
- src/account-server/accountclient.cpp: Removed selected character from
- client data. Cleaned account handler.
- * src/account-server/dalstorage.cpp, src/account-server/dalstorage.hpp:
- Added helper for querying existence of usernames.
- * src/account-server/accounthandler.cpp: Plugged several account leaks
- on error.
- * src/defines.h, src/account-server/accounthandler.cpp: Prevented
- banned users from logging in.
- * src/account-server/dalstorage.cpp, src/account-server/dalstorage.hpp:
- Handled banned database field.
- * src/game-server/accountconnection.hpp, src/defines.h,
- src/game-server/accountconnection.cpp,
- src/account-server/serverhandler.cpp: Added protocol for banning
- players.
- * src/game-server/command.cpp: Implemented "ban" remote command.
-
-2007-08-30 Guillaume Melquiond <gui...@gm...>
-
- * src/account-server/storage.hpp, src/account-server/storage.cpp,
- src/account-server/main-account.cpp: Removed abstract Storage. Relied
- on SQL-based implementation only.
- * src/account-server/characterdata.hpp,
- src/account-server/characterdata.cpp: Renamed class and files to just
- Character.
- * src/utils/countedptr.h: Got rid of reference-counted pointers.
- * src/account-server/dalstorage.hpp, src/account-server/dalstorage.cpp:
- Fixed permanent memory usage for accounts and characters loaded once.
- * src/account-server/serverhandler.cpp: Improved robustness to game
- server messages.
- * src/chat-server/chathandler.cpp, src/account-server/guildmanager.cpp,
- src/chat-server/chatchannelmanager.cpp, src/account-server/account.hpp,
- src/account-server/accounthandler.hpp, src/account-server/guild.cpp,
- src/account-server/accountclient.hpp, src/account-server/guild.hpp,
- src/account-server/guildmanager.hpp, src/account-server/account.cpp,
- src/account-server/serverhandler.hpp, src/Makefile.am,
- src/account-server/dalstoragesql.hpp,
- src/account-server/accounthandler.cpp,
- src/account-server/accountclient.cpp: Fixed fallout from previous
- patches.
-
-2007-08-29 Guillaume Melquiond <gui...@gm...>
-
- * data/scripts/libtmw.lua: Fixed race condition between quest_reply and
- npc_next.
- * src/game-server/command.cpp, src/game-server/gamehandler.cpp,
- src/game-server/gamehandler.hpp: Completed handler for admin commands,
- so that they can also touch local players.
- * src/game-server/comand.cpp: Implemented "goto" and "recall" remote
- commands.
- * src/Makefile.am, src/game-server/deathlistener.hpp,
- src/game-server/eventlistener.hpp: Replaced event system.
- * src/games-server/thing.hpp, src/game-server/thing.cpp: Placed
- listener handling at the lowest level. Added "inserted" and "removed"
- event.
- * src/game-server/being.hpp, src/game-server/being.cpp,
- src/game-server/character.hpp, src/game-server/character.cpp: Added
- "died" and "disconnected" event.
- * src/game-server/state.cpp, src/game-server/gamehandler.cpp: Added
- event notification.
- * src/game-server/spawnarea.cpp, src/game-server/spawnarea.hpp,
- src/game-server/monster.cpp, src/game-server/monster.hpp: Modified to
- use the new event system.
- * src/game-server/quest.cpp: Fixed event listener on character removal
- and/or disconnection.
- * src/account-server/account.hpp, src/account-server/dalstorage.cpp,
- src/account-server/accounthandler.cpp, src/account-server/account.cpp:
- Fixed account levels not being loaded from the database.
- * src/game-server/command.cpp: Fixed level checking.
-
-2007-08-28 Guillaume Melquiond <gui...@gm...>
-
- * src/account-server/storage.hpp, src/account-server/dalstoragesql.hpp,
- src/account-server/dalstorage.cpp, src/account-server/dalstorage.hpp:
- Implemented storing and recovering quest variables from database.
- * src/account-server/serverhandler.cpp, src/defines.h,
- src/game-server/accountconnection.cpp,
- src/game-server/accountconnection.hpp: Added protocol for sending quest
- variables between servers.
- * src/game-server/quest.cpp, src/game-server/quest.hpp,
- src/game-server/character.hpp, src/Makefile.am: Added async handling of
- quest variables.
- * src/scripting/lua.cpp, data/scripts/libtmw.lua: Added helper
- functions for querying quest variables from Lua scripts. Reworked state
- machine of the NPC support library.
- * data/test.lua: Modified for testing quest variables.
-
-2007-08-27 Eugenio Favalli <elv...@gm...>
-
- * accountserver.cbp, gameserver.cbp, src/game-server/mapreader.cpp,
- src/game-server/testing.cpp: Enabled loading of npcs and scripts from
- map files.
-
-2007-08-27 Guillaume Melquiond <gui...@gm...>
-
- * src/chat-server/chathandler.hpp, src/chat-server/chatclient.hpp,
- src/chat-server/chatclient.cpp, src/account-server/account.hpp,
- src/account-server/account.cpp, src/defines.hpp: Used discontiguous
- values for account level.
- * src/account-server/characterdata.cpp, src/game-server/character.hpp,
- src/serialize/characterdata.hpp, src/account-server/characterdata.hpp:
- Added serialization of account level.
- * src/game-server/gamehandler.cpp, src/game-server/command.cpp,
- src/Makefile.am: Added support for remote commands.
- * src/game-server/command.cpp: Implemented "warp", "item", "money",
- "drop", and "spawn" remote commands.
- * src/game-server/mapreader.cpp: Added support for uncompressed map
- files and compressed layers.
- * src/resourcemanager.cpp, src/resourcemanager.h: Added "exists"
- function to resource manager.
- * src/game-server/mapmanager.cpp: Used runtime selection of map
- filename extensions.
- * data/maps.xml: Removed extensions from map names.
-
-2007-08-20 Bjørn Lindeijer <bj...@li...>
-
- * data/test.lua, data/scripts/libtmw.lua: Defined two helper functions
- to abstract away money being available under inventory index 0.
-
-2007-08-20 Guillaume Melquiond <gui...@gm...>
-
- * src/scripting/script.cpp: Prevented access to uninitialized engines.
- * configure.ac: Enabled Lua scripting by default.
- * src/scripting/lua.cpp, data/scripts/libtmw.lua: Removed useless
- function prefixes. Commented Lua internal variables.
-
-2007-08-19 Guillaume Melquiond <gui...@gm...>
-
- * src/account-server/accounthandler.cpp, src/defines.h: Fixed typos.
- * src/game-server/itemmanager.cpp: Worked around inconsistent spelling.
- * src/game-server/item.cpp, src/game-server/item.hpp: Added support for
- equipment modifiers.
- * src/game-server/inventory.hpp, src/game-server/inventory.cpp: Added
- sanity checks at initialization. Applied equipment modifiers to
- character.
- * src/game-server/being.hpp, src/game-server/being.cpp: Set base
- element resistance to 100. Added support for temporary modifiers.
- * src/game-server/character.cpp: Removed redundant updates of
- attributes.
- * src/game-server/monster.cpp, src/game-server/character.hpp: Cleaned
- fallout due to above patches.
- * src/scripting/lua.cpp, data/test.lua: Allowed Lua scripts to query
- and change money.
- * src/game-server/being.cpp, src/game-server/being.hpp: Simplified
- handling of permanent modifiers.
- * src/game-server/item.cpp, src/game-server/item.hpp,
- src/game-server/gamehandler.cpp: Implemented use of items.
- * src/game-server/itemmanager.cpp: Fixed lifetime value.
-
-2007-08-18 Guillaume Melquiond <gui...@gm...>
-
- * src/serialize/characterdata.hpp, src/account-server/dalstorage.cpp,
- src/account-server/characterdata.cpp, src/game-server/spawnarea.cpp,
- src/account-server/accounthandler.cpp, src/defines.h,
- src/account-server/characterdata.hpp, src/game-server/state.cpp,
- src/game-server/being.cpp, src/game-server/monster.cpp,
- src/game-server/being.hpp, src/game-server/movingobject.hpp,
- src/game-server/monster.hpp, src/game-server/character.cpp,
- src/game-server/item.cpp, src/game-server/character.hpp,
- src/game-server/item.hpp, src/game-server/gamehandler.cpp,
- src/game-server/object.hpp, src/game-server/accountconnection.cpp,
- src/game-server/itemmanager.cpp: Removed character statistics from
- Being. Kept only attributes useful for fighting. Improved combat
- handling (evade and elements). Added support for weapon characteristics
- and weapon skills. Added support for attribute modifiers. Cleaned game
- state handling.
-
-2007-08-17 Guillaume Melquiond <gui...@gm...>
-
- * src/scripting/lua.cpp, data/test.lua: Added Lua function for trading
- between players and NPCs.
- * src/game-server/gamehandler.cpp, src/game-server/gamehandler.hpp,
- src/game-server/accountconnection.cpp: Handled multiple connections by
- allowing clients to take over characters.
- * src/utils/tokencollector.cpp, src/utils/tokencollector.hpp,
- src/Makefile.am: Simplified TokenCollector and fixed a few bugs. Moved
- its implementation outside the header file.
- * src/chat-server/chathandler.hpp, src/chat-server/chathandler.cpp,
- src/defines.h: Used TokenCollector to manage cookies in ChatHandler.
-
-2007-08-16 Guillaume Melquiond <gui...@gm...>
-
- * data/scripts/libtmw.lua: Improved NPC state machine, so that the
- engine avoids waiting, once the last message has been sent.
-
-2007-08-15 Guillaume Melquiond <gui...@gm...>
-
- * src/scripting/script.cpp, src/scripting/script.hpp: Added helper
- functions for loading files and NPCs as scripts.
- * src/scripting/lua.cpp, data/scripts/libtmw.lua: Put the Lua helpers
- into a separate library automatically loaded into new contexts.
- * src/game-server/testing.cpp, data/test.lua: Updated testing files.
-
-2007-08-14 Guillaume Melquiond <gui...@gm...>
-
- * src/serialize/characterdata.hpp, src/common/inventorydata.hpp,
- src/account-server/accounthandler.hpp, src/game-server/character.cpp,
- src/account-server/dalstorage.cpp, src/game-server/character.hpp,
- src/account-server/characterdata.cpp,
- src/account-server/accounthandler.cpp,
- src/account-server/characterdata.hpp: Handled money as part of the
- inventory.
- * src/game-server/inventory.hpp, src/game-server/inventory.cpp,
- src/game-server/buysell.cpp: Added money accessor to the inventory
- manager.
- * src/game-server/inventory.cpp: Fixed incorrect update message when
- merging item stacks and removing one of them.
- * src/game-server/character.cpp, src/game-server/buysell.cpp: Ensured
- cancelations do not enter an infinite loop of death.
- * src/defines.h, src/game-server/trade.cpp, src/game-server/trade.hpp,
- src/game-server/gamehandler.cpp: Involved money in trade handler.
- * src/scripting/lua.cpp, src/scripting/script.cpp,
- src/scripting/script.hpp, src/game-server/testing.cpp: Made it possible
- to load scripts from strings instead of files.
-
-2007-08-13 Eugenio Favalli <elv...@gm...>
-
- * accountserver.cbp, gameserver.cbp: Updated project files and added
- scripting engine.
-
-2007-08-13 Guillaume Melquiond <gui...@gm...>
-
- * src/bindings.i, src/script-squirrel.cpp, src/script-squirrel.h,
- src/skill.cpp, src/skill.h, scripts/init.rb: Deleted obsolete files.
- * configure.ac, src/Makefile.am, src/account-server/main-account.cpp,
- src/game-server/main-game.cpp, src/dal/sqlitedataprovider.cpp,
- src/dal/mysqldataprovider.cpp, src/account-server/dalstorage.cpp,
- src/account-server/dalstoragesql.hpp, src/dal/dataproviderfactory.cpp,
- src/account-server/accounthandler.cpp: Cleaned configuration. Removed
- obsolete SQL tables.
- * src/defines.h, src/Makefile.am, src/game-server/trade.cpp,
- src/game-server/trade.hpp, src/game-server/state.cpp,
- src/game-server/character.cpp, src/game-server/character.hpp,
- src/game-server/gamehandler.cpp, src/game-server/buysell.cpp,
- src/game-server/buysell.hpp: Implemented buy/sell handler.
- * src/scripting/lua.cpp, data/test.lua: Added a bit of buy/sell testing
- code.
-
-2007-08-11 Guillaume Melquiond <gui...@gm...>
-
- * src/scripting/lua.cpp: Added Lua functions for handling inventories.
- * data/test.lua: Tested them.
-
-2007-08-10 Guillaume Melquiond <gui...@gm...>
-
- * data/test.lua: Added Lua helper functions to simplify scripts.
- * src/game-server/testing.cpp, src/game-server/state.cpp,
- src/game-server/mapcomposite.cpp, src/game-server/mapcomposite.hpp:
- Associated scripts to maps.
- * src/scripting/lua.cpp, data/test.lua: Added Lua function for warping
- people around. Removed colon in NPC choice messages.
-
-2007-08-09 Guillaume Melquiond <gui...@gm...>
-
- * src/game-server/inventory.cpp: Fixed item move toward a not yet
- existing slot.
- * src/skill.h, src/net/connectionhandler.cpp: Removed useless
- references to script header.
- * src/script.cpp, src/script.h: Removed old scripting interface.
- * src/resourcemanager.cpp: Allowed binary files to be used as strings.
- * src/scripting/script.cpp, src/scripting/script.hpp: Added new
- scripting interface.
- * src/configure.ac, src/Makefile.am, src/scripting/lua.cpp: Added Lua
- scripting engine.
- * src/game-server/npc.cpp, src/game-server/npc.hpp,
- src/game-server/testing.cpp: Converted NPC class to scripting engine.
- * data/test.lua: Converted testing NPC to Lua.
-
-2007-08-08 Guillaume Melquiond <gui...@gm...>
-
- * src/net/messageout.hpp, src/net/messageout.cpp: Changed argument
- types to generic int.
- * src/game-server/inventory.cpp, src/game-server/inventory.hpp,
- src/defines.h, src/game-server/gamehandler.cpp: Added protocol for
- moving objects between slots of inventory.
- * src/game-server/state.cpp: Fixed position of the cleaning bit for
- looks, so that it actually fits into network data.
-
-2007-08-01 Guillaume Melquiond <gui...@gm...>
-
- * src/game-server/itemmanager.cpp: Ensured equipment items cannot
- stack.
- * src/game-server/inventory.hpp, src/game-server/inventory.cpp:
- Improved equipment change so that no empty slot is used, unless really
- needed. Ensured equip and unequip do not modify inventory when they
- fail in non-delayed mode. Simplified and robustified code. Added
- notification on changes of looks.
-
-2007-07-31 Guillaume Melquiond <gui...@gm...>
-
- * src/defines.h, src/game-server/inventory.hpp,
- src/game-server/gamehandler.cpp, src/game-server/inventory.cpp: Added
- protocol for removing equipment. Compressed inventory message a bit.
-
-2007-07-29 Guillaume Melquiond <gui...@gm...>
-
- * src/game-server/mapreader.cpp, src/game-server/map.cpp,
- src/game-server/map.hpp, src/game-server/mapcomposite.cpp: Revert to
- the old pathfinding system without collision with beings, as the new
- one is too cpu intensive.
- * src/net/messageout.hpp, src/net/messageout.cpp: Allowed cancellation
- of outgoing messages.
- * src/game-server/inventory.hpp, src/game-server/inventory.hpp: Allowed
- delayed changes of inventories.
- * src/defines.h, src/Makefile.am, src/game-server/trade.cpp,
- src/game-server/trade.hpp, src/game-server/state.cpp,
- src/game-server/character.cpp, src/game-server/character.hpp,
- src/game-server/gamehandler.cpp: Added support for trading.
-
-2007-07-28 Guillaume Melquiond <gui...@gm...>
-
- * src/account-server/storage.hpp, src/account-server/dalstorage.cpp,
- src/account-server/dalstorage.hpp: Stored channel IDs as unsigned data.
- * src/src/account-server/dalstoragesql.hpp,
- src/chat-server/chatchannel.hpp: Assumed channels withpassword are
- private.
- * src/chat-server/chatclient.hpp, src/chat-server/chatchannel.cpp:
- Added to client the channels it is connected to.
- * src/chat-server/chatchannelmanager.cpp,
- src/chat-server/chathandler.cpp, src/account-server/serverhandler.cpp,
- src/chat-server/chatchannelmanager.hpp: Replaced user names by client
- pointers when handling channels, in order to reduce lookups in
- ChatHandler::sendInChannel.
-
-2007-07-25 Guillaume Melquiond <gui...@gm...>
-
- * src/game-server/movingobject.hpp: Added missing accessor, compacted
- object, and used generic integer in signatures.
- * src/defines.h, src/game-server/state.cpp: Added being speed to
- protocol.
- * src/game-server/spawnarea.cpp, src/game-server/accountconnection.cpp:
- Halved speed of maggots. Reduced speed of characters, so that they do
- not travel much more than one tile per data round-trip.
-
-2007-07-25 Bjørn Lindeijer <bj...@li...>
-
- * src/chat-server/chathandler.hpp,
- src/chat-server/chatchannelmanager.cpp,
- src/chat-server/chatchannel.cpp,
- src/chat-server/chatchannelmanager.hpp,
- src/chat-server/chatchannel.hpp, src/chat-server/chathandler.cpp,
- src/account-server/serverhandler.cpp,
- src/account-server/dalstorage.cpp: Removed a host of unnecessary
- methods from ChatChannelManager.
-
-2007-07-23 Guillaume Melquiond <gui...@gm...>
-
- * src/game-server/monster.hpp, src/game-server/state.cpp: Sent proper
- monster identifiers.
- * src/resourcemanager.cpp: Enabled symlinks to data directory.
- * src/game-server/accountconnection.cpp,
- src/game-server/gamehandler.hpp, src/game-server/accountconnection.hpp,
- src/account-server/serverhandler.cpp: Commented out unused guild code.
- It should not have been handled by the game server anyway.
- * src/game-server/mapcomposite.hpp: Removed slow member, if it were to
- be implemented.
- * src/game-server/gamehandler.cpp, src/game-server/npc.hpp,
- src/game-server/state.cpp, src/Makefile.am, src/defines.h: Added NPC
- support.
- * src/game-server/testing.cpp: Added a test NPC.
-
-2007-07-20 Bjørn Lindeijer <bj...@li...>
-
- * src/chat-server/chatclient.hpp, src/chat-server/chathandler.cpp,
- src/Makefile.am: Separated ChatClient class from chathandler.cpp.
- * src/chat-server/chathandler.cpp, src/chat-server/chathandler.hpp:
- Cleaned up handling of messages, defining a method for each handled
- message.
- * src/account-server/guildmanager.cpp, src/account-server/guild.cpp,
- src/account-server/guildmanager.hpp, src/account-server/guild.hpp:
- Some code formatting cleanup and corrected headers.
-
-2007-07-17 Bjørn Lindeijer <bj...@li...>
-
- * src/chat-server/chathandler.hpp,
- src/chat-server/chatchannelmanager.cpp,
- src/chat-server/chatchannel.cpp,
- src/chat-server/chatchannelmanager.hpp,
- src/chat-server/chatchannel.hpp, src/chat-server/chathandler.cpp,
- src/account-server/serverhandler.cpp,
- src/account-server/dalstorage.cpp,
- src/game-server/accountconnection.hpp: Some more cleanup of chat
- handler related code.
-
-2007-07-17 Eugenio Favalli <elv...@gm...>
-
- * gameserver.cbp, src/game-server/mapmanager.cpp,
- src/game-server/mapreader.cpp, src/game-server/mapreader.hpp,
- src/game-server/testing.cpp, src/utils/xml.hpp: Implemented loading of
- warp and spawn areas from map files.
-
-2007-07-15 Bjørn Lindeijer <bj...@li...>
-
- * src/chat-server/chatchannelmanager.cpp,
- src/chat-server/chatchannelmanager.hpp,
- src/chat-server/chathandler.cpp: Some cleaning up of the chat channel
- manager code.
-
-2007-07-14 Guillaume Melquiond <gui...@gm...>
-
- * src/defines.h, src/game-server/state.cpp: Reduced size of equipment
- packets. Fixed packet sending on object distance change.
-
-2007-07-12 Guillaume Melquiond <gui...@gm...>
-
- * src/game-server/item.hpp, src/game-server/inventory.cpp,
- src/game-server/inventory.hpp: Fixed naming of equipment slot.
- * src/game-server/object.hpp: Added update flag for looks.
- * src/game-server/itemmanager.cpp: Added field loaded for sprite_id.
- * src/defines.h, src/game-server/state.cpp: Added support for visible
- equipment.
-
-2007-07-08 Guillaume Melquiond <gui...@gm...>
-
- * src/game-server/being.cpp: Lowered messages to debug level.
- * src/game-server/deathlistener.hpp: Made members non-abstract, so that
- inheritors do not have to define them when they do not use them.
- * data/monsters.xml: Added sample monster database.
- * src/game-server/monstermanager.cpp, src/game-server/main-game.cpp,
- src/game-server/monstermanager.hpp: Added manager for monster species.
- * src/game-server/spawnarea.cpp, src/game-server/spawnarea.hpp,
- src/game-server/testing.cpp: Specified the monster specy being spawned.
- * src/game-server/monster.cpp, src/game-server/monster.hpp: Added
- monster drops.
- * src/game-server/gamehandler.cpp: Update account database on
- unexpected client disconnection.
-
-2007-07-07 Guillaume Melquiond <gui...@gm...>
-
- * src/common/inventorydata.hpp: Fixed missing include.
- * src/game-server/mapcomposite.cpp, src/game-server/mapcomposite.hpp:
- Moved implementation details out of the header.
- * src/game-server/mapmanager.cpp, src/game-server/mapmanager.hpp,
- src/game-server/state.cpp, src/game-server/state.hpp: Merged LoadedMap
- and MapComposite classes. Delegated handling of composite maps to the
- map manager.
- * src/game-server/testing.cpp, src/game-server/thing.hpp,
- src/game-server/spawnarea.cpp, src/game-server/spawnarea.hpp,
- src/game-server/movingobject.cpp, src/game-server/monster.cpp,
- src/game-server/character.cpp, src/game-server/character.hpp,
- src/game-server/trigger.cpp, src/game-server/trigger.hpp,
- src/gamehandler.cpp: Simplified code by using map pointers only,
- instead of using both map IDs and map pointers.
- * src/game-server/main-game.cpp, src/game-server/inventory.cpp,
- src/game-server/itemmanager.cpp, src/game-server/itemmanager.hpp,
- src/game-server/mapmanager.cpp, src/game-server/mapmanager.hpp,
- src/game-server/state.cpp, src/game-server/state.hpp,
- src/game-server/accountconnection.cpp, src/game-server/gamehandler.cpp:
- Changed singleton managers from classes to namespace interfaces.
- Removed global pointers. Moved private members to implementation files.
- * src/game-server/state.cpp, src/game-server/being.cpp,
- src/game-server/movingobject.cpp, src/game-server/movingobject.hpp:
- Fixed teleportation hack caused by caching of pathfinder results.
-
-2007-07-03 Guillaume Melquiond <gui...@gm...>
-
- * src/account-server/dalstorage.cpp: Added error messages for failed
- SQL requests when retrieving character. Added check for failed
- character when retrieving account. Added check for corrupted inventory.
-
-2007-07-02 Guillaume Melquiond <gui...@gm...>
-
- * src/account-server/storage.cpp, src/account-server/storage.hpp: Moved
- trivial accessors to header file. Removed C-like prototypes and harmful
- exception specifications.
- * src/account-server/dalstorage.cpp, src/account-server/dalstorage.hpp:
- Factored duplicate query code. Removed C-like prototypes and harmful
- exception specifications.
- * src/account-server/dalstorage.cpp: Added support for loading
- inventory from database. Fixed mysqlism for multi-insertion.
-
-2007-07-02 Eugenio Favalli <elv...@gm...>
-
- * accountserver.cbp, gameserver.cbp: Updated project files.
-
-2007-07-01 Guillaume Melquiond <gui...@gm...>
-
- * src/abstractcharacterdata.cpp, src/abstractcharacterdata.hpp,
- src/serialize/characterdata.hpp, src/account-server/serverhandler.cpp,
- src/game-server/accountconnection.cpp: Removed multiple inheritance
- mechanism for serialization. Replaced it by a less cumbersome template
- interface.
- * src/common/inventorydata.hpp: Set inventory structures in a directory
- common to both servers.
- * src/account-server/dalstorage.cpp: Commented out unused code.
- * src/Makefile.am: Taken new files into account.
- * src/account-server/characterdata.cpp, src/game-server/character.cpp,
- src/account-server/characterdata.hpp, src/game-server/character.hpp:
- Removed new inventory code, as it was not doing anything.
- * src/inventory.cpp: Reverted to the old code, as it was working just
- fine.
- * src/game-server/state.cpp: Added assertions to detect insertion and
- removal of objects at updating time.
- * src/game-server/accountconnection.cpp, src/game-server/character.cpp,
- src/defines.h, src/account-server/characterdata.hpp,
- src/account-server/characterdata.cpp, src/serialize/characterdata.hpp:
- Removed automatic (de)serialization of ID, so that it can be properly
- used, and of name, so that it does not waste bandwidth.
- * src/account-server/serverhandler.cpp: Reverted to the scheme based on
- character ID, so that runtime character data are persistent again.
- * src/account-server/dalstoragesql.hpp,
- src/account-server/dalstorage.cpp: Added support for storing inventory
- in database.
-
-2007-06-28 Philipp Sehmisch <tm...@cr...>
-
- * src/defines.h, src/game-server/state.cpp: Attack direction is now
- included in being attack messages.
- * src/game-server/accountconnection.cpp: Player characters are now
- spawned with full hit points (todo: save current hit points in
- database when a character logs out so that players can't heal by
- logging in and out).
- * src/game-server/being.cpp, src/game-server/deathlistener.hpp,
- src/game-server/spawnarea.hpp: Death listeners are now informed when
- a being object is deleted.
- * src/game-server/being.hpp: Being::damage() now returns the resulting
- loss of hit points.
- * src/game-server/character.cpp: Characters hit circle size is now
- initialized properly.
- * src/game-server/map.cpp, src/game-server/map.hpp,
- src/game-server/mapcomposite.cpp, src/game-server/mapcomposite.hpp,
- src/game-server/mapreader.cpp, src/state.cpp: Pathfinding now takes
- the tiles that are occupied by beings into account. Map::find_path()
- now has an optional argument that sets the maximum path cost.
- * src/game-server/monster.cpp, src/game-server/monster.hpp,
- src/game-server/spawnarea.cpp, src/game-server/thing.hpp: Implemented
- monster attacking and provisoric monster AI. Monster now chase and
- attack players that hurt them.
- * src/game-server/spawnarea.cpp: Monsters are no longer spawned on
- unwalkable tiles.
-
-2007-06-28 Guillaume Melquiond <gui...@gm...>
-
- * src/game-server/spawnarea.cpp: Delegated creature insertion to the
- State class so that it does not disturb object updating.
-
-2007-06-26 Eugenio Favalli <elv...@gm...>
-
- * accountserver.cbp: Updated project file.
-
-2007-06-25 Eugenio Favalli <elv...@gm...>
-
- * accountserver.cbp, gameserver.cbp: Fixed include directories and
- updated project files.
-
-2007-06-16 Guillaume Melquiond <gui...@gm...>
-
- * src/utils/mathutils.cpp: Fixed miscompilation of rsqrt due to type
- aliasing and sped up sqrt.
- * src/game-server/character.cpp: Fixed initial attribute status.
-
-2007-04-28 David Athay <ko...@gm...>
-
- * src/chat-server/chathandler.cpp,
- src/account-server/guildmanager.cpp: Fixed bug where
- the guild creator was never added to the guild.
-
-2007-04-22 David Athay <ko...@gm...>
-
- * src/chat-server/chathandler.cpp,
- src/account-server/guildmanager.cpp,
- src/account-server/guildmanager.hpp,
- src/account-server/serverhandler.cpp,
- src/account-server/storage.hpp, src/account-server/dalstorage.cpp,
- src/account-server/dalstorage.hpp, src/defines.h,
- src/game-server/gamehandler.cpp,
- src/game-server/accountconnection.cpp,
- src/game-server/accountconnection.hpp: Added quitting guilds.
-
-2007-04-11 Philipp Sehmisch <tm...@cr...>
-
- * src/game-server/being.cpp: Using effective attributes instead of base
- attributes for damage calculation.
-
-2007-04-05 David Athay <ko...@gm...>
-
- * src/chat-server/chathandler.hpp,
- src/chat-server/chathandler.cpp,
- src/account-server/guildmanager.cpp,
- src/account-server/guildmanager.hpp, src/defines.h:
- Added user joining and leaving, plus stopped non guild members
- joining guild channels.
-
-2007-03-31 Bjørn Lindeijer <bj...@li...>
-
- * src/Makefile.am, src/game-server/testing.cpp,
- src/game-server/spawnarea.cpp, src/game-server/state.hpp,
- src/game-server/spawnarea.hpp, src/game-server/monster.cpp,
- src/game-server/monster.hpp, src/game-server/trigger.hpp: Made a start
- with having monsters spawn using a SpawnArea.
- * src/net/messagein.hpp, src/net/messagein.cpp,
- src/net/messageout.hpp, src/net/messageout.cpp,
- src/net/connectionhandler.cpp, src/net/netcomputer.cpp: Moved writing
- of messages into MessageIn and MessageOut and tweaked the printing of
- the message ID.
- * src/Makefile.am, src/game-server/spawnarea.cpp,
- src/game-server/being.cpp, src/game-server/spawnarea.hpp,
- src/game-server/monster.cpp, src/game-server/being.hpp,
- src/game-server/movingobject.hpp, src/game-server/monster.hpp,
- src/game-server/deathlistener.hpp: Added a DeathListener interface,
- which the SpawnArea now uses to get notified about dying beings, so
- that it knows when to spawn more.
- * src/game-server/spawnarea.cpp, src/game-server/spawnarea.hpp: Took
- into account spawn rate.
-
-2007-03-30 Bjørn Lindeijer <bj...@li...>
-
- * src/Makefile.am, src/game-server/thing.hpp,
- src/game-server/movingobject.cpp, src/game-server/being.hpp,
- src/game-server/movingobject.hpp, src/game-server/trigger.cpp,
- src/game-server/object.cpp, src/game-server/trigger.hpp,
- src/game-server/object.hpp: Separated the Thing and MovingObject
- classes from the Object module.
-
-2007-03-30 Philipp Sehmisch <tm...@cr...>
-
- * src/controller.cpp, src/controller.h, src/game-server/monster.cpp,
- src/game-server/monster.hpp, src/game-server/testing.cpp,
- src/Makefile.am: Renamed "Controlled" to "Monster" and moved it into
- the game-server directory.
-
-2007-03-30 David Athay <ko...@gm...>
-
- * src/chat-server/chathandler.cpp,
- src/chat-server/chathandler.hpp,
- src/account-server/accounthandler.hpp,
- src/account-server/guildmanager.cpp,
- src/account-server/guildmanager.hpp,
- src/account-server/guild.cpp, src/account-server/guild.hpp,
- src/account-server/serverhandler.cpp,
- src/account-server/serverhandler.hpp,
- src/account-server/storage.hpp, src/account-server/storage.cpp,
- src/account-server/characterdata.hpp,
- src/game-server/accountconnection.cpp,
- src/defines: Added rejoining guilds the player belongs to.
- * src/account-server/serverhandler.hpp,
- src/chat-server/chathandler.cpp: Player now joins guild channels
- upon connecting to the chat server.
- * src/acccount-server/dalstorage.cpp: Fixed bug with creating
- guilds.
-
-2007-03-25 David Athay <ko...@gm...>
-
- * src/chat-server/chathandler.cpp,
- src/chat-server/chathandler.hpp,
- src/account-server/serverhandler.cpp,
- src/account-server/serverhandler.hpp,
- src/account-server/dalstorage.cpp,
- src/account-server/dalstorage.hpp,
- src/defines.h, src/game-server/gamehandler.cpp,
- src/game-server/gamehandler.hpp,
- src/game-server/accountconnection.cpp: Implemented inviting
- users to guilds.
-
-2007-03-23 Eugenio Favalli <elv...@gm...>
-
- * tmw.cbp: Updated and fixed Code::Blocks project files.
-
-2007-03-23 Bjørn Lindeijer <bj...@li...>
-
- * src/point.h, src/configuration.cpp,
- src/account-server/accounthandler.cpp,
- src/account-server/accountclient.cpp, src/utils/stringfilter.cpp,
- src/abstractcharacterdata.hpp, src/game-server/being.cpp,
- src/game-server/character.cpp, src/game-server/character.hpp: Mostly
- fixed some compilation issues.
-
-2007-03-23 Philipp Sehmisch <tm...@cr...>
-
- * src/account-server/accounthandler.cpp, src/defines.h,
- src/game-server/character.cpp, src/game-server/character.hpp
- src/game-server/state.cpp: Implemented communication of attribute
- changes from server to client.
- * src/game-server/itemmanager.cpp: Another case of inconsistent order
- of attributes.
-
-2007-03-22 Philipp Sehmisch <tm...@cr...>
-
- * src/account-server/dalstorage.cpp: Fixed a bug that caused the
- character attributes to become mixed up.
-
-2007-03-20 Philipp Sehmisch <tm...@cr...>
-
- * src/account-server/accounthandler.cpp, src/defines.h: Removed check
- for difference between lowest and highest attribute at char creation.
- * src/account-server/dalstorage.cpp,
- src/account-server/dalstorage.hpp: Unified order of basic attributes.
-
-2007-03-20 Rogier Polak <rog...@gm...>
-
- * src/account-server/accounthandler.cpp, src/utils/tokencollector.hpp,
- src/game-server/gamehandler.cpp: Corrected a bug, that occurred when
- connecting to the game-server. Made member functions of TokenCollector
- less fragile.
-
-2007-03-19 Philipp Sehmisch <tm...@cr...>
-
- * src/game-server/gamehandler.cpp, src/game-server/gamehandler.hpp,
- src/utils/tokendispenser.hpp, src/account-server/accountclient.cpp,
- src/account-server/accounthandler.cpp: Fixed two compiler warnings
- and corrected a spelling error.
-
-2007-03-19 David Athay <ko...@gm...>
-
- * src/Makefile.am, src/account-server/accounthandler.cpp,
- src/account-server/characterdata.hpp,
- src/account-server/dalstorage.cpp,
- src/account-server/dalstorage.hpp,
- src/account-server/main-account.cpp,
- src/account-server/serverhandler.cpp,
- src/account-server/serverhandler.hpp,
- src/account-server/storage.hpp, src/chat-server/chathandler.cpp,
- src/account-server/guild.cpp, src/account-server/guild.h,
- src/account-server/guildmanager.cpp,
- src/account-server/guildmanager.hpp,
- src/chat-server/chathandler.hpp, src/defines.h,
- src/game-server/accountconnection.cpp,
- src/game-server/accountconnection.hpp,
- src/game-server/gamehandler.cpp, src/game-server/gamehandler.hpp,
- src/game-server/mapmanager.cpp, src/game-server/mapmanager.hpp,
- src/net/netcomputer.cpp : Add first stage of guild system.
-
-2007-03-18 Rogier Polak <rog...@gm...>
-
- * src/net/netcomputer.cpp: Corrected the debug message for big-endian
- architectures.
- * src/defines.h, src/Makefile.am,
- src/account-server/accountclient.hpp,
- src/account-server/accountclient.cpp,
- src/account-server/accounthandler.hpp,
- src/account-server/accounthandler.cpp,
- src/account-server/serverhandler.hpp,
- src/account-server/serverhandler.cpp,
- src/game-server/accountconnection.cpp,
- src/game-server/gamehandler.hpp, src/game-server/gamehandler.cpp,
- src/utils/tokencollector.hpp: Added a TokenCollector class, which
- matches tokens used for moving clients between servers. Improved the
- handling of connecting clients for the account-server.
-
-2007-03-15 Philipp Sehmisch <tm...@cr...>
-
- * src/account-server/accounthandler.cpp: Set the default map
- position of new characters to a value that makes more sense.
- * src/defines.h, src/account-server/dalstorage.cpp,
- src/account-server/dalstorage.hpp: Implemented new basic attribute
- system.
- * src/controller.cpp, src/controller.hpp, src/defines.h,
- src/game-server/being.cpp, src/game-server/being.hpp,
- src/game-server/character.cpp, src/game-server/character.hpp,
- src/gameserver/item.hpp, src/gameserver/itemmanager.hpp,
- src/gameserver/testing.cpp:
- Removed attribute modifiers, unified basic and derived attributes,
- storing attributes in a vector, renamed some attribute identifiers,
- removed identifiers for derived attributes that aren't needed yet.
-
-2007-03-14 Rogier Polak <rog...@gm...>
-
- * src/abstractcharacterdata.hpp, src/abstractcharacterdata.cpp,
- src/defines.h, src/Makefile.am, src/playerdata.hpp,
- src/playerdata.cpp, src/account-server/accounthandler.cpp,
- src/account-server/characterdata.hpp,
- src/account-server/characterdata.cpp,
- src/account-server/dalstorage.cpp,
- src/account-server/serverhandler.cpp,
- src/game-server/accountconnection.hpp,
- src/game-server/accountconnection.cpp, src/game-server/being.hpp,
- src/game-server/being.cpp, src/game-server/character.hpp,
- src/game-server/character.cpp, src/game-server/gamehandler.hpp,
- src/game-server/gamehandler.cpp, src/game-server/inventory.hpp,
- src/game-server/inventory.cpp, src/game-server/item.hpp,
- src/game-server/item.cpp, src/game-server/itemmanager.cpp,
- src/game-server/mapcomposite.hpp, src/game-server/mapcomposite.cpp,
- src/game-server/object.hpp, src/game-server/player.hpp,
- src/game-server/player.cpp, src/game-server/state.hpp,
- src/game-server/state.cpp, src/game-server/trigger.cpp: Renamed the
- Player class to Character, which now inherits from Being and
- AbstractCharacterData. (Changed as little as possible of basic damage
- calculation code)
-
-2007-03-11 Philipp Sehmisch <tm...@cr...>
-
- * src/controller.cpp, src/controller.h, src/gameserver/being.cpp,
- src/gameserver/being.hpp, src/gameserver/item.hpp,
- src/gameserver/itemmanager.cpp, src/gameserver/player.cpp,
- src/gameserver/player.hpp, src/gameserver/testing.cpp: Implemented
- stat handling infrastructure and basic damage calculation.
- src/gameserver/being.cpp: Increased attack zone (Sorry, I couldn't
- hit nothing and that annoyed me during testing)
-
-2007-03-10 Rogier Polak <rog...@gm...>
-
- * src/Makefile.am, src/account-server/accounthandler.cpp,
- src/account-server/main-account.cpp,
- src/account-server/serverhandler.cpp, src/chat-server/chathandler.cpp,
- src/game-server/accountconnection.cpp,
- src/game-server/gamehandler.cpp, src/game-server/main-game.cpp,
- src/utils/tokendispenser.hpp, src/utils/tokendispenser.cpp: Added a
- utility function for creating magic_tokens.
- * src/utils/processorutils.hpp, src/utils/processorutils.cpp,
- src/Makefile.am, src/account-server/main-account.cpp,
- src/game-server/main-game.cpp: Added a utils::processor namespace and
- a function to determine if, the processor the program is running on,
- is little-endian or big-endian.
- * src/net/connectionhandler.hpp, src/net/connectionhandler.cpp,
- src/net/netcomputer.cpp: Corrected the output of the overloaded
- operator << of the NetComputer class.
-
-2007-03-05 Rogier Polak <rog...@gm...>
-
- * src/defines.h, src/Makefile.am, src/abstractcharacterdata.hpp,
- src/abstractcharacterdata.cpp, src/account-server/account.hpp,
- src/account-server/account.cpp, src/account-server/accountclient.hpp
- src/account-server/accountclient.cpp,
- src/account-server/accounthandler.cpp,
- src/account-server/characterdata.hpp,
- src/account-server/characterdata.cpp,
- src/account-server/dalstorage.hpp, src/account-server/dalstorage.cpp
- src/account-server/dalstoragesql.hpp,
- src/account-server/serverhandler.hpp,
- src/account-server/serverhandler.cpp, src/account-server/storage.hpp
- src/game-server/accountconnection.cpp: Added an abstract base class
- for characterdata, in order to use the same serialize and deserialize
- functions on both the accountserver and the gameserver. Added the
- CharacterData class to the accountserver, a specialisation of
- characterdata for the accountserver. Renamed (raw)stats to attributes.
- * src/point.h, src/controller.cpp, src/game-server/testing.cpp,
- src/game-server/state.cpp: Added two constructors to the Point class.
- * src/utils/wingettimeofday.h, src/utils/timer.h: Set svn properties.
- * src/game-server/mapcomposite.cpp: Cleaned up a double deletion.
- * src/game-server/item.hpp: Added the member spriteId.
- * src/account-server/main-account.cpp, src/game-server/main-game.cpp:
- Modified the default log files (primarily for development purposes).
-
-2007-03-03 Bjørn Lindeijer <bj...@li...>
-
- * src/utils/mathutils.cpp, src/utils/mathutils.h,
- src/game-server/collisiondetection.hpp,
- src/game-server/collisiondetection.cpp: Use M_PI_2 instead of
- acos(0.0f) and FLT_MAX instead of 1.0E40f (which exceeded the maximum
- float value). Some cosmetics (whitespace and declaring variables where
- they are used).
-
-2007-03-03 Rogier Polak <rog...@gm...>
-
- * src/utils/mathutils.h, src/utils/mathutils.cpp,
- src/utils/fastsqrt.h, src/Makefile.am, src/game-server/main-game.cpp:
- Moved math utility functions to the namespace utils::math, added
- cached trigonomic functions.
- * src/game-server/collisiondetection.hpp, src/game-server/being.cpp,
- src/game-server/collisiondetection.cpp: Implemented an alternate
- collision-detection function, for disks and circle-sectors.
-
-2007-03-03 Philipp Sehmisch <tm...@cr...>
-
- * src/controller.cpp, src/controller.h, src/defines.h,
- src/gameserver/being.cpp, src/gameserver/being.hpp,
- src/gameserver/gamehandler.cpp, src/gameserver/object.hpp,
- src/gameserver/player.cpp, src/gameserver/player.hpp,
- src/gameserver/state.cpp, src/gameserver/testing.cpp,
- src/point.h: Implemented being death, removal of dead mobs and
- sitting.
-
-2007-03-01 Bjørn Lindeijer <bj...@li...>
-
- * src/Makefile.am: Updated with new collision related module.
-
-2007-02-27 Philipp Sehmisch <tm...@cr...>
-
- * src/account-server/dalstorage.cpp,
- src/account-server/dalstoragesql.hpp,
- src/chat-server/chatchannel.cpp,
- src/chat-server/chatchannel.hpp,
- src/chat-server/chatchannelmanager.cpp,
- src/chat-server/chatchannelmanager.hpp,
- src/chat-server/chathandler.cpp,
- src/dal/mysqldataprovider.cpp,
- src/dal/pqdataprovider.cpp
- src/dal/qulitedataprovider.cpp,
- src/defines.h: Implementation of chat channels by Trapdoor.
-
-2007-02-25 Philipp Sehmisch <tm...@cr...>
-
- * src/game-server/collisiondetection.cpp,
- src/game-server/collisiondetection.hpp,
- src/utils/fastsqrt.h: Added a function to calculate collisions between
- circles and circle sectors.
- * src/being.cpp, src/object.hpp, src/testing.cpp: Improved hit
- detection by using said function.
-
-2007-02-23 Rogier Polak <rog...@gm...>
-
- * src/chat-server/chathandler.cpp: Added disconnect.
- * src/game-server/gamehandler.cpp,
- src/game-server/accountconnection.cpp: Bugfixes related to
- switch_character.
- * src/account-server/main-account.cpp, src/game-server/main-game.cpp:
- Small modification to accomodate MS-Windows.
-
-2007-02-04 Rogier Polak <rog...@us...>
-
- * src/chat-server/chathandler.cpp,
- src/account-server/accounthandler.hpp,
- src/account-server/serverhandler.cpp,
- src/account-server/dalstorage.cpp, src/account-server/storage.hpp,
- src/account-server/accounthandler.cpp,
- src/account-server/dalstorage.hpp, src/defines.h, src/playerdata.cpp,
- src/playerdata.hpp, src/game-server/gamehandler.cpp,
- src/game-server/accountconnection.cpp,
- src/game-server/accountconnection.hpp: Added support for switching
- character by reconnecting to the account server and fixed the issue
- where a client is not logged in after registering (patch applied by
- Bjørn Lindeijer).
-
-2007-02-01 Rogier Polak <rog...@us...>
-
- * src/account-server/main-account.cpp,
- src/account-server/dalstorage.cpp, src/account-server/account.cpp,
- src/game-server/mapmanager.cpp, src/game-server/main-game.cpp:
- Added graceful server shutdown, chose some more sane variables names
- for SQL queries and fixed a possible character collision error (patch
- applied by Bjørn Lindeijer).
- * src/game-server/object.cpp, src/game-server/object.hpp: Added
- caching of paths (patch applied by Bjørn Lindeijer).
-
-2007-01-14 Björn Steinbrink <B.S...@gm...>
-
- * src/utils/logger.h: Un...
[truncated message content] |
