Changeset 505 for java

Timestamp:

05/05/16 01:34:56 (9 years ago)

Author:

sz

Message:

Creature object updated: energy balance fields removed, transferEnergyTo() added (Framsticks v5.0rc6)

File:

• java/Framclipse/com.framsticks.framclipse/res/framscript.xml (modified) (5 diffs)

java/Framclipse/com.framsticks.framclipse/res/framscript.xml

@@ -133 +133 @@
                 <element name="idleen" type="float"/>
                 <element name="energy" type="float"/>
-                <element name="energy_p" type="float"/>
-                <element name="energy_m" type="float"/>
-                <element name="energy_b" type="float"/>
                 <element name="perf" type="integer" min="0" max="2">
                         <description><![CDATA[Initial value of this property is taken from Population.enableperf]]></description>
@@ -323 +320 @@
                         </arguments>
                 </element>
+                <element name="transferEnergyTo" function="true" type="float" flags="32">
+                        <description><![CDATA[Transfers at most the requested_amount_of_energy from this creature to the recipient. Returns the amount of energy actually transferred.
+The function will only transfer positive amounts and will not transfer more energy than this creature has, so the function is equivalent to:
+if (this.energy>0 && requested_amount_of_energy>0)
+{
+  var amount = Math.min(requested_amount_of_energy, this.energy);
+  recipient.energy += amount;
+  this.energy -= amount;
+}]]></description>
+                        <arguments>
+                                <argument name="recipient" type="Creature"/>
+                                <argument name="requested_amount_of_energy" type="float"/>
+                        </arguments>
+                </element>
         </type>
         <type name="CreatureSettings" context="Global context">
@@ -411 +422 @@
                 <element name="idleen" type="float"/>
                 <element name="energy" type="float"/>
-                <element name="energy_p" type="float"/>
-                <element name="energy_m" type="float"/>
-                <element name="energy_b" type="float"/>
                 <element name="perf" type="integer" min="0" max="2">
                         <description><![CDATA[Initial value of this property is taken from Population.enableperf]]></description>
@@ -5539 +5547 @@
                 <element name="idleen" type="float"/>
                 <element name="energy" type="float"/>
-                <element name="energy_p" type="float"/>
-                <element name="energy_m" type="float"/>
-                <element name="energy_b" type="float"/>
                 <element name="perf" type="integer" min="0" max="2">
                         <description><![CDATA[Initial value of this property is taken from Population.enableperf]]></description>
@@ -5727 +5732 @@
                         <arguments>
                                 <argument name="mask" type="integer"/>
+                        </arguments>
+                </element>
+                <element name="transferEnergyTo" function="true" type="float" flags="32">
+                        <description><![CDATA[Transfers at most the requested_amount_of_energy from this creature to the recipient. Returns the amount of energy actually transferred.
+The function will only transfer positive amounts and will not transfer more energy than this creature has, so the function is equivalent to:
+if (this.energy>0 && requested_amount_of_energy>0)
+{
+  var amount = Math.min(requested_amount_of_energy, this.energy);
+  recipient.energy += amount;
+  this.energy -= amount;
+}]]></description>
+                        <arguments>
+                                <argument name="recipient" type="Creature"/>
+                                <argument name="requested_amount_of_energy" type="float"/>
                         </arguments>
                 </element>