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
9133742e
Commit
9133742e
authored
3 years ago
by
Kengxxiao
Committed by
Melledy
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix companionship exp
my IDEA lint is not happy on my change
parent
7bacd8ab
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/inventory/Inventory.java
+3
-0
3 additions, 0 deletions
src/main/java/emu/grasscutter/game/inventory/Inventory.java
src/main/java/emu/grasscutter/game/managers/InventoryManager.java
+6
-21
6 additions, 21 deletions
.../java/emu/grasscutter/game/managers/InventoryManager.java
with
9 additions
and
21 deletions
src/main/java/emu/grasscutter/game/inventory/Inventory.java
+
3
−
0
View file @
9133742e
...
...
@@ -242,6 +242,9 @@ public class Inventory implements Iterable<GameItem> {
case
102
:
// Adventure exp
getPlayer
().
addExpDirectly
(
count
);
break
;
case
105
:
// Companionship exp
getPlayer
().
getServer
().
getInventoryManager
().
upgradeAvatarFetterLevel
(
player
,
getPlayer
().
getTeamManager
().
getCurrentAvatarEntity
().
getAvatar
(),
count
);
break
;
case
201
:
// Primogem
getPlayer
().
setPrimogems
(
player
.
getPrimogems
()
+
count
);
break
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/game/managers/InventoryManager.java
+
6
−
21
View file @
9133742e
...
...
@@ -23,23 +23,7 @@ import emu.grasscutter.game.player.Player;
import
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam
;
import
emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo
;
import
emu.grasscutter.server.game.GameServer
;
import
emu.grasscutter.server.packet.send.PacketAbilityChangeNotify
;
import
emu.grasscutter.server.packet.send.PacketAvatarPromoteRsp
;
import
emu.grasscutter.server.packet.send.PacketAvatarPropNotify
;
import
emu.grasscutter.server.packet.send.PacketAvatarSkillChangeNotify
;
import
emu.grasscutter.server.packet.send.PacketAvatarSkillUpgradeRsp
;
import
emu.grasscutter.server.packet.send.PacketAvatarUnlockTalentNotify
;
import
emu.grasscutter.server.packet.send.PacketAvatarUpgradeRsp
;
import
emu.grasscutter.server.packet.send.PacketDestroyMaterialRsp
;
import
emu.grasscutter.server.packet.send.PacketProudSkillChangeNotify
;
import
emu.grasscutter.server.packet.send.PacketProudSkillExtraLevelNotify
;
import
emu.grasscutter.server.packet.send.PacketReliquaryUpgradeRsp
;
import
emu.grasscutter.server.packet.send.PacketSetEquipLockStateRsp
;
import
emu.grasscutter.server.packet.send.PacketStoreItemChangeNotify
;
import
emu.grasscutter.server.packet.send.PacketUnlockAvatarTalentRsp
;
import
emu.grasscutter.server.packet.send.PacketWeaponAwakenRsp
;
import
emu.grasscutter.server.packet.send.PacketWeaponPromoteRsp
;
import
emu.grasscutter.server.packet.send.PacketWeaponUpgradeRsp
;
import
emu.grasscutter.server.packet.send.*
;
import
emu.grasscutter.utils.Utils
;
import
it.unimi.dsi.fastutil.ints.Int2IntMap
;
import
it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap
;
...
...
@@ -659,7 +643,7 @@ public class InventoryManager {
// Level up
upgradeAvatar
(
player
,
avatar
,
promoteData
,
expGain
);
}
public
void
upgradeAvatar
(
Player
player
,
Avatar
avatar
,
int
expGain
)
{
AvatarPromoteData
promoteData
=
GameData
.
getAvatarPromoteData
(
avatar
.
getAvatarData
().
getAvatarPromoteId
(),
avatar
.
getPromoteLevel
());
if
(
promoteData
==
null
)
{
...
...
@@ -668,14 +652,14 @@ public class InventoryManager {
upgradeAvatar
(
player
,
avatar
,
promoteData
,
expGain
);
}
public
void
upgradeAvatar
(
Player
player
,
Avatar
avatar
,
AvatarPromoteData
promoteData
,
int
expGain
)
{
int
maxLevel
=
promoteData
.
getUnlockMaxLevel
();
int
level
=
avatar
.
getLevel
();
int
oldLevel
=
level
;
int
exp
=
avatar
.
getExp
();
int
reqExp
=
GameData
.
getAvatarLevelExpRequired
(
level
);
while
(
expGain
>
0
&&
reqExp
>
0
&&
level
<
maxLevel
)
{
// Do calculations
int
toGain
=
Math
.
min
(
expGain
,
reqExp
-
exp
);
...
...
@@ -690,7 +674,7 @@ public class InventoryManager {
reqExp
=
GameData
.
getAvatarLevelExpRequired
(
level
);
}
}
// Old map for packet
Map
<
Integer
,
Float
>
oldPropMap
=
avatar
.
getFightProperties
();
if
(
oldLevel
!=
level
)
{
...
...
@@ -734,6 +718,7 @@ public class InventoryManager {
avatar
.
save
();
player
.
sendPacket
(
new
PacketAvatarPropNotify
(
avatar
));
player
.
sendPacket
(
new
PacketAvatarFetterDataNotify
(
avatar
));
}
public
void
upgradeAvatarSkill
(
Player
player
,
long
guid
,
int
skillId
)
{
...
...
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