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

6.4 update (minus sprites)

Browse Source
This commit is contained in:
infinitefusion
2024-12-21 09:43:11 -05:00
parent f70c2cfde4
commit 1e325366d2
1717 changed files with 140299 additions and 27845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Data/Scripts/010_Data/001_Hardcoded data/011_TerrainTag.rb
View File

@@ -262,4 +262,28 @@ GameData::TerrainTag.register({
:id => :SharpedoObstacle,
:id_number => 23,
:sharpedoObstacle => true
})
GameData::TerrainTag.register({
:id => :Grass_alt1,
:id_number => 24,
:shows_grass_rustle => true,
:land_wild_encounters => true,
:battle_environment => :Grass
})
GameData::TerrainTag.register({
:id => :Grass_alt2,
:id_number => 25,
:shows_grass_rustle => true,
:land_wild_encounters => true,
:battle_environment => :Grass
})
GameData::TerrainTag.register({
:id => :Grass_alt3,
:id_number => 26,
:shows_grass_rustle => true,
:land_wild_encounters => true,
:battle_environment => :Grass
})

21
Data/Scripts/010_Data/001_Hardcoded data/013_EncounterType.rb
View File

@@ -33,6 +33,27 @@ GameData::EncounterType.register({
:old_slots => [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]
})
GameData::EncounterType.register({
:id => :Land1,
:type => :land,
:trigger_chance => 21,
:old_slots => [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]
})
GameData::EncounterType.register({
:id => :Land2,
:type => :land,
:trigger_chance => 21,
:old_slots => [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]
})
GameData::EncounterType.register({
:id => :Land3,
:type => :land,
:trigger_chance => 21,
:old_slots => [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]
})
GameData::EncounterType.register({
:id => :LandDay,
:type => :land,

2
Data/Scripts/010_Data/002_PBS data/006_Item.rb
View File

@@ -118,8 +118,10 @@ module GameData
def is_mulch?; return @type == 11; end
def is_mega_stone?; return @type == 12; end # Does NOT include Red Orb/Blue Orb
UNTOSSABLE_ITEMS =[:PINKANBERRY,:DYNAMITE, :TM00]
def is_important?
return true if is_key_item? || is_HM? || is_TM?
return true if UNTOSSABLE_ITEMS.include?(@id)
return false
end

2
Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb
View File

@@ -103,7 +103,7 @@ module GameData
def self.sprite_bitmap(species, form = 0, gender = 0, shiny = false, shadow = false, back = false, egg = false)
return self.egg_sprite_bitmap(species, form) if egg
return self.back_sprite_bitmap(species, form, gender, shiny, shadow) if back
return self.front_sprite_bitmap(species, form, gender, shiny, shadow)
return self.front_sprite_bitmap(species, shiny,)
end
def self.sprite_bitmap_from_pokemon(pkmn, back = false, species = nil)

2
Data/Scripts/010_Data/002_PBS data/011_EncounterModern.rb
View File

@@ -7,7 +7,7 @@ module GameData
attr_reader :types
DATA = {}
DATA_FILENAME = "encounters_modern.dat"
DATA_FILENAME = "encounters_remix.dat"
extend ClassMethodsSymbols
include InstanceMethods

6
Data/Scripts/010_Data/002_PBS data/013_Trainer.rb
View File

@@ -149,11 +149,14 @@ module GameData
end
def replace_species_to_randomized_gym(species, trainerId, pokemonIndex)
return if !pokemonIndex
return if !trainerId
return if !species
if $PokemonGlobal.randomGymTrainersHash == nil
$PokemonGlobal.randomGymTrainersHash = {}
end
if $game_switches[SWITCH_RANDOM_GYM_PERSIST_TEAMS] && $PokemonGlobal.randomGymTrainersHash != nil
if $PokemonGlobal.randomGymTrainersHash[trainerId] != nil && $PokemonGlobal.randomGymTrainersHash[trainerId].length >= $PokemonGlobal.randomTrainersHash[trainerId].length
if $PokemonGlobal.randomGymTrainersHash[trainerId] && $PokemonGlobal.randomGymTrainersHash[trainerId].length >= $PokemonGlobal.randomTrainersHash[trainerId].length
newSpecies = getSpecies($PokemonGlobal.randomGymTrainersHash[trainerId][pokemonIndex])
return newSpecies if newSpecies
return species
@@ -199,6 +202,7 @@ module GameData
end
def replace_species_to_randomized(species, trainerId, pokemonIndex)
return species if $game_switches[SWITCH_DONT_RANDOMIZE]
return species if $game_switches[SWITCH_FIRST_RIVAL_BATTLE]
return species if getDexNumberForSpecies(species) >= Settings::ZAPMOLCUNO_NB
if isGymBattle() && $game_switches[SWITCH_RANDOMIZE_GYMS_SEPARATELY]

3
Data/Scripts/010_Data/002_PBS data/013_TrainerModern.rb
View File

@@ -10,7 +10,7 @@ module GameData
attr_reader :pokemon
DATA = {}
DATA_FILENAME = "trainers_modern.dat"
DATA_FILENAME = "trainers_remix.dat"
SCHEMA = {
"Items" => [:items, "*e", :Item],
@@ -194,6 +194,7 @@ module GameData
def replace_species_to_randomized(species, trainerId, pokemonIndex)
return species if $game_switches[SWITCH_FIRST_RIVAL_BATTLE]
return species if $game_switches[SWITCH_DONT_RANDOMIZE]
if isGymBattle() && $game_switches[SWITCH_RANDOMIZE_GYMS_SEPARATELY]
return replace_species_to_randomized_gym(species, trainerId, pokemonIndex)
end