From 130096acedc5d89627768cad54f763cab2216144 Mon Sep 17 00:00:00 2001 From: taukausanake Date: Thu, 9 Jun 2016 17:46:09 -0500 Subject: [PATCH 01/11] Hydroponic HUDs Everything is done. Except it doesn't work. I must be missing something somewhere but otherwise I did everything that appeared needing to do. Based it off of mech diag HUD so that might be the issue. Code as of now does not let you join the server. Need to revert bit by bit and find out what I did wrong --- code/__DEFINES/hud.dm | 10 ++ code/datums/hud.dm | 3 +- code/game/data_huds.dm | 87 ++++++++++++++++++ code/modules/clothing/glasses/hud.dm | 17 +++- code/modules/hydroponics/beekeeping/beebox.dm | 4 + code/modules/hydroponics/trays/tray.dm | 11 +++ icons/mob/eyes.dmi | Bin 11361 -> 11894 bytes icons/mob/hud.dmi | Bin 12734 -> 14757 bytes icons/obj/clothing/glasses.dmi | Bin 8615 -> 8713 bytes 9 files changed, 130 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index 628afa0f5e9..aac30e5e83f 100644 --- a/code/__DEFINES/hud.dm +++ b/code/__DEFINES/hud.dm @@ -16,6 +16,14 @@ #define DIAG_MECH_HUD "11"// Mech health bar #define STATUS_HUD_OOC "12"// STATUS_HUD without virus db check for someone being ill. #define DIAG_BOT_HUD "13"// Bot HUDS +#define PLANT_NUTRIENT_HUD "15"// Plant nutrient level +#define PLANT_WATER_HUD "16"// Plant water level +#define PLANT_STATUS_HUD "17"// Plant harvest/dead +#define PLANT_HEALTH_HUD "18"// Plant health +#define PLANT_TOXIN_HUD "19"// Toxin level +#define PLANT_PEST_HUD "20"// Pest level +#define PLANT_WEED_HUD "21"// Weed level +#define PLANT_HONEY_HUD "22"// Used on apiary //for antag huds. these are used at the /mob level #define SPECIALROLE_HUD "13" @@ -41,3 +49,5 @@ #define ANTAG_HUD_CHANGELING 14 #define ANTAG_HUD_VAMPIRE 15 #define ANTAG_HUD_ABDUCTOR 16 //For Fox + +#define DATA_HUD_HYDROPONIC 17 diff --git a/code/datums/hud.dm b/code/datums/hud.dm index 28781979b77..4383ab0d3d4 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -6,7 +6,8 @@ var/datum/atom_hud/huds = list( \ DATA_HUD_SECURITY_ADVANCED = new/datum/atom_hud/data/human/security/advanced(), \ DATA_HUD_MEDICAL_BASIC = new/datum/atom_hud/data/human/medical/basic(), \ DATA_HUD_MEDICAL_ADVANCED = new/datum/atom_hud/data/human/medical/advanced(), \ - DATA_HUD_DIAGNOSTIC = new/datum/atom_hud/data/diagnostic(), + DATA_HUD_DIAGNOSTIC = new/datum/atom_hud/data/diagnostic(), \ + DATA_HUD_HYDROPONIC = new/datum/atom_hud/data/hydroponic(), \ GAME_HUD_NATIONS = new/datum/atom_hud/antag(), \ ANTAG_HUD_CULT = new/datum/atom_hud/antag(), \ ANTAG_HUD_REV = new/datum/atom_hud/antag(), \ diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index b308d996de9..d38bf80b1c7 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -46,6 +46,9 @@ /datum/atom_hud/data/diagnostic hud_icons = list (DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD) +/datum/atom_hud/data/hydroponic + hud_icons = list (PLANT_NUTRIENT_HUD, PLANT_WATER_HUD, PLANT_STATUS_HUD, PLANT_HEALTH_HUD, PLANT_TOXIN_HUD, PLANT_PEST_HUD, PLANT_WEED_HUD, PLANT_HONEY_HUD) + /* MED/SEC/DIAG HUD HOOKS */ /* @@ -294,3 +297,87 @@ holder.icon_state = "hudmove" else holder.icon_state = "" + +/*~~~~~~~~~~~~~~ + PLANT HUD +~~~~~~~~~~~~~~~*/ +/proc/RoundPlantBar(value) + switch(value * 100) + if(90 to INFINITY) + return "max" + if(80 to 90) + return "90" + if(70 to 80) + return "80" + if(60 to 70) + return "70" + if(50 to 60) + return "60" + if(40 to 50) + return "50" + if(30 to 40) + return "40" + if(20 to 30) + return "30" + if(10 to 20) + return "20" + if(1 to 10) + return "10" + else + return "zero" + return "zero" + +/obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_nutrient() + var/image/holder = hud_list[PLANT_NUTRIENT_HUD] + holder.icon_state = "hudnutrient[RoundPlantBar(nutrilevel/maxnutri)]" + +/obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_water() + var/image/holder = hud_list[PLANT_WATER_HUD] + holder.icon_state = "hudnutrient[RoundPlantBar(waterlevel/maxwater)]" + +/obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_status() + var/image/holder = hud_list[PLANT_STATUS_HUD] + // Dis be drugs here. And special mention plants + var/list/special = list(/datum/seed/nettle, /datum/seed/apple/poison, /datum/seed/ambrosia, /datum/seed/tobacco, /datum/seed/mushroom, \ + /datum/seed/weeds, /datum/seed/grass, /datum/seed/kudzu, /datum/seed/diona, /datum/seed/clown) + if (!seed) return + if (harvest) + if (is_type_in_list(seed, special)) + holder.icon_state = "hudharvest2" + holder.icon_state = "hudharvest" + return + if (dead) + holder.icon_state = "huddead" + return + else + holder.icon_state = "" + +/obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_health() + var/image/holder = hud_list[PLANT_HEALTH_HUD] + if (!seed) return + holder.icon_state = "hudhealth[RoundPlantBar(health/seed.get_trait(TRAIT_ENDURANCE))]" + +/obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_toxin() + var/image/holder = hud_list[PLANT_TOXIN_HUD] + if (toxins < 1) // You don't want to see these icons if the value is small + holder.icon_state = "" + return + holder.icon_state = "hudtoxin[RoundPlantBar(toxins/10)]" + +/obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_pest() + var/image/holder = hud_list[PLANT_PEST_HUD] + if (pestlevel < 1) // You don't want to see these icons if the value is small + holder.icon_state = "" + return + holder.icon_state = "hudpest[RoundPlantBar(pestlevel/10)]" + +/obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_weed() + var/image/holder = hud_list[PLANT_WEED_HUD] + if (weedlevel < 1) // You don't want to see these icons if the value is small + holder.icon_state = "" + return + holder.icon_state = "hudweed[RoundPlantBar(weedlevel/10)]" + +/obj/structure/beebox/proc/plant_hud_set_honey() + var/image/holder = hud_list[PLANT_HONEY_HUD] + holder.icon_state = "hudhoney[honeycombs.len]" \ No newline at end of file diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 44138b8e907..9137c2098d1 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -108,4 +108,19 @@ ) /obj/item/clothing/glasses/hud/security/sunglasses/prescription - prescription = 1 \ No newline at end of file + prescription = 1 + +/obj/item/clothing/glasses/hud/hydroponic + name = "Hydroponic HUD" + desc = "A heads-up display capable of analyzing the health and status of plants growing in hydro trays and soil." + icon_state = "hydroponichud" + HUDType = DATA_HUD_HYDROPONIC + +/obj/item/clothing/glasses/hud/hydroponic/night + name = "Night Vision Hydroponic HUD" + desc = "A hydroponic HUD fitted with a light amplifier." + icon_state = "hydroponichudnight" + item_state = "glasses" + darkness_view = 8 + see_darkness = 0 + prescription_upgradable = 0 \ No newline at end of file diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index 553251a2ee8..b3deb421ad9 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -48,6 +48,10 @@ ..() processing_objects.Add(src) +/* var/datum/atom_hud/data/hydroponic/hydro_hud = huds[DATA_HUD_HYDROPONIC] + hydro_hud.add_to_hud(src) + plant_hud_set_honey() +*/ /obj/structure/beebox/Destroy() processing_objects.Remove(src) diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 74a8d7824dc..c95e425a5c2 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -101,6 +101,17 @@ if(closed_system) flags &= ~OPENCONTAINER + var/datum/atom_hud/data/hydroponic/hydro_hud = huds[DATA_HUD_HYDROPONIC] + prepare_huds() + hydro_hud.add_to_hud(src) + plant_hud_set_nutrient() + plant_hud_set_water() + plant_hud_set_status() + plant_hud_set_health() + plant_hud_set_toxin() + plant_hud_set_pest() + plant_hud_set_weed() + /obj/machinery/portable_atmospherics/hydroponics/upgraded/New() ..() component_parts = list() diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 28399ab1ce124627312f901ea2a4a709c1fbcb5f..402bf49bd5c4d2729d5240912d902376c67e7143 100644 GIT binary patch literal 11894 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 literal 11361 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 diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index eeb5ecbbee3ff336f6c555bc376a66cfda42d997..b257f1fbed0badb8259d9eaf9e43f1470b3b74f4 100644 GIT binary patch literal 14757 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 AQvd(} literal 12734 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 Km5U#kzxfXfX~8Z4 diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 6ad7d94bda7c974b35f3c6a54707f7fac87ed0b8..0fc42d7bd4debb74cd8771c3b311f5130f2eaf42 100644 GIT binary patch literal 8713 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 PlL2Z<+KM&umf`;om7Tfu literal 8615 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 NC3!Wu8X1eo{{c8jVe|k1 From db7b819d1fa643a05093d68bb6e31eb221c59e5d Mon Sep 17 00:00:00 2001 From: taukausanake Date: Thu, 9 Jun 2016 21:36:23 -0500 Subject: [PATCH 02/11] Fixes Credit to Monster860 for telling me what I did stupid. HUD still doesn't show however so need to find out that next --- code/__DEFINES/hud.dm | 25 ++++++++++++------------- code/datums/hud.dm | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index aac30e5e83f..fb21b757b49 100644 --- a/code/__DEFINES/hud.dm +++ b/code/__DEFINES/hud.dm @@ -36,18 +36,17 @@ #define DATA_HUD_MEDICAL_BASIC 3 #define DATA_HUD_MEDICAL_ADVANCED 4 #define DATA_HUD_DIAGNOSTIC 5 +#define DATA_HUD_HYDROPONIC 6 //NATIONS -#define GAME_HUD_NATIONS 6 +#define GAME_HUD_NATIONS 7 //antag HUD defines -#define ANTAG_HUD_CULT 7 -#define ANTAG_HUD_REV 8 -#define ANTAG_HUD_OPS 9 -#define ANTAG_HUD_WIZ 10 -#define ANTAG_HUD_SHADOW 11 -#define ANTAG_HUD_TRAITOR 12 -#define ANTAG_HUD_NINJA 13 //For Daves Rework -#define ANTAG_HUD_CHANGELING 14 -#define ANTAG_HUD_VAMPIRE 15 -#define ANTAG_HUD_ABDUCTOR 16 //For Fox - -#define DATA_HUD_HYDROPONIC 17 +#define ANTAG_HUD_CULT 8 +#define ANTAG_HUD_REV 9 +#define ANTAG_HUD_OPS 10 +#define ANTAG_HUD_WIZ 11 +#define ANTAG_HUD_SHADOW 12 +#define ANTAG_HUD_TRAITOR 13 +#define ANTAG_HUD_NINJA 14 //For Daves Rework +#define ANTAG_HUD_CHANGELING 15 +#define ANTAG_HUD_VAMPIRE 16 +#define ANTAG_HUD_ABDUCTOR 17 //For Fox diff --git a/code/datums/hud.dm b/code/datums/hud.dm index 4383ab0d3d4..c29b5daf5b3 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -18,7 +18,7 @@ var/datum/atom_hud/huds = list( \ ANTAG_HUD_NINJA = new/datum/atom_hud/antag/hidden(),\ ANTAG_HUD_CHANGELING = new/datum/atom_hud/antag/hidden(),\ ANTAG_HUD_VAMPIRE = new/datum/atom_hud/antag/hidden(),\ - ANTAG_HUD_ABDUCTOR = new/datum/atom_hud/antag/hidden(),\ + ANTAG_HUD_ABDUCTOR = new/datum/atom_hud/antag/hidden()\ ) /datum/atom_hud From e9d9a4c345ebadba5b3e57c0ade063cf8dd97acb Mon Sep 17 00:00:00 2001 From: taukausanake Date: Wed, 15 Jun 2016 19:11:49 -0500 Subject: [PATCH 03/11] Mistakes were made --- code/game/data_huds.dm | 9 +++++---- icons/mob/hud.dmi | Bin 12734 -> 14757 bytes 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index d38bf80b1c7..cd6957ffd9f 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -340,7 +340,9 @@ // Dis be drugs here. And special mention plants var/list/special = list(/datum/seed/nettle, /datum/seed/apple/poison, /datum/seed/ambrosia, /datum/seed/tobacco, /datum/seed/mushroom, \ /datum/seed/weeds, /datum/seed/grass, /datum/seed/kudzu, /datum/seed/diona, /datum/seed/clown) - if (!seed) return + if (!seed) + holder.icon_state = "" + return if (harvest) if (is_type_in_list(seed, special)) holder.icon_state = "hudharvest2" @@ -349,13 +351,12 @@ if (dead) holder.icon_state = "huddead" return - else - holder.icon_state = "" + holder.icon_state = "" /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_health() var/image/holder = hud_list[PLANT_HEALTH_HUD] if (!seed) return - holder.icon_state = "hudhealth[RoundPlantBar(health/seed.get_trait(TRAIT_ENDURANCE))]" + holder.icon_state = "hudplanthealth[RoundPlantBar(health/seed.get_trait(TRAIT_ENDURANCE))]" /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_toxin() var/image/holder = hud_list[PLANT_TOXIN_HUD] diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index c5115b3cbc520182fef2891072f28bee770393d0..49a50c2a8394d8f913cf252e7331fbbb107a3de1 100644 GIT binary patch literal 14757 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 literal 12734 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 Date: Sat, 18 Jun 2016 18:10:31 -0500 Subject: [PATCH 04/11] I DID IT Finally got the HUDs to work all thanks to Crazylemon. The only thing that doesn't work is the hudharvest2 is_type_in_list() check I made but I could get rid of it --- code/game/data_huds.dm | 26 ++++++++++--------- code/modules/hydroponics/beekeeping/beebox.dm | 3 +++ code/modules/hydroponics/trays/tray.dm | 22 ++++++++++++++++ .../modules/hydroponics/trays/tray_process.dm | 6 +++++ 4 files changed, 45 insertions(+), 12 deletions(-) diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index cd6957ffd9f..d63a68046ae 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -303,23 +303,23 @@ ~~~~~~~~~~~~~~~*/ /proc/RoundPlantBar(value) switch(value * 100) - if(90 to INFINITY) + if(91 to INFINITY) return "max" - if(80 to 90) + if(81 to 90) return "90" - if(70 to 80) + if(71 to 80) return "80" - if(60 to 70) + if(61 to 70) return "70" - if(50 to 60) + if(51 to 60) return "60" - if(40 to 50) + if(41 to 50) return "50" - if(30 to 40) + if(31 to 40) return "40" - if(20 to 30) + if(21 to 30) return "30" - if(10 to 20) + if(11 to 20) return "20" if(1 to 10) return "10" @@ -333,11 +333,11 @@ /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_water() var/image/holder = hud_list[PLANT_WATER_HUD] - holder.icon_state = "hudnutrient[RoundPlantBar(waterlevel/maxwater)]" + holder.icon_state = "hudwater[RoundPlantBar(waterlevel/maxwater)]" /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_status() var/image/holder = hud_list[PLANT_STATUS_HUD] - // Dis be drugs here. And special mention plants + // Dis be drugs here. And special mention plants //TODO: make it work var/list/special = list(/datum/seed/nettle, /datum/seed/apple/poison, /datum/seed/ambrosia, /datum/seed/tobacco, /datum/seed/mushroom, \ /datum/seed/weeds, /datum/seed/grass, /datum/seed/kudzu, /datum/seed/diona, /datum/seed/clown) if (!seed) @@ -355,7 +355,9 @@ /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_health() var/image/holder = hud_list[PLANT_HEALTH_HUD] - if (!seed) return + if (!seed) + holder.icon_state = "" + return holder.icon_state = "hudplanthealth[RoundPlantBar(health/seed.get_trait(TRAIT_ENDURANCE))]" /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_toxin() diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index b3deb421ad9..d8f128d2a5a 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -37,6 +37,9 @@ icon_state = "beebox" anchored = 1 density = 1 + +// hud_possible = list (PLANT_HONEY_HUD) + var/mob/living/simple_animal/hostile/poison/bees/queen/queen_bee = null var/list/bees = list() //bees owned by the box, not those inside it var/list/honeycombs = list() diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index c95e425a5c2..42d22d82b2c 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -7,6 +7,8 @@ flags = OPENCONTAINER volume = 100 + hud_possible = list (PLANT_NUTRIENT_HUD, PLANT_WATER_HUD, PLANT_STATUS_HUD, PLANT_HEALTH_HUD, PLANT_TOXIN_HUD, PLANT_PEST_HUD, PLANT_WEED_HUD, PLANT_HONEY_HUD) + var/mechanical = 1 // Set to 0 to stop it from drawing the alert lights. var/base_name = "tray" @@ -129,6 +131,8 @@ maxnutri = tmp_capacity * 5 // Up to 30 //waterlevel = maxwater //nutrilevel = 3 + plant_hud_set_nutrient() + plant_hud_set_water() /obj/machinery/portable_atmospherics/hydroponics/bullet_act(var/obj/item/projectile/Proj) @@ -161,12 +165,16 @@ die() check_level_sanity() update_icon() + plant_hud_set_status() + plant_hud_set_health() /obj/machinery/portable_atmospherics/hydroponics/proc/die() dead = 1 harvest = 0 weedlevel += 1 * HYDRO_SPEED_MULTIPLIER pestlevel = 0 + plant_hud_set_status() + plant_hud_set_health() //Harvests the product of a plant. /obj/machinery/portable_atmospherics/hydroponics/proc/harvest(var/mob/user) @@ -244,6 +252,9 @@ pestlevel = 0 sampled = 0 update_icon() + plant_hud_set_weed() + plant_hud_set_status() + plant_hud_set_health() visible_message("[src] has been overtaken by [seed.display_name].") return @@ -402,6 +413,14 @@ toxins = max(0,min(toxins,10)) yield_mod = min(100, yield_mod) + plant_hud_set_nutrient() + plant_hud_set_water() + plant_hud_set_status() + plant_hud_set_health() + plant_hud_set_toxin() + plant_hud_set_pest() + plant_hud_set_weed() + /obj/machinery/portable_atmospherics/hydroponics/proc/mutate_species() var/previous_plant = seed.display_name @@ -420,6 +439,9 @@ harvest = 0 weedlevel = 0 + plant_hud_set_health() + plant_hud_set_weed() + update_icon() visible_message("\red The \blue [previous_plant] \red has suddenly mutated into \blue [seed.display_name]!") diff --git a/code/modules/hydroponics/trays/tray_process.dm b/code/modules/hydroponics/trays/tray_process.dm index 855d053008c..653b6c9d788 100644 --- a/code/modules/hydroponics/trays/tray_process.dm +++ b/code/modules/hydroponics/trays/tray_process.dm @@ -133,4 +133,10 @@ harvest() check_health() +// No idea what happens in here so sticking all these here for now + plant_hud_set_nutrient() + plant_hud_set_water() + plant_hud_set_toxin() + plant_hud_set_pest() + plant_hud_set_weed() return From 55326e1c708d356cbb254776f5ca71c3e3633a1f Mon Sep 17 00:00:00 2001 From: taukausanake Date: Mon, 20 Jun 2016 11:20:32 -0500 Subject: [PATCH 05/11] Technical difficulties Decided to scrap the beekeeping HUD for now. Turned out it's way more complicated that I thought. I'll try it again in the future. Added the Hydro HUD design for Protolathe. Need to test if it works. Might have made a mistake in Git so commiting in order to pull from Paradise master to see if anything broke. --- code/game/data_huds.dm | 6 +- code/modules/hydroponics/beekeeping/beebox.dm | 9 +-- .../research/designs/equipment_designs.dm | 68 +++++++++++------- icons/mob/hud.dmi | Bin 14757 -> 14674 bytes paradise.dme | 10 --- 5 files changed, 46 insertions(+), 47 deletions(-) diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index d63a68046ae..f25f6e234d6 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -379,8 +379,4 @@ if (weedlevel < 1) // You don't want to see these icons if the value is small holder.icon_state = "" return - holder.icon_state = "hudweed[RoundPlantBar(weedlevel/10)]" - -/obj/structure/beebox/proc/plant_hud_set_honey() - var/image/holder = hud_list[PLANT_HONEY_HUD] - holder.icon_state = "hudhoney[honeycombs.len]" \ No newline at end of file + holder.icon_state = "hudweed[RoundPlantBar(weedlevel/10)]" \ No newline at end of file diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index d8f128d2a5a..817f002f014 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -37,9 +37,6 @@ icon_state = "beebox" anchored = 1 density = 1 - -// hud_possible = list (PLANT_HONEY_HUD) - var/mob/living/simple_animal/hostile/poison/bees/queen/queen_bee = null var/list/bees = list() //bees owned by the box, not those inside it var/list/honeycombs = list() @@ -51,10 +48,6 @@ ..() processing_objects.Add(src) -/* var/datum/atom_hud/data/hydroponic/hydro_hud = huds[DATA_HUD_HYDROPONIC] - hydro_hud.add_to_hud(src) - plant_hud_set_honey() -*/ /obj/structure/beebox/Destroy() processing_objects.Remove(src) @@ -258,4 +251,4 @@ if(!user.put_in_active_hand(QB)) QB.forceMove(get_turf(src)) visible_message("[user] removes the queen from the apiary.") - queen_bee = null + queen_bee = null \ No newline at end of file diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm index 8a056d3e67d..0f23b2a6532 100644 --- a/code/modules/research/designs/equipment_designs.dm +++ b/code/modules/research/designs/equipment_designs.dm @@ -21,6 +21,16 @@ build_path = /obj/item/clothing/glasses/hud/health category = list("Equipment") +/datum/design/health_hud_night + name = "Night Vision Health Scanner HUD" + desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness." + id = "health_hud_night" + req_tech = list("biotech" = 4, "magnets" = 5) + build_type = PROTOLATHE + materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 1000, MAT_SILVER = 250) + build_path = /obj/item/clothing/glasses/hud/health/night + category = list("Equipment") + /datum/design/magboots name = "Magnetic Boots" desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle." @@ -41,14 +51,14 @@ build_path = /obj/item/clothing/glasses/night category = list("Equipment") -/datum/design/health_hud_night - name = "Night Vision Health Scanner HUD" - desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness." - id = "health_hud_night" - req_tech = list("biotech" = 4, "magnets" = 5) +/datum/design/security_hud + name = "Security HUD" + desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status." + id = "security_hud" + req_tech = list("magnets" = 3, "combat" = 2) build_type = PROTOLATHE - materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 1000, MAT_SILVER = 250) - build_path = /obj/item/clothing/glasses/hud/health/night + materials = list(MAT_METAL = 50, MAT_GLASS = 50) + build_path = /obj/item/clothing/glasses/hud/security category = list("Equipment") /datum/design/security_hud_night @@ -61,16 +71,6 @@ build_path = /obj/item/clothing/glasses/hud/security/night category = list("Equipment") -/datum/design/nvgmesons - name = "Night Vision Optical Meson Scanners" - desc = "Prototype meson scanners fitted with an extra sensor which amplifies the visible light spectrum and overlays it to the UHD display." - id = "nvgmesons" - req_tech = list("materials" = 5, "magnets" = 5, "engineering" = 4) - build_type = PROTOLATHE - materials = list(MAT_METAL = 300, MAT_GLASS = 400, MAT_PLASMA = 250, MAT_URANIUM = 1000) - build_path = /obj/item/clothing/glasses/meson/night - category = list("Equipment") - /datum/design/mesons name = "Optical Meson Scanners" desc = "Used for seeing walls, floors, and stuff through anything." @@ -81,14 +81,14 @@ build_path = /obj/item/clothing/glasses/meson category = list("Equipment") -/datum/design/security_hud - name = "Security HUD" - desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status." - id = "security_hud" - req_tech = list("magnets" = 3, "combat" = 2) +/datum/design/nvgmesons + name = "Night Vision Optical Meson Scanners" + desc = "Prototype meson scanners fitted with an extra sensor which amplifies the visible light spectrum and overlays it to the UHD display." + id = "nvgmesons" + req_tech = list("materials" = 5, "magnets" = 5, "engineering" = 4) build_type = PROTOLATHE - materials = list(MAT_METAL = 50, MAT_GLASS = 50) - build_path = /obj/item/clothing/glasses/hud/security + materials = list(MAT_METAL = 300, MAT_GLASS = 400, MAT_PLASMA = 250, MAT_URANIUM = 1000) + build_path = /obj/item/clothing/glasses/meson/night category = list("Equipment") /datum/design/air_horn @@ -170,3 +170,23 @@ materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$plasma" = 300) build_path = /obj/item/clothing/glasses/hud/diagnostic/night category = list("Equipment") + +/datum/design/hydroponic_hud + name = "Hydroponic HUD" + desc = "A HUD used to analyze the health and status of plants growing in hydro trays and soil." + id = "hydroponic_hud" + req_tech = list("magnets" = 3, "biotech" = 3) + build_type = PROTOLATHE + materials = list("$metal" = 50, "$glass" = 50) + build_path = /obj/item/clothing/glasses/hud/hydroponic + category = list("Equipment") + +/datum/design/hydroponic_hud_night + name = "Night Vision Hydroponic HUD" + desc = "A HUD used to analyze the health and status of plants growing in low-light environments." + id = "hydroponic_hud_night" + req_tech = list("magnets" = 5, "biotech" = 4) + build_type = PROTOLATHE + materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$plasma" = 200) + build_path = /obj/item/clothing/glasses/hud/hydroponic/night + category = list("Equipment") \ No newline at end of file diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 49a50c2a8394d8f913cf252e7331fbbb107a3de1..91f4aa1e374fa3231e2064b23b9d5402751f1085 100644 GIT binary patch delta 12957 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 delta 13056 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 O!S3tdE52*@^8W*7@KpQ& diff --git a/paradise.dme b/paradise.dme index 043f4208d45..89ddaa6cc8f 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1392,7 +1392,6 @@ #include "code\modules\mining\laborcamp\laborstacker.dm" #include "code\modules\mob\abilities.dm" #include "code\modules\mob\death.dm" -#include "code\modules\mob\emote.dm" #include "code\modules\mob\hear_say.dm" #include "code\modules\mob\holder.dm" #include "code\modules\mob\inventory.dm" @@ -1444,7 +1443,6 @@ #include "code\modules\mob\living\carbon\alien\login.dm" #include "code\modules\mob\living\carbon\alien\logout.dm" #include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\emote.dm" #include "code\modules\mob\living\carbon\alien\humanoid\empress.dm" #include "code\modules\mob\living\carbon\alien\humanoid\humanoid.dm" #include "code\modules\mob\living\carbon\alien\humanoid\inventory.dm" @@ -1456,7 +1454,6 @@ #include "code\modules\mob\living\carbon\alien\humanoid\caste\hunter.dm" #include "code\modules\mob\living\carbon\alien\humanoid\caste\sentinel.dm" #include "code\modules\mob\living\carbon\alien\larva\death.dm" -#include "code\modules\mob\living\carbon\alien\larva\emote.dm" #include "code\modules\mob\living\carbon\alien\larva\inventory.dm" #include "code\modules\mob\living\carbon\alien\larva\larva.dm" #include "code\modules\mob\living\carbon\alien\larva\life.dm" @@ -1467,7 +1464,6 @@ #include "code\modules\mob\living\carbon\brain\brain.dm" #include "code\modules\mob\living\carbon\brain\brain_item.dm" #include "code\modules\mob\living\carbon\brain\death.dm" -#include "code\modules\mob\living\carbon\brain\emote.dm" #include "code\modules\mob\living\carbon\brain\life.dm" #include "code\modules\mob\living\carbon\brain\login.dm" #include "code\modules\mob\living\carbon\brain\MMI.dm" @@ -1476,7 +1472,6 @@ #include "code\modules\mob\living\carbon\human\appearance.dm" #include "code\modules\mob\living\carbon\human\body_accessories.dm" #include "code\modules\mob\living\carbon\human\death.dm" -#include "code\modules\mob\living\carbon\human\emote.dm" #include "code\modules\mob\living\carbon\human\examine.dm" #include "code\modules\mob\living\carbon\human\human.dm" #include "code\modules\mob\living\carbon\human\human_attackalien.dm" @@ -1507,7 +1502,6 @@ #include "code\modules\mob\living\carbon\human\species\species.dm" #include "code\modules\mob\living\carbon\human\species\station.dm" #include "code\modules\mob\living\carbon\slime\death.dm" -#include "code\modules\mob\living\carbon\slime\emote.dm" #include "code\modules\mob\living\carbon\slime\examine.dm" #include "code\modules\mob\living\carbon\slime\life.dm" #include "code\modules\mob\living\carbon\slime\powers.dm" @@ -1516,7 +1510,6 @@ #include "code\modules\mob\living\carbon\slime\subtypes.dm" #include "code\modules\mob\living\carbon\slime\update_icons.dm" #include "code\modules\mob\living\silicon\death.dm" -#include "code\modules\mob\living\silicon\emote.dm" #include "code\modules\mob\living\silicon\laws.dm" #include "code\modules\mob\living\silicon\login.dm" #include "code\modules\mob\living\silicon\say.dm" @@ -1539,7 +1532,6 @@ #include "code\modules\mob\living\silicon\decoy\decoy.dm" #include "code\modules\mob\living\silicon\decoy\life.dm" #include "code\modules\mob\living\silicon\pai\death.dm" -#include "code\modules\mob\living\silicon\pai\emote.dm" #include "code\modules\mob\living\silicon\pai\examine.dm" #include "code\modules\mob\living\silicon\pai\life.dm" #include "code\modules\mob\living\silicon\pai\pai.dm" @@ -1550,7 +1542,6 @@ #include "code\modules\mob\living\silicon\pai\software_modules.dm" #include "code\modules\mob\living\silicon\robot\component.dm" #include "code\modules\mob\living\silicon\robot\death.dm" -#include "code\modules\mob\living\silicon\robot\emote.dm" #include "code\modules\mob\living\silicon\robot\examine.dm" #include "code\modules\mob\living\silicon\robot\inventory.dm" #include "code\modules\mob\living\silicon\robot\laws.dm" @@ -1583,7 +1574,6 @@ #include "code\modules\mob\living\simple_animal\bot\cleanbot.dm" #include "code\modules\mob\living\simple_animal\bot\construction.dm" #include "code\modules\mob\living\simple_animal\bot\ed209bot.dm" -#include "code\modules\mob\living\simple_animal\bot\emote.dm" #include "code\modules\mob\living\simple_animal\bot\floorbot.dm" #include "code\modules\mob\living\simple_animal\bot\medbot.dm" #include "code\modules\mob\living\simple_animal\bot\mulebot.dm" From 3dd3dabe24f06564ac5871fdd6c85d0a2abfe77d Mon Sep 17 00:00:00 2001 From: taukausanake Date: Mon, 20 Jun 2016 23:49:07 -0500 Subject: [PATCH 06/11] Final push unless someone says no. Everything should be good however I noticed some runtimes with the nutrient and water HUDs. Maybe some floating point problems but those two shouldn't do decimal values. Otherwise the only other issue I can thing is that the HUDs don't update immediately every time.They still update when they should but I've noticed some irregularities... --- code/game/data_huds.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index f25f6e234d6..1d48aa2c370 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -337,7 +337,7 @@ /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_status() var/image/holder = hud_list[PLANT_STATUS_HUD] - // Dis be drugs here. And special mention plants //TODO: make it work + // Dis be drugs here. And special mention plants var/list/special = list(/datum/seed/nettle, /datum/seed/apple/poison, /datum/seed/ambrosia, /datum/seed/tobacco, /datum/seed/mushroom, \ /datum/seed/weeds, /datum/seed/grass, /datum/seed/kudzu, /datum/seed/diona, /datum/seed/clown) if (!seed) @@ -346,6 +346,7 @@ if (harvest) if (is_type_in_list(seed, special)) holder.icon_state = "hudharvest2" + return holder.icon_state = "hudharvest" return if (dead) From a33c41f3abf922db5909f85941647374c758728f Mon Sep 17 00:00:00 2001 From: taukausanake Date: Tue, 21 Jun 2016 18:43:02 -0500 Subject: [PATCH 07/11] Wait, did I forget to save? --- icons/mob/hud.dmi | Bin 14674 -> 15086 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 91f4aa1e374fa3231e2064b23b9d5402751f1085..92d1ac397ef80e40257551c3dbb9d28551cfa69d 100644 GIT binary patch literal 15086 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 literal 14674 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

kDH{qJk4B9I7Hedf=!owz@=7_|CfbG`dHwDT= zt_+nM=pXc@nl7Dwc)|@zj%EP~Yc_!DeBuZ#vk&w<;I07p%Gk>G$;N7jtwNKClBs~g zshl)3Txi-5#pkosk7gRbRMkiW$eO+pWn6mmC>kEbJ&)Yu;}861#uu#qnS*-Ay-oe_ z9{3!q=^%5MkX3#7kqI-+`H%Zos94MCIe#j*rF%cxLj96-g zaV(TRR2m&38VpkHFPuexe8u-MzS`SN}K)^2swPQpbl@VjF)=4OHP+aDXm~or9zJ#}CEJ z&G(xl<@DQvNzK)ra}k5PPjc{FfD#jHZiW*KgB?p2N>#n`EQPwpD7zRLQIX7tkFs zIoNW`NyR`L0%$(ur+kR|HWvSxe(j(>v9c{d*~axY?VQu`_opzF0!;MLwQz?Beza83 zgu;1GZa_Q*JRezAvl-2j)Roy*>yQ5w2HL7&u+J)<-3&yoDo{X!12NfQ@hz6XgBp!8 zUnILeH{dpV-|a|4hnV3hPT^(bDEesCO<3Rfjo~OFJirueb|Isl8{S`lo+83LeQUnS z(`@c;#b$o_b@h7qg|A;6Roy&fql8yj%7r`1mCk4MM(~(SZAZ}=t;({vc@PJg)!<0G$_bmenAGTAh;a)9vGdoT|I0aK0AWFe*n zh6IMkr=IkFQu1!z`>P!M>(=uTaqo%c0qqPW2p8l!2?}I;{BsPkT6Us-xo#U~f}0bM zsjO`$Y&i!0*C|~n(1qu7e!=hyAG4{0=I%E1_xs^1MRLe$e)TRzmVZ}${l6CS0g-Z@ z7aa)XCL*&;>$}t|*E6MXGS!3jcQpmkSy|td)=u}AaAF8FpcS!xQ070RdGCa#d|H^k z5vnI&=&w=0&uR0Sd8G6M^zgRi$Q0x8t{3i2C)31wKA$5dqsws=!-dHaPR zWR~${s0A5!9|bnCh6zt1N+|Au~OWzT^WBf!)Vqy?K&@7km9Ao z8?IU4y&J+TbGK#C9YQzKkqx2s8$YOAF`sEb7FK6x4z~z^7&;SJlpa2=46drH0nLLl z-$;>O)}ds(6om%qWg;kikIfZil%X_|=ydIUzGLl4%>v%Io9%1M?{zn}32&=Fr=E7M zo_;O%22c%(Z9L8Nw`_HWp}Z+#Py1g*tMBqTY3V2bR%88BbrF8)e1zcCg@4tzUX{Fc ziW&2t?Me?k_@9)o?_xM_oUitL!LydRpSt;&3+PAaq-PP}p3fVBnZ3IpI=2`BpKQl} zidWw4bJE5z0-Y5DYxMc=F1DIy%kc6b(7OOYsPq3)Gwf9B1)2=mENW**7{1$Ea$IDe zT&h(CJ#J}#2o6>sgbIk?Grl1-)f5O1YeCyQt zSWa3)M_yqd`s+$?UDRp<4PMe}^6A*5kvVnV1?WTz=!7dK`@ai?UH3IzOgfURs zUcoiO*JdOjxAUih9fplEh;MlD50qQ`6M&4ap(kBIhl86LT@`FU4F0j| zB5y|nQoPATZ$0Fi3OJG`D6l&fn}A>XKbMZX0J0Wp?0dmB+;S~%IO8dwG@kKNPbw~n zILy-ShCr|XU4;)X95D>6IXeG_VlrwcE|JTT8@<@BMq%aa?_t_Y&JY0WAZSLOzi6o-SEkU8PeS z6DiIrVXDF_c)g4xZhQKe`aGAjJ*w4Oy+9T9B zi-<6rVOK0<0hJz2s?Jok_w>k-Ne6FvLxmx&71q*!5r@6?!@!}!Vo$C?@I!QGX7tJu z%icihtKx}nw%{k%&SF6Q?@wK90=B|5Agjq`WTLmXZs1=v1*6gYXn8!Hy0z08LL3is zK>omYIbc6^5kdWF>S($%%$Gyy&o{ACSn2;SO!t3o Date: Wed, 22 Jun 2016 23:03:09 -0500 Subject: [PATCH 08/11] This should be it Removed special check for plants. Bees undo it all so it's not worth the trouble just yet. Credit for Crazylemon for being best coder. He helped me find a lot of issues that I would have been too stupid to find myself. Runtimes are gone --- code/game/data_huds.dm | 42 +++++++++++--------------- code/modules/hydroponics/trays/tray.dm | 24 +++++++++------ 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 9cc7a6531ce..876a8259273 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -323,26 +323,26 @@ ~~~~~~~~~~~~~~~*/ /proc/RoundPlantBar(value) switch(value * 100) - if(91 to INFINITY) - return "max" - if(81 to 90) - return "90" - if(71 to 80) - return "80" - if(61 to 70) - return "70" - if(51 to 60) - return "60" - if(41 to 50) - return "50" - if(31 to 40) - return "40" - if(21 to 30) - return "30" - if(11 to 20) - return "20" if(1 to 10) return "10" + if(10 to 20) + return "20" + if(20 to 30) + return "30" + if(30 to 40) + return "40" + if(40 to 50) + return "50" + if(50 to 60) + return "60" + if(60 to 70) + return "70" + if(70 to 80) + return "80" + if(80 to 90) + return "90" + if(90 to INFINITY) + return "max" else return "zero" return "zero" @@ -357,16 +357,10 @@ /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_status() var/image/holder = hud_list[PLANT_STATUS_HUD] - // Dis be drugs here. And special mention plants - var/list/special = list(/datum/seed/nettle, /datum/seed/apple/poison, /datum/seed/ambrosia, /datum/seed/tobacco, /datum/seed/mushroom, \ - /datum/seed/weeds, /datum/seed/grass, /datum/seed/kudzu, /datum/seed/diona, /datum/seed/clown) if (!seed) holder.icon_state = "" return if (harvest) - if (is_type_in_list(seed, special)) - holder.icon_state = "hudharvest2" - return holder.icon_state = "hudharvest" return if (dead) diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 42d22d82b2c..00e6a853069 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -87,6 +87,17 @@ /obj/machinery/portable_atmospherics/hydroponics/New() ..() + var/datum/atom_hud/data/hydroponic/hydro_hud = huds[DATA_HUD_HYDROPONIC] + prepare_huds() + hydro_hud.add_to_hud(src) + plant_hud_set_nutrient() + plant_hud_set_water() + plant_hud_set_status() + plant_hud_set_health() + plant_hud_set_toxin() + plant_hud_set_pest() + plant_hud_set_weed() + component_parts = list() component_parts += new /obj/item/weapon/circuitboard/hydroponics(null) component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) @@ -103,16 +114,6 @@ if(closed_system) flags &= ~OPENCONTAINER - var/datum/atom_hud/data/hydroponic/hydro_hud = huds[DATA_HUD_HYDROPONIC] - prepare_huds() - hydro_hud.add_to_hud(src) - plant_hud_set_nutrient() - plant_hud_set_water() - plant_hud_set_status() - plant_hud_set_health() - plant_hud_set_toxin() - plant_hud_set_pest() - plant_hud_set_weed() /obj/machinery/portable_atmospherics/hydroponics/upgraded/New() ..() @@ -175,6 +176,8 @@ pestlevel = 0 plant_hud_set_status() plant_hud_set_health() + plant_hud_set_weed() + plant_hud_set_pest() //Harvests the product of a plant. /obj/machinery/portable_atmospherics/hydroponics/proc/harvest(var/mob/user) @@ -618,6 +621,7 @@ user.visible_message("[user] starts uprooting the weeds.", "You remove the weeds from the [src].") weedlevel = 0 update_icon() + plant_hud_set_weed() else to_chat(user, "This plot is completely devoid of weeds. It doesn't need uprooting.") From 35457bd80ce533f473e5aecc3a37f3e71cddba1a Mon Sep 17 00:00:00 2001 From: taukausanake Date: Wed, 22 Jun 2016 23:20:50 -0500 Subject: [PATCH 09/11] Forgot to remove bee HUD Yeah, can't do this so removing it. Maybe I'll revisit it once I can muster enough thought processing on it --- code/__DEFINES/hud.dm | 1 - code/game/data_huds.dm | 2 +- code/modules/hydroponics/trays/tray.dm | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index fb21b757b49..7c2e3163fff 100644 --- a/code/__DEFINES/hud.dm +++ b/code/__DEFINES/hud.dm @@ -23,7 +23,6 @@ #define PLANT_TOXIN_HUD "19"// Toxin level #define PLANT_PEST_HUD "20"// Pest level #define PLANT_WEED_HUD "21"// Weed level -#define PLANT_HONEY_HUD "22"// Used on apiary //for antag huds. these are used at the /mob level #define SPECIALROLE_HUD "13" diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 876a8259273..131e889d590 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -47,7 +47,7 @@ hud_icons = list (DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD) /datum/atom_hud/data/hydroponic - hud_icons = list (PLANT_NUTRIENT_HUD, PLANT_WATER_HUD, PLANT_STATUS_HUD, PLANT_HEALTH_HUD, PLANT_TOXIN_HUD, PLANT_PEST_HUD, PLANT_WEED_HUD, PLANT_HONEY_HUD) + hud_icons = list (PLANT_NUTRIENT_HUD, PLANT_WATER_HUD, PLANT_STATUS_HUD, PLANT_HEALTH_HUD, PLANT_TOXIN_HUD, PLANT_PEST_HUD, PLANT_WEED_HUD) /* MED/SEC/DIAG HUD HOOKS */ diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 00e6a853069..c3e3dbd0e00 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -7,7 +7,7 @@ flags = OPENCONTAINER volume = 100 - hud_possible = list (PLANT_NUTRIENT_HUD, PLANT_WATER_HUD, PLANT_STATUS_HUD, PLANT_HEALTH_HUD, PLANT_TOXIN_HUD, PLANT_PEST_HUD, PLANT_WEED_HUD, PLANT_HONEY_HUD) + hud_possible = list (PLANT_NUTRIENT_HUD, PLANT_WATER_HUD, PLANT_STATUS_HUD, PLANT_HEALTH_HUD, PLANT_TOXIN_HUD, PLANT_PEST_HUD, PLANT_WEED_HUD) var/mechanical = 1 // Set to 0 to stop it from drawing the alert lights. var/base_name = "tray" From 5e6f4837ac2e47bc312c826b8a2013e748ac122b Mon Sep 17 00:00:00 2001 From: taukausanake Date: Thu, 23 Jun 2016 00:26:02 -0500 Subject: [PATCH 10/11] Fixed weeds --- code/modules/hydroponics/trays/tray.dm | 2 ++ code/modules/hydroponics/trays/tray_process.dm | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index c3e3dbd0e00..d6b91ff388a 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -75,10 +75,12 @@ if(weedlevel > 0) nymph.reagents.add_reagent("nutriment", weedlevel) weedlevel = 0 + plant_hud_set_weed() nymph.visible_message("[nymph] begins rooting through [src], ripping out weeds and eating them noisily.","You begin rooting through [src], ripping out weeds and eating them noisily.") else if(nymph.nutrition > 100 && nutrilevel < 10) nymph.nutrition -= ((10-nutrilevel)*5) nutrilevel = 10 + plant_hud_set_nutrient() nymph.visible_message("[nymph] secretes a trickle of green liquid, refilling [src].","You secrete a trickle of green liquid, refilling [src].") else nymph.visible_message("[nymph] rolls around in [src] for a bit.","You roll around in [src] for a bit.") diff --git a/code/modules/hydroponics/trays/tray_process.dm b/code/modules/hydroponics/trays/tray_process.dm index 653b6c9d788..4c1988c6221 100644 --- a/code/modules/hydroponics/trays/tray_process.dm +++ b/code/modules/hydroponics/trays/tray_process.dm @@ -21,6 +21,7 @@ // Bonus chance if the tray is unoccupied. if(waterlevel > 10 && nutrilevel > 2 && prob(isnull(seed) ? 6 : 3)) weedlevel += 1 * HYDRO_SPEED_MULTIPLIER + plant_hud_set_weed() // There's a chance for a weed explosion to happen if the weeds take over. // Plants that are themselves weeds (weed_tolerance > 10) are unaffected. @@ -48,8 +49,10 @@ // Maintain tray nutrient and water levels. if(seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) > 0 && nutrilevel > 0 && prob(25)) nutrilevel -= max(0,seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) * HYDRO_SPEED_MULTIPLIER) + plant_hud_set_nutrient() if(seed.get_trait(TRAIT_WATER_CONSUMPTION) > 0 && waterlevel > 0 && prob(25)) waterlevel -= max(0,seed.get_trait(TRAIT_WATER_CONSUMPTION) * HYDRO_SPEED_MULTIPLIER) + plant_hud_set_water() // Make sure the plant is not starving or thirsty. Adequate // water and nutrients will cause a plant to become healthier. @@ -91,6 +94,7 @@ if(toxins > seed.get_trait(TRAIT_TOXINS_TOLERANCE)) health -= toxin_uptake toxins -= toxin_uptake + plant_hud_set_toxin() // Check for pests and weeds. // Some carnivorous plants happily eat pests. @@ -100,6 +104,7 @@ pestlevel -= HYDRO_SPEED_MULTIPLIER else if (pestlevel >= seed.get_trait(TRAIT_PEST_TOLERANCE)) health -= HYDRO_SPEED_MULTIPLIER + plant_hud_set_pest() // Some plants thrive and live off of weeds. if(weedlevel > 0) @@ -108,6 +113,7 @@ weedlevel -= HYDRO_SPEED_MULTIPLIER else if (weedlevel >= seed.get_trait(TRAIT_WEED_TOLERANCE)) health -= HYDRO_SPEED_MULTIPLIER + plant_hud_set_weed() // Handle life and death. // If the plant gets too old, begin killing it each cycle @@ -133,10 +139,4 @@ harvest() check_health() -// No idea what happens in here so sticking all these here for now - plant_hud_set_nutrient() - plant_hud_set_water() - plant_hud_set_toxin() - plant_hud_set_pest() - plant_hud_set_weed() return From c995cc036e23a3fd33f956fcdda35bf04f727ce1 Mon Sep 17 00:00:00 2001 From: taukausanake Date: Thu, 23 Jun 2016 17:14:05 -0500 Subject: [PATCH 11/11] I don't want Tiger to bite my head off --- code/game/data_huds.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 131e889d590..679b4862d77 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -357,41 +357,41 @@ /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_status() var/image/holder = hud_list[PLANT_STATUS_HUD] - if (!seed) + if(!seed) holder.icon_state = "" return - if (harvest) + if(harvest) holder.icon_state = "hudharvest" return - if (dead) + if(dead) holder.icon_state = "huddead" return holder.icon_state = "" /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_health() var/image/holder = hud_list[PLANT_HEALTH_HUD] - if (!seed) + if(!seed) holder.icon_state = "" return holder.icon_state = "hudplanthealth[RoundPlantBar(health/seed.get_trait(TRAIT_ENDURANCE))]" /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_toxin() var/image/holder = hud_list[PLANT_TOXIN_HUD] - if (toxins < 1) // You don't want to see these icons if the value is small + if(toxins < 1) // You don't want to see these icons if the value is small holder.icon_state = "" return holder.icon_state = "hudtoxin[RoundPlantBar(toxins/10)]" /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_pest() var/image/holder = hud_list[PLANT_PEST_HUD] - if (pestlevel < 1) // You don't want to see these icons if the value is small + if(pestlevel < 1) // You don't want to see these icons if the value is small holder.icon_state = "" return holder.icon_state = "hudpest[RoundPlantBar(pestlevel/10)]" /obj/machinery/portable_atmospherics/hydroponics/proc/plant_hud_set_weed() var/image/holder = hud_list[PLANT_WEED_HUD] - if (weedlevel < 1) // You don't want to see these icons if the value is small + if(weedlevel < 1) // You don't want to see these icons if the value is small holder.icon_state = "" return holder.icon_state = "hudweed[RoundPlantBar(weedlevel/10)]" \ No newline at end of file