Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add pool rules for Mega Stones and Z-Crystals (#7720)

Browse Source 
Co-authored-by: Hedara <hedara90@gmail.com>
This commit is contained in:
hedara90 2025-09-12 21:04:36 +02:00 committed by GitHub
parent b8d5951dfb
commit 3c94074750
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/config/battle.h
View File

@ -364,5 +364,7 @@
#define B_POOL_RULE_EXCLUDE_FORMS FALSE // Exclude different forms from the Species Clause #define B_POOL_RULE_EXCLUDE_FORMS FALSE // Exclude different forms from the Species Clause
#define B_POOL_RULE_ITEM_CLAUSE FALSE // Only allow each item to be picked once #define B_POOL_RULE_ITEM_CLAUSE FALSE // Only allow each item to be picked once
#define B_POOL_RULES_USE_ITEM_EXCLUSIONS FALSE // Exclude items listed in poolItemClauseExclusions #define B_POOL_RULES_USE_ITEM_EXCLUSIONS FALSE // Exclude items listed in poolItemClauseExclusions
#define B_POOL_RULE_MEGA_STONE_CLAUSE FALSE // Pick only 1 mon with mega stone
#define B_POOL_RULE_Z_CRYSTAL_CLAUSE FALSE // Pick only 1 mon with Z-crystal
#endif // GUARD_CONFIG_BATTLE_H #endif // GUARD_CONFIG_BATTLE_H

10
include/trainer_pools.h
View File

@ -56,10 +56,12 @@ enum PoolTags {
struct PoolRules struct PoolRules
{ {
bool8 speciesClause; u8 speciesClause:1;
bool8 excludeForms; u8 excludeForms:1;
bool8 itemClause; u8 itemClause:1;
bool8 itemClauseExclusions; u8 itemClauseExclusions:1;
u8 megaStoneClause:1;
u8 zCrystalClause:1;
u8 tagMaxMembers[POOL_NUM_TAGS]; u8 tagMaxMembers[POOL_NUM_TAGS];
bool8 tagRequired[POOL_NUM_TAGS]; bool8 tagRequired[POOL_NUM_TAGS];
}; };

12
src/data/battle_pool_rules.h
View File

@ -12,6 +12,8 @@ const struct PoolRules defaultPoolRules =
.excludeForms = B_POOL_RULE_EXCLUDE_FORMS, .excludeForms = B_POOL_RULE_EXCLUDE_FORMS,
.itemClause = B_POOL_RULE_ITEM_CLAUSE, .itemClause = B_POOL_RULE_ITEM_CLAUSE,
.itemClauseExclusions = B_POOL_RULES_USE_ITEM_EXCLUSIONS, .itemClauseExclusions = B_POOL_RULES_USE_ITEM_EXCLUSIONS,
.megaStoneClause = B_POOL_RULE_MEGA_STONE_CLAUSE,
.zCrystalClause = B_POOL_RULE_Z_CRYSTAL_CLAUSE,
}; };
const struct PoolRules gPoolRulesetsList[] = { const struct PoolRules gPoolRulesetsList[] = {
@ -20,6 +22,8 @@ const struct PoolRules gPoolRulesetsList[] = {
.excludeForms = B_POOL_RULE_EXCLUDE_FORMS, .excludeForms = B_POOL_RULE_EXCLUDE_FORMS,
.itemClause = B_POOL_RULE_ITEM_CLAUSE, .itemClause = B_POOL_RULE_ITEM_CLAUSE,
.itemClauseExclusions = B_POOL_RULES_USE_ITEM_EXCLUSIONS, .itemClauseExclusions = B_POOL_RULES_USE_ITEM_EXCLUSIONS,
.megaStoneClause = B_POOL_RULE_MEGA_STONE_CLAUSE,
.zCrystalClause = B_POOL_RULE_Z_CRYSTAL_CLAUSE,
.tagMaxMembers[POOL_TAG_LEAD] = 1, .tagMaxMembers[POOL_TAG_LEAD] = 1,
.tagMaxMembers[POOL_TAG_ACE] = 1, .tagMaxMembers[POOL_TAG_ACE] = 1,
}, },
@ -28,6 +32,8 @@ const struct PoolRules gPoolRulesetsList[] = {
.excludeForms = B_POOL_RULE_EXCLUDE_FORMS, .excludeForms = B_POOL_RULE_EXCLUDE_FORMS,
.itemClause = B_POOL_RULE_ITEM_CLAUSE, .itemClause = B_POOL_RULE_ITEM_CLAUSE,
.itemClauseExclusions = B_POOL_RULES_USE_ITEM_EXCLUSIONS, .itemClauseExclusions = B_POOL_RULES_USE_ITEM_EXCLUSIONS,
.megaStoneClause = B_POOL_RULE_MEGA_STONE_CLAUSE,
.zCrystalClause = B_POOL_RULE_Z_CRYSTAL_CLAUSE,
.tagMaxMembers[POOL_TAG_LEAD] = 2, .tagMaxMembers[POOL_TAG_LEAD] = 2,
.tagMaxMembers[POOL_TAG_ACE] = 2, .tagMaxMembers[POOL_TAG_ACE] = 2,
}, },
@ -36,6 +42,8 @@ const struct PoolRules gPoolRulesetsList[] = {
.excludeForms = B_POOL_RULE_EXCLUDE_FORMS, .excludeForms = B_POOL_RULE_EXCLUDE_FORMS,
.itemClause = B_POOL_RULE_ITEM_CLAUSE, .itemClause = B_POOL_RULE_ITEM_CLAUSE,
.itemClauseExclusions = B_POOL_RULES_USE_ITEM_EXCLUSIONS, .itemClauseExclusions = B_POOL_RULES_USE_ITEM_EXCLUSIONS,
.megaStoneClause = B_POOL_RULE_MEGA_STONE_CLAUSE,
.zCrystalClause = B_POOL_RULE_Z_CRYSTAL_CLAUSE,
.tagMaxMembers[POOL_TAG_LEAD] = 1, .tagMaxMembers[POOL_TAG_LEAD] = 1,
.tagMaxMembers[POOL_TAG_ACE] = 1, .tagMaxMembers[POOL_TAG_ACE] = 1,
.tagMaxMembers[POOL_TAG_WEATHER_SETTER] = 1, .tagMaxMembers[POOL_TAG_WEATHER_SETTER] = 1,
@ -48,6 +56,8 @@ const struct PoolRules gPoolRulesetsList[] = {
.excludeForms = B_POOL_RULE_EXCLUDE_FORMS, .excludeForms = B_POOL_RULE_EXCLUDE_FORMS,
.itemClause = B_POOL_RULE_ITEM_CLAUSE, .itemClause = B_POOL_RULE_ITEM_CLAUSE,
.itemClauseExclusions = B_POOL_RULES_USE_ITEM_EXCLUSIONS, .itemClauseExclusions = B_POOL_RULES_USE_ITEM_EXCLUSIONS,
.megaStoneClause = B_POOL_RULE_MEGA_STONE_CLAUSE,
.zCrystalClause = B_POOL_RULE_Z_CRYSTAL_CLAUSE,
.tagMaxMembers[POOL_TAG_LEAD] = 2, .tagMaxMembers[POOL_TAG_LEAD] = 2,
.tagMaxMembers[POOL_TAG_ACE] = 2, .tagMaxMembers[POOL_TAG_ACE] = 2,
.tagMaxMembers[POOL_TAG_WEATHER_SETTER] = 1, .tagMaxMembers[POOL_TAG_WEATHER_SETTER] = 1,
@ -60,6 +70,8 @@ const struct PoolRules gPoolRulesetsList[] = {
.excludeForms = B_POOL_RULE_EXCLUDE_FORMS, .excludeForms = B_POOL_RULE_EXCLUDE_FORMS,
.itemClause = B_POOL_RULE_ITEM_CLAUSE, .itemClause = B_POOL_RULE_ITEM_CLAUSE,
.itemClauseExclusions = B_POOL_RULES_USE_ITEM_EXCLUSIONS, .itemClauseExclusions = B_POOL_RULES_USE_ITEM_EXCLUSIONS,
.megaStoneClause = B_POOL_RULE_MEGA_STONE_CLAUSE,
.zCrystalClause = B_POOL_RULE_Z_CRYSTAL_CLAUSE,
.tagMaxMembers[POOL_TAG_LEAD] = 2, .tagMaxMembers[POOL_TAG_LEAD] = 2,
.tagMaxMembers[POOL_TAG_ACE] = 2, .tagMaxMembers[POOL_TAG_ACE] = 2,
.tagMaxMembers[POOL_TAG_SUPPORT] = 1, .tagMaxMembers[POOL_TAG_SUPPORT] = 1,

5
src/trainer_pools.c
View File

@ -1,5 +1,6 @@
#include "global.h" #include "global.h"
#include "data.h" #include "data.h"
#include "item.h"
#include "malloc.h" #include "malloc.h"
#include "pokemon.h" #include "pokemon.h"
#include "random.h" #include "random.h"
@ -227,6 +228,10 @@ static u32 PickMonFromPool(const struct Trainer *trainer, u8 *poolIndexArray, u3
poolIndexArray[currIndex] = POOL_SLOT_DISABLED; poolIndexArray[currIndex] = POOL_SLOT_DISABLED;
} }
} }
if (rules->megaStoneClause && gItemsInfo[currentItem].sortType == ITEM_TYPE_MEGA_STONE && gItemsInfo[chosenItem].sortType == ITEM_TYPE_MEGA_STONE)
poolIndexArray[currIndex] = POOL_SLOT_DISABLED;
if (rules->zCrystalClause && gItemsInfo[currentItem].sortType == ITEM_TYPE_Z_CRYSTAL && gItemsInfo[chosenItem].sortType == ITEM_TYPE_Z_CRYSTAL)
poolIndexArray[currIndex] = POOL_SLOT_DISABLED;
} }
} }
return monIndex; return monIndex;