From eb5230b019244f012fb47da850e5a5c569874e16 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 3 Nov 2024 06:56:10 +0300 Subject: [PATCH 01/11] White ship sprites --- .../10f0ca68-908b-4ee5-a040-ed1074c658aa.png | Bin 3916 -> 0 bytes .../1aa71696-4ad5-412d-9f14-342cd38f5631.png | Bin 0 -> 3331 bytes .../36a2218b-dff1-41ce-890d-520e37171b31.png | Bin 0 -> 1135 bytes .../5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf.png | Bin 0 -> 2450 bytes .../6589492c-ec33-4530-b55f-16489df31ff4.png | Bin 2700 -> 0 bytes .../965b4909-9ecd-4504-9ac1-ad7559c50805.png | Bin 0 -> 2307 bytes .../a6e533e7-1d01-4d43-960a-686a504f379c.png | Bin 1449 -> 0 bytes .../e96b4c09-4610-40c7-98ef-c4e76a16cb01.png | Bin 2923 -> 0 bytes .../5b39eae7-ec43-40f7-b3c1-e22cea88da02.png | Bin 3916 -> 0 bytes .../276d1ded-ec39-4e71-8b4a-c08caccf9599.png | Bin 0 -> 3331 bytes .../276d1ded-ec39-4e71-8b4a-c08caccf9599.png | Bin 0 -> 1135 bytes .../276d1ded-ec39-4e71-8b4a-c08caccf9599.png | Bin 0 -> 2450 bytes .../5b39eae7-ec43-40f7-b3c1-e22cea88da02.png | Bin 2700 -> 0 bytes .../276d1ded-ec39-4e71-8b4a-c08caccf9599.png | Bin 0 -> 2307 bytes .../5b39eae7-ec43-40f7-b3c1-e22cea88da02.png | Bin 1449 -> 0 bytes .../5b39eae7-ec43-40f7-b3c1-e22cea88da02.png | Bin 2923 -> 0 bytes .../spr_ship_back_black.yy | 30 +++++++++--------- 17 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 sprites/spr_ship_back_black/10f0ca68-908b-4ee5-a040-ed1074c658aa.png create mode 100644 sprites/spr_ship_back_black/1aa71696-4ad5-412d-9f14-342cd38f5631.png create mode 100644 sprites/spr_ship_back_black/36a2218b-dff1-41ce-890d-520e37171b31.png create mode 100644 sprites/spr_ship_back_black/5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf.png delete mode 100644 sprites/spr_ship_back_black/6589492c-ec33-4530-b55f-16489df31ff4.png create mode 100644 sprites/spr_ship_back_black/965b4909-9ecd-4504-9ac1-ad7559c50805.png delete mode 100644 sprites/spr_ship_back_black/a6e533e7-1d01-4d43-960a-686a504f379c.png delete mode 100644 sprites/spr_ship_back_black/e96b4c09-4610-40c7-98ef-c4e76a16cb01.png delete mode 100644 sprites/spr_ship_back_black/layers/10f0ca68-908b-4ee5-a040-ed1074c658aa/5b39eae7-ec43-40f7-b3c1-e22cea88da02.png create mode 100644 sprites/spr_ship_back_black/layers/1aa71696-4ad5-412d-9f14-342cd38f5631/276d1ded-ec39-4e71-8b4a-c08caccf9599.png create mode 100644 sprites/spr_ship_back_black/layers/36a2218b-dff1-41ce-890d-520e37171b31/276d1ded-ec39-4e71-8b4a-c08caccf9599.png create mode 100644 sprites/spr_ship_back_black/layers/5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf/276d1ded-ec39-4e71-8b4a-c08caccf9599.png delete mode 100644 sprites/spr_ship_back_black/layers/6589492c-ec33-4530-b55f-16489df31ff4/5b39eae7-ec43-40f7-b3c1-e22cea88da02.png create mode 100644 sprites/spr_ship_back_black/layers/965b4909-9ecd-4504-9ac1-ad7559c50805/276d1ded-ec39-4e71-8b4a-c08caccf9599.png delete mode 100644 sprites/spr_ship_back_black/layers/a6e533e7-1d01-4d43-960a-686a504f379c/5b39eae7-ec43-40f7-b3c1-e22cea88da02.png delete mode 100644 sprites/spr_ship_back_black/layers/e96b4c09-4610-40c7-98ef-c4e76a16cb01/5b39eae7-ec43-40f7-b3c1-e22cea88da02.png diff --git a/sprites/spr_ship_back_black/10f0ca68-908b-4ee5-a040-ed1074c658aa.png b/sprites/spr_ship_back_black/10f0ca68-908b-4ee5-a040-ed1074c658aa.png deleted file mode 100644 index 1ab54f76883428b15b656a219e08ab9428baa2da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3916 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_ship_back_black/36a2218b-dff1-41ce-890d-520e37171b31.png b/sprites/spr_ship_back_black/36a2218b-dff1-41ce-890d-520e37171b31.png new file mode 100644 index 0000000000000000000000000000000000000000..b2563c7b09996dd276bc31e87c1db1f0578855c6 GIT binary patch literal 1135 zcmeAS@N?(olHy`uVBq!ia0y~yVB`U^`#9Kua@a2CEqi4B`cIb_Lo1CD@X@-CY>|gW!U_%O^81FeiDsIEGZ*dVA+) zk(8kT>jlNBr~d!n_$fi%mE#7}mXhytKF=`Pc5SsBqa`0uKQ6$ra_hCS?Tyd>-nh%4 zz~6YVXjS(f7Pbq%2@H4P)a@OA&bTLRn0n!aE3z<9kwDb%ExToF1SFOyT6`0ha4>Il z)LPZEx9(jY!*&#BVGuqSD7^$x^LMkvdVDv*_bC6)vDAI4a1jg6=nveaqw5?|ZlUdT{hiuE+Ntz5RJUC{6EIS?c#6 z2RKx@Yx>aQx1o+tmT43Bqm(xJA7%kii5c*+XY?M)`goI zBo2j39AbKOBP@}F>4f@|+p7+-{903&ZJLsBM@XUI{;LBV_3eyzwm)u;j@IH4Wwv>~ zCEiY0Y(jX~`NWV9uQ(MGI$aWUKKNPwe6h8uMRuC~B$rCD=&RR_zfS*kN%t9#`s-B_ zP8f*w2tIwld9fqi^{$4sn(3PnaO*jA&aN2bT2EI$mvv4FO#mTU%$5KE literal 0 HcmV?d00001 diff --git a/sprites/spr_ship_back_black/5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf.png b/sprites/spr_ship_back_black/5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf.png new file mode 100644 index 0000000000000000000000000000000000000000..a0d9de4a72c684a6aba0fae52893d3febb01a3bd GIT binary patch literal 2450 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 XMEyI{+-Z4H#sHALv)u!mz{~#wmyRa} literal 0 HcmV?d00001 diff --git a/sprites/spr_ship_back_black/a6e533e7-1d01-4d43-960a-686a504f379c.png b/sprites/spr_ship_back_black/a6e533e7-1d01-4d43-960a-686a504f379c.png deleted file mode 100644 index 0746c698ffec5149c72c935b751fca3860ee8fa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1449 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_ship_back_black/layers/36a2218b-dff1-41ce-890d-520e37171b31/276d1ded-ec39-4e71-8b4a-c08caccf9599.png b/sprites/spr_ship_back_black/layers/36a2218b-dff1-41ce-890d-520e37171b31/276d1ded-ec39-4e71-8b4a-c08caccf9599.png new file mode 100644 index 0000000000000000000000000000000000000000..b2563c7b09996dd276bc31e87c1db1f0578855c6 GIT binary patch literal 1135 zcmeAS@N?(olHy`uVBq!ia0y~yVB`U^`#9Kua@a2CEqi4B`cIb_Lo1CD@X@-CY>|gW!U_%O^81FeiDsIEGZ*dVA+) zk(8kT>jlNBr~d!n_$fi%mE#7}mXhytKF=`Pc5SsBqa`0uKQ6$ra_hCS?Tyd>-nh%4 zz~6YVXjS(f7Pbq%2@H4P)a@OA&bTLRn0n!aE3z<9kwDb%ExToF1SFOyT6`0ha4>Il z)LPZEx9(jY!*&#BVGuqSD7^$x^LMkvdVDv*_bC6)vDAI4a1jg6=nveaqw5?|ZlUdT{hiuE+Ntz5RJUC{6EIS?c#6 z2RKx@Yx>aQx1o+tmT43Bqm(xJA7%kii5c*+XY?M)`goI zBo2j39AbKOBP@}F>4f@|+p7+-{903&ZJLsBM@XUI{;LBV_3eyzwm)u;j@IH4Wwv>~ zCEiY0Y(jX~`NWV9uQ(MGI$aWUKKNPwe6h8uMRuC~B$rCD=&RR_zfS*kN%t9#`s-B_ zP8f*w2tIwld9fqi^{$4sn(3PnaO*jA&aN2bT2EI$mvv4FO#mTU%$5KE literal 0 HcmV?d00001 diff --git a/sprites/spr_ship_back_black/layers/5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf/276d1ded-ec39-4e71-8b4a-c08caccf9599.png b/sprites/spr_ship_back_black/layers/5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf/276d1ded-ec39-4e71-8b4a-c08caccf9599.png new file mode 100644 index 0000000000000000000000000000000000000000..a0d9de4a72c684a6aba0fae52893d3febb01a3bd GIT binary patch literal 2450 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 XMEyI{+-Z4H#sHALv)u!mz{~#wmyRa} literal 0 HcmV?d00001 diff --git a/sprites/spr_ship_back_black/layers/a6e533e7-1d01-4d43-960a-686a504f379c/5b39eae7-ec43-40f7-b3c1-e22cea88da02.png b/sprites/spr_ship_back_black/layers/a6e533e7-1d01-4d43-960a-686a504f379c/5b39eae7-ec43-40f7-b3c1-e22cea88da02.png deleted file mode 100644 index 14b525d73a3a0b34949c6fccadb335b2b2fe4819..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1449 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKNIvi|3k+<8Q9s*Jd$sR$z3=CCj3=9n|3=F@3 zLJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e4JS{hfLJi@8*qArG0eY-T!oFM=NZq-(P zv157k^V)9)28qcGjW0^%LzEmCPN3ohF|*5>J`D$aS~yra1sFDQpx_7le}CF=(NBw! zX^)ymg>wVL1lIFKDTuPhrcyv;8wi{=M^`7{j8hZx{$fiqw3z*`_tPCW^^+&a_ER(Y-DJh$jN6V zq~H*})a>K-efhob&w8^-DqZMY!#VNQ9)6Y%&lO?n4haVP>;L|__*>#Z+2$734*~Hyc98L+FwM!b@S{3*sZO#v-C4G|XmkRTUy}hDSW$at?Fz~w1^-G>?UEi`q z4@j!*`;d{`mc5d}Kk?$d(>`oU+7*0mV@t1`*eEIFfa zC@z-y8&WVQ3D3>_X5Aob)@9+g!hm`93s0RyMo=)?T+UR#xU8_J^XM9#?6of(7=m_G zMtu|!yX_;9(9XxwpkpO)twhd&NtPp?lV4#XUy4{0qsE!!Ob&66r-AqMdDya`|;IW9g)31VIY6VyKjH34nta>WK3P+05ekQ)&+Qb^Bljv%G zIqKc<N;oSh_Pr0~hLtJ7J z_oN-`3Tk-|IRv_OH&q?&)b&W(`N*^^k*&MPOXRYk`iF_1>+I|qOLUdv>SZf?rWg6x zxjp-3dnS1g!y)Bv2F7Pb$>~qv}J}} zzw67-0&-^~4mF8oiI}!dIv3LraA^1L7lGY>pMTc+I=w4f?`E&nx#msmOj~gTe~ HDWM4fPLH${ diff --git a/sprites/spr_ship_back_black/layers/e96b4c09-4610-40c7-98ef-c4e76a16cb01/5b39eae7-ec43-40f7-b3c1-e22cea88da02.png b/sprites/spr_ship_back_black/layers/e96b4c09-4610-40c7-98ef-c4e76a16cb01/5b39eae7-ec43-40f7-b3c1-e22cea88da02.png deleted file mode 100644 index e87707ad901749c5f5731595b01b9ce2eee01885..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2923 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","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"10f0ca68-908b-4ee5-a040-ed1074c658aa","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"654701c3-6eb9-47f9-9729-f9ec8b8946dd","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a6e533e7-1d01-4d43-960a-686a504f379c","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"95dba8bc-79f2-46a9-a56e-f88d685c2fa0","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e96b4c09-4610-40c7-98ef-c4e76a16cb01","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"ea91669d-8b1b-4d0a-99de-644704ff5f64","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6589492c-ec33-4530-b55f-16489df31ff4","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"aadbc57c-c6db-4aff-bd66-cb738d401a26","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1aa71696-4ad5-412d-9f14-342cd38f5631","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"88ab3083-3474-43ac-8d0d-0adcd2ff8039","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"36a2218b-dff1-41ce-890d-520e37171b31","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"6596c626-5350-48f6-b75f-c91607f21dd3","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"52632645-cb74-4a2a-8a21-dcef105cc1b8","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"965b4909-9ecd-4504-9ac1-ad7559c50805","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"0e91c43a-7cc3-4422-ae3c-7e500f5a541e","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, @@ -76,5 +76,5 @@ }, "type": 0, "VTile": false, - "width": 400, + "width": 268, } \ No newline at end of file From b0918861120161e54993278e9673277acfad0504 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 3 Nov 2024 07:20:53 +0300 Subject: [PATCH 02/11] Fleet screen edits --- .../scr_fleet_advisor/scr_fleet_advisor.gml | 62 ++++++++++--------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index 582aed47ed..3936071229 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -54,7 +54,7 @@ function scr_fleet_advisor(){ va = real(temp[42]); if (va = 2) then blurp += " Two of our ships are highly damaged. You may wish to purchase a Repair License from the Sector Governerner."; if (va > 2) then blurp += " Several of our ships are highly damaged. It is advisable that you purchase a Repair License from the Sector Governer."; - blurp += "##Here are the current positions of our ships and their contents:"; + blurp += "\n\nHere are the current positions of our ships and their contents:"; if (menu_adept = 1) { blurp = string_replace(blurp, "Our", "Your"); @@ -78,12 +78,16 @@ function scr_fleet_advisor(){ if (obj_ini.ship[i] != "") { draw_rectangle(xx + 950, yy + 80 + (i * 20), xx + 1546, yy + 100 + (i * 20), 1); draw_sprite(spr_view_small, 0, xx + 953, yy + 84 + (i * 20)); - draw_text(xx + 970, yy + 80 + (i * 20), $"{obj_ini.ship[i]} ( {obj_ini.ship_class[i]} )"); - draw_text(xx + 1222, yy + 80 + (i * 20), obj_ini.ship_location[i]); - draw_text(xx + 1372, yy + 80 + (i * 20), $"{round((obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i]) * 100)}% HP"); - draw_text(xx + 1450, yy + 80 + (i * 20),$"{obj_ini.ship_carrying[i]} / {obj_ini.ship_capacity[i]} Space"); - - if scr_hit(xx + 950,yy + 80 + (i * 20),xx + 1546,yy + 100 + (i * 20)) { + draw_text(xx + 972, yy + 80 + (i * 20), string_truncate($"{obj_ini.ship[i]}", 120)); + draw_text(xx + 1102, yy + 80 + (i * 20), $"{obj_ini.ship_class[i]}"); + draw_text(xx + 1222, yy + 80 + (i * 20), $"{obj_ini.ship_location[i]}"); + draw_set_halign(fa_right); + // To save space, may be possible to remove health number and color ship name depending on HP percentage. + draw_text(xx + 1410, yy + 80 + (i * 20), $"{round((obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i]) * 100)}% HP"); + draw_text(xx + 1542, yy + 80 + (i * 20), $"{obj_ini.ship_carrying[i]} / {obj_ini.ship_capacity[i]} Space"); + draw_set_halign(fa_left); + + if scr_hit(xx + 950, yy + 80 + (i * 20), xx + 1546, yy + 100 + (i * 20)) { if (cn.temp[101] != obj_ini.ship[i]) { cn.temp[101] = obj_ini.ship[i]; cn.temp[102] = obj_ini.ship_class[i]; @@ -112,6 +116,7 @@ function scr_fleet_advisor(){ cn.temp[119] = ""; if (obj_ini.ship_carrying[i] > 0) then cn.temp[119] = scr_ship_occupants(i); } + tooltip_draw($"Carrying ({cn.temp[118]}): {cn.temp[119]}"); } } } @@ -120,51 +125,48 @@ function scr_fleet_advisor(){ draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); draw_text_transformed(xx + 622, yy + 434, cn.temp[101], 0.75, 0.75, 0); - draw_text_transformed(xx + 622, yy + 460, cn.temp[102], 0.5, 0.5, 0); + draw_text_transformed(xx + 622, yy + 464, cn.temp[102], 0.5, 0.5, 0); - draw_set_color(c_white); - draw_rectangle(xx + 498, yy + 492, xx + 746, yy + 623, 0); + draw_set_color(c_gray); + draw_rectangle(xx + 488, yy + 492, xx + 756, yy + 634, 1); var ships = ["Battle Barge", "Strike Cruiser","Gladius","Hunter"]; var ship_im = 0; for (var i=0;i Date: Mon, 4 Nov 2024 01:06:48 +0300 Subject: [PATCH 03/11] Keep black ship sprites and white separate --- ChapterMaster.yyp | 1 + .../00dd47db-65d6-4276-90cd-12c8e6708bcc.png | Bin 0 -> 1110 bytes .../41b410c3-01c1-440c-bd9d-40498f3ee679.png | Bin 0 -> 3016 bytes .../7f115bba-8dfa-467c-b850-6053b3321a30.png | Bin 0 -> 2080 bytes .../f84f2a39-f16e-4874-809b-e99be35df387.png | Bin 0 -> 2204 bytes .../d7bdc619-a660-497b-a4e5-2ac912a40407.png | Bin 0 -> 1110 bytes .../d7bdc619-a660-497b-a4e5-2ac912a40407.png | Bin 0 -> 3016 bytes .../d7bdc619-a660-497b-a4e5-2ac912a40407.png | Bin 0 -> 2080 bytes .../d7bdc619-a660-497b-a4e5-2ac912a40407.png | Bin 0 -> 2204 bytes .../spr_ship_back_black.yy | 18 ++-- .../1aa71696-4ad5-412d-9f14-342cd38f5631.png | Bin 3331 -> 3331 bytes .../36a2218b-dff1-41ce-890d-520e37171b31.png | Bin 1135 -> 1135 bytes .../5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf.png | Bin 2450 -> 2450 bytes .../965b4909-9ecd-4504-9ac1-ad7559c50805.png | Bin 2307 -> 2307 bytes .../276d1ded-ec39-4e71-8b4a-c08caccf9599.png | Bin .../276d1ded-ec39-4e71-8b4a-c08caccf9599.png | Bin .../276d1ded-ec39-4e71-8b4a-c08caccf9599.png | Bin .../276d1ded-ec39-4e71-8b4a-c08caccf9599.png | Bin .../spr_ship_back_white.yy | 80 ++++++++++++++++++ 19 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 sprites/spr_ship_back_black/00dd47db-65d6-4276-90cd-12c8e6708bcc.png create mode 100644 sprites/spr_ship_back_black/41b410c3-01c1-440c-bd9d-40498f3ee679.png create mode 100644 sprites/spr_ship_back_black/7f115bba-8dfa-467c-b850-6053b3321a30.png create mode 100644 sprites/spr_ship_back_black/f84f2a39-f16e-4874-809b-e99be35df387.png create mode 100644 sprites/spr_ship_back_black/layers/00dd47db-65d6-4276-90cd-12c8e6708bcc/d7bdc619-a660-497b-a4e5-2ac912a40407.png create mode 100644 sprites/spr_ship_back_black/layers/41b410c3-01c1-440c-bd9d-40498f3ee679/d7bdc619-a660-497b-a4e5-2ac912a40407.png create mode 100644 sprites/spr_ship_back_black/layers/7f115bba-8dfa-467c-b850-6053b3321a30/d7bdc619-a660-497b-a4e5-2ac912a40407.png create mode 100644 sprites/spr_ship_back_black/layers/f84f2a39-f16e-4874-809b-e99be35df387/d7bdc619-a660-497b-a4e5-2ac912a40407.png rename sprites/{spr_ship_back_black => spr_ship_back_white}/1aa71696-4ad5-412d-9f14-342cd38f5631.png (95%) rename sprites/{spr_ship_back_black => spr_ship_back_white}/36a2218b-dff1-41ce-890d-520e37171b31.png (86%) rename sprites/{spr_ship_back_black => spr_ship_back_white}/5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf.png (94%) rename sprites/{spr_ship_back_black => spr_ship_back_white}/965b4909-9ecd-4504-9ac1-ad7559c50805.png (92%) rename sprites/{spr_ship_back_black => spr_ship_back_white}/layers/1aa71696-4ad5-412d-9f14-342cd38f5631/276d1ded-ec39-4e71-8b4a-c08caccf9599.png (100%) rename sprites/{spr_ship_back_black => spr_ship_back_white}/layers/36a2218b-dff1-41ce-890d-520e37171b31/276d1ded-ec39-4e71-8b4a-c08caccf9599.png (100%) rename sprites/{spr_ship_back_black => spr_ship_back_white}/layers/5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf/276d1ded-ec39-4e71-8b4a-c08caccf9599.png (100%) rename sprites/{spr_ship_back_black => spr_ship_back_white}/layers/965b4909-9ecd-4504-9ac1-ad7559c50805/276d1ded-ec39-4e71-8b4a-c08caccf9599.png (100%) create mode 100644 sprites/spr_ship_back_white/spr_ship_back_white.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index e8dac67a17..788d638b4b 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -932,6 +932,7 @@ {"id":{"name":"spr_bionics_eye","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},}, {"id":{"name":"spr_bionics_arm","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},}, {"id":{"name":"scr_enemy_ai_c","path":"scripts/scr_enemy_ai_c/scr_enemy_ai_c.yy",},}, + {"id":{"name":"spr_ship_back_white","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},}, {"id":{"name":"scr_enemy_ai_d","path":"scripts/scr_enemy_ai_d/scr_enemy_ai_d.yy",},}, {"id":{"name":"scr_enemy_ai_e","path":"scripts/scr_enemy_ai_e/scr_enemy_ai_e.yy",},}, {"id":{"name":"scr_mission_reward","path":"scripts/scr_mission_reward/scr_mission_reward.yy",},}, diff --git a/sprites/spr_ship_back_black/00dd47db-65d6-4276-90cd-12c8e6708bcc.png b/sprites/spr_ship_back_black/00dd47db-65d6-4276-90cd-12c8e6708bcc.png new file mode 100644 index 0000000000000000000000000000000000000000..9e67e45486430e5355f30527dee2e797c4e2a241 GIT binary patch literal 1110 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","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1aa71696-4ad5-412d-9f14-342cd38f5631","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"88ab3083-3474-43ac-8d0d-0adcd2ff8039","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"36a2218b-dff1-41ce-890d-520e37171b31","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"6596c626-5350-48f6-b75f-c91607f21dd3","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"52632645-cb74-4a2a-8a21-dcef105cc1b8","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"965b4909-9ecd-4504-9ac1-ad7559c50805","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"0e91c43a-7cc3-4422-ae3c-7e500f5a541e","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"41b410c3-01c1-440c-bd9d-40498f3ee679","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"d5b49c97-eb68-44d9-85f7-56308f784f56","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"6a3f9dfb-09e6-49d7-9e49-459c61fb20c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f84f2a39-f16e-4874-809b-e99be35df387","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"439c05d6-5612-440b-bd9b-3221d09bd73b","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7f115bba-8dfa-467c-b850-6053b3321a30","path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},},},"Disabled":false,"id":"0b8203b0-1a34-40c1-b27e-a6d7d549bb87","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, diff --git a/sprites/spr_ship_back_black/1aa71696-4ad5-412d-9f14-342cd38f5631.png b/sprites/spr_ship_back_white/1aa71696-4ad5-412d-9f14-342cd38f5631.png similarity index 95% rename from sprites/spr_ship_back_black/1aa71696-4ad5-412d-9f14-342cd38f5631.png rename to sprites/spr_ship_back_white/1aa71696-4ad5-412d-9f14-342cd38f5631.png index 5609c03dc93a9ea50ae605767a60191e2ebb526e..945e78504e3b015f975c2075eee9dcbcbcd43856 100644 GIT binary patch delta 110 zcmZpcYL?p2z~gLWWMyDvWo)2rU|?lnaKIu)je&tdwZt`|BqgyV)hahXB{Qv(!N|bK pMAy(z*T6UgRl~;AC$lCW=24PE6@FH5)D>tBgQu&X%Q~loCIE0#9!CHG delta 110 zcmZpcYL?p2z~gLSWMyP#WooKzU|?ln@T6_I00RSqYKdz^NlIc#s#R`&N@iLmgOP!e piLRlcu7Pm~s)nhz<=0F;%%dcSDtzdiT`|xc22WQ%mvv4FO#q?79+vZYLovl%cBWzOnowIvObHF9IEPP1xH;O OfWXt$&t;ucLK6TP;}{VD delta 84 zcmaFQ@t$MD8)hK`BP$~_D^pW#0|P4qgC}jv1t$MvmPZqwdRuvQ=iP59K@+4hpPHn!BJNR OAn% delta 84 zcmbOvJV|&1Kc|p^k(H5|m8q$=fq|8Q!IQS-0+SUv<=d#Wzp$Pz%^cFV& diff --git a/sprites/spr_ship_back_black/965b4909-9ecd-4504-9ac1-ad7559c50805.png b/sprites/spr_ship_back_white/965b4909-9ecd-4504-9ac1-ad7559c50805.png similarity index 92% rename from sprites/spr_ship_back_black/965b4909-9ecd-4504-9ac1-ad7559c50805.png rename to sprites/spr_ship_back_white/965b4909-9ecd-4504-9ac1-ad7559c50805.png index 830a7a2dccd7134011d0abf554662018777575a4..93ef6c56c01bc2c788b7a41e73c32edc2d102b08 100644 GIT binary patch delta 110 zcmZn`Y8Kkiz~O9UWMyDvWo)2rU|?lnaKIu)je&tdwZt`|BqgyV)hahXB{Qv(!N|bK pMAy(z*T6UgRl~;AC$lCW=1`JD6@FH5)D>tBgQu&X%Q~loCIDw|9xng@ delta 110 zcmZn`Y8Kkiz~O9QWMyP#WooKzU|?ln@T6_I00RSqYKdz^NlIc#s#R`&N@iLmgOP!e piLRlcu7Pm~s)nhz<=0F;%%LQQDtzdiT`|xc22WQ%mvv4FO#qnQ9)AD; diff --git a/sprites/spr_ship_back_black/layers/1aa71696-4ad5-412d-9f14-342cd38f5631/276d1ded-ec39-4e71-8b4a-c08caccf9599.png b/sprites/spr_ship_back_white/layers/1aa71696-4ad5-412d-9f14-342cd38f5631/276d1ded-ec39-4e71-8b4a-c08caccf9599.png similarity index 100% rename from sprites/spr_ship_back_black/layers/1aa71696-4ad5-412d-9f14-342cd38f5631/276d1ded-ec39-4e71-8b4a-c08caccf9599.png rename to sprites/spr_ship_back_white/layers/1aa71696-4ad5-412d-9f14-342cd38f5631/276d1ded-ec39-4e71-8b4a-c08caccf9599.png diff --git a/sprites/spr_ship_back_black/layers/36a2218b-dff1-41ce-890d-520e37171b31/276d1ded-ec39-4e71-8b4a-c08caccf9599.png b/sprites/spr_ship_back_white/layers/36a2218b-dff1-41ce-890d-520e37171b31/276d1ded-ec39-4e71-8b4a-c08caccf9599.png similarity index 100% rename from sprites/spr_ship_back_black/layers/36a2218b-dff1-41ce-890d-520e37171b31/276d1ded-ec39-4e71-8b4a-c08caccf9599.png rename to sprites/spr_ship_back_white/layers/36a2218b-dff1-41ce-890d-520e37171b31/276d1ded-ec39-4e71-8b4a-c08caccf9599.png diff --git a/sprites/spr_ship_back_black/layers/5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf/276d1ded-ec39-4e71-8b4a-c08caccf9599.png b/sprites/spr_ship_back_white/layers/5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf/276d1ded-ec39-4e71-8b4a-c08caccf9599.png similarity index 100% rename from sprites/spr_ship_back_black/layers/5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf/276d1ded-ec39-4e71-8b4a-c08caccf9599.png rename to sprites/spr_ship_back_white/layers/5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf/276d1ded-ec39-4e71-8b4a-c08caccf9599.png diff --git a/sprites/spr_ship_back_black/layers/965b4909-9ecd-4504-9ac1-ad7559c50805/276d1ded-ec39-4e71-8b4a-c08caccf9599.png b/sprites/spr_ship_back_white/layers/965b4909-9ecd-4504-9ac1-ad7559c50805/276d1ded-ec39-4e71-8b4a-c08caccf9599.png similarity index 100% rename from sprites/spr_ship_back_black/layers/965b4909-9ecd-4504-9ac1-ad7559c50805/276d1ded-ec39-4e71-8b4a-c08caccf9599.png rename to sprites/spr_ship_back_white/layers/965b4909-9ecd-4504-9ac1-ad7559c50805/276d1ded-ec39-4e71-8b4a-c08caccf9599.png diff --git a/sprites/spr_ship_back_white/spr_ship_back_white.yy b/sprites/spr_ship_back_white/spr_ship_back_white.yy new file mode 100644 index 0000000000..87038c0d49 --- /dev/null +++ b/sprites/spr_ship_back_white/spr_ship_back_white.yy @@ -0,0 +1,80 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_ship_back_white", + "bbox_bottom": 116, + "bbox_left": 11, + "bbox_right": 255, + "bbox_top": 25, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1aa71696-4ad5-412d-9f14-342cd38f5631",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"36a2218b-dff1-41ce-890d-520e37171b31",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"965b4909-9ecd-4504-9ac1-ad7559c50805",}, + ], + "gridX": 0, + "gridY": 0, + "height": 142, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"276d1ded-ec39-4e71-8b4a-c08caccf9599","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "Ships", + "path": "folders/Sprites/Ships.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_ship_back_white", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 4.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1aa71696-4ad5-412d-9f14-342cd38f5631","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},},},"Disabled":false,"id":"7305107d-cd32-473d-89ec-c95e03ea3123","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"36a2218b-dff1-41ce-890d-520e37171b31","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},},},"Disabled":false,"id":"0746d0f4-e483-44c7-b37f-73d286bbe7f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},},},"Disabled":false,"id":"f452a7af-801c-4f84-b0f4-dc73532f0037","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"965b4909-9ecd-4504-9ac1-ad7559c50805","path":"sprites/spr_ship_back_white/spr_ship_back_white.yy",},},},"Disabled":false,"id":"6d495220-6a63-4ead-840b-771b34989d14","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 268, +} \ No newline at end of file From 95dac81a3ace3a4e2e773733be3e131287700d89 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 4 Nov 2024 01:08:38 +0300 Subject: [PATCH 04/11] Forgot to change to the new sprite --- scripts/scr_fleet_advisor/scr_fleet_advisor.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index 3936071229..d24f096e10 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -138,7 +138,7 @@ function scr_fleet_advisor(){ } } draw_set_color(c_white); - draw_sprite(spr_ship_back_black, ship_im, xx + 488, yy + 492); + draw_sprite(spr_ship_back_white, ship_im, xx + 488, yy + 492); draw_set_color(c_gray); draw_set_font(fnt_40k_14); From de6ee2d47b870cc53760cb8cfc4e930fac18b920 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 4 Nov 2024 06:55:39 +0300 Subject: [PATCH 05/11] Edit the ship list a bit more --- objects/obj_controller/Mouse_50.gml | 5 +- .../scr_fleet_advisor/scr_fleet_advisor.gml | 97 +++++++++++++++++-- 2 files changed, 91 insertions(+), 11 deletions(-) diff --git a/objects/obj_controller/Mouse_50.gml b/objects/obj_controller/Mouse_50.gml index b05e8ca1fe..ad3549e334 100644 --- a/objects/obj_controller/Mouse_50.gml +++ b/objects/obj_controller/Mouse_50.gml @@ -167,7 +167,8 @@ else if (menu==15) and (cooldown<=0){ } } // ** Fleet count ** -if (menu==16) and (cooldown<=0){ +// Moved to scr_fleet_advisor(); +/* if (menu==16) and (cooldown<=0){ var i=ship_current; for(var j=0; j<34; j++){ i+=1; @@ -191,7 +192,7 @@ if (menu==16) and (cooldown<=0){ } } } -} +} */ // ** Diplomacy ** diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index d24f096e10..08d505d0be 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -66,7 +66,7 @@ function scr_fleet_advisor(){ draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); - draw_text_transformed(xx + 1262, yy + 70, "Fleet", 0.6, 0.6, 0); + draw_text_transformed(xx + 1262, yy + 40, "Fleet", 0.6, 0.6, 0); draw_set_font(fnt_40k_14); draw_set_halign(fa_left); @@ -74,20 +74,80 @@ function scr_fleet_advisor(){ var cn = obj_controller; if (instance_exists(cn)) { + var _line_gap = 22; + var _name_column = { + x1: xx+953, + w: 168, + header: "Name", + h_align: fa_left, + }; + var _class_column = { + x1: xx+1123, + w: 128, + header: "Class", + h_align: fa_left, + }; + var _location_column = { + x1: xx+1270, + w: 138, + header: "Location", + h_align: fa_left, + }; + var _hp_column = { + x1: xx+1408, + w: 44, + header: "HP", + h_align: fa_right, + }; + var _carrying_column = { + x1: xx+1452, + w: 84, + header: "Carrying", + h_align: fa_right, + }; + var _columns = [_name_column, _class_column, _location_column, _hp_column, _carrying_column]; + for (var i = 0; i < array_length(_columns); i++) { + with (_columns[i]) { + x2 = x1 + w; + y1 = yy + 80; + header_y = (y1 - 2); + if (h_align == fa_left) { + header_x = x1; + } else if (h_align == fa_right) { + header_x = x2; + } else if (h_align == fa_center) { + header_x = (x1 + x2) / 2; + } + draw_set_halign(h_align); + draw_text(header_x, header_y, header); + } + } + draw_set_halign(fa_left); for (var i = ship_current; i < ship_current + 34; i++) { if (obj_ini.ship[i] != "") { - draw_rectangle(xx + 950, yy + 80 + (i * 20), xx + 1546, yy + 100 + (i * 20), 1); - draw_sprite(spr_view_small, 0, xx + 953, yy + 84 + (i * 20)); - draw_text(xx + 972, yy + 80 + (i * 20), string_truncate($"{obj_ini.ship[i]}", 120)); - draw_text(xx + 1102, yy + 80 + (i * 20), $"{obj_ini.ship_class[i]}"); - draw_text(xx + 1222, yy + 80 + (i * 20), $"{obj_ini.ship_location[i]}"); + draw_rectangle(xx + 950, yy + 80 + (i * _line_gap), xx + 1546, yy + 100 + (i * _line_gap), 1); + var _goto_button = { + x1: _location_column.x1 - 20, + y1: yy + 84 + (i * _line_gap), + sprite: spr_view_small, + }; + with (_goto_button) { + w = sprite_get_width(sprite); + h = sprite_get_height(sprite); + x2 = x1 + w; + y2 = y1 + h; + draw_sprite(sprite, 0, x1, y1); + } + draw_text(_name_column.x1, _name_column.y1 + (i * _line_gap), string_truncate($"{obj_ini.ship[i]}", _name_column.w - 6)); + draw_text(_class_column.x1, _class_column.y1 + (i * _line_gap), $"{obj_ini.ship_class[i]}"); + draw_text(_location_column.x1, _location_column.y1 + (i * _line_gap), $"{obj_ini.ship_location[i]}"); draw_set_halign(fa_right); // To save space, may be possible to remove health number and color ship name depending on HP percentage. - draw_text(xx + 1410, yy + 80 + (i * 20), $"{round((obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i]) * 100)}% HP"); - draw_text(xx + 1542, yy + 80 + (i * 20), $"{obj_ini.ship_carrying[i]} / {obj_ini.ship_capacity[i]} Space"); + draw_text(_hp_column.x2, _hp_column.y1 + (i * _line_gap), $"{round((obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i]) * 100)}%"); + draw_text(_carrying_column.x2, _carrying_column.y1 + (i * _line_gap), $"{obj_ini.ship_carrying[i]}/{obj_ini.ship_capacity[i]}"); draw_set_halign(fa_left); - if scr_hit(xx + 950, yy + 80 + (i * 20), xx + 1546, yy + 100 + (i * 20)) { + if scr_hit(xx + 950, yy + 80 + (i * _line_gap), xx + 1546, yy + 100 + (i * _line_gap)) { if (cn.temp[101] != obj_ini.ship[i]) { cn.temp[101] = obj_ini.ship[i]; cn.temp[102] = obj_ini.ship_class[i]; @@ -117,6 +177,25 @@ function scr_fleet_advisor(){ if (obj_ini.ship_carrying[i] > 0) then cn.temp[119] = scr_ship_occupants(i); } tooltip_draw($"Carrying ({cn.temp[118]}): {cn.temp[119]}"); + if (point_and_click([_goto_button.x1, _goto_button.y1, _goto_button.x2, _goto_button.y2])) { + temp[40]=obj_ini.ship[i]; + with(obj_p_fleet){ + for(var k=1; k<=40; k++){ + if (capital[k]==obj_controller.temp[40]) then instance_create(x,y,obj_temp7); + if (frigate[k]==obj_controller.temp[40]) then instance_create(x,y,obj_temp7); + if (escort[k]==obj_controller.temp[40]) then instance_create(x,y,obj_temp7); + } + } + if (instance_exists(obj_temp7)){ + x=obj_temp7.x; + y=obj_temp7.y; + cooldown=8000; + menu=0; + with(obj_fleet_show){instance_destroy();} + instance_create(obj_temp7.x,obj_temp7.y,obj_fleet_show); + with(obj_temp7){instance_destroy();} + } + } } } } From 26bd69c3e91e4125b7ee22dfc545cfccdff0205e Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 4 Nov 2024 07:31:02 +0300 Subject: [PATCH 06/11] Hopefully, optimize the code a bit --- .../scr_fleet_advisor/scr_fleet_advisor.gml | 93 ++++++++----------- 1 file changed, 41 insertions(+), 52 deletions(-) diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index 08d505d0be..6d32733d3c 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -73,62 +73,50 @@ function scr_fleet_advisor(){ var cn = obj_controller; + // TODO: Probably a good idea to turn this whole interactive list/sheet generating logic into a constructor, that can be reused on many screens. + // I have no passion for this atm. if (instance_exists(cn)) { - var _line_gap = 22; - var _name_column = { - x1: xx+953, - w: 168, - header: "Name", - h_align: fa_left, + var _header_offset = 80; + var _line_height = 20; + var _line_gap = 2; + var _headers = { + name: { x1: xx + 953, w: 168, text: "Name", h_align: fa_left }, + class: { x1: xx + 1123, w: 128, text: "Class", h_align: fa_left }, + location: { x1: xx + 1270, w: 138, text: "Location", h_align: fa_left }, + hp: { x1: xx + 1408, w: 44, text: "HP", h_align: fa_right }, + carrying: { x1: xx + 1452, w: 84, text: "Carrying", h_align: fa_right }, }; - var _class_column = { - x1: xx+1123, - w: 128, - header: "Class", - h_align: fa_left, - }; - var _location_column = { - x1: xx+1270, - w: 138, - header: "Location", - h_align: fa_left, - }; - var _hp_column = { - x1: xx+1408, - w: 44, - header: "HP", - h_align: fa_right, - }; - var _carrying_column = { - x1: xx+1452, - w: 84, - header: "Carrying", - h_align: fa_right, - }; - var _columns = [_name_column, _class_column, _location_column, _hp_column, _carrying_column]; - for (var i = 0; i < array_length(_columns); i++) { - with (_columns[i]) { + var _headers_array = struct_get_names(_headers); + for (var i = 0; i < array_length(_headers_array); i++) { + with (_headers[$ _headers_array[i]]) { x2 = x1 + w; - y1 = yy + 80; + y1 = yy + _header_offset; header_y = (y1 - 2); - if (h_align == fa_left) { - header_x = x1; - } else if (h_align == fa_right) { - header_x = x2; - } else if (h_align == fa_center) { - header_x = (x1 + x2) / 2; + switch (h_align) { + case fa_right: + header_x = x2; + break; + case fa_center: + header_x = (x1 + x2) / 2; + break; + case fa_left: + default: + header_x = x1; + break; } draw_set_halign(h_align); - draw_text(header_x, header_y, header); + draw_text(header_x, header_y, text); } } draw_set_halign(fa_left); for (var i = ship_current; i < ship_current + 34; i++) { if (obj_ini.ship[i] != "") { - draw_rectangle(xx + 950, yy + 80 + (i * _line_gap), xx + 1546, yy + 100 + (i * _line_gap), 1); + var current_y = yy + _header_offset + (i * (_line_height + _line_gap)); + draw_rectangle(xx + 950, current_y, xx + 1546, current_y + _line_height, 1); + var _goto_button = { - x1: _location_column.x1 - 20, - y1: yy + 84 + (i * _line_gap), + x1: _headers.location.x1 - 20, + y1: current_y + 4, sprite: spr_view_small, }; with (_goto_button) { @@ -138,16 +126,17 @@ function scr_fleet_advisor(){ y2 = y1 + h; draw_sprite(sprite, 0, x1, y1); } - draw_text(_name_column.x1, _name_column.y1 + (i * _line_gap), string_truncate($"{obj_ini.ship[i]}", _name_column.w - 6)); - draw_text(_class_column.x1, _class_column.y1 + (i * _line_gap), $"{obj_ini.ship_class[i]}"); - draw_text(_location_column.x1, _location_column.y1 + (i * _line_gap), $"{obj_ini.ship_location[i]}"); + + draw_text(_headers.name.x1, current_y, string_truncate(obj_ini.ship[i], _headers.name.w - 6)); + draw_text(_headers.class.x1, current_y, obj_ini.ship_class[i]); + draw_text(_headers.location.x1, current_y, obj_ini.ship_location[i]); + draw_set_halign(fa_right); - // To save space, may be possible to remove health number and color ship name depending on HP percentage. - draw_text(_hp_column.x2, _hp_column.y1 + (i * _line_gap), $"{round((obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i]) * 100)}%"); - draw_text(_carrying_column.x2, _carrying_column.y1 + (i * _line_gap), $"{obj_ini.ship_carrying[i]}/{obj_ini.ship_capacity[i]}"); + draw_text(_headers.hp.x2, current_y, string(round((obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i]) * 100)) + "%"); + draw_text(_headers.carrying.x2, current_y, string(obj_ini.ship_carrying[i]) + "/" + string(obj_ini.ship_capacity[i])); draw_set_halign(fa_left); - if scr_hit(xx + 950, yy + 80 + (i * _line_gap), xx + 1546, yy + 100 + (i * _line_gap)) { + if scr_hit(xx + 950, current_y, xx + 1546, yy + 100 + (i * (_line_height + _line_gap))) { if (cn.temp[101] != obj_ini.ship[i]) { cn.temp[101] = obj_ini.ship[i]; cn.temp[102] = obj_ini.ship_class[i]; @@ -249,5 +238,5 @@ function scr_fleet_advisor(){ } } // 31 wide - scr_scrollbar(1547, 100, 1577, 780, 34, ship_max, ship_current); + scr_scrollbar(1550, 100, 1577, 818, 34, ship_max, ship_current); } \ No newline at end of file From dc0309a9dc51e109da9da465091a8857999dc22c Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 4 Nov 2024 07:36:25 +0300 Subject: [PATCH 07/11] Format --- .../scr_fleet_advisor/scr_fleet_advisor.gml | 92 ++++++++++++------- 1 file changed, 60 insertions(+), 32 deletions(-) diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index 6d32733d3c..78c52e9a4b 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -80,29 +80,54 @@ function scr_fleet_advisor(){ var _line_height = 20; var _line_gap = 2; var _headers = { - name: { x1: xx + 953, w: 168, text: "Name", h_align: fa_left }, - class: { x1: xx + 1123, w: 128, text: "Class", h_align: fa_left }, - location: { x1: xx + 1270, w: 138, text: "Location", h_align: fa_left }, - hp: { x1: xx + 1408, w: 44, text: "HP", h_align: fa_right }, - carrying: { x1: xx + 1452, w: 84, text: "Carrying", h_align: fa_right }, + name: { + x1: xx + 953, + w: 168, + text: "Name", + h_align: fa_left + }, + class: { + x1: xx + 1123, + w: 128, + text: "Class", + h_align: fa_left + }, + location: { + x1: xx + 1270, + w: 138, + text: "Location", + h_align: fa_left + }, + hp: { + x1: xx + 1408, + w: 44, + text: "HP", + h_align: fa_right + }, + carrying: { + x1: xx + 1452, + w: 84, + text: "Carrying", + h_align: fa_right + }, }; var _headers_array = struct_get_names(_headers); for (var i = 0; i < array_length(_headers_array); i++) { - with (_headers[$ _headers_array[i]]) { + with(_headers[$ _headers_array[i]]) { x2 = x1 + w; y1 = yy + _header_offset; header_y = (y1 - 2); switch (h_align) { - case fa_right: - header_x = x2; - break; - case fa_center: - header_x = (x1 + x2) / 2; - break; - case fa_left: - default: - header_x = x1; - break; + case fa_right: + header_x = x2; + break; + case fa_center: + header_x = (x1 + x2) / 2; + break; + case fa_left: + default: + header_x = x1; + break; } draw_set_halign(h_align); draw_text(header_x, header_y, text); @@ -119,7 +144,7 @@ function scr_fleet_advisor(){ y1: current_y + 4, sprite: spr_view_small, }; - with (_goto_button) { + with(_goto_button) { w = sprite_get_width(sprite); h = sprite_get_height(sprite); x2 = x1 + w; @@ -130,7 +155,7 @@ function scr_fleet_advisor(){ draw_text(_headers.name.x1, current_y, string_truncate(obj_ini.ship[i], _headers.name.w - 6)); draw_text(_headers.class.x1, current_y, obj_ini.ship_class[i]); draw_text(_headers.location.x1, current_y, obj_ini.ship_location[i]); - + draw_set_halign(fa_right); draw_text(_headers.hp.x2, current_y, string(round((obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i]) * 100)) + "%"); draw_text(_headers.carrying.x2, current_y, string(obj_ini.ship_carrying[i]) + "/" + string(obj_ini.ship_capacity[i])); @@ -167,22 +192,25 @@ function scr_fleet_advisor(){ } tooltip_draw($"Carrying ({cn.temp[118]}): {cn.temp[119]}"); if (point_and_click([_goto_button.x1, _goto_button.y1, _goto_button.x2, _goto_button.y2])) { - temp[40]=obj_ini.ship[i]; - with(obj_p_fleet){ - for(var k=1; k<=40; k++){ - if (capital[k]==obj_controller.temp[40]) then instance_create(x,y,obj_temp7); - if (frigate[k]==obj_controller.temp[40]) then instance_create(x,y,obj_temp7); - if (escort[k]==obj_controller.temp[40]) then instance_create(x,y,obj_temp7); + obj_controller.temp[40] = obj_ini.ship[i]; + with(obj_p_fleet) { + for (var k = 0; k <= 40; k++) { + if (capital[k] == obj_controller.temp[40]) then instance_create(x, y, obj_temp7); + if (frigate[k] == obj_controller.temp[40]) then instance_create(x, y, obj_temp7); + if (escort[k] == obj_controller.temp[40]) then instance_create(x, y, obj_temp7); } } - if (instance_exists(obj_temp7)){ - x=obj_temp7.x; - y=obj_temp7.y; - cooldown=8000; - menu=0; - with(obj_fleet_show){instance_destroy();} - instance_create(obj_temp7.x,obj_temp7.y,obj_fleet_show); - with(obj_temp7){instance_destroy();} + if (instance_exists(obj_temp7)) { + obj_controller.x = obj_temp7.x; + obj_controller.y = obj_temp7.y; + obj_controller.menu = 0; + with(obj_fleet_show) { + instance_destroy(); + } + instance_create(obj_temp7.x, obj_temp7.y, obj_fleet_show); + with(obj_temp7) { + instance_destroy(); + } } } } From 2cd393e8d53a89c1228909562dac480bf3ea4889 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 4 Nov 2024 08:03:37 +0300 Subject: [PATCH 08/11] Am I improving the code or making it worse? --- .../scr_fleet_advisor/scr_fleet_advisor.gml | 51 ++++++++++++------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index 78c52e9a4b..3cb67e35bd 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -79,41 +79,41 @@ function scr_fleet_advisor(){ var _header_offset = 80; var _line_height = 20; var _line_gap = 2; - var _headers = { + var _columns = { name: { x1: xx + 953, w: 168, text: "Name", - h_align: fa_left + h_align: fa_left, }, class: { x1: xx + 1123, w: 128, text: "Class", - h_align: fa_left + h_align: fa_left, }, location: { x1: xx + 1270, w: 138, text: "Location", - h_align: fa_left + h_align: fa_left, }, hp: { x1: xx + 1408, w: 44, text: "HP", - h_align: fa_right + h_align: fa_right, }, carrying: { x1: xx + 1452, w: 84, text: "Carrying", - h_align: fa_right + h_align: fa_right, }, }; - var _headers_array = struct_get_names(_headers); - for (var i = 0; i < array_length(_headers_array); i++) { - with(_headers[$ _headers_array[i]]) { + var _columns_array = struct_get_names(_columns); + for (var i = 0; i < array_length(_columns_array); i++) { + with(_columns[$ _columns_array[i]]) { x2 = x1 + w; y1 = yy + _header_offset; header_y = (y1 - 2); @@ -140,7 +140,7 @@ function scr_fleet_advisor(){ draw_rectangle(xx + 950, current_y, xx + 1546, current_y + _line_height, 1); var _goto_button = { - x1: _headers.location.x1 - 20, + x1: _columns.location.x1 - 20, y1: current_y + 4, sprite: spr_view_small, }; @@ -152,14 +152,31 @@ function scr_fleet_advisor(){ draw_sprite(sprite, 0, x1, y1); } - draw_text(_headers.name.x1, current_y, string_truncate(obj_ini.ship[i], _headers.name.w - 6)); - draw_text(_headers.class.x1, current_y, obj_ini.ship_class[i]); - draw_text(_headers.location.x1, current_y, obj_ini.ship_location[i]); + with(_columns) { + name.contents = string_truncate(obj_ini.ship[i], _columns.name.w - 6); + class.contents = obj_ini.ship_class[i]; + location.contents = obj_ini.ship_location[i]; + hp.contents = $"{round(obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i] * 100)}%"; + carrying.contents = $"{obj_ini.ship_carrying[i]}/{obj_ini.ship_capacity[i]}"; + } - draw_set_halign(fa_right); - draw_text(_headers.hp.x2, current_y, string(round((obj_ini.ship_hp[i] / obj_ini.ship_maxhp[i]) * 100)) + "%"); - draw_text(_headers.carrying.x2, current_y, string(obj_ini.ship_carrying[i]) + "/" + string(obj_ini.ship_capacity[i])); - draw_set_halign(fa_left); + for (var g = 0; g < array_length(_columns_array); g++) { + with(_columns[$ _columns_array[g]]) { + draw_set_halign(h_align); + switch (h_align) { + case fa_right: + draw_text(x2, current_y, contents); + break; + case fa_center: + draw_text((x1 + x2) / 2, current_y, contents); + break; + case fa_left: + default: + draw_text(x1, current_y, contents); + break; + } + } + } if scr_hit(xx + 950, current_y, xx + 1546, yy + 100 + (i * (_line_height + _line_gap))) { if (cn.temp[101] != obj_ini.ship[i]) { From c3dde491245f218c8807d6105efecda359a2b0ab Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 4 Nov 2024 08:33:52 +0300 Subject: [PATCH 09/11] Less hardcoded column positions --- .../scr_fleet_advisor/scr_fleet_advisor.gml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index 3cb67e35bd..2fdf97b0bc 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -81,39 +81,39 @@ function scr_fleet_advisor(){ var _line_gap = 2; var _columns = { name: { - x1: xx + 953, - w: 168, + w: 176, text: "Name", h_align: fa_left, }, class: { - x1: xx + 1123, - w: 128, + w: 154, text: "Class", h_align: fa_left, }, location: { - x1: xx + 1270, - w: 138, + w: 130, text: "Location", h_align: fa_left, }, hp: { - x1: xx + 1408, w: 44, text: "HP", h_align: fa_right, }, carrying: { - x1: xx + 1452, w: 84, text: "Carrying", h_align: fa_right, }, }; - var _columns_array = struct_get_names(_columns); + + var current_x = xx + 953; + var _columns_array = ["name", "class", "location", "hp", "carrying"]; + for (var i = 0; i < array_length(_columns_array); i++) { with(_columns[$ _columns_array[i]]) { + x1 = current_x; + current_x += w; x2 = x1 + w; y1 = yy + _header_offset; header_y = (y1 - 2); @@ -134,6 +134,7 @@ function scr_fleet_advisor(){ } } draw_set_halign(fa_left); + for (var i = ship_current; i < ship_current + 34; i++) { if (obj_ini.ship[i] != "") { var current_y = yy + _header_offset + (i * (_line_height + _line_gap)); From 02fe0a19385fa2c30cfbb7ecbc53ef4770a462f9 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 4 Nov 2024 08:36:21 +0300 Subject: [PATCH 10/11] More readable variables --- .../scr_fleet_advisor/scr_fleet_advisor.gml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index 2fdf97b0bc..72eefad698 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -77,8 +77,8 @@ function scr_fleet_advisor(){ // I have no passion for this atm. if (instance_exists(cn)) { var _header_offset = 80; - var _line_height = 20; - var _line_gap = 2; + var _row_height = 20; + var _row_gap = 2; var _columns = { name: { w: 176, @@ -107,13 +107,13 @@ function scr_fleet_advisor(){ }, }; - var current_x = xx + 953; + var _column_x = xx + 953; var _columns_array = ["name", "class", "location", "hp", "carrying"]; for (var i = 0; i < array_length(_columns_array); i++) { with(_columns[$ _columns_array[i]]) { - x1 = current_x; - current_x += w; + x1 = _column_x; + _column_x += w; x2 = x1 + w; y1 = yy + _header_offset; header_y = (y1 - 2); @@ -137,12 +137,12 @@ function scr_fleet_advisor(){ for (var i = ship_current; i < ship_current + 34; i++) { if (obj_ini.ship[i] != "") { - var current_y = yy + _header_offset + (i * (_line_height + _line_gap)); - draw_rectangle(xx + 950, current_y, xx + 1546, current_y + _line_height, 1); + var _row_y = yy + _header_offset + (i * (_row_height + _row_gap)); + draw_rectangle(xx + 950, _row_y, xx + 1546, _row_y + _row_height, 1); var _goto_button = { x1: _columns.location.x1 - 20, - y1: current_y + 4, + y1: _row_y + 4, sprite: spr_view_small, }; with(_goto_button) { @@ -166,20 +166,20 @@ function scr_fleet_advisor(){ draw_set_halign(h_align); switch (h_align) { case fa_right: - draw_text(x2, current_y, contents); + draw_text(x2, _row_y, contents); break; case fa_center: - draw_text((x1 + x2) / 2, current_y, contents); + draw_text((x1 + x2) / 2, _row_y, contents); break; case fa_left: default: - draw_text(x1, current_y, contents); + draw_text(x1, _row_y, contents); break; } } } - if scr_hit(xx + 950, current_y, xx + 1546, yy + 100 + (i * (_line_height + _line_gap))) { + if scr_hit(xx + 950, _row_y, xx + 1546, yy + 100 + (i * (_row_height + _row_gap))) { if (cn.temp[101] != obj_ini.ship[i]) { cn.temp[101] = obj_ini.ship[i]; cn.temp[102] = obj_ini.ship_class[i]; From 6f1fd73c61c4b5aaeda99b88eae3097ba9b34743 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:27:24 +0300 Subject: [PATCH 11/11] Use click method for _goto_button --- scripts/scr_fleet_advisor/scr_fleet_advisor.gml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml index 72eefad698..d36dcf5aa9 100644 --- a/scripts/scr_fleet_advisor/scr_fleet_advisor.gml +++ b/scripts/scr_fleet_advisor/scr_fleet_advisor.gml @@ -144,6 +144,9 @@ function scr_fleet_advisor(){ x1: _columns.location.x1 - 20, y1: _row_y + 4, sprite: spr_view_small, + click: function() { + return point_and_click([x1, y1, x2, y2]); + } }; with(_goto_button) { w = sprite_get_width(sprite); @@ -209,7 +212,7 @@ function scr_fleet_advisor(){ if (obj_ini.ship_carrying[i] > 0) then cn.temp[119] = scr_ship_occupants(i); } tooltip_draw($"Carrying ({cn.temp[118]}): {cn.temp[119]}"); - if (point_and_click([_goto_button.x1, _goto_button.y1, _goto_button.x2, _goto_button.y2])) { + if (_goto_button.click()) { obj_controller.temp[40] = obj_ini.ship[i]; with(obj_p_fleet) { for (var k = 0; k <= 40; k++) {