test mode dev

jeffreykirchner · Sep 6, 2023 · 27d3fa9 · 27d3fa9
1 parent cc4dc2f
commit 27d3fa9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/main/migrations/0093_alter_parametersetgrove_options.py b/main/migrations/0093_alter_parametersetgrove_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.3 on 2023-09-06 18:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0092_parametersetgrove_parameter_set_group'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='parametersetgrove',
+            options={'ordering': ['id'], 'verbose_name': 'Parameter Set Grove', 'verbose_name_plural': 'Parameter Set Grove'},
+        ),
+    ]
diff --git a/main/templates/subject/subject_home/test_mode/test_mode.js b/main/templates/subject/subject_home/test_mode/test_mode.js
@@ -297,7 +297,7 @@ do_test_mode_avatar_attack()
 {
     if(app.random_number(1, 2) == 1 && 
        app.session.parameter_set.allow_attacks=='True' &&
-       parseFloat(app.session.world_state.avatars[app.session_player.parameter_set_player_id].health)>=parseFloat(app.session.parameter_set.attack_cost) &&
+       parseFloat(app.session.world_state.avatars[app.session_player.id].health)>=parseFloat(app.session.parameter_set.attack_cost) &&
        app.session.world_state_avatars.session_players[app.session_player.id].cool_down==0)
     {
         app.send_attack_avatar();
@@ -446,9 +446,9 @@ test_mode_check_near_avatar()
     for(i in app.session.world_state_avatars.session_players) 
     {
         let avatar = app.session.world_state_avatars.session_players[i];
-        if(avatar.parameter_set_player_id == app.session_player.id) continue;
+        if(parseInt(i) == app.session_player.id) continue;
 
-        if(app.get_distance(avatar.current_location, app.session.world_state_avatars.session_players[app.session_player.id].current_location) < app.session.parameter_set.interaction_range)
+        if(app.get_distance(avatar.current_location, app.session.world_state_avatars.session_players[app.session_player.id].current_location) <= app.session.parameter_set.interaction_range)
         {
             app.subject_pointer_up_action(2, avatar.current_location)
             break;

diff --git a/main/templates/subject/subject_home/the_stage/avatar_modal.html b/main/templates/subject/subject_home/the_stage/avatar_modal.html
@@ -11,7 +11,7 @@
     <div class="modal-dialog modal-dialog-centered modal-sm">
         <div class="modal-content">
             <div class="modal-header fw-bold" v-if="selected_avatar.avatar">
-                Move Fruit to [[session.parameter_set.parameter_set_players[selected_avatar.avatar.parameter_set_player_id].id_label]]
+                Interact with [[session.parameter_set.parameter_set_players[selected_avatar.avatar.parameter_set_player_id].id_label]]
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">