Skip to content

Commit bf98f8f

Browse files
schwarzlichtbezirkschwarzlichtbezirk
committed
lines refactoring.
1 parent 219694d commit bf98f8f

File tree

18 files changed

+25
-130
lines changed

18 files changed

+25
-130
lines changed

‎game/slot/2millionbc/2millionbc_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var LinePay = [13][5]float64{
2525
var ScatFreespin = [5]int{0, 0, 4, 12, 20} // 11 fire
2626

2727
// Bet lines
28-
var BetLines = slot.BetLinesBetSoft30
28+
var BetLines = slot.BetLinesNetEnt5x3[:30]
2929

3030
const (
3131
acbn = 1 // acorn bonus

‎game/slot/arabiannights/arabiannights_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var Jackpot = [12][5]int{
4747
}
4848

4949
// Bet lines
50-
var BetLines = slot.BetLinesNetEnt10
50+
var BetLines = slot.BetLinesNetEnt5x3[:10]
5151

5252
type Game struct {
5353
slot.Slot5x3 `yaml:",inline"`

‎game/slot/atthemovies/atthemovies_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var Jackpot = [10][5]int{
4343
}
4444

4545
// Bet lines
46-
var BetLines = slot.BetLinesBetSoft25
46+
var BetLines = slot.BetLinesNetEnt5x3[:25]
4747

4848
type Game struct {
4949
slot.Slot5x3 `yaml:",inline"`

‎game/slot/diamonddogs/diamonddogs_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var ScatPay = [5]float64{0, 2, 4, 25, 100} // 11 scatter
2626
var ScatFreespin = [5]int{0, 0, 10, 10, 10} // 11 scatter
2727

2828
// Bet lines
29-
var BetLines = slot.BetLinesBetSoft25
29+
var BetLines = slot.BetLinesNetEnt5x3[:25]
3030

3131
const (
3232
ne12 = 1 // bonus ID

‎game/slot/fruitshop/fruitshop_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ var LineFreespinBon = [11][5]int{
5252
}
5353

5454
// Bet lines
55-
var BetLines = slot.BetLinesNetEnt15
55+
var BetLines = slot.BetLinesNetEnt5x3[:15]
5656

5757
type Game struct {
5858
slot.Slot5x3 `yaml:",inline"`

‎game/slot/greatblue/greatblue_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var LinePay = [13][5]float64{
2929
var ScatPay = [5]float64{0, 2, 5, 20, 500} // 13 scatter
3030

3131
// Bet lines
32-
var BetLines = slot.BetLinesPlt30
32+
var BetLines = slot.BetLinesPlt5x3[:30]
3333

3434
const (
3535
shell_x5 = 1

‎game/slot/groovysixties/groovysixties_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var LinePay = [12][5]float64{
2323
}
2424

2525
// Bet lines
26-
var BetLines = slot.BetLinesNetEnt40
26+
var BetLines = slot.BetLinesNetEnt5x4[:40]
2727

2828
type Game struct {
2929
slot.Slot5x4 `yaml:",inline"`

‎game/slot/lines.go

Lines changed: 7 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ var BetLinesNvm20 = []Linex{
154154
}
155155

156156
// Novomatic 40 bet lines (screen 5x4)
157-
var BetLinesNvm40 = []Linex{
157+
var BetLinesNvm5x4 = [...]Linex{
158158
{1, 1, 1, 1, 1}, // 1
159159
{2, 2, 2, 2, 2}, // 2
160160
{3, 3, 3, 3, 3}, // 3
@@ -197,37 +197,8 @@ var BetLinesNvm40 = []Linex{
197197
{3, 4, 4, 4, 3}, // 40
198198
}
199199

200-
// BetSoft 25 bet lines
201-
var BetLinesBetSoft25 = []Linex{
202-
{2, 2, 2, 2, 2}, // 1
203-
{1, 1, 1, 1, 1}, // 2
204-
{3, 3, 3, 3, 3}, // 3
205-
{1, 2, 3, 2, 1}, // 4
206-
{3, 2, 1, 2, 3}, // 5
207-
{1, 1, 2, 1, 1}, // 6
208-
{3, 3, 2, 3, 3}, // 7
209-
{2, 3, 3, 3, 2}, // 8
210-
{2, 1, 1, 1, 2}, // 9
211-
{2, 1, 2, 1, 2}, // 10
212-
{2, 3, 2, 3, 2}, // 11
213-
{1, 2, 1, 2, 1}, // 12
214-
{3, 2, 3, 2, 3}, // 13
215-
{2, 2, 1, 2, 2}, // 14
216-
{2, 2, 3, 2, 2}, // 15
217-
{1, 2, 2, 2, 1}, // 16
218-
{3, 2, 2, 2, 3}, // 17
219-
{1, 2, 3, 3, 3}, // 18
220-
{3, 2, 1, 1, 1}, // 19
221-
{1, 3, 1, 3, 1}, // 20
222-
{3, 1, 3, 1, 3}, // 21
223-
{1, 3, 3, 3, 1}, // 22
224-
{3, 1, 1, 1, 3}, // 23
225-
{1, 1, 3, 1, 1}, // 24
226-
{3, 3, 1, 3, 3}, // 25
227-
}
228-
229-
// BetSoft 30 bet lines
230-
var BetLinesBetSoft30 = []Linex{
200+
// NetEnt/BetSoft 30 bet lines
201+
var BetLinesNetEnt5x3 = [...]Linex{
231202
{2, 2, 2, 2, 2}, // 1
232203
{1, 1, 1, 1, 1}, // 2
233204
{3, 3, 3, 3, 3}, // 3
@@ -260,65 +231,8 @@ var BetLinesBetSoft30 = []Linex{
260231
{3, 2, 1, 1, 2}, // 30
261232
}
262233

263-
// NetEnt 10 bet lines
264-
var BetLinesNetEnt10 = []Linex{
265-
{2, 2, 2, 2, 2}, // 1
266-
{1, 1, 1, 1, 1}, // 2
267-
{3, 3, 3, 3, 3}, // 3
268-
{1, 2, 3, 2, 1}, // 4
269-
{3, 2, 1, 2, 3}, // 5
270-
{1, 1, 2, 1, 1}, // 6
271-
{3, 3, 2, 3, 3}, // 7
272-
{2, 3, 3, 3, 2}, // 8
273-
{2, 1, 1, 1, 2}, // 9
274-
{2, 1, 2, 1, 2}, // 10
275-
}
276-
277-
// NetEnt 15 bet lines
278-
var BetLinesNetEnt15 = []Linex{
279-
{2, 2, 2, 2, 2}, // 1
280-
{1, 1, 1, 1, 1}, // 2
281-
{3, 3, 3, 3, 3}, // 3
282-
{1, 2, 3, 2, 1}, // 4
283-
{3, 2, 1, 2, 3}, // 5
284-
{1, 1, 2, 1, 1}, // 6
285-
{3, 3, 2, 3, 3}, // 7
286-
{2, 3, 3, 3, 2}, // 8
287-
{2, 1, 1, 1, 2}, // 9
288-
{2, 1, 2, 1, 2}, // 10
289-
{2, 3, 2, 3, 2}, // 11
290-
{1, 2, 1, 2, 1}, // 12
291-
{3, 2, 3, 2, 3}, // 13
292-
{2, 2, 1, 2, 2}, // 14
293-
{2, 2, 3, 2, 2}, // 15
294-
}
295-
296-
// NetEnt 20 bet lines
297-
var BetLinesNetEnt20 = []Linex{
298-
{2, 2, 2, 2, 2}, // 1
299-
{1, 1, 1, 1, 1}, // 2
300-
{3, 3, 3, 3, 3}, // 3
301-
{1, 2, 3, 2, 1}, // 4
302-
{3, 2, 1, 2, 3}, // 5
303-
{1, 1, 2, 1, 1}, // 6
304-
{3, 3, 2, 3, 3}, // 7
305-
{2, 3, 3, 3, 2}, // 8
306-
{2, 1, 1, 1, 2}, // 9
307-
{2, 1, 2, 1, 2}, // 10
308-
{2, 3, 2, 3, 2}, // 11
309-
{1, 2, 1, 2, 1}, // 12
310-
{3, 2, 3, 2, 3}, // 13
311-
{2, 2, 1, 2, 2}, // 14
312-
{2, 2, 3, 2, 2}, // 15
313-
{1, 2, 2, 2, 1}, // 16
314-
{3, 2, 2, 2, 3}, // 17
315-
{1, 2, 3, 3, 3}, // 18
316-
{3, 2, 1, 1, 1}, // 19
317-
{1, 3, 1, 3, 1}, // 20
318-
}
319-
320-
// NetEnt 40 bet lines for 5x4 screen
321-
var BetLinesNetEnt40 = []Linex{
234+
// NetEnt 40 bet lines (screen 5x4)
235+
var BetLinesNetEnt5x4 = [...]Linex{
322236
{2, 2, 2, 2, 2}, // 1
323237
{3, 3, 3, 3, 3}, // 2
324238
{1, 1, 1, 1, 1}, // 3
@@ -361,27 +275,8 @@ var BetLinesNetEnt40 = []Linex{
361275
{4, 3, 2, 1, 2}, // 40
362276
}
363277

364-
// Playtech 15 bet lines
365-
var BetLinesPlt15 = []Linex{
366-
{2, 2, 2, 2, 2}, // 1
367-
{1, 1, 1, 1, 1}, // 2
368-
{3, 3, 3, 3, 3}, // 3
369-
{1, 2, 3, 2, 1}, // 4
370-
{3, 2, 1, 2, 3}, // 5
371-
{2, 1, 1, 1, 2}, // 6
372-
{2, 3, 3, 3, 2}, // 7
373-
{1, 1, 2, 3, 3}, // 8
374-
{3, 3, 2, 1, 1}, // 9
375-
{2, 3, 2, 1, 2}, // 10
376-
{2, 1, 2, 3, 2}, // 11
377-
{1, 2, 2, 2, 1}, // 12
378-
{3, 2, 2, 2, 3}, // 13
379-
{1, 2, 1, 2, 1}, // 14
380-
{3, 2, 3, 2, 3}, // 15
381-
}
382-
383278
// Playtech 30 bet lines
384-
var BetLinesPlt30 = []Linex{
279+
var BetLinesPlt5x3 = [...]Linex{
385280
{2, 2, 2, 2, 2}, // 1
386281
{1, 1, 1, 1, 1}, // 2
387282
{3, 3, 3, 3, 3}, // 3
@@ -415,7 +310,7 @@ var BetLinesPlt30 = []Linex{
415310
}
416311

417312
// AGT software 20 bet lines
418-
var BetLinesAgt5x3 = [20]Linex{
313+
var BetLinesAgt5x3 = [...]Linex{
419314
{2, 2, 2, 2, 2}, // 1
420315
{1, 1, 1, 1, 1}, // 2
421316
{3, 3, 3, 3, 3}, // 3

‎game/slot/panthermoon/panthermoon_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var Jackpot = [13][5]int{
5151
}
5252

5353
// Bet lines
54-
var BetLines = slot.BetLinesPlt15
54+
var BetLines = slot.BetLinesPlt5x3[:15]
5555

5656
type Game struct {
5757
slot.Slot5x3 `yaml:",inline"`

‎game/slot/piggyriches/piggyriches_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var LinePay = [12][5]float64{
2424
var ScatPay = [5]float64{0, 2, 4, 15, 100} // 2 scatter
2525

2626
// Bet lines
27-
var BetLines = slot.BetLinesNetEnt15
27+
var BetLines = slot.BetLinesNetEnt5x3[:15]
2828

2929
type Game struct {
3030
slot.Slot5x3 `yaml:",inline"`

‎game/slot/roaringforties/roaringforties_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var Jackpot = [10][5]int{
4242
}
4343

4444
// Bet lines
45-
var BetLines = slot.BetLinesNvm40
45+
var BetLines = slot.BetLinesNvm5x4[:40]
4646

4747
type Game struct {
4848
slot.Slot5x4 `yaml:",inline"`

‎game/slot/simsalabim/simsalabim_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var ScatPay = [5]float64{0, 2, 4, 25, 200} // 11 scatter
2727
var ScatFreespin = [5]int{0, 0, 10, 20, 30} // 11 scatter
2828

2929
// Bet lines
30-
var BetLines = slot.BetLinesBetSoft25
30+
var BetLines = slot.BetLinesNetEnt5x3[:25]
3131

3232
const (
3333
ne12 = 1 // bonus ID

‎game/slot/spellcast/spellcast_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var ScatPay = [5]float64{0, 2, 5, 25, 500} // 2 scatter
3030
var ScatFreespin = [5]int{0, 0, 15, 15, 15} // 2 scatter
3131

3232
// Bet lines
33-
var BetLines = slot.BetLinesNetEnt20
33+
var BetLines = slot.BetLinesNetEnt5x3[:20]
3434

3535
type Game struct {
3636
slot.Slot5x3 `yaml:",inline"`

‎game/slot/thrillspin/thrillspin_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var ScatPay = [5]float64{0, 2, 5, 25, 500} // 2 scatter
3030
var ScatFreespin = [5]int{0, 0, 15, 15, 15} // 2 scatter
3131

3232
// Bet lines
33-
var BetLines = slot.BetLinesNetEnt15
33+
var BetLines = slot.BetLinesNetEnt5x3[:15]
3434

3535
type Game struct {
3636
slot.Slot5x3 `yaml:",inline"`

‎game/slot/tikiwonders/tikiwonders_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var ScatPay = [5]float64{0, 2, 4, 50, 400} // 2 scatter
2828
var ScatFreespin = [5]int{0, 0, 10, 20, 30} // 2 scatter
2929

3030
// Bet lines
31-
var BetLines = slot.BetLinesBetSoft30
31+
var BetLines = slot.BetLinesNetEnt5x3[:30]
3232

3333
type Game struct {
3434
slot.Slot5x3 `yaml:",inline"`

‎game/slot/trolls/trolls_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var Jackpot = [14][5]int{
5151
}
5252

5353
// Bet lines
54-
var BetLines = slot.BetLinesNetEnt20
54+
var BetLines = slot.BetLinesNetEnt5x3[:20]
5555

5656
type Game struct {
5757
slot.Slot5x3 `yaml:",inline"`

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
require (
1919
filippo.io/edwards25519 v1.1.0 // indirect
2020
github.com/bytedance/sonic v1.12.3 // indirect
21-
github.com/bytedance/sonic/loader v0.2.0 // indirect
21+
github.com/bytedance/sonic/loader v0.2.1 // indirect
2222
github.com/cloudwego/base64x v0.1.4 // indirect
2323
github.com/cloudwego/iasm v0.2.0 // indirect
2424
github.com/fsnotify/fsnotify v1.7.0 // indirect

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0p
55
github.com/bytedance/sonic v1.12.3 h1:W2MGa7RCU1QTeYRTPE3+88mVC0yXmsRQRChiyVocVjU=
66
github.com/bytedance/sonic v1.12.3/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
77
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
8-
github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM=
9-
github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
8+
github.com/bytedance/sonic/loader v0.2.1 h1:1GgorWTqf12TA8mma4DDSbaQigE2wOgQo7iCjjJv3+E=
9+
github.com/bytedance/sonic/loader v0.2.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
1010
github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
1111
github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
1212
github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=

0 commit comments

Comments
 (0)