From f697c8291936d2548b1096700f54f36eb3505cc8 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Sat, 14 Apr 2012 16:31:38 -0400 Subject: [PATCH 1/2] disabled books ever using sql --- code/game/magic/archived_book.dm | 3 ++- code/game/magic/library.dm | 21 +++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/code/game/magic/archived_book.dm b/code/game/magic/archived_book.dm index 8443444aa38..d8452caa832 100644 --- a/code/game/magic/archived_book.dm +++ b/code/game/magic/archived_book.dm @@ -1,6 +1,7 @@ #define BOOK_VERSION_MIN 1 #define BOOK_VERSION_MAX 2 #define BOOK_PATH "data/books/" +#define BOOKS_USE_SQL 0 // no guarentee for this branch to work right with sql var/global/datum/book_manager/book_mgr = new() @@ -41,7 +42,7 @@ datum/book_manager/proc/freeid() if(!isbn) return - if(config.sql_enabled) + if(BOOKS_USE_SQL && config.sql_enabled) var/DBConnection/dbcon = new() dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]") if(!dbcon.IsConnected()) diff --git a/code/game/magic/library.dm b/code/game/magic/library.dm index b99bf925756..4cdef6e855d 100644 --- a/code/game/magic/library.dm +++ b/code/game/magic/library.dm @@ -2,17 +2,6 @@ // // Library SQL Configuration // -//******************************* - -// Deprecated! See global.dm for new SQL config vars -- TLE -/* -#define SQL_ADDRESS "" -#define SQL_DB "" -#define SQL_PORT "3306" -#define SQL_LOGIN "" -#define SQL_PASS "" -*/ - //******************************* // Requires Dantom.DB library ( http://www.byond.com/developer/Dantom/DB ) @@ -499,7 +488,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f dat += "Filter by Author: [author]
" dat += "\[Start Search\]
" if(1) - if(config.sql_enabled) + if(BOOKS_USE_SQL && config.sql_enabled) var/DBConnection/dbcon = new() dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]") if(!dbcon.IsConnected()) @@ -563,7 +552,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f author = null author = dd_replacetext(author, "'", "''") if(href_list["search"]) - if(config.sql_enabled) + if(BOOKS_USE_SQL && config.sql_enabled) SQLquery = "SELECT author, title, category, id FROM library WHERE " if(category == "Any") SQLquery += "author LIKE '%[author]%' AND title LIKE '%[title]%'" @@ -659,7 +648,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f dat += "(Return to main menu)
" if(4) dat += "

External Archive

" - if(config.sql_enabled) + if(BOOKS_USE_SQL && config.sql_enabled) var/DBConnection/dbcon = new() dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]") if(!dbcon.IsConnected()) @@ -821,7 +810,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f if(scanner.cache) var/choice = input("Are you certain you wish to upload this title to the Archive?") in list("Confirm", "Abort") if(choice == "Confirm") - if(config.sql_enabled) + if(BOOKS_USE_SQL && config.sql_enabled) var/DBConnection/dbcon = new() dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]") if(!dbcon.IsConnected()) @@ -868,7 +857,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs") alert("Upload Complete.") if(href_list["targetid"]) - if(config.sql_enabled) + if(BOOKS_USE_SQL && config.sql_enabled) var/sqlid = href_list["targetid"] var/DBConnection/dbcon = new() dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]") From b223943b9f041966ad4727a700b425d5eab77133 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Sat, 14 Apr 2012 17:20:55 -0400 Subject: [PATCH 2/2] made passive gate prettier and use input as target pressure for output so it has a unique use as pure one-way valve --- .../components/binary_devices/passive_gate.dm | 9 ++++----- icons/obj/atmospherics/passive_gate.dmi | Bin 1913 -> 4142 bytes 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index aee6b2fa37a..a936bdd4ae6 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -8,7 +8,6 @@ obj/machinery/atmospherics/binary/passive_gate desc = "A one-way air valve that does not require power" var/on = 0 - var/target_pressure = ONE_ATMOSPHERE update_icon() if(node1&&node2) @@ -32,14 +31,14 @@ obj/machinery/atmospherics/binary/passive_gate var/output_starting_pressure = air2.return_pressure() var/input_starting_pressure = air1.return_pressure() - if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10)) - //No need to pump gas if target is already reached or input pressure is too low - //Need at least 10 KPa difference to overcome friction in the mechanism + if(input_starting_pressure - output_starting_pressure < 1) + //No need to pump gas if input pressure is too low + //Need at least 1 KPa difference to overcome friction in the mechanism return 1 //Calculate necessary moles to transfer using PV = nRT if((air1.total_moles() > 0) && (air1.temperature>0)) - var/pressure_delta = min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2) + var/pressure_delta = (input_starting_pressure - output_starting_pressure)/2 //Can not have a pressure delta that would cause output_pressure > input_pressure var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION) diff --git a/icons/obj/atmospherics/passive_gate.dmi b/icons/obj/atmospherics/passive_gate.dmi index 806a0ce64506a4ecbfb6ba8a699e226a8877bab7..d0dc55335c2fd600ec7b4d72e928b3fa8ede40e2 100644 GIT binary patch literal 4142 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 literal 1913 zcmZ{ldr(tX9>;HtyhOxKU9tsffUYG9f~l*iKn(&479k=cV1}Of829_bI$pF&+nW$ z-_N@h5ZTu0Bm*#1?&TWWo#sNvNT89C!Y@e6ZxIa-5-?^ka#NLedX;Wsz`>S^JP{H(e|t19c#N_MjGVVFW<6uXkH(Rk8Qp5Y^S5oO_=)F7fS z?KDcA9A_7t?&T4#s;%F+3INPGy90LY&n}l&bQghB`pE za`2GvG8=oKMPDA+I`)-stjje(nCF#Vi=j-o4A`YH50`N-_Om`ad9=9ZUp+@br@5=M z6SW?=w@T2Y+!Gxv z=s16vCCB(#;wuIwwy;|y!}i<*XXNdxxTaKIrbv@yxXW)Meq2db(*%3Q5Dt2jg-wa& zFW*u35V`#k*t%7F=f&Eye>Sko3vFz93S z>;*_c%9ntKgi@oSB%L!WnEx)V*IY`(N{NnAff_wTTs{PPEoCuyu-*dLYnLyC8avH_ zE`yS)q*kNrGu;X7aUtt}b}89A+NxgtY9-4f+mpZFJGCnpdL`RYepTZ2UeAGE#xJE5 z2Seloo?($)#svLc{w%RgVlS`cG|Hap+hwy~-Fp~qF|ST~y-Sp;o(jzRIf(8`c)=JV z>)b%D4(!A9TlQ{&qv#j{8+8Z*qan%X|IngKD&-k>d1@dR=eQvtdQFGA>uB!)*(Z&I zE1WW&!xI?wHc=fu&6aejtt$bLHXB2x$xO3C?^qMwND@e*jnV^w`ie05b;5 zTW@xr8{uzeHEFVX%eQ z1;LN8lxEPs-bgFB!c(;8;b04oS~x)p-)^d|IDN8jP~c-SuqVN_Odi=Jcb-=sH?2R@ ztgRa#^ClmIC#sqgidu)?SlN>!B1nDBLfOvfQUe|=sG!Wcw3n3<$74aKLnd0y5U(57 zv5lV9OVXy4OEwHc=fjAa&3I=BUkv-BDTOB1BzE$do~6-C2Df#Y$}Bhkd)dKr?~e5e zTO28A=p)hRMw2r$l+BIFCr+K>kR~vL<=;Zl23F?2w}M$v3h$YjghjwwEyUI#k9GVfkatwZsQRAN135)NUj#ssWUkk}8-wj)ANr^1n81jyI5OqzaPI^*!yS z)$s&6pwZD^T<$?Exn0P}Unoj)ALXUMoK;_dRM-u+h#Ca#QsIV5BQ&G$4O8>h``7DG z^Gc_+h5@#WEiqyF=@sFPi0eL~A}&k}omd3FrKjM)Ed6$QtlhwrbH+UGGQ#m^Q|bo3@@>6SB8ktV8I@kJs;dMfyw5w0791{csqQ?OKFzn%LV52c)& z(-P;pLT6TAwHV=6_0k3h>O&SCfXHwH-JDKE-}@l5B=yHfd;Mi2+@K%RM8bDqf4$*9 zRK*?G)n_H^2~9%F_U?e9)BCg`qO73j#y^09+)c2c*2wMHP3@)R|X*gw>v&`eA`n{R#uF(=kfH+cSItIhugIKRL_4#PIS5@rp@<-XlS zeanfb08kD*6l`zbh8-sW&jkqFY;oY1sR+4l+(UMs^z#BjkgeV5nRV{hy)e{2kLAMv z%j(bB;Un7^w+x3Hoa6q#%-;gh^}qVn=G;=0{krZacYazspUSmq>)j}}RXQ-TAY@r!c=~M z(GsP>2HWt-KHrLP6eA OVE4|@fF{4Vy#E4b2OK8=