From 62a5ff7872ddceb277cb22f288bc247ba4413b74 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Wed, 30 Mar 2022 20:08:09 -0400 Subject: [PATCH] trainer rematch improvements --- Data/Map011.rxdata | Bin 12738 -> 12746 bytes Data/Map491.rxdata | Bin 71009 -> 71009 bytes Data/MapInfos.rxdata | Bin 36405 -> 36405 bytes Data/Scripts/001_Settings.rb | 2 +- .../010_Data/002_PBS data/013_Trainer.rb | 2 +- .../003_Battle/003_Battle_StartAndEnd.rb | 2 +- Data/Scripts/050_AddOns/DisplayText.rb | 13 ++-- Data/Scripts/050_AddOns/IntroScreen.rb | 2 + Data/Scripts/050_AddOns/Trainers Rebattle.rb | 65 ++++++++++++++---- Data/System.rxdata | Bin 27359 -> 27359 bytes changelog.txt | 1 - 11 files changed, 65 insertions(+), 22 deletions(-) diff --git a/Data/Map011.rxdata b/Data/Map011.rxdata index 35c70abbb028f4ce417f4963bd1c5b459e5fe07f..43af54cae2b129cf7c85900ba56f3be39c7fd4a6 100644 GIT binary patch literal 12746 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 literal 12738 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 diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index c8e8422041d9cd44d50402dc6b51720bbe7d9227..939a2356b23eae8cba3df082ae0262f7610bd208 100644 GIT binary patch delta 31 ncmdlwhiU5^rVSEyj3JvP?L>H)GMOgpdn+)-Gj0y_e&PfGpq&Yx delta 31 ncmdlwhiU5^rVSEyjBcAH?L>H){xVP2_f}vsW!W6){lp0Xricmt diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index 333a997cc..afb53e164 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -6,7 +6,7 @@ module Settings # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format. GAME_VERSION = '5.0.0' - GAME_VERSION_NUMBER = "5.0.13 - beta" + GAME_VERSION_NUMBER = "5.0.16 - beta" POKERADAR_LIGHT_ANIMATION_RED_ID = 17 POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18 diff --git a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb index 15d387987..96e9ec506 100644 --- a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb +++ b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb @@ -130,7 +130,7 @@ module GameData trainer.items = @items.clone trainer.lose_text = self.lose_text - isRematch = $game_switches[200] + isRematch = $game_switches[IS_REMATCH_SWITCH] rematchId = getRematchId(trainer.name, trainer.trainer_type) # Create each Pokémon owned by the trainer diff --git a/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb b/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb index b0a3a7075..239ef48a5 100644 --- a/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb +++ b/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb @@ -337,7 +337,7 @@ class PokeBattle_Battle # End of battle #============================================================================= def pbGainMoney - return if $game_switches[200] #is rematch + return if $game_switches[IS_REMATCH_SWITCH] #is rematch return if !@internalBattle || !@moneyGain # Money rewarded from opposing trainers if trainerBattle? diff --git a/Data/Scripts/050_AddOns/DisplayText.rb b/Data/Scripts/050_AddOns/DisplayText.rb index a9695ba1c..6da81515b 100644 --- a/Data/Scripts/050_AddOns/DisplayText.rb +++ b/Data/Scripts/050_AddOns/DisplayText.rb @@ -1,14 +1,17 @@ -def Kernel.pbDisplayText(message,xposition,yposition,z=nil) - @hud = [] +def Kernel.pbDisplayText(message,xposition,yposition,z=nil, baseColor=nil, shadowColor=nil) + if @hud==nil + @hud = [] + end # Draw the text - baseColor=Color.new(72,72,72) - shadowColor=Color.new(160,160,160) + baseColor= baseColor != nil ? baseColor : Color.new(72,72,72) + shadowColor= shadowColor !=nil ? shadowColor : Color.new(160,160,160) sprite = BitmapSprite.new(Graphics.width,Graphics.height,@viewport1) if z != nil sprite.z=z end @hud.push(sprite) - text1=_INTL(message) + + text1=_INTL(message) textPosition=[ [text1,xposition,yposition,2,baseColor,shadowColor], ] diff --git a/Data/Scripts/050_AddOns/IntroScreen.rb b/Data/Scripts/050_AddOns/IntroScreen.rb index b38d08997..a4cc90e2c 100644 --- a/Data/Scripts/050_AddOns/IntroScreen.rb +++ b/Data/Scripts/050_AddOns/IntroScreen.rb @@ -115,7 +115,9 @@ end class GenOneStyle def initialize + Kernel.pbDisplayText("Controls: F1", 80, 0, 99999) Kernel.pbDisplayText("Version " + Settings::GAME_VERSION_NUMBER, 254, 308, 99999) + @maxPoke = 140 #1st gen, pas de legend la premiere fois, graduellement plus de poke @customPokeList = getCustomSpeciesList() #Get random Pokemon (1st gen orandPokenly, pas de legend la prmeiere fois) diff --git a/Data/Scripts/050_AddOns/Trainers Rebattle.rb b/Data/Scripts/050_AddOns/Trainers Rebattle.rb index 324d396fc..e0a7e88c2 100644 --- a/Data/Scripts/050_AddOns/Trainers Rebattle.rb +++ b/Data/Scripts/050_AddOns/Trainers Rebattle.rb @@ -119,22 +119,45 @@ def decreaseRematchNumber(trainerId) end end +# def evolveRematchPokemon(nbRematch, speciesSymbol) +# species = getDexNumberForSpecies(speciesSymbol) +# if (nbRematch >= 10 && $Trainer.numbadges >= 3) +# evospecies = getEvolution(species) +# return species if evospecies == -1 +# if (nbRematch >= 20 && $Trainer.numbadges >= 8) +# secondEvoSpecies = getEvolution(evospecies) +# return secondEvoSpecies == -1 ? evospecies : secondEvoSpecies +# end +# return evospecies +# end +# return species +# end def evolveRematchPokemon(nbRematch, speciesSymbol) species = getDexNumberForSpecies(speciesSymbol) - if (nbRematch >= 10 && $Trainer.numbadges >= 3) - evospecies = getEvolution(species) - return species if evospecies == -1 - if (nbRematch >= 20 && $Trainer.numbadges >= 8) - secondEvoSpecies = getEvolution(evospecies) - return secondEvoSpecies == -1 ? evospecies : secondEvoSpecies - end - return evospecies + if (nbRematch >= 30 && $Trainer.numbadges >= 6) + species = getEvolution(species,:HEAD) + species = getEvolution(species,:BODY) + species = getEvolution(species,:HEAD) + species = getEvolution(species,:BODY) + elsif (nbRematch >= 20 && $Trainer.numbadges >= 3) + species = getEvolution(species,:HEAD) + species = getEvolution(species,:BODY) + species = getEvolution(species,:HEAD) + elsif (nbRematch >= 10 && $Trainer.numbadges >= 3) + species = getEvolution(species,:HEAD) + species = getEvolution(species,:BODY) + elsif (nbRematch >= 5) + species = getEvolution(species,:HEAD) end return species end -def getEvolution(species) + +def getEvolution(species, halfToEvolve=nil) begin + prioritizeHead = halfToEvolve == :HEAD + prioritizeBody = halfToEvolve == :BODY + if species >= Settings::NB_POKEMON body = getBasePokemonID(species) head = getBasePokemonID(species, false) @@ -154,17 +177,33 @@ def getEvolution(species) evoHead = getDexNumberForSpecies(evoHeadSpecies) end - return -1 if evoBody == nil && evoHead == nil + return species if evoBody == nil && evoHead == nil + if prioritizeBody + if evoBody == nil + return body * Settings::NB_POKEMON + evoHead #only head evolves + else + return evoBody * Settings::NB_POKEMON + head #only body evolves + end + end + + if prioritizeHead + if evoHead == nil + return evoBody * Settings::NB_POKEMON + head #only body evolves + else + return body * Settings::NB_POKEMON + evoHead #only head evolves + end + end + return body * Settings::NB_POKEMON + evoHead if evoBody == nil #only head evolves return evoBody * Settings::NB_POKEMON + head if evoHead == nil #only body evolves - return evoBody * Settings::NB_POKEMON + evoHead #both evolve + return evoBody * Settings::NB_POKEMON + evoHead #both evolve else evo = pbGetEvolvedFormData(species) newSpecies = evo[rand(evo.length - 1)][0] - return evo.any? ? getDexNumberForSpecies(newSpecies) : -1 + return evo.any? ? getDexNumberForSpecies(newSpecies) : species end rescue - return -1 + return species end end diff --git a/Data/System.rxdata b/Data/System.rxdata index 5df29476782d2d7ce78d44a1eec2c52fda57f859..08192c352dc7ba952191615ff80e0ce420ef44bd 100644 GIT binary patch delta 25 hcmcbAmGS;n#tqqG%ub3OoP+ diff --git a/changelog.txt b/changelog.txt index 7ac207736..2d05b42be 100644 --- a/changelog.txt +++ b/changelog.txt @@ -16,7 +16,6 @@ Removed Pokedex key item ##New Stuff Added Quick Surf option Added Kin Island Club -Added support for multiple savefiles Replaced Delibird's hidden ability with Snow Warning Added overworld sprites for a few important trainers Added animations for using Rock Smash and Cut in the overworld