Merge pull request #133 from jeffreykirchner/dev

update sleep

main/forms/parameter_set_form.py

@@ -169,14 +169,6 @@ class ParameterSetForm(forms.ModelForm):
                                        widget=forms.NumberInput(attrs={"v-model":"parameter_set.attack_damage",
                                                                        "step":"0.1",
                                                                        "min":"0.1"}))
-
-    sleep_benefit = forms.DecimalField(label='Sleep Benefit (Health)',
-                                       max_digits=3,
-                                       decimal_places=1,
-                                       min_value=0.1,
-                                       widget=forms.NumberInput(attrs={"v-model":"parameter_set.sleep_benefit",
-                                                                       "step":"0.1",
-                                                                       "min":"0.1"}))
 
     allow_stealing = forms.ChoiceField(label='Allow Stealing',
                                        choices=((True, 'Yes'), (False,'No' )),
@@ -269,7 +261,7 @@ class Meta:
         fields =['period_count', 'period_length', 'night_length', 'break_frequency', 'break_length', 'show_instructions', 'instruction_set', 
                  'survey_required', 'survey_link', 'prolific_mode', 'prolific_completion_link', 'reconnection_limit',
                  'interaction_length', 'interaction_range', 'cool_down_length', 'starting_health', 'health_loss_per_second', 'heath_gain_per_sleep_second',
-                 'consumption_alpha', 'consumption_beta', 'consumption_multiplier', 'cents_per_second', 'allow_attacks', 'attack_damage', 'attack_cost', 'sleep_benefit', 'allow_stealing', 'world_width', 'world_height',
+                 'consumption_alpha', 'consumption_beta', 'consumption_multiplier', 'cents_per_second', 'allow_attacks', 'attack_damage', 'attack_cost', 'allow_stealing', 'world_width', 'world_height',
                  'field_width', 'field_height', 'house_width', 'house_height', 'avatar_scale', 'avatar_bound_box_percent','production_effort', 'max_patch_harvests',
                  'chat_mode', 'chat_rules_word_list', 'good_mode', 'test_mode']
 

main/migrations/0112_remove_parameterset_sleep_benefit.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.3 on 2023-09-20 20:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0111_remove_helpdocssubject_unique_help_doc_subject__and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='parameterset',
+            name='sleep_benefit',
+        ),
+    ]

main/models/parameter_set.py

@@ -73,8 +73,6 @@ class ParameterSet(models.Model):
     attack_damage = models.DecimalField(verbose_name='Attack Damage to Health', decimal_places=1, max_digits=3, default=7.0) #attack damage
     allow_attacks = models.BooleanField(default=False, verbose_name="Allow Attacks")                                         #if true allow attacks
 
-    sleep_benefit = models.DecimalField(verbose_name='Sleep Benefit to Health', decimal_places=1, max_digits=3, default=3.0) #sleep benefit
-
     allow_stealing = models.BooleanField(default=False, verbose_name="Allow Stealing")                      #if true all subjects to steal from other tribes
 
     chat_mode = models.CharField(verbose_name="Chat Mode", max_length=100, choices=ChatModes.choices, default=ChatModes.FULL)         #chat mode
@@ -156,7 +154,6 @@ def from_dict(self, new_ps):
             self.attack_damage = new_ps.get("attack_damage", 7.0)
             self.allow_attacks = True if new_ps.get("allow_attacks") == "True" else False
 
-            self.sleep_benefit = new_ps.get("sleep_benefit", 3.0)
             self.allow_stealing = True if new_ps.get("allow_stealing") == "True" else False
             self.break_frequency = new_ps.get("break_frequency", 7)
             self.break_length = new_ps.get("break_length", 100)
@@ -427,7 +424,6 @@ def update_json_local(self):
         self.json_for_session["attack_damage"] = self.attack_damage
         self.json_for_session["allow_attacks"] = "True" if self.allow_attacks else "False"
 
-        self.json_for_session["sleep_benefit"] = self.sleep_benefit
         self.json_for_session["allow_stealing"] = "True" if self.allow_stealing else "False"
         self.json_for_session["break_frequency"] = self.break_frequency
         self.json_for_session["break_length"] = self.break_length

main/models/session_period.py

@@ -74,7 +74,7 @@ def do_timer_actions(self, time_remaining):
         #metabolism
         health_loss_count = 0
         health_loss_per_second = Decimal(parameter_set["health_loss_per_second"])
-        sleep_benefit = Decimal(parameter_set["sleep_benefit"])
+        heath_gain_per_sleep_second = Decimal(parameter_set["heath_gain_per_sleep_second"])
 
         for i in self.timer_actions:
             if int(i) >= time_remaining and \
@@ -104,7 +104,7 @@ def do_timer_actions(self, time_remaining):
                 current_health = Decimal(avatar["health"])
 
                 if avatar["sleeping"] and world_state["time_remaining"] <= parameter_set["night_length"]:    
-                    total_sleep_benefit = (sleep_benefit * health_loss_count)     
+                    total_sleep_benefit = (heath_gain_per_sleep_second * health_loss_count)     
 
                     avatar["health"] = str(current_health + total_sleep_benefit)
                     temp_s["health_from_sleep"] = str(Decimal(temp_s["health_from_sleep"]) + total_sleep_benefit)

main/templates/staff/staff_session_parameters/general_settings/general_settings_card.html

@@ -181,14 +181,6 @@
                 [[parameter_set.attack_damage]]                          
             </div>  
         </div>
-        <div class="row">
-            <div class="col-7 text-end">
-                {{parameter_set_form.sleep_benefit.label}}:                
-            </div>
-            <div class="col text-start">
-                [[parameter_set.sleep_benefit]]                          
-            </div>  
-        </div>
         <div class="row">
             <div class="col-7 text-end">
                 {{parameter_set_form.allow_stealing.label}}:                

main/templates/subject/subject_home/the_stage/avatars.js

@@ -972,7 +972,7 @@ do_avatar_sleep_emitters()
             let health_sprite = PIXI.Sprite.from(app.pixi_textures["health_tex"]);
             health_sprite.scale.set(0.4);
 
-            app.add_text_emitters("+" + app.session.parameter_set.sleep_benefit + " health from sleep.",
+            app.add_text_emitters("+" + parseFloat(app.session.parameter_set.heath_gain_per_sleep_second).toFixed(1) + " health from sleep.",
                                     session_player.current_location.x, 
                                     session_player.current_location.y,
                                     session_player.current_location.x,