Skip to content

chore: 106590: move GetDataField calls to GetProperty in transdata so… #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FlufflesTheMicrosaur wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: 106590: move GetDataField calls to GetProperty in transdata so… #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Transcendence/TransData/EncounterCount.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ void GenerateEncounterCount (CUniverse &Universe, CXMLElement *pCmdLine)

// Output all rows

CCodeChainCtx CCCtx = CCodeChainCtx(*g_pUniverse);

for (i = 0; i < NodeTable.GetCount(); i++)
{
for (j = 0; j < NodeTable[i].Table.GetCount(); j++)
Expand All @@ -131,20 +133,19 @@ void GenerateEncounterCount (CUniverse &Universe, CXMLElement *pCmdLine)

CSovereign *pSovereign = pEncounterType->GetControllingSovereign();
CString sSovereign = (pSovereign ? pSovereign->GetNounPhrase() : CONSTLIT("(Unknown)"));

printf("%d\t%s\t0x%08x\t%s\t%s\t%s\t%d.%03d",
NodeTable[i].iLevel,
NodeTable[i].sNodeID.GetASCIIZPointer(),
NodeTable[i].Table.GetKey(j),
pEncounterType->GetDataField(CONSTLIT("category")).GetASCIIZPointer(),
pEncounterType->GetProperty(CCCtx, CONSTLIT("category"))->GetStringValue().GetASCIIZPointer(),
sSovereign.GetASCIIZPointer(),
pEncounterType->GetNounPhrase().GetASCIIZPointer(),
iCount,
iCountFrac);

for (l = 0; l < Cols.GetCount(); l++)
{
CString sValue = pEncounterType->GetDataField(Cols[l]);
CString sValue = pEncounterType->GetProperty(CCCtx, Cols[l])->GetStringValue();
printf("\t%s", sValue.GetASCIIZPointer());
}

Expand Down
12 changes: 7 additions & 5 deletions Transcendence/TransData/EncounterFrequency.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,25 +224,27 @@ void OutputFreq (const CSystemCreateStats &Stats, const SOptions &Options)
printf("\t%s", Options.Cols[i].GetASCIIZPointer());
printf("\n");

CCodeChainCtx CCCtx = CCodeChainCtx(*g_pUniverse);

for (int i = 0; i < EncounterFreq.GetCount(); i++)
{
CStationType *pEncounterType = EncounterFreq.GetKey(i);
int iAveWhole = EncounterFreq[i].iTotalChance / EncounterFreq[i].iCount;
int iAveFrac = 1000 * (EncounterFreq[i].iTotalChance % EncounterFreq[i].iCount) / EncounterFreq[i].iCount;

printf("%d\t%s\t%s\t%d\t%d.%03d\t%d\t%d",
printf("%d\t%s\t%s\t%d\t%d.%03d\t%d\t%d",
pEncounterType->GetLevel(),
pEncounterType->GetDataField(CONSTLIT("category")).GetASCIIZPointer(),
pEncounterType->GetProperty(CCCtx, CONSTLIT("category"))->GetStringValue().GetASCIIZPointer(),
pEncounterType->GetNounPhrase().GetASCIIZPointer(),
EncounterFreq[i].iCount,
iAveWhole,
iAveFrac,
EncounterFreq[i].iMinChance,
EncounterFreq[i].iMaxChance);

for (int j = 0; j < Options.Cols.GetCount(); j++)
{
CString sValue = pEncounterType->GetDataField(Options.Cols[j]);
CString sValue = pEncounterType->GetProperty(CCCtx, Options.Cols[j])->GetStringValue();
printf("\t%s", sValue.GetASCIIZPointer());
}

Expand Down
6 changes: 4 additions & 2 deletions Transcendence/TransData/EncounterTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,10 @@ void GenerateEncounterTable (CUniverse &Universe, CXMLElement *pCmdLine)

// Get the category and name

CString sCategory = pType->GetDataField(FIELD_CATEGORY);
CString sName = pType->GetDataField(FIELD_NAME);
CCodeChainCtx CCCtx = CCodeChainCtx(*g_pUniverse);

CString sCategory = pType->GetProperty(CCCtx, FIELD_CATEGORY)->GetStringValue();
CString sName = pType->GetProperty(CCCtx, FIELD_NAME)->GetStringValue();
if (*sName.GetASCIIZPointer() == '(')
sName = strSubString(sName, 1, -1);

Expand Down
4 changes: 3 additions & 1 deletion Transcendence/TransData/LootSim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@ void GenerateLootSim (CUniverse &Universe, CXMLElement *pCmdLine)
CItem NULL_ITEM;
CItemCtx ItemCtx(NULL_ITEM);

CCodeChainCtx CCCtx = CCodeChainCtx(*g_pUniverse);

for (int i = 0; i < Sorted.GetCount(); i++)
{
const SSystemInfo &SystemEntry = AllSystems[Sorted[i]];
Expand All @@ -284,7 +286,7 @@ void GenerateLootSim (CUniverse &Universe, CXMLElement *pCmdLine)
printf("%d\t%s\t%s\t%.2f\t%.2f\n",
SystemEntry.iLevel,
SystemEntry.sName.GetASCIIZPointer(),
ItemType.GetDataField(FIELD_NAME).GetASCIIZPointer(),
ItemType.GetProperty(CCCtx, FIELD_NAME)->GetStringValue().GetASCIIZPointer(),
(double)iItemCount / (double)iSystemSample,
(double)ItemType.GetValue(ItemCtx, true) * iItemCount / (double)iSystemSample);
}
Expand Down
16 changes: 10 additions & 6 deletions Transcendence/TransData/ShieldStats.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@ void GenerateShieldStats (CUniverse &Universe, CXMLElement *pCmdLine)

// Get the stats for the shield

Metric rHP = (Metric)pItem->GetDataFieldInteger(FIELD_HP);
Metric rHPRegenPerTick = pItem->GetDataFieldInteger(FIELD_REGEN) / 1000.0;
CCodeChainCtx CCCtx = CCodeChainCtx(*g_pUniverse);

Metric rHP = pItem->GetProperty(CCCtx, FIELD_HP)->GetDoubleValue();
Metric rHPRegenPerTick = pItem->GetProperty(CCCtx, FIELD_REGEN)->GetDoubleValue() / 1000.0;

int iDamageAdj[damageCount];
CString sDamageAdj = pItem->GetDataField(CONSTLIT("damageAdj"));
CString sDamageAdj = pItem->GetProperty(CCCtx, CONSTLIT("damageAdj"))->GetStringValue();
const char *pPos = sDamageAdj.GetASCIIZPointer();
int iCount = 0;
while (iCount < damageCount)
Expand Down Expand Up @@ -80,9 +82,11 @@ void GenerateShieldStats (CUniverse &Universe, CXMLElement *pCmdLine)

// Get the data for the weapon

int iFireDelay = pWeapon->GetDataFieldInteger(CONSTLIT("fireDelay"));
Metric rAverageDamage = pWeapon->GetDataFieldInteger(CONSTLIT("averageDamage")) / 1000.0;
int iDamageType = pWeapon->GetDataFieldInteger(CONSTLIT("damageType"));
CCodeChainCtx CCCtx = CCodeChainCtx(*g_pUniverse);

int iFireDelay = pWeapon->GetProperty(CCCtx, CONSTLIT("fireDelay"))->GetIntegerValue();
Metric rAverageDamage = pWeapon->GetProperty(CCCtx, CONSTLIT("averageDamage"))->GetDoubleValue() / 1000.0;
int iDamageType = pWeapon->GetProperty(CCCtx, CONSTLIT("damageType"))->GetIntegerValue();
if (iDamageType < 0 || iDamageType >= damageCount)
iDamageType = 0;

Expand Down
4 changes: 3 additions & 1 deletion Transcendence/TransData/SystemCount.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ void GenerateSystemCount (CUniverse &Universe, CXMLElement *pCmdLine)

// Output all rows

CCodeChainCtx CCCtx = CCodeChainCtx(*g_pUniverse);

for (i = 0; i < NodeTable.GetCount(); i++)
{
for (j = 0; j < NodeTable[i].Table.GetCount(); j++)
Expand All @@ -156,7 +158,7 @@ void GenerateSystemCount (CUniverse &Universe, CXMLElement *pCmdLine)
}
else
{
CString sValue = pSystemType->GetDataField(Cols[k]);
CString sValue = pSystemType->GetProperty(CCCtx, Cols[k])->GetStringValue();
printf("\t%s", sValue.GetASCIIZPointer());
}
}
Expand Down
4 changes: 3 additions & 1 deletion Transcendence/TransData/SystemTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,8 @@ void CSystemTestGenerator::PrintSystemItemStats (const TSortMap<CString, SSystem
{
printf("Level\tSystem\tItem\tCount\n");

CCodeChainCtx CCCtx = CCodeChainCtx(*g_pUniverse);

for (int i = 0; i < AllSystems.GetCount(); i++)
{
const SSystemInfo SystemEntry = AllSystems[i];
Expand All @@ -357,7 +359,7 @@ void CSystemTestGenerator::PrintSystemItemStats (const TSortMap<CString, SSystem
printf("%d\t%s\t%s\t%.2f\n",
SystemEntry.iLevel,
SystemEntry.sName.GetASCIIZPointer(),
Entry.pType->GetDataField(FIELD_NAME).GetASCIIZPointer(),
Entry.pType->GetProperty(CCCtx, FIELD_NAME)->GetStringValue().GetASCIIZPointer(),
(double)Entry.iTotalCount / (double)iSampleCount);
}
}
Expand Down
8 changes: 6 additions & 2 deletions Transcendence/TransData/TradeTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ void GenerateTradeTable (CUniverse &Universe, CXMLElement *pCmdLine)

// Get the name

CString sName = pType->GetDataField(FIELD_NAME);
CCodeChainCtx CCCtx = CCodeChainCtx(*g_pUniverse);

CString sName = pType->GetProperty(CCCtx, FIELD_NAME)->GetStringValue();
if (*sName.GetASCIIZPointer() == '(')
sName = strSubString(sName, 1, -1);

Expand Down Expand Up @@ -103,9 +105,11 @@ void PrintTradeDesc (CDesignType *pType, CTradingDesc *pTrade)

// Print line

CCodeChainCtx CCCtx = CCodeChainCtx(*g_pUniverse);

printf("%d\t%s\t%s\t%s\t%d\n",
pType->GetLevel(),
(LPSTR)pType->GetDataField(FIELD_NAME),
(LPSTR)pType->GetProperty(CCCtx, FIELD_NAME)->GetStringValue(),
(LPSTR)CTradingDesc::ServiceToString(Info.iService),
(LPSTR)sCriteria,
Info.iPriceAdj
Expand Down
4 changes: 3 additions & 1 deletion Transcendence/TransData/TypeTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ void GenerateTypeTable (CUniverse &Universe, CXMLElement *pCmdLine)

// Get the name

CString sName = pType->GetDataField(FIELD_NAME);
CCodeChainCtx CCCtx = CCodeChainCtx(*g_pUniverse);

CString sName = pType->GetProperty(CCCtx, FIELD_NAME)->GetStringValue();
if (*sName.GetASCIIZPointer() == '(')
sName = strSubString(sName, 1, -1);

Expand Down