From b0168af2e949162b35b3025de0f854876b4d3206 Mon Sep 17 00:00:00 2001
From: Kaiyotech <93724202+Kaiyotech@users.noreply.github.com>
Date: Sat, 15 Oct 2022 15:40:54 -0400
Subject: [PATCH] stop ceiling pinch, re-start kickoff with fixed obs and bit
 of 2s 3s, restart aerial with team spirit and some reward changes.

---
 learner_aerial.py  | 10 +++++-----
 learner_kickoff.py |  2 +-
 worker_aerial.py   | 26 +++++++++++++-------------
 worker_kickoff.py  |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/learner_aerial.py b/learner_aerial.py
index 16c58ef..cf29ef6 100644
--- a/learner_aerial.py
+++ b/learner_aerial.py
@@ -78,15 +78,15 @@
                                                               goal_w=2,
                                                               aerial_goal_w=5,
                                                               double_tap_w=10,
-                                                              flip_reset_w=5,
+                                                              flip_reset_w=10,
                                                               flip_reset_goal_w=20,
                                                               punish_ceiling_pinch_w=0,
                                                               concede_w=-10,
                                                               velocity_bg_w=0.25,
                                                               acel_ball_w=1,
-                                                              team_spirit=0,
-                                                              cons_air_touches_w=0.1,
-                                                              jump_touch_w=0.2,
+                                                              team_spirit=1,
+                                                              cons_air_touches_w=0.02,
+                                                              jump_touch_w=0.1,
                                                               wall_touch_w=0.5,
                                                               ),
                                         lambda: CoyoteAction(),
@@ -131,7 +131,7 @@
         disable_gradient_logging=True,
     )
 
-    alg.load("aerial_saves/Opti_1665659381.4329824/Opti_810/checkpoint.pt")
+    alg.load("aerial_saves/Opti_1665696998.0525448/Opti_1390/checkpoint.pt")
     alg.agent.optimizer.param_groups[0]["lr"] = logger.config.actor_lr
     alg.agent.optimizer.param_groups[1]["lr"] = logger.config.critic_lr
 
diff --git a/learner_kickoff.py b/learner_kickoff.py
index 3aed7a3..8844727 100644
--- a/learner_kickoff.py
+++ b/learner_kickoff.py
@@ -128,7 +128,7 @@
         disable_gradient_logging=True,
     )
 
-    alg.load("kickoff_saves/Opti_1664547156.065636/Opti_3300/checkpoint.pt")
+    alg.load("kickoff_saves/Opti_1664717947.0727122/Opti_4250/checkpoint.pt")
     alg.agent.optimizer.param_groups[0]["lr"] = logger.config.actor_lr
     alg.agent.optimizer.param_groups[1]["lr"] = logger.config.critic_lr
 
diff --git a/worker_aerial.py b/worker_aerial.py
index a6cc3d3..10c4498 100644
--- a/worker_aerial.py
+++ b/worker_aerial.py
@@ -19,19 +19,19 @@
 
 if __name__ == "__main__":
     rew = ZeroSumReward(zero_sum=Constants_aerial.ZERO_SUM,
-                        goal_w=2,
-                        aerial_goal_w=5,
-                        double_tap_w=10,
-                        flip_reset_w=5,
-                        flip_reset_goal_w=20,
-                        punish_ceiling_pinch_w=0,
-                        concede_w=-10,
-                        velocity_bg_w=0.25,
-                        acel_ball_w=1,
-                        team_spirit=0,
-                        cons_air_touches_w=0.1,
-                        jump_touch_w=0.2,
-                        wall_touch_w=0.5,)
+                          goal_w=2,
+                          aerial_goal_w=5,
+                          double_tap_w=10,
+                          flip_reset_w=10,
+                          flip_reset_goal_w=20,
+                          punish_ceiling_pinch_w=0,
+                          concede_w=-10,
+                          velocity_bg_w=0.25,
+                          acel_ball_w=1,
+                          team_spirit=1,
+                          cons_air_touches_w=0.02,
+                          jump_touch_w=0.1,
+                          wall_touch_w=0.5,)
     frame_skip = Constants_aerial.FRAME_SKIP
     fps = 120 // frame_skip
     name = "Default"
diff --git a/worker_kickoff.py b/worker_kickoff.py
index afa2072..a3e660b 100644
--- a/worker_kickoff.py
+++ b/worker_kickoff.py
@@ -106,7 +106,7 @@
                        send_obs=True,
                        auto_minimize=auto_minimize,
                        send_gamestates=send_gamestate,
-                       gamemode_weights={'1v1': 1, '2v2': 0, '3v3': 0},
+                       gamemode_weights={'1v1': 0.8, '2v2': 0.1, '3v3': 0.1},
                        streamer_mode=streamer_mode,
                        deterministic_streamer=deterministic_streamer,
                        force_old_deterministic=force_old_deterministic,