Commit Graph

54 Commits

Author SHA1 Message Date
YoumuKon 49e8849061
翻译+标记处理 (#205)
- 补齐翻译
- 将无限制标记移到判定函数
- askForUseCard缝入无限制标记,可以通过填标记实现用牌无次数/距离限制
2023-06-20 19:04:14 +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 1036159d38
Dev bugfix (#203)
- 修复泛转化牌的canUse炸锅的bug
- 未上场时显示新手保护

---------

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

- 修复了fk.currentresponsepattern = nil的时机
-
添加unlimited/withinTimesLimit和withinDistanceLimit,整合并实现真正的“无次数限制”/“无距离限制”
- 给观星框上了标题(暂时不往上加标题变量)
- 青龙刀会临时追加“对此人不限次数”+“对此人不限距离”的标记,响应(包括取消)后清除
- 添加了“对某人无次数/距离限制”的标记及对应两个global技能
2023-06-19 00:20:50 +08:00
YoumuKon 623007aca2
DetailComboBox等各种功能+bug fix (#192)
- 当你可用的武将数<玩家数*选将框数时发出警告(新禁/解禁(将/包)请退出重进)
- 修复人均克己的bug
- 修复帷幕能被挂闪的bug
- 为杀新增各种判定
- 添加AOE条件以修复无目标AOE的bug
- 延后Fk.currentResponsePattern = nil的时机,使视为技可以视为Fk.currentResponsePattern
- 主动技可以传更详细的ComboBox,谋徐盛现在会教你普通锦囊牌的用法
- 为防bug,由单挑王顶替小霸王的候补位
- 武将一览中没有翻译表的台词将设为空
- 新增exclusive_targets,可限定使用牌的目标(优先级高于一切目标筛选)
2023-06-15 21:19:57 +08:00
YoumuKon 7ef427d7ef
死亡音效查询修复+各种功能+i18n (#191)
- 迁移了死亡音效判定防止bug
- 牌种类/部分常见用语i18n
- 在线人数<10时会播放之前的登录/退出/重连信息
- askfordiscard禁止编辑已传入的maxNum/minNum
- getSuitString可以返回符号
- 添加getSuitCompletedString,可显示完整的**花色+点数**的完整点数
2023-06-14 13:40:50 +08:00
Ho-spair b2a963739b
Fix invalidity skill (#190)
- 修复技能失效技;
- 新增全局技能以令非锁定技失效仅使用标记即可实现。
2023-06-11 12:45:12 +08:00
Ho-spair 5ad2f870d5
fix bugs (#171) 2023-06-04 19:40:14 +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
notify 9519d1b9a7
Misc (#169)
- 扣上限心碎
- 进服维护的各种跟后端稳定性有关的代码
- 断线重连/旁观时候计入技能次数
- ban人和banip,相应的也有解禁
- 开房设置现在可以滑动
- 完善网络错误报错
- 现在开始游戏之前需要等待和所有人准备
- 指示掉线之人和走小道之人
- 掉线和走小道的人不再被AI接管
- 延时锦囊牌素材从拓展包找
- 拓展包管理界面UI优化,下载失败的包可以在管理拓展包中删除
2023-06-04 19:31:44 +08:00
notify a97f74450d Changelog: v0.2.0 2023-05-28 19:44:46 +08:00
Ho-spair 5128100083
modify process & quest skill (#166) 2023-05-28 18:45:54 +08:00
Ho-spair 1c6304f0f7
UI modify (#158)
- 实现移动场上一张牌;
- 实现用作记录牌名并可查看的mark;
- 将askForChoice和interaction的文本解析方式改为prompt;
- 新增属性将牌移至牌堆指定索引位置;
- 修改时机“游戏开始时”至正确位置;
- 优化衍生牌逻辑;
- 新增“卡牌展示后”时机。
2023-05-20 16:00:03 +08:00
notify 3dfff72836
新功能 (#141)
增加最大选将18
将退出房改为延迟按钮
修虚拟闪电bug
修看破bug
增加长度限制
将异步模块单独一个Lua
2023-04-30 18:51:05 +08:00
notify 7e8b798c05
Gameflow (#132)
修复trigger的优先级bug
修复回合事件
2023-04-22 14:10:06 +08:00
deepskybird d763929544
card_mark (#124)
试着增加了card_mark,如果顺利希望后续能在前端对@和@@整特效
例如@@开头的就是那种只有特定文字写在卡牌下方的标记牌

有个展望是和playermark类似,后续根据进入弃牌堆/进入其他区域/进入其他玩家手里决定是否删除对应mark。

同时本版本存在standard_card对AOE的一些修改,不过N神你之前要的那个恕我菜菜,合不起来···
2023-04-21 22:49:49 +08:00
notify ab4cfba7a3
Overview UI (#130)
优化了卡牌一览/武将一览的UI
2023-04-21 17:49:30 +08:00
Nyutanislavsky 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
Ho-spair 4d0d0c1d60
base lord skills (#119)
主公技
2023-04-15 12:06:24 +08:00
notify 9ae119028c
Enhancement (#116)
给Card堆一个伤害牌属性
能添加虚拟牌为子卡
封装了“视为使用xx牌”的函数
护甲机制
interaction现在可以作为一个函数,以实现动态化
冰属性伤害
使用牌堆中的牌不再报错
2023-04-13 20:17:39 +08:00
notify a735013411
Fixbug (#115)
修流离锁定技
修斧子弃自己
修顺手空城卡死
修旁观者id是自己的
修旁观者再开新局就闪退(或许吧)
修拼点报nil
修询问无懈时旁观者被卡在外面
修Room的请求队列不清理干净
2023-04-12 22:28:19 +08:00
notify b4f6e58f07
Chat (#112)
增加聊天功能
修bug
2023-04-10 21:34:23 +08:00
notify 9a951fdbfe
Spdx license (#109)
在所有代码中添加了许可证标记头
2023-04-09 13:35:35 +08:00
notify f1820bb07b
Lobby chat (#103)
大厅聊天
心跳包
服务端控制台踢人
2023-04-05 15:13:58 +08:00
notify 46176e2477
Fixbug (#102)
修复了势力没有实际赋值给Player的bug
修复了装备牌图标的存放位置
增加了mod中拓展势力的支持(其实就是加载图的位置罢了)
2023-04-05 02:21:59 +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
Ho-spair dfe3e8b2e7
Qing gang sword & zhu que fan (#85)
- 完成【青釭剑】效果
- 初步完成技能失效技
- 完成【朱雀羽扇】
- 修改“连环状态”传导逻辑
- 修改八卦阵匹配的pattern
2023-03-20 20:49:23 +08:00
notify 44c932981b fix chain bug 2023-03-20 20:28:25 +08:00
notify 16b6800811
New cards (#84)
火攻
铁锁重铸
2023-03-20 20:15:24 +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 590af8cb14
Maneuvering (#72)
军争包还差火攻、酒、朱雀羽扇没做
铁索还没法重铸
除此之外还行
2023-03-09 12:19:16 +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 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
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
Ho-spair 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
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
notify 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
notify 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
notify 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
notify 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
Ho-spair 2f9f13f74b common tricks completed (#35)
* common tricks completed

* fix muti-targets tricks
2022-12-20 21:15:49 +08:00
notify 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
notify 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
notify 22235ee6ec Jink&null (#32)
* rewrite toUtf8().data()

* jink, askforuse, askforresp

* nullification
2022-12-18 21:19:35 +08:00
notify 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
notify 162b3af505 Use skill (#25)
* distance & snatch

* distance & snatch - clean

* fix: client.alive_players

* room:askForCardChosen(todo: snatch)

* add skill to players(uncomplete)

* ui of skill btn

* expand pile(not completed)

* Use card2 (#23)

* snatch (todo: owner_map)

* owner_map

* remove too many snatch

* update

* call active skill's functions

* use zhiheng

* Qt6 (#24)

* use qt6

* android compiling

* remove version number of qml import

* correct anti-sql injection; update deprecated code

* add fkparse as submodule

* link fkparse, and write simple functions

* adjust ui

* adjust layout for photos; fix qml warning

* android problem fix (partially)

* move ico

* update copy_assets

* update logic for ok/cancel btn
2022-09-14 13:01:10 +08:00