Skip to content

Commit 5dc76ea

Browse files
committed
Merge branch 'dev'
2 parents 1cec304 + 869f8fd commit 5dc76ea

File tree

90 files changed

+709
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+709
-97
lines changed

game/assets/texture/tiles-cave.png

15.3 KB
Loading

game/database/domains/actor/dumb-slime.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
"card":"jump"
1616
}],
1717
"name":"Dumb Slime",
18-
"traits":[],
18+
"traits":[{
19+
"specname":"slow"
20+
}],
1921
"extends":false
2022
}
Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
11
{
2-
"ani":-2,
2+
"ani":-1,
33
"arc":-2,
44
"behavior":"aggro",
55
"cor":-2,
66
"description":"Careful with this hot head",
77
"initial_buffer":[{
8-
"amount":1,
9-
"card":"rage"
10-
},{
11-
"amount":1,
12-
"card":"stomp"
13-
},{
148
"amount":7,
159
"card":"strike"
1610
},{
1711
"amount":3,
1812
"card":"rush"
1913
}],
2014
"name":"Dumb Stove",
21-
"traits":[],
15+
"traits":[{
16+
"specname":"slow"
17+
}],
2218
"extends":false
2319
}

game/database/domains/actor/dumb.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
"name":"Dumb",
1212
"traits":[],
1313
"extends":false
14-
}
14+
}

game/database/domains/actor/fiendish-eye.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@
3232
"name":"Fiendish Eye",
3333
"traits":[],
3434
"extends":false
35-
}
35+
}

game/database/domains/actor/fiendish.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
}],
1212
"name":"Fiendish",
1313
"traits":[]
14-
}
14+
}

game/database/domains/actor/gadgeteer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
}],
2121
"name":"Gagdeteer",
2222
"traits":[]
23-
}
23+
}

game/database/domains/actor/grinful.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
}],
1212
"name":"Grinning",
1313
"traits":[]
14-
}
14+
}

game/database/domains/actor/newbieslayer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@
2626
}],
2727
"name":"Newbie Killer",
2828
"traits":[]
29-
}
29+
}

game/database/domains/actor/sentient.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
"initial_buffer":[],
88
"name":"Sentient",
99
"extends":false
10-
}
10+
}

0 commit comments

Comments
 (0)