MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update structures

develop
Ben Lubar 2020-07-01 23:10:13 -05:00
parent 27ee6a30d4
commit 72ce52e004
No known key found for this signature in database
GPG Key ID: 92939677AB59EDA4
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/modules/Translation.cpp
Unescape Escape View File

@ -69,16 +69,7 @@ bool Translation::copyName(df::language_name * source, df::language_name * targe
if (source == target) if (source == target)
return true; return true;
target->first_name = source->first_name; *target = *source;
target->nickname = source->nickname;
for (int i = 0; i < 7; i++)
{
target->words[i] = source->words[i];
target->parts_of_speech[i] = source->parts_of_speech[i];
}
target->language = source->language;
target->unknown = source->unknown;
target->has_name = source->has_name;
return true; return true;
} }

2
library/xml

@ -1 +1 @@
Subproject commit ec0f06754f0e03655611fe29d388f0a3ffad21e4 Subproject commit b439f22876634725f246703e3ac8a7a0b1a01d63

8
plugins/strangemood.cpp
Unescape Escape View File

@ -153,7 +153,7 @@ void selectWord (const df::language_word_table &table, int32_t &word, df::part_o
} }
} }
void generateName(df::language_name &output, int language, int mode, const df::language_word_table &table1, const df::language_word_table &table2) void generateName(df::language_name &output, int language, df::language_name_type mode, const df::language_word_table &table1, const df::language_word_table &table2)
{ {
for (int i = 0; i < 100; i++) for (int i = 0; i < 100; i++)
{ {
@ -162,7 +162,7 @@ void generateName(df::language_name &output, int language, int mode, const df::l
output = df::language_name(); output = df::language_name();
if (language == -1) if (language == -1)
language = rng.df_trandom(world->raws.language.translations.size()); language = rng.df_trandom(world->raws.language.translations.size());
output.unknown = mode; output.type = mode;
output.language = language; output.language = language;
} }
output.has_name = 1; output.has_name = 1;
@ -1316,10 +1316,10 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
// Generate the artifact's name // Generate the artifact's name
if (type == mood_type::Fell || type == mood_type::Macabre) if (type == mood_type::Fell || type == mood_type::Macabre)
generateName(unit->status.artifact_name, unit->name.language, 1, world->raws.language.word_table[0][2], world->raws.language.word_table[1][2]); generateName(unit->status.artifact_name, unit->name.language, language_name_type::Artifact, world->raws.language.word_table[0][2], world->raws.language.word_table[1][2]);
else else
{ {
generateName(unit->status.artifact_name, unit->name.language, 1, world->raws.language.word_table[0][1], world->raws.language.word_table[1][1]); generateName(unit->status.artifact_name, unit->name.language, language_name_type::Artifact, world->raws.language.word_table[0][1], world->raws.language.word_table[1][1]);
if (!rng.df_trandom(100)) if (!rng.df_trandom(100))
unit->status.artifact_name = unit->name; unit->status.artifact_name = unit->name;
} }