diff --git a/client/src/components/tos.jsx b/client/src/components/tos.jsx index e796cf60..a7d159f7 100644 --- a/client/src/components/tos.jsx +++ b/client/src/components/tos.jsx @@ -663,7 +663,7 @@ ul - +
@@ -677,12 +677,12 @@ ul

Introduction

-

Welcome to MNML!

+

Welcome to MNML!

-

MNML is a turn-based 1v1 strategy game -in an abstract setting where players outplay their opponents by building their -team of 3 constructs from a shifting meta of skills, effects and -specialisations.

+

MNML is a turn-based 1v1 strategy game in an abstract setting where players outplay their +opponents by building their team of 3 constructs from a shifting meta of +skills and specialisations.

MNML is provided by Minimal Studios Pty Ltd ACN 635 160 182 (Minimal Studios, we, us, our) and accessible to @@ -749,10 +749,10 @@ Website, nor do we undertake to keep the Services updated.

statement

All intellectual property rights in the -Services, including design, text, graphics, logos, icons, sound recordings and -all software relating to the Services belong to or are licensed by us.  These -intellectual property rights are protected by Australian and international -laws.

+Services, including design, text, graphics, logos, icons, sound recordings, +Virtual Money, Virtual Goods, and all software relating to the Services belong +to or are licensed by us.  These intellectual property rights are protected by +Australian and international laws.

Subject to you accepting and complying with these terms 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 or deceive others, or in any other manner that we consider to be unacceptable.

-

 

-

You acknowledge that you must take 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, @@ -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 with these terms and conditions). 

-

You must not (nor purport to) -assign, in whole or in part, or novate your rights and obligations under or in +

You must not (nor purport to) assign, +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. 

We may subcontract our obligations under these terms and conditions, and assign or novate our rights or obligations under these terms and conditions.

-

A clause or part of a clause of -these terms and conditions that is illegal or unenforceable may be severed from -these terms and conditions and the remaining clauses or parts of the clause of -these terms and conditions continue in force.

+

A clause or part of a clause of these +terms and conditions that is illegal or unenforceable may be severed from these +terms and conditions and the remaining clauses or parts of the clause of these +terms and conditions continue in force.

These terms and conditions supersede all previous agreements about their subject matter.  These terms and conditions @@ -911,10 +909,10 @@ included;

·                -no rule of construction applies in the interpretation -of these terms and conditions to the disadvantage of the party preparing the -terms and conditions on the basis that it put forward this document or any part -of it; and

+no rule of construction applies in the +interpretation of these terms and conditions to the disadvantage of the party +preparing the terms and conditions on the basis that it put forward this document +or any part of it; and

Part C – Buying Virtual Goods

-

A key aspect of the Services will be the ability for -registered users to buy goods such as game avatars and other user account -features from time to time (Virtual Goods).

+

The Services permit registered users to purchase virtual +currency (Virtual Money) and to use that Virtual Money to buy goods and +services expressly available for use in the Services, such as game avatars and +other user account features from time to time (Virtual Goods).  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.

-

To be eligible to buy Virtual Goods, you must first become -a member of the Services as set out in Part B above. 

+

You may access and purchase Virtual Money and Virtual +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.

-

The sale of each Virtual Good will be based on a value -that we assign to it in AUD. 

+

Virtual Money may be redeemed only for Virtual Goods and +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. 

-

Sales of Virtual Goods will be conducted in credits on the -Website that are equivalent to AUD.  It is each user’s responsibility to ensure -they have sufficient credits to perform any transaction.  Transactions made -using credits are ultimately settled through payments of AUD amounts equivalent -to the Website credits, between registered PayPal accounts, credit cards, or -any other method that we accept from time to time (for instance, we may in the -future expand to accept payment in one or more crypto-currencies). 

+

During the term of your licence to the Virtual Money, you +may redeem it for selected Virtual Goods.  It is your responsibility to ensure you +have sufficient Virtual Money to perform any transaction within the Services.  +Transactions made using Virtual Money are ultimately settled through payments +of AUD amounts via registered Stripe accounts or any other method that we +accept from time to time (for instance, we may in the future expand to accept +payment in one or more crypto-currencies). 

-

Each registered user must maintain a valid PayPal account, -linked and valid credit card (or other approved method from time to time) -through which payments for Website credit-based transactions can be made, and -must ensure the details of that account are kept up to date within the Website.  -

+

You will be provided with a register of Virtual Money +balances and Virtual Goods for convenience, but we utilise third party payment +processors with respect to the purchase of Virtual Money and we are not +responsible for the operation or accuracy of the transactions.  Any balance of +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.

-

The Website will maintain a register of account balances (credits) -for convenience, but the accounts behind the payment methods are operated -separately from us and we are not responsible for their operation, balances or -accuracy.

+

All sales of Virtual Money and Virtual Goods are final and +exchanges or refunds for unused Virtual Money or Virtual Goods are not +permitted, subjected to any rights you may have under the Competition and Consumer Act 2010 (Cth).

-

Nature of rights in Virtual Goods

+

Nature of rights in +Virtual Goods

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 @@ -1057,11 +1067,11 @@ require you to remain a member of the Services.

Rights in Virtual Goods are not assignable from your 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 -reason, you forfeit any Virtual Goods assigned to your account and we are not -liable to you in any way (including without limitation for the payment of any -amount in respect of the relevant Virtual Goods).  Any Virtual Goods so -forfeited will be made available for sale to other users at the price -determined by us.  

+reason, you may forfeit any Virtual Goods assigned to your account and we are +not liable to you in any way (including without limitation for the payment of +any amount in respect of the relevant Virtual Goods).  You may also forfeit data +or statistical information related to your account in the future, for example +win or loss scores.   

Tax

@@ -1103,8 +1113,7 @@ name="_Ref194721793"> - -`; +`; function termsOfService() { const newWindow = window.open('', 'TOS'); diff --git a/server/src/skill.rs b/server/src/skill.rs index 193bb64b..06fc7b38 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -294,7 +294,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) -> match event { 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() .find(|e| e.effect == Effect::Electric).unwrap().clone(); match meta {