Skip to content

Commit 4055938

Browse files
mengxinzxzyx-lingmeng
mengxinzxz
authored and
yx-lingmeng
committed
Merge pull request libnoname#3042 from Xiazhiliao/PR-Branch
技能修复&&ai调整&&卡牌调整
1 parent 66dac82 commit 4055938

File tree

5 files changed

+244
-252
lines changed

5 files changed

+244
-252
lines changed

‎card/extra.js‎

Lines changed: 0 additions & 219 deletions
Original file line numberDiff line numberDiff line change
@@ -4,60 +4,6 @@ game.import("card", function () {
44
name: "extra",
55
connect: true,
66
card: {
7-
//青囊书
8-
//杨彪：孩子们我没意见
9-
mb_qingnangshu: {
10-
audio: true,
11-
fullskin: true,
12-
type: "equip",
13-
subtype: "equip5",
14-
skills: ["mb_qingnangshu_skill"],
15-
maxNum: 3,
16-
onEquip() {
17-
if (!card.storage || typeof card.storage.mb_qingnangshu_skill != "number") {
18-
if (!card.storage) {
19-
card.storage = {};
20-
}
21-
card.storage.mb_qingnangshu_skill = lib.card.mb_qingnangshu.maxNum;
22-
lib.skill.mb_qingnangshu_skill.broadcast(card, player);
23-
}
24-
if (player.getVCards("e", i => (i.name == "mb_qingnangshu" && i.storage?.mb_qingnangshu_skill > 0)).length) {
25-
player.markSkill("mb_qingnangshu_skill");
26-
}
27-
},
28-
onLose() {
29-
if (!player.getVCards("e", i => (i.name == "mb_qingnangshu" && i.storage?.mb_qingnangshu_skill > 0)).length) {
30-
player.unmarkSkill("mb_qingnangshu_skill");
31-
} else {
32-
player.markSkill("mb_qingnangshu_skill");
33-
}
34-
},
35-
cardPrompt(card, player) {
36-
if (!card.storage || typeof card.storage.mb_qingnangshu_skill != "number") {
37-
if (!card.storage) {
38-
card.storage = {};
39-
}
40-
card.storage.mb_qingnangshu_skill = lib.card.mb_qingnangshu.maxNum;
41-
lib.skill.mb_qingnangshu_skill.broadcast(card, player);
42-
}
43-
return "锁定技，准备阶段，你加1点体力上限并回复1点体力（剩余" + parseFloat(card.storage.mb_qingnangshu_skill) + "次）。";
44-
},
45-
ai: {
46-
equipValue: 9,
47-
},
48-
},
49-
//传国玉玺
50-
//受命于天，既寿永昌！
51-
mb_chuanguoyuxi: {
52-
audio: true,
53-
fullskin: true,
54-
type: "equip",
55-
subtype: "equip5",
56-
skills: ["mb_chuanguoyuxi_skill"],
57-
ai: {
58-
equipValue: 9,
59-
},
60-
},
617
muniu: {
628
fullskin: true,
639
type: "equip",
@@ -1478,155 +1424,6 @@ game.import("card", function () {
14781424
},
14791425
},
14801426
huogon2: {},
1481-
1482-
//青囊书
1483-
mb_qingnangshu_skill: {
1484-
equipSkill: true,
1485-
//mark: true,
1486-
marktext: "书",
1487-
intro: {
1488-
markcount(_, player) {
1489-
if (!player.getVCards("e", i => i.name == "mb_qingnangshu").length) {
1490-
return "∞";
1491-
}
1492-
let cards = player.getVCards("e", card => {
1493-
return card.name == "mb_qingnangshu" && card.storage?.mb_qingnangshu_skill > 0;
1494-
}),
1495-
num = 0;
1496-
if (cards?.length) {
1497-
num = cards[0].storage.mb_qingnangshu_skill;
1498-
}
1499-
return `${num}/${lib.card.mb_qingnangshu.maxNum}`;
1500-
},
1501-
content(_, player) {
1502-
if (!player.getVCards("e", i => i.name == "mb_qingnangshu").length) {
1503-
return "<li>剩余可用∞次<br><li>锁定技，准备阶段，你加1点体力上限并回复1点体力。";
1504-
}
1505-
let cards = player.getVCards("e", card => {
1506-
return card.name == "mb_qingnangshu" && card.storage?.mb_qingnangshu_skill > 0;
1507-
}),
1508-
num = 0;
1509-
if (cards?.length) {
1510-
num = cards[0].storage.mb_qingnangshu_skill;
1511-
}
1512-
return `<li>剩余可用${num}次<br><li>锁定技，准备阶段，你加1点体力上限并回复1点体力。`;
1513-
},
1514-
},
1515-
audio: "zhaohan1.mp3",
1516-
trigger: { player: "phaseZhunbeiBegin" },
1517-
forced: true,
1518-
filter(event, player) {
1519-
if (!player.getVCards("e", i => i.name == "mb_qingnangshu").length) {
1520-
return true;
1521-
}
1522-
return player.hasVCard(card => {
1523-
return card.name == "mb_qingnangshu" && card.storage?.mb_qingnangshu_skill > 0;
1524-
}, "e");
1525-
},
1526-
broadcast(card, player) {
1527-
game.broadcast(
1528-
(card, storage) => {
1529-
card.storage = storage;
1530-
},
1531-
card,
1532-
card.storage
1533-
);
1534-
if (!player) {
1535-
player = get.owner(card);
1536-
}
1537-
if (player) {
1538-
player.markSkill("mb_qingnangshu_skill");
1539-
}
1540-
if (card.storage.mb_qingnangshu_skill <= 0) {
1541-
if (player) {
1542-
player.lose(card.cards, ui.special);
1543-
player.$throw(card.cards, 1000);
1544-
if (!player.getVCards("e", i => (i.name == "mb_qingnangshu" && i != card && i.storage?.mb_qingnangshu_skill > 0)).length) {
1545-
player.unmarkSkill("mb_qingnangshu_skill");
1546-
}
1547-
card.cards.forEach(cardx => {
1548-
cardx.fix();
1549-
cardx.remove();
1550-
cardx.destroyed = true;
1551-
});
1552-
} else {
1553-
game.cardsGotoSpecial(card.cards);
1554-
}
1555-
game.log(card.cards, "被移出了游戏");
1556-
}
1557-
},
1558-
getIndex(event, player) {
1559-
const cards = player.getVCards("e", card => {
1560-
return card.name == "mb_qingnangshu" && card.storage?.mb_qingnangshu_skill > 0;
1561-
});
1562-
if (cards?.length) {
1563-
return cards;
1564-
}
1565-
return 1;
1566-
},
1567-
async content(event, trigger, player) {
1568-
/*player.flashAvatar(event.name, "yangbiao");
1569-
player.chat("天道昭昭，再兴如光武亦可期！");*/
1570-
await player.gainMaxHp();
1571-
await player.recover();
1572-
const card = event.indexedData;
1573-
if (!card) {
1574-
return;
1575-
}
1576-
card.storage.mb_qingnangshu_skill--;
1577-
game.log(card, "减少了", "#y1点", "#g耐久值");
1578-
lib.skill.mb_qingnangshu_skill.broadcast(card, get.owner(card));
1579-
},
1580-
},
1581-
1582-
//传国玉玺
1583-
mb_chuanguoyuxi_skill: {
1584-
equipSkill: true,
1585-
audio: "weidi",
1586-
audioname2: {
1587-
shen_simayi: "lianpo1.mp3",
1588-
xin_simayi: "lianpo1.mp3",
1589-
new_simayi: "lianpo1.mp3",
1590-
},
1591-
trigger: { player: "phaseDiscardBegin" },
1592-
forced: true,
1593-
getIndex(event, player) {
1594-
const cards = player.getVCards("e", card => card.name == "mb_chuanguoyuxi");
1595-
if (cards?.length) {
1596-
return cards;
1597-
}
1598-
return 1;
1599-
},
1600-
async content(event, trigger, player) {
1601-
/*player.flashAvatar(event.name, "yuanshu");*/
1602-
let str = "受命于天，既寿永昌！";
1603-
await player.draw();
1604-
player.addSkill(event.name + "_add");
1605-
player.addMark(event.name + "_add", 2, false);
1606-
game.log(player, "的手牌上限", "#y+2");
1607-
if (!player.isZhu2()) {
1608-
await player.loseHp();
1609-
str = ["你们都得听我的号令！", "我才是皇帝！"].randomGet();
1610-
}
1611-
player.chat(str);
1612-
},
1613-
subSkill: {
1614-
add: {
1615-
charlotte: true,
1616-
onremove: true,
1617-
mark: true,
1618-
markimage: "image/card/handcard.png",
1619-
intro: {
1620-
content: "手牌上限+#",
1621-
},
1622-
mod: {
1623-
maxHandcard(player, num) {
1624-
return num + player.countMark("mb_chuanguoyuxi_skill_add");
1625-
},
1626-
},
1627-
},
1628-
},
1629-
},
16301427
},
16311428
translate: {
16321429
jiu: "酒",
@@ -1667,19 +1464,6 @@ game.import("card", function () {
16671464
muniu_skill_bg: "辎",
16681465
muniu_info: "①出牌阶段限一次，你可以将一张手牌扣置于你装备区里的【木牛流马】下，然后你可以将【木牛流马】移动到一名其他角色的装备区里。②你可以将【木牛流马】下的牌如手牌般使用或打出。③当你失去装备区的【木牛流马】后，你刷新〖木牛流马①〗的使用次数限制。若此牌不是因置入其他角色的装备区而失去的，则你将【木牛流马】下的所有牌置入弃牌堆。",
16691466
muniu_skill_info: "将一张手牌扣置于你装备区里的【木牛流马】下，然后可以将此装备移动到一名其他角色的装备区里。",
1670-
1671-
mb_qingnangshu: "青囊书",
1672-
mb_qingnangshu_bg: "书",
1673-
mb_qingnangshu_info: "锁定技，准备阶段，你加1点体力上限并回复1点体力（剩余3次）。",
1674-
mb_qingnangshu_append: '<span style="font-family: yuanli">你也会昭汉？</span>',
1675-
mb_qingnangshu_skill: "青囊书",
1676-
mb_qingnangshu_skill_info: "锁定技，准备阶段，你加1点体力上限并回复1点体力（剩余3次）。",
1677-
mb_chuanguoyuxi: "传国玉玺",
1678-
mb_chuanguoyuxi_bg: "玺",
1679-
mb_chuanguoyuxi_info: "锁定技，弃牌阶段开始时，你摸一张牌且手牌上限永久+2，然后若你不为主公，你失去1点体力。",
1680-
mb_chuanguoyuxi_append: '<span style="font-family: yuanli">受命于天，既寿永昌！</span>',
1681-
mb_chuanguoyuxi_skill: "传国玉玺",
1682-
mb_chuanguoyuxi_skill_info: "锁定技，弃牌阶段开始时，你摸一张牌且手牌上限永久+2，然后若你不为主公，你失去1点体力。",
16831467
},
16841468
list: [
16851469
["heart", 4, "sha", "fire"],
@@ -1738,9 +1522,6 @@ game.import("card", function () {
17381522
["club", 4, "bingliang"],
17391523

17401524
["diamond", 5, "muniu"],
1741-
1742-
["heart", 9, "mb_qingnangshu"],
1743-
["spade", 13, "mb_chuanguoyuxi"],
17441525
],
17451526
};
17461527
});

0 commit comments

Comments
 (0)