Skip to content

Commit

Permalink
Merge pull request #4 from UniTrader/Range-Update-dev
Browse files Browse the repository at this point in the history 
Range Update
  • Loading branch information
@UniTrader
UniTrader committed Oct 2, 2015
2 parents 7630c35 + de6faf6 commit 2088a17
Show file tree
Hide file tree
Showing 28 changed files with 4,086 additions and 667 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ Temporary Items
.apdisk
aiscripts/move.generic.xml
aiscripts/ut.cac.move.generic.wrapper.xml
aiscripts/ut.cac.move.generic.wrapper2.xml
12 changes: 7 additions & 5 deletions aiscripts/ut.cac.base.captain.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<aiscript xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ut.cac.base.captain" xsi:noNamespaceSchemaLocation="http://utnas/~unitrader/XRebirthxsds/aiscripts.xsd" version="1">
<aiscript xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ut.cac.base.captain" xsi:noNamespaceSchemaLocation="http://utnas/~unitrader/XRebirthxsds/aiscripts.xsd" version="2">
<!-- this is basically just a Script which executes previously given Orders in order and falls back to a logical default behavior depending on context (a very stupid script - the logic is to be implemented in other scripts) -->
<interrupts>
<handler comment="Print Script Vars">
Expand Down Expand Up @@ -47,7 +47,7 @@
</check_any>
</conditions>
<actions>
<debug_text filter="general" chance="this.$debug * 100" text="'%1 %2 %3 %4:\nevent.param= %5 event.param2= %6 event.param3= %7'.[player.age,this.name,this.container.name,event.name,event.param,event.param2,event.param3]"/>
<debug_text filter="general" chance="@this.$debug * 100" text="'%1 %2 %3 %4:\nevent.param= %5 event.param2= %6 event.param3= %7'.[player.age,this.name,this.container.name,event.name,event.param,event.param2,event.param3]"/>
<do_if value="typeof event.param2 == datatype.list" negate="true">
<!-- a List of new Orders has been passed instead of a single Order - make it a List for compatibility with multi-order-adding -->
<set_value name="$new_orders" exact="[ event.param2 ]" />
Expand Down Expand Up @@ -92,7 +92,7 @@
<event_object_signalled object="this.ship" param="'next order'"/>
</conditions>
<actions>
<debug_text filter="general" chance="this.$debug * 100" text="'%1 %2 %3 %4:\nevent.param= %5 event.param2= %6 event.param3= %7'.[player.age,this.name,this.container.name,event.name,event.param,event.param2,event.param3]"/>
<debug_text filter="general" chance="@this.$debug * 100" text="'%1 %2 %3 %4:\nevent.param= %5 event.param2= %6 event.param3= %7'.[player.age,this.name,this.container.name,event.name,event.param,event.param2,event.param3]"/>
<!-- ToDo: implement Condition for uninterruptable Orders (do nothing-cases) like Docking, which should not be aborted-->
<remove_value name="this.$orderlist.{1}"/>
<abort_scripts entity="this"/>
Expand All @@ -104,6 +104,8 @@
</init>
<attention min="unknown">
<actions>
<wait min="0.1s" max="10s" comment="to avoid multiple order requests at the same moment" sinceversion="2"/>

<label name="start"/>
<do_if value="not this.$orderlist?">
<create_list name="this.$orderlist"/>
Expand All @@ -112,13 +114,13 @@
<!-- first get to free Space/Undock, leave formations etc. to have a safe initial state -->
<run_script name="'ut.cac.com.captain.move.free'"/>

<wait min="0.1s" max="10s" comment="to avoid multiple order requests at the same moment"/>
<wait exact="100ms" />

<label name="start with orderlist"/>

<!-- fulfill all Orders in List in their order -->
<do_while value="this.$orderlist.count gt 0">
<debug_text filter="general" chance="this.$debug * 100" text="'%1 %2 %3 Command Queue: \n%4'.[player.age,this.name,this.container.name,this.$orderlist]"/>
<debug_text filter="general" chance="@this.$debug * 100" text="'%1 %2 %3 Command Queue: \n%4'.[player.age,this.name,this.container.name,this.$orderlist]"/>
<set_value name="$order" exact="this.$orderlist.{1}" />
<do_if value="typeof $order == datatype.table">
<set_value name="$order.$interruptable" exact="false"/>
Expand Down
61 changes: 30 additions & 31 deletions aiscripts/ut.cac.base.manager.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,47 @@
<actions>
<debug_text filter="general" text="'\n
Manager Name ' + this.knownname + ' at Time ' + player.age + ' Script Values:\n
this.$legality = ' + this.$legality + '\n
this.$ut_cac_settings = ' + this.$ut_cac_settings + '\n
this.$orderlist = ' + this.$orderlist + '\n
$bug = ' + $bug + '\n
this.$idle_subordinates = ' + this.$idle_subordinates"/>
</actions>
</handler>
<handler comment="Money Updated Handler">
<conditions>
<event_object_money_updated object="this"/>
</conditions>
</handler>
<handler comment="Order Request Handler - uses this.$idle_subordinates to let the manager finish what he is currently doing but not let him forget about outstanding order requests">
<conditions>
<check_any>
<event_object_signalled object="this" param="'request orders'"/>
</check_any>
</conditions>
<actions>
<debug_text filter="general" chance="this.$debug * 100" text="'%1 %2 %3 %4:\nevent.param= %5 event.param2= %6 event.param3= %7'.[player.age,this.name,this.container.name,event.name,event.param,event.param2,event.param3]"/>
<debug_text filter="general" chance="@this.$debug * 100" text="'%1 %2 %3 %4:\nevent.param= %5 event.param2= %6 event.param3= %7'.[player.age,this.name,this.container.name,event.name,event.param,event.param2,event.param3]"/>
<add_to_group groupname="this.$idle_subordinates" object="event.param2"/>
<!-- in case a script checks for the orderlist length for pausing/termination add a do-nothing order -->
<append_to_list name="this.$orderlist" exact="table[$script='ut.cac.microorder',$order=null]"/>
</actions>
</handler>
<handler comment="Zonetrade Cleanup">
<conditions>
<check_any>
<event_trade_order_cancelled buyer="this.container"/>
<event_trade_order_completed buyer="this.container"/>
</check_any>
</conditions>
<actions>
<do_if value="event.param == this.$ut_cac_settings.$currenttrade">
<debug_text filter="error" text="'%1 %2 %3 Manager Zonetrade %4 finally finished!! IT WORKS! PLEASE TELL ME WHEN YOU SEE THIS!'.[player.age,this.name,this.container.name,$finalselloffer]"/>
<remove_ware_reservation object="this.container" entity="this" ware="event.param.ware"/>
<set_value name="entity.$ut_cac_settings.$currenttrade" exact="null"/>
</do_if>
</actions>
</handler>
</interrupts>
<init>
</init>
<attention min="unknown">
<actions>
<label name="init"/>

<!-- set up legality levels:
3 - no goods which are considered illegal anywhere
2 - no goods which are considered illegal in this Zone or Sector
1 - no goods which are considered illegal in this Zone or Sector taking licenses into account (default for now; will change to 3 when interface is ready)
0 - trades with everything - wheter legal or illegal
-->
<do_if value="not this.$legality?">
<set_value name="this.$legality" exact="1"/>
</do_if>

<!-- set up orderlist -->
<do_if value="not this.$orderlist?">
<create_list name="this.$orderlist"/>
Expand All @@ -64,16 +64,15 @@
<set_value name="$miningorder" exact="table[$script='ut.cac.com.manager.gatherressources',$displayname='Gather Ressources (default)',$interruptable=false]"/>

<!--immediately allow Zone Trading and Mining -->
<set_value name="$next_zonetrade" exact="player.age"/>
<set_value name="$next_miningstep" exact="player.age"/>

<!-- for debug purposes-->
<!--set_value name="this.$debug" exact="true"/-->
<set_value name="$next_zonetrade" exact="player.age"/>
<set_value name="$next_miningstep" exact="player.age"/>

<!-- add Fuelcells as Trade Ware if Sctation has Cargo for them so Energy Freighters will buy it and put it into the Station Cargo for Refueling of Station Ships -->
<do_if value="this.container.cargo.{ware.fuelcells}.free gt 0">
<!--do_if value="this.container.cargo.{ware.fuelcells}.free gt 0">
<add_tradeware object="this.container" ware="ware.fuelcells" allowbuy="true" allowsell="false"/>
</do_if>
<add_cargo object="this.container" ware="ware.fuelcells" exact="1"/>
<set_value name="this.container.cargo.{ware.fuelcells}.target" exact="2500"/>
</do_if-->


<!-- register Subordinates - see event Handlers for actual adding procedure -->
Expand All @@ -82,14 +81,14 @@
<wait exact="1ms"/>
</do_all>

<debug_text filter="general" chance="this.$debug * 100" text="'%1 %2 init finished\nSet Values: this.$legalitiy= %3 , Fuelcells added as Tradeware, Signalled %4 Subordinates'.[player.age,this.name,this.$legality,this.container.subordinates.{this.type}.count]"/>
<debug_text filter="general" chance="@this.$debug * 100" text="'%1 %2 init finished\nSignalled %4 Subordinates'.[player.age,this.name,this.container.subordinates.{this.type}.count]"/>


<label name="start with orderlist"/>

<!-- fulfill all Orders in List in their order -->
<do_while value="this.$orderlist.count gt 0">
<debug_text filter="general" chance="this.$debug * 100" text="'%1 %2 %3 Command Queue: \n%4'.[player.age,this.name,this.container.name,this.$orderlist]"/>
<debug_text filter="general" chance="@this.$debug * 100" text="'%1 %2 %3 Command Queue: \n%4'.[player.age,this.name,this.container.name,this.$orderlist]"/>
<set_value name="$order" exact="this.$orderlist.{1}" />
<do_if value="typeof $order == datatype.table">
<set_value name="$order.$interruptable" exact="false"/>
Expand Down Expand Up @@ -119,7 +118,6 @@

<!-- check if we have gasses as ressource and can mine them directly -->
<do_if value="player.age gt $next_miningstep">
<set_value name="$next_miningstep" exact="player.age + 1min"/>
<create_list name="$mineable_ressources"/>
<do_all exact="this.container.resources.list.count" counter="$i">
<set_value name="$ware" exact="this.container.resources.list.{$i}"/>
Expand All @@ -131,21 +129,22 @@
</do_if>
</do_all>
<do_if value="$mineable_ressources.count or ( $miningorder.gatherware? and $miningorder.$gatherstart? and $miningorder.$gatherrate? )">
<debug_text filter="general" chance="this.$debug * 100" text="'%1 %2 %3 Found Mineable Ressources: \n%4'.[player.age,this.name,this.container.name,$mineable_ressources]"/>
<debug_text filter="general" chance="@this.$debug * 100" text="'%1 %2 %3 Found Mineable Ressources: \n%4'.[player.age,this.name,this.container.name,$mineable_ressources]"/>
<set_value name="$miningorder.$wareslist" exact="$mineable_ressources"/>
<set_value name="$miningorder.$next_call" exact="1min"/>
<append_to_list name="this.$orderlist" exact="$miningorder"/>
<set_value name="$next_miningstep" exact="player.age + 1min"/>
</do_if>
<do_else>
<set_value name="$next_miningstep" exact="player.age + 2min"/>
<set_value name="$next_miningstep" exact="player.age + 5min"/>
</do_else>
</do_if>

<!-- if there is not much else to do - do Zonetrade (POSSIBLY TIME INTENSIVE) -->
<!--do_if value="this.$orderlist.count lt 1 and player.age gt $next_zonetrade">
<do_if value="this.$orderlist.count lt 1 and player.age gt $next_zonetrade and not this.$ut_cac_settings.$currenttrade">
<set_value name="$next_zonetrade" exact="player.age + 7min"/>
<append_to_list name="this.$orderlist" exact="table[$script='ut.cac.com.manager.zonetrade',$displayname='Perform Zonetrade (default)',$repeat=false,$interruptable=true]"/>
</do_if-->
</do_if>

<do_if value="this.$orderlist.count == 0">
<append_to_list name="this.$orderlist" exact="table[$script='ut.cac.microorder',$displayname='Wait for Orders (default)',$order='wait order',$time=5min,$interruptable=true]"/>
Expand Down

0 comments on commit 2088a17

Please sign in to comment.