Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-26 19:12:52 +08:00
Code Issues Projects Releases Wiki Activity
1,818 Commits 7 Branches 22 Tags 150 MiB
025e5d3c1c
Commit Graph

163 Commits

Author SHA1 Message Date
Melledy
fc16f9d694 Refactor out InsectCaptureManager 2022-07-21 00:21:00 -07:00
zhaodice
6c49fab137 Block loader (sort and merge gadgets into different blocks) (#1517) 
Original commits:

* block loader
* fix
* fix
* fix foolish bug
* add scales
* rename
* set to 600
* nitpick

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-07-18 19:43:55 +09:30
Melledy
7f898417b0 Fix a few null pointer issues. 2022-07-18 02:33:13 -07:00
GanyusLeftHorn
fbf80e7156 Fix crafting for mystic enhancement ores. 2022-07-11 16:07:19 +02:00
Akka
910008216f quest fix & personal line impl 2022-07-10 17:52:47 +09:30
GanyusLeftHorn
13a7f08665 Add character's specialty food. 2022-07-01 23:14:36 -07:00
GanyusLeftHorn
8484a535f4 Load recipe excels. 2022-07-01 23:14:36 -07:00
Akka
12146ff09c implement the music game 2022-06-29 05:23:02 -07:00
Akka
977f1ca2ea implement the activity system 2022-06-29 05:23:02 -07:00
zhaodice
2462da2ede Big World Resources Collection Implement (#1368) 
* init

* init

* init

* revoke

* fix error

* mining support

* mining support

* Roks endurance support

* Roks endurance support

* Timed refresh

* upgrade resource data

* Timed refresh support

* remove null gadget

* Coordination

* full synchronized

* oh no, my math teacher will hit me!

* synchronized onInteract

* remove break;

* supply re-spawn time , thanks to @wl23333

* Clean up and integrate collection spawns into SpawnDataEntries

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-06-29 04:53:50 -07:00
GanyusLeftHorn
b0d19e54db Implement selection chests for BP rewards. 2022-06-26 21:38:35 -07:00
KingRainbow44
19d81463bc Merge remote-tracking branch 'origin/development' into development 2022-06-26 12:33:03 -04:00
KingRainbow44
71b118dd9f Add a start and finish message to resource loading 2022-06-26 12:31:09 -04:00
KingRainbow44
2dcdb839c4 Move resource loading messages to the debug level 2022-06-26 12:26:39 -04:00
AnimeGitB
baafb4104c Remove GiveAll, GiveArt, GiveChar commands 2022-06-25 22:19:29 -07:00
GanyusLeftHorn
3ec2c4e21e Reset forge points every day to enable crafting of enhancement ores. 2022-06-24 17:51:30 -07:00
Melledy
a16bc72101 Implement weekly points for the battle pass 2022-06-24 07:34:24 -07:00
Melledy
5eb1d34b14 Implement battle pass triggers/rewards 2022-06-24 01:12:52 -07:00
Luke H-W
f04035da34 Merge branch 'development' into Weather 2022-06-24 00:47:14 +09:30
AnimeGitB
dcd3c696ea Add default Climates per weather 2022-06-22 22:41:07 +09:30
KingRainbow44
eed59e0d77 Fix filenames issue (pt. 2) 2022-06-22 00:21:46 -04:00
KingRainbow44
74cbad261d Fix filenames issue 2022-06-22 00:21:43 -04:00
诗音澄鸢 镜苑芳依
b9bf33c2f7 implement BattlePass (Except missions) (#1316) 
* BattlePass

* BattlePass
 2022-06-21 07:18:13 -07:00
Akka
706dc5e4c7 MonsterInvestigation (boss icon in map) 2022-06-18 08:04:06 -07:00
诗音澄鸢 镜苑芳依
79e4172c47 Fix daily dungeon didn't display in note(笔记) (#1296) 
* Fix Daily dungeon didn't display in note(笔记) -- Buggy

* 123
 2022-06-17 23:50:55 -07:00
Melledy
2915b14c1f 2.7 Merge 2022-06-17 23:36:16 -07:00
Melledy
30c7bb9443 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development 2022-06-17 23:35:45 -07:00
Akka
2d461641f1 a little fix 2022-06-17 18:15:49 -07:00
Akka
211d7d6fbf implement furniture make system 2022-06-17 18:15:49 -07:00
Akka
e16633e34b Implement the Home System (Serenitea Pot) 2022-06-17 18:15:49 -07:00
Melledy
ac49114c45 Add embryos for all skill depots for the main characters 2022-06-16 07:54:53 -07:00
saucebing
458aadc2ff fix healing ability of some characters to some extent (#1201) 
* fix healing ability of some characters to some extent

* using SerialName to replace replaceAll in avatar ability files reading

* add class HealAbilityManager

* move codes in onAbilityInvoke of class AbilityManager to class HealAbilityManager
 2022-06-14 04:36:53 -07:00
ImmuState
6e955c9fdb Implement Resin (#1257) 
* Basic resin usage/refresh.

* Honor resin config, move some logic to logon.

* Add resin usage to DungeonChallenge

* Make fragile and transient resin usable.

* Get resin cost from dungeon excel.

* Add ability to unlock combine diagrams.

* Refactor CombineManager to use Inventory.payItems, enabling crafting of condensed resin.

* Refactor ForgingManager to use Inventory.payItems, to prepare for eventually forging Mystic Enhancement Ores using resin.

* Remove comment

* Check resin usage in addResin
 2022-06-14 01:14:15 -07:00
ImmuState
c4ce6caeba Add alternate name for tranSceneId, and fix inconsistent indentation. 2022-06-11 19:42:11 -07:00
ImmuState
0cc4bad18c Obtain forging results (UI is broken though). 2022-06-08 05:43:38 -07:00
ImmuState
a668bd6ec1 Check materials and mora 2022-06-08 05:43:38 -07:00
ImmuState
5db5c90a8b Start a new forge (no checking for now). 2022-06-08 05:43:38 -07:00
ImmuState
e5498e373e Add handling for ForgeExcelConfigData. 2022-06-08 05:43:38 -07:00
ImmuState
f243c10157 Unlock forging blueprints. 2022-06-03 00:52:22 -07:00
zhaodice
01481fd524 Arresting small creature support (#1150) 
* Arresting small creature support

* add InsectCaptureManager

* use EnvAnimalGatherExcelConfigData.json

* Update InsectCaptureManager.java
 2022-06-03 00:51:51 -07:00
line-bear
52a3f95729 Fix starglitter/stardust exchange error (#1108) 2022-05-30 20:06:25 -07:00
Melledy
e9a7032c4d Fix weapon curve excels and camel case relic affix ecels 2022-05-30 20:06:25 -07:00
Melledy
ef6e16aaf5 Refactor WeaponType and MonsterType into enums 2022-05-30 20:06:25 -07:00
linebear
18df521347 Fix enter tower dungeons 2022-05-30 20:06:25 -07:00
Melledy
7cfa2b6c5b Fixed constellation issues from new binout 2022-05-30 20:06:25 -07:00
Melledy
3ee13b3b1e Fixed dungeon entries not working with new binout 2022-05-30 20:06:25 -07:00
Melledy
153280ea08 Fix quest data parser 2022-05-30 20:06:25 -07:00
Melledy
a23b29b65a Rename excel classes 2022-05-30 20:06:25 -07:00
Akka
5a3e9bc34e Fixed excessive memory usage of Spatial Index 2022-05-25 00:42:52 -07:00
Akka
d95708ec03 Support spawn NPC 2022-05-24 21:43:51 -07:00
ShiroSaki
2b799958d2 Refactor support for codex(aka archive) animal, weapon, reliquary 2022-05-23 02:46:50 -07:00
Akka
717c2d1dd7 Support Boss Chest 2022-05-19 23:36:13 -07:00
Melledy
1282e1388f Add error message in case data files in resources could not be found 2022-05-19 03:06:07 -07:00
Melledy
5429469852 Add error message in case data files in resources could not be found 2022-05-19 03:05:57 -07:00
Melledy
86dee4bae7 Fix dataloader not getting path correctly 2022-05-19 03:01:21 -07:00
Melledy
01987279b5 Fix dataloader not getting path correctly 2022-05-19 03:00:59 -07:00
Melledy
a088ea9b6b Fix dataloader with eclipse 2022-05-19 01:06:20 -07:00
Melledy
512021b234 Fix dataloader with eclipse 2022-05-19 00:10:02 -07:00
Melledy
fe4e599014 Merge branch 'development' into dev-world-scripts 2022-05-18 15:54:35 -07:00
Melledy
a48585d124 Implement local specialty spawning 2022-05-18 02:21:34 -07:00
4Benj_
f473e44611 "Autogenerate" data files with data fallbacks and moved keys folder into jar resources (#927) 
* Autogenerate keys and data files

* Update gacha html files

Accidentally pushed with old html files

* Keys no longer copied. No more manually retrieving listing files. Recursive directory creation

Removed unused code from old GC as well.

* Moved somethings and better errors

* Fixed resources from loading twice

* Data files fallback
 2022-05-17 03:00:52 -07:00
Melledy
eb64b25f12 Implement quest rewards 2022-05-15 03:48:47 -07:00
ShigemoriHakura
749ef3ff23 Add support for codexQuests (#870) 2022-05-13 16:33:07 -07:00
Melledy
a227b44c70 Fixed quests not finishing their questline 2022-05-13 06:24:50 -07:00
Melledy
631a53030c Switch to using quest excels 2022-05-13 03:12:25 -07:00
Melledy
1231802192 Implement basic quest condition handling 
Quests that require talking to npcs now work.
 2022-05-12 02:30:34 -07:00
Melledy
dfd8fcb250 Fix build error from merge 2022-05-11 04:01:38 -07:00
Melledy
51844b6535 Merge branch 'development' into dev-quests 2022-05-11 03:56:59 -07:00
Melledy
e9d7d5d5f2 Implement quests 2022-05-11 03:56:40 -07:00
KingRainbow44
11161227ab Convert to the far superior config system 2022-05-11 00:30:07 -04:00
Akka
9fc4b916c8 Persist Tower Data && Set The Tower Schedule 2022-05-08 06:06:32 -07:00
Melledy
897f082b12 Implement AbilityManager 2022-05-08 06:05:50 -07:00
cfuncode
0152b146c5 Improved fault tolerance for json file deserialization (#595) 
* 修复一个Gson发序列化json文件的空值问题

* Improved fault tolerance for json file deserialization
 2022-05-06 13:39:37 -07:00
Akka
c912b8d857 Choose Avatar & Enter Tower 2022-05-06 00:12:33 -07:00
memetrollsXD
81998b9cf9 Customise sender and title too. Add statement of use 2022-05-05 19:49:28 -07:00
Akka
3f34aa0460 Support of Enter Room Scene 2022-05-05 09:02:54 -07:00
Akka
48d1e026ef Add Support of Item Combine (#513) 
* Add Support of Item Combine

* Add Support of Item Combine

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-05-04 10:06:13 -07:00
Melledy
1b97b4afa0 Fixed dungeon challenge scoreboard and implement dungeon drops 
Also fixed a few dungeon script handlers
 2022-05-03 23:24:43 -07:00
xtaodada
86e6eef4e2 Support giftPackage BatchUse 
Co-authored-by: pris <lilch1022@hotmail.com>
 2022-05-03 02:29:04 -07:00
LDA
1d36fd8f2a load photo mode pose and expression fetters 2022-05-02 10:47:27 -07:00
xtaodada
7b591a2da0 implement shopMail giftPackage function 
Co-authored-by: Kinesis <CCasusensa@users.noreply.github.com>
 2022-05-02 02:50:24 -07:00
Melledy
3169e87c60 Fix constellations that give an extra charge to skills 
Fix #228
 2022-04-30 19:34:50 -07:00
Melledy
66c2743d6e Update how scene/dungeon map points are handled 2022-04-30 01:20:44 -07:00
Melledy
14b6d3ce55 Fix monster levels in dungeons 2022-04-29 01:03:16 -07:00
Melledy
60cfa40d7f Merge branch 'development' into dungeon-scripts 2022-04-28 22:21:26 -07:00
Melledy
d71b7abfc3 Implement script support needed for dungeons 
Only a few are supported right now
You will need certain script files in ./resources/Scripts
 2022-04-28 22:19:14 -07:00
memetrollsXD
31764fe5d9 Merge branch 'development' into startMail 2022-04-28 22:45:23 +02:00
memetrollsXD
5c02fee7e2 Customisable welcome mail 2022-04-28 22:42:59 +02:00
Kengxxiao
275fcc7dd6 shop improvement 2022-04-28 13:30:50 -07:00
Kengxxiao
0559cc4e0b official shop support 2022-04-28 13:30:50 -07:00
ayy lmao
0c02ce9f63 Implement HandlerVehicleInteractReq & Rsp and HandlerVehicleSpawnReq & Rsp 
Also added opcodes related to vehicles, added LODPatternName to GadgetData and added EntityVehicle class
 2022-04-28 21:21:08 +02:00
Melledy
53cc1822f6 Implement dungeon entry 2022-04-28 08:20:37 -07:00
Melledy
1c36f0785b Renamed all references to a certain game 2022-04-26 21:27:35 -07:00
WetABQ
addfb5eb5d [BREAKING CHANGE] proto auto compiled by gradle (#226) 
* [BREAK] proto auto compiled by gradle

* [BREAK] move proto to submodule

* update gitmodules

* [BREAK] move proto to submodule

* move proto to submodule

* fix merge conflict

* fix github action after merging

* fix merge conflicts and del submodule

* upload the proto
 2022-04-26 14:44:30 -07:00
Melledy
1c691748f5 Make monsters scale off world level 2022-04-25 14:28:45 -07:00
Melledy
711e6eabd0 Natural spawn test 
(without luas)
 2022-04-25 14:28:44 -07:00
Yazawazi
3baef42aac Name Card Done!!!!!!!!!!! 2022-04-23 23:48:06 +08:00
Yazawazi
3bc249f042 Try to give name card 2022-04-23 21:03:29 +08:00
Yazawazi
5ea5ea238c OpenCond for unlocking judgment 2022-04-23 10:51:22 +08:00
Yazawazi
7ccecda07c AvatarFetterLevelReward 2022-04-23 06:08:37 +08:00