diff --git a/Makefile b/Makefile index 3a40c04..8e29850 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,7 @@ SOURCEFILES = \ src/sprites/create_sprite.c \ src/sprites/move_sprites.c \ src/sprites/sort_sprites.c \ + src/sprites/sprite_interactions.c \ src/sprites/sprite_caster.c \ OBJECTS = $(SOURCEFILES:.c=.o) diff --git a/README b/README index 1688010..ed9c37c 100644 --- a/README +++ b/README @@ -38,3 +38,11 @@ commande intégrée dans le jeu - kcolin - B. (perks, power switch) - tchampio + +-[ Controls + +WASD - move +Left and Right arrows - Rotate view +Space - Shoot +p - Give points +u - skip round diff --git a/ressources/doubletap_logo.xpm b/ressources/doubletap_logo.xpm index cecd547..e5b2231 100644 --- a/ressources/doubletap_logo.xpm +++ b/ressources/doubletap_logo.xpm @@ -1,832 +1,57 @@ /* XPM */ -static char * doubletap_logo_xpm[] = { -"48 48 781 2", -" c #000000", -". c #6A5666", -"+ c #6A5866", -"@ c #675668", -"# c #675661", -"$ c #634E5F", -"% c #614C5D", -"& c #5C4657", -"* c #573A4B", -"= c #4F3A4B", -"- c #4D3345", -"; c #462D41", -"> c #493041", -", c #432D3E", -"' c #43293E", -") c #462D3E", -"! c #492D45", -"~ c #493648", -"{ c #4F3648", -"] c #4D3045", -"^ c #4C3348", -"/ c #4F3345", -"( c #544054", -"_ c #5C495C", -": c #4F3A4E", -"< c #523A4B", -"[ c #523648", -"} c #54434E", -"| c #5E4957", -"1 c #6E5B68", -"2 c #867783", -"3 c #A097A4", -"4 c #675663", -"5 c #635363", -"6 c #675868", -"7 c #726677", -"8 c #72697A", -"9 c #7B7280", -"0 c #706471", -"a c #6A5A6A", -"b c #65515F", -"c c #5C495A", -"d c #5C4C5A", -"e c #5C4957", -"f c #544351", -"g c #7D6F7E", -"h c #655366", -"i c #5C4959", -"j c #634E5C", -"k c #675161", -"l c #695A68", -"m c #574354", -"n c #4E364B", -"o c #4F3348", -"p c #463345", -"q c #463048", -"r c #49334B", -"s c #463041", -"t c #493348", -"u c #493645", -"v c #4D364B", -"w c #4F364B", -"x c #523D52", -"y c #594657", -"z c #4F334B", -"A c #523D4E", -"B c #6E5868", -"C c #867987", -"D c #8C7D8B", -"E c #918892", -"F c #615163", -"G c #635163", -"H c #655363", -"I c #655866", -"J c #6C5D6F", -"K c #6E5F71", -"L c #776B7E", -"M c #756675", -"N c #6C5B6A", -"O c #5E4E5A", -"P c #5C4754", -"Q c #594754", -"R c #574757", -"S c #705F71", -"T c #5E4C5A", -"U c #573D52", -"V c #594051", -"W c #5E4657", -"X c #705D6E", -"Y c #766675", -"Z c #5B4657", -"` c #513A4B", -" . c #4C334B", -".. c #4D3348", -"+. c #4D334B", -"@. c #4C3048", -"#. c #493048", -"$. c #4F3A52", -"%. c #52364B", -"&. c #543A4E", -"*. c #573D51", -"=. c #FF0000", -"-. c #543D4E", -";. c #5E485A", -">. c #6A5566", -",. c #827583", -"'. c #807382", -"). c #796674", -"!. c #8F8290", -"~. c #6A5B6C", -"{. c #6A5B6A", -"]. c #705F6F", -"^. c #756673", -"/. c #75697C", -"(. c #61515D", -"_. c #5C475A", -":. c #594957", -"<. c #6C5A68", -"[. c #5C4354", -"}. c #57404E", -"|. c #604C5C", -"1. c #766873", -"2. c #786775", -"3. c #543D4B", -"4. c #4D3344", -"5. c #462C41", -"6. c #4C364B", -"7. c #493344", -"8. c #4F3645", -"9. c #523A48", -"0. c #52404B", -"a. c #594351", -"b. c #5C4357", -"c. c #827482", -"d. c #82717F", -"e. c #6E5D6C", -"f. c #705F6D", -"g. c #8F848E", -"h. c #63536A", -"i. c #65566A", -"j. c #6A5A6D", -"k. c #655663", -"l. c #655361", -"m. c #6C5F71", -"n. c #7B7080", -"o. c #7B7082", -"p. c #6E5D6D", -"q. c #675863", -"r. c #614E5D", -"s. c #5C4C5E", -"t. c #5E4E5F", -"u. c #705F6C", -"v. c #574752", -"w. c #614C57", -"x. c #7B6A79", -"y. c #776675", -"z. c #5E4C57", -"A. c #573D4E", -"B. c #4F3A48", -"C. c #544052", -"D. c #4C3644", -"E. c #523D4B", -"F. c #574054", -"G. c #5E4C5C", -"H. c #6C5D6D", -"I. c #63515F", -"J. c #695D6C", -"K. c #746475", -"L. c #705F6E", -"M. c #675366", -"N. c #6A5863", -"O. c #8B828D", -"P. c #634E61", -"Q. c #635361", -"R. c #675666", -"S. c #7B6F80", -"T. c #817484", -"U. c #756875", -"V. c #6A5B68", -"W. c #655161", -"X. c #61515E", -"Y. c #594752", -"Z. c #59434E", -"`. c #725F6E", -" + c #5E4959", -".+ c #574352", -"++ c #4D3A48", -"@+ c #4F3D4B", -"#+ c #54404B", -"$+ c #5E4859", -"%+ c #604E5F", -"&+ c #604E61", -"*+ c #544051", -"=+ c #5C4757", -"-+ c #614E5C", -";+ c #63535F", -">+ c #675561", -",+ c #857885", -"'+ c #59475A", -")+ c #5E4E61", -"!+ c #6A5D6F", -"~+ c #6A5868", -"{+ c #7B6F7E", -"]+ c #7F7482", -"^+ c #776977", -"/+ c #6E5F6A", -"(+ c #6E5D68", -"_+ c #6C5868", -":+ c #63535D", -"<+ c #5E4854", -"[+ c #63515D", -"}+ c #634C5C", -"|+ c #5E4E5C", -"1+ c #594757", -"2+ c #574052", -"3+ c #544352", -"4+ c #543F52", -"5+ c #54404E", -"6+ c #5E495A", -"7+ c #594354", -"8+ c #5B4853", -"9+ c #614E59", -"0+ c #5E495C", -"a+ c #5C4654", -"b+ c #594654", -"c+ c #604E5C", -"d+ c #675563", -"e+ c #6E5D6A", -"f+ c #63515E", -"g+ c #7B6D7B", -"h+ c #5E4C5D", -"i+ c #67586C", -"j+ c #7B6F7B", -"k+ c #847985", -"l+ c #7F7282", -"m+ c #756671", -"n+ c #6C5B68", -"o+ c #706171", -"p+ c #6C586A", -"q+ c #5E515F", -"r+ c #6C5863", -"s+ c #726271", -"t+ c #615161", -"u+ c #655666", -"v+ c #675363", -"w+ c #65535E", -"x+ c #675368", -"y+ c #635161", -"z+ c #6E5F6F", -"A+ c #573F51", -"B+ c #796A74", -"C+ c #594857", -"D+ c #61515F", -"E+ c #615166", -"F+ c #776877", -"G+ c #887B8B", -"H+ c #887D90", -"I+ c #80737F", -"J+ c #735F6C", -"K+ c #6C5D6A", -"L+ c #705F6A", -"M+ c #726673", -"N+ c #746373", -"O+ c #6C5D6B", -"P+ c #543D52", -"Q+ c #594959", -"R+ c #786B7A", -"S+ c #8A7F8B", -"T+ c #70616F", -"U+ c #7B6B77", -"V+ c #72646D", -"W+ c #6C5D68", -"X+ c #705D68", -"Y+ c #6C5866", -"Z+ c #766774", -"`+ c #5C495D", -" @ c #5E4C5F", -".@ c #726475", -"+@ c #7D6F7D", -"@@ c #887D8D", -"#@ c #8E818F", -"$@ c #796B78", -"%@ c #73646F", -"&@ c #655661", -"*@ c #6A5663", -"=@ c #4D3A45", -"-@ c #705D6A", -";@ c #7B6D75", -">@ c #796B76", -",@ c #7B6875", -"'@ c #827784", -")@ c #6E626D", -"!@ c #574654", -"~@ c #796A7C", -"{@ c #8A8193", -"]@ c #867B89", -"^@ c #72646F", -"/@ c #746675", -"(@ c #59465A", -"_@ c #7C6F7E", -":@ c #847884", -"<@ c #7E717E", -"[@ c #6C5A66", -"}@ c #827989", -"|@ c #887F8F", -"1@ c #7B6B7C", -"2@ c #6E5F6D", -"3@ c #7A6D7B", -"4@ c #60515E", -"5@ c #52404E", -"6@ c #523A4E", -"7@ c #4D3A4B", -"8@ c #7B6D7C", -"9@ c #705D6D", -"0@ c #756471", -"a@ c #7B6D77", -"b@ c #887B89", -"c@ c #8C7F8F", -"d@ c #9C92A0", -"e@ c #72667A", -"f@ c #766A7C", -"g@ c #766A78", -"h@ c #655566", -"i@ c #59495A", -"j@ c #5E495D", -"k@ c #614E5F", -"l@ c #70667A", -"m@ c #7F7487", -"n@ c #7F7687", -"o@ c #756979", -"p@ c #5C4C5C", -"q@ c #524051", -"r@ c #5C4C5F", -"s@ c #4C3344", -"t@ c #493345", -"u@ c #796D78", -"v@ c #796673", -"w@ c #786C77", -"x@ c #72626F", -"y@ c #5E485C", -"z@ c #544354", -"A@ c #543D54", -"B@ c #524054", -"C@ c #6A5D6C", -"D@ c #706175", -"E@ c #7B7086", -"F@ c #776B77", -"G@ c #4F3D4E", -"H@ c #4E404E", -"I@ c #4D3D4E", -"J@ c #463648", -"K@ c #463045", -"L@ c #5E4C59", -"M@ c #726373", -"N@ c #594954", -"O@ c #493644", -"P@ c #462F41", -"Q@ c #463344", -"R@ c #605163", -"S@ c #65556A", -"T@ c #675B6A", -"U@ c #756B7C", -"V@ c #4D3645", -"W@ c #493045", -"X@ c #4F3D48", -"Y@ c #57434E", -"Z@ c #614E5A", -"`@ c #493341", -" # c #433041", -".# c #402D41", -"+# c #57465A", -"@# c #4D364E", -"## c #49364B", -"$# c #543A4B", -"%# c #5E4C56", -"&# c #5C4954", -"*# c #4D3A4E", -"=# c #3F213D", -"-# c #433045", -";# c #3C253A", -"># c #40293E", -",# c #736471", -"'# c #574351", -")# c #675866", -"!# c #614E61", -"~# c #524052", -"{# c #544057", -"]# c #544357", -"^# c #594352", -"/# c #735F6A", -"(# c #574754", -"_# c #402D3A", -":# c #463044", -"<# c #40293A", -"[# c #402D3E", -"}# c #736371", -"|# c #59485C", -"1# c #605161", -"2# c #5C4E61", -"3# c #635366", -"4# c #604E5A", -"5# c #726473", -"6# c #65515D", -"7# c #63515C", -"8# c #5C4752", -"9# c #46303E", -"0# c #3C2137", -"a# c #43283A", -"b# c #432C3A", -"c# c #70606D", -"d# c #574357", -"e# c #6C5F6E", -"f# c #6A5D6D", -"g# c #6A586A", -"h# c #4F4052", -"i# c #594357", -"j# c #938995", -"k# c #573D54", -"l# c #6C5F6F", -"m# c #65586A", -"n# c #655668", -"o# c #5C4C5D", -"p# c #675361", -"q# c #5E4757", -"r# c #604E59", -"s# c #5E475A", -"t# c #5C4859", -"u# c #604B5C", -"v# c #5C4352", -"w# c #4C3045", -"x# c #4C3341", -"y# c #6C5D71", -"z# c #706178", -"A# c #6E6474", -"B# c #5C465A", -"C# c #655163", -"D# c #573F54", -"E# c #432C3E", -"F# c #4D3648", -"G# c #5C485C", -"H# c #615361", -"I# c #706271", -"J# c #72616F", -"K# c #634E5D", -"L# c #7B717B", -"M# c #59495D", -"N# c #5E4E5D", -"O# c #756B7A", -"P# c #6C5D74", -"Q# c #615363", -"R# c #5E5061", -"S# c #52434E", -"T# c #43303E", -"U# c #706475", -"V# c #7B6D82", -"W# c #817482", -"X# c #827682", -"Y# c #574657", -"Z# c #57495D", -"`# c #6C5A6A", -" $ c #432D3A", -".$ c #463341", -"+$ c #6E6178", -"@$ c #726B82", -"#$ c #7E7386", -"$$ c #867C8B", -"%$ c #827985", -"&$ c #756978", -"*$ c #897F8B", -"=$ c #6A5A6C", -"-$ c #67586A", -";$ c #605366", -">$ c #46303A", -",$ c #492D41", -"'$ c #635166", -")$ c #675A6F", -"!$ c #6A586C", -"~$ c #887F8D", -"{$ c #7F6F7E", -"]$ c #7D6F82", -"^$ c #796B7E", -"/$ c #75687C", -"($ c #776B7C", -"_$ c #726676", -":$ c #897F8E", -"<$ c #6A5668", -"[$ c #60515F", -"}$ c #746677", -"|$ c #75697A", -"1$ c #4C3A4B", -"2$ c #4D3644", -"3$ c #4D3D4B", -"4$ c #5C4C57", -"5$ c #5E5163", -"6$ c #80798B", -"7$ c #8C818F", -"8$ c #7E7582", -"9$ c #6A5A68", -"0$ c #756476", -"a$ c #827885", -"b$ c #796B77", -"c$ c #6A5B63", -"d$ c #75646F", -"e$ c #847C8B", -"f$ c #807583", -"g$ c #746673", -"h$ c #5C4D61", -"i$ c #726474", -"j$ c #938895", -"k$ c #918A95", -"l$ c #6C5D6C", -"m$ c #766D7C", -"n$ c #867E8F", -"o$ c #827582", -"p$ c #82737E", -"q$ c #7C6D7C", -"r$ c #72616C", -"s$ c #736171", -"t$ c #847787", -"u$ c #796F7A", -"v$ c #5B4C59", -"w$ c #7C6F7C", -"x$ c #807481", -"y$ c #847887", -"z$ c #746B7A", -"A$ c #635368", -"B$ c #7E7388", -"C$ c #7E717D", -"D$ c #7D6F7F", -"E$ c #847A87", -"F$ c #8E8794", -"G$ c #A69CA8", -"H$ c #9E95A2", -"I$ c #938C9A", -"J$ c #938896", -"K$ c #8A7F8D", -"L$ c #807484", -"M$ c #7B6F7C", -"N$ c #796976", -"O$ c #817480", -"P$ c #908592", -"Q$ c #978A98", -"R$ c #786879", -"S$ c #7A6F7C", -"T$ c #7E727F", -"U$ c #7A6E81", -"V$ c #706476", -"W$ c #5C4857", -"X$ c #6E5D6F", -"Y$ c #796D7B", -"Z$ c #746471", -"`$ c #867B87", -" % c #9A959F", -".% c #918594", -"+% c #918996", -"@% c #918A98", -"#% c #887D89", -"$% c #827787", -"%% c #7E7480", -"&% c #887C8B", -"*% c #938B96", -"=% c #9C929F", -"-% c #706474", -";% c #6C5F74", -">% c #6E6277", -",% c #6E6176", -"'% c #6E5F6E", -")% c #675A6A", -"!% c #756774", -"~% c #817886", -"{% c #8A818B", -"]% c #7B6F7D", -"^% c #756676", -"/% c #70646E", -"(% c #7E6F7C", -"_% c #8D858F", -":% c #FF00DC", -"<% c #614C5F", -"[% c #6C5D6E", -"}% c #6C6171", -"|% c #67566A", -"1% c #7B6D7A", -"2% c #827680", -"3% c #8A7E89", -"4% c #817682", -"5% c #796B7C", -"6% c #65515C", -"7% c #776B78", -"8% c #807380", -"9% c #807685", -"0% c #807682", -"a% c #89818D", -"b% c #7B7177", -"c% c #7B7380", -"d% c #857882", -"e% c #807680", -"f% c #8D8492", -"g% c #99929B", -"h% c #736774", -"i% c #73646D", -"j% c #887F88", -"k% c #877D87", -"l% c #8B828C", -"m% c #958C97", -"n% c #958E97", -"o% c #978E99", -"p% c #8F8692", -"q% c #8D848D", -"r% c #857D85", -"s% c #80737D", -"t% c #57475A", -"u% c #543F4E", -"v% c #867D87", -"w% c #867D89", -"x% c #7B6B75", -"y% c #726471", -"z% c #7E7380", -"A% c #8F8591", -"B% c #958A98", -"C% c #9C909B", -"D% c #776671", -"E% c #80727C", -"F% c #8E7D8B", -"G% c #8F818B", -"H% c #A99CA4", -"I% c #AC9EA7", -"J% c #937F87", -"K% c #7F6E78", -"L% c #7D707E", -"M% c #837685", -"N% c #70626E", -"O% c #4F3D52", -"P% c #59495C", -"Q% c #776979", -"R% c #776971", -"S% c #7A6D7C", -"T% c #80717B", -"U% c #99909F", -"V% c #A199A5", -"W% c #9E95A0", -"X% c #7D6B76", -"Y% c #7D707C", -"Z% c #7D6F7A", -"`% c #75616C", -" & c #77646F", -".& c #8A7682", -"+& c #8F7D85", -"@& c #84727E", -"#& c #847684", -"$& c #816F7A", -"%& c #75616A", -"&& c #705B68", -"*& c #6E5F6C", -"=& c #6C5F6C", -"-& c #786B78", -";& c #887B85", -">& c #7F717D", -",& c #928793", -"'& c #867B85", -")& c #8C7F8B", -"!& c #7B6D78", -"~& c #8C7F91", -"{& c #776673", -"]& c #65535F", -"^& c #6E5A66", -"/& c #79666F", -"(& c #867681", -"_& c #84747E", -":& c #82727E", -"<& c #7B6971", -"[& c #745F6A", -"}& c #605363", -"|& c #67586F", -"1& c #736271", -"2& c #776976", -"3& c #776B7A", -"4& c #7E727E", -"5& c #726671", -"6& c #8C818D", -"7& c #8F8593", -"8& c #7F747E", -"9& c #847480", -"0& c #7D7280", -"a& c #766876", -"b& c #7E6F7A", -"c& c #837682", -"d& c #8A7A82", -"e& c #7B646D", -"f& c #79666C", -"g& c #705D61", -"h& c #67515D", -"i& c #67515A", -"j& c #61516A", -"k& c #776974", -"l& c #817884", -"m& c #807684", -"n& c #70626D", -"o& c #7E7180", -"p& c #8C838D", -"q& c #7F727E", -"r& c #72616D", -"s& c #80747E", -"t& c #7E6D7B", -"u& c #7D6B74", -"v& c #806B75", -"w& c #745D6A", -"x& c #6E5861", -"y& c #755D68", -"z& c #705868", -"A& c #675157", -"B& c #7B6E79", -"C& c #827685", -"D& c #8A7D8B", -"E& c #847B89", -"F& c #908593", -"G& c #81727E", -"H& c #6E5A68", -"I& c #67515F", -"J& c #79626D", -"K& c #6C535C", -"L& c #6C535F", -"M& c #725D68", -"N& c #887A85", -"O& c #867A86", -"P& c #837885", -"Q& c #7E7381", -"R& c #978C99", -"S& c #776875", -"T& c #827380", -"U& c #67535F", -"V& c #6A565D", -"W& c #654E57", -"X& c #67565F", -"Y& c #705A66", -"Z& c #807480", -"`& c #7B707E", -" * c #7D7282", -".* c #796B7A", -"+* c #61535F", -"@* c #7C6C7B", -"#* c #9E97A4", -"$* c #81727C", -"%* c #786677", -"&* c #6E5D66", -"** c #877882", -"=* c #674E5A", -"-* c #827686", -";* c #726976", -">* c #6A5B66", -",* c #61485A", -"'* c #9A95A4", -")* c #7E7179", -"!* c #847A89", -"~* c #837686", -"{* c #897D89", -"]* c #FF52CE", -"^* c #796876", -"/* c #817885", -"(* c #837A89", -"_* c #786A79", -":* c #7F7480", -"<* c #725D6A", -"[* c #746974", -"}* c #7F7280", -"|* c #776471", -"1* c #897F89", -"2* c #6C5F68", -"3* c #847989", -"4* c #70626A", -"5* c #7B6975", -"6* c #766A79", -"7* c #6E6274", -"8* c #8F879B", -"9* c #8E8191", -"0* c #7D6F7C", -"a* c #6A5F6F", -"b* c #80778C", -"c* c #978E9E", -"d* c #7B6F7A", -"e* c #735D6A", -"f* c #978E9F", -" ", -" . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 $ 5 6 7 8 9 0 a b c d e f ", -" g h e i j k l m n o p q r s t u o v v ~ w x y : z A y B C D E F G H I J K L M N O P Q h R ", -" S T U V W X Y Z ` .] ! ..+.@.#.w z $.%.&.*.U =.-.;.>.,.'.).!.~.{.a 6 a ].^./.{.b (._.I :. ", -" <.[.-.}.|.1.2.e 3.4.o 5.w = = 6.7.{ 8.9.0.a.P =.b.X c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.l.r.s.t. ", -" u.P U v.w.x.y.z.A.B.B.[ = -.C.[ ..D.E.-.F.G.H.=.I.J.K.L.M.N.O.P.Q.h 6 5 R.S.T.U.V.4 W.z.X. ", -" l.| Y.Z.e `.l. +Q .+A ++A @+-.B.B.3.#+$+e %+&+=.*+=+-+;+>+# ,+'+T )+!+5 ~+{+]+^+/+(+_+:+T ", -" j <+| I.[+}+l.|+1+2+3+4+5+.+6+Q 7+8+9+0+;.a+b+=.2+c+d+e+e+f+g+6+T h+h i+{.j+k+l+m+n+o+p+q+ ", -" r++ e+s+t+r.u+T c d 5+} e v++ l.w+x+y+c+h+7+7+=.Q 6+a z+Q.A+B+C+h+D+t+E+J F+G+H+I+J+K+L+l. ", -" M+N+O+D+'+C.3+5+P+Q Q+-.$ R+S+T+U+V+W+X+Y+$ r.=.6+T H y+P }.Z+e `+ @d &+z+.@+@@@#@$@%@&@D+ ", -" *@:+Y.} E.=@ -@;@>@V+,@C '@)@N.=.z.;+e e e !@ &+l.V.~@{@]@^@N.;+ ", -" /@R.(@E.{ .. # _@T+Y+(+$@D :@<@=.[@v+v+6 p.H t.D+y+!+}@|@1@2@s+ ", -" 3@4@5@B.: ( 6@7@= B.A 7++ 8@J+9@0@a@b@c@d@=.{+^+e@f@g@h@ b+3+i@ @j@t+k@6 l@m@n@S.o@ ", -" p@7+-.++q@r@ t ! > s@t@& f.u@v@w@x@e+p+e+].=.)+y@y z@A@B@ `+R d i@t.t+k@h C@D@L E@F@ ", -" A+G@H@7@~ I@ J@K@~ ++#+L@j+M@4 %+Q.h+N@.+y =.3+7@O@t P@Q@ `+R@q+`+ @)+S@E+F k.T@H.U@ ", -" ++V@> W@X@.+ Y@O l.Z@h+_.e v.6@E.q@=.++`@ #5. #.# d T '+)+G r.k@ @H L ", -" ++7.s@s ^ +#*+@#x 7@##$#%## I.&#=+Y.U w B.*#m =.v t@=#-#;#>#,#'#r.u+)#!#)+h+h+5 )+!#r.t+8 ", -" ~#A t@s *#f {#]#G@~ = ^#;+/#/+d & (#E.7@: _#:#=..#Q@ #<#[#>#}#~#|#1#z+u+H F 2#F 3#D+p@k@H ", -" ++6@f 7.B.-.I@w 3+.+.+4#Y+5#~+6#7#8#9.9.8.V@`@=.) 9#0#a#b#' c#d#1+p@e#f#g#h H F H k@F j@|+ ", -" ~ E.G@f u u t@h#z@i#7+l.I+j#e+r.|.k#E.#+A.5+s@=., ; <#<#-#K@Z+B@1+'+u+5#l#K m#n#@ t+ @o#`+ ", -" 3+C.3+G@t@; s - : = } p#b@b@)@6#q#r#s#t#u#y v#=.E.w#x#) 9#{ B+~#'+r@q+J 5 ~+y#z#A#a t.B#R ", -" C#u+( D#t@9#E#t@7@F#= G#~+T+,#H#% T V.e.I#J#p. K#d *.B.< = L#P+i@M#j@ @N#5 f#O#m.P#Q#Q ~# ", -" R#i@r@S#t@T#s F#*#~#@+} T a k.6 n#u+U#V#W# =.8@^+)#!@m |+X#Y#i#Z#d =+1#t+`#~.)#n#m#!#*+ ", -" 5@h#C.= u $.$V@= ~#5+b+Q r.6 +$@$y#U##$$$ =.%$&$e.u+6 5#*$T k@h+i@d#1+6+p@% k.a =$-$;$ ", -" F#w z@: s >$,$V@~#C.z@_.0+!#'$)$-$!$ ~${$=.]$^$/./$($_$:$<$. [$% T r.d `+[$I.}$|$o@H. ", -" 1$2$++f 5@E.3$.+7+4$$ o#)+r@5$%+k@ 6$7$8$=.W+9$V.0$o@o+a$b$x@`#c$# <$&@D+y+# d$e$f$T+ ", -" B.B.3+e L@4$y+4 g$!+t+;$h$i#v.A b+ i$j$k$=.l$I W+m$f#k.'.n$C C o$p$q$y.r$<.K+s$t$C u$ ", -" 5+v$l.W+w$x$f$y$z$6 A$)+1+G@6@ _.t+<.I#B$S.=.l$G n#~.5 D+C$D$E$F$G$H$I$J$K$L$M$N$O$P$Q$ ", -" T ;+R$S$T$U$M V${.R.J W$ 3.5+} e h g#W+X$=. 5+Y$W+Z$`$ %.%+%@%#%C $%%%&%*%=% ", -" k@Q.+ R.a -%S ;%>%,%!#i@ *+*+7+e p#W+'%)%=. ++!%. L+N$~%{%]@y$]%^%/%e+5#(%_% ", -":% <%t.)#[%}%|%-$I l. = F#t@u ,## n+1%2%3%a$4%5%0 . 6%+ 7% ", -":% L#8%9%0%0%a$a$8%a% b%Y$L#c%d%e%a$f%g%f%a$=.L#h%h%h%i%h%j%k%l%m%n%o%o%p%q%l%r%s% :%:%:%", -":% =@2$t%u%=@*+e )#i$ v%w%x%W++ y%z%A%B%H$C%=.D%r$1%^@*@[+s%E%F%G%H%I%J%K%L%M%N%*@ :%:%:%", -":% ++O%(#G@E.7@P%5 T+Q%R%S%S+T%N%V.,#:@U%V%W%=.X%N$Y%Z%e+W.s%`%J+ &.&+&@&#&$&%&&& :%:%:%", -":%:%:% = 7@A r@h *&%@K =&-&X#;&m+u.>&,&G%'&=.)&!&T.~&{&]&8%^&/&(&_&:&<&[&X+ :%:%:%:%:%:%", -":%:%:% = v z@}&|&W+1&2&3&T+W+r$4&$@5&6&7&8&=.o$9&0&7$a&b T%b&c&d&e&f&g&h&i& :%:%:%:%:%:%", -":%:%:%:% j&m#`#k&Y%l&m&n&+ <.u@0@o&p&q&=.r&2%Y%s&9@r.t&u&v&w&x&y&z&A& :%:%:%:%:%:%", -":%:%:%:%:%:%:% u+].B&C&D&E&]+y%+ # x@k&C F&=.J+X#G&1%H&I&T%J&x&K&L&M& :%:%:%:%:%:%:%:%", -":%:%:%:%:%:%:% Y%2%N&)&O&8@]+P&5&;+K.l$Q&R&=.S&(%K$T&X+U&8%V&i&W&X&Y& :%:%:%:%:%:%:%:%", -":%:%:%:%:%:%:%:%:%:% Z&`& *.*W.(.+*@*#*=.0@)@g $*%*&***i&=*N.K+ :%:%:%:%:%:%:%:%:%", -":%:%:%:%:%:%:%:%:%:%:%:%:% W#-*;*>*,*k@/+'*=.)*n+g$!*~*-&{*H&]* :%:%:%:%:%:%:%:%:%:%:%:%", -":%:%:%:%:%:%:%:%:%:%:%:%:% ^*/*(*8%y%H ;+_*=.:*<*N [*}*|*1*2*]* :%:%:%:%:%:%:%:%:%:%:%:%", -":%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:% I+.%7$/+v+9$=.3*c.4*1 /#5* :%:%:%:%:%:%:%:%:%:%:%:%:%:%", -":%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:% 6*>*7*=.8*9*Z&0@L+ :%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%", -":%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:% 0*e.a*=.b*c*y$d*e* :%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%", -":%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:% 0*g$=.D$f* :%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%", -":%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:% :%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%", -":%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:% :%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%:%"}; +static char *_1e0c858bcf7443fbc4cd25db429bcbegClIeTeHspxjAz43[] = { +/* columns rows colors chars-per-pixel */ +"48 48 3 1 ", +" c #A87C39", +". c #FF00DC", +"X c gray90", +/* pixels */ +"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", +"XX XX", +"XX XX", +"XX XX", +"XX XX", +"XX XX", +"XX XX", +"XX XX", +"XX XX", +"XX XX", +"XX XX", +"XX XX", +"XX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XX", +"XX XXXXXXXXXXXXXXXXXXXXXXXXX XX", +"XX XXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXX XX", +"XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX", +"XX XXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XX", +"XX XXXXXXXXXXXXXXXXXXXXXXXXX XX", +"XX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XX", +"XX XX", +"XX XX", +"XX XX", +"XX XXXXXXXXXXXXXXXXXXXXXX XX", +"XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXX XX", +"XX XXXXXXXXXXXXXXXXXXXXXXXXXXX XX", +"XX XXXXXXXXXXXXXXXXXXXXXXXXX XXX XX", +"XX XXXXXXXXXXXXXXXXXXXXXX XX", +"XX XX", +"XX XX", +"XX XX", +"XX XX", +"XX XX", +"XX XX", +"XXX XXX", +"XXXXX XXXXX", +".XXXXXX XXXXXX.", +"....XXXX XXXX....", +"......XXXX XXXXX.....", +".......XXXX XXXX.......", +"........XXXXX XXXXX........", +"..........XXXXX XXXXX..........", +"............XXXXX XXXXX............", +"..............XXXXX XXXXX..............", +"................XXXX XXXX................", +"..................XXXXX XXXXX..................", +"...................XXXXXXXXXX...................", +".....................XXXXXX....................." +}; diff --git a/ressources/good_maps/door.cub b/ressources/good_maps/door.cub index 81b4f23..9dedf15 100644 --- a/ressources/good_maps/door.cub +++ b/ressources/good_maps/door.cub @@ -4,7 +4,7 @@ WE ressources/west.xpm EA ressources/east.xpm F 220,100,0 -C 225,30,0 +C 87,42,22 1111111111111111111111111 1000000000110000000000001 diff --git a/ressources/juggernog_logo.xpm b/ressources/juggernog_logo.xpm index 79d4c7c..b4e9c66 100644 --- a/ressources/juggernog_logo.xpm +++ b/ressources/juggernog_logo.xpm @@ -1,61 +1,63 @@ /* XPM */ -static char * juggernog_logo_xpm[] = { -"48 48 10 1", -" c #000000", -". c #CC6633", -"+ c #FFAE4C", -"@ c #FFCC66", -"# c #FFCC33", -"$ c #FFC054", -"% c #FF9933", -"& c #FFCC99", -"* c #FF0000", -"= c #FF00DC", -" ", -" ..+@@#@@@++$$$%@@@@@+@@&##@@@@++$$$+@@@@@+@@@ ", -" ..+@@#@@@++$$$%@@@@@+@@&##@@@@++$$$+@@@@@+@@@ ", -" ..+@@#@@@++$$$%@@@@@+@@*##@@@@++$$$+@@@@@+@@@ ", -" ..+@@#@@@++$$$%@@@@@+@@*##@@@@++$$$+@@@@@+@@@ ", -" ..+@@#@@@++$$$%@@@@@+@@*##@@@@++$$$+@@@@@+@@@ ", -" ..+@@#@@@++$$$%@@@++@@@*##@@@@++$$$+@@@@@+@@@ ", -" ..+@@#@@@++$$$%@@@++@@@*##@@@@++$$$+@@@@@+@@@ ", -" ..+@@#@@@++$$$%@@@++@@@*##@@@@++$$$+@@@@@+@@@ ", -" ..+@@#@@@++$$$%@@@++@@@*##@@@@++$$$+@@@@@+@@@ ", -" ..+@@# %@@@++@@@*##@@@@ @@@@@+@@@ ", -" ..+@@# %@@@++@@@*##@@@@ @@@@@+@@@ ", -" ..+@@# @++$$$%@@@++@@@*##@@@@ +$$+@@@@@+@@@ ", -" ..+@@# @++$$$%@@@++@@@*##@@@@ +$$+@@@@@+@@+ ", -" ..+@@# @++$$$%@@@++@@@*##@@@@ +$$+@@@@@+@@+ ", -" ..+@@# $$%@@@++@@@*##@@@@ +@@@@@+@@+ ", -" ..+@@#@@@++$$$%@@@++@@@*##@@@@@@+$$+@@@@@+@@+ ", -" ..+@@#@@@++$$$%@@@++@@@*##@@@@@@+$$+@@@@@+@@+ ", -" ..+@@#@@@++$$$%@@@++@@@*##@@@@@@+$$+@@@@@+@@+ ", -" ..+@@#@@@++$$$%@@@++@@@*##@@@@@@+$$+@@@@@+@@+ ", -" ..+@@#@@@++$$$%@@@++@@@*##@@@@@@+$$+@@@@@+@@+ ", -" ..+@@#@@@++$$$%@@@++@@@ ##@@@@@@+$$+@@@@@+@@+ ", -" ..+@@#@@@++$$$%@@@++@ *##@@@@@@+$$+@@@@@+@@+ ", -" ..+@@#@@@++$$$%@@@++@ *##@@@@@@+$$+@@@@@+@@+ ", -" ..+@@#@@@++$$$%@@@ @@*##@@@@@@+$$+@@@@@+@@+ ", -" ..+@@#@@@++$$$%@@ @@@*##@@@@@@+$$+@@@@@+@@+ ", -" ..+@@#@@@++$$$%@@ @@@*##@@@@@@+$$+@@@@@+@@+ ", -" ..+@@#@@@++$$$% @++@@@*##@@@@@@+$$+@@@@@+@@+ ", -" ..+@@#@@@++$ @@@++@@@* @@@+$$+@@@++@@@+ ", -" ..+@@#@@@++$ @@@++@@@* @@@+$$+@@@++@@@+ ", -"= +@@#@@@++ @@@@@@+$$+@@@++@@@ ", -"= +@@#@@@++ $$%@@@++@@@*##@@@@@@+$$$++@++@ ===", -"= +@@#@@@++ $$%@@@++@@@*##@@@@@@+$$$++@++@ ===", -"= +@@#@@@++$$$%@@@++@@@*##@@@@@@+$$$++@++ ===", -"=== #@@@++$$$%@@@++@@@*##@@@@@@+$$$++@ ======", -"=== #@@@++$$$%@@@++@@@*##@@@@@@+$$$++@ ======", -"==== @++$$$%@@@++@@@*##@@@@@@+$$$++ ======", -"======= ++$$$%@@@++@@@*##@@@@@@+$$$ ========", -"======= ++$$$%@@@++@@@*##@@@@@@+$$$ ========", -"========== %@@@++@@@*##@@@@@@+$$ =========", -"============= @@@++@@@*##@@@@++$ ============", -"============= @@@++@@@*##@@@@++$ ============", -"================ @++@@@*##@@@@ ==============", -"================== @@@*##@@@ =================", -"================== @@@*##@@@ =================", -"=================== @@*## ==================", -"===================== =====================", -"===================== ====================="}; +static char *_4f458ea097146c1c7aec4c38a3cb3a7FJ49loZKPAVgkJYb[] = { +/* columns rows colors chars-per-pixel */ +"48 48 9 1 ", +" c #9B2E2E", +". c #9F2F2F", +"X c #9C3232", +"o c #C52F2F", +"O c #FF00DC", +"+ c #FFF7DB", +"@ c gray90", +"# c #FAF7F7", +"$ c white", +/* pixels */ +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@oooooooooooooooooooooooooooooooooooooooooooo@@", +"@@oooooooooooooooooooooooooooooooooooooooooooo@@", +"@@ooooooooooooooooo++++++++++ooooooooooooooooo@@", +"@@ooooooooooooooooo++++++++++ooooooooooooooooo@@", +"@@ooooooooooooooooo++++++++++ooooooo$$$ooooooo@@", +"@@ooooooooooooooooo++++++++++oooo$$$ $ooooooo@@", +"@@ooooooooooooooooo++++++++++ooo$$.. $ooooooo@@", +"@@ooooooooooooooooo++++++++++oo$$X $oooooooo@@", +"@@ooooooooooooooooo++++++++++o$$X $$oooooooo@@", +"@@ooooooooooooooooo++++++++++$$ $ooooooooo@@", +"@@ooooooooooooooooo++++++$$+$$ $$ooooooooo@@", +"@@ooooooooooooooooo+++++$ $ $$oooooooooo@@", +"@@ooooooooooooooooo++++$ $$ $$ooooooooooo@@", +"@@ooooooooooooooooo+++$ $$ $oooooooooooo@@", +"@@ooooooooooooooooo++$ $ $ooooooooooooo@@", +"@@oooo++++++++++++++$ $++++++++++oooo@@", +"@@oooo+++++++++++++$ # $+++++++++oooo@@", +"@@oooo++++++++++++$ # $++++++++++oooo@@", +"@@oooo+++++++++++$ # $++++++++++oooo@@", +"@@oooo++++++++++$ # $+++++++++++oooo@@", +"@@oooo+++++++++$ # $++++++++++++oooo@@", +"@@oooo++++++++$ # $+++++++++++++oooo@@", +"@@oooo+++++++$ # $++++++++++++++oooo@@", +"@@oooo++++++$ # $+++++++++++++++oooo@@", +"@@oooo+++++$ # $++++++++++++++++oooo@@", +"@@oooooooo$ # $++++ooooooooooooooooo@@", +"@@ooooooo$ # $+++++ooooooooooooooooo@@", +"@@ooooo$$ $++++++ooooooooooooooooo@@", +"@@oooo$ $ $+++++++ooooooooooooooooo@@", +"@@oooo$ $ $++++++++ooooooooooooooooo@@", +"@@ooooo$ $ $+++++++++ooooooooooooooooo@@", +"@@oooooo$ $ $++++++++++ooooooooooooooooo@@", +"@@@oooooo$ $ $o++++++++++oooooooooooooooo@@@", +"@@@@@ooooo$ $ $oo++++++++++oooooooooooooo@@@@@", +"O@@@@@@oooo$ $ooo++++++++++oooooooooooo@@@@@@O", +"OOOO@@@@oooo$ $ooo++++++++++ooooooooooo@@@@OOOO", +"OOOOOO@@@@ooo$$oooo++++++++++ooooooooo@@@@@OOOOO", +"OOOOOOO@@@@oooooooo++++++++++oooooooo@@@@OOOOOOO", +"OOOOOOOO@@@@@oooooooooooooooooooooo@@@@@OOOOOOOO", +"OOOOOOOOOO@@@@@oooooooooooooooooo@@@@@OOOOOOOOOO", +"OOOOOOOOOOOO@@@@@oooooooooooooo@@@@@OOOOOOOOOOOO", +"OOOOOOOOOOOOOO@@@@@oooooooooo@@@@@OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO@@@@oooooooo@@@@OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOO@@@@@oo@@@@@OOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOO@@@@@@@@@@OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOO@@@@@@OOOOOOOOOOOOOOOOOOOOO" +}; diff --git a/ressources/revive_logo.xpm b/ressources/revive_logo.xpm index 17e5b1a..58fa03c 100644 --- a/ressources/revive_logo.xpm +++ b/ressources/revive_logo.xpm @@ -1,1545 +1,58 @@ /* XPM */ -static char * revive_logo_xpm[] = { -"48 48 1494 2", -" c #000000", -". c #87736F", -"+ c #8D7A78", -"@ c #6B5B5A", -"# c #987C73", -"$ c #A5867D", -"% c #8A6464", -"& c #8F6B6E", -"* c #9E7E7B", -"= c #896A6B", -"- c #AA8D83", -"; c #88696B", -"> c #A88E83", -", c #8F726F", -"' c #846868", -") c #8D6F6E", -"! c #A07879", -"~ c #926A6F", -"{ c #806466", -"] c #A08A80", -"^ c #8D7E78", -"/ c #817874", -"( c #7E7778", -"_ c #A8A8AC", -": c #9C97A1", -"< c #A7A6B5", -"[ c #BFC4D8", -"} c #A6A2B0", -"| c #99959D", -"1 c #928C8E", -"2 c #92918C", -"3 c #979590", -"4 c #A29D99", -"5 c #9C928B", -"6 c #817774", -"7 c #938A81", -"8 c #988E83", -"9 c #847570", -"0 c #94887C", -"a c #6A5B5A", -"b c #8F8177", -"c c #8A7A70", -"d c #9D8E82", -"e c #9C8C80", -"f c #AFA396", -"g c #776668", -"h c #8A7D77", -"i c #7A6B6D", -"j c #7B6C6B", -"k c #766665", -"l c #776664", -"m c #8A7070", -"n c #7F6062", -"o c #97706F", -"p c #6F5251", -"q c #80605F", -"r c #6B504D", -"s c #5D4743", -"t c #735853", -"u c #805F5C", -"v c #986F6E", -"w c #AF887E", -"x c #93726E", -"y c #7B6260", -"z c #908177", -"A c #57524F", -"B c #6C6466", -"C c #8E8883", -"D c #887C81", -"E c #9C9198", -"F c #AAA0AB", -"G c #A2979C", -"H c #C0BFC7", -"I c #BABBBD", -"J c #C2C8C8", -"K c #A09C90", -"L c #B8B3B2", -"M c #B4A8A7", -"N c #D4D2D3", -"O c #CAC5C3", -"P c #A29387", -"Q c #A69486", -"R c #907C77", -"S c #B2A391", -"T c #938077", -"U c #B8A895", -"V c #B6A493", -"W c #AF9B8A", -"X c #8E7773", -"Y c #99837B", -"Z c #A3978B", -"` c #998E83", -" . c #8A7C78", -".. c #74686D", -"+. c #857D7C", -"@. c #908B81", -"#. c #9D9B95", -"$. c #746664", -"%. c #7C5E5B", -"&. c #B0847D", -"*. c #60443F", -"=. c #593F39", -"-. c #583E37", -";. c #6B4D44", -">. c #9D6D6A", -",. c #906461", -"'. c #D8B49F", -"). c #7A5A53", -"!. c #795F5B", -"~. c #B5A78F", -"{. c #34352E", -"]. c #6A6161", -"^. c #474849", -"/. c #FF0000", -"(. c #CECDD3", -"_. c #E2E3EF", -":. c #CBC6CA", -"<. c #BCB5B2", -"[. c #8D807B", -"}. c #A7A28E", -"|. c #938A7E", -"1. c #6A5A5D", -"2. c #6F5A5D", -"3. c #473E3F", -"4. c #4D4141", -"5. c #A38980", -"6. c #544644", -"7. c #755B5C", -"8. c #816362", -"9. c #876866", -"0. c #BAA28F", -"a. c #B19786", -"b. c #AB8D82", -"c. c #5F4948", -"d. c #876668", -"e. c #84716B", -"f. c #B5AEA3", -"g. c #9D9186", -"h. c #7B6B69", -"i. c #A1998B", -"j. c #928A81", -"k. c #8B847D", -"l. c #817C78", -"m. c #744F4A", -"n. c #9D6665", -"o. c #54362D", -"p. c #8B5A56", -"q. c #A56B66", -"r. c #BB8979", -"s. c #AC786D", -"t. c #7B564D", -"u. c #8E665F", -"v. c #8B6C64", -"w. c #AA9982", -"x. c #81706B", -"y. c #0D0900", -"z. c #30312C", -"A. c #BFB6B2", -"B. c #927B78", -"C. c #8A7270", -"D. c #98837B", -"E. c #6A5A56", -"F. c #595149", -"G. c #2F2C22", -"H. c #423A3A", -"I. c #4E4041", -"J. c #241714", -"K. c #6F5357", -"L. c #715657", -"M. c #6C5251", -"N. c #684F4D", -"O. c #AB887D", -"P. c #8E6866", -"Q. c #876160", -"R. c #A68279", -"S. c #99726F", -"T. c #6A4E4C", -"U. c #533F3C", -"V. c #B4A593", -"W. c #8A786F", -"X. c #7F6D68", -"Y. c #85706A", -"Z. c #8F7D73", -"`. c #897A73", -" + c #9D9283", -".+ c #6A6060", -"++ c #908883", -"@+ c #9D7C75", -"#+ c #8E5B57", -"$+ c #794A43", -"%+ c #9C605C", -"&+ c #905951", -"*+ c #A0645D", -"=+ c #88564A", -"-+ c #9C685D", -";+ c #9D7469", -">+ c #A68877", -",+ c #A08B7B", -"'+ c #343129", -")+ c #0D0600", -"!+ c #0C0600", -"~+ c #A69487", -"{+ c #7C6364", -"]+ c #806464", -"^+ c #806662", -"/+ c #7A635C", -"(+ c #77625B", -"_+ c #735E58", -":+ c #7C5F62", -"<+ c #7F5E62", -"[+ c #0B0000", -"}+ c #CAACA6", -"|+ c #9C7573", -"1+ c #98716F", -"2+ c #D3B4A8", -"3+ c #6D4F4A", -"4+ c #946968", -"5+ c #926766", -"6+ c #A27972", -"7+ c #966768", -"8+ c #432F2B", -"9+ c #583E3B", -"0+ c #A08C79", -"a+ c #A69480", -"b+ c #907C6F", -"c+ c #83645F", -"d+ c #6B564D", -"e+ c #8E786E", -"f+ c #675858", -"g+ c #7B6C69", -"h+ c #817778", -"i+ c #765F5F", -"j+ c #754E49", -"k+ c #673D31", -"l+ c #7B493E", -"m+ c #985B52", -"n+ c #A0625A", -"o+ c #9E635A", -"p+ c #BC8A75", -"q+ c #D2AC8E", -"r+ c #937068", -"s+ c #6F5A57", -"t+ c #120B00", -"u+ c #171108", -"v+ c #030000", -"w+ c #99857C", -"x+ c #6D5857", -"y+ c #715955", -"z+ c #705851", -"A+ c #9A8072", -"B+ c #80645F", -"C+ c #846762", -"D+ c #6C5151", -"E+ c #342622", -"F+ c #775757", -"G+ c #AA827B", -"H+ c #9E7772", -"I+ c #8D6462", -"J+ c #C29F8C", -"K+ c #7F5956", -"L+ c #7C5753", -"M+ c #A2746E", -"N+ c #9D6F6A", -"O+ c #8F6261", -"P+ c #251106", -"Q+ c #6D4B4A", -"R+ c #B09A81", -"S+ c #856D64", -"T+ c #927A6B", -"U+ c #8F6D64", -"V+ c #946F65", -"W+ c #85625F", -"X+ c #89706A", -"Y+ c #7F6F6D", -"Z+ c #766968", -"`+ c #816766", -" @ c #744B45", -".@ c #845047", -"+@ c #5B3426", -"@@ c #7E4D3E", -"#@ c #92594D", -"$@ c #CA8F78", -"%@ c #AB7266", -"&@ c #885C57", -"*@ c #7C5B58", -"=@ c #342D29", -"-@ c #0C0300", -";@ c #090300", -">@ c #060000", -",@ c #B8A59A", -"'@ c #B09686", -")@ c #9A7972", -"!@ c #58453F", -"~@ c #85645F", -"{@ c #6D574F", -"]@ c #98786E", -"^@ c #231208", -"/@ c #180600", -"(@ c #745553", -"_@ c #896362", -":@ c #493730", -"<@ c #BB9685", -"[@ c #6B4D48", -"}@ c #9C736A", -"|@ c #7B574F", -"1@ c #835B56", -"2@ c #AB8174", -"3@ c #966662", -"4@ c #4C362E", -"5@ c #75504C", -"6@ c #98806E", -"7@ c #947C6F", -"8@ c #9E8975", -"9@ c #907268", -"0@ c #7C584F", -"a@ c #885F5B", -"b@ c #8D6761", -"c@ c #6D5855", -"d@ c #806F6D", -"e@ c #755E58", -"f@ c #754E45", -"g@ c #8B574E", -"h@ c #A86961", -"i@ c #9D6156", -"j@ c #C68C75", -"k@ c #B47369", -"l@ c #5D3A31", -"m@ c #885B5A", -"n@ c #7E5C60", -"o@ c #160905", -"p@ c #070000", -"q@ c #0C0401", -"r@ c #C5B3AF", -"s@ c #9A7B75", -"t@ c #6A504C", -"u@ c #614A43", -"v@ c #755752", -"w@ c #56443F", -"x@ c #392F28", -"y@ c #25150A", -"z@ c #2E2018", -"A@ c #7B5A58", -"B@ c #765753", -"C@ c #85605D", -"D@ c #966D66", -"E@ c #5C453B", -"F@ c #906961", -"G@ c #74524A", -"H@ c #A1796D", -"I@ c #A67E72", -"J@ c #7C574F", -"K@ c #674941", -"L@ c #704F48", -"M@ c #937B6B", -"N@ c #7C625B", -"O@ c #907A6B", -"P@ c #856D66", -"Q@ c #8F6C64", -"R@ c #8B5F5A", -"S@ c #835952", -"T@ c #98726A", -"U@ c #A58F83", -"V@ c #685653", -"W@ c #8B6761", -"X@ c #A36F65", -"Y@ c #B27769", -"Z@ c #C99179", -"`@ c #CA8F79", -" # c #593426", -".# c #73473F", -"+# c #855A5B", -"@# c #73575C", -"## c #16090A", -"$# c #1C1418", -"%# c #070001", -"&# c #020000", -"*# c #AC948B", -"=# c #291C13", -"-# c #745753", -";# c #6A4E48", -"># c #70534F", -",# c #846060", -"'# c #98736F", -")# c #53423E", -"!# c #57453F", -"~# c #9A746F", -"{# c #9C786E", -"]# c #A58173", -"^# c #AD8B79", -"/# c #845F57", -"(# c #A37D6D", -"_# c #997265", -":# c #A17B6A", -"<# c #A07869", -"[# c #AC8574", -"}# c #835C57", -"|# c #6F5C5C", -"1# c #837166", -"2# c #BBAC95", -"3# c #806862", -"4# c #8F756E", -"5# c #8B625F", -"6# c #C88F79", -"7# c #512E20", -"8# c #6C413B", -"9# c #755052", -"0# c #1D0B0B", -"a# c #180B10", -"b# c #090003", -"c# c #0E060C", -"d# c #0B0203", -"e# c #B59F9A", -"f# c #A7887D", -"g# c #A07A72", -"h# c #B28C7E", -"i# c #9A726E", -"j# c #9D7473", -"k# c #9E7D6E", -"l# c #9C7869", -"m# c #7B594E", -"n# c #9D7866", -"o# c #AA8570", -"p# c #835E52", -"q# c #745348", -"r# c #77554A", -"s# c #76554C", -"t# c #665A5A", -"u# c #807064", -"v# c #9E8B77", -"w# c #AD9C87", -"x# c #88746D", -"y# c #68514C", -"z# c #5C3A2D", -"A# c #995E56", -"B# c #A26665", -"C# c #8B5F62", -"D# c #4F3F47", -"E# c #3A3741", -"F# c #170D16", -"G# c #030001", -"H# c #080003", -"I# c #B49D95", -"J# c #A38379", -"K# c #A0796F", -"L# c #6F514A", -"M# c #8E6361", -"N# c #855F5F", -"O# c #906B5F", -"P# c #966F61", -"Q# c #90695B", -"R# c #B28D74", -"S# c #8D6357", -"T# c #9E7765", -"U# c #674A3E", -"V# c #67483B", -"W# c #63463A", -"X# c #837269", -"Y# c #857366", -"Z# c #715B55", -"`# c #948274", -" $ c #B0A69A", -".$ c #816662", -"+$ c #625556", -"@$ c #745B5C", -"#$ c #301A10", -"$$ c #371E14", -"%$ c #4E3127", -"&$ c #391F11", -"*$ c #522F20", -"=$ c #46281D", -"-$ c #734E4F", -";$ c #5F5060", -">$ c #0C020A", -",$ c #0C040B", -"'$ c #0C0307", -")$ c #DACDC7", -"!$ c #A78877", -"~$ c #D9BC9F", -"{$ c #BB977E", -"]$ c #B28979", -"^$ c #B2887B", -"/$ c #5F463C", -"($ c #795952", -"_$ c #BC9B82", -":$ c #B6927B", -"<$ c #8E665B", -"[$ c #9D7565", -"}$ c #A7826A", -"|$ c #A77D69", -"1$ c #BA9375", -"2$ c #BB9275", -"3$ c #80584A", -"4$ c #AB7E6A", -"5$ c #7E564A", -"6$ c #98826F", -"7$ c #AC9C7E", -"8$ c #A5947E", -"9$ c #715E5B", -"0$ c #A39790", -"a$ c #765F5C", -"b$ c #776260", -"c$ c #655758", -"d$ c #563E3C", -"e$ c #533430", -"f$ c #593731", -"g$ c #8B5856", -"h$ c #744841", -"i$ c #673D2E", -"j$ c #935B55", -"k$ c #674847", -"l$ c #7C5F69", -"m$ c #1C1119", -"n$ c #110710", -"o$ c #010000", -"p$ c #0D0607", -"q$ c #DAD1C5", -"r$ c #C4AB8C", -"s$ c #A8846E", -"t$ c #B58F75", -"u$ c #AA8070", -"v$ c #B28679", -"w$ c #A67C6E", -"x$ c #A1776A", -"y$ c #8F645B", -"z$ c #845A51", -"A$ c #976A5D", -"B$ c #B0866E", -"C$ c #A27862", -"D$ c #A67864", -"E$ c #875B4D", -"F$ c #946256", -"G$ c #B4846E", -"H$ c #895A4E", -"I$ c #815649", -"J$ c #887062", -"K$ c #9C8B73", -"L$ c #88746A", -"M$ c #928274", -"N$ c #856D6D", -"O$ c #886F70", -"P$ c #877774", -"Q$ c #6F595D", -"R$ c #624443", -"S$ c #7B4D4D", -"T$ c #613A36", -"U$ c #30130B", -"V$ c #925B56", -"W$ c #563120", -"X$ c #9A6258", -"Y$ c #7B5553", -"Z$ c #4C3D41", -"`$ c #231820", -" % c #0D050B", -".% c #070105", -"+% c #080303", -"@% c #BAA78E", -"#% c #A88D72", -"$% c #D4B68B", -"%% c #A07461", -"&% c #B58B74", -"*% c #805952", -"=% c #93635D", -"-% c #A37069", -";% c #AF7D70", -">% c #B48472", -",% c #A87766", -"'% c #A16D60", -")% c #B5836D", -"!% c #8F5E51", -"~% c #8B5B4D", -"{% c #6D4636", -"]% c #8E5B4E", -"^% c #815245", -"/% c #7F5143", -"(% c #8B7968", -"_% c #75665B", -":% c #7A6A65", -"<% c #877978", -"[% c #A19498", -"}% c #988080", -"|% c #4D2E2B", -"1% c #895757", -"2% c #58362D", -"3% c #5F3826", -"4% c #9C6458", -"5% c #654643", -"6% c #281616", -"7% c #23181F", -"8% c #0C0207", -"9% c #090105", -"0% c #070100", -"a% c #DDD6C5", -"b% c #B6A07E", -"c% c #B69A75", -"d% c #A7836A", -"e% c #966C5F", -"f% c #AC8275", -"g% c #946158", -"h% c #A37061", -"i% c #8B5A4D", -"j% c #905B4D", -"k% c #AB7361", -"l% c #9D6456", -"m% c #9C6256", -"n% c #9A6256", -"o% c #8E5A4E", -"p% c #835549", -"q% c #79645B", -"r% c #807066", -"s% c #8F8980", -"t% c #A19F9D", -"u% c #766C70", -"v% c #85716F", -"w% c #815B5A", -"x% c #583D3B", -"y% c #5D4143", -"z% c #523837", -"A% c #563634", -"B% c #4B312E", -"C% c #936365", -"D% c #6B4948", -"E% c #3C271E", -"F% c #754B3A", -"G% c #795040", -"H% c #4B342C", -"I% c #443539", -"J% c #5B4A58", -"K% c #12050C", -"L% c #040000", -"M% c #090101", -"N% c #D4CDBE", -"O% c #C8B891", -"P% c #C5B189", -"Q% c #9C816A", -"R% c #89665F", -"S% c #84615F", -"T% c #8D6866", -"U% c #A27C72", -"V% c #A37B6E", -"W% c #855E53", -"X% c #8E6056", -"Y% c #9E6C5F", -"Z% c #966152", -"`% c #B07964", -" & c #B47A64", -".& c #875241", -"+& c #935A4C", -"@& c #985F51", -"#& c #A56B5D", -"$& c #8E5B51", -"%& c #9D6961", -"&& c #927D6F", -"*& c #7B6A65", -"=& c #A8A3A1", -"-& c #9C9694", -";& c #9D9493", -">& c #C4ADAD", -",& c #7E534F", -"'& c #673F3B", -")& c #764B49", -"!& c #603E37", -"~& c #321B11", -"{& c #815753", -"]& c #76504C", -"^& c #6C4A44", -"/& c #63453B", -"(& c #634231", -"_& c #7A5143", -":& c #6A4B47", -"<& c #73565C", -"[& c #261A1F", -"}& c #090001", -"|& c #0D0106", -"1& c #0C0202", -"2& c #CDC6B5", -"3& c #97846E", -"4& c #B5A581", -"5& c #776053", -"6& c #6C574E", -"7& c #886766", -"8& c #806262", -"9& c #8B6A62", -"0& c #B18974", -"a& c #926256", -"b& c #A87761", -"c& c #A06756", -"d& c #935B4C", -"e& c #B57A64", -"f& c #B07360", -"g& c #A5695A", -"h& c #AA7365", -"i& c #8E5C55", -"j& c #9E6A65", -"k& c #846962", -"l& c #887068", -"m& c #A8A7A4", -"n& c #A2948F", -"o& c #926965", -"p& c #6D443B", -"q& c #83504A", -"r& c #512F26", -"s& c #87554E", -"t& c #925C58", -"u& c #5F3D32", -"v& c #5B3931", -"w& c #A06A65", -"x& c #94635A", -"y& c #996658", -"z& c #AC7D69", -"A& c #795652", -"B& c #76585F", -"C& c #352B34", -"D& c #12040B", -"E& c #080002", -"F& c #D7D3C7", -"G& c #AC9D81", -"H& c #8F7B66", -"I& c #B4A081", -"J& c #8A6F66", -"K& c #CBB8AA", -"L& c #9D8279", -"M& c #8B6B66", -"N& c #AD937D", -"O& c #9A786A", -"P& c #A5806E", -"Q& c #745043", -"R& c #AC7C66", -"S& c #B78369", -"T& c #A26958", -"U& c #945B4D", -"V& c #965F4E", -"W& c #A26B5D", -"X& c #C29479", -"Y& c #AB7B6D", -"Z& c #A07369", -"`& c #8B7068", -" * c #816C68", -".* c #968B82", -"+* c #A19A93", -"@* c #9A8D83", -"#* c #7E564D", -"$* c #7E4B40", -"%* c #7C4A41", -"&* c #7C4A40", -"** c #76473E", -"=* c #7E4E41", -"-* c #6D4439", -";* c #89574D", -">* c #89584E", -",* c #7C5245", -"'* c #98675A", -")* c #A87E6A", -"!* c #8E6970", -"~* c #5F4D5A", -"{* c #080001", -"]* c #181214", -"^* c #A59986", -"/* c #877568", -"(* c #C0B491", -"_* c #927D6E", -":* c #8A7268", -"<* c #A68D80", -"[* c #806666", -"}* c #7F6460", -"|* c #94756A", -"1* c #89645D", -"2* c #7A584C", -"3* c #996C5F", -"4* c #B2836D", -"5* c #845749", -"6* c #7A5041", -"7* c #764D3E", -"8* c #81564A", -"9* c #A77969", -"0* c #8E635D", -"a* c #8A635F", -"b* c #7A6C65", -"c* c #948A80", -"d* c #877A77", -"e* c #8B7D78", -"f* c #83706D", -"g* c #85564E", -"h* c #351706", -"i* c #613629", -"j* c #93584E", -"k* c #995E55", -"l* c #4F2E1E", -"m* c #472919", -"n* c #543524", -"o* c #7A4D41", -"p* c #7E5247", -"q* c #C59D80", -"r* c #A07A6D", -"s* c #A7847E", -"t* c #A28286", -"u* c #4D424E", -"v* c #0C0005", -"w* c #150B10", -"x* c #CAC7BB", -"y* c #B7AF96", -"z* c #5F5349", -"A* c #BEB196", -"B* c #AB9986", -"C* c #A58E83", -"D* c #99827E", -"E* c #947D77", -"F* c #8B746E", -"G* c #A78F7E", -"H* c #A08275", -"I* c #83625B", -"J* c #8B645D", -"K* c #996F62", -"L* c #81594E", -"M* c #9D7062", -"N* c #96685F", -"O* c #986D65", -"P* c #B08B79", -"Q* c #906B66", -"R* c #8E6B68", -"S* c #7F7170", -"T* c #4F4A4C", -"U* c #766669", -"V* c #775E5F", -"W* c #98615C", -"X* c #855047", -"Y* c #A1635C", -"Z* c #A1635D", -"`* c #512E22", -" = c #492B1D", -".= c #764A3F", -"+= c #7B4E43", -"@= c #6F473B", -"#= c #C59981", -"$= c #77564F", -"%= c #2D201E", -"&= c #292023", -"*= c #170B11", -"== c #170C14", -"-= c #160E15", -";= c #080102", -">= c #D3D5D7", -",= c #6B5E5C", -"'= c #2E2C22", -")= c #655856", -"!= c #B5A79C", -"~= c #736065", -"{= c #A28F8B", -"]= c #A8978F", -"^= c #A39187", -"/= c #9E8880", -"(= c #A58D82", -"_= c #5D4B48", -":= c #81625F", -"<= c #886360", -"[= c #AF8B7B", -"}= c #B18E7E", -"|= c #A88477", -"1= c #A38075", -"2= c #AD8E81", -"3= c #806364", -"4= c #796061", -"5= c #776969", -"6= c #84736F", -"7= c #7F6B6B", -"8= c #7C6A68", -"9= c #A37C72", -"0= c #7B4F4A", -"a= c #663F37", -"b= c #794D47", -"c= c #381F15", -"d= c #32180C", -"e= c #613E36", -"f= c #280F02", -"g= c #382316", -"h= c #68463F", -"i= c #9D716D", -"j= c #513F3B", -"k= c #85676D", -"l= c #2D2527", -"m= c #13060A", -"n= c #0B0005", -"o= c #070003", -"p= c #323135", -"q= c #150E07", -"r= c #1B1610", -"s= c #0E0600", -"t= c #0D0400", -"u= c #231D1E", -"v= c #20181A", -"w= c #0E0605", -"x= c #150D0A", -"y= c #1A120C", -"z= c #251D1A", -"A= c #120600", -"B= c #251B15", -"C= c #1D120A", -"D= c #342924", -"E= c #372D29", -"F= c #2B1F1B", -"G= c #1D120B", -"H= c #1C110B", -"I= c #090000", -"J= c #0D0300", -"K= c #7E6364", -"L= c #8F736F", -"M= c #947572", -"N= c #A8847B", -"O= c #7A5556", -"P= c #99686A", -"Q= c #744F4E", -"R= c #5C3D3B", -"S= c #6C4848", -"T= c #734E4E", -"U= c #321D16", -"V= c #483430", -"W= c #5C413F", -"X= c #835B5C", -"Y= c #5F4748", -"Z= c #0E0000", -"`= c #130606", -" - c #0C0001", -".- c #1A111A", -"+- c #0B010A", -"@- c #7A6D79", -"#- c #0C0502", -"$- c #080100", -"%- c #130C0C", -"&- c #0E0506", -"*- c #0E0707", -"=- c #0B0301", -"-- c #110908", -";- c #120906", -">- c #180E0D", -",- c #0D0200", -"'- c #110501", -")- c #110300", -"!- c #0E0100", -"~- c #0D0100", -"{- c #160C0B", -"]- c #0C0302", -"^- c #160705", -"/- c #211615", -"(- c #201414", -"_- c #59484E", -":- c #58454A", -"<- c #684E56", -"[- c #47383E", -"}- c #523F45", -"|- c #A78286", -"1- c #3D3136", -"2- c #413337", -"3- c #5B474D", -"4- c #8D6973", -"5- c #120100", -"6- c #150505", -"7- c #100305", -"8- c #110408", -"9- c #0D0107", -"0- c #0D040C", -"a- c #0B0208", -"b- c #1F1B1F", -"c- c #232024", -"d- c #201C1E", -"e- c #0B0105", -"f- c #0C0308", -"g- c #0B0206", -"h- c #0B0306", -"i- c #0C0102", -"j- c #080000", -"k- c #130A0C", -"l- c #0E070A", -"m- c #090201", -"n- c #0E0305", -"o- c #16090B", -"p- c #130407", -"q- c #130306", -"r- c #150508", -"s- c #201419", -"t- c #0E0102", -"u- c #15090A", -"v- c #15090F", -"w- c #10040B", -"x- c #060003", -"y- c #0D040B", -"z- c #928894", -"A- c #675C69", -"B- c #706270", -"C- c #605664", -"D- c #2B2931", -"E- c #1D151D", -"F- c #12070F", -"G- c #120B11", -"H- c #060001", -"I- c #0D0508", -"J- c #10070B", -"K- c #0E0507", -"L- c #0D0305", -"M- c #1B1418", -"N- c #120B0D", -"O- c #0E0508", -"P- c #080103", -"Q- c #0E060B", -"R- c #100B0D", -"S- c #0E0A0C", -"T- c #150E13", -"U- c #0E060A", -"V- c #10060A", -"W- c #0B0003", -"X- c #0D0105", -"Y- c #0E0206", -"Z- c #1B0F16", -"`- c #12050B", -" ; c #170D13", -".; c #0B0006", -"+; c #46414D", -"@; c #615564", -"#; c #6C5F6D", -"$; c #B5B1C3", -"%; c #A0929F", -"&; c #776674", -"*; c #8D7B87", -"=; c #6D5F6D", -"-; c #83707E", -";; c #897786", -">; c #5C5160", -",; c #28252C", -"'; c #070002", -"); c #11060B", -"!; c #3F4049", -"~; c #1B151A", -"{; c #181318", -"]; c #150E14", -"^; c #181319", -"/; c #0B0708", -"(; c #0C070A", -"_; c #130F13", -":; c #120C0F", -"<; c #150D10", -"[; c #12070C", -"}; c #150B0F", -"|; c #1B1118", -"1; c #11050A", -"2; c #1A0F15", -"3; c #12060C", -"4; c #655865", -"5; c #84727D", -"6; c #7A6874", -"7; c #847179", -"8; c #7E6B75", -"9; c #46444C", -"0; c #7E6975", -"a; c #3C3C43", -"b; c #71616E", -"c; c #83717D", -"d; c #8A7983", -"e; c #73626F", -"f; c #816F7C", -"g; c #5C515D", -"h; c #44404A", -"i; c #514A55", -"j; c #675A66", -"k; c #685B68", -"l; c #5C525D", -"m; c #4F4B56", -"n; c #544F5A", -"o; c #70626F", -"p; c #635B68", -"q; c #847580", -"r; c #615965", -"s; c #53515B", -"t; c #2E3337", -"u; c #625E68", -"v; c #83797D", -"w; c #847880", -"x; c #575058", -"y; c #37373E", -"z; c #2B2629", -"A; c #1B1114", -"B; c #1C1315", -"C; c #302B31", -"D; c #735F69", -"E; c #806875", -"F; c #928087", -"G; c #A08F96", -"H; c #887378", -"I; c #65575D", -"J; c #53494D", -"K; c #8E7978", -"L; c #98847E", -"M; c #7A6368", -"N; c #8B777B", -"O; c #8F7B7D", -"P; c #7F6770", -"Q; c #836B74", -"R; c #856D75", -"S; c #857178", -"T; c #887379", -"U; c #877379", -"V; c #7E6A74", -"W; c #75626D", -"X; c #998A89", -"Y; c #806F75", -"Z; c #434148", -"`; c #74666E", -" > c #8D7E81", -".> c #B6B0B6", -"+> c #8A8480", -"@> c #A7A6A4", -"#> c #AAA7A7", -"$> c #A8A09F", -"%> c #8F8180", -"&> c #9C8986", -"*> c #AC9A9A", -"=> c #9D8483", -"-> c #B6A4A7", -";> c #93797C", -">> c #856B70", -",> c #947B7B", -"'> c #978477", -")> c #968275", -"!> c #A19180", -"~> c #8D7870", -"{> c #A69380", -"]> c #9A8678", -"^> c #978073", -"/> c #8B7570", -"(> c #BBAA9E", -"_> c #A89186", -":> c #B49E98", -"<> c #B19C96", -"[> c #98807E", -"}> c #876C70", -"|> c #877173", -"1> c #927C7B", -"2> c #978480", -"3> c #877273", -"4> c #837273", -"5> c #706064", -"6> c #9C8D86", -"7> c #8D7D7B", -"8> c #92837E", -"9> c #FF00DC", -"0> c #B8B1A6", -"a> c #AF9F91", -"b> c #AC9A8B", -"c> c #A38B80", -"d> c #AC9586", -"e> c #A78D82", -"f> c #9E837B", -"g> c #A78B81", -"h> c #836A62", -"i> c #B2A08A", -"j> c #BEAE9A", -"k> c #C6B9A7", -"l> c #968072", -"m> c #846C64", -"n> c #7A5F5C", -"o> c #896D68", -"p> c #9C8279", -"q> c #A38D80", -"r> c #A79486", -"s> c #AD9E8F", -"t> c #A18F82", -"u> c #6B595A", -"v> c #544947", -"w> c #968478", -"x> c #A08F80", -"y> c #AB9B83", -"z> c #968173", -"A> c #A38D7B", -"B> c #68524D", -"C> c #5C4843", -"D> c #6A524D", -"E> c #8A6A64", -"F> c #AB8E7D", -"G> c #AA9279", -"H> c #AA957B", -"I> c #98816E", -"J> c #937C6A", -"K> c #AD9A7E", -"L> c #836A5F", -"M> c #967E6E", -"N> c #9D8973", -"O> c #BEB091", -"P> c #B4A482", -"Q> c #C1B18C", -"R> c #B6A581", -"S> c #97816E", -"T> c #B09C82", -"U> c #AF9B82", -"V> c #93806F", -"W> c #A5937B", -"X> c #BBAE8E", -"Y> c #B19E81", -"Z> c #B7A486", -"`> c #A28B77", -" , c #967D72", -"., c #988073", -"+, c #90786E", -"@, c #7F6760", -"#, c #7B665F", -"$, c #88756B", -"%, c #756360", -"&, c #33302C", -"*, c #383735", -"=, c #57473F", -"-, c #8D7566", -";, c #80665B", -">, c #9A836B", -",, c #A89377", -"', c #B5A082", -"), c #BEA88A", -"!, c #A58C77", -"~, c #A68D77", -"{, c #AD967B", -"], c #AF997E", -"^, c #B19B81", -"/, c #C4B199", -"(, c #9D8572", -"_, c #947D6E", -":, c #A2917B", -"<, c #AFA387", -"[, c #938573", -"}, c #5B4E45", -"|, c #A79B81", -"1, c #BBB196", -"2, c #B6AB8F", -"3, c #AC9F83", -"4, c #ABA082", -"5, c #B7AF8F", -"6, c #C9C4A7", -"7, c #A09379", -"8, c #A79A7B", -"9, c #A5957B", -"0, c #7E6860", -"a, c #9C8677", -"b, c #A6927D", -"c, c #937C6E", -"d, c #7E6D60", -"e, c #A19783", -"f, c #15110C", -"g, c #2B2E32", -"h, c #A18A73", -"i, c #AC967B", -"j, c #A69173", -"k, c #AA9475", -"l, c #B7A47E", -"m, c #C2B18C", -"n, c #E8E0C8", -"o, c #BAA586", -"p, c #CDBDAA", -"q, c #C2B09E", -"r, c #B19B87", -"s, c #AD967E", -"t, c #9C8372", -"u, c #A58E79", -"v, c #988372", -"w, c #A39486", -"x, c #BBB4A3", -"y, c #BEB8A7", -"z, c #BCB7A6", -"A, c #CBC9BA", -"B, c #BFB9A7", -"C, c #A59B80", -"D, c #C9C6AF", -"E, c #CECCB6", -"F, c #CDC9AF", -"G, c #C6C2A6", -"H, c #A2997B", -"I, c #CFCEB1", -"J, c #C8C2A2", -"K, c #B6AC8A", -"L, c #A79481", -"M, c #876D66", -"N, c #A28C79", -"O, c #B6A385", -"P, c #C2B793", -"Q, c #ABA281", -"R, c #A7A08B", -"S, c #110D08", -"T, c #AC9977", -"U, c #B7A57E", -"V, c #B09D7B", -"W, c #C5B594", -"X, c #A38E75", -"Y, c #CEC0AD", -"Z, c #CBBDAD", -"`, c #BCAB9F", -" ' c #B5A296", -".' c #AB998A", -"+' c #7E6660", -"@' c #B4A793", -"#' c #BAAF9E", -"$' c #BFB6A6", -"%' c #C6C0AF", -"&' c #C4BDAB", -"*' c #C0B8A6", -"=' c #BBB39D", -"-' c #BEB69D", -";' c #C8C1AB", -">' c #B8B091", -",' c #A2967B", -"'' c #B0A585", -")' c #C1BB9A", -"!' c #D5D2B5", -"~' c #A29679", -"{' c #A5937E", -"]' c #9E8979", -"^' c #AC9682", -"/' c #C1AF91", -"(' c #AC9C7D", -"_' c #C5BF9E", -":' c #BFAF89", -"<' c #C0B086", -"[' c #D5CAAA", -"}' c #C8B999", -"|' c #BAA88A", -"1' c #C1B39D", -"2' c #DAD1C7", -"3' c #AD9A87", -"4' c #C4B6B1", -"5' c #CDC5C2", -"6' c #9E8C7B", -"7' c #CDC8BB", -"8' c #B1A693", -"9' c #C0B9AA", -"0' c #B7AF9A", -"a' c #C5C0AD", -"b' c #A79B82", -"c' c #CBC7B6", -"d' c #DEDECE", -"e' c #B7AE91", -"f' c #BFB79D", -"g' c #CFCCB2", -"h' c #D5D3BD", -"i' c #E7E8D6", -"j' c #B6AD8E", -"k' c #BAB18F", -"l' c #998972", -"m' c #90796F", -"n' c #AD9786", -"o' c #9A8173", -"p' c #B59E85", -"q' c #897160", -"r' c #AB9C7E", -"s' c #CBC1A2", -"t' c #BCAF8F", -"u' c #A7957B", -"v' c #CDC2B2", -"w' c #C0B4A6", -"x' c #BCAEA3", -"y' c #998478", -"z' c #AD9D8B", -"A' c #87736A", -"B' c #AB9C83", -"C' c #AD9F87", -"D' c #978575", -"E' c #C2B9A7", -"F' c #C2B8A3", -"G' c #978573", -"H' c #B0A385", -"I' c #A89A7E", -"J' c #A7997D", -"K' c #96846F", -"L' c #B7AB8E", -"M' c #98866F", -"N' c #A7967E", -"O' c #9E867B", -"P' c #8A6D6B", -"Q' c #846362", -"R' c #9D8172", -"S' c #907866", -"T' c #907C68", -"U' c #A08D75", -"V' c #998675", -"W' c #A6947E", -"X' c #938073", -"Y' c #9C8979", -"Z' c #A69680", -"`' c #79645F", -" ) c #B8AD96", -".) c #7F6B62", -"+) c #9D8C79", -"@) c #A89981", -"#) c #93816F", -"$) c #998975", -"%) c #A29379", -"&) c #A6977D", -"*) c #978672", -"=) c #806C60", -"-) c #7E6A5F", -";) c #9E8C75", -">) c #806A5F", -",) c #A78E81", -"') c #846366", -")) c #9D7D75", -"!) c #94826A", -"~) c #A79579", -"{) c #897466", -"]) c #7F6960", -"^) c #7C665F", -"/) c #B6A793", -"() c #AD9C85", -"_) c #A08D79", -":) c #B2A38B", -"<) c #948172", -"[) c #B8AB91", -"}) c #A08D77", -"|) c #887366", -"1) c #927E6E", -"2) c #AF9E82", -"3) c #755E57", -"4) c #9A8975", -"5) c #9D8B77", -"6) c #5B4B44", -"7) c #735A55", -"8) c #4F403C", -"9) c #8E6F6E", -"0) c #947373", -"a) c #9C7973", -"b) c #A5927B", -"c) c #9C8875", -"d) c #735A57", -"e) c #6F5955", -"f) c #CEC5B6", -"g) c #988572", -"h) c #998673", -"i) c #9D8B75", -"j) c #A8977E", -"k) c #A18F79", -"l) c #8A7568", -"m) c #8F786A", -"n) c #6B534F", -"o) c #4E3F3A", -"p) c #76595F", -"q) c #8B676B", -"r) c #8D7466", -"s) c #C4B59E", -"t) c #7F665C", -"u) c #705751", -"v) c #99826F", -"w) c #8A7266", -"x) c #A7937B", -"y) c #AB967E", -"z) c #8F786B", -"A) c #66504C", -"B) c #755A57", -"C) c #8B7468", -"D) c #A68F7B", -"E) c #FF52CE", -"F) c #856C5F", -"G) c #AB967D", -"H) c #99836F", -"I) c #947D6B", -"J) c #B09C81", -"K) c #846B60", -"L) c #97806E", -"M) c #BFAE95", -"N) c #9A8472", -"O) c #9D8875", -"P) c #988272", -"Q) c #947D6F", -"R) c #7B625C", -"S) c #594741", -"T) c #B09A7E", -"U) c #B29D81", -"V) c #C5B49A", -"W) c #9E8672", -"X) c #92786A", -"Y) c #A28A75", -"Z) c #A58D77", -"`) c #7E625C", -" ! c #937A6B", -".! c #A6917B", -"+! c #977E6F", -"@! c #846862", -"#! c #A18973", -"$! c #84695F", -"%! c #9E8673", -"&! c #A68E79", -"*! c #9E8675", -"=! c #B7A38B", -"-! c #B49C7E", -";! c #967A6A", -">! c #AA917B", -",! c #AA917D", -"'! c #7E605B", -")! c #92756A", -"!! c #9D8373", -"~! c #B59E89", -"{! c #977B6B", -"]! c #A38A75", -"^! c #A18575", -"/! c #876962", -" ", -" . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f g ", -" h i j k l k m n o p q r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y ", -" Z ` ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d. ", -" e.f.g.h.i.j.k.l.. m.n.o.p.q.r.s.t.u.v.w.x.y.z./.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U. ", -" V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+!+/.~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+ ", -" 0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+/.w+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+ ", -" R+S+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@/.,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@ ", -" 6@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@p@/.r@s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@L@ ", -" M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#/.*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#G@}# ", -" |#1#2#3#4#5# 6#7#8#9#0#a#b#c#d#/.e#f#g#h#i#j# k#l#m#n#o#p#q#r#s# ", -" t#u#v#w#x#y# z#A#B#C#D#E#F#G#H#/.I#J#K#L#M#N# O#P#Q#R#S#T#U#V#W# ", -" X#Y#Z#`# $.$ 4#+$@$#$$$%$&$*$=$-$D#;$>$,$'$/.)$!$~${$]$^$ /$($_$:$<$[$}$|$1$2$3$4$5$ ", -" 6$7$8$9$0$a$ b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$/.q$r$s$t$u$v$ w$x$y$z$A$B$C$D$E$F$G$H$I$ ", -" J$K$L$M$N$O$ P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%/.@%#%$%%%&%*% =%-%;%>%,%'%)%!%~%{%]%^%/% ", -" (%_%:%<%[%}% |%1%2%3%4%5%6%7%8%9%0%/.a%b%c%d%e%f% g%h%i%j%k%l%m%n%o%p% ", -" q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%G%H%I%J%K%L%M%/.N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&$&%& ", -" &&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&<&[&}&|&1&/.2&3&4&5&6&7&8&!@9&/#0&a&b&c&d&e&f&g&h&i&j& ", -" k&l&x.m&n&o&p&q&r&s&t&u&v&w&x&y&z&A&B&C&D&E&1&/.F&G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&W&X&Y&Z& ", -" `& *.*+*@*#*$*%*&***=*-*;*>*,*'*)*H+!*~*{*b#]*/.^*/*(*_*:*<*[*}*C+|*1*2*3*4*5*6*7*8*9*0*a* ", -" b*c*d*e*f*g*h*i*j*k*l*m*n*o*p*q*r*s*t*u*v*w*v+/.x*y*z*A*B*C*D*E*F*G*H*I*J*K*L*M*N*O*P*Q*R* ", -" d*S*T*U*V*W*X*Y*Z*`* =.=+=@=#=$=r %=&=*===-=;= >=,='=)=!=~={=]=^=/=(=_=:=<=[=}=|=1=2=3=4= ", -" 5=6=7=8=9=0=a=b=c=d=e=f=g=h=i=j=k=l=m=n=o= /.p=q=r=s=t=u=v=w=x=y=z=A=B=C=D=E=F=G=H=I=J= ", -" K=L=M=N=O=P=Q=R=S=T=U=V=W=X=Y=Z=`= -v*.-+- /.@-#-q@$-%-&-{**-=---I=;->-,-'-)-!-~-{-I=]- ", -" ^-/-(-_-:-<-[-}-|-1-2-3-4-5-6-7-8-9- 0-a-/.b-c-d-d#&#e-f-%#g-h-%#L%}&i-i-j-I=k-v+v+l- ", -" m-j-v+n-7-o-p-q-j-r-r-s-t-u- -v-w- x-y-a-/.z-A-B-C-D-E-F-G-o=&#H-I-J-K-L-M-N-O-P-H#Q- ", -" R-S-T-U-V-W-X-Y-Z-X-`-j-`- ;%#w-.; +;@;#;/.$;%;&;*;=;-;;;>;,;n=';O-);I-O-#;!;~;{;];^; ", -" /;(;_;:;<;[;};|;};L%1;2;L%3;}; 4;&;5;6;7;8;/.9;0;a;b;c;d;e;f;g;h;i;j;k;l;m;n;o;p;q;r;s; ", -" t;u;v;w;x;y;z;A;B;C;D;E; F;G;H;I;J;K;L;M;/. N;O;P;Q;R;S;T;U;V;W;X;Y;Z;`; >.> ", -" +>@>#>$>%>&>*>=>->;>>>,> w+'>)>!>~>{>]>^>/. />(>_>:><>[>}>|>1>2>3>4>5>6>7>8> ", -"9> 0>a>b>c>d>e>f>g>h> i>j>k>l>m>n>o>p><*<*q>r>s>t>u>v>w>x> ", -"9> y>z>A>B>C>D>E>F>G> H>I>J>K>L>M>N>O>P>Q>R>/.S>T>U>V>W>X>Y>Z>`> ,.,+,@,#,$,%,&,*, 9>9>9>", -"9> =,-,;,>,,,',),!,~, {,],^,/,(,_,:,<,[,},|,/.1,2,3,4,5,6,7,8,9,0,a,b,c,K$d,e,f,g, 9>9>9>", -"9> h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,/.C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S, 9>9>9>", -"9>9>9> T,U,V,W,X,Y,Z,`, '.'+'@'#'$'%'&'%'*'/.='-';'>',''')'!'~'{']'^'/'('_' 9>9>9>9>9>9>", -"9>9>9> :'<'['}'|'1'2'3'4'5'6'7'8'9'0'a'b'c'/.d'e'f'g'h'i'j'k'l'm'n'o'p'q'r' 9>9>9>9>9>9>", -"9>9>9>9> s't'u'v'w'x'y'z'A'B'C'D'E'F'F'/.G'H'I'J'H'K'L'M'N'O'P'Q'R'S' 9>9>9>9>9>9>", -"9>9>9>9>9>9>9> T'U'V'W'X'Y'Z'`' ).)+)@)N'#)/.$)%)&)*)=)-);)>)S+,)'))) 9>9>9>9>9>9>9>9>", -"9>9>9>9>9>9>9> !)~){)])^)/)()_):)<)[)})|)1)/.2)3)|):,4)5)6)7)8)9)0)a) 9>9>9>9>9>9>9>9>", -"9>9>9>9>9>9>9>9>9>9> b)c)d)e)f)g)h)i)j)/.h)2)g)1)k)l)m)n)o)p)q) 9>9>9>9>9>9>9>9>9>", -"9>9>9>9>9>9>9>9>9>9>9>9>9> r)s)6$t)6$u)v)w)/.x)y)x)z)A)B)C)D)E) 9>9>9>9>9>9>9>9>9>9>9>9>", -"9>9>9>9>9>9>9>9>9>9>9>9>9> F)G)H)I)J)K)L)L)/.M)y)N)O)P)Q)R)S)E) 9>9>9>9>9>9>9>9>9>9>9>9>", -"9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9> T)U)V)W)X)Y)/.Z)`) !.!+!@! 9>9>9>9>9>9>9>9>9>9>9>9>9>9>", -"9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9> #!$!%!/.&!*!=!+!t 9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>", -"9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9> -!;!>!/.,!'!)!!!~! 9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>", -"9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9> {!]!/.^!/! 9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>", -"9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9> 9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>", -"9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9> 9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>9>"}; +static char *ff0c952e75144cdf92e74d3c31955b54Ni86SAFyDinhQGbX[] = { +/* columns rows colors chars-per-pixel */ +"48 48 4 1 ", +" c #FF00DC", +". c #23B6E2", +"X c gray90", +"o c #E9E9E9", +/* pixels */ +"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", +"XX............................................XX", +"XX............................................XX", +"XX........................oooo...ooo..........XX", +"XX......................oo......ooooo.........XX", +"XX...................ooo.......ooooooo........XX", +"XX..................oo.........ooooooo........XX", +"XX.................o.......oo..ooooooo........XX", +"XX........ooo.....o......oo.....ooooo.........XX", +"XX......oooooo....o.....o........ooo..........XX", +"XX.....oooooooo..oo...oo.......oooooo.........XX", +"XX....oooooooooo.o...o........oooooooooooo....XX", +"XX....oooooooooo.o...o......ooooooooooooooo...XX", +"XX...ooooooooooo....o......oooooooooooo.ooo...XX", +"XX...ooooooooooo....o.....ooooooooooooo.ooo...XX", +"XX...oooooooooooo...o.....ooo.ooooooooo.ooo...XX", +"XX...ooooooooooooo........ooo.ooooooooo.ooo...XX", +"XX...oooooooooooooo.......ooo.ooooooooo.ooo...XX", +"XX...oooooooo...oooo......ooo.ooooooooo.oo....XX", +"XX...ooooo.......oooo.....ooo.ooooooooo.......XX", +"XX...oooo.........oooo....ooo.ooooooooo.......XX", +"XX...oo............oooo...ooo.ooooooooo.......XX", +"XX...ooo............oooo..ooo.ooooooooo.......XX", +"XX...oooo............oooo.oo..ooooooooo.......XX", +"XX....oooo............ooo.....ooo...ooo.......XX", +"XX.....oooo...................ooo...ooo.......XX", +"XX......oooo..................ooo...ooo.......XX", +"XX.......oooo.................ooo...ooo.......XX", +"XX........oooo................ooo...ooo.......XX", +"XX.........oooo...............ooo...ooo.......XX", +"XX..........oooo..............ooo...ooo.......XX", +"XX...........oooo.............ooo...oo........XX", +"XX............oooo............ooo.............XX", +"XXX............oooo...........ooo............XXX", +"XXXXX...........oooo..........ooo..........XXXXX", +" XXXXXX..........oooo.........ooo........XXXXXX ", +" XXXX..........oooo........oo........XXXX ", +" XXXX.........oooo...............XXXXX ", +" XXXX.........oooo.............XXXX ", +" XXXXX........ooo...........XXXXX ", +" XXXXX.......oo.........XXXXX ", +" XXXXX......o.......XXXXX ", +" XXXXX..........XXXXX ", +" XXXX........XXXX ", +" XXXXX..XXXXX ", +" XXXXXXXXXX ", +" XXXXXX " +}; diff --git a/src/raycast/ray.c b/src/raycast/ray.c index 5b77f06..953053f 100644 --- a/src/raycast/ray.c +++ b/src/raycast/ray.c @@ -17,9 +17,9 @@ #include "../player/player.h" #include "../consts.h" #include "../cub3d_data.h" -#include #include #include "../map/collision.h" +#define FLT_EPSILON 1.19209290e-7F void init_ray(t_ray *ray, int pos_x, t_player *player) { diff --git a/src/raycast/ray2.c b/src/raycast/ray2.c index 455325d..622b288 100644 --- a/src/raycast/ray2.c +++ b/src/raycast/ray2.c @@ -14,6 +14,11 @@ #include "../../libft/includes/libft.h" #include "../player/pay.h" +bool check_door_pos(t_cub3d_data *data) +{ + return (data->map->map[(int)data->player.y][(int)data->player.x] == 'i'); +} + void handle_door_ray(t_ray *ray, t_cub3d_data *data) { char current_tile; @@ -31,7 +36,7 @@ void handle_door_ray(t_ray *ray, t_cub3d_data *data) data->map->map[ray->map_y][ray->map_x] = 'i'; else if (current_tile == 'P' && pay(data, data->door_amount, true)) data->map->map[ray->map_y][ray->map_x] = '0'; - else if (current_tile == 'i') + else if (current_tile == 'i' && !check_door_pos(data)) data->map->map[ray->map_y][ray->map_x] = 'd'; } } diff --git a/src/sprites/sprite_caster.c b/src/sprites/sprite_caster.c index dcbe37d..d327842 100644 --- a/src/sprites/sprite_caster.c +++ b/src/sprites/sprite_caster.c @@ -6,13 +6,14 @@ /* By: tchampio +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/08/05 15:51:01 by tchampio #+# #+# */ -/* Updated: 2025/09/15 15:41:09 by tchampio ### ########.fr */ +/* Updated: 2025/10/03 18:20:05 by tchampio ### ########.fr */ /* */ /* ************************************************************************** */ #include "../cub3d_data.h" #include "../draw/drawutils.h" #include "../renderer/render.h" +#include "sprite_interactions.h" #include "sort_sprites.h" #include #include "../../libft/includes/libft.h" @@ -113,18 +114,7 @@ void sprite_caster(t_cub3d_data *data) if (!data->sprite_list || !data->sprite_list[0]) return ; sort_sprites(data->sprite_order, data->sprite_distances, data); - if (data->sprite_distances[data->sprite_counter - 1] <= 1.5) - { - if (data->sprite_list[data->sprite_order[data->sprite_counter - 1]] - ->sprite_type == PERK) - { - if (data->keypresses.is_f_pressed) - { - data->keypresses.is_f_pressed = false; - ft_printf("🎵You need a little revive🎵\n"); - } - } - } + handle_sprite_interactions(data); i = 0; while (data->sprite_list[i] && i < MAX_SPRITES) { diff --git a/src/sprites/sprite_interactions.c b/src/sprites/sprite_interactions.c new file mode 100644 index 0000000..f6efb30 --- /dev/null +++ b/src/sprites/sprite_interactions.c @@ -0,0 +1,74 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* sprite_interactions.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tchampio +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/10/03 18:18:04 by tchampio #+# #+# */ +/* Updated: 2025/10/03 18:19:03 by tchampio ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "../cub3d_data.h" +#include "../../libft/includes/libft.h" +#include "../player/pay.h" + +void pick_right_perk(char symbol, t_cub3d_data *data, int *last_perk) +{ + if (symbol == 'J' && !data->player.has_juggernog) + { + if (pay(data, 2500, false)) + { + data->player.perk_order[(*last_perk)++] = JUGGERNOG; + data->player.has_juggernog = true; + } + } + else if (symbol == 'Q' && !data->player.has_revive) + { + if (pay(data, 1500, false)) + { + data->player.perk_order[(*last_perk)++] = REVIVE; + data->player.has_revive = true; + } + } + else if (symbol == 'D' && !data->player.has_doubletap) + { + if (pay(data, 2000, false)) + { + data->player.perk_order[(*last_perk)++] = DOUBLETAP; + data->player.has_doubletap = true; + } + } +} + +void pay_and_give(t_cub3d_data *data, t_sprite *current_sprite) +{ + static int last_perk_pos = 0; + char symbol; + + if (last_perk_pos > 2) + return ; + symbol = data->map->map[(int)current_sprite->y][(int)current_sprite->x]; + pick_right_perk(symbol, data, &last_perk_pos); +} + +void handle_sprite_interactions(t_cub3d_data *data) +{ + t_sprite *current_sprite; + + current_sprite = data->sprite_list + [data->sprite_order[data->sprite_counter - 1]]; + if (data->sprite_distances[data->sprite_counter - 1] <= 1.5) + { + if (data->sprite_list[data->sprite_order[data->sprite_counter - 1]] + ->sprite_type == PERK) + { + if (data->keypresses.is_f_pressed) + { + data->keypresses.is_f_pressed = false; + pay_and_give(data, current_sprite); + } + } + } +} diff --git a/src/sprites/sprite_interactions.h b/src/sprites/sprite_interactions.h new file mode 100644 index 0000000..1fc9328 --- /dev/null +++ b/src/sprites/sprite_interactions.h @@ -0,0 +1,20 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* sprite_interactions.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tchampio +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/10/03 18:19:22 by tchampio #+# #+# */ +/* Updated: 2025/10/03 18:21:00 by tchampio ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef SPRITE_INTERACTIONS_H +# define SPRITE_INTERACTIONS_H + +# include "../cub3d_data.h" + +void handle_sprite_interactions(t_cub3d_data *data); + +#endif diff --git a/src/utils/destroy_utils.c b/src/utils/destroy_utils.c index dc556b5..6c32910 100644 --- a/src/utils/destroy_utils.c +++ b/src/utils/destroy_utils.c @@ -17,9 +17,10 @@ void destroy_texture(t_cub3d_data *data, t_img_data *data_img) { - if (data) + if (data_img) { - mlx_destroy_image(data->mlx, data_img->img); + if (data_img->img) + mlx_destroy_image(data->mlx, data_img->img); } free(data_img); } @@ -29,17 +30,13 @@ void destroy_textures(t_cub3d_data *data) int i; if (data->no_texture) - mlx_destroy_image(data->mlx, data->no_texture->img); - free(data->no_texture); + destroy_texture(data, data->no_texture); if (data->so_texture) - mlx_destroy_image(data->mlx, data->so_texture->img); - free(data->so_texture); + destroy_texture(data, data->so_texture); if (data->ea_texture) - mlx_destroy_image(data->mlx, data->ea_texture->img); - free(data->ea_texture); + destroy_texture(data, data->ea_texture); if (data->we_texture) - mlx_destroy_image(data->mlx, data->we_texture->img); - free(data->we_texture); + destroy_texture(data, data->we_texture); i = 0; while (i < 6) destroy_texture(data, data->barricades_texture[i++]); diff --git a/src/utils/inits.c b/src/utils/inits.c index fc7fa11..d42c023 100644 --- a/src/utils/inits.c +++ b/src/utils/inits.c @@ -40,8 +40,8 @@ t_img_data *load_single_texture(t_cub3d_data *data, char *path) ft_printf("Error: textures are not the right size\n"); destroy(data, 1); } - ft_printf("image: %p\n", img); img_data = ft_calloc(sizeof(t_img_data), 1); + ft_printf("image: %p\n", img); img_data->img = img; img_data->addr = mlx_get_data_addr(img_data->img, &img_data->bits_per_pixel, &img_data->line_length, @@ -110,9 +110,9 @@ void init_cub3d_data(t_cub3d_data *data, char **argv) register_weapons(data); init_player(data, &data->player, data->map); data->screen_matrix = ft_calloc(sizeof(int), WIDTH * HEIGHT); - load_textures(data); data->sprite_list = ft_calloc(sizeof(t_sprite *), MAX_SPRITES); ft_memset(data->sprite_distances, -1, MAX_SPRITES); data->door_amount = 750; place_base_sprites(data, data->map->map); + load_textures(data); }