Changeset b72b78844ce1632d3f525227861f9c64dffaf5de

Timestamp:

08/08/09 17:43:10 (3 years ago)

Author:

Flupke <luper.rouch@…>

Children:

867160cce99744a7e64db9ac0de6bb741ada3087

Parents:

df6b2f294e72732aa332cc603206dec1576c9577, a59347fe3cc3a7fb05360bf2952952fb9cf01d28

git-committer:

Flupke <luper.rouch@…> (08/08/09 17:43:10)

Message:

Merge branch 'master' of luper.fr:/var/git/projects

Files:

• wow/CashControl/CashControl.lua (modified) (11 diffs)
• pyflu/pyflu/qt/widgets/__init__.py (added)
• pyflu/pyflu/qt/widgets/base_type_widgets.py (added)

wow/CashControl/CashControl.lua

@@ -54 +54 @@
             type = "input",
             name = "fixedcost",
-            desc = "Specify the fixed cost of components needed for a recipe: /cc fixed [recipe index] [[x]g] [[y]s] [[z]c]",
+            desc = "Specify the fixed cost of components needed for a recipe: /cc fixedcost [recipe index] [[x]g] [[y]s] [[z]c]",
             set = "SetRecipeFixedCost",
-        },
-        numitems = {
-            type = "input",
-            name = "numitems",
-            desc = "Specify the number of items produced by a recipe: /cc numitems [recipe index] [num items] (default: 1)",
-            set = "SetRecipeNumItems",
         },
         reset = {
             type = "execute",
             name = "reset",
-            desc = "Reset database",
+            desc = "Reset database - All recipes and history is lost, this cannot be undone !",
             func = "Reset",
         },
@@ -128 +122 @@
 
 function CashControl:OnEnable()
-    CashControl:Print("CashControl loaded, type /cc or /cashinfo for info")
+    CashControl:Print("CashControl loaded, type /cc or /cashcontrol for info")
 end
 
@@ -149 +143 @@
     count = tonumber(count)
     local cost = self:ParseMoneyString(cost_string)
+    if cost == nil then
+        CashControl:Print("Invalid money string: ", cost_string)
+        return
+    end
     local reagent_name = db.reagents[reagent_index]
     if reagent_name == nil then
@@ -193 +191 @@
     CashControl:Print("Minimum prices:")
     for recipe_name, info in pairs(db.craft_stock) do
-        CashControl:Print(string.format("%s: %s", recipe_name, 
-            GetCoinTextureString(info.cost / info.count)))
+        local base_price = info.cost / info.count
+        local ah_cut = base_price * 5 / 100
+        local price = base_price + ah_cut
+        CashControl:Print(string.format("%s: %s (+5%% cut: %s)", 
+                    recipe_name, 
+                    GetCoinTextureString(price),
+                    GetCoinTextureString(ah_cut)
+                )
+            )
     end
 end
@@ -317 +322 @@
 end
 
-function CashControl:SetRecipeNumItems(info, input)
-    local db = self.db.factionrealm
-    local i1, i2, recipe_index, count = string.find(input, "^ *(%d+) +(%d+) *$")
-    if i1 == nil then
-        CashControl:Print(string.format("You must specify a recipe index and an items count: /cc numitems [recipe index] [count]"))
-        return
-    end
-    recipe_index = tonumber(recipe_index)
-    count = tonumber(count)
-    local recipe_name = db.recipes[recipe_index]
-    db.recipes_specs[recipe_name].num_items = count
-    CashControl:Print(string.format("%s produces %d items", recipe_name, 
-        count))
-end
-
 function CashControl:Reset()
     -- Reset database to defaults
@@ -388 +378 @@
     --
     local db = self.db.factionrealm
-    local i1, i2, recipe_index, cost = string.find(input, "^ *(%d+) +(.+)$")
+    local i1, i2, recipe_index, cost_string = string.find(input, "^ *(%d+) +(.+)$")
     if i1 == nil then
         CashControl:Print(string.format(
@@ -395 +385 @@
     end
     recipe_index = tonumber(recipe_index)
-    cost = self:ParseMoneyString(cost)
+    local cost = self:ParseMoneyString(cost_string)
     if cost == nil then
+        CashControl:Print("Invalid money string: ", cost_string)
         return
     end
@@ -421 +412 @@
     CashControl:Print("    Recipe:")
     for reagent, count in pairs(specs.comps) do
-        CashControl:Print(string.format("        %s*%d", reagent, count))
-    end
-    CashControl:Print("    Items per craft: "..specs.num_items)
+        CashControl:Print(string.format("        %s x %d", reagent, count))
+    end
     CashControl:Print("    Fixed cost: "..GetCoinTextureString(specs.fixed_cost))
 end
@@ -438 +428 @@
             comps = {},
             fixed_cost = 0,
-            num_items = 1,
         }
     end
@@ -548 +537 @@
         local stock = db.stock[reagent]
         local needed_count = count
-        CashControl:Print("taking", count, reagent, "for", recipe_name)
+        -- CashControl:Print("taking", count, reagent, "for", recipe_name)
         while needed_count ~= 0 and #stock ~= 0 do 
             if stock[1].count <= needed_count then
                 -- Fully remove this stock entry
                 local stock_entry = table.remove(stock, 1)
-                CashControl:Print("full", stock_entry.cost, stock_entry.count)
+                --CashControl:Print("full", stock_entry.cost, stock_entry.count)
                 cost = cost + stock_entry.cost
                 needed_count = needed_count - stock_entry.count
@@ -562 +551 @@
                 stock[1].count = stock[1].count - needed_count
                 stock[1].cost = stock[1].cost - taken_cost
-                CashControl:Print("partial", taken_cost, needed_count)
+                --CashControl:Print("partial", taken_cost, needed_count)
                 cost = cost + taken_cost
                 needed_count = 0
             end
         end
-        CashControl:Print("finished taking", count, #stock)
+        --CashControl:Print("finished taking", count, #stock)
         if needed_count ~= 0 then
             CashControl:Print(string.format(