6e2687a3ab
modify functions
2023-05-13 15:03:35 +08:00
5843442f98
Win rate ( #149 )
...
胜率（无UI）
2023-05-13 14:45:23 +08:00
0033cd6c07
ban generals ( #146 )
...
- 禁将功能
- 公告展示
2023-05-13 14:20:48 +08:00
a7e3ad0f19
Switch skill ( #148 )
...
- 实现转换技；
- 将特殊的标记名称注册在mark_enum.lua文件；
- 标记值在UI的显示支持解析数组；
- 将觉醒技的觉醒条件分离至canWake函数；
- 修复一系列bug；
- 在Room类新增从牌堆、弃牌堆中随机获取牌的方法。
2023-05-13 14:20:34 +08:00
5e9505d18e
LogEdit, Card.Void, aux_skills ( #147 )
...
Card.Void, aux_skills, move card reason, clone card attackrange
2023-05-13 14:16:09 +08:00
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
19a2cc5ed7
Initial kingdom choosing ( #143 )
...
- 实现副势力概念，用于应对双势力机制；
- 完善神将及拥有副势力的武将开局选择势力的机制；
- 完成势力技概念；
- 实现ViewAsSkill在响应时对使用和打出的区分。
---------
Co-authored-by: notify <notify-ctrl@qq.com>
2023-04-30 18:55:59 +08:00
34ce4c9859
Cppfix ( #142 )
...
修了一些需要重新编译的bug
修大厅卡死尸体
修“已经有人登入”
修服务端翻译文件
增加出牌时间设置
修Linux下复制文件bug
再次尝试wasm
2023-04-30 18:54:23 +08:00
3dfff72836
新功能 ( #141 )
...
增加最大选将18
将退出房改为延迟按钮
修虚拟闪电bug
修看破bug
增加长度限制
将异步模块单独一个Lua
2023-04-30 18:51:05 +08:00
29fdfca9bb
Modify combo box ( #140 )
...
Co-authored-by: notify <notify-ctrl@qq.com>
2023-04-30 00:52:39 +08:00
417ec49de9
update freeassign
2023-04-28 19:19:45 +08:00
432bd5df4d
volume cfg
2023-04-28 18:24:31 +08:00
930826e664
Fixbug ( #139 )
...
修复了无法聊天
修复拼点没赢时双方都没赢
修复了被拼点的人无法选牌（或许吧
2023-04-28 10:27:56 +08:00
8d2230766d
ChangeLog: v0.1.5
2023-04-27 14:20:28 +08:00
fc8be0ad40
神貂蝉 ( #138 )
...
控制他人/一控多相关
2023-04-27 14:15:08 +08:00
b50c94d171
Fixbug ( #137 )
...
将DamageFinished承载者改为受到伤害的角色（解决无来源伤害无法传导的bug）
bury加入重置武将牌
改进火攻的交互
更改八卦阵的pattern（解决AskForUseCard和AskForResponseCard的pattern为任意时八卦阵可以响应的bug）
---------
Signed-off-by: Mechanel <nyutanislavsky@qq.com>
2023-04-26 09:40:51 +08:00
754bd24794
观星扩展限制参数 ( #135 )
...
已知Bug：~~初始化时，若牌堆顶牌位不足，剩余的牌在图像上会置于牌堆顶位置而不是牌堆底。挪动一次牌后恢复正常~~
更新：已修复
2023-04-25 19:02:17 +08:00
a09023c487
Heg ( #134 )
...
国战雏形
2023-04-23 21:10:07 +08:00
5888df6e7c
Zhuran ( #133 )
...
老朱然相关：终止结算、终止回合
执行新阶段
2023-04-22 15:52:26 +08:00
7e8b798c05
Gameflow ( #132 )
...
修复trigger的优先级bug
修复回合事件
2023-04-22 14:10:06 +08:00
d763929544
card_mark ( #124 )
...
试着增加了card_mark，如果顺利希望后续能在前端对@和@@整特效
例如@@开头的就是那种只有特定文字写在卡牌下方的标记牌
有个展望是和playermark类似，后续根据进入弃牌堆/进入其他区域/进入其他玩家手里决定是否删除对应mark。
同时本版本存在standard_card对AOE的一些修改，不过N神你之前要的那个恕我菜菜，合不起来···
2023-04-21 22:49:49 +08:00
cded53f261
ChangeLog: v0.1.3
2023-04-21 20:57:03 +08:00
ab4cfba7a3
Overview UI ( #130 )
...
优化了卡牌一览/武将一览的UI
2023-04-21 17:49:30 +08:00
f0212d54cf
Pattern ( #129 )
...
为Pattern增加了否定语法
优化几个类的__tostring元方法
增加调试器第三方库，编写调试文档
2023-04-21 04:29:52 +08:00
1b8447acbe
Fixbug ( #128 )
...
修倾国再点一下技能按钮会直接视为被取消
修服务端Log没有日期
修房间右上角没有轮数、对局时长、牌堆剩余牌数
修Linux上Log没有彩色字体
修短标记也会占用整整一行显示
修只有一张子卡的虚拟牌是无花色
修无花色牌不在牌面显示颜色
2023-04-20 00:19:48 +08:00
85923c8a71
Deputy general ( #127 )
...
增加双将机制
2023-04-19 14:07:16 +08:00
ba8aae852d
Fixbug ( #123 )
...
【杀】的residue_func无效bug
【顺手牵羊】的distance_limit_func无效bug
重铸的moveReason调整为置入弃牌堆
---------
Signed-off-by: Mechanel <nyutanislavsky@qq.com>
2023-04-18 12:57:09 +08:00
ce09673dcc
ChangeLog: v0.1.0
2023-04-15 12:40:07 +08:00
4d0d0c1d60
base lord skills ( #119 )
...
主公技
2023-04-15 12:06:24 +08:00
13b77e4c36
Enhancement ( #117 )
...
添加武将相关技能
添加武将中性和无性
Signed-off-by: Mechanel <nyutanislavsky@qq.com>
2023-04-13 22:01:25 +08:00
9ae119028c
Enhancement ( #116 )
...
给Card堆一个伤害牌属性
能添加虚拟牌为子卡
封装了“视为使用xx牌”的函数
护甲机制
interaction现在可以作为一个函数，以实现动态化
冰属性伤害
使用牌堆中的牌不再报错
2023-04-13 20:17:39 +08:00
a735013411
Fixbug ( #115 )
...
修流离锁定技
修斧子弃自己
修顺手空城卡死
修旁观者id是自己的
修旁观者再开新局就闪退（或许吧）
修拼点报nil
修询问无懈时旁观者被卡在外面
修Room的请求队列不清理干净
2023-04-12 22:28:19 +08:00
28436eb9d4
Comment ( #114 )
...
翻译注释/加注释
2023-04-12 20:51:09 +08:00
604e1d00b4
core_doc_20230412_0844 ( #113 )
...
general/gamemode/skill更新
Co-authored-by: YWSC120 <111111@163.com>
2023-04-12 13:28:01 +08:00
b4f6e58f07
Chat ( #112 )
...
增加聊天功能
修bug
2023-04-10 21:34:23 +08:00
90ad7fee5f
fix filterskill
2023-04-10 15:58:41 +08:00
533cc1a464
Card limitation ( #111 )
...
禁止使用打出弃置
Fk.currentResponseReason
FilterSkill加player参数
2023-04-10 15:55:06 +08:00
9a951fdbfe
Spdx license ( #109 )
...
在所有代码中添加了许可证标记头
2023-04-09 13:35:35 +08:00
b0c2855389
Enhancement ( #108 )
...
优化拖曳
牌局查看技能
狮子不给死人加血
GameEvent相关函数
觉醒技默认cost和锁定技一样
2023-04-09 11:44:19 +08:00
a51806f902
Fixbug2 ( #107 )
...
修了窃听移走装备不失去装备技能
询问无懈时减少CPU使用
将skill.interaction的数据传到服务器
自动清除诸如-round结尾的标记
增加了和 轮次流程 相关的游戏流程与时机
2023-04-08 20:45:55 +08:00
ed70e54cff
Fix syntax error in room.lua
2023-04-08 09:43:59 +08:00
c962f71c8f
Fixbug ( #104 )
...
修了觉醒技图标显示反的bug
修了流离报错bug
---------
Co-authored-by: RalphRad <121930519+RalphRad@users.noreply.github.com>
2023-04-08 09:32:51 +08:00
f1820bb07b
Lobby chat ( #103 )
...
大厅聊天
心跳包
服务端控制台踢人
2023-04-05 15:13:58 +08:00
46176e2477
Fixbug ( #102 )
...
修复了势力没有实际赋值给Player的bug
修复了装备牌图标的存放位置
增加了mod中拓展势力的支持（其实就是加载图的位置罢了）
2023-04-05 02:21:59 +08:00
4833d202b1
Wake limit ( #101 )
...
显示限定技标记的UI。
原理上也能显示觉醒技，我也做了显示觉醒技，但没测试。
转换技、使命技也是这样显示的，但先不提就是了，先合一发
2023-04-05 01:05:06 +08:00
09dd59bebf
Extra interaction ( #100 )
...
为主动技/视为技提供了自定义额外交互的能力
可以在交互时候进行额外的UI操作
以及提供了一个UI组件，总之参考谋徐盛
2023-04-05 00:49:54 +08:00
2e37b46234
Modify process & UI component ( #98 )
...
耦老周泰
点牌堆弹出牌
---------
Co-authored-by: Ho-spair <linyuy@163.com>
2023-04-04 16:25:37 +08:00
64f095d98f
Prompt ( #97 )
...
给好几个交互加个cancelable/prompt参数
把prompt美化了一下
2023-04-04 15:59:21 +08:00
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
95abdac88a
player_doc ( #93 )
...
增加了player.lua文档的注释
2023-04-01 23:06:55 +08:00
e4c806ff09
Doc2 ( #90 )
...
又写了一堆文档呢（乐
---------
Co-authored-by: deepskybird <32931830+deepskybird@users.noreply.github.com>
2023-03-29 23:27:11 +08:00
a1ae83c562
Sphinx doc ( #86 )
...
将文档系统改成Sphinx，并增加了新CI
2023-03-26 17:32:45 +08:00
dfe3e8b2e7
Qing gang sword & zhu que fan ( #85 )
...
- 完成【青釭剑】效果
- 初步完成技能失效技
- 完成【朱雀羽扇】
- 修改“连环状态”传导逻辑
- 修改八卦阵匹配的pattern
2023-03-20 20:49:23 +08:00
16b6800811
New cards ( #84 )
...
火攻
铁锁重铸
2023-03-20 20:15:24 +08:00
139464be14
UI ( #83 )
...
重写登陆界面UI和大厅UI
加入玩法一览界面
加入开屏动画
修bug
2023-03-20 14:53:56 +08:00
4ad61cf70f
exclude self and disabled generals from same generals
2023-03-19 02:28:09 +08:00
36fa1de360
Same general ( #82 )
...
同名武将替换功能
2023-03-19 02:21:45 +08:00
496598623d
update kingdom
2023-03-19 00:15:12 +08:00
fcddd36a6d
Fix more bug ( #81 )
...
修更多的bug，哪来那么多bug啊
2023-03-18 23:37:21 +08:00
5228991930
move card log (WIP) ( #80 )
...
移牌log
2023-03-18 15:35:44 +08:00
fd1a1ce5fd
Fixbug ( #79 )
...
修一大堆bug
2023-03-18 15:34:42 +08:00
49898eed46
Security ( #78 )
...
- 禁用了更多Lua函数
- 将计算MD5的过程挪到cpp
2023-03-14 20:50:36 +08:00
4ab14c7d74
Pindian&analeptic ( #77 )
...
Co-authored-by: notify <notify-ctrl@qq.com>
2023-03-14 20:48:08 +08:00
9b185c439d
Custom Packages When Creating Room ( #76 )
...
添加了创建房间时自选拓展包的功能
2023-03-14 14:12:13 +08:00
5f8a06e7df
change gamerule's logic to function
2023-03-14 01:21:09 +08:00
6ae86a1e3e
Gamemode ( #75 )
...
提供拓展游戏模式的接口
2023-03-14 00:12:02 +08:00
694deecdf1
Fixbug ( #74 )
...
- 修复ak和咆哮失效
- 修复服务端调viewAs的时候缺个Self
- 修复不能显示数字型标记
- 新函数player:gainAnExtraTurn，可用来进行额外回合
2023-03-13 20:51:12 +08:00
590af8cb14
Maneuvering ( #72 )
...
军争包还差火攻、酒、朱雀羽扇没做
铁索还没法重铸
除此之外还行
2023-03-09 12:19:16 +08:00
5488469ad6
Event ( #70 )
...
将执行回合和摸初始牌作为了“事件”
同时为事件添加了自定义清理函数（未经测试
2023-03-07 14:55:28 +08:00
861d87849a
Fixbug ( #69 )
...
修了很多bug 但我自己都不确定是不是修了
2023-03-07 10:21:56 +08:00
932914c62c
bagua and wushuang ( #65 )
...
* bagua and wushuang
* delete space
2023-03-06 01:07:54 +08:00
79389d9444
Expand pile ( #62 )
...
* fixbug: handcards in PlayerCardBox
* fix lightning
* fix translation
* gamelogic:getcurrentevent
* exppattern and pile
* complete pile
2023-03-05 01:28:59 +08:00
3e78466947
Interaction ( #61 )
...
* AG (WIP)
* fixbug: setemotion in windows
* room:askForCardsChosen
* fixbug: askForCardChosen
2023-03-01 21:41:16 +08:00
3f077a6d69
Rewrite event ( #60 )
...
* doc for gameevent
* init game event
* correct other yield call
* hp event
* dying event
* move card event
* use/response event
* judge event
* remove space
2023-03-01 01:43:44 +08:00
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
a579cf2a59
Ci: check space and LF ( #55 )
2023-02-26 16:51:29 +08:00
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
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
b2dfd69a16
Fixbug ( #51 )
...
* add translation for askforguanxing
* fix bug: observer will kill room that not take action
* fix bug: observe and reconnect
* fix bug: notifyCardMove
* fix bug: hegmony nullification
* fix bug: never show test generals in normal askforgeneral
* if game doesn't start, marshal() will only send simple information
2023-02-16 00:54:39 +08:00
3fe92b4344
standard equip skills ( #49 )
...
* install and uninstall equip skill
* complete pr; filter skill viewAs equip
---------
Co-authored-by: notify <notify-ctrl@qq.com>
2023-02-15 21:20:40 +08:00
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
c6d883eccf
Standard skills ( #48 )
...
* huatuo
* biyue
* gender of player
* let tablepile smaller
* card emotions
* remove getOtherPlayers
* guicai
* skill audio
* card audio
* death audio
* bgm
* damage sound
* local bgm
* add more skill audio
* android: dont link to quickcontrol2
* android: fix ifndef
* yield only when need
* modify cpp according to clazy
* reduce malloc times
* revert yield
* qingguo
* fix back to lobby
* use compact json in cpp
* notifySkillInvoke animation
* util: string2json
* losehp; tablepile fix
* judge result animation
* add scrollbar for logedit
* add lock on waitForReply
* fix: virtual jink has no effect
* tiandu
* fix: duplicated cards when related to equiparea
* ui: disable okcancel when replying
* ui: disable invaild card when responding
* game: skill & card use history
* game: more judge on vsskill's canUse
* luoyi
* login page i18n
* i18n for server error message
* tuxi
* expand equip area when needed
* add footnote to cards from pile
* ui: only filter CanUseCard when playing
* expand equip when responding
* prompt
* prompt for askforchoice
* guanxing
* fix guanxing
* tieqi
* liuli
* doc for trigger skill
* xiaoji
* lianying
* fanjian
* rende
* add skill's subclass
* TODO: add tmd skill functions for other cards
* paoxiao
* qicai
* guose
* yiji (WIP)
2023-01-29 18:11:41 +08:00
fd072ca0b4
Status skill and some skills ( #47 )
...
* prototype for 3 status skills
* maxcards skill
* attack range skill
* prohibit skill
* kongcheng
* use general's skill instead of default
* skills
2023-01-22 00:49:11 +08:00
a8cd7431ef
Reconnect ( #46 )
...
* 1
* room:delay and other coroutine
* yield in waitForReply
* fix stack overflow bug
* compress large message when transmiting
* delete useless func
* reconnect
* update doc for reconnect
2023-01-17 22:34:15 +08:00
2ab79a26fb
Better trigger ( #45 )
...
* set gamerule a refresh trigger skill
* cost and use of trigger skill
2023-01-16 21:04:28 +08:00
1dd9abda14
remove second getOtherPlayers() ( #43 )
2023-01-16 19:14:14 +08:00
b6530eae9d
Vs skill ( #44 )
...
* vs skill concept
* unify card:clone
* virtual card
* wusheng
* exppattern
* use virtual card(WIP)
* change cardId to card
* virtual card log
* notify skill invoked
* fix coroutine bug; allow vsskill to response
* extra_data for askForUseCard
Co-authored-by: Ho-spair <linyuy@163.com>
2023-01-16 19:13:07 +08:00
88d40018db
UI ( #42 )
...
* TileButton
* app icon
* about page
2023-01-12 22:53:22 +08:00
f34079e6c3
jieyin
...
jieyin and set gender
2023-01-09 19:15:18 +08:00
6121f7d66b
kurou
2023-01-08 14:57:42 +08:00
9f3c17b405
fix bug
2023-01-07 15:34:52 +08:00
fcb6ce89a4
fankui
...
fankui and fix some bugs
2023-01-07 15:20:44 +08:00
509cf29175
Distance skill ( #37 )
...
* global distance skill
* normal distance skill
* remove addGeneral from init.lua
* fixed distance
2023-01-04 14:21:29 +08:00
f434e9ee9b
prevent enter dying loop
2022-12-20 21:32:38 +08:00
2f9f13f74b
common tricks completed ( #35 )
...
* common tricks completed
* fix muti-targets tricks
2022-12-20 21:15:49 +08:00
dfa88df214
Delaytrick ( #34 )
...
* skip phase (not tested)
* Keep alive
* fix peach
* update
* fix move card
* indulgence
* lightning
* complete skip phase
2022-12-20 18:40:17 +08:00
0029949a40
Basiccard ( #33 )
...
* update nullification
* Slash
* kill player
* correct players to alive_players
* add log for changehp and dying
* usecard log & indicator
* setemotion, logevent
* fix distanceTo
* shutdown server when console start
* game over
* complete slash
* change format of flist.txt to avoid '\r\n'
* fix \r\n
* peach, zhiheng
* ask for peach
2022-12-20 12:51:54 +08:00
22235ee6ec
Jink&null ( #32 )
...
* rewrite toUtf8().data()
* jink, askforuse, askforresp
* nullification
2022-12-18 21:19:35 +08:00
a02410c282
Merge Dev ( #31 )
...
* splash screen when app is loading
* doRaceRequest
* prepare to add fkparse feature
* player mark operation
* dont call lua in regular room
* dont call lua in lobby
* clean up
* idle_room in Cpp's class Server
* fix many small bugs
* Security enhancement (#27 )
* use RSA encryption when sending password
* update fkp's url so other can clone it
* add salt to password
* save password
* fix default config bug
* fix room reuse bug
* disable empty usr name
* how to compile (#28 )
* add some doc
* how to compile
* update readme
* Actions (#29 )
* judge(not tested)
* logic of chat
* sendlog at most scenario
* adjust ui, add shortcuts
* ui, z axis of cardArea
* create server cli, improve logging
* basic shell using
* use gnu readline instead
* use static QRegularExp
* fix android build
* fix automoc problem
* MD5 check
* md5 check bugfix
* cardEffectEvent (#30 )
* cardEffectEvent
* add TODOs
* thinking
Co-authored-by: Ho-spair <62695577+Ho-spair@users.noreply.github.com>
2022-12-18 12:52:52 +08:00
7b12d82683
askForUseActiveSkill ( #26 )
...
* askForUseActiveSkill (not tested)
* askForDiscard
* askForChoosePlayers (not tested)
* add comment, update readme
2022-09-15 11:17:13 +08:00
Ho-spair
notify
Ho-spair
RalphRad
Nyutanislavsky
YoumuKon
deepskybird
jazuo