DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-01-24 07:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added class Data::Ability and made all code use symbols for abilities instead of numbers. Also added class Data::Item but it's unused.

Browse Source
This commit is contained in:
Maruno17
2020-11-01 20:10:28 +00:00
parent c4e69d0a2e
commit 213347b938
34 changed files with 590 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Data/Scripts/019_Other battles/004_PBattle_OrgBattleRules.rb
View File

@@ -399,8 +399,7 @@ class StandardRestriction
abilities = pbGetSpeciesData(pokemon.species,pokemon.form,SpeciesData::ABILITIES)
abilities = [abilities] if !abilities.is_a?(Array)
abilities.each do |a|
return true if isConst?(a,PBAbilities,:TRUANT) ||
isConst?(a,PBAbilities,:SLOWSTART)
return true if [:TRUANT, :SLOWSTART].include?(a)
end
# Certain named species are not banned
speciesWhitelist = [:DRAGONITE,:SALAMENCE,:TYRANITAR]

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

@@ -836,10 +836,10 @@ def pbDecideWinnerEffectiveness(move,otype1,otype2,ability,scores)
return 0 if data.basedamage==0
atype=data.type
typemod=PBTypeEffectiveness::NORMAL_EFFECTIVE_ONE*PBTypeEffectiveness::NORMAL_EFFECTIVE_ONE
if !isConst?(ability,PBAbilities,:LEVITATE) || !isConst?(data.type,PBTypes,:GROUND)
if ability != :LEVITATE || !isConst?(data.type,PBTypes,:GROUND)
mod1=PBTypes.getEffectiveness(atype,otype1)
mod2=(otype1==otype2) ? PBTypeEffectiveness::NORMAL_EFFECTIVE_ONE : PBTypes.getEffectiveness(atype,otype2)
if isConst?(ability,PBAbilities,:WONDERGUARD)
if ability == :WONDERGUARD
mod1=PBTypeEffectiveness::NORMAL_EFFECTIVE_ONE if !PBTypes.superEffective?(mod1)
mod2=PBTypeEffectiveness::NORMAL_EFFECTIVE_ONE if !PBTypes.superEffective?(mod2)
end
@@ -862,7 +862,7 @@ def pbDecideWinnerScore(party0,party1,rating)
for j in 0...party1.length
types1.push(party1[j].type1)
types2.push(party1[j].type2)
abilities.push(party1[j].ability)
abilities.push(party1[j].ability_id)
end
for i in 0...party0.length
for move in party0[i].moves