viewing paste Unknown #5695 | Diff

Posted on the | Last edited on
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 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294
Index: npc/re/scripts_athena.conf
===================================================================
--- npc/re/scripts_athena.conf  (revision 17276)
+++ npc/re/scripts_athena.conf  (working copy)
@@ -1,7 +1,7 @@
 // --------------------------------------------------------------
 // -                    Renewal Core Scripts                    -
 // --------------------------------------------------------------
-
+npc: npc/re/tester.txt
 // -------------------------- Airport ---------------------------
 npc: npc/re/airports/izlude.txt
 
Index: conf/char_athena.conf
===================================================================
--- conf/char_athena.conf   (revision 17276)
+++ conf/char_athena.conf   (working copy)
@@ -99,12 +99,10 @@
 // Start point, Map name followed by coordinates (x,y)
 start_point: new_1-1,53,111
 
-// Starting weapon for new characters
-start_weapon: 1201
+// Starting items for new characters (max 32)
+// Format is: id1,qt1,idn,qtn
+start_items: 1201,1,2301,1 
 
-// Starting armor for new characters
-start_armor: 2301
-
 // Starting zeny for new characters
 start_zeny: 0
 
Index: src/char/char.c
===================================================================
--- src/char/char.c (revision 17276)
+++ src/char/char.c (working copy)
@@ -147,8 +147,7 @@
 int gm_allow_group = -1;
 int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
 int start_zeny = 0;
-int start_weapon = 1201;
-int start_armor = 2301;
+int start_items[64]; //32 starting items allowed [mkbu95]
 int guild_exp_rate = 100;
 
 // Pincode system
@@ -1531,7 +1530,7 @@
 
    char name[NAME_LENGTH];
    char esc_name[NAME_LENGTH*2+1];
-   int char_id, flag;
+   int char_id, flag, k;
 
    safestrncpy(name, name_, NAME_LENGTH);
    normalize_name(name,TRIM_CHARS);
@@ -1606,14 +1605,10 @@
    //Retrieve the newly auto-generated char id
    char_id = (int)Sql_LastInsertId(sql_handle);
    //Give the char the default items
-   if (start_weapon > 0) { //add Start Weapon (Knife?)
-       if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `identify`) VALUES ('%d', '%d', '%d', '%d')", inventory_db, char_id, start_weapon, 1, 1) )
+   for (k = 0; k < ARRAYLENGTH(start_items) && start_items[k] != 0; k += 2) {
+       if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `identify`) VALUES ('%d', '%d', '%d', '%d')", inventory_db, char_id, start_items[k], start_items[k + 1], 1) )
            Sql_ShowDebug(sql_handle);
    }
-   if (start_armor > 0) { //Add default armor (cotton shirt?)
-       if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `identify`) VALUES ('%d', '%d', '%d', '%d')", inventory_db, char_id, start_armor, 1, 1) )
-           Sql_ShowDebug(sql_handle);
-   }
 
    ShowInfo("Created char: account: %d, char: %d, slot: %d, name: %s\n", sd->account_id, char_id, slot, name);
    return char_id;
@@ -4986,14 +4981,27 @@
            start_zeny = atoi(w2);
            if (start_zeny < 0)
                start_zeny = 0;
-       } else if (strcmpi(w1, "start_weapon") == 0) {
-           start_weapon = atoi(w2);
-           if (start_weapon < 0)
-               start_weapon = 0;
-       } else if (strcmpi(w1, "start_armor") == 0) {
-           start_armor = atoi(w2);
-           if (start_armor < 0)
-               start_armor = 0;
+       } else if (strcmpi(w1, "start_items") == 0) {
+           int i=0, tmp;
+           char *split, *split2;
+
+           split = strtok(w2, ",");
+           while (split != NULL && i < ) {
+               split2 = split;
+               split = strtok(NULL, ",");
+               tmp = atoi(split2);
+               if(i >= ARRAYLENGTH(start_items)){
+                   ShowDebug("start_items overbound, only %d items are allowed ignoring parameter %d\n",ARRAYLENGTH(start_items)/2,tmp);
+               }
+               else
+                   start_items[i] = max(tmp,0);
+               ++i;
+           }
+
+           if (i%2) { //we know it must be a even number
+               ShowError("Specified 'start_items' is missing a parameter. Removing '%d'.\n", start_items[i - 1]);
+               start_items[i - 1] = 0;
+           }
        } else if(strcmpi(w1,"log_char")==0) {      //log char or not [devil]
            log_char = atoi(w2);
        } else if (strcmpi(w1, "unknown_char_name") == 0) {
Index: src/map/script.c
===================================================================
--- src/map/script.c    (revision 17276)
+++ src/map/script.c    (working copy)
@@ -4360,6 +4360,7 @@
            clif_scriptmes(sd, st->oid, script_getstr(st, i));
        }
    }
+   st->has_windows = 1;
 
    return 0;
 }
@@ -4392,8 +4393,10 @@
    sd = script_rid2sd(st);
    if( sd == NULL )
        return 0;
-
-   st->state = END; //Should be CLOSE, but breaks backwards compatibility.
+   if(st->has_windows)
+       st->state = END; //backward compatibility
+   else
+       st->state = CLOSE;
    clif_scriptclose(sd, st->oid);
    return 0;
 }
@@ -6663,7 +6666,7 @@
        else
            item_tmp.identify=itemdb_isidentified(nameid);
 
-       map_addflooritem(&item_tmp,amount,m,x,y,0,0,0,0);
+       map_addflooritem(&item_tmp,amount,m,x,y,0,0,0,4);
    }
 
    return 0;
@@ -8209,7 +8212,10 @@
 /// end
 BUILDIN_FUNC(end)
 {
+   TBL_PC* sd;
+   sd = map_id2sd(st->rid);
    st->state = END;
+   if(sd) clif_scriptclose(sd, st->oid); //for menu and such
    return 0;
 }
 
Index: src/map/script.h
===================================================================
--- src/map/script.h    (revision 17276)
+++ src/map/script.h    (working copy)
@@ -133,6 +133,7 @@
    unsigned freeloop : 1;// used by buildin_freeloop
    unsigned op2ref : 1;// used by op_2
    unsigned npc_item_flag : 1;
+   int has_windows : 1;
 };
 
 struct script_reg {
Index: src/map/battle.c
===================================================================
--- src/map/battle.c    (revision 17276)
+++ src/map/battle.c    (working copy)
@@ -1189,7 +1189,9 @@
                        break;
                    }
        }
-       if( sc->data[SC_POISONINGWEAPON] && skill_id != GC_VENOMPRESSURE && (flag&BF_WEAPON) && damage > 0 && rnd()%100 < sc->data[SC_POISONINGWEAPON]->val3 )
+       if( sc->data[SC_POISONINGWEAPON]
+           && ((flag&BF_WEAPON) && (!skill_id || skill_id == GC_VENOMPRESSURE)) //chk skill type poison_smoke is a unit
+           && (damage > 0 && rnd()%100 < sc->data[SC_POISONINGWEAPON]->val3 )) //did some dammage and chance ok (why no additional effect ??
            sc_start(src,bl,sc->data[SC_POISONINGWEAPON]->val2,100,sc->data[SC_POISONINGWEAPON]->val1,skill_get_time2(GC_POISONINGWEAPON, 1));
        if( sc->data[SC__DEADLYINFECT] && damage > 0 && rnd()%100 < 65 + 5 * sc->data[SC__DEADLYINFECT]->val1 )
            status_change_spread(src, bl);
@@ -1227,9 +1229,9 @@
    }
 
    if( bl->type == BL_MOB && !status_isdead(bl) && src != bl) {
-     if (damage > 0 )
+       if (damage > 0 )
            mobskill_event((TBL_MOB*)bl,src,gettick(),flag);
-     if (skill_id)
+       if (skill_id)
            mobskill_event((TBL_MOB*)bl,src,gettick(),MSC_SKILLUSED|(skill_id<<16));
    }
    if( sd ) {
@@ -5374,7 +5376,7 @@
            if (t_bl->type == BL_MOB && ((TBL_MOB*)t_bl)->class_ == MOBID_EMPERIUM && flag&BCT_ENEMY)
                return 0; //mercenary may not attack Emperium
            break;
-    } //end switch actual src
+   } //end switch actual src
 
    switch( s_bl->type )
    {   //Checks on source master
@@ -5389,7 +5391,7 @@
                    strip_enemy = 0;
                }
                else if( sd->duel_group && !((!battle_config.duel_allow_pvp && map[m].flag.pvp) || (!battle_config.duel_allow_gvg && map_flag_gvg(m))) )
-               {
+               {
                    if( t_bl->type == BL_PC && (sd->duel_group == ((TBL_PC*)t_bl)->duel_group) )
                        return (BCT_ENEMY&flag)?1:-1; // Duel targets can ONLY be your enemy, nothing else.
                    else
Index: src/map/map.c
===================================================================
--- src/map/map.c   (revision 17276)
+++ src/map/map.c   (working copy)
@@ -1420,7 +1420,7 @@
  * @amount quantity
  * @m, @x, @y mapid,x,y
  * @first_charid, @second_charid, @third_charid, looting priority
- * @flag: &1 MVP item. &2 do stacking check.
+ * @flag: &1 MVP item. &2 do stacking check. &4 bypass dropable chk
  *------------------------------------------*/
 int map_addflooritem(struct item *item_data,int amount,int16 m,int16 x,int16 y,int first_charid,int second_charid,int third_charid,int flags)
 {
@@ -1429,7 +1429,7 @@
 
    nullpo_ret(item_data);
 
-   if(battle_config.item_onfloor && (itemdb_traderight(item_data->nameid)&1) )
+   if(!(flags&4) && battle_config.item_onfloor && (itemdb_traderight(item_data->nameid)&1) )
        return 0; //can't be dropped
 
    if(!map_searchrandfreecell(m,&x,&y,flags&2?1:0))
Index: src/map/pet.c
===================================================================
--- src/map/pet.c   (revision 17276)
+++ src/map/pet.c   (working copy)
@@ -591,7 +591,7 @@
    //You lost the pet already.
    if(!sd->status.pet_id || sd->pd->pet.intimate <= 0 || sd->pd->pet.incuvate)
        return 1;
-   
+
    egg_id = itemdb_exists(sd->pd->petDB->EggID);
    if (egg_id) {
        if ((egg_id->flag.trade_restriction&0x01) && !pc_inventoryblank(sd)) {
@@ -992,7 +992,7 @@
    while (ditem) {
        map_addflooritem(&ditem->item_data,ditem->item_data.amount,
            list->m,list->x,list->y,
-           list->first_charid,list->second_charid,list->third_charid,0);
+           list->first_charid,list->second_charid,list->third_charid,4);
        ditem_prev = ditem;
        ditem = ditem->next;
        ers_free(item_drop_ers, ditem_prev);
Index: src/map/atcommand.c
===================================================================
--- src/map/atcommand.c (revision 17276)
+++ src/map/atcommand.c (working copy)
@@ -5510,7 +5510,7 @@
 
    if((flag = pc_additem(sd,&item_tmp,1,LOG_TYPE_COMMAND))) {
        clif_additem(sd,0,0,flag);
-       map_addflooritem(&item_tmp,1,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0);
+       map_addflooritem(&item_tmp,1,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,4);
    }
 }
 
Index: src/map/skill.c
===================================================================
--- src/map/skill.c (revision 17276)
+++ src/map/skill.c (working copy)
@@ -15685,7 +15685,7 @@
                    memset(&item_tmp,0,sizeof(item_tmp));
                    item_tmp.nameid = group->item_id?group->item_id:ITEMID_TRAP;
                    item_tmp.identify = 1;
-                   map_addflooritem(&item_tmp,1,bl->m,bl->x,bl->y,0,0,0,0);
+                   map_addflooritem(&item_tmp,1,bl->m,bl->x,bl->y,0,0,0,4);
                }
                skill_delunit(unit);
            }
Index: src/map/mob.c
===================================================================
--- src/map/mob.c   (revision 17276)
+++ src/map/mob.c   (working copy)
@@ -1823,7 +1823,7 @@
    while (ditem) {
        map_addflooritem(&ditem->item_data,ditem->item_data.amount,
            list->m,list->x,list->y,
-           list->first_charid,list->second_charid,list->third_charid,0);
+           list->first_charid,list->second_charid,list->third_charid,4);
        ditem_prev = ditem;
        ditem = ditem->next;
        ers_free(item_drop_ers, ditem_prev);
Viewed 1241 times, submitted by lighta.