10 Commits
6.1 ... 6.1.1

Author SHA1 Message Date
infinitefusion
9a7ffd13fc Fixes bug when player loses to mew 2024-03-28 23:42:49 -04:00
infinitefusion
fed0e2be83 removes dev files 2024-03-28 21:47:44 -04:00
infinitefusion
c9f043d7b3 adds hint for marowak in meloetta quest 2024-03-28 21:47:01 -04:00
infinitefusion
31063a7a2e adds back pbs and project file lol 2024-03-28 20:12:40 -04:00
infinitefusion
58640ec8cb Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-03-28 20:08:27 -04:00
infinitefusion
695d00e351 fixes minor fuckups 2024-03-28 20:08:04 -04:00
infinitefusion
502ff9197c 6.1.1 2024-03-28 20:04:18 -04:00
infinitefusion
8ca8bf9b9f Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-03-28 19:59:29 -04:00
infinitefusion
085f73f7d1 fixes dex number not updating from previous version 2024-03-28 19:58:25 -04:00
infinitefusion
9608cca26f updates new version notification 2024-03-28 18:25:47 -04:00
23 changed files with 18 additions and 14 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -6,7 +6,7 @@
module Settings module Settings
# The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format. # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
GAME_VERSION = '5.0.0' GAME_VERSION = '5.0.0'
GAME_VERSION_NUMBER = "6.1.0" GAME_VERSION_NUMBER = "6.1.1"
POKERADAR_LIGHT_ANIMATION_RED_ID = 17 POKERADAR_LIGHT_ANIMATION_RED_ID = 17
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18 POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18

View File

@@ -97,6 +97,10 @@ class Game_Character
end end
end end
def set_opacity(opacity)
@opacity = opacity
end
def move_speed=(val) def move_speed=(val)
return if val == @move_speed return if val == @move_speed
@move_speed = val @move_speed = val

View File

@@ -84,6 +84,9 @@ end
def pbStartOver(gameover=false) def pbStartOver(gameover=false)
$game_variables[VAR_CURRENT_GYM_TYPE]=-1 $game_variables[VAR_CURRENT_GYM_TYPE]=-1
$game_switches[SWITCH_LOCK_PLAYER_MOVEMENT]=false $game_switches[SWITCH_LOCK_PLAYER_MOVEMENT]=false
clear_all_images()
$game_player.set_opacity(255)
$game_system.menu_disabled=false
if pbInBugContest? if pbInBugContest?
pbBugContestStartOver pbBugContestStartOver
return return

View File

@@ -128,10 +128,8 @@ class Pokemon
end end
def species_data def species_data
if !@species_data || @species != @species_data.species @species_data = GameData::Species.get(@species)
@species_data = GameData::Species.get(@species) return @species_data
end
return @species_data #GameData::Species.get(@species)
end end
#============================================================================= #=============================================================================
@@ -231,17 +229,16 @@ class Pokemon
end end
def changeFormSpecies(oldForm, newForm) def changeFormSpecies(oldForm, newForm)
is_already_old_form = self.isFusionOf(oldForm) #A 466 is_already_old_form = self.isFusionOf(oldForm) #A 466
is_already_new_form = self.isFusionOf(newForm) #P is_already_new_form = self.isFusionOf(newForm) #P
#reverse the fusion if it's a meloA and meloP fusion #reverse the fusion if it's a meloA and meloP fusion
# There's probably a smarter way to do this but laziness lol # There's probably a smarter way to do this but laziness lol
if is_already_old_form && is_already_new_form if is_already_old_form && is_already_new_form
if self.species_data.get_body_species() == oldForm if self.species_data.get_body_species() == oldForm
changeSpeciesSpecific(self,getFusedPokemonIdFromSymbols(newForm,oldForm)) changeSpeciesSpecific(self, getFusedPokemonIdFromSymbols(newForm, oldForm))
else else
changeSpeciesSpecific(self,getFusedPokemonIdFromSymbols(oldForm,newForm)) changeSpeciesSpecific(self, getFusedPokemonIdFromSymbols(oldForm, newForm))
end end
else else
changeSpecies(self, oldForm, newForm) if is_already_old_form changeSpecies(self, oldForm, newForm) if is_already_old_form
@@ -251,11 +248,11 @@ class Pokemon
calc_stats calc_stats
end end
def changeSpecies(pokemon, speciesToReplace,newSpecies) def changeSpecies(pokemon, speciesToReplace, newSpecies)
if pokemon.isFusion?() if pokemon.isFusion?()
replaceFusionSpecies(pokemon,speciesToReplace,newSpecies) replaceFusionSpecies(pokemon, speciesToReplace, newSpecies)
else else
changeSpeciesSpecific(pokemon,newSpecies) changeSpeciesSpecific(pokemon, newSpecies)
end end
$Trainer.pokedex.set_seen(pokemon.species) $Trainer.pokedex.set_seen(pokemon.species)
$Trainer.pokedex.set_owned(pokemon.species) $Trainer.pokedex.set_owned(pokemon.species)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1 +1 @@
6.0 6.1

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 795 KiB

After

Width:  |  Height:  |  Size: 795 KiB