mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 21:24:59 +00:00
Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d78c950afc | ||
|
|
e3bb249849 | ||
|
|
3dcaaedfc9 | ||
|
|
5e9153a097 | ||
|
|
3a307cdabf | ||
|
|
9a7ffd13fc | ||
|
|
fed0e2be83 | ||
|
|
c9f043d7b3 | ||
|
|
31063a7a2e | ||
|
|
58640ec8cb | ||
|
|
695d00e351 | ||
|
|
502ff9197c | ||
|
|
8ca8bf9b9f | ||
|
|
085f73f7d1 | ||
|
|
9608cca26f |
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.
@@ -5,8 +5,8 @@
|
||||
#==============================================================================#
|
||||
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 = "6.1.0"
|
||||
GAME_VERSION = '6.1.0'
|
||||
GAME_VERSION_NUMBER = "6.1.2"
|
||||
|
||||
POKERADAR_LIGHT_ANIMATION_RED_ID = 17
|
||||
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
|
||||
|
||||
@@ -97,6 +97,10 @@ class Game_Character
|
||||
end
|
||||
end
|
||||
|
||||
def set_opacity(opacity)
|
||||
@opacity = opacity
|
||||
end
|
||||
|
||||
def move_speed=(val)
|
||||
return if val == @move_speed
|
||||
@move_speed = val
|
||||
|
||||
@@ -84,6 +84,9 @@ end
|
||||
def pbStartOver(gameover=false)
|
||||
$game_variables[VAR_CURRENT_GYM_TYPE]=-1
|
||||
$game_switches[SWITCH_LOCK_PLAYER_MOVEMENT]=false
|
||||
clear_all_images()
|
||||
$game_player.set_opacity(255)
|
||||
$game_system.menu_disabled=false
|
||||
if pbInBugContest?
|
||||
pbBugContestStartOver
|
||||
return
|
||||
|
||||
@@ -128,10 +128,8 @@ class Pokemon
|
||||
end
|
||||
|
||||
def species_data
|
||||
if !@species_data || @species != @species_data.species
|
||||
@species_data = GameData::Species.get(@species)
|
||||
end
|
||||
return @species_data #GameData::Species.get(@species)
|
||||
@species_data = GameData::Species.get(@species)
|
||||
return @species_data
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
@@ -231,17 +229,16 @@ class Pokemon
|
||||
end
|
||||
|
||||
def changeFormSpecies(oldForm, newForm)
|
||||
is_already_old_form = self.isFusionOf(oldForm) #A 466
|
||||
is_already_new_form = self.isFusionOf(newForm) #P
|
||||
|
||||
is_already_old_form = self.isFusionOf(oldForm) #A 466
|
||||
is_already_new_form = self.isFusionOf(newForm) #P
|
||||
|
||||
#reverse the fusion if it's a meloA and meloP fusion
|
||||
# There's probably a smarter way to do this but laziness lol
|
||||
if is_already_old_form && is_already_new_form
|
||||
if self.species_data.get_body_species() == oldForm
|
||||
changeSpeciesSpecific(self,getFusedPokemonIdFromSymbols(newForm,oldForm))
|
||||
changeSpeciesSpecific(self, getFusedPokemonIdFromSymbols(newForm, oldForm))
|
||||
else
|
||||
changeSpeciesSpecific(self,getFusedPokemonIdFromSymbols(oldForm,newForm))
|
||||
changeSpeciesSpecific(self, getFusedPokemonIdFromSymbols(oldForm, newForm))
|
||||
end
|
||||
else
|
||||
changeSpecies(self, oldForm, newForm) if is_already_old_form
|
||||
@@ -251,11 +248,11 @@ class Pokemon
|
||||
calc_stats
|
||||
end
|
||||
|
||||
def changeSpecies(pokemon, speciesToReplace,newSpecies)
|
||||
def changeSpecies(pokemon, speciesToReplace, newSpecies)
|
||||
if pokemon.isFusion?()
|
||||
replaceFusionSpecies(pokemon,speciesToReplace,newSpecies)
|
||||
replaceFusionSpecies(pokemon, speciesToReplace, newSpecies)
|
||||
else
|
||||
changeSpeciesSpecific(pokemon,newSpecies)
|
||||
changeSpeciesSpecific(pokemon, newSpecies)
|
||||
end
|
||||
$Trainer.pokedex.set_seen(pokemon.species)
|
||||
$Trainer.pokedex.set_owned(pokemon.species)
|
||||
|
||||
@@ -593,6 +593,7 @@ end
|
||||
oldindex = @index
|
||||
pbGoToPrevious
|
||||
if @index != oldindex
|
||||
@selected_index=0
|
||||
pbUpdateDummyPokemon
|
||||
@available = pbGetAvailableForms
|
||||
pbSEStop
|
||||
@@ -603,6 +604,7 @@ end
|
||||
oldindex = @index
|
||||
pbGoToNext
|
||||
if @index != oldindex
|
||||
@selected_index=0
|
||||
pbUpdateDummyPokemon
|
||||
@available = pbGetAvailableForms
|
||||
pbSEStop
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
||||
6.0
|
||||
6.1
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 795 KiB After Width: | Height: | Size: 795 KiB |
Reference in New Issue
Block a user