mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-24 15:21:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated tree & updated GBK

Browse Source
This commit is contained in:
aMannus
2023-11-04 14:53:04 +01:00
parent a494d21db6
commit 13474a2dcc
14 changed files with 184 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/assets/custom/objects/object_xmas_tree/LeavesAlpha_64
BIN
View File
Binary file not shown.
soh/assets/custom/objects/object_xmas_tree/LeavesAlpha_shaded_64
BIN
View File
Binary file not shown.
soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL
+2
View File
@@ -3,6 +3,8 @@
<CallDisplayList Path="objects/object_xmas_tree/gXmasTreeDL_tri_0"/>
<CallDisplayList Path="objects/object_xmas_tree/mat_gXmasTreeDL_f3dlite_TreeGreen"/>
<CallDisplayList Path="objects/object_xmas_tree/gXmasTreeDL_tri_1"/>
<CallDisplayList Path="objects/object_xmas_tree/mat_gXmasTreeDL_f3dlite_TreeTip"/>
<CallDisplayList Path="objects/object_xmas_tree/gXmasTreeDL_tri_2"/>
<PipeSync/>
<SetGeometryMode G_LIGHTING="1" />
<ClearGeometryMode G_TEXTURE_GEN="1" />
soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_tri_1
+88 -100
View File
@@ -1,104 +1,6 @@
<DisplayList Version="0">
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="3" V01="4" V02="5"/>
<Triangle1 V00="6" V01="7" V02="4"/>
<Triangle1 V00="8" V01="9" V02="1"/>
<Triangle1 V00="10" V01="11" V02="12"/>
<Triangle1 V00="13" V01="14" V02="15"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="3" V01="4" V02="5"/>
<Triangle1 V00="6" V01="7" V02="8"/>
<Triangle1 V00="9" V01="10" V02="1"/>
<Triangle1 V00="11" V01="12" V02="13"/>
<Triangle1 V00="11" V01="14" V02="12"/>
<Triangle1 V00="14" V01="15" V02="12"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="1" V01="3" V02="2"/>
<Triangle1 V00="1" V01="4" V02="3"/>
<Triangle1 V00="4" V01="5" V02="3"/>
<Triangle1 V00="4" V01="6" V02="5"/>
<Triangle1 V00="6" V01="7" V02="5"/>
<Triangle1 V00="6" V01="8" V02="7"/>
<Triangle1 V00="8" V01="9" V02="7"/>
<Triangle1 V00="8" V01="10" V02="9"/>
<Triangle1 V00="10" V01="11" V02="9"/>
<Triangle1 V00="10" V01="12" V02="11"/>
<Triangle1 V00="12" V01="13" V02="11"/>
<Triangle1 V00="12" V01="14" V02="13"/>
<Triangle1 V00="14" V01="15" V02="13"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="48" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="1" V01="3" V02="2"/>
<Triangle1 V00="1" V01="4" V02="3"/>
<Triangle1 V00="5" V01="6" V02="7"/>
<Triangle1 V00="5" V01="8" V02="6"/>
<Triangle1 V00="8" V01="9" V02="6"/>
<Triangle1 V00="8" V01="10" V02="9"/>
<Triangle1 V00="10" V01="11" V02="9"/>
<Triangle1 V00="10" V01="12" V02="11"/>
<Triangle1 V00="12" V01="13" V02="11"/>
<Triangle1 V00="12" V01="14" V02="13"/>
<Triangle1 V00="14" V01="15" V02="13"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="1" V01="3" V02="2"/>
<Triangle1 V00="1" V01="4" V02="3"/>
<Triangle1 V00="4" V01="5" V02="3"/>
<Triangle1 V00="4" V01="6" V02="5"/>
<Triangle1 V00="6" V01="7" V02="5"/>
<Triangle1 V00="6" V01="8" V02="7"/>
<Triangle1 V00="8" V01="9" V02="7"/>
<Triangle1 V00="8" V01="10" V02="9"/>
<Triangle1 V00="10" V01="11" V02="9"/>
<Triangle1 V00="10" V01="12" V02="11"/>
<Triangle1 V00="13" V01="14" V02="15"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="80" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="1" V01="3" V02="2"/>
<Triangle1 V00="1" V01="4" V02="3"/>
<Triangle1 V00="4" V01="5" V02="3"/>
<Triangle1 V00="4" V01="6" V02="5"/>
<Triangle1 V00="6" V01="7" V02="5"/>
<Triangle1 V00="6" V01="8" V02="7"/>
<Triangle1 V00="8" V01="9" V02="7"/>
<Triangle1 V00="8" V01="10" V02="9"/>
<Triangle1 V00="10" V01="11" V02="9"/>
<Triangle1 V00="10" V01="12" V02="11"/>
<Triangle1 V00="12" V01="13" V02="11"/>
<Triangle1 V00="12" V01="14" V02="13"/>
<Triangle1 V00="14" V01="15" V02="13"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="96" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="1" V01="3" V02="2"/>
<Triangle1 V00="1" V01="4" V02="3"/>
<Triangle1 V00="4" V01="5" V02="3"/>
<Triangle1 V00="4" V01="6" V02="5"/>
<Triangle1 V00="7" V01="8" V02="9"/>
<Triangle1 V00="7" V01="10" V02="8"/>
<Triangle1 V00="10" V01="11" V02="8"/>
<Triangle1 V00="10" V01="12" V02="11"/>
<Triangle1 V00="12" V01="13" V02="11"/>
<Triangle1 V00="12" V01="14" V02="13"/>
<Triangle1 V00="14" V01="15" V02="13"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="112" Count="15"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="1" V01="3" V02="2"/>
<Triangle1 V00="1" V01="4" V02="3"/>
<Triangle1 V00="4" V01="5" V02="3"/>
<Triangle1 V00="4" V01="6" V02="5"/>
<Triangle1 V00="6" V01="7" V02="5"/>
<Triangle1 V00="6" V01="8" V02="7"/>
<Triangle1 V00="8" V01="9" V02="7"/>
<Triangle1 V00="8" V01="10" V02="9"/>
<Triangle1 V00="10" V01="11" V02="9"/>
<Triangle1 V00="10" V01="12" V02="11"/>
<Triangle1 V00="12" V01="13" V02="11"/>
<Triangle1 V00="12" V01="14" V02="13"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="127" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="3" V02="1"/>
<Triangle1 V00="3" V01="4" V02="1"/>
<Triangle1 V00="3" V01="5" V02="4"/>
@@ -112,7 +14,7 @@
<Triangle1 V00="11" V01="13" V02="12"/>
<Triangle1 V00="13" V01="14" V02="12"/>
<Triangle1 V00="13" V01="15" V02="14"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="143" Count="16"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="3" V02="1"/>
<Triangle1 V00="3" V01="4" V02="1"/>
@@ -125,7 +27,93 @@
<Triangle1 V00="11" V01="13" V02="12"/>
<Triangle1 V00="13" V01="14" V02="12"/>
<Triangle1 V00="13" V01="15" V02="14"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="159" Count="16"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="3" V02="1"/>
<Triangle1 V00="3" V01="4" V02="1"/>
<Triangle1 V00="3" V01="5" V02="4"/>
<Triangle1 V00="5" V01="6" V02="4"/>
<Triangle1 V00="5" V01="7" V02="6"/>
<Triangle1 V00="7" V01="8" V02="6"/>
<Triangle1 V00="7" V01="9" V02="8"/>
<Triangle1 V00="9" V01="10" V02="8"/>
<Triangle1 V00="9" V01="11" V02="10"/>
<Triangle1 V00="11" V01="12" V02="10"/>
<Triangle1 V00="11" V01="13" V02="12"/>
<Triangle1 V00="13" V01="14" V02="12"/>
<Triangle1 V00="13" V01="15" V02="14"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="48" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="3" V02="1"/>
<Triangle1 V00="3" V01="4" V02="1"/>
<Triangle1 V00="3" V01="5" V02="4"/>
<Triangle1 V00="5" V01="6" V02="4"/>
<Triangle1 V00="5" V01="7" V02="6"/>
<Triangle1 V00="7" V01="8" V02="6"/>
<Triangle1 V00="7" V01="9" V02="8"/>
<Triangle1 V00="9" V01="10" V02="8"/>
<Triangle1 V00="9" V01="11" V02="10"/>
<Triangle1 V00="11" V01="12" V02="10"/>
<Triangle1 V00="11" V01="13" V02="12"/>
<Triangle1 V00="13" V01="14" V02="12"/>
<Triangle1 V00="13" V01="15" V02="14"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="3" V02="1"/>
<Triangle1 V00="3" V01="4" V02="1"/>
<Triangle1 V00="3" V01="5" V02="4"/>
<Triangle1 V00="5" V01="6" V02="4"/>
<Triangle1 V00="5" V01="7" V02="6"/>
<Triangle1 V00="8" V01="9" V02="10"/>
<Triangle1 V00="8" V01="11" V02="9"/>
<Triangle1 V00="11" V01="12" V02="9"/>
<Triangle1 V00="11" V01="13" V02="12"/>
<Triangle1 V00="13" V01="14" V02="12"/>
<Triangle1 V00="13" V01="15" V02="14"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="80" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="3" V02="1"/>
<Triangle1 V00="3" V01="4" V02="1"/>
<Triangle1 V00="3" V01="5" V02="4"/>
<Triangle1 V00="5" V01="6" V02="4"/>
<Triangle1 V00="5" V01="7" V02="6"/>
<Triangle1 V00="7" V01="8" V02="6"/>
<Triangle1 V00="7" V01="9" V02="8"/>
<Triangle1 V00="9" V01="10" V02="8"/>
<Triangle1 V00="9" V01="11" V02="10"/>
<Triangle1 V00="11" V01="12" V02="10"/>
<Triangle1 V00="11" V01="13" V02="12"/>
<Triangle1 V00="13" V01="14" V02="12"/>
<Triangle1 V00="13" V01="15" V02="14"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="96" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="3" V02="1"/>
<Triangle1 V00="3" V01="4" V02="1"/>
<Triangle1 V00="3" V01="5" V02="4"/>
<Triangle1 V00="5" V01="6" V02="4"/>
<Triangle1 V00="5" V01="7" V02="6"/>
<Triangle1 V00="7" V01="8" V02="6"/>
<Triangle1 V00="7" V01="9" V02="8"/>
<Triangle1 V00="9" V01="10" V02="8"/>
<Triangle1 V00="9" V01="11" V02="10"/>
<Triangle1 V00="11" V01="12" V02="10"/>
<Triangle1 V00="11" V01="13" V02="12"/>
<Triangle1 V00="13" V01="14" V02="12"/>
<Triangle1 V00="13" V01="15" V02="14"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="112" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="3" V02="1"/>
<Triangle1 V00="3" V01="4" V02="1"/>
<Triangle1 V00="3" V01="5" V02="4"/>
<Triangle1 V00="5" V01="6" V02="4"/>
<Triangle1 V00="5" V01="7" V02="6"/>
<Triangle1 V00="8" V01="9" V02="10"/>
<Triangle1 V00="8" V01="11" V02="9"/>
<Triangle1 V00="11" V01="12" V02="9"/>
<Triangle1 V00="11" V01="13" V02="12"/>
<Triangle1 V00="13" V01="14" V02="12"/>
<Triangle1 V00="13" V01="15" V02="14"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_1" VertexBufferIndex="0" VertexOffset="128" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="3" V02="1"/>
<Triangle1 V00="3" V01="4" V02="1"/>
soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_tri_2
+16
View File
@@ -0,0 +1,16 @@
<DisplayList Version="0">
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_2" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="3" V01="4" V02="5"/>
<Triangle1 V00="6" V01="7" V02="4"/>
<Triangle1 V00="8" V01="9" V02="1"/>
<Triangle1 V00="10" V01="11" V02="12"/>
<Triangle1 V00="13" V01="14" V02="15"/>
<LoadVertices Path="objects/object_xmas_tree/gXmasTreeDL_vtx_2" VertexBufferIndex="0" VertexOffset="16" Count="11"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="3" V01="4" V02="5"/>
<Triangle1 V00="6" V01="7" V02="8"/>
<Triangle1 V00="9" V01="10" V02="1"/>
<EndDisplayList/>
</DisplayList>
soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_vtx_1
+8 -39
View File
@@ -1,39 +1,10 @@
<Vertex Version="0">
<Vtx X="0" Y="477" Z="0" S="-221" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="1" Y="427" Z="29" S="-221" T="2032" R="3" G="65" B="109" A="255"/>
<Vtx X="17" Y="427" Z="22" S="394" T="2032" R="68" G="63" B="87" A="255"/>
<Vtx X="0" Y="477" Z="0" S="2237" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="16" Y="427" Z="-24" S="2237" T="2032" R="61" G="65" B="165" A="255"/>
<Vtx X="-1" Y="427" Z="-28" S="2851" T="2032" R="253" G="63" B="146" A="255"/>
<Vtx X="0" Y="477" Z="0" S="1622" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="26" Y="427" Z="-10" S="1622" T="2032" R="104" G="63" B="218" A="255"/>
<Vtx X="0" Y="477" Z="0" S="-835" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="-16" Y="427" Z="23" S="-835" T="2032" R="194" G="63" B="92" A="255"/>
<Vtx X="0" Y="477" Z="0" S="3466" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="-18" Y="427" Z="-23" S="3466" T="2032" R="189" G="65" B="170" A="255"/>
<Vtx X="-27" Y="427" Z="-8" S="4080" T="2032" R="150" G="63" B="226" A="255"/>
<Vtx X="0" Y="477" Z="0" S="-2064" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="-27" Y="427" Z="-8" S="-2064" T="2032" R="150" G="63" B="226" A="255"/>
<Vtx X="-27" Y="427" Z="10" S="-1450" T="2032" R="153" G="65" B="37" A="255"/>
<Vtx X="0" Y="477" Z="0" S="1008" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="28" Y="427" Z="8" S="1008" T="2032" R="105" G="65" B="30" A="255"/>
<Vtx X="26" Y="427" Z="-10" S="1622" T="2032" R="104" G="63" B="218" A="255"/>
<Vtx X="0" Y="477" Z="0" S="2851" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="-1" Y="427" Z="-28" S="2851" T="2032" R="253" G="63" B="146" A="255"/>
<Vtx X="-18" Y="427" Z="-23" S="3466" T="2032" R="189" G="65" B="170" A="255"/>
<Vtx X="0" Y="477" Z="0" S="-1450" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="-27" Y="427" Z="10" S="-1450" T="2032" R="153" G="65" B="37" A="255"/>
<Vtx X="-16" Y="427" Z="23" S="-835" T="2032" R="194" G="63" B="92" A="255"/>
<Vtx X="0" Y="477" Z="0" S="394" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="17" Y="427" Z="22" S="394" T="2032" R="68" G="63" B="87" A="255"/>
<Vtx X="-11" Y="449" Z="-3" S="4080" T="-16" R="150" G="64" B="226" A="255"/>
<Vtx X="-26" Y="397" Z="-34" S="3466" T="2032" R="189" G="66" B="170" A="255"/>
<Vtx X="-40" Y="397" Z="-11" S="4080" T="2032" R="150" G="64" B="226" A="255"/>
<Vtx X="-7" Y="449" Z="-9" S="3466" T="-16" R="189" G="66" B="170" A="255"/>
<Vtx X="-1" Y="397" Z="-41" S="2851" T="2032" R="253" G="64" B="146" A="255"/>
<Vtx X="-7" Y="449" Z="-9" S="3466" T="-16" R="189" G="66" B="170" A="255"/>
<Vtx X="0" Y="449" Z="-11" S="2851" T="-16" R="253" G="64" B="146" A="255"/>
<Vtx X="-1" Y="397" Z="-41" S="2851" T="2032" R="253" G="64" B="146" A="255"/>
<Vtx X="24" Y="397" Z="-35" S="2237" T="2032" R="61" G="66" B="166" A="255"/>
<Vtx X="7" Y="449" Z="-10" S="2237" T="-16" R="61" G="66" B="166" A="255"/>
<Vtx X="39" Y="397" Z="-14" S="1622" T="2032" R="103" G="64" B="219" A="255"/>
@@ -44,12 +15,12 @@
<Vtx X="7" Y="449" Z="9" S="394" T="-16" R="68" G="64" B="87" A="255"/>
<Vtx X="1" Y="397" Z="43" S="-221" T="2032" R="3" G="66" B="109" A="255"/>
<Vtx X="0" Y="449" Z="12" S="-221" T="-16" R="3" G="66" B="109" A="255"/>
<Vtx X="0" Y="449" Z="12" S="-221" T="-16" R="3" G="66" B="109" A="255"/>
<Vtx X="-23" Y="397" Z="34" S="-835" T="2032" R="195" G="64" B="91" A="255"/>
<Vtx X="1" Y="397" Z="43" S="-221" T="2032" R="3" G="66" B="109" A="255"/>
<Vtx X="-6" Y="449" Z="9" S="-835" T="-16" R="195" G="64" B="91" A="255"/>
<Vtx X="-40" Y="397" Z="15" S="-1450" T="2032" R="154" G="66" B="37" A="255"/>
<Vtx X="-6" Y="449" Z="9" S="-835" T="-16" R="195" G="64" B="91" A="255"/>
<Vtx X="-11" Y="449" Z="4" S="-1450" T="-16" R="154" G="66" B="37" A="255"/>
<Vtx X="-40" Y="397" Z="15" S="-1450" T="2032" R="154" G="66" B="37" A="255"/>
<Vtx X="-40" Y="397" Z="-11" S="-2064" T="2032" R="150" G="64" B="226" A="255"/>
<Vtx X="-11" Y="449" Z="-3" S="-2064" T="-16" R="150" G="64" B="226" A="255"/>
<Vtx X="8" Y="427" Z="-16" S="4080" T="-16" R="52" G="64" B="159" A="255"/>
@@ -60,12 +31,12 @@
<Vtx X="17" Y="427" Z="3" S="2851" T="-16" R="108" G="64" B="19" A="255"/>
<Vtx X="37" Y="368" Z="39" S="2237" T="2032" R="75" G="66" B="79" A="255"/>
<Vtx X="13" Y="427" Z="13" S="2237" T="-16" R="75" G="66" B="79" A="255"/>
<Vtx X="13" Y="427" Z="13" S="2237" T="-16" R="75" G="66" B="79" A="255"/>
<Vtx X="7" Y="368" Z="51" S="1622" T="2032" R="15" G="64" B="109" A="255"/>
<Vtx X="37" Y="368" Z="39" S="2237" T="2032" R="75" G="66" B="79" A="255"/>
<Vtx X="2" Y="427" Z="17" S="1622" T="-16" R="15" G="64" B="109" A="255"/>
<Vtx X="-25" Y="368" Z="48" S="1008" T="2032" R="205" G="66" B="96" A="255"/>
<Vtx X="2" Y="427" Z="17" S="1622" T="-16" R="15" G="64" B="109" A="255"/>
<Vtx X="-9" Y="427" Z="16" S="1008" T="-16" R="205" G="66" B="96" A="255"/>
<Vtx X="-25" Y="368" Z="48" S="1008" T="2032" R="205" G="66" B="96" A="255"/>
<Vtx X="-47" Y="368" Z="23" S="394" T="2032" R="157" G="64" B="48" A="255"/>
<Vtx X="-16" Y="427" Z="8" S="394" T="-16" R="157" G="64" B="48" A="255"/>
<Vtx X="-53" Y="368" Z="-10" S="-221" T="2032" R="149" G="66" B="237" A="255"/>
@@ -79,9 +50,7 @@
<Vtx X="-23" Y="397" Z="12" S="4080" T="-16" R="160" G="67" B="49" A="255"/>
<Vtx X="-75" Y="320" Z="-12" S="3466" T="2032" R="150" G="69" B="240" A="255"/>
<Vtx X="-65" Y="320" Z="33" S="4080" T="2032" R="160" G="67" B="49" A="255"/>
<Vtx X="-23" Y="397" Z="12" S="4080" T="-16" R="160" G="67" B="49" A="255"/>
<Vtx X="-26" Y="397" Z="-4" S="3466" T="-16" R="150" G="69" B="240" A="255"/>
<Vtx X="-75" Y="320" Z="-12" S="3466" T="2032" R="150" G="69" B="240" A="255"/>
<Vtx X="-52" Y="320" Z="-52" S="2851" T="2032" R="180" G="67" B="180" A="255"/>
<Vtx X="-18" Y="397" Z="-18" S="2851" T="-16" R="180" G="67" B="180" A="255"/>
<Vtx X="-12" Y="320" Z="-75" S="2237" T="2032" R="240" G="69" B="150" A="255"/>
@@ -94,10 +63,10 @@
<Vtx X="25" Y="397" Z="4" S="394" T="-16" R="107" G="67" B="17" A="255"/>
<Vtx X="54" Y="320" Z="54" S="-221" T="2032" R="76" G="69" B="76" A="255"/>
<Vtx X="19" Y="397" Z="19" S="-221" T="-16" R="76" G="69" B="76" A="255"/>
<Vtx X="11" Y="320" Z="72" S="-835" T="2032" R="17" G="67" B="107" A="255"/>
<Vtx X="19" Y="397" Z="19" S="-221" T="-16" R="76" G="69" B="76" A="255"/>
<Vtx X="4" Y="397" Z="25" S="-835" T="-16" R="17" G="67" B="107" A="255"/>
<Vtx X="11" Y="320" Z="72" S="-835" T="2032" R="17" G="67" B="107" A="255"/>
<Vtx X="54" Y="320" Z="54" S="-221" T="2032" R="76" G="69" B="76" A="255"/>
<Vtx X="4" Y="397" Z="25" S="-835" T="-16" R="17" G="67" B="107" A="255"/>
<Vtx X="-35" Y="320" Z="68" S="-1450" T="2032" R="208" G="69" B="95" A="255"/>
<Vtx X="-12" Y="397" Z="23" S="-1450" T="-16" R="208" G="69" B="95" A="255"/>
<Vtx X="-65" Y="320" Z="33" S="-2064" T="2032" R="160" G="67" B="49" A="255"/>
@@ -110,10 +79,10 @@
<Vtx X="-37" Y="367" Z="-2" S="2851" T="-16" R="145" G="62" B="251" A="255"/>
<Vtx X="-80" Y="257" Z="-64" S="2237" T="2032" R="170" G="63" B="187" A="255"/>
<Vtx X="-30" Y="367" Z="-24" S="2237" T="-16" R="170" G="63" B="187" A="255"/>
<Vtx X="-26" Y="257" Z="-95" S="1622" T="2032" R="228" G="62" B="149" A="255"/>
<Vtx X="-30" Y="367" Z="-24" S="2237" T="-16" R="170" G="63" B="187" A="255"/>
<Vtx X="-10" Y="367" Z="-36" S="1622" T="-16" R="228" G="62" B="149" A="255"/>
<Vtx X="-26" Y="257" Z="-95" S="1622" T="2032" R="228" G="62" B="149" A="255"/>
<Vtx X="-80" Y="257" Z="-64" S="2237" T="2032" R="170" G="63" B="187" A="255"/>
<Vtx X="-10" Y="367" Z="-36" S="1622" T="-16" R="228" G="62" B="149" A="255"/>
<Vtx X="37" Y="257" Z="-96" S="1008" T="2032" R="39" G="63" B="153" A="255"/>
<Vtx X="14" Y="367" Z="-36" S="1008" T="-16" R="39" G="63" B="153" A="255"/>
<Vtx X="83" Y="257" Z="-54" S="394" T="2032" R="93" G="62" B="196" A="255"/>
soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_vtx_2
+29
View File
@@ -0,0 +1,29 @@
<Vertex Version="0">
<Vtx X="0" Y="477" Z="0" S="-221" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="1" Y="427" Z="29" S="-221" T="2032" R="3" G="65" B="109" A="255"/>
<Vtx X="17" Y="427" Z="22" S="394" T="2032" R="68" G="63" B="87" A="255"/>
<Vtx X="0" Y="477" Z="0" S="2237" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="16" Y="427" Z="-24" S="2237" T="2032" R="61" G="65" B="165" A="255"/>
<Vtx X="-1" Y="427" Z="-28" S="2851" T="2032" R="253" G="63" B="146" A="255"/>
<Vtx X="0" Y="477" Z="0" S="1622" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="26" Y="427" Z="-10" S="1622" T="2032" R="104" G="63" B="218" A="255"/>
<Vtx X="0" Y="477" Z="0" S="-835" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="-16" Y="427" Z="23" S="-835" T="2032" R="194" G="63" B="92" A="255"/>
<Vtx X="0" Y="477" Z="0" S="3466" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="-18" Y="427" Z="-23" S="3466" T="2032" R="189" G="65" B="170" A="255"/>
<Vtx X="-27" Y="427" Z="-8" S="4080" T="2032" R="150" G="63" B="226" A="255"/>
<Vtx X="0" Y="477" Z="0" S="-2064" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="-27" Y="427" Z="-8" S="-2064" T="2032" R="150" G="63" B="226" A="255"/>
<Vtx X="-27" Y="427" Z="10" S="-1450" T="2032" R="153" G="65" B="37" A="255"/>
<Vtx X="0" Y="477" Z="0" S="1008" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="28" Y="427" Z="8" S="1008" T="2032" R="105" G="65" B="30" A="255"/>
<Vtx X="26" Y="427" Z="-10" S="1622" T="2032" R="104" G="63" B="218" A="255"/>
<Vtx X="0" Y="477" Z="0" S="2851" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="-1" Y="427" Z="-28" S="2851" T="2032" R="253" G="63" B="146" A="255"/>
<Vtx X="-18" Y="427" Z="-23" S="3466" T="2032" R="189" G="65" B="170" A="255"/>
<Vtx X="0" Y="477" Z="0" S="-1450" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="-27" Y="427" Z="10" S="-1450" T="2032" R="153" G="65" B="37" A="255"/>
<Vtx X="-16" Y="427" Z="23" S="-835" T="2032" R="194" G="63" B="92" A="255"/>
<Vtx X="0" Y="477" Z="0" S="394" T="-16" R="0" G="127" B="0" A="255"/>
<Vtx X="17" Y="427" Z="22" S="394" T="2032" R="68" G="63" B="87" A="255"/>
</Vertex>
soh/assets/custom/objects/object_xmas_tree/mat_gXmasTreeDL_f3dlite_TreeGreen
+4 -3
View File
@@ -1,20 +1,21 @@
<DisplayList Version="0">
<PipeSync/>
<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_TEXEL0" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_COMBINED" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_TEXEL0" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1" />
<ClearGeometryMode G_CULL_FRONT="1" G_CULL_BACK="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" />
<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_XLU_SURF2="1" />
<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_TEX_EDGE2="1" />
<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
<SetTextureLUT Mode="G_TT_NONE"/>
<TileSync/>
<SetTextureImage Path="objects/object_xmas_tree/LeavesAlpha_64" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
<SetTextureImage Path="objects/object_xmas_tree/LeavesAlpha_shaded_64" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_MIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
<LoadSync/>
<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
<PipeSync/>
<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_MIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
<EndDisplayList/>
</DisplayList>
soh/assets/custom/objects/object_xmas_tree/mat_gXmasTreeDL_f3dlite_TreeTip
+21
View File
@@ -0,0 +1,21 @@
<DisplayList Version="0">
<PipeSync/>
<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_TEXEL0" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1" />
<ClearGeometryMode G_CULL_FRONT="1" G_CULL_BACK="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" />
<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_TEX_EDGE2="1" />
<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
<SetTextureLUT Mode="G_TT_NONE"/>
<TileSync/>
<SetTextureImage Path="objects/object_xmas_tree/LeavesAlpha_64" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
<LoadSync/>
<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
<PipeSync/>
<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
<EndDisplayList/>
</DisplayList>
soh/soh/Enhancements/debugger/debugSaveEditor.cpp
-5
View File
@@ -517,11 +517,6 @@ void DrawInfoTab() {
if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT)) {
ImGui::InputScalar("Triforce Pieces", ImGuiDataType_U8, &gSaveContext.triforcePiecesCollected);
UIWidgets::InsertHelpHoverText("Currently obtained Triforce Pieces. For Triforce Hunt.");
bool thFlag = gSaveContext.grantBossKey != 0;
if (ImGui::Checkbox("Finished Triforce Hunt", &thFlag)) {
gSaveContext.grantBossKey = thFlag;
}
}
ImGui::PushItemWidth(ImGui::GetFontSize() * 10);
soh/soh/Enhancements/debugger/debugSaveEditor.h
+1
View File
@@ -505,6 +505,7 @@ const std::vector<FlagTable> flagTables = {
{ RAND_INF_CHILD_FISHING, "RAND_INF_CHILD_FISHING" },
{ RAND_INF_ADULT_FISHING, "RAND_INF_ADULT_FISHING" },
{ RAND_INF_10_BIG_POES, "RAND_INF_10_BIG_POES" },
{ RAND_INF_GRANT_GANONS_BOSSKEY, "RAND_INF_GRANT_GANONS_BOSSKEY" },
} },
};
soh/soh/Enhancements/mods.cpp
+13 -7
View File
@@ -665,13 +665,6 @@ void RegisterTriforceHunt() {
triforcePieceScale = 0.0f;
GameInteractor::State::TriforceHuntPieceGiven = 0;
}
// Give Boss Key when player loads back into the savefile.
if (gSaveContext.grantBossKey &&
(1 << 0 & gSaveContext.inventory.dungeonItems[SCENE_GANONS_TOWER]) == 0) {
GetItemEntry getItemEntry = ItemTableManager::Instance->RetrieveItemEntry(MOD_RANDOMIZER, RG_GANONS_CASTLE_BOSS_KEY);
GiveItemEntryWithoutActor(gPlayState, getItemEntry);
}
}
if (currentPieces >= requiredPieces && eventTimer >= 1 && eventTimer <= 30) {
@@ -711,6 +704,18 @@ void RegisterTriforceHunt() {
});
}
void RegisterGrantGanonsBossKey() {
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
// Triforce Hunt needs the check if the player isn't being teleported to the credits scene.
if (!GameInteractor::IsGameplayPaused() && Flags_GetRandomizerInf(RAND_INF_GRANT_GANONS_BOSSKEY) &&
gPlayState->sceneLoadFlag != 0x14 && (1 << 0 & gSaveContext.inventory.dungeonItems[SCENE_GANONS_TOWER]) == 0) {
GetItemEntry getItemEntry =
ItemTableManager::Instance->RetrieveItemEntry(MOD_RANDOMIZER, RG_GANONS_CASTLE_BOSS_KEY);
GiveItemEntryWithoutActor(gPlayState, getItemEntry);
}
});
}
//this map is used for enemies that can be uniquely identified by their id
//and that are always counted
//enemies that can't be uniquely identified by their id
@@ -1096,6 +1101,7 @@ void InitMods() {
RegisterMenuPathFix();
RegisterMirrorModeHandler();
RegisterTriforceHunt();
RegisterGrantGanonsBossKey();
RegisterEnemyDefeatCounts();
RegisterAltTrapTypes();
RegisterRandomizerSheikSpawn();
soh/soh/Enhancements/randomizer/randomizer_inf.h
+1
View File
@@ -159,6 +159,7 @@ typedef enum {
RAND_INF_CHILD_FISHING,
RAND_INF_ADULT_FISHING,
RAND_INF_10_BIG_POES,
RAND_INF_GRANT_GANONS_BOSSKEY,
// If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
soh/src/overlays/actors/ovl_En_ChristmasTree/z_en_christmastree.c
+1 -1
View File
@@ -77,7 +77,7 @@ void EnChristmasTree_Talk(EnChristmasTree* this, PlayState* play) {
if (gSaveContext.triforcePiecesCollected >= Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED)) {
gSaveContext.sohStats.itemTimestamp[TIMESTAMP_TRIFORCE_COMPLETED] = GAMEPLAYSTAT_TOTAL_TIME;
gSaveContext.sohStats.gameComplete = 1;
gSaveContext.grantBossKey = 1;
Flags_SetRandomizerInf(RAND_INF_GRANT_GANONS_BOSSKEY);
Play_PerformSave(play);
GameInteractor_SetTriforceHuntCreditsWarpActive(true);
}