From 2424ee053988ceff5658c087cfc107106c7662a4 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 8 May 2018 13:36:41 -0400 Subject: [PATCH 1/3] Quirk limit now only applies to positive quirks --- code/modules/client/preferences.dm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7558380a36..5948da99a0 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -871,6 +871,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) Traits are applied at roundstart and cannot normally be removed." dat += "
Done
" dat += "
" +<<<<<<< HEAD dat += "
Current traits: [all_traits.len ? all_traits.Join(", ") : "None"]
" dat += "
[all_traits.len] / [MAX_TRAITS] max traits
\ Trait balance remaining: [GetTraitBalance()]

" @@ -879,6 +880,16 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/trait_name = initial(T.name) var/has_trait var/trait_cost = initial(T.value) * -1 +======= + dat += "
Current quirks: [all_quirks.len ? all_quirks.Join(", ") : "None"]
" + dat += "
[positive_quirks.len] / [MAX_QUIRKS] max positive quirks
\ + Quirk balance remaining: [GetQuirkBalance()]

" + for(var/V in SSquirks.quirks) + var/datum/quirk/T = SSquirks.quirks[V] + var/quirk_name = initial(T.name) + var/has_quirk + var/quirk_cost = initial(T.value) * -1 +>>>>>>> e74f33d... Quirk limit now only applies to positive quirks var/lock_reason = "This trait is unavailable." var/trait_conflict = FALSE for(var/_V in all_traits) @@ -986,11 +997,16 @@ GLOBAL_LIST_EMPTY(preferences_datums) neutral_traits -= trait all_traits -= trait else +<<<<<<< HEAD if(all_traits.len >= MAX_TRAITS) to_chat(user, "You can't have more than [MAX_TRAITS] traits!") return neutral_traits += trait all_traits += trait +======= + neutral_quirks += quirk + all_quirks += quirk +>>>>>>> e74f33d... Quirk limit now only applies to positive quirks else var/balance = GetTraitBalance() if(trait in positive_traits) @@ -1003,8 +1019,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) negative_traits -= trait all_traits -= trait else if(value > 0) +<<<<<<< HEAD if(all_traits.len >= MAX_TRAITS) to_chat(user, "You can't have more than [MAX_TRAITS] traits!") +======= + if(positive_quirks.len >= MAX_QUIRKS) + to_chat(user, "You can't have more than [MAX_QUIRKS] positive quirks!") +>>>>>>> e74f33d... Quirk limit now only applies to positive quirks return if(balance - value < 0) to_chat(user, "You don't have enough balance to gain this trait!") @@ -1012,12 +1033,18 @@ GLOBAL_LIST_EMPTY(preferences_datums) positive_traits += trait all_traits += trait else +<<<<<<< HEAD if(all_traits.len >= MAX_TRAITS) to_chat(user, "You can't have more than [MAX_TRAITS] traits!") return negative_traits += trait all_traits += trait SetTraits(user) +======= + negative_quirks += quirk + all_quirks += quirk + SetQuirks(user) +>>>>>>> e74f33d... Quirk limit now only applies to positive quirks if("reset") all_traits = list() positive_traits = list() From e990ac3ef77423b0a9959bd1dbf2c7bfa15a1fc9 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 13 May 2018 22:06:35 -0500 Subject: [PATCH 2/3] Update preferences.dm --- code/modules/client/preferences.dm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 5948da99a0..fd0e043a1e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -871,16 +871,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) Traits are applied at roundstart and cannot normally be removed." dat += "
Done
" dat += "
" -<<<<<<< HEAD - dat += "
Current traits: [all_traits.len ? all_traits.Join(", ") : "None"]
" - dat += "
[all_traits.len] / [MAX_TRAITS] max traits
\ - Trait balance remaining: [GetTraitBalance()]

" - for(var/V in SStraits.traits) - var/datum/trait/T = SStraits.traits[V] - var/trait_name = initial(T.name) - var/has_trait - var/trait_cost = initial(T.value) * -1 -======= dat += "
Current quirks: [all_quirks.len ? all_quirks.Join(", ") : "None"]
" dat += "
[positive_quirks.len] / [MAX_QUIRKS] max positive quirks
\ Quirk balance remaining: [GetQuirkBalance()]

" @@ -889,7 +879,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/quirk_name = initial(T.name) var/has_quirk var/quirk_cost = initial(T.value) * -1 ->>>>>>> e74f33d... Quirk limit now only applies to positive quirks var/lock_reason = "This trait is unavailable." var/trait_conflict = FALSE for(var/_V in all_traits) @@ -1669,4 +1658,4 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(icon_updates) character.update_body() character.update_hair() - character.update_body_parts() \ No newline at end of file + character.update_body_parts() From 21bc6c48efb9cd69855656fa461c1a5f87ccee1d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 14 May 2018 09:53:00 -0500 Subject: [PATCH 3/3] Update preferences.dm --- code/modules/client/preferences.dm | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index fd0e043a1e..ef90d49d05 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -986,16 +986,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) neutral_traits -= trait all_traits -= trait else -<<<<<<< HEAD - if(all_traits.len >= MAX_TRAITS) - to_chat(user, "You can't have more than [MAX_TRAITS] traits!") - return - neutral_traits += trait - all_traits += trait -======= neutral_quirks += quirk all_quirks += quirk ->>>>>>> e74f33d... Quirk limit now only applies to positive quirks else var/balance = GetTraitBalance() if(trait in positive_traits) @@ -1008,13 +1000,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) negative_traits -= trait all_traits -= trait else if(value > 0) -<<<<<<< HEAD - if(all_traits.len >= MAX_TRAITS) - to_chat(user, "You can't have more than [MAX_TRAITS] traits!") -======= if(positive_quirks.len >= MAX_QUIRKS) to_chat(user, "You can't have more than [MAX_QUIRKS] positive quirks!") ->>>>>>> e74f33d... Quirk limit now only applies to positive quirks return if(balance - value < 0) to_chat(user, "You don't have enough balance to gain this trait!") @@ -1022,18 +1009,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) positive_traits += trait all_traits += trait else -<<<<<<< HEAD - if(all_traits.len >= MAX_TRAITS) - to_chat(user, "You can't have more than [MAX_TRAITS] traits!") - return - negative_traits += trait - all_traits += trait - SetTraits(user) -======= negative_quirks += quirk all_quirks += quirk SetQuirks(user) ->>>>>>> e74f33d... Quirk limit now only applies to positive quirks if("reset") all_traits = list() positive_traits = list()