Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Grasscutter
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
ziqian zhang
Grasscutter
Commits
b253e779
Commit
b253e779
authored
3 years ago
by
xtaodada
Committed by
Melledy
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Implement food heal function
Co-authored-by:
pris
<
lilch1022@hotmail.com
>
parent
765f569e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/emu/grasscutter/game/managers/InventoryManager.java
+11
-1
11 additions, 1 deletion
.../java/emu/grasscutter/game/managers/InventoryManager.java
src/main/java/emu/grasscutter/game/player/TeamManager.java
+25
-1
25 additions, 1 deletion
src/main/java/emu/grasscutter/game/player/TeamManager.java
with
36 additions
and
2 deletions
src/main/java/emu/grasscutter/game/managers/InventoryManager.java
+
11
−
1
View file @
b253e779
...
@@ -937,10 +937,20 @@ public class InventoryManager {
...
@@ -937,10 +937,20 @@ public class InventoryManager {
if
(
target
==
null
)
{
if
(
target
==
null
)
{
break
;
break
;
}
}
used
=
player
.
getTeamManager
().
reviveAvatar
(
target
)
?
1
:
0
;
used
=
player
.
getTeamManager
().
reviveAvatar
(
target
)
?
1
:
0
;
}
}
break
;
break
;
case
MATERIAL_NOTICE_ADD_HP:
if
(
useItem
.
getItemData
().
getUseTarget
().
equals
(
"ITEM_USE_TARGET_SPECIFY_ALIVE_AVATAR"
))
{
if
(
target
==
null
)
{
break
;
}
int
[]
SatiationParams
=
useItem
.
getItemData
().
getSatiationParams
();
used
=
player
.
getTeamManager
().
healAvatar
(
target
,
SatiationParams
[
0
],
SatiationParams
[
1
])
?
1
:
0
;
}
break
;
case
MATERIAL_CHEST:
case
MATERIAL_CHEST:
if
(
useItem
.
getRewardBoxId
()
>
0
)
{
if
(
useItem
.
getRewardBoxId
()
>
0
)
{
used
=
handleRewardBox
(
player
,
useItem
)
?
1
:
0
;
used
=
handleRewardBox
(
player
,
useItem
)
?
1
:
0
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/game/player/TeamManager.java
+
25
−
1
View file @
b253e779
...
@@ -457,7 +457,31 @@ public class TeamManager {
...
@@ -457,7 +457,31 @@ public class TeamManager {
return
false
;
return
false
;
}
}
public
boolean
healAvatar
(
Avatar
avatar
,
int
healRate
,
int
healAmount
)
{
for
(
EntityAvatar
entity
:
getActiveTeam
())
{
if
(
entity
.
getAvatar
()
==
avatar
)
{
if
(!
entity
.
isAlive
())
{
return
false
;
}
entity
.
setFightProperty
(
FightProperty
.
FIGHT_PROP_CUR_HP
,
(
float
)
Math
.
min
(
(
entity
.
getFightProperty
(
FightProperty
.
FIGHT_PROP_CUR_HP
)
+
entity
.
getFightProperty
(
FightProperty
.
FIGHT_PROP_MAX_HP
)
*
(
float
)
healRate
/
100.0
+
(
float
)
healAmount
/
100.0
),
entity
.
getFightProperty
(
FightProperty
.
FIGHT_PROP_MAX_HP
)
)
);
getPlayer
().
sendPacket
(
new
PacketAvatarFightPropUpdateNotify
(
entity
.
getAvatar
(),
FightProperty
.
FIGHT_PROP_CUR_HP
));
getPlayer
().
sendPacket
(
new
PacketAvatarLifeStateChangeNotify
(
entity
.
getAvatar
()));
return
true
;
}
}
return
false
;
}
public
void
respawnTeam
()
{
public
void
respawnTeam
()
{
// Make sure all team members are dead
// Make sure all team members are dead
for
(
EntityAvatar
entity
:
getActiveTeam
())
{
for
(
EntityAvatar
entity
:
getActiveTeam
())
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment