cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6248 from JimTheCactus/pda_monitor_fix

Browse Source 
[DEV] PDAs now behave properly with unconnected power monitors
This commit is contained in:
Zuhayr
2014-09-01 23:07:20 +09:30
parent efb8d9e6b4 aeea0b0bd6
commit aba09de9d7
2 changed files with 56 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
code/game/objects/items/devices/PDA/cart.dm
View File

@@ -263,6 +263,7 @@
/* Power Monitor (Mode: 43 / 433) */ /* Power Monitor (Mode: 43 / 433) */
if(mode==43 || mode==433) if(mode==43 || mode==433)
var/pMonData[0] var/pMonData[0]
var/apcData[0]
for(var/obj/machinery/power/monitor/pMon in world) for(var/obj/machinery/power/monitor/pMon in world)
if(!(pMon.stat & (NOPOWER|BROKEN)) ) if(!(pMon.stat & (NOPOWER|BROKEN)) )
pMonData[++pMonData.len] = list ("Name" = pMon.name, "ref" = "\ref[pMon]") pMonData[++pMonData.len] = list ("Name" = pMon.name, "ref" = "\ref[pMon]")
@@ -270,22 +271,25 @@
values["powermonitors"] = pMonData values["powermonitors"] = pMonData
values["poweravail"] = powmonitor.powernet.avail if (!isnull(powmonitor.powernet))
values["powerload"] = num2text(powmonitor.powernet.viewload,10) values["powerconnected"] = 1
values["poweravail"] = powmonitor.powernet.avail
values["powerload"] = num2text(powmonitor.powernet.viewload,10)
var/list/L = list()
for(var/obj/machinery/power/terminal/term in powmonitor.powernet.nodes)
if(istype(term.master, /obj/machinery/power/apc))
var/obj/machinery/power/apc/A = term.master
L += A
var/list/L = list() var/list/Status = list(0,0,1,1) // Status: off, auto-off, on, auto-on
for(var/obj/machinery/power/terminal/term in powmonitor.powernet.nodes) var/list/chg = list(0,1,1) // Charging: nope, charging, full
if(istype(term.master, /obj/machinery/power/apc)) for(var/obj/machinery/power/apc/A in L)
var/obj/machinery/power/apc/A = term.master apcData[++apcData.len] = list("Name" = html_encode(A.area.name), "Equipment" = Status[A.equipment+1], "Lights" = Status[A.lighting+1], "Environment" = Status[A.environ+1], "CellPct" = A.cell ? round(A.cell.percent(),1) : -1, "CellStatus" = A.cell ? chg[A.charging+1] : 0)
L += A
var/list/Status = list(0,0,1,1) // Status: off, auto-off, on, auto-on
var/list/chg = list(0,1,1) // Charging: nope, charging, full
var/apcData[0]
for(var/obj/machinery/power/apc/A in L)
apcData[++apcData.len] = list("Name" = html_encode(A.area.name), "Equipment" = Status[A.equipment+1], "Lights" = Status[A.lighting+1], "Environment" = Status[A.environ+1], "CellPct" = A.cell ? round(A.cell.percent(),1) : -1, "CellStatus" = A.cell ? chg[A.charging+1] : 0)
values["apcs"] = apcData values["apcs"] = apcData
else
values["powerconnected"] = 0

73
nano/templates/pda.tmpl
View File

@@ -509,9 +509,9 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{else data.mode == 43}} {{else data.mode == 43}}
<H2>Station Powermonitors</H2> <H2>Station Power Monitors</H2>
<div class="item"> <div class="item">
Select A power monitor: Select a power monitor:
</div> </div>
{{for data.records.powermonitors}} {{for data.records.powermonitors}}
<div class="item"> <div class="item">
@@ -522,39 +522,42 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{else data.mode == 433}} {{else data.mode == 433}}
<H2>Powernet Status</H2> <H2>Powernet Status</H2>
<div class="item"> {{if data.records.powerconnected == 1}}
<div class="itemLabelNarrow"> <div class="item">
<b>Current Load</b>: <div class="itemLabelNarrow">
</div> <b>Current Load</b>:
<div class="itemContent"> </div>
<span class="average">{{:data.records.powerload}} W</span> <div class="itemContent">
</div> <span class="average">{{:data.records.powerload}} W</span>
</div> </div>
<div class="item"> </div>
<div class="itemLabelNarrow"> <div class="item">
<b>Total Power</b>: <div class="itemLabelNarrow">
</div> <b>Total Power</b>:
<div class="itemContent"> </div>
<span class="average">{{:data.records.poweravail}} W</span> <div class="itemContent">
</div> <span class="average">{{:data.records.poweravail}} W</span>
</div> </div>
<br> </div>
<div class="item"> <br>
<table class="curvedEdges"><tbody> <div class="item">
{{for data.records.apcs}} <table class="curvedEdges"><tbody>
{{if index % 20 === 0}} {{for data.records.apcs}}
<tr class=><th>&nbsp;Area&nbsp;</th><th>&nbsp;Eqp.&nbsp;</th><th>&nbsp;Lgt.&nbsp;</th><th>&nbsp;Env&nbsp;</th><th>&nbsp;Cell&nbsp;</th></tr> {{if index % 20 === 0}}
{{/if}} <tr class=><th>&nbsp;Area&nbsp;</th><th>&nbsp;Eqp.&nbsp;</th><th>&nbsp;Lgt.&nbsp;</th><th>&nbsp;Env&nbsp;</th><th>&nbsp;Cell&nbsp;</th></tr>
<tr class=><td><span class="average">{{:value.Name}}</span></td> {{/if}}
{{:helper.string('<td bgcolor="{0}">&nbsp;</td>', value.Equipment==1 ? '#4f7529' : '#8f1414')}} <tr class=><td><span class="average">{{:value.Name}}</span></td>
{{:helper.string('<td bgcolor="{0}">&nbsp;</td>', value.Lights==1 ? '#4f7529' : '#8f1414')}} {{:helper.string('<td bgcolor="{0}">&nbsp;</td>', value.Equipment==1 ? '#4f7529' : '#8f1414')}}
{{:helper.string('<td bgcolor="{0}">&nbsp;</td>', value.Environment==1 ? '#4f7529' : '#8f1414')}} {{:helper.string('<td bgcolor="{0}">&nbsp;</td>', value.Lights==1 ? '#4f7529' : '#8f1414')}}
{{:helper.string('<td bgcolor="{0}">{1}</td>', value.CellStatus==1 ? '#4f7529' : '#8f1414', value.CellStatus==-1 ? 'No Cell' : CellPct + '%')}} {{:helper.string('<td bgcolor="{0}">&nbsp;</td>', value.Environment==1 ? '#4f7529' : '#8f1414')}}
</tr> {{:helper.string('<td bgcolor="{0}">{1}</td>', value.CellStatus==1 ? '#4f7529' : '#8f1414', value.CellStatus==-1 ? 'No Cell' : value.CellPct + '%')}}
{{/for}} </tr>
</tbody></table> {{/for}}
</div> </tbody></table>
</div>
{{else}}
<b>Power monitor not connected to net</b>
{{/if}}
{{else data.mode == 44}} {{else data.mode == 44}}
<H2>Medical Record List</H2> <H2>Medical Record List</H2>