Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
735f7653
Commit
735f7653
authored
Sep 02, 2022
by
AnimeGitB
Browse files
Fix elementless Traveler depotValue
parent
36585840
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/game/props/ElementType.java
View file @
735f7653
...
...
@@ -26,7 +26,7 @@ public enum ElementType {
@Getter
private
final
int
teamResonanceId
;
@Getter
private
final
FightProperty
curEnergyProp
;
@Getter
private
final
FightProperty
maxEnergyProp
;
@Getter
private
int
depotValue
;
@Getter
private
final
int
depotValue
;
@Getter
private
final
int
configHash
;
private
static
final
Int2ObjectMap
<
ElementType
>
map
=
new
Int2ObjectOpenHashMap
<>();
private
static
final
Map
<
String
,
ElementType
>
stringMap
=
new
HashMap
<>();
...
...
@@ -39,14 +39,19 @@ public enum ElementType {
}
private
ElementType
(
int
value
,
FightProperty
curEnergyProp
,
FightProperty
maxEnergyProp
)
{
this
(
value
,
curEnergyProp
,
maxEnergyProp
,
0
,
null
);
this
(
value
,
curEnergyProp
,
maxEnergyProp
,
0
,
null
,
1
);
}
private
ElementType
(
int
value
,
FightProperty
curEnergyProp
,
FightProperty
maxEnergyProp
,
int
teamResonanceId
,
String
configName
)
{
this
(
value
,
curEnergyProp
,
maxEnergyProp
,
teamResonanceId
,
configName
,
1
);
}
private
ElementType
(
int
value
,
FightProperty
curEnergyProp
,
FightProperty
maxEnergyProp
,
int
teamResonanceId
,
String
configName
,
int
depotValue
)
{
this
.
value
=
value
;
this
.
curEnergyProp
=
curEnergyProp
;
this
.
maxEnergyProp
=
maxEnergyProp
;
this
.
teamResonanceId
=
teamResonanceId
;
this
.
depotValue
=
depotValue
;
if
(
configName
!=
null
)
{
this
.
configHash
=
Utils
.
abilityHash
(
configName
);
}
else
{
...
...
@@ -54,11 +59,6 @@ public enum ElementType {
}
}
private
ElementType
(
int
value
,
FightProperty
curEnergyProp
,
FightProperty
maxEnergyProp
,
int
teamResonanceId
,
String
configName
,
int
depotValue
)
{
this
(
value
,
curEnergyProp
,
maxEnergyProp
,
teamResonanceId
,
configName
);
this
.
depotValue
=
depotValue
;
}
public
static
ElementType
getTypeByValue
(
int
value
)
{
return
map
.
getOrDefault
(
value
,
None
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment