ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the glyph hack for bullet in type

Browse Source
This commit is contained in:
marcin.sciesinski
2019-10-12 09:01:38 -07:00
parent 4601f42216
commit 6449db69b1
3 changed files with 83 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-dwarven.json
View File

@@ -518,6 +518,12 @@
"possession": "hand weapon",
"strength": 2,
"target": "dwarf",
"text": [
"Bearer must be a Dwarf.",
"If bearer is Gimli, he is [keyword]damage +1[/keyword].",
"Each time bearer wins a skirmish, you may stack a {dwarven} event from your discard pile one a {dwarven} support are condition."
],
"quote": "Gimli masterfully wielded his axe in combat.",
"effects": [
{
"type": "modifier",

2
gemp-lotr/gemp-lotr-images/src/main/java/com/gempukku/lotro/images/ImageGenerator.java
View File

@@ -38,7 +38,7 @@ public class ImageGenerator {
final JSONObject cardsObject = (JSONObject) parser.parse(reader);
for (Map.Entry<String, JSONObject> cardEntry : (Set<Map.Entry<String, JSONObject>>) cardsObject.entrySet()) {
final String cardId = cardEntry.getKey();
if (cardId.equals("40_3") || cardId.equals("40_17")) {
if (cardId.equals("40_3") || cardId.equals("40_17") || cardId.equals("40_19")) {
BufferedImage bufferedImage = new BufferedImage(jsonImageRecipe.getWidth(), jsonImageRecipe.getHeight(), BufferedImage.TYPE_INT_RGB);
jsonImageRecipe.renderImage(properties, cardEntry.getValue(), bufferedImage);

127
gemp-lotr/gemp-lotr-images/src/main/resources/cardRecipe.json
View File

@@ -188,10 +188,10 @@
"type": "cardHasProperty",
"name": "subtitle"
},
"true": 16,
"false": 21
"true": 35,
"false": 50
},
"y": 180,
"y": 600,
"layer": {
"type": "text",
"font": {
@@ -204,12 +204,12 @@
},
"child": {
"type": "property",
"name": "subtitle.font"
"name": "title.font"
}
},
"size": {
"type": "property",
"name": "subtitle.size"
"name": "title.size"
},
"style": 0
},
@@ -230,12 +230,12 @@
"type": "cardHasProperty",
"name": "subtitle"
},
"true": 16,
"false": 21
"true": 35,
"false": 50
},
"y": 180,
"width": 127,
"height": 24,
"y": 600,
"width": 440,
"height": 70,
"horAlign": "right"
}
}
@@ -292,8 +292,8 @@
"values": {
"type": "rotate",
"angle": -90,
"x": 26,
"y": 180,
"x": 65,
"y": 600,
"layer": {
"type": "text",
"font": {
@@ -321,10 +321,10 @@
},
"box": {
"type": "box",
"x": 26,
"y": 180,
"width": 127,
"height": 24,
"x": 65,
"y": 600,
"width": 440,
"height": 70,
"horAlign": "right"
}
}
@@ -397,7 +397,7 @@
"value": {
"type": "append",
"values": [
" {bullet} ",
" [bullet]•[/bullet] ",
{
"type": "capitalize",
"value": {
@@ -429,7 +429,7 @@
"value": {
"type": "append",
"values": [
" {bullet} ",
" [bullet]•[/bullet] ",
{
"type": "capitalize",
"value": {
@@ -473,7 +473,7 @@
},
"style": 0
},
"glyph": {
"bullet": {
"type": "ttf",
"path": {
"type": "resolve",
@@ -481,16 +481,18 @@
"type": "property",
"name": "lotro.resources.folder"
},
"child": "LOTRSymbols.ttf"
"child": {
"type": "property",
"name": "type.font"
}
},
"size": 38,
"size": 30,
"style": 0
}
},
"glyphs": {
"shire": "#",
"dwarven": "@",
"bullet": "•"
"dwarven": "@"
},
"minYStart": 1,
"box": {
@@ -511,28 +513,9 @@
"name": "isNonCharacter"
},
"values": {
"type": "text",
"font": {
"type": "ttf",
"path": {
"type": "resolve",
"parent": {
"type": "property",
"name": "lotro.resources.folder"
},
"child": {
"type": "property",
"name": "type.font"
}
},
"size": {
"type": "property",
"name": "type.size"
},
"style": 0
},
"type": "textBox",
"text": {
"type": "append",
"type": "appendText",
"values": [
{
"comment": "Card type",
@@ -552,7 +535,7 @@
"value": {
"type": "append",
"values": [
" • ",
" [bullet]•[/bullet] ",
{
"type": "capitalize",
"value": {
@@ -573,7 +556,7 @@
"value": {
"type": "append",
"values": [
" • ",
" [bullet]•[/bullet] ",
{
"type": "capitalize",
"value": {
@@ -605,7 +588,7 @@
"value": {
"type": "append",
"values": [
" • ",
" [bullet]•[/bullet] ",
{
"type": "capitalize",
"value": {
@@ -629,12 +612,54 @@
}
]
},
"font": {
"default": {
"type": "ttf",
"path": {
"type": "resolve",
"parent": {
"type": "property",
"name": "lotro.resources.folder"
},
"child": {
"type": "property",
"name": "type.font"
}
},
"size": {
"type": "property",
"name": "type.size"
},
"style": 0
},
"bullet": {
"type": "ttf",
"path": {
"type": "resolve",
"parent": {
"type": "property",
"name": "lotro.resources.folder"
},
"child": {
"type": "property",
"name": "type.font"
}
},
"size": 30,
"style": 0
}
},
"glyphs": {
"shire": "#",
"dwarven": "@"
},
"minYStart": 1,
"box": {
"type": "box",
"x": 18,
"y": 197,
"width": 240,
"height": 30,
"x": 170,
"y": 611,
"width": 521,
"height": 40,
"horAlign": "center"
}
}