Compare commits

...

3 Commits

Author SHA1 Message Date
6a309febe0
(wip) setup armor visibility rules 2024-11-28 18:14:44 -05:00
799942abe6
update TODO (make sure this todo is gone before merge also REWORD THIS) 2024-11-28 03:39:57 -05:00
8384398305
(wip) script, bbmodel REBASE THIS LATER
- Imported textures into bbmodel
- script something idk
2024-11-28 03:14:44 -05:00
3 changed files with 195 additions and 5 deletions

View File

@ -1,5 +1,11 @@
# TODO # TODO
## THIS BRANCH
- [ ] Split armor trim overhang into two objects with different UVs; you can
get the 4 pixel wide armor trim hang by combining the left and right
corners of the existing trim (kinda hacky and may break with modded
textures.
## General ## General
- [ ] use matrix thing for UVManager (linear algebra is hard) - [ ] use matrix thing for UVManager (linear algebra is hard)
- [ ] Add action wheel icons - [ ] Add action wheel icons

File diff suppressed because one or more lines are too long

View File

@ -28,7 +28,7 @@ UVManager=require("nulllib.UVManager")
sharedstate=require("nulllib.sharedstate") sharedstate=require("nulllib.sharedstate")
sharedconfig=require("nulllib.sharedconfig") sharedconfig=require("nulllib.sharedconfig")
statemonitor=require("nulllib.statemonitor") statemonitor=require("nulllib.statemonitor")
KattArmor=require("kattarmor.KattArmor") KattArmor=require("kattarmor.KattArmor")()
---Set optimal settings for random player sounds ---Set optimal settings for random player sounds
---@param sound Sound ---@param sound Sound
@ -258,15 +258,19 @@ do
local mtail_mutually_exclusive={model.LeftLeg, model.RightLeg, TAIL, vanilla_model.LEGGINGS, vanilla_model.BOOTS} local mtail_mutually_exclusive={model.LeftLeg, model.RightLeg, TAIL, vanilla_model.LEGGINGS, vanilla_model.BOOTS}
PM.addPartListFunction(mtail_mutually_exclusive, function(last) return last and not aquaticTailVisible() end) PM.addPartListFunction(mtail_mutually_exclusive, function(last) return last and not aquaticTailVisible() end)
-- aquatic tail in water -- aquatic tail in water
PM.addPartListFunction(tail_parts, function(last) return last and aquaticTailVisible() end) local tail_visible_rule=function(last) return last and aquaticTailVisible() end
PM.addPartListFunction(tail_parts, tail_visible_rule)
PM.addPartListFunction(TAIL_LEGGINGS, tail_visible_rule)
PM.addPartListFunction(TAIL_BOOTS, tail_visible_rule)
--- Armor state --- Armor state
local all_armor=util.reduce(util.mergeTable, {VANILLA_GROUPS.ARMOR, TAIL_LEGGINGS, TAIL_BOOTS}) local all_armor=util.reduce(util.mergeTable, {VANILLA_GROUPS.ARMOR, TAIL_LEGGINGS, TAIL_BOOTS})
PM.addPartListFunction(all_armor, function(last) return last and sharedconfig.load("armor_enabled") end) PM.addPartListFunction(all_armor, function(last) return last and sharedconfig.load("armor_enabled") end)
-- Only show armor if equipped -- Only show armor if equipped
PM.addPartFunction(model.Body.MTail1.MTail2.MTail3.Boot, function(last) return last and armor_state.boots end) -- PM.addPartFunction(model.Body.MTail1.MTail2.MTail3.Boot, function(last) return last and armor_state.boots end)
PM.addPartFunction(model.Body.MTail1.MTail2.MTail3.LeatherBoot, function(last) return last and armor_state.leather_boots end) -- PM.addPartFunction(model.Body.MTail1.MTail2.MTail3.LeatherBoot, function(last) return last and armor_state.leather_boots end)
PM.addPartListFunction(TAIL_LEGGINGS, function(last) return last and armor_state.leggings end) -- PM.addPartListFunction(TAIL_LEGGINGS, function(last) return last and armor_state.leggings end)
-- Disable when vanilla_enabled -- Disable when vanilla_enabled
@ -276,6 +280,12 @@ end
SNORES={"snore-1", "snore-2", "snore-3"} SNORES={"snore-1", "snore-2", "snore-3"}
-- }}} -- }}}
-- KattArmor Config -- {{{
KattArmor.Armor.Leggings:addParts(table.unpack(TAIL_LEGGINGS))
KattArmor.Armor.Boots:addParts(table.unpack(TAIL_BOOTS))
-- KattArmor.
-- }}}
-- Expression change -- {{{ -- Expression change -- {{{
do do
local expressions={} local expressions={}