Blood macros, more kindred changes

Created a macros for blood token, tribal to kindred changes, typo in background on various files,

Bug fixes:
Fiendslayer Paladin
Dire Fleet Poisoner
Shapers of Nature
Raptor Hatchling
Emiel the Blessed
Path of Discovery
Departed Deckhand
This commit is contained in:
Eduardo MG
2025-05-26 18:46:55 -06:00
parent 9c32793eec
commit a371cef279
13 changed files with 135 additions and 152 deletions
+1 -1
View File
@@ -165,7 +165,7 @@ Credits::~Credits()
if (bonus[i])
delete bonus[i];
bonus.clear();
kBgFile = ""; //Reset the chosen backgorund.
kBgFile = ""; //Reset the chosen background.
}
void Credits::compute(GameObserver* g, GameApp * _app)
+2 -2
View File
@@ -37,7 +37,7 @@ GameStateAwards::GameStateAwards(GameApp* parent) :
GameStateAwards::~GameStateAwards()
{
kAwardFile = ""; //Reset the chosen backgorund.
kAwardFile = ""; //Reset the chosen background.
}
void GameStateAwards::End()
@@ -50,7 +50,7 @@ void GameStateAwards::End()
if (saveMe)
options.save();
kAwardFile = ""; //Reset the chosen backgorund.
kAwardFile = ""; //Reset the chosen background.
}
void GameStateAwards::Start()
{
+2 -2
View File
@@ -105,7 +105,7 @@ GameStateDeckViewer::~GameStateDeckViewer()
SAFE_DELETE(myCollection);
}
SAFE_DELETE(filterMenu);
kBgFile = ""; //Reset the chosen backgorund.
kBgFile = ""; //Reset the chosen background.
}
void GameStateDeckViewer::rebuildFilters()
@@ -308,7 +308,7 @@ void GameStateDeckViewer::End()
SAFE_DELETE(playerdata);
SAFE_DELETE(filterMenu);
SAFE_DELETE(source);
kBgFile = ""; //Reset the chosen backgorund.
kBgFile = ""; //Reset the chosen background.
}
void GameStateDeckViewer::addRemove(MTGCard * card)
+2 -2
View File
@@ -182,7 +182,7 @@ GameStateDuel::~GameStateDuel()
{
End();
SAFE_DELETE(tournament);
kBgFile = ""; //Reset the chosen backgorund.
kBgFile = ""; //Reset the chosen background.
}
void GameStateDuel::Start()
@@ -372,7 +372,7 @@ void GameStateDuel::End()
#endif
MTGAbility::deletedpointers.clear(); // Clear the list of deallocated pointer.
kBgFile = ""; //Reset the chosen backgorund.
kBgFile = ""; //Reset the chosen background.
}
//TODO Move This to utils or ResourceManager. Don't we have more generic functions that can do that?
+4 -4
View File
@@ -25,7 +25,7 @@ GameStateOptions::GameStateOptions(GameApp* parent) :
GameStateOptions::~GameStateOptions()
{
kBgFile = ""; //Reset the chosen backgorund.
kBgFile = ""; //Reset the chosen background.
}
void GameStateOptions::Start()
@@ -161,7 +161,7 @@ void GameStateOptions::End()
JRenderer::GetInstance()->EnableVSync(false);
SAFE_DELETE(optionsTabs);
SAFE_DELETE(optionsMenu);
kBgFile = ""; //Reset the chosen backgorund.
kBgFile = ""; //Reset the chosen background.
}
void GameStateOptions::Update(float dt)
@@ -282,7 +282,7 @@ void GameStateOptions::Render()
const char * const CreditsText[] = {
"Wagic, The Homebrew?! by Wololo",
"",
"Updates, new cards, and more on http://wololo.net/wagic",
"Updates, new cards, and more on the Wagic Discord",
"Many thanks to the people who help this project",
"",
"",
@@ -320,7 +320,7 @@ void GameStateOptions::Render()
"",
"This work is not related to or endorsed by Wizards of the Coast, Inc",
"",
"Please support this project with donations at http://wololo.net/wagic",
"Please support this project with donations at Wagic Discord",
};
WFont * mFont = WResourceManager::Instance()->GetWFont(Fonts::MAGIC_FONT);
+1 -1
View File
@@ -17,7 +17,7 @@ GuiBackground::GuiBackground(GameObserver* observer)
GuiBackground::~GuiBackground()
{
kBackdropFile = ""; //Reset the chosen backgorund.
kBackdropFile = ""; //Reset the chosen background.
}
void GuiBackground::Render()
+1 -1
View File
@@ -245,7 +245,7 @@ const char* Constants::MTGBasicAbilities[] = {
"countershroud", //Card can't get any kind of counter (e.g. "Solemnity").
"nonight", //It can't become night (e.g. "Angel of Eternal Dawn").
"nodamageremoved", //Damage is not removed from card (e.g. "Patient Zero").
"backgroundpartner", //Can choose a backgorund partner as commander (e.g. "Faceless One").
"backgroundpartner", //Can choose a background partner as commander (e.g. "Faceless One").
"bottomlibrarydeath", //It goes to bottom of library after death (e.g. "Quintorius, Loremaster").
"noloyaltydamage", //Damage does not cause loyalty counter to be removed from a Planeswalker (e.g. "Spark Rupture").
"nodefensedamage", //Damage does not cause defense counter to be removed from a Battle.
+2 -2
View File
@@ -454,7 +454,7 @@ Player * Rules::loadPlayerRandomCommander(GameObserver* observer, int isAI)
if(colors.data()[0] != 0) { colors.insert(colors.begin(),0); }
// Add lands
int numLands = colors.size() > 1 ? 40 / (colors.size() - 1) : 40;
int numLands = colors.size() > 2 ? 40 / (colors.size() - 1) : 40;
if(colors.size() > 1)
{
for (unsigned int i = 1; i < colors.size(); i++)
@@ -627,7 +627,7 @@ Player* Rules::loadPlayerRandomCommanderFromFile(GameObserver* observer, int isA
}
// Add lands
int numLands = colors.size() > 1 ? 40 / (colors.size() - 1) : 40;
int numLands = colors.size() > 2 ? 40 / (colors.size() - 1) : 40;
if (colors.size() > 1)
{
for (unsigned int i = 1; i < colors.size(); i++)
+1 -1
View File
@@ -26,7 +26,7 @@ Subtypes::Subtypes()
find("Dungeon");
find("Emblem");
find("Conspiracy");
find("Backgorund");
find("Background");
find("Battle");
}