Skip to content
Snippets Groups Projects
Commit fd74f958 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '37-add-a-nightmare-difficulty-mode-and-a-4x4-grid-size' into 'master' 

Resolve "Add a nightmare difficulty mode and a 4x4 grid size"

Closes #37

See merge request !32
parents 216aca45 c7b99de5
No related branches found
No related tags found
1 merge request!32Resolve "Add a nightmare difficulty mode and a 4x4 grid size"
Pipeline #1725 passed
Stage: update
Stage: build-debug
Hide whitespace changes
Inline Side-by-side
Showing
with 88 additions and 2 deletions
android/gradle.properties
+ 2
− 2
View file @ fd74f958
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
app.versionName=0.0.30
app.versionCode=30
app.versionName=0.0.31
app.versionCode=31
assets/files/templates.json
+ 86
− 0
View file @ fd74f958
......@@ -36,6 +36,18 @@
"0001010002000003",
"0020020300010300",
"0410200010000200"
],
"nightmare": [
"1003030001000020",
"0000000120003004",
"2300010000020010",
"4001000002300000",
"0200000204000003",
"0000100203010020",
"0000001300023000",
"0004000004012000",
"4200000000002130",
"0400000200000034"
]
},
"3x2": {
......@@ -74,6 +86,18 @@
"052400000001000050005006040032020000",
"200160060023000600000002050430004000",
"400000060000010400006002000205050046"
],
"nightmare": [
"004000002150600000000630000002040300",
"300000041000000406600010000045005200",
"000000412000000200003150000500000062",
"000002602400004060060314000000030000",
"100623003001000000000034000000600200",
"040006036000100500600300002040010000",
"000050500006000000400125305600002540",
"006021300060004000000200001006000050",
"000130003200230000040050506000010000",
"002030006501000300020000053040200000"
]
},
"3x3": {
......@@ -112,6 +136,68 @@
"000007800004003000000000092000000184007009030810300059009034010400600020756190000",
"000003040009020078060700000952604000040210000000000900300500780090001060006002010",
"040070620300800904062000700407080000000615040056040000784060009600100070900000000"
],
"nightmare": [
"000805900600000040250600000300170500721000300800003700006000000007030682100500000",
"300090450006000139001003000403000027009040000658000001700080006000000003000209700",
"000270080090000200010009040900000000300004009401600020003050000708906100040100502",
"090000002207000060063500004000600150100085000050004090000700000006209000702000010",
"092803000400100600800700010240000007000008030070400090036080100000000408000910300",
"078060205020000000640000190400020800700001504502000009300016900000200301001703008",
"021803700008200090007000002000907630019036420000000005003000000070300069000410570",
"400007000600408000070039002000000007006100000000000501750000406902060170068050030",
"008003704000000029010020300800200000090008470100495002040001060050046001000502007",
"708100000010087060400000000500060000074020500000005602030002000040000700000796240"
]
},
"4x4": {
"easy": [
"340E80D9F100C20B00000030749000G570C0A00G0E520001010800006003A9740C0230000000008EF381BD0296A000400G0078AE000001B0000A06C40B8D20F010000047G006080D000F520B0830000707009A08DC040E3F006CDG13500F9002023065BF00D0470060170900000B0DEA09DB007000150000EFA410G002600008",
"0007G03D548A0020GCBE000A6F03D5840040000B000E001002600C0E7000F00360398DB10GF00E02F00032700D10090A400G096F20E0530000004GE5370900D1C420009G06D0000019A0E4F0035070B0BE00510049A030003G5600D2EC0810090F9A0E00100BG7C65600C00098004B0EE08065G40A00010073040B190EC00A5F",
"0009A010F576000CCBF4200ED19G38000617F0002A8005045GA260C900B3000163000F02C000G9B000CA863GB210047F0250C00740691080470B090183G0A062A00800051030CB9E009000000D00400000G301049CEB02500C209BA0560007G3F00D05000GC0864700057D080BF400CG804C00F079D05A300A000000000E01D9",
"0010C0807E00GDA009206FA050CBE00008070G2BF0400005500E900D00G6400006G842DE0B0CF5101EF07C0G640309000745A0B0EF1806D0D03908012G057C40730000C542000G60010C0036B98004070FD60B401037020042BG0E7FCD6A085000E184GC00B0073000C4009A072EBFG180000000D301C0900A9001F0G0546E8D",
"51A0C068E39F072G20D6EA4000BG0F3C000F00D924500B8A0B0325FGD6A7094130089GE54C162AF006G2B47F09D3081E1C4EA83007F29G0005F7DC01AG08000002C5FE007D89A4068E1AGD9C6230B500D000768B000A02E06F0952A40EGB3C08030D40BA906000C2E86039GDCF25700440010FC23A0E80B07A20015EGB4DF693",
"F04BG3E00920DC1002090000G3A00400C0ED48900B513G6AG1A3C00B000E00900E06300098D00020003006FC420G0000700G2D8031FA50062AD809G40C7B1E030G05B400ED10A07F04C08G59203006B09B7FE1230600085D0000FA7D0GB820C410BC00A00000050000527E08CA0061000000900005G20DAC00G40CB507638200",
"00B006008D29GC300G538097C00F00DE9A00E10070005B0F8702D0GC500BA9600908C70DGF45B0E0D00098B5273040C0A0000E00DC016F000BGC0461A00E000540050FCE0B103AGD120E00D008G0C706G00B05860A0002407C3A0920E650F81BB00G6D0915C38EF2030100000000067CCD7900006GFA10B3F826BC030E079500",
"EGF965080402B0006C07A0EGD03028590BD394020FC6AG0E200A3D7B5E0G4C60D0C01A06F9548230F985423D0CG10E0040B6E7GFA80300C13001095060E000D00602FE401D803A0C85902BD0C34E0706CFE40163GAB05D28130D0000270F09400458B0A10G20CF93A13BG82796FC04E5GE2FDC90351076BA9D60500E4000G182",
"7GA09005080BFC61B8934A00C00020ED1020C0BE49FG730AFE000D6G72A3B098820075A00B0F0D39050E0089GC36A010003FG01287D00EC590G0EF3010004B8720D0FE0400008106C0400GD061800F0060FG000050B0C74351E8600A3024D9G03FC00041B6070000D70A0CE3240016F0E000A0G0F000950CG61902F0AECD3800",
"AC00BG067D0930F28EF0005002G19640G00630908F5EAB07B79410EFC6A0G050500108CE407G236F06004AD10C02B98E09380B206010C47540C273659EF81A0DD0E9G07318CB502A0A5B0EFCD0246G91086C50B00G00E034310FA9020500D80BCF4E25G0300071B0608DEF1927B000A09G0704A0F1EC80D315BAC037G486F2E9"
],
"medium": [
"340E80D9F100C20B00000030749000G570C0A00G0E520001010800006003A9740C0230000000008EF381BD0296A000400G0078AE000001B0000A06C40B8D20F010000047G006080D000F520B0830000707009A08DC040E3F006CDG13500F9002023065BF00D0470060170900000B0DEA09DB007000150000EFA410G002600008",
"0007G03D548A0020GCBE000A6F03D5840040000B000E001002600C0E7000F00360398DB10GF00E02F00032700D10090A400G096F20E0530000004GE5370900D1C420009G06D0000019A0E4F0035070B0BE00510049A030003G5600D2EC0810090F9A0E00100BG7C65600C00098004B0EE08065G40A00010073040B190EC00A5F",
"0009A010F576000CCBF4200ED19G38000617F0002A8005045GA260C900B3000163000F02C000G9B000CA863GB210047F0250C00740691080470B090183G0A062A00800051030CB9E009000000D00400000G301049CEB02500C209BA0560007G3F00D05000GC0864700057D080BF400CG804C00F079D05A300A000000000E01D9",
"0010C0807E00GDA009206FA050CBE00008070G2BF0400005500E900D00G6400006G842DE0B0CF5101EF07C0G640309000745A0B0EF1806D0D03908012G057C40730000C542000G60010C0036B98004070FD60B401037020042BG0E7FCD6A085000E184GC00B0073000C4009A072EBFG180000000D301C0900A9001F0G0546E8D",
"51A0C068E39F072G20D6EA4000BG0F3C000F00D924500B8A0B0325FGD6A7094130089GE54C162AF006G2B47F09D3081E1C4EA83007F29G0005F7DC01AG08000002C5FE007D89A4068E1AGD9C6230B500D000768B000A02E06F0952A40EGB3C08030D40BA906000C2E86039GDCF25700440010FC23A0E80B07A20015EGB4DF693",
"F04BG3E00920DC1002090000G3A00400C0ED48900B513G6AG1A3C00B000E00900E06300098D00020003006FC420G0000700G2D8031FA50062AD809G40C7B1E030G05B400ED10A07F04C08G59203006B09B7FE1230600085D0000FA7D0GB820C410BC00A00000050000527E08CA0061000000900005G20DAC00G40CB507638200",
"00B006008D29GC300G538097C00F00DE9A00E10070005B0F8702D0GC500BA9600908C70DGF45B0E0D00098B5273040C0A0000E00DC016F000BGC0461A00E000540050FCE0B103AGD120E00D008G0C706G00B05860A0002407C3A0920E650F81BB00G6D0915C38EF2030100000000067CCD7900006GFA10B3F826BC030E079500",
"EGF965080402B0006C07A0EGD03028590BD394020FC6AG0E200A3D7B5E0G4C60D0C01A06F9548230F985423D0CG10E0040B6E7GFA80300C13001095060E000D00602FE401D803A0C85902BD0C34E0706CFE40163GAB05D28130D0000270F09400458B0A10G20CF93A13BG82796FC04E5GE2FDC90351076BA9D60500E4000G182",
"7GA09005080BFC61B8934A00C00020ED1020C0BE49FG730AFE000D6G72A3B098820075A00B0F0D39050E0089GC36A010003FG01287D00EC590G0EF3010004B8720D0FE0400008106C0400GD061800F0060FG000050B0C74351E8600A3024D9G03FC00041B6070000D70A0CE3240016F0E000A0G0F000950CG61902F0AECD3800",
"AC00BG067D0930F28EF0005002G19640G00630908F5EAB07B79410EFC6A0G050500108CE407G236F06004AD10C02B98E09380B206010C47540C273659EF81A0DD0E9G07318CB502A0A5B0EFCD0246G91086C50B00G00E034310FA9020500D80BCF4E25G0300071B0608DEF1927B000A09G0704A0F1EC80D315BAC037G486F2E9"
],
"hard": [
"340E80D9F100C20B00000030749000G570C0A00G0E520001010800006003A9740C0230000000008EF381BD0296A000400G0078AE000001B0000A06C40B8D20F010000047G006080D000F520B0830000707009A08DC040E3F006CDG13500F9002023065BF00D0470060170900000B0DEA09DB007000150000EFA410G002600008",
"0007G03D548A0020GCBE000A6F03D5840040000B000E001002600C0E7000F00360398DB10GF00E02F00032700D10090A400G096F20E0530000004GE5370900D1C420009G06D0000019A0E4F0035070B0BE00510049A030003G5600D2EC0810090F9A0E00100BG7C65600C00098004B0EE08065G40A00010073040B190EC00A5F",
"0009A010F576000CCBF4200ED19G38000617F0002A8005045GA260C900B3000163000F02C000G9B000CA863GB210047F0250C00740691080470B090183G0A062A00800051030CB9E009000000D00400000G301049CEB02500C209BA0560007G3F00D05000GC0864700057D080BF400CG804C00F079D05A300A000000000E01D9",
"0010C0807E00GDA009206FA050CBE00008070G2BF0400005500E900D00G6400006G842DE0B0CF5101EF07C0G640309000745A0B0EF1806D0D03908012G057C40730000C542000G60010C0036B98004070FD60B401037020042BG0E7FCD6A085000E184GC00B0073000C4009A072EBFG180000000D301C0900A9001F0G0546E8D",
"51A0C068E39F072G20D6EA4000BG0F3C000F00D924500B8A0B0325FGD6A7094130089GE54C162AF006G2B47F09D3081E1C4EA83007F29G0005F7DC01AG08000002C5FE007D89A4068E1AGD9C6230B500D000768B000A02E06F0952A40EGB3C08030D40BA906000C2E86039GDCF25700440010FC23A0E80B07A20015EGB4DF693",
"F04BG3E00920DC1002090000G3A00400C0ED48900B513G6AG1A3C00B000E00900E06300098D00020003006FC420G0000700G2D8031FA50062AD809G40C7B1E030G05B400ED10A07F04C08G59203006B09B7FE1230600085D0000FA7D0GB820C410BC00A00000050000527E08CA0061000000900005G20DAC00G40CB507638200",
"00B006008D29GC300G538097C00F00DE9A00E10070005B0F8702D0GC500BA9600908C70DGF45B0E0D00098B5273040C0A0000E00DC016F000BGC0461A00E000540050FCE0B103AGD120E00D008G0C706G00B05860A0002407C3A0920E650F81BB00G6D0915C38EF2030100000000067CCD7900006GFA10B3F826BC030E079500",
"EGF965080402B0006C07A0EGD03028590BD394020FC6AG0E200A3D7B5E0G4C60D0C01A06F9548230F985423D0CG10E0040B6E7GFA80300C13001095060E000D00602FE401D803A0C85902BD0C34E0706CFE40163GAB05D28130D0000270F09400458B0A10G20CF93A13BG82796FC04E5GE2FDC90351076BA9D60500E4000G182",
"7GA09005080BFC61B8934A00C00020ED1020C0BE49FG730AFE000D6G72A3B098820075A00B0F0D39050E0089GC36A010003FG01287D00EC590G0EF3010004B8720D0FE0400008106C0400GD061800F0060FG000050B0C74351E8600A3024D9G03FC00041B6070000D70A0CE3240016F0E000A0G0F000950CG61902F0AECD3800",
"AC00BG067D0930F28EF0005002G19640G00630908F5EAB07B79410EFC6A0G050500108CE407G236F06004AD10C02B98E09380B206010C47540C273659EF81A0DD0E9G07318CB502A0A5B0EFCD0246G91086C50B00G00E034310FA9020500D80BCF4E25G0300071B0608DEF1927B000A09G0704A0F1EC80D315BAC037G486F2E9"
],
"nightmare": [
"340E80D9F100C20B00000030749000G570C0A00G0E520001010800006003A9740C0230000000008EF381BD0296A000400G0078AE000001B0000A06C40B8D20F010000047G006080D000F520B0830000707009A08DC040E3F006CDG13500F9002023065BF00D0470060170900000B0DEA09DB007000150000EFA410G002600008",
"0007G03D548A0020GCBE000A6F03D5840040000B000E001002600C0E7000F00360398DB10GF00E02F00032700D10090A400G096F20E0530000004GE5370900D1C420009G06D0000019A0E4F0035070B0BE00510049A030003G5600D2EC0810090F9A0E00100BG7C65600C00098004B0EE08065G40A00010073040B190EC00A5F",
"0009A010F576000CCBF4200ED19G38000617F0002A8005045GA260C900B3000163000F02C000G9B000CA863GB210047F0250C00740691080470B090183G0A062A00800051030CB9E009000000D00400000G301049CEB02500C209BA0560007G3F00D05000GC0864700057D080BF400CG804C00F079D05A300A000000000E01D9",
"0010C0807E00GDA009206FA050CBE00008070G2BF0400005500E900D00G6400006G842DE0B0CF5101EF07C0G640309000745A0B0EF1806D0D03908012G057C40730000C542000G60010C0036B98004070FD60B401037020042BG0E7FCD6A085000E184GC00B0073000C4009A072EBFG180000000D301C0900A9001F0G0546E8D",
"51A0C068E39F072G20D6EA4000BG0F3C000F00D924500B8A0B0325FGD6A7094130089GE54C162AF006G2B47F09D3081E1C4EA83007F29G0005F7DC01AG08000002C5FE007D89A4068E1AGD9C6230B500D000768B000A02E06F0952A40EGB3C08030D40BA906000C2E86039GDCF25700440010FC23A0E80B07A20015EGB4DF693",
"F04BG3E00920DC1002090000G3A00400C0ED48900B513G6AG1A3C00B000E00900E06300098D00020003006FC420G0000700G2D8031FA50062AD809G40C7B1E030G05B400ED10A07F04C08G59203006B09B7FE1230600085D0000FA7D0GB820C410BC00A00000050000527E08CA0061000000900005G20DAC00G40CB507638200",
"00B006008D29GC300G538097C00F00DE9A00E10070005B0F8702D0GC500BA9600908C70DGF45B0E0D00098B5273040C0A0000E00DC016F000BGC0461A00E000540050FCE0B103AGD120E00D008G0C706G00B05860A0002407C3A0920E650F81BB00G6D0915C38EF2030100000000067CCD7900006GFA10B3F826BC030E079500",
"EGF965080402B0006C07A0EGD03028590BD394020FC6AG0E200A3D7B5E0G4C60D0C01A06F9548230F985423D0CG10E0040B6E7GFA80300C13001095060E000D00602FE401D803A0C85902BD0C34E0706CFE40163GAB05D28130D0000270F09400458B0A10G20CF93A13BG82796FC04E5GE2FDC90351076BA9D60500E4000G182",
"7GA09005080BFC61B8934A00C00020ED1020C0BE49FG730AFE000D6G72A3B098820075A00B0F0D39050E0089GC36A010003FG01287D00EC590G0EF3010004B8720D0FE0400008106C0400GD061800F0060FG000050B0C74351E8600A3024D9G03FC00041B6070000D70A0CE3240016F0E000A0G0F000950CG61902F0AECD3800",
"AC00BG067D0930F28EF0005002G19640G00630908F5EAB07B79410EFC6A0G050500108CE407G236F06004AD10C02B98E09380B206010C47540C273659EF81A0DD0E9G07318CB502A0A5B0EFCD0246G91086C50B00G00E034310FA9020500D80BCF4E25G0300071B0608DEF1927B000A09G0704A0F1EC80D315BAC037G486F2E9"
]
}
}
......
assets/icons/difficulty_nightmare.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/icons/difficulty_nightmare.png

1.8 KiB

assets/icons/size_4x4.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/icons/size_4x4.png

2.32 KiB

assets/icons/skin_monsters.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/icons/skin_monsters.png

14.2 KiB

assets/skins/default_10.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/default_10.png

2.6 KiB

assets/skins/default_11.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/default_11.png

2.15 KiB

assets/skins/default_12.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/default_12.png

2.85 KiB

assets/skins/default_13.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/default_13.png

2.1 KiB

assets/skins/default_14.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/default_14.png

365 B

assets/skins/default_15.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/default_15.png

422 B

assets/skins/default_16.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/default_16.png

2.84 KiB

assets/skins/food_10.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/food_10.png

7.08 KiB

assets/skins/food_11.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/food_11.png

5.4 KiB

assets/skins/food_12.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/food_12.png

8.06 KiB

assets/skins/food_13.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/food_13.png

5.93 KiB

assets/skins/food_14.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/food_14.png

5.33 KiB

assets/skins/food_15.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/food_15.png

5.42 KiB

assets/skins/food_16.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/food_16.png

5.02 KiB

assets/skins/monsters_1.png 0 → 100644
+ 0
− 0
View file @ fd74f958
assets/skins/monsters_1.png

9.68 KiB

0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment