Refactor "text scrawl" to "text crawl" (sounds more simple to understand than scrawl tbh)
This commit is contained in:
		
							parent
							
								
									9ebc0f9b54
								
							
						
					
					
						commit
						d1e7b2920b
					
				@ -229,8 +229,8 @@ public:
 | 
			
		||||
  // Current wait time between messages for the queue system
 | 
			
		||||
  int stay_time();
 | 
			
		||||
 | 
			
		||||
  // Returns the letter display speed during text scrawl in in-character messages
 | 
			
		||||
  int get_text_scrawl();
 | 
			
		||||
  // Returns the letter display speed during text crawl in in-character messages
 | 
			
		||||
  int get_text_crawl();
 | 
			
		||||
 | 
			
		||||
  // Returns Minimum amount of time (in miliseconds) that must pass before the next Enter key press will send your IC message. (new behaviour)
 | 
			
		||||
  int get_chat_ratelimit();
 | 
			
		||||
 | 
			
		||||
@ -58,8 +58,8 @@ private:
 | 
			
		||||
  QCheckBox *ui_desync_logs_cb;
 | 
			
		||||
  QLabel *ui_instant_objection_lbl;
 | 
			
		||||
  QCheckBox *ui_instant_objection_cb;
 | 
			
		||||
  QLabel *ui_text_scrawl_lbl;
 | 
			
		||||
  QSpinBox *ui_text_scrawl_spinbox;
 | 
			
		||||
  QLabel *ui_text_crawl_lbl;
 | 
			
		||||
  QSpinBox *ui_text_crawl_spinbox;
 | 
			
		||||
  QLabel *ui_chat_ratelimit_lbl;
 | 
			
		||||
  QSpinBox *ui_chat_ratelimit_spinbox;
 | 
			
		||||
  QLabel *ui_log_ic_actions_lbl;
 | 
			
		||||
 | 
			
		||||
@ -336,7 +336,7 @@ private:
 | 
			
		||||
  bool message_is_centered = false;
 | 
			
		||||
 | 
			
		||||
  int current_display_speed = 3;
 | 
			
		||||
  int text_scrawl = 40;
 | 
			
		||||
  int text_crawl = 40;
 | 
			
		||||
  double message_display_mult[7] = {0.125, 0.25, 0.65, 1, 1.25, 1.75, 2.25};
 | 
			
		||||
 | 
			
		||||
  // The character ID of the character this user wants to appear alongside with.
 | 
			
		||||
 | 
			
		||||
@ -219,19 +219,19 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app)
 | 
			
		||||
  ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_instant_objection_cb);
 | 
			
		||||
 | 
			
		||||
  row += 1;
 | 
			
		||||
  ui_text_scrawl_lbl = new QLabel(ui_form_layout_widget);
 | 
			
		||||
  ui_text_scrawl_lbl->setText(tr("Text Scrawl:"));
 | 
			
		||||
  ui_text_scrawl_lbl->setToolTip(tr(
 | 
			
		||||
  ui_text_crawl_lbl = new QLabel(ui_form_layout_widget);
 | 
			
		||||
  ui_text_crawl_lbl->setText(tr("Text crawl:"));
 | 
			
		||||
  ui_text_crawl_lbl->setToolTip(tr(
 | 
			
		||||
      "Amount of time (in miliseconds) spent on each letter when the in-character text is being displayed."));
 | 
			
		||||
 | 
			
		||||
  ui_gameplay_form->setWidget(row, QFormLayout::LabelRole, ui_text_scrawl_lbl);
 | 
			
		||||
  ui_gameplay_form->setWidget(row, QFormLayout::LabelRole, ui_text_crawl_lbl);
 | 
			
		||||
 | 
			
		||||
  ui_text_scrawl_spinbox = new QSpinBox(ui_form_layout_widget);
 | 
			
		||||
  ui_text_scrawl_spinbox->setSuffix(" ms");
 | 
			
		||||
  ui_text_scrawl_spinbox->setMaximum(500);
 | 
			
		||||
  ui_text_scrawl_spinbox->setValue(p_ao_app->get_text_scrawl());
 | 
			
		||||
  ui_text_crawl_spinbox = new QSpinBox(ui_form_layout_widget);
 | 
			
		||||
  ui_text_crawl_spinbox->setSuffix(" ms");
 | 
			
		||||
  ui_text_crawl_spinbox->setMaximum(500);
 | 
			
		||||
  ui_text_crawl_spinbox->setValue(p_ao_app->get_text_crawl());
 | 
			
		||||
 | 
			
		||||
  ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_text_scrawl_spinbox);
 | 
			
		||||
  ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_text_crawl_spinbox);
 | 
			
		||||
 | 
			
		||||
  row += 1;
 | 
			
		||||
  ui_chat_ratelimit_lbl = new QLabel(ui_form_layout_widget);
 | 
			
		||||
@ -853,7 +853,7 @@ void AOOptionsDialog::save_pressed()
 | 
			
		||||
  configini->setValue("desync_logs", ui_desync_logs_cb->isChecked());
 | 
			
		||||
  configini->setValue("stay_time", ui_stay_time_spinbox->value());
 | 
			
		||||
  configini->setValue("instant_objection", ui_instant_objection_cb->isChecked());
 | 
			
		||||
  configini->setValue("text_scrawl", ui_text_scrawl_spinbox->value());
 | 
			
		||||
  configini->setValue("text_crawl", ui_text_crawl_spinbox->value());
 | 
			
		||||
  configini->setValue("chat_ratelimit", ui_chat_ratelimit_spinbox->value());
 | 
			
		||||
  configini->setValue("default_username", ui_username_textbox->text());
 | 
			
		||||
  configini->setValue("show_custom_shownames", ui_showname_cb->isChecked());
 | 
			
		||||
 | 
			
		||||
@ -3228,7 +3228,7 @@ void Courtroom::start_chat_ticking()
 | 
			
		||||
 | 
			
		||||
  tick_pos = 0;
 | 
			
		||||
  blip_ticker = 0;
 | 
			
		||||
  text_scrawl = ao_app->get_text_scrawl();
 | 
			
		||||
  text_crawl = ao_app->get_text_crawl();
 | 
			
		||||
  blip_rate = ao_app->read_blip_rate();
 | 
			
		||||
  blank_blip = ao_app->get_blank_blip();
 | 
			
		||||
 | 
			
		||||
@ -3415,7 +3415,7 @@ void Courtroom::chat_tick()
 | 
			
		||||
  else if (current_display_speed > 6)
 | 
			
		||||
    current_display_speed = 6;
 | 
			
		||||
 | 
			
		||||
  int msg_delay = text_scrawl * message_display_mult[current_display_speed];
 | 
			
		||||
  int msg_delay = text_crawl * message_display_mult[current_display_speed];
 | 
			
		||||
  if ((msg_delay <= 0 &&
 | 
			
		||||
       tick_pos < f_message.size() - 1) ||
 | 
			
		||||
      formatting_char) {
 | 
			
		||||
@ -3459,7 +3459,7 @@ void Courtroom::chat_tick()
 | 
			
		||||
      // And if it's faster than that:
 | 
			
		||||
      // 40/10 = 4
 | 
			
		||||
      b_rate =
 | 
			
		||||
          qMax(b_rate, qRound(static_cast<float>(text_scrawl) /
 | 
			
		||||
          qMax(b_rate, qRound(static_cast<float>(text_crawl) /
 | 
			
		||||
                              msg_delay));
 | 
			
		||||
    }
 | 
			
		||||
    if (blip_ticker % b_rate == 0) {
 | 
			
		||||
@ -3480,7 +3480,7 @@ void Courtroom::chat_tick()
 | 
			
		||||
    if (current_display_speed > 1 && punctuation_chars.contains(f_character)) {
 | 
			
		||||
      // Making the user have to wait any longer than 1.5 of the slowest speed
 | 
			
		||||
      // is downright unreasonable
 | 
			
		||||
      int max_delay = text_scrawl * message_display_mult[6] * 1.5;
 | 
			
		||||
      int max_delay = text_crawl * message_display_mult[6] * 1.5;
 | 
			
		||||
      msg_delay = qMin(max_delay, msg_delay * punctuation_modifier);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -52,9 +52,9 @@ int AOApplication::stay_time()
 | 
			
		||||
  return result;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int AOApplication::get_text_scrawl()
 | 
			
		||||
int AOApplication::get_text_crawl()
 | 
			
		||||
{
 | 
			
		||||
  int result = configini->value("text_scrawl", 40).toInt();
 | 
			
		||||
  int result = configini->value("text_crawl", 40).toInt();
 | 
			
		||||
  return result;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user