Skip to content

Commit

Permalink
fixed sizing of certain elements
Browse files Browse the repository at this point in the history
  • Loading branch information
davewx7 committed Jan 16, 2018
1 parent 32196fb commit de6034b
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 4 deletions.
15 changes: 15 additions & 0 deletions data/campaign-dialog/4ca3280fcb674aba88257f30f032ecce5.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"edit_loc": [326,174],
"id": "4ca3280fcb674aba88257f30f032ecce5",
"image": "portraits/astral-walk.png",
"image_animate_time": 600,
"image_area": [0,0,800,535],
"next_image_area": [101.0,43.5,627.0,395.5],
"options": [
{
"goto": "4ca3280fcb674aba88257f30f032ecce6",
"text": "Continue"
}
],
"text": "You run away"
}
30 changes: 30 additions & 0 deletions data/campaign-dialog/4ca3280fcb674aba88257f30f032ecce6.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"edit_loc": [324,272],
"id": "4ca3280fcb674aba88257f30f032ecce6",
"image": "portraits/oil-of-anointing.png",
"image_animate_time": 600,
"image_area": [231.0,200.0,701.0,514.0],
"next_image_area": [231.0,200.0,701.0,514.0],
"options": [
{
"goto": "4ca3280fcb674aba88257f30f032ecce7",
"text": "Continue"
}
],
"related_nodes": ["reward2"],
"reward": {
"cards": [],
"devotion": {
"@eval 1": 0,
"@eval 2": 0,
"@eval 3": 0,
"@eval 4": 0,
"@eval 5": 0
},
"flags": ["killed_goblin_king"],
"gold": 50,
"location": null,
"packs": 0
},
"text": "Lorem ipsum"
}
28 changes: 28 additions & 0 deletions data/campaign-dialog/4ca3280fcb674aba88257f30f032ecce7.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"condition": {
"conditions": [
{
"cmp": "=",
"constant": "",
"variable": "has flag"
}
]
},
"edit_loc": [327,372],
"id": "4ca3280fcb674aba88257f30f032ecce7",
"image": "portraits/tactical-maneuver.png",
"image_animate_time": 600,
"image_area": [227.5,283.5,716.5,610.5],
"next_image_area": [227.5,283.5,716.5,610.5],
"options": [
{
"goto": "4ca3280fcb674aba88257f30f032ecce8",
"text": "True"
},
{
"goto": null,
"text": "False"
}
],
"text": "Lorem ipsum"
}
14 changes: 14 additions & 0 deletions data/campaign-dialog/4ca3280fcb674aba88257f30f032ecce8.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"edit_loc": [259,457],
"id": "4ca3280fcb674aba88257f30f032ecce8",
"image": "portraits/acolyte.png",
"image_animate_time": 600,
"image_area": [0.0,0.0,800.0,400.0],
"options": [
{
"goto": null,
"text": "Continue"
}
],
"text": "Lorem ipsum"
}
14 changes: 14 additions & 0 deletions data/campaign-dialog/8f65117744b446cda0578d647f2ede5e3.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"edit_loc": [149,746],
"id": "8f65117744b446cda0578d647f2ede5e3",
"image": "portraits/acolyte.png",
"image_animate_time": 600,
"image_area": [0.0,0.0,800.0,400.0],
"options": [
{
"goto": null,
"text": "Continue"
}
],
"text": "Lorem ipsum"
}
2 changes: 1 addition & 1 deletion data/objects/mana_numeric_display.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ properties: {
_dirty: { default: false },

_font: { type: "string", init: "lib.font.regular_font" },
_font_size: "int :: lib.citadel.py(24)",
_font_size: "int :: lib.citadel.py(22)",

_controller: { type: "obj citadel_controller" },
_is_player: { type: "bool" },
Expand Down
2 changes: 1 addition & 1 deletion data/objects/move_arrow.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
},

events: {
create: "set(alpha, if(is_leap, 255, 128)); render(100, _height); set(mid_x, (src.x+dst.x)/2); set(mid_y, (src.y+dst.y)/2); set(rotate, -atan2(src.x - dst.x, src.y - dst.y))",
create: "set(alpha, if(is_leap, 255, 128)); render(lib.gui.py(100), _height); set(mid_x, (src.x+dst.x)/2); set(mid_y, (src.y+dst.y)/2); set(rotate, -atan2(src.x - dst.x, src.y - dst.y))",
type_updated: "fire_event('create')",

mouse_enter: "if(selectable, animate(me, { alpha: 255 }, { duration: 10 }))",
Expand Down
5 changes: 3 additions & 2 deletions module.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"--dump-to-console=false",
"--defer-archive-desktop-fullscreen=true",
"--log-instrumentation=true",
"--ffl-vm=true"
"--no-tests",
"--ffl-vm=true",
],
"build_requirements": [],
"custom_arguments": {
Expand Down Expand Up @@ -57,6 +58,6 @@
"version": [
1,
0,
657
659
]
}

0 comments on commit de6034b

Please sign in to comment.