cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 07:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1260 from Fox-McCloud/viewrange

Browse Source 
Dynamic HUD
This commit is contained in:
ZomgPonies
2015-06-08 02:03:03 -04:00
parent 9119f1fd08 b454fb9628
commit 715e5aa260
15 changed files with 108 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/_defines.dm
+71 -92
View File
@@ -14,136 +14,115 @@
*/
//Middle left indicators
#define ui_alienplasmadisplay "1,6:15"
#define ui_alienplasmadisplay "EAST-1:28,CENTER-2:15"
//Lower left, persistant menu
#define ui_inventory "1:6,1:5"
#define ui_inventory "WEST:6,SOUTH:5"
//Lower center, persistant menu
#define ui_sstore1 "3:10,1:5"
#define ui_id "4:12,1:5"
#define ui_belt "5:14,1:5"
#define ui_back "6:14,1:5"
#define ui_rhand "7:16,1:5"
#define ui_lhand "8:16,1:5"
#define ui_equip "7:16,2:5"
#define ui_swaphand1 "7:16,2:5"
#define ui_swaphand2 "8:16,2:5"
#define ui_storage1 "9:18,1:5"
#define ui_storage2 "10:20,1:5"
#define ui_sstore1 "CENTER-5:10,SOUTH:5"
#define ui_id "CENTER-4:12,SOUTH:5"
#define ui_belt "CENTER-3:14,SOUTH:5"
#define ui_back "CENTER-2:14,SOUTH:5"
#define ui_rhand "CENTER:-16,SOUTH:5"
#define ui_lhand "CENTER: 16,SOUTH:5"
#define ui_equip "CENTER:-16,SOUTH+1:5"
#define ui_swaphand1 "CENTER:-16,SOUTH+1:5"
#define ui_swaphand2 "CENTER: 16,SOUTH+1:5"
#define ui_storage1 "CENTER+1:18,SOUTH:5"
#define ui_storage2 "CENTER+2:20,SOUTH:5"
#define ui_pda "11:22,1:5"
#define ui_pda "CENTER+3:22,SOUTH:5"
#define ui_alien_head "4:12,1:5" //aliens
#define ui_alien_oclothing "5:14,1:5" //aliens
#define ui_borg_sensor "5:16,1:5" //borgs
#define ui_inv1 "6:16,1:5" //borgs
#define ui_inv2 "7:16,1:5" //borgs
#define ui_inv3 "8:16,1:5" //borgs
#define ui_borg_sensor "CENTER-3:16, SOUTH:5" //borgs
#define ui_inv1 "CENTER-2:16,SOUTH:5" //borgs
#define ui_inv2 "CENTER-1 :16,SOUTH:5" //borgs
#define ui_inv3 "CENTER :16,SOUTH:5" //borgs
#define ui_borg_module "CENTER+1:16,SOUTH:5"
#define ui_borg_store "CENTER+2:16,SOUTH:5" //borgs
#define ui_monkey_mask "5:14,1:5" //monkey
#define ui_monkey_back "6:14,1:5" //monkey
#define ui_monkey_mask "CENTER-3:14,SOUTH:5" //monkey
#define ui_monkey_back "CENTER-2:15,SOUTH:5" //monkey
#define ui_alien_storage_l "CENTER-2:14,SOUTH:5"//alien
#define ui_alien_storage_r "CENTER+1:18,SOUTH:5"//alien
//Lower right, persistant menu
//#define ui_dropbutton "11:22,1:5"
#define ui_drop_throw "16:28,2:7"
#define ui_pull_resist "15:26,2:7"
#define ui_acti "15:26,1:5"
#define ui_movi "14:24,1:5"
#define ui_zonesel "16:28,1:5"
#define ui_acti_alt "16:28,1:5" //alternative intent switcher for when the interface is hidden (F12)
#define ui_drop_throw "EAST-1:28,SOUTH+1:7"
#define ui_pull_resist "EAST-2:26,SOUTH+1:7"
#define ui_acti "EAST-2:26,SOUTH:5"
#define ui_movi "EAST-3:24,SOUTH:5"
#define ui_zonesel "EAST-1:28,SOUTH:5"
#define ui_acti_alt "EAST-1:28,SOUTH:5" //alternative intent switcher for when the interface is hidden (F12)
#define ui_borg_pull "EAST-2:26,SOUTH+1:7"
#define ui_borg_radio "EAST-1:28,SOUTH+1:7"
#define ui_borg_intents "EAST-2:26,SOUTH:5"
//Gun buttons
#define ui_gun1 "15:26,3:7"
#define ui_gun2 "16:28, 4:7"
#define ui_gun3 "15:26,4:7"
#define ui_gun_select "16:28,3:7"
#define ui_gun1 "EAST-2:26,SOUTH+2:7"
#define ui_gun2 "EAST-1:28,SOUTH+3:7"
#define ui_gun3 "EAST-2:26,SOUTH+3:7"
#define ui_gun_select "EAST-1:28,SOUTH+2:7"
//Upper-middle right (damage indicators)
#define ui_toxin "16:28,13:27"
#define ui_fire "16:28,12:25"
#define ui_oxygen "16:28,11:23"
#define ui_pressure "16:28,10:21"
#define ui_toxin "EAST-1:28,CENTER+5:27"
#define ui_fire "EAST-1:28,CENTER+4:25"
#define ui_oxygen "EAST-1:28,CENTER+3:23"
#define ui_pressure "EAST-1:28,CENTER+2:21"
#define ui_alien_toxin "16:28,13:25"
#define ui_alien_fire "16:28,12:25"
#define ui_alien_oxygen "16:28,11:25"
#define ui_alien_nightvision "16:28,10:25"
#define ui_alien_toxin "EAST-1:28,CENTER+5:25"
#define ui_alien_fire "EAST-1:28,CENTER+4:25"
#define ui_alien_oxygen "EAST-1:28,CENTER+3:25"
#define ui_alien_nightvision "EAST-1:28,CENTER+2:25"
//Middle right (status indicators)
#define ui_nutrition "16:28,5:11"
#define ui_temp "16:28,6:13"
#define ui_healthdoll "16:28,7:15"
#define ui_health "16:28,8:17"
#define ui_internal "16:28,9:19"
#define ui_nutrition "EAST-1:28,CENTER-3:11"
#define ui_temp "EAST-1:28,CENTER-2:13"
#define ui_healthdoll "EAST-1:28,CENTER-1:15"
#define ui_health "EAST-1:28,CENTER:17"
#define ui_internal "EAST-1:28,CENTER+1:19"
//borgs
#define ui_borg_health "16:28,6:13" //borgs have the health display where humans have the pressure damage indicator.
#define ui_alien_health "16:28,6:13" //aliens have the health display where humans have the pressure damage indicator.
#define ui_borg_health "EAST-1:28,CENTER-1:15" //borgs have the health display where humans have the pressure damage indicator.
#define ui_alien_health "EAST-1:28,CENTER-1:15" //aliens have the health display where humans have the pressure damage indicator.
#define ui_construct_health "16:00,8:17" //same height as humans, hugging the right border
#define ui_construct_purge "16:00,6:15"
#define ui_construct_fire "15:16,8:13" //above health, slightly to the left
#define ui_construct_pull "16:28,2:10" //above the zone_sel icon
#define ui_construct_pull "EAST-1:28,SOUTH+1:10" //above the zone_sel icon
//Pop-up inventory
#define ui_shoes "2:8,1:5"
#define ui_shoes "WEST+1:8,SOUTH:5"
#define ui_iclothing "1:6,2:7"
#define ui_oclothing "2:8,2:7"
#define ui_gloves "3:10,2:7"
#define ui_iclothing "WEST:6,SOUTH+1:7"
#define ui_oclothing "WEST+1:8,SOUTH+1:7"
#define ui_gloves "WEST+2:10,SOUTH+1:7"
#define ui_glasses "1:6,3:9"
#define ui_mask "2:8,3:9"
#define ui_l_ear "3:10,3:9"
#define ui_r_ear "3:10,4:11"
#define ui_glasses "WEST:6,SOUTH+2:9"
#define ui_mask "WEST+1:8,SOUTH+2:9"
#define ui_l_ear "WEST+2:10,SOUTH+2:9"
#define ui_r_ear "WEST+2:10,SOUTH+3:11"
#define ui_head "2:8,4:11"
//Intent small buttons
#define ui_help_small "14:8,1:1"
#define ui_disarm_small "14:15,1:18"
#define ui_grab_small "14:32,1:18"
#define ui_harm_small "14:39,1:1"
//#define ui_swapbutton "6:-16,1:5" //Unused
//#define ui_headset "SOUTH,8"
#define ui_hand "6:14,1:5"
#define ui_hstore1 "5,5"
//#define ui_resist "EAST+1,SOUTH-1"
#define ui_sleep "EAST+1, NORTH-13"
#define ui_rest "EAST+1, NORTH-14"
#define ui_iarrowleft "SOUTH-1,11"
#define ui_iarrowright "SOUTH-1,13"
#define ui_head "WEST+1:8,SOUTH+3:11"
// AI
#define ui_ai_core "SOUTH:6,WEST:16"
#define ui_ai_camera_list "SOUTH:6,WEST+1:16"
#define ui_ai_track_with_camera "SOUTH:6,WEST+2:16"
#define ui_ai_camera_light "SOUTH:6,WEST+3:16"
#define ui_ai_crew_monitor "SOUTH:6,WEST+4:16"
#define ui_ai_crew_manifest "SOUTH:6,WEST+5:16"
#define ui_ai_alerts "SOUTH:6,WEST+6:16"
#define ui_ai_announcement "SOUTH:6,WEST+7:16"
#define ui_ai_shuttle "SOUTH:6,WEST+8:16"
#define ui_ai_state_laws "SOUTH:6,WEST+9:16"
#define ui_ai_pda_send "SOUTH:6,WEST+10:16"
#define ui_ai_pda_log "SOUTH:6,WEST+11:16"
#define ui_ai_take_picture "SOUTH:6,WEST+12:16"
#define ui_ai_view_images "SOUTH:6,WEST+13:16"
#define ui_ai_sensor "SOUTH:6,WEST+14:16"
#define ui_ai_core "SOUTH:6,WEST"
#define ui_ai_camera_list "SOUTH:6,WEST+1"
#define ui_ai_track_with_camera "SOUTH:6,WEST+2"
#define ui_ai_camera_light "SOUTH:6,WEST+3"
#define ui_ai_crew_monitor "SOUTH:6,WEST+4"
#define ui_ai_crew_manifest "SOUTH:6,WEST+5"
#define ui_ai_alerts "SOUTH:6,WEST+6"
#define ui_ai_announcement "SOUTH:6,WEST+7"
#define ui_ai_shuttle "SOUTH:6,WEST+8"
#define ui_ai_state_laws "SOUTH:6,WEST+9"
#define ui_ai_pda_send "SOUTH:6,WEST+10"
#define ui_ai_pda_log "SOUTH:6,WEST+11"
#define ui_ai_take_picture "SOUTH:6,WEST+12"
#define ui_ai_view_images "SOUTH:6,WEST+13"
#define ui_ai_sensor "SOUTH:6,WEST+14"
code/_onclick/hud/alien.dm
+10 -10
View File
@@ -7,7 +7,7 @@
var/obj/screen/using
var/obj/screen/inventory/inv_box
using = new /obj/screen()
using.name = "act_intent"
using.dir = SOUTHWEST
@@ -16,7 +16,7 @@
using.screen_loc = ui_acti
using.layer = 20
src.adding += using
action_intent = using
action_intent = using
using = new /obj/screen()
using.name = "mov_intent"
@@ -26,8 +26,8 @@
using.screen_loc = ui_movi
using.layer = 20
src.adding += using
move_intent = using
move_intent = using
if(istype(mymob, /mob/living/carbon/alien/humanoid/hunter))
mymob.leap_icon = new /obj/screen()
mymob.leap_icon.icon = 'icons/mob/screen1_alien.dmi'
@@ -35,7 +35,7 @@
mymob.leap_icon.icon_state = "leap_off"
mymob.leap_icon.screen_loc = ui_alien_storage_r
src.adding += mymob.leap_icon
//equippable shit
inv_box = new /obj/screen/inventory()
inv_box.name = "r_hand"
@@ -90,7 +90,7 @@
using.screen_loc = ui_pull_resist
using.layer = 19
src.adding += using
using = new /obj/screen()
using.name = "drop"
using.icon = 'icons/mob/screen1_alien.dmi'
@@ -133,8 +133,8 @@
nightvisionicon.icon = 'icons/mob/screen1_alien.dmi'
nightvisionicon.icon_state = "nightvision1"
nightvisionicon.name = "night vision"
nightvisionicon.screen_loc = ui_alien_nightvision
nightvisionicon.screen_loc = ui_alien_nightvision
mymob.pullin = new /obj/screen()
mymob.pullin.icon = 'icons/mob/screen1_alien.dmi'
mymob.pullin.icon_state = "pull0"
@@ -151,14 +151,14 @@
mymob.blind.icon = 'icons/mob/screen1_full.dmi'
mymob.blind.icon_state = "blackimageoverlay"
mymob.blind.name = " "
mymob.blind.screen_loc = "1,1"
mymob.blind.screen_loc = "CENTER-8,CENTER-8"
mymob.blind.layer = 0
mymob.flash = new /obj/screen()
mymob.flash.icon = 'icons/mob/screen1_alien.dmi'
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
mymob.flash.screen_loc = "1,1 to 15,15"
mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH"
mymob.flash.layer = 17
mymob.zone_sel = new /obj/screen/zone_sel()
code/_onclick/hud/alien_larva.dm
+4 -4
View File
@@ -49,12 +49,12 @@
mymob.healths.icon_state = "health0"
mymob.healths.name = "health"
mymob.healths.screen_loc = ui_alien_health
nightvisionicon = new /obj/screen()
nightvisionicon.icon = 'icons/mob/screen1_alien.dmi'
nightvisionicon.icon_state = "nightvision1"
nightvisionicon.name = "night vision"
nightvisionicon.screen_loc = ui_alien_nightvision
nightvisionicon.screen_loc = ui_alien_nightvision
mymob.pullin = new /obj/screen()
mymob.pullin.icon = 'icons/mob/screen1_alien.dmi'
@@ -66,14 +66,14 @@
mymob.blind.icon = 'icons/mob/screen1_full.dmi'
mymob.blind.icon_state = "blackimageoverlay"
mymob.blind.name = " "
mymob.blind.screen_loc = "1,1"
mymob.blind.screen_loc = "CENTER-8,CENTER-8"
mymob.blind.layer = 0
mymob.flash = new /obj/screen()
mymob.flash.icon = 'icons/mob/screen1_alien.dmi'
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
mymob.flash.screen_loc = "1,1 to 15,15"
mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH"
mymob.flash.layer = 17
mymob.zone_sel = new /obj/screen/zone_sel()
code/_onclick/hud/hud.dm
+12 -12
View File
@@ -35,32 +35,32 @@ var/datum/global_hud/global_hud = new()
//that nasty looking dither you get when you're short-sighted
vimpaired = newlist(/obj/screen,/obj/screen,/obj/screen,/obj/screen)
O = vimpaired[1]
O.screen_loc = "1,1 to 6,17"
O.screen_loc = "WEST,SOUTH to CENTER-3,NORTH"
O = vimpaired[2]
O.screen_loc = "6,1 to 11,6"
O.screen_loc = "WEST,SOUTH to EAST,CENTER-3"
O = vimpaired[3]
O.screen_loc = "7,12 to 11,17"
O.screen_loc = "CENTER+3,SOUTH to EAST,NORTH"
O = vimpaired[4]
O.screen_loc = "12,1 to 17,17"
O.screen_loc = "WEST,CENTER+3 to EAST,NORTH"
//welding mask overlay black/dither
darkMask = newlist(/obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen)
O = darkMask[1]
O.screen_loc = "4,4 to 6,14"
O.screen_loc = "CENTER-5,CENTER-5 to CENTER-3,CENTER+5"
O = darkMask[2]
O.screen_loc = "6,4 to 11,6"
O.screen_loc = "CENTER-5,CENTER-5 to CENTER+5,CENTER-3"
O = darkMask[3]
O.screen_loc = "7,12 to 11,14"
O.screen_loc = "CENTER+3,CENTER-5 to CENTER+5,CENTER+5"
O = darkMask[4]
O.screen_loc = "12,4 to 14,14"
O.screen_loc = "CENTER-5,CENTER+3 to CENTER+5,CENTER+5"
O = darkMask[5]
O.screen_loc = "1,1 to 16,3"
O.screen_loc = "WEST,SOUTH to CENTER-5,NORTH"
O = darkMask[6]
O.screen_loc = "1,4 to 3,17"
O.screen_loc = "WEST,SOUTH to EAST,CENTER-5"
O = darkMask[7]
O.screen_loc = "15,4 to 17,17"
O.screen_loc = "CENTER+5,SOUTH to EAST,NORTH"
O = darkMask[8]
O.screen_loc = "4,15 to 14,17"
O.screen_loc = "WEST,CENTER+5 to EAST,NORTH"
for(i = 1, i <= 4, i++)
O = vimpaired[i]
code/_onclick/hud/human.dm
+3 -3
View File
@@ -433,7 +433,7 @@
mymob.blind.icon = 'icons/mob/screen1_full.dmi'
mymob.blind.icon_state = "blackimageoverlay"
mymob.blind.name = "blind"
mymob.blind.screen_loc = "1,1"
mymob.blind.screen_loc = "CENTER-8,CENTER-8"
mymob.blind.mouse_opacity = 0
mymob.blind.layer = 0
@@ -441,7 +441,7 @@
mymob.damageoverlay.icon = 'icons/mob/screen1_full.dmi'
mymob.damageoverlay.icon_state = "oxydamageoverlay0"
mymob.damageoverlay.name = "dmg"
mymob.damageoverlay.screen_loc = "1,1"
mymob.damageoverlay.screen_loc = "CENTER-8,CENTER-8"
mymob.damageoverlay.mouse_opacity = 0
mymob.damageoverlay.layer = 18.1 //The black screen overlay sets layer to 18 to display it, this one has to be just on top.
@@ -449,7 +449,7 @@
mymob.flash.icon = ui_style
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
mymob.flash.screen_loc = "1,1 to 17,17"
mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH"
mymob.flash.layer = 17
mymob.pain = new /obj/screen( null )
code/_onclick/hud/monkey.dm
+3 -3
View File
@@ -244,7 +244,7 @@
mymob.blind.icon = 'icons/mob/screen1_full.dmi'
mymob.blind.icon_state = "blackimageoverlay"
mymob.blind.name = "blind"
mymob.blind.screen_loc = "1,1"
mymob.blind.screen_loc = "CENTER-8,CENTER-8"
mymob.blind.mouse_opacity = 0
mymob.blind.layer = 0
@@ -252,7 +252,7 @@
mymob.damageoverlay.icon = 'icons/mob/screen1_full.dmi'
mymob.damageoverlay.icon_state = "oxydamageoverlay0"
mymob.damageoverlay.name = "dmg"
mymob.damageoverlay.screen_loc = "1,1"
mymob.damageoverlay.screen_loc = "CENTER-8,CENTER-8"
mymob.damageoverlay.mouse_opacity = 0
mymob.damageoverlay.layer = 18.1 //The black screen overlay sets layer to 18 to display it, this one has to be just on top.
@@ -260,7 +260,7 @@
mymob.flash.icon = ui_style
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
mymob.flash.screen_loc = "1,1 to 17,17"
mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH"
mymob.flash.layer = 17
mymob.pain = new /obj/screen( null )
code/_onclick/hud/other_mobs.dm
+1 -1
View File
@@ -45,7 +45,7 @@
mymob.blind.icon = 'icons/mob/screen1_full.dmi'
mymob.blind.icon_state = "blackimageoverlay"
mymob.blind.name = " "
mymob.blind.screen_loc = "1,1"
mymob.blind.screen_loc = "CENTER-8,CENTER-8"
mymob.blind.layer = 0
code/_onclick/hud/robot.dm
+2 -2
View File
@@ -128,14 +128,14 @@
mymob.blind.icon = 'icons/mob/screen1_full.dmi'
mymob.blind.icon_state = "blackimageoverlay"
mymob.blind.name = " "
mymob.blind.screen_loc = "1,1"
mymob.blind.screen_loc = "CENTER-8,CENTER-8"
mymob.blind.layer = 0
mymob.flash = new /obj/screen()
mymob.flash.icon = 'icons/mob/screen1_robot.dmi'
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
mymob.flash.screen_loc = "1,1 to 15,15"
mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH"
mymob.flash.layer = 17
mymob.zone_sel = new /obj/screen/zone_sel()
code/game/gamemodes/vampire/hud.dm
+1 -1
View File
@@ -3,7 +3,7 @@
vampire_blood_display = new /obj/screen()
vampire_blood_display.name = "Vampire Blood"
vampire_blood_display.icon_state = "dark128"
vampire_blood_display.screen_loc = "16:28,9:15"
vampire_blood_display.screen_loc = "EAST-1:28,CENTER+1:15"
vampire_blood_display.layer = 20
mymob.client.screen += list(vampire_blood_display)
code/modules/mob/living/silicon/ai/login.dm
+1 -1
View File
@@ -8,7 +8,7 @@
flash = new /obj/screen()
flash.icon_state = "blank"
flash.name = "flash"
flash.screen_loc = "1,1 to 15,15"
flash.screen_loc = "WEST,SOUTH to EAST,NORTH"
flash.layer = 17
blind = new /obj/screen()
blind.icon_state = "black"