summaryrefslogtreecommitdiffstats
path: root/pokemod/AbilityEffect.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'pokemod/AbilityEffect.cpp')
-rw-r--r--pokemod/AbilityEffect.cpp60
1 files changed, 29 insertions, 31 deletions
diff --git a/pokemod/AbilityEffect.cpp b/pokemod/AbilityEffect.cpp
index 7c50fdc8..2247c37e 100644
--- a/pokemod/AbilityEffect.cpp
+++ b/pokemod/AbilityEffect.cpp
@@ -26,14 +26,14 @@
extern PokeGen::PokeMod::Pokemod curPokeMod;
PokeGen::PokeMod::AbilityEffect::AbilityEffect(const unsigned _id) :
- chance(1, 1),
- effect(UINT_MAX),
- val1(UINT_MAX),
- val2(UINT_MAX),
- val3(UINT_MAX),
- trigger(UINT_MAX),
- tval1(UINT_MAX),
- tval2(UINT_MAX)
+ chance(1, 1),
+ effect(UINT_MAX),
+ val1(UINT_MAX),
+ val2(UINT_MAX),
+ val3(UINT_MAX),
+ trigger(UINT_MAX),
+ tval1(UINT_MAX),
+ tval2(UINT_MAX)
{
LogCtor("AbilityEffect", _id);
id = _id;
@@ -226,7 +226,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (AE_END <= effect)
{
LogVarNotValid("AbilityEffect", id, "effect");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "effect"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "effect"));
isValid = false;
}
else
@@ -237,7 +237,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if ((BST_END <= val1) || ((val1 == BST_SPECIAL_DEFENSE) && !curPokeMod.IsSpecialSplit()))
{
LogVarNotValid("AbilityEffect", id, "val1");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
isValid = false;
}
break;
@@ -245,7 +245,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (!curPokeMod.GetStatus(val1))
{
LogVarNotValid("AbilityEffect", id, "val1");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
isValid = false;
}
break;
@@ -253,7 +253,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (!curPokeMod.GetAbility(val1))
{
LogVarNotValid("AbilityEffect", id, "val1");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
isValid = false;
}
break;
@@ -261,7 +261,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (PA_END <= val1)
{
LogVarNotValid("AbilityEffect", id, "val1");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
isValid = false;
}
break;
@@ -269,7 +269,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (ABIT_END <= val1)
{
LogVarNotValid("AbilityEffect", id, "val1");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
isValid = false;
}
break;
@@ -277,7 +277,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (!curPokeMod.GetType(val1))
{
LogVarNotValid("AbilityEffect", id, "val1");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
isValid = false;
}
break;
@@ -285,7 +285,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (W_END_ALL <= val1)
{
LogVarNotValid("AbilityEffect", id, "val1");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val1"));
isValid = false;
}
}
@@ -295,7 +295,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (BM_END <= val2)
{
LogVarNotValid("AbilityEffect", id, "val2");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val2"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val2"));
isValid = false;
}
break;
@@ -304,7 +304,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (CA_END <= val2)
{
LogVarNotValid("AbilityEffect", id, "val2");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val2"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val2"));
isValid = false;
}
break;
@@ -312,7 +312,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (ABI_END <= val2)
{
LogVarNotValid("AbilityEffect", id, "val2");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val2"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val2"));
isValid = false;
}
break;
@@ -320,7 +320,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (BO_END <= val2)
{
LogVarNotValid("AbilityEffect", id, "val2");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val2"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val2"));
isValid = false;
}
}
@@ -337,7 +337,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if ((val3 < 0) || (100 < val3))
{
LogVarNotValid("AbilityEffect", id, "val3");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val3"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val3"));
isValid = false;
}
break;
@@ -345,7 +345,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if ((val3 < -6) || (6 < val3))
{
LogVarNotValid("AbilityEffect", id, "val3");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "val3"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "val3"));
isValid = false;
}
}
@@ -353,7 +353,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (AT_END <= trigger)
{
LogVarNotValid("AbilityEffect", id, "trigger");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "trigger"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "trigger"));
isValid = false;
}
else
@@ -364,7 +364,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (W_END_ALL <= tval1)
{
LogVarNotValid("AbilityEffect", id, "tVal1");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "tVal1"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "tVal1"));
isValid = false;
}
break;
@@ -372,7 +372,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (!curPokeMod.GetType(tval1))
{
LogVarNotValid("AbilityEffect", id, "tVal1");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "tVal1"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "tVal1"));
isValid = false;
}
break;
@@ -380,7 +380,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (SI_END <= tval1)
{
LogVarNotValid("AbilityEffect", id, "tVal1");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "tVal1"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "tVal1"));
isValid = false;
}
break;
@@ -388,7 +388,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if ((BST_END <= tval1) || ((tval1 == BST_SPECIAL_DEFENSE) && !curPokeMod.IsSpecialSplit()))
{
LogVarNotValid("AbilityEffect", id, "tVal1");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "tVal1"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "tVal1"));
isValid = false;
}
break;
@@ -396,7 +396,7 @@ void PokeGen::PokeMod::AbilityEffect::Validate(const wxListBox &output)
if (!curPokeMod.GetStatus(tval1))
{
LogVarNotValid("AbilityEffect", id, "tVal1");
- output.append(OutputLogVarNotValid("AbilityEffect", id, "tVal1"));
+ output.Append(OutputLogVarNotValid("AbilityEffect", id, "tVal1"));
isValid = false;
}
}
@@ -412,7 +412,6 @@ void PokeGen::PokeMod::AbilityEffect::ImportIni(Ini &ini, const unsigned _id)
if (_id == UINT_MAX)
{
ini.GetValue("id", id);
- // Was there an id associated with the element?
if (id == UINT_MAX)
LogIdNotFound("AbilityEffect");
}
@@ -438,8 +437,7 @@ void PokeGen::PokeMod::AbilityEffect::ImportIni(Ini &ini, const unsigned _id)
void PokeGen::PokeMod::AbilityEffect::ExportIni(std::ofstream &fout, const String &ability) const
{
LogExportStart("AbilityEffect", id);
- // Make elements
- Ini exAbilityEffect(ability + " abilityEffect");
+ Ini exAbilityEffect("abilityEffect " + ability);
exAbilityEffect.AddField("id", id);
exAbilityEffect.AddField("chance-n", chance.GetNum());
exAbilityEffect.AddField("chance-d", chance.GetDenom());
generated by cgit (git 2.34.1) at 2026-01-25 02:28:29 +0000