diff --git a/convert.sh b/convert.sh new file mode 100755 index 0000000..a71ad32 --- /dev/null +++ b/convert.sh @@ -0,0 +1,66 @@ +#!/usr/bin/perl -w + +use strict; +use Getopt::Declare; +use Cwd; +use File::Find; +use HTML::TreeBuilder; +use URI::URL qw(url); +use File::Copy; +use IO::File; + +use vars qw($VERSION $BASE_URL $BACKUP $DIRECTORY @WANTED_TYPES); + +$VERSION = (qw$Revision: 1.1 $)[1]; + +#Load the definition and grab the command-line parameters +my $opts = Getopt::Declare->new( do{ local $/; } ); + +#Cycle through this directory, and all those underneath it +find(\&wanted, $DIRECTORY || getcwd); + +#Parse each HTML file and make a backup +#of it using File::Copy::copy. +sub wanted { + return unless $File::Find::name =~ /html?$/; + + #Extract Links from the file + my $h = HTML::TreeBuilder->new; + $h->parse_file($File::Find::name); + + my $link_elements = $h->extract_links(@WANTED_TYPES); + return unless @$link_elements; + + #Grab each img src and re-write them so they are relative URL's + foreach my $link_element (@$link_elements) { + my $link = shift @$link_element; #URL value + my $element = shift @$link_element; #HTML::Element Object + + my $url = url($link)->canonical; + next unless $url->can('host_port') and + $BASE_URL->host_port eq $url->host_port; + + #Sigh.. The following is because extract_links() doesn't + #tell you which attribute $link belongs to, except to say + #it is the value of an attribute in $element.. somewhere. + + #Given the $link, find out which attribute it was for + my ($attr) = grep { + defined $element->attr($_) and $link eq $element->attr($_) + } @{ $HTML::Tagset::linkElements{$element->tag} }; + + #Re-write the attribute in the HTML::Element Tree + #Note: $BASE_URL needs to be quoted here. + $element->attr($attr, $url->path("$BASE_URL")); + } + + #Make a backup of the file before over-writing it + copy $File::Find::name => $File::Find::name.'.bak' + if defined $BACKUP; + + #Save the updated file + my $fh = IO::File->new($File::Find::name, O_RDWR) + or die "Could not open $File::Find::name: $!"; + $fh->print($h->as_HTML); +} + diff --git a/index.html b/index.html index 22c55c8..c7e98d3 100644 --- a/index.html +++ b/index.html @@ -1 +1 @@ -game
\ No newline at end of file +game
\ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 213cdc7..a59bbc7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3194,7 +3194,8 @@ "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true + "dev": true, + "optional": true }, "coa": { "version": "2.0.2", @@ -5863,7 +5864,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -5884,12 +5886,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5904,17 +5908,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6031,7 +6038,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6043,6 +6051,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6057,6 +6066,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6064,12 +6074,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -6088,6 +6100,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -6168,7 +6181,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -6180,6 +6194,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -6265,7 +6280,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -6301,6 +6317,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6320,6 +6337,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -6363,12 +6381,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -10777,7 +10797,8 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", - "dev": true + "dev": true, + "optional": true }, "rx-lite-aggregates": { "version": "4.0.8", @@ -12522,14 +12543,6 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, - "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "requires": { - "is-typedarray": "^1.0.0" - } - }, "typical": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz", @@ -13317,8 +13330,32 @@ "integrity": "sha512-8p6ZLv+1JYa5Vs8oBn33Nn3VGFBbF+wVfO+b78RJS1Qf1uIOzjFVDk3XwYDD7rlz9G5BKpxhaQw+6EGQ7L02aw==", "requires": { "underscore": "1.8.3", - "web3-core-helpers": "1.0.0-beta.37", - "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2" + "web3-core-helpers": "1.0.0-beta.37" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "websocket": { + "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "requires": { + "debug": "^2.2.0", + "nan": "^2.3.3", + "typedarray-to-buffer": "^3.1.2", + "yaeti": "^0.0.6" + } + } } }, "web3-shh": { @@ -13706,31 +13743,6 @@ "source-map": "~0.6.1" } }, - "websocket": { - "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", - "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible", - "requires": { - "debug": "^2.2.0", - "nan": "^2.3.3", - "typedarray-to-buffer": "^3.1.2", - "yaeti": "^0.0.6" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, "websocket-driver": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz", @@ -13905,11 +13917,6 @@ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", "dev": true }, - "yaeti": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", - "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=" - }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", diff --git a/src/components/Game.vue b/src/components/Game.vue index b3bccbf..dc2ad63 100644 --- a/src/components/Game.vue +++ b/src/components/Game.vue @@ -4,7 +4,7 @@ .treasure-btn(@click='lootModal = true') .treasure-modal(v-if='lootModal') .title LOOTBOX - img.loot(src='/loot.png') + img.loot(src='../../public/loot.png') .btns .exit(@click='lootModal = false') Cancel .open(@click='openLootbox') OPEN @@ -33,15 +33,15 @@ .exit(@click='marketModal = false') Cancel .quick .quick-item - img(v-if='items.length>0' :src='"/weapeon_"+items[0][1]+".png"') + img(v-if='items.length>0' :src='"../../public/weapeon_"+items[0][1]+".png"') .quick-item - img(v-if='items&&items[1]' :src='"/weapeon_"+items[1][1]+".png"') + img(v-if='items&&items[1]' :src='"../../public/weapeon_"+items[1][1]+".png"') .quick-item - img(v-if='items&&items[2]' :src='"/weapeon_"+items[2][1]+".png"') + img(v-if='items&&items[2]' :src='"../../public/weapeon_"+items[2][1]+".png"') .quick-item - img(v-if='items&&items[3]' :src='"/weapeon_"+items[3][1]+".png"') + img(v-if='items&&items[3]' :src='"../../public/weapeon_"+items[3][1]+".png"') .quick-item - img(v-if='items&&items[4]' :src='"/weapeon_"+items[4][1]+".png"') + img(v-if='items&&items[4]' :src='"../../public/weapeon_"+items[4][1]+".png"') .money Cash {{money}}$ .game(@click='shoot') .playerFriend(v-for='p in players' :style='{ "left": p.left + "px", "top": p.top + "px", "transform": "rotate("+p.rotate+"deg)" }') @@ -96,7 +96,7 @@ export default { let id = randomInteger(500, 2000000) let x = Math.floor(randomInteger(50, window.innerWidth - 50)) let y = Math.floor(randomInteger(50, window.innerHeight - 50)) - window.session.request(`INSERT INTO enemies VALUES(${id}, 100, ${x}, ${y})`).result().then((r) => { + window.session.request(`INSERT INTO enemies VALUES(${id}, 100, ${x}, ${y})`).then((r) => { this.enemies.push({ left: x, top: y, @@ -214,19 +214,19 @@ export default { this.enemies.forEach((v, j)=> { if(Math.abs(v.left - e.left) < 30 && Math.abs(v.top - e.top) < 30){ this.bullets.splice(i, 1) - if(v.hp - 10 < 0){ + if(v.hp - 10 <= 0){ this.enemies.splice(j, 1) - window.session.request(`DELETE FROM ENEMIES WHERE id = ${v.id}`).result().then(r=>{ - console.log('killed') - }) + console.log('killed') + window.session.request(`DELETE FROM ENEMIES WHERE id = ${v.id}`) this.money += 10 + console.log("SETTING CASH TO " + this.money + " GAME IS " + window.localStorage.getItem("game")) window.session.request(`UPDATE users SET cash = ${this.money} WHERE id = ${window.localStorage.getItem("game")}`) this.level = this.level>5?5:this.level + 1 for(let l=0; l { + window.session.request(`INSERT INTO enemies VALUES(${id}, 100, ${x}, ${y})`).then((r) => { this.enemies.push({ left: x, top: y, @@ -237,9 +237,9 @@ export default { } }else { v.hp -= 10 - window.session.request(`UPDATE enemies SET hp = ${v.hp - 10} WHERE id = ${v.id}`).result().then((r) => { - console.log('dmg') - }) + console.log("CASH IS " + this.money + " GAME IS " + window.localStorage.getItem("game")) + window.session.request(`UPDATE enemies SET hp = ${v.hp - 10} WHERE id = ${v.id}`) + console.log('dmg') } } }) @@ -261,7 +261,6 @@ export default { console.log("Session created"); window.session = s; this.getItems() - window.session.request(`SELECT * FROM users`).result().then((r) => {console.log(r.asString())}) }); setTimeout(()=>{ var arrow = document.getElementById("player"); @@ -422,7 +421,7 @@ export default { width: 90px height: 90px background-repeat: no-repeat - background: center center rgba(233,30,99, .4) url(/treasure.png) no-repeat + background: center center rgba(233,30,99, .4) url('../../public/treasure.png') no-repeat border-top-left-radius: 25px border-bottom-left-radius: 25px border-left: 5px solid rgb(233,30,99) @@ -536,7 +535,7 @@ export default { width: 90px height: 90px background-repeat: no-repeat - background: center center rgba(233,30,99, .4) url(/auction.png) no-repeat + background: center center rgba(233,30,99, .4) url('../../public/auction.png') no-repeat border-top-left-radius: 25px border-bottom-left-radius: 25px border-left: 5px solid rgb(233,30,99) @@ -554,7 +553,7 @@ export default { width: 90px height: 90px background-repeat: no-repeat - background: center center rgba(233,30,99, .4) url(/rucksack.png) no-repeat + background: center center rgba(233,30,99, .4) url('../../public/rucksack.png') no-repeat border-top-left-radius: 25px border-bottom-left-radius: 25px border-left: 5px solid rgb(233,30,99) @@ -571,16 +570,16 @@ export default { right: 15px top: 15px .game - background: url('/stone2_b.jpg') + background: url('../../public/stone2_b.jpg') background-size: 42px 32px width: 100vw height: 100vh - cursor: url('/crosshair.png'), auto; + cursor: url('../../public/crosshair.png'), auto; .enemy width: 40px height: 40px position: absolute - background-image: url(/enemy.png) + background-image: url('../../public/enemy.png') background-size: 100% 100% .hp background: red @@ -593,14 +592,14 @@ export default { width: 40px height: 40px position: absolute - background-image: url(/player.png) + background-image: url('../../public/player.png') background-size: 100% 100% transition: top .3s, left .3s .player width: 40px height: 40px position: absolute - background-image: url(/player.png) + background-image: url('../../public/player.png') background-size: 100% 100% transition: top .3s, left .3s .bullet diff --git a/vue.config.js b/vue.config.js new file mode 100644 index 0000000..9bb7674 --- /dev/null +++ b/vue.config.js @@ -0,0 +1,3 @@ +module.exports = { + publicPath: '' +} \ No newline at end of file