Commit Graph

71 Commits

Author SHA1 Message Date
YoumuKon a433b1a9ed
Dev bugfix (#344)
- 实装了by_user用以检定“使用牌造成伤害”
- 实装Fk.lords以快速查找主公武将
- 添加moveMark以在移动后(前一刻)赋予标记
- 实装-inarea后缀,移动后若不在对应区域会被立即移除
- 为system_enum补全注释
- 内置神将映射
- 修复了小乔转酒杀导致二连击的bug
- 修复了askForCardsChosen烧条后不自动抓取的bug

---------

Co-authored-by: Nyutanislavsky <nyutanislavsky@qq.com>
2024-04-19 21:35:29 +08:00
YoumuKon e75836ff8d
bugfix (#339)
- 改造常备主逻辑,现在常备主会根据可用多余将数调整
- 改良了getCardArea
- 重新启用将框不足提醒
- 修复了司马懿问打出牌的bug
- 修复了白名单武将不存在时无法创房的bug

---------

Co-authored-by: notify <notify-ctrl@qq.com>
2024-04-07 00:51:29 +08:00
Nyutanislavsky 30e33f92c7
Enhance (#338)
1. 国战选将框动态显示珠联璧合(等待更清晰的图…)
2. 废除和恢复区域log
3. 搬运isMale,isFemale,compareDistance,hasShownSkill
4. hasSkill如果是状态技,判断是否亮出,未亮出的返回false
5. 标准包调整,修复八卦阵,离间结姻用isMale
6. 亮将技能改用&后缀并详细化prompt
7. 拼点移动起点改为owner
8. 使用牌filter改为owner

---------

Co-authored-by: notify <notify-ctrl@qq.com>
2024-04-07 00:45:55 +08:00
YoumuKon e840a3b322
bugfix (#328)
- 为findParent添加深度限制参数(默认无限制)
- 搬运了damageByCardEffect
- 修复了ex__choose_skill
- 修复了华佗、吕蒙和古锭刀
- 添加势力映射,可以指定一个势力必须变成其他几个势力之一(需要神话再临包/OL包自行处理神将变将范围)
- askForCardsChosen界限突破,改成了基于askForPoxi的格式
- 修复了空城虚拟杀可以方天的bug
- 给强制平局添加了原因提醒
- 优化了移动牌的视觉逻辑
2024-04-02 00:56:04 +08:00
notify 726602873e
修复武将牌堆回流 (role mode下) (#325) 2024-02-27 16:33:00 +08:00
YoumuKon 380ca120e9
多后缀与bugFix (#321)
- 正式添加对多后缀标记的支持
- 添加了一点注释
- 搬运了moveCardIntoEquip和canMoveCardIntoEquip
- 为选牌的默认prompt添加了目标
- 完善了朱雀羽扇的判定
- 修复了抽选武将牌堆时未删除已选武将的bug
- 修复了maxCard标记不识别“-turn”以外标记的bug
- 修复了obtaincard实际不能接受id数组的bug
2024-02-27 02:27:59 +08:00
Nyutanislavsky b2a438c200
Yiji (#316)
1. 标遗计运用expand_pile
2024-02-05 11:07:09 +08:00
YoumuKon 21e4c65204
终结标记与界bugfix (#307)
-
正式移除了作为临时手段的-tmp标记,现在can_use和target_filter支持读取extra_data(card_filter暂时搁置)
-
规范了askForUseCard中card_name和pattern的关系,现在的格式将以pattern为主,若无pattern才会将card_name视为pattern
- 将withinDistanceLimit迁移至ActiveSkill内
- 添加了令卡牌无距离/次数限制的标记判断
- 添加放大了⑨倍的冰伤音效
- 优化了同将判断的逻辑,使其能够准确读取trueName
- 身份场主公选将后其他角色能看见主公技能(只是看见,无实际功能)
- 开局添加不存在的技能时会放出警报
- 修复了findParent在当前事件无parent时报错的bug
- 修复了人工洗牌后不刷新摸牌堆的bug
- 修复了getPile返回牌堆实例的bug
- 修复了getSkillNameList无法过滤主公技的bug
- 修复了死亡后武将牌没有圆角效果的bug
2024-01-25 03:13:57 +08:00
Ho-spair cec18e0614
Modify game core (#294)
- 新增船新“休整”机制;
- 修改作废逻辑,并可在当前响应读条禁用该技能(出牌阶段空闲时间点尚未完成限制);
- 修复锁视技的相关bug,其cardFilter新增标识是否为判定的参数;
- 将护甲扣减融合进体力扣减流程,为伤害流程增加“虚拟伤害”概念,为伤害流程增加“造成过伤害”标识id以供记录搜索使用;
- 为变将新增可删除副将。

---------

Co-authored-by: notify <notify-ctrl@qq.com>
2023-12-10 18:55:16 +08:00
Nyutanislavsky 5abbdc9b23
Enhancement (#292)
1. 卡牌一览中音效播放(装备牌鸽)
2. 修改游戏桌面菜单式样,增加音量
3. 卡牌使用时prompt
4. 比较角色性别是否相同
5. 修一些函数提示
6. getEventsOfScope找不到start_event直接返回
7. 应用all_card_types
8. 修改askForCard的默认返回值
9. 增加装备牌技能触发log
10. phase_state初始化
11. 额外阶段走phaseChanging
12. 亮将增加一个时机并做调整(但还是不对……)
13. 标准包和军争篇增加卡牌prompt,修改描述
14. 运用一些Util,hasSkill精简
15. 修改一些神秘英语单词,水

---------

Signed-off-by: Mechanel <nyutanislavsky@qq.com>
2023-12-09 21:57:47 +08:00
xxyheaven 041d5835ff
fix bugs (#288)
1、修正标准版武将、卡牌结算
2023-12-03 00:21:52 +08:00
luazyxs d1619672a2
初步ai逻辑 (#270)
大部分修改的地方都在代码里加了注释

---------

Co-authored-by: notify <notify-ctrl@qq.com>
Co-authored-by: xxyheaven <1433191064@qq.com>
Co-authored-by: YoumuKon <38815081+YoumuKon@users.noreply.github.com>
2023-10-07 03:22:57 +08:00
YoumuKon 7e15ccb63e
武将牌堆和更多bugfix (#261)
- 修复了询问卡牌时会返回不符合要求的牌的bug
- 修复了摸牌阶段的skillname(游戏规则)
- 实装武将牌堆
- 剥离身份模式特有常备主逻辑
- 为资产变换添加时机
- 分离了改判时的移动
- 将canUseGeneral改为Engine所属函数
2023-09-27 21:02:22 +08:00
Nyutanislavsky bbead752cc
Fixbug (#256)
1. 修复龙胆
2. 调整黄月英和孙尚香
2023-08-25 08:11:25 +08:00
notify 607d3b010c
Enhancement (#253)
- 修复clone狮子的bug
- 支持拓展自定义游戏事件
- 修复反选拓展包时极其卡顿的bug
- 修复自订身份无法正常显示的bug
- 谋攻篇askForCard(s)Chosen
- 修复了倾国时点取消的bug
- player:broadcastSkillInvoke
- 修复客户端白名单忘记屏蔽的bug
2023-08-24 21:37:24 +08:00
Nyutanislavsky d0913e42ce
Heg (#254)
1. 修复木马、真名无懈可击
2. 增加亮将、暗将时机
3. 增加武将珠联璧合关系
4. 增加武将选择框禁止替换
5. 增加变换武将不改变体力上限
6. 增加亮将禁止、不计入距离和座次的MarkEnum,相应的player函数
7. 状态技默认锁定技
8. 修复拼点
9. 增加出牌阶段亮将技能
10. 增加暗置武将函数

---------

Signed-off-by: Mechanel <nyutanislavsky@qq.com>
2023-08-24 21:37:06 +08:00
notify 6dd1eded9a Changelog: v0.3.3 2023-08-13 16:36:11 +08:00
YoumuKon 48bb6ac999
bug fix (#239)
- 修复了人人主公框+无主公酱报错的bug
- 修复了random(n)不返回表的bug
- 为table添加connect(不改变输入数组的连接各数组)方法及其IfNeed版本(包括insertTable)
- 修复了有死人不能喝酒的bug
2023-08-03 21:08:01 +08:00
Nyutanislavsky d38b0ca805
bugfix (#237)
1. 修复甄姬等
2. 将弃置所有牌、武将牌上的牌等修复为一次性弃置
3. 添加连环状态改变的音效
4. 改进notifyMoveCards的可见

---------

Signed-off-by: Mechanel <nyutanislavsky@qq.com>
2023-08-03 15:26:52 +08:00
Nyutanislavsky 35477c0ea1
Enchance Mouxusheng (#235)
1. 谋徐盛增加大离间、复活,可以变更副将
2. 修改CardEffecting等时机的承载者
3. 修复changeHero
4. 给moveCardTo堆一个proposer
5. 修复一些标准版武将和装备
2023-08-02 21:50:47 +08:00
notify 8bfe087374 遗计,默认主公,修同名替换 2023-08-02 21:39:03 +08:00
YoumuKon 7fd39264ee
bugfix (#229)
- 为需要无视描述的请求添加-tmp标签(……)
- 修改铁索相关描述
- 修复了可以通过取消目标以跳过exclusive_targets的bug
- 修复了观星只控顶时还有底部标签的bug
- 修复了没有correct_func时的报错
- 修复了一个人且未分胜负时无限循环的bug
- 将AOE的函数调到了Util内方便其他DIY快速调用
- 将AskForAddTarget转正
- 主动技添加modTargetFilter,负责重新定义目标(借刀摆烂了)
- 游戏模式添加countInFunc(room),负责检测本局游戏是否可以纳入胜率统计(默认true)

---------

Co-authored-by: Nyutanislavsky <nyutanislavsky@qq.com>
2023-08-02 02:19:51 +08:00
Ho-spair 8ca9f9154c
Skip nullification (#227)
- 完善移动场上一张牌移动虚拟牌及选框中显示逻辑,并增加排除特定卡牌id的参数;
- 多目标锦囊牌询问无懈时新增“本轮忽略”功能;
- 修复传导伤害额外传导自身的问题。
2023-07-16 19:18:43 +08:00
YoumuKon a812af8d97
bug fix和黑名单 (#223)
- 修复了旁观skill出错的bug
- 为模式和扩展包提供相互之间的黑/白名单
2023-07-14 22:17:54 +08:00
RalphRad fdf2ccc75b
standard fix (#221) 2023-07-11 21:15:38 +08:00
Ho-spair 297d466b05 fix surrender 2023-07-02 22:13:51 +08:00
notify dad2b5406c Changelog: v0.2.7 2023-07-02 20:53:42 +08:00
Ho-spair cf01ac9499 modify 2023-07-02 20:47:10 +08:00
YoumuKon 3aef53d16c bypassDistancesCheck + bugfix (#204)
- 重命名isUnlimited/unlimited,因为未正式上线所以无关紧要(?)
- 新增bypassDistancesCheck/bypass_distances,实现真正的无距离限制
- 修复早退导致的报错bug

---------

Co-authored-by: notify <notify-ctrl@qq.com>
2023-06-20 14:17:20 +08:00
YoumuKon d5330d5bed
isInLimit等各种功能 + bugfix (#201)
没来得及转远程url,这是最后一次从fork来的更新了

- 修复了fk.currentresponsepattern = nil的时机
-
添加unlimited/withinTimesLimit和withinDistanceLimit,整合并实现真正的“无次数限制”/“无距离限制”
- 给观星框上了标题(暂时不往上加标题变量)
- 青龙刀会临时追加“对此人不限次数”+“对此人不限距离”的标记,响应(包括取消)后清除
- 添加了“对某人无次数/距离限制”的标记及对应两个global技能
2023-06-19 00:20:50 +08:00
Ho-spair b2a963739b
Fix invalidity skill (#190)
- 修复技能失效技;
- 新增全局技能以令非锁定技失效仅使用标记即可实现。
2023-06-11 12:45:12 +08:00
Nyutanislavsky 23762e1600
Enhancement (#170)
1. 手牌上限显示:体力值为负数和手牌上限为无限时显示优化
2. 观星新增提示,修复观星
3. 增加不计入手牌上限技
4. 修复变更武将
5. 修复奸雄和救援
6. 修复选角色的cancelble
7. 增强谋徐盛

---------

Signed-off-by: Mechanel <nyutanislavsky@qq.com>
2023-06-04 19:39:20 +08:00
Ho-spair 5128100083
modify process & quest skill (#166) 2023-05-28 18:45:54 +08:00
notify 48f3ae3ecd
ModMaker start (#163)
做了个Mod制作器的壳
修手气卡bug
修旁观/重连看不到标记
优化Card元表实现
2023-05-26 20:53:26 +08:00
Nyutanislavsky 8d87fbbf09
Fixbug (#144)
视为技添加frequency(为了显示限定技)
修复主动技canUse (by @Ho-spair )
Exppattern增加子类别
增加体力上限相关的log
增加求桃prompt
修复许褚、夏侯惇(by @xxyheaven )和赵云
移除观星一张牌直接放在牌堆顶
添加获得牌的log(和摸牌区分开)
封装重铸(和以技能重铸)函数

---------

Signed-off-by: Mechanel <nyutanislavsky@qq.com>
2023-05-13 13:23:18 +08:00
notify a09023c487
Heg (#134)
国战雏形
2023-04-23 21:10:07 +08:00
Ho-spair 4d0d0c1d60
base lord skills (#119)
主公技
2023-04-15 12:06:24 +08:00
notify a735013411
Fixbug (#115)
修流离锁定技
修斧子弃自己
修顺手空城卡死
修旁观者id是自己的
修旁观者再开新局就闪退(或许吧)
修拼点报nil
修询问无懈时旁观者被卡在外面
修Room的请求队列不清理干净
2023-04-12 22:28:19 +08:00
notify 9a951fdbfe
Spdx license (#109)
在所有代码中添加了许可证标记头
2023-04-09 13:35:35 +08:00
notify 615a4884e2
Card skill name (#95)
重新设计了Card.skillName,并给各种cloneCard补上了skillName

- 赋值:card.skillName = 'xxx'
- 判断是否: table.contains(card.skillNames, 'xxx')
- 判断是否(不推荐): card.skillName == 'xxx'
2023-04-02 12:56:29 +08:00
notify 44c932981b fix chain bug 2023-03-20 20:28:25 +08:00
Ho-spair 4ab14c7d74
Pindian&analeptic (#77)
Co-authored-by: notify <notify-ctrl@qq.com>
2023-03-14 20:48:08 +08:00
notify 6ae86a1e3e
Gamemode (#75)
提供拓展游戏模式的接口
2023-03-14 00:12:02 +08:00
notify 861d87849a
Fixbug (#69)
修了很多bug 但我自己都不确定是不是修了
2023-03-07 10:21:56 +08:00
Ho-spair 932914c62c
bagua and wushuang (#65)
* bagua and wushuang

* delete space
2023-03-06 01:07:54 +08:00
notify cd7e4c9bd3 I18n (#57)
* rotate general name when it becomes too long

* remember x and y pos of window

* config.language, and can change translations according to language

* standard i18n (WIP)

* client translation (WIP)

* translation for standard cards

* translate skill name and adjust UI
2023-02-27 10:23:48 +08:00
notify a579cf2a59 Ci: check space and LF (#55) 2023-02-26 16:51:29 +08:00
notify 9ac89caa1f Random AI (#54)
* android: dont copy RSA key and test.lua(generated by fkp)

* remove debug code

* ai think

* fixbug: 100% cpu per thread

* init ai

* fix bug, next step is to remove all feasible

* remame vscode -> lsp

* add some lsp comment

* rewrite feasible

* Random AI

* fixbug: chooseplayer

* liuli

* move checkNoHuman to waitForAiReply

* prototype for cardLimitation skill

* add Exppattern:Parse to static.lua

* remove unnecessary static
2023-02-26 15:01:14 +08:00
notify afb537a661 Merge 'standard' (#53)
* todo

* todo.md

* doc for move cards

* weapons excluding qinggang

* equip sound and emotion

* remove silence on the starting of using skill

* add audio skill for TMD equip

* fixbug: running and observing

* when PreUseCard is broken, jump to move cards to discardPile

* doc for diy

* addToPile

* viewPile (WIP)

* fix git bug

* auto update packages when md5 fail

* use thread when updating pack

* correct status() handling

* update fkp

* remove PKGBUILD since it's presented in AUR repo

* fix fkp md5 bug

* extensible qml

* set bigAnim's z to 999

* nioh sheild

* lijian

* now mod can return nil

* if dmg.nature == nil then = normal

* disable notifyUI when qWarning

* fix lijian and gender problem
2023-02-21 13:44:24 +08:00
notify cc271bcdf8 Standard equips (#50)
* support fkp

* get default setting in qml

* correct zixing

* mark

* TODO: parse fkp in c++

* scale the drawer

* free assign

* fix free assign bug

* add submodule for official generals

* generate fkp in cpp code

* use UTF-8 in windows conhost

* use onUse for regular skill

* active skill for fkp

* add fkp function; change data for DMG and Heal

* add cancelable to askForDiscard

* don't let generals naked

* config bg and bgm

* fix exists for win

* bugfix: rewardandpunish

* fkp: vs skill

* room config

* observe

* god_salavation

* fkp: judge

* add read storage permission for android build

* remove submodule fk_official

* remove include/

* use a submodule as include directory

* libgit2

* remove debugging 'downloadNewPack'

* libgit2.dll for Windows

* rewrite system_enum, disable dangerous function

* fix bug in trigger()

* filter skill

* filter judgement card

* add about page for git2

* very basic general detail

* FKP: status skill

* libgit: android test

* libgit: build for android

* 1

* libgit2.dll

* android: load qm file after copy asset

* filter skill: if no filter skill then remove filtered card

* allow warning and critical to show a popup, and fix warnings from QML

* resource: move general audio/image to packages/

* move assets of cards

* FKP: modify

* use sqlite db to manage packages

* packman cli

* packman gui

* use Popup for error dialog

* android full screen note

* fix android ssl problem
2023-02-15 19:54:35 +08:00