enefel 2.1.4 → 2.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/block.ts +27 -11
  2. package/dist/block.js +23 -11
  3. package/dist/package-lock.json +2 -2
  4. package/dist/package.json +1 -1
  5. package/package.json +1 -1
package/block.ts CHANGED
@@ -22,19 +22,14 @@ const hasDefenserDodge = (
22
22
  return hasDefenderDodge && !hasAttackerTacle;
23
23
  };
24
24
 
25
- // ah oui si je suis bloqué à deux dès contre et que j'ai pas blocage, en effet je voudrais 1 3 2 4 5voir 1 3 4 2 5 si j'ai esquive
26
- // c'est vrai
27
- // la ligne if (!hasSkill(defender, SKILL_NAMES.BLOCK)) { doit aussi s'appliquer quand l'attaque a pas blocage du coup
28
- // mais que quand c'est en dés contre c'est ca?
29
- // je vérifierai ca
30
- // faut que je le dessine
25
+ // si je suis bloqué à deux dès contre et que j'ai pas blocage, en effet je voudrais 1 3 2 4 5voir 1 3 4 2 5 si j'ai esquive
31
26
 
32
27
  const getOrderDice = (attacker: PlayerWithSkill, defender: PlayerWithSkill) => {
33
28
  let order = [
34
29
  { value: 5, isReroll: false }, // Never change
35
30
  { value: 4, isReroll: false },
36
31
  { value: 3, isReroll: false },
37
- { value: 2, isReroll: true },
32
+ { value: 2, isReroll: !hasSkill(attacker, SKILL_NAMES.WRESTLE) },
38
33
  { value: 1, isReroll: true }, // Never change
39
34
  ] as { value: number; isReroll: boolean }[];
40
35
 
@@ -76,18 +71,29 @@ const getOrderDiceAgainst = (
76
71
  defender: PlayerWithSkill
77
72
  ) => {
78
73
  if (hasSkill(defender, SKILL_NAMES.BLOCK)) {
74
+ // Pas sur de ce cas
79
75
  if (hasSkill(defender, SKILL_NAMES.WRESTLE)) {
80
76
  return [
81
77
  { value: 1, isReroll: true },
82
78
  { value: 3, isReroll: false },
83
- { value: 2, isReroll: !hasSkill(attacker, SKILL_NAMES.BLOCK) },
79
+ {
80
+ value: 2,
81
+ isReroll:
82
+ !hasSkill(attacker, SKILL_NAMES.BLOCK) &&
83
+ !hasSkill(attacker, SKILL_NAMES.WRESTLE),
84
+ },
84
85
  { value: 4, isReroll: false },
85
86
  { value: 5, isReroll: false },
86
87
  ];
87
88
  }
88
89
  return [
89
90
  { value: 1, isReroll: true },
90
- { value: 2, isReroll: !hasSkill(attacker, SKILL_NAMES.BLOCK) },
91
+ {
92
+ value: 2,
93
+ isReroll:
94
+ !hasSkill(attacker, SKILL_NAMES.BLOCK) &&
95
+ !hasSkill(attacker, SKILL_NAMES.WRESTLE),
96
+ },
91
97
  { value: 3, isReroll: false },
92
98
  { value: 4, isReroll: false },
93
99
  { value: 5, isReroll: false },
@@ -98,14 +104,24 @@ const getOrderDiceAgainst = (
98
104
  { value: 1, isReroll: true },
99
105
  { value: 3, isReroll: false },
100
106
  { value: 4, isReroll: false },
101
- { value: 2, isReroll: !hasSkill(attacker, SKILL_NAMES.BLOCK) },
107
+ {
108
+ value: 2,
109
+ isReroll:
110
+ !hasSkill(attacker, SKILL_NAMES.BLOCK) &&
111
+ !hasSkill(attacker, SKILL_NAMES.WRESTLE),
112
+ },
102
113
  { value: 5, isReroll: false },
103
114
  ];
104
115
  } else {
105
116
  return [
106
117
  { value: 1, isReroll: true },
107
118
  { value: 3, isReroll: false },
108
- { value: 2, isReroll: !hasSkill(attacker, SKILL_NAMES.BLOCK) },
119
+ {
120
+ value: 2,
121
+ isReroll:
122
+ !hasSkill(attacker, SKILL_NAMES.BLOCK) &&
123
+ !hasSkill(attacker, SKILL_NAMES.WRESTLE),
124
+ },
109
125
  { value: 4, isReroll: false },
110
126
  { value: 5, isReroll: false },
111
127
  ];
package/dist/block.js CHANGED
@@ -17,18 +17,13 @@ const hasDefenserDodge = (attacker, defender) => {
17
17
  let hasAttackerTacle = (0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.TACKLE);
18
18
  return hasDefenderDodge && !hasAttackerTacle;
19
19
  };
20
- // ah oui si je suis bloqué à deux dès contre et que j'ai pas blocage, en effet je voudrais 1 3 2 4 5voir 1 3 4 2 5 si j'ai esquive
21
- // c'est vrai
22
- // la ligne if (!hasSkill(defender, SKILL_NAMES.BLOCK)) { doit aussi s'appliquer quand l'attaque a pas blocage du coup
23
- // mais que quand c'est en dés contre c'est ca?
24
- // je vérifierai ca
25
- // faut que je le dessine
20
+ // si je suis bloqué à deux dès contre et que j'ai pas blocage, en effet je voudrais 1 3 2 4 5voir 1 3 4 2 5 si j'ai esquive
26
21
  const getOrderDice = (attacker, defender) => {
27
22
  let order = [
28
23
  { value: 5, isReroll: false }, // Never change
29
24
  { value: 4, isReroll: false },
30
25
  { value: 3, isReroll: false },
31
- { value: 2, isReroll: true },
26
+ { value: 2, isReroll: !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.WRESTLE) },
32
27
  { value: 1, isReroll: true }, // Never change
33
28
  ];
34
29
  // Only block can make change the order
@@ -65,18 +60,27 @@ const getOrderDice = (attacker, defender) => {
65
60
  exports.getOrderDice = getOrderDice;
66
61
  const getOrderDiceAgainst = (attacker, defender) => {
67
62
  if ((0, skill_1.hasSkill)(defender, skill_1.SKILL_NAMES.BLOCK)) {
63
+ // Pas sur de ce cas
68
64
  if ((0, skill_1.hasSkill)(defender, skill_1.SKILL_NAMES.WRESTLE)) {
69
65
  return [
70
66
  { value: 1, isReroll: true },
71
67
  { value: 3, isReroll: false },
72
- { value: 2, isReroll: !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.BLOCK) },
68
+ {
69
+ value: 2,
70
+ isReroll: !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.BLOCK) &&
71
+ !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.WRESTLE),
72
+ },
73
73
  { value: 4, isReroll: false },
74
74
  { value: 5, isReroll: false },
75
75
  ];
76
76
  }
77
77
  return [
78
78
  { value: 1, isReroll: true },
79
- { value: 2, isReroll: !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.BLOCK) },
79
+ {
80
+ value: 2,
81
+ isReroll: !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.BLOCK) &&
82
+ !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.WRESTLE),
83
+ },
80
84
  { value: 3, isReroll: false },
81
85
  { value: 4, isReroll: false },
82
86
  { value: 5, isReroll: false },
@@ -87,7 +91,11 @@ const getOrderDiceAgainst = (attacker, defender) => {
87
91
  { value: 1, isReroll: true },
88
92
  { value: 3, isReroll: false },
89
93
  { value: 4, isReroll: false },
90
- { value: 2, isReroll: !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.BLOCK) },
94
+ {
95
+ value: 2,
96
+ isReroll: !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.BLOCK) &&
97
+ !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.WRESTLE),
98
+ },
91
99
  { value: 5, isReroll: false },
92
100
  ];
93
101
  }
@@ -95,7 +103,11 @@ const getOrderDiceAgainst = (attacker, defender) => {
95
103
  return [
96
104
  { value: 1, isReroll: true },
97
105
  { value: 3, isReroll: false },
98
- { value: 2, isReroll: !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.BLOCK) },
106
+ {
107
+ value: 2,
108
+ isReroll: !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.BLOCK) &&
109
+ !(0, skill_1.hasSkill)(attacker, skill_1.SKILL_NAMES.WRESTLE),
110
+ },
99
111
  { value: 4, isReroll: false },
100
112
  { value: 5, isReroll: false },
101
113
  ];
package/dist/package-lock.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "enefel",
3
- "version": "2.1.4",
3
+ "version": "2.1.5",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "enefel",
9
- "version": "2.1.4",
9
+ "version": "2.1.5",
10
10
  "license": "MIT",
11
11
  "dependencies": {
12
12
  "seedrandom": "3.0.5",
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "enefel",
3
- "version": "2.1.4",
3
+ "version": "2.1.5",
4
4
  "description": "Blood Bowl 3 game engine",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "enefel",
3
- "version": "2.1.4",
3
+ "version": "2.1.5",
4
4
  "description": "Blood Bowl 3 game engine",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",