diff --git a/card/standard.js b/card/standard.js index 9a666a36c1..92012f118f 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1929,7 +1929,7 @@ game.import("card", function () { if (pos == "h" && !player.hasSkillTag("viewHandcard", null, target, true)) return btv + 0.1; return btv + val; } - if (get.equipValue(button.link) <= 0) return get.equipValue(button.link); + if (get.equipValue(button.link) <= 0) return -get.equipValue(button.link); let sub = get.subtype(button.link); if (sub == "equip1") return (btv * Math.min(3.6, target.hp)) / 3; if (sub == "equip2") { @@ -2228,7 +2228,7 @@ game.import("card", function () { } if (att > 0) val = -val; if (pos !== "e") return val; - if (get.equipValue(button.link) <= 0) return get.equipValue(button.link); + if (get.equipValue(button.link) <= 0) return -get.equipValue(button.link); let sub = get.subtypes(button.link); if (sub.includes("equip1")) return (val * Math.min(3.6, target.hp)) / 3; if (sub.includes("equip2")) { diff --git a/game/source.js b/game/source.js index bd42e3be4a..fb3829a6dd 100644 --- a/game/source.js +++ b/game/source.js @@ -10,9 +10,11 @@ window.noname_source_list = [ "noname/game/compatible.js", "noname/game/index.js", "noname/game/PauseManager.js", + "noname/game/PauseManager.ts", "noname/game/promises.js", "noname/game/dynamic-style/index.js", "noname/get/audio.js", + "noname/get/audio.ts", "noname/get/compatible.js", "noname/get/index.js", "noname/get/is.js", @@ -28,28 +30,24 @@ window.noname_source_list = [ "noname/init/node.js", "noname/init/onload.js", "noname/init/polyfill.js", + "noname/init/onload/default-splash.d.ts", "noname/init/onload/default-splash.js", "noname/init/onload/index.js", + "noname/init/onload/onload-splash.d.ts", "noname/init/onload/OnloadSplash.js", + "noname/init/onload/wide-splash.d.ts", "noname/init/onload/wide-splash.js", "noname/library/index.js", "noname/library/path.js", "noname/library/update-urls.js", "noname/library/update.js", "noname/library/announce/index.js", - "noname/library/assembly/index.js", "noname/library/assembly/buildin.js", + "noname/library/assembly/index.js", "noname/library/cache/cacheContext.js", "noname/library/cache/childNodesWatcher.js", "noname/library/channel/index.js", "noname/library/crypt/md5.js", - "noname/library/element/GameEvent/compilers/ArrayCompiler.js", - "noname/library/element/GameEvent/compilers/AsyncCompiler.js", - "noname/library/element/GameEvent/compilers/ContentCompiler.js", - "noname/library/element/GameEvent/compilers/ContentCompilerBase.js", - "noname/library/element/GameEvent/compilers/StepCompiler.js", - "noname/library/element/GameEvent/compilers/YieldCompiler.js", - "noname/library/element/GameEvent/GameEventManager.js", "noname/library/element/button.js", "noname/library/element/card.js", "noname/library/element/character.js", @@ -64,6 +62,21 @@ window.noname_source_list = [ "noname/library/element/nodeWS.js", "noname/library/element/player.js", "noname/library/element/vcard.js", + "noname/library/element/GameEvent/GameEventManager.js", + "noname/library/element/GameEvent/GameEventManager.ts", + "noname/library/element/GameEvent/compilers/ArrayCompiler.js", + "noname/library/element/GameEvent/compilers/ArrayCompiler.ts", + "noname/library/element/GameEvent/compilers/AsyncCompiler.js", + "noname/library/element/GameEvent/compilers/AsyncCompiler.ts", + "noname/library/element/GameEvent/compilers/ContentCompiler.js", + "noname/library/element/GameEvent/compilers/ContentCompiler.ts", + "noname/library/element/GameEvent/compilers/ContentCompilerBase.js", + "noname/library/element/GameEvent/compilers/ContentCompilerBase.ts", + "noname/library/element/GameEvent/compilers/IContentCompiler.ts", + "noname/library/element/GameEvent/compilers/StepCompiler.js", + "noname/library/element/GameEvent/compilers/StepCompiler.ts", + "noname/library/element/GameEvent/compilers/YieldCompiler.js", + "noname/library/element/GameEvent/compilers/YieldCompiler.ts", "noname/library/experimental/index.js", "noname/library/experimental/symbol.js", "noname/library/hooks/buildin.js", @@ -88,6 +101,7 @@ window.noname_source_list = [ "noname/util/index.js", "noname/util/initRealms.js", "noname/util/mutex.js", + "noname/util/pagination.js", "noname/util/sandbox.js", "noname/util/security.js", "noname/util/struct/index.js", @@ -448,10 +462,10 @@ window.noname_source_list = [ "game/config.js", "game/core-js-bundle.js", "game/directory.js", - "game/generateChanged.js", "game/entry.js", "game/fallback.js", "game/game.js", + "game/generateChanged.js", "game/http.js", "game/jszip.js", "game/keyWords.js", @@ -484,6 +498,7 @@ window.noname_source_list = [ "layout/default/codemirror.css", "layout/default/layout.css", "layout/default/menu.css", + "layout/default/pagination.css", "layout/default/phone.css", "layout/default/toast.css", "layout/long/layout.css", @@ -493,23 +508,27 @@ window.noname_source_list = [ "layout/mode/boss.css", "layout/mode/chess.css", "layout/mode/stone.css", + "layout/mode/story.css", "layout/mode/tafang.css", "layout/newlayout/equip.css", "layout/newlayout/global.css", "layout/newlayout/layout.css", "layout/nova/layout.css", + "layout/others/dialog.css", + "layout/others/skill.css", "mode/boss.js", + "mode/brawl.js", "mode/chess.js", + "mode/connect.js", "mode/doudizhu.js", "mode/guozhan.js", "mode/identity.js", - "mode/tafang.js", + "mode/realtime.js", "mode/single.js", "mode/stone.js", - "mode/brawl.js", + "mode/tafang.js", "mode/versus.js", - "mode/connect.js", "extension/boss/extension.js", "extension/cardpile/extension.js",