ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new tos

Browse Source
This commit is contained in:
Mashy 2019-10-10 08:33:29 +10:00
parent d8ff256735
commit 2a84ea2caf
2 changed files with 63 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
client/src/components/tos.jsx
View File

@ -663,7 +663,7 @@ ul
</head> </head>
<body bgcolor=white lang=EN-US link=blue vlink=purple> <body lang=EN-US link=blue vlink=purple>
<div class=WordSection1> <div class=WordSection1>
@ -677,12 +677,12 @@ ul
<p class=LetterBodyText><b><span lang=EN-AU>Introduction</span></b></p> <p class=LetterBodyText><b><span lang=EN-AU>Introduction</span></b></p>
<p class=LetterBodyText><span lang=EN-AU>Welcome to MNML!<a name="_GoBack"></a></span></p> <p class=LetterBodyText><span lang=EN-AU>Welcome to MNML!</span></p>
<p class=LetterBodyText><span lang=EN-AU>MNML is a turn-based 1v1 strategy game <p class=LetterBodyText><span lang=EN-AU>MNML is a turn-based 1v1 strategy <a
in an abstract setting where players outplay their opponents by building their name="_GoBack"></a>game in an abstract setting where players outplay their
team of 3 constructs from a shifting meta of skills, effects and opponents by building their team of 3 constructs from a shifting meta of
specialisations.</span></p> skills and specialisations.</span></p>
<p class=LetterBodyText><span lang=EN-AU>MNML is provided by Minimal Studios <p class=LetterBodyText><span lang=EN-AU>MNML is provided by Minimal Studios
Pty Ltd ACN 635 160 182 (<b>Minimal Studios, we, us, our</b>) and accessible to Pty Ltd ACN 635 160 182 (<b>Minimal Studios, we, us, our</b>) and accessible to
@ -749,10 +749,10 @@ Website, nor do we undertake to keep the Services updated.</span></p>
statement</span></p> statement</span></p>
<p class=LetterBodyText><span lang=EN-AU>All intellectual property rights in the <p class=LetterBodyText><span lang=EN-AU>All intellectual property rights in the
Services, including design, text, graphics, logos, icons, sound recordings and Services, including design, text, graphics, logos, icons, sound recordings,
all software relating to the Services belong to or are licensed by us.  These Virtual Money, Virtual Goods, and all software relating to the Services belong
intellectual property rights are protected by Australian and international to or are licensed by us.  These intellectual property rights are protected by
laws. </span></p> Australian and international laws. </span></p>
<h2><span lang=EN-AU>Subject to you accepting and complying with these terms <h2><span lang=EN-AU>Subject to you accepting and complying with these terms
and conditions, and paying applicable fees, we grant you a limited, and conditions, and paying applicable fees, we grant you a limited,
@ -813,8 +813,6 @@ engage in unlawful or fraudulent behaviour, to defame or harass any third
party, to circumvent any security measures, through act or omission to mislead party, to circumvent any security measures, through act or omission to mislead
or deceive others, or in any other manner that we consider to be unacceptable. </span></p> or deceive others, or in any other manner that we consider to be unacceptable. </span></p>
<p class=LetterBodyText><span lang=EN-AU>  </span></p>
<p class=LetterBodyText><span lang=EN-AU>You acknowledge that you must take <p class=LetterBodyText><span lang=EN-AU>You acknowledge that you must take
your own precautions to ensure that the process that you employ for accessing the your own precautions to ensure that the process that you employ for accessing the
Services does not expose you to the risk of viruses, malicious computer code, Services does not expose you to the risk of viruses, malicious computer code,
@ -879,18 +877,18 @@ terms and conditions will not affect any accrued rights or remedies of the
parties (noting that rights to Virtual Goods will be extinguished in accordance parties (noting that rights to Virtual Goods will be extinguished in accordance
with these terms and conditions).  </span></p> with these terms and conditions).  </span></p>
<h2 style='margin-top:6.0pt'><span lang=EN-AU>You must not (nor purport to) <h2 style='margin-top:6.0pt'><span lang=EN-AU>You must not (nor purport to) assign,
assign, in whole or in part, or novate your rights and obligations under or in in whole or in part, or novate your rights and obligations under or in
connection with these terms and conditions without our prior written consent.  </span></h2> connection with these terms and conditions without our prior written consent.  </span></h2>
<h2 style='margin-top:6.0pt'><span lang=EN-AU>We may subcontract our <h2 style='margin-top:6.0pt'><span lang=EN-AU>We may subcontract our
obligations under these terms and conditions, and assign or novate our rights obligations under these terms and conditions, and assign or novate our rights
or obligations under these terms and conditions.</span></h2> or obligations under these terms and conditions.</span></h2>
<h2 style='margin-top:6.0pt'><span lang=EN-AU>A clause or part of a clause of <h2 style='margin-top:6.0pt'><span lang=EN-AU>A clause or part of a clause of these
these terms and conditions that is illegal or unenforceable may be severed from terms and conditions that is illegal or unenforceable may be severed from these
these terms and conditions and the remaining clauses or parts of the clause of terms and conditions and the remaining clauses or parts of the clause of these
these terms and conditions continue in force.</span></h2> terms and conditions continue in force.</span></h2>
<h2 style='margin-top:6.0pt'><span lang=EN-AU>These terms and conditions supersede <h2 style='margin-top:6.0pt'><span lang=EN-AU>These terms and conditions supersede
all previous agreements about their subject matter.  These terms and conditions all previous agreements about their subject matter.  These terms and conditions
@ -911,10 +909,10 @@ included;</span></h3>
<h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left: <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:
1.0cm;margin-bottom:.0001pt;text-indent:-1.0cm'><span lang=EN-AU 1.0cm;margin-bottom:.0001pt;text-indent:-1.0cm'><span lang=EN-AU
style='font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; style='font-family:Symbol'>·<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span></span><span lang=EN-AU>no rule of construction applies in the interpretation </span></span><span lang=EN-AU>no rule of construction applies in the
of these terms and conditions to the disadvantage of the party preparing the interpretation of these terms and conditions to the disadvantage of the party
terms and conditions on the basis that it put forward this document or any part preparing the terms and conditions on the basis that it put forward this document
of it; and</span></h3> or any part of it; and</span></h3>
<h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left: <h3 style='margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:
1.0cm;margin-bottom:.0001pt;text-indent:-1.0cm'><span lang=EN-AU 1.0cm;margin-bottom:.0001pt;text-indent:-1.0cm'><span lang=EN-AU
@ -1012,36 +1010,48 @@ member details.</span></h1>
<p class=CourtHeading><span lang=EN-AU>Part C – Buying Virtual Goods </span></p> <p class=CourtHeading><span lang=EN-AU>Part C – Buying Virtual Goods </span></p>
<h1><span lang=EN-AU>A key aspect of the Services will be the ability for <h1><span lang=EN-AU>The Services permit registered users to purchase virtual
registered users to buy goods such as game avatars and other user account currency (<b>Virtual Money</b>) and to use that Virtual Money to buy goods and
features from time to time (<b>Virtual Goods</b>).</span></h1> services expressly available for use in the Services, such as game avatars and
other user account features from time to time (<b>Virtual Goods</b>).  To be
eligible to buy Virtual Money and Virtual Goods, you must first become a member
of the Services as set out in Part B above.</span></h1>
<h1><span lang=EN-AU>To be eligible to buy Virtual Goods, you must first become <h1><span lang=EN-AU>You may access and purchase Virtual Money and Virtual
a member of the Services as set out in Part B above.  </span></h1> Goods for your personal, non-commercial use of the Services.  You acknowledge
that you do not acquire any ownership rights in or to the Virtual Money or
Virtual Goods.  You may only acquire Virtual Money and Virtual Goods from us
and through means provided by us.</span></h1>
<h1><span lang=EN-AU>The sale of each Virtual Good will be based on a value <h1><span lang=EN-AU>Virtual Money may be redeemed only for Virtual Goods and
that we assign to it in AUD.  </span></h1> can never be sold, transferred, or exchanged for ‘real’ money, ‘real’ goods, or
‘real’ services from us or anyone else.  Once you acquire a licence to Virtual
Money or Virtual Goods, you may not transfer them to another individual or
account.  </span></h1>
<h1><span lang=EN-AU>Sales of Virtual Goods will be conducted in credits on the <h1><span lang=EN-AU>During the term of your licence to the Virtual Money, you
Website that are equivalent to AUD.  It is each user’s responsibility to ensure may redeem it for selected Virtual Goods.  It is your responsibility to ensure you
they have sufficient credits to perform any transaction.  Transactions made have sufficient Virtual Money to perform any transaction within the Services. 
using credits are ultimately settled through payments of AUD amounts equivalent Transactions made using Virtual Money are ultimately settled through payments
to the Website credits, between registered PayPal accounts, credit cards, or of AUD amounts via registered Stripe accounts or any other method that we
any other method that we accept from time to time (for instance, we may in the accept from time to time (for instance, we may in the future expand to accept
future expand to accept payment in one or more crypto-currencies).  </span></h1> payment in one or more crypto-currencies).  </span></h1>
<h1><span lang=EN-AU>Each registered user must maintain a valid PayPal account, <h1><span lang=EN-AU>You will be provided with a register of Virtual Money
linked and valid credit card (or other approved method from time to time) balances and Virtual Goods for convenience, but we utilise third party payment
through which payments for Website credit-based transactions can be made, and processors with respect to the purchase of Virtual Money and we are not
must ensure the details of that account are kept up to date within the Website.  responsible for the operation or accuracy of the transactions.  Any balance of
</span></h1> Virtual Money or Virtual Goods does not reflect any stored value, has no monetary
value, and does not constitute currency or property of any type.</span></h1>
<h1><span lang=EN-AU>The Website will maintain a register of account balances (credits) <h1><span lang=EN-AU>All sales of Virtual Money and Virtual Goods are final and
for convenience, but the accounts behind the payment methods are operated exchanges or refunds for unused Virtual Money or Virtual Goods are not
separately from us and we are not responsible for their operation, balances or permitted, subjected to any rights you may have under the </span><i><span
accuracy.</span></h1> lang=EN-AU>Competition and Consumer Act 2010</span></i><span lang=EN-AU> (Cth)</span><span
lang=EN-AU>.</span></h1>
<h1><b><span lang=EN-AU>Nature of rights in Virtual Goods</span></b></h1> <h1 style='page-break-after:avoid'><b><span lang=EN-AU>Nature of rights in
Virtual Goods</span></b></h1>
<h1><span lang=EN-AU>There is no inherent value in any Virtual Goods and the <h1><span lang=EN-AU>There is no inherent value in any Virtual Goods and the
value in particular Virtual Goods may fluctuate in value from time to time by value in particular Virtual Goods may fluctuate in value from time to time by
@ -1057,11 +1067,11 @@ require you to remain a member of the Services.</span></h1>
<h1><span lang=EN-AU>Rights in Virtual Goods are not assignable from your <h1><span lang=EN-AU>Rights in Virtual Goods are not assignable from your
account to any other account. If your membership is cancelled or suspended in account to any other account. If your membership is cancelled or suspended in
accordance with these terms, or you cancel your use of the website for any accordance with these terms, or you cancel your use of the website for any
reason, you forfeit any Virtual Goods assigned to your account and we are not reason, you may forfeit any Virtual Goods assigned to your account and we are
liable to you in any way (including without limitation for the payment of any not liable to you in any way (including without limitation for the payment of
amount in respect of the relevant Virtual Goods).  Any Virtual Goods so any amount in respect of the relevant Virtual Goods).  You may also forfeit data
forfeited will be made available for sale to other users at the price or statistical information related to your account in the future, for example
determined by us.  </span></h1> win or loss scores.   </span></h1>
<h1><b><span lang=EN-AU>Tax</span></b></h1> <h1><b><span lang=EN-AU>Tax</span></b></h1>
@ -1103,8 +1113,7 @@ name="_Ref194721793"></a></h2>
</body> </body>
</html> </html>`;
`;
function termsOfService() { function termsOfService() {
const newWindow = window.open('', 'TOS'); const newWindow = window.open('', 'TOS');

2
server/src/skill.rs
View File

@ -294,7 +294,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) ->
match event { match event {
Event::Damage { amount, skill, mitigation: _, colour: c } => { Event::Damage { amount, skill, mitigation: _, colour: c } => {
if target.affected(Effect::Electric) { if target.affected(Effect::Electric) && !skill.is_tick() {
let ConstructEffect { effect: _, duration: _, meta, tick: _ } = target.effects.iter() let ConstructEffect { effect: _, duration: _, meta, tick: _ } = target.effects.iter()
.find(|e| e.effect == Effect::Electric).unwrap().clone(); .find(|e| e.effect == Effect::Electric).unwrap().clone();
match meta { match meta {