Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Make pets behave more accurately to Live #1305

Draft
wants to merge 102 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
8270e0e
Working on pet bouncers
jadebenn Nov 18, 2023
a58ffcc
Merge branch 'DarkflameUniverse:main' into PetDigAnimFix
jadebenn Nov 18, 2023
5734ef8
initial dig functionality; need to clean up kruft
jadebenn Nov 19, 2023
a76ddd9
cleaned up kruft
jadebenn Nov 19, 2023
fc1ff50
Merge branch 'DarkflameUniverse:main' into PetFixes
jadebenn Nov 19, 2023
bd6f9a7
added imagination cost to digs
jadebenn Nov 19, 2023
76d3187
actually check if the player can afford to dig
jadebenn Nov 19, 2023
c8b624c
minor changes
jadebenn Nov 19, 2023
9b9b5bc
Merge branch 'DarkflameUniverse:main' into PetFixes
jadebenn Nov 19, 2023
e835eb3
Fixed pet emotes not playing
jadebenn Nov 19, 2023
81a54e7
Merge branch 'PetFixes' of https://github.com/jadebenn/DarkflameServe…
jadebenn Nov 19, 2023
23664c0
updated pet command functionality
jadebenn Nov 19, 2023
81d8c18
mission fix redo
jadebenn Nov 22, 2023
57a1c05
update loop cleanup
jadebenn Nov 22, 2023
1a6fb89
Merge branch 'DarkflameUniverse:main' into PetFixes
jadebenn Nov 22, 2023
74047bc
Working on pet bouncers
jadebenn Nov 18, 2023
119968a
initial dig functionality; need to clean up kruft
jadebenn Nov 19, 2023
86abbc1
cleaned up kruft
jadebenn Nov 19, 2023
b3762da
added imagination cost to digs
jadebenn Nov 19, 2023
e73b2bf
actually check if the player can afford to dig
jadebenn Nov 19, 2023
3f1f51f
minor changes
jadebenn Nov 19, 2023
1a74ed6
Fixed pet emotes not playing
jadebenn Nov 19, 2023
cb65de6
updated pet command functionality
jadebenn Nov 19, 2023
3f1468e
mission fix redo
jadebenn Nov 22, 2023
e4b3e22
update loop cleanup
jadebenn Nov 22, 2023
c598b57
Merge branch 'PetFixes' of https://github.com/jadebenn/DarkflameServe…
jadebenn Nov 25, 2023
55f857b
Merge branch 'DarkflameUniverse:main' into PetFixes
jadebenn Nov 25, 2023
93592c7
Merge branch 'DarkflameUniverse:main' into PetFixes
jadebenn Dec 10, 2023
1c01219
added some pet debug commands
jadebenn Dec 10, 2023
200d679
redone pet update loop
jadebenn Dec 11, 2023
5b738df
Further redid pet update loop
jadebenn Dec 12, 2023
a99f7a7
Re-implemented treasure dig handling
jadebenn Dec 13, 2023
68df8af
capitalization
jadebenn Dec 13, 2023
fd5ea75
added bone dragon treasure dig handling
jadebenn Dec 13, 2023
291fc83
added bone dragon treasure dig handling
jadebenn Dec 13, 2023
775e4fe
change AND priority
jadebenn Dec 13, 2023
2a4cfe3
function rename
jadebenn Dec 13, 2023
1b8f10f
added treasure dig menu prompts and help messages
jadebenn Dec 14, 2023
9953255
Update GameMessages.h
jadebenn Dec 14, 2023
2db76ae
Update GameMessages.cpp
jadebenn Dec 14, 2023
8f19aa9
minor gm formatting fix
jadebenn Dec 14, 2023
f5ca142
Update PetStatus enum to prep for bitset use
jadebenn Dec 14, 2023
668bebf
adding new pet flags
jadebenn Dec 15, 2023
054371d
added new pet bitflag system
jadebenn Dec 15, 2023
e01fbfc
restored header guards
jadebenn Dec 15, 2023
9add2c9
PetFlag system now functioning correctly
jadebenn Dec 15, 2023
1c7ce6e
updated CDClient pet data handling
jadebenn Dec 16, 2023
cecf065
Changed how pet data is loaded
jadebenn Dec 16, 2023
60e4813
Merge branch 'DarkflameUniverse:main' into PetFixes
jadebenn Dec 17, 2023
8c97271
Update treasure behavior
jadebenn Dec 17, 2023
b8449a1
Merge branch 'PetFixes' of https://github.com/jadebenn/DarkflameServe…
jadebenn Dec 17, 2023
2d3e03a
pet following and flag behavior improvements
jadebenn Dec 17, 2023
c6df078
comment cleanup
jadebenn Dec 17, 2023
60b3f3c
Merge branch 'main' into PetFixes
Dec 27, 2023
d7d5202
Merge branch 'DarkflameUniverse:main' into PetFixes
jadebenn Dec 27, 2023
6edd42d
pet bouncer minimum functionality
Dec 28, 2023
a4f0602
Merge branch 'main' into PetFixes
Dec 28, 2023
5f8f200
pet bouncers now bounce player upon pressing shift
Dec 28, 2023
b83e1bf
some further bouncer refinements
Dec 29, 2023
1ee5b64
Update PetComponent.h
jadebenn Jan 1, 2024
17753c5
Update PetComponent.h
jadebenn Jan 1, 2024
d5a0b71
Update PetComponent.cpp
jadebenn Jan 1, 2024
9a35aad
Merge branch 'DarkflameUniverse:main' into PetFixes
jadebenn Jan 1, 2024
c575fd9
Merge branch 'DarkflameUniverse:main' into PetFixes
jadebenn Jan 5, 2024
384083e
use reference instead of pointer for cdclient data
jadebenn Jan 5, 2024
0f365e0
Merge branch 'DarkflameUniverse:main' into PetFixes
jadebenn Jan 5, 2024
6c3c08c
Added fallback to default values if CDClient data cannot be loaded
jadebenn Jan 5, 2024
20d6820
Merge branch 'main' into PetFixes
jadebenn Jan 6, 2024
06d5a27
Merge branch 'DarkflameUniverse:main' into PetFixes
jadebenn Jan 6, 2024
d6321a6
Merge remote-tracking branch 'upstream/main' into PetFixes
jadebenn Feb 14, 2024
70e0cd6
more merge
jadebenn Feb 14, 2024
a449e53
delete unused functions and update documentation
jadebenn Mar 4, 2024
1c1b733
Merge remote-tracking branch 'upstream/main' into PetFixes
jadebenn Mar 4, 2024
c36bc83
fix pet taming minigame countdown
jadebenn Mar 4, 2024
9ec028b
Merge remote-tracking branch 'upstream/main' into PetFixes
jadebenn Mar 6, 2024
4791b31
use class enums
jadebenn Mar 6, 2024
9a9254b
Merge remote-tracking branch 'upstream/main' into PetFixes
jadebenn Mar 8, 2024
e832dfb
add most pet messages
jadebenn Mar 9, 2024
50b2074
Merge remote-tracking branch 'upstream/main' into PetFixes
jadebenn Mar 24, 2024
657fb35
semi update the unit tests
jadebenn Apr 1, 2024
0b4d7b6
Merge remote-tracking branch 'upstream/main' into PetFixes
jadebenn Apr 1, 2024
36e0dbd
load imagination costs for pet abilities from CDClient
jadebenn Apr 19, 2024
d88b982
Merge remote-tracking branch 'upstream/main' into PetFixes
jadebenn Apr 19, 2024
0b24532
clean up PetComponent
jadebenn Apr 20, 2024
6ddf5b3
remove unneeded tests
jadebenn Apr 20, 2024
5ddf4ce
fix unused expression
jadebenn Apr 20, 2024
f41321e
Use compile-time flag setting
jadebenn Apr 20, 2024
071c022
this commit may be kinda broke but I'm gonna push it to check something
jadebenn Apr 20, 2024
7b223d1
Revert "this commit may be kinda broke but I'm gonna push it to check…
jadebenn Apr 20, 2024
68bb51f
move the pet taming minigame start logic into a separate function
jadebenn Apr 20, 2024
fdd981c
Merge remote-tracking branch 'upstream/main' into PetFixes
jadebenn Apr 25, 2024
efc2cb6
Merge branch 'main' into PetFixes
jadebenn Dec 14, 2024
514732d
formatting & const
jadebenn Dec 15, 2024
43681b4
more formatting & const
jadebenn Dec 15, 2024
96f224c
move semantics
jadebenn Dec 15, 2024
0786986
partially address comments
jadebenn Dec 15, 2024
472f873
further address feedback
jadebenn Dec 15, 2024
f7bcbb0
no longer bad (you know it)
jadebenn Dec 15, 2024
d42351d
formatting nits
jadebenn Dec 15, 2024
79c26d9
misc
jadebenn Dec 17, 2024
eb59b5d
Merge remote-tracking branch 'upstream/main' into PetFixes
jadebenn Dec 18, 2024
e2ff3f9
Merge remote-tracking branch 'upstream/main' into PetFixes
jadebenn Jan 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cleaned up kruft
  • Loading branch information
jadebenn committed Nov 19, 2023
commit a76ddd9ae1b3ac9eee7184f70273f4fe7fcbb06c
3 changes: 1 addition & 2 deletions dGame/dComponents/BouncerComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ BouncerComponent::~BouncerComponent() {
void BouncerComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) {
outBitStream->Write(m_PetEnabled);
if (m_PetEnabled) {
LOG("NOPE.");
//outBitStream->Write(m_PetBouncerEnabled);
outBitStream->Write(m_PetBouncerEnabled);
}
}

Expand Down
13 changes: 2 additions & 11 deletions dGame/dComponents/SwitchComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,6 @@ void SwitchComponent::Update(float deltaTime) {
}
}

void SwitchComponent::OnUse(Entity* originator) {
LOG("YOU USED ME!");
m_Parent->TriggerEvent(eTriggerEventType::INTERACT, originator);

for (CppScripts::Script* script : CppScripts::GetEntityScripts(m_Parent)) {
script->OnUse(m_Parent, originator);
}
}

Entity* SwitchComponent::GetParentEntity() const {
return m_Parent;
}
Expand All @@ -135,8 +126,8 @@ void SwitchComponent::SetPetBouncer(BouncerComponent* value) {
m_PetBouncer = value;

if (value != nullptr) {
//m_PetBouncer->SetPetEnabled(true);
//petSwitches.push_back(this); //This seems to govern if pets can "see" this
m_PetBouncer->SetPetEnabled(true);
petSwitches.push_back(this);
}
}

Expand Down
2 changes: 0 additions & 2 deletions dGame/dComponents/SwitchComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ class SwitchComponent : public Component {

void Update(float deltaTime) override;

void OnUse(Entity* originator) override;

Entity* GetParentEntity() const;

void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) override;
Expand Down