Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
b4aa6ef
feat: GetContainer() proof of concept
RobbeBryssinck Dec 23, 2021
f96ae17
feat: TESObjectREFR::AddItem()
RobbeBryssinck Dec 23, 2021
c5412d2
fix: deadlock issue with AddItem
RobbeBryssinck Dec 23, 2021
e1f7c94
tweak: null and vtables and pointers and stuff
RobbeBryssinck Dec 24, 2021
1110e42
feat: Actor::SetFullContainer()
RobbeBryssinck Dec 27, 2021
979cce9
Merge branch 'master' into feature-inventories
RobbeBryssinck Jan 22, 2022
efde771
tweak: updated TiltedReverse
RobbeBryssinck Jan 26, 2022
8935919
fix: build errors
RobbeBryssinck Jan 28, 2022
9094c8a
Merge branch 'master' into feature-inventories
RobbeBryssinck Jan 28, 2022
5fe6533
tweak: (de)serialize entries in Container struct
RobbeBryssinck Jan 28, 2022
395713a
tweak: added Container.cpp to the right folder
RobbeBryssinck Jan 28, 2022
b9751bf
tweak: further cleanup of TestService
RobbeBryssinck Jan 28, 2022
2695ed0
feat: successfully transfer inventory to dummy
RobbeBryssinck Jan 29, 2022
bdedb97
tweak: minor cleanup
RobbeBryssinck Feb 6, 2022
53c96cb
Merge branch 'master' into feature-inventories
RobbeBryssinck Feb 7, 2022
94d1dd6
Merge branch 'stability' into feature-inventories
RobbeBryssinck Feb 11, 2022
e52d8bf
fix: build error
RobbeBryssinck Feb 11, 2022
6b9264f
tweak: more hacks to make it not crash
RobbeBryssinck Feb 11, 2022
1ade122
tweak: properly handle no parsed ExtraData
RobbeBryssinck Feb 11, 2022
1c9be42
feat: sync enchantments
RobbeBryssinck Feb 11, 2022
57ed4f1
tweak: decoded EnchantmentItem struct
RobbeBryssinck Feb 11, 2022
0bc2e1b
feat: serializing custom enchantments
RobbeBryssinck Feb 12, 2022
bfdc267
fix: object, not a ptr
RobbeBryssinck Feb 12, 2022
ff9adeb
fix: forgot TESCondition
RobbeBryssinck Feb 12, 2022
001f176
tweak: properly send extra text stuff
RobbeBryssinck Feb 13, 2022
8a37d7b
tweak: improved enchantment sync
RobbeBryssinck Feb 14, 2022
ea8a9d5
tweak: dramatically cleaned up TESObjectREFR::AddItem()
RobbeBryssinck Feb 14, 2022
6bd8c51
fix: memory leak
RobbeBryssinck Feb 14, 2022
8f0cd0a
fix: build errors
RobbeBryssinck Feb 14, 2022
5af2c5a
tweak: moved container stuff to TESObjectREFR
RobbeBryssinck Feb 14, 2022
3bb8cae
tweak: network serialization for containers
RobbeBryssinck Feb 14, 2022
a0cb1f4
tweak: replaced old inventory infrastructure
RobbeBryssinck Feb 15, 2022
86319bc
fix: build fixes
RobbeBryssinck Feb 15, 2022
d2f4077
fix: serialization bugs
RobbeBryssinck Feb 17, 2022
5687a6e
tweak: restored lock
RobbeBryssinck Feb 17, 2022
de83841
tweak: EquipManager function calls
RobbeBryssinck Feb 17, 2022
7c9870b
tweak: enumerate calls to SetActorInventory()
RobbeBryssinck Feb 17, 2022
9c0b123
Merge branch 'stability' into feature-inventories
RobbeBryssinck Feb 22, 2022
bc7c73f
tweak: address lib for inventory stuff
RobbeBryssinck Feb 22, 2022
07f57c1
tweak: guard inventory change event hooks
RobbeBryssinck Feb 22, 2022
326e6bc
tweak: equip is done in Actor class
RobbeBryssinck Mar 6, 2022
c19b0f0
tweak: improved efficiency of inventory system
RobbeBryssinck Mar 9, 2022
d13b074
tweak: inventory system clean up
RobbeBryssinck Mar 9, 2022
53dcc69
tweak: further cleanup
RobbeBryssinck Mar 9, 2022
3800de2
Merge branch 'master' into feature-inventories
RobbeBryssinck Mar 9, 2022
28494fe
Merge branch 'master' into feature-inventories
RobbeBryssinck Mar 9, 2022
89b3099
Merge branch 'master' into feature-inventories
RobbeBryssinck Mar 10, 2022
3687b61
fix: SpellItem struct
RobbeBryssinck Mar 12, 2022
b614ba9
fix: temp fix for waiting spawn
RobbeBryssinck Mar 12, 2022
b63ce95
fix: health on remote actors going back up
RobbeBryssinck Mar 12, 2022
9c4e697
tweak: logging to debug new inventory system
RobbeBryssinck Mar 12, 2022
1f1b605
fix: permanent fix for waiting spawn
RobbeBryssinck Mar 12, 2022
b4fab96
fix: death bug
RobbeBryssinck Mar 12, 2022
6539d27
WIP: RemoveItem()
RobbeBryssinck Mar 14, 2022
f3c74ae
tweak: GetItemExtraData()
RobbeBryssinck Mar 14, 2022
b9a850b
tweak: refactored ugly c style casts
RobbeBryssinck Mar 14, 2022
c07cdb7
Merge branch 'master' into feature-inventories
RobbeBryssinck Mar 20, 2022
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
tweak: decoded EnchantmentItem struct
  • Loading branch information
RobbeBryssinck committed Feb 11, 2022
commit 57ed4f13cbf2896b2f8a5f1d550256c8f303e739
29 changes: 29 additions & 0 deletions Code/client/Games/Magic/MagicSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,35 @@ enum CastingType : int32_t
CASTING_COUNT = 0x3,
};

enum Delivery : int32_t
{
SELF = 0x0,
TOUCH = 0x1,
AIMED = 0x2,
TARGET_ACTOR = 0x3,
TARGET_LOCATION = 0x4,
DELIVERY_COUNT = 0x5,
};

enum SpellType : int32_t
{
SPELL = 0x0,
DISEASE = 0x1,
POWER = 0x2,
LESSER_POWER = 0x3,
ABILITY = 0x4,
POISON = 0x5,
ENCHANTMENT = 0x6,
POTION = 0x7,
WORTCRAFT = 0x8,
LEVELED_SPELL = 0x9,
ADDICTION = 0xA,
VOICE_POWER = 0xB,
STAFF_ENCHANTMENT = 0xC,
SCROLL = 0xD,
SPELL_TYPE_COUNT = 0xE,
};

}

namespace EffectArchetypes
Expand Down
6 changes: 6 additions & 0 deletions Code/client/Games/Skyrim/Forms/EnchantmentItem.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#include "EnchantmentItem.h"

void EnchantmentItem::Init(const Container::EnchantmentData& aData)
{

}
11 changes: 11 additions & 0 deletions Code/client/Games/Skyrim/Forms/EnchantmentItem.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,18 @@

#include "TESForm.h"

#include <Structs/Container.h>
#include <Games/Magic/MagicSystem.h>

struct EnchantmentItem : TESForm
{
void Init(const Container::EnchantmentData& aData);

MagicSystem::CastingType eCastingType;
int32_t iChargeOverride;
MagicSystem::Delivery eDelivery;
MagicSystem::SpellType eSpellType;
float fChargeTime;
EnchantmentItem* pBaseEnchantment;
void* pWornRestrictions;
};
5 changes: 5 additions & 0 deletions Code/encoding/Structs/Container.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ using TiltedPhoques::Vector;

struct Container
{
struct EnchantmentData
{
GameId EnchantmentId{};
};

struct Entry
{
GameId BaseId{};
Expand Down