cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Cleanbots not showing on PDA app, touch up UI

Browse Source
This commit is contained in:
mochi
2020-06-09 14:29:03 +02:00
parent 5d8ccb2e1f
commit db1bfd18fc
2 changed files with 58 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/pda/cart_apps.dm
+8 -19
View File
@@ -366,6 +366,7 @@
JaniData["user_loc"] = list("x" = cl.x, "y" = cl.y)
else
JaniData["user_loc"] = list("x" = 0, "y" = 0)
var/MopData[0]
for(var/obj/item/mop/M in GLOB.janitorial_equipment)
var/turf/ml = get_turf(M)
@@ -375,10 +376,6 @@
var/direction = get_dir(pda, M)
MopData[++MopData.len] = list ("x" = ml.x, "y" = ml.y, "dir" = uppertext(dir2text(direction)), "status" = M.reagents.total_volume ? "Wet" : "Dry")
if(!MopData.len)
MopData[++MopData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
var/BucketData[0]
for(var/obj/structure/mopbucket/B in GLOB.janitorial_equipment)
var/turf/bl = get_turf(B)
@@ -386,13 +383,10 @@
if(bl.z != cl.z)
continue
var/direction = get_dir(pda,B)
BucketData[++BucketData.len] = list ("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "status" = B.reagents.total_volume/100)
if(!BucketData.len)
BucketData[++BucketData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
BucketData[++BucketData.len] = list ("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "volume" = B.reagents.total_volume, "max_volume" = B.reagents.maximum_volume)
var/CbotData[0]
for(var/mob/living/simple_animal/bot/cleanbot/B in GLOB.simple_animals)
for(var/mob/living/simple_animal/bot/cleanbot/B in GLOB.simple_animals[AI_ON])
var/turf/bl = get_turf(B)
if(bl)
if(bl.z != cl.z)
@@ -400,9 +394,6 @@
var/direction = get_dir(pda,B)
CbotData[++CbotData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "status" = B.on ? "Online" : "Offline")
if(!CbotData.len)
CbotData[++CbotData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
var/CartData[0]
for(var/obj/structure/janitorialcart/B in GLOB.janitorial_equipment)
var/turf/bl = get_turf(B)
@@ -410,12 +401,10 @@
if(bl.z != cl.z)
continue
var/direction = get_dir(pda,B)
CartData[++CartData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "status" = B.reagents.total_volume/100)
if(!CartData.len)
CartData[++CartData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
CartData[++CartData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "volume" = B.reagents.total_volume, "max_volume" = B.reagents.maximum_volume)
JaniData["mops"] = MopData
JaniData["buckets"] = BucketData
JaniData["cleanbots"] = CbotData
JaniData["carts"] = CartData
JaniData["mops"] = MopData.len ? MopData : null
JaniData["buckets"] = BucketData.len ? BucketData : null
JaniData["cleanbots"] = CbotData.len ? CbotData : null
JaniData["carts"] = CartData.len ? CartData : null
data["janitor"] = JaniData
nano/templates/pda_janitor.tmpl
+50 -34
View File
@@ -8,43 +8,59 @@
{{/if}}
</div>
<div class="item">
{{for data.janitor.mops}}
{{if value.x==0}}
<span class="bad">Unable to locate Mop</span>
{{else}}
<span class="good">Mop Location:</span>
<span class="average">({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}</span><br>
{{/if}}
{{/for}}
{{if data.janitor.mops}}
<span class="good">Mop Locations:</span>
<ul>
{{for data.janitor.mops}}
<li>
<span class="average">({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}</span>
</li>
{{/for}}
</ul>
{{else}}
<span class="bad">Unable to locate Mops</span>
{{/if}}
</div>
<div class="item">
{{for data.janitor.buckets}}
{{if value.x==0}}
<span class="bad">Unable to locate Water Buckets</span>
{{else}}
<span class="good">Water Buckets Location:</span>
<span class="average">({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Water Level: {{:value.status}}</span><br>
{{/if}}
{{/for}}
{{if data.janitor.buckets}}
<span class="good">Mop Bucket Locations:</span>
<ul>
{{for data.janitor.buckets}}
<li>
<span class="average">({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Capacity: {{:value.volume}}/{{:value.max_volume}}</span>
</li>
{{/for}}
</ul>
{{else}}
<span class="bad">Unable to locate Mop Buckets</span>
{{/if}}
</div>
<div class="item">
{{for data.janitor.cleanbots}}
{{if value.x==0}}
<span class="bad">Unable to locate Clean Bots</span>
{{else}}
<span class="good">Clean Bots Location:</span>
<span class="average">({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}</span><br>
{{/if}}
{{/for}}
{{if data.janitor.cleanbots}}
<span class="good">Cleanbot Locations:</span>
<ul>
{{for data.janitor.cleanbots}}
<li>
<span class="average">({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}</span>
</li>
{{/for}}
</ul>
{{else}}
<span class="bad">Unable to locate Cleanbots</span>
{{/if}}
</div>
<div class="item">
{{for data.janitor.carts}}
{{if value.x==0}}
<span class="bad">Unable to locate Janitorial Cart</span>
{{else}}
<span class="good">Janitorial cart Location:</span>
<span class="average">({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}</span><br>
{{/if}}
{{/for}}
<div class="item">
{{if data.janitor.carts}}
<span class="good">Janitorial Cart Locations:</span>
<ul>
{{for data.janitor.carts}}
<li>
<span class="average">({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Water Level: {{:value.volume}}/{{:value.max_volume}}</span>
</li>
{{/for}}
</ul>
{{else}}
<span class="bad">Unable to locate Janitorial Carts</span>
{{/if}}
</div>
</div>
</div>