Merge branch 'dev'

uspgamedev · Jun 25, 2020 · a398573 · a398573
2 parents 63d66a5 + ee272f1
commit a398573
Show file tree

Hide file tree

Showing 169 changed files with 1,388 additions and 800 deletions.
diff --git a/game/assets/sfx/close_hand.wav b/game/assets/sfx/close_hand.wav
diff --git a/game/assets/sfx/cond_off.wav b/game/assets/sfx/cond_off.wav
diff --git a/game/assets/sfx/cond_on.wav b/game/assets/sfx/cond_on.wav
diff --git a/game/assets/sfx/create_card.wav b/game/assets/sfx/create_card.wav
diff --git a/game/assets/sfx/discard-temporary-card.wav b/game/assets/sfx/discard-temporary-card.wav
diff --git a/game/assets/sfx/draw_card.wav b/game/assets/sfx/draw_card.wav
diff --git a/game/assets/sfx/equip_off.wav b/game/assets/sfx/equip_off.wav
diff --git a/game/assets/sfx/equip_on.wav b/game/assets/sfx/equip_on.wav
diff --git a/game/assets/sfx/gain_focus.wav b/game/assets/sfx/gain_focus.wav
diff --git a/game/assets/sfx/get_hp.wav b/game/assets/sfx/get_hp.wav
diff --git a/game/assets/sfx/get_pack.wav b/game/assets/sfx/get_pack.wav
diff --git a/game/assets/sfx/get_pp.wav b/game/assets/sfx/get_pp.wav
diff --git a/game/assets/sfx/open-pack.wav b/game/assets/sfx/open-pack.wav
diff --git a/game/assets/sfx/open_hand.wav b/game/assets/sfx/open_hand.wav
diff --git a/game/assets/sfx/select_card.wav b/game/assets/sfx/select_card.wav
diff --git a/game/assets/sfx/shuffle_hand.wav b/game/assets/sfx/shuffle_hand.wav
diff --git a/game/assets/sfx/toggle_card.wav b/game/assets/sfx/toggle_card.wav
diff --git a/game/assets/sfx/weapon_off.wav b/game/assets/sfx/weapon_off.wav
diff --git a/game/assets/sfx/weapon_on.wav b/game/assets/sfx/weapon_on.wav
diff --git a/game/assets/texture/tiles.png b/game/assets/texture/tiles.png
diff --git a/game/database/domains/body/obstacle.json b/game/database/domains/body/obstacle.json
@@ -5,6 +5,6 @@
   "faction":"agressive",
   "fin":-2,
   "name":"Obstacle",
-  "res":2,
+  "res":-1,
   "extends":false
 }
diff --git a/game/database/domains/card/arcane-burst.json b/game/database/domains/card/arcane-burst.json
@@ -2,15 +2,13 @@
   "art":{
     "art_ability":{
       "effects":[{
-          "attr":"=arc",
-          "base":1,
           "center":"=self_pos",
           "ignore_owner":true,
-          "mod":80,
           "name":"damage_on_area",
           "sfx":"attack-hit",
           "size":3,
-          "type":"effect"
+          "type":"effect",
+          "value":"=amount"
         }],
       "inputs":[{
           "aoe-hint":3,
@@ -22,11 +20,6 @@
           "output":"dummy",
           "tactical-hint":"harmful",
           "type":"input"
-        },{
-          "name":"get_attribute",
-          "output":"arc",
-          "type":"operator",
-          "which":"ARC"
         },{
           "name":"self",
           "output":"self",
@@ -41,13 +34,21 @@
           "name":"get_body_pos",
           "output":"self_pos",
           "type":"operator"
+        },{
+          "attr":"ARC",
+          "base":1,
+          "mod":80,
+          "name":"effective_power",
+          "output":"amount",
+          "type":"operator"
         }]
     }
   },
   "attr":"ARC",
   "cost":3,
   "exhaustion":"FULL",
   "icon":"card-arcane-burst",
+  "level":4,
   "name":"Arcane Burst",
   "set":"ranged_common"
-}
+}
diff --git a/game/database/domains/card/auto-fire.json b/game/database/domains/card/auto-fire.json
@@ -9,10 +9,9 @@
     "auto_activation":{
       "ability":{
         "effects":[{
-            "attr":"=cor",
-            "base":0,
-            "mod":100,
+            "value":"=amount",
             "name":"damage_on_target",
+            "projectile":true,
             "sfx":"attack-hit",
             "target":"=target",
             "type":"effect"
@@ -40,10 +39,12 @@
             "range":3,
             "type":"operator"
           },{
-            "name":"get_attribute",
-            "output":"cor",
-            "type":"operator",
-            "which":"COR"
+            "attr":"COR",
+            "base":0,
+            "mod":100,
+            "name":"effective_power",
+            "output":"amount",
+            "type":"operator"
           }]
       },
       "trigger":"on_cycle"
@@ -57,4 +58,4 @@
   },
   "icon":false,
   "set":false
-}
+}
diff --git a/game/database/domains/card/bloodthirst.json b/game/database/domains/card/bloodthirst.json
@@ -1,5 +1,6 @@
 {
   "attr":"ANI",
+  "level":4,
   "cost":3,
   "icon":"card-bloodthirst",
   "name":"Bloodthirst",
@@ -8,9 +9,7 @@
     "auto_activation":{
       "ability":{
         "effects":[{
-            "attr":"=ani",
-            "base":2,
-            "mod":50,
+            "value":"=amount",
             "name":"heal",
             "target":"=self-body",
             "type":"effect"
@@ -25,18 +24,74 @@
             "output":"self-body",
             "type":"operator"
           },{
-            "name":"get_attribute",
-            "output":"ani",
-            "type":"operator",
-            "which":"ANI"
+            "attr":"ANI",
+            "base":2,
+            "mod":50,
+            "name":"effective_power",
+            "output":"amount",
+            "type":"operator"
           }]
       },
       "trigger":"on_kill"
     },
     "charges":12,
     "operators":[],
+    "static":[{
+        "descr":"Whenever you deal damage, you deal an\nadditional 1 damage for each other\ncreature within 3 tiles of you.",
+        "op":"damage_on_target",
+        "replacement-ability":{
+          "effects":[{
+              "attr":"=attr",
+              "base":"=base+x",
+              "mod":"=mod",
+              "name":"damage_on_target",
+              "sfx":"attack-hit",
+              "target":"=target",
+              "type":"effect",
+              "value":"=base+x"
+            }],
+          "inputs":[{
+              "name":"integer",
+              "output":"value",
+              "type":"input"
+            },{
+              "name":"body",
+              "output":"target",
+              "type":"input"
+            },{
+              "name":"self",
+              "output":"self",
+              "type":"operator"
+            },{
+              "actor":"=self",
+              "name":"get_actor_body",
+              "output":"self_body",
+              "type":"operator"
+            },{
+              "body":"=self_body",
+              "name":"get_body_pos",
+              "output":"self_pos",
+              "type":"operator"
+            },{
+              "ignore-owner":true,
+              "name":"count_nearby_bodies",
+              "output":"count",
+              "pos":"=self_pos",
+              "range":3,
+              "type":"operator",
+              "body-type":false
+            },{
+              "lhs":"=value",
+              "name":"integer_binop",
+              "op":"+",
+              "output":"base+x",
+              "rhs":"=count",
+              "type":"operator"
+            }]
+        }
+      }],
     "status-tags":[],
     "tactical-hint":"helpful",
     "trigger":"on_turn"
   }
-}
+}
diff --git a/game/database/domains/card/bone-club-crush.json b/game/database/domains/card/bone-club-crush.json
@@ -2,9 +2,7 @@
   "art":{
     "art_ability":{
       "effects":[{
-          "attr":"=cor",
-          "base":7,
-          "mod":20,
+          "value":"=amount",
           "name":"damage_on_target",
           "sfx":"attack-hit",
           "target":"=target-body",
@@ -25,17 +23,20 @@
           "pos":"=target-pos",
           "type":"operator"
         },{
-          "name":"get_attribute",
-          "output":"cor",
-          "type":"operator",
-          "which":"COR"
+          "attr":"COR",
+          "base":7,
+          "mod":20,
+          "name":"effective_power",
+          "output":"amount",
+          "type":"operator"
         }]
     }
   },
   "attr":"COR",
   "cost":1,
   "icon":"card-bone-club",
+  "level":6,
   "name":"Bone Club Crush",
   "temporary":true,
   "set":false
-}
+}
diff --git a/game/database/domains/card/bone-club.json b/game/database/domains/card/bone-club.json
@@ -1,6 +1,7 @@
 {
   "attr":"COR",
   "cost":3,
+  "level":6,
   "icon":"card-bone-club",
   "name":"Bone Club",
   "one_time":true,
@@ -24,4 +25,4 @@
     "trigger":false,
     "auto_activation":false
   }
-}
+}
diff --git a/game/database/domains/card/chained-energy.json b/game/database/domains/card/chained-energy.json
@@ -1,6 +1,7 @@
 {
   "attr":"ANI",
   "cost":1,
+  "level":4,
   "desc":"",
   "icon":"card-chained-energy",
   "name":"Chained Energy",
@@ -10,9 +11,7 @@
     "auto_activation":{
       "ability":{
         "effects":[{
-            "attr":"=ani",
-            "base":0,
-            "mod":50,
+            "value":"=amount",
             "name":"damage_on_target",
             "projectile":true,
             "sfx":"attack-hit",
@@ -43,10 +42,12 @@
             "range":4,
             "type":"operator"
           },{
-            "name":"get_attribute",
-            "output":"ani",
-            "type":"operator",
-            "which":"ANI"
+            "attr":"ANI",
+            "base":0,
+            "mod":50,
+            "name":"effective_power",
+            "output":"amount",
+            "type":"operator"
           }]
       },
       "trigger":"on_play"

diff --git a/game/database/domains/card/chained-surge.json b/game/database/domains/card/chained-surge.json
@@ -11,7 +11,8 @@
   },
   "attr":"ANI",
   "cost":1,
+  "level":8,
   "icon":"card-chained-surge",
   "name":"Chained Surge",
   "set":"support_expert"
-}
+}
diff --git a/game/database/domains/card/change-of-plans.json b/game/database/domains/card/change-of-plans.json
@@ -11,10 +11,11 @@
   },
   "attr":"ARC",
   "cost":1,
+  "level":5,
   "desc":"Close your eyes and see beyond.",
   "icon":"card-change-of-plans",
   "name":"Change of Plans",
   "set":"support_advanced",
   "type-description":"",
   "one_time":false
-}
+}
diff --git a/game/database/domains/card/concentration.json b/game/database/domains/card/concentration.json
@@ -1,6 +1,7 @@
 {
   "attr":"ANI",
   "cost":1,
+  "level":3,
   "desc":"",
   "half-exhaustion":true,
   "icon":"card-concentration",
@@ -21,4 +22,4 @@
   },
   "art":false,
   "one_time":false
-}
+}
diff --git a/game/database/domains/card/dash.json b/game/database/domains/card/dash.json
@@ -43,8 +43,9 @@
   },
   "attr":"COR",
   "cost":1,
+  "level":3,
   "desc":"Voooosh",
   "icon":"card-dash",
   "name":"Dash",
   "set":"maneuver_common"
-}
+}
diff --git a/game/database/domains/card/disposable-defenses.json b/game/database/domains/card/disposable-defenses.json
@@ -1,6 +1,7 @@
 {
   "attr":"NONE",
   "cost":3,
+  "level":7,
   "icon":"card-disposable-defenses",
   "name":"Disposable Defenses",
   "one_time":true,
@@ -15,4 +16,4 @@
     "tactical-hint":"helpful",
     "trigger":false
   }
-}
+}
diff --git a/game/database/domains/card/energy-beam.json b/game/database/domains/card/energy-beam.json
@@ -2,10 +2,8 @@
   "art":{
     "art_ability":{
       "effects":[{
-          "attr":"=arc",
-          "base":0,
+          "value":"=amount",
           "center":"=target_pos",
-          "mod":100,
           "name":"damage_on_area",
           "sfx":"attack-hit",
           "size":1,
@@ -46,10 +44,12 @@
           "pos":"=hitscan",
           "type":"operator"
         },{
-          "name":"get_attribute",
-          "output":"arc",
-          "type":"operator",
-          "which":"ARC"
+          "attr":"ARC",
+          "base":0,
+          "mod":100,
+          "name":"effective_power",
+          "output":"amount",
+          "type":"operator"
         }]
     }
   },
@@ -61,4 +61,4 @@
   "type-description":"",
   "set":false,
   "one_time":false
-}
+}