feat: migrate weapon stats to type string (#13)

* feat: migrate weapon stats to type string to support D{n},-n, and n+ values * fix: yaml formatting --------- Co-authored-by: brittonhayes <[email protected]>
brittonhayes · Jul 29, 2023 · 392842d · 392842d
1 parent 38c1419
commit 392842d
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 71 deletions.
diff --git a/api/api.gen.go b/api/api.gen.go
diff --git a/api/openapi.yaml b/api/openapi.yaml
@@ -468,7 +468,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-
 components:
   schemas:
     Health:
@@ -589,24 +588,19 @@ components:
             bun: ',pk'
         name:
           type: string
+          example: "Lance and Sword"
         range:
-          type: integer
-          format: int64
+          type: string
         attacks:
-          type: integer
-          format: int64
+          type: string
         to_hit:
-          type: integer
-          format: int64
+          type: string
         to_wound:
-          type: integer
-          format: int64
+          type: string
         rend:
-          type: integer
-          format: int64
+          type: string
         damage:
-          type: integer
-          format: int64
+          type: string
     GrandAlliance:
       type: object
       required:
@@ -696,20 +690,14 @@ components:
             type: string
         command_abilities:
           type: array
-          # x-go-extra-tags:
-          #   bun: "rel:has-many,join:id=unit_id"
           items:
             $ref: '#/components/schemas/Attribute'
         magic:
           type: array
-          # x-go-extra-tags:
-          #   bun: "rel:has-many,join:id=unit_id"
           items:
             $ref: '#/components/schemas/Attribute'
         damage_table:
           type: array
-          # x-go-extra-tags:
-          #   bun: "rel:has-many,join:id=unit_id"
           items:
             $ref: '#/components/schemas/DamageTable'
         missile_weapons:
@@ -720,7 +708,6 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/Weapon'
-
     Army:
       type: object
       required:

diff --git a/fixtures/units.yaml b/fixtures/units.yaml
@@ -35,12 +35,26 @@
           min_wounds_suffered: 0
       melee_weapons:
         - name: Celestine Hammer
-          range: 1
-          attacks: 4
-          to_hit: 3
-          to_wound: 3
-          rend: -1
-          damage: 2
+          range: '1'
+          attacks: '4+'
+          to_hit: '3+'
+          to_wound: '3+'
+          rend: '-1'
+          damage: 'D3'
+        - name: Stormbound Blade
+          range: '1'
+          attacks: '1'
+          to_hit: '3+'
+          to_wound: '4+'
+          rend: '-1'
+          damage: '2'
+        - name: Great Claws
+          range: '1'
+          attacks: '2'
+          to_hit: '3+'
+          to_wound: '3+'
+          rend: '-1'
+          damage: '1'
       missile_weapons: []
     - id: liberators
       name: Liberators
@@ -75,10 +89,10 @@
           min_wounds_suffered: 0
       melee_weapons:
         - name: Warhammer
-          range: 1
-          attacks: 1
-          to_hit: 4
-          to_wound: 3
-          rend: -1
-          damage: 1
+          range: '1'
+          attacks: '1+'
+          to_hit: '4+'
+          to_wound: '3+'
+          rend: '-1'
+          damage: '1'
       missile_weapons: []