Skip to content

Commit

Permalink
TsumBeta: Release v70 (r2-studio#539)
Browse files Browse the repository at this point in the history
* Add Backlog with missing bugfixes and features.

* 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.

* TsumBeta: Shorten log "Current page" to "Pg:"

The length of the overlay log is quite short, so don't waste it for this phrase.

* TsumBeta: Click slow after script start

Now as "auto launch game" doesn't work anymore due to a change of TsumTsum, the script should always assume being on startup mode when initially navigating to the friends page.

* TsumBeta: Speed up mail processing

Speed was reduced in v62 to improve stability, but that does not seem to affect the script stability.

* TsumBeta: Release v70
mcs authored Aug 16, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 8e7adbc commit 6e8ec5e
Showing 6 changed files with 45 additions and 11 deletions.
4 changes: 2 additions & 2 deletions script-config.json
Original file line number Diff line number Diff line change
@@ -82,8 +82,8 @@
"com.r2studio.TsumBeta": {
"id": "com.r2studio.TsumBeta",
"title": "Disney Tsum Tsum",
"versionCode": 69,
"description": "<b style='color: #2196f3;'>\uD83D\uDD16 版本 v69</b>\n<ul>\n <li>重新设计的 HTML 报告<br>Redesigned HTML report</li>\n</ul>",
"versionCode": 70,
"description": "<b style='color: #2196f3;'>\uD83D\uDD16 版本 v70</b>\n<ul>\n <li>新技能: 光年队长<br>New skill: Captain Lightyear</li>\n</ul>",
"packageName": "com.linecorp.LGTMTMG",
"downloadURL": "https://github.com/r2-studio/robotmon-scripts/raw/master/scripts/com.r2studio.TsumBeta/index.zip",
"dependencies": []
12 changes: 12 additions & 0 deletions scripts/com.r2studio.TsumBeta/BACKLOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Backlog

All potential changes which would improve the TsumBeta script will be documented in this file.

### Bugs
- On some devices, after game play, rubies are spent when "Magic Time" is offered (reported by TAR). Happened on real phones without "Special screen ratio" (with video evidence) and Nox (not recorded, config details currently unknown).
- Harden auto start. Clicking the daily banners too fast or while loading can make the game stuck.

### Features
- Add "Spam skill" option to check for skill after every finished chain instead of every chain batch.
- 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)
9 changes: 8 additions & 1 deletion scripts/com.r2studio.TsumBeta/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -5,7 +5,14 @@ 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)
## [v70] - 2024-08-16

### Added
- Skill: Captain Lightyear

### Changed
- First clicks on script start do now always have pauses until the friends page is reached. This should reduce the game ending in an infinite "Loading" dialog if event notifications get clicked away too fast. This attempt is not very solid, but a better implementation will need time, so this topic stays in the backlog.
- Mail processing speed increased. This was slowed down in v62 to improve stability, but time has shown that this does not improve the game stability.


## [v69] - 2024-07-27
Binary file modified scripts/com.r2studio.TsumBeta/index.zip
Binary file not shown.
26 changes: 20 additions & 6 deletions scripts/com.r2studio.TsumBeta/src/index.js
Original file line number Diff line number Diff line change
@@ -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},
@@ -826,7 +829,7 @@ var Logs = {
calculateScreenSize: 'Calculating screen size',
offset: 'Offset (X, Y, H, W)',
startTsumTsumApp: 'Start TsumTsum app',
currentPage: 'Current page',
currentPage: 'Pg:',
friendsPage: 'Friends page',
checkBonusItems: 'Check bonus items',
receiveAllGifts: 'Receive all gifts',
@@ -1159,7 +1162,7 @@ function Tsum(isJP, detect, logs) {
this.debug = false;
this.autoLaunch = false;
this.isRunning = true;
this.isStartupPhase = false;
this.isStartupPhase = true;
this.runTimes = 0;
this.myTsum = '';
this.storagePath = getStoragePath();
@@ -1320,7 +1323,6 @@ Tsum.prototype.startApp = function() {
return;
}
log(this.logs.startTsumTsumApp);
this.isStartupPhase = true;
startTsumTsumApp(this.isJP);
this.sleep(10000);
log("TsumTsum app starting.");
@@ -1941,8 +1943,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;
@@ -2313,7 +2328,6 @@ Tsum.prototype.taskReceiveOneItem = function() {
receivedCount++;
}
sender = undefined;
this.sleep(600);
timeoutCounter = 0;
if (this.claimAllWithoutCoins && isHeartWithoutCoins)
receivedHeartWithoutCoins++;
5 changes: 3 additions & 2 deletions scripts/com.r2studio.TsumBeta/src/settings.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use strict";

var VERSION = 69;
var VERSION = 70;

/**
* Returns the language parameter for the currently active locale.
@@ -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: '没有技能'}
]
},

0 comments on commit 6e8ec5e

Please sign in to comment.