diff --git a/src/App.vue b/src/App.vue index 3383973..f48bd54 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,8 +1,11 @@ @@ -30,7 +33,12 @@ import moment from 'moment' encounter: null, encounters: null, world: null, - mode: 'explore' + mode: 'explore', + props: { + Explore: { + world: this + } + } } } }) @@ -42,7 +50,7 @@ export default class App extends Vue { @Emit('startFight') startFight (encounter: Encounter) { this.$data.encounter = encounter - this.$data.mode = 'combat' + this.$data.mode = 'Combat' } created () { @@ -62,9 +70,9 @@ export default class App extends Vue { this.$data.encounter = this.$data.encounters[0] - const home = new Place('Home', 'This is not not home') + const home = new Place(new ProperNoun('your home'), 'This is not not home') - const street = new Place('Street', 'The street') + const street = new Place(new ImproperNoun('street'), 'The street') home.biconnect(Direction.North, street) this.$data.encounters.forEach((encounter: Encounter) => home.choices.push(new Choice( @@ -78,7 +86,7 @@ export default class App extends Vue { } ))) - const bar = new Place('Bar', 'This is the bar') + const bar = new Place(new ProperNoun('Dave\'s Bar'), 'This is the bar') street.biconnect(Direction.East, bar) player.location = home this.$data.world = new World(player) @@ -144,6 +152,7 @@ body, html { } #app { + position: relative; font-family: Avenir, Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -157,6 +166,13 @@ body, html { flex-direction: column; } +#main-area { + position: relative; + flex: 10; + overflow-x: hidden; + overflow-y: hidden; +} + .tippy-box { text-align: center; border-radius: 10px; @@ -204,5 +220,11 @@ body, html { *::-webkit-scrollbar-corner { background: transparent; } - +.component-fade-enter-active, .component-fade-leave-active { + transition: opacity .3s ease; +} +.component-fade-enter, .component-fade-leave-to +/* .component-fade-leave-active below version 2.1.8 */ { + opacity: 0; +} diff --git a/src/components/Combat.vue b/src/components/Combat.vue index 05e162e..379549f 100644 --- a/src/components/Combat.vue +++ b/src/components/Combat.vue @@ -277,13 +277,12 @@ export default class Combat extends Vue { } .combat-layout { - position: relative; + position: absolute; display: grid; grid-template-rows: fit-content(50%) 10% [main-row-start] 1fr 20% [main-row-end] ; grid-template-columns: 20% [main-col-start] 1fr 1fr [main-col-end] 20%; width: 100%; height: 100%; - flex: 10; overflow-x: hidden; overflow-y: hidden; } diff --git a/src/components/Explore.vue b/src/components/Explore.vue index 644ab11..a00ccc1 100644 --- a/src/components/Explore.vue +++ b/src/components/Explore.vue @@ -9,11 +9,11 @@
-

{{ location.name }}

+

{{ location.name.capital }}

{{ location.desc }}

- +
@@ -62,17 +62,17 @@ export default class Explore extends Vue { writeLog (entry: LogEntry) { const log = this.$el.querySelector(".explore-log") if (log !== null) { - const before = log.querySelector("div.log-entry") + const before = log.querySelector("div.explore-log-entry") const holder = document.createElement("div") - holder.classList.add("log-entry") + holder.classList.add("explore-log-entry") entry.render().forEach(element => { holder.appendChild(element) }) - holder.classList.add("left-move") + holder.classList.add("explore-entry") const hline = document.createElement("div") - hline.classList.add("log-separator") + hline.classList.add("explore-log-separator") log.insertBefore(hline, before) log.insertBefore(holder, hline) @@ -148,7 +148,9 @@ export default class Explore extends Vue { grid-template-rows: 1fr 1fr 1fr; grid-template-columns: 1fr 1fr 1fr; width: 100%; + max-width: 1000px; height: 100%; + justify-self: end; } .explore-choices { @@ -159,3 +161,27 @@ export default class Explore extends Vue { overflow-y: scroll; } + + diff --git a/src/components/NavButton.vue b/src/components/NavButton.vue index 14bd70b..af05e25 100644 --- a/src/components/NavButton.vue +++ b/src/components/NavButton.vue @@ -1,6 +1,6 @@