From 0a7875995130686ee202f68465eb29adfedbe5dd Mon Sep 17 00:00:00 2001 From: Phrancis Date: Tue, 22 May 2018 21:58:50 -0400 Subject: [PATCH 1/5] add package-lock.json to gitignore, NetBeans keeps creating it --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9bbf2d4..6cc8e90 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ yarn-error.log* *.njsproj *.sln /nbproject/ +package-lock.json !build/ !/build/ From a46487c547450e93e3962c814b26335dc6dac405 Mon Sep 17 00:00:00 2001 From: Phrancis Date: Tue, 22 May 2018 22:00:09 -0400 Subject: [PATCH 2/5] add one preloaded deck to deck builder, confirmed it works saving and loading --- src/components/DeckBuilder.vue | 41 ++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/components/DeckBuilder.vue b/src/components/DeckBuilder.vue index 1f0bf4f..0dc74bd 100644 --- a/src/components/DeckBuilder.vue +++ b/src/components/DeckBuilder.vue @@ -373,6 +373,47 @@ export default { },{ "name":"Defensive", "cards":{"3":1,"4":1,"6":2,"7":1,"9":1,"10":2,"12":1,"13":1,"15":2,"16":1,"17":1,"18":1,"19":2,"20":1,"21":2,"22":1,"24":2,"25":1,"26":1,"27":1,"29":1,"32":1,"34":1,"35":1} + },{ + "name":"Balanced2", + "cards":{ + "robot-guard":1, + "humadroid":1, + "scout-mech":1, + "steroid-implants":1, + "f.m.u.":0, + "spareparts":2, + "supply-mech":1, + "commander":1, + "trapped-socket":0, + "exoskeleton":0, + "bionic-arms":1, + "e.m.p.":0, + "upgrado-mk-i":1, + "shieldmech":1, + "longshot":1, + "conscript":1, + "fortimech":0, + "modleg-ambusher":1, + "web-boss":1, + "the-chopper":2, + "wastelander":1, + "cyberpimp":0, + "artificial-intelligence-implants":1, + "heavy-mech":0, + "cybernetic-arm-cannon":1, + "inside-man":1, + "reinforced-cranial-implants":0, + "gyrodroid":1, + "assassinatrix":1, + "body-armor":1, + "waste-runner":1, + "field-medic":1, + "full-body-cybernetics-upgrade":0, + "adrenalin-injection":0, + "vetter":2, + "bodyman":1, + "cyborg":1 + } } ] } From 100efe0ca7beef4c9640e6f2e94c08416f2ab37e Mon Sep 17 00:00:00 2001 From: Phrancis Date: Wed, 23 May 2018 20:31:16 -0400 Subject: [PATCH 3/5] Replace old Balanced & Defensive preloaded decks with new working ones --- src/components/DeckBuilder.vue | 76 +++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 25 deletions(-) diff --git a/src/components/DeckBuilder.vue b/src/components/DeckBuilder.vue index 0dc74bd..0f5c401 100644 --- a/src/components/DeckBuilder.vue +++ b/src/components/DeckBuilder.vue @@ -350,32 +350,15 @@ export default { this.enteringGame = this.currentUser.game.id; CardshifterServerAPI.$on("type:playerconfig", this.playerconfig); - const preloadedDecks = {"decks": - { + const preloadedDecks = { + "decks":{ "Mythos":[ - { - "name":"Chinese Focus", - "cards":{"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"18":1,"19":1,"20":1,"21":1,"25":2,"26":2,"27":2,"30":1,"31":2,"32":2,"33":2,"34":2,"35":2} - },{ - "name":"Greek Classic", - "cards":{"36":1,"37":1,"38":1,"39":1,"40":1,"41":1,"42":1,"43":1,"44":1,"45":1,"46":1,"61":1,"68":1,"69":1,"70":1,"71":1,"72":1,"73":1,"74":1,"75":1,"76":1,"78":1,"79":1,"80":1,"82":1,"85":1,"93":1,"94":1,"97":1,"98":1} - },{ - "name":"Greek Dark", - "cards":{"9":1,"12":2,"16":2,"17":2,"47":1,"48":1,"49":1,"50":1,"51":1,"52":1,"53":1,"54":1,"55":1,"56":1,"57":1,"58":1,"59":1,"60":1,"62":1,"63":1,"64":1,"65":1,"66":1,"67":1,"95":1,"96":1,"98":1} - },{ - "name":"Hindu Focus", - "cards":{"3":1,"4":1,"5":1,"6":2,"7":2,"8":2,"9":2,"10":2,"11":1,"12":1,"16":1,"17":1,"18":1,"99":1,"101":1,"103":1,"104":1,"105":1,"106":1,"107":1,"108":1,"109":3,"110":1} - } - ],"Cyborg-Chronicles":[ - { + + ], + "Cyborg-Chronicles":[ + { "name":"Balanced", - "cards":{"3":1,"4":1,"5":1,"6":1,"7":1,"8":2,"10":1,"12":2,"14":1,"16":1,"17":1,"19":1,"20":2,"21":1,"22":1,"23":1,"24":1,"25":2,"26":1,"27":1,"28":1,"29":1,"30":1,"31":1,"35":1,"36":1} - },{ - "name":"Defensive", - "cards":{"3":1,"4":1,"6":2,"7":1,"9":1,"10":2,"12":1,"13":1,"15":2,"16":1,"17":1,"18":1,"19":2,"20":1,"21":2,"22":1,"24":2,"25":1,"26":1,"27":1,"29":1,"32":1,"34":1,"35":1} - },{ - "name":"Balanced2", - "cards":{ + "cards":{ "robot-guard":1, "humadroid":1, "scout-mech":1, @@ -414,10 +397,53 @@ export default { "bodyman":1, "cyborg":1 } + }, + { + "name":"Defensive", + "cards":{ + "robot-guard":1, + "humadroid":1, + "scout-mech":0, + "steroid-implants":0, + "f.m.u.":1, + "spareparts":1, + "supply-mech":2, + "commander":0, + "trapped-socket":0, + "exoskeleton":0, + "bionic-arms":0, + "e.m.p.":0, + "upgrado-mk-i":1, + "shieldmech":1, + "longshot":1, + "conscript":1, + "fortimech":2, + "modleg-ambusher":0, + "web-boss":1, + "the-chopper":1, + "wastelander":1, + "cyberpimp":1, + "artificial-intelligence-implants":1, + "heavy-mech":1, + "cybernetic-arm-cannon":1, + "inside-man":1, + "reinforced-cranial-implants":1, + "gyrodroid":1, + "assassinatrix":0, + "body-armor":1, + "waste-runner":1, + "field-medic":1, + "full-body-cybernetics-upgrade":0, + "adrenalin-injection":1, + "vetter":2, + "bodyman":1, + "cyborg":1 + } } + ] } - }; + } if(!localStorage.getItem(DECK_STORAGE)) { // var mods = {}; From 96d5a44deaec0e71293bea883567ad5e37c03f21 Mon Sep 17 00:00:00 2001 From: Phrancis Date: Wed, 23 May 2018 22:02:12 -0400 Subject: [PATCH 4/5] add preloaded decks for Mythos --- src/components/DeckBuilder.vue | 104 ++++++++------------------------- 1 file changed, 24 insertions(+), 80 deletions(-) diff --git a/src/components/DeckBuilder.vue b/src/components/DeckBuilder.vue index 0f5c401..059477a 100644 --- a/src/components/DeckBuilder.vue +++ b/src/components/DeckBuilder.vue @@ -353,97 +353,41 @@ export default { const preloadedDecks = { "decks":{ "Mythos":[ - + { + "name":"Greek Classic", + "cards":{ "ninja-spy":0,"odysseus":1,"shaman":0,"assassin":0,"monking":0,"persephone":0,"caucasian-eagle":1,"cerberus":0,"poseidon":1,"hades'-bident":0,"tartarus":0,"durga":0,"achilles'-shield":0,"thanatos":0,"apollo":1,"mnemosyne":0,"guanyin":0,"zeus":1,"hyperion":0,"empusa":0,"athena":1,"maitreya-buddha":0,"tartarean-pit":0,"gaia":1,"poseidon's-trident":0,"diyu":0,"gautama-buddha":0,"longbowman":0,"vishnu":0,"helm-of-darkness":0,"guan-yu":0,"golden-fleece":0,"charon":0,"arachne":0,"rhea":0,"krishna":0,"styx":0,"ajax-the-great":1,"chiron":0,"archer":0,"terracotta-soldier":0,"eros":1,"mount-olympus":1,"defender":1,"perseus":1,"iolaus":1,"the-underworld":0,"medusa":0,"varuna":0,"pegasus":1,"judges-of-the-dead":0,"skeleton":0,"undead":0,"hermes":1,"nemean-lion":1,"achilles":1,"pikeman":0,"hades":0,"heracles":1,"healer":1,"yama":0,"hector":1,"lamia":0,"ares":1,"uranus":1,"indra":0,"eight-immortals":0,"holy-man":0,"kung-fu-fighter":0,"cronus":0,"erymanthian-boar":1,"shiva":0,"hera":1,"shinje":0,"cronus'-scythe":0,"daedalus":1,"nuwa":0,"artemis":1,"griffin":1,"brahma":0,"slinger":1,"jade-emperor":0,"lernaean-hydra":0,"menoetius":0,"theseus":1,"manchu-archer":0,"macaria":0,"swordsman":1,"hecate":0,"mazu":0,"moirai":0 + } + }, + { + "name":"Greek Dark", + "cards":{"ninja-spy":0,"odysseus":0,"shaman":0,"assassin":1,"monking":0,"persephone":1,"caucasian-eagle":0,"cerberus":1,"poseidon":0,"hades'-bident":1,"tartarus":1,"durga":0,"achilles'-shield":0,"thanatos":1,"apollo":0,"mnemosyne":1,"guanyin":0,"zeus":0,"hyperion":1,"empusa":1,"athena":0,"maitreya-buddha":0,"tartarean-pit":1,"gaia":0,"poseidon's-trident":0,"diyu":0,"gautama-buddha":0,"longbowman":0,"vishnu":0,"helm-of-darkness":1,"guan-yu":0,"golden-fleece":0,"charon":1,"arachne":1,"rhea":1,"krishna":0,"styx":1,"ajax-the-great":0,"chiron":1,"archer":0,"terracotta-soldier":0,"eros":0,"mount-olympus":0,"defender":0,"perseus":0,"iolaus":0,"the-underworld":0,"medusa":1,"varuna":0,"pegasus":0,"judges-of-the-dead":1,"skeleton":2,"undead":2,"hermes":0,"nemean-lion":0,"achilles":0,"pikeman":0,"hades":1,"heracles":0,"healer":0,"yama":0,"hector":0,"lamia":1,"ares":0,"uranus":0,"indra":0,"eight-immortals":0,"holy-man":0,"kung-fu-fighter":0,"cronus":1,"erymanthian-boar":0,"shiva":0,"hera":0,"shinje":0,"cronus'-scythe":1,"daedalus":0,"nuwa":0,"artemis":0,"griffin":0,"brahma":0,"slinger":0,"jade-emperor":0,"lernaean-hydra":0,"menoetius":1,"theseus":0,"manchu-archer":0,"macaria":1,"swordsman":0,"hecate":1,"mazu":0,"moirai":1 + } + }, + { + "name":"Chinese Focus", + "cards":{"ninja-spy":2,"odysseus":0,"shaman":0,"assassin":1,"monking":2,"persephone":0,"caucasian-eagle":0,"cerberus":0,"poseidon":0,"hades'-bident":0,"tartarus":0,"durga":0,"achilles'-shield":0,"thanatos":0,"apollo":0,"mnemosyne":0,"guanyin":2,"zeus":0,"hyperion":0,"empusa":0,"athena":0,"maitreya-buddha":0,"tartarean-pit":0,"gaia":0,"poseidon's-trident":0,"diyu":1,"gautama-buddha":0,"longbowman":0,"vishnu":0,"helm-of-darkness":0,"guan-yu":2,"golden-fleece":0,"charon":0,"arachne":0,"rhea":0,"krishna":0,"styx":0,"ajax-the-great":0,"chiron":0,"archer":1,"terracotta-soldier":3,"eros":0,"mount-olympus":0,"defender":0,"perseus":0,"iolaus":0,"the-underworld":0,"medusa":0,"varuna":0,"pegasus":0,"judges-of-the-dead":0,"skeleton":0,"undead":0,"hermes":0,"nemean-lion":0,"achilles":0,"pikeman":0,"hades":0,"heracles":0,"healer":0,"yama":0,"hector":0,"lamia":0,"ares":0,"uranus":0,"indra":0,"eight-immortals":3,"holy-man":1,"kung-fu-fighter":3,"cronus":0,"erymanthian-boar":0,"shiva":0,"hera":0,"shinje":1,"cronus'-scythe":0,"daedalus":0,"nuwa":1,"artemis":0,"griffin":0,"brahma":0,"slinger":0,"jade-emperor":1,"lernaean-hydra":0,"menoetius":0,"theseus":0,"manchu-archer":3,"macaria":0,"swordsman":0,"hecate":0,"mazu":3,"moirai":0 + } + }, + { + "name":"Hindu Focus", + "cards":{"ninja-spy":2,"odysseus":0,"shaman":2,"assassin":0,"monking":0,"persephone":0,"caucasian-eagle":0,"cerberus":0,"poseidon":0,"hades'-bident":0,"tartarus":0,"durga":1,"achilles'-shield":0,"thanatos":0,"apollo":0,"mnemosyne":0,"guanyin":0,"zeus":0,"hyperion":0,"empusa":0,"athena":0,"maitreya-buddha":1,"tartarean-pit":0,"gaia":0,"poseidon's-trident":0,"diyu":0,"gautama-buddha":3,"longbowman":1,"vishnu":1,"helm-of-darkness":0,"guan-yu":0,"golden-fleece":0,"charon":0,"arachne":0,"rhea":0,"krishna":1,"styx":0,"ajax-the-great":0,"chiron":0,"archer":1,"terracotta-soldier":0,"eros":0,"mount-olympus":0,"defender":1,"perseus":0,"iolaus":0,"the-underworld":0,"medusa":0,"varuna":1,"pegasus":0,"judges-of-the-dead":0,"skeleton":2,"undead":2,"hermes":0,"nemean-lion":0,"achilles":0,"pikeman":1,"hades":0,"heracles":0,"healer":2,"yama":1,"hector":0,"lamia":0,"ares":0,"uranus":0,"indra":1,"eight-immortals":0,"holy-man":2,"kung-fu-fighter":0,"cronus":0,"erymanthian-boar":0,"shiva":1,"hera":0,"shinje":0,"cronus'-scythe":0,"daedalus":0,"nuwa":0,"artemis":0,"griffin":0,"brahma":1,"slinger":1,"jade-emperor":0,"lernaean-hydra":0,"menoetius":0,"theseus":0,"manchu-archer":0,"macaria":0,"swordsman":1,"hecate":0,"mazu":0,"moirai":0 + } + } ], "Cyborg-Chronicles":[ - { + { "name":"Balanced", - "cards":{ - "robot-guard":1, - "humadroid":1, - "scout-mech":1, - "steroid-implants":1, - "f.m.u.":0, - "spareparts":2, - "supply-mech":1, - "commander":1, - "trapped-socket":0, - "exoskeleton":0, - "bionic-arms":1, - "e.m.p.":0, - "upgrado-mk-i":1, - "shieldmech":1, - "longshot":1, - "conscript":1, - "fortimech":0, - "modleg-ambusher":1, - "web-boss":1, - "the-chopper":2, - "wastelander":1, - "cyberpimp":0, - "artificial-intelligence-implants":1, - "heavy-mech":0, - "cybernetic-arm-cannon":1, - "inside-man":1, - "reinforced-cranial-implants":0, - "gyrodroid":1, - "assassinatrix":1, - "body-armor":1, - "waste-runner":1, - "field-medic":1, - "full-body-cybernetics-upgrade":0, - "adrenalin-injection":0, - "vetter":2, - "bodyman":1, - "cyborg":1 + "cards":{"robot-guard":1,"humadroid":1,"scout-mech":1,"steroid-implants":1,"f.m.u.":0,"spareparts":2,"supply-mech":1,"commander":1,"trapped-socket":0,"exoskeleton":0,"bionic-arms":1,"e.m.p.":0,"upgrado-mk-i":1,"shieldmech":1,"longshot":1,"conscript":1,"fortimech":0,"modleg-ambusher":1,"web-boss":1,"the-chopper":2,"wastelander":1,"cyberpimp":0,"artificial-intelligence-implants":1,"heavy-mech":0,"cybernetic-arm-cannon":1,"inside-man":1,"reinforced-cranial-implants":0,"gyrodroid":1,"assassinatrix":1,"body-armor":1,"waste-runner":1,"field-medic":1,"full-body-cybernetics-upgrade":0,"adrenalin-injection":0,"vetter":2,"bodyman":1,"cyborg":1 } }, { "name":"Defensive", - "cards":{ - "robot-guard":1, - "humadroid":1, - "scout-mech":0, - "steroid-implants":0, - "f.m.u.":1, - "spareparts":1, - "supply-mech":2, - "commander":0, - "trapped-socket":0, - "exoskeleton":0, - "bionic-arms":0, - "e.m.p.":0, - "upgrado-mk-i":1, - "shieldmech":1, - "longshot":1, - "conscript":1, - "fortimech":2, - "modleg-ambusher":0, - "web-boss":1, - "the-chopper":1, - "wastelander":1, - "cyberpimp":1, - "artificial-intelligence-implants":1, - "heavy-mech":1, - "cybernetic-arm-cannon":1, - "inside-man":1, - "reinforced-cranial-implants":1, - "gyrodroid":1, - "assassinatrix":0, - "body-armor":1, - "waste-runner":1, - "field-medic":1, - "full-body-cybernetics-upgrade":0, - "adrenalin-injection":1, - "vetter":2, - "bodyman":1, - "cyborg":1 + "cards":{"robot-guard":1,"humadroid":1,"scout-mech":0,"steroid-implants":0,"f.m.u.":1,"spareparts":1,"supply-mech":2,"commander":0,"trapped-socket":0,"exoskeleton":0,"bionic-arms":0,"e.m.p.":0,"upgrado-mk-i":1,"shieldmech":1,"longshot":1,"conscript":1,"fortimech":2,"modleg-ambusher":0,"web-boss":1,"the-chopper":1,"wastelander":1,"cyberpimp":1,"artificial-intelligence-implants":1,"heavy-mech":1,"cybernetic-arm-cannon":1,"inside-man":1,"reinforced-cranial-implants":1,"gyrodroid":1,"assassinatrix":0,"body-armor":1,"waste-runner":1,"field-medic":1,"full-body-cybernetics-upgrade":0,"adrenalin-injection":1,"vetter":2,"bodyman":1,"cyborg":1 } } - ] } - } + }; if(!localStorage.getItem(DECK_STORAGE)) { // var mods = {}; From 98dde31f35b41798d31cc53158a9d03f17dad7b8 Mon Sep 17 00:00:00 2001 From: Phrancis Date: Wed, 23 May 2018 22:51:18 -0400 Subject: [PATCH 5/5] add missing default.png for Mythos --- src/assets/images/cards/mythos/default.png | Bin 0 -> 11991 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/assets/images/cards/mythos/default.png diff --git a/src/assets/images/cards/mythos/default.png b/src/assets/images/cards/mythos/default.png new file mode 100644 index 0000000000000000000000000000000000000000..2c4ba29adc2e4f1882c2e6f9ebf3a184a184e81c GIT binary patch literal 11991 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 literal 0 HcmV?d00001