From 577ec5eba99a1a46ed6f2c21c169f7082e499b82 Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Mon, 3 Oct 2011 01:29:41 +0000 Subject: [PATCH] =?UTF-8?q?Committed=20for=20Rolan7:=20=20=20=20=20?= =?UTF-8?q?=E2=97=A6=20Fixed=20job=20assignments.=20Hopefully=20this=20sho?= =?UTF-8?q?uld=20stop=20the=20massive=20amount=20of=20assistants=20spawnin?= =?UTF-8?q?g=20at=20round=20start!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit My changes: ◦ Fixed some Metroid-related bugs. Had stuff to do with draining life out of things and being able to move at the same time. Also some stuff with the way Metroids' speech is handled. ◦ Removed some unnecessary, commented-out code from the say() proc. ◦ Removed the chat bubble preference from the character creation screen. ◦ Added some more chat bubble themes, in the event someone wants to continue that. I've lost all motivation to continue the project because, no matter what I do, it just looks butt-ugly and laggy as hell. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2321 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/mob/living/carbon/metroid.dm | 2 +- code/game/jobs/jobprocs.dm | 29 +---- .../modules/mob/living/carbon/metroid/life.dm | 3 +- .../mob/living/carbon/metroid/powers.dm | 4 +- code/modules/mob/living/carbon/metroid/say.dm | 14 ++- code/modules/mob/living/say.dm | 109 ++++++++++++++---- code/modules/mob/new_player/preferences.dm | 2 +- icons/changelog.html | 5 + icons/effects/speechbubble.dmi | Bin 1925 -> 2960 bytes 9 files changed, 116 insertions(+), 52 deletions(-) diff --git a/code/defines/mob/living/carbon/metroid.dm b/code/defines/mob/living/carbon/metroid.dm index dffbd2fade0..2d2cefc503e 100644 --- a/code/defines/mob/living/carbon/metroid.dm +++ b/code/defines/mob/living/carbon/metroid.dm @@ -7,7 +7,7 @@ icon_state = "baby metroid" pass_flags = PASSTABLE voice_message = "skree!" - say_message = "says" + say_message = "hums" health = 150 gender = NEUTER diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index 748f23c93d5..1c0dfcf9f14 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -31,8 +31,8 @@ var/list/candidates = FindOccupationCandidates(unassigned, command_position, level) if(!candidates.len) continue var/mob/new_player/candidate = pick(candidates) - unassigned -= candidate if(Assign_Role(candidate, command_position)) + unassigned -= candidate jobs[command_position]-- return 1 return 0 @@ -48,8 +48,8 @@ candidates -= player if(candidates.len) var/mob/new_player/candidate = pick(candidates) - unassigned -= candidate if(Assign_Role(candidate, "AI")) + unassigned -= candidate jobs["AI"]-- ai_selected++ break @@ -59,8 +59,8 @@ for(var/mob/new_player/player in unassigned) if(jobban_isbanned(player, "AI")) continue - unassigned -= player if(Assign_Role(player, "AI")) + unassigned -= player jobs["AI"]-- ai_selected++ break @@ -107,31 +107,12 @@ var/list/candidates = FindOccupationCandidates(unassigned, occupation, level) while(candidates.len && occupations_available[occupation]) var/mob/new_player/candidate = pick(candidates) - unassigned -= candidate if(Assign_Role(candidate, occupation)) + unassigned -= candidate occupations_available[occupation]-- - if(!unassigned.len) return 1 - - //Set all remaining players to an assistant job - var/list/vacancies = list() - for(var/assist_job in assistant_occupations) - if(!occupations_available[assist_job] > 0) continue - for(var/i = 1 to occupations_available[assist_job]) - vacancies += assist_job - for(var/mob/new_player/player in unassigned) - if((!unassigned.len) || (!vacancies.len)) break - unassigned -= player - var/assist_job = pick(vacancies) - if(Assign_Role(player, assist_job)) - vacancies -= assist_job - - if(unassigned.len) - for(var/mob/new_player/player in unassigned) - if(!unassigned.len) break - Assign_Role(player, "Assistant") - //If anyone still has no job then something is fucked up with their mob and they will currently spawn at spawn but the runtimes should no longer dump several people here + Assign_Role(player, "Assistant") return 1 diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm index 5df8d7d35d2..88fac4623c4 100644 --- a/code/modules/mob/living/carbon/metroid/life.dm +++ b/code/modules/mob/living/carbon/metroid/life.dm @@ -43,7 +43,8 @@ handle_nutrition() if(Tempstun) - canmove = 0 + if(!Victim) // not while they're eating! + canmove = 0 else canmove = 1 diff --git a/code/modules/mob/living/carbon/metroid/powers.dm b/code/modules/mob/living/carbon/metroid/powers.dm index 136487e4695..157c9918cdf 100644 --- a/code/modules/mob/living/carbon/metroid/powers.dm +++ b/code/modules/mob/living/carbon/metroid/powers.dm @@ -103,8 +103,8 @@ if(cloneloss<0) cloneloss = 0 nutrition += rand(10,25) - if(nutrition >= lastnut + 100) - if(prob(60)) + if(nutrition >= lastnut + 50) + if(prob(80)) lastnut = nutrition powerlevel++ if(powerlevel > 10) diff --git a/code/modules/mob/living/carbon/metroid/say.dm b/code/modules/mob/living/carbon/metroid/say.dm index 6bb65f63f8d..a1e49441963 100644 --- a/code/modules/mob/living/carbon/metroid/say.dm +++ b/code/modules/mob/living/carbon/metroid/say.dm @@ -1,3 +1,15 @@ /mob/living/carbon/metroid/say_quote(var/text) - return "[src.say_message], \"[text]\""; + var/ending = copytext(text, length(text)) + + if (ending == "?") + return "telepathically asks, \"[text]\""; + else if (ending == "!") + return "telepathically cries, \"[text]\""; + + return "telepathically chirps, \"[text]\""; + +/mob/living/carbon/metroid/say_understands(var/other) + if (istype(other, /mob/living/carbon/metroid)) + return 1 + return ..() diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index dd9e0a7afe8..08e56e3116b 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -312,8 +312,60 @@ else rendered = "[real_name][alt_name] [message_a]" +/* + // Create speech bubble + var/obj/speech_bubble/B = new/obj/speech_bubble + B.icon = 'speechbubble.dmi' + B.parent = src + B.mouse_opacity = 0 + B.invisibility = invisibility + B.layer = 10 + + // Determine if the speech bubble's going to have a special look + var/presay = "" + if(istype(src, /mob/living/silicon)) + presay = "bot" + if(istype(src, /mob/living/carbon/alien)) + presay = "xeno" + if(istype(src, /mob/living/carbon/metroid)) + presay = "metroid" +*/ for (var/mob/M in heard_a) + M.show_message(rendered, 2) + /* + if(M.client) + + // If this client has bubbles disabled, obscure the bubble + if(!M.client.bubbles || M == src) + var/image/I = image('speechbubble.dmi', B, "override") + I.override = 1 + M << I + */ + /* + // find the suffix, if bot, human or monkey + var/punctuation = "" + if(presay == "bot" || presay == "") + var/ending = copytext(text, length(text)) + if (ending == "?") + punctuation = "question" + else if (ending == "!") + punctuation = "exclamation" + else + punctuation = "" + + // flick the bubble + flick("[presay]say[punctuation]", B) + + if(istype(loc, /turf)) + B.loc = loc + else + B.loc = loc.loc + + spawn() + sleep(11) + del(B) + */ if (length(heard_b)) var/message_b @@ -329,37 +381,50 @@ rendered = "[voice_name] [message_b]" + + /* + // Create speech bubble + var/obj/speech_bubble/B = new/obj/speech_bubble + B.icon = 'speechbubble.dmi' + B.parent = src + B.mouse_opacity = 0 + B.invisibility = invisibility + B.layer = 10 + + // Determine if the speech bubble's going to have a special look + var/presay = "" + if(istype(src, /mob/living/silicon)) + presay = "bot" + if(istype(src, /mob/living/carbon/alien)) + presay = "xeno" + if(istype(src, /mob/living/carbon/metroid)) + presay = "metroid" + */ + for (var/mob/M in heard_b) M.show_message(rendered, 2) + /* if(M.client) - spawn() - var/isbot = "" - if(istype(src, /mob/living/silicon)) - isbot = "bot" - var/obj/speech_bubble/B = new/obj/speech_bubble - B.icon = 'speechbubble.dmi' - B.parent = src - B.mouse_opacity = 0 - B.invisibility = invisibility - B.layer = 10 + if(!M.client.bubbles || M == src) + var/image/I = image('speechbubble.dmi', B, "override") + I.override = 1 + M << I + */ /* - if(!M.client.bubbles || M == src) - var/image/I = image('speechbubble.dmi', B, "override") - I.override = 1 - M << I + flick("[presay]say", B) - flick("[isbot]say", B) + if(istype(loc, /turf)) + B.loc = loc + else + B.loc = loc.loc - if(istype(loc, /turf)) - B.loc = loc - else - B.loc = loc.loc + spawn() + sleep(11) + del(B) + */ - sleep(11) - del(B) - */ log_say("[name]/[key] : [message]") diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 0524cab14b1..e7d5cf283c8 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -394,7 +394,7 @@ datum/preferences dat += "
" dat += "UI Style: [UI == UI_NEW ? "New" : "Old"]
" dat += "Play admin midis: [midis == 1 ? "Yes" : "No"]
" - dat += "Show chat bubbles: [bubbles == 1 ? "Yes" : "No"]
" + //dat += "Show chat bubbles: [bubbles == 1 ? "Yes" : "No"]
" if((user.client) && (user.client.holder) && (user.client.holder.rank) && (user.client.holder.rank == "Game Master")) dat += "
OOC
" diff --git a/icons/changelog.html b/icons/changelog.html index 6eac40bff61..1db66672792 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -67,6 +67,11 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • Less ponies, gryphons, and Tohou.
    • +
  • Rolan7 updated: + +
    • 1 October 2011: diff --git a/icons/effects/speechbubble.dmi b/icons/effects/speechbubble.dmi index 1cedd80ddc6b8a2b6462c69cc2699f5caa791ed7..eff411b793290064e70e7795366d9b819205201a 100644 GIT binary patch literal 2960 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