diff --git a/applications/services/dolphin/helpers/dolphin_state.c b/applications/services/dolphin/helpers/dolphin_state.c index 033886ff6..24db214f9 100644 --- a/applications/services/dolphin/helpers/dolphin_state.c +++ b/applications/services/dolphin/helpers/dolphin_state.c @@ -14,35 +14,35 @@ #define DOLPHIN_STATE_PATH INT_PATH(DOLPHIN_STATE_FILE_NAME) #define DOLPHIN_STATE_HEADER_MAGIC 0xD0 #define DOLPHIN_STATE_HEADER_VERSION 0x01 -#define LEVEL2_THRESHOLD 450 -#define LEVEL3_THRESHOLD 700 -#define LEVEL4_THRESHOLD 1100 -#define LEVEL5_THRESHOLD 1800 -#define LEVEL6_THRESHOLD 2300 -#define LEVEL7_THRESHOLD 2900 -#define LEVEL8_THRESHOLD 3900 -#define LEVEL9_THRESHOLD 5000 -#define LEVEL10_THRESHOLD 5900 -#define LEVEL11_THRESHOLD 7200 -#define LEVEL12_THRESHOLD 8400 -#define LEVEL13_THRESHOLD 10000 -#define LEVEL14_THRESHOLD 11500 -#define LEVEL15_THRESHOLD 13000 -#define LEVEL16_THRESHOLD 15000 -#define LEVEL17_THRESHOLD 18000 -#define LEVEL18_THRESHOLD 20000 -#define LEVEL19_THRESHOLD 22000 -#define LEVEL20_THRESHOLD 25000 -#define LEVEL21_THRESHOLD 33000 -#define LEVEL22_THRESHOLD 41000 -#define LEVEL23_THRESHOLD 50000 -#define LEVEL24_THRESHOLD 62000 -#define LEVEL25_THRESHOLD 75000 -#define LEVEL26_THRESHOLD 90000 -#define LEVEL27_THRESHOLD 105000 -#define LEVEL28_THRESHOLD 120000 -#define LEVEL29_THRESHOLD 135000 -#define LEVEL30_THRESHOLD 155000 +#define LEVEL2_THRESHOLD 100 +#define LEVEL3_THRESHOLD 200 +#define LEVEL4_THRESHOLD 300 +#define LEVEL5_THRESHOLD 450 +#define LEVEL6_THRESHOLD 600 +#define LEVEL7_THRESHOLD 750 +#define LEVEL8_THRESHOLD 950 +#define LEVEL9_THRESHOLD 1150 +#define LEVEL10_THRESHOLD 1350 +#define LEVEL11_THRESHOLD 1600 +#define LEVEL12_THRESHOLD 1850 +#define LEVEL13_THRESHOLD 2100 +#define LEVEL14_THRESHOLD 2400 +#define LEVEL15_THRESHOLD 2700 +#define LEVEL16_THRESHOLD 3000 +#define LEVEL17_THRESHOLD 3350 +#define LEVEL18_THRESHOLD 3700 +#define LEVEL19_THRESHOLD 4050 +#define LEVEL20_THRESHOLD 4450 +#define LEVEL21_THRESHOLD 4850 +#define LEVEL22_THRESHOLD 5250 +#define LEVEL23_THRESHOLD 5700 +#define LEVEL24_THRESHOLD 6150 +#define LEVEL25_THRESHOLD 6600 +#define LEVEL26_THRESHOLD 7100 +#define LEVEL27_THRESHOLD 7600 +#define LEVEL28_THRESHOLD 8100 +#define LEVEL29_THRESHOLD 8650 +#define LEVEL30_THRESHOLD 9200 #define BUTTHURT_MAX 14 #define BUTTHURT_MIN 0 diff --git a/assets/dolphin/external/manifest.txt b/assets/dolphin/external/manifest.txt index c4bcf8707..80a6de314 100644 --- a/assets/dolphin/external/manifest.txt +++ b/assets/dolphin/external/manifest.txt @@ -3,210 +3,210 @@ Version: 1 Name: lvl_1 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 1 Max level: 30 Weight: 7 Name: lvl_2 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 2 Max level: 30 Weight: 7 Name: lvl_3 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 3 Max level: 30 Weight: 7 Name: lvl_4 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 4 Max level: 30 Weight: 7 Name: lvl_5 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 5 Max level: 30 Weight: 7 Name: lvl_6 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 6 Max level: 30 Weight: 7 Name: lvl_7 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 7 Max level: 30 Weight: 7 Name: lvl_8 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 8 Max level: 30 Weight: 7 Name: lvl_9 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 9 Max level: 30 Weight: 7 Name: lvl_10 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 10 Max level: 30 Weight: 7 Name: lvl_11 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 11 Max level: 30 Weight: 7 Name: lvl_12 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 12 Max level: 30 Weight: 7 Name: lvl_13 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 13 Max level: 30 Weight: 7 Name: lvl_14 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 14 Max level: 30 Weight: 7 Name: lvl_15 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 15 Max level: 30 Weight: 7 Name: lvl_16 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 16 Max level: 30 Weight: 7 Name: lvl_17 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 17 Max level: 30 Weight: 7 Name: lvl_18 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 18 Max level: 30 Weight: 7 Name: lvl_19 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 19 Max level: 30 Weight: 7 Name: lvl_20 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 20 Max level: 30 Weight: 7 Name: lvl_21 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 21 Max level: 30 Weight: 7 Name: lvl_22 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 22 Max level: 30 Weight: 7 Name: lvl_23 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 23 Max level: 30 Weight: 7 Name: lvl_24 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 24 Max level: 30 Weight: 7 Name: lvl_25 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 25 Max level: 30 Weight: 7 Name: lvl_26 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 26 Max level: 30 Weight: 7 Name: lvl_27 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 27 Max level: 30 Weight: 7 Name: lvl_28 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 28 Max level: 30 Weight: 7 Name: lvl_29 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 29 Max level: 30 Weight: 7 Name: lvl_30 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 30 Max level: 30 Weight: 7 \ No newline at end of file diff --git a/assets/resources/dolphin/manifest.txt b/assets/resources/dolphin/manifest.txt index 8067c649d..41cfe0899 100644 --- a/assets/resources/dolphin/manifest.txt +++ b/assets/resources/dolphin/manifest.txt @@ -3,210 +3,210 @@ Version: 1 Name: lvl_1 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 1 Max level: 30 Weight: 7 Name: lvl_2 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 2 Max level: 30 Weight: 7 Name: lvl_3 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 3 Max level: 30 Weight: 7 Name: lvl_4 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 4 Max level: 30 Weight: 7 Name: lvl_5 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 5 Max level: 30 Weight: 7 Name: lvl_6 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 6 Max level: 30 Weight: 7 Name: lvl_7 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 7 Max level: 30 Weight: 7 Name: lvl_8 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 8 Max level: 30 Weight: 7 Name: lvl_9 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 9 Max level: 30 Weight: 7 Name: lvl_10 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 10 Max level: 30 Weight: 7 Name: lvl_11 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 11 Max level: 30 Weight: 7 Name: lvl_12 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 12 Max level: 30 Weight: 7 Name: lvl_13 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 13 Max level: 30 Weight: 7 Name: lvl_14 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 14 Max level: 30 Weight: 7 Name: lvl_15 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 15 Max level: 30 Weight: 7 Name: lvl_16 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 16 Max level: 30 Weight: 7 Name: lvl_17 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 17 Max level: 30 Weight: 7 Name: lvl_18 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 18 Max level: 30 Weight: 7 Name: lvl_19 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 19 Max level: 30 Weight: 7 Name: lvl_20 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 20 Max level: 30 Weight: 7 Name: lvl_21 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 21 Max level: 30 Weight: 7 Name: lvl_22 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 22 Max level: 30 Weight: 7 Name: lvl_23 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 23 Max level: 30 Weight: 7 Name: lvl_24 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 24 Max level: 30 Weight: 7 Name: lvl_25 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 25 Max level: 30 Weight: 7 Name: lvl_26 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 26 Max level: 30 Weight: 7 Name: lvl_27 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 27 Max level: 30 Weight: 7 Name: lvl_28 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 28 Max level: 30 Weight: 7 Name: lvl_29 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 29 Max level: 30 Weight: 7 Name: lvl_30 Min butthurt: 0 -Max butthurt: 3 +Max butthurt: 14 Min level: 30 Max level: 30 Weight: 7 diff --git a/fbt_options.py b/fbt_options.py index 4abfae7ab..3cdf2d190 100644 --- a/fbt_options.py +++ b/fbt_options.py @@ -14,7 +14,7 @@ DEBUG = 0 # Suffix to add to files when building distribution # If OS environment has DIST_SUFFIX set, it will be used instead -DIST_SUFFIX = "XFW-0027_12232022" +DIST_SUFFIX = "XFW-0028_12232022" # Coprocessor firmware COPRO_OB_DATA = "scripts/ob.data"