DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-12 07:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Created setting MAX_PARTY_SIZE, fixed some bugs

Browse Source
This commit is contained in:
Maruno17
2021-01-11 22:44:01 +00:00
parent 53c3f23146
commit f72ce06654
17 changed files with 176 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/019_Other battles/003_PBattle_OrgBattle.rb
View File

@@ -868,7 +868,7 @@ def pbBattleFactoryPokemon(rule,numwins,numswaps,_rentals)
party=[]
loop do
party.clear
while party.length<6
while party.length < MAX_PARTY_SIZE
rnd=pokemonNumbers[0]+rand(pokemonNumbers[1]-pokemonNumbers[0]+1)
rndpoke=btpokemon[rnd]
indvalue=(party.length<ivgroups[0]) ? ivs[0] : ivs[1]

10
Data/Scripts/019_Other battles/005_PBattle_OrgBattleGenerator.rb
View File

@@ -995,8 +995,8 @@ def pbTrainerInfo(pokemonlist,trfile,rules)
end
end
numbers|=[]
if (numbers.length<6 ||
!rulesetTeam.hasValidTeam?(numbersPokemon))
if numbers.length < MAX_PARTY_SIZE ||
!rulesetTeam.hasValidTeam?(numbersPokemon)
for index in 0...pokemonlist.length
pkmn=pokemonlist[index]
next if !validities[index]
@@ -1013,11 +1013,11 @@ def pbTrainerInfo(pokemonlist,trfile,rules)
end
}
end
break if numbers.length>=6 && rules.ruleset.hasValidTeam?(numbersPokemon)
break if numbers.length >= MAX_PARTY_SIZE && rules.ruleset.hasValidTeam?(numbersPokemon)
end
if numbers.length<6 || !rules.ruleset.hasValidTeam?(numbersPokemon)
if numbers.length < MAX_PARTY_SIZE || !rules.ruleset.hasValidTeam?(numbersPokemon)
while numbers.length<pokemonlist.length &&
(numbers.length<6 || !rules.ruleset.hasValidTeam?(numbersPokemon))
(numbers.length < MAX_PARTY_SIZE || !rules.ruleset.hasValidTeam?(numbersPokemon))
index=rand(pokemonlist.length)
if !numbers.include?(index)
numbers.push(index)