Skip to content

Commit cbd94b1

Browse files
AmeliaCuteAmeliaCute
committed
Fixing my own complaints
1 parent 8b2d870 commit cbd94b1

File tree

11 files changed

+45
-178
lines changed

11 files changed

+45
-178
lines changed

‎include‎

‎src/API/Common/Common.cpp‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44

55
std::string Common::NounSingular(LANG lang, std::string_view identifier)
66
{
7-
if(identifier == "None") return nullptr;
7+
if(identifier == "None") return "nullptr";
88
auto text = ModLoader::gameCache->GetNoun(identifier.data());
99
switch(lang)
1010
{
11-
case LANG::JAPANESE: return text->nounSingularForm.ToString();
12-
case LANG::ENGLISH: return text->nounSingularForm_en.ToString();
13-
case LANG::FRENCH: return text->nounSingularForm_fr.ToString();
14-
case LANG::ESPAGNOL: return text->nounSingularForm_es.ToString();
15-
case LANG::DEUTSCH: return text->nounSingularForm_de.ToString();
16-
case LANG::ITALIAN: return text->nounSingularForm_it.ToString();
17-
case LANG::TZH: return text->nounSingularForm_tzh.ToString();
18-
case LANG::CZH: return text->nounSingularForm_czh.ToString();
19-
case LANG::KO: return text->nounSingularForm_ko.ToString();
11+
case LANG::JAPANESE: return text->nounSingularForm.ToString(); break;
12+
case LANG::ENGLISH: return text->nounSingularForm_en.ToString(); break;
13+
case LANG::FRENCH: return text->nounSingularForm_fr.ToString(); break;
14+
case LANG::ESPAGNOL: return text->nounSingularForm_es.ToString(); break;
15+
case LANG::DEUTSCH: return text->nounSingularForm_de.ToString(); break;
16+
case LANG::ITALIAN: return text->nounSingularForm_it.ToString(); break;
17+
case LANG::TZH: return text->nounSingularForm_tzh.ToString(); break;
18+
case LANG::CZH: return text->nounSingularForm_czh.ToString(); break;
19+
case LANG::KO: return text->nounSingularForm_ko.ToString(); break;
2020
}
2121

2222
return text->nounSingularForm.ToString();
@@ -33,15 +33,15 @@ void Common::NounSingularSet(LANG lang, std::string_view identifier, FString val
3333
auto text = ModLoader::gameCache->GetNoun(identifier.data());
3434
switch(lang)
3535
{
36-
case LANG::JAPANESE: text->nounSingularForm = value;
37-
case LANG::ENGLISH: text->nounSingularForm_en = value;
38-
case LANG::FRENCH: text->nounSingularForm_fr = value;
39-
case LANG::ESPAGNOL: text->nounSingularForm_es = value;
40-
case LANG::DEUTSCH: text->nounSingularForm_de = value;
41-
case LANG::ITALIAN: text->nounSingularForm_it = value;
42-
case LANG::TZH: text->nounSingularForm_tzh = value;
43-
case LANG::CZH: text->nounSingularForm_czh = value;
44-
case LANG::KO: text->nounSingularForm_ko = value;
36+
case LANG::JAPANESE: text->nounSingularForm = value; break;
37+
case LANG::ENGLISH: text->nounSingularForm_en = value; break;
38+
case LANG::FRENCH: text->nounSingularForm_fr = value; break;
39+
case LANG::ESPAGNOL: text->nounSingularForm_es = value; break;
40+
case LANG::DEUTSCH: text->nounSingularForm_de = value; break;
41+
case LANG::ITALIAN: text->nounSingularForm_it = value; break;
42+
case LANG::TZH: text->nounSingularForm_tzh = value; break;
43+
case LANG::CZH: text->nounSingularForm_czh = value; break;
44+
case LANG::KO: text->nounSingularForm_ko = value; break;
4545
}
4646
}
4747

@@ -50,15 +50,15 @@ std::string Common::Description(LANG lang, std::string_view identifier)
5050
auto text = ModLoader::gameCache->GetText(identifier.data());
5151
switch(lang)
5252
{
53-
case LANG::JAPANESE: return text->Text.ToString();
54-
case LANG::ENGLISH: return text->text_en.ToString();
55-
case LANG::FRENCH: return text->text_fr.ToString();
56-
case LANG::ESPAGNOL: return text->text_es.ToString();
57-
case LANG::DEUTSCH: return text->text_de.ToString();
58-
case LANG::ITALIAN: return text->text_de.ToString();
59-
case LANG::TZH: return text->text_tzh.ToString();
60-
case LANG::CZH: return text->text_czh.ToString();
61-
case LANG::KO : return text->text_ko.ToString();
53+
case LANG::JAPANESE: return text->Text.ToString(); break;
54+
case LANG::ENGLISH: return text->text_en.ToString(); break;
55+
case LANG::FRENCH: return text->text_fr.ToString(); break;
56+
case LANG::ESPAGNOL: return text->text_es.ToString(); break;
57+
case LANG::DEUTSCH: return text->text_de.ToString(); break;
58+
case LANG::ITALIAN: return text->text_de.ToString(); break;
59+
case LANG::TZH: return text->text_tzh.ToString(); break;
60+
case LANG::CZH: return text->text_czh.ToString(); break;
61+
case LANG::KO: return text->text_ko.ToString(); break;
6262
}
6363

6464
return text->Text.ToString();
@@ -75,14 +75,14 @@ void Common::DescriptionSet(LANG lang, std::string_view identifier, FString valu
7575
auto text = ModLoader::gameCache->GetText(identifier.data());
7676
switch(lang)
7777
{
78-
case LANG::JAPANESE: text->Text = value;
79-
case LANG::ENGLISH: text->text_en = value;
80-
case LANG::FRENCH: text->text_fr = value;
81-
case LANG::ESPAGNOL: text->text_es = value;
82-
case LANG::DEUTSCH: text->text_de = value;
83-
case LANG::ITALIAN: text->text_de = value;
84-
case LANG::TZH: text->text_tzh = value;
85-
case LANG::CZH: text->text_czh = value;
86-
case LANG::KO : text->text_ko = value;
78+
case LANG::JAPANESE: text->Text = value; break;
79+
case LANG::ENGLISH: text->text_en = value; break;
80+
case LANG::FRENCH: text->text_fr = value; break;
81+
case LANG::ESPAGNOL: text->text_es = value; break;
82+
case LANG::DEUTSCH: text->text_de = value; break;
83+
case LANG::ITALIAN: text->text_de = value; break;
84+
case LANG::TZH: text->text_tzh = value; break;
85+
case LANG::CZH: text->text_czh = value; break;
86+
case LANG::KO: text->text_ko = value; break;
8787
}
8888
}

‎src/API/Common/CommonItemTableSetting.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
#include "API/Common/CommonItemTableSetting.hpp"
22
#include "API/Engine/FName.hpp"
33

4-
std::string CommonItemTableSetting::GetIdentifier()
5-
{
6-
return this->_object.tableId.ToString();
7-
}
8-
94
ItemTableDetail CommonItemTableSetting::GetData(int index)
105
{
116
auto raw = this->_object.tableData.Get(index);

‎src/API/Common/CommonPickParamData.cpp‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/API/Entities/CharaData.cpp‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
11
#include "API/Entities/CharaData.hpp"
22
#include "API/Common/Common.hpp"
3-
#include "API/Engine/FName.hpp"
4-
5-
std::string CharaData::GetIdentifier()
6-
{
7-
return this->_object.ID.ToString();
8-
}
9-
10-
std::string CharaData::GetNameIdentifier()
11-
{
12-
return this->_object.nameId.ToString();
13-
}
14-
15-
std::string CharaData::GetFlag()
16-
{
17-
return this->_object.Flag.ToString();
18-
}
193

204
std::string CharaData::GetName(LANG lang)
215
{

‎src/API/Item/ItemData.cpp‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,15 @@
22
#include "API/Common/Common.hpp"
33
#include "API/Engine/FName.hpp"
44

5-
std::string ItemData::GetIdentifier()
6-
{
7-
return this->_object.ID.ToString();
8-
}
9-
10-
std::string ItemData::getNameIdentifier()
11-
{
12-
return this->_object.nameId.ToString();
13-
}
14-
15-
std::string ItemData::GetDescIdentifier()
16-
{
17-
return this->_object.DescId.ToString();
18-
}
195

206
std::string ItemData::GetName(LANG lang)
217
{
22-
return NAME_GET(lang, getNameIdentifier());
8+
return NAME_GET(lang, GetNameIdentifier());
239
}
2410

2511
void ItemData::SetName(LANG lang, FString string)
2612
{
27-
NAME_SET(lang, getNameIdentifier(), string);
13+
NAME_SET(lang, GetNameIdentifier(), string);
2814
}
2915

3016
std::string ItemData::GetDescription(LANG lang)
@@ -35,9 +21,4 @@ std::string ItemData::GetDescription(LANG lang)
3521
void ItemData::SetDescription(LANG lang, FString string)
3622
{
3723
DESC_SET(lang, GetDescIdentifier(), string);
38-
}
39-
40-
std::string ItemData::GetOverwriteIcon()
41-
{
42-
return this->_object.overwriteIconName.ToString();
4324
}

‎src/API/Recipe/RecipeData.cpp‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@
33
#include "ModLoader.hpp"
44
#include "GameCache.hpp"
55

6-
std::string RecipeData::GetIdentifier()
7-
{
8-
return this->_object.recipeId.ToString();
9-
}
10-
11-
std::string RecipeData::GetItemIdentifier()
12-
{
13-
return this->_object.ItemId.ToString();
14-
}
15-
166
ItemData RecipeData::GetItem()
177
{
188
return ModLoader::gameCache->GetItem(GetItemIdentifier());

‎src/API/Skill/SkillData.cpp‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,11 @@
22
#include "API/Engine/FName.hpp"
33
#include "API/Common/Common.hpp"
44

5-
std::string SkillData::GetIdentifier()
6-
{
7-
return this->_object.ID.Name.ToString();
8-
}
9-
10-
std::string SkillData::GetNameIdentifier()
11-
{
12-
return this->_object.nameTextID.ToString();
13-
}
14-
15-
std::string SkillData::GetName(LANG lang)
16-
{
17-
return NAME_GET(lang, GetNameIdentifier());
18-
}
19-
205
void SkillData::SetName(LANG lang, FString string)
216
{
227
NAME_SET(lang, GetNameIdentifier(), string);
238
}
249

25-
std::string SkillData::GetDescIdentifier()
26-
{
27-
return this->_object.descTextID.ToString();
28-
}
29-
30-
std::string SkillData::GetDescription(LANG lang)
31-
{
32-
return DESC_GET(lang, GetDescIdentifier());
33-
}
34-
3510
void SkillData::SetDescription(LANG lang, FString string)
3611
{
3712
DESC_SET(lang, GetDescIdentifier(), string);

‎src/API/World/MapData.cpp‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,6 @@
22
#include "API/Engine/FName.hpp"
33
#include "API/Common/Common.hpp"
44

5-
std::string MapData::GetIdentifier()
6-
{
7-
return this->_object.mapId.ToString();
8-
}
9-
10-
std::string MapData::GetPath()
11-
{
12-
return this->_object.MapPath.ToString();
13-
}
14-
15-
std::string MapData::GetMapViewCategory()
16-
{
17-
return this->_object.MapViewCategory.ToString();
18-
}
19-
205
std::string MapData::GetMapViewName(int index)
216
{
227
if(index < 0 || index >= this->_object.MapViewDataArray.Count)
@@ -37,15 +22,6 @@ void MapData::SetMapViewName(int index, FString name)
3722
this->_object.MapViewDataArray.Data[index].mapName = name;
3823
}
3924

40-
std::string MapData::GetMapSubject()
41-
{
42-
return this->_object.MapSubject.ToString();
43-
}
44-
45-
std::string MapData::GetNameIdentifier()
46-
{
47-
return this->_object.MapNameID.ToString();
48-
}
4925

5026
std::string MapData::GetName(LANG lang)
5127
{
@@ -57,11 +33,6 @@ void MapData::SetName(LANG lang, FString string)
5733
NAME_SET(lang, GetNameIdentifier(), string);
5834
}
5935

60-
std::string MapData::GetWorldMap()
61-
{
62-
return this->_object.WorldMapID.ToString();
63-
}
64-
6536
MapDataSubMapData MapData::GetSubMap(int index)
6637
{
6738
if(index < 0 || index >= this->_object.subMapDataList.Data.Count)

‎src/API/World/MapSubLevel.cpp‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)