Merge branch 'development' into unstable

# Conflicts:
#	src/main/java/emu/grasscutter/data/GameData.java
#	src/main/java/emu/grasscutter/data/excels/monster/MonsterData.java
#	src/main/java/emu/grasscutter/data/excels/monster/MonsterDescribeData.java
#	src/main/java/emu/grasscutter/game/entity/EntityMonster.java
This commit is contained in:
KingRainbow44 2023-05-30 00:58:41 -04:00
commit d6b16f2111
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE

View File

@ -0,0 +1,24 @@
package emu.grasscutter.data.excels;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ResourceType(name = "MonsterSpecialNameExcelConfigData.json", loadPriority = LoadPriority.HIGH)
@EqualsAndHashCode(callSuper=false)
@Data
public class MonsterSpecialNameData extends GameResource {
@SerializedName(value = "specialNameId", alternate={"specialNameID"})
private int specialNameId;
@SerializedName(value = "specialNameLabId", alternate={"specialNameLabID"})
private int specialNameLabId;
private long specialNameTextMapHash;
@Override
public int getId() {
return specialNameId;
}
}