mirror of
https://github.com/neoStudiosLCE/neoLegacy.git
synced 2026-07-06 08:27:02 +00:00
e17e26ff99
- Based fishing mechanics off of decompiled java 1.7.2 instead of 1.12. - Added check for sky access - Switching between different fishing rods now reels the line back in - Fixed duplicate assignment in fishingTreasuresArray - Remove testing weights from catchTypeArray - Make lureLevel and luckLevel member variables of FishingHook that are calculated upon initialization instead of recalculating every tick. - Changed random nibbleTimer range from 5 - 30 secs to 5 - 45 secs - Fixed out of order and incorrect assignments of fishingJunkArray - Values are now clamped to prevent unintended behavior - Lure now affects loot rates.
88 lines
2 KiB
C++
88 lines
2 KiB
C++
#pragma once
|
|
using namespace std;
|
|
#include "../Minecraft.World/WeighedTreasure.h"
|
|
#include "../Minecraft.World/ItemInstance.h"
|
|
#include "net.minecraft.world.item.h"
|
|
#include <unordered_map>
|
|
#include <memory>
|
|
|
|
|
|
enum CatchType {
|
|
FISH,
|
|
TREASURE,
|
|
JUNK
|
|
};
|
|
|
|
class CatchTypeWeighedItem : public WeighedRandomItem {
|
|
protected:
|
|
CatchType type;
|
|
int weight;
|
|
|
|
public:
|
|
CatchTypeWeighedItem(CatchType type, int weight) : WeighedRandomItem(weight)
|
|
{
|
|
this->type = type;
|
|
this->weight = weight;
|
|
}
|
|
|
|
CatchType getType()
|
|
{
|
|
return type;
|
|
}
|
|
|
|
void modWeight(int mod) {
|
|
// Modweight doesn't need clamping, this is done in FishingHook.cpp.
|
|
// randomWeight can be changed, weight stays the same. randomWeight is set equal to weight upon initialization.
|
|
this->randomWeight = this->weight + mod;
|
|
}
|
|
|
|
};
|
|
|
|
class CatchWeighedItem : public WeighedRandomItem {
|
|
protected:
|
|
int itemId;
|
|
int count;
|
|
int auxValue;
|
|
|
|
public:
|
|
CatchWeighedItem(int itemId, int count, int auxValue, int weight) : WeighedRandomItem(weight)
|
|
{
|
|
this->itemId = itemId;
|
|
this->count = count;
|
|
this->auxValue = auxValue;
|
|
}
|
|
int getItemId()
|
|
{
|
|
return this->itemId;
|
|
}
|
|
int getCount()
|
|
{
|
|
return this->count;
|
|
}
|
|
int getAuxValue()
|
|
{
|
|
return this->auxValue;
|
|
}
|
|
};
|
|
|
|
class FishingHelper
|
|
{
|
|
private:
|
|
FishingHelper();
|
|
|
|
WeighedRandomItemArray catchTypeArray;
|
|
|
|
WeighedRandomItemArray fishingFishArray;
|
|
WeighedRandomItemArray fishingJunkArray;
|
|
WeighedRandomItemArray fishingTreasuresArray;
|
|
|
|
CatchWeighedItem* getRandCatch(CatchType catchType, Random* random);
|
|
std::shared_ptr<ItemInstance> handleCatch(CatchWeighedItem* weighedCatch, CatchType catchType, Random* random);
|
|
CatchType getRandCatchType(int fishMod, int junkMod, int treasureMod, Random* random);
|
|
public:
|
|
// Setup singleton
|
|
FishingHelper(const FishingHelper&) = delete;
|
|
FishingHelper& operator=(const FishingHelper&) = delete;
|
|
static FishingHelper* getInstance();
|
|
std::shared_ptr<ItemInstance> getCatch(int fishMod, int junkMod, int treasureMod, Random* random);
|
|
}; |