From d50716fcb12caf60c5398ee6ff892403ff043032 Mon Sep 17 00:00:00 2001 From: Bitl Date: Wed, 15 Sep 2021 17:38:30 -0700 Subject: [PATCH] redid 2006s/2006s-shaders in 2007e, improved stability. --- Graphics/2006S.png | Bin 5207 -> 0 bytes Graphics/2006S/2006S.png | Bin 0 -> 4092 bytes Graphics/2006S/COPY_CLIPBOARD_16..png | Bin 0 -> 251 bytes Graphics/2006S/COPY_CLIPBOARD_16_D.png | Bin 0 -> 262 bytes Graphics/2006S/COPY_CLIPBOARD_16_H.png | Bin 0 -> 251 bytes Graphics/2006S/CUT_CLIPBOARD_16.png | Bin 0 -> 248 bytes Graphics/2006S/CUT_CLIPBOARD_16_D.png | Bin 0 -> 253 bytes Graphics/2006S/CUT_CLIPBOARD_16_H.png | Bin 0 -> 248 bytes Graphics/2006S/GROUP_16.png | Bin 0 -> 246 bytes Graphics/2006S/LOCK_16.png | Bin 0 -> 252 bytes Graphics/2006S/LOCK_OPEN_16.png | Bin 0 -> 251 bytes Graphics/2006S/NEW_DOCUMENT_16.png | Bin 0 -> 227 bytes Graphics/2006S/NEW_DOCUMENT_16_D.png | Bin 0 -> 227 bytes Graphics/2006S/NEW_DOCUMENT_16_H.png | Bin 0 -> 227 bytes Graphics/2006S/OPEN_DOCUMENT_16.png | Bin 0 -> 269 bytes Graphics/2006S/OPEN_DOCUMENT_16_D.png | Bin 0 -> 269 bytes Graphics/2006S/OPEN_DOCUMENT_16_H.png | Bin 0 -> 269 bytes Graphics/2006S/PAINTCAN_16.png | Bin 0 -> 283 bytes Graphics/2006S/PASTE_CLIPBOARD_16.png | Bin 0 -> 290 bytes Graphics/2006S/PASTE_CLIPBOARD_16_D.png | Bin 0 -> 314 bytes Graphics/2006S/PASTE_CLIPBOARD_16_H.png | Bin 0 -> 290 bytes Graphics/2006S/RECYCLE_16.png | Bin 0 -> 250 bytes Graphics/2006S/REDO_16.png | Bin 0 -> 234 bytes Graphics/2006S/REDO_16_D.png | Bin 0 -> 222 bytes Graphics/2006S/REDO_16_H.png | Bin 0 -> 234 bytes Graphics/2006S/SAVE_16.png | Bin 0 -> 229 bytes Graphics/2006S/SAVE_16_D.png | Bin 0 -> 229 bytes Graphics/2006S/SAVE_16_H.png | Bin 0 -> 229 bytes Graphics/2006S/UNDO_16.png | Bin 0 -> 231 bytes Graphics/2006S/UNDO_16_D.png | Bin 0 -> 227 bytes Graphics/2006S/UNDO_16_H.png | Bin 0 -> 231 bytes Graphics/2006S/UNGROUP_16.png | Bin 0 -> 253 bytes .../CharacterCustomizationShared.cs | 36 +++++-- .../Compact/CharacterCustomizationCompact.cs | 2 +- .../CharacterCustomizationExtended.cs | 5 +- changelog.txt | 6 +- scripts/game/2006S-Shaders/CSMPFunctions.lua | 90 +++++++++--------- scripts/game/2006S/CSMPFunctions.lua | 88 ++++++++--------- scripts/game/2007E-Shaders/CSMPFunctions.lua | 8 -- scripts/game/2007E/CSMPFunctions.lua | 9 -- 40 files changed, 124 insertions(+), 120 deletions(-) delete mode 100644 Graphics/2006S.png create mode 100644 Graphics/2006S/2006S.png create mode 100644 Graphics/2006S/COPY_CLIPBOARD_16..png create mode 100644 Graphics/2006S/COPY_CLIPBOARD_16_D.png create mode 100644 Graphics/2006S/COPY_CLIPBOARD_16_H.png create mode 100644 Graphics/2006S/CUT_CLIPBOARD_16.png create mode 100644 Graphics/2006S/CUT_CLIPBOARD_16_D.png create mode 100644 Graphics/2006S/CUT_CLIPBOARD_16_H.png create mode 100644 Graphics/2006S/GROUP_16.png create mode 100644 Graphics/2006S/LOCK_16.png create mode 100644 Graphics/2006S/LOCK_OPEN_16.png create mode 100644 Graphics/2006S/NEW_DOCUMENT_16.png create mode 100644 Graphics/2006S/NEW_DOCUMENT_16_D.png create mode 100644 Graphics/2006S/NEW_DOCUMENT_16_H.png create mode 100644 Graphics/2006S/OPEN_DOCUMENT_16.png create mode 100644 Graphics/2006S/OPEN_DOCUMENT_16_D.png create mode 100644 Graphics/2006S/OPEN_DOCUMENT_16_H.png create mode 100644 Graphics/2006S/PAINTCAN_16.png create mode 100644 Graphics/2006S/PASTE_CLIPBOARD_16.png create mode 100644 Graphics/2006S/PASTE_CLIPBOARD_16_D.png create mode 100644 Graphics/2006S/PASTE_CLIPBOARD_16_H.png create mode 100644 Graphics/2006S/RECYCLE_16.png create mode 100644 Graphics/2006S/REDO_16.png create mode 100644 Graphics/2006S/REDO_16_D.png create mode 100644 Graphics/2006S/REDO_16_H.png create mode 100644 Graphics/2006S/SAVE_16.png create mode 100644 Graphics/2006S/SAVE_16_D.png create mode 100644 Graphics/2006S/SAVE_16_H.png create mode 100644 Graphics/2006S/UNDO_16.png create mode 100644 Graphics/2006S/UNDO_16_D.png create mode 100644 Graphics/2006S/UNDO_16_H.png create mode 100644 Graphics/2006S/UNGROUP_16.png diff --git a/Graphics/2006S.png b/Graphics/2006S.png deleted file mode 100644 index 1ecfa8e0cb635ac6939c9382a9f8453d1087b283..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5207 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 literal 0 HcmV?d00001 diff --git a/Graphics/2006S/COPY_CLIPBOARD_16_D.png b/Graphics/2006S/COPY_CLIPBOARD_16_D.png new file mode 100644 index 0000000000000000000000000000000000000000..75510f0714e590960f5a4c865900008fc4367675 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^{2!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*BFQM0Fu zV~B<=VSupIXcL+EUjW z`GyS*E)C~q=80U5x~hHXP&PBeLy2|+hM4qw3PQqrp5{EhA#wbi*|CY6=dwD?x*;v3 z|M`i`Uge{5J1o~9d0bpL_gtQd${qis(elZq8n57)pmP{JUHx3vIVCg! E0PeY4_y7O^ literal 0 HcmV?d00001 diff --git a/Graphics/2006S/COPY_CLIPBOARD_16_H.png b/Graphics/2006S/COPY_CLIPBOARD_16_H.png new file mode 100644 index 0000000000000000000000000000000000000000..915c1258639f19bab979ca586d348595cdcae5f8 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^{2!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33JtM=93Yk-ZiYh!^ z978Pp=LR+M9#G);Tw{dk}wSw~X@QQ#qwmW~|kb{F@@Q#o)M%q~mPn s@2cOJ<3p3&)GF^AeO`WVA8Q4})9v9QZhFB^KsPXWy85}Sb4q9e04|tS-2eap literal 0 HcmV?d00001 diff --git a/Graphics/2006S/CUT_CLIPBOARD_16.png b/Graphics/2006S/CUT_CLIPBOARD_16.png new file mode 100644 index 0000000000000000000000000000000000000000..4b9771a8f845a617873e772fc53423f7412a3744 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-ZiZVQ1978Ppk52OBV^H8=uH0pRJj9tLSYe)x#B`%IU8}gFl`8CR)wa7G zRIO>%wfeSvOYJKjooq9U?pue}6ecp=Tw!Jrw)VzL3+o>ijf-EX{8YGop~qI_TzN{` n5B_hZ+wXq+I*oVj5x?309U=oZTzaz#XeWcGtDnm{r-UW|x{+1z literal 0 HcmV?d00001 diff --git a/Graphics/2006S/CUT_CLIPBOARD_16_D.png b/Graphics/2006S/CUT_CLIPBOARD_16_D.png new file mode 100644 index 0000000000000000000000000000000000000000..1dbe451d6751e2271b6785c8e449389425cc2f16 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-ZigG<&978Ppk52aHJD|YfVr#|yu6M4QaHp(S%ua(9AAa-{x*Q2OeP-V4 zr?=04@D%9VZLs>V+}63#;Sb)QX<5BWcTLM_{eV@y3gz|bt)b^{9`b2osTSfio^Vj| t)NlSZOz#g?z6;A$J-6}J)&9qSS?c% literal 0 HcmV?d00001 diff --git a/Graphics/2006S/CUT_CLIPBOARD_16_H.png b/Graphics/2006S/CUT_CLIPBOARD_16_H.png new file mode 100644 index 0000000000000000000000000000000000000000..4b9771a8f845a617873e772fc53423f7412a3744 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-ZiZVQ1978Ppk52OBV^H8=uH0pRJj9tLSYe)x#B`%IU8}gFl`8CR)wa7G zRIO>%wfeSvOYJKjooq9U?pue}6ecp=Tw!Jrw)VzL3+o>ijf-EX{8YGop~qI_TzN{` n5B_hZ+wXq+I*oVj5x?309U=oZTzaz#XeWcGtDnm{r-UW|x{+1z literal 0 HcmV?d00001 diff --git a/Graphics/2006S/GROUP_16.png b/Graphics/2006S/GROUP_16.png new file mode 100644 index 0000000000000000000000000000000000000000..f4d989816ded9d1990dd6a15d87c045c69448339 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-Ziqbq?978Pp&rS~HVo>C8vE5}}e%(Q0nk4V5Wc!v=^Da-B8R_D>=dfnM z{)b2II=hNa-4JxPN#vZX&n70V{Wfu}*6*i!2d?^K+d1n$!@QbD+EaLM1@7Kn&$jvA myD7)Nz4_B$@O`sD9mDm=L;<#cI!AyuGI+ZBxvX0#LT=By}Z;C1rt33 zJwsy?=IAP*q8v{b#}EtuqkWD-4GKKWl~wg|LWMG0HN|WzZlp=2Y~1-DUOD@qKhRzVPgg&ebxsLQ0Q=BWCjbBd literal 0 HcmV?d00001 diff --git a/Graphics/2006S/LOCK_OPEN_16.png b/Graphics/2006S/LOCK_OPEN_16.png new file mode 100644 index 0000000000000000000000000000000000000000..5576507416b989204bf3ede9be0d13318ca491f4 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwsy?=IAP*qHIqW#}EtuqkWEi2NXD1YOU;-?>1Buo91!bnV&hax%u#2`-RR&ChpjL zf>FtM_eZY-`-H!XSvr*L+BLcPK1?c#|1NA@6I;_TFc<+>gTe~DWM4ftEy7t literal 0 HcmV?d00001 diff --git a/Graphics/2006S/NEW_DOCUMENT_16.png b/Graphics/2006S/NEW_DOCUMENT_16.png new file mode 100644 index 0000000000000000000000000000000000000000..01ec760fc28d190d2cf159ab42975c224da37864 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-Zih?~|978PplYjjGZ_mtQY+&%`c>BbwO*aa96ZmFy%O2oy-NE zQ2_UWX_In{H*t4d>v^LzMbThel`1grt&6hO0*NYhT+> RaRD07;OXk;vd$@?2>>q&OcDS9 literal 0 HcmV?d00001 diff --git a/Graphics/2006S/NEW_DOCUMENT_16_D.png b/Graphics/2006S/NEW_DOCUMENT_16_D.png new file mode 100644 index 0000000000000000000000000000000000000000..01ec760fc28d190d2cf159ab42975c224da37864 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-Zih?~|978PplYjjGZ_mtQY+&%`c>BbwO*aa96ZmFy%O2oy-NE zQ2_UWX_In{H*t4d>v^LzMbThel`1grt&6hO0*NYhT+> RaRD07;OXk;vd$@?2>>q&OcDS9 literal 0 HcmV?d00001 diff --git a/Graphics/2006S/NEW_DOCUMENT_16_H.png b/Graphics/2006S/NEW_DOCUMENT_16_H.png new file mode 100644 index 0000000000000000000000000000000000000000..01ec760fc28d190d2cf159ab42975c224da37864 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-Zih?~|978PplYjjGZ_mtQY+&%`c>BbwO*aa96ZmFy%O2oy-NE zQ2_UWX_In{H*t4d>v^LzMbThel`1grt&6hO0*NYhT+> RaRD07;OXk;vd$@?2>>q&OcDS9 literal 0 HcmV?d00001 diff --git a/Graphics/2006S/OPEN_DOCUMENT_16.png b/Graphics/2006S/OPEN_DOCUMENT_16.png new file mode 100644 index 0000000000000000000000000000000000000000..488c105c2a46f3d52fabc5c941112c3c6edfc5a5 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-ZifTPw978Ppmj-$A9Z=wyv;23ll*5KC5g9fUcJOZI=-`;kFb7_#*UJjW+vju213?W*20_o$t-QE^uSAC3BXOR0z{MZ++W- z##LS_D`Zlim9jpn{;&1<5Bm$}B)MHZ>ksVvXEyuw;*U0L@mEhOD2lPCP60ZE!PC{x JWt~$(69A=CT8;n! literal 0 HcmV?d00001 diff --git a/Graphics/2006S/OPEN_DOCUMENT_16_D.png b/Graphics/2006S/OPEN_DOCUMENT_16_D.png new file mode 100644 index 0000000000000000000000000000000000000000..488c105c2a46f3d52fabc5c941112c3c6edfc5a5 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-ZifTPw978Ppmj-$A9Z=wyv;23ll*5KC5g9fUcJOZI=-`;kFb7_#*UJjW+vju213?W*20_o$t-QE^uSAC3BXOR0z{MZ++W- z##LS_D`Zlim9jpn{;&1<5Bm$}B)MHZ>ksVvXEyuw;*U0L@mEhOD2lPCP60ZE!PC{x JWt~$(69A=CT8;n! literal 0 HcmV?d00001 diff --git a/Graphics/2006S/OPEN_DOCUMENT_16_H.png b/Graphics/2006S/OPEN_DOCUMENT_16_H.png new file mode 100644 index 0000000000000000000000000000000000000000..488c105c2a46f3d52fabc5c941112c3c6edfc5a5 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-ZifTPw978Ppmj-$A9Z=wyv;23ll*5KC5g9fUcJOZI=-`;kFb7_#*UJjW+vju213?W*20_o$t-QE^uSAC3BXOR0z{MZ++W- z##LS_D`Zlim9jpn{;&1<5Bm$}B)MHZ>ksVvXEyuw;*U0L@mEhOD2lPCP60ZE!PC{x JWt~$(69A=CT8;n! literal 0 HcmV?d00001 diff --git a/Graphics/2006S/PAINTCAN_16.png b/Graphics/2006S/PAINTCAN_16.png new file mode 100644 index 0000000000000000000000000000000000000000..74abba6a2d577321027ed70e3f141d8239b1bedb GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwsy?=IAP*qHa$Y#}EtuseX(?2NXD7z5KhU_2klNYj-4ba&5m9Rs80_^8S10U$k=G zn^v(0#LT=By}Z;C1rt33 zJtM=93Yk-ZiY9rwIEGmG&kb(mJ)pqxxWwVY1dY;z$ zdw1(ak9^)G@>bjOyzhx^veD}g`c>x4)_i`Eog?g@#^Dp`sVnX!JO8aoepeZ|uD);i h@>g5AeyG(mPTIuupL3hdPoV10#LT=By}Z;C1rt33 zJtM=93Yk-ZidK2LIEGmGFP-ej)odW(YFi~{*%8os$-5-HOI!S&qsHFDC;0yusM&Yz zkZ77&`T4)fGULsDt{ewzR?Om=cJ#+QyZ0hm?P;8DpT5fE)O^WQ_2}T8al9+0&GyIt zwab_q)~}v2)pfsnd(h43&x@!0wvG@zCb3p@`6-6!KciWtPhDPiR9V7z_2qAy1;1Tm zyc_gPWBSyUvvNP{Yro%N`q^*iSBt)NT$Vo3C28 literal 0 HcmV?d00001 diff --git a/Graphics/2006S/PASTE_CLIPBOARD_16_H.png b/Graphics/2006S/PASTE_CLIPBOARD_16_H.png new file mode 100644 index 0000000000000000000000000000000000000000..ccb17acccf10e928997e4fe4f4b4e3dc6d4fd81b GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-ZiY9rwIEGmG&kb(mJ)pqxxWwVY1dY;z$ zdw1(ak9^)G@>bjOyzhx^veD}g`c>x4)_i`Eog?g@#^Dp`sVnX!JO8aoepeZ|uD);i h@>g5AeyG(mPTIuupL3hdPoV10#LT=By}Z;C1rt33 zJwsy?=IAP*qAX7r#}EtuxqXaW2Ml{QLrUd9j~9FTOgWZrAFVdQ&MBb@0M2hvcmMzZ literal 0 HcmV?d00001 diff --git a/Graphics/2006S/REDO_16.png b/Graphics/2006S/REDO_16.png new file mode 100644 index 0000000000000000000000000000000000000000..3c71aef2ed8e5c98ff89dbd2b9eb68beb6725e0a GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-ZilRJS978PplYjjGZ_m7QMozB+H~Yjiwl=l})dCXn6$>n+mvF`!o>53C zoME*iEk|l&R>LkX)dL)vY}#(0`8>@YU*R#9jAmHKuGBXFW9Bi@N6i`&Crt9xC^BQ% X^{s5nWXX3RKQMT@`njxgN@xNAlHf=X literal 0 HcmV?d00001 diff --git a/Graphics/2006S/REDO_16_D.png b/Graphics/2006S/REDO_16_D.png new file mode 100644 index 0000000000000000000000000000000000000000..7a6d54597e672994f1ee1a107e04d73ebf40d48d GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-Ziu^oX978PplM^HwAN>FSpXbDmrAwdM8@Wwy|9H@`b)De!#22puOqz2J zr*eD9sPPwzdd^B@o3K>UR;S~W@vh#8T(@uHcKaXm0#LT=By}Z;C1rt33 zJtM=93Yk-ZilRJS978PplYjjGZ_m7QMozB+H~Yjiwl=l})dCXn6$>n+mvF`!o>53C zoME*iEk|l&R>LkX)dL)vY}#(0`8>@YU*R#9jAmHKuGBXFW9Bi@N6i`&Crt9xC^BQ% X^{s5nWXX3RKQMT@`njxgN@xNAlHf=X literal 0 HcmV?d00001 diff --git a/Graphics/2006S/SAVE_16.png b/Graphics/2006S/SAVE_16.png new file mode 100644 index 0000000000000000000000000000000000000000..9aa0e7207070ba19a4957ae32d0a81067edbd18e GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-Zib6eI978PplYjjGZ_g~yz;VgYr`Va<#kixN|L~OtU1fLUJ5!%zwC$Xv zGn;*8+K%E6F47*nVd;leIu;r(>XMl4IIG}RkM`1oLgy4N`IJ3Vm?HS$Br}8ElJ%_< T?%VtVTEO7x>gTe~DWM4f{@+TM literal 0 HcmV?d00001 diff --git a/Graphics/2006S/SAVE_16_D.png b/Graphics/2006S/SAVE_16_D.png new file mode 100644 index 0000000000000000000000000000000000000000..23873647466ba601834f84af75db5270ad06d1c5 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-Zib6eI978PplYjjGZ}05ve7L^IfZ6BsrK8*j*cyKPF!15+Q1doEGc_f% zZD)~1M%z!;_$`fB622PyG)YJ)uj<$+xrB51*&TCuye*nNjCamt&R0{I;>o~&Gn>Wx SN60#LT=By}Z;C1rt33 zJtM=93Yk-Zib6eI978PplYjjGZ_g~yz;VgYr`Va<#kixN|L~OtU1fLUJ5!%zwC$Xv zGn;*8+K%E6F47*nVd;leIu;r(>XMl4IIG}RkM`1oLgy4N`IJ3Vm?HS$Br}8ElJ%_< T?%VtVTEO7x>gTe~DWM4f{@+TM literal 0 HcmV?d00001 diff --git a/Graphics/2006S/UNDO_16.png b/Graphics/2006S/UNDO_16.png new file mode 100644 index 0000000000000000000000000000000000000000..f9f6f2518db3f21f6b2de611eafdba6c64e87ea2 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-Zio!iz978PplYjjGZ_m7QMozB+H~Ypkwl=l}zXc>LYaX0q({z~FkmbPd zlTxZND^chL+e0G;XJf_Q2LWxngjT0Hu?bx1InA)9PR(p;;1bE~5W(!v4=(U9By2C+ U^7ew21kefwPgg&ebxsLQ0R2Ko_y7O^ literal 0 HcmV?d00001 diff --git a/Graphics/2006S/UNDO_16_D.png b/Graphics/2006S/UNDO_16_D.png new file mode 100644 index 0000000000000000000000000000000000000000..fc66466c81e4da960231bfcca0af33e75f1b659a GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJtM=93Yk-Zih?~|978PppH6h-Vo=~0#LT=By}Z;C1rt33 zJtM=93Yk-Zio!iz978PplYjjGZ_m7QMozB+H~Ypkwl=l}zXc>LYaX0q({z~FkmbPd zlTxZND^chL+e0G;XJf_Q2LWxngjT0Hu?bx1InA)9PR(p;;1bE~5W(!v4=(U9By2C+ U^7ew21kefwPgg&ebxsLQ0R2Ko_y7O^ literal 0 HcmV?d00001 diff --git a/Graphics/2006S/UNGROUP_16.png b/Graphics/2006S/UNGROUP_16.png new file mode 100644 index 0000000000000000000000000000000000000000..0607467f10006728dbe1896ac2d06d8522a8c9ce GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^{20#LT=By}Z;C1rt33 zJwsy?=IAP*qFhfG#}EturG1Qi4GKKW-@p8=37VWK$;uE@0lwmYoD_Dz0g zcVJ%kgZoB$It39ke>$#OIy2tuiRibtZ>CFrD?gC>HO^CidfzFI$$tVAPjei2Zq$CV tF!C?w;eVV{k2tl~T7Ncre)6@l9?RZ<|Bs7)7XU40@O1TaS?83{1ORZ|TB`s6 literal 0 HcmV?d00001 diff --git a/Novetus/NovetusCore/CharCustom/CharacterCustomizationShared.cs b/Novetus/NovetusCore/CharCustom/CharacterCustomizationShared.cs index 3f8609e..ffd71a2 100644 --- a/Novetus/NovetusCore/CharCustom/CharacterCustomizationShared.cs +++ b/Novetus/NovetusCore/CharCustom/CharacterCustomizationShared.cs @@ -34,6 +34,7 @@ class CharacterCustomizationShared public PictureBox Hat1Image, Hat2Image, Hat3Image, HeadImage, TShirtImage, ShirtImage, PantsImage, FaceImage, ExtraItemImage, IconImage; public ListView ColorView; private ImageList ColorImageList; + public bool closeOnLaunch = false; #endregion #region Constructor @@ -42,7 +43,7 @@ class CharacterCustomizationShared } - public void InitColors() + public bool InitColors() { try { @@ -51,7 +52,7 @@ class CharacterCustomizationShared PartColorList = PartColorLoader.GetPartColors(); PartColorListConv = new List(); PartColorListConv.AddRange(PartColorList); - return; + return true; } else { @@ -66,13 +67,19 @@ class CharacterCustomizationShared Failure: MessageBox.Show("The part colors cannot be loaded. The character customization menu will now close.", "Novetus - Cannot load part colors.", MessageBoxButtons.OK, MessageBoxIcon.Error); - Parent.Close(); + return false; } #endregion #region Form Event Functions public void InitForm() { + if (closeOnLaunch) + { + Parent.Close(); + return; + } + if (File.Exists(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ContentProviderXMLName)) { contentProviders = OnlineClothing.GetContentProviders(); @@ -542,13 +549,22 @@ class CharacterCustomizationShared public void ApplyPreset(int head, int torso, int larm, int rarm, int lleg, int rleg) { - ColorView.SelectedIndices.Clear(); - ChangeColorOfPart("Head", head, PartColorListConv.Find(x => x.ColorID == head).ColorObject); - ChangeColorOfPart("Torso", torso, PartColorListConv.Find(x => x.ColorID == torso).ColorObject); - ChangeColorOfPart("Left Arm", larm, PartColorListConv.Find(x => x.ColorID == larm).ColorObject); - ChangeColorOfPart("Right Arm", rarm, PartColorListConv.Find(x => x.ColorID == rarm).ColorObject); - ChangeColorOfPart("Left Leg", lleg, PartColorListConv.Find(x => x.ColorID == lleg).ColorObject); - ChangeColorOfPart("Right Leg", rleg, PartColorListConv.Find(x => x.ColorID == rleg).ColorObject); + try + { + ColorView.SelectedIndices.Clear(); + ChangeColorOfPart("Head", head, PartColorListConv.Find(x => x.ColorID == head).ColorObject); + ChangeColorOfPart("Torso", torso, PartColorListConv.Find(x => x.ColorID == torso).ColorObject); + ChangeColorOfPart("Left Arm", larm, PartColorListConv.Find(x => x.ColorID == larm).ColorObject); + ChangeColorOfPart("Right Arm", rarm, PartColorListConv.Find(x => x.ColorID == rarm).ColorObject); + ChangeColorOfPart("Left Leg", lleg, PartColorListConv.Find(x => x.ColorID == lleg).ColorObject); + ChangeColorOfPart("Right Leg", rleg, PartColorListConv.Find(x => x.ColorID == rleg).ColorObject); + } + catch(Exception ex) + { + MessageBox.Show("Failed to load required colors for the preset.", "Novetus - Preset Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + ResetColors(); + GlobalFuncs.LogExceptions(ex); + } } public void ResetColors() diff --git a/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs b/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs index bcf47ab..7425071 100644 --- a/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs +++ b/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs @@ -17,7 +17,7 @@ public partial class CharacterCustomizationCompact : Form { InitializeComponent(); InitCompactForm(); - characterCustomizationForm.InitColors(); + characterCustomizationForm.closeOnLaunch = !characterCustomizationForm.InitColors(); } #endregion diff --git a/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs b/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs index e6b7bfe..9c6a0bc 100644 --- a/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs +++ b/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs @@ -15,10 +15,9 @@ public partial class CharacterCustomizationExtended : Form #region Constructor public CharacterCustomizationExtended() { - InitializeComponent(); + InitializeComponent(); InitExtendedForm(); - characterCustomizationForm.InitColors(); - + characterCustomizationForm.closeOnLaunch = !characterCustomizationForm.InitColors(); Size = new Size(671, 337); panel2.Size = new Size(568, 302); } diff --git a/changelog.txt b/changelog.txt index a1b82ab..65b9555 100644 --- a/changelog.txt +++ b/changelog.txt @@ -10,7 +10,8 @@ Changes from 1.3 Pre-Release 4: - Added "%args%" as the default ClientScript example. - Improved the Green Screen map. - Added more options to the Super Safe Chat menu. -- Added more items (details in full changelog) +- Rebuilt 2006S in 2007E. +- Added more items and maps (details in full changelog) Changes from 1.2.4.1: - The OBJ2MeshV1GUI, The Asset Localizer, and the Item SDK have been merged to form the Asset SDK! - Works with the Roblox Asset Delivery API! Note: Script assetss wil have to be downloaded manually in order to be used in scripts. @@ -191,8 +192,9 @@ Changes from 1.2.4.1: - Changed the console text font. - Updated mesh converter to a modified version of Coke's Obj2RBXMesh converter (https://github.com/Novetus/ObjToRBXMesh) to the Asset SDK. - Added 35 new hats from the 2007 hat pack! (https://itch.io/t/893195/2007-hat-pack-v1, credit to Bobi MJ) -- Added 1 place: +- Added 2 maps: 2007 - millons of Roblox. Kill them +2011 - Survive The End Of The World (Survive The End Of Roblox) - Added the following items: Hats: Biology Textbook diff --git a/scripts/game/2006S-Shaders/CSMPFunctions.lua b/scripts/game/2006S-Shaders/CSMPFunctions.lua index 8e48bf2..726993d 100644 --- a/scripts/game/2006S-Shaders/CSMPFunctions.lua +++ b/scripts/game/2006S-Shaders/CSMPFunctions.lua @@ -3,10 +3,10 @@ showServerNotifications = true --function made by rbxbanland function newWaitForChild(newParent,name) local returnable = nil - if newParent:FindFirstChild(name) then - returnable = newParent:FindFirstChild(name) + if newParent:findFirstChild(name) then + returnable = newParent:findFirstChild(name) else - repeat wait() returnable = newParent:FindFirstChild(name) until returnable ~= nil + repeat wait() returnable = newParent:findFirstChild(name) until returnable ~= nil end return returnable end @@ -30,8 +30,8 @@ function newWaitForChildSecurity(newParent,name) local loadAttempts = 0 local maxAttempts = 5 while loadAttempts < maxAttempts do - if newParent:FindFirstChild(name) then - returnable = newParent:FindFirstChild(name) + if newParent:findFirstChild(name) then + returnable = newParent:findFirstChild(name) break end wait() @@ -47,8 +47,8 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) - PlayerService = game:GetService("Players") - Player = PlayerService:GetPlayerFromCharacter(newChar) + PlayerService = game:service("Players") + Player = PlayerService:playerFromCharacter(newChar) local function kick() KickPlayer(Player, "Modified Client") @@ -58,18 +58,18 @@ function LoadCharacterNew(playerApp,newChar) kick() end - if (not Player:FindFirstChild("Appearance")) then + if (not Player:findFirstChild("Appearance")) then kick() end - if ((playerApp:GetChildren() == 0) or (playerApp:GetChildren() == nil)) then + if ((playerApp:children() == 0) or (playerApp:children() == nil)) then kick() end local path = "rbxasset://../../../shareddata/charcustom/" local charparts = {[1] = newWaitForChild(newChar,"Head"),[2] = newWaitForChild(newChar,"Torso"),[3] = newWaitForChild(newChar,"Left Arm"),[4] = newWaitForChild(newChar,"Right Arm"),[5] = newWaitForChild(newChar,"Left Leg"),[6] = newWaitForChild(newChar,"Right Leg")} - for _,newVal in pairs(playerApp:GetChildren()) do + for _,newVal in pairs(playerApp:children()) do if (newVal.Name == "Body Color") then pcall(function() charparts[newVal.ColorIndex.Value].BrickColor = newVal.Value @@ -138,15 +138,15 @@ function LoadSecurity(playerApp,Player,ServerSecurityLocation) kick() end - if (not Player:FindFirstChild("Security")) then + if (not Player:findFirstChild("Security")) then kick() end - if (not playerApp:FindFirstChild("ClientEXEMD5") or not playerApp:FindFirstChild("LauncherMD5") or not playerApp:FindFirstChild("ClientScriptMD5")) then + if (not playerApp:findFirstChild("ClientEXEMD5") or not playerApp:findFirstChild("LauncherMD5") or not playerApp:findFirstChild("ClientScriptMD5")) then kick() end - for _,newVal in pairs(playerApp:GetChildren()) do + for _,newVal in pairs(playerApp:children()) do if (newVal.Name == "ClientEXEMD5") then if (newVal.Value ~= ServerSecurityLocation.Security.ClientEXEMD5.Value or newVal.Value == "") then kick() @@ -198,11 +198,11 @@ function LoadTripcode(Player) KickPlayer(Player, "Modified Client") end - if (not Player:FindFirstChild("Tripcode")) then + if (not Player:findFirstChild("Tripcode")) then kick() end - for _,newVal in pairs(Player:GetChildren()) do + for _,newVal in pairs(Player:children()) do if (newVal.Name == "Tripcode") then if (newVal.Value == "") then kick() @@ -217,31 +217,31 @@ function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, Serve game:httpGet(pingURL .. "&online=" .. online) end -print("ROBLOX Client version '0.3.512.0' loaded.") +print("ROBLOX Client version '0.3.368.0' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client) - Server = game:GetService("NetworkServer") - RunService = game:GetService("RunService") - PlayerService = game:GetService("Players") - game:GetService("Visit"):SetUploadUrl("") + Server = game:service("NetworkServer") + RunService = game:service("RunService") + PlayerService = game:service("Players") + game:service("Visit"):setUploadUrl("") Server:start(Port, 20) RunService:run() showServerNotifications = Notifications - game.Workspace:InsertContent("rbxasset://Fonts//libraries.rbxm") + game.Workspace:insertContent("rbxasset://Fonts//libraries.rbxm") if (showServerNotifications) then - PlayerService.MaxPlayers = PlayerLimit + 1 + PlayerService.maxPlayers = PlayerLimit + 1 --create a fake player to record connections and disconnections - notifyPlayer = game:GetService("Players"):CreateLocalPlayer(-1) + notifyPlayer = game:service("Players"):createLocalPlayer(-1) notifyPlayer.Name = "[SERVER]" else - PlayerService.MaxPlayers = PlayerLimit + PlayerService.maxPlayers = PlayerLimit end - PlayerService.PlayerAdded:connect(function(Player) + PlayerService.ChildAdded:connect(function(Player) Player.Chatted:connect(function(msg) print(Player.Name.."; "..msg) end) - if (PlayerService.NumPlayers > PlayerService.MaxPlayers) then + if (PlayerService.numPlayers > PlayerService.maxPlayers) then KickPlayer(Player, "Too many players on server.") else print("Player '" .. Player.Name .. "' with ID '" .. Player.userId .. "' added") @@ -259,15 +259,15 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti end -- rename all Server replicators in NetworkServer to "ServerReplicator" - for _,Child in pairs(Server:GetChildren()) do + for _,Child in pairs(Server:children()) do Child.Name = "ServerReplicator" end coroutine.resume(coroutine.create(function() while Player ~= nil do wait(0.1) - if (Player.Character:FindFirstChild("Humanoid") and (Player.Character.Humanoid.Health == 0)) then - if (Player.Character.Humanoid.Health == 0) then + if (Player.Character ~= nil) then + if (Player.Character:findFirstChild("Humanoid") and (Player.Character.Humanoid.Health == 0)) then wait(5) Player:LoadCharacter() LoadCharacterNew(newWaitForChildSecurity(Player,"Appearance"),Player.Character) @@ -289,20 +289,21 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5) PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server.IncommingConnection:connect(IncommingConnection) - pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:Stop() end) end) + pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:stop() end) end) end function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket) local suc, err = pcall(function() - client = game:GetService("NetworkClient") - player = game:GetService("Players"):CreateLocalPlayer(UserID) + client = game:service("NetworkClient") + player = game:service("Players"):createLocalPlayer(UserID) InitalizeSecurityValues(player,ClientEXEMD5,LauncherMD5,ClientScriptMD5) InitalizeTripcode(player,Tripcode) player:SetSuperSafeChat(false) pcall(function() player:SetUnder13(false) end) pcall(function() player:SetAccountAge(365) end) + player:SetAdminMode(true) pcall(function() player.Name=PlayerName or "" end) - game:GetService("Visit"):SetUploadUrl("") + game:service("Visit"):setUploadUrl("") InitalizeClientAppearance(player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,ItemID) end) @@ -352,11 +353,11 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He client.ConnectionAccepted:connect(connected) client.ConnectionRejected:connect(rejected) client.ConnectionFailed:connect(failed) - client:Connect(ServerIP,ServerPort, 0, 20) - game.GuiRoot.MainMenu["Toolbox"]:Remove() - game.GuiRoot.MainMenu["Edit Mode"]:Remove() - game.GuiRoot.RightPalette.ReportAbuse:Remove() - game.GuiRoot.ChatMenuPanel:Remove() + client:connect(ServerIP,ServerPort, 0, 20) + game.GuiRoot.MainMenu["Toolbox"]:remove() + game.GuiRoot.MainMenu["Edit Mode"]:remove() + game.GuiRoot.RightPalette.ReportAbuse:remove() + game.GuiRoot.ChatMenuPanel:remove() end) if not suc then @@ -368,18 +369,19 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) - local plr = game.Players:CreateLocalPlayer(UserID) - game:GetService("RunService"):run() - game.Workspace:InsertContent("rbxasset://Fonts//libraries.rbxm") + local plr = game.Players:createLocalPlayer(UserID) + game:service("RunService"):run() + game.Workspace:insertContent("rbxasset://Fonts//libraries.rbxm") plr.Name = PlayerName + plr:SetAdminMode(true) plr:LoadCharacter() InitalizeClientAppearance(plr,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,ItemID) LoadCharacterNew(newWaitForChild(plr,"Appearance"),plr.Character,false) - game:GetService("Visit"):SetUploadUrl("") + game:service("Visit"):setUploadUrl("") while true do wait(0.001) if (plr.Character ~= nil) then - if (plr.Character:FindFirstChild("Humanoid") and (plr.Character.Humanoid.Health == 0)) then + if (plr.Character:findFirstChild("Humanoid") and (plr.Character.Humanoid.Health == 0)) then wait(5) plr:LoadCharacter() LoadCharacterNew(newWaitForChild(plr,"Appearance"),plr.Character) @@ -398,4 +400,4 @@ end _G.CSServer=CSServer _G.CSConnect=CSConnect _G.CSSolo=CSSolo -_G.CSStudio=CSStudio \ No newline at end of file +_G.CSStudio=CSStudio diff --git a/scripts/game/2006S/CSMPFunctions.lua b/scripts/game/2006S/CSMPFunctions.lua index 5cb9a3d..726993d 100644 --- a/scripts/game/2006S/CSMPFunctions.lua +++ b/scripts/game/2006S/CSMPFunctions.lua @@ -3,10 +3,10 @@ showServerNotifications = true --function made by rbxbanland function newWaitForChild(newParent,name) local returnable = nil - if newParent:FindFirstChild(name) then - returnable = newParent:FindFirstChild(name) + if newParent:findFirstChild(name) then + returnable = newParent:findFirstChild(name) else - repeat wait() returnable = newParent:FindFirstChild(name) until returnable ~= nil + repeat wait() returnable = newParent:findFirstChild(name) until returnable ~= nil end return returnable end @@ -30,8 +30,8 @@ function newWaitForChildSecurity(newParent,name) local loadAttempts = 0 local maxAttempts = 5 while loadAttempts < maxAttempts do - if newParent:FindFirstChild(name) then - returnable = newParent:FindFirstChild(name) + if newParent:findFirstChild(name) then + returnable = newParent:findFirstChild(name) break end wait() @@ -47,8 +47,8 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) - PlayerService = game:GetService("Players") - Player = PlayerService:GetPlayerFromCharacter(newChar) + PlayerService = game:service("Players") + Player = PlayerService:playerFromCharacter(newChar) local function kick() KickPlayer(Player, "Modified Client") @@ -58,18 +58,18 @@ function LoadCharacterNew(playerApp,newChar) kick() end - if (not Player:FindFirstChild("Appearance")) then + if (not Player:findFirstChild("Appearance")) then kick() end - if ((playerApp:GetChildren() == 0) or (playerApp:GetChildren() == nil)) then + if ((playerApp:children() == 0) or (playerApp:children() == nil)) then kick() end local path = "rbxasset://../../../shareddata/charcustom/" local charparts = {[1] = newWaitForChild(newChar,"Head"),[2] = newWaitForChild(newChar,"Torso"),[3] = newWaitForChild(newChar,"Left Arm"),[4] = newWaitForChild(newChar,"Right Arm"),[5] = newWaitForChild(newChar,"Left Leg"),[6] = newWaitForChild(newChar,"Right Leg")} - for _,newVal in pairs(playerApp:GetChildren()) do + for _,newVal in pairs(playerApp:children()) do if (newVal.Name == "Body Color") then pcall(function() charparts[newVal.ColorIndex.Value].BrickColor = newVal.Value @@ -138,15 +138,15 @@ function LoadSecurity(playerApp,Player,ServerSecurityLocation) kick() end - if (not Player:FindFirstChild("Security")) then + if (not Player:findFirstChild("Security")) then kick() end - if (not playerApp:FindFirstChild("ClientEXEMD5") or not playerApp:FindFirstChild("LauncherMD5") or not playerApp:FindFirstChild("ClientScriptMD5")) then + if (not playerApp:findFirstChild("ClientEXEMD5") or not playerApp:findFirstChild("LauncherMD5") or not playerApp:findFirstChild("ClientScriptMD5")) then kick() end - for _,newVal in pairs(playerApp:GetChildren()) do + for _,newVal in pairs(playerApp:children()) do if (newVal.Name == "ClientEXEMD5") then if (newVal.Value ~= ServerSecurityLocation.Security.ClientEXEMD5.Value or newVal.Value == "") then kick() @@ -198,11 +198,11 @@ function LoadTripcode(Player) KickPlayer(Player, "Modified Client") end - if (not Player:FindFirstChild("Tripcode")) then + if (not Player:findFirstChild("Tripcode")) then kick() end - for _,newVal in pairs(Player:GetChildren()) do + for _,newVal in pairs(Player:children()) do if (newVal.Name == "Tripcode") then if (newVal.Value == "") then kick() @@ -217,31 +217,31 @@ function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, Serve game:httpGet(pingURL .. "&online=" .. online) end -print("ROBLOX Client version '0.3.512.0' loaded.") +print("ROBLOX Client version '0.3.368.0' loaded.") function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client) - Server = game:GetService("NetworkServer") - RunService = game:GetService("RunService") - PlayerService = game:GetService("Players") - game:GetService("Visit"):SetUploadUrl("") + Server = game:service("NetworkServer") + RunService = game:service("RunService") + PlayerService = game:service("Players") + game:service("Visit"):setUploadUrl("") Server:start(Port, 20) RunService:run() showServerNotifications = Notifications - game.Workspace:InsertContent("rbxasset://Fonts//libraries.rbxm") + game.Workspace:insertContent("rbxasset://Fonts//libraries.rbxm") if (showServerNotifications) then - PlayerService.MaxPlayers = PlayerLimit + 1 + PlayerService.maxPlayers = PlayerLimit + 1 --create a fake player to record connections and disconnections - notifyPlayer = game:GetService("Players"):CreateLocalPlayer(-1) + notifyPlayer = game:service("Players"):createLocalPlayer(-1) notifyPlayer.Name = "[SERVER]" else - PlayerService.MaxPlayers = PlayerLimit + PlayerService.maxPlayers = PlayerLimit end - PlayerService.PlayerAdded:connect(function(Player) + PlayerService.ChildAdded:connect(function(Player) Player.Chatted:connect(function(msg) print(Player.Name.."; "..msg) end) - if (PlayerService.NumPlayers > PlayerService.MaxPlayers) then + if (PlayerService.numPlayers > PlayerService.maxPlayers) then KickPlayer(Player, "Too many players on server.") else print("Player '" .. Player.Name .. "' with ID '" .. Player.userId .. "' added") @@ -259,7 +259,7 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti end -- rename all Server replicators in NetworkServer to "ServerReplicator" - for _,Child in pairs(Server:GetChildren()) do + for _,Child in pairs(Server:children()) do Child.Name = "ServerReplicator" end @@ -267,7 +267,7 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti while Player ~= nil do wait(0.1) if (Player.Character ~= nil) then - if (Player.Character:FindFirstChild("Humanoid") and (Player.Character.Humanoid.Health == 0)) then + if (Player.Character:findFirstChild("Humanoid") and (Player.Character.Humanoid.Health == 0)) then wait(5) Player:LoadCharacter() LoadCharacterNew(newWaitForChildSecurity(Player,"Appearance"),Player.Character) @@ -289,20 +289,21 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5) PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server.IncommingConnection:connect(IncommingConnection) - pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:Stop() end) end) + pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:stop() end) end) end function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket) local suc, err = pcall(function() - client = game:GetService("NetworkClient") - player = game:GetService("Players"):CreateLocalPlayer(UserID) + client = game:service("NetworkClient") + player = game:service("Players"):createLocalPlayer(UserID) InitalizeSecurityValues(player,ClientEXEMD5,LauncherMD5,ClientScriptMD5) InitalizeTripcode(player,Tripcode) player:SetSuperSafeChat(false) pcall(function() player:SetUnder13(false) end) pcall(function() player:SetAccountAge(365) end) + player:SetAdminMode(true) pcall(function() player.Name=PlayerName or "" end) - game:GetService("Visit"):SetUploadUrl("") + game:service("Visit"):setUploadUrl("") InitalizeClientAppearance(player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,ItemID) end) @@ -352,11 +353,11 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He client.ConnectionAccepted:connect(connected) client.ConnectionRejected:connect(rejected) client.ConnectionFailed:connect(failed) - client:Connect(ServerIP,ServerPort, 0, 20) - game.GuiRoot.MainMenu["Toolbox"]:Remove() - game.GuiRoot.MainMenu["Edit Mode"]:Remove() - game.GuiRoot.RightPalette.ReportAbuse:Remove() - game.GuiRoot.ChatMenuPanel:Remove() + client:connect(ServerIP,ServerPort, 0, 20) + game.GuiRoot.MainMenu["Toolbox"]:remove() + game.GuiRoot.MainMenu["Edit Mode"]:remove() + game.GuiRoot.RightPalette.ReportAbuse:remove() + game.GuiRoot.ChatMenuPanel:remove() end) if not suc then @@ -368,18 +369,19 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He end function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID) - local plr = game.Players:CreateLocalPlayer(UserID) - game:GetService("RunService"):run() - game.Workspace:InsertContent("rbxasset://Fonts//libraries.rbxm") + local plr = game.Players:createLocalPlayer(UserID) + game:service("RunService"):run() + game.Workspace:insertContent("rbxasset://Fonts//libraries.rbxm") plr.Name = PlayerName + plr:SetAdminMode(true) plr:LoadCharacter() InitalizeClientAppearance(plr,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,ItemID) LoadCharacterNew(newWaitForChild(plr,"Appearance"),plr.Character,false) - game:GetService("Visit"):SetUploadUrl("") + game:service("Visit"):setUploadUrl("") while true do wait(0.001) if (plr.Character ~= nil) then - if (plr.Character:FindFirstChild("Humanoid") and (plr.Character.Humanoid.Health == 0)) then + if (plr.Character:findFirstChild("Humanoid") and (plr.Character.Humanoid.Health == 0)) then wait(5) plr:LoadCharacter() LoadCharacterNew(newWaitForChild(plr,"Appearance"),plr.Character) @@ -398,4 +400,4 @@ end _G.CSServer=CSServer _G.CSConnect=CSConnect _G.CSSolo=CSSolo -_G.CSStudio=CSStudio \ No newline at end of file +_G.CSStudio=CSStudio diff --git a/scripts/game/2007E-Shaders/CSMPFunctions.lua b/scripts/game/2007E-Shaders/CSMPFunctions.lua index fc0e4de..4ae65e9 100644 --- a/scripts/game/2007E-Shaders/CSMPFunctions.lua +++ b/scripts/game/2007E-Shaders/CSMPFunctions.lua @@ -143,14 +143,6 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso indexValue.Parent = BodyColor indexValue.Value = i end - --T-SHIRT - local newTShirt = Instance.new("StringValue",newCharApp) - if (TShirtID ~= nil) then - newTShirt.Value = TShirtID - else - newTShirt.Value = "NoTShirt.rbxm" - end - newTShirt.Name = "T-Shirt" --EXTRA local newItem = Instance.new("StringValue",newCharApp) if (ItemID ~= nil) then diff --git a/scripts/game/2007E/CSMPFunctions.lua b/scripts/game/2007E/CSMPFunctions.lua index 8d0349e..4ae65e9 100644 --- a/scripts/game/2007E/CSMPFunctions.lua +++ b/scripts/game/2007E/CSMPFunctions.lua @@ -74,7 +74,6 @@ function LoadCharacterNew(playerApp,newChar) pcall(function() charparts[newVal.ColorIndex.Value].BrickColor = newVal.Value end) - elseif (newVal.Name == "Extra") then pcall(function() local newItem = game.Workspace:insertContent(path.."custom/"..newVal.Value) @@ -144,14 +143,6 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso indexValue.Parent = BodyColor indexValue.Value = i end - --T-SHIRT - local newTShirt = Instance.new("StringValue",newCharApp) - if (TShirtID ~= nil) then - newTShirt.Value = TShirtID - else - newTShirt.Value = "NoTShirt.rbxm" - end - newTShirt.Name = "T-Shirt" --EXTRA local newItem = Instance.new("StringValue",newCharApp) if (ItemID ~= nil) then