Skip to content

Commit

Permalink
1.6 alpha + updated docs
Browse files Browse the repository at this point in the history
  • Loading branch information
StudioSyndiCatCaius committed Dec 3, 2024
1 parent f1b9a72 commit 0ebce5c
Show file tree
Hide file tree
Showing 802 changed files with 4,363 additions and 1,401 deletions.
8 changes: 8 additions & 0 deletions .vscode/OGF.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"folders": [
{
"path": ".."
}
],
"settings": {}
}
5 changes: 4 additions & 1 deletion OmegaGameFramework/Config/DefaultOmegaGameFramework.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[CoreRedirects]
+FunctionRedirects=(OldName="/Script/OmegaGameFramework.OmegaGameMode.local_activatePersistenSystems",NewName="/Script/OmegaGameFramework.OmegaGameMode.Local_ActivatePersistenSystems")
+PropertyRedirects=(OldName="/Script/OmegaGameFramework.OmegaGrid3D_Tile.REF_Occupants",NewName="/Script/OmegaGameFramework.OmegaGrid3D_Tile.Occupants")
+PropertyRedirects=(OldName="/Script/OmegaGameFramework.OmegaGrid3D_Tile.REF_Occupants",NewName="/Script/OmegaGameFramework.OmegaGrid3D_Tile.Occupants")
+PropertyRedirects=(OldName="/Script/OmegaGameFramework.DynamicProgressMeter.Progress",NewName="/Script/OmegaGameFramework.DynamicProgressMeter.Percent_Progress")
+PropertyRedirects=(OldName="/Script/OmegaGameFramework.DynamicProgressMeter.Percent",NewName="/Script/OmegaGameFramework.DynamicProgressMeter.Percent_Progress")
+PropertyRedirects=(OldName="/Script/OmegaGameFramework.DynamicProgressMeter.GhostPercent",NewName="/Script/OmegaGameFramework.DynamicProgressMeter.Percent_Ghost")
Binary file modified OmegaGameFramework/Content/Blueprints/Actors/OA_AutoMenu.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/Blueprints/Actors/OA_Chest.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/Blueprints/Actors/OA_Door.uasset
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/Blueprints/Actors/OA_MiniMount.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/Blueprints/Macros/mac_Trace.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Animation/AT_Idle.uasset
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Animation/Emotes/Emote_No.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Animation/Emotes/Emote_Sit.uasset
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Animation/Emotes/Emote_Yes.uasset
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Attributes/HP.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Attributes/Health.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Attributes/MP.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/DamageType/DT_c_Dark.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/DamageType/DT_c_Light.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/DamageType/DT_m_Earth.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/DamageType/DT_m_Fire.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/DamageType/DT_m_Water.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/DamageType/DT_m_Wind.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/DamageType/DT_p_bash.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/DamageType/DT_p_pirece.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/DamageType/DT_p_slash.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/DamageType/DT_x_physical.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Encounter/enc_Omega_Trash.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Equipment/EquipSlot_Armor.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Equipment/EquipSlot_Torso.uasset
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Equipment/EquipSlot_Weapon.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Flow/FN_DebugSwitch.uasset
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Flow/FN_Save_AssetTag.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/Input/Actions/OIA_UI_Confim.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified OmegaGameFramework/Content/DEMO/LinearEvents/LE_HUDLayers.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Lua.diagnostics.disable": [
"assign-type-mismatch"
]
}
19 changes: 15 additions & 4 deletions OmegaGameFramework/Content/DEMO/Lua/OmegaLua/Lib/lib_Hooks.lua
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
SynHook={}

local hook_list={}
hook_list={}

---Adds a hook call to your code. IF name = '__next', then it will automatically asign it the name of the next available integer in that hook list.
---@param hook string
---@param name string
---@param func function
function SynHook.Add(hook,name,func)
function SynHook.Add(hook,func,name)
--make hook if non existent
if not (hook_list[hook]) then
hook_list[hook]={}
end

if not (name) then
name=tostring(SynTable.key_length(hook_list[hook])+1)
end

hook_list[hook][name]=func
end

Expand All @@ -22,12 +28,17 @@ end

---@param hook string
function SynHook.Call(hook,meta)
local out
if hook_list[hook] then
print("Called Hook : "..hook.." with meta: "..tostring(meta))
for key, value in pairs(hook_list[hook]) do
print(" run hook event: "..key.." ")
value(meta)
local ret = value(meta)
if not ret==nil then
out=ret
end
end
end
return out
end

6 changes: 6 additions & 0 deletions OmegaGameFramework/Content/DEMO/Lua/OmegaLua/Lib/lib_Math.lua
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ SynMath={
if value < min then return min end
if value > max then return max end
return value
end,

-- random number. If in range of min, return true
RngBool=function (chance)
local val=math.random()
return SynLit.BOOL(val<=chance)
end
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
local a={}

a._config={
default_language='en'
}


--[[
Adds a new localization value to a single text field.
* IF the field is TABLE: Simply addes the now value key
* IF the field is STRING: converts the field to a table, with the string as the value for the ``default_language`` in ``_config``
]]

--- func desc
---@param field any
---@param injected_language string
---@param injected_text string
---@return table
a.Inject_SingleText=function (field,injected_language,injected_text)
if type(field)=='string' then
local sav_str=field
field={}
field[a._config.default_language]=sav_str
field[injected_language]=injected_text
elseif type(field)=='table' then
field[injected_language]=injected_text
end
return field
end



-- Localiztion Library
SynLoc=a
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ SynTable={}
Copy
]]

function SynTable.key_length(tbl)
local out=0
for key, value in pairs(tbl) do
out=out+1
end
return out
end


function SynTable.copy_shallow(original)
Expand Down
103 changes: 103 additions & 0 deletions OmegaGameFramework/Content/DEMO/Lua/OmegaLua/components/comps.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
local c={}

-- ==============================================
-- Attributes
-- ==============================================
c.Attributes=function ()
return {
attribute_values={},

GetValue_Base=function (self,attribute)
return 0
end,
GetValue_Max=function (self,attribute)
return 0
end,
GetValue_Current=function (self,attribute)
return 0
end,

DamageAttribute=function (self,attribute,damage_amount,meta)
self.attribute_values[attribute]=self:GetValue_Current(attribute)-damage_amount
end,
}
end

local att=c.Attributes()


-- ==============================================
-- Equipment
-- ==============================================
c.Equipment=function ()
return {
equipment={},

GetItemInSlot=function (self,slot)
return self.equipment[slot]
end,

EquipItem=function (self,item,slot)
self:UnequipSlot(slot)
self.equipment[slot]=item
end,

UnequipItem=function (self,item,all)
for key, value in pairs(self.equipment) do
if self:GetItemInSlot(key)==item then
self:UnequipSlot(key)
if not all then
return
end
end
end
end,

UnequipSlot=function (self,slot)
self.equipment[slot]=''
end,
}
end

local eq=c:Equipment()

eq:EquipItem('sword_1','weapon')

-- ==============================================
-- Equipment
-- ==============================================
c.Inventory=function ()
return {
items={},
GetItemAmount=function (self,item)
return SynLit.INT(self.items[item])
end,
AddItem=function (self,item,amount)
self.items[item]=self:GetItemAmount(item)+amount
end,
}
end


-- ==============================================
-- Turn Manager
-- ==============================================
c.TurnManager=function ()
return {
turn_order={},
combatants={},
NextTurn=function ()

end,
Generate_TurnOrder=function ()

end
}
end


local ev={
menu=function (options,postition,size,on_close)

end
}
21 changes: 14 additions & 7 deletions OmegaGameFramework/Content/DEMO/Lua/OmegaLua/main.lua
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
_={}
_C={} -- constants


if _D==nil then _D={} end -- Database:
_S={} -- Save: data save to the game file.
if _SAV==nil then _SAV={} end -- Save: data save to the game file.
COMP={} --Create Components
ALUA={}

_.ENGINE={
_C.ENGINE={
UE={
setup=function ()

Expand All @@ -19,9 +18,7 @@ _.ENGINE={
}
}



_.COLOR={
_C.COLOR={
White = "#FFFFFF",
Silver = "#C0C0C0",
Gray = "#808080",
Expand All @@ -42,3 +39,13 @@ _.COLOR={
}


SYN={
Math=SynMath,
File=SynFile,
Loc=SynLoc,
Hook=SynHook,
Table=SynTable,
String=SynString,
Parse=SynParse,
}

36 changes: 36 additions & 0 deletions OmegaGameFramework/Content/DEMO/Lua/OmegaLua/src/SYS_Cooking.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
local a={}


local _getSav=function ()
if _SAV.recipes==nil then
_SAV.recipes={}
end
return _SAV.recipes
end

a.CanCookItem=function (item)

end


a.Recipe_IsOwned=function (recipe)
return SynLit.BOOL(SynTable.has_value(_getSav(),recipe))
end

a.Recipe_SetOwned=function (recipe,owned)
if owned~=a.Recipe_IsOwned(recipe) then
if owned then
table.insert(_getSav(),recipe)
else
SynTable.remove_value(_getSav(),recipe)
end
end
end

a.Recipe_GetOwnedList=function ()
return _getSav()
end


_A.Cooking=a

46 changes: 46 additions & 0 deletions OmegaGameFramework/Content/DEMO/Lua/OmegaLua/src/SYS_Events.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
local active_events={}


local a={}


--- func desc
---@param event_sequence table
---@param end_callback function
---@return table
a.Play=function (event_sequence,end_callback)
return {
sequence=event_sequence,
current_event=1,

GetCurrent=function (self)
return self.sequence[self.current_event]
end,

Next=function (self)
if (self.sequence[self.current_event]) then
self.GetCurrent():ON_END(self)
end

local next_event=self.current_event+1

if (self.sequence[next_event]) then
self.current_event=next_event
self.GetCurrent():ON_START(self)
else
self.END('_FINISHED_')
end
end,

End=function (reason)
end_callback(reason)
end
}
end


_A.Event=a

-- ==========================================
-- Events
-- ==========================================
Loading

0 comments on commit 0ebce5c

Please sign in to comment.