Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfixes #95

Merged
merged 3 commits into from
Sep 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/custom/bab.json
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@
"tiling": "-1"
},
{
"name": "chain",
"name": "babchain",
"sprite": "chain",
"color": [
"0",
Expand Down
29 changes: 19 additions & 10 deletions data/custom/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -917,15 +917,6 @@
],
"tiling": "-1"
},
{
"name": "em2",
"sprite": "eeveemaster",
"color": [
"2",
"3"
],
"tiling": "2"
},
{
"name": "text_pride",
"sprite": "text_pride",
Expand Down Expand Up @@ -1680,7 +1671,7 @@
"2",
"2"
],
"tiling": "3"
"tiling": "2"
},
{
"name": "tar",
Expand Down Expand Up @@ -1753,5 +1744,23 @@
"3"
],
"tiling": "1"
},
{
"name": "nest",
"sprite": "nest",
"color": [
"2",
"3"
],
"tiling": "-1"
},
{
"name": "text_nest",
"sprite": "text_nest",
"color": [
"2",
"3"
],
"tiling": "-1"
}
]
45 changes: 45 additions & 0 deletions data/custom/theopold-sprites.json
Original file line number Diff line number Diff line change
Expand Up @@ -1321,5 +1321,50 @@
"3"
],
"tiling": "2"
},
{
"name": "grgr",
"sprite": "grgr",
"color": [
"0",
"3"
],
"tiling": "2"
},
{
"name": "lele",
"sprite": "lele",
"color": [
"4",
"1"
],
"tiling": "0"
},
{
"name": "sasa",
"sprite": "sasa",
"color": [
"0",
"1"
],
"tiling": "0"
},
{
"name": "ee",
"sprite": "ee",
"color": [
"6",
"2"
],
"tiling": "0"
},
{
"name": "text_ee",
"sprite": "text_ee",
"color": [
"6",
"2"
],
"tiling": "-1"
}
]
4 changes: 3 additions & 1 deletion data/misc/listofcharacter.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ bebe
bee
belbel
beta
beta
bibad
bibi
bibo
Expand All @@ -46,6 +45,7 @@ bubu
bug
bug2
bunny
bwot
cat
cbaba
ceba
Expand Down Expand Up @@ -180,6 +180,8 @@ packoc
page
pivotisoc
popo
poweredoc
poweroc
pumpkin
quiqui
rat
Expand Down
Binary file modified data/sprites/misc/canopy_0_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_0_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_0_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_10_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_10_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_10_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_11_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_11_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_11_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_12_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_12_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_12_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_13_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_13_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_13_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_14_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_14_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_14_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_15_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_15_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_15_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_1_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_1_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_1_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_2_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprites/misc/canopy_2_2.png
Binary file modified data/sprites/misc/canopy_2_3.png
Binary file modified data/sprites/misc/canopy_3_1.png
Binary file modified data/sprites/misc/canopy_3_2.png
Binary file modified data/sprites/misc/canopy_3_3.png
Binary file modified data/sprites/misc/canopy_4_1.png
Binary file modified data/sprites/misc/canopy_4_2.png
Binary file modified data/sprites/misc/canopy_4_3.png
Binary file modified data/sprites/misc/canopy_5_1.png
Binary file modified data/sprites/misc/canopy_5_2.png
Binary file modified data/sprites/misc/canopy_5_3.png
Binary file modified data/sprites/misc/canopy_6_1.png
Binary file modified data/sprites/misc/canopy_6_2.png
Binary file modified data/sprites/misc/canopy_6_3.png
Binary file modified data/sprites/misc/canopy_7_1.png
Binary file modified data/sprites/misc/canopy_7_2.png
Binary file modified data/sprites/misc/canopy_7_3.png
Binary file modified data/sprites/misc/canopy_8_1.png
Binary file modified data/sprites/misc/canopy_8_2.png
Binary file modified data/sprites/misc/canopy_8_3.png
Binary file modified data/sprites/misc/canopy_9_1.png
Binary file modified data/sprites/misc/canopy_9_2.png
Binary file modified data/sprites/misc/canopy_9_3.png
Binary file modified data/sprites/misc/mario_0_1.png
Binary file modified data/sprites/misc/mario_0_2.png
Binary file modified data/sprites/misc/mario_0_3.png
Binary file modified data/sprites/misc/mario_10_1.png
Binary file modified data/sprites/misc/mario_10_2.png
Binary file modified data/sprites/misc/mario_10_3.png
Binary file modified data/sprites/misc/mario_11_1.png
Binary file modified data/sprites/misc/mario_11_2.png
Binary file modified data/sprites/misc/mario_11_3.png
Binary file added data/sprites/misc/mario_15_1.png
Binary file added data/sprites/misc/mario_15_2.png
Binary file added data/sprites/misc/mario_15_3.png
Binary file modified data/sprites/misc/mario_16_1.png
Binary file modified data/sprites/misc/mario_16_2.png
Binary file modified data/sprites/misc/mario_16_3.png
Binary file modified data/sprites/misc/mario_17_1.png
Binary file modified data/sprites/misc/mario_17_2.png
Binary file modified data/sprites/misc/mario_17_3.png
Binary file modified data/sprites/misc/mario_18_1.png
Binary file modified data/sprites/misc/mario_18_2.png
Binary file modified data/sprites/misc/mario_18_3.png
Binary file modified data/sprites/misc/mario_19_1.png
Binary file modified data/sprites/misc/mario_19_2.png
Binary file modified data/sprites/misc/mario_19_3.png
Binary file modified data/sprites/misc/mario_1_1.png
Binary file modified data/sprites/misc/mario_1_2.png
Binary file modified data/sprites/misc/mario_1_3.png
Binary file added data/sprites/misc/mario_23_1.png
Binary file added data/sprites/misc/mario_23_2.png
Binary file added data/sprites/misc/mario_23_3.png
Binary file modified data/sprites/misc/mario_24_1.png
Binary file modified data/sprites/misc/mario_24_2.png
Binary file modified data/sprites/misc/mario_24_3.png
Binary file modified data/sprites/misc/mario_25_1.png
Binary file modified data/sprites/misc/mario_25_2.png
Binary file modified data/sprites/misc/mario_25_3.png
Binary file modified data/sprites/misc/mario_26_1.png
Binary file modified data/sprites/misc/mario_26_2.png
Binary file modified data/sprites/misc/mario_26_3.png
Binary file modified data/sprites/misc/mario_27_1.png
Binary file modified data/sprites/misc/mario_27_2.png
Binary file modified data/sprites/misc/mario_27_3.png
Binary file modified data/sprites/misc/mario_2_1.png
Binary file modified data/sprites/misc/mario_2_2.png
Binary file modified data/sprites/misc/mario_2_3.png
Binary file added data/sprites/misc/mario_31_1.png
Binary file added data/sprites/misc/mario_31_2.png
Binary file added data/sprites/misc/mario_31_3.png
Binary file modified data/sprites/misc/mario_3_1.png
Binary file modified data/sprites/misc/mario_3_2.png
Binary file modified data/sprites/misc/mario_3_3.png
Binary file added data/sprites/misc/mario_7_1.png
Binary file added data/sprites/misc/mario_7_2.png
Binary file added data/sprites/misc/mario_7_3.png
Binary file modified data/sprites/misc/mario_8_1.png
Binary file modified data/sprites/misc/mario_8_2.png
Binary file modified data/sprites/misc/mario_8_3.png
Binary file modified data/sprites/misc/mario_9_1.png
Binary file modified data/sprites/misc/mario_9_2.png
Binary file modified data/sprites/misc/mario_9_3.png
Binary file added data/sprites/misc/nest_0_1.png
Binary file added data/sprites/misc/nest_0_2.png
Binary file added data/sprites/misc/nest_0_3.png
Binary file added data/sprites/misc/text_nest_0_1.png
Binary file added data/sprites/misc/text_nest_0_2.png
Binary file added data/sprites/misc/text_nest_0_3.png
Binary file added data/sprites/theopold-sprites/ee_0_1.png
Binary file added data/sprites/theopold-sprites/ee_0_2.png
Binary file added data/sprites/theopold-sprites/ee_0_3.png
Binary file added data/sprites/theopold-sprites/ee_16_1.png
Binary file added data/sprites/theopold-sprites/ee_16_2.png
Binary file added data/sprites/theopold-sprites/ee_16_3.png
Binary file added data/sprites/theopold-sprites/ee_24_1.png
Binary file added data/sprites/theopold-sprites/ee_24_2.png
Binary file added data/sprites/theopold-sprites/ee_24_3.png
Binary file added data/sprites/theopold-sprites/ee_8_1.png
Binary file added data/sprites/theopold-sprites/ee_8_2.png
Binary file added data/sprites/theopold-sprites/ee_8_3.png
Binary file added data/sprites/theopold-sprites/grgr_0_1.png
Binary file added data/sprites/theopold-sprites/grgr_0_2.png
Binary file added data/sprites/theopold-sprites/grgr_0_3.png
Binary file added data/sprites/theopold-sprites/grgr_10_1.png
Binary file added data/sprites/theopold-sprites/grgr_10_2.png
Binary file added data/sprites/theopold-sprites/grgr_10_3.png
Binary file added data/sprites/theopold-sprites/grgr_11_1.png
Binary file added data/sprites/theopold-sprites/grgr_11_2.png
Binary file added data/sprites/theopold-sprites/grgr_11_3.png
Binary file added data/sprites/theopold-sprites/grgr_15_1.png
Binary file added data/sprites/theopold-sprites/grgr_15_2.png
Binary file added data/sprites/theopold-sprites/grgr_15_3.png
Binary file added data/sprites/theopold-sprites/grgr_16_1.png
Binary file added data/sprites/theopold-sprites/grgr_16_2.png
Binary file added data/sprites/theopold-sprites/grgr_16_3.png
Binary file added data/sprites/theopold-sprites/grgr_17_1.png
Binary file added data/sprites/theopold-sprites/grgr_17_2.png
Binary file added data/sprites/theopold-sprites/grgr_17_3.png
Binary file added data/sprites/theopold-sprites/grgr_18_1.png
Binary file added data/sprites/theopold-sprites/grgr_18_2.png
Binary file added data/sprites/theopold-sprites/grgr_18_3.png
Binary file added data/sprites/theopold-sprites/grgr_19_1.png
Binary file added data/sprites/theopold-sprites/grgr_19_2.png
Binary file added data/sprites/theopold-sprites/grgr_19_3.png
Binary file added data/sprites/theopold-sprites/grgr_1_1.png
Binary file added data/sprites/theopold-sprites/grgr_1_2.png
Binary file added data/sprites/theopold-sprites/grgr_1_3.png
Binary file added data/sprites/theopold-sprites/grgr_23_1.png
Binary file added data/sprites/theopold-sprites/grgr_23_2.png
Binary file added data/sprites/theopold-sprites/grgr_23_3.png
Binary file added data/sprites/theopold-sprites/grgr_24_1.png
Binary file added data/sprites/theopold-sprites/grgr_24_2.png
Binary file added data/sprites/theopold-sprites/grgr_24_3.png
Binary file added data/sprites/theopold-sprites/grgr_25_1.png
Binary file added data/sprites/theopold-sprites/grgr_25_2.png
Binary file added data/sprites/theopold-sprites/grgr_25_3.png
Binary file added data/sprites/theopold-sprites/grgr_26_1.png
Binary file added data/sprites/theopold-sprites/grgr_26_2.png
Binary file added data/sprites/theopold-sprites/grgr_26_3.png
Binary file added data/sprites/theopold-sprites/grgr_27_1.png
Binary file added data/sprites/theopold-sprites/grgr_27_2.png
Binary file added data/sprites/theopold-sprites/grgr_27_3.png
Binary file added data/sprites/theopold-sprites/grgr_2_1.png
Binary file added data/sprites/theopold-sprites/grgr_2_2.png
Binary file added data/sprites/theopold-sprites/grgr_2_3.png
Binary file added data/sprites/theopold-sprites/grgr_31_1.png
Binary file added data/sprites/theopold-sprites/grgr_31_2.png
Binary file added data/sprites/theopold-sprites/grgr_31_3.png
Binary file added data/sprites/theopold-sprites/grgr_3_1.png
Binary file added data/sprites/theopold-sprites/grgr_3_2.png
Binary file added data/sprites/theopold-sprites/grgr_3_3.png
Binary file added data/sprites/theopold-sprites/grgr_7_1.png
Binary file added data/sprites/theopold-sprites/grgr_7_2.png
Binary file added data/sprites/theopold-sprites/grgr_7_3.png
Binary file added data/sprites/theopold-sprites/grgr_8_1.png
Binary file added data/sprites/theopold-sprites/grgr_8_2.png
Binary file added data/sprites/theopold-sprites/grgr_8_3.png
Binary file added data/sprites/theopold-sprites/grgr_9_1.png
Binary file added data/sprites/theopold-sprites/grgr_9_2.png
Binary file added data/sprites/theopold-sprites/grgr_9_3.png
Binary file added data/sprites/theopold-sprites/lele_0_1.png
Binary file added data/sprites/theopold-sprites/lele_0_2.png
Binary file added data/sprites/theopold-sprites/lele_0_3.png
Binary file added data/sprites/theopold-sprites/lele_16_1.png
Binary file added data/sprites/theopold-sprites/lele_16_2.png
Binary file added data/sprites/theopold-sprites/lele_16_3.png
Binary file added data/sprites/theopold-sprites/lele_24_1.png
Binary file added data/sprites/theopold-sprites/lele_24_2.png
Binary file added data/sprites/theopold-sprites/lele_24_3.png
Binary file added data/sprites/theopold-sprites/lele_8_1.png
Binary file added data/sprites/theopold-sprites/lele_8_2.png
Binary file added data/sprites/theopold-sprites/lele_8_3.png
Binary file added data/sprites/theopold-sprites/sasa_0_1.png
Binary file added data/sprites/theopold-sprites/sasa_0_2.png
Binary file added data/sprites/theopold-sprites/sasa_0_3.png
Binary file added data/sprites/theopold-sprites/sasa_16_1.png
Binary file added data/sprites/theopold-sprites/sasa_16_2.png
Binary file added data/sprites/theopold-sprites/sasa_16_3.png
Binary file added data/sprites/theopold-sprites/sasa_24_1.png
Binary file added data/sprites/theopold-sprites/sasa_24_2.png
Binary file added data/sprites/theopold-sprites/sasa_24_3.png
Binary file added data/sprites/theopold-sprites/sasa_8_1.png
Binary file added data/sprites/theopold-sprites/sasa_8_2.png
Binary file added data/sprites/theopold-sprites/sasa_8_3.png
Binary file added data/sprites/theopold-sprites/text_ee_0_1.png
Binary file added data/sprites/theopold-sprites/text_ee_0_2.png
Binary file added data/sprites/theopold-sprites/text_ee_0_3.png
3 changes: 2 additions & 1 deletion src/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,14 @@
COLOR_NAMES: dict[str, tuple[int, int]] = {
"maroon": (2, 1), # Not actually a word in the game
"gold": (6, 2), # Not actually a word in the game
"navy": (1, 1), # Not actually a word in the game
"red": (2, 2),
"orange": (2, 3),
"yellow": (2, 4),
"lime": (5, 3),
"green": (5, 2),
"cyan": (1, 4),
"blue": (1, 3),
"blue": (3, 2),
"purple": (3, 1),
"pink": (4, 1),
"rosy": (4, 2),
Expand Down