Skip to content

Grues cannot marry and reproduce anymore #38732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
boy2mantwicethefam wants to merge 1 commit into from
Closed

Grues cannot marry and reproduce anymore #38732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/controllers/configuration.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@

var/renders_url = ""

var/grue_egglaying = 1 //Whether or not grues can lay eggs to reproduce
// var/grue_egglaying = 1 //Whether or not grues can lay eggs to reproduce

var/skip_minimap_generation = 0 //If 1, don't generate minimaps
var/skip_holominimap_generation = 0 //If 1, don't generate holominimaps
Expand Down Expand Up @@ -423,8 +423,8 @@
if ("no_respawn_as_hobo")
config.respawn_as_hobo = 0

if ("no_grue_egglaying")
config.grue_egglaying = 0
// if ("no_grue_egglaying")
// config.grue_egglaying = 0

if ("servername")
config.server_name = value
Expand Down
12 changes: 5 additions & 7 deletions code/datums/gamemode/role/grue.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@
AppendObjective(/datum/objective/grue/grue_basic)
else
AppendObjective(/datum/objective/grue/eat_sentients)
if(prob(50) && config.grue_egglaying)
AppendObjective(/datum/objective/grue/spawn_offspring)
// if(prob(50) && config.grue_egglaying)
// AppendObjective(/datum/objective/grue/spawn_offspring)

/datum/role/grue/GetScoreboard()
. = ..()
. += "The grue ate [eatencount] sentient being[eatencount==1 ? "" : "s"]"
if(config.grue_egglaying)
. += " and spawned [spawncount] offspring"
. += ".<BR>"

. += "The grue ate [eatencount] sentient being[eatencount==1 ? "" : "s"].<BR>"
// if(config.grue_egglaying)
// . += " and spawned [spawncount] offspring"
94 changes: 47 additions & 47 deletions code/modules/mob/living/simple_animal/hostile/grue.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@

var/lifestage=GRUE_ADULT //1=baby grue, 2=grueling, 3=(mature) grue
var/eatencount=0 //number of sentient carbons eaten, makes the grue more powerful
var/eatencharge=0 //power charged by eating sentient carbons, increments with eatencount but is spent on upgrades
var/spawncount=0 //how many eggs laid by this grue have successfully hatched
// var/eatencharge=0 //power charged by eating sentient carbons, increments with eatencount but is spent on upgrades
// var/spawncount=0 //how many eggs laid by this grue have successfully hatched

var/number = 1 //Appends a number to the grue to keep it distinguishable, the compiler doesn't play nicely with putting rand(1, 1000) here so it goes in New()

Expand Down Expand Up @@ -267,8 +267,8 @@
handle_feed(pick(feed_targets))

//Egglaying
if(config.grue_egglaying && (lifestage==GRUE_ADULT) && (eatencharge>0) && (lightparams.dark_dim_light==GRUE_DARK))
reproduce()
// if(config.grue_egglaying && (lifestage==GRUE_ADULT) && (eatencharge>0) && (lightparams.dark_dim_light==GRUE_DARK))
// reproduce()

//Movement
//
Expand Down Expand Up @@ -413,8 +413,8 @@
pass_flags = 0
reagents.maximum_volume = 1500
//Adult grue spells: eat, lay eggs, shadow shunt, and drain light
if(config.grue_egglaying)
add_spell(new /spell/aoe_turf/grue_egg, "grue_spell_ready", /obj/abstract/screen/movable/spell_master/grue)
// if(config.grue_egglaying)
// add_spell(new /spell/aoe_turf/grue_egg, "grue_spell_ready", /obj/abstract/screen/movable/spell_master/grue)
add_spell(new /spell/aoe_turf/grue_blink, "grue_spell_ready", /obj/abstract/screen/movable/spell_master/grue)
add_spell(new /spell/aoe_turf/grue_drainlight/, "grue_spell_ready", /obj/abstract/screen/movable/spell_master/grue)
add_spell(new /spell/targeted/grue_eat, "grue_spell_ready", /obj/abstract/screen/movable/spell_master/grue)
Expand Down Expand Up @@ -448,8 +448,8 @@
stat(null, "Nutritive energy: [round(nutrienergy,0.1)]/[round(maxnutrienergy,0.1)]")
if(lifestage>=GRUE_JUVENILE)
stat(null, "Sentient organisms eaten: [eatencount]")
if(config.grue_egglaying && lifestage==GRUE_ADULT)
stat(null, "Reproductive energy: [eatencharge]")
// if(config.grue_egglaying && lifestage==GRUE_ADULT)
// stat(null, "Reproductive energy: [eatencharge]")

/mob/living/simple_animal/hostile/grue/gruespawn
lifestage=GRUE_LARVA
Expand Down Expand Up @@ -523,8 +523,8 @@
var/hintstring=""
if(lifestage==GRUE_JUVENILE)
hintstring="a juvenile, and can eat sentient beings to gain their strength"
else if(lifestage==GRUE_ADULT)
hintstring="fully-grown[config.grue_egglaying ? ", and can lay eggs to spawn offspring" : ""]"
// else if(lifestage==GRUE_ADULT)
// hintstring="fully-grown[config.grue_egglaying ? ", and can lay eggs to spawn offspring" : ""]"
visible_message("<span class='warning'>The chrysalis shifts and morphs into a grue!</span>","<span class='warning'>You finish moulting! You are now [hintstring].</span>")
playsound(src, 'sound/effects/grue_moult.ogg', 50, 1)
else
Expand All @@ -540,42 +540,42 @@
..()

//Reproduction via egglaying.
/mob/living/simple_animal/hostile/grue/proc/reproduce()

if(lifestage==GRUE_ADULT) //must be adult
if(eatencharge<=0)
to_chat(src, "<span class='notice'>You need to feed more first.</span>")
return
else if(!isturf(loc))
to_chat(src, "<span class='notice'>You need more room to reproduce.</span>")
return
else if(stat==UNCONSCIOUS)
to_chat(src, "<span class='notice'>You must be awake to reproduce.</span>")
return
else if(busy)
to_chat(src, "<span class='notice'>You are already doing something.</span>")
return
else
handle_reproduce()

else
to_chat(src, "<span class='notice'>You haven't grown enough to reproduce yet.</span>")

/mob/living/simple_animal/hostile/grue/proc/handle_reproduce()

if(eatencharge>=1)
busy=TRUE
visible_message("<span class='warning'>\The [src] tightens up...</span>","<span class='notice'>You start to push out an egg...</span>")
if(do_after(src, src, 5 SECONDS))
visible_message("<span class='warning'>\The [src] pushes out an egg!</span>","<span class='notice'>You lay an egg.</span>")
eatencharge--
var/mob/living/simple_animal/grue_egg/E = new /mob/living/simple_animal/grue_egg(get_turf(src))
E.parent_grue=src //mark this grue as the parent of the egg
busy=FALSE

else
to_chat(src, "<span class='notice'>You need to feed more first.</span>")
return
// /mob/living/simple_animal/hostile/grue/proc/reproduce()

// if(lifestage==GRUE_ADULT) //must be adult
// if(eatencharge<=0)
// to_chat(src, "<span class='notice'>You need to feed more first.</span>")
// return
// else if(!isturf(loc))
// to_chat(src, "<span class='notice'>You need more room to reproduce.</span>")
// return
// else if(stat==UNCONSCIOUS)
// to_chat(src, "<span class='notice'>You must be awake to reproduce.</span>")
// return
// else if(busy)
// to_chat(src, "<span class='notice'>You are already doing something.</span>")
// return
// else
// handle_reproduce()

// else
// to_chat(src, "<span class='notice'>You haven't grown enough to reproduce yet.</span>")

///mob/living/simple_animal/hostile/grue/proc/handle_reproduce()

// if(eatencharge>=1)
// busy=TRUE
// visible_message("<span class='warning'>\The [src] tightens up...</span>","<span class='notice'>You start to push out an egg...</span>")
// if(do_after(src, src, 5 SECONDS))
// visible_message("<span class='warning'>\The [src] pushes out an egg!</span>","<span class='notice'>You lay an egg.</span>")
// eatencharge--
// var/mob/living/simple_animal/grue_egg/E = new /mob/living/simple_animal/grue_egg(get_turf(src))
// E.parent_grue=src //mark this grue as the parent of the egg
// busy=FALSE

// else
// to_chat(src, "<span class='notice'>You need to feed more first.</span>")
// return

//Procs for grabbing players.
/mob/living/simple_animal/hostile/grue/proc/request_player()
Expand Down Expand Up @@ -632,7 +632,7 @@
var/datum/role/grue/G = mind.GetRole(GRUE)
if(G)
G.eatencount++
eatencharge++ //can be spent on egg laying
// eatencharge++ //can be spent on egg laying
grue_stat_updates(TRUE)
else
if(isskellington(E))
Expand Down
26 changes: 13 additions & 13 deletions code/modules/mob/living/simple_animal/hostile/grue_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,19 @@
/spell/aoe_turf/grue_hide/cast(list/targets, mob/living/simple_animal/hostile/grue/user)
user.hide()

/spell/aoe_turf/grue_egg
name = "Reproduce"
desc = "Spawn offspring in the form of an egg."
user_type = USER_TYPE_GRUE
panel = "Grue"
hud_state = "grue_egg"
override_base = "grue"
range = 0
charge_type = SP_RECHARGE
charge_cooldown_max = 0

/spell/aoe_turf/grue_egg/cast(list/targets, mob/living/simple_animal/hostile/grue/user)
user.reproduce()
///spell/aoe_turf/grue_egg
// name = "Reproduce"
// desc = "Spawn offspring in the form of an egg."
// user_type = USER_TYPE_GRUE
// panel = "Grue"
// hud_state = "grue_egg"
// override_base = "grue"
// range = 0
// charge_type = SP_RECHARGE
// charge_cooldown_max = 0

///spell/aoe_turf/grue_egg/cast(list/targets, mob/living/simple_animal/hostile/grue/user)
// user.reproduce()

/spell/aoe_turf/grue_moult
name = "Moult"
Expand Down
Loading