From 3aa583a11049473a0f9a1340990531ea078eff19 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Tue, 20 May 2025 12:36:55 -0600 Subject: [PATCH 01/11] Delete images/tiles/items/community.png --- images/tiles/items/community.png | Bin 1253 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 images/tiles/items/community.png diff --git a/images/tiles/items/community.png b/images/tiles/items/community.png deleted file mode 100644 index 901ee26dbeda28c7dc81996f137fc15ce31a3496..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1253 zcmeAS@N?(olHy`uVBq!ia0y~yVCZ3BVA#UJ%)r1VWMrhBon2K`)ddBIs!-o>Teles7ROIKpK<5Ejh3-#airOl7%d;y2QO~So^v#M z#eaveRho5o)k5W?bM=Ft(6wF_1B`tiQtN-9iQiW;st6$B>F!Z>L3RQcSDA@^eG#5|Yuff{H$=aGIP!2-hS}V{ zNb&i3Qzvf5AleZsFrJQ*ac%t9=tlOu@&)45S z_P6^OyE<5`p)2v$R_4j`D%`?-C z=PwU5nQC_Zc!rIX?dr(X*|W@SFE01l%qd>EVRN9nq2&Goo|z|4zkYqXCBrP3Z~MnQ zk?9p%LUJOGl@-6;7%0_vYgww`vubHoJ7FW^#YVmdP3C$9)xJBHmAk3sXXnv2PSI&A z7h9YccU9CYnK{*C&!yCyjeE~dsma)^-H>-UbcS6{Q_W6|qR3enJoYT|l{EgQDZTHN z>TM>QjM?myn3o)E(Kq$hhd`gB@7_kgdq4NCeXeZe z|IMd3W-sGbJb(Vyorj?xUoQWizt?1S+MC?kN2g!b)O~BLiT^W;)50}!s@}^Gr;`&8 zg-o@uNH}ErYLn7bY2H;?b!+Bih~)Pdtk^M$yLZ)6m$x3vQ#{K=ixQ2lCW%;YI`+Zu z>g?~AS`T?FE(+d%eVtDAl6yS&=HBGxC_KFEj&D|Ymh#+FXBU*Xw_Wl3JDq`4u;vfD z)T`hr$+AwJ3=9maC9V-ADTyViR>?)Fi6yBFMg~Tvx&|h?28JPq23E! Date: Tue, 20 May 2025 12:37:30 -0600 Subject: [PATCH 02/11] Add Resist orbs to sprite sheet --- images/tiles/items/community.png | Bin 0 -> 4305 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/tiles/items/community.png diff --git a/images/tiles/items/community.png b/images/tiles/items/community.png new file mode 100644 index 0000000000000000000000000000000000000000..f02b26e3e6f1b628435553e0fc34f6cae77aedf4 GIT binary patch literal 4305 zcmeAS@N?(olHy`uVBq!ia0y~yVCZ3BVA#UJ#=yYf_VUO-1_lPk;vjb?hIQv;UNSHU zbbGouhE&A8ol{*Ra#i+t{lu;?R?#&!my!f3Swcb-SXw(cqy#!EPANAi2)%k-a6u`m zldDN0hda!&>Q$gp*B%yrDOU&Er5qXpA3|F>rnFySShT3AzpBRPeEFf+cYbB*>1F1> ze9yoCw|V#G@^^pF{jGcUeRp}DndBl@cZDMyDMwaCM?}1s@p$Ugsh759hkt*3YiqWu zv9WQ{sU}wLqPtOI6{vq}kzsJq3`zn9-RB6%Eiti%KJ-q$7=kzm0 ze%;&n-#YW+4~y{E|8)%vv^6v~_I#T+``kAk9X63WN2mXJK7m1@IOp!KTEFRc)C4aa zcKG~azwCFnoe$UaIGB5_krtYzW&hjf(=F4fS7(3sN;}+^q~zNn{Ud$tt(VuF)E8IE z7MA^e@$L85YyPRHFNN10U!YZTtbz4-+1p#H_qH^DxwNP9b5`JqJmtG@X9jLLYr@aYa}=S>n`J6FBY9RdaJZ~he650$0e_4*qErvN=4Y^1*xnS3!V`ObIg^ds}Lj<7sixqM!cTaU!U zy6MxWKVK8Kch{}z-F@O#`UYXK>iYWrhqkqU^ZjM0@IZ9Kj8DrMlULup*tx(l#WCdI zYu{vZuZJJ}jPeWIj?FE<_wr8p{n~{+FK=yYZhp~JlA?6_1ZTeW=H+wcSIO$%F*Eq_ z?ohGc7WXY%TU(nrS|9Z$e7v@71-F-7<*6Zc)!)C~%Vu}wO%X`AmLn8tkiPiO zmuKBYKJD76hkm9S<=ikhdF~uv4%e@Pb67VlxUn+h(qz$dPqLf0KV@BZwPE&LtDDJp z4|f=_8o!&kbTgmV(J5k$UvK8lGHFSEn*7Y|mc?r4^y6&maweSCwNECd&o!M{=%*90{L2Lvd*-E@0bs9AW<#7&zv9e7)r7`ZKF>6e|m+PS@VubF(; zjJ^Ck|I}#$u{^Sy}zcZm(XtApYv6U2j^q25n6B z)R>%GaX~I&=cWZGZ2u(PTyx<9kEHR{-WFY}Z6(Uwr+)F5oql#VKCJnewct0#$O&x% zkpX#HKWG2>{PH-{Y{ua2ey<+-RlJ>&@_jm&N!b*~*&g0(i#A+fm=U;FZo*IV_Y?DP zon0}lDknoAb&v4FmIHtO>Mve&?B}uD-jmsu{pjO7H)CS#l5?82tDN45Yd?K>^YxM^ z|1ulT9;{@WRk#1W#L}~E&vx#XpD<5Zt8JNsSf6(W? z>P38^_noCBn=Vu=?)h$Y$f0>kh+XZz6q~;rpU6n*cbKhT`$EF>UtGqUpFQgXUtfD$ za4utmrPuv-_S>G*^-ezZcbQSbSn+-G`5hCFEm3-}z%(y+=~7SKTwaGnrL(!!cIA9| z7H;<{-Uny?c;k?1TbX+1Wag#|5*lw`vn*f`{o6K^BYw{Qld`)N`AsLkHka`%KP>IO z@xr!z{q23_dXKr!e7e~@=bJcR@25w1&7XO`pLo8di(^@1$@b|SQeU#qXZ{JA^nG{8 z!p4aj8{hp)S;#mgLwLas!CgsdL7ydEW(u3#*IGTTe8TZr zYu4))CbkW0BER`w^4H&cV96~xwq9PT&3lf0mT-}r5>dW??-RbwOCR={qzU!ZIjx=Z z>`nQcY^j~U7<^x@etd_$LhUcZ3^wIxH(BS{_=Ez*4H$ zcN`b{-tb7aPh_*HyHFy(<3#3`{As&;1=6?~FC;w5J~hi#c&1OH{XEK~5B8aP1fR6w{I*Pe%{(5HxCkMpW-hhf884cW z6W_6|cl4ig>-Nd``o-Kl4{qPFyo@ z!;@om!VHdv)&3Ro`Id4b1)IO{O`W#p*jx6hvaC=xwfzU=YtS=-9b{n@tC zq;kQ&H`3)E>wec%I`KNP^L|ZoWKQT>Zm0cOexLTzeGI(6Dw5Bu@AJ;HzI0=?xE}Hy%+@bI&OGc_c_SO4)S^n?YQPkrsXZ2v4Pbu|OET{HX` zduq?HX{^}5VIcgiE5{=E+qysbPp+JKRNJ_?Pkh?9<#SZt*L@5PX*t-w`FxJ<`}cRG zG;SSXI$9mOvVl3`&9^gO*<`JkRb5qTXH34iC-u_4$E;0TSRD3DR6F5XaoB*3PwMs%0~8?0?liZJ)%qwOefVF1Cra z+jz}o<_@R5fk)H=ag$neDf@d&*l={OivC zUU2%AN5;1$it8o6b)D4No$M;e?4uK~=PR#;W20kL#)VC<#2fB4t!RknSoGs;vXZ&S z-#dL^r`X|zbl_nQ}u1v+49WXAR(#d&N@{NgB|zo z*+1E_GW+C*H7l-Ob6;;V>GeIShi;-v6c03A|LnitiLXCbb+X>-aP37tQ#^!Y_e_p- zXfY}IJ?E&=mRxSl_5T+?ky#}i>3LK-L*Jl*ng8{hrl}KS|0waiQar`dYfyKQHFu_` zK2O=@OB3%)gnPTYFY30G%f8h8o?$^I_kkO!7bpCC=g!calyLBO6n9Vgf<64N1quaH zqhxRB`R$LJ^s(tb|8`!3jSe5br5^BP;aSvEsquX7{uyQy`yvT=jv!peSTys#pZy@nL@$RNN3@v57Pb(a? zdE)g&<%&bI*~d9Y^%#!I@NZiFq}S+UN!*3)t$VhXw7)lNY~)Y)n-*goAK;U6Fgw@N z{lct*&xZFlPg`(70pz#NMW;VM?JEvFcd`CtVsmoOHu)=+ua7q$th<#R)U`7E+q9-U zUIr=YY1{eth_Lc0aRsfqY2ur9Ui-w^@Zi!(voaJz9R;45beOn4?tbjo7Nyp-r&+aqwlQy7Q>38@^{yr*(CX%@!Yk4)7>2mqq2fa zKK2^aHD@;*{3P{R>W$@3-K}reHb$&g`ZAS6>QIb>+^;zcQPJsy2KS3SY*!Y}-=B>YmA7 zo@>+$UuA`beD!7y&N`i?aW6v4pl6C;c2Gjc*~BT!4jAlmTI1QMXx1J$i|OzSu8nG} zZ8v1xGP!sbYaf{ Date: Tue, 20 May 2025 12:39:13 -0600 Subject: [PATCH 03/11] Linked Orbs to the Sprite sheet --- design/dimensions.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/design/dimensions.py b/design/dimensions.py index 44bb621..d566bcd 100644 --- a/design/dimensions.py +++ b/design/dimensions.py @@ -839,6 +839,11 @@ positions={ "orbofdex":["",1,48], "orbofint":["",2,48], "orbofvit":["",3,48], + "orboffire":["community",1,1], + "orboffrost":["community",2,1], + "orbofplague":["community",3,1], + "orbofresolve":["",8,49], + "orbofelements":["community",5,1], #tshirts "tshirt0":["",2,38], From a6a8b9da494426475abcd144a54d2c846b8eaa3f Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Tue, 20 May 2025 12:42:22 -0600 Subject: [PATCH 04/11] Created Resistance Orb stats --- design/items.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/design/items.py b/design/items.py index 5616b47..d614f54 100644 --- a/design/items.py +++ b/design/items.py @@ -6250,6 +6250,55 @@ orbs={ "grades":[1,4], "edge":-2, }, + "orboffire":{ + "type":"orb", + "skin":"orboffire", + "firesistance":10, + "name":"Orb of Fire", + "g":240000, + "grades":[0,0], + }, + "orboffrost":{ + "type":"orb", + "skin":"orboffrost", + "fzresistance":10, + "name":"Orb of Frost", + "g":240000, + "grades":[0,0], + }, + "orbofplague":{ + "type":"orb", + "skin":"orbofplague", + "pnresistance":10, + "name":"Orb of Plague", + "g":240000, + "grades":[0,0], + }, + "orbofresolve":{ + "type":"orb", + "skin":"orbofresolve", + "phresistance":5, + "name":"Orb of Resolve", + "g":240000, + "grades":[0,0], + }, + "orbofelements":{ + "type":"orb", + "skin":"orbofelements", + "firesistance":15, + "fzresistance":15, + "pnresistance":15, + "phresistance":15, + "compound":{ + "firesistance":5, + "fzresistance":5, + "pnresistance":5, + "phresistance":5, + }, + "name":"Orb of Elements", + "g":1000000, + "grades":[0,2], + }, "orbofsc":{ "set":"holidays", "type":"orb", From 95b514abd31d977eb8d7e558ab58bcdad99acad1 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Tue, 20 May 2025 12:44:08 -0600 Subject: [PATCH 05/11] Created Recipe for Orb of Elements consists of the other 4 resistance orbs to make 1 orb of elements --- design/recipes.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/design/recipes.py b/design/recipes.py index 4d89e7f..dd7ecb9 100644 --- a/design/recipes.py +++ b/design/recipes.py @@ -368,6 +368,16 @@ craft={ "cost":0, "quest":"mcollector", }, + "orbofelements":{ + "items":[ + [1,"orboffire"], + [1,"orboffrost"], + [1,"orbofplague"], + [1,"orbofresolve"], + ], + "cost":0, + "quest":"mcollector", + }, "armorring":{ "items":[ [1,"snakefang"], From cef1bd2ee7153defbcd433c47b9a6dd22fea24cb Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Tue, 20 May 2025 12:47:40 -0600 Subject: [PATCH 06/11] Added Resistance Orbs drop added each orb to their corresponding gProtector boss --- design/drops.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/design/drops.py b/design/drops.py index 5c409dc..e5210ab 100644 --- a/design/drops.py +++ b/design/drops.py @@ -21,6 +21,8 @@ drops={ #[0.0002,"gift0"], #[0.004,"gift1"], #[0.0004,"redenvelope"], + #[0.00005,"goldenegg"], + #[0.009,"open","eastereggs"], #originally 0.009 #[0.0001,"redenvelopev2"], #[0.0001,"redenvelopev3"], #[0.00005,"greenenvelope"], @@ -536,18 +538,22 @@ drops={ [1.0/10000,"tombkey"], ], "ggreenpro":[ + [1.0/1.0,"orbofplague"], [1.0/25,"spikedhelmet"], [1.0/20000,"tombkey"], ], "gredpro":[ + [1.0/1.0,"orboffire"], [1.0/25,"spikedhelmet"], [1.0/20000,"tombkey"], ], "gbluepro":[ + [1.0/1.0,"orboffrost"], [1.0/25,"spikedhelmet"], [1.0/20000,"tombkey"], ], "gpurplepro":[ + [1.0/1.0,"orbofresolve"], [1.0/25,"spikedhelmet"], [1.0/20000,"tombkey"], ], From 4e62def14f36758fb31ed34254a8a946eb5e75dd Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Tue, 20 May 2025 12:52:16 -0600 Subject: [PATCH 07/11] fixed the global drop part i mustve had an old drops.py that added back in easter event items --- design/drops.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/design/drops.py b/design/drops.py index e5210ab..4a7505d 100644 --- a/design/drops.py +++ b/design/drops.py @@ -21,8 +21,6 @@ drops={ #[0.0002,"gift0"], #[0.004,"gift1"], #[0.0004,"redenvelope"], - #[0.00005,"goldenegg"], - #[0.009,"open","eastereggs"], #originally 0.009 #[0.0001,"redenvelopev2"], #[0.0001,"redenvelopev3"], #[0.00005,"greenenvelope"], From 837ec5e41b61d0a57c1bb0fee7d4234a8222426b Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Wed, 21 May 2025 02:53:51 -0600 Subject: [PATCH 08/11] Renamed Orb of Elements to Orb of Adventure --- design/items.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/design/items.py b/design/items.py index d614f54..40ed9a1 100644 --- a/design/items.py +++ b/design/items.py @@ -6282,9 +6282,9 @@ orbs={ "g":240000, "grades":[0,0], }, - "orbofelements":{ + "orba":{ "type":"orb", - "skin":"orbofelements", + "skin":"orboa", "firesistance":15, "fzresistance":15, "pnresistance":15, @@ -6295,7 +6295,7 @@ orbs={ "pnresistance":5, "phresistance":5, }, - "name":"Orb of Elements", + "name":"Orb of Adventure", "g":1000000, "grades":[0,2], }, From 641efc91906c8b8c13123a7252504f2eaa8ad318 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Wed, 21 May 2025 02:57:22 -0600 Subject: [PATCH 09/11] Fixed Typo and nerfed g cost --- design/items.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/design/items.py b/design/items.py index 40ed9a1..6e79e0d 100644 --- a/design/items.py +++ b/design/items.py @@ -6255,7 +6255,7 @@ orbs={ "skin":"orboffire", "firesistance":10, "name":"Orb of Fire", - "g":240000, + "g":60000, "grades":[0,0], }, "orboffrost":{ @@ -6263,7 +6263,7 @@ orbs={ "skin":"orboffrost", "fzresistance":10, "name":"Orb of Frost", - "g":240000, + "g":60000, "grades":[0,0], }, "orbofplague":{ @@ -6271,7 +6271,7 @@ orbs={ "skin":"orbofplague", "pnresistance":10, "name":"Orb of Plague", - "g":240000, + "g":60000, "grades":[0,0], }, "orbofresolve":{ @@ -6279,12 +6279,12 @@ orbs={ "skin":"orbofresolve", "phresistance":5, "name":"Orb of Resolve", - "g":240000, + "g":60000, "grades":[0,0], }, "orba":{ "type":"orb", - "skin":"orboa", + "skin":"orba", "firesistance":15, "fzresistance":15, "pnresistance":15, @@ -6296,7 +6296,7 @@ orbs={ "phresistance":5, }, "name":"Orb of Adventure", - "g":1000000, + "g":240000, "grades":[0,2], }, "orbofsc":{ From 48cb4416a7b604d450586e053a6af06d178545c9 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Wed, 21 May 2025 09:41:25 -0600 Subject: [PATCH 10/11] fixed crafting --- design/recipes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design/recipes.py b/design/recipes.py index dd7ecb9..75a6d62 100644 --- a/design/recipes.py +++ b/design/recipes.py @@ -368,7 +368,7 @@ craft={ "cost":0, "quest":"mcollector", }, - "orbofelements":{ + "orba":{ "items":[ [1,"orboffire"], [1,"orboffrost"], From a0a61d52972ebd5a7f0aa6d1caa5772024f152b7 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 25 May 2025 12:34:27 -0600 Subject: [PATCH 11/11] compoundable base orbs it was requested by basically everyone that the base orbs be compoundable --- design/items.py | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/design/items.py b/design/items.py index 6e79e0d..c7271d1 100644 --- a/design/items.py +++ b/design/items.py @@ -6253,34 +6253,46 @@ orbs={ "orboffire":{ "type":"orb", "skin":"orboffire", - "firesistance":10, + "firesistance":15, + "compound":{ + "firesistance":5, + }, "name":"Orb of Fire", "g":60000, - "grades":[0,0], + "grades":[0,3], }, "orboffrost":{ "type":"orb", "skin":"orboffrost", - "fzresistance":10, + "fzresistance":15, + "compound":{ + "fzresistance":5, + }, "name":"Orb of Frost", "g":60000, - "grades":[0,0], + "grades":[0,3], }, "orbofplague":{ "type":"orb", "skin":"orbofplague", - "pnresistance":10, + "pnresistance":15, + "compound":{ + "pnresistance":5, + }, "name":"Orb of Plague", "g":60000, - "grades":[0,0], + "grades":[0,3], }, "orbofresolve":{ "type":"orb", "skin":"orbofresolve", - "phresistance":5, + "phresistance":15, + "compound":{ + "phresistance":5, + }, "name":"Orb of Resolve", "g":60000, - "grades":[0,0], + "grades":[0,3], }, "orba":{ "type":"orb", @@ -6295,7 +6307,7 @@ orbs={ "pnresistance":5, "phresistance":5, }, - "name":"Orb of Adventure", + "name":"Orb of Adventures", "g":240000, "grades":[0,2], },