Skip to content

Commit

Permalink
kod ve bolge degisiklikleri
Browse files Browse the repository at this point in the history 
- altın para olmaktan çıktı. tek para turu akce olacak.
- limit ekipman sayisi kontroluyle ilgili kucuk degisiklik.
- kronik derleme problemlerinin tumu cozuldu.
- karakter dosyasindaki version bilgisi kaldirildi.
  • Loading branch information
ozgur yilmaz authored and ozgur yilmaz committed Jun 21, 2020
1 parent 19e41f6 commit 9c8f93a
Show file tree
Hide file tree
Showing 27 changed files with 545 additions and 953 deletions.
28 changes: 2 additions & 26 deletions area/limbo.are
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,45 +251,21 @@ A 0 1

#OBJECTS
#1
ak�e sikke~
ak�e~
bir ak�e~
Bir ak�e.~
silver~
money 0 A
1 0 0 0 0
0 10 0 P
#2
alt�n sikke~
bir alt�n~
Bir alt�n.~
gold~
money 0 A
0 1 0 0 0
0 10 0 P
#3
alt�n sikke~
bir miktar alt�n~
Bir miktar alt�n.~
gold~
money 0 A
0 0 0 0 0
0 10 0 P
#4
ak�e sikke~
ak�e~
bir miktar ak�e~
Bir miktar ak�e.~
silver~
money 0 A
0 0 0 0 0
0 10 0 P
#5
alt�n ak�e sikke~
%d ak�e ve %d alt�n sikke~
Bir miktar sikke.~
gold~
money 0 A
0 0 0 0 0
0 10 0 P
#6
%s ok~
bir %s ok~
Expand Down
63 changes: 14 additions & 49 deletions src/act_comm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1663,15 +1663,14 @@ void do_group( CHAR_DATA *ch, char *argument )
void do_split( CHAR_DATA *ch, char *argument )
{
char buf[MAX_STRING_LENGTH];
char arg1[MAX_INPUT_LENGTH],arg2[MAX_INPUT_LENGTH];
char arg1[MAX_INPUT_LENGTH];
CHAR_DATA *gch;
int members;
int amount_gold = 0, amount_silver = 0;
int share_gold, share_silver;
int extra_gold, extra_silver;
int amount_silver = 0;
int share_silver;
int extra_silver;

argument = one_argument( argument, arg1 );
one_argument( argument, arg2 );
one_argument( argument, arg1 );

if ( arg1[0] == '\0' )
{
Expand All @@ -1681,22 +1680,19 @@ void do_split( CHAR_DATA *ch, char *argument )

amount_silver = atoi( arg1 );

if (arg2[0] != '\0')
amount_gold = atoi(arg2);

if ( amount_gold < 0 || amount_silver < 0)
if ( amount_silver < 0)
{
printf_to_char(ch,"Grubun bundan hoþlanmaz.\n\r" );
return;
}

if ( amount_gold == 0 && amount_silver == 0 )
if ( amount_silver == 0 )
{
printf_to_char( ch,"Sýfýr sikke daðýttýn ve kimse çakozlamadý.\n\r" );
return;
}

if ( ch->gold < amount_gold || ch->silver < amount_silver)
if ( ch->silver < amount_silver)
{
printf_to_char(ch,"Üzerinde bu kadar yok.\n\r" );
return;
Expand All @@ -1718,19 +1714,14 @@ void do_split( CHAR_DATA *ch, char *argument )
share_silver = amount_silver / members;
extra_silver = amount_silver % members;

share_gold = amount_gold / members;
extra_gold = amount_gold % members;

if ( share_gold == 0 && share_silver == 0 )
if ( share_silver == 0 )
{
printf_to_char(ch,"Pis cimri.\n\r" );
return;
}

ch->silver -= amount_silver;
ch->silver += share_silver + extra_silver;
ch->gold -= amount_gold;
ch->gold += share_gold + extra_gold;

if (share_silver > 0)
{
Expand All @@ -1739,36 +1730,14 @@ void do_split( CHAR_DATA *ch, char *argument )
amount_silver,share_silver + extra_silver);
}

if (share_gold > 0)
{
printf_to_char(ch,
"Sen %d altýn daðýttýn. Senin payýna %d altýn düþtü.\n\r",
amount_gold,share_gold + extra_gold);
}
sprintf(buf,"$n %d akçe daðýttý. Senin payýna %d akçe düþtü.",amount_silver,share_silver);

if (share_gold == 0)
{
sprintf(buf,"$n %d akçe daðýttý. Senin payýna %d akçe düþtü.",
amount_silver,share_silver);
}
else if (share_silver == 0)
{
sprintf(buf,"$n %d altýn daðýttý. Senin payýna %d altýn düþtü.",
amount_gold,share_gold);
}
else
{
sprintf(buf,
"$n %d akçe ve %d altýn daðýttý. Senin payýna %d akçe ve %d altýn düþtü.\n\r",
amount_silver,amount_gold,share_silver,share_gold);
}

for ( gch = ch->in_room->people; gch != NULL; gch = gch->next_in_room )
{
if ( gch != ch && is_same_group(gch,ch) && !IS_AFFECTED(gch,AFF_CHARM))
{
act( buf, ch, NULL, gch, TO_VICT );
gch->gold += share_gold;
gch->silver += share_silver;
}
}
Expand Down Expand Up @@ -2088,7 +2057,7 @@ void do_remort( CHAR_DATA *ch, char *argument )
char mkstr[MAX_INPUT_LENGTH];
char pbuf[MAX_STRING_LENGTH];
char name[MAX_STRING_LENGTH];
int bankg, banks, qp, silver, gold, old_tra, old_pra, rkp;
int banks, qp, silver, old_tra, old_pra, rkp;

if ( IS_NPC(ch) || ( d = ch->desc ) == NULL )
return;
Expand Down Expand Up @@ -2121,7 +2090,7 @@ ch->pcdata->confirm_remort = FALSE;
printf_to_char(ch,"Bu sýrada muddan koparsan veya mud çökerse:\n\r");
printf_to_char(ch," AYNI ÝSÝMLE YENÝ BÝR KARAKTER YARAT VE ÖLÜMSÜZLERE DURUMU BÝLDÝR.\n\r");
printf_to_char(ch,"Unutma ki, eski karaktere ait aþaðýdaki özellikler aynen korunur:\n\r");
printf_to_char(ch," bankadakiler dahil tüm altýn ve akçe\n\r");
printf_to_char(ch," bankadakiler dahil tüm akçe\n\r");
printf_to_char(ch," pratik, eðitim seanslarý ve görev puaný\n\r");
printf_to_char(ch,"Yeni yaþamýnda 6 yüzük takabileceksin.\n\r");
printf_to_char(ch," Ve fazladan 10 eðitim seansýn olacak.\n\r");
Expand All @@ -2132,10 +2101,8 @@ ch->pcdata->confirm_remort = FALSE;
sprintf( name, "%s", ch->name );
d = ch->desc;
banks = ch->pcdata->bank_s;
bankg = ch->pcdata->bank_g;
qp = ch->pcdata->questpoints;
silver = ch->silver;
gold = ch->gold;
old_tra = ch->train;
old_pra = ch->practice;
rkp = ch->pcdata->rk_puani;
Expand All @@ -2153,12 +2120,10 @@ ch->pcdata->confirm_remort = FALSE;

/* give the remorting bonus */
ch->pcdata->bank_s += banks;
ch->pcdata->bank_g += bankg;
ch->silver += silver;
ch->gold += gold;
ch->pcdata->questpoints += qp;
ch->practice += old_pra;
ch->train += (10 + old_tra);
ch->train += (5 + old_tra);
ch->pcdata->rk_puani += rkp;

write_to_buffer( d, "\n\r[Devam etmek için ENTER]\n\r",0);
Expand All @@ -2169,7 +2134,7 @@ ch->pcdata->confirm_remort = FALSE;
printf_to_char(ch,"UYARI: bu komutun geri dönüþü yoktur.\n\r");
printf_to_char(ch,"Yeniyaþam komutunu argümanla yazmak yeniyaþam durumunu iptal edecektir.\n\r");
printf_to_char(ch,"Unutma ki, eski karaktere ait aþaðýdaki özellikler aynen korunur:\n\r");
printf_to_char(ch," bankadakiler dahil tüm altýn ve akçe\n\r");
printf_to_char(ch," bankadakiler dahil tüm akçe\n\r");
printf_to_char(ch," pratik, eðitim seanslarý ve görev puaný\n\r");
printf_to_char(ch,"Yeni yaþamýnda 6 yüzük takabileceksin.\n\r");
printf_to_char(ch," Ve fazladan 10 eðitim seansýn olacak.\n\r");
Expand Down
55 changes: 25 additions & 30 deletions src/act_hera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -730,9 +730,7 @@ int find_path( int in_room_vnum, int out_room_vnum, CHAR_DATA *ch,

/* ancestor for first layer is the direction */
hash_enter( &x_room, tmp_room,
((intptr_t)hash_find(&x_room,q_head->room_nr)
== -1) ? (void*)(i+1)
: hash_find(&x_room,q_head->room_nr));
((intptr_t)hash_find(&x_room,q_head->room_nr)== -1) ? reinterpret_cast<void*>(i+1) : hash_find(&x_room,q_head->room_nr));
}
}
else
Expand Down Expand Up @@ -1453,18 +1451,17 @@ void do_repair(CHAR_DATA *ch, char *argument)

cost = ( (obj->level * 10) +
((obj->cost * (100 - obj->condition)) /100) );
cost /= 100;

if (cost > ch->gold)
if (cost > ch->silver)
{
do_say(mob,(char*)"Hizmetlerimden yararlanmak için yeterince paran yok.");
return;
}

WAIT_STATE(ch,PULSE_VIOLENCE);

ch->gold -= cost;
mob->gold += cost;
ch->silver -= cost;
mob->silver += cost;
sprintf(buf, "$N $n'dan %s'ý alýyor, tamir ediyor ve $n'a geri veriyor.", obj->short_descr);
act(buf,ch,NULL,mob,TO_ROOM);
sprintf(buf, "%s %s'ý alýp, tamir edip sana geri veriyor.\n\r", mob->short_descr, obj->short_descr);
Expand Down Expand Up @@ -1523,9 +1520,8 @@ void do_estimate(CHAR_DATA *ch, char *argument)

cost = ( (obj->level * 10) +
((obj->cost * (100 - obj->condition)) /100) );
cost /= 100;

sprintf(buf, "Bu eþyayý tamir etmek sana %d altýna patlar.", cost);
sprintf(buf, "Bu eþyayý tamir etmek sana %d akçeye patlar.", cost);
do_say(mob,buf);
}

Expand Down Expand Up @@ -1572,7 +1568,7 @@ void do_restring( CHAR_DATA *ch, char *argument )

cost += (obj->level * 1500);

if (cost > ch->gold)
if (cost > ch->silver)
{
act("$N 'Hizmetlerim için yeterli akçen yok,' dedi.",
ch,NULL,mob,TO_CHAR);
Expand Down Expand Up @@ -1604,8 +1600,8 @@ void do_restring( CHAR_DATA *ch, char *argument )

WAIT_STATE(ch,PULSE_VIOLENCE);

ch->gold -= cost;
mob->gold += cost;
ch->silver -= cost;
mob->silver += cost;
sprintf(buf, "$N takes $n's item, tinkers with it, and returns it to $n.");
act(buf,ch,NULL,mob,TO_ROOM);
sprintf(buf,"%s takes your item, tinkers with it, and returns %s to you.\n\r", mob->short_descr, obj->short_descr);
Expand Down Expand Up @@ -2072,20 +2068,18 @@ void auction_update (void)
case 1 : /* going once */
case 2 : /* going twice */
if (auction->bet > 0)
sprintf (buf, "%s: %d altýna gidiyor - %s.", auction->item->short_descr,
auction->bet, ((auction->going == 1) ? "bir" : "iki"));
sprintf (buf, "%s: %d akçeye gidiyor.", auction->item->short_descr,auction->bet);
else
sprintf (buf, "%s: gidiyor - %s (teklif yok).", auction->item->short_descr,
((auction->going == 1) ? "bir" : "iki"));
sprintf(bufc,"%s%s%s",CLR_CYAN,buf,CLR_WHITE_BOLD);
sprintf (buf, "%s: henüz teklif yok.", auction->item->short_descr);
sprintf(bufc,"%s%s%s",CLR_CYAN,buf,CLR_WHITE_BOLD);
talk_auction (bufc);
break;

case 3 : /* SOLD! */

if (auction->bet > 0)
{
sprintf (buf, "%s: satýn alan %s, %d altýn.",
sprintf (buf, "%s: %s %d akçeye satýn aldý.",
auction->item->short_descr,
IS_NPC(auction->buyer) ? auction->buyer->short_descr : auction->buyer->name,
auction->bet);
Expand All @@ -2097,7 +2091,7 @@ void auction_update (void)
act ("Mezatçý beliriyor ve $p eþyasýný $e veriyor.",
auction->buyer,auction->item,NULL,TO_ROOM);

auction->seller->gold += auction->bet; /* give him the money */
auction->seller->silver += auction->bet; /* give him the money */

auction->item = NULL; /* reset item */

Expand Down Expand Up @@ -2156,7 +2150,7 @@ void do_auction (CHAR_DATA *ch, char *argument)
{
/* show item data here */
if (auction->bet > 0)
sprintf (buf, "Bu objeye son verilen teklif %d altýn.\n\r",auction->bet);
sprintf (buf, "Bu objeye son verilen teklif %d akçe.\n\r",auction->bet);
else
sprintf (buf, "Henüz teklif verilmedi.\n\r");
sprintf(bufc,"%s%s%s",CLR_GREEN,buf,CLR_WHITE_BOLD);
Expand All @@ -2166,8 +2160,7 @@ void do_auction (CHAR_DATA *ch, char *argument)
}
else
{
sprintf(bufc,"%sNeyi mezata çýkaracaksýn?%s\n\r",CLR_RED,CLR_WHITE);
send_to_char (bufc,ch);
printf_to_char(ch,"{rNeyi mezata çýkaracaksýn?{x\n\r");
return;
}
}
Expand Down Expand Up @@ -2195,8 +2188,8 @@ void do_auction (CHAR_DATA *ch, char *argument)
auction->item = NULL;
if (auction->buyer != NULL) /* return money to the buyer */
{
auction->buyer->gold += auction->bet;
send_to_char ("Paran iade edildi.\n\r",auction->buyer);
auction->buyer->silver += auction->bet;
printf_to_char (auction->buyer,"%d akçen iade edildi.\n\r",auction->bet);
}
return;
}
Expand Down Expand Up @@ -2225,29 +2218,31 @@ void do_auction (CHAR_DATA *ch, char *argument)

if (newbet < (auction->bet + 1))
{
send_to_char ("Teklifin son tekliften 1 altýn fazla ya da açýlýþ fiyatý kadar olmalý.\n\r",ch);
send_to_char ("Teklifin son tekliften 1 akçe fazla ya da açýlýþ fiyatý kadar olmalý.\n\r",ch);
return;
}

if (newbet > ch->gold)
if (newbet > ch->silver)
{
send_to_char ("O kadar paran yok!\n\r",ch);
return;
}

/* the actual bet is OK! */

/* return the gold to the last buyer, if one exists */
/* acik artirma devam ediyor. son yapilan teklifin
* uzerine cikildi. son teklifi yapana parasini geri ver.
*/
if (auction->buyer != NULL)
auction->buyer->gold += auction->bet;
auction->buyer->silver += auction->bet;

ch->gold -= newbet; /* substract the gold - important :) */
ch->silver -= newbet; /* substract the silver - important :) */
auction->buyer = ch;
auction->bet = newbet;
auction->going = 0;
auction->pulse = PULSE_AUCTION; /* start the auction over again */

sprintf (buf,"%s için %d altýn teklif edildi.\n\r",auction->item->short_descr,newbet);
sprintf (buf,"%s için %d akçe teklif edildi.\n\r",auction->item->short_descr,newbet);
sprintf(bufc,"%s%s%s",CLR_MAGENTA,buf,CLR_WHITE_BOLD);
talk_auction (bufc);
return;
Expand Down
Loading

0 comments on commit 9c8f93a

Please sign in to comment.