Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-17 09:25:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,242 Commits 7 Branches 22 Tags
0e44d18ae94380a7dd6f1e034a25d02bd208ef5b
Commit Graph

124 Commits

Author SHA1 Message Date
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
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
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
717a358636 Format code [skip actions] 2023-09-02 00:33:12 +00:00
KingRainbow44
e04df0526a Run formatter & update protocol 2023-08-31 23:46:55 -04:00
KingRainbow44
58b3570f27 De-obfuscate definitions & run formatter 2023-08-31 19:29:31 -04:00
KingRainbow44
d43e5ca608 Compile scripts to replace require with script content 2023-08-31 01:09:53 -04:00
KingRainbow44
67c0e82dfb Logging changes (move levels down & add toString for some objects) 2023-08-30 23:28:54 -04:00
KingRainbow44
154ace3d7e Run formatter on code 2023-08-27 23:23:01 -04:00
KingRainbow44
aa3e23f5f3 Remove log for 'unimplemented' SetWeatherAreaState Lua function 2023-08-27 16:04:21 -04:00
KingRainbow44
1844cb43f7 Fix Lua require, Fix monster abilities & Fix ServerLuaCall 2023-08-27 02:39:56 -04:00
KingRainbow44
f656143038 Run the formatter & Generate protocol definitions 2023-08-26 19:51:45 -04:00
KingRainbow44
70eb0f2b16 Merge branch 'talking' into dev-4.0 2023-08-15 20:46:38 -04:00
KingRainbow44
8cac8d13f4 Run formatter & bump version 2023-08-14 18:53:23 -04:00
KingRainbow44
6a421336df Implement time axis 2023-08-13 19:01:08 -04:00
KingRainbow44
e7410a0be5 Semi-functional require handler implementation 2023-08-13 18:19:42 -04:00
KingRainbow44
0175e207af Fix errors in chasm 2023-08-13 18:01:41 -04:00
KingRainbow44
f2b81a70c8 Remove deprecated function 2023-08-13 16:22:41 -04:00
KingRainbow44
afc5841596 Add way to toggle certain spam logs 2023-08-12 22:16:41 -04:00
Nazrin
98fbc4e512 Improve Platforms (#2275) 
* Improve Platforms

* add this.
 2023-07-29 11:38:34 -04:00
github-actions
0005fcf96f Format code [skip actions] 2023-07-23 03:19:10 +00:00
github-actions
f065b2b16f Format code [skip actions] 2023-07-23 03:18:53 +00:00
Nazrin
47971dc931 various small bug fixes (#2270) 
* various small bug fixes

* Upgrade warning to error

* A few more state changes to match the others in this pull
 2023-07-22 23:17:59 -04:00
Nazrin
ddc082fc97 Everything triggers regions (#2271) 
* Everything triggers regions

* hotfix
 2023-07-22 23:17:33 -04:00
Nazrin
49ba0e55e8 make xxGroupVariableValueByGroup the same as xxGroupVariableValue (#2266) 2023-07-22 23:17:11 -04:00
KingRainbow44
f17339f1b6 Send global value packet after the scene host has finished initializing the scene 2023-07-14 23:03:49 -04:00
KingRainbow44
f0775f70f3 Send packet after scene load & Directly send back entity ID to clients 2023-07-14 21:22:45 -04:00
KingRainbow44
dfbe4022f3 Merge remote-tracking branch 'origin/development' into development 2023-07-14 19:47:56 -04:00
KingRainbow44
e859d87ae3 Implement SetEntityServerGlobalValueByEntityId 2023-07-14 19:46:30 -04:00
Nazrin
d62394e35e Remove obsolete code in ScriptLib.java (#2263) 2023-07-14 19:37:08 -04:00
pfyy
0d71d29932 fix first entering teapot failure (#2259) 2023-07-12 22:00:55 -04:00
github-actions
308686d9e7 Format code [skip actions] 2023-06-27 05:51:09 +00:00
Nazrin
83d447cfc2 Update region logic (#2240) 2023-06-27 01:49:24 -04:00
Nazrin
4ec274f5c5 Set event source for group variable changes to the variable name (#2231) 2023-06-25 10:45:37 -04:00
Nazrin
30d093f348 Update ScriptLib.java (#2227) 2023-06-24 00:37:13 -04:00
Nazrin
b58caf0632 Fix Librarian Story Quest (#2218) 
* Fix Librarian Story Quest

* People die if they are killed

You want to die people instead of remove them so they play their sweet death animations.

* Nope. I take it back. Scriptlib is the wierd one to think removeEntity removes the entity.

* One must stop editing the code directly.

* Update EntityType.java

* Add warnings per Hartie

* Per Hartie, change getEntityType to EntityType
 2023-06-20 16:37:00 -04:00
Magix
06d5bf7098 Temporary fix to scene reference 2023-06-17 11:24:46 -04:00
Nazrin
9d94888da3 Fix race condition with worktops (#2216) 
* Fix race condition with worktops

* Update ScriptLib.java

* Update ScriptLib.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-06-17 11:00:10 -04:00
Nazrin
6da5343df0 Do not unload groups asked for by quests (#2212) 2023-06-16 14:04:58 -04:00
dragon
248af4abfb Update VisionLevelType.java (#2207) 2023-06-13 11:27:24 -04:00
Nazrin
2788206934 Almost fully fix Chasing Shadows (#2202) 2023-06-10 23:31:57 -04:00
github-actions
4093420c90 Format code [skip actions] 2023-06-09 17:29:36 +00:00
Nazrin
e6d32f5599 Make ice dude show up (#2200) 
* Make ice dude show up

* replace contains with equals

Might as well fix this while I'm here.
"leave" and "enter" have the same number of letters, so it works.

* empty strings suck

* Update SceneTrigger.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-06-09 13:28:28 -04:00
KingRainbow44
f9dffba27a Merge remote-tracking branch 'origin/development' into development 2023-06-03 15:36:05 -04:00
StartForKiller
56f09e87a1 Fix ore dropping and implement subfields 2023-06-03 15:29:45 -04:00
github-actions
8fc17ede99 Format code [skip actions] 2023-06-03 16:43:21 +00:00
KingRainbow44
73e181df9b Merge remote-tracking branch 'origin/development' into development 2023-06-03 12:41:51 -04:00