GDB Busan v7.9.0 merge

README.md

@@ -1,22 +1,32 @@
 # Overwatch-Genji-Dodgeball
-**Current Version: v7.1.1**  
-**Deathmatch Code: 8H59R**  
+**Current Version: v7.9.1**  
+**Deathmatch Code: VYDBB**
 
 Genji Dodgeball is a minigame inspired by the TF2 game pyro dodgeball.
 When the ball is red it is targeting you! Use your deflect to target someone else. Look at the person you want to target next while deflecting. Use bouncepads to get extra air and style points.
 
 ## Team Deathmatch  
-**Team Deathmatch Code: 2SS96**  
+**Team Deathmatch Code: BZMVY**  
 The Team Deathmatch version is a version where passing is enabled by default. To pass, hold the Secondary Fire button. The ball with pass to another teammate or if none are alive, it will pass it to yourself. Each pass will cost 100 health, you can get healed by deflecting the ball to a enemy, or someone on either team dies.  
 
 ## How to compile  
-`Genji-Dodgeball.opy` is a file format compatable with OverPy, a high-level language for the Overwatch Workshop with support for compilation and decompilation.  
+Any file with a `.opy` ending is a file format compatable with OverPy, a high-level language for the Overwatch Workshop with support for compilation and decompilation.  
 [Follow this tutorial for instructions on how to compile this game.](https://github.com/Zezombye/overpy/wiki/General-usage)
 
 ## A personal note
-I am the so called founder of this game, although many names have influenced this game, and I am very proud of that.
-I have done 100% of the development of this game for free and I will always do it for free. Please do not be pressured to donate, this is only for if you want to go above and beyond. But if you appreciate what I create, and have funds to spare, I will greatly appreciate any amount that you give, and I will be truly thankful, from the bottom of my heart.  
+I am the founder of this game, although many names have influenced this game.
+I have done 100% of the development of this game for free and I will always do it for free. Please do not be pressured to donate, this is only for if you want to go above and beyond. But if you appreciate what I create, and have funds to spare, I will appreciate any amount that you give.
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/Q5Q64CGIL)  
 
+## Credit to others
+Special thanks to the following for updating the game and improving it for everyone:
+- u/FearlessKat
+- u/Blink
+- u/TheRedstoneBlaze
+- ELIMINATED#1572
+- T1mur4TR#6594
+- DazNachbarzkind#2265
+- And everyone else not named here who contributed.
+
 ## YouTube Video
 [![YouTube video](http://img.youtube.com/vi/mQmDIZGKKR8/0.jpg)](http://www.youtube.com/watch?v=mQmDIZGKKR8)

src/BallHero.opy

@@ -8,125 +8,129 @@ rule "Create hero ball":
     waitUntil(hostPlayer.hasSpawned(), 9999)
     getPlayersOnHero(ballHero, Team.ALL).startFacing(directionTowards(getPlayersOnHero(ballHero, Team.ALL).getEyePosition(), hostPlayer.getEyePosition()), 1000, Relativity.TO_WORLD, FacingReeval.DIRECTION_AND_TURN_RATE)
     ballPlayer = getPlayersOnHero(ballHero, Team.ALL)[0]
-    switch random.randint(1, 21):
-        case 1:
-            startingText = "People always underestimate the engineers!"
-            break
-        case 2:
-            startingText = "I'm giving it all I've got!"
-            break
-        case 3:
-            startingText = "I'd rather be the hammer, than the nail."
-            break
-        case 4:
-            startingText = "My baby!"
-            break
-        case 5:
-            startingText = "Build 'em up, break 'em down!"
-            break
-        case 6:
-            startingText = "Heh, time to roll up my sleeves!"
-            break
-        case 7:
-            startingText = "Time to get my hands dirty."
-            break
-        case 8:
-            startingText = "Torbjörn! Ready to work!"
-            break
-        case 9:
-            startingText = "You're making a chicken out of a feather."
-            break
-        case 10:
-            startingText = "Du gör en höna av en fjäder."
-            break
-        case 11:
-            startingText = "Fastna inte med skägget i brevlådan."
-            break
-        case 12:
-            startingText = "Köp inte grisen i säcken."
-            break
-        case 13:
-            startingText = "De är som en katt som går runt het gröt!"
-            break
-        case 14:
-            startingText = "Too hot for you?"
-            break
-        case 15:
-            startingText = "Bingo!"
-            break
-        case 16:
-            startingText = "For the last time, I'm Swedish!"
-            break
-        case 17:
-            startingText = "Ha ha! There's more where that came from."
-            break
-        case 18:
-            startingText = "Tehh... Poor craftsmen blames their tools..."
-            break
-        case 19:
-            startingText = "Just start hammering."
-            break
-        case 20:
-            startingText = "I smell trouble brewing"
-            break
-        case 21:
-            startingText = "There's no prize for coming in second"
-            break
+    if ballHero == Hero.TORBJORN:
+        switch random.randint(1, 21):
+            case 1:
+                startingText = "People always underestimate the engineers!"
+                break
+            case 2:
+                startingText = "I'm giving it all I've got!"
+                break
+            case 3:
+                startingText = "I'd rather be the hammer, than the nail."
+                break
+            case 4:
+                startingText = "My baby!"
+                break
+            case 5:
+                startingText = "Build 'em up, break 'em down!"
+                break
+            case 6:
+                startingText = "Heh, time to roll up my sleeves!"
+                break
+            case 7:
+                startingText = "Time to get my hands dirty."
+                break
+            case 8:
+                startingText = "Torbjörn! Ready to work!"
+                break
+            case 9:
+                startingText = "You're making a chicken out of a feather."
+                break
+            case 10:
+                startingText = "Du gör en höna av en fjäder."
+                break
+            case 11:
+                startingText = "Fastna inte med skägget i brevlådan."
+                break
+            case 12:
+                startingText = "Köp inte grisen i säcken."
+                break
+            case 13:
+                startingText = "De är som en katt som går runt het gröt!"
+                break
+            case 14:
+                startingText = "Too hot for you?"
+                break
+            case 15:
+                startingText = "Bingo!"
+                break
+            case 16:
+                startingText = "For the last time, I'm Swedish!"
+                break
+            case 17:
+                startingText = "Ha ha! There's more where that came from."
+                break
+            case 18:
+                startingText = "Tehh... Poor craftsmen blames their tools..."
+                break
+            case 19:
+                startingText = "Just start hammering."
+                break
+            case 20:
+                startingText = "I smell trouble brewing"
+                break
+            case 21:
+                startingText = "There's no prize for coming in second"
+                break
+    else:
+        startingText = "Wait... I'm " + ballHero + "? What did you do " + hostPlayer + "?"
     createInWorldText(getAllPlayers(), startingText, ballPlayer.getEyePosition() + vect(0, 0.5, 0), 5, Clip.SURFACES, WorldTextReeval.VISIBILITY_AND_POSITION, Color.ORANGE, SpecVisibility.ALWAYS)
     ballHeroRegretText = getLastCreatedText()
 
 
 rule "Init hero ball":
-    @Event eachPlayer
     @Condition ballHero
     @Condition isGameInProgress()
-    @Condition eventPlayer.getCurrentHero() == ballHero
 
     destroyInWorldText(ballHeroRegretText)
-    eventPlayer.stopFacing()
-    eventPlayer.setGravity(0)
-    eventPlayer.disablePlayerCollision()
-    # eventPlayer.startForcingPosition(updateEveryTick(ballPosition) + vect(0, -1, 0) , true)
+    ballPlayer.stopFacing()
+    ballPlayer.setGravity(0)
+    ballPlayer.disablePlayerCollision()
+    # ballPlayer.startForcingPosition(updateEveryTick(ballPosition) + vect(0, -1, 0) , true)
     wait(0.5)
-    eventPlayer.startFacing(directionTowards(eventPlayer.getEyePosition(), targetedPlayer.getEyePosition()), 1000, Relativity.TO_WORLD, FacingReeval.DIRECTION_AND_TURN_RATE)
+    ballPlayer.startFacing(directionTowards(ballPlayer.getEyePosition(), targetedPlayer.getEyePosition()), 1000, Relativity.TO_WORLD, FacingReeval.DIRECTION_AND_TURN_RATE)
 
 
 rule "Teleport hero ball":
-    @Event eachPlayer
     @Condition ballHero
     @Condition isGameInProgress()
-    @Condition eventPlayer.getCurrentHero() == ballHero
     @Condition not ballPlayerMock
 
-    eventPlayer.teleport(ballPosition - vect(0, 1, 0))
+    ballPlayer.teleport(ballPosition - vect(0, 1, 0))
     wait(0.001)
     if RULE_CONDITION:
         goto RULE_START
 
 
 rule "Don't move while ball isn't in play":
-    @Event eachPlayer
     @Condition ballHero
     @Condition isGameInProgress()
-    @Condition eventPlayer.getCurrentHero() == ballHero
     @Condition ballPlayerMock
 
-    eventPlayer.setGravity(100)
+    ballPlayer.setGravity(100)
     waitUntil(not ballPlayerMock, 9999)
-    eventPlayer.startFacing(directionTowards(eventPlayer.getEyePosition(), targetedPlayer.getEyePosition()), 1000, Relativity.TO_WORLD, FacingReeval.DIRECTION_AND_TURN_RATE)
-    eventPlayer.setGravity(0)
+    if not ballPlayer.hasStatusEffect(Status.FROZEN):
+        ballPlayer.startFacing(directionTowards(ballPlayer.getEyePosition(), targetedPlayer.getEyePosition()), 1000, Relativity.TO_WORLD, FacingReeval.DIRECTION_AND_TURN_RATE)
+    ballPlayer.setGravity(0)
 
 
 rule "Set hero ball outline":
-    @Event eachPlayer
     @Condition ballHero
     @Condition isGameInProgress()
-    @Condition eventPlayer.getCurrentHero() == ballHero
 
     ballPlayer.startForcingOutlineFor([player for player in getAllPlayers() if player != targetedPlayer], true, Color.WHITE, OutlineVisibility.DEFAULT)
     ballPlayer.startForcingOutlineFor([player for player in getAllPlayers() if player == targetedPlayer], true, Color.RED, OutlineVisibility.DEFAULT)
     wait(0.1)
     goto RULE_START
 
 
+rule "Don't look around while frozen":
+    @Condition ballHero
+    @Condition isGameInProgress()
+    @Condition ballPlayer.hasStatusEffect(Status.FROZEN)
+
+    ballPlayer.stopFacing()
+
+
 #!include "./Fun.opy"