Use Dec instead of Hex in framerange when pack verion is 103 or above

This commit is contained in:
mkwong98 2020-05-16 00:46:10 +08:00
parent 36deb11f37
commit 6770a94557
2 changed files with 153 additions and 341 deletions

View file

@ -2,282 +2,46 @@
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Release" />
<File name="hdnesPackEditormainForm.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="38542" topLine="204" />
</Cursor>
<Folding>
<Collapse line="16" />
<Collapse line="31" />
<Collapse line="32" />
<Collapse line="34" />
<Collapse line="70" />
<Collapse line="75" />
<Collapse line="84" />
<Collapse line="85" />
<Collapse line="88" />
<Collapse line="91" />
<Collapse line="96" />
<Collapse line="102" />
<Collapse line="103" />
<Collapse line="111" />
<Collapse line="122" />
<Collapse line="136" />
<Collapse line="145" />
<Collapse line="149" />
<Collapse line="153" />
<Collapse line="204" />
<Collapse line="213" />
<Collapse line="249" />
<Collapse line="258" />
<Collapse line="263" />
<Collapse line="277" />
<Collapse line="283" />
<Collapse line="302" />
<Collapse line="309" />
<Collapse line="315" />
<Collapse line="319" />
<Collapse line="327" />
<Collapse line="331" />
<Collapse line="335" />
<Collapse line="339" />
<Collapse line="345" />
<Collapse line="351" />
<Collapse line="357" />
<Collapse line="362" />
<Collapse line="420" />
<Collapse line="456" />
<Collapse line="477" />
<Collapse line="513" />
<Collapse line="523" />
<Collapse line="536" />
<Collapse line="578" />
<Collapse line="612" />
<Collapse line="635" />
<Collapse line="654" />
<Collapse line="662" />
<Collapse line="730" />
<Collapse line="745" />
<Collapse line="753" />
<Collapse line="766" />
<Collapse line="787" />
<Collapse line="814" />
<Collapse line="824" />
<Collapse line="888" />
<Collapse line="902" />
<Collapse line="913" />
<Collapse line="1320" />
<Collapse line="1357" />
<Collapse line="1374" />
<Collapse line="1412" />
<Collapse line="1426" />
<Collapse line="1456" />
<Collapse line="1492" />
<Collapse line="1504" />
<Collapse line="1518" />
<Collapse line="1523" />
<Collapse line="1536" />
<Collapse line="1556" />
<Collapse line="1568" />
<Collapse line="1580" />
<Collapse line="1594" />
<Collapse line="1608" />
<Collapse line="1614" />
<Collapse line="1632" />
<Collapse line="1649" />
<Collapse line="1663" />
<Collapse line="1723" />
<Collapse line="1733" />
<Collapse line="1802" />
<Collapse line="1842" />
<Collapse line="1876" />
<Collapse line="1918" />
<Collapse line="1958" />
<Collapse line="1970" />
<Collapse line="2041" />
<Collapse line="2052" />
<Collapse line="2059" />
<Collapse line="2066" />
<Collapse line="2077" />
<Collapse line="2085" />
<Collapse line="2093" />
<Collapse line="2096" />
<Collapse line="2099" />
<Collapse line="2104" />
<Collapse line="2124" />
<Collapse line="2133" />
<Collapse line="2137" />
<Collapse line="2142" />
<Collapse line="2151" />
<Collapse line="2156" />
<Collapse line="2165" />
<Collapse line="2175" />
<Collapse line="2179" />
<Collapse line="2188" />
<Collapse line="2203" />
<Collapse line="2217" />
<Collapse line="2224" />
<Collapse line="2233" />
<Collapse line="2265" />
<Collapse line="2269" />
<Collapse line="2278" />
<Collapse line="2311" />
<Collapse line="2429" />
<Collapse line="2446" />
<Collapse line="2449" />
<Collapse line="2454" />
<Collapse line="2503" />
<Collapse line="2508" />
<Collapse line="2529" />
<Collapse line="2534" />
<Collapse line="2538" />
<Collapse line="2542" />
<Collapse line="2546" />
<Collapse line="2550" />
<Collapse line="2561" />
<Collapse line="2571" />
<Collapse line="2581" />
<Collapse line="2620" />
<Collapse line="2631" />
<Collapse line="2656" />
<Collapse line="2661" />
<Collapse line="2690" />
<Collapse line="2694" />
<Collapse line="2705" />
<Collapse line="2717" />
<Collapse line="2728" />
<Collapse line="2749" />
<Collapse line="2773" />
<Collapse line="2820" />
<Collapse line="2828" />
<Collapse line="2836" />
<Collapse line="2844" />
<Collapse line="2853" />
<Collapse line="2866" />
<Collapse line="2932" />
<Collapse line="2944" />
<Collapse line="2950" />
<Collapse line="2956" />
<Collapse line="2986" />
<Collapse line="2990" />
<Collapse line="3006" />
<Collapse line="3046" />
<Collapse line="3058" />
<Collapse line="3068" />
<Collapse line="3075" />
<Collapse line="3108" />
<Collapse line="3130" />
<Collapse line="3179" />
</Folding>
</File>
<File name="hdnesPackEditornewProjectDialog.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="742" topLine="0" />
</Cursor>
<Folding>
<Collapse line="10" />
<Collapse line="16" />
</Folding>
</File>
<File name="colourDialogClient.h" open="1" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="235" topLine="0" />
</Cursor>
<Folding>
<Collapse line="5" />
</Folding>
</File>
<File name="hdnesPackEditornewProjectDialog.h" open="1" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="229" topLine="0" />
</Cursor>
<Folding>
<Collapse line="3" />
<Collapse line="14" />
</Folding>
</File>
<File name="classList.h" open="1" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="256" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditorreplacementDialog.cpp" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
<Cursor>
<Cursor1 position="2646" topLine="0" />
</Cursor>
<Folding>
<Collapse line="10" />
<Collapse line="19" />
<Collapse line="23" />
<Collapse line="30" />
<Collapse line="43" />
<Collapse line="55" />
</Folding>
</File>
<File name="paletteSwap.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="279" topLine="0" />
</Cursor>
</File>
<File name="coreData.h" open="1" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="776" topLine="0" />
</Cursor>
<Folding>
<Collapse line="8" />
</Folding>
</File>
<File name="tileReference.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1081" topLine="0" />
</Cursor>
<Folding>
<Collapse line="5" />
<Collapse line="10" />
<Collapse line="14" />
<Collapse line="29" />
<Collapse line="61" />
<Collapse line="73" />
<Collapse line="96" />
</Folding>
</File>
<File name="hdnesPackEditormainForm.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="hdnesPackEditormainForm.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1133" topLine="0" />
</Cursor>
<Folding>
<Collapse line="32" />
<Collapse line="47" />
</Folding>
</File>
<File name="main.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="hdnesPackEditorcolourSelectDialog.h" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="565" topLine="2" />
<Cursor1 position="382" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditorreplacementDialog.cpp" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
<Cursor>
<Cursor1 position="2646" topLine="0" />
</Cursor>
<Folding>
<Collapse line="10" />
<Collapse line="17" />
<Collapse line="24" />
<Collapse line="30" />
<Collapse line="36" />
<Collapse line="50" />
<Collapse line="60" />
<Collapse line="66" />
<Collapse line="78" />
<Collapse line="95" />
<Collapse line="108" />
<Collapse line="112" />
<Collapse line="118" />
<Collapse line="35" />
<Collapse line="47" />
</Folding>
</File>
<File name="hdnesPackEditorreplacementDialog.h" open="1" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="mainForm.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1177" topLine="0" />
<Cursor1 position="76" topLine="0" />
</Cursor>
<Folding>
<Collapse line="3" />
<Collapse line="15" />
<Collapse line="47" />
</Folding>
</File>
<File name="image.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="189" topLine="0" />
</Cursor>
</File>
<File name="main.h" open="0" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="380" topLine="0" />
</Cursor>
</File>
<File name="paletteSwap.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="293" topLine="0" />
@ -286,134 +50,182 @@
<Collapse line="6" />
</Folding>
</File>
<File name="hdnesPackEditornewProjectDialog.cpp" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="742" topLine="0" />
</Cursor>
</File>
<File name="image.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="359" topLine="0" />
</Cursor>
</File>
<File name="mainForm.cpp" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="53767" topLine="3" />
</Cursor>
<Folding>
<Collapse line="12" />
<Collapse line="1161" />
<Collapse line="1296" />
<Collapse line="1352" />
<Collapse line="1359" />
<Collapse line="1714" />
<Collapse line="1849" />
<Collapse line="1909" />
</Folding>
</File>
<File name="common.h" open="1" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="171" topLine="0" />
</Cursor>
</File>
<File name="image.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="189" topLine="0" />
</Cursor>
</File>
<File name="condition.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="5395" topLine="0" />
</Cursor>
<Folding>
<Collapse line="6" />
<Collapse line="11" />
<Collapse line="138" />
<Collapse line="161" />
</Folding>
</File>
<File name="main.h" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="380" topLine="0" />
</Cursor>
<Folding>
<Collapse line="12" />
</Folding>
</File>
<File name="condition.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="hdnesPackEditornewProjectDialog.h" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="229" topLine="0" />
</Cursor>
</File>
<File name="tileReference.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="colourDialogClient.h" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="502" topLine="0" />
<Cursor1 position="235" topLine="0" />
</Cursor>
</File>
<File name="gameTile.h" open="1" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="main.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="804" topLine="0" />
<Cursor1 position="565" topLine="2" />
</Cursor>
</File>
<File name="condition.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="229" topLine="0" />
</Cursor>
<Folding>
<Collapse line="8" />
<Collapse line="18" />
</Folding>
</File>
<File name="coreData.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="common.h" open="0" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="13402" topLine="16" />
<Cursor1 position="171" topLine="0" />
</Cursor>
</File>
<File name="gameObjNode.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1479" topLine="1" />
</Cursor>
</File>
<File name="coreData.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2901" topLine="51" />
</Cursor>
<Folding>
<Collapse line="11" />
<Collapse line="22" />
<Collapse line="24" />
<Collapse line="28" />
<Collapse line="32" />
<Collapse line="412" />
<Collapse line="38" />
<Collapse line="53" />
<Collapse line="198" />
<Collapse line="238" />
<Collapse line="258" />
<Collapse line="287" />
<Collapse line="325" />
<Collapse line="361" />
<Collapse line="366" />
<Collapse line="371" />
<Collapse line="385" />
<Collapse line="392" />
<Collapse line="475" />
<Collapse line="481" />
</Folding>
</File>
<File name="hdnesPackEditorcolourSelectDialog.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="hdnesPackEditorcolourSelectDialog.cpp" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3921" topLine="0" />
</Cursor>
<Folding>
<Collapse line="11" />
<Collapse line="82" />
<Collapse line="89" />
<Collapse line="98" />
<Collapse line="114" />
</Folding>
</File>
<File name="coreData.h" open="0" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="776" topLine="0" />
</Cursor>
</File>
<File name="classList.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="256" topLine="0" />
</Cursor>
</File>
<File name="gameObjNode.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2696" topLine="3" />
</Cursor>
</File>
<File name="hdnesPackEditorcolourSelectDialog.h" open="1" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="382" topLine="0" />
<Cursor1 position="490" topLine="10" />
</Cursor>
<Folding>
<Collapse line="34" />
<Collapse line="38" />
<Collapse line="43" />
<Collapse line="47" />
<Collapse line="52" />
<Collapse line="61" />
<Collapse line="232" />
<Collapse line="253" />
<Collapse line="263" />
</Folding>
</File>
<File name="hdnesPackEditorreplacementDialog.h" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1177" topLine="0" />
</Cursor>
</File>
<File name="gameTile.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1137" topLine="4" />
</Cursor>
<Folding>
<Collapse line="7" />
<Collapse line="22" />
<Collapse line="26" />
<Collapse line="56" />
<Collapse line="65" />
<Collapse line="135" />
<Collapse line="173" />
</Folding>
</File>
<File name="gameTile.h" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="40" topLine="0" />
</Cursor>
</File>
<File name="condition.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="4788" topLine="46" />
</Cursor>
<Folding>
<Collapse line="3" />
<Collapse line="15" />
<Collapse line="53" />
<Collapse line="108" />
<Collapse line="126" />
</Folding>
</File>
<File name="gameObjNode.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="tileReference.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1292" topLine="0" />
<Cursor1 position="1065" topLine="36" />
</Cursor>
<Folding>
<Collapse line="21" />
<Collapse line="65" />
</Folding>
</File>
<File name="mainForm.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="hdnesPackEditormainForm.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="10060" topLine="37" />
<Cursor1 position="91137" topLine="1713" />
</Cursor>
<Folding>
<Collapse line="331" />
<Collapse line="357" />
<Collapse line="444" />
<Collapse line="31" />
<Collapse line="32" />
<Collapse line="34" />
<Collapse line="47" />
<Collapse line="85" />
<Collapse line="88" />
<Collapse line="91" />
<Collapse line="103" />
<Collapse line="924" />
<Collapse line="1017" />
<Collapse line="1926" />
<Collapse line="1934" />
<Collapse line="1945" />
<Collapse line="1977" />
<Collapse line="1989" />
</Folding>
</File>
<File name="gameTile.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="tileReference.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="872" topLine="0" />
<Cursor1 position="412" topLine="0" />
</Cursor>
</File>
<File name="paletteSwap.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="279" topLine="0" />
</Cursor>
</File>
<File name="mainForm.cpp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="888" topLine="356" />
</Cursor>
</File>
</CodeBlocks_layout_file>

View file

@ -2245,7 +2245,7 @@ void hdnesPackEditormainForm::genGameObjItemConditionPack(fstream& file, wxTreeI
frameCounter = totalFrames;
for(int i = node->frameRanges.size() - 1; i > 0; --i){
frameCounter -= node->frameRanges[i].frameCnt;
file << "<condition>" << node->nodeName << "_" << node->frameRanges[i].frameName << ",frameRange," << main::intToHex(totalFrames) << "," << main::intToHex(frameCounter) << "\n";
file << "<condition>" << node->nodeName << "_" << node->frameRanges[i].frameName << ",frameRange," << (coreData::cData->verNo >= 103 ? main::intToStr(totalFrames) : main::intToHex(totalFrames)) << "," << (coreData::cData->verNo >= 103 ? main::intToStr(frameCounter) : main::intToHex(frameCounter)) << "\n";
}
}
for(int i = 0; i < node->tiles.size(); ++i){