From 404da4dbdd895f09a84b4425ecce6deecc5be9a0 Mon Sep 17 00:00:00 2001 From: paprka Date: Thu, 25 Dec 2014 13:28:05 -0800 Subject: [PATCH] code optimizations --- code/game/objects/structures/lattice.dm | 10 ++-- code/game/turfs/simulated/floor/plating.dm | 2 +- code/modules/power/cable.dm | 55 +-------------------- code/modules/power/power.dm | 2 +- icons/obj/structures.dmi | Bin 106290 -> 106289 bytes 5 files changed, 9 insertions(+), 60 deletions(-) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index f74bcc11fa5..42b6270e67e 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -2,7 +2,7 @@ name = "lattice" desc = "A lightweight support lattice." icon = 'icons/obj/structures.dmi' - icon_state = "lattice" + icon_state = "latticefull" density = 0 anchored = 1.0 layer = 2.3 //under pipes @@ -60,7 +60,7 @@ if (istype(C, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = C if(WT.remove_fuel(0, user)) - user << "Slicing [initial(icon_state)] joints ..." + user << "Slicing [name] joints ..." Deconstruct() return @@ -78,7 +78,7 @@ if(!(istype(get_step(src, direction), /turf/space))) dir_sum += direction - icon_state = "[initial(icon_state)][dir_sum]" + icon_state = "[name][dir_sum]" return /obj/structure/lattice/Deconstruct() @@ -93,7 +93,7 @@ /obj/structure/lattice/catwalk name = "catwalk" desc = "A catwalk for easier EVA manuevering." - icon_state = "catwalk" + icon_state = "catwalkfull" /obj/structure/lattice/catwalk/attackby(obj/item/C as obj, mob/user as mob) ..() @@ -103,4 +103,4 @@ if((LC.d1==0)||(LC.d2==0)) LC.attackby(C,user) return - coil.catwalk_place(src, user) \ No newline at end of file + coil.place(src, user) \ No newline at end of file diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index bd74639bd6d..fac5e611c82 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -63,7 +63,7 @@ if((LC.d1==0)||(LC.d2==0)) LC.attackby(C,user) return - coil.turf_place(src, user) + coil.place(src, user) else if(istype(C, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/welder = C if( welder.isOn() && (broken || burnt) ) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index ae6b20fa805..6ef1295fa37 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -623,7 +623,7 @@ obj/structure/cable/proc/avail() return new path (location) // called when cable_coil is clicked on a turf/simulated/floor -/obj/item/stack/cable_coil/proc/turf_place(turf/simulated/floor/F, mob/user) +/obj/item/stack/cable_coil/proc/place(turf/simulated/floor/F, mob/user) if(!isturf(user.loc)) return @@ -677,57 +677,6 @@ obj/structure/cable/proc/avail() if (prob(50)) //fail C.Deconstruct() - - -// called when cable_coil is clicked on a catwalk -/obj/item/stack/cable_coil/proc/catwalk_place(var/obj/structure/lattice/catwalk/W, mob/user) - if(get_amount() < 1) // Out of cable - user << "There is no cable left." - return - - if(get_dist(W,user) > 1) // Too far - user << "You can't lay cable at a place that far away." - return - - else - var/dirn - - if(user.loc == W) - dirn = user.dir // if laying on the tile we're on, lay in the direction we're facing - else - dirn = get_dir(W, user) - - for(var/obj/structure/cable/LC in W) - if(LC.d2 == dirn && LC.d1 == 0) - user << "There's already a cable at that position." - return - - var/obj/structure/cable/C = get_new_cable (W) - - //set up the new cable - C.d1 = 0 //it's a O-X node cable - C.d2 = dirn - C.add_fingerprint(user) - C.updateicon() - - //create a new powernet with the cable, if needed it will be merged later - var/datum/powernet/PN = new() - PN.add_cable(C) - - C.mergeConnectedNetworks(C.d2) //merge the powernet with adjacents powernets - C.mergeConnectedNetworksOnTurf() //merge the powernet with on turf powernets - - if(C.d2 & (C.d2 - 1))// if the cable is layed diagonally, check the others 2 possible directions - C.mergeDiagonalsNetworks(C.d2) - - - use(1) - - if (C.shock(user, 50)) - if (prob(50)) //fail - C.Deconstruct() - - // called when cable_coil is click on an installed obj/cable // or click on a turf that already contains a "node" cable /obj/item/stack/cable_coil/proc/cable_join(obj/structure/cable/C, mob/user) @@ -749,7 +698,7 @@ obj/structure/cable/proc/avail() for(var/obj/structure/lattice/catwalk/W in src) catwalk_place(W,user) return - turf_place(T,user) + place(T,user) return var/dirn = get_dir(C, user) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 9a3a6aea791..3a7868df4b0 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -128,7 +128,7 @@ if(get_dist(src, user) > 1) return - coil.turf_place(T, user) + coil.place(T, user) return else ..() diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index d5c951b31ca7938c16e5b0b5ab227a82741f8db9..84deb196d4d30088323cfdef53d21957763498ae 100644 GIT binary patch delta 697 zcmV;q0!IC^z6PvpvZ7jXXkP)DctR|UjV9AZ-KXC}b|J|w%+HNT-#@WuKH1^k{CNGjemASPb^b}* z_!Q03JUveHto2T6vo!Nrp4H@cwR8`SSRu1CcRSCH_%6?!=f*65O_666+XHpKPnZfg z-yDN2$*Clhk5ys>Jx~w;+p!OURBX#>PZ5NJ74aoiA0eo0X{EJc53#L}F12UupaiZWw$9gid)O*E7-L!ao{h6<G`_~&h3ZOSj#rA-mJRsV1ADsHB{s)|);2Z^?P;h~Q-%#)w z1z%9`JKS*nX8udUvnk-=6!3HkcsvC>A9(BFA3D7rDmm&nsyJ#mDmdylsyAvkDmUyl ztTt>mEH>;ltTm$=GU_2~qareDBBLrY>LQ~uGHN5EIx^}b!$LA_B*RKF>?FfdGHj)w zRtjpRpjHZMrJz;{YNeo73TmaGRtjpRz*Y)urNCASY^A_f3T&mb2fL#g3NG{>b>Q>G fiudOAePvc}>-;xNpYVlu%-Iuz-U7GY0s&N zKbmymP2r&MBKZY_7DpCgnlwg}2thp0(adZB}MJ%d?vNzLxHx5i4X?=5FuV5#QyR^W2z!l_~P9Vtb_S_a~+T z&NruEOL8j7L5~y!!1nAzAQjtjI#2}RU`2eXbETEmhJ(trKDyMNv8M~o0Xeyi zOTnpV1(tk^tqtMp4bSt;QLrCoWr|5L8Kkb6wjAZgS>9etUw-TLT)$6t7ijA|>m9W_ zK%cH&AwH1QzC2)mWxD`HH+sq9TIT4TgIDA{&%nCQ^ITnao06lrv&_Dm>J6*K_uAA1_N?$@_ zD|$#LiYi%!lo+b{Nn(YAj}&)4K2&d)F08NU+J*|J>3EV46+fi|F=pl&h0eVmeuIhQ z6s%$|2)a1jk1peo*KOPf+caCeVLe{|vh3Bqp}YUZ;P&>DV1GyZ*Bd+vpf^j!_K2N4 zAlh^vocgJM{ui8~;2Z@PD7Zwy?&)f=@Nl^b>&RvR`O78~{&)|ycb8TF7+5g9d+Q56|=kx>~L zwUJRB8TFB2AsIH3VI>)Ml3^(swo*_l1+`L8D+RSbQcx=ewNg+k1+`L8D+RSuU@HZ- zQeZ0uwo+g#1-8=JqutXC1($k{I`Hvg#e4Jox;E>VP5uXYu