forked from github/server
smaller message-fixes
This commit is contained in:
parent
1145f37975
commit
f02d8abf9a
|
@ -1355,7 +1355,7 @@ randomevents(void)
|
||||||
* Lieber sammeln lassen, bis sie mindestens 5% der Bevölkerung sind, und
|
* Lieber sammeln lassen, bis sie mindestens 5% der Bevölkerung sind, und
|
||||||
* dann erst auferstehen. */
|
* dann erst auferstehen. */
|
||||||
int undead = unburied / (rand() % 2 + 1);
|
int undead = unburied / (rand() % 2 + 1);
|
||||||
const race * rc;
|
const race * rc = NULL;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (!undead || r->age < 20) continue;
|
if (!undead || r->age < 20) continue;
|
||||||
|
@ -1395,7 +1395,7 @@ randomevents(void)
|
||||||
LOC(default_locale, rc_name(u->race, u->number!=1)), regionname(r, NULL));
|
LOC(default_locale, rc_name(u->race, u->number!=1)), regionname(r, NULL));
|
||||||
|
|
||||||
{
|
{
|
||||||
message * msg = msg_message("undeadrise", "region amount", r, undead);
|
message * msg = msg_message("undeadrise", "region", r);
|
||||||
add_message(&r->msgs, msg);
|
add_message(&r->msgs, msg);
|
||||||
for (u=r->units;u;u=u->next) freset(u->faction, FL_DH);
|
for (u=r->units;u;u=u->next) freset(u->faction, FL_DH);
|
||||||
for (u=r->units;u;u=u->next) {
|
for (u=r->units;u;u=u->next) {
|
||||||
|
@ -1474,7 +1474,7 @@ randomevents(void)
|
||||||
|
|
||||||
log_printf("%d Ents in %s.\n", u->number, regionname(r, NULL));
|
log_printf("%d Ents in %s.\n", u->number, regionname(r, NULL));
|
||||||
|
|
||||||
msg = msg_message("entrise", "region amount", r, u->number);
|
msg = msg_message("entrise", "region", r);
|
||||||
add_message(&r->msgs, msg);
|
add_message(&r->msgs, msg);
|
||||||
for (u=r->units;u;u=u->next) freset(u->faction, FL_DH);
|
for (u=r->units;u;u=u->next) freset(u->faction, FL_DH);
|
||||||
for (u=r->units;u;u=u->next) {
|
for (u=r->units;u;u=u->next) {
|
||||||
|
|
|
@ -14,6 +14,8 @@
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <eressea.h>
|
#include <eressea.h>
|
||||||
|
|
||||||
|
#ifdef ARENA_MODULE
|
||||||
#include "arena.h"
|
#include "arena.h"
|
||||||
|
|
||||||
/* modules include */
|
/* modules include */
|
||||||
|
@ -546,3 +548,4 @@ register_arena(void)
|
||||||
tt_register(&tt_caldera);
|
tt_register(&tt_caldera);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* def ARENA_MODULE */
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* vi: set ts=2:
|
/* vi: set ts=2:
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* Eressea PB(E)M host Copyright (C) 1998-2000
|
* Eressea PB(E)M host Copyright (C) 1998-2003
|
||||||
* Christian Schlittchen (corwin@amber.kn-bremen.de)
|
* Christian Schlittchen (corwin@amber.kn-bremen.de)
|
||||||
* Katja Zedel (katze@felidae.kn-bremen.de)
|
* Katja Zedel (katze@felidae.kn-bremen.de)
|
||||||
* Henning Peters (faroul@beyond.kn-bremen.de)
|
* Henning Peters (faroul@beyond.kn-bremen.de)
|
||||||
|
|
|
@ -32,7 +32,7 @@ typedef struct dirent {
|
||||||
char d_dir[_MAX_DIR];
|
char d_dir[_MAX_DIR];
|
||||||
char d_ext[_MAX_EXT];
|
char d_ext[_MAX_EXT];
|
||||||
long hnd;
|
long hnd;
|
||||||
};
|
} dirent;
|
||||||
|
|
||||||
DIR *opendir(const char *name);
|
DIR *opendir(const char *name);
|
||||||
struct dirent *readdir(DIR * thedir);
|
struct dirent *readdir(DIR * thedir);
|
||||||
|
|
|
@ -5,15 +5,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attributes", "common\attrib
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea\eressea.vcproj", "{B859D542-781E-4647-BCAB-3FE5ED077366}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea\eressea.vcproj", "{B859D542-781E-4647-BCAB-3FE5ED077366}"
|
||||||
ProjectSection(ProjectDependencies) = postProject
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
|
|
||||||
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
|
|
||||||
{79659D44-EC28-42B9-9475-6C0D62D0AAE0} = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
|
|
||||||
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
|
|
||||||
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
|
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
|
||||||
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
|
{79659D44-EC28-42B9-9475-6C0D62D0AAE0} = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
|
||||||
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
|
|
||||||
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
|
|
||||||
{EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
|
{EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
|
||||||
|
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
|
||||||
|
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
|
||||||
|
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
|
||||||
|
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
|
||||||
|
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
|
||||||
|
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common\gamecode\gamecode.vcproj", "{79659D44-EC28-42B9-9475-6C0D62D0AAE0}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common\gamecode\gamecode.vcproj", "{79659D44-EC28-42B9-9475-6C0D62D0AAE0}"
|
||||||
|
@ -30,14 +30,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common\kernel\ker
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapper", "mapper\mapper.vcproj", "{17F83AAB-352D-4F68-ADA6-09F36D86826F}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapper", "mapper\mapper.vcproj", "{17F83AAB-352D-4F68-ADA6-09F36D86826F}"
|
||||||
ProjectSection(ProjectDependencies) = postProject
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
|
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
|
||||||
{EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
|
{EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
|
||||||
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
|
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
|
||||||
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
|
|
||||||
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
|
|
||||||
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
|
|
||||||
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
|
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
|
||||||
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
|
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
|
||||||
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
|
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
|
||||||
|
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
|
||||||
|
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modules", "common\modules\modules.vcproj", "{601CF164-F483-4DE7-8014-64BDD30680B5}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modules", "common\modules\modules.vcproj", "{601CF164-F483-4DE7-8014-64BDD30680B5}"
|
||||||
|
@ -60,6 +60,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util\util.vc
|
||||||
ProjectSection(ProjectDependencies) = postProject
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlsplitter", "D:\Documents\eressea\src\freeze\tools\xmlsplitter.vcproj", "{8031178A-081B-4BFA-AA98-46A2B03A3202}"
|
||||||
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
|
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
|
||||||
|
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
|
||||||
|
EndProjectSection
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfiguration) = preSolution
|
GlobalSection(SolutionConfiguration) = preSolution
|
||||||
Debug = Debug
|
Debug = Debug
|
||||||
|
@ -108,6 +114,10 @@ Global
|
||||||
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Debug.Build.0 = Debug|Win32
|
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Debug.Build.0 = Debug|Win32
|
||||||
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.ActiveCfg = Release|Win32
|
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.ActiveCfg = Release|Win32
|
||||||
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.Build.0 = Release|Win32
|
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.Build.0 = Release|Win32
|
||||||
|
{8031178A-081B-4BFA-AA98-46A2B03A3202}.Debug.ActiveCfg = Debug|Win32
|
||||||
|
{8031178A-081B-4BFA-AA98-46A2B03A3202}.Debug.Build.0 = Debug|Win32
|
||||||
|
{8031178A-081B-4BFA-AA98-46A2B03A3202}.Release.ActiveCfg = Release|Win32
|
||||||
|
{8031178A-081B-4BFA-AA98-46A2B03A3202}.Release.Build.0 = Release|Win32
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<?xml version="1.0" encoding="iso-8859-1" ?>
|
||||||
|
<strings xmlns="http://eressea.upb.de/~eressea/xsd/strings.xsd">
|
||||||
<comment>
|
<comment>
|
||||||
_d: dativ (wir erklären allen /Trollen/ den Krieg)
|
_d: dativ (wir erklären allen /Trollen/ den Krieg)
|
||||||
_p: plural (13 /Trolle/)
|
_p: plural (13 /Trolle/)
|
||||||
|
@ -5,7 +7,6 @@
|
||||||
_a: including article (ein Troll, a troll)
|
_a: including article (ein Troll, a troll)
|
||||||
</comment>
|
</comment>
|
||||||
|
|
||||||
<strings>
|
|
||||||
<string name="Tresen">
|
<string name="Tresen">
|
||||||
<text locale="de">Tresen</text>
|
<text locale="de">Tresen</text>
|
||||||
<text locale="en">counter </text>
|
<text locale="en">counter </text>
|
||||||
|
@ -1917,9 +1918,6 @@
|
||||||
<text locale="de">ALLIANZ</text>
|
<text locale="de">ALLIANZ</text>
|
||||||
<text locale="en">ALLIANCE</text>
|
<text locale="en">ALLIANCE</text>
|
||||||
</string>
|
</string>
|
||||||
<string name="NACH">
|
|
||||||
<text locale="de">NACH</text>
|
|
||||||
</string>
|
|
||||||
<string name="PFLANZEN">
|
<string name="PFLANZEN">
|
||||||
<text locale="de">PFLANZEN</text>
|
<text locale="de">PFLANZEN</text>
|
||||||
</string>
|
</string>
|
||||||
|
@ -2099,7 +2097,6 @@
|
||||||
<text locale="de">Schaden</text>
|
<text locale="de">Schaden</text>
|
||||||
</string>
|
</string>
|
||||||
|
|
||||||
|
|
||||||
<comment>report newbie info</comment>
|
<comment>report newbie info</comment>
|
||||||
<string name="nr_nmr">
|
<string name="nr_nmr">
|
||||||
<text locale="de">Deine Partei hat letzte Runde keinen Zug
|
<text locale="de">Deine Partei hat letzte Runde keinen Zug
|
||||||
|
@ -3342,6 +3339,10 @@
|
||||||
<text locale="de">Schleieraura</text>
|
<text locale="de">Schleieraura</text>
|
||||||
<text locale="en">Veil</text>
|
<text locale="en">Veil</text>
|
||||||
</string>
|
</string>
|
||||||
|
<string name="blessedharvest">
|
||||||
|
<text locale="de">Segen der Erde</text>
|
||||||
|
<text locale="en">Blessed Harvest</text>
|
||||||
|
</string>
|
||||||
<string name="gwyrrdearnsilver">
|
<string name="gwyrrdearnsilver">
|
||||||
<text locale="de">Viehheilung</text>
|
<text locale="de">Viehheilung</text>
|
||||||
<text locale="en">Cattle Healing</text>
|
<text locale="en">Cattle Healing</text>
|
||||||
|
@ -3668,10 +3669,6 @@
|
||||||
<text locale="de">Schöne Träume</text>
|
<text locale="de">Schöne Träume</text>
|
||||||
<text locale="en">Pleasant Dreams</text>
|
<text locale="en">Pleasant Dreams</text>
|
||||||
</string>
|
</string>
|
||||||
<string name="blessedharvest">
|
|
||||||
<text locale="de">Segen der Erde</text>
|
|
||||||
<text locale="en">Blessed Harvest</text>
|
|
||||||
</string>
|
|
||||||
<string name="illaundestroymagic">
|
<string name="illaundestroymagic">
|
||||||
<text locale="de">Traumbilder entwirren</text>
|
<text locale="de">Traumbilder entwirren</text>
|
||||||
<text locale="en">Remove Dreams</text>
|
<text locale="en">Remove Dreams</text>
|
||||||
|
@ -3910,8 +3907,7 @@
|
||||||
</text>
|
</text>
|
||||||
<text locale="en">Combat medics are not the only ones
|
<text locale="en">Combat medics are not the only ones
|
||||||
who can help those who got injured during a
|
who can help those who got injured during a
|
||||||
battle. Druids are, with the help of a summons
|
battle. Druids are, with the help of a summons of
|
||||||
of
|
|
||||||
the Elemental Spirits Of Life, able to heal
|
the Elemental Spirits Of Life, able to heal
|
||||||
wounds, mend broken bones or even regenerate
|
wounds, mend broken bones or even regenerate
|
||||||
separated limbs as well.
|
separated limbs as well.
|
||||||
|
@ -4784,9 +4780,8 @@
|
||||||
</string>
|
</string>
|
||||||
<string name="shapeshift">
|
<string name="shapeshift">
|
||||||
<text locale="de">Mit Hilfe dieses arkanen Rituals
|
<text locale="de">Mit Hilfe dieses arkanen Rituals
|
||||||
vermag
|
vermag der Traumweber die wahre Gestalt einer Gruppe
|
||||||
der Traumweber die wahre Gestalt einer Gruppe zu
|
zu verschleiern. Unbedarften Beobachtern erscheint
|
||||||
verschleiern. Unbedarften Beobachtern erscheint
|
|
||||||
sie dann als einer anderen Rasse zugehörig.
|
sie dann als einer anderen Rasse zugehörig.
|
||||||
</text>
|
</text>
|
||||||
<text locale="en">With the help of this ritual the
|
<text locale="en">With the help of this ritual the
|
||||||
|
|
|
@ -1854,7 +1854,6 @@
|
||||||
<message name="entrise" section="events">
|
<message name="entrise" section="events">
|
||||||
<type>
|
<type>
|
||||||
<arg name="region" type="region"></arg>
|
<arg name="region" type="region"></arg>
|
||||||
<arg name="amount" type="int"></arg>
|
|
||||||
</type>
|
</type>
|
||||||
<text locale="de">"In $region($region) erschienen die Herren der Bäume."</text>
|
<text locale="de">"In $region($region) erschienen die Herren der Bäume."</text>
|
||||||
<text locale="fr">"In $region($region), the lords of the trees have risen."</text>
|
<text locale="fr">"In $region($region), the lords of the trees have risen."</text>
|
||||||
|
@ -1863,7 +1862,6 @@
|
||||||
<message name="undeadrise" section="events">
|
<message name="undeadrise" section="events">
|
||||||
<type>
|
<type>
|
||||||
<arg name="region" type="region"></arg>
|
<arg name="region" type="region"></arg>
|
||||||
<arg name="amount" type="int"></arg>
|
|
||||||
</type>
|
</type>
|
||||||
<text locale="de">"In $region($region) erhoben sich die Toten aus den Gräbern."</text>
|
<text locale="de">"In $region($region) erhoben sich die Toten aus den Gräbern."</text>
|
||||||
</message>
|
</message>
|
||||||
|
|
Loading…
Reference in New Issue