diff --git a/RM11030117-0.70.2-78cf7a6.tgz b/RM11030117-0.70.2-78cf7a6.tgz deleted file mode 100644 index b4b6b1f60..000000000 Binary files a/RM11030117-0.70.2-78cf7a6.tgz and /dev/null differ diff --git a/RM11030117-0.70.2-78cf7a6.zip b/RM11030117-0.70.2-78cf7a6.zip deleted file mode 100644 index 7ca235e01..000000000 Binary files a/RM11030117-0.70.2-78cf7a6.zip and /dev/null differ diff --git a/assets/dolphin/external/Kuronons_RMCFW_128x64/meta.txt b/assets/dolphin/external/Kuronons_RMCFW_128x64/meta.txt index 3154d0aef..aa9584f03 100644 --- a/assets/dolphin/external/Kuronons_RMCFW_128x64/meta.txt +++ b/assets/dolphin/external/Kuronons_RMCFW_128x64/meta.txt @@ -3,12 +3,12 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 54 -Active frames: 0 -Frames order: 0 0 0 0 1 1 1 2 2 3 4 4 5 6 7 7 8 8 9 10 10 10 11 11 11 11 11 11 12 12 13 13 14 14 15 15 15 15 15 16 16 17 18 18 18 18 18 18 18 18 18 18 18 18 -Active cycles: 0 +Passive frames: 10 +Active frames: 42 +Frames order: 11 11 12 13 14 15 14 13 12 11 0 1 1 1 2 2 3 4 4 5 6 7 7 8 8 9 10 10 10 11 11 11 11 11 11 12 12 13 13 14 14 15 15 15 15 15 16 16 17 18 18 18 +Active cycles: 1 Frame rate: 6 Duration: 3600 -Active cooldown: 0 +Active cooldown: 4 Bubble slots: 0 diff --git a/assets/dolphin/external/Sasquach_Blaster_128x64/meta.txt b/assets/dolphin/external/Sasquach_Blaster_128x64/meta.txt index 4d5cb4433..63d6e4750 100644 --- a/assets/dolphin/external/Sasquach_Blaster_128x64/meta.txt +++ b/assets/dolphin/external/Sasquach_Blaster_128x64/meta.txt @@ -3,12 +3,12 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 50 -Active frames: 0 +Passive frames: 10 +Active frames: 40 Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 -Active cycles: 0 +Active cycles: 1 Frame rate: 6 Duration: 3600 -Active cooldown: 0 +Active cooldown: 4 Bubble slots: 0 diff --git a/assets/dolphin/external/Sasquach_CloudG0ku_128x64/meta.txt b/assets/dolphin/external/Sasquach_CloudG0ku_128x64/meta.txt index 7ed1ea4e9..e780d7e95 100644 --- a/assets/dolphin/external/Sasquach_CloudG0ku_128x64/meta.txt +++ b/assets/dolphin/external/Sasquach_CloudG0ku_128x64/meta.txt @@ -3,8 +3,8 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 47 -Active frames: 1 +Passive frames: 10 +Active frames: 38 Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 46 Active cycles: 1 Frame rate: 5 diff --git a/assets/dolphin/external/Sasquach_Narut0_128x64/meta.txt b/assets/dolphin/external/Sasquach_Narut0_128x64/meta.txt index 7e7e55b26..1c4b1c117 100644 --- a/assets/dolphin/external/Sasquach_Narut0_128x64/meta.txt +++ b/assets/dolphin/external/Sasquach_Narut0_128x64/meta.txt @@ -3,12 +3,12 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 30 -Active frames: 0 +Passive frames: 10 +Active frames: 20 Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 -Active cycles: 0 +Active cycles: 1 Frame rate: 6 Duration: 3600 -Active cooldown: 0 +Active cooldown: 4 Bubble slots: 0 diff --git a/assets/dolphin/external/Sasquach_RMCF_128x64/meta.txt b/assets/dolphin/external/Sasquach_RMCF_128x64/meta.txt index b6b3fdf3e..ffc01409d 100644 --- a/assets/dolphin/external/Sasquach_RMCF_128x64/meta.txt +++ b/assets/dolphin/external/Sasquach_RMCF_128x64/meta.txt @@ -3,13 +3,13 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 100 -Active frames: 0 -Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 11 11 11 11 11 11 11 11 11 11 11 12 12 12 12 12 12 12 13 14 15 16 17 18 17 18 17 18 19 20 19 20 19 20 19 20 19 20 21 22 21 22 22 22 23 24 25 26 27 28 29 30 31 32 33 0 34 35 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 37 38 -Active cycles: 0 +Passive frames: 9 +Active frames: 99 +Frames order: 0 1 2 3 4 3 2 1 0 1 2 3 4 5 6 7 8 9 10 11 11 11 11 11 11 11 11 11 11 11 11 12 12 12 12 12 12 12 13 14 15 16 17 18 17 18 17 18 19 20 19 20 19 20 19 20 19 20 21 22 21 22 22 22 23 24 25 26 27 28 29 30 31 32 33 0 34 35 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 37 38 +Active cycles: 1 Frame rate: 4 Duration: 3600 -Active cooldown: 0 +Active cooldown: 4 Bubble slots: 1 diff --git a/assets/dolphin/external/manifest.txt b/assets/dolphin/external/manifest.txt index 7be04dc86..507d6614f 100644 --- a/assets/dolphin/external/manifest.txt +++ b/assets/dolphin/external/manifest.txt @@ -4,7 +4,7 @@ Version: 1 Name: Haseo_Sharingan_128x64 Min butthurt: 0 Max butthurt: 14 -Min level: 2 +Min level: 1 Max level: 30 Weight: 7 @@ -50,20 +50,6 @@ Min level: 2 Max level: 30 Weight: 7 -Name: L1_Halloween_128x64 -Min butthurt: 0 -Max butthurt: 14 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: L1_Painting_128x64 -Min butthurt: 0 -Max butthurt: 14 -Min level: 1 -Max level: 30 -Weight: 5 - Name: L1_Purple_rain_128x64 Min butthurt: 0 Max butthurt: 14 @@ -84,3 +70,17 @@ Max butthurt: 14 Min level: 3 Max level: 30 Weight: 7 + +Name: L1_Painting_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: L1_Halloween_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 5 diff --git a/assets/resources/dolphin/Kuronons_RMCFW_128x64/meta.txt b/assets/resources/dolphin/Kuronons_RMCFW_128x64/meta.txt index 3154d0aef..aa9584f03 100644 --- a/assets/resources/dolphin/Kuronons_RMCFW_128x64/meta.txt +++ b/assets/resources/dolphin/Kuronons_RMCFW_128x64/meta.txt @@ -3,12 +3,12 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 54 -Active frames: 0 -Frames order: 0 0 0 0 1 1 1 2 2 3 4 4 5 6 7 7 8 8 9 10 10 10 11 11 11 11 11 11 12 12 13 13 14 14 15 15 15 15 15 16 16 17 18 18 18 18 18 18 18 18 18 18 18 18 -Active cycles: 0 +Passive frames: 10 +Active frames: 42 +Frames order: 11 11 12 13 14 15 14 13 12 11 0 1 1 1 2 2 3 4 4 5 6 7 7 8 8 9 10 10 10 11 11 11 11 11 11 12 12 13 13 14 14 15 15 15 15 15 16 16 17 18 18 18 +Active cycles: 1 Frame rate: 6 Duration: 3600 -Active cooldown: 0 +Active cooldown: 4 Bubble slots: 0 diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/meta.txt b/assets/resources/dolphin/Sasquach_Blaster_128x64/meta.txt index 4d5cb4433..63d6e4750 100644 --- a/assets/resources/dolphin/Sasquach_Blaster_128x64/meta.txt +++ b/assets/resources/dolphin/Sasquach_Blaster_128x64/meta.txt @@ -3,12 +3,12 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 50 -Active frames: 0 +Passive frames: 10 +Active frames: 40 Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 -Active cycles: 0 +Active cycles: 1 Frame rate: 6 Duration: 3600 -Active cooldown: 0 +Active cooldown: 4 Bubble slots: 0 diff --git a/assets/resources/dolphin/Sasquach_CloudG0ku_128x64/meta.txt b/assets/resources/dolphin/Sasquach_CloudG0ku_128x64/meta.txt index dcbf70702..e780d7e95 100644 --- a/assets/resources/dolphin/Sasquach_CloudG0ku_128x64/meta.txt +++ b/assets/resources/dolphin/Sasquach_CloudG0ku_128x64/meta.txt @@ -3,9 +3,9 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 47 -Active frames: 0 -Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 +Passive frames: 10 +Active frames: 38 +Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 46 Active cycles: 1 Frame rate: 5 Duration: 3600 diff --git a/assets/resources/dolphin/Sasquach_Narut0_128x64/meta.txt b/assets/resources/dolphin/Sasquach_Narut0_128x64/meta.txt index 7e7e55b26..1c4b1c117 100644 --- a/assets/resources/dolphin/Sasquach_Narut0_128x64/meta.txt +++ b/assets/resources/dolphin/Sasquach_Narut0_128x64/meta.txt @@ -3,12 +3,12 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 30 -Active frames: 0 +Passive frames: 10 +Active frames: 20 Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 -Active cycles: 0 +Active cycles: 1 Frame rate: 6 Duration: 3600 -Active cooldown: 0 +Active cooldown: 4 Bubble slots: 0 diff --git a/assets/resources/dolphin/Sasquach_RMCF_128x64/meta.txt b/assets/resources/dolphin/Sasquach_RMCF_128x64/meta.txt index b6b3fdf3e..ffc01409d 100644 --- a/assets/resources/dolphin/Sasquach_RMCF_128x64/meta.txt +++ b/assets/resources/dolphin/Sasquach_RMCF_128x64/meta.txt @@ -3,13 +3,13 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 100 -Active frames: 0 -Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 11 11 11 11 11 11 11 11 11 11 11 12 12 12 12 12 12 12 13 14 15 16 17 18 17 18 17 18 19 20 19 20 19 20 19 20 19 20 21 22 21 22 22 22 23 24 25 26 27 28 29 30 31 32 33 0 34 35 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 37 38 -Active cycles: 0 +Passive frames: 9 +Active frames: 99 +Frames order: 0 1 2 3 4 3 2 1 0 1 2 3 4 5 6 7 8 9 10 11 11 11 11 11 11 11 11 11 11 11 11 12 12 12 12 12 12 12 13 14 15 16 17 18 17 18 17 18 19 20 19 20 19 20 19 20 19 20 21 22 21 22 22 22 23 24 25 26 27 28 29 30 31 32 33 0 34 35 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 37 38 +Active cycles: 1 Frame rate: 4 Duration: 3600 -Active cooldown: 0 +Active cooldown: 4 Bubble slots: 1 diff --git a/assets/resources/dolphin/manifest.txt b/assets/resources/dolphin/manifest.txt index 29295c598..507d6614f 100644 --- a/assets/resources/dolphin/manifest.txt +++ b/assets/resources/dolphin/manifest.txt @@ -50,20 +50,6 @@ Min level: 2 Max level: 30 Weight: 7 -Name: L1_Halloween_128x64 -Min butthurt: 0 -Max butthurt: 14 -Min level: 1 -Max level: 30 -Weight: 14 - -Name: L1_Painting_128x64 -Min butthurt: 0 -Max butthurt: 14 -Min level: 1 -Max level: 30 -Weight: 5 - Name: L1_Purple_rain_128x64 Min butthurt: 0 Max butthurt: 14 @@ -84,3 +70,17 @@ Max butthurt: 14 Min level: 3 Max level: 30 Weight: 7 + +Name: L1_Painting_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: L1_Halloween_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 5