Commit Graph

60 Commits

Author SHA1 Message Date
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
Ho-spair 2f7d7d4a96
fix abort areas (#252)
Co-authored-by: Nyutanislavsky <nyutanislavsky@qq.com>
2023-08-13 12:35:23 +08:00
YoumuKon aa05984522
各种bug fix (#241)
- 修复只观顶时出错的bug
- 修复主公框和正常框有重复将的bug
- 添加getN,帮助获得数组前/后X项

---------

Co-authored-by: notify <notify-ctrl@qq.com>
2023-08-11 03:24:22 +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 24a8020d1e
bugfix (#240)
1. 修复旁观进入时的手牌无法查看
2. 修复武将牌上的牌
3. 主公选势力……
2023-08-03 20:34:43 +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
Nyutanislavsky acda9f4eb8
Choose kingdom (#226)
1. 封装选择势力
2. 修复可以选到主公副将

---------

Signed-off-by: Mechanel <nyutanislavsky@qq.com>
2023-07-16 19:17:03 +08:00
YoumuKon a812af8d97
bug fix和黑名单 (#223)
- 修复了旁观skill出错的bug
- 为模式和扩展包提供相互之间的黑/白名单
2023-07-14 22:17:54 +08:00
notify fd270a2edb
船新登陆界面 (#214)
* 修一些小bug
* 局域网检测
* 检测服务器数据
* 船新的登陆界面
2023-07-01 04:12:19 +08:00
YoumuKon 8a11690de7
无用空表Util.DummyTable化+若干bug fix+若干调整 (#189)
- 将一些作为替代选项的空表替换为Util.DummyTable
- 修复了控制失效bug
- 修复了askForCards的bug
- 为弃牌阶段弃牌禁止取消
- 谋徐盛血量变为100
- setMark追加count为0时设为nil的设定
- 各种国际化
- 观星盒追加旁边的牌堆名
2023-06-11 16:22:11 +08:00
xxyheaven d3aed7242a
fix bug (#187)
fix GameEvent:searchEvents
2023-06-10 20:54:48 +08:00
notify 713bbca17a
Recorder (#178)
提供了一个简单的事件记录器机制和一个功能简单的查询函数。
在GameEvent的clear环节中,先执行默认的clear函数,再执行用户自订的clear函数。
2023-06-09 01:10:16 +08:00
Ho-spair 1c6304f0f7
UI modify (#158)
- 实现移动场上一张牌;
- 实现用作记录牌名并可查看的mark;
- 将askForChoice和interaction的文本解析方式改为prompt;
- 新增属性将牌移至牌堆指定索引位置;
- 修改时机“游戏开始时”至正确位置;
- 优化衍生牌逻辑;
- 新增“卡牌展示后”时机。
2023-05-20 16:00:03 +08:00
Ho-spair a7e3ad0f19
Switch skill (#148)
- 实现转换技;
- 将特殊的标记名称注册在mark_enum.lua文件;
- 标记值在UI的显示支持解析数组;
- 将觉醒技的觉醒条件分离至canWake函数;
- 修复一系列bug;
- 在Room类新增从牌堆、弃牌堆中随机获取牌的方法。
2023-05-13 14:20:34 +08:00
Ho-spair 19a2cc5ed7
Initial kingdom choosing (#143)
- 实现副势力概念,用于应对双势力机制;
- 完善神将及拥有副势力的武将开局选择势力的机制;
- 完成势力技概念;
- 实现ViewAsSkill在响应时对使用和打出的区分。

---------

Co-authored-by: notify <notify-ctrl@qq.com>
2023-04-30 18:55:59 +08:00
notify fc8be0ad40
神貂蝉 (#138)
控制他人/一控多相关
2023-04-27 14:15:08 +08:00
notify a09023c487
Heg (#134)
国战雏形
2023-04-23 21:10:07 +08:00
notify 5888df6e7c
Zhuran (#133)
老朱然相关:终止结算、终止回合
执行新阶段
2023-04-22 15:52:26 +08:00
notify 7e8b798c05
Gameflow (#132)
修复trigger的优先级bug
修复回合事件
2023-04-22 14:10:06 +08:00
notify 85923c8a71
Deputy general (#127)
增加双将机制
2023-04-19 14:07:16 +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 28436eb9d4
Comment (#114)
翻译注释/加注释
2023-04-12 20:51:09 +08:00
notify 9a951fdbfe
Spdx license (#109)
在所有代码中添加了许可证标记头
2023-04-09 13:35:35 +08:00
notify b0c2855389
Enhancement (#108)
优化拖曳
牌局查看技能
狮子不给死人加血
GameEvent相关函数
觉醒技默认cost和锁定技一样
2023-04-09 11:44:19 +08:00
notify a51806f902
Fixbug2 (#107)
修了窃听移走装备不失去装备技能
询问无懈时减少CPU使用
将skill.interaction的数据传到服务器
自动清除诸如-round结尾的标记
增加了和 轮次流程 相关的游戏流程与时机
2023-04-08 20:45:55 +08:00
notify 46176e2477
Fixbug (#102)
修复了势力没有实际赋值给Player的bug
修复了装备牌图标的存放位置
增加了mod中拓展势力的支持(其实就是加载图的位置罢了)
2023-04-05 02:21:59 +08:00
notify 2e37b46234
Modify process & UI component (#98)
耦老周泰
点牌堆弹出牌

---------

Co-authored-by: Ho-spair <linyuy@163.com>
2023-04-04 16:25:37 +08:00
notify a1ae83c562
Sphinx doc (#86)
将文档系统改成Sphinx,并增加了新CI
2023-03-26 17:32:45 +08:00
notify 139464be14
UI (#83)
重写登陆界面UI和大厅UI
加入玩法一览界面
加入开屏动画
修bug
2023-03-20 14:53:56 +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 9b185c439d
Custom Packages When Creating Room (#76)
添加了创建房间时自选拓展包的功能
2023-03-14 14:12:13 +08:00
notify 5488469ad6
Event (#70)
将执行回合和摸初始牌作为了“事件”
同时为事件添加了自定义清理函数(未经测试
2023-03-07 14:55:28 +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 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
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 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
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 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
jazuo f34079e6c3 jieyin
jieyin and set gender
2023-01-09 19:15:18 +08:00
jazuo 6121f7d66b kurou 2023-01-08 14:57:42 +08:00
jazuo fcb6ce89a4 fankui
fankui and fix some bugs
2023-01-07 15:20:44 +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
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 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