Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-21 11:24:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,349 Commits 7 Branches 22 Tags
45438cd2a721e95befb15fe76bfb967793454983
Commit Graph

88 Commits

Author SHA1 Message Date
Melledy
45438cd2a7 2.7 Merge 2022-06-17 23:36:16 -07:00
Melledy
4501db1135 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development 2022-06-17 23:35:45 -07:00
Akka
89ba8f5d01 a little fix 2022-06-17 18:15:49 -07:00
Akka
d35ff068cf implement furniture make system 2022-06-17 18:15:49 -07:00
Akka
1c0d869ee5 Implement the Home System (Serenitea Pot) 2022-06-17 18:15:49 -07:00
Melledy
8fdf9bfddf Add embryos for all skill depots for the main characters 2022-06-16 07:54:53 -07:00
saucebing
f10dc1cf8d 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
ded7ce1dcf 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
52e9c05440 Add alternate name for tranSceneId, and fix inconsistent indentation. 2022-06-11 19:42:11 -07:00
ImmuState
5a58a0b765 Obtain forging results (UI is broken though). 2022-06-08 05:43:38 -07:00
ImmuState
8840f22bba Check materials and mora 2022-06-08 05:43:38 -07:00
ImmuState
aae799f9a7 Start a new forge (no checking for now). 2022-06-08 05:43:38 -07:00
ImmuState
4ffda39b12 Add handling for ForgeExcelConfigData. 2022-06-08 05:43:38 -07:00
ImmuState
9d10b81b95 Unlock forging blueprints. 2022-06-03 00:52:22 -07:00
zhaodice
87e7d225cd 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
d2288d4489 Fix starglitter/stardust exchange error (#1108) 2022-05-30 20:06:25 -07:00
Melledy
9e19a5c160 Fix weapon curve excels and camel case relic affix ecels 2022-05-30 20:06:25 -07:00
Melledy
310ac82fa2 Refactor WeaponType and MonsterType into enums 2022-05-30 20:06:25 -07:00
linebear
649d600fd5 Fix enter tower dungeons 2022-05-30 20:06:25 -07:00
Melledy
0453f387ac Fixed constellation issues from new binout 2022-05-30 20:06:25 -07:00
Melledy
ea980428bf Fixed dungeon entries not working with new binout 2022-05-30 20:06:25 -07:00
Melledy
eaee7cfeb2 Fix quest data parser 2022-05-30 20:06:25 -07:00
Melledy
8ef99db9d3 Rename excel classes 2022-05-30 20:06:25 -07:00
Akka
5d0610b6f2 Fixed excessive memory usage of Spatial Index 2022-05-25 00:42:52 -07:00
Akka
e1770b5a68 Support spawn NPC 2022-05-24 21:43:51 -07:00
ShiroSaki
3a39545e34 Refactor support for codex(aka archive) animal, weapon, reliquary 2022-05-23 02:46:50 -07:00
Akka
233b46b2f9 Support Boss Chest 2022-05-19 23:36:13 -07:00
Melledy
c2bf663554 Add error message in case data files in resources could not be found 2022-05-19 03:06:07 -07:00
Melledy
db8cbd4f83 Add error message in case data files in resources could not be found 2022-05-19 03:05:57 -07:00
Melledy
d418d4e3e6 Fix dataloader not getting path correctly 2022-05-19 03:01:21 -07:00
Melledy
f876470369 Fix dataloader not getting path correctly 2022-05-19 03:00:59 -07:00
Melledy
5e56b49320 Fix dataloader with eclipse 2022-05-19 01:06:20 -07:00
Melledy
89454726ac Fix dataloader with eclipse 2022-05-19 00:10:02 -07:00
Melledy
3902a5d744 Merge branch 'development' into dev-world-scripts 2022-05-18 15:54:35 -07:00
Melledy
17a273387e Implement local specialty spawning 2022-05-18 02:21:34 -07:00
4Benj_
ead0df336e "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
82775b4ff9 Implement quest rewards 2022-05-15 03:48:47 -07:00
ShigemoriHakura
44456e2868 Add support for codexQuests (#870) 2022-05-13 16:33:07 -07:00
Melledy
00ffbea451 Fixed quests not finishing their questline 2022-05-13 06:24:50 -07:00
Melledy
608c379afe Switch to using quest excels 2022-05-13 03:12:25 -07:00
Melledy
d8c30d5680 Implement basic quest condition handling 
Quests that require talking to npcs now work.
 2022-05-12 02:30:34 -07:00
Melledy
26575561d6 Fix build error from merge 2022-05-11 04:01:38 -07:00
Melledy
9351127fe1 Merge branch 'development' into dev-quests 2022-05-11 03:56:59 -07:00
Melledy
285405cee4 Implement quests 2022-05-11 03:56:40 -07:00
KingRainbow44
6894ab8aae Convert to the far superior config system 2022-05-11 00:30:07 -04:00
Akka
916b7412fd Persist Tower Data && Set The Tower Schedule 2022-05-08 06:06:32 -07:00
Melledy
6d1ef0d841 Implement AbilityManager 2022-05-08 06:05:50 -07:00
cfuncode
2b58d69534 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
696f629080 Choose Avatar & Enter Tower 2022-05-06 00:12:33 -07:00
memetrollsXD
2dc6a48403 Customise sender and title too. Add statement of use 2022-05-05 19:49:28 -07:00