Merge pull request #3091 from bakermor/bug-3090

[BUGFIX] added can_have_stat attribute to patrols that reference both p_l and s_c

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,73 @@
+name: Bug report
+description: Create a report to help us improve
+title: "[BUG] "
+body:
+  - type: dropdown
+    id: type
+    attributes:
+      label: Type of bug
+      description: What kind of issue are you experiencing?
+      options:
+      - Please choose an option...
+      - UI - anything to do with the user interface - maybe a button is not working, or the way some assets are formatted seems to be off. 
+      - Sprite - an issue with the art in the game
+      - Audio - issues related to the audio system
+      - Code - general bugs related to how the game runs and responds to you. 
+      - 'Typo - misspellings or incorrect grammar - IMPORTANT: "bugs" of this type are collected here: https://github.com/ClanGenOfficial/clangen/issues/1818'
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Describe the bug
+      placeholder: "ex.: This bug implies that the cat is never..."
+    validations:
+      required: true
+  - type: dropdown
+    id: grade
+    attributes:
+      label: Grade
+      description: How much of an impact does this issue have on play?
+      options:
+      - Please choose an option...
+      - Game-breaking - a bug that makes it impossible to play the game
+      - Dire - Still playable, but a major feature is broken
+      - Important - The bug has a large effect on the gameplay but is not urgent
+      - Regular - A typical bug that should be seen to soon, but doesn't necessarily break the game or inhibit the player
+      - Non-vital - This bug can easily be ignored and does not have a large impact on play
+      - Unimportant - This bug has little to no impact on play. 
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce the behavior
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    id: patrol
+    attributes:
+      label: Patrol ID + Outcome Print (if applicable)
+      placeholder: If you don't know what this means, you probably don't need to fill it out.
+  - type: input
+    id: version
+    attributes:
+      label: "Commit # or Game Version Number"
+    validations:
+      required: true
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: Additional context
+      placeholder: Add any other context about the problem here.
+  - type: textarea
+    id: screenshots
+    attributes: 
+      label: Screenshots
+      placeholder: If applicable, add screenshots to help explain your problem.

resources/dicts/patrols/general/border.json

@@ -233,6 +233,7 @@
                 "art": "gen_coyote_danger2_w1",
                 "stat_trait": [ "playful", "childish", "strange"
                 ],
+                "can_have_stat": ["r_c"],
                 "relationships": [
                     {
                         "cats_to": ["s_c"],
@@ -832,6 +833,7 @@
                 "weight": 5,
                 "art": "gen_bord_patrolwoundedlonerrescue",
                 "stat_trait": [ "childish", "playful", "strange" ],
+                "can_have_stat": ["r_c"],
                 "relationships": [
                     {
                         "cats_to": ["patrol"],
@@ -1576,7 +1578,8 @@
                 "weight": 10,
                 "stat_skill": [
                     "KITTYPET,0", 
-                    "LONER,0"]
+                    "LONER,0"],
+                "can_have_stat": ["r_c"]
             },
             {
                 "text": "The patrol nervously heads towards the unblinking eyes, unsure of what lies ahead. As the strange object comes into view, s_c begins to bristle with unease. {PRONOUN/s_c/subject/CAP} can see strange, mist-like Twolegs floating around the glowing, unblinking face of a... pumpkin? The figures approach s_c, and run their cold, fur-less paws through {PRONOUN/s_c/subject} fur. s_c can hardly hear r_c asking {PRONOUN/s_c/object} why {PRONOUN/s_c/subject}{VERB/s_c/'re/'s} frozen in place.",

resources/dicts/patrols/general/hunting.json

@@ -182,6 +182,7 @@
                 "exp": 0,
                 "weight": 20,
                 "stat_trait": ["childish", "playful" ],
+                "can_have_stat": ["not_pl_rc"],
                 "prey": ["very_small"],
                 "injury": [
                     {
@@ -1251,7 +1252,8 @@
         "text": "r_c kills the distracted rat easily, but p_l points out the putrid scent. c_n could use the prey, but it isn't safe to risk sickness. s_c cocks {PRONOUN/s_c/poss} head. If they aren't going to eat it, can they at least name it? Before p_l can figure out how to reply to that, s_c touches {PRONOUN/s_c/poss} nose to the body of the rat. Henceforth, this rat will be known as Stinkyrat, honored for its stinkiness. Stinkyrat! Stinkyrat!",
         "exp": 30,
         "weight": 10,
-        "stat_trait": ["childish", "playful" ]
+        "stat_trait": ["childish", "playful" ],
+        "can_have_stat": ["r_c"]
       }
     ],
     "fail_outcomes": [

resources/dicts/patrols/general/training.json

@@ -544,6 +544,7 @@
                     "ambitious",
                     "grumpy"
                 ],
+                "can_have_stat": ["r_c"],
                 "relationships": [
                     {
                         "cats_to": ["p_l"],
@@ -3848,6 +3849,7 @@
                 "exp": 20,
                 "weight": 20,
                 "stat_skill": ["SPEAKER,1"],
+                "can_have_stat": ["r_c"],
                 "relationships": [
                     {
                         "cats_to": ["patrol"],
@@ -3877,6 +3879,7 @@
                 "exp": 20,
                 "weight": 20,
                 "stat_skill": ["MEDIATOR,1"],
+                "can_have_stat": ["not_pl_rc"],
                 "relationships": [
                     {
                         "cats_to": ["patrol"],
@@ -3906,6 +3909,7 @@
                 "exp": 20,
                 "weight": 20,
                 "stat_skill": ["CLEVER,1"],
+                "can_have_stat": ["r_c"],
                 "relationships": [
                     {
                         "cats_to": ["patrol"],
@@ -3928,6 +3932,7 @@
                 "exp": 20,
                 "weight": 20,
                 "stat_skill": ["INSIGHTFUL,1"],
+                "can_have_stat": ["r_c"],
                 "relationships": [
                     {
                         "cats_to": ["patrol"],
@@ -3957,6 +3962,7 @@
                 "exp": 20,
                 "weight": 20,
                 "stat_skill": ["HEALER,1"],
+                "can_have_stat": ["r_c"],
                 "injury": [
                     {
                         "cats": ["p_l"],
@@ -4013,6 +4019,7 @@
                     "arrogant",
                     "ambitious"
                 ],
+                "can_have_stat": ["r_c"],
                 "relationships": [
                     {
                         "cats_to": ["s_c"],
@@ -4474,6 +4481,7 @@
                     "arrogant",
                     "ambitious"
                 ],
+                "can_have_stat": ["r_c"],
                 "relationships": [
                     {
                         "cats_to": ["s_c"],
@@ -12081,6 +12089,7 @@
             "exp": 5,
         "weight": 20,
         "stat_trait": ["troublesome", "lonesome", "fierce", "bloodthirsty", "cold", "childish", "playful", "charismatic", "bold", "daring", "nervous", "righteous", "insecure", "strict", "compassionate", "thoughtful", "ambitious", "confident", "adventurous", "calm", "careful", "faithful", "loving", "loyal", "responsible", "shameless", "sneaky", "strange", "vengeful", "wise", "arrogant", "competitive", "grumpy", "cunning", "oblivious", "gloomy", "sincere", "flamboyant", "rebellious"],
+        "can_have_stat": ["not_pl_rc"],
             "relationships": [
         {
                     "cats_to": ["patrol"],
@@ -12097,6 +12106,7 @@
     "exp": 5,
 "weight": 20,
 "stat_trait": ["troublesome", "lonesome", "fierce", "bloodthirsty", "cold", "childish", "playful", "charismatic", "bold", "daring", "nervous", "righteous", "insecure", "strict", "compassionate", "thoughtful", "ambitious", "confident", "adventurous", "calm", "careful", "faithful", "loving", "loyal", "responsible", "shameless", "sneaky", "strange", "vengeful", "wise", "arrogant", "competitive", "grumpy", "cunning", "oblivious", "gloomy", "sincere", "flamboyant", "rebellious"],
+    "can_have_stat": ["not_pl_rc"],
     "relationships": [
 {
             "cats_to": ["patrol"],
@@ -12113,6 +12123,7 @@
     "exp": 5,
 "weight": 20,
 "stat_trait": ["troublesome", "lonesome", "fierce", "bloodthirsty", "cold", "childish", "playful", "charismatic", "bold", "daring", "nervous", "righteous", "insecure", "strict", "compassionate", "thoughtful", "ambitious", "confident", "adventurous", "calm", "careful", "faithful", "loving", "loyal", "responsible", "shameless", "sneaky", "strange", "vengeful", "wise", "arrogant", "competitive", "grumpy", "cunning", "oblivious", "gloomy", "sincere", "flamboyant", "rebellious"],
+    "can_have_stat": ["not_pl_rc"],
     "relationships": [
 {
             "cats_to": ["patrol"],
@@ -12136,6 +12147,7 @@
 	"exp": 10,
     "weight": 40,
     "stat_trait": [ "bloodthirsty", "arrogant", "ambitious", "confident", "sneaky", "cunning", "fierce", "competitive" ],
+    "can_have_stat": ["not_pl_rc"],
 	"relationships": [
 {
 			"cats_to": [ "patrol" ],
@@ -12160,6 +12172,7 @@
             "weight": 40,
             "stat_trait": [ "bloodthirsty", "adventurous", "arrogant", "ambitious", "confident", "fierce", "competitive" ],
             "stat_skill": [ "FIGHTER,2"],
+            "can_have_stat": ["not_pl_rc"],
             "relationships": [
         {
                     "cats_to": [ "patrol" ],
@@ -12184,6 +12197,7 @@
             "weight": 40,
             "stat_trait": [ "wise", "thoughtful", "calm", "careful", "lonesome" ],
             "stat_skill": [ "FIGHTER,2"],
+            "can_have_stat": ["not_pl_rc"],
             "relationships": [
         {
                     "cats_to": [ "patrol" ],
@@ -12208,6 +12222,7 @@
             "weight": 40,
             "stat_trait": [ "cunning", "sneaky", "shameless", "flamboyant", "charismatic", "daring", "bold" ],
             "stat_skill": [ "FIGHTER,1"],
+            "can_have_stat": ["not_pl_rc"],
             "relationships": [
         {
                     "cats_to": [ "patrol" ],
@@ -12232,6 +12247,7 @@
             "weight": 40,
             "stat_trait": [ "charismatic", "loving", "compassionate", "loyal", "faithful", "cunning", "thoughtful", "sincere" ],
             "stat_skill": [ "FIGHTER,2"],
+            "can_have_stat": ["not_pl_rc"],
             "relationships": [
         {
                     "cats_to": [ "patrol" ],
@@ -12256,6 +12272,7 @@
             "weight": 40,
             "stat_trait": [ "cunning", "sneaky", "cold", "lonesome", "grumpy", "gloomy", "strict", "strange", "insecure", "nervous" ],
             "stat_skill": [ "FIGHTER,2"],
+            "can_have_stat": ["not_pl_rc"],
             "relationships": [
         {
                     "cats_to": [ "patrol" ],
@@ -12280,6 +12297,7 @@
             "weight": 40,
             "stat_trait": [ "gloomy", "lonesome", "insecure", "nervous" ],
             "stat_skill": [ "FIGHTER,2"],
+            "can_have_stat": ["not_pl_rc"],
             "relationships": [
         {
                     "cats_to": [ "patrol" ],
@@ -12303,6 +12321,7 @@
             "exp": 10,
             "weight": 40,
             "stat_skill": [ "CLAIRVOYANT,1"],
+            "can_have_stat": ["not_pl_rc"],
             "relationships": [
         {
                     "cats_to": [ "patrol" ],
@@ -12328,6 +12347,7 @@
             "exp": 0,
             "weight": 40,
             "stat_trait": [ "childish"],
+            "can_have_stat": ["not_pl_rc"],
             "relationships": [
         {
                     "cats_to": [ "s_c" ],
@@ -12353,6 +12373,7 @@
         "stat_trait": [ 
         "troublesome", "lonesome", "cold", "childish", "playful", "charismatic", "bold", "daring", "nervous", "righteous", "insecure", "strict", "compassionate", "thoughtful", "confident", "calm", "careful", "faithful", "loving", "loyal", "responsible", "shameless", "sneaky", "strange", "vengeful", "wise", "arrogant", "competitive", "grumpy", "cunning", "oblivious", "gloomy", "sincere", "flamboyant", "rebellious"
     ],
+        "can_have_stat": ["not_pl_rc"],
         "relationships": [
     {
                 "cats_to": [ "s_c" ],
@@ -12371,6 +12392,7 @@
             "stat_trait": [ 
             "troublesome", "lonesome", "fierce", "bloodthirsty", "cold", "childish", "playful", "charismatic", "bold", "daring", "nervous", "righteous", "insecure", "strict", "compassionate", "thoughtful", "ambitious", "confident", "adventurous", "calm", "careful", "faithful", "loving", "loyal", "responsible", "shameless", "sneaky", "strange", "vengeful", "wise", "arrogant", "competitive", "grumpy", "cunning", "oblivious", "gloomy", "sincere", "flamboyant", "rebellious"
         ],
+            "can_have_stat": ["not_pl_rc"],
             "relationships": [
         {
                     "cats_to": [ "p_l", "r_c" ],
@@ -12396,6 +12418,7 @@
                 "stat_trait": [ 
                 "troublesome", "lonesome", "fierce", "bloodthirsty", "cold", "childish", "bold", "daring", "righteous", "insecure", "strict", "ambitious", "confident", "adventurous", "faithful", "loyal", "shameless", "sneaky", "strange", "vengeful", "arrogant", "competitive", "grumpy", "gloomy", "sincere", "flamboyant", "rebellious"
             ],
+                "can_have_stat": ["not_pl_rc"],
                 "relationships": [
             {
                         "cats_to": [ "p_l", "r_c" ],
@@ -12443,6 +12466,7 @@
                 "stat_trait": [ 
                 "troublesome", "lonesome", "fierce", "bloodthirsty", "cold", "childish", "bold", "daring", "righteous", "insecure", "strict", "ambitious", "confident", "adventurous", "faithful", "loyal", "shameless", "sneaky", "strange", "vengeful", "arrogant", "competitive", "grumpy", "gloomy", "sincere", "flamboyant", "rebellious"
             ],
+                "can_have_stat": ["not_pl_rc"],
             "injury": [
                 {
                     "cats": [ "p_l" ],