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

rename teaching_info.value to days

This commit is contained in:
Steffen Mecke 2017-09-02 15:50:03 +02:00
parent b98c01a7b8
commit 080d5e3f65
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/items.c
View File

@ -74,9 +74,9 @@ struct order *ord)
if (amount > MAXGAIN) { if (amount > MAXGAIN) {
amount = MAXGAIN; amount = MAXGAIN;
} }
teach->value += amount * STUDYDAYS; teach->days += amount * STUDYDAYS;
if (teach->value > MAXGAIN * STUDYDAYS) { if (teach->days > MAXGAIN * STUDYDAYS) {
teach->value = MAXGAIN * STUDYDAYS; teach->days = MAXGAIN * STUDYDAYS;
} }
i_change(&u->items, itype, -amount); i_change(&u->items, itype, -amount);
return 0; return 0;

14
src/study.c
View File

@ -223,7 +223,7 @@ teach_unit(unit * teacher, unit * student, int nteaching, skill_t sk,
teach = (teaching_info *)a->data.v; teach = (teaching_info *)a->data.v;
} }
selist_push(&teach->teachers, teacher); selist_push(&teach->teachers, teacher);
teach->value += students * STUDYDAYS; teach->days += students * STUDYDAYS;
teach->students += students; teach->students += students;
if (student->building && teacher->building == student->building) { if (student->building && teacher->building == student->building) {
@ -232,7 +232,7 @@ teach_unit(unit * teacher, unit * student, int nteaching, skill_t sk,
/* FIXME comment contradicts implementation */ /* FIXME comment contradicts implementation */
if (academy_can_teach(teacher, student, sk)) { if (academy_can_teach(teacher, student, sk)) {
/* Jeder Schueler zusaetzlich +10 Tage wenn in Uni. */ /* Jeder Schueler zusaetzlich +10 Tage wenn in Uni. */
teach->value += students * EXPERIENCEDAYS; /* learning erhoehen */ teach->days += students * EXPERIENCEDAYS; /* learning erhoehen */
/* Lehrer zusaetzlich +1 Tag pro Schueler. */ /* Lehrer zusaetzlich +1 Tag pro Schueler. */
if (academy_students) { if (academy_students) {
*academy_students += students; *academy_students += students;
@ -713,12 +713,12 @@ int study_cmd(unit * u, order * ord)
if (get_effect(u, oldpotiontype[P_WISE])) { if (get_effect(u, oldpotiontype[P_WISE])) {
l = MIN(u->number, get_effect(u, oldpotiontype[P_WISE])); l = MIN(u->number, get_effect(u, oldpotiontype[P_WISE]));
teach->value += l * EXPERIENCEDAYS; teach->days += l * EXPERIENCEDAYS;
change_effect(u, oldpotiontype[P_WISE], -l); change_effect(u, oldpotiontype[P_WISE], -l);
} }
if (get_effect(u, oldpotiontype[P_FOOL])) { if (get_effect(u, oldpotiontype[P_FOOL])) {
l = MIN(u->number, get_effect(u, oldpotiontype[P_FOOL])); l = MIN(u->number, get_effect(u, oldpotiontype[P_FOOL]));
teach->value -= l * STUDYDAYS; teach->days -= l * STUDYDAYS;
change_effect(u, oldpotiontype[P_FOOL], -l); change_effect(u, oldpotiontype[P_FOOL], -l);
} }
@ -727,16 +727,16 @@ int study_cmd(unit * u, order * ord)
/* p ist Kosten ohne Uni, studycost mit; wenn /* p ist Kosten ohne Uni, studycost mit; wenn
* p!=studycost, ist die Einheit zwangsweise * p!=studycost, ist die Einheit zwangsweise
* in einer Uni */ * in einer Uni */
teach->value += u->number * EXPERIENCEDAYS; teach->days += u->number * EXPERIENCEDAYS;
} }
if (is_cursed(r->attribs, &ct_badlearn)) { if (is_cursed(r->attribs, &ct_badlearn)) {
teach->value -= u->number * EXPERIENCEDAYS; teach->days -= u->number * EXPERIENCEDAYS;
} }
multi *= study_speedup(u, sk, speed_rule); multi *= study_speedup(u, sk, speed_rule);
days = study_days(u, sk); days = study_days(u, sk);
days = (int)((days + teach->value) * multi); days = (int)((days + teach->days) * multi);
/* the artacademy currently improves the learning of entertainment /* the artacademy currently improves the learning of entertainment
of all units in the region, to be able to make it cumulative with of all units in the region, to be able to make it cumulative with

2
src/study.h
View File

@ -51,7 +51,7 @@ extern "C" {
typedef struct teaching_info { typedef struct teaching_info {
struct selist *teachers; struct selist *teachers;
int students; int students;
int value; int days;
} teaching_info; } teaching_info;
extern const struct attrib_type at_learning; extern const struct attrib_type at_learning;

2
src/study.test.c
View File

@ -626,7 +626,7 @@ static void test_teach_message(CuTest *tc) {
CuAssertPtrNotNull(tc, a->data.v); CuAssertPtrNotNull(tc, a->data.v);
teach = (teaching_info *)a->data.v; teach = (teaching_info *)a->data.v;
CuAssertPtrNotNull(tc, teach->teachers); CuAssertPtrNotNull(tc, teach->teachers);
CuAssertIntEquals(tc, 600, teach->value); CuAssertIntEquals(tc, 600, teach->days);
CuAssertIntEquals(tc, 2, selist_length(teach->teachers)); CuAssertIntEquals(tc, 2, selist_length(teach->teachers));
CuAssertPtrEquals(tc, u1, selist_get(teach->teachers, 0)); CuAssertPtrEquals(tc, u1, selist_get(teach->teachers, 0));
CuAssertPtrEquals(tc, u2, selist_get(teach->teachers, 1)); CuAssertPtrEquals(tc, u2, selist_get(teach->teachers, 1));