From c5904dc0658c3cb886166e148cb434511243726b Mon Sep 17 00:00:00 2001 From: ac-stef Date: Thu, 15 Sep 2016 20:01:38 +0200 Subject: [PATCH] add stairs to edit menu --- config/menus_edit.cfg | 31 +++++++++++++------------- packages/textures/map_editor/axes.png | Bin 0 -> 2751 bytes 2 files changed, 15 insertions(+), 16 deletions(-) create mode 100644 packages/textures/map_editor/axes.png diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg index ba4b8b1a..10eec191 100644 --- a/config/menus_edit.cfg +++ b/config/menus_edit.cfg @@ -9,7 +9,7 @@ menuitem "Pickups..." [ showmenu Pickups ] menuitem "Textures..." [ showmenu textures ] menuitem "Skymaps..." [ showmenu skymaps ] menuitem "Ambient sounds..." [ showmenu [Ambient sounds] ] -menuitem "Arches and slopes..." [ showmenu Arches ] +menuitem "Arches, slopes and stairs..." [ showmenu Arches ] menuitem "Map operations..." [ showmenu [Map operations] ] menuitem "Map settings..." [ showmenu [Map settings] ] menuitem "Map config operations..." [ showmenu [Map config operations] ] @@ -94,24 +94,23 @@ menuitem "Akimbo" [ newent akimbo ] menuitem "Grenades" [ newent grenades ] //Arch and slope menu +looplist [__slopeaxis 0 __slopeinc 4 __stairaxis 0 __stairwidth 1 __undoarch "" __archside 1] [n v] [tempalias $n $v] +tempalias __setundoarch [ __undoarch = (concat select (at (selx) 0) (at (sely) 0) (at (selxs) 0) (at (selys) 0) "; if (= (undolevel)" (+ (undolevel) 2) ") [ undolevel" (undolevel) "]") ] newmenu Arches - -menuitem "Arch with no sideways curves" [ heightfield 2; arch 0 ] -menuitem "Arch with sideways curves (delta 1)" [ heightfield 2; arch 1 ] -menuitem "Arch with sideways curves (delta 2)" [ heightfield 2; arch 2 ] -menuitem "Arch with sideways curves (delta 3)" [ heightfield 2; arch 3 ] -menuitem "Arch with sideways curves (delta 4)" [ heightfield 2; arch 4 ] +menuinit [ chmenutexture (curmenu) map_editor/axes.png " " ] +menuitemslider "Arch sideways curve delta: " 0 5 "$__archside" 1 [] [ __archside = $arg1 ] +menuitem "\t[ Place arch ]" [ __setundoarch ; heightfield 2; arch $__archside ] menuitem "" -1 -menuitem "Slope increase 2 left-right" [ heightfield 0; slope 2 0 ] -menuitem "Slope decrease 2 left-right" [ heightfield 0; slope -2 0 ] -menuitem "Slope increase 2 top-bottom" [ heightfield 0; slope 0 2 ] -menuitem "Slope decrease 2 top-bottom" [ heightfield 0; slope 0 -2 ] -menuitem "Slope increase 1 left-right" [ heightfield 0; slope 1 0 ] -menuitem "Slope decrease 1 left-right" [ heightfield 0; slope -1 0 ] -menuitem "Slope increase 1 top-bottom" [ heightfield 0; slope 0 1 ] -menuitem "Slope decrease 1 top-bottom" [ heightfield 0; slope 0 -1 ] +menuitemslider "Slope axis: " 0 1 "$__slopeaxis" 1 ["West to East (X)" "North to South (Y)"] [ __slopeaxis = $arg1 ] +menuitemslider "Slope increment: " 0 5 "$__slopeinc" 1 ["downwards 3" "downwards 2" "downwards 1" "upwards 1" "upwards 2" "upwards 3"] [ __slopeinc = $arg1 ] +menuitem "\t[ Place slope ]" [ __setundoarch ; heightfield 0; push i (at "-3 -2 -1 1 2 3" $__slopeinc) ; slope (if $__slopeaxis 0 $i) (if $__slopeaxis $i 0) ; pop i ; 0] menuitem "" -1 -menuitem "Fix heightfielding" [ solid 0; slope 0 0 ] +menuitem "Clear heightfielding" [ solid 0; slope 0 0 ] +menuitem "Undo last placed arch or slope" [ __undoarch ; -1 ] +menuitem "" -1 +menuitemslider "Stairs axis: " 0 1 "$__stairaxis" 1 ["West to East (X)" "North to South (Y)"] [ __stairaxis = $arg1 ] +menuitemslider "Step width: " 0 5 "$__stairwidth" 1 ["downwards 3" "downwards 2" "downwards 1" "upwards 1" "upwards 2" "upwards 3"] [ __stairwidth = $arg1 ] +menuitem "\t[ Place stairs ]" [ selectionwalk [ += sw_floor (div (if $__stairaxis $sw_rel_y $sw_rel_x) (at "-3 -2 -1 1 2 3" $__stairwidth)) ] ] newmenu skymaps menuinit [ diff --git a/packages/textures/map_editor/axes.png b/packages/textures/map_editor/axes.png new file mode 100644 index 0000000000000000000000000000000000000000..78fe910a5bca6f32e7054eadfb02245e57fd193a GIT binary patch literal 2751 zcmZuzdo&aL8{gJmo7-&2Jw~OdSj^p+8d8WI$|bCb<(k#Yq_8ks5-JmtOxEij7&-s3y&*z~#Ioe8!DTx6907<(O zIK1#|-C0nOa362}=>!0XQSES6F65EL+-UoI0;R4z28iS46nb*6=K-XtCeqf*TC-Mx z`}`8;?ktNQ8ytM9yAyZr-m9{TU|eP!ynvqRr|s`%$wF5Km$Z2sXiHTquC> zohle0{75qX5r<*naab7MnNJw4 z-ftF3RhNZ#BS@rdNs%kg&ZTU&JQGOyVw2yWYd&0geZBp75)&>7orbQjFE%yp#m~L` zdf8&fBQG#1h1g$5Y4gx+sq2USD?)59p2y^?V-$Hil&0mA0Q#Pdn~% zrdZdzQB6iB&PkX{&#R`Q!5laQI*mNZ#oF0HJ^?7f;*x>@9l=a^JpNMelPNe9uv65p z>Hrh~7__oy;&79Wuc2oY&RZ4HQ!2)LvX@QK*H8O1`XL_=*e^l07v*@wu}tY;JWLNR zCI==}V`g*J;a@1&3P@ipg&+mKiGg=3b}ugzQcF6rQaDu}%P-L$=K8*QSJy(LbUv@a z_KEOR3Pn^Kj)hU9vOQSW_?2~#n7)%?t*9$kSUv~tqlV(8Ka)js-0D~-tE&gBP?vaF zz1oIP6}zuZ?m~%o+};CfQ$^+NJOo_>1VF*j$bN|?$zLhhCm2DN+Uy&OlG`%lB*4gi z^D_5?v8o>Jr7?U?We>GUOvX`-DlPJ>Xe<&yImeiuCe*aFYJ;<_0|N~`SxHY%Zyz}v z3r>}u$&LmvK<@a-^(Pv%E$LC=2mze7!>TL(JoZ`~=LTy-bU`Q4n+Hn(H6UXN__?k0T=kZ<*Mp zmRpcfFZGysNnzBC%*n`{H&BW{qJZzvyFAR%&MN)8;b&#e4I3yr`NG+$hJfV?k+E<_(Is{?9MCnB#JMn!zrPL_@`c_m4-lP@gA7F%Vj)?H{d!hyg{VUHl zP*-pM`){e1pSFQ4XAh6rTK;70lGVZSXBn!3 zfCg-!#z>XcgWTyA@|dLZO?%DH3+&Mp8|o{YFQ#$#?-MkNOTSpxzQv_3e`vexnG^a> z+v<8_tZzZY;)u17UQ$w0c@ujAiT#?II^K2vv@|tY8oswg^*=2vYkdKqWluOQ6 zx*V!@?BND#6c^7|R#}}^Mh@t%Vr2-UN@oz&{*}xMrOHKw5)xI2B}K7&o(GS}PEU1= z*B^R5V#n-$xGGxc%c) z2QSeCMF=ML@7w{3L5+Y4@JMdr*BMbjM-F2yc-M>f!Lmg2(u_<55k>8%KXVg3CL@DL-~E1 zramfJVq*mfz+Z$3hYCsLH-kdKLI&Nru(fl9`74NKnsGY`I+-1)yF!Y&{t8Z%9tx`4 zgE8fz+#*%+gX?W&9V1 zwelij@W9E!BiAjK`m(?g)56Un??8s3k-??&)Rfu{E#AxCC64%o%FAOnx#dL%wdTm1 z-};RvpuK(9vpVtz2GV?Dn_@R=r9FlQK_=XkfUh4YQ(aS>XBsZW>glvMXLQnOv7Zu_ zJEX$gZj`fi1@Frix3;`-1CwF5Zf_*Dwbrg0nReM;tc}NlfTv5w4MI`K4@}2^D(;+? zmX)h(5pH!Ph-75!D4q0eD8(_r<=|CcTUoK(lr?xd_pztS#f5wj!r9Sr1#JWbKRagq zBK}e+2CJ3G7?|1CK0Tw!!+LOXv&8+pyrt(gk-Ub6 z@K0HsR*hZ1Mvecf^8W=HfMQPlb3raMGt8;zA2mz4$Ou;K_U1^6ay(p4+&qDxBvcxA z_q&;c_wuq%JeQ|?kF;#>e|TC!v0JlwL$9+pIhy-&`_t5R9lBQ}=Si!1uSf6O2lYEdidri7+V-fL z#oPCVxx1%C@+8XLIkP2fZ!5ok+$gZ)!RW{jp|QOeLqf*0A2rJ!wGttL%id#grx=eD ztdPpzSKd@fS-7e0Ir5eN@y9y