Commit Graph

1890 Commits

Author SHA1 Message Date
github-actions
770a793c69 Format code [skip actions] 2023-12-14 05:36:30 +00:00
longfruit
c4402cc287
Fix some more dungeons (#2449)
* Monds weapon mats domain: Fix time between kill not refreshing
* Inaz husk domain: Fix broken domain challenge
    * `EVENT_ANY_MONSTER_LIVE` is likely sent on tick, not on create. See scene40801_group240801001.lua:
        1. `condition_EVENT_ANY_MONSTER_LIVE_1023` checks for mob 1008 to spawn AND for variable `challenge` to be 1
        2. Mob 1008 spawns during `action_EVENT_SELECT_OPTION_1003`, at `ScriptLib.AddExtraGroupSuite(context, 240801001, 2)`
        3. This spawn triggers `EVENT_ANY_MONSTER_LIVE` for mob 1008 but still fails the condition because `challenge` is still 0.
        4. `challenge` is set to 1 at the end of `action_EVENT_SELECT_OPTION_1003`. By now, `EVENT_ANY_MONSTER_LIVE` for mob 1008 no longer fires, causing the domain challenge to fail to start.
2023-12-14 00:34:50 -05:00
github-actions
cdb0dc560a Format code [skip actions] 2023-11-17 04:58:02 +00:00
longfruit
d8c3da8fcd
Handle mob summon and limbo state (#2432)
Mob summon: Something like Monster_Apparatus_Perpetual can summon helper mobs. Ensure these helpers actually get summoned and, on their defeat, possibly change the summoner's mob state. Like, temporarily enter weak state.
* Take summon tags from BinOutput/Monster/ConfigMonster_*.json and put them in SceneMonsterInfo
* Handle Summon action in ability modifiers from BinOutput/Ability/Temp/MonsterAbilities/ConfigAbility_Monster_*.json
* On summoner's kill, also kill the summoned mobs

Limbo state: Something like Monster_Invoker_Herald_Water should be invulnerable at a certain HP threshold. Like, shouldn't die when creating their elemental shield. Or, Monster_Apparatus_Perpetual's helper mobs shouldn't die before their summoner.
* Look through ConfigAbility (AbilityData in GC) like Invoker_Herald_Water_StateControl. If any AbilityModifier within specifies state Limbo and properties.Actor_HpThresholdRatio, account for this threshold in GameEntity::damage.
* Don't let the entity die while in limbo. They will be killed by other events.
2023-11-16 23:56:37 -05:00
github-actions
13c40b53a7 Format code [skip actions] 2023-11-10 02:57:50 +00:00
hamusuke
f1c1a84683
fix: NPE related to teapot when player logs in. (#2429)
* fix: NPE related to home when player logs in.

* fix: NPE related to home when player logs in.

* forgot to save player after fixing module id
2023-11-09 21:56:21 -05:00
github-actions
2bcbd41026 Format code [skip actions] 2023-11-09 02:16:38 +00:00
longfruit
0bbeaf254b
Fix tower mob level and hp scaling (#2430) 2023-11-08 21:15:10 -05:00
github-actions
1fac319eb2 Format code [skip actions] 2023-11-05 19:58:28 +00:00
longfruit
d224178a64
Only deduct energy when elemental burst actually fires (#2424) 2023-11-05 14:57:17 -05:00
github-actions
d461ee2eb3 Format code [skip actions] 2023-11-03 02:02:24 +00:00
longfruit
24874e7fba
Implement abyss defense objective (#2422) 2023-11-02 22:00:05 -04:00
github-actions
583a41ab2c Format code [skip actions] 2023-11-01 01:54:08 +00:00
longfruit
cf6fb275be
Add events to support scene group substitution (#2413)
* Add events to support scene group substitution

* make event members private with getter/setter

* delete stray unused var
2023-10-31 21:52:01 -04:00
github-actions
9b4ce34f4a Format code [skip actions] 2023-10-26 02:29:17 +00:00
longfruit
f86259a430
Fix some revives; improve dungeon exit flow (#2409) 2023-10-25 22:27:48 -04:00
github-actions
837e30e04b Format code [skip actions] 2023-10-19 13:19:46 +00:00
longfruit
f5703e5964
Fix mirror tower stages; fix tower time challenge and star scoring (#2406) 2023-10-19 09:18:12 -04:00
github-actions
bc8e7c21ce Format code [skip actions] 2023-10-17 05:42:17 +00:00
jie65535
b7a9d28f02
Fix reset tag without notification (#2405) 2023-10-17 01:41:24 -04:00
longfruit
770cd62370
Fix daily dungeon flow (#2398)
* Fix dungeon entry, daily changes, replay flow; fix Mond's weapon mats domain unlock

* add note to DungeonEntryToBeExploreNotify
2023-10-17 01:41:04 -04:00
github-actions
6745d1126e Format code [skip actions] 2023-10-14 16:11:33 +00:00
github-actions
0803618bf5 Format code [skip actions] 2023-10-14 16:10:31 +00:00
jie65535
cfc8a4866f
Add reset scene tag subcommand (#2403)
* Add reset scene tag subcommand

* Fix Control Flow
2023-10-14 12:10:16 -04:00
longfruit
fd75ba7b9b
Fix triggered Monster Tide spawn; fix Tower dungeon handoff (#2397)
* Abyss: Fix monster tide trigger; fix dungeon handoff

* back out unrelated changes
2023-10-14 12:08:49 -04:00
Nazrin
d32a75e980
Fix setPrevScene bug (#2396) 2023-10-07 00:40:36 -04:00
Nazrin
9a198bd231
Alphabetize and Format ScriptLib.java (#2395)
I deeply apologize to anyone who is trying to find the history of the code from before today.
2023-10-07 00:40:15 -04:00
github-actions
453dc9717d Format code [skip actions] 2023-10-02 14:58:22 +00:00
Nazrin
582d7af9c4
Send QUEST_COND_STATE_NOT_EQUAL and QUEST_COND_STATE_EQUAL on login (#2394) 2023-10-02 10:56:09 -04:00
Nazrin
cab3bfb5a7
Fix bug in quest cond state not equal (#2393)
* Fix bug in ConditionStateNotEqual.java

* Do the same fix for ConditionStateEqual.java
2023-10-02 03:25:35 -04:00
github-actions
cf574e99cb Format code [skip actions] 2023-10-01 05:41:41 +00:00
KingRainbow44
6e309b6fee
Merge remote-tracking branch 'origin/development' into development 2023-09-30 23:15:50 -04:00
KingRainbow44
a3fd10c3be
Fix NullPointerException when refilling an avatar with no skill depot 2023-09-30 18:09:40 -04:00
Nazrin
b6e7d69949
Send QUEST_COND_NONE on every login (#2386)
For players that enabled questing late
2023-09-25 19:30:33 -04:00
github-actions
5faf39d359 Format code [skip actions] 2023-09-23 17:45:57 +00:00
Nazrin
0dd95450b1
Bare-bones Hangouts implementation (#2384) 2023-09-23 13:44:31 -04:00
hamusuke
5ee4812ac5
fix: login too slow (#2380) 2023-09-20 21:23:08 -04:00
github-actions
ec2bfffdd1 Format code [skip actions] 2023-09-18 01:03:10 +00:00
github-actions
7f5059cb8f Format code [skip actions] 2023-09-18 01:03:02 +00:00
jie65535
43db7eba8f
tp to move directly in the same scene (#2375) 2023-09-17 21:01:21 -04:00
jie65535
ff6a51db30
Update position parameters to support rotation-based offsets (#2374) 2023-09-17 21:00:58 -04:00
github-actions
047feaf4aa Format code [skip actions] 2023-09-17 02:57:50 +00:00
github-actions
88315ec712 Format code [skip actions] 2023-09-17 02:57:38 +00:00
jie65535
fdad4218e7
Fix freeze on startup (#2368)
* DON'T load resources in static init!!!

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

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/tools/Tools.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-09-16 22:55:46 -04:00
jie65535
5f5e6c38b1
Add rotation to /spawn (#2372) 2023-09-16 22:55:25 -04:00
github-actions
92bd09eeed Format code [skip actions] 2023-09-16 23:00:20 +00:00
KingRainbow44
30f7580184
Merge remote-tracking branch 'origin/development' into development 2023-09-16 18:59:02 -04:00
KingRainbow44
65eaaa96f2
Apply changes from #2310 2023-09-16 18:58:36 -04:00
github-actions
70a961e167 Format code [skip actions] 2023-09-16 22:44:16 +00:00
KingRainbow44
dd78addc29
Fix ability modifier serialization 2023-09-16 18:36:16 -04:00
KingRainbow44
43467ebc85
Factor fight properties into healing calculation 2023-09-16 18:32:01 -04:00
github-actions
1f15d6219b Format code [skip actions] 2023-09-16 21:40:49 +00:00
Simplxs
fb0c2dbc84
Merge pull request #2341
* enableRandomEncryptSeed

* update config version

* Merge branch 'Grasscutters:development' into random-seed

* make the codes more beautiful

* move KahnsSort to algorithms

* rename variables

* Merge branch 'development' into random-seed
2023-09-16 14:38:39 -07:00
github-actions
b8f7aea168 Format code [skip actions] 2023-09-16 21:33:36 +00:00
github-actions
cf8092e8ba Update languages [skip actions] 2023-09-16 21:32:21 +00:00
Thoronium
0e44d18ae9
Better SceneTags (#2361)
* Add scene tag handling

* Move warns to debug

* Move to PlayerProgressManager

* Add success message

* Inline check

* Improve per-scene handling

* Update src/main/java/emu/grasscutter/command/commands/SetSceneTagCommand.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/command/commands/SetSceneTagCommand.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Fix types

* Small fix

* Update ScriptLib.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-09-16 17:31:59 -04:00
Magix
5bd8f532c1
i forgot to add ` 2023-09-16 17:23:54 -04:00
github-actions
ad62b6b11d Format code [skip actions] 2023-09-16 00:53:28 +00:00
github-actions
c9a43a5e98 Format code [skip actions] 2023-09-16 00:52:37 +00:00
hamusuke
5458d36102
fix: HomeModuleManager isnt ticked unless player changes module (#2365) 2023-09-15 20:51:16 -04:00
Nazrin
c4dbb6851b
Implement passJumpDungeon. Make dungeons kick you out to the correct scene (#2366) 2023-09-15 20:50:56 -04:00
github-actions
2643c6b3b7 Format code [skip actions] 2023-09-15 00:45:41 +00:00
Nazrin
84e1371499
Fixes for alchemy dude's quest part 2 (#2362)
* Make platforms able to reset

platforms apparently are able to run again once reaching the last point. As well, canceling a timer seems to return a 0, not a 1

* Fix Seelies

Added HandlerClientScriptEventNotify (shoutouts to Hartie!) and cleaned up the platform stuff in ScriptLib.

There is a problem with HandlerClientScriptEventNotify where the client seems to only pass 0 into param1 instead of the configId. I coded in a workaround, but someone with greater access to things should check up on what is going on
2023-09-14 20:44:30 -04:00
Nazrin
f955bb1e16
Little update to item giving handling (#2363)
* Little update to HandlerItemGivingReq.java

GIVING_METHOD_GROUP is used in cooking girl's quest

* Send the giving packet at the start of relogs, even if encountered before.

* Make item checking not exact

You can have more items in your inventory than what you are submitting.
2023-09-14 20:44:08 -04:00
hamusuke
2b64814534
fix: home worlds are ticked twice (#2360) 2023-09-14 01:22:29 -04:00
KingRainbow44
ea5ee075a7
Merge remote-tracking branch 'origin/development' into development 2023-09-13 21:03:44 -04:00
KingRainbow44
6108a3bb37
Handbook documentation & build flow fixes 2023-09-13 21:03:32 -04:00
TotallyNotOndre
4f62e484ad
Update ru-RU.json (#2356)
translation & typo
2023-09-12 11:56:31 -04:00
Thoronium
5fd31aece8
Fix home nulls (#2355)
* Add null checking

* Sanity check for moduleManager
2023-09-12 01:07:17 -04:00
github-actions
8de281d4da Format code [skip actions] 2023-09-10 23:21:44 +00:00
Nazrin
fbe2b138ee
Fixes for alchemy dude's quest (#2352)
* Add drops for gadgets

Gadgets only have drop_id when they are not chests (chest_drop_id). When drop_id is not set (0), handleChestDrop quickly exits

* Implement QUEST_COND_ITEM_GIVING_FINISHED

Took the oppertunity to Rename ContentFinishGivingItem to ItemGiving

* Store accept conditions like fail and finish content are

Took the oppertunity to clean up some old code as well

conditions are stored in QuestManager

* Update src/main/java/emu/grasscutter/game/quest/QuestManager.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Update ConditionItemGivingFinished.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-09-10 19:20:28 -04:00
Nazrin
47c96fd964
Regular ScriptLib update! (#2349)
* Regular ScriptLib update!

* Move RefreshGroup down to debug

* Update SetGadgetEnableInteract
2023-09-09 20:49:22 -04:00
github-actions
7845c54570 Format code [skip actions] 2023-09-09 03:07:29 +00:00
Nazrin
a9402f487f
Implement RegionShape.POLYGON and RegionShape.CYLINDER (#2348)
Also took the opportunity to sort them in order and use multiplication instead of pow.
2023-09-08 23:06:14 -04:00
github-actions
cdcdf924bd Format code [skip actions] 2023-09-08 03:35:28 +00:00
hamusuke
fc42f665a7
feat: implement teapot suite (#2344)
* feat: implement teapot suite

* fix: home animals, check respawn, etc

* fix: NPE and cancel summon events

* fix: forgot to send eventId also
2023-09-07 23:34:03 -04:00
github-actions
8db1f597ce Format code [skip actions] 2023-09-02 23:51:35 +00:00
KingRainbow44
c08ab19d84
Various removals of '&' for Javadoc to be happy 2023-09-02 19:49:38 -04:00
KingRainbow44
34589d0128
Merge remote-tracking branch 'origin/development' into development 2023-09-02 19:48:39 -04:00
github-actions
88d7be86da Format code [skip actions] 2023-09-02 23:06:00 +00:00
KingRainbow44
416ef56101
Bump down the plugin API version
nothing major was *removed*, meaning all existing v2 plugins should still work
2023-09-02 19:05:30 -04:00
KingRainbow44
ed0e89074b
Merge remote-tracking branch 'origin/development' into development 2023-09-02 19:04:09 -04:00
hamusuke
1894296ed4
fix: home transfer (#2327)
* fix: home transfer

* Update HomeSceneItem.java
2023-09-02 19:04:02 -04:00
KingRainbow44
69a223949b
Merge remote-tracking branch 'origin/development' into development 2023-09-02 19:02:41 -04:00
github-actions
f8fb6732de Format code [skip actions] 2023-09-02 15:55:11 +00:00
hamusuke
ed97201473
fix: arrangement of main house is duplicated even if player changes module (#2325)
* fix: arrangement of main house is duplicated even if player change module

* removeIf

* Update src/main/java/emu/grasscutter/game/home/GameHome.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-09-02 11:52:56 -04:00
github-actions
decf494234 Format code [skip actions] 2023-09-02 05:49:00 +00:00
github-actions
9c25060c78 Format code [skip actions] 2023-09-02 05:48:12 +00:00
hamusuke
a49f37edb3
feat: finish home avatar talk (#2328) 2023-09-02 01:47:06 -04:00
hamusuke
97138d8c84
feat: implement home animals (#2329) 2023-09-02 01:46:58 -04:00
KingRainbow44
314bccb7a2
Add command description for debug 2023-09-01 20:50:37 -04:00
github-actions
c1045103ed Format code [skip actions] 2023-09-02 00:37:43 +00:00
Moistcrafter
1831d5c81f
SerializedName MonsterSpecialName (#2331)
* SerializedName MonsterSpecialName

* uh add space back

* remove space

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-09-01 20:35:54 -04:00
github-actions
717a358636 Format code [skip actions] 2023-09-02 00:33:12 +00:00
hamusuke
0db69882a3
fix: sync home avatar costume (#2326) 2023-09-01 20:31:55 -04:00
KingRainbow44
12da46b5ee
Re-order troubleshooting info 2023-09-01 20:29:25 -04:00
Magix
6fc4859f31
Merge pull request #2313 from Grasscutters/dev-4.0
Upgrade to REL4.0.x
2023-08-31 22:05:36 -07:00
KingRainbow44
89efa35f83
Disable LOG_MISSING_ABILITY_HANDLERS 2023-09-01 00:52:30 -04:00
KingRainbow44
e04df0526a
Run formatter & update protocol 2023-08-31 23:46:55 -04:00
KingRainbow44
541433c01b
Merge remote-tracking branch 'origin/dev-4.0' into dev-4.0
# Conflicts:
#	src/main/java/emu/grasscutter/game/player/Player.java
#	src/main/java/emu/grasscutter/game/player/TeamManager.java
#	src/main/java/emu/grasscutter/game/world/Scene.java
2023-08-31 21:06:13 -04:00