Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-18 01:46:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate random point offsets

Browse Source
This commit is contained in:
AnimeGitB
2022-08-25 00:13:27 +09:30
parent 6098b51e4f
commit 9970aeb94d
5 changed files with 15 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/game/drop/DropSystem.java
View File

@@ -78,8 +78,8 @@ public class DropSystem extends BaseGameSystem {
}
if (itemData.isEquip()) {
for (int i = 0; i < num; i++) {
float range = (5f + (.1f * num));
Position pos = em.getPosition().clone().addX((float) (Math.random() * range) - (range / 2)).addY(3f).addZ((float) (Math.random() * range) - (range / 2));
float range = (2.5f + (.05f * num));
Position pos = em.getPosition().nearby2d(range).addY(3f);
addDropEntity(dd, em.getScene(), itemData, pos, num, gp);
}
} else {

5
src/main/java/emu/grasscutter/game/entity/gadget/GadgetGatherObject.java
View File

@@ -68,10 +68,7 @@ public class GadgetGatherObject extends GadgetContent {
scene,
player,
GameData.getItemDataMap().get(itemId),
getGadget().getPosition().clone()
.addY(2f)
.addX(Utils.randomFloatRange(-1f, 1f))
.addZ(Utils.randomFloatRange(-1f, 1f)),
getGadget().getPosition().nearby2d(1f).addY(2f),
1,
true);

2
src/main/java/emu/grasscutter/game/managers/blossom/BlossomActivity.java
View File

@@ -101,7 +101,7 @@ public class BlossomActivity {
for (int i = 0; i < willSpawn; i++) {
MonsterData monsterData = GameData.getMonsterDataMap().get(candidateMonsters.poll());
int level = scene.getEntityLevel(1, worldLevelOverride);
EntityMonster entity = new EntityMonster(scene, monsterData, pos.nearby2d(40), level);
EntityMonster entity = new EntityMonster(scene, monsterData, pos.nearby2d(4f), level);
scene.addEntity(entity);
newMonsters.add(entity);
}

6
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@@ -695,14 +695,14 @@ public class Scene {
return;
}
if (itemData.isEquip()) {
float range = (3f + (.1f * amount));
float range = (1.5f + (.05f * amount));
for (int i = 0; i < amount; i++) {
Position pos = bornForm.getPosition().clone().addX((float) (Math.random() * range) - (range / 2)).addZ((float) (Math.random() * range) - (range / 2)).addZ(.9f);
Position pos = bornForm.getPosition().nearby2d(range).addZ(.9f); // Why Z?
EntityItem entity = new EntityItem(this, null, itemData, pos, 1);
addEntity(entity);
}
} else {
EntityItem entity = new EntityItem(this, null, itemData, bornForm.getPosition().clone().addZ(.9f), amount);
EntityItem entity = new EntityItem(this, null, itemData, bornForm.getPosition().clone().addZ(.9f), amount); // Why Z?
addEntity(entity);
}
}