Skip to content

Commit 5bf4d99

Browse files
committed
[refactoring] Rename "unsportive" to "unsporting" as in the rules
1 parent 8075070 commit 5bf4d99

File tree

7 files changed

+118
-118
lines changed

7 files changed

+118
-118
lines changed

internal/app/controller/gameEvent.go

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ const (
3737
GameEventDefenderInDefenseAreaPartially GameEventType = "defenderInDefenseAreaPartially"
3838
GameEventDefenderInDefenseArea GameEventType = "defenderInDefenseArea"
3939
GameEventKeeperHeldBall GameEventType = "keeperHeldBall"
40-
GameEventUnsportiveBehaviorMinor GameEventType = "unsportiveBehaviorMinor"
41-
GameEventUnsportiveBehaviorMajor GameEventType = "unsportiveBehaviorMajor"
40+
GameEventUnsportingBehaviorMinor GameEventType = "unsportingBehaviorMinor"
41+
GameEventUnsportingBehaviorMajor GameEventType = "unsportingBehaviorMajor"
4242
GameEventMultipleCards GameEventType = "multipleCards"
4343
GameEventMultipleFouls GameEventType = "multipleFouls"
4444
GameEventMultiplePlacementFailures GameEventType = "multiplePlacementFailures"
@@ -88,8 +88,8 @@ func AllGameEvents() []GameEventType {
8888
GameEventDefenderInDefenseAreaPartially,
8989
GameEventDefenderInDefenseArea,
9090
GameEventKeeperHeldBall,
91-
GameEventUnsportiveBehaviorMinor,
92-
GameEventUnsportiveBehaviorMajor,
91+
GameEventUnsportingBehaviorMinor,
92+
GameEventUnsportingBehaviorMajor,
9393
GameEventMultipleCards,
9494
GameEventMultipleFouls,
9595
GameEventMultiplePlacementFailures,
@@ -138,7 +138,7 @@ func (e GameEvent) IncrementsFoulCounter() bool {
138138
// AddsYellowCard checks if this game event causes a yellow card
139139
func (e GameEvent) AddsYellowCard() bool {
140140
switch e.Type {
141-
case GameEventUnsportiveBehaviorMinor,
141+
case GameEventUnsportingBehaviorMinor,
142142
GameEventMultipleFouls,
143143
GameEventDefenderInDefenseAreaPartially:
144144
return true
@@ -149,7 +149,7 @@ func (e GameEvent) AddsYellowCard() bool {
149149
// AddsRedCard checks if this game event causes a red card
150150
func (e GameEvent) AddsRedCard() bool {
151151
switch e.Type {
152-
case GameEventUnsportiveBehaviorMajor:
152+
case GameEventUnsportingBehaviorMajor:
153153
return true
154154
}
155155
return false
@@ -169,8 +169,8 @@ func (e GameEvent) IsSecondary() bool {
169169
switch e.Type {
170170
case GameEventBotTooFastInStop,
171171
GameEventBotCrashDrawn,
172-
GameEventUnsportiveBehaviorMinor,
173-
GameEventUnsportiveBehaviorMajor,
172+
GameEventUnsportingBehaviorMinor,
173+
GameEventUnsportingBehaviorMajor,
174174
GameEventMultipleFouls,
175175
GameEventBotCrashUniqueContinue,
176176
GameEventBotPushedBotContinue,
@@ -258,10 +258,10 @@ func (e GameEvent) ToProto() *refproto.GameEvent {
258258
protoEvent.Event = &refproto.GameEvent_DefenderInDefenseArea_{DefenderInDefenseArea: e.Details.DefenderInDefenseArea}
259259
case GameEventKeeperHeldBall:
260260
protoEvent.Event = &refproto.GameEvent_KeeperHeldBall_{KeeperHeldBall: e.Details.KeeperHeldBall}
261-
case GameEventUnsportiveBehaviorMinor:
262-
protoEvent.Event = &refproto.GameEvent_UnsportiveBehaviorMinor_{UnsportiveBehaviorMinor: e.Details.UnsportiveBehaviorMinor}
263-
case GameEventUnsportiveBehaviorMajor:
264-
protoEvent.Event = &refproto.GameEvent_UnsportiveBehaviorMajor_{UnsportiveBehaviorMajor: e.Details.UnsportiveBehaviorMajor}
261+
case GameEventUnsportingBehaviorMinor:
262+
protoEvent.Event = &refproto.GameEvent_UnsportingBehaviorMinor_{UnsportingBehaviorMinor: e.Details.UnsportingBehaviorMinor}
263+
case GameEventUnsportingBehaviorMajor:
264+
protoEvent.Event = &refproto.GameEvent_UnsportingBehaviorMajor_{UnsportingBehaviorMajor: e.Details.UnsportingBehaviorMajor}
265265
case GameEventMultipleCards:
266266
protoEvent.Event = &refproto.GameEvent_MultipleCards_{MultipleCards: e.Details.MultipleCards}
267267
case GameEventMultipleFouls:
@@ -314,8 +314,8 @@ type GameEventDetails struct {
314314
DefenderInDefenseAreaPartially *refproto.GameEvent_DefenderInDefenseAreaPartially `json:"defenderInDefenseAreaPartially,omitempty"`
315315
DefenderInDefenseArea *refproto.GameEvent_DefenderInDefenseArea `json:"defenderInDefenseArea,omitempty"`
316316
KeeperHeldBall *refproto.GameEvent_KeeperHeldBall `json:"keeperHeldBall,omitempty"`
317-
UnsportiveBehaviorMinor *refproto.GameEvent_UnsportiveBehaviorMinor `json:"unsportiveBehaviorMinor,omitempty"`
318-
UnsportiveBehaviorMajor *refproto.GameEvent_UnsportiveBehaviorMajor `json:"unsportiveBehaviorMajor,omitempty"`
317+
UnsportingBehaviorMinor *refproto.GameEvent_UnsportingBehaviorMinor `json:"unsportingBehaviorMinor,omitempty"`
318+
UnsportingBehaviorMajor *refproto.GameEvent_UnsportingBehaviorMajor `json:"unsportingBehaviorMajor,omitempty"`
319319
MultipleCards *refproto.GameEvent_MultipleCards `json:"multiple,omitempty"`
320320
MultipleFouls *refproto.GameEvent_MultipleFouls `json:"multipleFouls,omitempty"`
321321
MultiplePlacementFailures *refproto.GameEvent_MultiplePlacementFailures `json:"multiplePlacementFailures,omitempty"`
@@ -403,11 +403,11 @@ func (d GameEventDetails) EventType() GameEventType {
403403
if d.KeeperHeldBall != nil {
404404
return GameEventKeeperHeldBall
405405
}
406-
if d.UnsportiveBehaviorMinor != nil {
407-
return GameEventUnsportiveBehaviorMinor
406+
if d.UnsportingBehaviorMinor != nil {
407+
return GameEventUnsportingBehaviorMinor
408408
}
409-
if d.UnsportiveBehaviorMajor != nil {
410-
return GameEventUnsportiveBehaviorMajor
409+
if d.UnsportingBehaviorMajor != nil {
410+
return GameEventUnsportingBehaviorMajor
411411
}
412412
if d.MultipleCards != nil {
413413
return GameEventMultipleCards
@@ -593,15 +593,15 @@ func (d GameEventDetails) Description() string {
593593
if d.KeeperHeldBall != nil {
594594
return ""
595595
}
596-
if d.UnsportiveBehaviorMinor != nil {
597-
if d.UnsportiveBehaviorMinor.Reason != nil {
598-
return fmt.Sprintf("%v", *d.UnsportiveBehaviorMinor.Reason)
596+
if d.UnsportingBehaviorMinor != nil {
597+
if d.UnsportingBehaviorMinor.Reason != nil {
598+
return fmt.Sprintf("%v", *d.UnsportingBehaviorMinor.Reason)
599599
}
600600
return ""
601601
}
602-
if d.UnsportiveBehaviorMajor != nil {
603-
if d.UnsportiveBehaviorMajor.Reason != nil {
604-
return fmt.Sprintf("%v", *d.UnsportiveBehaviorMajor.Reason)
602+
if d.UnsportingBehaviorMajor != nil {
603+
if d.UnsportingBehaviorMajor.Reason != nil {
604+
return fmt.Sprintf("%v", *d.UnsportingBehaviorMajor.Reason)
605605
}
606606
return ""
607607
}
@@ -661,8 +661,8 @@ func NewGameEventDetails(event refproto.GameEvent) (d GameEventDetails) {
661661
d.DefenderInDefenseAreaPartially = event.GetDefenderInDefenseAreaPartially()
662662
d.DefenderInDefenseArea = event.GetDefenderInDefenseArea()
663663
d.KeeperHeldBall = event.GetKeeperHeldBall()
664-
d.UnsportiveBehaviorMinor = event.GetUnsportiveBehaviorMinor()
665-
d.UnsportiveBehaviorMajor = event.GetUnsportiveBehaviorMajor()
664+
d.UnsportingBehaviorMinor = event.GetUnsportingBehaviorMinor()
665+
d.UnsportingBehaviorMajor = event.GetUnsportingBehaviorMajor()
666666
d.MultipleCards = event.GetMultipleCards()
667667
d.MultipleFouls = event.GetMultipleFouls()
668668
d.MultiplePlacementFailures = event.GetMultiplePlacementFailures()

0 commit comments

Comments
 (0)