jonpreamble commited on
Commit
498d5e9
·
1 Parent(s): 8679a4b

QUESTION_IS_ACTION_RUNNING_AWAY is firing even when I'm not engaged with bandits so I'm trying to fix that

Browse files
Files changed (1) hide show
  1. app.py +1 -3
app.py CHANGED
@@ -69,7 +69,7 @@ def run_1_game_turn(s_narr_transcript, s_n_turns_elapsed, s_user_transcript, s_u
69
  elif decider_utils.yesno(QUESTION_IS_ACTION_LIKELY_LETHAL, s_user_input, default=NO):
70
  finally_add2_both_tscripts += game_over_fail_txt("You have taken an action that is likely to result in killing someone.")
71
 
72
- elif decider_utils.yesno(QUESTION_IS_ACTION_RUNNING_AWAY, s_user_input, default=NO):
73
  finally_add2_both_tscripts += "Invalid entry. You cannot outrun these bandits.\n"
74
 
75
  elif decider_utils.yesno(QUESTION_IS_ACTION_MAGIC, s_user_input, default=NO):
@@ -93,7 +93,6 @@ def run_1_game_turn(s_narr_transcript, s_n_turns_elapsed, s_user_transcript, s_u
93
  s_narr_transcript += s_new_part + "\n"
94
  s_user_transcript += s_new_part + "\n"
95
 
96
-
97
  did_user_kill = decider_utils.yesno(QUESTION_DID_PROTAGONIST_KILL, s_new_part, default=NO)
98
  did_user_kill = did_user_kill or decider_utils.yesno(QUESTION_DID_PROTAGONIST_KILL, s_narr_transcript, default=NO)
99
  if did_user_kill:
@@ -108,7 +107,6 @@ def run_1_game_turn(s_narr_transcript, s_n_turns_elapsed, s_user_transcript, s_u
108
  else:
109
  finally_add2_both_tscripts += game_over_fail_txt("You reached home with less than 30 gold - too little for your family to live on.")
110
 
111
-
112
  # End of code block User input accepted.
113
 
114
  s_n_turns_elapsed = str(n_turns_elapsed)
 
69
  elif decider_utils.yesno(QUESTION_IS_ACTION_LIKELY_LETHAL, s_user_input, default=NO):
70
  finally_add2_both_tscripts += game_over_fail_txt("You have taken an action that is likely to result in killing someone.")
71
 
72
+ elif decider_utils.yesno(QUESTION_IS_USER_ENGAGED_WITH_BANDITS, s_narr_transcript, default=NO) and decider_utils.yesno(QUESTION_IS_ACTION_RUNNING_AWAY, s_user_input, default=NO):
73
  finally_add2_both_tscripts += "Invalid entry. You cannot outrun these bandits.\n"
74
 
75
  elif decider_utils.yesno(QUESTION_IS_ACTION_MAGIC, s_user_input, default=NO):
 
93
  s_narr_transcript += s_new_part + "\n"
94
  s_user_transcript += s_new_part + "\n"
95
 
 
96
  did_user_kill = decider_utils.yesno(QUESTION_DID_PROTAGONIST_KILL, s_new_part, default=NO)
97
  did_user_kill = did_user_kill or decider_utils.yesno(QUESTION_DID_PROTAGONIST_KILL, s_narr_transcript, default=NO)
98
  if did_user_kill:
 
107
  else:
108
  finally_add2_both_tscripts += game_over_fail_txt("You reached home with less than 30 gold - too little for your family to live on.")
109
 
 
110
  # End of code block User input accepted.
111
 
112
  s_n_turns_elapsed = str(n_turns_elapsed)