diff --git a/sonic-radiance.love/assets/music/battle2.mp3 b/sonic-radiance.love/assets/music/battle2.mp3 new file mode 100644 index 0000000..9360a30 Binary files /dev/null and b/sonic-radiance.love/assets/music/battle2.mp3 differ diff --git a/sonic-radiance.love/assets/music/victory.mp3 b/sonic-radiance.love/assets/music/victory.mp3 index 4b8d359..c65ab31 100644 Binary files a/sonic-radiance.love/assets/music/victory.mp3 and b/sonic-radiance.love/assets/music/victory.mp3 differ diff --git a/sonic-radiance.love/datas/gamedata/battles/test/testBoss.lua b/sonic-radiance.love/datas/gamedata/battles/test/testBoss.lua index 795ca16..85ff44b 100644 --- a/sonic-radiance.love/datas/gamedata/battles/test/testBoss.lua +++ b/sonic-radiance.love/datas/gamedata/battles/test/testBoss.lua @@ -1,8 +1,8 @@ return { - music = "battle1", + music = "battle2", ennemies = { {"normal", "classics", "motobug", 1}, - {"boss", "classics", "motobug", 2, 1.2, true}, + {"boss", "classics", "motobug", 10, 1.8, true}, {"normal", "classics", "motobug", 1}} } diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/ennemy.lua b/sonic-radiance.love/scenes/battlesystem/controllers/ennemy.lua index b8e5e01..9f3e094 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/ennemy.lua +++ b/sonic-radiance.love/scenes/battlesystem/controllers/ennemy.lua @@ -44,7 +44,7 @@ function EnnemyController:addBoss(ennData) boss:setBonus(ennData.pvFactor, ennData.statFactor) boss.isBoss = true boss:setCheapEffect(ennData.cheapEffect) - self.owner.canFleeBattle = false + self.turnSystem.canFleeBattle = false self:add(boss) end diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/init.lua b/sonic-radiance.love/scenes/battlesystem/controllers/init.lua index 91490a4..6007947 100644 --- a/sonic-radiance.love/scenes/battlesystem/controllers/init.lua +++ b/sonic-radiance.love/scenes/battlesystem/controllers/init.lua @@ -41,6 +41,7 @@ function TurnController:getChanceTooFlee(value) local speedComparison = math.min(value / self.ennemies:getHighestSpeed(), 1.5) return 25 + (50 * speedComparison) end + return 0 end function TurnController:fleeBattle()