Merge pull request #345 from jeffreykirchner/dev

Dev

Author: jeffreykirchner

main/templates/subject/subject_home/the_stage/avatar_attack_modal.html

@@ -48,7 +48,7 @@
                             <strong>Cooling ... [[session.world_state_avatars.session_players[session_player.id].cool_down]]</strong>
                         </span>                        
                         <span class="me-4 " v-else-if="check_truce_hat_binding(selected_avatar.parameter_set_player.parameter_set_group)">
-                            <strong>You have their hat.</strong>
+                            <strong>You have a truce.</strong>
                         </span>
 
                         <span v-if="working" class="me-2">

main/templates/subject/subject_home/the_stage/patch_modal.html

@@ -42,7 +42,7 @@
                         </span>
 
                         <span class="me-4 " v-if="check_truce_hat_binding(selected_patch.patch.parameter_set_group)">
-                            <strong>You have their hat.</strong>
+                            <strong>You have a truce.</strong>
                         </span>
 
                         <button type="button"

setup.sh

@@ -1,6 +1,6 @@
 echo "setup trade_gifts"
 sudo service postgresql restart
-echo "drop template db: enter db password"
+echo "drop trade gifts db: enter db password"
 dropdb trade_gifts -U dbadmin -h localhost -i -p 5433
 echo "create database: enter db password"
 createdb -h localhost -p 5433 -U dbadmin -O dbadmin trade_gifts

startup.sh

@@ -1,4 +1,5 @@
 echo "*** Startup.sh ***"
+apt-get update
 echo "Run Migrations:"
 python manage.py migrate
 echo "Install htop:"