Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kazuo256 committed May 28, 2020
2 parents 6e6e268 + b845af2 commit 2d95eeb
Show file tree
Hide file tree
Showing 109 changed files with 738 additions and 92 deletions.
Binary file added game/assets/texture/bleeding-eye.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added game/assets/texture/heart-drop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion game/database/domains/actor/brawler.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"extends":"sentient",
"initial_buffer":[{
"amount":1,
"card":"stunning-blow"
"card":"bloodthirst"
},{
"amount":1,
"card":"old-laddle"
Expand Down
22 changes: 22 additions & 0 deletions game/database/domains/actor/dumb-slime.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"ani":-2,
"arc":-2,
"behavior":"aggro",
"cor":-2,
"description":"Weak slimey blob",
"initial_buffer":[{
"amount":6,
"card":"strike"
},{
"amount":4,
"card":"sidestep"
},{
"amount":1,
"card":"jump"
}],
"name":"Dumb Slime",
"signature":"tackle",
"traits":[],
"collection":false,
"extends":false
}
25 changes: 25 additions & 0 deletions game/database/domains/actor/dumb-stove.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"ani":-2,
"arc":-2,
"behavior":"aggro",
"collection":"stove",
"cor":-2,
"description":"Careful with this hot head",
"initial_buffer":[{
"amount":1,
"card":"rage"
},{
"amount":1,
"card":"stomp"
},{
"amount":7,
"card":"strike"
},{
"amount":3,
"card":"rush"
}],
"name":"Dumb Stove",
"signature":"tackle",
"traits":[],
"extends":false
}
37 changes: 37 additions & 0 deletions game/database/domains/actor/fiendish-eye.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"ani":-1,
"arc":2,
"behavior":"aggro",
"collection":"eye",
"cor":-1,
"description":"Stronger spellcaster monster, looking at your soul.",
"initial_buffer":[{
"amount":2,
"card":"fireball"
},{
"amount":7,
"card":"firebolt"
},{
"amount":2,
"card":"chained-energy"
},{
"amount":2,
"card":"chained-surge"
},{
"amount":1,
"card":"vial-of-essence"
},{
"amount":1,
"card":"spark_rod"
},{
"amount":2,
"card":"signet-of-inspiration"
},{
"amount":2,
"card":"stick_flame"
}],
"name":"Fiendish Eye",
"signature":"glare",
"traits":[],
"extends":false
}
28 changes: 28 additions & 0 deletions game/database/domains/actor/grinful-imp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"ani":-1,
"arc":1,
"behavior":"aggro",
"collection":"imp",
"cor":-1,
"description":"Spellcaster monster, evil by nature.",
"initial_buffer":[{
"amount":7,
"card":"firebolt"
},{
"amount":1,
"card":"soul_robe"
},{
"amount":2,
"card":"concentration"
},{
"amount":1,
"card":"teleport"
},{
"amount":1,
"card":"illusion_of_darkness"
}],
"name":"Grinning Imp",
"signature":"scratch",
"traits":[],
"extends":false
}
19 changes: 17 additions & 2 deletions game/database/domains/actor/newbieslayer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,28 @@
"ani":1,
"arc":1,
"behavior":"aggro",
"collection":"anything",
"collection":"doggo",
"cor":2,
"description":"The newbie's nightmares...",
"extends":"strong",
"initial_buffer":[{
"amount":10,
"amount":5,
"card":"teleport"
},{
"amount":5,
"card":"strike"
},{
"amount":2,
"card":"flurry-of-blows"
},{
"amount":2,
"card":"plated-shield"
},{
"amount":2,
"card":"stunning-blow"
},{
"amount":2,
"card":"greater-rush"
}],
"name":"Newbie Killer",
"signature":"punch",
Expand Down
3 changes: 3 additions & 0 deletions game/database/domains/body/eye.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
},{
"droprate":40,
"droptype":"food2"
},{
"droprate":50,
"droptype":"heart"
}],
"efc":-2,
"extends":"imp",
Expand Down
3 changes: 3 additions & 0 deletions game/database/domains/body/imp.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
},{
"droprate":20,
"droptype":"food2"
},{
"droprate":50,
"droptype":"heart"
}],
"efc":-2,
"extends":"slime",
Expand Down
38 changes: 33 additions & 5 deletions game/database/domains/body/rewasvat.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,48 @@
"drops":{
"1":{
"droprate":100,
"droptype":"pack"
"droptype":"doggo-pack"
},
"2":{
"droprate":10,
"droptype":"pack"
"droprate":100,
"droptype":"doggo-pack"
},
"3":{
"droprate":50,
"droprate":100,
"droptype":"heart"
},
"4":{
"droprate":100,
"droptype":"heart"
},
"5":{
"droprate":100,
"droptype":"food"
},
"drops":[{
"droprate":7,
"droptype":"pack"
}]
}],
"1":{
"droprate":100,
"droptype":"doggo-pack"
},
"2":{
"droprate":50,
"droptype":"doggo-pack"
},
"3":{
"droprate":100,
"droptype":"food"
},
"4":{
"droprate":100,
"droptype":"heart"
},
"5":{
"droprate":100,
"droptype":"heart"
}
},
"efc":0,
"extends":"corgi",
Expand Down
3 changes: 3 additions & 0 deletions game/database/domains/body/slime.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
},{
"droprate":25,
"droptype":"food2"
},{
"droprate":50,
"droptype":"heart"
}],
"efc":-1,
"faction":"agressive",
Expand Down
3 changes: 3 additions & 0 deletions game/database/domains/body/stove.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
},{
"droprate":10,
"droptype":"food2"
},{
"droprate":75,
"droptype":"heart"
}],
"efc":0,
"faction":"agressive",
Expand Down
1 change: 1 addition & 0 deletions game/database/domains/card/arcane-burst.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"max-range":0,
"name":"choose_target",
"output":"dummy",
"tactical-hint":"harmful",
"type":"input"
},{
"name":"get_attribute",
Expand Down
1 change: 1 addition & 0 deletions game/database/domains/card/blind.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"val":3
}],
"status-tags":[],
"tactical-hint":"harmful",
"trigger":"on_turn",
"equipment":false
},
Expand Down
42 changes: 42 additions & 0 deletions game/database/domains/card/bloodthirst.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"attr":"ANI",
"cost":3,
"icon":"card-bloodthirst",
"name":"Bloodthirst",
"set":"support_common",
"widget":{
"auto_activation":{
"ability":{
"effects":[{
"attr":"=ani",
"base":2,
"mod":50,
"name":"heal",
"target":"=self-body",
"type":"effect"
}],
"inputs":[{
"name":"self",
"output":"self",
"type":"operator"
},{
"actor":"=self",
"name":"get_actor_body",
"output":"self-body",
"type":"operator"
},{
"name":"get_attribute",
"output":"ani",
"type":"operator",
"which":"ANI"
}]
},
"trigger":"on_kill"
},
"charges":12,
"operators":[],
"status-tags":[],
"tactical-hint":"helpful",
"trigger":"on_turn"
}
}
1 change: 1 addition & 0 deletions game/database/domains/card/bone-club-crush.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"max-range":1,
"name":"choose_target",
"output":"target-pos",
"tactical-hint":"harmful",
"type":"input"
},{
"name":"get_body_at",
Expand Down
1 change: 1 addition & 0 deletions game/database/domains/card/bone-club.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
},
"operators":[],
"status-tags":[],
"tactical-hint":"helpful",
"trigger":false,
"auto_activation":false
}
Expand Down
1 change: 1 addition & 0 deletions game/database/domains/card/calming_down.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"status-tags":[{
"tag":"stun"
}],
"tactical-hint":"healing",
"trigger":"on_cycle",
"equipment":false
},
Expand Down
1 change: 1 addition & 0 deletions game/database/domains/card/chained-energy.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"charges":5,
"operators":[],
"status-tags":[],
"tactical-hint":"harmful",
"trigger":"on_turn",
"equipment":false
},
Expand Down
5 changes: 3 additions & 2 deletions game/database/domains/card/concentration.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
"val":2
}],
"status-tags":[],
"tactical-hint":"helpful",
"trigger":"on_turn",
"equipment":false
},
"one_time":false,
"art":false
"art":false,
"one_time":false
}
1 change: 1 addition & 0 deletions game/database/domains/card/dash.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"name":"choose_dir",
"output":"target_dir",
"reach":5,
"tactical-hint":"movement",
"type":"input"
},{
"name":"self",
Expand Down
1 change: 1 addition & 0 deletions game/database/domains/card/disposable-defenses.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
},
"operators":[],
"status-tags":[],
"tactical-hint":"helpful",
"trigger":false
}
}
1 change: 1 addition & 0 deletions game/database/domains/card/energy-beam.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"body-block":true,
"name":"choose_dir",
"output":"dir",
"tactical-hint":"harmful",
"type":"input"
},{
"name":"self",
Expand Down
1 change: 1 addition & 0 deletions game/database/domains/card/energy-shield.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
},
"operators":[],
"status-tags":[],
"tactical-hint":"helpful",
"trigger":false
}
}
Loading

0 comments on commit 2d95eeb

Please sign in to comment.