Compare commits
16 commits
b71cf74e73
...
e4594fbb82
Author | SHA1 | Date | |
---|---|---|---|
|
e4594fbb82 | ||
|
7bfeb7952b | ||
|
194641f06d | ||
|
f3d666efef | ||
|
2708aef353 | ||
|
b589934e71 | ||
|
75a69441fe | ||
|
4aa35092a3 | ||
|
3c71d0ac9b | ||
|
d85e02a06b | ||
|
65b4d76a45 | ||
|
382fffdca9 | ||
|
c443f33dad | ||
|
09eae80dfb | ||
|
4ca549f1e7 | ||
|
900992db5f |
|
@ -1 +1 @@
|
|||
QNgtt}tQN€‘’…€‡‘™tttt€Š…<C5A0>tttt€‰’ˆQNgtt}uQN€‘’…€‡‘™tttt€Š…<C5A0>tttu€‰’ˆQNgtt}vQN€‘’…€‡‘™tttt€Š…<C5A0>tttv€‰’ˆQNgtt}wQN€‘’…€‡‘™tttt€Š…<C5A0>tttw€‰’DQNgtt}xQN€‘’…€‡‘™tttt€Š…<C5A0>tttx€‰’ˆQNgtuttQN€”–<E2809D>€Š…“tttx€˜–…ttut~tt}x~tt{w~ttv{QNgtxttQN€”–<E2809D>€ˆ’”txtt€Š<E282AC>otzut€‰š‰txtuQNgtxtuQN€‰š‰ttvt
|
||||
=:S``i`=:l}~qls}…````lvqy````lu~t=:S``ia=:l}~qls}…````lvqy```alu~t=:S``ib=:l}~qls}…````lvqy```blu~t=:S``ic=:l}~qls}…````lvqy```clu~t=:S``id=:l}~qls}…````lvqy```dlu~t=:S`a``=:l€‚ylvq```dl„‚q``a`j``idj``gcj``bg=:S`d0`=:l€‚ylv|z`fa`j`d`bls~€`d``j``baj````lƒ…``bblv|[`fa`lu†u`d`a=:S`d`a=:lu†u``b`=:S`d`b=:l{u‰l}ƒwu<77> ¤©^l~tls|lu~t=:S`dea=:lt~€`deals~€`de`j`abfj````lq~€`de`j``a`j```bl‡qy``aelt~€`de`lv|]`fa`ls~€`d``j``aej````lu~t
|
|
@ -1 +1 @@
|
|||
YVo||厊YV垯殟垙櫋|||~垝崟||||垜殣YVo||厎YV垯殟垙櫋|||~垝崟|||}垜殣YVo||厏YV垯殟垙櫋|||~垝崟|||~垜殣YVo||<7C>YV垯殟垙櫋|||~垝崟|||垜殣YVo||厐YV垯殟垙櫋|||~垝崟|||€垜殣YVo|}||YV垪懃垷洝||}}垗殰|}||唡|||唡||~垝崨||||垯<>||||YV垝槚|億唡}|}YV垹瀺||厗||厐唡|剙唡|}乊Vo|}|}YV垝榳|億€垹瀺||厗||厐唡|剙唡|}乊Vo|}|乊V垪懃垝崨|||€垹瀺||厗||厐唡|厎唡|}~YVo|~||YV垪懃垯煋牬眑古坷本祷量l净<6C>纗YV櫥嚎辣緇<E8BEA3>zz垰洂YVセ辆l<E8BE86><6C><EFBFBD>l阑l<E99891>拉<EFBFBD>YV悼l么焙l道縧喘蜡磍患焙縵垰洂垜殣YVo|||YV垪懃垯煋垹<E7858B>晄筶璴即趴弹淡簔YV敱颈xl副纋贡l颈驳父l呕辆l幢<6C>来z垰洂垙槢垬晈}|||垷洝||~|YV垥爾||}倖||~YV垝槚|億|唡|}垝榳|億|垼崟||亅垜<E4BA85>||乊Vo||}YV垝槚|億€唡|€YV垝槚|億~唡|YV垪懃垯煋垹<E7858B>牬眑<E789AC>岛弹l悼簊纋阑籰箔緕YV摶l富环l不緇炕贡l贡暗<E8B4A1>罕l来<6C>YV富环縧量<E7B8A7>副z垰洂垜殣YVo||~YV垪懃垯煋垥爕||}倛挊w|億~垝榳|儌|垝榳|億YV垞暊}|}倛牎灁<E7898E>氨發宦本l来眑墢辆眣嵏笁z垰洂垜殣YVo||YV垪懃垯煋垹<E7858B>櫗号l来<6C>房zYV柫坷l副纋贡l喘喊副l来眑颈坷z垰洂垜殣YVo||€YV垪懃垯煋垹<E7858B>樆环縧傅繁l来眑贡暗<E8B4A1>罕s縔V没痉岛硓垰洂垙槥煷眘父l<E788B6>l<EFBFBD><6C>l岛l<E5B29B>赖缓l岛YV夯l赖贡z垰洂YV嵏竘来<E7AB98>房l阑l呕義l徊l<E5BE8A>辆勘z垰洂垜殣YVo||乊V垜<56>||們YVo|}|YV垝槚|億€唡}YV垝L東億~唡}~YV垝槚|億}唡}}YV垪懃垯煋垹<E7858B>晄筶璴毫究眤垰洂YV昹量卑l阑l没痉l岛l来眑桓癥V<E799A5>岛弹l罕<6C><E7BD95>x垰洂垙槥<E59E99>纋道l铆縧勘灯卑l<E58D91>l炒豢揽xYV<59>發昹哺卑l幢颈z垰洂垜殣YVo|}}YV垪懃垯煋垹<E7858B>嵕眑呕羖璴簿当喊l徊l幢究媹殯悎彉灂瞝呕羖<E59195>颈l<E9A288>涣纋幢緓l晄癥V<E799A5>碌勘l呕羖阑l盎l<E79B8E>l来眑盎<E79C91>痪YV凯趴z垰洂垜殣YVo|}~YV垪懃垯煋垹<E7858B>摶话l痘畓YVセ羖暗昂s纋勘眑<E58B98>舕炒豢揽xYV暗發呕翄垰洂垜殣YVo|}YV垪懃垯煋垹<E7858B>洿xl暗發呕羖<E59195>贡l阑l<E99891>悲穀V良l缓l来<6C>l车靖媹殯悎彉灍幢l帽豪l徊瞝阑铆景縧来盰Vn幓粮氨緇彺<E7B787><E5BDBA>緉z垰洂垜殣YVo|~|YV垝槚|億~唡~~YV垝槚|億}唡~}垝榳|億}YV垪懃垯煋垹<E7858B>垝崗||}厸磝l幢舖垰洂垙槥敪卤簊纋勘焙l<E78499><6C>岛YV璴么蹈眤垰洂YVセ羢颈l富环岛砽郴话m垰洂垜殣YVo|~}YV垪懃垯煋垹<E7858B>垝崗||~|昹苛韭德卑xl疟<6C>xl<78>繷V夯胠么<E883A0>媹殯悎彉灀帘靠l晄筶读坷l郴岛砓V阑l康纋幢颈l<E9A288>發净纙zz垰洂垜殣YVo|~~YV垪懃垷崰垯煋垝崗||~|牬本眘縧缓概l缓眑铆臲V涣纋徊l来眑槶<E79C91>镜豪磟垰洂垙槥セ羖喘卤l阑l潮纋辑坷YV来眑车<E79C91>纋净<E7BA8B>l岛l来盰V幓粮氨緇彺<E7B787><E5BDBA>緕垰洂垙槥晄發郴l玫来l呕義垰洂垙槥<E59E99>纋玫来l来眑坷<E79C91>眑晄筜V岛xl晄發读坷l潮纋岛YV呕辆l铆舲zz垰洂垝榳|儌|垝榳|億垜殣YVo|€||YV垪懃垝槚|億亞|||}垝榳|億亪煕<E4BAAA>|~~垙殰|€||唡|~}唡|||垜<>|€|}YVo|€|}YV垜<56>||倕
|
||||
-*CPPYP-*\mna\cmuPPPR\faiPPPP\fljVRPRZPPYU\end-*CPPYQ-*\mna\cmuPPPR\faiPPPQ\fljVRPRZPPYU\end-*CPPYR-*\mna\cmuPPPR\faiPPPR\fljVRPRZPPYU\end-*CPPYS-*\mna\cmuPPPR\faiPPPS\fljVRPRZPPYU\end-*CPPYT-*\mna\cmuPPPR\faiPPPT\fljVRPRZPPYU\end-*CPPYU-*\cmpPPQWZPPPSZPQSX\cmpPPQWZPPPRZPPPP\cmpPPQWZPPPTZPPPP\end-*-*CPQPP-*\key\souPPQQ\anpPQPPZPPPPZPPPR\faoPPPP\mydPPPP-*\fljPWPSZPQPQ-*\traPPSYZPPYTZPPXTZPPQU-*CPQPQ-*\flKPWPT\traPPSYZPPYTZPPXTZPPQU-*CPQPU-*\key\faoPPPT\traPPSYZPPYTZPPYQZPPQR-*CPRPP-*\key\msgt<67>@甑灯<E79491>縁蕪@衷o猫-*m庶灯<E5BAB6>@xNNN\nod-*y助叩ヨ℃ュ@拍@#煤ル-*遠@来<>@鉛邸<E9899B>買<EFBFBD>署<EFBFBD>哲\nod\end-*CPSPP-*\key\msg\turiG后 粋剴宴堰晒-*h<><68>@桁如劫@着<>血@剌葡@<40>′蝿N\nod\clo\liKQPPP\souPPRP-*\itjPPQVZPSPR-*\fljPWPPZPSPQ\flKPWPP\waiPPUP\evePSPU-*CPSPQ-*\fljPWPTZPSPT-*\fljPWPRZPSPS-*\key\msg\turt<72>@レ猿宴@遠雑如拍宗<E68B8D>誰-*g宗件暑@<40>叩棟劫@劫чラ糸@蝿#-*件暑邸蕪≠桁N\nod\end-*CPSPR-*\key\msg\itMPPQV\flKPWPR\flKPWVP\flKPWPS-*\gitQPQV\turh℃уА叙<D090>@蝿<>]c葡<63>a血]N\nod\end-*CPSPS-*\key\msg\turm℃僉蝿℃挙N-*j蕪如桁如劫@<40>私桁@蝿<>着灯N\nod\end-*CPSPT-*\key\msg\turl緒挙@潔球@蝿<>劫чラ糸G<E7B3B8>-*酪昼猿⑮\nod\clrs<72>G血@e@aル@猿@<秤庶@猿-*誌@秤劫N\nod-*a血@蝿℃挙@拍 剌畢@醇@ワ葡套N\nod\end-*CPSPU-*\evePPVW-*CPSQP-*\fljPWPTZPSQS-*\fljPWPRZPSQR-*\fljPWPQZPSQQ-*\key\msg\turiG后 歯駐<E6ADAF>\nod-*i@蕪<>@拍@酪昼@猿@蝿<>曙<EFBFBD>-*レ猿宴@糸£yL\nod\clru如鉛@浴邸套凹<E5A597>@y@㊧藷箔L-*℃Аi@<40><>@<40>着N\nod\end-*CPSQQ-*\key\msg\tura着@剌鼻 <E9BCBB>怨私@醇@<40>駐_\nod\clri<72>剌鼻メ着@≠助如<E58AA9>鱈@iG<69>-*>哩套@剌鼻拍@э@%@蝿<>эヴ薯-*刀剴N\nod\end-*CPSQR-*\key\msg\turg緒А鰹<D090>-*y助@чьG如套<E5A682>℃僉㊧藷箔L-*чА剌廟\nod\end-*CPSQS-*\key\msg\turo<72>@чА剌鼻ワ劫@拍@ヨ<><E383A8>-*武@庶@蝿#@㊨柱_\nod\clrs<72>@羅飼@醇<>拍浴嫡邸蝿<E982B8>-*Bb助隙<E58AA9>@c<>高<EFBFBD>BN\nod\end-*CPSRP-*\fljPWPRZPSRR-*\fljPWPQZPSRQ\flKPWPQ-*\key\msg\tur\facPPQYo<59>@<40>僊\nod\clrh*<68>G如套<E5A682>@you@猿-* 来煙<E69DA5>\nod-*y助G着@件暑猿①㍼巡A\nod\end-*CPSRQ-*\key\msg\tur\facPPRPi@燈猪塩<E78CAA>L@刔∴L@u<>-*誌諭来#_\nod\clrg腐涛@iG后兜灯@㍼猿<E38DBC>-*拍@悼如<E682BC>着@℃А衷年NN\nod\end-*CPSRR-*\key\sat\msg\facPPRPt<50>着G邸庶嫌@庶<>浴<EFBFBD>-*助如醇@蝿<>l≠剪猿蝿N\nod\clry助@<40>妹@拍@㊤如吹灯-*蝿<>㊨℃如衷ル@猿@蝿<>-*b助隙<E58AA9>@c<>高<EFBFBD>N\nod\clriGА㍼@莱蝿@剌畢\nod\clru如莱蝿@蝿<>灯#<E781AF>iG<69>-*猿L@iGА兜灯@㊤如猿-*剌葡@浴儂NN\nod\flKPWVP\flKPWPS\end-*CPTPP-*\key\fljPWPUZPPPQ\flKPWPU\souPPRR\cnpPTPPZPPRQZPPPP\evePTPQ-*CPTPQ-*\evePPVY
|
|
@ -1 +1 @@
|
|||
>;Taaja>;m~rmt~<7E>adhmwrzaaaamw}{gcackaajfmvu>;Taajb>;m~rmt~<7E>adhmwrzaaabmw}{gcackaajfmvu>;Taajc>;m~rmt~<7E>adhmwrzaaacmw}{gcackaajfmvu>;Taajd>;m~rmt~<7E>adhmwrzaaadmw}{gcackaajfmvu>;Taaje>;m~rmt~<7E>adhmwrzaaaemw}{gcackaajfmvu>;Taajf>;mt~∥aiakaaagkaabgmvu>;Tabaa>;m<zmwraaacm<63>raadikaajckaaafkaaad>;Tabab>;Tabac>;m<zmо<6D>abbmu∥bacmwraaaem<65>raaeakaajckaaaekaaaf>;Tabad>;mw}{agibkabaf>;mz<6D>aabhkabae>;m<zm~з}<7D>莫抹_mumvu>;Tabae>;m<zmо<6D>accmxz<78>abhmw}\agibmz<6D>aabh>;m~зm<D0B7>ユ、抹Q・剿Qnt撓泅撚|蓑n_mumt}mv<6D>abaf>;Tabaf>;m<zmо<6D>abbmu∥badmwraaaam<61>raae1kaajakaabfkaaaj>;Tabag>;m|v確о<E7A2BA>abbmr∥bagkaaaakaaacmwraaaem<65>raaeckaajekaaafkaaaj>;Tabba>;mv<6D>abbb>;Tabbb>;m|v確о<E7A2BA>abbmr∥bbakaaaakaaacmwraaacm<63>raaedkaajckaaaekaabd>;Tabca>;m|v確wraaaem<65>raaeakaajekaabckaaac>;Tadaa>;Tadab>;mu∥dabmsraaabmw}^agiamvu>;Tadac>;mu∥dacmt~<7E>aahmsraabamt∥daakaabdkaaaamsмaaaamvu>;Tbaaa>;m|v確wsaaaakaabgm<67>zacfamt~<7E>aaa>;m~<7E>m<EFBFBD>ノt~<7E>abf>;u沫亦・抹Q~<7E>洟・魅Q雲mw~aabgm<67>zabgamw}\gbagmumt}mt~<7E>adh>;mt∥daakaaaakaaaamw}\agiamvu>;Tbcaa>;m|v確r|caakaacakaaac>;mwbcaakaabgmwrzaaab>;m<>zabaamwraaabm<62>raaehkbcaakaadikaabg
|
||||
=:S``i`=:l}~qls}…``cglvqy````lu~t=:S``ia=:l}~qls}…``cglvqy```alu~t=:S``ib=:l}~qls}…``cglvqy```blu~t=:S``ic=:l}~qls}…``cglvqy```clu~t=:S``id=:l}~qls}…``cglvqy```dlu~t=:S`a``=:l€‚ylvq```bl„‚q``chj``ibj```ej```c=:S`a`a=:S`a`b=:l€‚ylƒ…``aalt~€`a`blvq```dl„‚q``d`j``ibj```dj```e=:S`a`c=:lv|z`fhaj`a`e=:ly„z``agj`a`d=:l€‚yl}ƒw|Ÿ“›•”^l~tlu~t=:S`a`d=:l€‚ylƒ…``bblwy„a`aglv|[`fhaly„]``ag=:l}ƒwl„…‚…£•”P¤˜•Pmsœ™ž™“P{•©m^l~tls|lu†u`a`e=:S`a`e=:l€‚ylƒ…``aalt~€`a`clvq````l„‚q``daj``i`j``aej```i=:S`a`f=:l{u‰lƒ…``aalq~€`a`fj``0`j```blvq```dl„‚q``dbj``idj```ej```i=:S`aa`=:lu†u`aaa=:S`aaa=:l{u‰lƒ…``aalq~€`aa`j````j```blvq```bl„‚q``dcj``ibj```dj``ac=:S`ab`=:l{u‰lvq```dl„‚q``d`j``idj``abj```b=:S`c``=:S`c`a=:lt~€`c`alrq```alv|]`fh`lu~t=:S`c`b=:lt~€`c`bls}…```glrq``a`ls~€`c``j``acj````lrƒ|````lu~t=:Sa```=:l{u‰lvr````j``afl‡qy`be`ls}…````=:l}ƒcl„…‚ls}…``ae=:t•–•‘¤•”P}Ÿž£¤•¢Pˆ^lv}``afl‡qy`af`lv|[fa`fl~tls|ls}…``cg=:ls~€`c``j````j````lv|[`fh`lu~t=:Sab``=:l{u‰lq~€ab``j``b`j```b=:lv~ab``j``aflvqy```a=:l‡qy`a``lvq```al„‚q``dgjab``j``chj``af
|
|
@ -1 +1 @@
|
|||
-*CPPYP-*\mna\cmuPPQT\faiPPPP\end-*CPPYQ-*\mna\cmuPPQT\faiPPPQ\end-*CPPYR-*\mna\cmuPPQT\faiPPPR\end-*CPPYS-*\mna\cmuPPQT\faiPPPS\end-*CPPYT-*\mna\cmuPPQT\faiPPPT\fljVQPYZPPYV\end-*CPPYU-*\faiPPPQ\end-*CPPYV-*\fljQPTRZPPYW\end-*CPPYW-*\dnpPXSV\end-*CPQPP-*\key\anpPQPPZPPPPZPPPR\souPPQQ-*\faoPPPT\css\traPPTXZPPYTZPQUSZPPQV-*CPRPP-*\key\sat-*\fljQTTQZPRPS-*\fljQTTPZPRPR-*\fljPXSUZPRPQ-*\msg\turw薯<77>@潔㊧如武@蝿<>塔着<E5A194>N\nod\clr-*PTMPXMPX@w掩<77>o着@ヨ煙Н\nod\end-*CPRPQ-*\key\msg\turw薯<77>@潔㊧如武@蝿<>塔着<E5A194>N\nod\clr-*\turw<72>@э雑如剌鼻煤球@ 着灯_\nod\end-*CPRPR-*\key\flKQTTU\msg\turw薯<77>@潔㊧如武@蝿<>塔着<E5A194>N\nod\clr\tury助@去女L@i@醇賠察着ワ嫡<E383AF>@来#-*i@桁£糸А猿@蝿#@誌賠o暑NNN\nod\end-*CPRPS-*\key\msgw薯<77>@潔㊧如武@蝿<>塔着<E5A194>N\nod\clr-*\turi@崇☆@<40>叩剌葡@哩ヴ薯儂\nod\end-*CPRQP-*CPRRP-*\key\msgy助@<40>私@誌蝿猿①醇@猿賠着灯NNN\nod\end-*CPRRQ-*\key\sat\msgt<67>着G邸 誌賠o暑L@ワ妹着<E5A6B9>-*猿@<40>灯NNN\nod\fljQTTQZPRRS\fljQTTUZPRRR\end-*CPRRR-*\key\msg\tur-*d宗剌鼻浴飼@拍@署<> 蝿<>誌賠o暑_\ynjPPPP\flKQTTQ-*\clr\cmuPPQPl<50>虫<EFBFBD>@<40>諭拍@白<>如<EFBFBD>緒у<E7B792>-*衷o箔A\waiPQVP\nod\rmu\end-*CPRRS-*\key\msgn諸<6E>紫@<40>套@<40>着@$水£<E6B0B4>-*<2A>水ラ′嫌@蕪<>阜NNN\nod\end-*CPRTP-*\key\msg\turg宗aル@拍@蝿<>戟y忠飼<E5BFA0>\ynjPPPP-*\pri\faoPPPT\traPPTVZPPYTZPPPXZPPPY-*CPRUP-*\key-*\sat-*\fljQTTTZPRUW-*\fljQTTRZPRUT-*\fljQTTQZPRUS-*\fljQTTPZPRUR-*\fljPXSVZPRUQ\evePPQY-*CPRUQ-*\key\msg-*d宗剌鼻浴飼@拍@着灯_\ynjPPPP\faoPPPT\cmuPPPP\waiPPRP\clr-*NNNNN\nod\clo-*\waiPQPP\liKQPPP-*\dnpPRQP\flMPXSV\flKQTTP\mydPPPR\rmu-*\traPPWSZPPYUZPPQRZPPPY-*CPRUR-*\key\msg\turs<72>@遠雑如刻哩紫L@u如鉛@件暑<E4BBB6>-*潔球@嶋<>邸灯煙掘′塩<E280B2>\nod\end-*CPRUS-*\key\msg\turd宗剌鼻浴飼@拍@<40>♂察蝿<E5AF9F>浴賠<E6B5B4>-*<2A>渚@c葡嫌_\ynjPPPP\clo-*\flKQTTR\faoPPPQ\cmuPPPP\waiPQPP\faiPPPQ-*\waiPPVP-*\cmuPPQT\anpPRVPZPPPQZPPPR\waiPPTP\anpPRVPZPPPQZPPPP-*\waiPPUP-*\msg\turs<72>@<40>血@棟侮А%桁<EFBC85>N\nod-*\end-*CPRUT-*\key\cnpPRVPZPRUYZPPPP\flKPXSV\flKQPTR\flMQTTP\flKQTTT\waiPPQP\end-*CPRUW-*\key\msgt<67>@eЖ邸棟瑞猿①羅年\nod\end-*CPRVP
|
||||
-*CPPYP-*\mna\cmuPPQT\faiPPPP\end-*CPPYQ-*\mna\cmuPPQT\faiPPPQ\end-*CPPYR-*\mna\cmuPPQT\faiPPPR\end-*CPPYS-*\mna\cmuPPQT\faiPPPS\end-*CPPYT-*\mna\cmuPPQT\faiPPPT\fljVQPYZPPYV\end-*CPPYU-*\faiPPPQ\end-*CPPYV-*\fljQPTRZPPYW\end-*CPPYW-*\dnpPXSV\end-*CPQPP-*\key\anpPQPPZPPPPZPPPR\souPPQQ-*\faoPPPT\css\traPPTXZPPYTZPQUSZPPQV-*CPRPP-*\key\sat-*\fljQTTQZPRPS-*\fljQTTPZPRPR-*\fljPXSUZPRPQ-*\msg\turw薯<77>@潔㊧如武@蝿<>塔着<E5A194>N\nod\clr-*PTMPXMPX@w掩<77>o着@ヨ煙Н\nod\end-*CPRPQ-*\key\msg\turw薯<77>@潔㊧如武@蝿<>塔着<E5A194>N\nod\clr-*\turw<72>@э雑如剌鼻煤球@ 着灯_\nod\end-*CPRPR-*\key\flKQTTU\msg\turw薯<77>@潔㊧如武@蝿<>塔着<E5A194>N\nod\clr\tury助@去女L@i@醇賠察着ワ嫡<E383AF>@来#-*i@桁£糸А猿@蝿#@誌賠o暑NNN\nod\end-*CPRPS-*\key\msgw薯<77>@潔㊧如武@蝿<>塔着<E5A194>N\nod\clr-*\turi@崇☆@<40>叩剌葡@哩ヴ薯儂\nod\end-*CPRQP-*CPRRP-*\key\msgy助@<40>私@誌蝿猿①醇@猿賠着灯NNN\nod\end-*CPRRQ-*\key\sat\msgt<67>着G邸 誌賠o暑L@ワ妹着<E5A6B9>-*猿@<40>灯NNN\nod\fljQTTQZPRRS\fljQTTUZPRRR\end-*CPRRR-*\key\msg\tur-*d宗剌鼻浴飼@拍@署<>@蝿<> 誌賠o暑_\ynjPPPP\flKQTTQ-*\clr\cmuPPQPl<50>虫<EFBFBD>@<40>諭拍@白<>如<EFBFBD>緒у<E7B792>-*衷o箔A\waiPQVP\nod\rmu\end-*CPRRS-*\key\msgn諸<6E>紫@<40>套@<40>着@$水£<E6B0B4>-*<2A>水ラ′嫌@蕪<>阜NNN\nod\end-*CPRTP-*\key\msg\turg宗aル@拍@蝿<>戟y忠飼<E5BFA0>\waiPPTP\ynjPPPP-*\pri\faoPPPT\traPPTVZPPYTZPPPXZPPPY-*CPRUP-*\key-*\sat-*\fljQTTTZPRUW-*\fljQTTRZPRUT-*\fljQTTQZPRUS-*\fljQTTPZPRUR-*\fljPXSVZPRUQ\evePPQY-*CPRUQ-*\key\msg-*d宗剌鼻浴飼@拍@着灯_\ynjPPPP\faoPPPT\cmuPPPP\waiPPRP\clr-*NNNNN\nod\clo-*\waiPQPP\liKQPPP-*\dnpPRQP\flMPXSV\flKQTTP\mydPPPR\rmu-*\traPPWSZPPYUZPPQRZPPPY-*CPRUR-*\key\msg\turs<72>@遠雑如刻哩紫L@u如鉛@件暑<E4BBB6>-*潔球@嶋<>邸灯煙掘′塩<E280B2>\nod\end-*CPRUS-*\key\msg\turd宗剌鼻浴飼@拍@<40>♂察蝿<E5AF9F>浴賠<E6B5B4>-*<2A>渚@c葡嫌_\ynjPPPP\clo-*\flKQTTR\faoPPPQ\cmuPPPP\waiPQPP\faiPPPQ-*\waiPPVP-*\cmuPPQT\anpPRVPZPPPQZPPPR\waiPPTP\anpPRVPZPPPQZPPPP-*\waiPPUP-*\msg\turs<72>@<40>血@棟侮А%桁<EFBC85>N\nod-*\end-*CPRUT-*\key\cnpPRVPZPRUYZPPPP\flKPXSV\flKQPTR\flMQTTP\flKQTTT\waiPPQP\end-*CPRUW-*\key\msgt<67>@eЖ邸棟瑞猿①羅年\nod\end-*CPRVP
|
|
@ -1 +1 @@
|
|||
|y挓煥焲y<E784B2>桨<EFBFBD>还煝 <E7859D>煥か布臒煙ǐ蛋笩煙煫唇硘y挓煥爘y<E78898>桨<EFBFBD>还煝 <E7859D>煥カ布臒煙ǐ蛋笩煙牜唇硘y挓煥<E68C93>y<EFBFBD>桨<EFBFBD>还煝 <E7859D>煥Λ布臒煙ǐ蛋笩煙~唇硘y挓煥<E68C93>y<EFBFBD>桨<EFBFBD>还煝 <E7859D>煥Й布臒煙ǐ蛋笩煙<E7ACA9>唇硘y挓煥<E68C93>y<EFBFBD>桨<EFBFBD>还煝 <E7859D>煥ǐ布臒煙ǐ蛋笩煙+唇硘y挓煥<E68C93>y<EFBFBD>寄煙¨<E78599>案煙煙<E78599>匠|y挓煥<E68C93>y<EFBFBD>寄煙¨<E78599>案煙煚<E78599>匠|y挓煥<E68C93>y<EFBFBD>寄煙¨<E78599>案煙煛<E78599>匠|y挓煥<E68C93>y<EFBFBD>寄煙¨<E78599>案煙煝<E78599>匠|y挓煥▅y<E29685>寄煙¨<E78599>案煙煟<E78599>匠|y挓牊焲y<E784B2>粮<EFBFBD>熬煙煛<E78599>涟煙牋<E78599>煥々煙煚<E78599>煝<EFBFBD>y挓牊爘y<E78898>粮<EFBFBD>熬煙煛<E78599>涟煙牋<E78599><E7898B>З煙煚<E78599>煝<EFBFBD>y挓<79>焲y<E784B2>慈<EFBFBD>露落援<E890BD>境<EFBFBD>涣仍凶洀笍谳捩徸葬潾骄硘y米秀栤忋自徱溷詮重巅忔邹忊阈桠|y肄捱杂忎邚剌彴徙卒釚鈴邹溻詜y雄蹚阕詮阖茉洀嶝肿惝<E882BF>境|y伦詮庾捩杂忎邚自嵩忀捭忋揶|y坜葜徯洲潾骄硘y圃徴o漭訌自釓嫘庾杂忎邚嶝肿銃y自嵩徹輳阕詮嵩庠徨挢釢<E68CA2>境|y伦詮愚遭輺銖庠攒忋迯圬谠忎鈢y茕易潩潾骄硘y笍愚輺銖谳捩忔阻洀庳菀詮庾詵鈢y袕钾茇中徺溻銖圬谠忎鉂<E5BF8E>境<EFBFBD>匠|y挓<79>焲y<E784B2>粮|y<>粴煝ˉ<E7859D>粴煝<E7B2B4><E7859D>粶煝<E7B2B6><E7859D>粴煝ァ|y<>娇煝煙<E7859D>糯煝煚|y挓<79>爘y<E78898>糯煙ぃ|y挓<79>焲y<E784B2>匠|y挓<79>爘y<E78898>慈<EFBFBD>瘸煙煛<E78599>娇煟煙<E7859F>露<EFBFBD>安煙煡白惈骄倡不緗y<E7B797>娇煟煛<E7859F>煙ォ煙煛<E78599>案煙Η<E78599>娇煟煛<E7859F>粴煝<E7B2B4><E7859D>匠|y挓<79><E68C93>y挓 焲y<E784B2>慈<EFBFBD>寄煙煙<E78599>疾<EFBFBD>瘸煙煛|y<>娇煟牊<E7859F>牑煩煙煙<E78599>案煙煚|y<>娇煟牊<E7859F>煚牘煙煛<E78599>案煚<E6A188>|y<>案煙煚<E78599>案煚煙|y<>疾<EFBFBD>娇煟牊<E7859F>案煙<E6A188><E78599>寄煙¨<E78599>糯煟牋|y挓 爘y<E78898>还。煟<E38082>煙煫祷殹<E7A5B7>+磁礋 <E7A48B>y挓 <E68C93>y<EFBFBD>糯煙Д|y挓<79>焲y<E784B2>慈<EFBFBD>露<EFBFBD>牧掇徰幸趶戕忋自徾醒栳剌阕<E5898C>冉篃煙焲y<E784B2>粮<EFBFBD>熬煙煟<E78599>涟煙%<E78599>煥)煙煣<E78599>煙<EFBFBD>
|
||||
-*CPPYP-*\mna\fljPSTQZPPYU\cmuPPPY\faiPPPP\end-*CPPYQ-*\mna\fljPSTQZPPYV\cmuPPPY\faiPPPQ\end-*CPPYR-*\mna\fljPSTQZPPYW\cmuPPPY\faiPPPR\end-*CPPYS-*\mna\fljPSTQZPPYX\cmuPPPY\faiPPPS\end-*CPPYT-*\mna\fljPSTQZPPYY\cmuPPPY\faiPPPT\end-*CPPYU-*\cmuPPRX\faiPPPP\end-*CPPYV-*\cmuPPRX\faiPPPQ\end-*CPPYW-*\cmuPPRX\faiPPPR\end-*CPPYX-*\cmuPPRX\faiPPPS\end-*CPPYY-*\cmuPPRX\faiPPPT\end-*CPQPP-*\pri\faoPPPR\traPPQQZPPYRZPPPQZPPSX-*CPQPQ-*\pri\faoPPPR\traPPQQZPSPXZPPPQZPPSX-*CPRPP-*\key\msgs腐_\nod\clry<72><79>@i@去女@<40>誰\nod-*t<>濡邸蝿<E982B8>ヵ賠@㊨柱@来宗灯☆<E781AF>-*ワ署<E383AF>@武@猿@a樗<61>竪邸<E7ABAA>蕪<EFBFBD>-*′掘蝿<E68E98>秤劫L@忠㊧農\nod-*s<>@嶋女<E5B68B>@武@<40>着@誌如拍<E5A682>-*件紫@∞蒐\nod-*w<><77>侮<EFBFBD> <20>叩浴嶋<E6B5B4>@武@忠㊧<E5BFA0>-*<2A>着@猿@蝿<>着套猪初誰\nod-*s<>@э<>雑如套<E5A682>@拍@潔球@蕪-*黒ヨNNN\nod-*i@э雑如去女@来儉@悼祉<E682BC>嶋<EFBFBD><E5B68B>-* m燕援 兜灯@潔球@蕪N\nod\end-*CPSPP-*\pri-*\flKPSRV\flKPSWQ\flMPSRQ\flKPSVR-*\dnpPSPP\evePSPQ-*CPSPQ-*\evePPUT-*CPTPP-*\end-*CPTPQ-*\key\mydPPPR\dnpPTPP\msg\facPPPVa<56>\nod\clo-*\anpPTPRZPPPVZPPPR\waiPPWX\dnpPTPR\flKPSWQ\end-*CPTPR-*CPTQP-*\key\cmuPPPP\hmc\mydPPPR-*\cnpPTQPZPQUPZPPPP\waiPPPQ-*\anpPTQPZPPQQZPPPR\waiPQUP-*\faiPPPQ\waiPQPP-*\smc\dnpPTQP\waiPPUP\cmuPPRX\evePTQQ-*CPTQQ-*\fljRTPTZPPPP\flKRTPT\evePTQR-*CPTQR-*\evePPXV-*CPUPP-*\key\msg\turg宗aル@拍@蝿<>戟y忠飼<E5BFA0>\waiPPTP\ynjPPPP-*\pri\faoPPPT\traPPTVZPPYTZPPPXZPPPY
|
|
@ -9,13 +9,14 @@
|
|||
<MNA<CMU0000<FAI0003<END
|
||||
#0094
|
||||
<MNA<CMU0000<FAI0004<END
|
||||
|
||||
#0100
|
||||
<PRI<FAO0004<TRA0010:0094:0073:0027
|
||||
|
||||
#0400
|
||||
<PRI<DNP0400<FL+0610<EVE0401
|
||||
<PRI<FLJ0610:0402<CNP0400:0021:0000<SOU0022<FL+0610<EVE0401
|
||||
#0401
|
||||
<EVE0020
|
||||
#0402
|
||||
<KEY<MSGEmpty.<NOD<CLO<END
|
||||
|
||||
|
||||
#0451
|
||||
<DNP0451<CNP0450:0126:0000<ANP0450:0010:0002<WAI0015<DNP0450<FL-0610<CNP0400:0015:0000<END
|
|
@ -1,16 +1,17 @@
|
|||
|
||||
#0090
|
||||
<MNA<CMU0002<FAI0000<END
|
||||
<MNA<CMU0002<FAI0000<FLJ6202:0095<END
|
||||
#0091
|
||||
<MNA<CMU0002<FAI0001<END
|
||||
<MNA<CMU0002<FAI0001<FLJ6202:0095<END
|
||||
#0092
|
||||
<MNA<CMU0002<FAI0002<END
|
||||
<MNA<CMU0002<FAI0002<FLJ6202:0095<END
|
||||
#0093
|
||||
<MNA<CMU0002<FAI0003<END
|
||||
<MNA<CMU0002<FAI0003<FLJ6202:0095<END
|
||||
#0094
|
||||
<MNA<CMU0002<FAI0004<END
|
||||
|
||||
|
||||
<MNA<CMU0002<FAI0004<FLJ6202:0095<END
|
||||
#0095
|
||||
<CMP0017:0003:0138<CMP0017:0002:0000<CMP0017:0004:0000<END
|
||||
Make the chest (5HP Life Capsule) always accessible in Camp mode
|
||||
|
||||
|
||||
#0100
|
||||
|
|
|
@ -1,16 +1,14 @@
|
|||
|
||||
#0090
|
||||
<MNA<CMU0037<FAI0000<FLJ6202:0095<END
|
||||
<MNA<CMU0037<FAI0000<END
|
||||
#0091
|
||||
<MNA<CMU0037<FAI0001<FLJ6202:0095<END
|
||||
<MNA<CMU0037<FAI0001<END
|
||||
#0092
|
||||
<MNA<CMU0037<FAI0002<FLJ6202:0095<END
|
||||
<MNA<CMU0037<FAI0002<END
|
||||
#0093
|
||||
<MNA<CMU0037<FAI0003<FLJ6202:0095<END
|
||||
<MNA<CMU0037<FAI0003<END
|
||||
#0094
|
||||
<MNA<CMU0037<FAI0004<FLJ6202:0095<END
|
||||
#0095
|
||||
<CMP0080:0006:0016<END In Camp mode, make Camp chest accessible without flight or damage boost
|
||||
<MNA<CMU0037<FAI0004<END
|
||||
|
||||
#0100
|
||||
<PRI<FAO0002<TRA0038:0092:0005:0003
|
||||
|
|
|
@ -15,11 +15,9 @@
|
|||
<FLJ1042:0097<END
|
||||
#0097
|
||||
<DNP0836<END
|
||||
|
||||
#0100
|
||||
<KEY<ANP0100:0000:0002<SOU0011
|
||||
<FAO0004<CSS<TRA0048:0094:0153:0016
|
||||
|
||||
#0200
|
||||
<KEY<SAT
|
||||
<FLJ1441:0203
|
||||
|
@ -27,21 +25,16 @@
|
|||
<FLJ0835:0201
|
||||
<MSG<TURWords light up the screen.<NOD<CLR
|
||||
04-08-08 Wife bore child.<NOD<END
|
||||
|
||||
#0201
|
||||
<KEY<MSG<TURWords light up the screen.<NOD<CLR
|
||||
<TURWhy don't you take a rest?<NOD<END
|
||||
|
||||
#0202
|
||||
<KEY<FL+1445<MSG<TURWords light up the screen.<NOD<CLR<TURYou know, I often recorded what
|
||||
I learned in that notebook...<NOD<END
|
||||
|
||||
#0203
|
||||
<KEY<MSGWords light up the screen.<NOD<CLR
|
||||
<TURI pray for your victory.<NOD<END
|
||||
|
||||
#0210
|
||||
|
||||
#0220
|
||||
<KEY<MSGYou find nothing of interest...<NOD<END
|
||||
#0221
|
||||
|
@ -55,11 +48,9 @@ robots!<WAI0160<NOD<RMU<END
|
|||
#0223
|
||||
<KEY<MSGNothing else here appears
|
||||
especially useful...<NOD<END
|
||||
|
||||
#0240
|
||||
<KEY<MSG<TURGo back to the labyrinth?<YNJ0000
|
||||
<KEY<MSG<TURGo back to the labyrinth?<WAI0040<YNJ0000
|
||||
<PRI<FAO0004<TRA0046:0094:0008:0009
|
||||
|
||||
#0250
|
||||
<KEY
|
||||
<SAT
|
||||
|
@ -91,6 +82,4 @@ from Curly?<YNJ0000<CLO
|
|||
<KEY<CNP0260:0259:0000<FL+0836<FL+1042<FL-1440<FL+1444<WAI0010<END
|
||||
#0257
|
||||
<KEY<MSGThe bed's sopping wet.<NOD<END
|
||||
|
||||
#0260
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
<MNA<FLJ0341:0098<CMU0009<FAI0003<END
|
||||
#0094
|
||||
<MNA<FLJ0341:0099<CMU0009<FAI0004<END
|
||||
|
||||
#0095
|
||||
<CMU0028<FAI0000<END
|
||||
#0096
|
||||
|
@ -20,14 +19,10 @@
|
|||
<CMU0028<FAI0003<END
|
||||
#0099
|
||||
<CMU0028<FAI0004<END
|
||||
|
||||
#0100
|
||||
<PRI<FAO0002<TRA0011:0092:0001:0038
|
||||
#0101
|
||||
<PRI<FAO0002<TRA0011:0308:0001:0038
|
||||
|
||||
|
||||
|
||||
#0200
|
||||
<KEY<MSGSue?<NOD<CLRYeah, I know her.<NOD
|
||||
That's the cute girl who stays
|
||||
|
@ -41,23 +36,18 @@ She doesn't seem to like us
|
|||
much...<NOD
|
||||
I don't know why, since she's
|
||||
a Mimiga just like us.<NOD<END
|
||||
|
||||
#0300
|
||||
<PRI
|
||||
<FL+0326<FL+0371<FL-0321<FL+0362
|
||||
<DNP0300<EVE0301
|
||||
|
||||
#0301
|
||||
<EVE0054
|
||||
|
||||
|
||||
#0400
|
||||
<END
|
||||
#0401
|
||||
<KEY<MYD0002<DNP0400<MSG<FAC0006Ah!<NOD<CLO
|
||||
<ANP0402:0006:0002<WAI0078<DNP0402<FL+0371<END
|
||||
#0402
|
||||
|
||||
#0410
|
||||
<KEY<CMU0000<HMC<MYD0002
|
||||
<CNP0410:0150:0000<WAI0001
|
||||
|
@ -68,8 +58,6 @@ a Mimiga just like us.<NOD<END
|
|||
<FLJ2404:0000<FL+2404<EVE0412
|
||||
#0412
|
||||
<EVE0086
|
||||
|
||||
#0500
|
||||
<KEY<MSG<TURGo back to the labyrinth?<YNJ0000
|
||||
<KEY<MSG<TURGo back to the labyrinth?<WAI0040<YNJ0000
|
||||
<PRI<FAO0004<TRA0046:0094:0008:0009
|
||||
|
||||
|
|
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 180 KiB |
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 180 KiB |
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 180 KiB |
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 180 KiB |
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 180 KiB |
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 180 KiB |
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 180 KiB |
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 180 KiB |
|
@ -3,7 +3,7 @@ local function lifeCapsule3()
|
|||
name = "Life Capsule",
|
||||
script = "<EVE0012",
|
||||
attributes = {"nonProgressive", "hp3", "helpful"},
|
||||
hints = {"a Life Capsule", "some health", "a little HP"}
|
||||
hints = {"a Life Capsule", "a little HP"}
|
||||
}
|
||||
end
|
||||
local function lifeCapsule4()
|
||||
|
@ -11,7 +11,7 @@ local function lifeCapsule4()
|
|||
name = "Life Capsule",
|
||||
script = "<EVE0013",
|
||||
attributes = {"nonProgressive", "hp4", "helpful"},
|
||||
hints = {"a Life Capsule", "some health", "some decent HP"}
|
||||
hints = {"a Life Capsule", "some decent HP"}
|
||||
}
|
||||
end
|
||||
local function lifeCapsule5()
|
||||
|
@ -19,7 +19,7 @@ local function lifeCapsule5()
|
|||
name = "Life Capsule",
|
||||
script = "<EVE0014",
|
||||
attributes = {"nonProgressive", "hp5", "helpful"},
|
||||
hints = {"a Life Capsule", "some health", "a lot of HP"}
|
||||
hints = {"a Life Capsule", "a lot of HP"}
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -119,13 +119,13 @@ local function _itemData()
|
|||
name = "Map System",
|
||||
script = "<EVE0052",
|
||||
attributes = {"nonProgressive", "map"},
|
||||
hints = {"the Map System", "a map", "an electronic device"}
|
||||
hints = {"a map", "an electronic device"}
|
||||
},
|
||||
locket = {
|
||||
name = "Silver Locket",
|
||||
script = "<EVE0054",
|
||||
attributes = {"mandatory"},
|
||||
hints = {"the Silver Locket", "some fishy jewelry", "a Mimiga's item"}
|
||||
hints = {"some fishy jewelry", "a Mimiga's item"}
|
||||
},
|
||||
arthurKey = {
|
||||
name = "Arthur's Key",
|
||||
|
@ -149,13 +149,13 @@ local function _itemData()
|
|||
name = "Chaco's Lipstick",
|
||||
script = "<EVE0087",
|
||||
attributes = {"nonProgressive", "useless"},
|
||||
hints = {"Chaco's Lipstick", "some lipstick", "a Mimiga's item", "a lewd item"}
|
||||
hints = {"some lipstick", "a Mimiga's item", "a lewd item"}
|
||||
},
|
||||
juice = {
|
||||
name = "Jellyfish Juice",
|
||||
script = "<EVE0058",
|
||||
attributes = {"mandatory"},
|
||||
hints = {"some Jellyfish Juice", "a bomb ingredient"}
|
||||
hints = {"some juice", "a bomb ingredient"}
|
||||
},
|
||||
charcoal = {
|
||||
name = "Charcoal",
|
||||
|
@ -414,14 +414,14 @@ local function _itemData()
|
|||
}
|
||||
|
||||
local hintArray = {
|
||||
mandatory = {"a required item"},
|
||||
puppy = {"a required item", "a puppy", "a living being"},
|
||||
helpful = {"a helpful item"},
|
||||
useless = {"a useless item"},
|
||||
--mandatory = {"a required item"},
|
||||
puppy = {"a puppy", "a living being"},
|
||||
--helpful = {"a helpful item"},
|
||||
--useless = {"a useless item"},
|
||||
weapon = {"a weapon"},
|
||||
weaponSN = {"a weapon that breaks blocks"},
|
||||
weaponStrong = {"a strong weapon"},
|
||||
flight = {"a pair of wings", "a method of flight", "flight"},
|
||||
--weaponSN = {"a weapon that breaks blocks"},
|
||||
--weaponStrong = {"a strong weapon"},
|
||||
flight = {"a method of flight", "flight"},
|
||||
missileLauncher = {"a Missile upgrade"}
|
||||
}
|
||||
|
||||
|
@ -496,7 +496,7 @@ function C:unplacedString()
|
|||
end
|
||||
|
||||
local function _hint(message, l)
|
||||
local MSGBOXLIMIT = 42
|
||||
local MSGBOXLIMIT = 35
|
||||
local PATTERN = " [^ ]*$"
|
||||
local line1, line2, line3 = "", "", ""
|
||||
|
||||
|
@ -510,7 +510,7 @@ local function _hint(message, l)
|
|||
|
||||
if line2:find(PATTERN) and #message > MSGBOXLIMIT*2 then
|
||||
line2 = line2:sub(1, line2:find(PATTERN))
|
||||
split = line2:find(PATTERN)+split
|
||||
split = line2:find(PATTERN)+split-2
|
||||
line3 = "\r\n" .. message:sub(split, split+MSGBOXLIMIT)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -428,7 +428,7 @@ function lastCave:new(worldGraph)
|
|||
redDemon = Location("Red Demon Boss", "Priso2", "0300", self)
|
||||
}
|
||||
|
||||
self.requirements = function(self, items) return _has(items, "weaponBoss") and _count(items, "booster", 2) and (_has(items, "eventRocket") or (self.world:_dboost(items, 'rocket') and _has(items, "machineGun"))) end
|
||||
self.requirements = function(self, items) return _has(items, "weaponBoss") and _count(items, "booster", 2) and (_has(items, "eventRocket") or (self.world:_dboost(items, 'rocket') and _has(items, "machineGun") and self.world.regions.plantation:canAccess(items))) end
|
||||
end
|
||||
|
||||
local endgame = Region:extend()
|
||||
|
@ -510,10 +510,12 @@ function worldGraph:new(items)
|
|||
}
|
||||
|
||||
self.hintregion = hintRegion(self)
|
||||
|
||||
self.noFallingBlocks = false
|
||||
end
|
||||
|
||||
function worldGraph:_dboost(items, key)
|
||||
return (self.seqbreak or self.dboosts[key].enabled) and _hp(items) > self.dboosts[key].hp
|
||||
return self.seqbreak and self.dboosts[key].enabled and _hp(items) > self.dboosts[key].hp
|
||||
end
|
||||
|
||||
function worldGraph:StartPoint() return self.spawn == "Start Point" end
|
||||
|
|
|
@ -169,6 +169,7 @@ function C:_shuffleItems(tscFiles)
|
|||
obj.name = obj.name .. (", %s"):format(self.worldGraph.spawn)
|
||||
obj.script = obj.script .. self.worldGraph:getSpawnScript()
|
||||
if self.worldGraph.seqbreak and self.worldGraph.dboosts.rocket.enabled then obj.script = "<FL+6400" .. obj.script end
|
||||
if self.worldGraph.noFallingBlocks then obj.script = "<FL+1351" .. obj.script end
|
||||
-- place the objective scripts in Start Point
|
||||
self:_fastFillItems({obj}, self.worldGraph:getObjectiveSpot())
|
||||
|
||||
|
@ -284,7 +285,7 @@ function C:_writeLog()
|
|||
end
|
||||
|
||||
function C:_copyMyChar()
|
||||
local path = self:_getWritePath() .. '/myChar.bmp'
|
||||
local path = self:_getWritePath() .. '/MyChar.bmp'
|
||||
local data = lf.read(self.mychar)
|
||||
U.writeFile(path, data)
|
||||
end
|
||||
|
@ -349,6 +350,7 @@ function C:_updateSettings()
|
|||
Settings.settings.musicShuffle = self.shuffleMusic
|
||||
Settings.settings.musicBeta = self.music.betaEnabled
|
||||
Settings.settings.musicFlavor = self.music.flavor
|
||||
Settings.settings.noFallingBlocks = self.worldGraph.noFallingBlocks
|
||||
Settings:update()
|
||||
end
|
||||
|
||||
|
@ -358,13 +360,15 @@ function C:_updateSharecode(seed)
|
|||
-- O: three bits used for objective
|
||||
-- S: three bits used for spawn location
|
||||
-- B: single bit used for sequence breaks
|
||||
-- 0bBSSSOOOP
|
||||
-- F: single bit used for falling blocks in Hell
|
||||
-- 0bFBSSSOOOP
|
||||
|
||||
-- bitshift intervals
|
||||
local obj = 1
|
||||
local pup = 0
|
||||
local spn = 4
|
||||
local brk = 7
|
||||
local nfb = 8
|
||||
|
||||
if self.obj == "objBadEnd" then
|
||||
settings = bit.bor(settings, bit.blshift(1, obj))
|
||||
|
@ -398,11 +402,15 @@ function C:_updateSharecode(seed)
|
|||
if self.worldGraph.dboosts.rocket.enabled then seq = bit.bor(seq, 128) end
|
||||
end
|
||||
|
||||
if self.worldGraph.noFallingBlocks then
|
||||
settings = bit.bor(settings, bit.blshift(1, nfb))
|
||||
end
|
||||
|
||||
if #seed < 20 then
|
||||
seed = seed .. (" "):rep(20-#seed)
|
||||
end
|
||||
|
||||
local packed = love.data.pack("data", "<s1BB", seed, settings, seq)
|
||||
local packed = love.data.pack("data", "<s1I2B", seed, settings, seq)
|
||||
self.sharecode = love.data.encode("string", "base64", packed)
|
||||
|
||||
logNotice(("Sharecode: %s"):format(self.sharecode))
|
||||
|
|
|
@ -39,6 +39,7 @@ function C:getDefaults()
|
|||
musicShuffle = false,
|
||||
musicBeta = false,
|
||||
musicFlavor = "Shuffle",
|
||||
noFallingBlocks = false,
|
||||
csversion = 0
|
||||
}
|
||||
end
|
||||
|
@ -69,6 +70,7 @@ function C:serialize()
|
|||
line = line .. tab .. ("musicShuffle = %s,\r\n"):format(self.settings.musicShuffle)
|
||||
line = line .. tab .. ("musicBeta = %s,\r\n"):format(self.settings.musicBeta)
|
||||
line = line .. tab .. ("musicFlavor = %q,\r\n"):format(self.settings.musicFlavor)
|
||||
line = line .. tab .. ("noFallingBlocks = %s,\r\n"):format(self.settings.noFallingBlocks)
|
||||
line = line .. tab .. ("csversion = %s,\r\n"):format(self.settings.csversion)
|
||||
|
||||
return line .. "}"
|
||||
|
|
|
@ -29,6 +29,7 @@ function C:setup()
|
|||
self:loadSpawn(Settings.settings.spawn)
|
||||
self:loadSeqSettings(Settings.settings.seqbreaks, Settings.settings.dboosts)
|
||||
self:loadMusicSettings(Settings.settings.musicShuffle, Settings.settings.musicBeta, Settings.settings.musicFlavor)
|
||||
self:loadNoFallingBlocks(Settings.settings.noFallingBlocks)
|
||||
|
||||
background = lg.newImage('assets/background.png')
|
||||
self:draw()
|
||||
|
@ -54,6 +55,7 @@ settings.randoButton:onPress(function()
|
|||
rocket = fifty()
|
||||
})
|
||||
Screen:loadMusicSettings(fifty(), fifty(), love.math.random(3))
|
||||
Screen:loadNoFallingBlocks(fifty())
|
||||
end)
|
||||
|
||||
function C:loadPuppy(puppy)
|
||||
|
@ -151,6 +153,10 @@ function C:loadMusicSettings(shuffle, beta, flavor)
|
|||
end
|
||||
end
|
||||
|
||||
function C:loadNoFallingBlocks(noFallingBlocks)
|
||||
settings.noFallingBlocks.value = noFallingBlocks
|
||||
end
|
||||
|
||||
layout.version.text = 'Cave Story Randomizer v' .. VERSION
|
||||
layout.author.text = 'by duncathan'
|
||||
layout.twitter.text = '(@duncathan_salt)'
|
||||
|
@ -207,6 +213,8 @@ layout.go:onPress(function()
|
|||
if music.random.value then Randomizer.music.flavor = "Random" end
|
||||
if music.chaos.value then Randomizer.music.flavor = "Chaos" end
|
||||
|
||||
Randomizer.worldGraph.noFallingBlocks = settings.noFallingBlocks.value
|
||||
|
||||
C:setStatus(Randomizer:randomize())
|
||||
|
||||
layout.sharecode.text = "Copy Sharecode"
|
||||
|
@ -271,18 +279,18 @@ end)
|
|||
settings.importshare:onPress(function()
|
||||
local success, seed, sharesettings, seq = pcall(function()
|
||||
local packed = love.data.decode("data", "base64", settings.sharecode.value)
|
||||
local seed, settings, seq = love.data.unpack("<s1BB", packed)
|
||||
local seed, settings, seq = love.data.unpack("<s1I2B", packed)
|
||||
assert(#seed == 20)
|
||||
return seed, settings, seq
|
||||
end)
|
||||
|
||||
if success then
|
||||
settings.importshare.text = "Sharecode Imported"
|
||||
Screen:loadPuppy(bit.band(sharesettings, 1) ~= 0) -- settings & 0b00000001
|
||||
Screen:loadObjective(bit.brshift(bit.band(sharesettings, 14), 1)) -- (settings & 0b00001110) >> 1
|
||||
Screen:loadSpawn(bit.brshift(bit.band(sharesettings, 112), 4)) -- (settings & 0b01110000) >> 4
|
||||
Screen:loadPuppy(bit.band(sharesettings, 1) ~= 0) -- settings & 0b000000001
|
||||
Screen:loadObjective(bit.brshift(bit.band(sharesettings, 14), 1)) -- (settings & 0b000001110) >> 1
|
||||
Screen:loadSpawn(bit.brshift(bit.band(sharesettings, 112), 4)) -- (settings & 0b001110000) >> 4
|
||||
Screen:loadSeed(seed:gsub("^%s*(.-)%s*$", "%1")) -- trim any leading or trailing whitespace
|
||||
Screen:loadSeqSettings(bit.band(sharesettings, 128) ~= 0, { -- (settings & 0b10000000)
|
||||
Screen:loadSeqSettings(bit.band(sharesettings, 128) ~= 0, { -- (settings & 0b010000000)
|
||||
cthulhu = bit.band(seq, 1) ~= 0,
|
||||
chaco = bit.band(seq, 2) ~= 0,
|
||||
paxChaco = bit.band(seq, 4) ~= 0,
|
||||
|
@ -292,6 +300,7 @@ settings.importshare:onPress(function()
|
|||
plantation = bit.band(seq, 64) ~= 0,
|
||||
rocket = bit.band(seq, 128) ~= 0
|
||||
})
|
||||
Screen:loadNoFallingBlocks(bit.band(sharesettings, 256) ~= 0) -- (settings & 0b100000000)
|
||||
else
|
||||
settings.importshare.text = "Invalid Sharecode!"
|
||||
end
|
||||
|
|
|
@ -52,7 +52,8 @@ return { style = 'dialog',
|
|||
{ text = " Start\r\n Point", value = "Start Point", icon = "assets/icon/StartPoint2.png" },
|
||||
{ text = " Arthur's\r\n House", value = "Arthur's House", icon = "assets/icon/Arthur2.png" },
|
||||
{ text = " Camp", value = "Camp", icon = "assets/icon/Camp.png" }
|
||||
}
|
||||
},
|
||||
{ type = 'check', value = false, id = 'noFallingBlocks', text = "No Falling Blocks in Hell", minheight = 27 }
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|