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
fbf80e71
Commit
fbf80e71
authored
Jul 11, 2022
by
GanyusLeftHorn
Committed by
memetrollsXD
Jul 11, 2022
Browse files
Fix crafting for mystic enhancement ores.
parent
5e6a1f39
Changes
2
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/data/excels/ForgeData.java
View file @
fbf80e71
...
@@ -12,6 +12,7 @@ public class ForgeData extends GameResource {
...
@@ -12,6 +12,7 @@ public class ForgeData extends GameResource {
private
int
id
;
private
int
id
;
private
int
playerLevel
;
private
int
playerLevel
;
private
int
forgeType
;
private
int
forgeType
;
private
int
showItemId
;
private
int
resultItemId
;
private
int
resultItemId
;
private
int
resultItemCount
;
private
int
resultItemCount
;
private
int
forgeTime
;
private
int
forgeTime
;
...
@@ -66,6 +67,10 @@ public class ForgeData extends GameResource {
...
@@ -66,6 +67,10 @@ public class ForgeData extends GameResource {
return
materialItems
;
return
materialItems
;
}
}
public
int
getShowItemId
()
{
return
showItemId
;
}
@Override
@Override
public
void
onLoad
()
{
public
void
onLoad
()
{
}
}
...
...
src/main/java/emu/grasscutter/game/managers/forging/ForgingManager.java
View file @
fbf80e71
...
@@ -198,8 +198,9 @@ public class ForgingManager {
...
@@ -198,8 +198,9 @@ public class ForgingManager {
// Give finished items to the player.
// Give finished items to the player.
ForgeData
data
=
GameData
.
getForgeDataMap
().
get
(
forge
.
getForgeId
());
ForgeData
data
=
GameData
.
getForgeDataMap
().
get
(
forge
.
getForgeId
());
ItemData
resultItemData
=
GameData
.
getItemDataMap
().
get
(
data
.
getResultItemId
());
int
resultId
=
data
.
getResultItemId
()
>
0
?
data
.
getResultItemId
()
:
data
.
getShowItemId
();
ItemData
resultItemData
=
GameData
.
getItemDataMap
().
get
(
resultId
);
GameItem
addItem
=
new
GameItem
(
resultItemData
,
data
.
getResultItemCount
()
*
finished
);
GameItem
addItem
=
new
GameItem
(
resultItemData
,
data
.
getResultItemCount
()
*
finished
);
this
.
player
.
getInventory
().
addItem
(
addItem
);
this
.
player
.
getInventory
().
addItem
(
addItem
);
...
...
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