Commit Graph

41 Commits

Author SHA1 Message Date
YoumuKon a9b5d6cd98
更多bug fix (#232)
- 修复了 #229 整出来的bug
- 修复了禁止技被绕过的bug
- 查找事件结果包括端点

---------

Co-authored-by: notify <notify-ctrl@qq.com>
2023-08-02 23:01:28 +08:00
notify 8bfe087374 遗计,默认主公,修同名替换 2023-08-02 21:39:03 +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 c3fd8fc9a5
Bugfix (#206)
* 修cost_data
* 修cardMark,仍需自动清理措施
* 修锁视技( **重要!使用牌之前会根据锁视技重新决定使用的卡牌!!**)
2023-06-23 22:18:11 +08:00
notify 02e22024f2
Misc (#195)
- 调度器善后
- 修复可用不足警告
- 创房时可以全选或者反选
- 重连时候不可以重新开大
- 顶号
2023-06-16 13:26:02 +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
deepskybird 5a30c69085
player_doc更新 (#168)
更新文档注释,还请各位查阅。

Co-authored-by: YWSC120 <111111@163.com>
2023-06-03 23:59:04 +08:00
Ho-spair 0033cd6c07
ban generals (#146)
- 禁将功能
- 公告展示
2023-05-13 14:20:48 +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 a09023c487
Heg (#134)
国战雏形
2023-04-23 21:10:07 +08:00
notify 90ad7fee5f fix filterskill 2023-04-10 15:58:41 +08:00
notify 533cc1a464
Card limitation (#111)
禁止使用打出弃置
Fk.currentResponseReason
FilterSkill加player参数
2023-04-10 15:55:06 +08:00
notify 9a951fdbfe
Spdx license (#109)
在所有代码中添加了许可证标记头
2023-04-09 13:35:35 +08:00
notify a1ae83c562
Sphinx doc (#86)
将文档系统改成Sphinx,并增加了新CI
2023-03-26 17:32:45 +08:00
notify 4ad61cf70f exclude self and disabled generals from same generals 2023-03-19 02:28:09 +08:00
notify 36fa1de360
Same general (#82)
同名武将替换功能
2023-03-19 02:21:45 +08:00
notify 9b185c439d
Custom Packages When Creating Room (#76)
添加了创建房间时自选拓展包的功能
2023-03-14 14:12:13 +08:00
notify 6ae86a1e3e
Gamemode (#75)
提供拓展游戏模式的接口
2023-03-14 00:12:02 +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 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 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
notify 7b12d82683 askForUseActiveSkill (#26)
* askForUseActiveSkill (not tested)

* askForDiscard

* askForChoosePlayers (not tested)

* add comment, update readme
2022-09-15 11:17:13 +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
notify 5628e67a78 UI-adjust-1 (#20)
* better general card item

* translation for UI

* optimize size of general card PNGs

* make overviews 'singleton' (only create once)

* background, small bug fix

* init & lobby's roomlist

* gitignore for win deploy, fonts
2022-05-01 18:37:13 +08:00
notify dedde94643
Use card (#19)
* the process of using card (uncompleted)

* code style: tab is 2 spaces(not \t or 4 space)

* update lua54.dll to MinGW version(no cygwin1.dll required)

* basic ui logic

* ActiveSkill

* modidy ActiveSkill defaults

* todo: defaultEquipSkill

* client

* send use card to server

* playing phase, equip

Co-authored-by: Ho-spair <linyuy@163.com>
2022-04-30 15:27:56 +08:00
notify fd2d7b4d10
General & Cards overview (#18)
* adjust room list of the lobby

* add client lua func

* overviews

Co-authored-by: Notify-ctrl <notify-ctrl@qq.com>
2022-04-15 18:37:20 +08:00
Ho-spair 09e34cfef6
Gamecore 2 (#16)
* upgrade gamecore

* [Funtion] Room:moveCards() completed

* add some functions in Room

* fixup

* delete wrong files
2022-04-08 18:39:58 +08:00
Notify-ctrl 927c5f479b
gamerule:Turnstart (#12)
* add tag to room

* add switch statement(util.lua)

* using emmylua

* gamerule(..)

* turnOver

* add many events

* stop the room when deleting

Co-authored-by: Notify-ctrl <notify-ctrl@qq.com>
2022-04-02 21:39:44 +08:00
Notify-ctrl 4e25c032e6
Skill (#9)
* TriggerSkill

* update type comment

* events of phases

* lua annotation

* change style of enums

* clear lua stack

* multi lua_State at server side

* disable addPlayer when room is full or started

* logic:trigger

Co-authored-by: Notify-ctrl <notify-ctrl@qq.com>
2022-04-01 20:51:01 +08:00
Notify-ctrl 957fefe881
Cards (#8)
* more comment

* create standard card pack

* create card classes

* freekill -> fk

* fk_ex
2022-03-31 13:29:23 +08:00
Notify-ctrl a85f510c98 commit 2022-03-30 16:33:56 +08:00
Notify-ctrl 7fd127b849
Request (#7)
* cli

* add timeout for class Room

* request func, roomowner

* request

* corrent stupid Qml/JS

* chooseGenerals

* prepareForStart(part 1)

* fix require grammar
2022-03-30 14:14:40 +08:00
Notify-ctrl 58ea0ca80a
Role & Seat (#6)
* standard generals

* assignrole

* arrangeSeat

* fix bugs
2022-03-28 22:24:30 +08:00
Notify-ctrl 3dc95ebc49 Gamecore (#3)
* create some class

* create some base classes

* fixup

Co-authored-by: Ho-spair <linyuy@163.com>
2022-03-27 15:12:00 +08:00