Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-19 10:24:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/unstable' into unstable

Browse Source
This commit is contained in:
KingRainbow44
2023-05-23 19:35:51 -04:00
parent f1baaf5869 1d884dd05e
commit c0ad1bf75b
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/emu/grasscutter/scripts/data/SceneGadget.java
View File

@@ -6,9 +6,7 @@ import lombok.ToString;
@ToString @ToString
@Setter @Setter
public class SceneGadget extends SceneObject { public class SceneGadget extends SceneObject {
public int config_id;
public int gadget_id; public int gadget_id;
public int level;
public int chest_drop_id; public int chest_drop_id;
public int drop_count; public int drop_count;
public String drop_tag; public String drop_tag;
@@ -28,7 +26,6 @@ public class SceneGadget extends SceneObject {
*/ */
public boolean isOneoff; public boolean isOneoff;
public int area_id;
public int draft_id; public int draft_id;
public int route_id; public int route_id;
public boolean start_route = true; public boolean start_route = true;

2
src/main/java/emu/grasscutter/scripts/data/SceneMonster.java
View File

@@ -6,10 +6,8 @@ import lombok.ToString;
@ToString @ToString
@Setter @Setter
public class SceneMonster extends SceneObject { public class SceneMonster extends SceneObject {
public int config_id;
public int monster_id; public int monster_id;
public int pose_id; public int pose_id;
public int level;
public int drop_id; public int drop_id;
public boolean disableWander; public boolean disableWander;
public int title_id; public int title_id;