Merge pull request #759 from nonameShijian/PR-Branch

修复左慈bug,添加Player类的typeAnnotation,添加Get.Is类的类型注释
This commit is contained in:
Spmario233 2024-01-02 23:04:10 +08:00 committed by GitHub
commit 4b6ae3b4eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 292 additions and 27 deletions

View File

@ -4310,7 +4310,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
event.dialog.open();
event.custom.replace.button=function(button){
if(!event.dialog.includes(button.parentNode)) return;
if(!event.dialog.contains(button.parentNode)) return;
if(event.control) event.control.style.opacity=1;
if(button.classList.contains('selectedx')){
event.button=null;

View File

@ -38,4 +38,4 @@ declare type GameHistory = import('../../noname/game/index.js').GameHistory;
declare type CodeMirror = typeof import('../../game/codemirror.js').default;
declare type Sex = 'male' | 'female' | 'dobule' | 'none';
declare type Character = [Sex, string, number | string, string[], ...any[]];
declare type Character = [Sex, string, number | string, string[], string[]];

View File

@ -79,4 +79,6 @@ declare interface Window {
ensureDirectory: () => any,
createDir: () => any,
})): void;
bannedKeyWords: string[];
}

View File

@ -9,9 +9,9 @@ import { GNC as gnc } from '../gnc/index.js';
export class Is extends Uninstantable {
/**
* 判断是否为进攻坐骑
* @param {Card | VCard} card
* @param {false | Player} [player]
* @returns {boolean}
* @param { Card | VCard } card
* @param { false | Player } [player]
* @returns { boolean }
*/
static attackingMount(card, player) {
const subtype = get.subtype(card, player);
@ -25,9 +25,9 @@ export class Is extends Uninstantable {
}
/**
* 判断是否为防御坐骑
* @param {Card | VCard} card
* @param {false | Player} [player]
* @returns {boolean}
* @param { Card | VCard } card
* @param { false | Player } [player]
* @returns { boolean }
*/
static defendingMount(card, player) {
const subtype = get.subtype(card, player);
@ -41,6 +41,7 @@ export class Is extends Uninstantable {
}
/**
* 判断坐骑栏是否被合并
* @returns { boolean }
*/
static mountCombined() {
if (lib.configOL.mount_combine) {
@ -117,6 +118,7 @@ export class Is extends Uninstantable {
}
/**
* 判断一张牌是否为明置手牌
* @param { Card } card
*/
static shownCard(card) {
if (!card) return false;
@ -125,34 +127,53 @@ export class Is extends Uninstantable {
}
/**
* 是否是虚拟牌
* @param { Card | VCard } card
*/
// @ts-ignore
static vituralCard(card) { return card.isCard || (!("cards" in card) || !Array.isArray(card.cards) || card.cards.length == 0) }
/**
* 是否是转化牌
* @param { Card | VCard } card
*/
// @ts-ignore
static convertedCard(card) { return !card.isCard && ("cards" in card) && Array.isArray(card.cards) && card.cards.length > 0 }
/**
* 是否是实体牌
* @param { Card | VCard } card
*/
// @ts-ignore
static ordinaryCard(card) { return card.isCard && ("cards" in card) && Array.isArray(card.cards) && card.cards.length == 1 }
/**
* 押韵判断
* @param { string } str1
* @param { string } str2
*/
static yayun(str1, str2) {
if (str1 == str2) return true;
var pinyin1 = get.pinyin(str1, false), pinyin2 = get.pinyin(str2, false);
let pinyin1 = get.pinyin(str1, false), pinyin2 = get.pinyin(str2, false);
if (!pinyin1.length || !pinyin2.length) return false;
var pron1 = pinyin1[pinyin1.length - 1], pron2 = pinyin2[pinyin2.length - 1];
let pron1 = pinyin1[pinyin1.length - 1], pron2 = pinyin2[pinyin2.length - 1];
if (pron1 == pron2) return true;
return get.yunjiao(pron1) == get.yunjiao(pron2);
}
/**
* @param { string } skill 技能id
* @param { Player } player 玩家
* @returns
*/
static blocked(skill, player) {
if (!player.storage.skill_blocker || !player.storage.skill_blocker.length) return false;
for (var i of player.storage.skill_blocker) {
for (let i of player.storage.skill_blocker) {
if (lib.skill[i] && lib.skill[i].skillBlocker && lib.skill[i].skillBlocker(skill, player)) return true;
}
return false;
}
/**
* 是否是双势力武将
* @param { string } name
* @param { string[] } array
* @returns { boolean | string[] }
*/
static double(name, array) {
const extraInformations = get.character(name, 4);
if (!extraInformations) return false;
@ -166,14 +187,21 @@ export class Is extends Uninstantable {
* Check if the card has a Yingbian condition
*
* 检测此牌是否具有应变条件
* @param { Card | VCard } card
*/
static yingbianConditional(card) { return get.is.complexlyYingbianConditional(card) || get.is.simplyYingbianConditional(card) }
/**
* @param { Card | VCard } card
*/
static complexlyYingbianConditional(card) {
for (const key of lib.yingbian.condition.complex.keys()) {
if (get.cardtag(card, `yingbian_${key}`)) return true;
}
return false;
}
/**
* @param { Card | VCard } card
*/
static simplyYingbianConditional(card) {
for (const key of lib.yingbian.condition.simple.keys()) {
if (get.cardtag(card, `yingbian_${key}`)) return true;
@ -184,6 +212,8 @@ export class Is extends Uninstantable {
* Check if the card has a Yingbian effect
*
* 检测此牌是否具有应变效果
*
* @param { Card | VCard } card
*/
static yingbianEffective(card) {
for (const key of lib.yingbian.effect.keys()) {
@ -191,26 +221,32 @@ export class Is extends Uninstantable {
}
return false;
}
/**
* @param { Card | VCard } card
*/
static yingbian(card) { return get.is.yingbianConditional(card) || get.is.yingbianEffective(card) }
/**
* @param { string } [substring]
*/
static emoji(substring) {
if (substring) {
var reg = new RegExp("[~#^$@%&!?%*]", 'g');
const reg = new RegExp("[~#^$@%&!?%*]", 'g');
if (substring.match(reg)) {
return true;
}
for (var i = 0; i < substring.length; i++) {
var hs = substring.charCodeAt(i);
for (let i = 0; i < substring.length; i++) {
const hs = substring.charCodeAt(i);
if (0xd800 <= hs && hs <= 0xdbff) {
if (substring.length > 1) {
var ls = substring.charCodeAt(i + 1);
var uc = ((hs - 0xd800) * 0x400) + (ls - 0xdc00) + 0x10000;
const ls = substring.charCodeAt(i + 1);
const uc = ((hs - 0xd800) * 0x400) + (ls - 0xdc00) + 0x10000;
if (0x1d000 <= uc && uc <= 0x1f77f) {
return true;
}
}
}
else if (substring.length > 1) {
var ls = substring.charCodeAt(i + 1);
const ls = substring.charCodeAt(i + 1);
if (ls == 0x20e3) {
return true;
}
@ -238,13 +274,28 @@ export class Is extends Uninstantable {
}
return false;
}
/**
* @param { string } str
*/
static banWords(str) { return get.is.emoji(str) || window.bannedKeyWords.some(item => str.includes(item)) }
/**
* @param { GameEventPromise } event
*/
// @ts-ignore
static converted(event) { return !(event.card && event.card.isCard) }
static safari() { return userAgent.indexOf('safari' != -1) && userAgent.indexOf('chrome') == -1 }
static safari() { return userAgent.indexOf('safari') != -1 && userAgent.indexOf('chrome') == -1 }
/**
* @param { (Card | VCard)[]} cards
*/
// @ts-ignore
static freePosition(cards) { return !cards.some(card => !card.hasPosition || card.hasPosition()) }
/**
* @param { string } name
* @param { boolean } item
*/
static nomenu(name, item) {
var menus = ['system', 'menu'];
var configs = {
const menus = ['system', 'menu'];
const configs = {
show_round_menu: lib.config.show_round_menu,
round_menu_func: lib.config.round_menu_func,
touchscreen: lib.config.touchscreen,
@ -284,23 +335,50 @@ export class Is extends Uninstantable {
// return !lib.config.vintageSkills.includes(skill);
},
*/
/**
* @param { any } obj
* @returns { boolean }
*/
static node(obj) {
var str = Object.prototype.toString.call(obj);
if (str && str.indexOf('[object HTML')) return true;
return false;
return Object.prototype.toString.call(obj).startsWith('[object HTML');
}
/**
* @param { any } obj
*/
static div(obj) { return Object.prototype.toString.call(obj) === '[object HTMLDivElement]' }
/**
* @param { any } obj
*/
static map(obj) { return Object.prototype.toString.call(obj) === '[object Map]' }
/**
* @param { any } obj
*/
static set(obj) { return Object.prototype.toString.call(obj) === '[object Set]' }
/**
* @param { any } obj
*/
static object(obj) { return Object.prototype.toString.call(obj) === '[object Object]' }
/**
* @overload
* @param { Function } func
* @returns { false }
*/
/**
* @overload
* @param { number | [number, number] } func
* @returns { boolean }
*/
static singleSelect(func) {
if (typeof func == 'function') return false;
var select = get.select(func);
const select = get.select(func);
return select[0] == 1 && select[1] == 1;
}
/**
* @param { string | Player } name
*/
static jun(name) {
if (get.mode() == 'guozhan') {
if (name && typeof name == 'object') {
if (name instanceof lib.element.Player) {
if (name.isUnseen && name.isUnseen(0)) return false;
name = name.name1;
}
@ -313,13 +391,19 @@ export class Is extends Uninstantable {
static versus() { return !_status.connectMode && get.mode() == 'versus' && _status.mode == 'three' }
static changban() { return get.mode() == 'single' && _status.mode == 'changban' }
static single() { return get.mode() == 'single' && _status.mode == 'normal' }
static mobileMe(player) { return (game.layout == 'mobile' || game.layout == 'long') && !game.chess && player.dataset.position == 0 }
/**
* @param { Player } [player]
*/
static mobileMe(player) { return (game.layout == 'mobile' || game.layout == 'long') && !game.chess && player && player.dataset.position == '0' }
static newLayout() { return game.layout != 'default' }
static phoneLayout() {
if (!lib.config.phonelayout) return false;
return (game.layout == 'mobile' || game.layout == 'long' || game.layout == 'long2' || game.layout == 'nova');
}
static singleHandcard() { return game.singleHandcard || game.layout == 'mobile' || game.layout == 'long' || game.layout == 'long2' || game.layout == 'nova' }
/**
* @param { Player } player
*/
static linked2(player) {
if (game.chess) return true;
if (lib.config.link_style2 != 'rotate') return true;
@ -330,10 +414,21 @@ export class Is extends Uninstantable {
}
return false;
}
/**
* @param { {} } obj
*/
static empty(obj) { return Object.keys(obj).length == 0 }
/**
* @param { string } str
*/
static pos(str) { return str == 'h' || str == 'e' || str == 'j' || str == 'he' || str == 'hj' || str == 'ej' || str == 'hej' }
/**
* @param { string } skill
* @param { Player } player
* @returns
*/
static locked(skill, player) {
var info = lib.skill[skill];
const info = lib.skill[skill];
if (typeof info.locked == 'function') return info.locked(skill, player);
if (info.locked == false) return false;
if (info.trigger && info.forced) return true;
@ -510,6 +605,9 @@ export class Get extends Uninstantable {
return [];
}
//装备栏 END
/**
* @returns { string[] }
*/
static pinyin(chinese, withTone) {
const pinyinUtilx = window.pinyinUtilx;
if (!pinyinUtilx) return [];
@ -836,6 +934,18 @@ export class Get extends Uninstantable {
return func(list[0]);
}
}
/**
* @overload
* @param { string } name
* @returns { Character }
*/
/**
* @template { 0 | 1 | 2 | 3 | 4 } T
* @overload
* @param { string } name
* @param { T } num
* @returns { Character[T] }
*/
static character(name, num) {
let info = lib.character[name];
if (!info) {
@ -2709,6 +2819,9 @@ export class Get extends Uninstantable {
game.players.length + game.dead.length :
game.players.concat(game.dead).filter(current => current.identity == identity).length
}
/**
* @param { Card | VCard } item
*/
static cardtag(item, tag) {
return (item.cardid && (get.itemtype(item) == 'card' || !item.cards || !item.cards.length || item.name == item.cards[0].name) && _status.cardtag && _status.cardtag[tag] && _status.cardtag[tag].includes(item.cardid))
|| (item.cardtags && item.cardtags.includes(tag))

View File

@ -21,6 +21,153 @@ export class Player extends HTMLDivElement {
player.build(noclick);
return player;
}
/**
* Do not call this method
*
* @returns { never }
*/
typeAnnotation() {
/**
* @type { SMap<HTMLDivElement> }
*/
// @ts-ignore
this.node;
/**
* @type { number }
*/
// @ts-ignore
this.phaseNumber;
/**
* @type { string[] }
*/
// @ts-ignore
this.skipList;
/**
* @type { string[] }
*/
// @ts-ignore
this.skills;
/**
* @type { string[] }
*/
// @ts-ignore
this.invisibleSkills;
/**
* @type { string[] }
*/
// @ts-ignore
this.initedSkills;
/**
* @type { SMap<string[]> }
*/
// @ts-ignore
this.additionalSkills;
/**
* @type { SMap<string[]> }
*/
// @ts-ignore
this.disabledSkills;
/**
* @type { string[] }
*/
// @ts-ignore
this.hiddenSkills;
/**
* @type { string[] }
*/
// @ts-ignore
this.awakenedSkills;
/**
* @type { SMap<string[]> }
*/
// @ts-ignore
this.forbiddenSkills = {};
/**
* @type { [] }
*/
// @ts-ignore
this.popups;
/**
* @type { [] }
*/
// @ts-ignore
this.damagepopups;
/**
* @type { Card[] }
*/
// @ts-ignore
this.judging;
/**
* @type { { card:{}, skill: {} }[] }
*/
// @ts-ignore
this.stat;
/**
* @type { {
* useCard: GameEventPromise[],
* respond: GameEventPromise[],
* skipped: GameEventPromise[],
* lose: GameEventPromise[],
* gain: GameEventPromise[],
* sourceDamage: GameEventPromise[],
* damage: GameEventPromise[],
* custom: GameEventPromise[],
* useSkill: GameEventPromise[],
* }[] }
*/
// @ts-ignore
this.actionHistory;
/**
* @type { SMap<string[]> }
*/
// @ts-ignore
this.tempSkills;
/**
* @type { SMap<any> }
*/
// @ts-ignore
this.storage;
/**
* @type { SMap<HTMLDivElement> }
*/
// @ts-ignore
this.marks;
/**
* @type { SMap<number> }
*/
// @ts-ignore
this.expandedSlots;
/**
* @type { SMap<number> }
*/
// @ts-ignore
this.disabledSlots;
/**
* @type { {
* friend: [],
* enemy: [],
* neutral: [],
* handcards: {
* global: [],
* source: [],
* viewed: []
* }
* } }
*/
// @ts-ignore
this.ai;
/**
* @type { number }
*/
// @ts-ignore
this.queueCount;
/**
* @type { number }
*/
// @ts-ignore
this.outCount;
throw new Error('Do not call this method');
}
build(noclick) {
let player = this;
player.buildNode();

View File

@ -38,6 +38,9 @@ export class VCard {
this.color = get.color(suitOrCard);
this.number = get.number(suitOrCard);
this.nature = get.nature(suitOrCard);
/**
* @type { boolean }
*/
this.isCard = true;
this.cardid = suitOrCard.cardid;
this.wunature = suitOrCard.wunature;