Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-22 20:04:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,239 Commits 7 Branches 22 Tags
9d10b81b9521c8f3c48b25964a526115ef713f48
Commit Graph

341 Commits

Author SHA1 Message Date
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
2e90e744d9 Fix stuck when talking to npc seller (#1128) 
* Fix zero length array check method

* Import grasscutter logger
 2022-05-31 02:42:16 -07:00
ImmuState
01910214fd Add energy generation probabilities to WeaponType. 2022-05-30 20:06:25 -07:00
Melledy
310ac82fa2 Refactor WeaponType and MonsterType into enums 2022-05-30 20:06:25 -07:00
ImmuState
1985ef6f07 Make NA/CA energy not scale with ER. 2022-05-30 20:06:25 -07:00
ImmuState
db2c0c47fd Make sure the hit target is actually a monster. 2022-05-30 20:06:25 -07:00
ImmuState
39b985b37c Add a rough implementation for NA/CA energy generation. 2022-05-30 20:06:25 -07:00
linebear
649d600fd5 Fix enter tower dungeons 2022-05-30 20:06:25 -07:00
Melledy
73fadfb767 Fix map mark issues from updating from 2.6 
Close #1086
 2022-05-30 20:06:25 -07:00
Melledy
8ef99db9d3 Rename excel classes 2022-05-30 20:06:25 -07:00
Yazawazi
91f8381fb1 [Anime Game Version update] Support 2.7 (#1072) 
* feature(2.7 version): support 2.7 version & upload new protos

1. Support GC in GI 2.7.0;
2. Upload new protos;
3. Fix some bugs cuz by new protos.

BREAKING CHANGE: all

* fix(database helper): fix player uid issues

* fix(ability embryo): uint32 to fixed32

* fix(proto): map mark

rename MAP_MARK_FROM_TYPE_NOE to MAP_MARK_FROM_TYPE_NONE

* fix(game version): change game version to 2.7.0

* perf(proto): remove unused protos

1. Remove unused protos;
2. Temporarily commented out some of the proto fields.

* fix(proto): uint32 to fixed32
 2022-05-30 20:06:25 -07:00
zhaodice
dc1741ce6d Hunting and deforestation support. (#1083) 
* add drops for animals wild pig,fishes,foxes,birds

* append fox

* Deforestation Support

implement drop woods when attacking tree

* Deforestation support (remove prints)

implement drop woods when attacking tree

* Deforestation support (remove prints)

implement drop woods when attacking tree

* add AutoRecycleHashMap

Map's KEY is automatic expire if key long time no use (query or modify from HashMap)

* use AutoRecycleHashMap in case of memory leak

* fix bug

* remove prints

* static AutoRecycleHashMap

* fix problems

* Delete AutoRecycleHashMap.java

* remove log

* fix build

* improve

* remove unnecessary information

Co-authored-by: Albedo <105265570+arub3do@users.noreply.github.com>

Co-authored-by: Albedo <105265570+arub3do@users.noreply.github.com>
 2022-05-29 06:16:49 -07:00
ImmuState
b504866d84 Make sure energy drops are only processed for actual monsters. 2022-05-27 23:48:54 -07:00
Melledy
141b1913cb Refactor accounts to not use a player uid 2022-05-27 00:22:55 -07:00
ProxyismGH
fc687a3bde TeamManager avatar add refactor. 2022-05-26 22:54:36 -07:00
ImmuState
cb2d6da2c5 Some refactoring. 2022-05-26 03:41:19 -07:00
ImmuState
35ad284c42 Introduce a simpler way to get the original owner of an EntityClientGadget 2022-05-26 03:41:19 -07:00
logictc
24dc2c47a6 remove debug msg 2022-05-25 21:10:10 -07:00
logictc
bdbdbd53b9 change indentation to tab 2022-05-25 21:10:10 -07:00
logictc
a5ab979418 fix indentation 2022-05-25 21:10:10 -07:00
logictc
eb5ff22464 implement skill particle generation 2022-05-25 21:10:10 -07:00
ImmuState
ef20177a6b Energy: Particle/Orb Drops from Monsters (#1054) 
* Generate energy drops for monsters + make sure picking up particles honors their count.

* Use drop info from excels instead.

* Remove double newline.

* Remove commented code.
 2022-05-24 21:43:04 -07:00
logictc
c45dd92ba5 don't take effect if energyUsage is false 2022-05-24 14:43:02 -07:00
logictc
40129ab346 clear energy on death 2022-05-24 14:43:02 -07:00
logictc
8f6f30c813 implement persist energy 2022-05-24 14:43:02 -07:00
ShiroSaki
74649f28f6 Fix new account can't load codex datas 2022-05-23 23:55:46 -07:00
ShigemoriHakura
ec7a6aec50 remove unused import 2022-05-23 15:46:21 -07:00
ShiroSaki
0d5dc5ec31 Fix the bug that can't kill command-generated monsters 
Command-generated monsters do not have spawnentry so we have to get data from getMonsterData
 2022-05-23 15:46:21 -07:00
ShiroSaki
3a39545e34 Refactor support for codex(aka archive) animal, weapon, reliquary 2022-05-23 02:46:50 -07:00
ImmuState
4cd6b799d2 Fix EnergyManager indentation. 2022-05-22 12:55:55 -07:00
ImmuState
c9cb13ac3a Make sure offFieldPenalty does not go below 0.1 2022-05-22 12:55:55 -07:00
ImmuState
419b3505e6 Remove debug stuff 2022-05-22 12:55:55 -07:00
ImmuState
bc3021fb20 Fix traveller not being able to gain energy. 2022-05-22 12:55:55 -07:00
ImmuState
42f5a66df7 Move energy-related logic to a new EnergyManager. 2022-05-22 12:55:55 -07:00
ImmuState
8aa0fde1cd Make energy usage configurable, and preserve current behavior as the default. 2022-05-22 12:55:55 -07:00
ImmuState
76880a5bf7 Make sure to use absolute energy to deplete burst. 2022-05-22 12:55:55 -07:00
ImmuState
542f37d0fb Give correct amount of energy for collecting particles/orbs, and consume energy on burst cast. 2022-05-22 12:55:55 -07:00
ImmuState
2f6beda8ff Generate energy particle of the correct element for abilities. 2022-05-22 12:55:55 -07:00
Няшик Няшный
c683effead Added banner start and end time checks 2022-05-20 05:51:44 -07:00
Няшик Няшный
b9eef26d8b Changing how banners work 2022-05-20 05:51:44 -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
xtaodada
003e28e3f8 Enhance the default permissions logic 2022-05-16 21:55:47 -07:00
line-bear
58df221c6d Remove the extra slash while loading resources. (#893) 
* Remove the extra slash

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Import java.nio.file.Paths to use Paths.get

* Mark fields as private to prevent use *FOLDER directly

* Remove unnecessary slash

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>
 2022-05-15 23:32:03 -07:00
Melledy
82775b4ff9 Implement quest rewards 2022-05-15 03:48:47 -07:00
muhammadeko
f1af23e8d6 Modify chat manager to give plugin ability to change it 2022-05-14 23:27:36 -07:00
tiantian520
f1b12ccf63 Add a new command "nostamina" (#877) 
* Add a new command " nostamina\

* Fix

* Fix 2

* Renamed some names.

* Update zh-CN.json

Fix an existing language expression error.
 2022-05-14 16:06:48 -07:00
KingRainbow44
c8c823b515 Fix errors 2022-05-14 12:10:43 -04:00
KingRainbow44
5c6fe7bb04 Merge development into plugin-auth 2022-05-14 12:08:33 -04:00
Melledy
46f16c6759 Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-14 06:35:37 -07:00