Merge pull request #124 from Giftfox/chaco-mychar

Chaco mychar added
This commit is contained in:
duncathan salt 2021-01-28 21:06:18 -06:00 committed by GitHub
commit 90b64d8917
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions

BIN
src/assets/icon/Chaco.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 432 B

BIN
src/assets/myChar/Chaco.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

View file

@ -42,7 +42,7 @@ settings.randoButton:onPress(function()
Screen:loadObjective(love.math.random(4)-1)
settings.seedselect.value = false
settings.seedrandom.value = true
Screen:loadMyChar(love.math.random(8))
Screen:loadMyChar(love.math.random(9))
Screen:loadSpawn(love.math.random(3)-1)
Screen:loadSeqSettings(fifty(), {
cthulhu = fifty(),
@ -98,12 +98,14 @@ function C:loadMyChar(mychar)
settings.mychar.index = 4
elseif mychar == "assets/myChar/King.bmp" then
settings.mychar.index = 5
elseif mychar == "assets/myChar/Kanpachi.bmp" then
elseif mychar == "assets/myChar/Chaco.bmp" then
settings.mychar.index = 6
elseif mychar == "assets/myChar/Misery.bmp" then
elseif mychar == "assets/myChar/Kanpachi.bmp" then
settings.mychar.index = 7
elseif mychar == "assets/myChar/Frog.bmp" then
elseif mychar == "assets/myChar/Misery.bmp" then
settings.mychar.index = 8
elseif mychar == "assets/myChar/Frog.bmp" then
settings.mychar.index = 9
end
settings.mychar.value = "override"
end

View file

@ -43,6 +43,7 @@ return { style = 'dialog',
{ text = " Sue", value = "assets/myChar/Sue.bmp", icon = "assets/icon/Sue.png" },
{ text = " Toroko", value = "assets/myChar/Toroko.bmp", icon = "assets/icon/Toroko.png" },
{ text = " King", value = "assets/myChar/King.bmp", icon = "assets/icon/King.png" },
{ text = " Chaco", value = "assets/myChar/Chaco.bmp", icon = "assets/icon/Chaco.png" },
{ text = " Kanpachi", value = "assets/myChar/Kanpachi.bmp", icon = "assets/icon/Kanpachi.png" },
{ text = " Misery", value = "assets/myChar/Misery.bmp", icon = "assets/icon/Misery.png" },
{ text = " Frog", value = "assets/myChar/Frog.bmp", icon = "assets/icon/Frog.png" }