From 4798d7fff22589a85ab7e85a9c3b3fa912f96a76 Mon Sep 17 00:00:00 2001 From: David Boedigheimer Date: Tue, 12 May 2020 15:03:25 -0700 Subject: [PATCH 1/4] Add image for que and button to start attack. --- src/img/card-que.png | Bin 0 -> 1064 bytes src/index.html | 9 +++++++++ 2 files changed, 9 insertions(+) create mode 100644 src/img/card-que.png diff --git a/src/img/card-que.png b/src/img/card-que.png new file mode 100644 index 0000000000000000000000000000000000000000..4da60a0f63cb87f598cda88f7ec5a0f54613ede6 GIT binary patch literal 1064 zcmeAS@N?(olHy`uVBq!ia0vp^CxAGGgAGU?ZmZ{JU|@dl>Eakt5%+ekW010=0Q2$l zbH&dV?=_55={6H-_WW>Nhua8W@^brntDsGqQZ#nEsrBi9;wrNU)Yg z;K=cLbD235JRCe-z6d%9$XA!~DKscBstR6oXK<`}bJKFzXbj;hs!QGQ`}Jb=lnBdu z;ZJ@iKAcz+Hla9Rxyt+duiu{8pv7@!US}xxBb`70y59?{%$!i})HX}{iQKc*;a*o6 z=T3Nd_09MH_KNRYc)ZVitNmZ`&!X@4?MchCkNzopy1FsUVRhalPRVJf;wmGqRLX4L zuhii*>FOp?$*^;OTJ{JV=@|ajZqm4ywszXu6B|OlojQC+!8~fC{H1Wd<*yR_PHZT8 zrv7B^gv8FsSG=F@P7tn>Hc~u%$#F+@#Mh=zTIXHTHkzOCXDJk|-976*la=uvs|oRc z+fL6cSK1uqILCEA_oH(gv^uQy>pkN$d(ssR8XTVT8Z~GOdI6)>b7Idz#Rdhbb!(!W z7#zL2Qh0b7SuPf&UKL{E2nte3&frk!XwzOjO~7HoBqd2_X9h=;n8>Xy3{6u+PD)5I zaV&axYLzOBz>*~%$1Vss2=Io7=>m;Ybv0^hV`$3Qu_=p_kwsH;lA#HUfXm^jq25Eo z$_K}rGPc$4ef9LKvdu?!j+j{EcfbE_{8}h;yHdeE@-bIg+s$p!a&-y@&wP|P+6$E! zSt@f{rBfbRZcUw~+QEDH^RYcgr9#>ayWSd~czotR1DB(NUVpANs4QUcboFyt=akR{ E0K=r3&j0`b literal 0 HcmV?d00001 diff --git a/src/index.html b/src/index.html index 47fcd6f..ebbfe22 100644 --- a/src/index.html +++ b/src/index.html @@ -24,6 +24,15 @@

H.O.W.I.E

+
+
+ +
+
+ + +
+
From c10fe14be562b756e6042561111be6e4764bb610 Mon Sep 17 00:00:00 2001 From: David Boedigheimer Date: Tue, 12 May 2020 16:01:00 -0700 Subject: [PATCH 2/4] Add edit to display when game starts. --- Specs.MD | 16 ++++++++-------- src/main.js | 2 ++ src/styles.css | 10 ++++++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Specs.MD b/Specs.MD index 6202e54..34ba371 100644 --- a/Specs.MD +++ b/Specs.MD @@ -1,6 +1,6 @@ ## Mech ``` --> HAS: Sprites: +-> HAS: Sprites: -> Core -> Cockpit -> Hardpoint @@ -76,7 +76,7 @@ Cycle Battery ## Enemy: ``` ->HAS: ID -->HAS: Name +->HAS: Name ->HAS: ATK, DEF, Shield, Durability per-part ->CAN: set INTENT by making primitive decisions based on stats and RNG ->HAS: 1-4 usable cards. @@ -94,7 +94,7 @@ ALL Cards ``` Part: -->HAS: HP, CAP, ATK, Durability +->HAS: HP, CAP, ATK, Durability ->HAS: PV Cost ->CAN: Open up, close off, and add properties to INTENTs. ->MAGNITUDE: @@ -116,14 +116,14 @@ Stretch Intents: ->Move further away from or closer to the enemy. -Hinderances - +Hinderances - * Corrosion: Equipment is "Poisoned" * Mollification: Equipment's material is cheapened, attacks do more to affected equipment * Malfunction: One piece of Equipment is unusable * Concussion: Entire turn is missed * Flashed: Intent is chosen at random this turn -Enhancements - +Enhancements - * Nano-implantation: Nanobots repair the equip * Tempering: Defense up * Target Tracking: Temporary percentage chance for critical hits @@ -135,14 +135,14 @@ Enhancements - -> CAN: Move cards between decks, based on ID -> CAN: Find card based on ID -> CAN: Find card based on Position in Array --> CAN: Damage Shields, wear out Durability on Parts, change INTENTIONS temporarily or permanently, +-> CAN: Damage Shields, wear out Durability on Parts, change INTENTIONS temporarily or permanently, -> CAN: Affect all stats, whether on a per-turn basis or a single time. Software: -> HAS: Type and Magnitude -> CAN: Move cards between decks, based on ID and position in deck (Going either direction through any pile, like first second third forward or backward) --> CAN: +-> CAN: Enemies, depending on what kind of enemy they are, CAN have 1-4 cards. For the MVP, the initial enemy will have 2 of them and an otherwise stock frame. -> CAN: Multiply and/or divide stats for the duration of the fight. @@ -157,5 +157,5 @@ Scene Stretch Combat loop: Player plays cards to bring out parts, sets intent per-part, then ends turn. -Intents play out one by one, starting with defenses, then utilities, then attacks in that order until one or the other is dead. Generally this game will be organized in duels. +Intents play out one by one, starting with defenses, then utilities, then attacks in that order until one or the other is dead. Generally this game will be organized in duels. At the end of combat the player may choose one part or software to take from the enemy's mech. diff --git a/src/main.js b/src/main.js index 96e0ec4..846cd3a 100644 --- a/src/main.js +++ b/src/main.js @@ -11,6 +11,8 @@ $(document).ready(function() { $('.jumbotron').slideUp(); $('#start-button').slideUp(); $('.parent').show(); + $('#attack').show(); + $('#que').show(); }); // let data = service.Acquire(); diff --git a/src/styles.css b/src/styles.css index 71858de..50a32d8 100644 --- a/src/styles.css +++ b/src/styles.css @@ -14,6 +14,10 @@ body { display: none; } +#attack { + display: none; +} + #cockpit{ display: block; margin-top: 20px; @@ -57,3 +61,9 @@ body { margin-right: auto; width: 60px; } + +#que { + display: none; + width: 500px; + height: 100px; +} From 6239ef66c796828fbac3ac04ce29a933a3e2935d Mon Sep 17 00:00:00 2001 From: David Boedigheimer Date: Wed, 13 May 2020 16:01:45 -0700 Subject: [PATCH 3/4] Add webpack for draggable. --- package-lock.json | 6 ++++++ package.json | 1 + src/main.js | 1 + 3 files changed, 8 insertions(+) diff --git a/package-lock.json b/package-lock.json index f339133..5c4610f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -98,6 +98,12 @@ "any-observable": "^0.3.0" } }, + "@shopify/draggable": { + "version": "1.0.0-beta.8", + "resolved": "https://registry.npmjs.org/@shopify/draggable/-/draggable-1.0.0-beta.8.tgz", + "integrity": "sha512-9IeBPQM93Ad4qFKUopwuTClzoST/1OId4MaSd/8FB5ScCL2tl25UaOGNR8E2hjiL7xK4LN5+I1Ews6amS7YAiA==", + "dev": true + }, "@sindresorhus/is": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", diff --git a/package.json b/package.json index 9260d62..711f1b2 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "webpack": "4.19.1" }, "devDependencies": { + "@shopify/draggable": "^1.0.0-beta.8", "babel-core": "^6.26.0", "babel-loader": "^7.1.3", "babel-preset-es2015": "^6.24.1", diff --git a/src/main.js b/src/main.js index 846cd3a..67c1121 100644 --- a/src/main.js +++ b/src/main.js @@ -4,6 +4,7 @@ import { Game } from './Models/Game'; import 'bootstrap/dist/css/bootstrap.min.css'; import './styles.css'; import png from './img/mainBackground.png'; +import { Draggable, Sortable, Plugins } from '@shopify/draggable'; $(document).ready(function() { From ee7c8473de87b435057fc9fd82065e313e450511 Mon Sep 17 00:00:00 2001 From: David Boedigheimer Date: Thu, 14 May 2020 13:38:00 -0700 Subject: [PATCH 4/4] Add display for cards que. --- src/index.html | 31 ++++++++++++++++++++++++++----- src/main.js | 2 +- src/styles.css | 8 +++++--- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/index.html b/src/index.html index ebbfe22..a662f0a 100644 --- a/src/index.html +++ b/src/index.html @@ -6,7 +6,7 @@ test - +
@@ -25,12 +25,33 @@

H.O.W.I.E

-
+
-
- - +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
diff --git a/src/main.js b/src/main.js index 67c1121..4b80d3e 100644 --- a/src/main.js +++ b/src/main.js @@ -13,7 +13,7 @@ $(document).ready(function() { $('#start-button').slideUp(); $('.parent').show(); $('#attack').show(); - $('#que').show(); + $('.cards').show(); }); // let data = service.Acquire(); diff --git a/src/styles.css b/src/styles.css index 50a32d8..daddf77 100644 --- a/src/styles.css +++ b/src/styles.css @@ -62,8 +62,10 @@ body { width: 60px; } -#que { +.cards { display: none; - width: 500px; - height: 100px; + border: 3px solid blue; + padding: 50px; + margin-left: 15px; + margin-right: 15px; }