From 340bfbcbe1e9e0d6ceb5af2e5cac1787d32de0b8 Mon Sep 17 00:00:00 2001 From: thgvr Date: Fri, 16 Feb 2024 20:54:46 -0800 Subject: [PATCH] maybe fixes fishing --- code/modules/fishing/fish/_fish.dm | 12 ++++++------ code/modules/fishing/fishing_minigame.dm | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm index 48219cf98f2f..82edb0698208 100644 --- a/code/modules/fishing/fish/_fish.dm +++ b/code/modules/fishing/fish/_fish.dm @@ -33,7 +33,7 @@ /// What type of reagent this fish needs to be fed. var/food = /datum/reagent/consumable/nutriment /// How often the fish needs to be fed - var/feeding_frequency = 20 MINUTES + var/feeding_frequency = 30 MINUTES /// Time of last feedeing var/last_feeding @@ -263,12 +263,14 @@ /obj/item/fish/proc/process_health(delta_time) var/health_change_per_second = 0 + if(!proper_environment()) health_change_per_second -= 3 //Dying here - if(world.time - last_feeding <= feeding_frequency) - health_change_per_second += 0.5 //Slowly healing + if(world.time - last_feeding >= feeding_frequency) + health_change_per_second -= 0.5 //Starving else - return + health_change_per_second += 0.5 //Slowly healing + adjust_health(health + health_change_per_second) /obj/item/fish/proc/adjust_health(amt) @@ -291,8 +293,6 @@ return if(length(aquarium.tracked_fish) >= AQUARIUM_MAX_BREEDING_POPULATION) //so aquariums full of fish don't need to do these expensive checks return - if(world.time - last_feeding >= feeding_frequency) - return var/list/other_fish_of_same_type = list() for(var/obj/item/fish/fish_in_aquarium in aquarium) if(fish_in_aquarium == src || fish_in_aquarium.type != type) diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm index 18db513aa6ee..f928f07962a3 100644 --- a/code/modules/fishing/fishing_minigame.dm +++ b/code/modules/fishing/fishing_minigame.dm @@ -125,7 +125,7 @@ if(reward_path != FISHING_DUD) playsound(lure, 'sound/effects/bigsplash.ogg', 100) else - user.balloon_alert(user, "it got away") + user.balloon_alert(user, "it got away!") SEND_SIGNAL(src, COMSIG_FISHING_CHALLENGE_COMPLETED, user, win, perfect_win) qdel(src)