1
0
Fork 0

It's Green Tea Time!

This commit is contained in:
Akira Olivia Pink 2025-08-03 16:47:59 -03:00
parent b002803158
commit c592d7ad08
156 changed files with 9890 additions and 5259 deletions

2
.obsidian/app.json vendored
View file

@ -1,4 +1,4 @@
{
"readableLineLength": true,
"readableLineLength": false,
"showLineNumber": true
}

View file

@ -5,7 +5,7 @@
"textFontFamily": "Inter,Work Sans,Inter Frozen,Aptos Narrow,Averia Libre,B612,Minecraft Seven v2",
"monospaceFontFamily": "Aptos Mono",
"theme": "system",
"baseFontSize": 16,
"baseFontSize": 15,
"baseFontSizeAction": true,
"nativeMenus": false,
"enabledCssSnippets": [

View file

@ -170,14 +170,19 @@
},
"active": "9838d81e3d14d8d7",
"lastOpenFiles": [
"3d_models/MyAkizets_2025-07-24.zip",
"3d_models/MyAkizet_2025-07-24.zip",
"writings/SharedCollective/Story Overture.md",
"writings/SharedCollective/Story Overture (copy).md",
"writings/SharedCollective/Obesk Embassy.md",
"writings/SharedCollective/Federal Bureau of Xenorelations.md",
"writings/SharedCollective/Missy's Talk - Life, Identity, Death.md",
"writings/SharedCollective/Mandarin Labs.md",
"writings/Linux Distro Recommendation Masterpost.md",
"3d_models/akira/model 4.13/avatar.png",
"pixel_art/controlstrip_genders.aseprite",
"drawings/junk/akirapink_AuroraBorealisConcept.xcf",
"drawings/akirapink_sharedcollective_higordon.aseprite",
"writings/SharedCollective/Story Overture (copy).md",
"writings/SharedCollective/Story Overture.md",
"pixel_art/HypnOS/hypnospace_system.png",
"pixel_art/akirapink_pmd_the_bad_guy_rev300.aseprite",
"drawings/rw_moon_a little beast!_rev02.xcf",
@ -187,11 +192,7 @@
"pixel_art/akirapink_pmd_the_bad_guy.aseprite",
"memes/akirapink_c_ob_fbx_horrorbasement.png",
"drawings/akirapink-FWD-astra_underscore-astraverse.aseprite",
"drawings/net_Akirapink_ppdat.aseprite",
"TH.md",
"writings/SharedCollective/Obesk Embassy.md",
"writings/SharedCollective/Missy's Talk - Life, Identity, Death.md",
"writings/SharedCollective/Federal Bureau of Xenorelations.md",
"README.md",
"drawings/com_azuamdeline_sonadrawing.png",
"3d_models/akira/akiracombined.png",

View file

@ -0,0 +1,181 @@
-- V3
local items = {}
local function getItem(item,itemid)
return item.id:find(itemid) or item:getName():find(itemid)
end
local function isPlaying(equip,unequip)
return (equip and equip:isPlaying()) or (unequip and unequip:isPlaying())
end
local complexList = {}
function events.render(_,ctx)
vanilla_model.RIGHT_ITEM:setVisible(true)
vanilla_model.RIGHT_ITEM:setVisible(true)
for _, value in pairs(complexList) do
if value.right then
vanilla_model.RIGHT_ITEM:setVisible(ctx == "FIRST_PERSON" or false)
end
if value.left then
vanilla_model.LEFT_ITEM:setVisible(ctx == "FIRST_PERSON" or false)
end
end
end
---@param itemtype string
---@param extrapart? ModelPart | table
---@param firstpart ModelPart
---@param thirdpartright ModelPart | table
---@param thirdpartleft ModelPart | table
---@param rightequip? Animation
---@param rightunequip? Animation
---@param leftequip? Animation
---@param leftunequip? Animation
---@param rightholding? Animation
---@param leftholding? Animation
function items:complexReplace(itemtype,extrapart,firstpart,thirdpartright,thirdpartleft,rightequip,rightunequip,leftequip,leftunequip,rightholding,leftholding)
if type(itemtype) ~= "string" then
error("Provided item to replace is not a string",2)
end
if type(firstpart) ~= "ModelPart" then
error("Provided first person part isn't a modelpart",2)
end
if type(thirdpartright) ~= "ModelPart" and type(thirdpartright) ~= "table" then
error("Provided third person right hand part isn't a modelpart or a table",2)
end
if type(thirdpartleft) ~= "ModelPart" and type(thirdpartleft) ~= "table" then
error("Provided third person left hand part isn't a modelpartor a table",2)
end
complexList[itemtype] = {}
if rightequip then rightequip:setLoop("ONCE") end
if rightunequip then rightunequip:setLoop("ONCE") end
if leftequip then leftequip:setLoop("ONCE") end
if leftunequip then leftunequip:setLoop("ONCE") end
local expart = type(extrapart) == "table" and extrapart or {extrapart}
local rpart = type(thirdpartright) == "table" and thirdpartright or {thirdpartright}
local lpart = type(thirdpartleft) == "table" and thirdpartleft or {thirdpartleft}
firstpart:setParentType("Item")
events.item_render:remove(itemtype.."Complex")
events.item_render:register(
function(item,mode)
if getItem(item,itemtype) and mode:find("FIRST") then
return firstpart
end
end,
itemtype.."Complex")
local oldrighthold
local oldlefthold
events.entity_init:remove(itemtype.."Complex")
events.entity_init:register(
function()
local lefty = player:isLeftHanded()
oldrighthold = getItem(player:getHeldItem(lefty),itemtype)
oldlefthold = getItem(player:getHeldItem(not lefty),itemtype)
end,
itemtype.."Complex")
events.render:remove(itemtype.."Complex")
events.render:register(
function(delta,context)
local lefty = player:isLeftHanded()
local righthold = getItem(player:getHeldItem(lefty),itemtype)
local lefthold = getItem(player:getHeldItem(not lefty),itemtype)
complexList[itemtype].right = righthold or false
complexList[itemtype].left = lefthold or false
local rightequipping = isPlaying(rightequip,rightunequip)
local leftequipping = isPlaying(leftequip,leftunequip)
for _,ex in pairs(expart) do
ex:setVisible((not (righthold or lefthold)) or rightequipping or leftequipping)
end
for _, right in pairs(rpart) do
right:setVisible(righthold or rightequipping and context~="FIRST_PERSON")
end
for _,left in pairs(lpart) do
left:setVisible(lefthold or leftequipping and context~="FIRST_PERSON")
end
if rightholding then
rightholding:setPlaying(righthold and not rightequipping)
end
if leftholding then
leftholding:setPlaying(lefthold and not leftequipping)
end
local newrighthold = righthold
if oldrighthold ~= newrighthold then
for _, right in pairs(rpart) do
right:setVisible(oldrighthold)
end
for _,ex in pairs(expart) do
ex:setVisible(newrighthold)
end
if rightequip then rightequip:setPlaying(newrighthold) end
if rightunequip then rightunequip:setPlaying(oldrighthold) end
end
oldrighthold = newrighthold
local newlefthold = lefthold
if oldlefthold ~= newlefthold then
for _,left in pairs(lpart) do
left:setVisible(oldlefthold)
end
for _,ex in pairs(expart) do
ex:setVisible(newlefthold)
end
if leftequip then leftequip:setPlaying(newlefthold) end
if leftunequip then leftunequip:setPlaying(oldlefthold) end
end
oldlefthold = newlefthold
end,
itemtype.."Complex")
return self
end
---@param itemtype string
---@param newparts ModelPart
---@param extrapart? ModelPart | table
---@param righthold? Animation
---@param lefthold? Animation
function items:simpleReplace(itemtype,newparts,extrapart,righthold,lefthold)
if type(itemtype) ~= "string" then
error("Provided item to replace is not a string",2)
end
if newparts then newparts:setParentType("Item") end
events.item_render:remove(itemtype.."Simple")
events.item_render:register(
function(item)
if getItem(item,itemtype) then
return newparts
end
end,
itemtype.."Simple")
if not (extrapart or righthold or lefthold) then return self end
local part = type(extrapart) == "table" and extrapart or {extrapart}
events.tick:remove(itemtype.."Simple")
events.tick:register(
function()
local lefty = player:isLeftHanded()
local rightI = player:getHeldItem(lefty)
local leftI = player:getHeldItem(not lefty)
for _, value in pairs(part) do
value:setVisible(not (getItem(rightI,itemtype) or getItem(leftI,itemtype)))
end
if righthold then righthold:setPlaying(getItem(rightI,itemtype)) end
if lefthold then lefthold:setPlaying(getItem(leftI,itemtype)) end
end,
itemtype.."Simple")
return self
end
return items

File diff suppressed because it is too large Load diff

View file

@ -8,7 +8,8 @@ vanilla_model.CAPE:setVisible(false)
vanilla_model.ELYTRA:setVisible(false)
animations.akira_eiko_olivia_pink.sit_emote:setBlendTime(2)
example:addAllOverrider(animations.akira_eiko_olivia_pink.spyglog)
example:addAllOverrider(animations.akira_eiko_olivia_pink.spyglog2)
example:addAllOverrider(animations.akira_eiko_olivia_pink.attackL)
example:addAllOverrider(animations.akira_eiko_olivia_pink.attackR)
@ -151,15 +152,29 @@ exampleKey.press = function()
pings.examplePing(bladeHeld)
end
function events.item_render(item)
if item:getName()=="Rose Gold Rapier" or bladeHeld then
function events.item_render(item, mode)
if item:getName():find("Rose Gold Rapier") or bladeHeld then
return models.akira_eiko_olivia_pink.ItemRapier
else if item:getName()=="Pool Noodle" then
else if item:getName():find("Pool Noodle") then
return models.akira_eiko_olivia_pink.ItemNoodle
end
end
end
--[[ The Horror Terror
function events.item_render(item, mode)
if item:getName():find("Rose Gold Rapier") then
return models.akira_eiko_olivia_pink.ItemRapier
else if item:getName():find("Rose Gold Rapier") and mode:find("GUI") then
return textures.akira_eiko_olivia_pink.rose_gold_rapier_handheld
else if item:getName():find("Pool Noodle") then
return models.akira_eiko_olivia_pink.ItemNoodle
end
end
end
end
]]
-- animations.akira_eiko_olivia_pink.spyglassL:setBlendTime(0)
-- animations.akira_eiko_olivia_pink.spyglassR:setBlendTime(0)

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 B

View file

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View file

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View file

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View file

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View file

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

View file

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

View file

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View file

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View file

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View file

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View file

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View file

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View file

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 88 KiB

View file

Before

Width:  |  Height:  |  Size: 123 KiB

After

Width:  |  Height:  |  Size: 123 KiB

View file

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

View file

Before

Width:  |  Height:  |  Size: 774 B

After

Width:  |  Height:  |  Size: 774 B

View file

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 5 KiB

View file

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 84 KiB

View file

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View file

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

View file

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

View file

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View file

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB

View file

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

View file

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

View file

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View file

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View file

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 65 KiB

View file

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View file

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 946 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 662 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 693 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 779 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 884 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 927 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 853 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 MiB

File diff suppressed because it is too large Load diff

BIN
drawings/Leverage_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 KiB

BIN
drawings/Leverage_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 403 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 494 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

BIN
drawings/rewrite_car.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 258 KiB

BIN
drawings/shrimp.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 16 KiB

Some files were not shown because too many files have changed in this diff Show more