Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #634 from ennorehling/develop 

Letzte Reste des Eressea-Namens entfernen.
This commit is contained in:
Enno Rehling 2017-01-22 21:35:22 +01:00 committed by GitHub
parent 4598bdf917 3a07d43321
commit 31b551aa1e
18 changed files with 57 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/e2/config.json
View File

@ -8,8 +8,6 @@
"jsreport"
],
"settings": {
"game.id": 2,
"game.name": "Eressea",
"orders.default": "work",
"NewbieImmunity": 8,
"modules.wormholes": true,

12
conf/e2/config.xml
View File

@ -52,16 +52,4 @@
<xi:include href="config://default/names-zombies.xml"/>
<xi:include href="config://default/names-ghouls.xml"/>
<xi:include href="config://default/names-dragons.xml"/>
<strings>
<string name="newbie_info_game">
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
ERESSEA 2 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden.</text>
<text locale="en">Remember to send your orders to
eressea-server@eressea.kn-bremen.de with the subject ERESSEA 2 ORDERS.</text>
</string>
<string name="mailcmd">
<text locale="de">ERESSEA 2 BEFEHLE</text>
<text locale="en">ERESSEA 2 ORDERS</text>
</string>
</strings>
</eressea>

2
conf/e3/config.json
View File

@ -25,8 +25,6 @@
"jsreport"
],
"settings": {
"game.id": 3,
"game.name": "E3",
"orders.default": "work",
"database.gameid": 7,
"NewbieImmunity": 4,

12
conf/e3/config.xml
View File

@ -36,16 +36,4 @@
<rules>
<function name="wage" value="minimum_wage"/>
</rules>
<strings>
<string name="newbie_info_game">
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
ERESSEA 3 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden.</text>
<text locale="en">Remember to send your orders to
eressea-server@eressea.kn-bremen.de with the subject E3 ORDERS.</text>
</string>
<string name="mailcmd">
<text locale="de">ERESSEA 3 BEFEHLE</text>
<text locale="en">ERESSEA 3 ORDERS</text>
</string>
</strings>
</eressea>

2
conf/e4/config.json
View File

@ -25,8 +25,6 @@
"jsreport"
],
"settings": {
"game.id": 4,
"game.name": "Deveron",
"orders.default": "work",
"database.gameid": 7,
"NewbieImmunity": 4,

12
conf/e4/config.xml
View File

@ -36,16 +36,4 @@
<rules>
<function name="wage" value="minimum_wage"/>
</rules>
<strings>
<string name="newbie_info_game">
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
ERESSEA 4 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden.</text>
<text locale="en">Remember to send your orders to
eressea-server@eressea.kn-bremen.de with the subject ERESSEA 4 ORDERS.</text>
</string>
<string name="mailcmd">
<text locale="de">ERESSEA 4 BEFEHLE</text>
<text locale="en">ERESSEA 4 ORDERS</text>
</string>
</strings>
</eressea>

4
res/core/de/strings.xml
View File

@ -6,6 +6,10 @@
_x: preposition (15 /Schlumpf/schwerter)
_a: including article (ein Schlumpf, a smurf)
-->
<string name="mailcmd">
<text locale="de">BEFEHLE</text>
<text locale="en">ORDERS</text>
</string>
<string name="vortex">
<text locale="de">Wirbel</text>
<text locale="en">vortex</text>

10
res/core/messages.xml
View File

@ -1,5 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<messages>
<message name="newbie_info_game" section="events">
<type>
<arg name="subject" type="string"/>
<arg name="email" type="string"/>
</type>
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
$subject an $email zu senden.</text>
<text locale="en">Remember to send your orders to
$email with the subject ${subject}.</text>
</message>
<message name="parse_error" section="errors">
<type>
<arg name="unit" type="unit"/>

69
res/e3a/equipment.xml
View File

@ -1,78 +1,9 @@
<?xml version="1.0"?>
<equipment>
<!-- equipment given to new units -->
<set name="new_demon_unit">
<!--skill name="stamina" level="6"/-->
</set>
<set name="new_troll_unit">
<!--skill name="stamina" level="2"/-->
</set>
<set name="seaserpent_spoils">
<item name="dragonblood" amount="2"/>
<item name="seaserpenthead" amount="1"/>
</set>
<set name="goblin_1">
<skill name="melee" level="7"/>
<skill name="stamina" level="3"/>
<item name="sword" amount="1"/>
<item name="shield" amount="1"/>
<item name="chainmail" amount="1"/>
</set>
<set name="troll_1">
<skill name="melee" level="7"/>
<skill name="stamina" level="3"/>
<item name="sword" amount="1"/>
<item name="shield" amount="1"/>
<item name="plate" amount="1"/>
</set>
<set name="front_1">
<skill name="melee" level="7"/>
<skill name="stamina" level="3"/>
<item name="sword" amount="1"/>
<item name="shield" amount="1"/>
<item name="plate" amount="1"/>
</set>
<set name="front_2">
<skill name="melee" level="7"/>
<skill name="stamina" level="3"/>
<item name="sword" amount="1"/>
<item name="towershield" amount="1"/>
<item name="plate" amount="1"/>
</set>
<set name="rear_1">
<skill name="crossbow" level="7"/>
<skill name="stamina" level="3"/>
<item name="crossbow" amount="1"/>
<item name="shield" amount="1"/>
</set>
<set name="rear_2">
<skill name="crossbow" level="7"/>
<skill name="stamina" level="3"/>
<item name="crossbow" amount="1"/>
<item name="shield" amount="1"/>
</set>
<set name="dwarf_2">
<skill name="melee" level="7"/>
<skill name="stamina" level="3"/>
<item name="sword" amount="1"/>
<item name="shield" amount="1"/>
<item name="plate" amount="1"/>
</set>
<set name="halfling_2">
<skill name="crossbow" level="7"/>
<skill name="stamina" level="3"/>
<item name="rep_crossbow" amount="1"/>
</set>
</equipment>

2
scripts/eressea/e2/init.lua
View File

@ -11,7 +11,7 @@ return {
require('eressea.tunnels'),
require('eressea.ponnuki'),
require('eressea.astral'),
require('eressea.locales'),
-- require('eressea.locales'),
require('eressea.jsreport'),
require('eressea.ents'),
require('eressea.cursed')

4
src/creport.c
View File

@ -1510,9 +1510,7 @@ report_computer(const char *filename, report_context * ctx, const char *bom)
fprintf(F, "%d;Zeitalter\n", era);
fprintf(F, "\"%s\";Build\n", eressea_version());
if (mailto != NULL) {
// char mailcmd[64];
// snprintf(mailcmd, sizeof(mailcmd), "%s %d, %s", game_name(), game_id(), LOC(f->locale, "mailcmd"));
const char * mailcmd = LOC(f->locale, "mailcmd");
const char * mailcmd = get_mailcmd(f->locale);
fprintf(F, "\"%s\";mailto\n", mailto);
fprintf(F, "\"%s\";mailcmd\n", mailcmd);
}

17
src/kernel/config.c
View File

@ -803,12 +803,25 @@ void free_gamedata(void)
}
}
const char * game_name(void) {
const char * game_name(void)
{
const char * param = config_get("game.name");
return param ? param : global.gamename;
}
const char * game_name_upper(void)
{
static char result[32]; // FIXME: static result
char *r = result;
const char *param = game_name();
const char *c = param;
while (*c && (result+sizeof(result))>r) {
*r++ = (char)toupper(*c++);
}
*r = '\0';
return result;
}
int game_id(void) {
return config_get_int("game.id", 0);
}

1
src/kernel/config.h
View File

@ -50,6 +50,7 @@ extern "C" {
param_t getparam(const struct locale *lang);
const char * game_name(void);
const char * game_name_upper(void);
int game_id(void);
/* returns a value between [0..xpct_2], generated with two dice */

2
src/kernel/config.test.c
View File

@ -244,6 +244,8 @@ static void test_config_inifile(CuTest *tc) {
iniparser_set(ini, "game:name", "Eressea");
config_set_from(ini);
CuAssertStrEquals(tc, "Eressea", config_get("game.name"));
CuAssertStrEquals(tc, "Eressea", game_name());
CuAssertStrEquals(tc, "ERESSEA", game_name_upper());
CuAssertIntEquals(tc, 42, game_id());
iniparser_freedict(ini);
test_cleanup();

17
src/report.c
View File

@ -2081,19 +2081,24 @@ report_plaintext(const char *filename, report_context * ctx,
}
if (f->age <= 2) {
const char *s;
s = locale_getstring(f->locale, "newbie_info_game");
if (s) {
newline(out);
centre(out, s, true);
const char *email;
const char *subject;
email = config_get("game.email");
subject = get_mailcmd(f->locale);
m = msg_message("newbie_info_game", "email subject", email, subject);
if (m) {
nr_render(m, f->locale, buf, sizeof(buf), f);
msg_release(m);
centre(out, buf, true);
}
if ((f->options & want(O_COMPUTER)) == 0) {
f->options |= want(O_COMPUTER);
const char *s;
s = locale_getstring(f->locale, "newbie_info_cr");
if (s) {
newline(out);
centre(out, s, true);
}
f->options |= want(O_COMPUTER);
}
}
newline(out);

7
src/reports.c
View File

@ -1945,6 +1945,13 @@ static void eval_regions(struct opstack **stack, const void *userdata)
opush(stack, var);
}
const char *get_mailcmd(const struct locale *loc)
{
static char result[64]; // FIXME: static return buffer
snprintf(result, sizeof(result), "%s %d %s", game_name_upper(), game_id(), LOC(loc, "mailcmd"));
return result;
}
static void eval_trail(struct opstack **stack, const void *userdata)
{ /* order -> string */
const faction *report = (const faction *)userdata;

1
src/reports.h
View File

@ -129,6 +129,7 @@ extern "C" {
int stream_printf(struct stream * out, const char *format, ...);
int count_travelthru(struct region *r, const struct faction *f);
const char *get_mailcmd(const struct locale *loc);
#define GR_PLURAL 0x01 /* grammar: plural */
#define MAX_INVENTORY 128 /* maimum number of different items in an inventory */

10
tests/eressea.ini
View File

@ -1,10 +1,8 @@
[eressea]
base = .
report = reports
[game]
name = Eressea
id = 2
email = eressea-server@kn-bremen.de
verbose = 0
lomem = 0
debug = 0
memcheck = 0
locales = de,en
[lua]