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

integration von katjas patch

This commit is contained in:
Enno Rehling 2001-05-27 08:37:56 +00:00
parent 389a3adb18
commit 378e228707
5 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/gamecode/study.c
View File

@ -141,7 +141,7 @@ teach_unit(unit * teacher, unit * student, int teaching, skill_t sk, boolean rep
* von schon gelernten Tagen zum max(30 Tage pro Mann) betragen. */ * von schon gelernten Tagen zum max(30 Tage pro Mann) betragen. */
if (magic_lowskill(student)){ if (magic_lowskill(student)){
cmistake(teacher, teacher->thisorder, 274, MSG_EVENT); cmistake(teacher, teacher->thisorder, 292, MSG_EVENT);
return 0; return 0;
} }
@ -169,9 +169,10 @@ teach_unit(unit * teacher, unit * student, int teaching, skill_t sk, boolean rep
* && inside_building(student)!=NULL) */ * && inside_building(student)!=NULL) */
&& student->building && student->building->type == &bt_academy) && student->building && student->building->type == &bt_academy)
{ {
int j = study_cost(teacher, sk); int j = study_cost(student, sk);
j = max(50, j * 2); j = max(50, j * 2);
if (get_pooled(teacher, teacher->region, R_SILVER) >= j) { /* kann Einheit das zahlen? */ /* kann Einheit das zahlen? */
if (get_pooled(student, student->region, R_SILVER) >= j) {
/* Jeder Schüler zusätzlich +10 Tage wenn in Uni. */ /* Jeder Schüler zusätzlich +10 Tage wenn in Uni. */
a->data.i += (n / 30) * 10; /* learning erhöhen */ a->data.i += (n / 30) * 10; /* learning erhöhen */
/* Lehrer zusätzlich +1 Tag pro Schüler. */ /* Lehrer zusätzlich +1 Tag pro Schüler. */

1
src/common/kernel/save.c
View File

@ -608,6 +608,7 @@ is_persistent(const char *s, const struct locale *lang)
switch(igetkeyword(s, lang)) { switch(igetkeyword(s, lang)) {
case K_BUY: case K_BUY:
case K_SELL: case K_SELL:
case K_CAST:
case K_KOMMENTAR: case K_KOMMENTAR:
case K_LIEFERE: case K_LIEFERE:
case K_RESERVE: case K_RESERVE:

3
src/common/kernel/unit.c
View File

@ -729,7 +729,8 @@ transfermen(unit * u, unit * u2, int n)
rsetpeasants(r, rpeasants(r) + n); rsetpeasants(r, rpeasants(r) + n);
} }
struct building * inside_building(const struct unit * u) struct building *
inside_building(const struct unit * u)
{ {
if (u->building==NULL) return NULL; if (u->building==NULL) return NULL;

1
src/res/de/messages.txt
View File

@ -290,6 +290,7 @@ error288;errors:0;de;{unit} in {region}: '{command}' - Wieviel sollen wir einrei
error289;errors:0;de;{unit} in {region}: '{command}' - Tarne wie? error289;errors:0;de;{unit} in {region}: '{command}' - Tarne wie?
error290;errors:0;de;{unit} in {region}: '{command}' - Hier wachsen keine Bäume. error290;errors:0;de;{unit} in {region}: '{command}' - Hier wachsen keine Bäume.
error291;errors:0;de;{unit} in {region}: '{command}' - Dies ist schon eine Mallornregion. error291;errors:0;de;{unit} in {region}: '{command}' - Dies ist schon eine Mallornregion.
error292;errors:0;de;{unit} in {region}: '{command}' - Die Einheit kann nicht unterrichtet werden.
# Meldungen und Ereignisse # Meldungen und Ereignisse
msg_event;events:0;de;{string} msg_event;events:0;de;{string}

13
src/res/de/messages.xml
View File

@ -116,6 +116,19 @@
</locale> </locale>
</message> </message>
<message name="error292">
<type>
<arg name="unit" type="unit"></arg>
<arg name="region" type="region"></arg>
<arg name="command" type="string"></arg>
</type>
<locale name="de">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - Die Einheit kann nicht unterrichtet werden ."</text>
</nr>
</locale>
</message>
<message name="error4"> <message name="error4">
<type> <type>
<arg name="unit" type="unit"></arg> <arg name="unit" type="unit"></arg>