viewing paste checkweight_upd | Diff

Posted on the
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223
# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /home/lighta/Documents/Myscript/RO/Servs/ra2
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: doc/sample/npc_test_chekweight.txt
--- doc/sample/npc_test_chekweight.txt No Base Revision
+++ doc/sample/npc_test_chekweight.txt Locally New
@@ -0,0 +1,94 @@
+//===== rAthena Script =======================================
+//= Sample: ChekWeight
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Current Version: =====================================
+//= 20121113
+//===== Description: =========================================
+//= Demonstrates ChekWeight commands.
+//============================================================
+
+new_1-1,56,106,5       script  ChkSpace        763,{
+
+function ChkResult;
+function FinalReport;
+
+L_RESET:
+       resetlvl(1);
+       getinventorylist;
+       for(set .@i,0; .@i < @inventorylist_count; set .@i,.@i+1){     
+               delitem(@inventorylist_id[.@i],@inventorylist_amount[.@i]); //clear inventory
+       }
+      
+
+L_TEST1: //basic backward chk
+       .@testid = 0;
+       .@succes = 0;
+       .@ret = checkweight(512,10);
+       set .@succes,.@succes+ChkResult(.@testid++,1,.@ret); //should be success
+       .@ret = checkweight("Apple",10);
+       set .@succes,.@succes+ChkResult(.@testid++,1,.@ret); //should be success
+       .@ret = checkweight(6320,33000);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure too many item amount item weight=0
+       .@ret = checkweight("Premium_Reset_Stone",33000);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure too many item amount
+       .@ret = checkweight(717,500);
+       set .@succes,.@succes+ChkResult(.@testid++,1,.@ret); //should be success weight based on max weight=2030
+       .@ret = checkweight(717,1000);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure weight based on max weight=2030
+       .@ret = checkweight(2794,100);
+       set .@succes,.@succes+ChkResult(.@testid++,1,.@ret); //should be success
+       .@ret = checkweight(2794,101);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure (with MAX_INVENTORY = 100)
+       .@ret = checkweight(-1,1);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure invalide item id
+       .@ret = checkweight(512,0);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure invalide amount
+
+
+L_TEST2: //basic backward chk
+       .@ret = checkweight(512,10,513,10);
+       set .@succes,.@succes+ChkResult(.@testid++,1,.@ret); //should be success
+       .@ret = checkweight("Apple",10,"Banana",10);
+       set .@succes,.@succes+ChkResult(.@testid++,1,.@ret); //should be success
+       .@ret = checkweight(512,80,513,33000);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure
+       .@ret = checkweight("Apple",80,"Banana",33000);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure too many item amount
+       .@ret = checkweight("Apple",10,"Banana",21,512);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure invalid nb of args
+       .@ret = checkweight(717,500,716,100);
+       set .@succes,.@succes+ChkResult(.@testid++,1,.@ret); //should be succes weight 1800/2030
+       .@ret = checkweight(717,500,716,500);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure weight 3000/2030
+       .@ret = checkweight(2794,95,2795,5);
+       set .@succes,.@succes+ChkResult(.@testid++,1,.@ret); //should be success
+       .@ret = checkweight(2794,95,2795,10);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure (with MAX_INVENTORY = 100)
+       .@ret = checkweight(512,1,-1,1);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure invalide item id
+       .@ret = checkweight(512,1,513,0);
+       set .@succes,.@succes+ChkResult(.@testid++,0,.@ret); //should be failure invalide amount
+
+L_FINAL:
+       FinalReport(.@testid,.@succes);
+       end;
+      
+
+       function ChkResult {
+               .@tid = getarg(0);
+               .@expected = getarg(1);
+               .@ret = getarg(2);
+               .@sucess = (.@ret==.@expected);
+               debugmes "Test "+.@tid+" = "+(.@sucess?"Sucess":"Fail");
+               return .@sucess;
+       }
+
+       function FinalReport {
+               .@tdone = getarg(0);
+               .@succes = getarg(1);
+               debugmes "Results = Pass : "+.@succes+"/"+.@tdone+" Fails : "+(.@tdone-.@succes)+"/"+.@tdone;
+               if(.@succes != .@tdone) { debugmes "Some failure as occured, enable chkresult print to found out"; }
+               return;
+       }
+}
 
Index: src/map/script.c
--- src/map/script.c Base (BASE)
+++ src/map/script.c Locally Modified (Based On LOCAL)
@@ -6115,48 +6115,47 @@
  *------------------------------------------*/
 BUILDIN_FUNC(checkweight)
 {
-       int nameid, amount, slots;
-       unsigned int weight;
+       int nameid, amount, slots, amount2=0;
+       unsigned int weight, i, nbargs;
        struct item_data* id = NULL;
        struct map_session_data* sd;
        struct script_data* data;
 
-       if( ( sd = script_rid2sd(st) ) == NULL )
-       {
+       if( ( sd = script_rid2sd(st) ) == NULL ){
                return 0;
        }
+       nbargs = script_lastdata(st)+1;
+       ShowInfo("nb args = %d\n",nbargs);
+       if(nbargs%2){
+           ShowError("buildin_checkweight: Invalid nb of args should be a multiple of 2.\n");  // returns string, regardless of what it was
+           script_pushint(st,0);
+           return 1;
+       }
+       slots = pc_inventoryblank(sd); //nb of empty slot
 
-       data = script_getdata(st,2);
+       for(i=2; i<nbargs; i=i+2){
+           data = script_getdata(st,i);
        get_val(st, data);  // convert into value in case of a variable
-
-       if( data_isstring(data) )
-       {// item name
+           if( data_isstring(data) ){// item name
                id = itemdb_searchname(conv_str(st, data));
-       }
-       else
-       {// item id
+           } else {// item id
                id = itemdb_exists(conv_num(st, data));
        }
-
-       if( id == NULL )
-       {
-               ShowError("buildin_checkweight: Invalid item '%s'.\n", script_getstr(st,2));  // returns string, regardless of what it was
+           if( id == NULL ) {
+                   ShowError("buildin_checkweight: Invalid item '%s'.\n", script_getstr(st,i));  // returns string, regardless of what it was
                script_pushint(st,0);
                return 1;
        }
-
        nameid = id->nameid;
-       amount = script_getnum(st,3);
 
-       if( amount < 1 )
-       {
+           amount = script_getnum(st,i+1);
+           if( amount < 1 ) {
                ShowError("buildin_checkweight: Invalid amount '%d'.\n", amount);
                script_pushint(st,0);
                return 1;
        }
 
-       weight = itemdb_weight(nameid)*amount;
-
+           weight += itemdb_weight(nameid)*amount; //total weight for all chk
        if( weight + sd->weight > sd->max_weight )
        {// too heavy
                script_pushint(st,0);
@@ -6169,20 +6168,16 @@
                        // item is already in inventory, but there is still space for the requested amount
                        break;
                case ADDITEM_NEW:
-                       slots = pc_inventoryblank(sd);
-
-                       if( itemdb_isstackable(nameid) )
-                       {// stackable
-                               if( slots < 1 )
-                               {
+                           if( itemdb_isstackable(nameid) ) {// stackable
+                                   amount2++;
+                                   if( slots < amount2 ) {
                                        script_pushint(st,0);
                                        return 0;
                                }
                        }
-                       else
-                       {// non-stackable
-                               if( slots < amount )
-                               {
+                           else {// non-stackable
+                                   amount2 += amount;
+                                   if( slots < amount2){
                                        script_pushint(st,0);
                                        return 0;
                                }
@@ -6192,7 +6187,7 @@
                        script_pushint(st,0);
                        return 0;
        }
-
+       }
        script_pushint(st,1);
        return 0;
 }
 
 
@@ -17145,7 +17145,7 @@
        BUILDIN_DEF(rand,"i?"),
        BUILDIN_DEF(countitem,"v"),
        BUILDIN_DEF(countitem2,"viiiiiii"),
-       BUILDIN_DEF(checkweight,"vi"),
+       BUILDIN_DEF(checkweight,"vi*"),
        BUILDIN_DEF(readparam,"i?"),
        BUILDIN_DEF(getcharid,"i?"),
        BUILDIN_DEF(getnpcid,"i?"),
Viewed 467 times, submitted by lighta.