TsumBeta: Add skill for Captain Lightyear

Currently only for SL 6, maybe also suitable for SL 4 and 5. SL 1 to 3 probably should shoot to other positions, but that can be added later.
mcs · Aug 9, 2024 · b7ed061 · b7ed061
1 parent 5dd1940
commit b7ed061
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/scripts/com.r2studio.TsumBeta/BACKLOG.md b/scripts/com.r2studio.TsumBeta/BACKLOG.md
@@ -9,6 +9,5 @@ All potential changes whih would improve the TsumBeta script will be documented
 ### Features
 - Add "Spam skill" option to check for skill after every finished chain instead of every chain batch.
 - Allow heart recording even with "Skip first person".
-- Skill: Captain Lightyear
 - Skill: Jedi Luke (13 swipes technique)
 - Rewrite of Settings UI (became too large as single-page, not dynamic regarding settings like "skill level" of Cinderella)
diff --git a/scripts/com.r2studio.TsumBeta/CHANGELOG.md b/scripts/com.r2studio.TsumBeta/CHANGELOG.md
@@ -5,7 +5,10 @@ All notable changes to the TsumBeta script will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
-[//]: # (## unreleased)
+## unreleased
+
+### Added
+- Skill: Captain Lightyear
 
 
 ## [v69] - 2024-07-27

diff --git a/scripts/com.r2studio.TsumBeta/index.zip b/scripts/com.r2studio.TsumBeta/index.zip
diff --git a/scripts/com.r2studio.TsumBeta/src/index.js b/scripts/com.r2studio.TsumBeta/src/index.js
@@ -131,6 +131,9 @@ var Button = {
   skillLuke2: {x: 830, y: 1402},
   skillLuke3: {x: 670, y: 1447},
   skillLuke4: {x: 960, y: 1232},
+  skillCptLy1: {x: 670, y: 1050},
+  skillCptLy2: {x: 310, y: 1050},
+  skillCptLy3: {x: 540, y: 414},
   outReceiveNameFromBase: {y: 532},
   outReceiveNameFrom: {x: 150},
   outReceiveNameToBase: {y: 670},
@@ -1941,8 +1944,21 @@ Tsum.prototype.useSkill = function(board) {
     } else {
       this.clearAllBubbles();
     }
-  }
-  else {
+  } else if (this.skillType === 'block_cpt_ly_s'){
+    this.tap(Button.gameRand, 100);
+    this.sleep(2100);
+    this.tap(Button.skillCptLy1, 10);
+    this.sleep(50);
+    this.tap(Button.skillCptLy2, 10);
+    this.sleep(500);
+    this.tap(Button.skillCptLy3, 10);
+    this.sleep(500);
+    this.tap(Button.skillCptLy3, 10);
+    this.sleep(550);
+    this.tap(Button.skillCptLy3, 10);
+    this.sleep(500);
+    this.clearAllBubbles(0, 0, 1000);
+  } else {
     this.sleep(this.skillInterval);
   }
   return true;

diff --git a/scripts/com.r2studio.TsumBeta/src/settings.js b/scripts/com.r2studio.TsumBeta/src/settings.js
@@ -188,8 +188,9 @@ var settings = [
                 {key: 'block_snowwhite_s', title: 'Snow White', title_zh_TW: '白雪公主'},
                 {key: 'block_cinderella_s', title: 'Cinderella', title_zh_TW: '仙度瑞拉'},
                 {key: 'block_woody2_s', title: 'Sheriff Woody', title_zh_TW: '警長胡迪'},
-                {key: 'block_pair_tsum', title: 'Pair Tsum', title_zh_TW: '配对Tsum'},
                 {key: 'block_cabbage_mickey_s', title: 'Cabbage Mickey', title_zh_TW: '卷心菜米奇'},
+                {key: 'block_cpt_ly_s', title: 'Cpt. Lightyear', title_zh_TW: '光年队长'},
+                {key: 'block_pair_tsum', title: 'Pair Tsum', title_zh_TW: '配对Tsum'},
                 {key: 'no_skill', title: 'No Skill', title_zh_TW: '没有技能'}
             ]
         },