mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 21:24:59 +00:00
More WIP 5.1 stuff
This commit is contained in:
infinitefusion
@@ -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.36"
|
||||
GAME_VERSION_NUMBER = "5.0.36.3"
|
||||
|
||||
POKERADAR_LIGHT_ANIMATION_RED_ID = 17
|
||||
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
|
||||
|
||||
@@ -177,7 +177,7 @@ class PokeBattle_Battle
|
||||
# For "1v2" names, the first number is for the player's side and the second
|
||||
# number is for the opposing side.
|
||||
def setBattleMode(mode)
|
||||
default = $game_variables[242].is_a?(Array) ? $game_variables[242] : [1,1]
|
||||
default = $game_variables[VAR_DEFAULT_BATTLE_TYPE].is_a?(Array) ? $game_variables[VAR_DEFAULT_BATTLE_TYPE] : [1,1]
|
||||
@sideSizes =
|
||||
case mode
|
||||
when "triple", "3v3" then [3, 3]
|
||||
|
||||
@@ -202,8 +202,13 @@ class PokeBattle_Battle
|
||||
msg += _INTL("{1} sent out {2} and {3}!",t.full_name,
|
||||
@battlers[sent[0]].name,@battlers[sent[1]].name)
|
||||
when 3
|
||||
msg += _INTL("{1} sent out {2}, {3} and {4}!",t.full_name,
|
||||
@battlers[sent[0]].name,@battlers[sent[1]].name,@battlers[sent[2]].name)
|
||||
if $PokemonTemp.battleRules["birdboss"]
|
||||
msg += _INTL("{1} sent out Zapmolticuno!",t.full_name)
|
||||
else
|
||||
msg += _INTL("{1} sent out {2}, {3} and {4}!",t.full_name,
|
||||
@battlers[sent[0]].name,@battlers[sent[1]].name,@battlers[sent[2]].name)
|
||||
end
|
||||
|
||||
end
|
||||
toSendOut.concat(sent)
|
||||
end
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
class PokeBattle_Animation
|
||||
attr_writer :animDone
|
||||
def initialize(sprites,viewport)
|
||||
@sprites = sprites
|
||||
@viewport = viewport
|
||||
|
||||
@@ -293,15 +293,25 @@ class PokeBattle_Scene
|
||||
faintAnim = BattlerFaintAnimation.new(@sprites,@viewport,battler.index,@battle)
|
||||
dataBoxAnim = DataBoxDisappearAnimation.new(@sprites,@viewport,battler.index)
|
||||
loop do
|
||||
faintAnim.update
|
||||
if !showFaintingAnimation(battler)
|
||||
faintAnim.animDone = true
|
||||
else
|
||||
faintAnim.update
|
||||
end
|
||||
dataBoxAnim.update
|
||||
pbUpdate
|
||||
break if faintAnim.animDone? && dataBoxAnim.animDone?
|
||||
end
|
||||
faintAnim.dispose
|
||||
faintAnim.dispose if !$PokemonTemp.battleRules["birdboss"].nil?
|
||||
dataBoxAnim.dispose
|
||||
end
|
||||
|
||||
def showFaintingAnimation(battler)
|
||||
return true if !battler.opposes?
|
||||
return false if $game_switches[SWITCH_BIRDBOSS_BATTLE] && battler.battle.pbAbleCount(1) > 0
|
||||
return true
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
# Animates throwing a Poké Ball at a Pokémon in an attempt to catch it
|
||||
#=============================================================================
|
||||
|
||||
@@ -30,6 +30,7 @@ class PokemonTemp
|
||||
when "single", "1v1", "1v2", "2v1", "1v3", "3v1",
|
||||
"double", "2v2", "2v3", "3v2", "triple", "3v3"
|
||||
rules["size"] = rule.to_s.downcase
|
||||
when "birdboss" then rules["birdboss"] = true
|
||||
when "canlose" then rules["canLose"] = true
|
||||
when "cannotlose" then rules["canLose"] = false
|
||||
when "canrun" then rules["canRun"] = true
|
||||
@@ -121,6 +122,8 @@ def pbPrepareBattle(battle)
|
||||
battleRules = $PokemonTemp.battleRules
|
||||
# The size of the battle, i.e. how many Pokémon on each side (default: "single")
|
||||
battle.setBattleMode(battleRules["size"]) if !battleRules["size"].nil? || $game_switches[SWITCH_NEW_GAME_PLUS]
|
||||
battle.setBattleMode("1v3") if !battleRules["birdboss"].nil?
|
||||
|
||||
# Whether the game won't black out even if the player loses (default: false)
|
||||
battle.canLose = battleRules["canLose"] if !battleRules["canLose"].nil?
|
||||
# Whether the player can choose to run from the battle (default: true)
|
||||
@@ -502,6 +505,8 @@ end
|
||||
def pbTrainerBattle(trainerID, trainerName, endSpeech=nil,
|
||||
doubleBattle=false, trainerPartyID=0, canLose=false, outcomeVar=1,
|
||||
name_override=nil,trainer_type_overide=nil)
|
||||
|
||||
|
||||
#level override applies to every pokemon
|
||||
|
||||
# If there is another NPC trainer who spotted the player at the same time, and
|
||||
@@ -522,7 +527,7 @@ def pbTrainerBattle(trainerID, trainerName, endSpeech=nil,
|
||||
next if $game_self_switches[[$game_map.map_id,i.id,"A"]]
|
||||
otherEvent.push(i)
|
||||
end
|
||||
# Load the trainer's data, and call an event which might modify it
|
||||
# Load the trainer's data, and call an event w0hich might modify it
|
||||
trainer = pbLoadTrainer(trainerID,trainerName,trainerPartyID)
|
||||
pbMissingTrainer(trainerID,trainerName,trainerPartyID) if !trainer
|
||||
return false if !trainer
|
||||
|
||||
@@ -226,7 +226,7 @@ def pbPokeRadarGetEncounter(rarity = 0)
|
||||
array.push(enc) if enc[0] == map && GameData::Species.exists?(enc[2])
|
||||
end
|
||||
# If there are any exclusives, first have a chance of encountering those
|
||||
if array.length > 0
|
||||
if array.length > 0 && listPokemonInCurrentRoute($PokemonEncounters.encounter_type, false, true).length==0
|
||||
rnd = rand(100)
|
||||
array.each do |enc|
|
||||
rnd -= enc[1]
|
||||
|
||||
@@ -734,7 +734,7 @@ module Compiler
|
||||
end
|
||||
|
||||
def main
|
||||
#return
|
||||
return
|
||||
return if !$DEBUG
|
||||
begin
|
||||
dataFiles = [
|
||||
|
||||
@@ -129,3 +129,4 @@ DIRECTION_DOWN = 2
|
||||
DIRECTION_UP = 8
|
||||
|
||||
|
||||
SWITCH_BIRDBOSS_BATTLE = 824
|
||||
|
||||
@@ -182,6 +182,7 @@ RandPokeNick = [
|
||||
"Regis",
|
||||
"Cleopatra",
|
||||
"Robin",
|
||||
"Obi-wan",
|
||||
"pthread_cond_init",
|
||||
"Pharaoh",
|
||||
"Moskva",
|
||||
@@ -246,6 +247,8 @@ RandPokeNick = [
|
||||
"Mec",
|
||||
"Boromir",
|
||||
"Gandalf",
|
||||
"Ganon",
|
||||
"Ganondorf",
|
||||
"Mickey",
|
||||
"Michael Jordan",
|
||||
"POSIX",
|
||||
@@ -271,6 +274,7 @@ RandPokeNick = [
|
||||
"Mr. Bean",
|
||||
"Lover",
|
||||
"HALLOWS",
|
||||
"HAL 9000",
|
||||
"Trucker",
|
||||
"idk",
|
||||
"Bababa",
|
||||
@@ -336,6 +340,7 @@ RandPokeNick = [
|
||||
"thank you",
|
||||
"Lamar",
|
||||
"CJ",
|
||||
"Tinky-Winky",
|
||||
"sup",
|
||||
"LOL",
|
||||
"^-^",
|
||||
@@ -379,14 +384,17 @@ RandPokeNick = [
|
||||
"Allah",
|
||||
"clipou",
|
||||
"Muhammad",
|
||||
"Homelander",
|
||||
"Gino",
|
||||
"password",
|
||||
"password123",
|
||||
"covid",
|
||||
"McLovin",
|
||||
"Caillou",
|
||||
"covfefe",
|
||||
"admin",
|
||||
"God",
|
||||
"Hulk",
|
||||
"spaghetti-o",
|
||||
"prawn",
|
||||
"1; DROP TABLE pokemon;--",
|
||||
@@ -402,10 +410,12 @@ RandPokeNick = [
|
||||
"ur welcome",
|
||||
"Cartman",
|
||||
"Switch",
|
||||
"Fonzie",
|
||||
"Zelda",
|
||||
"Link",
|
||||
"Mario",
|
||||
"Luigi",
|
||||
"Aquaman",
|
||||
"Waluigi",
|
||||
"Kirby",
|
||||
"Samus",
|
||||
@@ -429,7 +439,6 @@ RandPokeNick = [
|
||||
"Samba",
|
||||
"Bossa Nova",
|
||||
"Reggae",
|
||||
"Spock",
|
||||
"Jazz",
|
||||
"generatedName_1",
|
||||
"generatedName_2",
|
||||
@@ -509,6 +518,8 @@ RandPokeNick = [
|
||||
"POKEMAN2",
|
||||
"POKEMAN4",
|
||||
"Gnome",
|
||||
"pewdiepie",
|
||||
"coolbaby",
|
||||
"Warbles",
|
||||
"Primavera",
|
||||
"Gigi",
|
||||
@@ -542,13 +553,16 @@ RandPokeNick = [
|
||||
"Misty",
|
||||
"Ash",
|
||||
"Satoshi",
|
||||
"Katniss",
|
||||
"Sniper",
|
||||
"Suzy",
|
||||
"Mozart",
|
||||
"Lucy",
|
||||
"Mike",
|
||||
"Molly",
|
||||
"Leela",
|
||||
"Pauvcon",
|
||||
"Pinkman",
|
||||
"Fatso",
|
||||
"Coolio",
|
||||
"Sonata",
|
||||
@@ -566,6 +580,7 @@ RandPokeNick = [
|
||||
"Solfege",
|
||||
"Kunidé",
|
||||
"Kate",
|
||||
"Darth Vader",
|
||||
"Dave",
|
||||
"t bo",
|
||||
"what",
|
||||
@@ -596,12 +611,14 @@ RandPokeNick = [
|
||||
"Morty",
|
||||
"Scheiße",
|
||||
"Santa",
|
||||
"Sherlock",
|
||||
"Crumbs",
|
||||
"Neo",
|
||||
"Michael",
|
||||
"Jackson",
|
||||
"Adamas",
|
||||
"Tina",
|
||||
"Arya",
|
||||
"Scrabble",
|
||||
"Tiamath",
|
||||
"Raggedy",
|
||||
@@ -623,6 +640,7 @@ RandPokeNick = [
|
||||
"Jones",
|
||||
"cheers!",
|
||||
"Frootloops",
|
||||
"Hypnotoad",
|
||||
"T",
|
||||
"The Batman",
|
||||
"Twerk",
|
||||
@@ -637,6 +655,7 @@ RandPokeNick = [
|
||||
"Macarena",
|
||||
"Dreamer",
|
||||
"Beetlejuice",
|
||||
"Beethoven",
|
||||
"fann",
|
||||
"Gizmo",
|
||||
"Cannonball",
|
||||
@@ -684,6 +703,7 @@ RandPokeNick = [
|
||||
"PlayStation",
|
||||
"GameCube",
|
||||
"Petit mec",
|
||||
"Tarzan",
|
||||
"X-Box",
|
||||
"AAAAAAAA",
|
||||
"cyka",
|
||||
@@ -700,12 +720,16 @@ RandPokeNick = [
|
||||
"Lionel",
|
||||
"Malicious",
|
||||
"Supernova",
|
||||
"Chopin",
|
||||
"Agumon",
|
||||
"mick jagger",
|
||||
"Greymon",
|
||||
"Rockstar",
|
||||
"Shin",
|
||||
"Gargamel",
|
||||
"Egg",
|
||||
"Buttercup",
|
||||
"Betty",
|
||||
"Emily",
|
||||
"Eminem",
|
||||
"garcia",
|
||||
@@ -720,6 +744,7 @@ RandPokeNick = [
|
||||
"DEMON",
|
||||
"Ponytails",
|
||||
"monesti",
|
||||
"picklerick",
|
||||
"ticon",
|
||||
"macalice",
|
||||
"Dixie",
|
||||
@@ -734,13 +759,14 @@ RandPokeNick = [
|
||||
"Conky",
|
||||
"fait chier",
|
||||
"lamus",
|
||||
"Sonic",
|
||||
"sanic",
|
||||
"Harry",
|
||||
"Potter",
|
||||
"Rumba",
|
||||
"pikapika",
|
||||
"Never Gonna Give You Up",
|
||||
"Peppy",
|
||||
"Bart",
|
||||
"Link",
|
||||
"Uber",
|
||||
"Lollipop",
|
||||
@@ -754,8 +780,8 @@ RandPokeNick = [
|
||||
"Monsta!",
|
||||
"virus.exe",
|
||||
"Limewire",
|
||||
"Ariel",
|
||||
"nothing",
|
||||
"rick and morty",
|
||||
"a Pokémon",
|
||||
"Popeye",
|
||||
"Kermit",
|
||||
@@ -769,6 +795,7 @@ RandPokeNick = [
|
||||
"Sylvain",
|
||||
"Light",
|
||||
"Peter",
|
||||
"Mr. Resetti",
|
||||
"Angel",
|
||||
"Corona",
|
||||
"Cinnamon",
|
||||
@@ -777,6 +804,9 @@ RandPokeNick = [
|
||||
"Joker",
|
||||
"O'Neil",
|
||||
"Stu",
|
||||
"Dog",
|
||||
"Cat",
|
||||
"Spiderman",
|
||||
"||||",
|
||||
"Nightmare",
|
||||
"1",
|
||||
@@ -789,9 +819,12 @@ RandPokeNick = [
|
||||
"Puppy",
|
||||
"Puffy",
|
||||
"Fi",
|
||||
"Spirou",
|
||||
"FASHION",
|
||||
"Chuckles",
|
||||
"Bacon",
|
||||
"Ridley",
|
||||
"Andross",
|
||||
"Nightman",
|
||||
"Dayman",
|
||||
"Jojo",
|
||||
@@ -801,6 +834,7 @@ RandPokeNick = [
|
||||
"McNeil",
|
||||
"Bowie",
|
||||
"Hendrix",
|
||||
"Tom Nook",
|
||||
"Bunny",
|
||||
"Jina",
|
||||
"Gipsy",
|
||||
@@ -812,6 +846,7 @@ RandPokeNick = [
|
||||
"Hilary Clinton",
|
||||
"Metroid",
|
||||
"Ali",
|
||||
"Bowser",
|
||||
"Snoopy",
|
||||
"Mimi",
|
||||
"Quebec",
|
||||
@@ -834,6 +869,7 @@ RandPokeNick = [
|
||||
"Ridley",
|
||||
"Ursaring",
|
||||
"Charlie",
|
||||
"Samus",
|
||||
"Justin Trudeau",
|
||||
"273-8255",
|
||||
"Gino",
|
||||
@@ -843,6 +879,8 @@ RandPokeNick = [
|
||||
"Macho",
|
||||
"Paddle",
|
||||
"Tennis",
|
||||
"Sonic",
|
||||
"Knuckles",
|
||||
"Chidi",
|
||||
"OFCOURS-_-",
|
||||
"Baseball",
|
||||
@@ -870,12 +908,14 @@ RandPokeNick = [
|
||||
"Corsola",
|
||||
"Glass",
|
||||
"Rocket",
|
||||
"meh",
|
||||
"Vodka",
|
||||
"I <3 U",
|
||||
"Ninja",
|
||||
"Papa",
|
||||
"Mama",
|
||||
"Fortnite",
|
||||
"Tintin",
|
||||
"Eleanor",
|
||||
"Pepito",
|
||||
"Dolphin",
|
||||
@@ -886,8 +926,11 @@ RandPokeNick = [
|
||||
"AAAAAH!!!",
|
||||
"N64",
|
||||
"Turnips",
|
||||
"Taylor Swift",
|
||||
"Hermione",
|
||||
"Olaf",
|
||||
"Narnia",
|
||||
"Lucky Luke",
|
||||
"Obama",
|
||||
"Freebie",
|
||||
"un joli pokémon",
|
||||
@@ -900,6 +943,7 @@ RandPokeNick = [
|
||||
"Reaper",
|
||||
"193119",
|
||||
"pokemon.png",
|
||||
"Kiwi",
|
||||
"Muscles",
|
||||
"Buddy",
|
||||
"asl",
|
||||
@@ -923,8 +967,11 @@ RandPokeNick = [
|
||||
"huh?",
|
||||
"Rachid",
|
||||
"Naruto",
|
||||
"Clicken",
|
||||
"bling bling",
|
||||
"gimme $$$",
|
||||
"Masterchief",
|
||||
"Better luck next time!",
|
||||
"Zombie",
|
||||
"Woofster",
|
||||
"Turing",
|
||||
@@ -942,6 +989,8 @@ RandPokeNick = [
|
||||
"Prince",
|
||||
"Princess",
|
||||
"Emperor",
|
||||
"Cloud",
|
||||
"Bilbo",
|
||||
"Mimosa",
|
||||
"Heisenberg",
|
||||
"Java",
|
||||
@@ -951,12 +1000,15 @@ RandPokeNick = [
|
||||
"BOOM",
|
||||
"Cloud",
|
||||
"Jeremy",
|
||||
"Ryu",
|
||||
"Madrid",
|
||||
"deez",
|
||||
"Garfield",
|
||||
"Gin",
|
||||
"Luke",
|
||||
"gracias",
|
||||
"Madonna",
|
||||
"Kratos",
|
||||
"Lucky",
|
||||
"Pinnocchio",
|
||||
"Kylie",
|
||||
@@ -977,10 +1029,14 @@ RandPokeNick = [
|
||||
"Moby",
|
||||
"Sashimi",
|
||||
"Vito",
|
||||
"Boognish",
|
||||
"GLaDOS",
|
||||
"Chippy",
|
||||
"Boogie",
|
||||
"Funky",
|
||||
"Chun-Li",
|
||||
"Groot",
|
||||
"Shaggy",
|
||||
"Chewbacca",
|
||||
"Schrroms",
|
||||
"Boris",
|
||||
|
||||
Reference in New Issue
Block a user