事件卡抽卡修复
This commit is contained in:
strawberry
parent
200b97d435
commit
6f00b46b03
@ -1 +1 @@
|
||||
{"viewportLoc":[0,0],"lastUsed":[{"idnum":85,"id":"specialDoor","images":"animates","y":8,"recent":1757043296731,"frequent":14},{"idnum":396,"id":"Mimi","images":"animates","y":36,"recent":1756907433393,"frequent":1},{"idnum":999,"id":"npc7","images":"npc48","y":7,"recent":1756907414830,"frequent":2},{"idnum":1001,"id":"Hako","images":"animates","y":35,"recent":1756907362344,"frequent":1},{"idnum":81,"id":"yellowDoor","images":"animates","y":4,"recent":1756385647302,"frequent":46},{"idnum":481,"id":"Mamushi","images":"enemys","y":90,"recent":1756306842755,"frequent":1},{"idnum":480,"id":"Souri","images":"enemys","y":89,"recent":1756306840851,"frequent":1},{"idnum":142,"id":"autotile8","images":"autotile","y":0,"recent":1757043302803,"frequent":204},{"idnum":207,"id":"redBat","images":"enemys","y":6,"recent":1756306582961,"frequent":16},{"idnum":32,"id":"bluePotion","images":"items","y":21,"recent":1756306568867,"frequent":22},{"idnum":460,"id":"EbiBro","images":"enemys","y":88,"recent":1756306564395,"frequent":8},{"idnum":228,"id":"darkKnight","images":"enemys","y":27,"recent":1756306559509,"frequent":11},{"idnum":82,"id":"blueDoor","images":"animates","y":5,"recent":1756306507081,"frequent":15},{"idnum":414,"id":"blueGem4","images":"items","y":102,"recent":1756306492166,"frequent":10},{"idnum":21,"id":"yellowKey","images":"items","y":0,"recent":1756306490296,"frequent":21},{"idnum":204,"id":"slimelord","images":"enemys","y":3,"recent":1756306485881,"frequent":15},{"idnum":31,"id":"redPotion","images":"items","y":20,"recent":1756306471762,"frequent":29},{"idnum":404,"id":"redGem4","images":"items","y":99,"recent":1756306470124,"frequent":10},{"idnum":219,"id":"brownWizard","images":"enemys","y":18,"recent":1756306464268,"frequent":9},{"idnum":83,"id":"redDoor","images":"animates","y":6,"recent":1756306171778,"frequent":4},{"idnum":220,"id":"redWizard","images":"enemys","y":19,"recent":1756306162359,"frequent":22},{"idnum":63,"id":"battletoken","images":"items","y":46,"recent":1756306135249,"frequent":3},{"idnum":420,"id":"KaniBro","images":"enemys","y":84,"recent":1756306092722,"frequent":3},{"idnum":22,"id":"blueKey","images":"items","y":1,"recent":1756305863075,"frequent":5},{"idnum":247,"id":"blackMagician","images":"enemys","y":46,"recent":1756305840533,"frequent":2},{"idnum":421,"id":"cardbag","images":"items","y":132,"recent":1756305644387,"frequent":3},{"idnum":91,"id":"upPortal","images":"animates","y":26,"recent":1756305432080,"frequent":5},{"idnum":23,"id":"redKey","images":"items","y":2,"recent":1756305265628,"frequent":1},{"idnum":246,"id":"whiteKing","images":"enemys","y":45,"recent":1756305197643,"frequent":10},{"idnum":92,"id":"leftPortal","images":"animates","y":24,"recent":1756305084224,"frequent":3},{"idnum":93,"id":"downPortal","images":"animates","y":23,"recent":1756305017710,"frequent":5},{"idnum":94,"id":"rightPortal","images":"animates","y":25,"recent":1756305015864,"frequent":3},{"idnum":400,"id":"Thief","images":"enemys","y":82,"recent":1756304829917,"frequent":1},{"idnum":223,"id":"redGuard","images":"enemys","y":22,"recent":1756303424681,"frequent":2}],"editor_multi.fontSize":14,"editorLastFloorId":"DPR4_3","disableBlocklyReplace":true,"foldPerCol":50,"folded":false}
|
||||
{"viewportLoc":[0,0],"lastUsed":[{"idnum":562,"id":"Magnifier","images":"items","y":142,"recent":1757751128625,"frequent":1},{"idnum":142,"id":"autotile8","images":"autotile","y":0,"recent":1757043302803,"frequent":204},{"idnum":85,"id":"specialDoor","images":"animates","y":8,"recent":1757043296731,"frequent":14},{"idnum":396,"id":"Mimi","images":"animates","y":36,"recent":1756907433393,"frequent":1},{"idnum":999,"id":"npc7","images":"npc48","y":7,"recent":1756907414830,"frequent":2},{"idnum":1001,"id":"Hako","images":"animates","y":35,"recent":1756907362344,"frequent":1},{"idnum":81,"id":"yellowDoor","images":"animates","y":4,"recent":1756385647302,"frequent":46},{"idnum":481,"id":"Mamushi","images":"enemys","y":90,"recent":1756306842755,"frequent":1},{"idnum":480,"id":"Souri","images":"enemys","y":89,"recent":1756306840851,"frequent":1},{"idnum":207,"id":"redBat","images":"enemys","y":6,"recent":1756306582961,"frequent":16},{"idnum":32,"id":"bluePotion","images":"items","y":21,"recent":1756306568867,"frequent":22},{"idnum":460,"id":"EbiBro","images":"enemys","y":88,"recent":1756306564395,"frequent":8},{"idnum":228,"id":"darkKnight","images":"enemys","y":27,"recent":1756306559509,"frequent":11},{"idnum":82,"id":"blueDoor","images":"animates","y":5,"recent":1756306507081,"frequent":15},{"idnum":414,"id":"blueGem4","images":"items","y":102,"recent":1756306492166,"frequent":10},{"idnum":21,"id":"yellowKey","images":"items","y":0,"recent":1756306490296,"frequent":21},{"idnum":204,"id":"slimelord","images":"enemys","y":3,"recent":1756306485881,"frequent":15},{"idnum":31,"id":"redPotion","images":"items","y":20,"recent":1756306471762,"frequent":29},{"idnum":404,"id":"redGem4","images":"items","y":99,"recent":1756306470124,"frequent":10},{"idnum":219,"id":"brownWizard","images":"enemys","y":18,"recent":1756306464268,"frequent":9},{"idnum":83,"id":"redDoor","images":"animates","y":6,"recent":1756306171778,"frequent":4},{"idnum":220,"id":"redWizard","images":"enemys","y":19,"recent":1756306162359,"frequent":22},{"idnum":63,"id":"battletoken","images":"items","y":46,"recent":1756306135249,"frequent":3},{"idnum":420,"id":"KaniBro","images":"enemys","y":84,"recent":1756306092722,"frequent":3},{"idnum":22,"id":"blueKey","images":"items","y":1,"recent":1756305863075,"frequent":5},{"idnum":247,"id":"blackMagician","images":"enemys","y":46,"recent":1756305840533,"frequent":2},{"idnum":421,"id":"cardbag","images":"items","y":132,"recent":1756305644387,"frequent":3},{"idnum":91,"id":"upPortal","images":"animates","y":26,"recent":1756305432080,"frequent":5},{"idnum":23,"id":"redKey","images":"items","y":2,"recent":1756305265628,"frequent":1},{"idnum":246,"id":"whiteKing","images":"enemys","y":45,"recent":1756305197643,"frequent":10},{"idnum":92,"id":"leftPortal","images":"animates","y":24,"recent":1756305084224,"frequent":3},{"idnum":93,"id":"downPortal","images":"animates","y":23,"recent":1756305017710,"frequent":5},{"idnum":94,"id":"rightPortal","images":"animates","y":25,"recent":1756305015864,"frequent":3},{"idnum":400,"id":"Thief","images":"enemys","y":82,"recent":1756304829917,"frequent":1},{"idnum":223,"id":"redGuard","images":"enemys","y":22,"recent":1756303424681,"frequent":2}],"editor_multi.fontSize":14,"editorLastFloorId":"MT4","disableBlocklyReplace":true,"foldPerCol":50,"folded":false}
|
||||
@ -1185,7 +1185,7 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 =
|
||||
{
|
||||
"type": "function",
|
||||
"async": true,
|
||||
"function": "function(){\nconst rand = core.plugin.event.eventList[core.randevent()]\ncore.plugin.event.doEvent(rand, core.doAction)\ncore.replay()\n}"
|
||||
"function": "function(){\nconst rand = core.plugin.event.eventList[core.randevent()]\ncore.plugin.event.doEvent(rand, true, core.doAction)\n}"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@ -11845,7 +11845,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
const rand = core.plugin.event.eventList[core.randevent()]
|
||||
core.drawTip("搜查，分析，解明！")
|
||||
core.playSound("Fenny.mp3")
|
||||
core.plugin.event.doEvent(rand, () => {
|
||||
core.plugin.event.doEvent(rand, false, () => {
|
||||
hero.ActiveCD = hero.ActiveSkillCD
|
||||
core.afterSkill()
|
||||
})
|
||||
@ -14342,8 +14342,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
close() { //关闭手牌界面
|
||||
const ctx = core.getContextByName("card")
|
||||
core.clearMap(ctx)
|
||||
core.closePanel()
|
||||
core.plugin.card.selectcard = ""
|
||||
core.status.event.id = null
|
||||
core.unlockControl()
|
||||
}
|
||||
cardcostdown(cost) { //出牌费用计算
|
||||
if (flags.MapStatus?.Choose === "Souri") return
|
||||
@ -14410,6 +14411,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
}
|
||||
usecard(index) { // 使用卡牌费用判定
|
||||
const card = core.plugin.card.cardsInfo[hero.myCard[index]]
|
||||
console.log(index, card)
|
||||
const a = hero.cost + (flags.komachiskill ?? 0)
|
||||
if (flags.MapStatus?.Choose !== "Souri" && a < (core.hasItem("AncientStaff2") ? Math.max(0, card.cost - 1) : card.cost)) {
|
||||
core.drawTip("出牌费用不足")
|
||||
@ -14419,6 +14421,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
core.clearMap(ctx)
|
||||
core.status.event.id = null
|
||||
core.plugin.card.selectcard = ""
|
||||
core.unlockControl()
|
||||
card.effect(index)
|
||||
core.status.route.push("card:" + index)
|
||||
}
|
||||
@ -14491,8 +14494,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
closeCardshop() { //关闭卡牌商店
|
||||
const ctx = core.getContextByName("cardShop")
|
||||
core.clearMap(ctx)
|
||||
core.closePanel()
|
||||
core.status.event.id = null
|
||||
core.playBgm(core.floors[core.status.floorId].bgm)
|
||||
core.unlockControl()
|
||||
}
|
||||
buyCard(Num) { //购买卡牌，同步记录至录像
|
||||
const price = flags.MapStatus?.Map === "魔法学院" ? (40 * (flags.ratio ** 2)) : 60
|
||||
@ -14870,7 +14874,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
}
|
||||
this.evBoss = []
|
||||
this.eventInfo = {
|
||||
Crowd: function (callback) {
|
||||
Crowd: function (inAction, callback) {
|
||||
core.plugin.turncard("Crowd.webp", () => {
|
||||
let blocks = []
|
||||
let nullpos = []
|
||||
@ -14924,28 +14928,28 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
core.setEnemyOnPoint(v[0], v[1], floorId, "special", b, "=")
|
||||
}
|
||||
})
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
MyGoddess: function (callback) {
|
||||
MyGoddess: function (inAction, callback) {
|
||||
core.plugin.turncard("MyGoddess.webp", () => {
|
||||
hero.hp += 50 * flags.ratio
|
||||
flags.health.count += 10
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
FoodSafety: function (callback) {
|
||||
FoodSafety: function (inAction, callback) {
|
||||
core.plugin.turncard("FoodSafety.webp", () => {
|
||||
hero.hp -= 50 * flags.ratio
|
||||
if (hero.hp <= 0) return core.lose("吃毒外卖升天")
|
||||
flags.health.count = 0
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
CardDestruction: function (callback) {
|
||||
CardDestruction: function (inAction, callback) {
|
||||
core.plugin.turncard("CardDestruction.webp", () => {
|
||||
if (hero.myCard.length !== 0) {
|
||||
const length = hero.myCard.length;
|
||||
@ -14956,41 +14960,41 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
}
|
||||
hero.myCard = hero.myCard.slice(0, halfLength);
|
||||
}
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
Hightemperaturewarning: function (callback) {
|
||||
Hightemperaturewarning: function (inAction, callback) {
|
||||
core.plugin.turncard("Hightemperaturewarning.webp", () => {
|
||||
flags.HOT = true
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
FallingGifts: function (callback) {
|
||||
FallingGifts: function (inAction, callback) {
|
||||
core.plugin.turncard("FallingGifts.webp", () => {
|
||||
hero.money += 25 * flags.ratio
|
||||
if (hero.myCard.length < 8) core.drawFolds(core.plugin.card.cardList[core.randcard()])
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
JACKPOT: function (callback) {
|
||||
JACKPOT: function (inAction, callback) {
|
||||
core.plugin.turncard("JACKPOT.webp", () => {
|
||||
hero.cost = hero.costmax
|
||||
core.drawFolds([core.plugin.card.cardList[core.randcard()], core.plugin.card.cardList[core.randcard()], core.plugin.card.cardList[core.randcard()]])
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
Haste: function (callback) {
|
||||
Haste: function (inAction, callback) {
|
||||
core.plugin.turncard("Haste.webp", () => {
|
||||
flags.Haste = true
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
Thunderstormapproaching: function (callback) {
|
||||
Thunderstormapproaching: function (inAction, callback) {
|
||||
core.plugin.turncard("Thunderstormapproaching.webp", () => {
|
||||
let enemys = []
|
||||
const floorId = core.status.floorId
|
||||
@ -15008,11 +15012,11 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
b.push(a)
|
||||
core.setEnemyOnPoint(v[0], v[1], floorId, "special", b, "=")
|
||||
})
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
ReliefArrives: function (callback) {
|
||||
ReliefArrives: function (inAction, callback) {
|
||||
core.plugin.turncard("ReliefArrives.webp", () => {
|
||||
let enemys = []
|
||||
const floorId = core.status.floorId
|
||||
@ -15024,11 +15028,11 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
enemys.forEach(v => {
|
||||
core.setEnemyOnPoint(v[0], v[1], floorId, "special", [], "=")
|
||||
})
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
BUG: function (callback) {
|
||||
BUG: function (inAction, callback) {
|
||||
core.plugin.turncard("BUG.webp", () => {
|
||||
let nullblock = []
|
||||
for (let i = 0; i < 13; i++) {
|
||||
@ -15043,11 +15047,11 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
core.clearMap("hero")
|
||||
core.drawHero()
|
||||
core.drawTip("你还好吗？我们刚刚抢修了一个BUG")
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
RacoonAppears: function (callback) {
|
||||
RacoonAppears: function (inAction, callback) {
|
||||
core.plugin.turncard("RacoonAppears.webp", () => {
|
||||
let enemys = []
|
||||
const floorId = core.status.floorId
|
||||
@ -15067,52 +15071,52 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
core.setEnemyOnPoint(v[0], v[1], floorId, "special", b, "=")
|
||||
})
|
||||
}
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
Doubled: function (callback) {
|
||||
Doubled: function (inAction, callback) {
|
||||
core.plugin.turncard("Doubled.webp", () => {
|
||||
const money = Math.min(Math.floor(hero.money / 5), 200 * flags.ratio)
|
||||
hero.money += money
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
Half: function (callback) {
|
||||
Half: function (inAction, callback) {
|
||||
core.plugin.turncard("Half.webp", () => {
|
||||
const money = Math.min(Math.floor(hero.money / 5), 200 * flags.ratio)
|
||||
hero.money -= money
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
ItsWar: function (callback) {
|
||||
ItsWar: function (inAction, callback) {
|
||||
core.plugin.turncard("ItsWar.webp", () => {
|
||||
const deck = ["AttackM2", "AttackM2", "AttackM2", "AttackM2", "AttackM2", "AttackL2", "AttackL2", "AttackL2", "AttackL2", "AttackG2", "AttackG2", "AttackG2", "Charge2", "GaWuCut2", "GaWuCut2", "ShadowAttack2", "ShadowAttack2", "ShadowAttack2"]
|
||||
core.drawFolds([deck[core.rand(deck.length)], deck[core.rand(deck.length)]])
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
},
|
||||
NoEvent: function (callback) {
|
||||
NoEvent: function (inAction, callback) {
|
||||
core.plugin.turncard("NoEvent.webp", () => {
|
||||
core.plugin.event.afterEvent()
|
||||
core.plugin.event.afterEvent(inAction)
|
||||
if (callback) callback()
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
afterEvent() {
|
||||
afterEvent(inAction) {
|
||||
const Character = core.plugin.Character[hero.name]
|
||||
if (Character && Character.PassiveTime.includes("Event")) {
|
||||
Character.Passive()
|
||||
}
|
||||
core.updateStatusBar()
|
||||
core.closePanel()
|
||||
if (!inAction) core.closePanel()
|
||||
}
|
||||
doEvent(event, callback) {
|
||||
core.plugin.event.eventInfo[event](callback)
|
||||
doEvent(event, inAction, callback) {
|
||||
core.plugin.event.eventInfo[event](inAction, callback)
|
||||
}
|
||||
}
|
||||
core.plugin.event = new Event()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user